pacc 4.18.3 → 4.20.0

package/package.json

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

package/src/expand.mjs

@@ -0,0 +1,33 @@
+import { parse } from "./expression.mjs";
+import { tokens } from "./tokens.mjs";
+
+export function expand(object, context) {
+  switch (typeof object) {
+    case "string":
+      return object.replaceAll(/\$\{([^\}]*)\}/g, (match, m1) => {
+        context.tokens = tokens(m1);
+        return parse(context) ?? "${" + m1 + "}";
+      });
+
+    case "object":
+      if (object instanceof Map) {
+        return new Map(
+          [...object].map(([k, v]) => [expand(k, context), expand(v, context)])
+        );
+      }
+
+      if (object instanceof Set) {
+        return new Set([...object].map(e => expand(e, context)));
+      }
+
+      if (Array.isArray(object)) {
+        return object.map(e => expand(e, context));
+      }
+
+      return Object.fromEntries(
+        Object.entries(object).map(([k, v]) => [k, expand(v, context)])
+      );
+  }
+
+  return object;
+}

package/src/expression.mjs

@@ -75,7 +75,7 @@ export function parse(context) {
             }
             result = r;
           } else {
-            result = result[p];
+            result = result[p] ?? context.globals?.[p];
           }
           break;
         case "object":
@@ -172,8 +172,10 @@ export function parse(context) {
 
       case "infix": {
         let right = expression(token.precedence);
+
         if (typeof left === typeof right) {
           switch (typeof left) {
+            case "string":
             case "number":
             case "bigint":
               return binop(token, left, right, binopError);

package/src/module.mjs

@@ -4,6 +4,8 @@ export * from "./multiple.mjs";
 export * from "./attributes.mjs";
 export * from "./common-attributes.mjs";
 export * from "./properties.mjs";
+export * from "./expression.mjs";
+export * from "./expand.mjs";
 export {
   setAttribute,
   getAttribute,

package/types/expand.d.mts

@@ -0,0 +1 @@
+export function expand(object: any, context: any): any;

package/types/module.d.mts

@@ -4,4 +4,6 @@ export * from "./multiple.mjs";
 export * from "./attributes.mjs";
 export * from "./common-attributes.mjs";
 export * from "./properties.mjs";
+export * from "./expression.mjs";
+export * from "./expand.mjs";
 export { setAttribute, getAttribute, getAttributeAndOperator } from "./settergetter.mjs";