pacc 9.2.3 → 9.2.5

package/benchmark/first.mjs

@@ -0,0 +1,48 @@
+import { run, bench, boxplot, summary } from "mitata";
+import { tokens } from "../src/tokens.mjs";
+import { parse, parseOnly } from "../src/parser.mjs";
+
+const root = new Map([
+  ["a", { n: 1, l: [1, 2] }],
+  ["b", { n: 3, x: 7, l: [3, 4] }],
+  [
+    "c",
+    {
+      d: {
+        e: { f: { g: { h: { i: { j: { k: { l: { m: { n: "xyz" } } } } } } } } }
+      }
+    }
+  ]
+]);
+
+const root2 = {
+  a: {
+    b: {
+      c: {
+        d: {
+          e: {
+            f: { g: { h: { i: { j: { k: { l: { m: { n: "xyz" } } } } } } } }
+          }
+        }
+      }
+    }
+  }
+};
+
+bench('"[n<5].l"', () => parse("[n<5].l", { root }));
+
+
+const expression = "a.b.c.d.e.f.g.h.i.j.k.l.m.n";
+
+bench('"a.b.c.d.e.f.g.h.i.j.k.l.m.n"', () =>
+  parse(expression, { root: root2 })
+);
+
+bench('parseOnly "a.b.c.d.e.f.g.h.i.j.k.l.m.n"', () =>
+  parseOnly(expression, { })
+);
+bench('tokens "a.b.c.d.e.f.g.h.i.j.k.l.m.n"', () =>
+  Array.from(tokens(expression, { }))
+);
+
+await run();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pacc",
-  "version": "9.2.3",
+  "version": "9.2.5",
   "publishConfig": {
     "access": "public",
     "provenance": true
@@ -29,6 +29,7 @@
   ],
   "license": "0BSD",
   "scripts": {
+    "benchmark": "node benchmark/*.mjs",
     "prepare": "node --run prepare:typescript",
     "prepare:typescript": "tsc --allowJs --declaration --emitDeclarationOnly --declarationDir types --resolveJsonModule --target esnext -m esnext --module nodenext --moduleResolution nodenext --rootDir src ./src**/*.mjs",
     "test": "node --run test:browser-ava && node --run test:ava",
@@ -41,10 +42,12 @@
     "lint:typescript": "tsc --allowJs --checkJs --noEmit --resolveJsonModule --target esnext -m esnext --module nodenext --moduleResolution nodenext ./src**/*.mjs"
   },
   "devDependencies": {
+    "@mitata/counters": "^0.0.8",
     "ava": "^6.4.1",
     "browser-ava": "^2.3.53",
     "c8": "^10.1.3",
     "documentation": "^14.0.3",
+    "mitata": "^1.0.34",
     "semantic-release": "^25.0.3",
     "typescript": "^5.9.3"
   },

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

@@ -1,6 +1,6 @@
 import { tokens, EOF } from "./tokens.mjs";
 
-export function parseOnly(input, context = {}) {
+export function parseOnly(input, context) {
   input = tokens(input, context);
   
   let token, value;
@@ -54,7 +54,7 @@ export function parseOnly(input, context = {}) {
   return parser.expression(0);
 }
 
-export function parse(input, context) {
+export function parse(input, context={}) {
   const result = parseOnly(input, context);
   return result.eval ? result.eval(result, context.root, context) : result;
 }

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);
     }
 

package/types/parser.d.mts

@@ -1,2 +1,2 @@
-export function parseOnly(input: any, context?: {}): any;
-export function parse(input: any, context: any): any;
+export function parseOnly(input: any, context: any): any;
+export function parse(input: any, context?: {}): any;