pacc 4.17.0 → 4.18.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pacc",
-  "version": "4.17.0",
+  "version": "4.18.1",
   "publishConfig": {
     "access": "public",
     "provenance": true

package/src/expression.mjs

@@ -19,7 +19,7 @@ import {
   EOF
 } from "./tokens.mjs";
 
-export function binop(op, left, right) {
+export function binop(op, left, right, fallback) {
   switch (op) {
     case DOUBLE_BAR:
       return left || right;
@@ -46,6 +46,8 @@ export function binop(op, left, right) {
     case DIVIDE:
       return left / right;
   }
+
+  return fallback(op, left, right);
 }
 
 export function parse(context) {
@@ -55,6 +57,43 @@ export function parse(context) {
     const error = new Error(message);
     throw error;
   }
+  function binopError(op, left, right) {
+    error(`Unexpected '${op.str || op}'`);
+  }
+
+  const pathEval = (node, current) => {
+    let result = current;
+
+    for (const p of node.path) {
+      switch (typeof p) {
+        case "string":
+        case "number":
+          if(typeof result === 'function') {
+            const r = [];
+            for(const x of result()) {
+              r.push(x[p]);
+            }
+            result = r;
+          }
+          else {
+            result = result[p];
+          }
+          break;
+        case "object":
+          function* filter() {
+            for (const x of result) {
+              if (p.eval(p, x)) {
+                yield x;
+              }
+            }
+          }
+          //result = filter;
+          result = [...filter()];
+      }
+    }
+
+    return result;
+  };
 
   const advance = () => {
     const { value, done } = context.tokens.next();
@@ -81,7 +120,7 @@ export function parse(context) {
             const node = expression(0);
             expect(CLOSE_BRACKET);
             if (typeof node === "number") {
-              return { path: [node] };
+              return { eval: pathEval, path: [node] };
             }
             return node;
           }
@@ -93,7 +132,7 @@ export function parse(context) {
 
     switch (typeof token) {
       case "string":
-        return { path: [token] };
+        return { eval: pathEval, path: [token] };
       case "number":
       case "bigint":
       case "boolean":
@@ -113,10 +152,17 @@ export function parse(context) {
             case "number":
             case "bigint":
             case "boolean":
-              return binop(token, left, right);
+              return binop(token, left, right, binopError);
           }
         }
         return {
+          eval: (node, current) =>
+            binop(
+              token,
+              left?.eval ? left.eval(left, current) : left,
+              right?.eval ? right.eval(right, current) : right,
+              binopError
+            ),
           token,
           left,
           right
@@ -124,12 +170,12 @@ export function parse(context) {
       }
 
       case "infix": {
-        const right = expression(token.precedence);
+        let right = expression(token.precedence);
         if (typeof left === typeof right) {
           switch (typeof left) {
             case "number":
             case "bigint":
-              return binop(token, left, right);
+              return binop(token, left, right, binopError);
           }
         }
         if (token === DOT) {
@@ -142,13 +188,21 @@ export function parse(context) {
               right.path.unshift(left);
               return right;
           }
-          return { path: [left.token, right.token] };
+          return { eval: pathEval, path: [left.token, right.token] };
         }
 
         if (right.token === EOF) {
           error("unexpected EOF");
         }
+
         return {
+          eval: (node, current) =>
+            binop(
+              token,
+              left?.eval ? left.eval(left, current) : left,
+              right?.eval ? right.eval(right, current) : right,
+              binopError
+            ),
           token,
           left,
           right
@@ -184,5 +238,11 @@ export function parse(context) {
 
   advance();
 
-  return expression(token.precedence ?? 0);
+  const result = expression(token.precedence ?? 0);
+
+  if (context.exec !== false && result?.eval) {
+    return result.eval(result, context.root);
+  }
+
+  return result;
 }

package/src/settergetter.mjs

@@ -27,7 +27,7 @@ import { convertValue } from "./attributes.mjs";
  * @param {Object} definition type def
  */
 export function setAttribute(object, expression, value, definition) {
-  const { path } = parse({ tokens: tokens(expression) });
+  const { path } = parse({ tokens: tokens(expression), exec: false });
 
   let anchor, anchorKey;
 
@@ -60,7 +60,7 @@ export function setAttribute(object, expression, value, definition) {
  * @returns {any} value associated with the given property name
  */
 export function getAttribute(object, expression, definition) {
-  const { path } = parse({ tokens: tokens(expression) });
+  const { path } = parse({ tokens: tokens(expression), exec: false });
 
   for (const key of path) {
     if (object !== undefined) {

package/types/expression.d.mts

@@ -1,2 +1,2 @@
-export function binop(op: any, left: any, right: any): any;
+export function binop(op: any, left: any, right: any, fallback: any): any;
 export function parse(context: any): any;