refactor: remove pnpm, fix tests

This commit is contained in:
littensy 2025-05-03 20:30:10 -07:00
parent 861ee5acd7
commit e34b0c9aca
65 changed files with 353 additions and 2458 deletions

View file

@ -1,6 +1,6 @@
local ReplicatedStorage = game:GetService("ReplicatedStorage")
local Charm = require(ReplicatedStorage.DevPackages.Charm)
local Charm = require(ReplicatedStorage.Packages.Charm)
local computed = Charm.computed
local effect = Charm.effect

View file

@ -1,6 +1,8 @@
local ReplicatedStorage = game:GetService("ReplicatedStorage")
local patch = require(ReplicatedStorage.DevPackages.CharmSync.patch)
local CharmSync = require(ReplicatedStorage.Packages.CharmSync)
local patch = CharmSync.patch
local USERS = 1000

View file

@ -1,7 +1,8 @@
local ReplicatedStorage = game:GetService("ReplicatedStorage")
local Charm = require(ReplicatedStorage.DevPackages.Charm)
local signals = require(ReplicatedStorage.DevPackages.Charm.signals)
local Charm = require(ReplicatedStorage.Packages.Charm)
local signals = Charm.signals
local function propagate(
signal: <T>(T) -> (T?) -> T,

View file

@ -1,14 +1,12 @@
local Charm = require("../../packages/charm/src/lib")
local Charm = require("../charm")
local atom = Charm.atom
local computed = Charm.computed
local effect = Charm.effect
local signals = require("../../packages/charm/src/signals")
local signal = signals.signal
local computedSignal = signals.computed
local effectSignal = signals.effect
local signal = Charm.signals.signal
local computedSignal = Charm.signals.computed
local effectSignal = Charm.signals.effect
local w = 10
local h = 10

View file

@ -1,8 +1,8 @@
local ReplicatedStorage = game:GetService("ReplicatedStorage")
local ServerScriptService = game:GetService("ServerScriptService")
local Charm = require(ReplicatedStorage.DevPackages.Charm)
local CharmSync = require(ReplicatedStorage.DevPackages.CharmSync)
local Charm = require(ReplicatedStorage.Packages.Charm)
local CharmSync = require(ReplicatedStorage.Packages.CharmSync)
local suite = require(ServerScriptService.Tests.suite)
local atom = Charm.atom

View file

@ -1,8 +1,8 @@
local ReplicatedStorage = game:GetService("ReplicatedStorage")
local ServerScriptService = game:GetService("ServerScriptService")
local Charm = require(ReplicatedStorage.DevPackages.Charm)
local CharmSync = require(ReplicatedStorage.DevPackages.CharmSync)
local Charm = require(ReplicatedStorage.Packages.Charm)
local CharmSync = require(ReplicatedStorage.Packages.CharmSync)
local suite = require(ServerScriptService.Tests.suite)
local atom = Charm.atom

View file

@ -1,10 +1,10 @@
local HttpService = game:GetService("HttpService")
local ReplicatedStorage = game:GetService("ReplicatedStorage")
local ServerScriptService = game:GetService("ServerScriptService")
local patch = require(ReplicatedStorage.DevPackages.CharmSync.patch)
local suite = require(ServerScriptService.Tests.suite)
local CharmSync = require(ReplicatedStorage.Packages.CharmSync)
local suite = require("../suite")
local patch = CharmSync.patch
local test = suite.test
local function serdes(value: { [any]: any })
@ -124,7 +124,6 @@ test("optionally validates state", function()
end)
assert(success)
assert(success)
end)
return {}

View file

@ -1,15 +1,15 @@
local ReplicatedStorage = game:GetService("ReplicatedStorage")
local ServerScriptService = game:GetService("ServerScriptService")
local Charm = require(ReplicatedStorage.DevPackages.Charm)
local CharmSync = require(ReplicatedStorage.DevPackages.CharmSync)
local patch = require(ReplicatedStorage.DevPackages.CharmSync.patch)
local Charm = require(ReplicatedStorage.Packages.Charm)
local CharmSync = require(ReplicatedStorage.Packages.CharmSync)
local suite = require(ServerScriptService.Tests.suite)
type SyncPayload = CharmSync.SyncPayload
local atom = Charm.atom
local server = CharmSync.server
local patch = CharmSync.patch
local test = suite.test
local target: Player = {} :: any
@ -98,3 +98,5 @@ test("preserves history", function()
disconnect()
end)
return {}

View file

