pacc 4.23.1 → 4.24.1

package/package.json

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

package/src/expand.mjs

@@ -1,5 +1,4 @@
 import { parse } from "./expression.mjs";
-import { tokens } from "./tokens.mjs";
 
 const maxNestingLevel = 5;
 
@@ -20,8 +19,7 @@ export function expand(object, context) {
       const v = object.replace(
         /\$\{([^\}]*)\}/g,
         (match, expression, offset, string) => {
-          context.tokens = tokens(expression);
-          let value = parse(context);
+          let value = parse(expression,context);
 
           if (typeof value === "string" || value instanceof String) {
             value = _expand(value, path);

package/src/expression.mjs

@@ -1,4 +1,5 @@
 import {
+  tokens,
   DOT,
   OPEN_ROUND,
   CLOSE_ROUND,
@@ -51,7 +52,9 @@ export function binop(op, left, right, fallback) {
   return fallback(op, left, right);
 }
 
-export function parse(context) {
+export function parse(input, context = {}) {
+  input = tokens(input);
+
   let node, token, value;
 
   function error(message) {
@@ -76,13 +79,17 @@ export function parse(context) {
             }
             result = r;
           } else {
-            result = result[p] ?? context.globals?.[p];
+            if (result instanceof Map) {
+              result = result.get(p);
+            } else {
+              result = result[p] ?? context.globals?.[p];
+            }
           }
           break;
         case "object":
-          const input = result;
+          const r = result;
           function* filter() {
-            for (const x of input) {
+            for (const x of r) {
               if (p.eval(p, x)) {
                 yield x;
               }
@@ -96,7 +103,7 @@ export function parse(context) {
   };
 
   const advance = () => {
-    const next = context.tokens.next();
+    const next = input.next();
     if (next.done) {
       token = EOF;
     } else {

package/src/settergetter.mjs

@@ -28,7 +28,7 @@ import { prepareValue } from "./attributes.mjs";
  * @param {Object} definition type def
  */
 export function setAttribute(object, expression, value, definition) {
-  const { path } = parse({ tokens: tokens(expression), exec: false });
+  const { path } = parse(expression, { exec: false });
 
   let anchor, anchorKey;
 
@@ -61,7 +61,7 @@ export function setAttribute(object, expression, value, definition) {
  * @returns {any} value associated with the given property name
  */
 export function getAttribute(object, expression, definition) {
-  const { path } = parse({ tokens: tokens(expression), exec: false });
+  const { path } = parse(expression, { exec: false });
 
   for (const key of path) {
     if (object !== undefined) {

package/types/expression.d.mts

@@ -1,2 +1,2 @@
 export function binop(op: any, left: any, right: any, fallback: any): any;
-export function parse(context: any): any;
+export function parse(input: any, context?: {}): any;