@benev/tact 0.1.0-5 → 0.1.0

package/README.md

@@ -1,16 +1,4 @@
 
-> [!CAUTION]
-> ### 🚨🚨 TACT IS UNDER DEVELOPMENT!! 🚨🚨
-> *everything is half-broken right now.. just gimmie a minute to finish coding this, will ya?*
-
-<br></br>
-
----
-
----
-
-<br></br>
-
 # 🎮 @benev/tact
 > *web game input library, from keypress to couch co-op*
 

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@benev/tact",
-	"version": "0.1.0-5",
+	"version": "0.1.0",
 	"description": "keybindings and gamepad support for web games",
 	"license": "MIT",
 	"author": "Chase Moskal <chasemoskal@gmail.com>",
@@ -29,21 +29,21 @@
 		"count": "find s -path '*/_archive' -prune -o -name '*.ts' -exec wc -l {} +"
 	},
 	"peerDependencies": {
-		"lit": "^3.3.1"
+		"lit": "^3.3.2"
 	},
 	"dependencies": {
-		"@benev/math": "^0.2.0-4",
+		"@benev/math": "^0.2.0",
 		"@e280/kv": "^0.1.0",
-		"@e280/sly": "^0.2.0-24",
-		"@e280/strata": "^0.2.0-14",
-		"@e280/stz": "^0.2.7"
+		"@e280/sly": "^0.2.5",
+		"@e280/strata": "^0.2.8",
+		"@e280/stz": "^0.2.24"
 	},
 	"devDependencies": {
-		"@e280/science": "^0.1.2",
-		"@e280/scute": "^0.1.0",
+		"@e280/science": "^0.1.8",
+		"@e280/scute": "^0.1.5",
 		"http-server": "^14.1.1",
 		"npm-run-all": "^4.1.5",
-		"typescript": "^5.9.2"
+		"typescript": "^5.9.3"
 	},
 	"repository": {
 		"type": "git",

package/s/core/bindings/parts/defaults.ts

@@ -3,10 +3,10 @@ import {Code, CodeSettings, CodeState} from "../types.js"
 
 export const defaultHoldTime = 250
 
-export function defaultCodeState([,,settings]: Code): CodeState {
+export function defaultCodeState([,,settings]: Code, now: number): CodeState {
 	return {
 		lastValue: 0,
-		holdStart: 0,
+		holdStart: now,
 		settings: defaultifyCodeSettings(settings),
 	}
 }

package/s/core/bindings/resolver.ts

@@ -1,5 +1,5 @@
 
-import {MapG, pub, obMap} from "@e280/stz"
+import {pub, obMap, GMap} from "@e280/stz"
 import {Action} from "./action.js"
 import {SampleMap} from "./sample-map.js"
 import {lensAlgo} from "./parts/lens-algo.js"
@@ -12,7 +12,7 @@ export class Resolver<B extends Bindings> {
 	#modes = new Set<keyof B>()
 	#sampleMap = new SampleMap()
 	#now = 0
-	#codeStates = new MapG<number, CodeState>()
+	#codeStates = new GMap<string, CodeState>()
 	#update = pub()
 
 	constructor(public bindings: B) {
@@ -20,7 +20,7 @@ export class Resolver<B extends Bindings> {
 			const action = new Action()
 			this.#update.subscribe(() => {
 				action.value = this.#modes.has(mode)
-					? this.#resolveAtom()(atom)
+					? this.#resolveAtom([])(atom, mode as string)
 					: 0
 			})
 			return action
@@ -35,24 +35,31 @@ export class Resolver<B extends Bindings> {
 		return this.actions
 	}
 
-	#resolveCode(count: number, code: string, settings?: Partial<CodeSettings>) {
+	#resolveCode(path: string[], code: string, settings?: Partial<CodeSettings>) {
 		const state = this.#codeStates.guarantee(
-			count,
-			() => defaultCodeState(["code", code, settings]),
+			path.join("/"),
+			() => defaultCodeState(["code", code, settings], this.#now),
 		)
 		const value = this.#sampleMap.get(code) ?? 0
 		return lensAlgo(this.#now, state, value)
 	}
 
-	#resolveAtom = (context: {count: number} = {count: 0}) => (atom: Atom): number => {
-		const resolveAtom = this.#resolveAtom(context)
-		if (typeof atom === "string") {
-			return this.#resolveCode(context.count++, atom)
-		}
+	#resolveAtom = (path: string[]) => (atom: Atom, zone: string | number): number => {
+		const nextPath = [
+			...path,
+			String(zone),
+			typeof atom === "string" ? atom : atom[0],
+		]
+
+		const resolveAtom = this.#resolveAtom(nextPath)
+
+		if (typeof atom === "string")
+			return this.#resolveCode(nextPath, atom)
+
 		else switch (atom[0]) {
 			case "code": {
 				const [, code, settings] = atom
-				return this.#resolveCode(context.count++, code, settings)
+				return this.#resolveCode(nextPath, code, settings)
 			}
 			case "and": {
 				const [,...atoms] = atom
@@ -66,13 +73,13 @@ export class Resolver<B extends Bindings> {
 			}
 			case "not": {
 				const [, subject] = atom
-				const value = resolveAtom(subject)
+				const value = resolveAtom(subject, "subject")
 				return (value > 0) ? 0 : 1
 			}
 			case "cond": {
 				const [, subject, guard] = atom
-				return (resolveAtom(guard) > 0)
-					? resolveAtom(subject)
+				return (resolveAtom(guard, "guard") > 0)
+					? resolveAtom(subject, "subject")
 					: 0
 			}
 			case "mods": {
@@ -85,9 +92,9 @@ export class Resolver<B extends Bindings> {
 					maybe(modifiers.alt ?? false, "AltLeft", "AltRight"),
 					maybe(modifiers.meta ?? false, "MetaLeft", "MetaRight"),
 					maybe(modifiers.shift ?? false, "ShiftLeft", "ShiftRight"),
-				]])
+				]], "guard")
 				return (guard > 0)
-					? resolveAtom(subject)
+					? resolveAtom(subject, "subject")
 					: 0
 			}
 		}

