domql 1.6.56 → 1.6.58

package/dist/cjs/element/iterate.js

@@ -49,9 +49,15 @@ const throughUpdatedExec = (element, options = { excludes: import_utils2.METHODS
       continue;
     const newExec = ref.__exec[param](element, element.state, element.context);
     const execReturnsString = (0, import_utils.isString)(newExec) || (0, import_utils.isNumber)(newExec);
-    if (prop && prop.node && execReturnsString) {
-      (0, import_utils2.overwrite)(prop, { text: newExec }, options);
-    } else if (newExec !== prop) {
+    if (prop && prop.node) {
+      if (execReturnsString) {
+        (0, import_utils2.overwrite)(prop, { text: newExec }, options);
+      } else if ((0, import_utils2.checkIfKeyIsComponent)(param)) {
+        const { extend, ...newElem } = (0, import_utils2.extendizeByKey)(newExec, element, param);
+        console.log(newElem);
+        (0, import_utils2.overwrite)(prop, newElem, options);
+      }
+    } else if (!execReturnsString && newExec !== prop) {
       ref.__cached[param] = changes[param] = prop;
       element[param] = newExec;
     }

package/dist/esm/index.js

@@ -2590,6 +2590,7 @@ var require_string2 = __commonJS({
     var __toCommonJS2 = (mod) => __copyProps2(__defProp2({}, "__esModule", { value: true }), mod);
     var string_exports = {};
     __export2(string_exports, {
+      replaceLiteralsWithObjectFields: () => replaceLiteralsWithObjectFields,
       stringIncludesAny: () => stringIncludesAny
     });
     module.exports = __toCommonJS2(string_exports);
@@ -2601,6 +2602,25 @@ var require_string2 = __commonJS({
       }
       return false;
     };
+    var replaceLiteralsWithObjectFields = (str, state2) => {
+      return str.replace(/\{\{\s*((?:\.\.\/)+)?([^}\s]+)\s*\}\}/g, (_, parentPath, variable) => {
+        if (parentPath) {
+          const parentLevels = parentPath.match(/\.\.\//g).length;
+          let parentState = state2;
+          for (let i = 0; i < parentLevels; i++) {
+            parentState = parentState.parent;
+            if (!parentState) {
+              return "";
+            }
+          }
+          const value = parentState[variable.trim()];
+          return value !== void 0 ? `${value}` : "";
+        } else {
+          const value = state2[variable.trim()];
+          return value !== void 0 ? `${value}` : "";
+        }
+      });
+    };
   }
 });
 
@@ -5304,9 +5324,15 @@ var throughUpdatedExec = (element, options = { excludes: METHODS_EXL }) => {
       continue;
     const newExec = ref.__exec[param](element, element.state, element.context);
     const execReturnsString = (0, import_utils7.isString)(newExec) || (0, import_utils7.isNumber)(newExec);
-    if (prop && prop.node && execReturnsString) {
-      overwrite(prop, { text: newExec }, options);
-    } else if (newExec !== prop) {
+    if (prop && prop.node) {
+      if (execReturnsString) {
+        overwrite(prop, { text: newExec }, options);
+      } else if (checkIfKeyIsComponent(param)) {
+        const { extend, ...newElem } = extendizeByKey(newExec, element, param);
+        console.log(newElem);
+        overwrite(prop, newElem, options);
+      }
+    } else if (!execReturnsString && newExec !== prop) {
       ref.__cached[param] = changes[param] = prop;
       element[param] = newExec;
     }

package/dist/iife/index.js

@@ -2592,6 +2592,7 @@ ${element}` : ""
       var __toCommonJS2 = (mod) => __copyProps2(__defProp2({}, "__esModule", { value: true }), mod);
       var string_exports = {};
       __export2(string_exports, {
+        replaceLiteralsWithObjectFields: () => replaceLiteralsWithObjectFields,
         stringIncludesAny: () => stringIncludesAny
       });
       module.exports = __toCommonJS2(string_exports);
@@ -2603,6 +2604,25 @@ ${element}` : ""
         }
         return false;
       };
+      var replaceLiteralsWithObjectFields = (str, state2) => {
+        return str.replace(/\{\{\s*((?:\.\.\/)+)?([^}\s]+)\s*\}\}/g, (_, parentPath, variable) => {
+          if (parentPath) {
+            const parentLevels = parentPath.match(/\.\.\//g).length;
+            let parentState = state2;
+            for (let i = 0; i < parentLevels; i++) {
+              parentState = parentState.parent;
+              if (!parentState) {
+                return "";
+              }
+            }
+            const value = parentState[variable.trim()];
+            return value !== void 0 ? `${value}` : "";
+          } else {
+            const value = state2[variable.trim()];
+            return value !== void 0 ? `${value}` : "";
+          }
+        });
+      };
     }
   });
 
@@ -5306,9 +5326,15 @@ ${element}` : ""
         continue;
       const newExec = ref.__exec[param](element, element.state, element.context);
       const execReturnsString = (0, import_utils7.isString)(newExec) || (0, import_utils7.isNumber)(newExec);
-      if (prop && prop.node && execReturnsString) {
-        overwrite(prop, { text: newExec }, options);
-      } else if (newExec !== prop) {
+      if (prop && prop.node) {
+        if (execReturnsString) {
+          overwrite(prop, { text: newExec }, options);
+        } else if (checkIfKeyIsComponent(param)) {
+          const { extend, ...newElem } = extendizeByKey(newExec, element, param);
+          console.log(newElem);
+          overwrite(prop, newElem, options);
+        }
+      } else if (!execReturnsString && newExec !== prop) {
         ref.__cached[param] = changes[param] = prop;
         element[param] = newExec;
       }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "domql",
   "description": "DOM rendering Javascript framework at early stage.",
-  "version": "1.6.56",
+  "version": "1.6.58",
   "repository": "https://github.com/domql/domql",
   "publishConfig": {
     "registry": "https://registry.npmjs.org"

package/src/element/iterate.js

@@ -33,8 +33,11 @@ export const throughUpdatedExec = (element, options = { excludes: METHODS_EXL })
       if (execReturnsString) {
         overwrite(prop, { text: newExec }, options)
       } else if (checkIfKeyIsComponent(param)) {
-        const { extend, ...newElem } = extendizeByKey(newExec)
+        const { extend, ...newElem } = extendizeByKey(newExec, element, param)
+        console.log(newElem)
         overwrite(prop, newElem, options)
+      } else {
+        overwrite(prop, newExec, options)
       }
     } else if (!execReturnsString && newExec !== prop) {
       ref.__cached[param] = changes[param] = prop