@benev/tact 0.4.0-0 → 0.4.0-2

package/x/lib/input/evaluate/evaluate.js

@@ -1,21 +1,23 @@
 import { remap } from "@benev/math";
-import { arraylimit, guarantee, isNumber, isString } from "@e280/stz";
+import { arraylimit, guarantee, isHappy, isNumber, isString } from "@e280/stz";
 import { isDown } from "../utils/is-down.js";
-export function evaluate(context, id, expression) {
-    const e = (expression) => evaluate(context, id, expression);
+export function evaluate(context, expression) {
+    const e = (expression) => evaluate(context, expression);
+    if (expression === null)
+        return 0;
     if (isNumber(expression))
         return expression;
-    else if (isString(expression))
-        return context.latestValues.get(expression) ?? 0;
+    else if (isString(expression)) {
+        const latest = context.latestValues.get(expression) ?? 0;
+        return context.recentSamples
+            .filter(s => s.code === expression)
+            .reduce((peak, s) => Math.abs(s.value) > Math.abs(peak)
+            ? s.value
+            : peak, latest);
+    }
     else
         switch (expression[0]) {
             case "accumulate": {
-                const subexpression = expression[1];
-                const total = (context.accumulated.get(expression) ?? 0) + e(subexpression);
-                context.accumulated.set(expression, total);
-                return total;
-            }
-            case "sum": {
                 const code = expression[1];
                 let x = 0;
                 for (const sample of context.recentSamples) {
@@ -64,7 +66,7 @@ export function evaluate(context, id, expression) {
                 const [, condition, yes, no] = expression;
                 return e(condition)
                     ? e(yes)
-                    : (no ? e(no) : 0);
+                    : (isHappy(no) ? e(no) : 0);
             }
             case "min":
                 return Math.min(...expression.slice(1).map(e));
@@ -94,14 +96,23 @@ export function evaluate(context, id, expression) {
                 return +(e(expression[1]) === 0);
             case "!!":
                 return +(e(expression[1]) !== 0);
+            case "-": {
+                const [, first, ...rest] = expression;
+                if (rest.length === 0)
+                    return -e(first);
+                let value = e(first);
+                for (const neg of rest)
+                    value -= e(neg);
+                return value;
+            }
             case "clamp": {
                 const [, min, max, expr] = expression;
                 const value = e(expr);
                 return Math.min(max === null ? Infinity : e(max), Math.max(min === null ? -Infinity : e(min), value));
             }
             case "remap": {
-                const [, a, b, c, d, expr] = expression;
-                return remap(e(expr), e(a), e(b), e(c), e(d));
+                const [a, b, c, d, value] = expression.slice(1).map(e);
+                return remap(value, a, b, c, d);
             }
             case "dt":
                 return context.dt;
@@ -140,6 +151,23 @@ export function evaluate(context, id, expression) {
                 }
                 return 0;
             }
+            case "mod": {
+                const [, ...modifiers] = expression;
+                const down = (code) => isDown(context.latestValues.get(code) ?? 0);
+                const shift = down("ShiftLeft") || down("ShiftRight");
+                const ctrl = down("ControlLeft") || down("ControlRight");
+                const alt = down("AltLeft") || down("AltRight");
+                const meta = down("MetaLeft") || down("MetaRight");
+                if (modifiers.includes("shift") !== shift)
+                    return 0;
+                if (modifiers.includes("ctrl") !== ctrl)
+                    return 0;
+                if (modifiers.includes("alt") !== alt)
+                    return 0;
+                if (modifiers.includes("meta") !== meta)
+                    return 0;
+                return 1;
+            }
             default:
                 throw new Error("unknown expression");
         }

package/x/lib/input/evaluate/evaluate.js.map

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

package/x/lib/input/expression.d.ts

@@ -1 +1 @@
-export type Expression = (number | ["accumulate", Expression] | string | ["sum", string] | ["up", string] | ["down", string] | ["was", string] | ["since", string] | ["if", condition: Expression, yes: Expression, no?: Expression] | ["min", ...Expression[]] | ["max", ...Expression[]] | ["+", ...Expression[]] | ["*", ...Expression[]] | ["==", Expression, Expression] | ["!=", Expression, Expression] | [">", Expression, Expression] | ["<", Expression, Expression] | [">=", Expression, Expression] | ["<=", Expression, Expression] | ["!", Expression] | ["!!", Expression] | ["clamp", low: Expression | null, high: Expression | null, subject: Expression] | ["remap", inLow: Expression, inHigh: Expression, outLow: Expression, outHigh: Expression, subject: Expression] | ["dt"] | ["held", ms: number, Expression] | ["taps", taps: number, ms: number, Expression]);
+export type Expression = (null | number | string | ["accumulate", string] | ["up", string] | ["down", string] | ["was", string] | ["since", string] | ["if", condition: Expression, yes: Expression, no?: Expression | null] | ["min", ...Expression[]] | ["max", ...Expression[]] | ["+", ...Expression[]] | ["*", ...Expression[]] | ["mod", ...("shift" | "ctrl" | "meta" | "alt")[]] | ["==", Expression, Expression] | ["!=", Expression, Expression] | [">", Expression, Expression] | ["<", Expression, Expression] | [">=", Expression, Expression] | ["<=", Expression, Expression] | ["!", Expression] | ["!!", Expression] | ["-", Expression, ...Expression[]] | ["clamp", low: Expression | null, high: Expression | null, subject: Expression] | ["remap", inLow: Expression, inHigh: Expression, outLow: Expression, outHigh: Expression, subject: Expression] | ["dt"] | ["held", ms: number, Expression] | ["taps", taps: number, ms: number, Expression]);

package/x/lib/input/investigate/is-expression.js

@@ -1,5 +1,7 @@
 import { isArray, isNumber, isString } from "@e280/stz";
 export function isExpression(b) {
+    if (b === null)
+        return true;
     if (isString(b))
         return true;
     if (isNumber(b))

package/x/lib/input/investigate/is-expression.js.map

@@ -1 +1 @@
-{"version":3,"file":"is-expression.js","sourceRoot":"","sources":["../../../../s/lib/input/investigate/is-expression.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAC,MAAM,WAAW,CAAA;AAIrD,MAAM,UAAU,YAAY,CAAC,CAAW;IACvC,IAAI,QAAQ,CAAC,CAAC,CAAC;QAAE,OAAO,IAAI,CAAA;IAC5B,IAAI,QAAQ,CAAC,CAAC,CAAC;QAAE,OAAO,IAAI,CAAA;IAC5B,IAAI,OAAO,CAAC,CAAC,CAAC;QAAE,OAAO,IAAI,CAAA;IAC3B,OAAO,KAAK,CAAA;AACb,CAAC"}
+{"version":3,"file":"is-expression.js","sourceRoot":"","sources":["../../../../s/lib/input/investigate/is-expression.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAC,MAAM,WAAW,CAAA;AAIrD,MAAM,UAAU,YAAY,CAAC,CAAW;IACvC,IAAI,CAAC,KAAK,IAAI;QAAE,OAAO,IAAI,CAAA;IAC3B,IAAI,QAAQ,CAAC,CAAC,CAAC;QAAE,OAAO,IAAI,CAAA;IAC5B,IAAI,QAAQ,CAAC,CAAC,CAAC;QAAE,OAAO,IAAI,CAAA;IAC5B,IAAI,OAAO,CAAC,CAAC,CAAC;QAAE,OAAO,IAAI,CAAA;IAC3B,OAAO,KAAK,CAAA;AACb,CAAC"}

package/x/lib/input/investigate/make-input.js

@@ -1,8 +1,4 @@
 export function makeInput() {
-    return {
-        value: 0,
-        was: 0,
-        delta: 0,
-    };
+    return { value: 0, was: 0, sum: 0 };
 }
 //# sourceMappingURL=make-input.js.map

package/x/lib/input/investigate/make-input.js.map

@@ -1 +1 @@
-{"version":3,"file":"make-input.js","sourceRoot":"","sources":["../../../../s/lib/input/investigate/make-input.ts"],"names":[],"mappings":"AAGA,MAAM,UAAU,SAAS;IACxB,OAAO;QACN,KAAK,EAAE,CAAC;QACR,GAAG,EAAE,CAAC;QACN,KAAK,EAAE,CAAC;KACR,CAAA;AACF,CAAC"}
+{"version":3,"file":"make-input.js","sourceRoot":"","sources":["../../../../s/lib/input/investigate/make-input.ts"],"names":[],"mappings":"AAGA,MAAM,UAAU,SAAS;IACxB,OAAO,EAAC,KAAK,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,EAAC,CAAA;AAClC,CAAC"}

package/x/lib/input/sources/gamepad.js

@@ -1,5 +1,4 @@
 import { PlainSource } from "./plain.js";
-import { splitAxis } from "../utils/split-axis.js";
 export class GamepadSource extends PlainSource {
     pad;
     #values = new Map();
@@ -26,19 +25,14 @@ export class GamepadSource extends PlainSource {
         let any = 0;
         for (const [index, button] of gamepad.buttons.entries()) {
             const value = button.value;
-            const i = index + 1;
-            this.#publish(`gamepad.button.${i}`, value);
+            this.#publish(`gamepad.${index + 1}`, value);
             any = Math.max(any, value);
         }
-        this.#publish("gamepad.button.any", any);
+        this.#publish("gamepad.any", any >= 0.9 ? 1 : 0);
     }
     #pollAxes(gamepad) {
         for (const [index, value] of gamepad.axes.entries()) {
-            const i = index + 1;
-            const [pos, neg] = splitAxis(value);
-            this.#publish(`gamepad.axis.${i}`, value);
-            this.#publish(`gamepad.axis.${i}.neg`, neg);
-            this.#publish(`gamepad.axis.${i}.pos`, pos);
+            this.#publish(`gamepad.axis.${index + 1}`, value);
         }
     }
 }

package/x/lib/input/sources/gamepad.js.map

@@ -1 +1 @@
-{"version":3,"file":"gamepad.js","sourceRoot":"","sources":["../../../../s/lib/input/sources/gamepad.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,WAAW,EAAC,MAAM,YAAY,CAAA;AAEtC,OAAO,EAAC,SAAS,EAAC,MAAM,wBAAwB,CAAA;AAEhD,MAAM,OAAO,aAAc,SAAQ,WAAW;IAG1B,GAAG;IAFtB,OAAO,GAAG,IAAI,GAAG,EAAkB,CAAA;IAEnC,YAAmB,GAAQ;QAC1B,KAAK,EAAE,CAAA;mBADW,GAAG;IAEtB,CAAC;IAED,IAAI,OAAO;QACV,OAAO,IAAI,CAAC,GAAG,CAAC,OAAO,CAAA;IACxB,CAAC;IAED,IAAI;QACH,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAA;QAC5B,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,CAAA;QAC1B,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAA;IACxB,CAAC;IAED,QAAQ,CAAC,IAAY,EAAE,KAAa;QACnC,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QAE5C,IAAI,KAAK,KAAK,QAAQ,EAAE,CAAC;YACxB,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,EAAE,KAAK,CAAC,CAAA;YAC7B,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAC,IAAI,EAAE,KAAK,EAAC,CAAC,CAAA;QACrC,CAAC;IACF,CAAC;IAED,YAAY,CAAC,OAAgB;QAC5B,IAAI,GAAG,GAAG,CAAC,CAAA;QAEX,KAAK,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,IAAI,OAAO,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC;YACzD,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAA;YAC1B,MAAM,CAAC,GAAG,KAAK,GAAG,CAAC,CAAA;YACnB,IAAI,CAAC,QAAQ,CAAC,kBAAkB,CAAC,EAAE,EAAE,KAAK,CAAC,CAAA;YAC3C,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,CAAC,CAAA;QAC3B,CAAC;QAED,IAAI,CAAC,QAAQ,CAAC,oBAAoB,EAAE,GAAG,CAAC,CAAA;IACzC,CAAC;IAED,SAAS,CAAC,OAAgB;QACzB,KAAK,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,IAAI,OAAO,CAAC,IAAI,CAAC,OAAO,EAAE,EAAE,CAAC;YACrD,MAAM,CAAC,GAAG,KAAK,GAAG,CAAC,CAAA;YACnB,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,GAAG,SAAS,CAAC,KAAK,CAAC,CAAA;YACnC,IAAI,CAAC,QAAQ,CAAC,gBAAgB,CAAC,EAAE,EAAE,KAAK,CAAC,CAAA;YACzC,IAAI,CAAC,QAAQ,CAAC,gBAAgB,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;YAC3C,IAAI,CAAC,QAAQ,CAAC,gBAAgB,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;QAC5C,CAAC;IACF,CAAC;CACD"}
+{"version":3,"file":"gamepad.js","sourceRoot":"","sources":["../../../../s/lib/input/sources/gamepad.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,WAAW,EAAC,MAAM,YAAY,CAAA;AAGtC,MAAM,OAAO,aAAc,SAAQ,WAAW;IAG1B,GAAG;IAFtB,OAAO,GAAG,IAAI,GAAG,EAAkB,CAAA;IAEnC,YAAmB,GAAQ;QAC1B,KAAK,EAAE,CAAA;mBADW,GAAG;IAEtB,CAAC;IAED,IAAI,OAAO;QACV,OAAO,IAAI,CAAC,GAAG,CAAC,OAAO,CAAA;IACxB,CAAC;IAED,IAAI;QACH,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAA;QAC5B,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,CAAA;QAC1B,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAA;IACxB,CAAC;IAED,QAAQ,CAAC,IAAY,EAAE,KAAa;QACnC,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QAE5C,IAAI,KAAK,KAAK,QAAQ,EAAE,CAAC;YACxB,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,EAAE,KAAK,CAAC,CAAA;YAC7B,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAC,IAAI,EAAE,KAAK,EAAC,CAAC,CAAA;QACrC,CAAC;IACF,CAAC;IAED,YAAY,CAAC,OAAgB;QAC5B,IAAI,GAAG,GAAG,CAAC,CAAA;QAEX,KAAK,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,IAAI,OAAO,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC;YACzD,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAA;YAC1B,IAAI,CAAC,QAAQ,CAAC,WAAW,KAAK,GAAG,CAAC,EAAE,EAAE,KAAK,CAAC,CAAA;YAC5C,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,CAAC,CAAA;QAC3B,CAAC;QAED,IAAI,CAAC,QAAQ,CAAC,aAAa,EAAE,GAAG,IAAI,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;IACjD,CAAC;IAED,SAAS,CAAC,OAAgB;QACzB,KAAK,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,IAAI,OAAO,CAAC,IAAI,CAAC,OAAO,EAAE,EAAE,CAAC;YACrD,IAAI,CAAC,QAAQ,CAAC,gBAAgB,KAAK,GAAG,CAAC,EAAE,EAAE,KAAK,CAAC,CAAA;QAClD,CAAC;IACF,CAAC;CACD"}

package/x/lib/input/sources/pointer.js

@@ -1,7 +1,6 @@
 import { ev } from "@e280/stz";
 import { Vec2 } from "@benev/math";
 import { PlainSource } from "./plain.js";
-import { splitAxis } from "../utils/split-axis.js";
 import { mouseButton } from "../utils/mouse-button.js";
 export class PointerSource extends PlainSource {
     client = new Vec2();
@@ -18,36 +17,16 @@ export class PointerSource extends PlainSource {
         },
         pointermove: ({ clientX, clientY, movementX, movementY }) => {
             this.client.set_(clientX, clientY);
-            const [xPos, xNeg] = splitAxis(movementX);
-            const [yPos, yNeg] = splitAxis(movementY);
             if (movementX)
                 this.onSample.publish({ code: "pointer.x", value: movementX });
-            if (xPos)
-                this.onSample.publish({ code: "pointer.x.pos", value: xPos });
-            if (xNeg)
-                this.onSample.publish({ code: "pointer.x.neg", value: xNeg });
             if (movementY)
                 this.onSample.publish({ code: "pointer.y", value: movementY });
-            if (yPos)
-                this.onSample.publish({ code: "pointer.y.pos", value: yPos });
-            if (yNeg)
-                this.onSample.publish({ code: "pointer.y.neg", value: yNeg });
         },
         wheel: ({ deltaX, deltaY }) => {
-            const [xPos, xNeg] = splitAxis(deltaX);
-            const [yPos, yNeg] = splitAxis(deltaY);
             if (deltaX)
                 this.onSample.publish({ code: "pointer.wheel.x", value: deltaX });
-            if (xPos)
-                this.onSample.publish({ code: "pointer.wheel.x.pos", value: xPos });
-            if (xNeg)
-                this.onSample.publish({ code: "pointer.wheel.x.neg", value: xNeg });
             if (deltaY)
                 this.onSample.publish({ code: "pointer.wheel.y", value: deltaY });
-            if (yPos)
-                this.onSample.publish({ code: "pointer.wheel.y.pos", value: yPos });
-            if (yNeg)
-                this.onSample.publish({ code: "pointer.wheel.y.neg", value: yNeg });
         },
     };
 }

package/x/lib/input/sources/pointer.js.map

@@ -1 +1 @@
-{"version":3,"file":"pointer.js","sourceRoot":"","sources":["../../../../s/lib/input/sources/pointer.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"pointer.js","sourceRoot":"","sources":["../../../../s/lib/input/sources/pointer.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,EAAE,EAAC,MAAM,WAAW,CAAA;AAC5B,OAAO,EAAC,IAAI,EAAC,MAAM,aAAa,CAAA;AAChC,OAAO,EAAC,WAAW,EAAC,MAAM,YAAY,CAAA;AACtC,OAAO,EAAC,WAAW,EAAC,MAAM,0BAA0B,CAAA;AAEpD,MAAM,OAAO,aAAc,SAAQ,WAAW;IAC7C,MAAM,GAAG,IAAI,IAAI,EAAE,CAAA;IAEnB,YAAY,MAAM,GAAgB,MAAM;QACvC,KAAK,EAAE,CAAA;QACP,IAAI,CAAC,OAAO,CAAC,QAAQ,CACpB,EAAE,CAAC,MAAM,EAAE,IAAI,CAAC,UAAU,CAAC,CAC3B,CAAA;IACF,CAAC;IAED,UAAU,GAAG;QACZ,WAAW,EAAE,CAAC,KAAmB,EAAE,EAAE;YACpC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAC,IAAI,EAAE,WAAW,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,CAAC,EAAC,CAAC,CAAA;QACnE,CAAC;QAED,SAAS,EAAE,CAAC,KAAmB,EAAE,EAAE;YAClC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAC,IAAI,EAAE,WAAW,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,CAAC,EAAC,CAAC,CAAA;QACnE,CAAC;QAED,WAAW,EAAE,CAAC,EAAC,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,SAAS,EAAe,EAAE,EAAE;YACvE,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,OAAO,CAAC,CAAA;YAClC,IAAI,SAAS;gBAAE,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAC,IAAI,EAAE,WAAW,EAAE,KAAK,EAAE,SAAS,EAAC,CAAC,CAAA;YAC3E,IAAI,SAAS;gBAAE,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAC,IAAI,EAAE,WAAW,EAAE,KAAK,EAAE,SAAS,EAAC,CAAC,CAAA;QAC5E,CAAC;QAED,KAAK,EAAE,CAAC,EAAC,MAAM,EAAE,MAAM,EAAa,EAAE,EAAE;YACvC,IAAI,MAAM;gBAAE,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAC,IAAI,EAAE,iBAAiB,EAAE,KAAK,EAAE,MAAM,EAAC,CAAC,CAAA;YAC3E,IAAI,MAAM;gBAAE,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAC,IAAI,EAAE,iBAAiB,EAAE,KAAK,EAAE,MAAM,EAAC,CAAC,CAAA;QAC5E,CAAC;KACD,CAAA;CACD"}

package/x/lib/input/test.d.ts

@@ -0,0 +1,18 @@
+declare const _default: {
+    parcel: {
+        parcel: {
+            roundtrip: import("@e280/science").Test;
+        };
+    };
+    roundtrip: import("@e280/science").Test;
+    "update bindings": import("@e280/science").Test;
+    "incompatible bindings throws an error": import("@e280/science").Test;
+    "rapid transitions": import("@e280/science").Test;
+    "quick tap controller-level": import("@e280/science").Test;
+    "quick tap decoder-level": import("@e280/science").Test;
+    "double tap in one frame": import("@e280/science").Test;
+    "held across empty frames": import("@e280/science").Test;
+    "taps and holds coexist": import("@e280/science").Test;
+    "independent controller consumers": import("@e280/science").Test;
+};
+export default _default;

package/x/lib/input/test.js

@@ -0,0 +1,143 @@
+import { expect, suite, test } from "@e280/science";
+import { asBindings } from "./types.js";
+import { Controller } from "./controller.js";
+import { PlainSource } from "./sources/plain.js";
+import { quickbind } from "./testing/quickbind.js";
+import parcel from "./data/test.js";
+export default suite({
+    parcel,
+    "roundtrip": test(async () => {
+        const { sample, solve } = quickbind("KeyE");
+        sample({ code: "KeyE", value: 0 });
+        expect(solve().value).is(0);
+        sample({ code: "KeyE", value: 1 });
+        const inputs = solve();
+        expect(inputs.value).is(1);
+        expect(inputs.was).is(0);
+    }),
+    "update bindings": test(async () => {
+        const { sample, solve, controller } = quickbind("KeyA");
+        sample({ code: "KeyA", value: 1 });
+        expect(solve().value).is(1);
+        sample({ code: "KeyA", value: 0 });
+        expect(solve().value).is(0);
+        controller.bindings = "KeyB";
+        expect(controller.bindings).is("KeyB");
+        sample({ code: "KeyA", value: 1 });
+        expect(solve().value).is(0);
+        sample({ code: "KeyA", value: 0 });
+        sample({ code: "KeyB", value: 1 });
+        expect(solve().value).is(1);
+    }),
+    "incompatible bindings throws an error": test(async () => {
+        const { controller } = quickbind({ alpha: "KeyA" });
+        expect(() => controller.bindings = { bravo: "KeyA" }).throws();
+    }),
+    "rapid transitions": test(async () => {
+        const { sample, solve } = quickbind({
+            key: "KeyE",
+            downs: ["down", "KeyE"],
+            ups: ["up", "KeyE"],
+        });
+        for (const value of [1, 0, 1, 0, 1])
+            sample({ code: "KeyE", value });
+        let inputs = solve();
+        expect(inputs.key.value).is(1);
+        expect(inputs.downs.value).is(3);
+        expect(inputs.ups.value).is(2);
+        inputs = solve();
+        expect(inputs.key.value).is(1);
+        expect(inputs.downs.value).is(0);
+        expect(inputs.ups.value).is(0);
+    }),
+    "quick tap controller-level": test(async () => {
+        const { sample, solve, inputs } = quickbind("KeyE");
+        solve();
+        expect(inputs.sum).is(0);
+        for (const value of [0, 1, 0])
+            sample({ code: "KeyE", value });
+        solve();
+        expect(inputs.sum).is(1);
+        solve();
+        expect(inputs.sum).is(0);
+    }),
+    "quick tap decoder-level": test(async () => {
+        const { sample, solve, controller, decoder, inputs } = quickbind("KeyE");
+        solve();
+        expect(inputs.sum).is(0);
+        const datas = [];
+        for (const value of [0, 1, 0]) {
+            sample({ code: "KeyE", value });
+            datas.push(controller.encode());
+        }
+        decoder.decode(...datas);
+        expect(inputs.sum).is(1);
+        solve();
+        expect(inputs.sum).is(0);
+    }),
+    "double tap in one frame": test(async () => {
+        const { sample, solve } = quickbind(["taps", 2, 300, ["down", "KeyE"]]);
+        for (const value of [1, 0, 1, 0])
+            sample({ code: "KeyE", value });
+        expect(solve(100).value).is(1);
+        expect(solve(200).value).is(0);
+    }),
+    "held across empty frames": test(async () => {
+        const { sample, solve } = quickbind(["held", 300, "KeyE"]);
+        solve(0);
+        sample({ code: "KeyE", value: 1 });
+        expect(solve(100).value).is(0);
+        expect(solve(399).value).is(0);
+        expect(solve(400).value).is(1);
+        expect(solve(500).value).is(1);
+        sample({ code: "KeyE", value: 0 });
+        expect(solve(501).value).is(0);
+        sample({ code: "KeyE", value: 1 });
+        expect(solve(600).value).is(0);
+        expect(solve(900).value).is(1);
+    }),
+    "taps and holds coexist": test(async () => {
+        const { sample, solve } = quickbind({
+            tapper: ["taps", 1, 10, ["down", "KeyE"]],
+            holder: ["held", 10, "KeyE"],
+        });
+        solve(0);
+        sample({ code: "KeyE", value: 1 });
+        expect(solve(1).tapper.value).is(1);
+        sample({ code: "KeyE", value: 0 });
+        const released = solve(2);
+        expect(released.tapper.value).is(0);
+        expect(released.holder.value).is(0);
+        sample({ code: "KeyE", value: 1 });
+        const pressed = solve(3);
+        expect(pressed.tapper.value).is(1);
+        expect(pressed.holder.value).is(0);
+        const holding = solve(13);
+        expect(holding.tapper.value).is(0);
+        expect(holding.holder.value).is(1);
+    }),
+    "independent controller consumers": test(async () => {
+        const source = new PlainSource();
+        const bindings = asBindings({
+            downs: ["down", "KeyE"],
+            ups: ["up", "KeyE"],
+        });
+        const fast = new Controller({ source, bindings });
+        const slow = new Controller({ source, bindings });
+        source.onSample.publish({ code: "KeyE", value: 1 });
+        expect([...fast.evaluate(1)]).deep([
+            { id: 0, value: 1 },
+        ]);
+        source.onSample.publish({ code: "KeyE", value: 0 });
+        expect([...fast.evaluate(2)]).deep([
+            { id: 1, value: 1 },
+        ]);
+        expect([...slow.evaluate(20)]).deep([
+            { id: 0, value: 1 },
+            { id: 1, value: 1 },
+        ]);
+        fast.dispose();
+        slow.dispose();
+    }),
+});
+//# sourceMappingURL=test.js.map

package/x/lib/input/test.js.map

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

package/x/lib/input/testing/quickbind.d.ts

@@ -1,11 +1,12 @@
 import { InputDecoder } from "../decoder.js";
-import { InputEncoder } from "../encoder.js";
+import { Controller } from "../controller.js";
 import { Bindings, Sample } from "../types.js";
 import { PlainSource } from "../sources/plain.js";
 export declare function quickbind<B extends Bindings>(b: B): {
     source: PlainSource;
-    encoder: InputEncoder<B>;
+    controller: Controller<B>;
     decoder: InputDecoder<import("../types.js").Rebindings<B>>;
     sample: (...samples: Sample[]) => void;
     solve: (time?: number) => import("../types.js").Inputs<import("../types.js").Rebindings<B>>;
+    inputs: import("../types.js").Inputs<import("../types.js").Rebindings<B>>;
 };

package/x/lib/input/testing/quickbind.js

@@ -1,12 +1,13 @@
 import { InputDecoder } from "../decoder.js";
-import { InputEncoder } from "../encoder.js";
+import { Controller } from "../controller.js";
 import { PlainSource } from "../sources/plain.js";
 export function quickbind(b) {
     const source = new PlainSource();
-    const encoder = new InputEncoder(source, b);
-    const decoder = new InputDecoder(encoder.bindings);
+    const controller = new Controller({ source, bindings: b });
+    const decoder = new InputDecoder(controller.bindings);
+    const { inputs } = decoder;
     const sample = (...samples) => samples.forEach(s => source.onSample.publish(s));
-    const solve = (time) => decoder.decode(encoder.encode(time));
-    return { source, encoder, decoder, sample, solve };
+    const solve = (time) => decoder.decode(controller.encode(time));
+    return { source, controller, decoder, sample, solve, inputs };
 }
 //# sourceMappingURL=quickbind.js.map

package/x/lib/input/testing/quickbind.js.map

@@ -1 +1 @@
-{"version":3,"file":"quickbind.js","sourceRoot":"","sources":["../../../../s/lib/input/testing/quickbind.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,YAAY,EAAC,MAAM,eAAe,CAAA;AAC1C,OAAO,EAAC,YAAY,EAAC,MAAM,eAAe,CAAA;AAE1C,OAAO,EAAC,WAAW,EAAC,MAAM,qBAAqB,CAAA;AAE/C,MAAM,UAAU,SAAS,CAAqB,CAAI;IACjD,MAAM,MAAM,GAAG,IAAI,WAAW,EAAE,CAAA;IAChC,MAAM,OAAO,GAAG,IAAI,YAAY,CAAC,MAAM,EAAE,CAAC,CAAC,CAAA;IAC3C,MAAM,OAAO,GAAG,IAAI,YAAY,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAA;IAElD,MAAM,MAAM,GAAG,CAAC,GAAG,OAAiB,EAAE,EAAE,CACvC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAA;IAEjD,MAAM,KAAK,GAAG,CAAC,IAAa,EAAE,EAAE,CAC/B,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAA;IAErC,OAAO,EAAC,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAC,CAAA;AACjD,CAAC"}
+{"version":3,"file":"quickbind.js","sourceRoot":"","sources":["../../../../s/lib/input/testing/quickbind.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,YAAY,EAAC,MAAM,eAAe,CAAA;AAC1C,OAAO,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAA;AAE3C,OAAO,EAAC,WAAW,EAAC,MAAM,qBAAqB,CAAA;AAE/C,MAAM,UAAU,SAAS,CAAqB,CAAI;IACjD,MAAM,MAAM,GAAG,IAAI,WAAW,EAAE,CAAA;IAChC,MAAM,UAAU,GAAG,IAAI,UAAU,CAAC,EAAC,MAAM,EAAE,QAAQ,EAAE,CAAC,EAAC,CAAC,CAAA;IACxD,MAAM,OAAO,GAAG,IAAI,YAAY,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAA;IACrD,MAAM,EAAC,MAAM,EAAC,GAAG,OAAO,CAAA;IAExB,MAAM,MAAM,GAAG,CAAC,GAAG,OAAiB,EAAE,EAAE,CACvC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAA;IAEjD,MAAM,KAAK,GAAG,CAAC,IAAa,EAAE,EAAE,CAC/B,OAAO,CAAC,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAA;IAExC,OAAO,EAAC,MAAM,EAAE,UAAU,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAC,CAAA;AAC5D,CAAC"}

package/x/lib/input/types.d.ts

@@ -8,18 +8,13 @@ export type Source = {
     readonly dispose: () => void;
     readonly poll?: () => void;
 };
-export type Intent = {
-    id: number;
-    value: number;
-};
-export type InputData = ArrayBuffer;
 export type Input = {
     /** latest-known value. */
     value: number;
-    /** previously-known value. */
+    /** previously-known value from last frame. */
     was: number;
-    /** change in value since the previously-known value. */
-    delta: number;
+    /** sum of values since last frame. */
+    sum: number;
 };
 export type Inputs<B extends Bindings = any> = (B extends Expression ? Input : B extends {
     [key: string]: Bindings;

package/x/lib/input/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../s/lib/input/types.ts"],"names":[],"mappings":"AA0CA,MAAM,CAAC,MAAM,UAAU,GAAG,CAAqB,QAAW,EAAE,EAAE,CAAE,QAAiC,CAAA"}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../s/lib/input/types.ts"],"names":[],"mappings":"AAsCA,MAAM,CAAC,MAAM,UAAU,GAAG,CAAqB,QAAW,EAAE,EAAE,CAAE,QAAiC,CAAA"}

package/x/lib/input/utils/mouse-button.js

@@ -1,9 +1,4 @@
 export function mouseButton(button) {
-    switch (button) {
-        case 0: return "pointer.button.left";
-        case 1: return "pointer.button.middle";
-        case 2: return "pointer.button.right";
-        default: return `pointer.button.${button + 1}`;
-    }
+    return `pointer.${button + 1}`;
 }
 //# sourceMappingURL=mouse-button.js.map

package/x/lib/input/utils/mouse-button.js.map

@@ -1 +1 @@
-{"version":3,"file":"mouse-button.js","sourceRoot":"","sources":["../../../../s/lib/input/utils/mouse-button.ts"],"names":[],"mappings":"AACA,MAAM,UAAU,WAAW,CAAC,MAAc;IACzC,QAAQ,MAAM,EAAE,CAAC;QAChB,KAAK,CAAC,EAAE,OAAO,qBAAqB,CAAA;QACpC,KAAK,CAAC,EAAE,OAAO,uBAAuB,CAAA;QACtC,KAAK,CAAC,EAAE,OAAO,sBAAsB,CAAA;QACrC,SAAS,OAAO,kBAAkB,MAAM,GAAG,CAAC,EAAE,CAAA;IAC/C,CAAC;AACF,CAAC"}
+{"version":3,"file":"mouse-button.js","sourceRoot":"","sources":["../../../../s/lib/input/utils/mouse-button.ts"],"names":[],"mappings":"AACA,MAAM,UAAU,WAAW,CAAC,MAAc;IACzC,OAAO,WAAW,MAAM,GAAG,CAAC,EAAE,CAAA;AAC/B,CAAC"}