package/s/core/core.test.ts

@@ -24,6 +24,28 @@ export default Science.suite({
 		}
 	}),
 
+	"hold timing": test(async() => {
+		const {time, device, resolve} = testSetupAlpha()
+		{
+			time.frame = 1
+			device.setSample("KeyG", 0)
+			const actions = resolve()
+			expect(actions.basic.grenade.value).is(0)
+		}
+		{
+			time.frame = 2
+			device.setSample("KeyG", 1)
+			const actions = resolve()
+			expect(actions.basic.grenade.value).is(0)
+		}
+		{
+			time.frame = 15
+			device.setSample("KeyG", 1)
+			const actions = resolve()
+			expect(actions.basic.grenade.value).is(1)
+		}
+	}),
+
 	"hub": Science.suite({
 		"device inputs work": test(async() => {
 			const {hub, time} = testSetupBravo()

package/s/core/testing/testing.ts

@@ -2,7 +2,7 @@
 import {Hub} from "../hub/hub.js"
 import {Port} from "../hub/port.js"
 import {Device} from "../devices/device.js"
-import {asBindings} from "../bindings/types.js"
+import {asBindings, Code} from "../bindings/types.js"
 import {Resolver} from "../bindings/resolver.js"
 import {SampleMap} from "../bindings/sample-map.js"
 import {SamplerDevice} from "../devices/infra/sampler.js"
@@ -20,6 +20,7 @@ export function testBindings() {
 		basic: {
 			jump: "Space",
 			shoot: "pointer.button.left",
+			grenade: <Code>["code", "KeyG", {timing: ["hold", 200]}]
 		},
 	})
 }

package/x/core/bindings/parts/defaults.d.ts

@@ -1,3 +1,3 @@
 import { Code, CodeState } from "../types.js";
 export declare const defaultHoldTime = 250;
-export declare function defaultCodeState([, , settings]: Code): CodeState;
+export declare function defaultCodeState([, , settings]: Code, now: number): CodeState;

package/x/core/bindings/parts/defaults.js

@@ -1,8 +1,8 @@
 export const defaultHoldTime = 250;
-export function defaultCodeState([, , settings]) {
+export function defaultCodeState([, , settings], now) {
     return {
         lastValue: 0,
-        holdStart: 0,
+        holdStart: now,
         settings: defaultifyCodeSettings(settings),
     };
 }

package/x/core/bindings/parts/defaults.js.map

@@ -1 +1 @@
-{"version":3,"file":"defaults.js","sourceRoot":"","sources":["../../../../s/core/bindings/parts/defaults.ts"],"names":[],"mappings":"AAGA,MAAM,CAAC,MAAM,eAAe,GAAG,GAAG,CAAA;AAElC,MAAM,UAAU,gBAAgB,CAAC,CAAC,EAAC,EAAC,QAAQ,CAAO;IAClD,OAAO;QACN,SAAS,EAAE,CAAC;QACZ,SAAS,EAAE,CAAC;QACZ,QAAQ,EAAE,sBAAsB,CAAC,QAAQ,CAAC;KAC1C,CAAA;AACF,CAAC;AAED,SAAS,mBAAmB;IAC3B,OAAO;QACN,KAAK,EAAE,CAAC;QACR,MAAM,EAAE,KAAK;QACb,KAAK,EAAE,IAAI;QACX,KAAK,EAAE,IAAI;QACX,MAAM,EAAE,IAAI;QACZ,GAAG,EAAE,IAAI;QACT,MAAM,EAAE,CAAC,QAAQ,CAAC;KAClB,CAAA;AACF,CAAC;AAED,SAAS,sBAAsB,CAAC,UAAiC,EAAE;IAClE,OAAO;QACN,GAAG,mBAAmB,EAAE;QACxB,GAAG,OAAO;KACV,CAAA;AACF,CAAC"}
+{"version":3,"file":"defaults.js","sourceRoot":"","sources":["../../../../s/core/bindings/parts/defaults.ts"],"names":[],"mappings":"AAGA,MAAM,CAAC,MAAM,eAAe,GAAG,GAAG,CAAA;AAElC,MAAM,UAAU,gBAAgB,CAAC,CAAC,EAAC,EAAC,QAAQ,CAAO,EAAE,GAAW;IAC/D,OAAO;QACN,SAAS,EAAE,CAAC;QACZ,SAAS,EAAE,GAAG;QACd,QAAQ,EAAE,sBAAsB,CAAC,QAAQ,CAAC;KAC1C,CAAA;AACF,CAAC;AAED,SAAS,mBAAmB;IAC3B,OAAO;QACN,KAAK,EAAE,CAAC;QACR,MAAM,EAAE,KAAK;QACb,KAAK,EAAE,IAAI;QACX,KAAK,EAAE,IAAI;QACX,MAAM,EAAE,IAAI;QACZ,GAAG,EAAE,IAAI;QACT,MAAM,EAAE,CAAC,QAAQ,CAAC;KAClB,CAAA;AACF,CAAC;AAED,SAAS,sBAAsB,CAAC,UAAiC,EAAE;IAClE,OAAO;QACN,GAAG,mBAAmB,EAAE;QACxB,GAAG,OAAO;KACV,CAAA;AACF,CAAC"}

package/x/core/bindings/resolver.js

@@ -1,4 +1,4 @@
-import { MapG, pub, obMap } from "@e280/stz";
+import { pub, obMap, GMap } from "@e280/stz";
 import { Action } from "./action.js";
 import { SampleMap } from "./sample-map.js";
 import { lensAlgo } from "./parts/lens-algo.js";
@@ -10,7 +10,7 @@ export class Resolver {
     #modes = new Set();
     #sampleMap = new SampleMap();
     #now = 0;
-    #codeStates = new MapG();
+    #codeStates = new GMap();
     #update = pub();
     constructor(bindings) {
         this.bindings = bindings;
@@ -18,7 +18,7 @@ export class Resolver {
             const action = new Action();
             this.#update.subscribe(() => {
                 action.value = this.#modes.has(mode)
-                    ? this.#resolveAtom()(atom)
+                    ? this.#resolveAtom([])(atom, mode)
                     : 0;
             });
             return action;
@@ -31,21 +31,25 @@ export class Resolver {
         this.#update();
         return this.actions;
     }
-    #resolveCode(count, code, settings) {
-        const state = this.#codeStates.guarantee(count, () => defaultCodeState(["code", code, settings]));
+    #resolveCode(path, code, settings) {
+        const state = this.#codeStates.guarantee(path.join("/"), () => defaultCodeState(["code", code, settings], this.#now));
         const value = this.#sampleMap.get(code) ?? 0;
         return lensAlgo(this.#now, state, value);
     }
-    #resolveAtom = (context = { count: 0 }) => (atom) => {
-        const resolveAtom = this.#resolveAtom(context);
-        if (typeof atom === "string") {
-            return this.#resolveCode(context.count++, atom);
-        }
+    #resolveAtom = (path) => (atom, zone) => {
+        const nextPath = [
+            ...path,
+            String(zone),
+            typeof atom === "string" ? atom : atom[0],
+        ];
+        const resolveAtom = this.#resolveAtom(nextPath);
+        if (typeof atom === "string")
+            return this.#resolveCode(nextPath, atom);
         else
             switch (atom[0]) {
                 case "code": {
                     const [, code, settings] = atom;
-                    return this.#resolveCode(context.count++, code, settings);
+                    return this.#resolveCode(nextPath, code, settings);
                 }
                 case "and": {
                     const [, ...atoms] = atom;
@@ -59,13 +63,13 @@ export class Resolver {
                 }
                 case "not": {
                     const [, subject] = atom;
-                    const value = resolveAtom(subject);
+                    const value = resolveAtom(subject, "subject");
                     return (value > 0) ? 0 : 1;
                 }
                 case "cond": {
                     const [, subject, guard] = atom;
-                    return (resolveAtom(guard) > 0)
-                        ? resolveAtom(subject)
+                    return (resolveAtom(guard, "guard") > 0)
+                        ? resolveAtom(subject, "subject")
                         : 0;
                 }
                 case "mods": {
@@ -78,9 +82,9 @@ export class Resolver {
                             maybe(modifiers.alt ?? false, "AltLeft", "AltRight"),
                             maybe(modifiers.meta ?? false, "MetaLeft", "MetaRight"),
                             maybe(modifiers.shift ?? false, "ShiftLeft", "ShiftRight"),
-                        ]]);
+                        ]], "guard");
                     return (guard > 0)
-                        ? resolveAtom(subject)
+                        ? resolveAtom(subject, "subject")
                         : 0;
                 }
             }

