pacc 4.24.1 → 4.25.1

package/README.md

@@ -125,6 +125,7 @@ const result = getAttribute({ a: [0,{ b: 4 }]}, "a[1].b");
 *   [DOUBLE\_AMPERSAND](#double_ampersand)
 *   [BAR](#bar)
 *   [DOUBLE\_BAR](#double_bar)
+*   [IDENTIFIER](#identifier)
 *   [EOF](#eof)
 
 ## prepareAttributesDefinitions
@@ -571,6 +572,10 @@ Type: [Token](#token)
 
 Type: [Token](#token)
 
+## IDENTIFIER
+
+Type: [Token](#token)
+
 ## EOF
 
 Type: [Token](#token)

package/package.json

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

package/src/attributes.mjs

@@ -32,7 +32,7 @@ export const types = {
 /**
  * Create attributes from its definition.
  * @param {Object} newDefinitions
- * @param {Object} [presentDefinitions] optional merg in attributes
+ * @param {Object} [presentDefinitions] optional merge in attributes
  * @return {Object} attributes
  */
 export function prepareAttributesDefinitions(

package/src/expand.mjs

@@ -2,9 +2,20 @@ import { parse } from "./expression.mjs";
 
 const maxNestingLevel = 5;
 
-export function expand(object, context) {
+/**
+ *
+ * @param {any} object
+ * @param {Object} context
+ * @param {any} context.root
+ * @param {function} context.stopClass
+ * @returns {any}
+ */
+export function expand(object, context = {}) {
   const promises = [];
 
+  const leadIn = context.leadIn ?? "${";
+  const leadOut = context.leadOut ?? "}";
+
   function _expand(object, path) {
     if (path.length >= maxNestingLevel) {
       throw new Error(
@@ -13,27 +24,70 @@ export function expand(object, context) {
     }
 
     if (typeof object === "string" || object instanceof String) {
-      let wholeValue;
+      let result = "";
 
       const localPromises = [];
+
+      let cur = 0;
+      let start;
+
+      while ((start = object.indexOf(leadIn, cur)) >= 0) {
+        const end = object.indexOf(leadOut, cur + leadIn.length);
+
+        if (end >= 0) {
+          const expression = object.substring(start + leadIn.length, end);
+
+          let value = parse(expression, context);
+          if (value === undefined) {
+            result += object.substring(start, end + leadOut.length);
+          } else {
+            if (typeof value === "string") {
+              value = _expand(value, path);
+            }
+            if (value instanceof Promise) {
+              localPromises.push(value);
+              value = localPromises.length - 1;
+            }
+
+            if (start === 0 && end === object.length - leadOut.length) {
+              return value;
+            }
+            result += object.substring(cur, start) + value;
+          }
+
+          cur = end + leadOut.length;
+        } else {
+          throw new Error(
+            `Unterminated expression between '${leadIn}' and '${leadOut}'`
+          );
+        }
+      }
+
+      result += object.substring(cur);
+
+      return result;
+      /*
       const v = object.replace(
         /\$\{([^\}]*)\}/g,
         (match, expression, offset, string) => {
-          let value = parse(expression,context);
+          let value = parse(expression, context);
 
           if (typeof value === "string" || value instanceof String) {
             value = _expand(value, path);
           } else if (value === undefined) {
-            value = "${" + expression + "}";
+            value = leadIn + expression + leadOut;
           }
-          if (string.length === expression.length + 3) {
+          if (
+            string.length ===
+            expression.length + leadIn.length + leadOut.length
+          ) {
             wholeValue = value;
             return "";
           }
 
           if (value instanceof Promise) {
             localPromises.push(value);
-            return "${" + (localPromises.length - 1) + "}";
+            return leadIn + (localPromises.length - 1) + leadOut;
           }
           return value;
         }
@@ -50,6 +104,7 @@ export function expand(object, context) {
       }
 
       return v;
+      */
     }
 
     switch (typeof object) {
@@ -114,7 +169,7 @@ export function expand(object, context) {
       return array;
     }
 
-    if(object instanceof context.stopClass) {
+    if (context.stopClass && object instanceof context.stopClass) {
       return object;
     }
 

package/types/attributes.d.mts

@@ -1,7 +1,7 @@
 /**
  * Create attributes from its definition.
  * @param {Object} newDefinitions
- * @param {Object} [presentDefinitions] optional merg in attributes
+ * @param {Object} [presentDefinitions] optional merge in attributes
  * @return {Object} attributes
  */
 export function prepareAttributesDefinitions(newDefinitions: any, presentDefinitions?: any): any;

package/types/expand.d.mts

@@ -1 +1,12 @@
-export function expand(object: any, context: any): any;
+/**
+ *
+ * @param {any} object
+ * @param {Object} context
+ * @param {any} context.root
+ * @param {function} context.stopClass
+ * @returns {any}
+ */
+export function expand(object: any, context?: {
+    root: any;
+    stopClass: Function;
+}): any;