diff --git a/src/apply.luau b/src/apply.luau index 0f4586e..abb482c 100644 --- a/src/apply.luau +++ b/src/apply.luau @@ -1,13 +1,12 @@ -if not game then script = require "test/relative-string" end -local typeof = game and typeof or require "test/mock".typeof :: never -local Vector2 = game and Vector2 or require "test/mock".Vector2 :: never -local UDim2 = game and UDim2 or require "test/mock".UDim2 :: never +local typeof = game and typeof or require "../test/mock".typeof :: never +local Vector2 = game and Vector2 or require "../test/mock".Vector2 :: never +local UDim2 = game and UDim2 or require "../test/mock".UDim2 :: never -local flags = require(script.Parent.flags) -local throw = require(script.Parent.throw) -local bind = require(script.Parent.bind) -local _, is_action = require(script.Parent.action)() -local graph = require(script.Parent.graph) +local flags = require "./flags" +local throw = require "./throw" +local bind = require "./bind" +local _, is_action = require "./action"() +local graph = require "./graph" type Node = graph.Node type Array = { V } diff --git a/src/batch.luau b/src/batch.luau index 45ab038..4cd7581 100644 --- a/src/batch.luau +++ b/src/batch.luau @@ -1,8 +1,6 @@ -if not game then script = require "test/relative-string" end - -local flags = require(script.Parent.flags) -local throw = require(script.Parent.throw) -local graph = require(script.Parent.graph) +local flags = require "./flags" +local throw = require "./throw" +local graph = require "./graph" local function batch(setter: () -> ()) local already_batching = flags.batch diff --git a/src/bind.luau b/src/bind.luau index 3a016a6..ff32bcb 100644 --- a/src/bind.luau +++ b/src/bind.luau @@ -1,6 +1,4 @@ -if not game then script = require "test/relative-string" end - -local graph = require(script.Parent.graph) +local graph = require "./graph" type Node = graph.Node local create_node = graph.create_node local assert_stable_scope = graph.assert_stable_scope diff --git a/src/changed.luau b/src/changed.luau index 519a554..063f7e9 100644 --- a/src/changed.luau +++ b/src/changed.luau @@ -1,7 +1,5 @@ -if not game then script = require "test/relative-string" end - -local action = require(script.Parent.action)() -local cleanup = require(script.Parent.cleanup) +local action = require "./action"() +local cleanup = require "./cleanup" local function changed(property: string, callback: (T) -> ()) return action(function(instance) diff --git a/src/cleanup.luau b/src/cleanup.luau index 8449fcc..54195fb 100644 --- a/src/cleanup.luau +++ b/src/cleanup.luau @@ -1,8 +1,7 @@ -if not game then script = require "test/relative-string" end -local typeof = game and typeof or require "test/mock".typeof :: never +local typeof = game and typeof or require "../test/mock".typeof :: never -local throw = require(script.Parent.throw) -local graph = require(script.Parent.graph) +local throw = require "./throw" +local graph = require "./graph" local get_scope = graph.get_scope local push_cleanup = graph.push_cleanup diff --git a/src/context.luau b/src/context.luau index 6c571d0..882b838 100644 --- a/src/context.luau +++ b/src/context.luau @@ -1,7 +1,7 @@ -if not game then script = require "test/relative-string" end +if not game then script = require "../test/relative-string" end -local throw = require(script.Parent.throw) -local graph = require(script.Parent.graph) +local throw = require "./throw" +local graph = require "./graph" type Node = graph.Node local create_node = graph.create_node local get_scope = graph.get_scope diff --git a/src/create.luau b/src/create.luau index 7adfc68..5b6c9df 100644 --- a/src/create.luau +++ b/src/create.luau @@ -1,10 +1,10 @@ -if not game then script = require "test/relative-string" end -local typeof = game and typeof or require "test/mock".typeof:: never -local Instance = game and Instance or require "test/mock".Instance :: never +if not game then script = require "../test/relative-string" end +local typeof = game and typeof or require "../test/mock".typeof :: never +local Instance = game and Instance or require "../test/mock".Instance :: never -local throw = require(script.Parent.throw) -local defaults = require(script.Parent.defaults) -local apply = require(script.Parent.apply) +local throw = require "./throw" +local defaults = require "./defaults" +local apply = require "./apply" local ctor_cache = {} :: { [string]: () -> Instance } diff --git a/src/defaults.luau b/src/defaults.luau index 03badd6..ff2a256 100644 --- a/src/defaults.luau +++ b/src/defaults.luau @@ -1,6 +1,6 @@ -local Enum = game and Enum or require "test/mock".Enum :: never -local Color3 = game and Color3 or require "test/mock".Color3 :: never -local Vector3 = game and Vector3 or require "test/mock".Vector3 :: never +local Enum = game and Enum or require "../test/mock".Enum :: never +local Color3 = game and Color3 or require "../test/mock".Color3 :: never +local Vector3 = game and Vector3 or require "../test/mock".Vector3 :: never return { Part = { diff --git a/src/derive.luau b/src/derive.luau index fb824a4..73bbfeb 100644 --- a/src/derive.luau +++ b/src/derive.luau @@ -1,6 +1,4 @@ -if not game then script = require "test/relative-string" end - -local graph = require(script.Parent.graph) +local graph = require "./graph" local create_node = graph.create_node local push_child_to_scope = graph.push_child_to_scope local assert_stable_scope = graph.assert_stable_scope diff --git a/src/effect.luau b/src/effect.luau index 3acab21..5a2cd25 100644 --- a/src/effect.luau +++ b/src/effect.luau @@ -1,6 +1,4 @@ -if not game then script = require "test/relative-string" end - -local graph = require(script.Parent.graph) +local graph = require "./graph" local create_node = graph.create_node local assert_stable_scope = graph.assert_stable_scope local evaluate_node = graph.evaluate_node diff --git a/src/graph.luau b/src/graph.luau index 1495a59..be58b15 100644 --- a/src/graph.luau +++ b/src/graph.luau @@ -1,7 +1,5 @@ -if not game then script = require "test/relative-string" end - -local throw = require(script.Parent.throw) -local flags = require(script.Parent.flags) +local throw = require "./throw" +local flags = require "./flags" export type SourceNode = { cache: T, diff --git a/src/init.luau b/src/init.luau index 3bcc7ad..79cbf75 100644 --- a/src/init.luau +++ b/src/init.luau @@ -4,28 +4,26 @@ local version = { major = 0, minor = 3, patch = 1 } -if not game then script = require "test/relative-string" end - -local root = require(script.root) -local mount = require(script.mount) -local create = require(script.create) -local apply = require(script.apply) -local source = require(script.source) -local effect = require(script.effect) -local derive = require(script.derive) -local cleanup = require(script.cleanup) -local untrack = require(script.untrack) -local read = require(script.read) -local batch = require(script.batch) -local context = require(script.context) -local switch = require(script.switch) -local show = require(script.show) -local indexes, values = require(script.maps)() -local spring, update_springs = require(script.spring)() -local action = require(script.action)() -local changed = require(script.changed) -local throw = require(script.throw) -local flags = require(script.flags) +local root = require "./root" +local mount = require "./mount" +local create = require "./create" +local apply = require "./apply" +local source = require "./source" +local effect = require "./effect" +local derive = require "./derive" +local cleanup = require "./cleanup" +local untrack = require "./untrack" +local read = require "./read" +local batch = require "./batch" +local context = require "./context" +local switch = require "./switch" +local show = require "./show" +local indexes, values = require "./maps"() +local spring, update_springs = require "./spring"() +local action = require "./action"() +local changed = require "./changed" +local throw = require "./throw" +local flags = require "./flags" export type Source = source.Source export type source = Source diff --git a/src/maps.luau b/src/maps.luau index 23c1eb3..5fea836 100644 --- a/src/maps.luau +++ b/src/maps.luau @@ -1,8 +1,6 @@ -if not game then script = require "test/relative-string" end - -local throw = require(script.Parent.throw) -local flags = require(script.Parent.flags) -local graph = require(script.Parent.graph) +local throw = require "./throw" +local flags = require "./flags" +local graph = require "./graph" type Node = graph.Node type SourceNode = graph.SourceNode local create_node = graph.create_node diff --git a/src/mount.luau b/src/mount.luau index b9d0ace..567d3d9 100644 --- a/src/mount.luau +++ b/src/mount.luau @@ -1,7 +1,5 @@ -if not game then script = require "test/relative-string" end - -local root = require(script.Parent.root) -local apply = require(script.Parent.apply) +local root = require "./root" +local apply = require "./apply" local function mount(component: () -> T, target: Instance?): () -> () return root(function() diff --git a/src/read.luau b/src/read.luau index d3a2fb7..3764315 100644 --- a/src/read.luau +++ b/src/read.luau @@ -1,5 +1,3 @@ -if not game then script = require "test/relative-string" end - local function read(value: T | () -> T): T return if type(value) == "function" then value() else value end diff --git a/src/root.luau b/src/root.luau index bc5904d..d8dc230 100644 --- a/src/root.luau +++ b/src/root.luau @@ -1,7 +1,5 @@ -if not game then script = require "test/relative-string" end - -local throw = require(script.Parent.throw) -local graph = require(script.Parent.graph) +local throw = require "./throw" +local graph = require "./graph" type Node = graph.Node local create_node = graph.create_node local push_scope = graph.push_scope diff --git a/src/show.luau b/src/show.luau index 1cf60ca..b3c3fef 100644 --- a/src/show.luau +++ b/src/show.luau @@ -1,6 +1,4 @@ -if not game then script = require "test/relative-string" end - -local switch = require(script.Parent.switch) +local switch = require "./switch" local function show(source: () -> any, component: () -> T, fallback: (() -> T)?): () -> T? local function truthy() diff --git a/src/source.luau b/src/source.luau index e326815..0b89637 100644 --- a/src/source.luau +++ b/src/source.luau @@ -1,6 +1,4 @@ -if not game then script = require "test/relative-string" end - -local graph = require(script.Parent.graph) +local graph = require "./graph" type Node = graph.Node local create_source_node = graph.create_source_node local push_child_to_scope = graph.push_child_to_scope diff --git a/src/spring.luau b/src/spring.luau index a01ac1c..063b186 100644 --- a/src/spring.luau +++ b/src/spring.luau @@ -1,5 +1,4 @@ -if not game then script = require "test/relative-string" end -local Vector3 = game and Vector3 or require "test/mock".Vector3 :: never +local Vector3 = game and Vector3 or require "../test/mock".Vector3 :: never --[[ @@ -21,8 +20,8 @@ Unsupported datatypes: ]] -local throw = require(script.Parent.throw) -local graph = require(script.Parent.graph) +local throw = require "./throw" +local graph = require "./graph" type Node = graph.Node type SourceNode = graph.SourceNode local create_node = graph.create_node diff --git a/src/switch.luau b/src/switch.luau index 99edd3c..cb7cba4 100644 --- a/src/switch.luau +++ b/src/switch.luau @@ -1,7 +1,5 @@ -if not game then script = require "test/relative-string" end - -local throw = require(script.Parent.throw) -local graph = require(script.Parent.graph) +local throw = require "./throw" +local graph = require "./graph" type Node = graph.Node type SourceNode = graph.SourceNode local create_node = graph.create_node diff --git a/src/throw.luau b/src/throw.luau index 954f3e2..4135f69 100644 --- a/src/throw.luau +++ b/src/throw.luau @@ -1,5 +1,3 @@ -if not game then script = require "test/relative-string" end - local function VIDE_ASSERT(msg): any error(msg, 0) end diff --git a/src/untrack.luau b/src/untrack.luau index 86cdb7b..90ceee2 100644 --- a/src/untrack.luau +++ b/src/untrack.luau @@ -1,6 +1,4 @@ -if not game then script = require "test/relative-string" end - -local graph = require(script.Parent.graph) +local graph = require "./graph" type Node = graph.Node local get_scope = graph.get_scope diff --git a/test/benchmark.luau b/test/benchmark.luau index 05fe3ef..e61f05b 100644 --- a/test/benchmark.luau +++ b/test/benchmark.luau @@ -1,7 +1,7 @@ -local testkit = require("test/testkit") +local testkit = require("./testkit") local BENCH, START = testkit.benchmark() -local vide = require "src/init" +local vide = require "../src/init" local source = vide.source local derive = vide.derive local effect = vide.effect @@ -200,7 +200,7 @@ end) TITLE "property apply" ROOT_BENCH("apply 0 properties", function() - local apply = require "src/apply" + local apply = require "../src/apply" local instance = create("Frame") {} for i = 1, START(N) do @@ -209,7 +209,7 @@ ROOT_BENCH("apply 0 properties", function() end) ROOT_BENCH("apply 8 properties", function() - local apply = require "src/apply" + local apply = require "../src/apply" local instance = create("Frame") {} for i = 1, START(N) do @@ -227,7 +227,7 @@ ROOT_BENCH("apply 8 properties", function() end) ROOT_BENCH("bind property", function() - local apply = require "src/apply" + local apply = require "../src/apply" local instance = create("Frame") {} local src = source(1) @@ -242,7 +242,7 @@ ROOT_BENCH("bind property", function() end) ROOT_BENCH("update binding", function() - local apply = require "src/apply" + local apply = require "../src/apply" local instance = create("Frame") {} local src = source(1) @@ -512,8 +512,8 @@ do -- the purpose of the two following benchmarks is to measure the overhead of -- aggregate construction ROOT_BENCH("set explicit mock vector2", function() - local apply = require "src/apply" - local Vector2 = require "test/mock".Vector2 + local apply = require "../src/apply" + local Vector2 = require "../test/mock".Vector2 local label = create "TextLabel" { AnchorPoint = Vector2.new(1, 1) @@ -527,8 +527,8 @@ do end) ROOT_BENCH("set aggregate mock vector2", function() - local apply = require "src/apply" - local Vector2 = require "test/mock".Vector2 + local apply = require "../src/apply" + local Vector2 = require "../test/mock".Vector2 local label = create "TextLabel" { AnchorPoint = Vector2.new(1, 1) diff --git a/test/spring-test.luau b/test/spring-test.luau index 2e3bc9b..a849598 100644 --- a/test/spring-test.luau +++ b/test/spring-test.luau @@ -1,5 +1,5 @@ -local vide = require "src/init" -local testkit = require("test/testkit") +local vide = require "../src/init" +local testkit = require("../test/testkit") local program_time = os.clock() diff --git a/test/tests.luau b/test/tests.luau index 395b568..42f9563 100644 --- a/test/tests.luau +++ b/test/tests.luau @@ -1,12 +1,12 @@ -local testkit = require("test/testkit") +local testkit = require "./testkit" local TEST, CASE, CHECK, FINISH = testkit.test() -local mock = require "test/mock" +local mock = require "./mock" local Instance, Signal = mock.Instance, mock.Signal local Vector2, UDim2 = mock.Vector2, mock.UDim2 -local vide = require "src/init" -local graph = require "src/graph" +local vide = require "../src/init" +local graph = require "../src/graph" type Node = graph.Node type Map = { [K] : V } @@ -722,7 +722,7 @@ TEST("create()", wrap_root(function() local cleanup = vide.cleanup do CASE "apply default properties" - local defaults = require("src/defaults") + local defaults = require "../src/defaults" local frame = create "Frame" {} :: Instance & { BorderSizePixel: any, BorderColor3: any } CHECK(frame.BorderSizePixel == defaults.Frame.BorderSizePixel) CHECK(frame.BorderColor3 == defaults.Frame.BorderColor3) @@ -1169,7 +1169,7 @@ TEST("switch()", wrap_root(function() end do CASE "reactive stack resets after error" - local scopes = require "src/graph".scopes + local scopes = require "../src/graph".scopes local input = source(1) local n0 = scopes.n @@ -1328,7 +1328,7 @@ TEST("indexes()", wrap_root(function() end do CASE "reactive stack resets after error" - local scopes = require "src/graph".scopes + local scopes = require "../src/graph".scopes local input = source { 1 } @@ -1507,7 +1507,7 @@ TEST("values()", wrap_root(function() end do CASE "reactive stack resets after error" - local scopes = require "src/graph".scopes + local scopes = require "../src/graph".scopes local input = source { 1 } @@ -2260,7 +2260,7 @@ TEST("context()", function() end) TEST("nested effects cases", function() - local vide = require "src/init" + local vide = require "../src/init" local source = vide.source local effect = vide.effect local untrack = vide.untrack