@domql/element 3.7.3 → 3.7.5

package/create.js

@@ -286,7 +286,11 @@ const onlyResolveExtends = (element, parent, key, options) => {
         !optionsHasDefine &&
         !contextHasDefine
       ) {
-        create(exec(element[k], element), element, k, options)
+        try {
+          create(exec(element[k], element), element, k, options)
+        } catch (e) {
+          console.warn('[DOMQL] onlyResolveExtends child error in', k, ':', e?.message || e)
+        }
       }
     }
   }

package/dist/cjs/create.js

@@ -201,7 +201,11 @@ const onlyResolveExtends = (element, parent, key, options) => {
       if (!ref.__skipCreate && import_mixins.REGISTRY[k] && !optionsHasDefine) {
         continue;
       } else if (element[k] && !hasDefine && !optionsHasDefine && !contextHasDefine) {
-        create((0, import_utils.exec)(element[k], element), element, k, options);
+        try {
+          create((0, import_utils.exec)(element[k], element), element, k, options);
+        } catch (e) {
+          console.warn("[DOMQL] onlyResolveExtends child error in", k, ":", e?.message || e);
+        }
       }
     }
   }

package/dist/cjs/iterate.js

@@ -33,13 +33,19 @@ const throughInitialExec = (element, exclude = {}) => {
     const prop = element[param];
     if ((0, import_utils.isFunction)(prop) && !(0, import_utils.isMethod)(param, element)) {
       ref.__exec[param] = prop;
-      const result = prop(element, element.state, element.context);
-      if (result && typeof result.then === "function") {
-        result.then((resolved) => {
-          element[param] = resolved;
-        });
-      } else {
-        element[param] = result;
+      try {
+        const result = prop(element, element.state, element.context);
+        if (result && typeof result.then === "function") {
+          result.then((resolved) => {
+            element[param] = resolved;
+          }).catch((e) => {
+            console.warn("[DOMQL] Async exec error in", param, ":", e?.message || e);
+          });
+        } else {
+          element[param] = result;
+        }
+      } catch (e) {
+        console.warn("[DOMQL] Exec error in", param, ":", e?.message || e);
       }
     }
   }

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/esm/create.js

@@ -192,7 +192,11 @@ const onlyResolveExtends = (element, parent, key, options) => {
       if (!ref.__skipCreate && REGISTRY[k] && !optionsHasDefine) {
         continue;
       } else if (element[k] && !hasDefine && !optionsHasDefine && !contextHasDefine) {
-        create(exec(element[k], element), element, k, options);
+        try {
+          create(exec(element[k], element), element, k, options);
+        } catch (e) {
+          console.warn("[DOMQL] onlyResolveExtends child error in", k, ":", e?.message || e);
+        }
       }
     }
   }

package/dist/esm/iterate.js

@@ -16,13 +16,19 @@ const throughInitialExec = (element, exclude = {}) => {
     const prop = element[param];
     if (isFunction(prop) && !isMethod(param, element)) {
       ref.__exec[param] = prop;
-      const result = prop(element, element.state, element.context);
-      if (result && typeof result.then === "function") {
-        result.then((resolved) => {
-          element[param] = resolved;
-        });
-      } else {
-        element[param] = result;
+      try {
+        const result = prop(element, element.state, element.context);
+        if (result && typeof result.then === "function") {
+          result.then((resolved) => {
+            element[param] = resolved;
+          }).catch((e) => {
+            console.warn("[DOMQL] Async exec error in", param, ":", e?.message || e);
+          });
+        } else {
+          element[param] = result;
+        }
+      } catch (e) {
+        console.warn("[DOMQL] Exec error in", param, ":", e?.message || e);
       }
     }
   }

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/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;
           }
@@ -1938,7 +1941,9 @@ var DomqlElement = (() => {
           );
           createClient = mod.createClient;
         }
