@baleada/logic 0.23.1 → 0.23.3

package/lib/index.cjs

@@ -761,15 +761,13 @@ function createToGraph(options = {}) {
 }
 
 const defaultOptions$k = {
-  toKey: (alias) => fromAliasToKeyStatusKey(alias)
+  toKey: (alias) => fromAliasToKeyStatusKey(alias),
+  toAliases: (event) => fromEventToAliases(event)
 };
 const createPredicateKeycomboMatch$1 = (keycombo, options = {}) => {
-  const { toKey } = { ...defaultOptions$k, ...options }, keys = lazyCollections.pipe(
-    fromComboToAliases,
-    lazyCollections.map(toKey)
-  )(keycombo);
+  const { toKey, toAliases } = { ...defaultOptions$k, ...options }, aliases = fromComboToAliases(keycombo), keys = lazyCollections.map(toKey)(aliases);
   return (event) => {
-    const { toValue, set } = createKeyStatuses();
+    const { toValue, set, toEntries } = createKeyStatuses();
     set(fromEventToKeyStatusKey(event), "down");
     for (const modifier of modifiers) {
       if (event[`${modifier.toLowerCase()}Key`])
@@ -778,7 +776,11 @@ const createPredicateKeycomboMatch$1 = (keycombo, options = {}) => {
     return lazyCollections.every(lazyCollections.pipe(
       toValue,
       predicateDown
-    ))(keys);
+    ))(keys) && lazyCollections.every(
+      ([key]) => lazyCollections.some(
+        (alias) => lazyCollections.includes(alias)(aliases)
+      )(toAliases(key))
+    )(toEntries());
   };
 };
 
@@ -1300,6 +1302,8 @@ function createMousepress(options = {}) {
     onDown?.(toHookApi(api));
   };
   const mousemove = (event, api) => {
+    const { pushSequence } = api;
+    pushSequence(event);
     storePointerMoveMetadata(event, api);
     recognize(event, api);
     onMove?.(toHookApi(api));
@@ -2070,7 +2074,7 @@ const initialMetadata = {
   velocity: 0
 };
 function storePointerTimeMetadata(event, api, getShouldStore, setRequest, recognize) {
-  const { getMetadata, getStatus, onRecognized } = api, metadata = getMetadata();
+  const { getSequence, getMetadata, getStatus, onRecognized } = api, metadata = getMetadata();
   if (!metadata.times) {
     metadata.times = createClone()(initialMetadata.times);
   }
@@ -2085,9 +2089,10 @@ function storePointerTimeMetadata(event, api, getShouldStore, setRequest, recogn
         metadata.duration = Math.max(0, metadata.times.end - metadata.times.start);
         const durationFromPrevious = Math.max(0, metadata.times.end - previousTime);
         metadata.velocity = metadata.distance.straight.fromPrevious / durationFromPrevious;
-        recognize?.(event, api);
+        const event2 = getSequence().at(-1);
+        recognize?.(event2, api);
         if (getStatus() === "recognized")
-          onRecognized(event);
+          onRecognized(event2);
         storeDuration();
       }
     });
@@ -2265,11 +2270,18 @@ class Recognizeable {
   }
   recognize(sequenceItem, { onRecognized } = {}) {
     this.recognizing();
-    const type = this.toType(sequenceItem), excess = predicateNumber(this.maxSequenceLength) ? Math.max(0, this.sequence.length - this.maxSequenceLength) : 0, newSequence = createConcat(
-      createSlice(excess)(this.sequence),
-      [sequenceItem]
-    )([]);
+    const type = this.toType(sequenceItem), pushSequence = (sequenceItem2) => {
+      newSequence.push(sequenceItem2);
+      if (this.maxSequenceLength !== true && newSequence.length > this.maxSequenceLength) {
+        newSequence.shift();
+      }
+    }, newSequence = [];
+    for (const sequenceItem2 of this.sequence) {
+      pushSequence(sequenceItem2);
+    }
+    pushSequence(sequenceItem);
     this.effectApi.getSequence = () => newSequence;
+    this.effectApi.pushSequence = pushSequence;
     this.effectApi.onRecognized = onRecognized || (() => {
     });
     this.effects[type]?.(sequenceItem, { ...this.effectApi });

package/lib/index.d.ts

@@ -160,6 +160,7 @@ type RecognizeableEffectApi<Type extends ListenableSupportedType, Metadata exten
     recognized: () => void;
     denied: () => void;
     getSequence: () => ListenEffectParam<Type>[];
+    pushSequence: (sequenceItem: ListenEffectParam<Type>) => void;
     onRecognized: (sequenceItem: ListenEffectParam<Type>) => any;
 };
 type RecognizeableStatus = 'recognized' | 'recognizing' | 'denied' | 'ready';
