@baleada/logic 0.24.5 → 0.24.7

package/lib/index.cjs

@@ -1800,6 +1800,7 @@ function createLayers$1(options = {}) {
         yield layers[depth - 1];
       (layers[depth] || (layers[depth] = [])).push(node);
     }
+    yield layers.at(-1);
   };
 }
 function createTree$2(options = {}) {
@@ -2220,22 +2221,23 @@ const createKeycomboMatch$1 = (keycombo, options = {}) => {
     }
     return implicitModifierAliases2;
   })();
-  return (event) => {
+  return (descriptor) => {
     const statuses = [];
-    createSet(fromEventToKeyStatusCode(event), "down")(statuses);
+    if (descriptor.code)
+      createSet(fromEventToKeyStatusCode(descriptor), "down")(statuses);
     for (const modifier of modifiers) {
       const prefix = modifier === "Control" ? "ctrl" : modifier.toLowerCase();
-      if (event[`${prefix}Key`])
+      if (descriptor[`${prefix}Key`])
         createSet(modifier, "down")(statuses);
     }
-    const events = createMap(
+    const descriptors = createMap(
       ([code]) => {
-        const e = { code };
+        const newDescriptor = { code };
         for (const modifier of modifiers) {
           const prefix = modifier === "Control" ? "ctrl" : modifier.toLowerCase();
-          e[`${prefix}Key`] = event[`${prefix}Key`];
+          newDescriptor[`${prefix}Key`] = descriptor[`${prefix}Key`];
         }
-        return e;
+        return newDescriptor;
       }
     )(statuses);
     return lazyCollections.every(
@@ -2244,7 +2246,7 @@ const createKeycomboMatch$1 = (keycombo, options = {}) => {
         { predicateKey: createCode(code) }
       )(statuses) === "down"
     )(codes) && lazyCollections.every(
-      (e) => lazyCollections.pipe(
+      (d) => lazyCollections.pipe(
         fromDescriptorToAliases,
         lazyCollections.map(fromComboToAliases),
         lazyCollections.some(
@@ -2252,8 +2254,8 @@ const createKeycomboMatch$1 = (keycombo, options = {}) => {
             (longhandAlias) => lazyCollections.includes(longhandAlias)(aliases) || lazyCollections.includes(longhandAlias)(implicitModifierAliases)
           )(longhandAliases)
         )
-      )(e)
-    )(events);
+      )(d)
+    )(descriptors);
   };
 };
 
@@ -2485,13 +2487,13 @@ const createKeycomboDown = (keycombo, options = {}) => {
   )(codes);
 };
 
