@domql/element 2.33.14 → 2.33.20

package/dist/cjs/methods/index.js

@@ -335,7 +335,8 @@ function call(fnKey, ...args) {
     }
     return result;
   } catch (error2) {
-    console.error(`Error calling function: '${fnKey}'`);
+    console.error(`Error calling function: '${fnKey}'
+`, error2);
     throw new Error(error2);
   }
 }

package/dist/cjs/mixins/html.js

@@ -22,10 +22,23 @@ __export(html_exports, {
   html: () => html
 });
 module.exports = __toCommonJS(html_exports);
-var import_utils = require("@domql/utils");
 function html(param, element, node, opts) {
   var _a;
-  const prop = (0, import_utils.exec)(param, element, element.state, element.context, opts) || (0, import_utils.exec)((_a = element == null ? void 0 : element.props) == null ? void 0 : _a.html, element, element.state, element.context, opts);
+  const prop = element.call(
+    "exec",
+    param,
+    element,
+    element.state,
+    element.context,
+    opts
+  ) || element.call(
+    "exec",
+    (_a = element == null ? void 0 : element.props) == null ? void 0 : _a.html,
+    element,
+    element.state,
+    element.context,
+    opts
+  );
   const { __ref } = element;
   if (prop !== __ref.__html) {
     if (node.nodeName === "SVG") node.textContent = prop;

package/dist/cjs/utils/extendUtils.js

@@ -101,19 +101,36 @@ const cloneAndMergeArrayExtend = (stack) => {
   }, {});
 };
 const fallbackStringExtend = (extend, context, options = {}, variant) => {
-  const COMPONENTS = context && context.components || options.components;
-  const PAGES = context && context.pages || options.pages;
+  const checkIfExists = (key, variant2, onlyVariant) => {
+    const COMPONENTS = context && context.components || options.components;
+    if (COMPONENTS) {
+      const hasVariant = variant2 && COMPONENTS[key + "." + variant2];
+      if (onlyVariant) return hasVariant;
+      const componentExists = hasVariant || COMPONENTS[key] || COMPONENTS["smbls." + key];
+      if (componentExists) return componentExists;
+    }
+    const PAGES = context && context.pages || options.pages;
+    if (PAGES) {
+      const pageExists = (key == null ? void 0 : key.startsWith("/")) && PAGES[key];
+      if (pageExists) return pageExists;
+    }
+  };
+  if (variant) {
+    console.log(extend, variant);
+  }
   if ((0, import_utils.isString)(extend)) {
-    const componentExists = COMPONENTS && (COMPONENTS[extend + "." + variant] || COMPONENTS[extend] || COMPONENTS["smbls." + extend]);
-    const pageExists = PAGES && extend.startsWith("/") && PAGES[extend];
-    if (componentExists) return componentExists;
-    else if (pageExists) return pageExists;
-    else {
-      if (options.verbose && (0, import_utils.isNotProduction)()) {
-        console.warn("Extend is string but component was not found:", extend);
-      }
-      return {};
+    const variantExists = checkIfExists(extend, variant);
+    if (variantExists) return variantExists;
+    if (options.verbose && (0, import_utils.isNotProduction)()) {
+      console.warn("Extend is string but component was not found:", extend);
     }
+    return {};
+  } else if ((0, import_utils.isArray)(extend)) {
+    const extendKey = extend.find((element) => {
+      return typeof element === "string";
+    });
+    const variantExists = checkIfExists(extendKey, variant, true);
+    if (variantExists) return variantExists;
   }
   return extend;
 };

package/dist/esm/methods/index.js

@@ -294,7 +294,8 @@ function call(fnKey, ...args) {
     }
     return result;
   } catch (error2) {
-    console.error(`Error calling function: '${fnKey}'`);
+    console.error(`Error calling function: '${fnKey}'
+`, error2);
     throw new Error(error2);
   }
 }

package/dist/esm/mixins/html.js

