content-entry-transform 1.3.20 → 1.4.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "content-entry-transform",
-  "version": "1.3.20",
+  "version": "1.4.2",
   "publishConfig": {
     "access": "public"
   },
@@ -25,7 +25,7 @@
     "lint:docs": "documentation lint ./src/**/*.mjs"
   },
   "dependencies": {
-    "content-entry": "^5.0.1",
+    "content-entry": "^5.0.2",
     "iterable-string-interceptor": "^2.0.0"
   },
   "devDependencies": {

package/src/expression-transformer.mjs

@@ -4,9 +4,39 @@ import { iterableStringInterceptor } from "iterable-string-interceptor";
 export const utf8StreamOptions = { encoding: "utf8" };
 
 export function createPropertiesInterceptor(properties) {
-  return async function* transformer(expression, remainder, source, cb) {
-    const value = properties[expression];
-    yield value === undefined ? "" : value;
+  return async function* transformer(
+    expression,
+    remainder,
+    source,
+    cb,
+    leadIn,
+    leadOut
+  ) {
+    function ev(e, deepth) {
+      if (deepth > 9) {
+        throw new Error(
+          `Probably circular reference evaluating: ${expression}`
+        );
+      }
+      const value = properties[e];
+      if (value !== undefined) {
+        if (typeof value === "string") {
+          const li = value.indexOf(leadIn);
+          if (li >= 0) {
+            const lo = value.indexOf(leadOut, li + leadIn.length);
+            return (
+              value.substring(0, li) +
+              ev(value.substring(li + leadIn.length, lo), deepth + 1) +
+              value.substring(lo + leadOut.length)
+            );
+          }
+        }
+        return value;
+      }
+      return "";
+    }
+
+    yield ev(expression, 0);
   };
 }