-function fromKeyboardEventDescriptorToAliases(event) {
-  if (event.shiftKey && event.code in aliasesByShiftCode)
-    return [aliasesByShiftCode[event.code]];
-  const withoutModifierSide = toWithoutModifierSide(event.code);
+function fromKeyboardEventDescriptorToAliases(descriptor) {
+  if (descriptor.shiftKey && descriptor.code in aliasesByShiftCode)
+    return [aliasesByShiftCode[descriptor.code]];
+  const withoutModifierSide = toWithoutModifierSide(descriptor.code);
   if (withoutModifierSide in aliasListsByModifier)
     return aliasListsByModifier[withoutModifierSide];
-  return event.code in aliasesByCode ? [aliasesByCode[event.code]] : [event.code.match(aliasCaptureRE)?.[1].toLowerCase() || "unsupported"];
+  return descriptor.code in aliasesByCode ? [aliasesByCode[descriptor.code]] : [descriptor.code.match(aliasCaptureRE)?.[1].toLowerCase() || "unsupported"];
 }
 const toWithoutModifierSide = createClip(/(?:Left|Right)$/);
 const aliasCaptureRE = /^(?:Digit|Key)?(F[0-9]{1,2}|[0-9]|[A-Z])$/;
@@ -2753,21 +2755,24 @@ function storeKeyboardTimeMetadata({
     timeMetadata.times = createClone()(initialMetadata$3.times);
   timeMetadata.times.start = Math.round(event.timeStamp);
   timeMetadata.times.end = Math.round(event.timeStamp);
-  const storeDuration = () => {
+  const frameEffect = (timestamp) => {
+    timeMetadata.times.end = Math.round(timestamp);
+    timeMetadata.duration = Math.max(0, timeMetadata.times.end - timeMetadata.times.start);
+    if (recognize) {
+      recognize(event, api);
+      if (getStatus() === "recognized")
+        effect(event);
+    }
+  }, storeDuration = () => {
     const request = requestAnimationFrame((timestamp) => {
       if (!getShouldStore())
         return;
-      timeMetadata.times.end = Math.round(timestamp);
-      timeMetadata.duration = Math.max(0, timeMetadata.times.end - timeMetadata.times.start);
-      if (recognize) {
-        recognize(event, api);
-        if (getStatus() === "recognized")
-          effect(event);
-      }
+      frameEffect(timestamp);
       storeDuration();
     });
     setRequest(request);
   };
+  frameEffect(performance.now());
   storeDuration();
 }
 
@@ -2867,23 +2872,26 @@ function storePointerTimeMetadata(event, api, getShouldStore, setRequest, recogn
   metadata.times.start = Math.round(event.timeStamp);
   metadata.times.end = Math.round(event.timeStamp);
   let previousTime = metadata.times.start;
-  const storeDuration = () => {
+  const frameEffect = (timestamp) => {
+    previousTime = metadata.times.end;
+    metadata.times.end = Math.round(timestamp);
+    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 || 0;
+    const event2 = getSequence().at(-1);
+    recognize?.(event2, api);
+    if (getStatus() === "recognized")
+      effect(event2);
+  }, storeDuration = () => {
     const request = requestAnimationFrame((timestamp) => {
-      if (getShouldStore()) {
-        previousTime = metadata.times.end;
-        metadata.times.end = Math.round(timestamp);
-        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;
-        const event2 = getSequence().at(-1);
-        recognize?.(event2, api);
-        if (getStatus() === "recognized")
-          effect(event2);
-        storeDuration();
-      }
+      if (!getShouldStore())
+        return;
+      frameEffect(timestamp);
+      storeDuration();
     });
     setRequest(request);
   };
+  frameEffect(performance.now());
   storeDuration();
 }
 

package/lib/index.d.ts

@@ -134,7 +134,7 @@ type CreateKeycomboMatchOptions$1 = CreateKeycomboDownOptions & {
 };
 
 type KeyboardEventDescriptor = {
-    code: string;
+    code?: string;
     shiftKey?: boolean;
     altKey?: boolean;
     ctrlKey?: boolean;
@@ -638,14 +638,14 @@ type GraphTreeTransform<Id extends string, Transformed> = (tree: GraphTree<Id>)
  */
 declare function createFind<Id extends string>(node: GraphNode<Id>): GraphTreeTransform<Id, GraphTreeNode<Id>>;
 
-type KeyboardEventTransform<Transformed> = (keyboardEvent: KeyboardEvent) => Transformed;
+type KeyboardEventDescriptorTransform<Transformed> = (descriptor: KeyboardEventDescriptor) => Transformed;
 type CreateKeycomboMatchOptions = Omit<CreateKeycomboMatchOptions$1, 'toAliases'> & {
     toAliases?: (descriptor: KeyboardEventDescriptor) => string[];
 };
 /**
  * [Docs](https://baleada.dev/docs/logic/pipes/keycombo-match)
  */
-declare const createKeycomboMatch: (keycombo: string, options?: CreateKeycomboMatchOptions) => KeyboardEventTransform<boolean>;
+declare const createKeycomboMatch: (keycombo: string, options?: CreateKeycomboMatchOptions) => KeyboardEventDescriptorTransform<boolean>;
 
 type NumberTransform<Transformed> = (number: number) => Transformed;
 /**

package/lib/index.js

@@ -1798,6 +1798,7 @@ function createLayers$1(options = {}) {
         yield layers[depth - 1];
       (layers[depth] || (layers[depth] = [])).push(node);
     }
+    yield layers.at(-1);
   };
 }
 function createTree$2(options = {}) {
@@ -2218,22 +2219,23 @@ const createKeycomboMatch$1 = (keycombo, options = {}) => {
     }
     return implicitModifierAliases2;
   })();
-  return (event) => {
+  return (descriptor) => {
     const statuses = [];
-    createSet(fromEventToKeyStatusCode(event), "down")(statuses);
+    if (descriptor.code)
+      createSet(fromEventToKeyStatusCode(descriptor), "down")(statuses);
     for (const modifier of modifiers) {
       const prefix = modifier === "Control" ? "ctrl" : modifier.toLowerCase();
-      if (event[`${prefix}Key`])
+      if (descriptor[`${prefix}Key`])
         createSet(modifier, "down")(statuses);
     }
-    const events = createMap(
+    const descriptors = createMap(
       ([code]) => {
-        const e = { code };
+        const newDescriptor = { code };
         for (const modifier of modifiers) {
           const prefix = modifier === "Control" ? "ctrl" : modifier.toLowerCase();
-          e[`${prefix}Key`] = event[`${prefix}Key`];
+          newDescriptor[`${prefix}Key`] = descriptor[`${prefix}Key`];
         }
-        return e;
+        return newDescriptor;
       }
     )(statuses);
     return every(
@@ -2242,7 +2244,7 @@ const createKeycomboMatch$1 = (keycombo, options = {}) => {
         { predicateKey: createCode(code) }
       )(statuses) === "down"
     )(codes) && every(
-      (e) => pipe(
+      (d) => pipe(
         fromDescriptorToAliases,
         map(fromComboToAliases),
         some(
@@ -2250,8 +2252,8 @@ const createKeycomboMatch$1 = (keycombo, options = {}) => {
             (longhandAlias) => includes(longhandAlias)(aliases) || includes(longhandAlias)(implicitModifierAliases)
           )(longhandAliases)
         )
-      )(e)
-    )(events);
+      )(d)
+    )(descriptors);
   };
 };
 
@@ -2483,13 +2485,13 @@ const createKeycomboDown = (keycombo, options = {}) => {
   )(codes);
 };
 
-function fromKeyboardEventDescriptorToAliases(event) {
-  if (event.shiftKey && event.code in aliasesByShiftCode)
-    return [aliasesByShiftCode[event.code]];
-  const withoutModifierSide = toWithoutModifierSide(event.code);
+function fromKeyboardEventDescriptorToAliases(descriptor) {
+  if (descriptor.shiftKey && descriptor.code in aliasesByShiftCode)
+    return [aliasesByShiftCode[descriptor.code]];
+  const withoutModifierSide = toWithoutModifierSide(descriptor.code);
   if (withoutModifierSide in aliasListsByModifier)
     return aliasListsByModifier[withoutModifierSide];
-  return event.code in aliasesByCode ? [aliasesByCode[event.code]] : [event.code.match(aliasCaptureRE)?.[1].toLowerCase() || "unsupported"];
+  return descriptor.code in aliasesByCode ? [aliasesByCode[descriptor.code]] : [descriptor.code.match(aliasCaptureRE)?.[1].toLowerCase() || "unsupported"];
 }
 const toWithoutModifierSide = createClip(/(?:Left|Right)$/);
 const aliasCaptureRE = /^(?:Digit|Key)?(F[0-9]{1,2}|[0-9]|[A-Z])$/;
@@ -2751,21 +2753,24 @@ function storeKeyboardTimeMetadata({
     timeMetadata.times = createClone()(initialMetadata$3.times);
   timeMetadata.times.start = Math.round(event.timeStamp);
   timeMetadata.times.end = Math.round(event.timeStamp);
-  const storeDuration = () => {
+  const frameEffect = (timestamp) => {
+    timeMetadata.times.end = Math.round(timestamp);
+    timeMetadata.duration = Math.max(0, timeMetadata.times.end - timeMetadata.times.start);
+    if (recognize) {
+      recognize(event, api);
+      if (getStatus() === "recognized")
+        effect(event);
+    }
+  }, storeDuration = () => {
     const request = requestAnimationFrame((timestamp) => {
       if (!getShouldStore())
         return;
-      timeMetadata.times.end = Math.round(timestamp);
-      timeMetadata.duration = Math.max(0, timeMetadata.times.end - timeMetadata.times.start);
-      if (recognize) {
-        recognize(event, api);
-        if (getStatus() === "recognized")
-          effect(event);
-      }
+      frameEffect(timestamp);
       storeDuration();
     });
     setRequest(request);
   };
+  frameEffect(performance.now());
   storeDuration();
 }
 
@@ -2865,23 +2870,26 @@ function storePointerTimeMetadata(event, api, getShouldStore, setRequest, recogn
   metadata.times.start = Math.round(event.timeStamp);
   metadata.times.end = Math.round(event.timeStamp);
   let previousTime = metadata.times.start;
-  const storeDuration = () => {
+  const frameEffect = (timestamp) => {
+    previousTime = metadata.times.end;
+    metadata.times.end = Math.round(timestamp);
+    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 || 0;
+    const event2 = getSequence().at(-1);
+    recognize?.(event2, api);
+    if (getStatus() === "recognized")
+      effect(event2);
+  }, storeDuration = () => {
     const request = requestAnimationFrame((timestamp) => {
-      if (getShouldStore()) {
-        previousTime = metadata.times.end;
-        metadata.times.end = Math.round(timestamp);
-        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;
-        const event2 = getSequence().at(-1);
-        recognize?.(event2, api);
-        if (getStatus() === "recognized")
-          effect(event2);
-        storeDuration();
-      }
+      if (!getShouldStore())
+        return;
+      frameEffect(timestamp);
+      storeDuration();
     });
     setRequest(request);
   };
+  frameEffect(performance.now());
   storeDuration();
 }
 

package/package.json

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