@benev/tact 0.1.0-1 → 0.1.0-2

package/s/core/testing/testing.ts

@@ -0,0 +1,50 @@
+
+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"
+
+export class TestTime {
+	frame = 0
+
+	get now() {
+		return (this.frame++) * (1000 / 60)
+	}
+}
+
+export function testBindings() {
+	return asBindings({
+		basic: {
+			jump: [{lenses: [{code: "Space"}]}],
+			shoot: [{lenses: [{code: "pointer.button.left"}]}],
+		},
+	})
+}
+
+export function testConnect<C extends Controller>(switchboard: Hub<any>, controller: C) {
+	switchboard.plug(controller)
+	return controller
+}
+
+export function testSetupAlpha() {
+	const time = new TestTime()
+	const controller = new SamplerController()
+	const port = new Port(testBindings())
+	port.modes.add("basic")
+	port.controllers.add(controller)
+	return {controller, port, time}
+}
+
+export function testSetupBravo() {
+	const time = new TestTime()
+	const port = () => {
+		const port = new Port(hubBindings(testBindings()))
+		port.modes.adds(Hub.mode, "basic")
+		return port
+	}
+	const hub = new Hub([port(), port(), port(), port()])
+	return {hub: hub, time}
+}
+

package/s/demo/main.bundle.ts

@@ -1,11 +1,11 @@
 
 import {$, view} from "@e280/sly"
 import {NubStick} from "../nubs/stick/view.js"
-import {StickDevice} from "../nubs/stick/device.js"
+import {StickController} from "../core/controllers/standard/stick.js"
 
 $.register({
 	TactDemo: view.component(use => {
-		const stick = use.once(() => new StickDevice())
+		const stick = use.once(() => new StickController())
 		return NubStick(stick)
 	}),
 })

package/s/index.ts

@@ -1,15 +1,5 @@
 
-export * from "./station/devices/infra/device.js"
-export * from "./station/devices/infra/group.js"
-export * from "./station/devices/infra/sampler.js"
-export * from "./station/devices/gamepad.js"
-export * from "./station/devices/keyboard.js"
-export * from "./station/devices/pointer.js"
-export * from "./station/parts/action.js"
-export * from "./station/utils/modprefix.js"
-export * from "./station/station.js"
-export * from "./station/switchboard.js"
-export * from "./station/types.js"
+export * from "./core/index.js"
 
 export * from "./utils/gamepads.js"
 export * from "./utils/split-axis.js"

package/s/nubs/stick/view.ts

@@ -3,14 +3,14 @@ import {html} from "lit"
 import {view} from "@e280/sly"
 import {Vec2} from "@benev/math"
 
-import {StickDevice} from "./device.js"
 import {styles} from "./styles.js"
 import {Basis} from "../stick-graphic/types/basis.js"
 import {NubStickGraphic} from "../stick-graphic/view.js"
+import {StickController} from "../../core/controllers/standard/stick.js"
 import {make_pointer_listeners} from "./utils/make_pointer_listeners.js"
 import {calculate_new_vector_from_pointer_position} from "./utils/calculate_new_vector_from_pointer_position.js"
 
