@domql/utils 2.3.142 → 2.3.146

package/dist/cjs/object.js

@@ -347,8 +347,6 @@ const overwriteDeep = (obj, params, excludeFrom = []) => {
       continue;
     const objProp = obj[e];
     const paramsProp = params[e];
-    if (!obj.hasOwnProperty(e) || e === "__proto__" || e === "constructor")
-      continue;
     if ((0, import_types.isObjectLike)(objProp) && (0, import_types.isObjectLike)(paramsProp)) {
       overwriteDeep(objProp, paramsProp);
     } else if (paramsProp !== void 0) {

package/dist/cjs/string.js

@@ -18,6 +18,7 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var string_exports = {};
 __export(string_exports, {
+  replaceLiteralsWithObjectFields: () => replaceLiteralsWithObjectFields,
   stringIncludesAny: () => stringIncludesAny
 });
 module.exports = __toCommonJS(string_exports);
@@ -29,3 +30,19 @@ const stringIncludesAny = (str, characters) => {
   }
   return false;
 };
+const replaceLiteralsWithObjectFields = (str, state) => {
+  return str.replace(/\{\{\s*((?:\.\.\/)+)?([^}\s]+)\s*\}\}/g, (_, parentPath, variable) => {
+    if (parentPath) {
+      const parentLevels = parentPath.split("../").filter(Boolean).length;
+      let parentState = state;
+      for (let i = 0; i < parentLevels; i++) {
+        parentState = parentState.parent;
+      }
+      const value = parentState[variable.trim()];
+      return value ? `${value}` : "";
+    } else {
+      const value = state[variable.trim()];
+      return value ? `${value}` : "";
+    }
+  });
+};

package/object.js

@@ -83,7 +83,7 @@ export const deepCloneExclude = (obj, excludeFrom = []) => {
   return o
 }
 
-// Merge array, but exclude keys listed in 'excl'
+// Merge array, but exclude keys listed in 'excl'z
 export const mergeArrayExclude = (arr, excl = []) => {
   return arr.reduce((acc, curr) => deepMerge(acc, deepCloneExclude(curr, excl)), {})
 }
@@ -335,7 +335,6 @@ export const overwriteDeep = (obj, params, excludeFrom = []) => {
     if (excludeFrom.includes(e) || e.startsWith('__')) continue
     const objProp = obj[e]
     const paramsProp = params[e]
-    if (!obj.hasOwnProperty(e) || e === '__proto__' || e === 'constructor') continue
     if (isObjectLike(objProp) && isObjectLike(paramsProp)) {
       overwriteDeep(objProp, paramsProp)
     } else if (paramsProp !== undefined) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@domql/utils",
-  "version": "2.3.142",
+  "version": "2.3.146",
   "license": "MIT",
   "type": "module",
   "module": "index.js",
@@ -23,7 +23,7 @@
     "@domql/key": "latest",
     "@domql/tags": "latest"
   },
-  "gitHead": "5d134dec55390026220f6370a71c82feb6f26aad",
+  "gitHead": "96ed22cf144f9b80ad0532ce6af1393677b5249f",
   "devDependencies": {
     "@babel/core": "^7.12.0"
   }

package/string.js

@@ -3,8 +3,25 @@
 export const stringIncludesAny = (str, characters) => {
   for (const char of characters) {
     if (str.includes(char)) {
-      return true;
+      return true
     }
   }
-  return false;
-}
+  return false
+}
+
+export const replaceLiteralsWithObjectFields = (str, state) => {
+  return str.replace(/\{\{\s*((?:\.\.\/)+)?([^}\s]+)\s*\}\}/g, (_, parentPath, variable) => {
+    if (parentPath) {
+      const parentLevels = parentPath.split('../').filter(Boolean).length
+      let parentState = state
+      for (let i = 0; i < parentLevels; i++) {
+        parentState = parentState.parent
+      }
+      const value = parentState[variable.trim()]
+      return value ? `${value}` : ''
+    } else {
+      const value = state[variable.trim()]
+      return value ? `${value}` : ''
+    }
+  })
+}