@domql/element 2.33.4 → 2.33.6
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/cjs/extend.js +5 -5
- package/dist/cjs/mixins/registry.js +6 -3
- package/dist/esm/extend.js +5 -5
- package/dist/esm/mixins/registry.js +6 -3
- package/extend.js +6 -6
- package/mixins/registry.js +6 -3
- package/package.json +6 -6
package/dist/cjs/extend.js
CHANGED
|
@@ -39,15 +39,15 @@ const applyExtend = (element, parent, options = {}) => {
|
|
|
39
39
|
if (!options.ignoreChildExtend && !(props && props.ignoreChildExtend)) {
|
|
40
40
|
childExtendStack = (0, import_utils2.getExtendStack)(parent.childExtend, context);
|
|
41
41
|
const ignoreChildExtendRecursive = props && props.ignoreChildExtendRecursive;
|
|
42
|
-
if (parent.
|
|
42
|
+
if (parent.childExtendsRecursive && !ignoreChildExtendRecursive) {
|
|
43
43
|
const canExtendRecursive = element.key !== "__text";
|
|
44
44
|
if (canExtendRecursive) {
|
|
45
|
-
const
|
|
46
|
-
parent.
|
|
45
|
+
const childExtendsRecursiveStack = (0, import_utils2.getExtendStack)(
|
|
46
|
+
parent.childExtendsRecursive,
|
|
47
47
|
context
|
|
48
48
|
);
|
|
49
|
-
childExtendStack = childExtendStack.concat(
|
|
50
|
-
element.
|
|
49
|
+
childExtendStack = childExtendStack.concat(childExtendsRecursiveStack);
|
|
50
|
+
element.childExtendsRecursive = parent.childExtendsRecursive;
|
|
51
51
|
}
|
|
52
52
|
}
|
|
53
53
|
}
|
|
@@ -45,10 +45,13 @@ const REGISTRY = {
|
|
|
45
45
|
scope: import_scope.scope,
|
|
46
46
|
deps: (param, el) => param || el.parent.deps,
|
|
47
47
|
extend: {},
|
|
48
|
+
extends: {},
|
|
49
|
+
childExtend: {},
|
|
50
|
+
childExtends: {},
|
|
51
|
+
childExtendsRecursive: {},
|
|
52
|
+
childExtendsRecursive: {},
|
|
48
53
|
helmet: {},
|
|
49
54
|
metadata: {},
|
|
50
|
-
childExtend: {},
|
|
51
|
-
childExtendRecursive: {},
|
|
52
55
|
props: {},
|
|
53
56
|
path: {},
|
|
54
57
|
if: {},
|
|
@@ -116,7 +119,7 @@ const parseFilters = {
|
|
|
116
119
|
"key",
|
|
117
120
|
"extend",
|
|
118
121
|
"childExtend",
|
|
119
|
-
"
|
|
122
|
+
"childExtendsRecursive",
|
|
120
123
|
"scope",
|
|
121
124
|
"query",
|
|
122
125
|
"$collection",
|
package/dist/esm/extend.js
CHANGED
|
@@ -22,15 +22,15 @@ const applyExtend = (element, parent, options = {}) => {
|
|
|
22
22
|
if (!options.ignoreChildExtend && !(props && props.ignoreChildExtend)) {
|
|
23
23
|
childExtendStack = getExtendStack(parent.childExtend, context);
|
|
24
24
|
const ignoreChildExtendRecursive = props && props.ignoreChildExtendRecursive;
|
|
25
|
-
if (parent.
|
|
25
|
+
if (parent.childExtendsRecursive && !ignoreChildExtendRecursive) {
|
|
26
26
|
const canExtendRecursive = element.key !== "__text";
|
|
27
27
|
if (canExtendRecursive) {
|
|
28
|
-
const
|
|
29
|
-
parent.
|
|
28
|
+
const childExtendsRecursiveStack = getExtendStack(
|
|
29
|
+
parent.childExtendsRecursive,
|
|
30
30
|
context
|
|
31
31
|
);
|
|
32
|
-
childExtendStack = childExtendStack.concat(
|
|
33
|
-
element.
|
|
32
|
+
childExtendStack = childExtendStack.concat(childExtendsRecursiveStack);
|
|
33
|
+
element.childExtendsRecursive = parent.childExtendsRecursive;
|
|
34
34
|
}
|
|
35
35
|
}
|
|
36
36
|
}
|
|
@@ -19,10 +19,13 @@ const REGISTRY = {
|
|
|
19
19
|
scope,
|
|
20
20
|
deps: (param, el) => param || el.parent.deps,
|
|
21
21
|
extend: {},
|
|
22
|
+
extends: {},
|
|
23
|
+
childExtend: {},
|
|
24
|
+
childExtends: {},
|
|
25
|
+
childExtendsRecursive: {},
|
|
26
|
+
childExtendsRecursive: {},
|
|
22
27
|
helmet: {},
|
|
23
28
|
metadata: {},
|
|
24
|
-
childExtend: {},
|
|
25
|
-
childExtendRecursive: {},
|
|
26
29
|
props: {},
|
|
27
30
|
path: {},
|
|
28
31
|
if: {},
|
|
@@ -90,7 +93,7 @@ const parseFilters = {
|
|
|
90
93
|
"key",
|
|
91
94
|
"extend",
|
|
92
95
|
"childExtend",
|
|
93
|
-
"
|
|
96
|
+
"childExtendsRecursive",
|
|
94
97
|
"scope",
|
|
95
98
|
"query",
|
|
96
99
|
"$collection",
|
package/extend.js
CHANGED
|
@@ -42,16 +42,16 @@ export const applyExtend = (element, parent, options = {}) => {
|
|
|
42
42
|
|
|
43
43
|
const ignoreChildExtendRecursive =
|
|
44
44
|
props && props.ignoreChildExtendRecursive
|
|
45
|
-
if (parent.
|
|
45
|
+
if (parent.childExtendsRecursive && !ignoreChildExtendRecursive) {
|
|
46
46
|
const canExtendRecursive = element.key !== '__text'
|
|
47
47
|
if (canExtendRecursive) {
|
|
48
|
-
const
|
|
49
|
-
parent.
|
|
48
|
+
const childExtendsRecursiveStack = getExtendStack(
|
|
49
|
+
parent.childExtendsRecursive,
|
|
50
50
|
context
|
|
51
51
|
)
|
|
52
|
-
// add error if
|
|
53
|
-
childExtendStack = childExtendStack.concat(
|
|
54
|
-
element.
|
|
52
|
+
// add error if childExtendsRecursive contains element which goes to infinite loop
|
|
53
|
+
childExtendStack = childExtendStack.concat(childExtendsRecursiveStack)
|
|
54
|
+
element.childExtendsRecursive = parent.childExtendsRecursive
|
|
55
55
|
}
|
|
56
56
|
}
|
|
57
57
|
}
|
package/mixins/registry.js
CHANGED
|
@@ -24,10 +24,13 @@ export const REGISTRY = {
|
|
|
24
24
|
deps: (param, el) => param || el.parent.deps,
|
|
25
25
|
|
|
26
26
|
extend: {},
|
|
27
|
+
extends: {},
|
|
28
|
+
childExtend: {},
|
|
29
|
+
childExtends: {},
|
|
30
|
+
childExtendsRecursive: {},
|
|
31
|
+
childExtendsRecursive: {},
|
|
27
32
|
helmet: {},
|
|
28
33
|
metadata: {},
|
|
29
|
-
childExtend: {},
|
|
30
|
-
childExtendRecursive: {},
|
|
31
34
|
props: {},
|
|
32
35
|
path: {},
|
|
33
36
|
if: {},
|
|
@@ -99,7 +102,7 @@ export const parseFilters = {
|
|
|
99
102
|
'key',
|
|
100
103
|
'extend',
|
|
101
104
|
'childExtend',
|
|
102
|
-
'
|
|
105
|
+
'childExtendsRecursive',
|
|
103
106
|
'scope',
|
|
104
107
|
'query',
|
|
105
108
|
'$collection',
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@domql/element",
|
|
3
|
-
"version": "2.33.
|
|
3
|
+
"version": "2.33.6",
|
|
4
4
|
"license": "MIT",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"module": "index.js",
|
|
@@ -27,12 +27,12 @@
|
|
|
27
27
|
"prepublish": "npx rimraf -I dist && npm run build && npm run copy:package:cjs"
|
|
28
28
|
},
|
|
29
29
|
"dependencies": {
|
|
30
|
-
"@domql/event": "^2.33.
|
|
31
|
-
"@domql/render": "^2.33.
|
|
32
|
-
"@domql/state": "^2.33.
|
|
33
|
-
"@domql/utils": "^2.33.
|
|
30
|
+
"@domql/event": "^2.33.6",
|
|
31
|
+
"@domql/render": "^2.33.6",
|
|
32
|
+
"@domql/state": "^2.33.6",
|
|
33
|
+
"@domql/utils": "^2.33.6"
|
|
34
34
|
},
|
|
35
|
-
"gitHead": "
|
|
35
|
+
"gitHead": "4f683b61e876700d93b87445331b66ce9b5f1e33",
|
|
36
36
|
"devDependencies": {
|
|
37
37
|
"@babel/core": "^7.27.1"
|
|
38
38
|
}
|