pacc 8.0.5 → 8.1.0

package/README.md

@@ -26,14 +26,16 @@ const result = getAttribute({ a: [0,{ b: 4 }]}, "a[1].b");
 
 ### Table of Contents
 
-*   [prepareAttributesDefinitions](#prepareattributesdefinitions)
+*   [binopError](#binoperror)
     *   [Parameters](#parameters)
-*   [mergeAttributeDefinitions](#mergeattributedefinitions)
+*   [prepareAttributesDefinitions](#prepareattributesdefinitions)
     *   [Parameters](#parameters-1)
-*   [attributeIterator](#attributeiterator)
+*   [mergeAttributeDefinitions](#mergeattributedefinitions)
     *   [Parameters](#parameters-2)
-*   [parseBytes](#parsebytes)
+*   [attributeIterator](#attributeiterator)
     *   [Parameters](#parameters-3)
+*   [parseBytes](#parsebytes)
+    *   [Parameters](#parameters-4)
 *   [AttributeDefinition](#attributedefinition)
     *   [Properties](#properties)
 *   [default\_attribute](#default_attribute)
@@ -88,13 +90,11 @@ const result = getAttribute({ a: [0,{ b: 4 }]}, "a[1].b");
 *   [timeout\_attribute](#timeout_attribute)
 *   [language\_attribute](#language_attribute)
 *   [environmentValues](#environmentvalues)
-    *   [Parameters](#parameters-4)
-*   [expand](#expand)
     *   [Parameters](#parameters-5)
+*   [expand](#expand)
+    *   [Parameters](#parameters-6)
 *   [promises](#promises)
 *   [error](#error)
-    *   [Parameters](#parameters-6)
-*   [binopError](#binoperror)
     *   [Parameters](#parameters-7)
 *   [filter](#filter)
     *   [Parameters](#parameters-8)
@@ -157,6 +157,14 @@ const result = getAttribute({ a: [0,{ b: 4 }]}, "a[1].b");
 *   [raiseOnUnknownType](#raiseonunknowntype)
     *   [Parameters](#parameters-20)
 
+## binopError
+
+### Parameters
+
+*   `op` **[Token](#token)** 
+*   `left` **AST** 
+*   `right` **AST** 
+
 ## prepareAttributesDefinitions
 
 Create attributes from its definition.
@@ -482,14 +490,6 @@ Type: [Array](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global
 
 *   `message` **[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)** 
 
-## binopError
-
-### Parameters
-
-*   `op` **[Token](#token)** 
-*   `left` **AST** 
-*   `right` **AST** 
-
 ## filter
 
 Generate filter function.

package/package.json

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

package/src/ast.mjs

@@ -13,6 +13,11 @@ import {
   MINUS
 } from "./tokens.mjs";
 
+/**
+ * @typedef {Object} AST
+ * @property {Function} [eval]
+ */
+
 /**
  *
  * @param {Token} op
@@ -21,7 +26,7 @@ import {
  *
  */
 export function binopError(op, left, right) {
-  throw new Error(`Unexpected '${op.str || op}'`,{ cause: op});
+  throw new Error(`Unexpected '${op.str || op}'`, { cause: op });
 }
 
 export function binop(op, left, right, fallback) {
@@ -73,7 +78,7 @@ export function predicateIteratorEval(node, current, context) {
     current = [...current.values()];
   }
   return current
-    .filter(item => node.predicate(node, item, context))
+    .filter(item => node.left.eval(node.left, item, context))
     .map(item => node.right.eval(node.right, item, context));
 }
 
@@ -117,3 +122,10 @@ export function pathEval(node, current, context) {
 
   return result;
 }
+
+export function functionEval(node, current, context) {
+  const args = node.args.map(a =>
+    typeof a === "object" ? a.eval(a, current, context) : a
+  );
+  return context.getGlobal(node.path[0])(...args);
+}

package/src/expression.mjs

@@ -10,7 +10,14 @@ import {
   EOF
 } from "./tokens.mjs";
 
-import {binopError, binop, binopEval, predicateIteratorEval, pathEval} from "./ast.mjs";
+import {
+  binopError,
+  binop,
+  binopEval,
+  predicateIteratorEval,
+  pathEval,
+  functionEval
+} from "./ast.mjs";
 
 /**
  *
@@ -101,14 +108,8 @@ export function parse(input, context = {}) {
           }
         }
 
-        return {          
-          eval: (node, current, context) =>
-            binop(
-              last,
-              left.eval ? left.eval(left, current, context) : left,
-              right.eval ? right.eval(right, current, context) : right,
-              binopError
-            ),
+        return {
+          eval: binopEval,
           token: last,
           left,
           right
@@ -141,7 +142,7 @@ export function parse(input, context = {}) {
           if (left.eval) {
             return {
               eval: predicateIteratorEval,
-              predicate: left.eval,
+              left,
               right
             };
           }
@@ -171,13 +172,8 @@ export function parse(input, context = {}) {
                   advance();
                 }
               }
-              left.path.push(args);
-              left.eval = (node, current, context) => {
-                const args = node.path[1].map(a =>
-                  typeof a === "object" ? a.eval(a, current, context) : a
-                );
-                return context.getGlobal(node.path[0])(...args);
-              };
+              left.args = args;
+              left.eval = functionEval;
 
               advance();
 

package/types/ast.d.mts

@@ -1,3 +1,7 @@
+/**
+ * @typedef {Object} AST
+ * @property {Function} [eval]
+ */
 /**
  *
  * @param {Token} op
@@ -10,3 +14,7 @@ export function binop(op: any, left: any, right: any, fallback: any): any;
 export function binopEval(node: any, current: any, context: any): any;
 export function predicateIteratorEval(node: any, current: any, context: any): any;
 export function pathEval(node: any, current: any, context: any): any;
+export function functionEval(node: any, current: any, context: any): any;
+export type AST = {
+    eval?: Function;
+};