pacc 9.2.2 → 9.2.4

package/package.json

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

package/src/ast.mjs

@@ -19,26 +19,7 @@ export function keyedAccessOrGlobalEval(node, current, context) {
   return keyedAccessEval(node, current, context) ?? context.valueFor(node.key);
 }
 
-export function keyedAccessEval(node, current, context) {
-  if (current === undefined) {
-    return undefined;
-  }
-  if (current instanceof Map) {
-    return current.get(node.key);
-  }
-  if (current instanceof Set) {
-    return current.has(node.key) ? node.key : undefined;
-  }
-  if (current instanceof Iterator) {
-    if(typeof node.key === 'number') {
-      for(const item of current.drop(node.key)) {
-        return item;
-      }
-    }
-
-    return current.map(item => item[node.key]);
-  }
-
+function scalarAccessEval(node, current, context) {
   switch (typeof current[node.key]) {
     case "function": {
       const value = current[node.key]();
@@ -56,6 +37,37 @@ export function keyedAccessEval(node, current, context) {
   return current[node.key];
 }
 
+function plain(value) {
+  if (typeof value === "function") {
+    return value();
+  }
+
+  return value;
+}
+
+export function keyedAccessEval(node, current, context) {
+  if (current === undefined) {
+    return undefined;
+  }
+  if (current instanceof Map) {
+    return plain(current.get(node.key));
+  }
+  if (current instanceof Set) {
+    return current.has(node.key) ? node.key : undefined;
+  }
+  if (current instanceof Iterator) {
+    if (typeof node.key === "number") {
+      for (const item of current.drop(node.key)) {
+        return plain(item);
+      }
+    }
+
+    return current.map(item => scalarAccessEval(node, item, context));
+  }
+
+  return scalarAccessEval(node, current, context);
+}
+
 export function filterEval(node, current, context) {
   if (typeof current.values === "function") {
     current = current.values();

package/src/parser.mjs

@@ -3,7 +3,7 @@ import { tokens, EOF } from "./tokens.mjs";
 export function parseOnly(input, context = {}) {
   input = tokens(input, context);
   
-  let node, token, value;
+  let token, value;
 
   function advance() {
     const next = input.next();
@@ -18,9 +18,6 @@ export function parseOnly(input, context = {}) {
   }
 
   const parser = {
-    get node() {
-      return node;
-    },
     get token() {
       return token;
     },
@@ -40,7 +37,7 @@ export function parseOnly(input, context = {}) {
     expression(precedence) {
       const last = token;
       advance();
-      node = last.nud(parser);
+      let node = last.nud(parser);
 
       while (token.precedence > precedence) {
         const last = token;

package/src/tokens.mjs

@@ -187,6 +187,13 @@ function createFilter(parser) {
     case "number":
       return { eval: keyedAccessEval, key: filter };
     default:
+      if (
+        filter.eval === keyedAccessEval ||
+        filter.eval === keyedAccessOrGlobalEval
+      ) {
+        return filter;
+      }
+
       return { eval: filterEval, filter };
   }
 }
@@ -321,7 +328,7 @@ function evalOne(arg, current, context) {
 }
 
 export const globals = {
-  in: (args,current,context) => {
+  in: (args, current, context) => {
     const a = evalOne(args[0], current, context);
     const b = evalOne(args[1], current, context);
 
@@ -373,9 +380,9 @@ export const globals = {
     const data = evalOne(args[0], current, context);
     if (args.length >= 2) {
       let order = 1;
-      if(args.length > 2) {
+      if (args.length > 2) {
         const str = evalOne(args[2], current, context);
-        if(str === 'descending') {
+        if (str === "descending") {
           order = -1;
         }
       }
@@ -383,7 +390,8 @@ export const globals = {
       return data.sort(
         (a, b) =>
           (selector.eval(selector, a, context) -
-          selector.eval(selector, b, context)) * order
+            selector.eval(selector, b, context)) *
+          order
       );
     }
 
@@ -393,7 +401,7 @@ export const globals = {
     const data = evalOne(args[0], current, context);
     const length = evalOne(args[1], current, context);
 
-    if(data instanceof Iterator) {
+    if (data instanceof Iterator) {
       return data.take(length);
     }