pacc 8.1.4 → 8.1.6

package/package.json

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

package/src/ast.mjs

@@ -99,15 +99,17 @@ export function pathEval(node, current, context) {
             if (collection) {
               current = current.map(x => x[item]);
             } else {
-              if (current instanceof Map) {
-                current = current.get(item);
-              } else {
-                current = current[item] ?? context.getGlobal(item);
-              }
+              current =
+                (current instanceof Map ? current.get(item) : current[item]) ??
+                context.getGlobal(item);
             }
         }
         break;
       case "object":
+        if (current.values) {
+          current = current.values();
+        }
+
         current = current.filter(c => item.eval(item, c, context));
         collection = true;
     }

package/src/expression.mjs

@@ -64,7 +64,7 @@ export function parse(input, context = {}) {
             return node;
           }
           case OPEN_BRACKET: {
-            if(token === CLOSE_BRACKET) {
+            if (token === CLOSE_BRACKET) {
               advance();
               return ASTNodeTrue;
             }
@@ -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;
@@ -186,9 +180,14 @@ export function parse(input, context = {}) {
             return left;
           }
           case OPEN_BRACKET: {
-            const predicate = expression(0);
-            expect(CLOSE_BRACKET);
-            left.path.push(predicate);
+            if (token === CLOSE_BRACKET) {
+              advance();
+              left.path.push(ASTNodeTrue);
+            } else {
+              const predicate = expression(0);
+              expect(CLOSE_BRACKET);
+              left.path.push(predicate);
+            }
             return left;
           }
         }