@ -1,11 +1,12 @@
local ReplicatedStorage = game:GetService("ReplicatedStorage")
local ServerScriptService = game:GetService("ServerScriptService")
local Charm = require(ReplicatedStorage.DevPackages.Charm)
local Charm = require(ReplicatedStorage.Packages.Charm)
local CharmSync = require(ReplicatedStorage.Packages.CharmSync)
local suite = require(ServerScriptService.Tests.suite)
local validate = require(ReplicatedStorage.DevPackages.CharmSync.validate)
local atom = Charm.atom
local validate = CharmSync.validate
local test = suite.test
test("validates inputs", function()
@ -33,3 +34,5 @@ test("validates inputs", function()
end
end
end)
return {}

3
tests/charm.luau Normal file
View file

@ -0,0 +1,3 @@
return if game
then require(game:GetService("ReplicatedStorage").Packages.Charm)
else require("../packages/charm/src/lib")

View file

@ -1,9 +1,9 @@
local ReplicatedStorage = game:GetService("ReplicatedStorage")
local ServerScriptService = game:GetService("ServerScriptService")
local Charm = require(ReplicatedStorage.DevPackages.Charm)
local ReactCharm = require(ReplicatedStorage.DevPackages.ReactCharm)
local renderHook = require(script.Parent.Parent.utils.renderHook)
local Charm = require(ReplicatedStorage.Packages.Charm)
local ReactCharm = require(ReplicatedStorage.Packages.ReactCharm)
local renderHook = require(ServerScriptService.Tests.utils.renderHook)
local suite = require(ServerScriptService.Tests.suite)
local atom = Charm.atom
@ -46,3 +46,5 @@ test("tracks dependencies", function()
state(1)
assert(hook.result == 1)
end)
return {}

View file

@ -1,5 +1,5 @@
local test = require("../suite").test
local signals = require("../../packages/charm/src/signals")
local signals = require("../charm").signals
local computed = signals.computed
local signal = signals.signal

View file

@ -1,5 +1,5 @@
local test = require("../suite").test
local signals = require("../../packages/charm/src/signals")
local signals = require("../charm").signals
local computed = signals.computed
local effect = signals.effect

View file

@ -1,5 +1,5 @@
local test = require("../suite").test
local signals = require("../../packages/charm/src/signals")
local signals = require("../charm").signals
local effect = signals.effect
local effectScope = signals.effectScope

View file

@ -1,5 +1,5 @@
local test = require("../suite").test
local signals = require("../../packages/charm/src/signals")
local signals = require("../charm").signals
local computed = signals.computed
local effect = signals.effect

View file

@ -1,4 +1,4 @@
local signals = require("../../packages/charm/src/signals")
local signals = require("../charm").signals
local suite = require("../suite")
local test = suite.test

View file

@ -1,5 +1,5 @@
local test = require("../suite").test
local signals = require("../../packages/charm/src/signals")
local signals = require("../charm").signals
local computed = signals.computed
local pauseTracking = signals.pauseTracking

View file

@ -12,9 +12,10 @@ end
test("signals")
if game then
test("sync")
test("react")
test("vide")
_G.__DEV__ = true
test("charm-sync")
test("react-charm")
test("vide-charm")
end
finish()

View file

@ -44,13 +44,13 @@ local function describe(name: string, callback: () -> ())
end
local function finish()
print(`\n🔵 {tests - #errors} / {tests} tests passed\n`)
local output = { `\n🔵 {tests - #errors} / {tests} tests passed\n` }
for _, result in results do
print(result)
table.insert(output, result)
end
print()
print(table.concat(output, "\n") .. "\n")
if #errors > 0 then
error(`{#errors} test(s) failed:\n{table.concat(errors, "\n")}\n`)

View file

@ -2,8 +2,8 @@ local ReplicatedStorage = game:GetService("ReplicatedStorage")
_G.__ROACT_17_MOCK_SCHEDULER__ = true
local React = require(ReplicatedStorage.DevPackages.React)
local ReactRoblox = require(ReplicatedStorage.DevPackages.ReactRoblox)
local React = require(ReplicatedStorage.Packages.React)
local ReactRoblox = require(ReplicatedStorage.Packages.ReactRoblox)
type RenderedHook<Props, Result> = {
result: Result,

View file

@ -1,9 +1,9 @@
local ReplicatedStorage = game:GetService("ReplicatedStorage")
local ServerScriptService = game:GetService("ServerScriptService")
local Charm = require(ReplicatedStorage.DevPackages.Charm)
local Vide = require(ReplicatedStorage.DevPackages.Vide)
local VideCharm = require(ReplicatedStorage.DevPackages.VideCharm)
local Charm = require(ReplicatedStorage.Packages.Charm)
local Vide = require(ReplicatedStorage.Packages.Vide)
local VideCharm = require(ReplicatedStorage.Packages.VideCharm)
local suite = require(ServerScriptService.Tests.suite)
local atom = Charm.atom