@benev/tact 0.1.0-2 → 0.1.0-3

package/s/core/deck/deck.ts

@@ -0,0 +1,40 @@
+
+import {Kv} from "@e280/kv"
+import {Hub} from "../hub/hub.js"
+import {Port} from "../port/port.js"
+import {HubFriendlyBindings} from "../hub/types.js"
+import {BindingsDepot} from "./parts/bindings-depot.js"
+
+export class Deck<B extends HubFriendlyBindings> {
+	static async load<B extends HubFriendlyBindings>(options: {
+			portCount: number
+			kv: Kv
+			bindings: B
+		}) {
+		const bindingsDepot = new BindingsDepot<B>(options.portCount, options.kv)
+		const bindings = await bindingsDepot.loadAll()
+		const ports = bindings.map(b => new Port(b))
+		const hub = new Hub<B>(ports)
+		return new this(hub, bindingsDepot)
+	}
+
+	constructor(
+		public readonly hub: Hub<B>,
+		private bindingsDepot: BindingsDepot<B>,
+	) {}
+
+	async reload() {
+		const allBindings = await this.bindingsDepot.loadAll()
+		for (const [index, bindings] of allBindings.entries()) {
+			const port = this.hub.ports.at(index)!
+			port.bindings = bindings
+		}
+	}
+
+	async save(index: number, bindings: B) {
+		const port = this.hub.ports.at(index)!
+		port.bindings = bindings
+		await this.bindingsDepot.save(index, bindings)
+	}
+}
+

package/s/core/deck/parts/bindings-depot.ts