package/x/core/bindings/resolver.js.map

@@ -1 +1 @@
-{"version":3,"file":"resolver.js","sourceRoot":"","sources":["../../../s/core/bindings/resolver.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"resolver.js","sourceRoot":"","sources":["../../../s/core/bindings/resolver.ts"],"names":[],"mappings":"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"}

package/x/core/core.test.d.ts

@@ -1,6 +1,7 @@
 import { Science } from "@e280/science";
 declare const _default: {
     "sample to action value": Science.Test;
+    "hold timing": Science.Test;
     hub: {
         "device inputs work": Science.Test;
         "reveal overlay works": Science.Test;

package/x/core/core.test.js

@@ -21,6 +21,27 @@ export default Science.suite({
             expect(actions.basic.shoot.value).is(3);
         }
     }),
+    "hold timing": test(async () => {
+        const { time, device, resolve } = testSetupAlpha();
+        {
+            time.frame = 1;
+            device.setSample("KeyG", 0);
+            const actions = resolve();
+            expect(actions.basic.grenade.value).is(0);
+        }
+        {
+            time.frame = 2;
+            device.setSample("KeyG", 1);
+            const actions = resolve();
+            expect(actions.basic.grenade.value).is(0);
+        }
+        {
+            time.frame = 15;
+            device.setSample("KeyG", 1);
+            const actions = resolve();
+            expect(actions.basic.grenade.value).is(1);
+        }
+    }),
     "hub": Science.suite({
         "device inputs work": test(async () => {
             const { hub, time } = testSetupBravo();

package/x/core/core.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"core.test.js","sourceRoot":"","sources":["../../s/core/core.test.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"core.test.js","sourceRoot":"","sources":["../../s/core/core.test.ts"],"names":[],"mappings":"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"}

package/x/core/devices/infra/group.d.ts

@@ -1,8 +1,7 @@
-import { SetG } from "@e280/stz";
 import { Device } from "../device.js";
 export declare class GroupDevice extends Device {
     #private;
-    devices: SetG<Device>;
+    devices: import("@e280/stz").GSet<Device>;
     constructor(...devices: Device[]);
     samples(): Generator<[string, number], void, unknown>;
 }

package/x/core/devices/standard/keyboard.d.ts

@@ -1,9 +1,6 @@
 import { SamplerDevice } from "../infra/sampler.js";
 export declare class KeyboardDevice extends SamplerDevice {
     #private;
-    dispose: {
-        (): void;
-        schedule(fn: () => void): any;
-    };
+    dispose: import("@e280/stz").Disposer;
     constructor(target?: EventTarget);
 }

package/x/core/devices/standard/pointer.d.ts

@@ -4,10 +4,7 @@ export declare class PointerDevice extends SamplerDevice {
     #private;
     client: Vec2;
     movement: Vec2;
-    dispose: {
-        (): void;
-        schedule(fn: () => void): any;
-    };
+    dispose: import("@e280/stz").Disposer;
     constructor(target?: EventTarget);
     static buttonCode(event: PointerEvent): string;
     static wheelCodes(event: WheelEvent): [string, number][];

package/x/core/hub/port.d.ts

@@ -1,10 +1,9 @@
-import { SetG } from "@e280/stz";
 import { Bindings } from "../bindings/types.js";
 import { Resolver } from "../bindings/resolver.js";
 export declare class Port<B extends Bindings> extends Resolver<B> {
     #private;
-    readonly devices: SetG<import("../index.js").Device>;
-    readonly modes: SetG<keyof B>;
+    readonly devices: import("@e280/stz").GSet<import("../index.js").Device>;
+    readonly modes: import("@e280/stz").GSet<keyof B>;
     constructor(bindings: B);
     resolve(now?: number): import("../bindings/types.js").Actions<B>;
 }

package/x/core/testing/testing.d.ts

@@ -1,5 +1,6 @@
 import { Hub } from "../hub/hub.js";
 import { Device } from "../devices/device.js";
+import { Code } from "../bindings/types.js";
 import { Resolver } from "../bindings/resolver.js";
 import { SamplerDevice } from "../devices/infra/sampler.js";
 export declare class TestTime {
@@ -10,6 +11,7 @@ export declare function testBindings(): {
     basic: {
         jump: string;
         shoot: string;
+        grenade: Code;
     };
 };
 export declare function testPlug<C extends Device>(hub: Hub<any>, device: C): C;
@@ -19,12 +21,14 @@ export declare function testSetupAlpha(): {
         basic: {
             jump: string;
             shoot: string;
+            grenade: Code;
         };
     }>;
     resolve: () => import("../bindings/types.js").Actions<{
         basic: {
             jump: string;
             shoot: string;
+            grenade: Code;
         };
     }>;
     time: TestTime;
@@ -34,6 +38,7 @@ export declare function testSetupBravo(): {
         basic: {
             jump: string;
             shoot: string;
+            grenade: Code;
         };
     }, any>;
     time: TestTime;

package/x/core/testing/testing.js

@@ -15,6 +15,7 @@ export function testBindings() {
         basic: {
             jump: "Space",
             shoot: "pointer.button.left",
+            grenade: ["code", "KeyG", { timing: ["hold", 200] }]
         },
     });
 }

package/x/core/testing/testing.js.map

@@ -1 +1 @@
-{"version":3,"file":"testing.js","sourceRoot":"","sources":["../../../s/core/testing/testing.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,GAAG,EAAC,MAAM,eAAe,CAAA;AACjC,OAAO,EAAC,IAAI,EAAC,MAAM,gBAAgB,CAAA;AAEnC,OAAO,EAAC,UAAU,EAAC,MAAM,sBAAsB,CAAA;AAC/C,OAAO,EAAC,QAAQ,EAAC,MAAM,yBAAyB,CAAA;AAChD,OAAO,EAAC,SAAS,EAAC,MAAM,2BAA2B,CAAA;AACnD,OAAO,EAAC,aAAa,EAAC,MAAM,6BAA6B,CAAA;AAEzD,MAAM,OAAO,QAAQ;IACpB,KAAK,GAAG,CAAC,CAAA;IAET,IAAI,GAAG;QACN,OAAO,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC,GAAG,CAAC,IAAI,GAAG,EAAE,CAAC,CAAA;IACpC,CAAC;CACD;AAED,MAAM,UAAU,YAAY;IAC3B,OAAO,UAAU,CAAC;QACjB,KAAK,EAAE;YACN,IAAI,EAAE,OAAO;YACb,KAAK,EAAE,qBAAqB;SAC5B;KACD,CAAC,CAAA;AACH,CAAC;AAED,MAAM,UAAU,QAAQ,CAAmB,GAAa,EAAE,MAAS;IAClE,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;IAChB,OAAO,MAAM,CAAA;AACd,CAAC;AAED,MAAM,UAAU,cAAc;IAC7B,MAAM,IAAI,GAAG,IAAI,QAAQ,EAAE,CAAA;IAC3B,MAAM,MAAM,GAAG,IAAI,aAAa,EAAE,CAAA;IAClC,MAAM,QAAQ,GAAG,IAAI,QAAQ,CAAC,YAAY,EAAE,CAAC,CAAA;IAC7C,MAAM,KAAK,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAA;IACrD,MAAM,OAAO,GAAG,GAAG,EAAE,CAAC,QAAQ,CAAC,OAAO,CACrC,IAAI,CAAC,GAAG,EACR,KAAY,EACZ,IAAI,SAAS,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC,CAC/B,CAAA;IACD,OAAO,EAAC,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,IAAI,EAAC,CAAA;AACzC,CAAC;AAED,MAAM,UAAU,cAAc;IAC7B,MAAM,IAAI,GAAG,IAAI,QAAQ,EAAE,CAAA;IAC3B,MAAM,IAAI,GAAG,GAAG,EAAE;QACjB,MAAM,IAAI,GAAG,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC,CAAA;QACrC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;QACxB,OAAO,IAAI,CAAA;IACZ,CAAC,CAAA;IACD,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,IAAI,EAAE,EAAE,IAAI,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,CAAA;IACrD,OAAO,EAAC,GAAG,EAAE,IAAI,EAAC,CAAA;AACnB,CAAC"}
+{"version":3,"file":"testing.js","sourceRoot":"","sources":["../../../s/core/testing/testing.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,GAAG,EAAC,MAAM,eAAe,CAAA;AACjC,OAAO,EAAC,IAAI,EAAC,MAAM,gBAAgB,CAAA;AAEnC,OAAO,EAAC,UAAU,EAAO,MAAM,sBAAsB,CAAA;AACrD,OAAO,EAAC,QAAQ,EAAC,MAAM,yBAAyB,CAAA;AAChD,OAAO,EAAC,SAAS,EAAC,MAAM,2BAA2B,CAAA;AACnD,OAAO,EAAC,aAAa,EAAC,MAAM,6BAA6B,CAAA;AAEzD,MAAM,OAAO,QAAQ;IACpB,KAAK,GAAG,CAAC,CAAA;IAET,IAAI,GAAG;QACN,OAAO,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC,GAAG,CAAC,IAAI,GAAG,EAAE,CAAC,CAAA;IACpC,CAAC;CACD;AAED,MAAM,UAAU,YAAY;IAC3B,OAAO,UAAU,CAAC;QACjB,KAAK,EAAE;YACN,IAAI,EAAE,OAAO;YACb,KAAK,EAAE,qBAAqB;YAC5B,OAAO,EAAQ,CAAC,MAAM,EAAE,MAAM,EAAE,EAAC,MAAM,EAAE,CAAC,MAAM,EAAE,GAAG,CAAC,EAAC,CAAC;SACxD;KACD,CAAC,CAAA;AACH,CAAC;AAED,MAAM,UAAU,QAAQ,CAAmB,GAAa,EAAE,MAAS;IAClE,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;IAChB,OAAO,MAAM,CAAA;AACd,CAAC;AAED,MAAM,UAAU,cAAc;IAC7B,MAAM,IAAI,GAAG,IAAI,QAAQ,EAAE,CAAA;IAC3B,MAAM,MAAM,GAAG,IAAI,aAAa,EAAE,CAAA;IAClC,MAAM,QAAQ,GAAG,IAAI,QAAQ,CAAC,YAAY,EAAE,CAAC,CAAA;IAC7C,MAAM,KAAK,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAA;IACrD,MAAM,OAAO,GAAG,GAAG,EAAE,CAAC,QAAQ,CAAC,OAAO,CACrC,IAAI,CAAC,GAAG,EACR,KAAY,EACZ,IAAI,SAAS,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC,CAC/B,CAAA;IACD,OAAO,EAAC,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,IAAI,EAAC,CAAA;AACzC,CAAC;AAED,MAAM,UAAU,cAAc;IAC7B,MAAM,IAAI,GAAG,IAAI,QAAQ,EAAE,CAAA;IAC3B,MAAM,IAAI,GAAG,GAAG,EAAE;QACjB,MAAM,IAAI,GAAG,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC,CAAA;QACrC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;QACxB,OAAO,IAAI,CAAA;IACZ,CAAC,CAAA;IACD,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,IAAI,EAAE,EAAE,IAAI,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,CAAA;IACrD,OAAO,EAAC,GAAG,EAAE,IAAI,EAAC,CAAA;AACnB,CAAC"}

package/x/deck/deck.d.ts

@@ -19,10 +19,7 @@ export declare class Deck<B extends Bindings, MB extends MetaBindings = any> {
     hub: Hub<B, MB>;
     db: Db;
     static load<B extends Bindings, MB extends MetaBindings = any>(options: DeckOptions<B, MB>): Promise<Deck<B, any>>;
-    dispose: {
-        (): void;
-        schedule(fn: () => void): any;
-    };
+    dispose: import("@e280/stz").Disposer;
     deviceSkins: DeviceSkins;
     primaryDevice: PrimaryDevice;
     overlayVisibility: OverlayVisibility;

package/x/deck/parts/catalog.d.ts

@@ -1,4 +1,3 @@
-import { MapG } from "@e280/stz";
 import { MetaBindings } from "../../core/hub/types.js";
 import { Bindings } from "../../core/bindings/types.js";
 export type Profile = {
@@ -12,7 +11,7 @@ export type CatalogData = {
     metaBindings: MetaBindings | null;
 };
 export declare class Catalog {
-    profiles: MapG<string, Profile>;
+    profiles: import("@e280/stz").GMap<string, Profile>;
     portProfiles: (string | null)[];
     metaBindings: MetaBindings | null;
     constructor(data?: CatalogData);

package/x/deck/parts/db.d.ts

@@ -7,10 +7,7 @@ export declare class Db {
     private store;
     $catalog: SignalFn<Catalog>;
     static load(store: Store<CatalogData>): Promise<Db>;
-    dispose: {
-        (): void;
-        schedule(fn: () => void): any;
-    };
+    dispose: import("@e280/stz").Disposer;
     constructor(store: Store<CatalogData>, $catalog: SignalFn<Catalog>);
     reload(): Promise<void>;
     save(catalog: Catalog): Promise<void>;

package/x/deck/parts/overlay-visibility.d.ts

@@ -5,10 +5,7 @@ export declare class OverlayVisibility {
     hub: Hub<any>;
     deviceSkins: DeviceSkins;
     auto: boolean;
-    dispose: {
-        (): void;
-        schedule(fn: () => void): any;
-    };
+    dispose: import("@e280/stz").Disposer;
     /** manual override for whether the ports view should be visible */
     readonly $manual: import("@e280/strata").SignalFn<boolean>;
     /** derived signal about whether the ports view should be visible */

package/x/demo/game/game.d.ts

@@ -7,10 +7,7 @@ export declare class Game {
     deck: GameDeck;
     static load(): Promise<Game>;
     logic: Logic;
-    dispose: {
-        (): void;
-        schedule(fn: () => void): any;
-    };
+    dispose: import("@e280/stz").Disposer;
     state: State;
     renderer: Renderer;
     constructor(deck: GameDeck);