pacc 8.1.3 → 8.1.5

package/package.json

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

package/src/ast.mjs

@@ -86,41 +86,28 @@ export function predicateIteratorEval(node, current, context) {
 }
 
 export function pathEval(node, current, context) {
+  let collection = false;
   for (const item of node.path) {
     switch (typeof item) {
       case "string":
       case "number":
         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);
+            if (collection) {
+              current = current.map(x => x[item]);
             } else {
-              current = current[item] ?? context.getGlobal(item);
+              current =
+                (current instanceof Map ? current.get(item) : current[item]) ??
+                context.getGlobal(item);
             }
         }
         break;
       case "object":
-        const r = current;
-        function* filter() {
-          for (const x of r) {
-            if (item.eval(item, x, context)) {
-              yield x;
-            }
-          }
-        }
-        current = filter;
+        current = current.filter(c => item.eval(item, c, context));
+        collection = true;
     }
   }
 

package/src/expression.mjs

@@ -135,12 +135,6 @@ export function parse(input, context = {}) {
           }
         }
         if (last === DOT) {
-          switch (typeof left) {
-            case "number":
-              right.path.unshift(left);
-              return right;
-          }
-
           if (left.path) {
             left.path.push(...right.path);
             return left;