@@ -1,7 +1,20 @@
-import { exec } from "@domql/utils";
 function html(param, element, node, opts) {
   var _a;
-  const prop = exec(param, element, element.state, element.context, opts) || exec((_a = element == null ? void 0 : element.props) == null ? void 0 : _a.html, element, element.state, element.context, opts);
+  const prop = element.call(
+    "exec",
+    param,
+    element,
+    element.state,
+    element.context,
+    opts
+  ) || element.call(
+    "exec",
+    (_a = element == null ? void 0 : element.props) == null ? void 0 : _a.html,
+    element,
+    element.state,
+    element.context,
+    opts
+  );
   const { __ref } = element;
   if (prop !== __ref.__html) {
     if (node.nodeName === "SVG") node.textContent = prop;

package/dist/esm/utils/extendUtils.js

@@ -71,19 +71,36 @@ const cloneAndMergeArrayExtend = (stack) => {
   }, {});
 };
 const fallbackStringExtend = (extend, context, options = {}, variant) => {
-  const COMPONENTS = context && context.components || options.components;
-  const PAGES = context && context.pages || options.pages;
+  const checkIfExists = (key, variant2, onlyVariant) => {
+    const COMPONENTS = context && context.components || options.components;
+    if (COMPONENTS) {
+      const hasVariant = variant2 && COMPONENTS[key + "." + variant2];
+      if (onlyVariant) return hasVariant;
+      const componentExists = hasVariant || COMPONENTS[key] || COMPONENTS["smbls." + key];
+      if (componentExists) return componentExists;
+    }
+    const PAGES = context && context.pages || options.pages;
+    if (PAGES) {
+      const pageExists = (key == null ? void 0 : key.startsWith("/")) && PAGES[key];
+      if (pageExists) return pageExists;
+    }
+  };
+  if (variant) {
+    console.log(extend, variant);
+  }
   if (isString(extend)) {
-    const componentExists = COMPONENTS && (COMPONENTS[extend + "." + variant] || COMPONENTS[extend] || COMPONENTS["smbls." + extend]);
-    const pageExists = PAGES && extend.startsWith("/") && PAGES[extend];
-    if (componentExists) return componentExists;
-    else if (pageExists) return pageExists;
-    else {
-      if (options.verbose && isNotProduction()) {
-        console.warn("Extend is string but component was not found:", extend);
-      }
-      return {};
+    const variantExists = checkIfExists(extend, variant);
+    if (variantExists) return variantExists;
+    if (options.verbose && isNotProduction()) {
+      console.warn("Extend is string but component was not found:", extend);
     }
+    return {};
+  } else if (isArray(extend)) {
+    const extendKey = extend.find((element) => {
+      return typeof element === "string";
+    });
+    const variantExists = checkIfExists(extendKey, variant, true);
+    if (variantExists) return variantExists;
   }
   return extend;
 };

package/methods/index.js

@@ -379,7 +379,7 @@ export function call(fnKey, ...args) {
     // Return synchronous results directly
     return result
   } catch (error) {
-    console.error(`Error calling function: '${fnKey}'`)
+    console.error(`Error calling function: '${fnKey}'\n`, error)
     throw new Error(error)
   }
 }

package/mixins/html.js

@@ -1,15 +1,27 @@
 'use strict'
 
