pacc 4.18.1 → 4.18.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pacc",
-  "version": "4.18.1",
+  "version": "4.18.3",
   "publishConfig": {
     "access": "public",
     "provenance": true
@@ -14,6 +14,10 @@
     }
   },
   "description": "property path utils",
+  "keywords": [
+    "xpath",
+    "property path"
+  ],
   "contributors": [
     {
       "name": "Markus Felten",
@@ -35,7 +39,7 @@
   },
   "devDependencies": {
     "ava": "^6.4.1",
-    "browser-ava": "^2.3.31",
+    "browser-ava": "^2.3.32",
     "c8": "^10.1.3",
     "documentation": "^14.0.3",
     "semantic-release": "^24.2.8",

package/src/expression.mjs

@@ -68,27 +68,26 @@ export function parse(context) {
       switch (typeof p) {
         case "string":
         case "number":
-          if(typeof result === 'function') {
+          if (typeof result === "function") {
             const r = [];
-            for(const x of result()) {
+            for (const x of result()) {
               r.push(x[p]);
             }
             result = r;
-          }
-          else {
+          } else {
             result = result[p];
           }
           break;
         case "object":
+          const input = result;
           function* filter() {
-            for (const x of result) {
+            for (const x of input) {
               if (p.eval(p, x)) {
                 yield x;
               }
             }
           }
-          //result = filter;
-          result = [...filter()];
+          result = filter;
       }
     }
 
@@ -119,9 +118,11 @@ export function parse(context) {
           case OPEN_BRACKET: {
             const node = expression(0);
             expect(CLOSE_BRACKET);
-            if (typeof node === "number") {
-              return { eval: pathEval, path: [node] };
+            switch (typeof node) {
+              case "number":
+                return { eval: pathEval, path: [node] };
             }
+
             return node;
           }
         }
@@ -159,8 +160,8 @@ export function parse(context) {
           eval: (node, current) =>
             binop(
               token,
-              left?.eval ? left.eval(left, current) : left,
-              right?.eval ? right.eval(right, current) : right,
+              left.eval ? left.eval(left, current) : left,
+              right.eval ? right.eval(right, current) : right,
               binopError
             ),
           token,
@@ -199,8 +200,8 @@ export function parse(context) {
           eval: (node, current) =>
             binop(
               token,
-              left?.eval ? left.eval(left, current) : left,
-              right?.eval ? right.eval(right, current) : right,
+              left.eval ? left.eval(left, current) : left,
+              right.eval ? right.eval(right, current) : right,
               binopError
             ),
           token,
@@ -238,10 +239,14 @@ export function parse(context) {
 
   advance();
 
-  const result = expression(token.precedence ?? 0);
+  let result = expression(token.precedence ?? 0);
 
   if (context.exec !== false && result?.eval) {
-    return result.eval(result, context.root);
+    result = result.eval(result, context.root);
+
+    if(typeof result === 'function') {
+      return [...result()];
+    }
   }
 
   return result;