revert: build: remove project json files (#46)

bin/build.sh

@@ -1,14 +1,5 @@
 mkdir build
-
+rojo build packages/charm -o build/charm.rbxm
-build() {
+rojo build packages/charm-sync -o build/charm-sync.rbxm
-	cat > packages/default.project.json <<EOF
+rojo build packages/react -o build/react-charm.rbxm
-{"name":"$1","globIgnorePaths":["**/node_modules","**/package.json","**/wally.toml"],"tree":{"\$path":"$1"}}
+rojo build packages/vide -o build/vide-charm.rbxm
-EOF
-	rojo build packages -o build/$1.rbxm
-	rm -rf packages/default.project.json
-}
-
-build charm
-build charm-sync
-build react
-build vide

default.project.json

@@ -3,23 +3,25 @@
 	"tree": {
 		"$className": "DataModel",
 		"ReplicatedStorage": {
+			"$className": "ReplicatedStorage",
 			"DevPackages": {
 				"$path": "modules/DevPackages",
-				"charm": {
+				"Charm": {
 					"$path": "packages/charm"
 				},
-				"charm-sync": {
+				"CharmSync": {
 					"$path": "packages/charm-sync"
 				},
-				"react-charm": {
+				"ReactCharm": {
 					"$path": "packages/react"
 				},
-				"vide-charm": {
+				"VideCharm": {
 					"$path": "packages/vide"
 				}
 			}
 		},
 		"ServerScriptService": {
+			"$className": "ServerScriptService",
 			"Tests": {
 				"$path": "tests"
 			}

packages/charm-sync/default.project.json

@@ -0,0 +1,6 @@
+{
+	"name": "CharmSync",
+	"tree": {
+		"$path": "src"
+	}
+}

packages/charm-sync/init.luau

@@ -1,5 +0,0 @@
-local src = require(script.src)
-
-export type SyncPayload = src.SyncPayload
-
-return src

packages/charm-sync/package.json

@@ -4,8 +4,8 @@
 	"description": "Sync server state with clients using Charm",
 	"repository": "littensy/charm",
 	"license": "MIT",
-	"main": "init.luau",
+	"main": "src/init.luau",
-	"types": "index.d.ts",
+	"types": "src/index.d.ts",
 	"scripts": {
 		"prepare": "cp ../../LICENSE.md . && cp ../../README.md .",
 		"publish:wally": "wally publish"

packages/charm-sync/src/client.luau

@@ -1,4 +1,4 @@
-local Charm = require(script.Parent.Parent.Parent.charm)
+local Charm = require(script.Parent.Parent.Charm)
 local patch = require(script.Parent.patch)
 local types = require(script.Parent.types)
 type AtomMap = types.AtomMap

packages/charm-sync/src/server.luau

@@ -1,6 +1,6 @@
 local Players = game:GetService("Players")
 
-local Charm = require(script.Parent.Parent.Parent.charm)
+local Charm = require(script.Parent.Parent.Charm)
 local interval = require(script.Parent.interval)
 local patch = require(script.Parent.patch)
 local types = require(script.Parent.types)

packages/charm-sync/src/types.luau

@@ -1,4 +1,4 @@
-local Charm = require(script.Parent.Parent.Parent.charm)
+local Charm = require(script.Parent.Parent.Charm)
 type Atom<T> = Charm.Atom<T>
 
 --[=[

packages/charm-sync/wally.toml

@@ -3,8 +3,6 @@ name = "littensy/charm-sync"
 version = "0.3.0"
 registry = "https://github.com/UpliftGames/wally-index"
 realm = "shared"
-exclude = ["package.json", "node_modules"]
-include = ["LICENSE.md"]
 
 [dependencies]
 charm = "littensy/charm@^0.10"

packages/charm/default.project.json

@@ -0,0 +1,6 @@
+{
+	"name": "Charm",
+	"tree": {
+		"$path": "src"
+	}
+}

packages/charm/init.luau

@@ -1,7 +0,0 @@
-local src = require(script.src)
-
-export type Atom<State> = src.Atom<State>
-export type Selector<State> = src.Selector<State>
-export type Molecule<State> = src.Selector<State>
-
-return src

packages/charm/package.json

@@ -4,8 +4,8 @@
 	"description": "An atomic state management library for Roblox",
 	"repository": "littensy/charm",
 	"license": "MIT",
-	"main": "init.luau",
+	"main": "src/init.luau",
-	"types": "index.d.ts",
+	"types": "src/index.d.ts",
 	"scripts": {
 		"prepare": "cp ../../LICENSE.md . && cp ../../README.md .",
 		"publish:wally": "wally publish"

packages/charm/src/init.luau

@@ -10,6 +10,7 @@ local types = require(script.types)
 export type Atom<State> = types.Atom<State>
 export type Selector<State> = types.Selector<State>
 export type Molecule<State> = types.Selector<State>
+export type SyncPayload = types.SyncPayload
 
 return {
 	atom = atom,

packages/charm/src/types.luau

@@ -31,4 +31,13 @@ export type AtomOptions<T> = {
 	equals: (prev: T, next: T) -> boolean,
 }
 
+--[=[
+	A payload that can be sent from the server to the client to synchronize
+	state between the two.
+]=]
+export type SyncPayload = {
+	type: "patch" | "init",
+	data: { [any]: any },
+}
+
 return nil

packages/charm/wally.toml

@@ -3,7 +3,5 @@ name = "littensy/charm"
 version = "0.10.0"
 registry = "https://github.com/UpliftGames/wally-index"
 realm = "shared"
-exclude = ["package.json", "node_modules"]
-include = ["LICENSE.md"]
 
 [dependencies]

packages/react/default.project.json

@@ -0,0 +1,6 @@
+{
+	"name": "ReactCharm",
+	"tree": {
+		"$path": "src"
+	}
+}

packages/react/init.luau

@@ -1 +0,0 @@
-return require(script.src)

packages/react/package.json

@@ -4,8 +4,8 @@
 	"description": "React bindings for Charm",
 	"repository": "littensy/charm",
 	"license": "MIT",
-	"main": "init.luau",
+	"main": "src/init.luau",
-	"types": "index.d.ts",
+	"types": "src/index.d.ts",
 	"scripts": {
 		"prepare": "cp ../../LICENSE.md . && cp ../../README.md .",
 		"publish:wally": "wally publish"

packages/react/src/init.luau

@@ -1,7 +1,7 @@
-local Charm = require(script.Parent.Parent.charm)
+local Charm = require(script.Parent.Charm)
-local React = if script.Parent.Parent:FindFirstChild("React")
+local React = if script.Parent:FindFirstChild("react")
-	then require(script.Parent.Parent.React)
+	then require(script.Parent.react) :: never
-	else require((script.Parent.Parent :: any).react) :: never
+	else require(script.Parent.React)
 
 --[=[
 	A hook that subscribes to changes in the given atom or selector. The

packages/react/wally.toml

@@ -3,8 +3,6 @@ name = "littensy/react-charm"
 version = "0.3.0"
 registry = "https://github.com/UpliftGames/wally-index"
 realm = "shared"
-exclude = ["package.json", "node_modules"]
-include = ["LICENSE.md"]
 
 [dependencies]
 charm = "littensy/charm@^0.10"

packages/vide/default.project.json

@@ -0,0 +1,6 @@
+{
+	"name": "VideCharm",
+	"tree": {
+		"$path": "src"
+	}
+}

packages/vide/init.luau

@@ -1 +0,0 @@
-return require(script.src)

packages/vide/package.json

@@ -4,8 +4,8 @@
 	"description": "Vide bindings for Charm",
 	"repository": "littensy/charm",
 	"license": "MIT",
-	"main": "init.luau",
+	"main": "src/init.luau",
-	"types": "index.d.ts",
+	"types": "src/index.d.ts",
 	"scripts": {
 		"prepare": "cp ../../LICENSE.md . && cp ../../README.md .",
 		"publish:wally": "wally publish"

packages/vide/src/init.luau

@@ -1,7 +1,7 @@
-local Charm = require(script.Parent.Parent.charm)
+local Charm = require(script.Parent.Charm)
-local Vide = if script.Parent.Parent:FindFirstChild("Vide")
+local Vide = if script.Parent:FindFirstChild("vide")
-	then require(script.Parent.Parent.Vide)
+	then require(script.Parent.vide.src) :: never
-	else require((script.Parent.Parent :: any).vide.src) :: never
+	else require(script.Parent.Vide)
 
 --[=[
 	Subscribes to the state of an atom and returns a Vide source.

packages/vide/wally.toml

@@ -3,8 +3,6 @@ name = "littensy/vide-charm"
 version = "0.3.0"
 registry = "https://github.com/UpliftGames/wally-index"
 realm = "shared"
-exclude = ["package.json", "node_modules"]
-include = ["LICENSE.md"]
 
 [dependencies]
 charm = "littensy/charm@^0.10"

tests/benchmarks/atom.bench.luau

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

tests/benchmarks/patch.bench.luau

@@ -1,6 +1,6 @@
 local ReplicatedStorage = game:GetService("ReplicatedStorage")
 
-local patch = require(ReplicatedStorage.DevPackages["charm-sync"].src.patch)
+local patch = require(ReplicatedStorage.DevPackages.CharmSync.patch)
 
 local USERS = 1000
 

tests/charm-sync/client.spec.luau

@@ -1,9 +1,9 @@
 local ReplicatedStorage = game:GetService("ReplicatedStorage")
 
-local Charm = require(ReplicatedStorage.DevPackages.charm)
+local Charm = require(ReplicatedStorage.DevPackages.Charm)
 local atom = Charm.atom
 local subscribe = Charm.subscribe
-local CharmSync = require(ReplicatedStorage.DevPackages["charm-sync"])
+local CharmSync = require(ReplicatedStorage.DevPackages.CharmSync)
 local client = CharmSync.client
 
 return function()

tests/charm-sync/flatten.spec.luau

@@ -1,8 +1,8 @@
 local ReplicatedStorage = game:GetService("ReplicatedStorage")
 
-local Charm = require(ReplicatedStorage.DevPackages.charm)
+local Charm = require(ReplicatedStorage.DevPackages.Charm)
 local atom = Charm.atom
-local CharmSync = require(ReplicatedStorage.DevPackages["charm-sync"])
+local CharmSync = require(ReplicatedStorage.DevPackages.CharmSync)
 local flatten = CharmSync.flatten
 
 return function()

tests/charm-sync/patch.spec.luau

@@ -1,7 +1,7 @@
 local HttpService = game:GetService("HttpService")
 local ReplicatedStorage = game:GetService("ReplicatedStorage")
 
-local patch = require(ReplicatedStorage.DevPackages["charm-sync"].src.patch)
+local patch = require(ReplicatedStorage.DevPackages.CharmSync.patch)
 
 return function()
 	local function serdes(value: { [any]: any })

tests/charm-sync/server.spec.luau

@@ -1,11 +1,11 @@
 local ReplicatedStorage = game:GetService("ReplicatedStorage")
 
-local Charm = require(ReplicatedStorage.DevPackages.charm)
+local Charm = require(ReplicatedStorage.DevPackages.Charm)
 local atom = Charm.atom
-local CharmSync = require(ReplicatedStorage.DevPackages["charm-sync"])
+local CharmSync = require(ReplicatedStorage.DevPackages.CharmSync)
 type SyncPayload = CharmSync.SyncPayload
 local server = CharmSync.server
-local patch = require(ReplicatedStorage.DevPackages["charm-sync"].src.patch)
+local patch = require(ReplicatedStorage.DevPackages.CharmSync.patch)
 
 return function()
 	local target: Player = {} :: any

tests/charm-sync/validate.spec.luau

@@ -1,8 +1,8 @@
 local ReplicatedStorage = game:GetService("ReplicatedStorage")
 
-local Charm = require(ReplicatedStorage.DevPackages.charm)
+local Charm = require(ReplicatedStorage.DevPackages.Charm)
 local atom = Charm.atom
-local validate = require(ReplicatedStorage.DevPackages["charm-sync"].src.validate)
+local validate = require(ReplicatedStorage.DevPackages.CharmSync.validate)
 
 return function()
 	it("validates inputs", function()

tests/charm/atom.spec.luau

@@ -1,8 +1,8 @@
 local ReplicatedStorage = game:GetService("ReplicatedStorage")
 
-local Charm = require(ReplicatedStorage.DevPackages.charm)
+local Charm = require(ReplicatedStorage.DevPackages.Charm)
 local atom = Charm.atom
-local store = require(ReplicatedStorage.DevPackages.charm.src.store)
+local store = require(ReplicatedStorage.DevPackages.Charm.store)
 
 return function()
 	it("updates state", function()

tests/charm/batch.spec.luau

@@ -1,11 +1,11 @@
 local ReplicatedStorage = game:GetService("ReplicatedStorage")
 
-local Charm = require(ReplicatedStorage.DevPackages.charm)
+local Charm = require(ReplicatedStorage.DevPackages.Charm)
 local atom = Charm.atom
 local computed = Charm.computed
 local subscribe = Charm.subscribe
 local effect = Charm.effect
-local store = require(ReplicatedStorage.DevPackages.charm.src.store)
+local store = require(ReplicatedStorage.DevPackages.Charm.store)
 
 return function()
 	it("batches updates", function()

tests/charm/capture.spec.luau

@@ -1,9 +1,9 @@
 local ReplicatedStorage = game:GetService("ReplicatedStorage")
 
-local Charm = require(ReplicatedStorage.DevPackages.charm)
+local Charm = require(ReplicatedStorage.DevPackages.Charm)
 local atom = Charm.atom
 local subscribe = Charm.subscribe
-local store = require(ReplicatedStorage.DevPackages.charm.src.store)
+local store = require(ReplicatedStorage.DevPackages.Charm.store)
 
 return function()
 	it("gracefully handles yielding", function()

tests/charm/computed.spec.luau

@@ -1,9 +1,9 @@
 local ReplicatedStorage = game:GetService("ReplicatedStorage")
 
-local Charm = require(ReplicatedStorage.DevPackages.charm)
+local Charm = require(ReplicatedStorage.DevPackages.Charm)
 local atom = Charm.atom
 local computed = Charm.computed
-local store = require(ReplicatedStorage.DevPackages.charm.src.store)
+local store = require(ReplicatedStorage.DevPackages.Charm.store)
 local collect = require(script.Parent.Parent.utils.collect)
 local count = require(script.Parent.Parent.utils.count)
 

tests/charm/effect.spec.luau

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

tests/charm/mapped.spec.luau

@@ -1,10 +1,10 @@
 local ReplicatedStorage = game:GetService("ReplicatedStorage")
 
-local Charm = require(ReplicatedStorage.DevPackages.charm)
+local Charm = require(ReplicatedStorage.DevPackages.Charm)
 local atom = Charm.atom
 local mapped = Charm.mapped
 local observe = Charm.observe
-local store = require(ReplicatedStorage.DevPackages.charm.src.store)
+local store = require(ReplicatedStorage.DevPackages.Charm.store)
 
 return function()
 	it("returns mapped atoms", function()

tests/charm/observe.spec.luau

@@ -1,6 +1,6 @@
 local ReplicatedStorage = game:GetService("ReplicatedStorage")
 
-local Charm = require(ReplicatedStorage.DevPackages.charm)
+local Charm = require(ReplicatedStorage.DevPackages.Charm)
 local atom = Charm.atom
 local observe = Charm.observe
 

tests/charm/peek.spec.luau

@@ -1,6 +1,6 @@
 local ReplicatedStorage = game:GetService("ReplicatedStorage")
 
-local Charm = require(ReplicatedStorage.DevPackages.charm)
+local Charm = require(ReplicatedStorage.DevPackages.Charm)
 local atom = Charm.atom
 local capture = Charm.capture
 local peek = Charm.peek

tests/charm/subscribe.spec.luau

@@ -1,10 +1,10 @@
 local ReplicatedStorage = game:GetService("ReplicatedStorage")
 
-local Charm = require(ReplicatedStorage.DevPackages.charm)
+local Charm = require(ReplicatedStorage.DevPackages.Charm)
 local atom = Charm.atom
 local computed = Charm.computed
 local subscribe = Charm.subscribe
-local store = require(ReplicatedStorage.DevPackages.charm.src.store)
+local store = require(ReplicatedStorage.DevPackages.Charm.store)
 local collect = require(script.Parent.Parent.utils.collect)
 local count = require(script.Parent.Parent.utils.count)
 

tests/init.server.luau

@@ -6,8 +6,8 @@ local TestEZ = require(ReplicatedStorage.DevPackages.TestEZ)
 
 -- Start Charm in debug mode
 _G.__DEV__ = true
-require(ReplicatedStorage.DevPackages.charm)
+require(ReplicatedStorage.DevPackages.Charm)
-require(ReplicatedStorage.DevPackages["charm-sync"])
+require(ReplicatedStorage.DevPackages.CharmSync)
 _G.__DEV__ = false
 
 TestEZ.TestBootstrap:run({ script.Parent }, TestEZ.Reporters.TextReporter)

tests/init.spec.luau

@@ -1,6 +1,6 @@
 local ReplicatedStorage = game:GetService("ReplicatedStorage")
 
-local store = require(ReplicatedStorage.DevPackages.charm.src.store)
+local store = require(ReplicatedStorage.DevPackages.Charm.store)
 
 return function()
 	afterEach(function()

tests/react/useAtom.spec.luau

@@ -1,8 +1,8 @@
 local ReplicatedStorage = game:GetService("ReplicatedStorage")
 
-local Charm = require(ReplicatedStorage.DevPackages.charm)
+local Charm = require(ReplicatedStorage.DevPackages.Charm)
 local atom = Charm.atom
-local ReactCharm = require(ReplicatedStorage.DevPackages["react-charm"])
+local ReactCharm = require(ReplicatedStorage.DevPackages.ReactCharm)
 local useAtom = ReactCharm.useAtom
 local renderHook = require(script.Parent.Parent.utils.renderHook)
 

tests/vide/useAtom.spec.luau

@@ -1,10 +1,10 @@
 local ReplicatedStorage = game:GetService("ReplicatedStorage")
 
-local Charm = require(ReplicatedStorage.DevPackages.charm)
+local Charm = require(ReplicatedStorage.DevPackages.Charm)
 local atom = Charm.atom
 local Vide = require(ReplicatedStorage.DevPackages.Vide)
 local root = Vide.root
-local VideCharm = require(ReplicatedStorage.DevPackages["vide-charm"])
+local VideCharm = require(ReplicatedStorage.DevPackages.VideCharm)
 local useAtom = VideCharm.useAtom
 
 return function()