refactor: improve imports

packages/charm-sync/Charm.luau

@@ -0,0 +1,2 @@
+--!nocheck
+return require(script.Parent.charm.src)

packages/charm/src/computed.luau

@@ -1,13 +0,0 @@
-local signals = require("./signals")
-
-local computedImpl = signals.computed
-
-local function computed<T>(selector: (previous: T?) -> T): () -> T
-	local getter = computedImpl(selector)
-
-	return function()
-		return getter()
-	end
-end
-
-return computed

packages/charm/src/effect.luau

@@ -1,4 +1,3 @@
-local effectScope = require("./effectScope")
 local signals = require("./signals")
 
 local effectImpl = signals.effect
@@ -14,10 +13,8 @@ local function effect(callback: (dispose: () -> ()) -> ...() -> ()?): () -> ()
 		end
 	end
 
-	dispose = effectScope(function()
+	dispose = effectImpl(function()
-		effectImpl(function()
+		return callback(disposeSafe)
-			return callback(disposeSafe)
-		end)
 	end)
 
 	if disposed then

packages/charm/src/effectScope.luau

@@ -1,13 +0,0 @@
-local signals = require("./signals")
-
-local effectScopeImpl = signals.effectScope
-
-local function effectScope(callback: () -> ...() -> ()?): () -> ()
-	local dispose = effectScopeImpl(callback)
-
-	return function()
-		dispose()
-	end
-end
-
-return effectScope

packages/charm/src/lib.luau

@@ -1,8 +1,6 @@
 local atom = require("./atom")
 local batched = require("./batched")
-local computed = require("./computed")
 local effect = require("./effect")
-local effectScope = require("./effectScope")
 local listen = require("./listen")
 local mapped = require("./mapped")
 local observe = require("./observe")
@@ -15,6 +13,9 @@ export type Atom<T = any> = types.Atom<T>
 export type AtomOptions<T = any> = types.AtomOptions<T>
 export type Selector<T = any> = types.Selector<T>
 
+local computed = signals.computed
+local effectScope = signals.effectScope
+
 return {
 	atom = atom,
 	batched = batched,

packages/charm/src/listen.luau

@@ -1,4 +1,3 @@
-local effectScope = require("./effectScope")
 local signals = require("./signals")
 local spawn = require("./spawn")
 
@@ -19,23 +18,21 @@ local function listen<T>(selector: () -> T, listener: (state: T, previous: T?, d
 		end
 	end
 
-	dispose = effectScope(function()
+	dispose = effect(function()
-		effect(function()
+		local value = selector()
-			local value = selector()
 
-			if mounted then
+		if mounted then
-				mounted = false
+			mounted = false
-			elseif value == current then
+		elseif value == current then
-				return
+			return
-			end
+		end
 
-			local previous = current
+		local previous = current
-			current = value
+		current = value
 
-			pauseTracking()
+		pauseTracking()
-			spawn(listener, value, previous, disposeSafe)
+		spawn(listener, value, previous, disposeSafe)
-			resumeTracking()
+		resumeTracking()
-		end)
 	end)
 
 	if disposed then

packages/charm/src/mapped.luau

@@ -1,6 +1,6 @@
-local computed = require("./computed")
 local signals = require("./signals")
 
+local computed = signals.computed
 local pauseTracking = signals.pauseTracking
 local resumeTracking = signals.resumeTracking
 

packages/charm/src/subscribe.luau

@@ -1,4 +1,3 @@
-local effectScope = require("./effectScope")
 local signals = require("./signals")
 local spawn = require("./spawn")
 
@@ -11,22 +10,20 @@ local function subscribe<T>(selector: () -> T, listener: (T, T) -> ()): () -> ()
 	local mounted = true
 	local dispose: () -> ()
 
-	dispose = effectScope(function()
+	dispose = effect(function()
-		effect(function()
+		local value = selector()
-			local value = selector()
 
-			if mounted then
+		if mounted then
-				current = value
+			current = value
-				mounted = false
+			mounted = false
-			elseif value ~= current then
+		elseif value ~= current then
-				local previous = current
+			local previous = current
-				current = value
+			current = value
 
-				pauseTracking()
+			pauseTracking()
-				spawn(listener, value, previous)
+			spawn(listener, value, previous)
-				resumeTracking()
+			resumeTracking()
-			end
+		end
-		end)
 	end)
 
 	return function()

packages/react-charm/Charm.luau

@@ -0,0 +1,2 @@
+--!nocheck
+return require(script.Parent.charm.src)

packages/react-charm/React.luau

@@ -0,0 +1,2 @@
+--!nocheck
+return require(script.Parent.react)

packages/react-charm/src/init.luau

@@ -1,7 +1,5 @@
 local Charm = require(script.Parent.Charm)
-local React = if script.Parent:FindFirstChild("react")
+local React = require(script.Parent.React)
-	then require((script :: any).Parent.react) :: never
-	else require(script.Parent.React)
 
 local listen = Charm.listen
 local useEffect = React.useEffect

packages/vide-charm/Charm.luau

@@ -0,0 +1,2 @@
+--!nocheck
+return require(script.Parent.charm.src)

packages/vide-charm/Vide.luau

@@ -0,0 +1,2 @@
+--!nocheck
+return require(script.Parent.vide.src)

packages/vide-charm/src/init.luau

@@ -1,7 +1,5 @@
 local Charm = require(script.Parent.Charm)
-local Vide = if script.Parent:FindFirstChild("vide")
+local Vide = require(script.Parent.Vide)
-	then require((script :: any).Parent.vide.src) :: never
-	else require(script.Parent.Vide)
 
 local subscribe = Charm.subscribe
 local source = Vide.source
@@ -15,8 +13,7 @@ local cleanup = Vide.cleanup
 ]=]
 local function useAtom<State>(callback: () -> State): () -> State
 	local state = source(callback())
-	local dispose = subscribe(callback, state)
+	cleanup(subscribe(callback, state))
-	cleanup(dispose)
 	return state
 end
 

tests/signals/computed.spec.luau

@@ -1,8 +1,10 @@
-local test = require("../suite").test
+local charm = require("../charm")
-local signals = require("../charm").signals
+local suite = require("../suite")
 
+local signals = charm.signals
 local computed = signals.computed
 local signal = signals.signal
+local test = suite.test
 
 test("should correctly propagate changes through computed signals", function()
 	local src = signal(0)

tests/signals/effect.spec.luau

@@ -1,6 +1,7 @@
-local test = require("../suite").test
+local charm = require("../charm")
-local signals = require("../charm").signals
+local suite = require("../suite")
 
+local signals = charm.signals
 local computed = signals.computed
 local effect = signals.effect
 local effectScope = signals.effectScope
@@ -9,6 +10,7 @@ local pauseTracking = signals.pauseTracking
 local resumeTracking = signals.resumeTracking
 local signal = signals.signal
 local startBatch = signals.startBatch
+local test = suite.test
 
 test("should clear subscriptions when untracked by all subscribers", function()
 	local bRunTimes = 0

tests/signals/effectScope.spec.luau

@@ -1,9 +1,11 @@
-local test = require("../suite").test
+local charm = require("../charm")
-local signals = require("../charm").signals
+local suite = require("../suite")
 
+local signals = charm.signals
 local effect = signals.effect
 local effectScope = signals.effectScope
 local signal = signals.signal
+local test = suite.test
 
 test("should not trigger after stop", function()
 	local count = signal(1)

tests/signals/issue_48.spec.luau

@@ -1,11 +1,13 @@
-local test = require("../suite").test
+local charm = require("../charm")
-local signals = require("../charm").signals
+local suite = require("../suite")
 
+local signals = charm.signals
 local computed = signals.computed
 local effect = signals.effect
 local pauseTracking = signals.pauseTracking
 local resumeTracking = signals.resumeTracking
 local signal = signals.signal
+local test = suite.test
 
 type ReactionOptions<T = unknown> = {
 	fireImmediately: boolean?,

tests/signals/topology.spec.luau

@@ -1,12 +1,12 @@
-local signals = require("../charm").signals
+local charm = require("../charm")
 local suite = require("../suite")
 
-local test = suite.test
+local signals = charm.signals
-local describe = suite.describe
-
 local computed = signals.computed
 local effect = signals.effect
 local signal = signals.signal
+local describe = suite.describe
+local test = suite.test
 
 --[[
 	Tests adopted with thanks from preact-signals implementation at

tests/signals/untrack.spec.luau

@@ -1,10 +1,12 @@
-local test = require("../suite").test
+local charm = require("../charm")
-local signals = require("../charm").signals
+local suite = require("../suite")
 
+local signals = charm.signals
 local computed = signals.computed
 local pauseTracking = signals.pauseTracking
 local resumeTracking = signals.resumeTracking
 local signal = signals.signal
+local test = suite.test
 
 test("should pause tracking", function()
 	local src = signal(0)