@domql/element 2.5.205 → 2.5.206
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/create.js +43 -85
- package/dist/cjs/define.js +1 -2
- package/dist/cjs/extend.js +4 -8
- package/dist/cjs/index.js +3 -3
- package/dist/cjs/iterate.js +9 -18
- package/dist/cjs/methods/index.js +33 -66
- package/dist/cjs/methods/set.js +1 -2
- package/dist/cjs/methods/v2.js +6 -12
- package/dist/cjs/mixins/attr.js +4 -8
- package/dist/cjs/mixins/classList.js +8 -16
- package/dist/cjs/mixins/content.js +7 -14
- package/dist/cjs/mixins/data.js +2 -4
- package/dist/cjs/mixins/html.js +2 -4
- package/dist/cjs/mixins/scope.js +1 -2
- package/dist/cjs/mixins/state.js +2 -4
- package/dist/cjs/mixins/style.js +2 -4
- package/dist/cjs/mixins/text.js +3 -6
- package/dist/cjs/node.js +8 -14
- package/dist/cjs/props/create.js +6 -12
- package/dist/cjs/props/inherit.js +2 -4
- package/dist/cjs/props/update.js +3 -6
- package/dist/cjs/set.js +7 -14
- package/dist/cjs/update.js +27 -51
- package/dist/cjs/utils/applyParam.js +1 -2
- package/dist/cjs/utils/component.js +3 -6
- package/dist/cjs/utils/extendUtils.js +9 -18
- package/dist/cjs/utils/object.js +8 -16
- package/dist/cjs/utils/onlyResolveExtends.js +13 -26
- package/dist/cjs/utils/propEvents.js +2 -4
- package/dist/esm/create.js +43 -85
- package/dist/esm/define.js +1 -2
- package/dist/esm/extend.js +4 -8
- package/dist/esm/iterate.js +9 -18
- package/dist/esm/methods/index.js +33 -66
- package/dist/esm/methods/set.js +1 -2
- package/dist/esm/methods/v2.js +6 -12
- package/dist/esm/mixins/attr.js +4 -8
- package/dist/esm/mixins/classList.js +8 -16
- package/dist/esm/mixins/content.js +7 -14
- package/dist/esm/mixins/data.js +2 -4
- package/dist/esm/mixins/html.js +2 -4
- package/dist/esm/mixins/scope.js +1 -2
- package/dist/esm/mixins/state.js +2 -4
- package/dist/esm/mixins/style.js +2 -4
- package/dist/esm/mixins/text.js +3 -6
- package/dist/esm/node.js +8 -14
- package/dist/esm/props/create.js +6 -12
- package/dist/esm/props/inherit.js +2 -4
- package/dist/esm/props/update.js +3 -6
- package/dist/esm/set.js +7 -14
- package/dist/esm/update.js +27 -51
- package/dist/esm/utils/applyParam.js +1 -2
- package/dist/esm/utils/component.js +3 -6
- package/dist/esm/utils/extendUtils.js +9 -18
- package/dist/esm/utils/object.js +8 -16
- package/dist/esm/utils/onlyResolveExtends.js +13 -26
- package/dist/esm/utils/propEvents.js +2 -4
- package/node.js +2 -2
- package/package.json +3 -3
- package/update.js +3 -3
package/dist/cjs/utils/object.js
CHANGED
|
@@ -96,8 +96,7 @@ const METHODS_EXL = (0, import_utils.joinArrays)(
|
|
|
96
96
|
);
|
|
97
97
|
const deepMerge = (element, extend, exclude = METHODS_EXL) => {
|
|
98
98
|
for (const e in extend) {
|
|
99
|
-
if (exclude.includes(e))
|
|
100
|
-
continue;
|
|
99
|
+
if (exclude.includes(e)) continue;
|
|
101
100
|
const elementProp = element[e];
|
|
102
101
|
const extendProp = extend[e];
|
|
103
102
|
if (elementProp === void 0) {
|
|
@@ -111,8 +110,7 @@ const deepMerge = (element, extend, exclude = METHODS_EXL) => {
|
|
|
111
110
|
const clone = (obj, exclude = METHODS_EXL) => {
|
|
112
111
|
const o = {};
|
|
113
112
|
for (const e in obj) {
|
|
114
|
-
if (exclude.includes(e))
|
|
115
|
-
continue;
|
|
113
|
+
if (exclude.includes(e)) continue;
|
|
116
114
|
o[e] = obj[e];
|
|
117
115
|
}
|
|
118
116
|
return o;
|
|
@@ -122,31 +120,27 @@ const overwrite = (element, params, options) => {
|
|
|
122
120
|
const { __ref } = element;
|
|
123
121
|
const { __exec, __cached } = __ref;
|
|
124
122
|
for (const e in params) {
|
|
125
|
-
if (e === "props" || e === "state" || e === "__ref")
|
|
126
|
-
continue;
|
|
123
|
+
if (e === "props" || e === "state" || e === "__ref") continue;
|
|
127
124
|
const elementProp = element[e];
|
|
128
125
|
const paramsProp = params[e];
|
|
129
126
|
if (paramsProp !== void 0) {
|
|
130
127
|
__cached[e] = changes[e] = elementProp;
|
|
131
128
|
element[e] = paramsProp;
|
|
132
129
|
}
|
|
133
|
-
if (options.cleanExec)
|
|
134
|
-
delete __exec[e];
|
|
130
|
+
if (options.cleanExec) delete __exec[e];
|
|
135
131
|
}
|
|
136
132
|
return changes;
|
|
137
133
|
};
|
|
138
134
|
const overwriteShallow = (obj, params, exclude = METHODS_EXL) => {
|
|
139
135
|
for (const e in params) {
|
|
140
|
-
if (exclude.includes(e))
|
|
141
|
-
continue;
|
|
136
|
+
if (exclude.includes(e)) continue;
|
|
142
137
|
obj[e] = params[e];
|
|
143
138
|
}
|
|
144
139
|
return obj;
|
|
145
140
|
};
|
|
146
141
|
const overwriteDeep = (obj, params, exclude = METHODS_EXL) => {
|
|
147
142
|
for (const e in params) {
|
|
148
|
-
if (exclude.includes(e))
|
|
149
|
-
continue;
|
|
143
|
+
if (exclude.includes(e)) continue;
|
|
150
144
|
const objProp = obj[e];
|
|
151
145
|
const paramsProp = params[e];
|
|
152
146
|
if ((0, import_utils.isObjectLike)(objProp) && (0, import_utils.isObjectLike)(paramsProp)) {
|
|
@@ -158,8 +152,7 @@ const overwriteDeep = (obj, params, exclude = METHODS_EXL) => {
|
|
|
158
152
|
return obj;
|
|
159
153
|
};
|
|
160
154
|
const mergeIfExisted = (a, b) => {
|
|
161
|
-
if ((0, import_utils.isObjectLike)(a) && (0, import_utils.isObjectLike)(b))
|
|
162
|
-
return deepMerge(a, b);
|
|
155
|
+
if ((0, import_utils.isObjectLike)(a) && (0, import_utils.isObjectLike)(b)) return deepMerge(a, b);
|
|
163
156
|
return a || b;
|
|
164
157
|
};
|
|
165
158
|
const mergeArray = (arr, exclude = ["parent", "node", "__element", "state", "context", "__ref"]) => {
|
|
@@ -172,8 +165,7 @@ const flattenRecursive = (param, prop, stack = []) => {
|
|
|
172
165
|
const objectized = mergeAndCloneIfArray(param);
|
|
173
166
|
stack.push(objectized);
|
|
174
167
|
const extendOfExtend = objectized[prop];
|
|
175
|
-
if (extendOfExtend)
|
|
176
|
-
flattenRecursive(extendOfExtend, prop, stack);
|
|
168
|
+
if (extendOfExtend) flattenRecursive(extendOfExtend, prop, stack);
|
|
177
169
|
delete objectized[prop];
|
|
178
170
|
return stack;
|
|
179
171
|
};
|
|
@@ -36,24 +36,15 @@ const onlyResolveExtends = (element, parent, key, options) => {
|
|
|
36
36
|
element.tag = (0, import_render.detectTag)(element);
|
|
37
37
|
{
|
|
38
38
|
const { __ref: ref2 } = element;
|
|
39
|
-
if (!ref2.__cached)
|
|
40
|
-
|
|
41
|
-
if (!ref2.
|
|
42
|
-
|
|
43
|
-
if (!ref2.
|
|
44
|
-
|
|
45
|
-
if (!ref2.
|
|
46
|
-
|
|
47
|
-
if (!ref2.
|
|
48
|
-
ref2.__class = {};
|
|
49
|
-
if (!ref2.__classNames)
|
|
50
|
-
ref2.__classNames = {};
|
|
51
|
-
if (!ref2.__attr)
|
|
52
|
-
ref2.__attr = {};
|
|
53
|
-
if (!ref2.__changes)
|
|
54
|
-
ref2.__changes = [];
|
|
55
|
-
if (!ref2.__children)
|
|
56
|
-
ref2.__children = [];
|
|
39
|
+
if (!ref2.__cached) ref2.__cached = {};
|
|
40
|
+
if (!ref2.__defineCache) ref2.__defineCache = {};
|
|
41
|
+
if (!ref2.__exec) ref2.__exec = {};
|
|
42
|
+
if (!ref2.__execProps) ref2.__execProps = {};
|
|
43
|
+
if (!ref2.__class) ref2.__class = {};
|
|
44
|
+
if (!ref2.__classNames) ref2.__classNames = {};
|
|
45
|
+
if (!ref2.__attr) ref2.__attr = {};
|
|
46
|
+
if (!ref2.__changes) ref2.__changes = [];
|
|
47
|
+
if (!ref2.__children) ref2.__children = [];
|
|
57
48
|
}
|
|
58
49
|
(0, import_set.addMethods)(element, parent, options);
|
|
59
50
|
(0, import_state.createState)(element, parent);
|
|
@@ -62,10 +53,8 @@ const onlyResolveExtends = (element, parent, key, options) => {
|
|
|
62
53
|
const ifPassed = element.if(element, element.state, element.context);
|
|
63
54
|
if (!ifPassed) {
|
|
64
55
|
delete ref.__if;
|
|
65
|
-
} else
|
|
66
|
-
|
|
67
|
-
} else
|
|
68
|
-
ref.__if = true;
|
|
56
|
+
} else ref.__if = true;
|
|
57
|
+
} else ref.__if = true;
|
|
69
58
|
if (element.node && ref.__if) {
|
|
70
59
|
parent[key || element.key] = element;
|
|
71
60
|
}
|
|
@@ -76,8 +65,7 @@ const onlyResolveExtends = (element, parent, key, options) => {
|
|
|
76
65
|
(0, import_iterate.throughInitialExec)(element);
|
|
77
66
|
for (const param in element) {
|
|
78
67
|
const prop = element[param];
|
|
79
|
-
if ((0, import_utils.isUndefined)(prop) || (0, import_methods.isMethod)(param, element) || (0, import_utils.isObject)(import_mixins.REGISTRY[param]) || (0, import__2.isVariant)(param))
|
|
80
|
-
continue;
|
|
68
|
+
if ((0, import_utils.isUndefined)(prop) || (0, import_methods.isMethod)(param, element) || (0, import_utils.isObject)(import_mixins.REGISTRY[param]) || (0, import__2.isVariant)(param)) continue;
|
|
81
69
|
const hasDefine = element.define && element.define[param];
|
|
82
70
|
const contextHasDefine = element.context && element.context.define && element.context.define[param];
|
|
83
71
|
const optionsHasDefine = options.define && options.define[param];
|
|
@@ -95,7 +83,6 @@ const onlyResolveExtends = (element, parent, key, options) => {
|
|
|
95
83
|
delete element.props.update;
|
|
96
84
|
delete element.props.__element;
|
|
97
85
|
}
|
|
98
|
-
if (!options.keepRef)
|
|
99
|
-
delete element.__ref;
|
|
86
|
+
if (!options.keepRef) delete element.__ref;
|
|
100
87
|
return element;
|
|
101
88
|
};
|
|
@@ -32,10 +32,8 @@ const propagateEventsFromProps = (element) => {
|
|
|
32
32
|
if ((0, import_utils.isFunction)(origEvent)) {
|
|
33
33
|
on[eventName] = (...args) => {
|
|
34
34
|
const originalEventRetunrs = origEvent(...args);
|
|
35
|
-
if (originalEventRetunrs !== false)
|
|
36
|
-
funcFromProps(...args);
|
|
35
|
+
if (originalEventRetunrs !== false) funcFromProps(...args);
|
|
37
36
|
};
|
|
38
|
-
} else
|
|
39
|
-
on[eventName] = funcFromProps;
|
|
37
|
+
} else on[eventName] = funcFromProps;
|
|
40
38
|
});
|
|
41
39
|
};
|
package/dist/esm/create.js
CHANGED
|
@@ -59,20 +59,17 @@ const create = async (element, parent, key, options = OPTIONS.create || {}, atta
|
|
|
59
59
|
addMethods(element, parent, options);
|
|
60
60
|
createScope(element, parent);
|
|
61
61
|
await createState(element, parent);
|
|
62
|
-
if (element.scope === "state")
|
|
63
|
-
element.scope = element.state;
|
|
62
|
+
if (element.scope === "state") element.scope = element.state;
|
|
64
63
|
createIfConditionFlag(element, parent);
|
|
65
64
|
createProps(element, parent, options);
|
|
66
|
-
if (element.scope === "props" || element.scope === true)
|
|
67
|
-
element.scope = element.props;
|
|
65
|
+
if (element.scope === "props" || element.scope === true) element.scope = element.props;
|
|
68
66
|
createIfConditionFlag(element, parent);
|
|
69
67
|
if (element.node && ref.__if) {
|
|
70
68
|
return assignNode(element, parent, key, attachOptions);
|
|
71
69
|
}
|
|
72
70
|
applyVariant(element, parent);
|
|
73
71
|
const onInit = await triggerEventOn("init", element, options);
|
|
74
|
-
if (onInit === false)
|
|
75
|
-
return element;
|
|
72
|
+
if (onInit === false) return element;
|
|
76
73
|
triggerEventOn("beforeClassAssign", element, options);
|
|
77
74
|
assignKeyAsClassname(element);
|
|
78
75
|
addChildrenIfNotInOriginal(element, parent, key);
|
|
@@ -88,15 +85,13 @@ const createBasedOnType = (element, parent, key, options) => {
|
|
|
88
85
|
}
|
|
89
86
|
return {};
|
|
90
87
|
}
|
|
91
|
-
if (isString(key) && key.slice(0,
|
|
88
|
+
if (isString(key) && key.slice(0, false)) {
|
|
92
89
|
if (ENV === "testing" || ENV === "development") {
|
|
93
90
|
console.warn(key, "seems like to be in __ref");
|
|
94
91
|
}
|
|
95
92
|
}
|
|
96
|
-
if (element === null)
|
|
97
|
-
|
|
98
|
-
if (element === true)
|
|
99
|
-
return { text: true };
|
|
93
|
+
if (element === null) return;
|
|
94
|
+
if (element === true) return { text: true };
|
|
100
95
|
if (element.__hash) {
|
|
101
96
|
return { extend: element };
|
|
102
97
|
}
|
|
@@ -105,10 +100,8 @@ const createBasedOnType = (element, parent, key, options) => {
|
|
|
105
100
|
const redefineElement = (element, parent, key, options) => {
|
|
106
101
|
const elementWrapper = createBasedOnType(element, parent, key, options);
|
|
107
102
|
if (options.syntaxv3 || element.props && element.props.syntaxv3 || parent && parent.props && parent.props.syntaxv3) {
|
|
108
|
-
if (element.props)
|
|
109
|
-
|
|
110
|
-
else
|
|
111
|
-
element.syntaxv3 = true;
|
|
103
|
+
if (element.props) element.props.syntaxv3 = true;
|
|
104
|
+
else element.syntaxv3 = true;
|
|
112
105
|
return createValidDomqlObjectFromSugar(element, parent, key, options);
|
|
113
106
|
} else if (checkIfKeyIsComponent(key)) {
|
|
114
107
|
return applyKeyComponentAsExtend(elementWrapper, parent, key);
|
|
@@ -119,8 +112,7 @@ const redefineElement = (element, parent, key, options) => {
|
|
|
119
112
|
return elementWrapper;
|
|
120
113
|
};
|
|
121
114
|
const redefineParent = (element, parent, key, options) => {
|
|
122
|
-
if (!parent)
|
|
123
|
-
return ROOT;
|
|
115
|
+
if (!parent) return ROOT;
|
|
124
116
|
if (isNode(parent)) {
|
|
125
117
|
const parentNodeWrapper = { key: ":root", node: parent };
|
|
126
118
|
ROOT[`${key}_parent`] = parentNodeWrapper;
|
|
@@ -138,36 +130,30 @@ const createKey = (element, parent, key) => {
|
|
|
138
130
|
return (exec(key, element) || key || element.key || generateKey()).toString();
|
|
139
131
|
};
|
|
140
132
|
const addRef = (element, parent) => {
|
|
141
|
-
if (element.__ref)
|
|
142
|
-
|
|
143
|
-
else
|
|
144
|
-
element.__ref = { origin: element };
|
|
133
|
+
if (element.__ref) element.__ref.origin = element;
|
|
134
|
+
else element.__ref = { origin: element };
|
|
145
135
|
return element.__ref;
|
|
146
136
|
};
|
|
147
137
|
const switchDefaultOptions = (element, parent, options) => {
|
|
148
138
|
if (Object.keys(options).length) {
|
|
149
139
|
registry.defaultOptions = options;
|
|
150
|
-
if (options.ignoreChildExtend)
|
|
151
|
-
delete options.ignoreChildExtend;
|
|
140
|
+
if (options.ignoreChildExtend) delete options.ignoreChildExtend;
|
|
152
141
|
}
|
|
153
142
|
};
|
|
154
143
|
const addElementIntoParentChildren = (element, parent) => {
|
|
155
|
-
if (parent.__ref && parent.__ref.__children)
|
|
156
|
-
parent.__ref.__children.push(element.key);
|
|
144
|
+
if (parent.__ref && parent.__ref.__children) parent.__ref.__children.push(element.key);
|
|
157
145
|
};
|
|
158
146
|
const visitedElements = /* @__PURE__ */ new WeakMap();
|
|
159
147
|
const renderElement = async (element, parent, options, attachOptions) => {
|
|
160
148
|
var _a, _b, _c, _d;
|
|
161
149
|
if (visitedElements.has(element)) {
|
|
162
|
-
if (ENV === "testing" || ENV === "development")
|
|
163
|
-
console.warn("Cyclic rendering detected:", element.__ref.path);
|
|
150
|
+
if (ENV === "testing" || ENV === "development") console.warn("Cyclic rendering detected:", element.__ref.path);
|
|
164
151
|
}
|
|
165
152
|
visitedElements.set(element, true);
|
|
166
153
|
const { __ref: ref, key } = element;
|
|
167
154
|
const createNestedChild = async () => {
|
|
168
155
|
const isInfiniteLoopDetected = detectInfiniteLoop(ref.path);
|
|
169
|
-
if (ref.__uniqId || isInfiniteLoopDetected)
|
|
170
|
-
return;
|
|
156
|
+
if (ref.__uniqId || isInfiniteLoopDetected) return;
|
|
171
157
|
await createNode(element, options);
|
|
172
158
|
ref.__uniqId = Math.random();
|
|
173
159
|
};
|
|
@@ -178,18 +164,14 @@ const renderElement = async (element, parent, options, attachOptions) => {
|
|
|
178
164
|
await createNestedChild();
|
|
179
165
|
} catch (e) {
|
|
180
166
|
const path = ref.path;
|
|
181
|
-
if (path.includes("ComponentsGrid"))
|
|
182
|
-
|
|
183
|
-
if (path.includes("demoComponent"))
|
|
184
|
-
path.splice(0, path.indexOf("demoComponent") + 1);
|
|
167
|
+
if (path.includes("ComponentsGrid")) path.splice(0, path.indexOf("ComponentsGrid") + 2);
|
|
168
|
+
if (path.includes("demoComponent")) path.splice(0, path.indexOf("demoComponent") + 1);
|
|
185
169
|
const isDemoComponent = (_b = (_a = element.lookup((el) => el.state.key)) == null ? void 0 : _a.state) == null ? void 0 : _b.key;
|
|
186
170
|
element.warn("Error happened in:", isDemoComponent ? isDemoComponent + " " : "" + path.join("."));
|
|
187
171
|
element.verbose();
|
|
188
172
|
element.error(e, options);
|
|
189
|
-
if ((_c = element.on) == null ? void 0 : _c.error)
|
|
190
|
-
|
|
191
|
-
if ((_d = element.props) == null ? void 0 : _d.onError)
|
|
192
|
-
element.props.onError(e, element, element.state, element.context, options);
|
|
173
|
+
if ((_c = element.on) == null ? void 0 : _c.error) element.on.error(e, element, element.state, element.context, options);
|
|
174
|
+
if ((_d = element.props) == null ? void 0 : _d.onError) element.props.onError(e, element, element.state, element.context, options);
|
|
193
175
|
}
|
|
194
176
|
}
|
|
195
177
|
if (!ref.__if) {
|
|
@@ -216,55 +198,37 @@ const applyValueAsText = (element, parent, key) => {
|
|
|
216
198
|
};
|
|
217
199
|
const applyContext = (element, parent, options) => {
|
|
218
200
|
const forcedOptionsContext = options.context && !ROOT.context && !element.context;
|
|
219
|
-
if (forcedOptionsContext)
|
|
220
|
-
|
|
221
|
-
if (!element.context)
|
|
222
|
-
element.context = parent.context || options.context || ROOT.context;
|
|
201
|
+
if (forcedOptionsContext) ROOT.context = options.context;
|
|
202
|
+
if (!element.context) element.context = parent.context || options.context || ROOT.context;
|
|
223
203
|
};
|
|
224
204
|
const createScope = (element, parent) => {
|
|
225
205
|
const { __ref: ref } = element;
|
|
226
|
-
if (!element.scope)
|
|
227
|
-
element.scope = parent.scope || ref.root.scope || {};
|
|
206
|
+
if (!element.scope) element.scope = parent.scope || ref.root.scope || {};
|
|
228
207
|
};
|
|
229
208
|
const createIfConditionFlag = (element, parent) => {
|
|
230
209
|
const { __ref: ref } = element;
|
|
231
210
|
if (isFunction(element.if) && !element.if(element, element.state, element.context)) {
|
|
232
211
|
delete ref.__if;
|
|
233
|
-
} else
|
|
234
|
-
ref.__if = true;
|
|
212
|
+
} else ref.__if = true;
|
|
235
213
|
};
|
|
236
214
|
const addCaching = (element, parent) => {
|
|
237
215
|
const { __ref: ref, key } = element;
|
|
238
216
|
let { __ref: parentRef } = parent;
|
|
239
|
-
if (!element.transform)
|
|
240
|
-
|
|
241
|
-
if (!ref.
|
|
242
|
-
|
|
243
|
-
if (!ref.
|
|
244
|
-
|
|
245
|
-
if (!ref.
|
|
246
|
-
|
|
247
|
-
if (!ref.
|
|
248
|
-
|
|
249
|
-
if (
|
|
250
|
-
ref.__class = {};
|
|
251
|
-
if (!ref.__classNames)
|
|
252
|
-
ref.__classNames = {};
|
|
253
|
-
if (!ref.__attr)
|
|
254
|
-
ref.__attr = {};
|
|
255
|
-
if (!ref.__changes)
|
|
256
|
-
ref.__changes = [];
|
|
257
|
-
if (!ref.__children)
|
|
258
|
-
ref.__children = [];
|
|
259
|
-
if (checkIfKeyIsComponent(key))
|
|
260
|
-
ref.__componentKey = key.split("_")[0].split(".")[0].split("+")[0];
|
|
217
|
+
if (!element.transform) element.transform = {};
|
|
218
|
+
if (!ref.__cached) ref.__cached = {};
|
|
219
|
+
if (!ref.__defineCache) ref.__defineCache = {};
|
|
220
|
+
if (!ref.__exec) ref.__exec = {};
|
|
221
|
+
if (!ref.__execProps) ref.__execProps = {};
|
|
222
|
+
if (!ref.__class) ref.__class = {};
|
|
223
|
+
if (!ref.__classNames) ref.__classNames = {};
|
|
224
|
+
if (!ref.__attr) ref.__attr = {};
|
|
225
|
+
if (!ref.__changes) ref.__changes = [];
|
|
226
|
+
if (!ref.__children) ref.__children = [];
|
|
227
|
+
if (checkIfKeyIsComponent(key)) ref.__componentKey = key.split("_")[0].split(".")[0].split("+")[0];
|
|
261
228
|
const hasRoot = parent && parent.key === ":root";
|
|
262
|
-
if (!ref.root)
|
|
263
|
-
|
|
264
|
-
if (!parentRef)
|
|
265
|
-
parentRef = parent.ref = {};
|
|
266
|
-
if (!parentRef.path)
|
|
267
|
-
parentRef.path = [];
|
|
229
|
+
if (!ref.root) ref.root = hasRoot ? element : parentRef.root;
|
|
230
|
+
if (!parentRef) parentRef = parent.ref = {};
|
|
231
|
+
if (!parentRef.path) parentRef.path = [];
|
|
268
232
|
ref.path = parentRef.path.concat(element.key);
|
|
269
233
|
};
|
|
270
234
|
const onlyResolveExtends = (element, parent, key, options) => {
|
|
@@ -274,17 +238,14 @@ const onlyResolveExtends = (element, parent, key, options) => {
|
|
|
274
238
|
addMethods(element, parent, options);
|
|
275
239
|
createScope(element, parent);
|
|
276
240
|
createState(element, parent);
|
|
277
|
-
if (element.scope === "state")
|
|
278
|
-
element.scope = element.state;
|
|
241
|
+
if (element.scope === "state") element.scope = element.state;
|
|
279
242
|
createIfConditionFlag(element, parent);
|
|
280
243
|
createProps(element, parent, options);
|
|
281
|
-
if (element.scope === "props" || element.scope === true)
|
|
282
|
-
element.scope = element.props;
|
|
244
|
+
if (element.scope === "props" || element.scope === true) element.scope = element.props;
|
|
283
245
|
if (element.node && ref.__if) {
|
|
284
246
|
parent[key || element.key] = element;
|
|
285
247
|
}
|
|
286
|
-
if (!element.props)
|
|
287
|
-
element.props = {};
|
|
248
|
+
if (!element.props) element.props = {};
|
|
288
249
|
applyVariant(element, parent);
|
|
289
250
|
addElementIntoParentChildren(element, parent);
|
|
290
251
|
}
|
|
@@ -292,8 +253,7 @@ const onlyResolveExtends = (element, parent, key, options) => {
|
|
|
292
253
|
throughInitialDefine(element);
|
|
293
254
|
throughInitialExec(element);
|
|
294
255
|
for (const k in element) {
|
|
295
|
-
if (isUndefined(element[k]) || isMethod(k, element) || isObject((registry.default || registry)[k]) || isVariant(k))
|
|
296
|
-
continue;
|
|
256
|
+
if (isUndefined(element[k]) || isMethod(k, element) || isObject((registry.default || registry)[k]) || isVariant(k)) continue;
|
|
297
257
|
const hasDefine = element.define && element.define[k];
|
|
298
258
|
const contextHasDefine = element.context && element.context.define && element.context.define[k];
|
|
299
259
|
const optionsHasDefine = options.define && options.define[k];
|
|
@@ -318,10 +278,8 @@ const applyMediaProps = (element, parent, key) => {
|
|
|
318
278
|
const { props } = element;
|
|
319
279
|
if (props) {
|
|
320
280
|
props.display = "none";
|
|
321
|
-
if (props[key])
|
|
322
|
-
|
|
323
|
-
else
|
|
324
|
-
props[key] = { display: props.display || "block" };
|
|
281
|
+
if (props[key]) props[key].display = props.display;
|
|
282
|
+
else props[key] = { display: props.display || "block" };
|
|
325
283
|
return element;
|
|
326
284
|
} else {
|
|
327
285
|
return {
|
package/dist/esm/define.js
CHANGED
|
@@ -5,8 +5,7 @@ var define_default = (params, options = {}) => {
|
|
|
5
5
|
for (const param in params) {
|
|
6
6
|
if (REGISTRY[param] && !overwrite) {
|
|
7
7
|
report("OverwriteToBuiltin", param);
|
|
8
|
-
} else
|
|
9
|
-
REGISTRY[param] = params[param];
|
|
8
|
+
} else REGISTRY[param] = params[param];
|
|
10
9
|
}
|
|
11
10
|
};
|
|
12
11
|
export {
|
package/dist/esm/extend.js
CHANGED
|
@@ -9,16 +9,14 @@ import {
|
|
|
9
9
|
const ENV = "development";
|
|
10
10
|
let mainExtend;
|
|
11
11
|
const applyExtend = (element, parent, options = {}) => {
|
|
12
|
-
if (isFunction(element))
|
|
13
|
-
element = exec(element, parent);
|
|
12
|
+
if (isFunction(element)) element = exec(element, parent);
|
|
14
13
|
const { props, __ref } = element;
|
|
15
14
|
let extend = (props == null ? void 0 : props.extends) || element.extends || element.extend;
|
|
16
15
|
const variant = props == null ? void 0 : props.variant;
|
|
17
16
|
const context = element.context || parent.context;
|
|
18
17
|
extend = fallbackStringExtend(extend, context, options, variant);
|
|
19
18
|
const extendStack = getExtendStack(extend, context);
|
|
20
|
-
if (ENV !== "test" || ENV !== "development")
|
|
21
|
-
delete element.extend;
|
|
19
|
+
if (ENV !== "test" || ENV !== "development") delete element.extend;
|
|
22
20
|
let childExtendStack = [];
|
|
23
21
|
if (parent) {
|
|
24
22
|
element.parent = parent;
|
|
@@ -44,8 +42,7 @@ const applyExtend = (element, parent, options = {}) => {
|
|
|
44
42
|
stack = extendStack;
|
|
45
43
|
} else if (childExtendLength) {
|
|
46
44
|
stack = childExtendStack;
|
|
47
|
-
} else if (!context.defaultExtends)
|
|
48
|
-
return element;
|
|
45
|
+
} else if (!context.defaultExtends) return element;
|
|
49
46
|
if (context.defaultExtends) {
|
|
50
47
|
if (!mainExtend) {
|
|
51
48
|
const defaultOptionsExtend = getExtendStack(context.defaultExtends, context);
|
|
@@ -54,8 +51,7 @@ const applyExtend = (element, parent, options = {}) => {
|
|
|
54
51
|
}
|
|
55
52
|
stack = [].concat(stack, mainExtend);
|
|
56
53
|
}
|
|
57
|
-
if (__ref)
|
|
58
|
-
__ref.__extend = stack;
|
|
54
|
+
if (__ref) __ref.__extend = stack;
|
|
59
55
|
let mergedExtend = cloneAndMergeArrayExtend(stack);
|
|
60
56
|
const COMPONENTS = context && context.components || options.components;
|
|
61
57
|
const component = exec(element.component || mergedExtend.component, element);
|
package/dist/esm/iterate.js
CHANGED
|
@@ -13,8 +13,7 @@ import { isMethod } from "./methods/index.js";
|
|
|
13
13
|
const throughInitialExec = (element, exclude = {}) => {
|
|
14
14
|
const { __ref: ref } = element;
|
|
15
15
|
for (const param in element) {
|
|
16
|
-
if (exclude[param])
|
|
17
|
-
continue;
|
|
16
|
+
if (exclude[param]) continue;
|
|
18
17
|
const prop = element[param];
|
|
19
18
|
if (isFunction(prop) && !isMethod(param, element) && !isVariant(param)) {
|
|
20
19
|
ref.__exec[param] = prop;
|
|
@@ -28,8 +27,7 @@ const throughUpdatedExec = (element, options = { excludes: METHODS_EXL }) => {
|
|
|
28
27
|
for (const param in ref.__exec) {
|
|
29
28
|
const prop = element[param];
|
|
30
29
|
const isDefinedParam = ref.__defineCache[param];
|
|
31
|
-
if (isDefinedParam)
|
|
32
|
-
continue;
|
|
30
|
+
if (isDefinedParam) continue;
|
|
33
31
|
const newExec = ref.__exec[param](element, element.state, element.context);
|
|
34
32
|
const execReturnsString = isString(newExec) || isNumber(newExec);
|
|
35
33
|
if (prop && prop.node && execReturnsString) {
|
|
@@ -64,10 +62,8 @@ const throughInitialDefine = (element) => {
|
|
|
64
62
|
const { define, context, __ref: ref } = element;
|
|
65
63
|
let defineObj = {};
|
|
66
64
|
const hasGlobalDefine = context && isObject(context.define);
|
|
67
|
-
if (isObject(define))
|
|
68
|
-
|
|
69
|
-
if (hasGlobalDefine)
|
|
70
|
-
defineObj = { ...defineObj, ...context.define };
|
|
65
|
+
if (isObject(define)) defineObj = { ...define };
|
|
66
|
+
if (hasGlobalDefine) defineObj = { ...defineObj, ...context.define };
|
|
71
67
|
for (const param in defineObj) {
|
|
72
68
|
let elementProp = element[param];
|
|
73
69
|
if (isFunction(elementProp) && !isMethod(param, element) && !isVariant(param)) {
|
|
@@ -79,8 +75,7 @@ const throughInitialDefine = (element) => {
|
|
|
79
75
|
}
|
|
80
76
|
}
|
|
81
77
|
const execParam = defineObj[param](elementProp, element, element.state, element.context);
|
|
82
|
-
if (execParam)
|
|
83
|
-
element[param] = execParam;
|
|
78
|
+
if (execParam) element[param] = execParam;
|
|
84
79
|
}
|
|
85
80
|
return element;
|
|
86
81
|
};
|
|
@@ -88,18 +83,14 @@ const throughUpdatedDefine = (element) => {
|
|
|
88
83
|
const { context, define, __ref: ref } = element;
|
|
89
84
|
const changes = {};
|
|
90
85
|
let obj = {};
|
|
91
|
-
if (isObject(define))
|
|
92
|
-
|
|
93
|
-
if (isObject(context && context.define))
|
|
94
|
-
obj = { ...obj, ...context.define };
|
|
86
|
+
if (isObject(define)) obj = { ...define };
|
|
87
|
+
if (isObject(context && context.define)) obj = { ...obj, ...context.define };
|
|
95
88
|
for (const param in obj) {
|
|
96
89
|
const execParam = ref.__exec[param];
|
|
97
|
-
if (execParam)
|
|
98
|
-
ref.__defineCache[param] = execParam(element, element.state, element.context);
|
|
90
|
+
if (execParam) ref.__defineCache[param] = execParam(element, element.state, element.context);
|
|
99
91
|
const cached = exec(ref.__defineCache[param], element);
|
|
100
92
|
const newExecParam = obj[param](cached, element, element.state, element.context);
|
|
101
|
-
if (newExecParam)
|
|
102
|
-
element[param] = newExecParam;
|
|
93
|
+
if (newExecParam) element[param] = newExecParam;
|
|
103
94
|
}
|
|
104
95
|
return changes;
|
|
105
96
|
};
|