@domql/element 3.7.3 → 3.7.4

package/dist/cjs/mixins/attr.js

@@ -32,7 +32,10 @@ function attr(params, element, node) {
     const attrs = (0, import_utils.exec)(params, element);
     if (props.attr) (0, import_utils.deepMerge)(attrs, props.attr);
     for (const attr2 in attrs) {
-      const val = (0, import_utils.exec)(attrs[attr2], element);
+      let val = (0, import_utils.exec)(attrs[attr2], element);
+      if ((0, import_utils.isString)(val) && val.includes("{{") && element.call) {
+        val = element.call("replaceLiteralsWithObjectFields", val, element.state);
+      }
       if (val === __attr[attr2]) continue;
       if (val !== false && val !== void 0 && val !== null && node.setAttribute) {
         node.setAttribute(attr2, val);

package/dist/cjs/mixins/html.js

@@ -24,7 +24,10 @@ __export(html_exports, {
 module.exports = __toCommonJS(html_exports);
 var import_utils = require("@domql/utils");
 function html(param, element, node) {
-  const prop = (0, import_utils.exec)(param ?? element?.props?.html, element);
+  let prop = (0, import_utils.exec)(param ?? element?.props?.html, element);
+  if ((0, import_utils.isString)(prop) && prop.includes("{{") && element.call) {
+    prop = element.call("replaceLiteralsWithObjectFields", prop, element.state);
+  }
   const { __ref } = element;
   if (prop !== __ref.__html) {
     if (node.nodeName === "SVG") node.textContent = prop;

package/dist/esm/mixins/attr.js

@@ -1,4 +1,4 @@
-import { deepMerge, exec, isNot } from "@domql/utils";
+import { deepMerge, exec, isNot, isString } from "@domql/utils";
 import { report } from "@domql/report";
 function attr(params, element, node) {
   const { __ref: ref, props } = element;
@@ -8,7 +8,10 @@ function attr(params, element, node) {
     const attrs = exec(params, element);
     if (props.attr) deepMerge(attrs, props.attr);
     for (const attr2 in attrs) {
-      const val = exec(attrs[attr2], element);
+      let val = exec(attrs[attr2], element);
+      if (isString(val) && val.includes("{{") && element.call) {
+        val = element.call("replaceLiteralsWithObjectFields", val, element.state);
+      }
       if (val === __attr[attr2]) continue;
       if (val !== false && val !== void 0 && val !== null && node.setAttribute) {
         node.setAttribute(attr2, val);

package/dist/esm/mixins/html.js

@@ -1,6 +1,9 @@
-import { exec } from "@domql/utils";
+import { exec, isString } from "@domql/utils";
 function html(param, element, node) {
-  const prop = exec(param ?? element?.props?.html, element);
+  let prop = exec(param ?? element?.props?.html, element);
+  if (isString(prop) && prop.includes("{{") && element.call) {
+    prop = element.call("replaceLiteralsWithObjectFields", prop, element.state);
+  }
   const { __ref } = element;
   if (prop !== __ref.__html) {
     if (node.nodeName === "SVG") node.textContent = prop;

package/dist/iife/index.js

@@ -1080,14 +1080,17 @@ var DomqlElement = (() => {
         }
         return element;
       };
-      trackSourcemapDeep = (sourcemap, obj, sourceName) => {
+      trackSourcemapDeep = (sourcemap, obj, sourceName, seen) => {
+        if (!seen) seen = /* @__PURE__ */ new WeakSet();
+        if (seen.has(obj)) return;
+        seen.add(obj);
         for (const key in obj) {
           if (!Object.prototype.hasOwnProperty.call(obj, key)) continue;
           if (key === "__proto__" || key === "constructor" || key === "prototype") continue;
           const val = obj[key];
           if (isObject(val) && !isArray(val)) {
             sourcemap[key] = sourcemap[key] || {};
-            trackSourcemapDeep(sourcemap[key], val, sourceName);
+            trackSourcemapDeep(sourcemap[key], val, sourceName, seen);
           } else {
             sourcemap[key] = sourceName;
           }
@@ -3451,12 +3454,12 @@ var DomqlElement = (() => {
       const result = fn.call(this, ...args);
       if (result && typeof result.then === "function") {
         result.catch((err) => {
-          this.error = err;
+          error.call(this, err);
         });
       }
       return result;
     } catch (err) {
-      this.error = err;
+      error.call(this, err);
       if (context?.strictMode) throw err;
     }
   }
@@ -4299,7 +4302,10 @@ ${element}` : "";
       const attrs = exec(params, element);
       if (props.attr) deepMerge(attrs, props.attr);
       for (const attr2 in attrs) {
-        const val = exec(attrs[attr2], element);
+        let val = exec(attrs[attr2], element);
+        if (isString(val) && val.includes("{{") && element.call) {
+          val = element.call("replaceLiteralsWithObjectFields", val, element.state);
+        }
         if (val === __attr[attr2]) continue;
         if (val !== false && val !== void 0 && val !== null && node.setAttribute) {
           node.setAttribute(attr2, val);
@@ -4360,7 +4366,10 @@ ${element}` : "";
   // mixins/html.js
   init_esm();
   function html(param, element, node) {
-    const prop = exec(param ?? element?.props?.html, element);
+    let prop = exec(param ?? element?.props?.html, element);
+    if (isString(prop) && prop.includes("{{") && element.call) {
+      prop = element.call("replaceLiteralsWithObjectFields", prop, element.state);
+    }
     const { __ref } = element;
     if (prop !== __ref.__html) {
       if (node.nodeName === "SVG") node.textContent = prop;

package/mixins/attr.js

@@ -1,6 +1,6 @@
 'use strict'
 
-import { deepMerge, exec, isNot } from '@domql/utils'
+import { deepMerge, exec, isNot, isString } from '@domql/utils'
 import { report } from '@domql/report'
 
 /**
@@ -14,7 +14,10 @@ export function attr (params, element, node) {
     const attrs = exec(params, element)
     if (props.attr) deepMerge(attrs, props.attr)
     for (const attr in attrs) {
-      const val = exec(attrs[attr], element)
+      let val = exec(attrs[attr], element)
+      if (isString(val) && val.includes('{{') && element.call) {
+        val = element.call('replaceLiteralsWithObjectFields', val, element.state)
+      }
       if (val === __attr[attr]) continue
       if (
         val !== false &&

package/mixins/html.js

@@ -1,13 +1,16 @@
 'use strict'
 
-import { exec } from '@domql/utils'
+import { exec, isString } from '@domql/utils'
 
 /**
  * Appends raw HTML as content
  * an original one as a child
  */
 export function html (param, element, node) {
-  const prop = exec(param ?? element?.props?.html, element)
+  let prop = exec(param ?? element?.props?.html, element)
+  if (isString(prop) && prop.includes('{{') && element.call) {
+    prop = element.call('replaceLiteralsWithObjectFields', prop, element.state)
+  }
   const { __ref } = element
   if (prop !== __ref.__html) {
     if (node.nodeName === 'SVG') node.textContent = prop

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@domql/element",
-  "version": "3.7.3",
+  "version": "3.7.4",
   "license": "CC-BY-NC-4.0",
   "type": "module",
   "module": "./dist/esm/index.js",
@@ -46,10 +46,10 @@
     "build:iife": "cross-env NODE_ENV=$NODE_ENV esbuild index.js --bundle --target=es2020 --format=iife --global-name=DomqlElement --outfile=dist/iife/index.js --define:process.env.NODE_ENV=process.env.NODE_ENV"
   },
   "dependencies": {
-    "@domql/report": "^3.7.3",
-    "@domql/state": "^3.7.3",
-    "@domql/utils": "^3.7.3",
-    "attrs-in-props": "^3.7.3"
+    "@domql/report": "^3.7.4",
+    "@domql/state": "^3.7.4",
+    "@domql/utils": "^3.7.4",
+    "attrs-in-props": "^3.7.4"
   },
   "gitHead": "9fc1b79b41cdc725ca6b24aec64920a599634681",
   "devDependencies": {