-import { exec } from '@domql/utils'
-
 /**
  * Appends raw HTML as content
  * an original one as a child
  */
 export function html(param, element, node, opts) {
   const prop =
-    exec(param, element, element.state, element.context, opts) ||
-    exec(element?.props?.html, element, element.state, element.context, opts)
+    element.call(
+      'exec',
+      param,
+      element,
+      element.state,
+      element.context,
+      opts
+    ) ||
+    element.call(
+      'exec',
+      element?.props?.html,
+      element,
+      element.state,
+      element.context,
+      opts
+    )
   const { __ref } = element
   if (prop !== __ref.__html) {
     // const parser = new window.DOMParser()

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@domql/element",
-  "version": "2.33.14",
+  "version": "2.33.20",
   "license": "MIT",
   "type": "module",
   "module": "index.js",
@@ -27,12 +27,12 @@
     "prepublish": "npx rimraf -I dist && npm run build && npm run copy:package:cjs"
   },
   "dependencies": {
-    "@domql/event": "^2.33.14",
-    "@domql/render": "^2.33.14",
-    "@domql/state": "^2.33.14",
-    "@domql/utils": "^2.33.14"
+    "@domql/event": "^2.33.20",
+    "@domql/render": "^2.33.20",
+    "@domql/state": "^2.33.20",
+    "@domql/utils": "^2.33.20"
   },
-  "gitHead": "6794a2267003c3ffcbf972d382e850c1fee0dbe5",
+  "gitHead": "717ab2ed8690b295c7d6c79e31831048f20f4e86",
   "devDependencies": {
     "@babel/core": "^7.27.1"
   }

package/utils/extendUtils.js

@@ -15,7 +15,7 @@ export const generateHash = () => Math.random().toString(36).substring(2)
 export const extendStackRegistry = {}
 export const extendCachedRegistry = {}
 
-export const getHashedExtend = extend => {
+export const getHashedExtend = (extend) => {
   return extendStackRegistry[extend.__hash]
 }
 
@@ -37,7 +37,7 @@ export const getExtendStackRegistry = (extend, stack) => {
 
 // stacking
 export const extractArrayExtend = (extend, stack, context) => {
-  extend.forEach(each => flattenExtend(each, stack, context))
+  extend.forEach((each) => flattenExtend(each, stack, context))
   return stack
 }
 
@@ -79,7 +79,7 @@ export const deepMergeExtend = (element, extend) => {
   return element
 }
 
-export const cloneAndMergeArrayExtend = stack => {
+export const cloneAndMergeArrayExtend = (stack) => {
   return stack.reduce((a, c) => {
     return deepMergeExtend(a, deepClone(c))
   }, {})
@@ -91,23 +91,39 @@ export const fallbackStringExtend = (
   options = {},
   variant
 ) => {
-  const COMPONENTS = (context && context.components) || options.components
-  const PAGES = (context && context.pages) || options.pages
+  const checkIfExists = (key, variant, onlyVariant) => {
+    const COMPONENTS = (context && context.components) || options.components
+    if (COMPONENTS) {
+      const hasVariant = variant && COMPONENTS[key + '.' + variant]
+      if (onlyVariant) return hasVariant
+      const componentExists =
+        hasVariant || COMPONENTS[key] || COMPONENTS['smbls.' + key] // add shared libraries
+      if (componentExists) return componentExists
+    }
+    const PAGES = (context && context.pages) || options.pages
+    if (PAGES) {
+      const pageExists = key?.startsWith('/') && PAGES[key]
+      if (pageExists) return pageExists
+    }
+  }
+
+  if (variant) {
+    console.log(extend, variant)
+  }
+
   if (isString(extend)) {
-    const componentExists =
-      COMPONENTS &&
-      (COMPONENTS[extend + '.' + variant] ||
-        COMPONENTS[extend] ||
-        COMPONENTS['smbls.' + extend])
-    const pageExists = PAGES && extend.startsWith('/') && PAGES[extend]
-    if (componentExists) return componentExists
-    else if (pageExists) return pageExists
-    else {
-      if (options.verbose && isNotProduction()) {
-        console.warn('Extend is string but component was not found:', extend)
-      }
-      return {}
+    const variantExists = checkIfExists(extend, variant)
+    if (variantExists) return variantExists
+    if (options.verbose && isNotProduction()) {
+      console.warn('Extend is string but component was not found:', extend)
     }
+    return {}
+  } else if (isArray(extend)) {
+    const extendKey = extend.find((element) => {
+      return typeof element === 'string'
+    })
+    const variantExists = checkIfExists(extendKey, variant, true)
+    if (variantExists) return variantExists
   }
   return extend
 }
@@ -129,7 +145,7 @@ export const getExtendStack = (extend, context) => {
   return getExtendStackRegistry(extend, stack)
 }
 
-export const getExtendMerged = extend => {
+export const getExtendMerged = (extend) => {
   const stack = getExtendStack(extend)
   return cloneAndMergeArrayExtend(stack)
 }