pacc 8.1.0 → 8.1.2

package/README.md

@@ -26,6 +26,8 @@ const result = getAttribute({ a: [0,{ b: 4 }]}, "a[1].b");
 
 ### Table of Contents
 
+*   [AST](#ast)
+    *   [Properties](#properties)
 *   [binopError](#binoperror)
     *   [Parameters](#parameters)
 *   [prepareAttributesDefinitions](#prepareattributesdefinitions)
@@ -37,7 +39,7 @@ const result = getAttribute({ a: [0,{ b: 4 }]}, "a[1].b");
 *   [parseBytes](#parsebytes)
     *   [Parameters](#parameters-4)
 *   [AttributeDefinition](#attributedefinition)
-    *   [Properties](#properties)
+    *   [Properties](#properties-1)
 *   [default\_attribute](#default_attribute)
 *   [default\_attribute](#default_attribute-1)
 *   [default\_attribute](#default_attribute-2)
@@ -121,7 +123,7 @@ const result = getAttribute({ a: [0,{ b: 4 }]}, "a[1].b");
     *   [Parameters](#parameters-18)
 *   [lookup](#lookup)
 *   [Token](#token)
-    *   [Properties](#properties-1)
+    *   [Properties](#properties-2)
 *   [createToken](#createtoken)
     *   [Parameters](#parameters-19)
 *   [PLUS](#plus)
@@ -153,17 +155,25 @@ const result = getAttribute({ a: [0,{ b: 4 }]}, "a[1].b");
 *   [IDENTIFIER](#identifier)
 *   [EOF](#eof)
 *   [Type](#type)
-    *   [Properties](#properties-2)
+    *   [Properties](#properties-3)
 *   [raiseOnUnknownType](#raiseonunknowntype)
     *   [Parameters](#parameters-20)
 
+## AST
+
+Type: [Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)
+
+### Properties
+
+*   `eval` **[Function](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Statements/function)?** 
+
 ## binopError
 
 ### Parameters
 
 *   `op` **[Token](#token)** 
-*   `left` **AST** 
-*   `right` **AST** 
+*   `left` **[AST](#ast)** 
+*   `right` **[AST](#ast)** 
 
 ## prepareAttributesDefinitions
 

package/package.json

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

package/src/ast.mjs

@@ -72,55 +72,55 @@ export function binopEval(node, current, context) {
 }
 
 export function predicateIteratorEval(node, current, context) {
-  if (current instanceof Set) {
-    current = [...current];
-  } else if (current instanceof Map) {
-    current = [...current.values()];
+  if (current.values) {
+    current = current.values();
   }
+
   return current
     .filter(item => node.left.eval(node.left, item, context))
     .map(item => node.right.eval(node.right, item, context));
 }
 
 export function pathEval(node, current, context) {
-  let result = current;
-
-  for (const p of node.path) {
-    switch (typeof p) {
+  for (const item of node.path) {
+    switch (typeof item) {
       case "string":
       case "number":
-        if (typeof result === "function") {
-          const r = [];
-          for (const x of result()) {
-            r.push(x[p]);
-          }
-          result = r;
-        } else {
-          if (result === undefined) {
-            result = context.getGlobal(p);
-          } else {
-            if (result instanceof Map) {
-              result = result.get(p);
+        switch (typeof current) {
+          case "function":
+            {
+              const r = [];
+              for (const x of current()) {
+                r.push(x[item]);
+              }
+              current = r;
+            }
+            break;
+          case "undefined":
+            current = context.getGlobal(item);
+            break;
+          default:
+            if (current instanceof Map) {
+              current = current.get(item);
             } else {
-              result = result[p] ?? context.getGlobal(p);
+              current = current[item] ?? context.getGlobal(item);
             }
-          }
         }
         break;
       case "object":
-        const r = result;
+        const r = current;
         function* filter() {
           for (const x of r) {
-            if (p.eval(p, x, context)) {
+            if (item.eval(item, x, context)) {
               yield x;
             }
           }
         }
-        result = filter;
+        current = filter;
     }
   }
 
-  return result;
+  return current;
 }
 
 export function functionEval(node, current, context) {

package/src/expression.mjs

@@ -63,6 +63,11 @@ export function parse(input, context = {}) {
             return node;
           }
           case OPEN_BRACKET: {
+            if(token === CLOSE_BRACKET) {
+              advance();
+              return { eval: () => true };
+            }
+
             const node = expression(0);
             expect(CLOSE_BRACKET);
             switch (typeof node) {
@@ -163,23 +168,21 @@ export function parse(input, context = {}) {
       }
       case "prefix":
         switch (last) {
-          case OPEN_ROUND:
-            {
-              const args = [];
-              while (token !== CLOSE_ROUND) {
-                args.push(expression(0));
-                if (token === COMMA) {
-                  advance();
-                }
+          case OPEN_ROUND: {
+            const args = [];
+            while (token !== CLOSE_ROUND) {
+              args.push(expression(0));
+              if (token === COMMA) {
+                advance();
               }
-              left.args = args;
-              left.eval = functionEval;
+            }
+            left.args = args;
+            left.eval = functionEval;
 
-              advance();
+            advance();
 
-              return left;
-            }
-            break;
+            return left;
+          }
           case OPEN_BRACKET: {
             const predicate = expression(0);
             expect(CLOSE_BRACKET);