@@ -1244,6 +1245,7 @@ declare function createToGraph<TreeNode>(options?: CreateToGraphOptions<TreeNode
 type KeyboardEventFn<Returned> = (keyboardEvent: KeyboardEvent) => Returned;
 type CreatePredicateKeycomboMatchOptions = {
     toKey?: (alias: string) => KeyStatusKey;
+    toAliases?: (event: KeyboardEvent) => string[];
 };
 declare const createPredicateKeycomboMatch: (keycombo: string, options?: CreatePredicateKeycomboMatchOptions) => KeyboardEventFn<boolean>;
 

package/lib/index.js

@@ -759,15 +759,13 @@ function createToGraph(options = {}) {
 }
 
 const defaultOptions$k = {
-  toKey: (alias) => fromAliasToKeyStatusKey(alias)
+  toKey: (alias) => fromAliasToKeyStatusKey(alias),
+  toAliases: (event) => fromEventToAliases(event)
 };
 const createPredicateKeycomboMatch$1 = (keycombo, options = {}) => {
-  const { toKey } = { ...defaultOptions$k, ...options }, keys = pipe(
-    fromComboToAliases,
-    map(toKey)
-  )(keycombo);
+  const { toKey, toAliases } = { ...defaultOptions$k, ...options }, aliases = fromComboToAliases(keycombo), keys = map(toKey)(aliases);
   return (event) => {
-    const { toValue, set } = createKeyStatuses();
+    const { toValue, set, toEntries } = createKeyStatuses();
     set(fromEventToKeyStatusKey(event), "down");
     for (const modifier of modifiers) {
       if (event[`${modifier.toLowerCase()}Key`])
@@ -776,7 +774,11 @@ const createPredicateKeycomboMatch$1 = (keycombo, options = {}) => {
     return every(pipe(
       toValue,
       predicateDown
-    ))(keys);
+    ))(keys) && every(
+      ([key]) => some(
+        (alias) => includes(alias)(aliases)
+      )(toAliases(key))
+    )(toEntries());
   };
 };
 
@@ -1298,6 +1300,8 @@ function createMousepress(options = {}) {
     onDown?.(toHookApi(api));
   };
   const mousemove = (event, api) => {
+    const { pushSequence } = api;
+    pushSequence(event);
     storePointerMoveMetadata(event, api);
     recognize(event, api);
     onMove?.(toHookApi(api));
@@ -2068,7 +2072,7 @@ const initialMetadata = {
   velocity: 0
 };
 function storePointerTimeMetadata(event, api, getShouldStore, setRequest, recognize) {
-  const { getMetadata, getStatus, onRecognized } = api, metadata = getMetadata();
+  const { getSequence, getMetadata, getStatus, onRecognized } = api, metadata = getMetadata();
   if (!metadata.times) {
     metadata.times = createClone()(initialMetadata.times);
   }
@@ -2083,9 +2087,10 @@ function storePointerTimeMetadata(event, api, getShouldStore, setRequest, recogn
         metadata.duration = Math.max(0, metadata.times.end - metadata.times.start);
         const durationFromPrevious = Math.max(0, metadata.times.end - previousTime);
         metadata.velocity = metadata.distance.straight.fromPrevious / durationFromPrevious;
-        recognize?.(event, api);
+        const event2 = getSequence().at(-1);
+        recognize?.(event2, api);
         if (getStatus() === "recognized")
-          onRecognized(event);
+          onRecognized(event2);
         storeDuration();
       }
     });
@@ -2263,11 +2268,18 @@ class Recognizeable {
   }
   recognize(sequenceItem, { onRecognized } = {}) {
     this.recognizing();
-    const type = this.toType(sequenceItem), excess = predicateNumber(this.maxSequenceLength) ? Math.max(0, this.sequence.length - this.maxSequenceLength) : 0, newSequence = createConcat(
-      createSlice(excess)(this.sequence),
-      [sequenceItem]
-    )([]);
+    const type = this.toType(sequenceItem), pushSequence = (sequenceItem2) => {
+      newSequence.push(sequenceItem2);
+      if (this.maxSequenceLength !== true && newSequence.length > this.maxSequenceLength) {
+        newSequence.shift();
+      }
+    }, newSequence = [];
+    for (const sequenceItem2 of this.sequence) {
+      pushSequence(sequenceItem2);
+    }
+    pushSequence(sequenceItem);
     this.effectApi.getSequence = () => newSequence;
+    this.effectApi.pushSequence = pushSequence;
     this.effectApi.onRecognized = onRecognized || (() => {
     });
     this.effects[type]?.(sequenceItem, { ...this.effectApi });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@baleada/logic",
-  "version": "0.23.1",
+  "version": "0.23.3",
   "description": "UI logic for the Baleada toolkit",
   "main": "lib/index.cjs",
   "module": "lib/index.js",