@domql/element 2.5.37 → 2.5.40

package/dist/cjs/utils/component.js

@@ -40,21 +40,22 @@ const checkIfKeyIsComponent = (key) => {
   return /^[A-Z]*$/.test(firstCharKey);
 };
 const addAdditionalExtend = (newExtend, element) => {
-  const { extend } = element;
-  const preserveExtend = (0, import_utils.isArray)(extend) ? extend : [extend];
-  return {
-    ...element,
-    extend: [newExtend].concat(preserveExtend)
-  };
+  const { extend: elementExtend } = element;
+  const originalArray = (0, import_utils.isArray)(elementExtend) ? elementExtend : [elementExtend];
+  const receivedArray = (0, import_utils.isArray)(newExtend) ? newExtend : [newExtend];
+  const extend = (0, import_utils.joinArrays)(receivedArray, originalArray);
+  return { ...element, extend };
 };
 const extendizeByKey = (element, parent, key) => {
-  const { tag, extend, props, state, childExtend, childProps, on, if: condition } = element;
-  const hasComponentAttrs = extend || childExtend || props || state || on || condition;
-  const componentKey = key.includes("_") ? key.split("_")[0] : key.includes(".") ? key.split(".")[0] : key;
-  const extendKey = componentKey || key;
-  if (!hasComponentAttrs || childProps) {
+  const { context, tag, extend, props, attr, state, childExtend, childProps, on, if: condition } = element;
+  const hasComponentAttrs = extend || childExtend || props || state || on || condition || attr;
+  const extendFromKey = key.includes("+") ? key.split("+") : key.includes("_") ? key.split("_")[0] : key.includes(".") ? key.split(".")[0] : key;
+  const isExtendKeyComponent = context == null ? void 0 : context.components[extendFromKey];
+  if (element === isExtendKeyComponent)
+    return element;
+  else if (!hasComponentAttrs || childProps) {
     return {
-      extend: extendKey,
+      extend: extendFromKey,
       tag,
       props: { ...element }
     };
@@ -62,14 +63,13 @@ const extendizeByKey = (element, parent, key) => {
     return {
       ...element,
       tag,
-      extend: extendKey
+      extend: extendFromKey
     };
   } else if (extend) {
-    addAdditionalExtend(extendKey, element);
+    return addAdditionalExtend(extendFromKey, element);
   } else if ((0, import_utils.isFunction)(element)) {
-    console.log(element);
     return {
-      extend: extendKey,
+      extend: extendFromKey,
       tag,
       props: { ...(0, import_utils.exec)(element, parent) }
     };
@@ -86,8 +86,9 @@ const applyComponentFromContext = (element, parent, options) => {
   const { extend } = element;
   const execExtend = (0, import_utils.exec)(extend, element);
   if ((0, import_utils.isString)(execExtend)) {
-    if (components[execExtend])
-      element.extend = components[execExtend];
+    const componentExists = components[execExtend] || components["smbls." + execExtend];
+    if (componentExists)
+      element.extend = componentExists;
     else {
       if ((ENV === "test" || ENV === "development") && options.verbose) {
         console.warn(execExtend, "is not in library", components, element);

package/dist/cjs/utils/extendUtils.js

@@ -126,7 +126,6 @@ const fallbackStringExtend = (extend, context, options = {}) => {
   const COMPONENTS = context && context.components || options.components;
   if ((0, import_utils.isString)(extend)) {
     const componentExists = COMPONENTS[extend] || COMPONENTS["smbls." + extend];
-    console.log(extend, componentExists);
     if (COMPONENTS && componentExists) {
       return componentExists;
     } else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@domql/element",
-  "version": "2.5.37",
+  "version": "2.5.40",
   "license": "MIT",
   "type": "module",
   "module": "index.js",
@@ -31,7 +31,7 @@
     "@domql/state": "latest",
     "@domql/utils": "latest"
   },
-  "gitHead": "1cba51181175cc713dc6d55a4cd2b10e456e1315",
+  "gitHead": "536a661204a0377cb6dbb415eba1081ac156048d",
   "devDependencies": {
     "@babel/core": "^7.12.0"
   }

package/utils/component.js

@@ -1,6 +1,6 @@
 'use strict'
 
-import { exec, isArray, isFunction, isObject, isString, overwriteDeep } from '@domql/utils'
+import { exec, isArray, isFunction, isObject, isString, joinArrays, overwriteDeep } from '@domql/utils'
 import { applyExtend } from '../extend'
 const ENV = process.env.NODE_ENV
 
@@ -12,25 +12,31 @@ export const checkIfKeyIsComponent = (key) => {
 }
 
 export const addAdditionalExtend = (newExtend, element) => {
-  const { extend } = element
-  const preserveExtend = isArray(extend) ? extend : [extend]
-  return {
-    ...element,
-    extend: [newExtend].concat(preserveExtend)
-  }
+  const { extend: elementExtend } = element
+  const originalArray = isArray(elementExtend) ? elementExtend : [elementExtend]
+  const receivedArray = isArray(newExtend) ? newExtend : [newExtend]
+  const extend = joinArrays(receivedArray, originalArray)
+  return { ...element, extend }
 }
 
 export const extendizeByKey = (element, parent, key) => {
-  const { tag, extend, props, state, childExtend, childProps, on, if: condition } = element
-  const hasComponentAttrs = extend || childExtend || props || state || on || condition
-  const componentKey = key.includes('_')
-    ? key.split('_')[0]
-    : key.includes('.') ? key.split('.')[0] : key
-  const extendKey = componentKey || key
-
-  if (!hasComponentAttrs || childProps) {
+  const { context, tag, extend, props, attr, state, childExtend, childProps, on, if: condition } = element
+  const hasComponentAttrs = extend || childExtend || props || state || on || condition || attr
+
+  const extendFromKey = key.includes('+')
+    ? key.split('+')
+    : key.includes('_')
+      ? key.split('_')[0]
+      : key.includes('.')
+        ? key.split('.')[0]
+        : key
+
+  const isExtendKeyComponent = context?.components[extendFromKey]
+
+  if (element === isExtendKeyComponent) return element
+  else if (!hasComponentAttrs || childProps) {
     return {
-      extend: extendKey,
+      extend: extendFromKey,
       tag,
       props: { ...element }
     }
@@ -38,14 +44,13 @@ export const extendizeByKey = (element, parent, key) => {
     return {
       ...element,
       tag,
-      extend: extendKey
+      extend: extendFromKey
     }
   } else if (extend) {
-    addAdditionalExtend(extendKey, element)
+    return addAdditionalExtend(extendFromKey, element)
   } else if (isFunction(element)) {
-    console.log(element)
     return {
-      extend: extendKey,
+      extend: extendFromKey,
       tag,
       props: { ...exec(element, parent) }
     }
@@ -65,7 +70,8 @@ export const applyComponentFromContext = (element, parent, options) => {
   const { extend } = element
   const execExtend = exec(extend, element)
   if (isString(execExtend)) {
-    if (components[execExtend]) element.extend = components[execExtend]
+    const componentExists = components[execExtend] || components['smbls.' + execExtend]
+    if (componentExists) element.extend = componentExists
     else {
       if ((ENV === 'test' || ENV === 'development') && options.verbose) {
         console.warn(execExtend, 'is not in library', components, element)

package/utils/extendUtils.js

@@ -94,7 +94,6 @@ export const fallbackStringExtend = (extend, context, options = {}) => {
   const COMPONENTS = (context && context.components) || options.components
   if (isString(extend)) {
     const componentExists = COMPONENTS[extend] || COMPONENTS['smbls.' + extend]
-    console.log(extend, componentExists)
     if (COMPONENTS && componentExists) {
       return componentExists
     } else {