pacc 6.8.1 → 6.9.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pacc",
-  "version": "6.8.1",
+  "version": "6.9.1",
   "publishConfig": {
     "access": "public",
     "provenance": true
@@ -39,7 +39,7 @@
   },
   "devDependencies": {
     "ava": "^6.4.1",
-    "browser-ava": "^2.3.49",
+    "browser-ava": "^2.3.50",
     "c8": "^10.1.3",
     "documentation": "^14.0.3",
     "semantic-release": "^25.0.2",

package/src/expression.mjs

@@ -53,19 +53,39 @@ export function binop(op, left, right, fallback) {
   return fallback(op, left, right);
 }
 
+/**
+ *
+ * @param {string} message
+ */
+function error(message) {
+  const error = new Error(message);
+  throw error;
+}
+/**
+ *
+ * @param {Token} op
+ * @param {AST} left
+ * @param {AST} right
+ */
+function binopError(op, left, right) {
+  error(`Unexpected '${op.str || op}'`);
+}
+
 export function parse(input, context = { globals }) {
   input = tokens(input);
 
   let node, token, value;
 
-  function error(message) {
-    const error = new Error(message);
-    throw error;
-  }
-  function binopError(op, left, right) {
-    error(`Unexpected '${op.str || op}'`);
-  }
-
+  const predicateIteratorEval = (node, current) => {
+    if (current instanceof Set) {
+      current = [...current];
+    } else if (current instanceof Map) {
+      current = [...current.values()];
+    }
+    return current
+      .filter(item => node.predicate(node, item))
+      .map(item => node.right.eval(node.right, item));
+  };
   const pathEval = (node, current) => {
     let result = current;
 
@@ -207,15 +227,26 @@ export function parse(input, context = { globals }) {
           }
         }
         if (last === DOT) {
-          if (left.path) {
-            left.path.push(...right.path);
-            return left;
-          }
           switch (typeof left) {
             case "number":
               right.path.unshift(left);
               return right;
           }
+
+          if (left.path) {
+            left.path.push(...right.path);
+            return left;
+          }
+
+          if (left.eval) {
+            return {
+              eval: predicateIteratorEval,
+              predicate: left.eval,
+              right
+              // path: right.path
+            };
+          }
+
           return { eval: pathEval, path: [left.token, right.token] };
         }
 
@@ -312,10 +343,13 @@ export const globals = {
     }
     return false;
   },
-  min: (a, b) => (a < b ? a : b),
-  max: (a, b) => (a > b ? a : b),
-  uppercase: (a) => a.toUpperCase(),
-  lowercase: (a) => a.toLowerCase(),
+  ceil: Math.ceil,
+  floor: Math.floor,
+  abs: Math.abs,
+  min: Math.min,
+  max: Math.max,
+  uppercase: a => a.toUpperCase(),
+  lowercase: a => a.toLowerCase(),
   substring: (s, a, b) => s.substring(a, b),
   length: s => s.length
 };

package/types/expression.d.mts

@@ -2,8 +2,11 @@ export function binop(op: any, left: any, right: any, fallback: any): any;
 export function parse(input: any, context?: {
     globals: {
         in: (a: any, b: any) => boolean;
-        min: (a: any, b: any) => any;
-        max: (a: any, b: any) => any;
+        ceil: (x: number) => number;
+        floor: (x: number) => number;
+        abs: (x: number) => number;
+        min: (...values: number[]) => number;
+        max: (...values: number[]) => number;
         uppercase: (a: any) => any;
         lowercase: (a: any) => any;
         substring: (s: any, a: any, b: any) => any;
@@ -13,8 +16,11 @@ export function parse(input: any, context?: {
 export namespace globals {
     export function _in(a: any, b: any): boolean;
     export { _in as in };
-    export function min(a: any, b: any): any;
-    export function max(a: any, b: any): any;
+    export let ceil: (x: number) => number;
+    export let floor: (x: number) => number;
+    export let abs: (x: number) => number;
+    export let min: (...values: number[]) => number;
+    export let max: (...values: number[]) => number;
     export function uppercase(a: any): any;
     export function lowercase(a: any): any;
     export function substring(s: any, a: any, b: any): any;