@domql/element 2.4.8 → 2.4.10

package/create.js

@@ -103,7 +103,7 @@ const create = (element, parent, key, options = OPTIONS.create || {}) => {
 
   // Only resolve extends, skip everything else
   if (options.onlyResolveExtends) {
-    return resolveExtends(element, parent, options)
+    return onlyResolveExtends(element, parent, options)
   }
 
   if (Object.keys(options).length) {
@@ -241,7 +241,7 @@ const addCaching = (element, parent) => {
   }
 }
 
-const resolveExtends = (element, parent, options) => {
+const onlyResolveExtends = (element, parent, options) => {
   const { __ref } = element
   element.tag = detectTag(element)
 
@@ -249,9 +249,9 @@ const resolveExtends = (element, parent, options) => {
   if (!__ref.__attr) __ref.__attr = {}
 
   if (!element.props) element.props = {}
-  if (!element.state) element.state = {}
+  if (!element.state) element.state = element.parent.state || {}
 
-  createState(element, parent, { skipApplyMethods: true })
+  createState(element, parent, { skipApplyMethods: true, ...options })
   createProps(element, parent)
   applyVariant(element, parent)
 
@@ -266,11 +266,14 @@ const resolveExtends = (element, parent, options) => {
       isVariant(param)
     ) continue
 
-    const hasDefined = element.define && element.define[param]
-    const ourParam = registry[param]
-    const hasOptionsDefine = options.define && options.define[param]
-    if (ourParam && !hasOptionsDefine) continue
-    else if (element[param] && !hasDefined && !hasOptionsDefine) {
+    const hasDefine = element.define && element.define[param]
+    const contextHasDefine = element.context && element.context.define &&
+          element.context.define[param]
+    const optionsHasDefine = options.define && options.define[param]
+
+    if (registry[param] && !optionsHasDefine) {
+      continue
+    } else if (element[param] && !hasDefine && !optionsHasDefine && !contextHasDefine) {
       create(exec(prop, element), element, param, options)
     }
   }

package/dist/cjs/create.js

@@ -100,7 +100,7 @@ const create = (element, parent, key, options = import_options.default.create ||
   (0, import_extend.applyExtend)(element, parent, options);
   element.key = assignedKey;
   if (options.onlyResolveExtends) {
-    return resolveExtends(element, parent, options);
+    return onlyResolveExtends(element, parent, options);
   }
   if (Object.keys(options).length) {
     import_mixins.registry.defaultOptions = options;
@@ -200,7 +200,7 @@ const addCaching = (element, parent) => {
     ref.__path = parentRef.__path.concat(element.key);
   }
 };
-const resolveExtends = (element, parent, options) => {
+const onlyResolveExtends = (element, parent, options) => {
   const { __ref } = element;
   element.tag = (0, import_node2.detectTag)(element);
   if (!__ref.__exec)
@@ -210,8 +210,8 @@ const resolveExtends = (element, parent, options) => {
   if (!element.props)
     element.props = {};
   if (!element.state)
-    element.state = {};
-  (0, import_state.createState)(element, parent, { skipApplyMethods: true });
+    element.state = element.parent.state || {};
+  (0, import_state.createState)(element, parent, { skipApplyMethods: true, ...options });
   (0, import_props.createProps)(element, parent);
   (0, import_component.applyVariant)(element, parent);
   (0, import_iterate.throughInitialExec)(element, options.propsExcludedFromExec);
@@ -219,12 +219,12 @@ const resolveExtends = (element, parent, options) => {
     const prop = element[param];
     if ((0, import_utils.isUndefined)(prop) || (0, import_methods.isMethod)(param) || (0, import_utils.isObject)(import_mixins.registry[param]) || (0, import_component.isVariant)(param))
       continue;
-    const hasDefined = element.define && element.define[param];
-    const ourParam = import_mixins.registry[param];
-    const hasOptionsDefine = options.define && options.define[param];
-    if (ourParam && !hasOptionsDefine)
+    const hasDefine = element.define && element.define[param];
+    const contextHasDefine = element.context && element.context.define && element.context.define[param];
+    const optionsHasDefine = options.define && options.define[param];
+    if (import_mixins.registry[param] && !optionsHasDefine) {
       continue;
-    else if (element[param] && !hasDefined && !hasOptionsDefine) {
+    } else if (element[param] && !hasDefine && !optionsHasDefine && !contextHasDefine) {
       create((0, import_utils.exec)(prop, element), element, param, options);
     }
   }

package/dist/cjs/extend.js

@@ -49,9 +49,9 @@ const applyExtend = (element, parent, options = {}) => {
       if (props && props.ignoreChildExtend)
         return;
       childExtendStack = (0, import_utils2.getExtendStack)(parent.childExtend);
-      if (parent.childExtendRecursive || props && props.ignoreChildExtendRecursive) {
-        const propsChildExtendRecursive = props && !props.ignoreChildExtendRecursive;
-        const canExtendRecursive = propsChildExtendRecursive && element.key !== "__text";
+      const ignoreChildExtendRecursive = props && props.ignoreChildExtendRecursive;
+      if (parent.childExtendRecursive && !ignoreChildExtendRecursive) {
+        const canExtendRecursive = element.key !== "__text";
         if (canExtendRecursive) {
           const childExtendRecursiveStack = (0, import_utils2.getExtendStack)(parent.childExtendRecursive);
           childExtendStack = childExtendStack.concat(childExtendRecursiveStack);

package/extend.js

@@ -44,9 +44,9 @@ export const applyExtend = (element, parent, options = {}) => {
       childExtendStack = getExtendStack(parent.childExtend)
 
       // if (parent.childExtendRecursive && (props && !props.ignoreChildExtendRecursive)) {
-      if (parent.childExtendRecursive || (props && props.ignoreChildExtendRecursive)) {
-        const propsChildExtendRecursive = props && !props.ignoreChildExtendRecursive
-        const canExtendRecursive = propsChildExtendRecursive && element.key !== '__text'
+      const ignoreChildExtendRecursive = props && props.ignoreChildExtendRecursive
+      if (parent.childExtendRecursive && !ignoreChildExtendRecursive) {
+        const canExtendRecursive = element.key !== '__text'
         if (canExtendRecursive) {
           const childExtendRecursiveStack = getExtendStack(parent.childExtendRecursive)
           // add error if childExtendRecursive contains element which goes to infinite loop

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@domql/element",
-  "version": "2.4.8",
+  "version": "2.4.10",
   "license": "MIT",
   "type": "module",
   "module": "index.js",
@@ -31,7 +31,7 @@
     "@domql/state": "latest",
     "@domql/utils": "latest"
   },
-  "gitHead": "7822f906ac9a99ba2c2882eceacbd39516dc4b2d",
+  "gitHead": "0b2e301e066ed1745f29966e05bca8531c3487f6",
   "devDependencies": {
     "@babel/core": "^7.12.0"
   }