content-entry-transform 1.3.18 → 1.4.0

package/README.md

@@ -27,7 +27,7 @@ transform content entries
 ## createPropertiesTransformer
 
 Creates a new transformer.
-On match the enrtry will be assigned new properties as given by propertyDefinitions.
+On match the entry will be assigned new properties as given by propertyDefinitions.
 
 ### Parameters
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "content-entry-transform",
-  "version": "1.3.18",
+  "version": "1.4.0",
   "publishConfig": {
     "access": "public"
   },
@@ -25,12 +25,12 @@
     "lint:docs": "documentation lint ./src/**/*.mjs"
   },
   "dependencies": {
-    "content-entry": "^4.1.11",
+    "content-entry": "^5.0.1",
     "iterable-string-interceptor": "^2.0.0"
   },
   "devDependencies": {
     "ava": "^4.2.0",
-    "c8": "^7.11.0",
+    "c8": "^7.11.3",
     "documentation": "^13.2.5",
     "semantic-release": "^19.0.2"
   },

package/src/expression-transformer.mjs

@@ -4,9 +4,31 @@ 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 ev(value.substring(li + leadIn.length, lo), deepth + 1);
+          }
+        }
+        return value;
+      }
+      return "";
+    }
+
+    yield ev(expression, 0);
   };
 }
 

package/src/properties-transformer.mjs

@@ -1,6 +1,6 @@
 /**
  * Creates a new transformer.
- * On match the enrtry will be assigned new properties as given by propertyDefinitions.
+ * On match the entry will be assigned new properties as given by propertyDefinitions.
  * @param {Object} propertyDefinitions
  * @param {Matcher} matcher
  * @return {Transformer}