@domql/element 2.5.93 → 2.5.96

package/dist/cjs/extend.js

@@ -28,7 +28,8 @@ let mainExtend;
 const applyExtend = (element, parent, options = {}) => {
   if ((0, import_utils.isFunction)(element))
     element = (0, import_utils.exec)(element, parent);
-  let { extend, props, context, __ref } = element;
+  let { extend, props, __ref } = element;
+  const context = element.context || parent.context;
   extend = (0, import_utils2.fallbackStringExtend)(extend, context, options);
   const extendStack = (0, import_utils2.getExtendStack)(extend, context);
   if (ENV !== "test" || ENV !== "development")

package/dist/cjs/utils/component.js

@@ -93,9 +93,10 @@ const createValidDomqlObjectFromSugar = (el, parent, key, options) => {
   return newElem;
 };
 const extendizeByKey = (element, parent, key) => {
-  const { context, tag, extend, props, attr, state, childExtend, childProps, on, if: condition, data } = element;
+  const { context } = parent;
+  const { tag, extend, props, attr, state, childExtend, childProps, on, if: condition, data } = element;
   const hasComponentAttrs = extend || childExtend || props || state || on || condition || attr || data;
-  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(".") && !checkIfKeyIsComponent(key.split(".")[1]) ? [key.split(".")[0]] : [key];
   const isExtendKeyComponent = context && context.components[extendFromKey];
   if (element === isExtendKeyComponent)
     return element;

package/extend.js

@@ -20,7 +20,8 @@ let mainExtend
 export const applyExtend = (element, parent, options = {}) => {
   if (isFunction(element)) element = exec(element, parent)
 
-  let { extend, props, context, __ref } = element
+  let { extend, props, __ref } = element
+  const context = element.context || parent.context
 
   extend = fallbackStringExtend(extend, context, options)
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@domql/element",
-  "version": "2.5.93",
+  "version": "2.5.96",
   "license": "MIT",
   "type": "module",
   "module": "index.js",
@@ -31,7 +31,7 @@
     "@domql/state": "latest",
     "@domql/utils": "latest"
   },
-  "gitHead": "6c5a9e10c74137700ad69ff9108b6ccc09745cc7",
+  "gitHead": "0cecd2c613b24dde1ea12f7e7581a58671dc3ad3",
   "devDependencies": {
     "@babel/core": "^7.12.0"
   }

package/utils/component.js

@@ -66,17 +66,21 @@ export const createValidDomqlObjectFromSugar = (el, parent, key, options) => {
 }
 
 export const extendizeByKey = (element, parent, key) => {
-  const { context, tag, extend, props, attr, state, childExtend, childProps, on, if: condition, data } = element
+  const { context } = parent
+  const { tag, extend, props, attr, state, childExtend, childProps, on, if: condition, data } = element
   const hasComponentAttrs = extend || childExtend || props || state || on || condition || attr || data
 
   const extendFromKey = key.includes('+')
     ? key.split('+') // get array of componentKeys
     : key.includes('_')
-      ? key.split('_')[0] // get component key split _
-      : key.includes('.') // TODO: add only Component.camelCase cases - avoud Component.Variant
-        ? key.split('.')[0] // get component key split .
+      ? [key.split('_')[0]] // get component key split _
+      : key.includes('.') && !checkIfKeyIsComponent(key.split('.')[1])
+        ? [key.split('.')[0]] // get component key split .
         : [key]
 
+  // console.log(extendFromKey)
+  // console.log(context, context?.components)
+  // console.log(element)
   const isExtendKeyComponent = context && context.components[extendFromKey]
 
   if (element === isExtendKeyComponent) return element