@domql/element 2.4.7 → 2.4.9

package/create.js

@@ -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

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

package/extend.js

@@ -44,8 +44,9 @@ export const applyExtend = (element, parent, options = {}) => {
       childExtendStack = getExtendStack(parent.childExtend)
 
       // if (parent.childExtendRecursive && (props && !props.ignoreChildExtendRecursive)) {
-      if (parent.childExtendRecursive) {
-        const canExtendRecursive = !props.ignoreChildExtendRecursive && element.key !== '__text'
+      if (parent.childExtendRecursive || (props && props.ignoreChildExtendRecursive)) {
+        const propsChildExtendRecursive = props && !props.ignoreChildExtendRecursive
+        const canExtendRecursive = propsChildExtendRecursive && 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.7",
+  "version": "2.4.9",
   "license": "MIT",
   "type": "module",
   "module": "index.js",
@@ -31,7 +31,7 @@
     "@domql/state": "latest",
     "@domql/utils": "latest"
   },
-  "gitHead": "fd9683a7d42893983463967fa512ac095a6a36e9",
+  "gitHead": "86251c1d94b9e87288cc9e84fd9badb6461b2973",
   "devDependencies": {
     "@babel/core": "^7.12.0"
   }

package/LICENSE

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2023 symbo.ls
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.