-        return supabaseAdapter(createClient(supabaseUrl, key, options));
+        const client = createClient(supabaseUrl, key, options);
+        if (!client || !client.auth) return null;
+        return supabaseAdapter(client);
       };
       applyFilters = (query, params) => {
         if (!params) return query;
@@ -2570,7 +2575,7 @@ var DomqlElement = (() => {
         return resolved;
       };
       initAdapterAuth = async (adapter, context) => {
-        if (adapter.__authInitialized) return;
+        if (!adapter || adapter.__authInitialized) return;
         adapter.__authInitialized = true;
         if (!adapter.getSession) return;
         const updateAuth = (user, session) => {
@@ -2602,9 +2607,10 @@ var DomqlElement = (() => {
         if (db.__resolving) return db.__resolving;
         db.__resolving = resolveDb(db);
         const resolved = await db.__resolving;
+        delete db.__resolving;
+        if (!resolved) return null;
         db.__resolved = resolved;
         context.fetch = resolved;
-        delete db.__resolving;
         if (db.auth !== false) await initAdapterAuth(resolved, context);
         return resolved;
       };
@@ -3451,12 +3457,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;
     }
   }
@@ -4137,13 +4143,19 @@ ${element}` : "";
       const prop = element[param];
       if (isFunction(prop) && !isMethod(param, element)) {
         ref.__exec[param] = prop;
-        const result = prop(element, element.state, element.context);
-        if (result && typeof result.then === "function") {
-          result.then((resolved) => {
-            element[param] = resolved;
-          });
-        } else {
-          element[param] = result;
+        try {
+          const result = prop(element, element.state, element.context);
+          if (result && typeof result.then === "function") {
+            result.then((resolved) => {
+              element[param] = resolved;
+            }).catch((e) => {
+              console.warn("[DOMQL] Async exec error in", param, ":", e?.message || e);
+            });
+          } else {
+            element[param] = result;
+          }
+        } catch (e) {
+          console.warn("[DOMQL] Exec error in", param, ":", e?.message || e);
         }
       }
     }
@@ -4299,7 +4311,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);
@@ -6628,7 +6643,11 @@ ${element}` : "";
         if (!ref.__skipCreate && REGISTRY[k] && !optionsHasDefine) {
           continue;
         } else if (element[k] && !hasDefine && !optionsHasDefine && !contextHasDefine) {
-          create(exec(element[k], element), element, k, options);
+          try {
+            create(exec(element[k], element), element, k, options);
+          } catch (e) {
+            console.warn("[DOMQL] onlyResolveExtends child error in", k, ":", e?.message || e);
+          }
         }
       }
     }

package/iterate.js

@@ -19,13 +19,19 @@ export const throughInitialExec = (element, exclude = {}) => {
     const prop = element[param]
     if (isFunction(prop) && !isMethod(param, element)) {
       ref.__exec[param] = prop
-      const result = prop(element, element.state, element.context)
-      if (result && typeof result.then === 'function') {
-        result.then(resolved => {
-          element[param] = resolved
-        })
-      } else {
-        element[param] = result
+      try {
+        const result = prop(element, element.state, element.context)
+        if (result && typeof result.then === 'function') {
+          result.then(resolved => {
+            element[param] = resolved
+          }).catch(e => {
+            console.warn('[DOMQL] Async exec error in', param, ':', e?.message || e)
+          })
+        } else {
+          element[param] = result
+        }
+      } catch (e) {
+        console.warn('[DOMQL] Exec error in', param, ':', e?.message || e)
       }
     }
   }

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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@domql/element",
-  "version": "3.7.3",
+  "version": "3.7.5",
   "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.5",
+    "@domql/state": "^3.7.5",
+    "@domql/utils": "^3.7.5",
+    "attrs-in-props": "^3.7.5"
   },
   "gitHead": "9fc1b79b41cdc725ca6b24aec64920a599634681",
   "devDependencies": {