@domql/element 2.5.43 → 2.5.47

package/dist/cjs/extend.js

@@ -24,6 +24,7 @@ module.exports = __toCommonJS(extend_exports);
 var import_utils = require("@domql/utils");
 var import_utils2 = require("./utils");
 const ENV = "development";
+let mainExtend;
 const applyExtend = (element, parent, options = {}) => {
   if ((0, import_utils.isFunction)(element))
     element = (0, import_utils.exec)(element, parent);
@@ -60,8 +61,12 @@ const applyExtend = (element, parent, options = {}) => {
   } else if (!options.extend)
     return element;
   if (options.extend) {
-    const defaultOptionsExtend = (0, import_utils2.getExtendStack)(options.extend, context);
-    stack = [].concat(stack, defaultOptionsExtend);
+    if (!mainExtend) {
+      const defaultOptionsExtend = (0, import_utils2.getExtendStack)(options.extend, context);
+      mainExtend = (0, import_utils2.cloneAndMergeArrayExtend)(defaultOptionsExtend);
+      delete mainExtend.extend;
+    }
+    stack = [].concat(stack, mainExtend);
   }
   if (__ref)
     __ref.__extend = stack;
@@ -72,5 +77,6 @@ const applyExtend = (element, parent, options = {}) => {
     const componentExtend = (0, import_utils2.cloneAndMergeArrayExtend)((0, import_utils2.getExtendStack)(COMPONENTS[component]));
     mergedExtend = (0, import_utils2.deepMergeExtend)(componentExtend, mergedExtend);
   }
-  return (0, import_utils2.deepMergeExtend)(element, mergedExtend);
+  const merged = (0, import_utils2.deepMergeExtend)(element, mergedExtend);
+  return merged;
 };

package/dist/cjs/onlyResolveExtends.js

@@ -36,7 +36,6 @@ const onlyResolveExtends = (element, parent, key, options) => {
   element.tag = (0, import_render.detectTag)(element);
   {
     const { __ref: ref2 } = element;
-    const { __ref: parentRef } = parent;
     if (!ref2.__cached)
       ref2.__cached = {};
     if (!ref2.__defineCache)

package/dist/cjs/utils/component.js

@@ -49,7 +49,7 @@ const addAdditionalExtend = (newExtend, element) => {
 const extendizeByKey = (element, parent, key) => {
   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 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;

package/extend.js

@@ -11,6 +11,8 @@ import {
 
 const ENV = process.env.NODE_ENV
 
+let mainExtend
+
 /**
  * Checks whether element has `extend` or is a part
  * of parent's `childExtend` extend
@@ -59,8 +61,12 @@ export const applyExtend = (element, parent, options = {}) => {
   } else if (!options.extend) return element
 
   if (options.extend) {
-    const defaultOptionsExtend = getExtendStack(options.extend, context)
-    stack = [].concat(stack, defaultOptionsExtend)
+    if (!mainExtend) {
+      const defaultOptionsExtend = getExtendStack(options.extend, context)
+      mainExtend = cloneAndMergeArrayExtend(defaultOptionsExtend)
+      delete mainExtend.extend
+    }
+    stack = [].concat(stack, mainExtend)
   }
 
   // check if array contains string extends
@@ -75,5 +81,6 @@ export const applyExtend = (element, parent, options = {}) => {
     mergedExtend = deepMergeExtend(componentExtend, mergedExtend)
   }
 
-  return deepMergeExtend(element, mergedExtend)
+  const merged = deepMergeExtend(element, mergedExtend)
+  return merged
 }

package/onlyResolveExtends.js

@@ -20,7 +20,7 @@ export const onlyResolveExtends = (element, parent, key, options) => {
   // Copy-paste of addCaching()
   {
     const { __ref: ref } = element
-    const { __ref: parentRef } = parent
+    // const { __ref: parentRef } = parent
 
     // enable TRANSFORM in data
     // TODO: do we need this at all?

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@domql/element",
-  "version": "2.5.43",
+  "version": "2.5.47",
   "license": "MIT",
   "type": "module",
   "module": "index.js",
@@ -31,7 +31,7 @@
     "@domql/state": "latest",
     "@domql/utils": "latest"
   },
-  "gitHead": "17740fdf2439bc2c6cba3d7d5f62748021e5eeaa",
+  "gitHead": "c49194ab459d5e43b9d5fabdf3d0f3c7b8b32b5f",
   "devDependencies": {
     "@babel/core": "^7.12.0"
   }

package/utils/component.js

@@ -29,7 +29,7 @@ export const extendizeByKey = (element, parent, key) => {
       ? key.split('_')[0]
       : key.includes('.')
         ? key.split('.')[0]
-        : key
+        : [key]
 
   const isExtendKeyComponent = context?.components[extendFromKey]