-export const NubStick = view(use => (stick: StickDevice) => {
+export const NubStick = view(use => (stick: StickController) => {
 	use.name("nub-stick")
 	use.styles(styles)
 

package/s/nubs/virtual-gamepad/view.ts

@@ -6,12 +6,12 @@ import {ev, MapG} from "@e280/stz"
 import stylesCss from "./styles.css.js"
 
 import {NubStick} from "../stick/view.js"
-import {VirtualGamepadDevice} from "./device.js"
 import {GamepadInputs} from "./utils/gamepad-inputs.js"
 import {touchTracking} from "./utils/touch-tracking.js"
+import {VirtualGamepadController} from "../../core/controllers/standard/virtual-gamepad.js"
 import {preventDefaultTouchShenanigans} from "./utils/prevent-default-touch-shenanigans.js"
 
-export const VirtualGamepad = view(use => (device: VirtualGamepadDevice) => {
+export const VirtualGamepad = view(use => (controller: VirtualGamepadController) => {
 	use.name("virtual-gamepad")
 	use.css(stylesCss)
 
@@ -38,11 +38,11 @@ export const VirtualGamepad = view(use => (device: VirtualGamepadDevice) => {
 		buttons,
 		touchdown: button => {
 			const code = codes.require(button)
-			device.setSample(code, 1)
+			controller.setSample(code, 1)
 		},
 		touchup: button => {
 			const code = codes.require(button)
-			device.setSample(code, 0)
+			controller.setSample(code, 0)
 		},
 	}))
 
@@ -123,7 +123,7 @@ export const VirtualGamepad = view(use => (device: VirtualGamepadDevice) => {
 				${renderDPad()}
 				${NubStick
 					.attr("class", "stick")
-					.props(device.stickLeft)}
+					.props(controller.stickLeft)}
 			</div>
 
 			<div class="right side">
@@ -131,7 +131,7 @@ export const VirtualGamepad = view(use => (device: VirtualGamepadDevice) => {
 				${renderButtonPad()}
 				${NubStick
 					.attr("class", "stick")
-					.props(device.stickRight)}
+					.props(controller.stickRight)}
 			</div>
 		</div>
 	`

package/s/tests.test.ts

@@ -1,8 +1,6 @@
 
 import {Science} from "@e280/science"
-import station from "./station/station.test.js"
+import core from "./core/core.test.js"
 
-await Science.run({
-	station,
-})
+await Science.run({core})
 

package/s/{station/utils/tmin.ts → utils/quick-math.ts}

@@ -1,4 +1,10 @@
 
+export function tmax(values: number[]) {
+	return values.length > 0
+		? Math.max(...values)
+		: 0
+}
+
 export function tmin(values: number[]) {
 	return values.length > 0
 		? Math.min(...values)

package/x/{station → core/bindings}/types.d.ts

@@ -1,11 +1,3 @@
-import { Action } from "./parts/action.js";
-export type Actions<B extends Bindings> = {
-    [Mode in keyof B]: {
-        [K in keyof B[Mode]]: Action;
-    };
-};
-export type Sample = [code: string, value: number];
-export type SampleMap = Map<string, number>;
 export type Timing = (DirectTiming | TapTiming | HoldTiming);
 export type DirectTiming = {
     style: "direct";
@@ -28,10 +20,6 @@ export type Lens = {
     code: string;
     settings?: Partial<LensSettings>;
 };
-export type LensState = {
-    lastValue: number;
-    holdStart: number;
-};
 export type Spoon = {
     lenses: Lens[];
     required?: Lens[];
@@ -46,11 +34,11 @@ export type Bindings = {
 };
 export type AsBindings<B extends Bindings> = B;
 export declare function asBindings<B extends Bindings>(bindings: B): B;
-export declare const switchboardMode: "switchboard";
-export type AsSwitchboardBindings<B extends Bindings> = {
-    [switchboardMode]: {
+export declare const hubMode: "hub";
+export type AsHubBindings<B extends Bindings> = {
+    [hubMode]: {
         shimmyNext: Spoon[];
         shimmyPrevious: Spoon[];
     };
 } & B;
-export type SwitchboardBindings = AsSwitchboardBindings<Bindings>;
+export type HubBindings = AsHubBindings<Bindings>;

package/x/core/bindings/types.js

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

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

@@ -0,0 +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"}

package/x/core/controllers/controller.d.ts

@@ -0,0 +1,4 @@
+import { Sample } from "./types.js";
+export declare abstract class Controller {
+    abstract takeSamples(): Sample[];
+}

package/x/core/controllers/controller.js

@@ -0,0 +1,3 @@
+export class Controller {
+}
+//# sourceMappingURL=controller.js.map

package/x/core/controllers/controller.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"controller.js","sourceRoot":"","sources":["../../../s/core/controllers/controller.ts"],"names":[],"mappings":"AAGA,MAAM,OAAgB,UAAU;CAE/B"}

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

@@ -0,0 +1,7 @@
+import { SetG } from "@e280/stz";
+import { Controller } from "../controller.js";
+export declare class GroupController extends Controller {
+    controllers: SetG<Controller>;
+    constructor(...controllers: Controller[]);
+    takeSamples(): import("../types.js").Sample[];
+}

package/x/core/controllers/infra/group.js

@@ -0,0 +1,13 @@
+import { SetG } from "@e280/stz";
+import { Controller } from "../controller.js";
+export class GroupController extends Controller {
+    controllers = new SetG();
+    constructor(...controllers) {
+        super();
+        this.controllers.adds(...controllers);
+    }
+    takeSamples() {
+        return [...this.controllers].flatMap(controller => controller.takeSamples());
+    }
+}
+//# sourceMappingURL=group.js.map

package/x/core/controllers/infra/group.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"group.js","sourceRoot":"","sources":["../../../../s/core/controllers/infra/group.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,IAAI,EAAC,MAAM,WAAW,CAAA;AAC9B,OAAO,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAA;AAE3C,MAAM,OAAO,eAAgB,SAAQ,UAAU;IAC9C,WAAW,GAAG,IAAI,IAAI,EAAc,CAAA;IAEpC,YAAY,GAAG,WAAyB;QACvC,KAAK,EAAE,CAAA;QACP,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,GAAG,WAAW,CAAC,CAAA;IACtC,CAAC;IAED,WAAW;QACV,OAAO,CAAC,GAAG,IAAI,CAAC,WAAW,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,CAAC,UAAU,CAAC,WAAW,EAAE,CAAC,CAAA;IAC7E,CAAC;CACD"}

package/x/core/controllers/infra/sampler.d.ts

@@ -0,0 +1,8 @@
+import { Controller } from "../controller.js";
+import { Sample } from "../types.js";
+export declare class SamplerController extends Controller {
+    #private;
+    on: import("@e280/stz").Sub<Sample>;
+    setSample(code: string, value: number): this;
+    takeSamples(): Sample[];
+}

package/x/{station/devices → core/controllers}/infra/sampler.js

@@ -1,6 +1,6 @@
 import { sub } from "@e280/stz";
-import { Device } from "./device.js";
-export class SamplerDevice extends Device {
+import { Controller } from "../controller.js";
+export class SamplerController extends Controller {
     on = sub();
     #map = new Map();
     setSample(code, value) {

package/x/core/controllers/infra/sampler.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"sampler.js","sourceRoot":"","sources":["../../../../s/core/controllers/infra/sampler.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,GAAG,EAAC,MAAM,WAAW,CAAA;AAC7B,OAAO,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAA;AAG3C,MAAM,OAAO,iBAAkB,SAAQ,UAAU;IAChD,EAAE,GAAG,GAAG,EAAU,CAAA;IAClB,IAAI,GAAc,IAAI,GAAG,EAAE,CAAA;IAE3B,SAAS,CAAC,IAAY,EAAE,KAAa;QACpC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,KAAK,CAAC,CAAA;QAC1B,IAAI,CAAC,EAAE,CAAC,GAAG,CAAC,IAAI,EAAE,KAAK,CAAC,CAAA;QACxB,OAAO,IAAI,CAAA;IACZ,CAAC;IAED,WAAW;QACV,MAAM,OAAO,GAAG,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,CAAA;QAC9B,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,CAAA;QACjB,OAAO,OAAO,CAAA;IACf,CAAC;CACD"}

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

@@ -0,0 +1,10 @@
+import { SamplerController } from "../infra/sampler.js";
+import { Pad } from "../../../utils/gamepads.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/{station/devices → core/controllers/standard}/gamepad.js

@@ -1,7 +1,7 @@
-import { tmax } from "../utils/tmax.js";
-import { SamplerDevice } from "./infra/sampler.js";
-import { splitAxis } from "../../utils/split-axis.js";
-import { gamepads } from "../../utils/gamepads.js";
+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",
@@ -21,7 +21,7 @@ const gamepadButtonCodes = [
     "gamepad.right",
     "gamepad.gamma",
 ];
-export class GamepadDevice extends SamplerDevice {
+export class GamepadController extends SamplerController {
     pad;
     static on(fn) {
         return gamepads(pad => fn(new this(pad)));

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

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

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

@@ -0,0 +1,5 @@
+export * from "./gamepad.js";
+export * from "./keyboard.js";
+export * from "./pointer.js";
+export * from "./stick.js";
+export * from "./virtual-gamepad.js";

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

@@ -0,0 +1,6 @@
+export * from "./gamepad.js";
+export * from "./keyboard.js";
+export * from "./pointer.js";
+export * from "./stick.js";
+export * from "./virtual-gamepad.js";
+//# sourceMappingURL=index.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../s/core/controllers/standard/index.ts"],"names":[],"mappings":"AACA,cAAc,cAAc,CAAA;AAC5B,cAAc,eAAe,CAAA;AAC7B,cAAc,cAAc,CAAA;AAC5B,cAAc,YAAY,CAAA;AAC1B,cAAc,sBAAsB,CAAA"}

package/x/{station/devices → core/controllers/standard}/keyboard.d.ts

@@ -1,9 +1,9 @@
 import { Sample } from "../types.js";
-import { Device } from "./infra/device.js";
-export declare class KeyboardDevice extends Device {
+import { Controller } from "../controller.js";
+export declare class KeyboardController extends Controller {
     #private;
     on: import("@e280/stz").Sub<Sample>;
     dispose: () => void;
-    constructor(target: EventTarget);
+    constructor(target?: EventTarget);
     takeSamples(): Sample[];
 }

package/x/{station/devices → core/controllers/standard}/keyboard.js

@@ -1,11 +1,11 @@
 import { coalesce, ev, sub } from "@e280/stz";
-import { Device } from "./infra/device.js";
+import { Controller } from "../controller.js";
 import { modprefix } from "../utils/modprefix.js";
-export class KeyboardDevice extends Device {
+export class KeyboardController extends Controller {
     on = sub();
     dispose;
     #held = new Set();
-    constructor(target) {
+    constructor(target = window) {
         super();
         const down = (code) => {
             this.#held.add(code);

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

@@ -0,0 +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"}

package/x/{station/devices → core/controllers/standard}/pointer.d.ts

@@ -1,11 +1,11 @@
 import { Vec2 } from "@benev/math";
-import { SamplerDevice } from "./infra/sampler.js";
-export declare class PointerDevice extends SamplerDevice {
+import { SamplerController } from "../infra/sampler.js";
+export declare class PointerController extends SamplerController {
     client: Vec2;
     movement: Vec2;
     dispose: () => void;
+    constructor(target?: EventTarget);
     static buttonCode(event: PointerEvent): string;
     static wheelCodes(event: WheelEvent): [string, number][];
-    constructor(target: EventTarget);
     takeSamples(): import("../types.js").Sample[];
 }

package/x/{station/devices → core/controllers/standard}/pointer.js

@@ -1,35 +1,13 @@
 import { ev } from "@e280/stz";
 import { Vec2 } from "@benev/math";
 import { modprefix } from "../utils/modprefix.js";
-import { SamplerDevice } from "./infra/sampler.js";
-import { splitAxis } from "../../utils/split-axis.js";
-export class PointerDevice extends SamplerDevice {
+import { splitAxis } from "../../../utils/split-axis.js";
+import { SamplerController } from "../infra/sampler.js";
+export class PointerController extends SamplerController {
     client = new Vec2(0, 0);
     movement = new Vec2(0, 0);
     dispose;
-    static buttonCode(event) {
-        switch (event.button) {
-            case 0: return "pointer.button.left";
-            case 1: return "pointer.button.middle";
-            case 2: return "pointer.button.right";
-            default: return `pointer.button.${event.button + 1}`;
-        }
-    }
-    static wheelCodes(event) {
-        const movements = [];
-        if (event.deltaX)
-            movements.push([
-                event.deltaX > 0 ? "pointer.wheel.right" : "pointer.wheel.left",
-                event.deltaX,
-            ]);
-        if (event.deltaY)
-            movements.push([
-                event.deltaY > 0 ? "pointer.wheel.down" : "pointer.wheel.up",
-                event.deltaY,
-            ]);
-        return movements;
-    }
-    constructor(target) {
+    constructor(target = window) {
         super();
         const dispatch = (event, code, value) => {
             this.setSample(code, value);
@@ -37,11 +15,11 @@ export class PointerDevice extends SamplerDevice {
         };
         this.dispose = ev(target, {
             pointerdown: (event) => {
-                const code = PointerDevice.buttonCode(event);
+                const code = PointerController.buttonCode(event);
                 dispatch(event, code, 1);
             },
             pointerup: (event) => {
-                const code = PointerDevice.buttonCode(event);
+                const code = PointerController.buttonCode(event);
                 dispatch(event, code, 0);
             },
             pointermove: (event) => {
@@ -51,11 +29,33 @@ export class PointerDevice extends SamplerDevice {
                 this.movement.y += event.movementY;
             },
             wheel: (event) => {
-                for (const [code, value] of PointerDevice.wheelCodes(event))
+                for (const [code, value] of PointerController.wheelCodes(event))
                     dispatch(event, code, value);
             },
         });
     }
+    static buttonCode(event) {
+        switch (event.button) {
+            case 0: return "pointer.button.left";
+            case 1: return "pointer.button.middle";
+            case 2: return "pointer.button.right";
+            default: return `pointer.button.${event.button + 1}`;
+        }
+    }
+    static wheelCodes(event) {
+        const movements = [];
+        if (event.deltaX)
+            movements.push([
+                event.deltaX > 0 ? "pointer.wheel.right" : "pointer.wheel.left",
+                event.deltaX,
+            ]);
+        if (event.deltaY)
+            movements.push([
+                event.deltaY > 0 ? "pointer.wheel.down" : "pointer.wheel.up",
+                event.deltaY,
+            ]);
+        return movements;
+    }
     takeSamples() {
         const [x, y] = this.movement;
         const [left, right] = splitAxis(x);

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

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

package/x/{nubs/stick/device.d.ts → core/controllers/standard/stick.d.ts}

@@ -1,7 +1,7 @@
 import { Vec2 } from "@benev/math";
 import { Disposable } from "@e280/stz";
-import { SamplerDevice } from "../../station/devices/infra/sampler.js";
-export declare class StickDevice extends SamplerDevice implements Disposable {
+import { SamplerController } from "../infra/sampler.js";
+export declare class StickController extends SamplerController implements Disposable {
     channel: string;
     vector: import("@e280/strata").Signal<Vec2>;
     dispose: () => void;

package/x/{nubs/stick/device.js → core/controllers/standard/stick.js}

@@ -1,8 +1,8 @@
 import { Vec2 } from "@benev/math";
 import { signal } from "@e280/strata";
-import { splitAxis } from "../../utils/split-axis.js";
-import { SamplerDevice } from "../../station/devices/infra/sampler.js";
-export class StickDevice extends SamplerDevice {
+import { SamplerController } from "../infra/sampler.js";
+import { splitAxis } from "../../../utils/split-axis.js";
+export class StickController extends SamplerController {
     channel;
     vector = signal(Vec2.zero());
     dispose;
@@ -24,4 +24,4 @@ export class StickDevice extends SamplerDevice {
         return { up, down, left, right };
     }
 }
-//# sourceMappingURL=device.js.map
+//# sourceMappingURL=stick.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"stick.js","sourceRoot":"","sources":["../../../../s/core/controllers/standard/stick.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,IAAI,EAAC,MAAM,aAAa,CAAA;AAChC,OAAO,EAAC,MAAM,EAAC,MAAM,cAAc,CAAA;AAEnC,OAAO,EAAC,iBAAiB,EAAC,MAAM,qBAAqB,CAAA;AACrD,OAAO,EAAC,SAAS,EAAC,MAAM,8BAA8B,CAAA;AAEtD,MAAM,OAAO,eAAgB,SAAQ,iBAAiB;IAIlC;IAHnB,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAA;IAC5B,OAAO,CAAY;IAEnB,YAAmB,UAAU,OAAO;QACnC,KAAK,EAAE,CAAA;QADW,YAAO,GAAP,OAAO,CAAU;QAEnC,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,GAAG,EAAE;YAClC,MAAM,EAAC,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAC,GAAG,IAAI,CAAC,SAAS,EAAE,CAAA;YAChD,IAAI,CAAC,SAAS,CAAC,GAAG,OAAO,KAAK,EAAE,EAAE,CAAC,CAAA;YACnC,IAAI,CAAC,SAAS,CAAC,GAAG,OAAO,OAAO,EAAE,IAAI,CAAC,CAAA;YACvC,IAAI,CAAC,SAAS,CAAC,GAAG,OAAO,OAAO,EAAE,IAAI,CAAC,CAAA;YACvC,IAAI,CAAC,SAAS,CAAC,GAAG,OAAO,QAAQ,EAAE,KAAK,CAAC,CAAA;QAC1C,CAAC,CAAC,CAAA;IACH,CAAC;IAED,SAAS;QACR,MAAM,EAAC,CAAC,EAAE,CAAC,EAAC,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE,CAAA;QAChC,MAAM,CAAC,IAAI,EAAE,EAAE,CAAC,GAAG,SAAS,CAAC,CAAC,CAAC,CAAA;QAC/B,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,GAAG,SAAS,CAAC,CAAC,CAAC,CAAA;QAClC,OAAO,EAAC,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAC,CAAA;IAC/B,CAAC;CACD"}

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

@@ -0,0 +1,7 @@
+import { StickController } from "./stick.js";
+import { SamplerController } from "../infra/sampler.js";
+export declare class VirtualGamepadController extends SamplerController {
+    stickLeft: StickController;
+    stickRight: StickController;
+    takeSamples(): import("../types.js").Sample[];
+}

package/x/{nubs/virtual-gamepad/device.js → core/controllers/standard/virtual-gamepad.js}

@@ -1,8 +1,8 @@
-import { StickDevice } from "../stick/device.js";
-import { SamplerDevice } from "../../station/devices/infra/sampler.js";
-export class VirtualGamepadDevice extends SamplerDevice {
-    stickLeft = new StickDevice();
-    stickRight = new StickDevice();
+import { StickController } from "./stick.js";
+import { SamplerController } from "../infra/sampler.js";
+export class VirtualGamepadController extends SamplerController {
+    stickLeft = new StickController();
+    stickRight = new StickController();
     takeSamples() {
         const left = this.stickLeft.breakdown();
         this.setSample("gamepad.stick.left.up", left.up);
@@ -17,4 +17,4 @@ export class VirtualGamepadDevice extends SamplerDevice {
         return super.takeSamples();
     }
 }
-//# sourceMappingURL=device.js.map
+//# sourceMappingURL=virtual-gamepad.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"virtual-gamepad.js","sourceRoot":"","sources":["../../../../s/core/controllers/standard/virtual-gamepad.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,eAAe,EAAC,MAAM,YAAY,CAAA;AAC1C,OAAO,EAAC,iBAAiB,EAAC,MAAM,qBAAqB,CAAA;AAErD,MAAM,OAAO,wBAAyB,SAAQ,iBAAiB;IAC9D,SAAS,GAAG,IAAI,eAAe,EAAE,CAAA;IACjC,UAAU,GAAG,IAAI,eAAe,EAAE,CAAA;IAElC,WAAW;QACV,MAAM,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,SAAS,EAAE,CAAA;QACvC,IAAI,CAAC,SAAS,CAAC,uBAAuB,EAAE,IAAI,CAAC,EAAE,CAAC,CAAA;QAChD,IAAI,CAAC,SAAS,CAAC,yBAAyB,EAAE,IAAI,CAAC,IAAI,CAAC,CAAA;QACpD,IAAI,CAAC,SAAS,CAAC,yBAAyB,EAAE,IAAI,CAAC,IAAI,CAAC,CAAA;QACpD,IAAI,CAAC,SAAS,CAAC,0BAA0B,EAAE,IAAI,CAAC,KAAK,CAAC,CAAA;QAEtD,MAAM,KAAK,GAAG,IAAI,CAAC,UAAU,CAAC,SAAS,EAAE,CAAA;QACzC,IAAI,CAAC,SAAS,CAAC,wBAAwB,EAAE,KAAK,CAAC,EAAE,CAAC,CAAA;QAClD,IAAI,CAAC,SAAS,CAAC,0BAA0B,EAAE,KAAK,CAAC,IAAI,CAAC,CAAA;QACtD,IAAI,CAAC,SAAS,CAAC,0BAA0B,EAAE,KAAK,CAAC,IAAI,CAAC,CAAA;QACtD,IAAI,CAAC,SAAS,CAAC,2BAA2B,EAAE,KAAK,CAAC,KAAK,CAAC,CAAA;QAExD,OAAO,KAAK,CAAC,WAAW,EAAE,CAAA;IAC3B,CAAC;CACD"}

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

@@ -0,0 +1,2 @@
+export type Sample = [code: string, value: number];
+export type SampleMap = Map<string, number>;

package/x/core/controllers/types.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=types.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../s/core/controllers/types.ts"],"names":[],"mappings":""}

package/x/core/controllers/utils/modprefix.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"modprefix.js","sourceRoot":"","sources":["../../../../s/core/controllers/utils/modprefix.ts"],"names":[],"mappings":"AACA,MAAM,UAAU,SAAS,CAAC,KAAgD,EAAE,IAAY;IACvF,MAAM,SAAS,GAAa,EAAE,CAAA;IAE9B,IAAI,KAAK,CAAC,OAAO;QAAE,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;IACzC,IAAI,KAAK,CAAC,MAAM;QAAE,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;IACvC,IAAI,KAAK,CAAC,OAAO;QAAE,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;IACzC,IAAI,KAAK,CAAC,QAAQ;QAAE,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;IAE3C,MAAM,MAAM,GAAG,SAAS,CAAC,MAAM,GAAG,CAAC;QAClC,CAAC,CAAC,CAAC,GAAG,SAAS,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC;QAC1B,CAAC,CAAC,GAAG,CAAA;IAEN,OAAO,GAAG,MAAM,IAAI,IAAI,EAAE,CAAA;AAC3B,CAAC"}

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

@@ -0,0 +1,11 @@
+import { Science } from "@e280/science";
+declare const _default: {
+    "sample to action value": Science.Test;
+    hub: {
+        "controller inputs work": Science.Test;
+        "two controllers playing on separate ports": Science.Test;
+        "controller can shimmy": Science.Test;
+        "two controllers can share a port": Science.Test;
+    };
+};
+export default _default;