@domql/element 2.5.94 → 2.5.98

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/methods/index.js

@@ -24,6 +24,7 @@ __export(methods_exports, {
   isMethod: () => isMethod,
   keys: () => keys,
   log: () => log,
+  lookdown: () => lookdown,
   lookup: () => lookup,
   nextElement: () => nextElement,
   parse: () => parse,
@@ -73,6 +74,27 @@ const lookup = function(param) {
   }
   return parent;
 };
+const lookdown = function(param) {
+  const el = this;
+  const { __ref: ref } = el;
+  const children = ref.__children;
+  for (let i = 0; i < children.length; i++) {
+    const v = children[i];
+    const childElem = el[v];
+    if (v === param)
+      return childElem;
+    else if ((0, import_utils.isFunction)(param)) {
+      const exec = param(childElem, childElem.state, childElem.context);
+      if (childElem.state && exec) {
+        return childElem;
+      }
+    }
+    const lookdown2 = childElem.lookdown(param);
+    if (lookdown2)
+      return lookdown2;
+  }
+  return null;
+};
 const remove = function() {
   const element = this;
   if ((0, import_utils.isFunction)(element.node.remove))
@@ -183,6 +205,7 @@ const METHODS = [
   "updateContent",
   "removeContent",
   "lookup",
+  "lookdown",
   "spotByPath",
   "keys",
   "parse",

package/dist/cjs/methods/set.js

@@ -45,6 +45,7 @@ const addMethods = (element, parent) => {
     removeContent: import_content.removeContent.bind(element),
     setProps: import__.setProps.bind(element),
     lookup: import__.lookup.bind(element),
+    lookdown: import__.lookdown.bind(element),
     spotByPath: import__.spotByPath.bind(element),
     parse: import__.parse.bind(element),
     parseDeep: import__.parseDeep.bind(element),

package/dist/cjs/mixins/registry.js

@@ -61,6 +61,7 @@ var registry_default = {
   updateContent: {},
   removeContent: {},
   lookup: {},
+  lookdown: {},
   spotByPath: {},
   keys: {},
   log: {},

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(".") && !checkIfKeyIsComponent(key.split(".")[1]) ? 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;
@@ -167,7 +168,9 @@ const overwriteVariant = (element, variant, variantProps) => {
   } else if (variantElement.extend) {
     variantElement = addAdditionalExtend({ props }, variantElement);
   }
-  return (0, import_utils.overwriteDeep)(element, (0, import_extend.applyExtend)(variantElement));
+  const extendedVariant = (0, import_extend.applyExtend)(variantElement, element.parent);
+  const { parent, ...rest } = extendedVariant;
+  return (0, import_utils.overwriteDeep)(element, rest);
 };
 const applyVariant = (element) => {
   const { props } = 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/methods/index.js

@@ -42,6 +42,29 @@ export const lookup = function (param) {
   return parent
 }
 
+export const lookdown = function (param) {
+  const el = this
+  const { __ref: ref } = el
+  const children = ref.__children
+
+  for (let i = 0; i < children.length; i++) {
+    const v = children[i]
+    const childElem = el[v]
+
+    if (v === param) return childElem
+    else if (isFunction(param)) {
+      const exec = param(childElem, childElem.state, childElem.context)
+      if (childElem.state && exec) {
+        return childElem
+      }
+    }
+    const lookdown = childElem.lookdown(param)
+    if (lookdown) return lookdown
+  }
+
+  return null
+}
+
 export const remove = function () {
   const element = this
   if (isFunction(element.node.remove)) element.node.remove()
@@ -159,6 +182,7 @@ export const METHODS = [
   'updateContent',
   'removeContent',
   'lookup',
+  'lookdown',
   'spotByPath',
   'keys',
   'parse',

package/methods/set.js

@@ -7,6 +7,7 @@ import update from '../update'
 
 import {
   lookup,
+  lookdown,
   setProps,
   remove,
   spotByPath,
@@ -29,6 +30,7 @@ export const addMethods = (element, parent) => {
     removeContent: removeContent.bind(element),
     setProps: setProps.bind(element),
     lookup: lookup.bind(element),
+    lookdown: lookdown.bind(element),
     spotByPath: spotByPath.bind(element),
     parse: parse.bind(element),
     parseDeep: parseDeep.bind(element),

package/mixins/registry.js

@@ -45,6 +45,7 @@ export default {
   updateContent: {},
   removeContent: {},
   lookup: {},
+  lookdown: {},
   spotByPath: {},
   keys: {},
   log: {},

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@domql/element",
-  "version": "2.5.94",
+  "version": "2.5.98",
   "license": "MIT",
   "type": "module",
   "module": "index.js",
@@ -31,7 +31,7 @@
     "@domql/state": "latest",
     "@domql/utils": "latest"
   },
-  "gitHead": "76edeab829524b706fd1a0bd3fac3fd5563a3b84",
+  "gitHead": "6318fa362595b70f826d48c5eb8fffbc2a6a5443",
   "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.split('_')[0]] // get component key split _
       : key.includes('.') && !checkIfKeyIsComponent(key.split('.')[1])
-        ? key.split('.')[0] // get component key split .
+        ? [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
@@ -151,7 +155,10 @@ export const overwriteVariant = (element, variant, variantProps) => {
   } else if (variantElement.extend) {
     variantElement = addAdditionalExtend({ props }, variantElement)
   }
-  return overwriteDeep(element, applyExtend(variantElement)) // TODO: check why string is not working
+  const extendedVariant = applyExtend(variantElement, element.parent)
+  const { parent, ...rest } = extendedVariant
+  return overwriteDeep(element, rest) // TODO: check why string is not working
+  // return overwriteDeep(element, applyExtend(variantElement, element.parent)) // TODO: check why string is not working
 }
 
 export const applyVariant = (element) => {