@@ -0,0 +1,24 @@
+
+import {Kv} from "@e280/kv"
+import {deep, range} from "@e280/stz"
+import {HubFriendlyBindings} from "../../hub/types.js"
+
+export class BindingsDepot<B extends HubFriendlyBindings> {
+	#kv: Kv<B>
+
+	constructor(public readonly portCount: number, rootKv: Kv) {
+		this.#kv = rootKv.scope("bindings")
+	}
+
+	async loadAll() {
+		const indices = range(this.portCount)
+		const keys = indices.map(k => k.toString())
+		return (await this.#kv.gets(...keys))
+			.map(bindings => bindings ?? deep.clone(bindings)) as B[]
+	}
+
+	async save(index: number, bindings: B) {
+		await this.#kv.set(index.toString(), bindings)
+	}
+}
+

package/s/core/deck/parts/local-storage-kv.ts

@@ -0,0 +1,7 @@
+
+import {Kv, StorageDriver} from "@e280/kv"
+
+export function localStorageKv() {
+	return new Kv(new StorageDriver(window.localStorage))
+}
+

package/s/core/hub/bindings.ts

@@ -1,21 +1,18 @@
 
-import {Hub} from "./hub.js"
-import {AsHubBindings, Bindings} from "../bindings/types.js"
+import {HubBindings, hubMode} from "./types.js"
+
+export const hubBindings = (): HubBindings => ({
+	[hubMode]: {
+		shimmyNext: ["or",
+			"BracketRight",
+			["and", "gamepad.gamma", "gamepad.right"],
+			["and", "gamepad.gamma", "gamepad.bumper.right"],
+		],
+		shimmyPrevious: ["or",
+			"BracketLeft",
+			["and", "gamepad.gamma", "gamepad.left"],
+			["and", "gamepad.gamma", "gamepad.bumper.left"],
+		],
+	},
+})
 
-export function hubBindings<B extends Bindings>(b: B): AsHubBindings<B> {
-	return {
-		...b,
-		[Hub.mode]: {
-			shimmyNext: [
-				{lenses: [{code: "BracketRight"}]},
-				{lenses: [{code: "gamepad.right"}], required: [{code: "gamepad.gamma"}]},
-				{lenses: [{code: "gamepad.bumper.right"}], required: [{code: "gamepad.gamma"}]},
-			],
-			shimmyPrevious: [
-				{lenses: [{code: "BracketLeft"}]},
-				{lenses: [{code: "gamepad.left"}], required: [{code: "gamepad.gamma"}]},
-				{lenses: [{code: "gamepad.bumper.left"}], required: [{code: "gamepad.gamma"}]},
-			],
-		},
-	}
-}

package/s/core/hub/hub.ts

@@ -4,9 +4,9 @@ import {Scalar} from "@benev/math"
 import {Port} from "../port/port.js"
 import {hubBindings} from "./bindings.js"
 import {Controller} from "../controllers/controller.js"
-import {hubMode, HubBindings} from "../bindings/types.js"
+import {HubFriendlyBindings, hubMode} from "./types.js"
 
-export class Hub<B extends HubBindings> {
+export class Hub<B extends HubFriendlyBindings> {
 	static readonly mode = hubMode
 	static readonly bindings = hubBindings
 

package/s/core/hub/types.ts

@@ -0,0 +1,14 @@
+
+import {AsBindings, Atom, Bindings} from "../bindings/types.js"
+
+export const hubMode = "hub" as const
+
+export type HubBindings = AsBindings<{
+	[hubMode]: {
+		shimmyNext: Atom
+		shimmyPrevious: Atom
+	}
+}>
+
+export type HubFriendlyBindings = Bindings & HubBindings
+

package/s/core/index.ts

@@ -1,19 +1,21 @@
 
+export * from "./bindings/action.js"
 export * from "./bindings/types.js"
 
 export * as controllers from "./controllers/standard/index.js"
 export * from "./controllers/infra/group.js"
 export * from "./controllers/infra/sampler.js"
 export * from "./controllers/standard/index.js"
-export * from "./controllers/utils/modprefix.js"
 export * from "./controllers/controller.js"
 export * from "./controllers/types.js"
 
+export * from "./deck/parts/bindings-depot.js"
+export * from "./deck/parts/local-storage-kv.js"
+export * from "./deck/deck.js"
+
 export * from "./hub/auto-gamepads.js"
 export * from "./hub/bindings.js"
 export * from "./hub/hub.js"
 
-export * from "./port/action.js"
 export * from "./port/port.js"
-export * from "./port/types.js"
 

package/s/core/port/port.ts

@@ -1,8 +1,8 @@
 
 import {SetG} from "@e280/stz"
 import {Bindings} from "../bindings/types.js"
+import {Resolver} from "../bindings/resolver.js"
 import {SampleMap} from "../controllers/types.js"
-import {Resolver} from "./resolution/resolver.js"
 import {Controller} from "../controllers/controller.js"
 import {wipe_samples_map} from "./utils/wipe_samples_map.js"
 import {aggregate_samples_into_map} from "./utils/aggregate_samples_into_map.js"

package/s/core/testing/testing.ts

@@ -2,9 +2,9 @@
 import {Hub} from "../hub/hub.js"
 import {Port} from "../port/port.js"
 import {asBindings} from "../bindings/types.js"
-import {hubBindings} from "../hub/bindings.js"
 import {Controller} from "../controllers/controller.js"
 import {SamplerController} from "../controllers/infra/sampler.js"
+import { hubBindings } from "../hub/bindings.js"
 
 export class TestTime {
 	frame = 0
@@ -17,8 +17,8 @@ export class TestTime {
 export function testBindings() {
 	return asBindings({
 		basic: {
-			jump: [{lenses: [{code: "Space"}]}],
-			shoot: [{lenses: [{code: "pointer.button.left"}]}],
+			jump: "Space",
+			shoot: "pointer.button.left",
 		},
 	})
 }
@@ -40,11 +40,11 @@ export function testSetupAlpha() {
 export function testSetupBravo() {
 	const time = new TestTime()
 	const port = () => {
-		const port = new Port(hubBindings(testBindings()))
+		const port = new Port({...testBindings(), ...hubBindings()})
 		port.modes.adds(Hub.mode, "basic")
 		return port
 	}
 	const hub = new Hub([port(), port(), port(), port()])
-	return {hub: hub, time}
+	return {hub, time}
 }
 

package/x/core/{port → bindings}/action.js

@@ -1,4 +1,4 @@
-import { isPressed } from "./utils/is-pressed.js";
+import { isPressed } from "./parts/is-pressed.js";
 export class Action {
     #value = 0;
     #previous = 0;

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

@@ -0,0 +1 @@
+{"version":3,"file":"action.js","sourceRoot":"","sources":["../../../s/core/bindings/action.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,SAAS,EAAC,MAAM,uBAAuB,CAAA;AAE/C,MAAM,OAAO,MAAM;IAClB,MAAM,GAAG,CAAC,CAAA;IACV,SAAS,GAAG,CAAC,CAAA;IAEb,MAAM,CAAC,MAAM,CAAC,MAAc,EAAE,KAAa;QAC1C,MAAM,CAAC,SAAS,GAAG,MAAM,CAAC,MAAM,CAAA;QAChC,MAAM,CAAC,MAAM,GAAG,KAAK,CAAA;IACtB,CAAC;IAED,IAAI,KAAK,KAAK,OAAO,IAAI,CAAC,MAAM,CAAA,CAAC,CAAC;IAClC,IAAI,QAAQ,KAAK,OAAO,IAAI,CAAC,SAAS,CAAA,CAAC,CAAC;IACxC,IAAI,OAAO,KAAK,OAAO,IAAI,CAAC,MAAM,KAAK,IAAI,CAAC,SAAS,CAAA,CAAC,CAAC;IACvD,IAAI,OAAO,KAAK,OAAO,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA,CAAC,CAAC;IAC/C,IAAI,IAAI,KAAK,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA,CAAC,CAAC;IAC1E,IAAI,EAAE,KAAK,OAAO,SAAS,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA,CAAC,CAAC;CACxE"}

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

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

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

@@ -0,0 +1,23 @@
+export const defaultHoldTime = 250;
+export function defaultCodeState([, , settings]) {
+    return {
+        lastValue: 0,
+        holdStart: 0,
+        settings: defaultifyCodeSettings(settings),
+    };
+}
+function defaultCodeSettings() {
+    return {
+        scale: 1,
+        invert: false,
+        deadzone: 0.2,
+        timing: ["direct"],
+    };
+}
+function defaultifyCodeSettings(partial = {}) {
+    return {
+        ...defaultCodeSettings(),
+        ...partial,
+    };
+}
+//# sourceMappingURL=defaults.js.map

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

@@ -0,0 +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,QAAQ,EAAE,GAAG;QACb,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/parts/is-pressed.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"is-pressed.js","sourceRoot":"","sources":["../../../../s/core/bindings/parts/is-pressed.ts"],"names":[],"mappings":"AACA,MAAM,UAAU,SAAS,CAAC,KAAa;IACtC,OAAO,KAAK,GAAG,CAAC,CAAA;AACjB,CAAC"}

package/x/core/bindings/parts/lens-algo.d.ts

@@ -0,0 +1,2 @@
+import { CodeState } from "../types.js";
+export declare const lensAlgo: (now: number, state: CodeState, v: number) => number;

package/x/core/{port/resolution → bindings/parts}/lens-algo.js

@@ -1,7 +1,7 @@
 import { pipe } from "@e280/stz";
 import { Scalar } from "@benev/math";
+import { isPressed } from "./is-pressed.js";
 import { defaultHoldTime } from "./defaults.js";
-import { isPressed } from "../utils/is-pressed.js";
 export const lensAlgo = (now, state, v) => pipe(v).line(function deadzone(value) {
     if (value < state.settings.deadzone)
         return 0;
@@ -16,16 +16,16 @@ export const lensAlgo = (now, state, v) => pipe(v).line(function deadzone(value)
     return state.settings.scale * value;
 }, function timing(value) {
     const { settings } = state;
-    const holdTime = (settings.timing.style === "direct"
+    const holdTime = (settings.timing[0] === "direct"
         ? undefined
-        : settings.timing.holdTime) ?? defaultHoldTime;
+        : settings.timing[1]) ?? defaultHoldTime;
     const isFreshlyPressed = !isPressed(state.lastValue) && isPressed(value);
     const isFreshlyReleased = isPressed(state.lastValue) && !isPressed(value);
     const isHolding = (now - state.holdStart) >= holdTime;
     if (isFreshlyPressed)
         state.holdStart = now;
     state.lastValue = value;
-    switch (settings.timing.style) {
+    switch (settings.timing[0]) {
         case "direct":
             return value;
         case "tap":

package/x/core/bindings/parts/lens-algo.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"lens-algo.js","sourceRoot":"","sources":["../../../../s/core/bindings/parts/lens-algo.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,IAAI,EAAC,MAAM,WAAW,CAAA;AAC9B,OAAO,EAAC,MAAM,EAAC,MAAM,aAAa,CAAA;AAElC,OAAO,EAAC,SAAS,EAAC,MAAM,iBAAiB,CAAA;AACzC,OAAO,EAAC,eAAe,EAAC,MAAM,eAAe,CAAA;AAE7C,MAAM,CAAC,MAAM,QAAQ,GAAG,CACtB,GAAW,EACX,KAAgB,EAChB,CAAS,EACR,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAEjB,SAAS,QAAQ,CAAC,KAAK;IACtB,IAAI,KAAK,GAAG,KAAK,CAAC,QAAQ,CAAC,QAAQ;QAClC,OAAO,CAAC,CAAA;IAET,IAAI,KAAK,GAAG,CAAC;QACZ,OAAO,KAAK,CAAA;IAEb,OAAO,MAAM,CAAC,KAAK,CAClB,KAAK,EACL,KAAK,CAAC,QAAQ,CAAC,QAAQ,EAAE,CAAC,EAC1B,CAAC,EAAE,CAAC,CACJ,CAAA;AACF,CAAC,EAED,SAAS,SAAS,CAAC,KAAK;IACvB,OAAO,KAAK,CAAC,QAAQ,CAAC,MAAM;QAC3B,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC;QACZ,CAAC,CAAC,KAAK,CAAA;AACT,CAAC,EAED,SAAS,OAAO,CAAC,KAAK;IACrB,OAAO,KAAK,CAAC,QAAQ,CAAC,KAAK,GAAG,KAAK,CAAA;AACpC,CAAC,EAED,SAAS,MAAM,CAAC,KAAK;IACpB,MAAM,EAAC,QAAQ,EAAC,GAAG,KAAK,CAAA;IAExB,MAAM,QAAQ,GAAG,CAChB,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,QAAQ;QAC9B,CAAC,CAAC,SAAS;QACX,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CACrB,IAAI,eAAe,CAAA;IAEpB,MAAM,gBAAgB,GAAG,CAAC,SAAS,CAAC,KAAK,CAAC,SAAS,CAAC,IAAI,SAAS,CAAC,KAAK,CAAC,CAAA;IACxE,MAAM,iBAAiB,GAAG,SAAS,CAAC,KAAK,CAAC,SAAS,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAA;IACzE,MAAM,SAAS,GAAG,CAAC,GAAG,GAAG,KAAK,CAAC,SAAS,CAAC,IAAI,QAAQ,CAAA;IAErD,IAAI,gBAAgB;QACnB,KAAK,CAAC,SAAS,GAAG,GAAG,CAAA;IAEtB,KAAK,CAAC,SAAS,GAAG,KAAK,CAAA;IAEvB,QAAQ,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC;QAC5B,KAAK,QAAQ;YACZ,OAAO,KAAK,CAAA;QAEb,KAAK,KAAK;YACT,OAAO,CAAC,iBAAiB,IAAI,CAAC,SAAS,CAAC;gBACvC,CAAC,CAAC,CAAC;gBACH,CAAC,CAAC,CAAC,CAAA;QAEL,KAAK,MAAM;YACV,OAAO,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,SAAS,CAAC;gBACrC,CAAC,CAAC,KAAK;gBACP,CAAC,CAAC,CAAC,CAAA;QAEL;YACC,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAA;IAC5C,CAAC;AACF,CAAC,CACD,CAAA"}

package/x/core/{port/resolution → bindings}/resolver.d.ts

@@ -1,6 +1,5 @@
-import { Actions } from "../types.js";
-import { SampleMap } from "../../controllers/types.js";
-import { Bindings } from "../../bindings/types.js";
+import { SampleMap } from "../controllers/types.js";
+import { Actions, Bindings } from "./types.js";
 export declare class Resolver<B extends Bindings> {
     #private;
     readonly bindings: B;

package/x/core/bindings/resolver.js

@@ -0,0 +1,87 @@
+import { MapG, pub, obMap } from "@e280/stz";
+import { Action } from "./action.js";
+import { lensAlgo } from "./parts/lens-algo.js";
+import { tmax, tmin } from "../../utils/quick-math.js";
+import { defaultCodeState } from "./parts/defaults.js";
+export class Resolver {
+    bindings;
+    #actions;
+    #now = 0;
+    #samples = new Map();
+    #codeStates = new MapG();
+    #update = pub();
+    constructor(bindings, modes) {
+        this.bindings = bindings;
+        this.#actions = obMap(bindings, (bracket, mode) => obMap(bracket, atom => {
+            const action = new Action();
+            this.#update.subscribe(() => {
+                const value = modes.has(mode)
+                    ? this.#resolveAtom()(atom)
+                    : 0;
+                Action.update(action, value);
+            });
+            return action;
+        }));
+    }
+    poll(now, samples) {
+        this.#now = now;
+        this.#samples = samples;
+        this.#update();
+        return this.#actions;
+    }
+    #resolveCode(count, code, settings) {
+        const state = this.#codeStates.guarantee(count, () => defaultCodeState(["code", code, settings]));
+        const value = this.#samples.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);
+        }
+        else
+            switch (atom[0]) {
+                case "code": {
+                    const [, code, settings] = atom;
+                    return this.#resolveCode(context.count++, code, settings);
+                }
+                case "and": {
+                    const [, ...atoms] = atom;
+                    const values = atoms.map(resolveAtom);
+                    return tmin(values);
+                }
+                case "or": {
+                    const [, ...atoms] = atom;
+                    const values = atoms.map(resolveAtom);
+                    return tmax(values);
+                }
+                case "not": {
+                    const [, subject] = atom;
+                    const value = resolveAtom(subject);
+                    return (value > 0) ? 0 : 1;
+                }
+                case "cond": {
+                    const [, subject, guard] = atom;
+                    return (resolveAtom(guard) > 0)
+                        ? resolveAtom(subject)
+                        : 0;
+                }
+                case "mods": {
+                    const [, subject, modifiers] = atom;
+                    const maybe = (x, ...codes) => x
+                        ? ["or", ...codes]
+                        : ["not", ["or", ...codes]];
+                    const guard = resolveAtom(["cond", subject, ["and",
+                            maybe(modifiers.ctrl ?? false, "ControlLeft", "ControlRight"),
+                            maybe(modifiers.alt ?? false, "AltLeft", "AltRight"),
+                            maybe(modifiers.meta ?? false, "MetaLeft", "MetaRight"),
+                            maybe(modifiers.shift ?? false, "ShiftLeft", "ShiftRight"),
+                        ]]);
+                    return (guard > 0)
+                        ? resolveAtom(subject)
+                        : 0;
+                }
+            }
+    };
+}
+//# sourceMappingURL=resolver.js.map

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

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

package/x/core/bindings/types.d.ts

@@ -1,44 +1,38 @@
-export type Timing = (DirectTiming | TapTiming | HoldTiming);
-export type DirectTiming = {
-    style: "direct";
+import { Action } from "./action.js";
+export type Actions<B extends Bindings> = {
+    [Mode in keyof B]: {
+        [K in keyof B[Mode]]: Action;
+    };
 };
-export type TapTiming = {
-    style: "tap";
-    holdTime?: number;
+export type Bindings = {
+    [mode: string]: Bracket;
 };
-export type HoldTiming = {
-    style: "hold";
-    holdTime?: number;
+export type Bracket = {
+    [action: string]: Atom;
 };
-export type LensSettings = {
+export type AsBindings<B extends Bindings> = B;
+export declare function asBindings<B extends Bindings>(bindings: B): B;
+export type Code = ["code", string, settings?: Partial<CodeSettings>];
+export type And = ["and", ...Atom[]];
+export type Or = ["or", ...Atom[]];
+export type Not = ["not", Atom];
+export type Cond = ["cond", Atom, guard: Atom];
+export type Mods = ["mods", Atom, modifiers: Partial<Modifiers>];
+export type Atom = string | (Code | And | Or | Not | Cond | Mods);
+export type CodeSettings = {
     scale: number;
     invert: boolean;
     deadzone: number;
-    timing: Timing;
-};
-export type Lens = {
-    code: string;
-    settings?: Partial<LensSettings>;
+    timing: (["direct"] | ["tap", holdTime?: number] | ["hold", holdTime?: number]);
 };
-export type Spoon = {
-    lenses: Lens[];
-    required?: Lens[];
-    forbidden?: Lens[];
+export type CodeState = {
+    settings: CodeSettings;
+    lastValue: number;
+    holdStart: number;
 };
-export type Fork = Spoon[];
-export type Bracket = {
-    [action: string]: Spoon[];
-};
-export type Bindings = {
-    [mode: string]: Bracket;
+export type Modifiers = {
+    ctrl: boolean;
+    alt: boolean;
+    shift: boolean;
+    meta: boolean;
 };
-export type AsBindings<B extends Bindings> = B;
-export declare function asBindings<B extends Bindings>(bindings: B): B;
-export declare const hubMode: "hub";
-export type AsHubBindings<B extends Bindings> = {
-    [hubMode]: {
-        shimmyNext: Spoon[];
-        shimmyPrevious: Spoon[];
-    };
-} & B;
-export type HubBindings = AsHubBindings<Bindings>;

package/x/core/bindings/types.js

@@ -1,5 +1,4 @@
 export function asBindings(bindings) {
     return bindings;
 }
-export const hubMode = "hub";
 //# sourceMappingURL=types.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../s/core/bindings/types.ts"],"names":[],"mappings":"AAyCA,MAAM,UAAU,UAAU,CAAqB,QAAW;IACzD,OAAO,QAAQ,CAAA;AAChB,CAAC;AAED,MAAM,CAAC,MAAM,OAAO,GAAG,KAAc,CAAA"}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../s/core/bindings/types.ts"],"names":[],"mappings":"AAaA,MAAM,UAAU,UAAU,CAAqB,QAAW;IACzD,OAAO,QAAQ,CAAA;AAChB,CAAC"}

package/x/core/controllers/standard/gamepad.d.ts

@@ -1,9 +1,8 @@
-import { SamplerController } from "../infra/sampler.js";
 import { Pad } from "../../../utils/gamepads.js";
+import { SamplerController } from "../infra/sampler.js";
 export declare class GamepadController extends SamplerController {
     #private;
     pad: Pad;
-    static on(fn: (controller: GamepadController) => () => void): () => void;
     constructor(pad: Pad);
     get gamepad(): Gamepad;
     takeSamples(): import("../types.js").Sample[];

package/x/core/controllers/standard/gamepad.js

@@ -1,7 +1,6 @@
 import { tmax } from "../../../utils/quick-math.js";
 import { splitAxis } from "../../../utils/split-axis.js";
 import { SamplerController } from "../infra/sampler.js";
-import { gamepads } from "../../../utils/gamepads.js";
 const gamepadButtonCodes = [
     "gamepad.a",
     "gamepad.b",
@@ -23,9 +22,6 @@ const gamepadButtonCodes = [
 ];
 export class GamepadController extends SamplerController {
     pad;
-    static on(fn) {
-        return gamepads(pad => fn(new this(pad)));
-    }
     constructor(pad) {
         super();
         this.pad = pad;

package/x/core/controllers/standard/gamepad.js.map

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

package/x/core/controllers/standard/keyboard.js

@@ -1,6 +1,5 @@
 import { coalesce, ev, sub } from "@e280/stz";
 import { Controller } from "../controller.js";
-import { modprefix } from "../utils/modprefix.js";
 export class KeyboardController extends Controller {
     on = sub();
     dispose;
@@ -20,11 +19,9 @@ export class KeyboardController extends Controller {
                 if (event.repeat)
                     return;
                 down(event.code);
-                down(modprefix(event, event.code));
             },
             keyup: (event) => {
                 up(event.code);
-                up(modprefix(event, event.code));
             },
         }), ev(window, {
             blur: () => {

package/x/core/controllers/standard/keyboard.js.map

@@ -1 +1 @@
-{"version":3,"file":"keyboard.js","sourceRoot":"","sources":["../../../../s/core/controllers/standard/keyboard.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,QAAQ,EAAE,EAAE,EAAE,GAAG,EAAC,MAAM,WAAW,CAAA;AAE3C,OAAO,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAA;AAC3C,OAAO,EAAC,SAAS,EAAC,MAAM,uBAAuB,CAAA;AAE/C,MAAM,OAAO,kBAAmB,SAAQ,UAAU;IACjD,EAAE,GAAG,GAAG,EAAU,CAAA;IAClB,OAAO,CAAY;IACnB,KAAK,GAAG,IAAI,GAAG,EAAU,CAAA;IAEzB,YAAY,SAAsB,MAAM;QACvC,KAAK,EAAE,CAAA;QAEP,MAAM,IAAI,GAAG,CAAC,IAAY,EAAE,EAAE;YAC7B,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;YACpB,IAAI,CAAC,EAAE,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC,CAAA;QACrB,CAAC,CAAA;QAED,MAAM,EAAE,GAAG,CAAC,IAAY,EAAE,EAAE;YAC3B,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;YACvB,IAAI,CAAC,EAAE,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC,CAAA;QACrB,CAAC,CAAA;QAED,IAAI,CAAC,OAAO,GAAG,QAAQ,CACtB,EAAE,CAAC,MAAM,EAAE;YACV,OAAO,EAAE,CAAC,KAAoB,EAAE,EAAE;gBACjC,IAAI,KAAK,CAAC,MAAM;oBAAE,OAAM;gBACxB,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;gBAChB,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC,CAAA;YACnC,CAAC;YACD,KAAK,EAAE,CAAC,KAAoB,EAAE,EAAE;gBAC/B,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;gBACd,EAAE,CAAC,SAAS,CAAC,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC,CAAA;YACjC,CAAC;SACD,CAAC,EAEF,EAAE,CAAC,MAAM,EAAE;YACV,IAAI,EAAE,GAAG,EAAE;gBACV,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,KAAK;oBAC5B,IAAI,CAAC,EAAE,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC,CAAA;gBACrB,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,CAAA;YACnB,CAAC;SACD,CAAC,CACF,CAAA;IACF,CAAC;IAED,WAAW;QACV,OAAO,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC;aACpB,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,CAAW,CAAC,CAAA;IACnC,CAAC;CACD"}
+{"version":3,"file":"keyboard.js","sourceRoot":"","sources":["../../../../s/core/controllers/standard/keyboard.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,QAAQ,EAAE,EAAE,EAAE,GAAG,EAAC,MAAM,WAAW,CAAA;AAE3C,OAAO,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAA;AAE3C,MAAM,OAAO,kBAAmB,SAAQ,UAAU;IACjD,EAAE,GAAG,GAAG,EAAU,CAAA;IAClB,OAAO,CAAY;IACnB,KAAK,GAAG,IAAI,GAAG,EAAU,CAAA;IAEzB,YAAY,SAAsB,MAAM;QACvC,KAAK,EAAE,CAAA;QAEP,MAAM,IAAI,GAAG,CAAC,IAAY,EAAE,EAAE;YAC7B,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;YACpB,IAAI,CAAC,EAAE,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC,CAAA;QACrB,CAAC,CAAA;QAED,MAAM,EAAE,GAAG,CAAC,IAAY,EAAE,EAAE;YAC3B,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;YACvB,IAAI,CAAC,EAAE,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC,CAAA;QACrB,CAAC,CAAA;QAED,IAAI,CAAC,OAAO,GAAG,QAAQ,CACtB,EAAE,CAAC,MAAM,EAAE;YACV,OAAO,EAAE,CAAC,KAAoB,EAAE,EAAE;gBACjC,IAAI,KAAK,CAAC,MAAM;oBAAE,OAAM;gBACxB,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;YACjB,CAAC;YACD,KAAK,EAAE,CAAC,KAAoB,EAAE,EAAE;gBAC/B,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;YACf,CAAC;SACD,CAAC,EAEF,EAAE,CAAC,MAAM,EAAE;YACV,IAAI,EAAE,GAAG,EAAE;gBACV,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,KAAK;oBAC5B,IAAI,CAAC,EAAE,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC,CAAA;gBACrB,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,CAAA;YACnB,CAAC;SACD,CAAC,CACF,CAAA;IACF,CAAC;IAED,WAAW;QACV,OAAO,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC;aACpB,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,CAAW,CAAC,CAAA;IACnC,CAAC;CACD"}

package/x/core/controllers/standard/pointer.js

@@ -1,6 +1,5 @@
 import { ev } from "@e280/stz";
 import { Vec2 } from "@benev/math";
-import { modprefix } from "../utils/modprefix.js";
 import { splitAxis } from "../../../utils/split-axis.js";
 import { SamplerController } from "../infra/sampler.js";
 export class PointerController extends SamplerController {
@@ -9,18 +8,14 @@ export class PointerController extends SamplerController {
     dispose;
     constructor(target = window) {
         super();
-        const dispatch = (event, code, value) => {
-            this.setSample(code, value);
-            this.setSample(modprefix(event, code), value);
-        };
         this.dispose = ev(target, {
             pointerdown: (event) => {
                 const code = PointerController.buttonCode(event);
-                dispatch(event, code, 1);
+                this.setSample(code, 1);
             },
             pointerup: (event) => {
                 const code = PointerController.buttonCode(event);
-                dispatch(event, code, 0);
+                this.setSample(code, 0);
             },
             pointermove: (event) => {
                 this.client.x = event.clientX;
@@ -30,7 +25,7 @@ export class PointerController extends SamplerController {
             },
             wheel: (event) => {
                 for (const [code, value] of PointerController.wheelCodes(event))
-                    dispatch(event, code, value);
+                    this.setSample(code, value);
             },
         });
     }

package/x/core/controllers/standard/pointer.js.map

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

package/x/core/deck/deck.d.ts

@@ -0,0 +1,16 @@
+import { Kv } from "@e280/kv";
+import { Hub } from "../hub/hub.js";
+import { HubFriendlyBindings } from "../hub/types.js";
+import { BindingsDepot } from "./parts/bindings-depot.js";
+export declare class Deck<B extends HubFriendlyBindings> {
+    readonly hub: Hub<B>;
+    private bindingsDepot;
+    static load<B extends HubFriendlyBindings>(options: {
+        portCount: number;
+        kv: Kv;
+        bindings: B;
+    }): Promise<Deck<B>>;
+    constructor(hub: Hub<B>, bindingsDepot: BindingsDepot<B>);
+    reload(): Promise<void>;
+    save(index: number, bindings: B): Promise<void>;
+}