babel-plugin-wallace 0.1.0 → 0.2.0
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/config.js.map +1 -1
- package/dist/consolidation/ComponentDefinitionData.js +5 -2
- package/dist/consolidation/ComponentDefinitionData.js.map +1 -1
- package/dist/consolidation/consolidateComponent.js +2 -2
- package/dist/consolidation/consolidateComponent.js.map +1 -1
- package/dist/consolidation/processNodes.js +40 -43
- package/dist/consolidation/processNodes.js.map +1 -1
- package/dist/consolidation/utils.d.ts +3 -4
- package/dist/consolidation/utils.js +20 -15
- package/dist/consolidation/utils.js.map +1 -1
- package/dist/consolidation/visibility.js +1 -1
- package/dist/consolidation/visibility.js.map +1 -1
- package/dist/constants.d.ts +24 -9
- package/dist/constants.js +34 -16
- package/dist/constants.js.map +1 -1
- package/dist/contexts/handlers.js +6 -8
- package/dist/contexts/handlers.js.map +1 -1
- package/dist/contexts/parameters.js +8 -6
- package/dist/contexts/parameters.js.map +1 -1
- package/dist/directives.d.ts +4 -3
- package/dist/directives.js +12 -2
- package/dist/directives.js.map +1 -1
- package/dist/errors.js +3 -3
- package/dist/errors.js.map +1 -1
- package/dist/index.d.ts +2 -1
- package/dist/index.js +6 -4
- package/dist/index.js.map +1 -1
- package/dist/models/component.js +1 -1
- package/dist/models/component.js.map +1 -1
- package/dist/models/directive.js +1 -1
- package/dist/models/directive.js.map +1 -1
- package/dist/models/index.d.ts +1 -1
- package/dist/models/module.js +2 -4
- package/dist/models/module.js.map +1 -1
- package/dist/models/node.d.ts +4 -3
- package/dist/models/node.js +3 -3
- package/dist/models/node.js.map +1 -1
- package/dist/utils.d.ts +2 -2
- package/dist/utils.js +3 -2
- package/dist/utils.js.map +1 -1
- package/dist/visitors/attribute.js +1 -1
- package/dist/visitors/jsx.js +2 -2
- package/dist/visitors/jsx.js.map +1 -1
- package/dist/visitors/program.js +1 -1
- package/dist/visitors/program.js.map +1 -1
- package/dist/writers/define-component.js +9 -9
- package/dist/writers/define-component.js.map +1 -1
- package/package.json +2 -2
package/dist/config.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.js","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AACA,6CAAiD;AAMjD,MAAM,aAAa;IAAnB;QACE,eAAU,GAAwC,EAAE,CAAC;QACrD,gCAAmB,KAAK,EAAC;
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AACA,6CAAiD;AAMjD,MAAM,aAAa;IAAnB;QACE,eAAU,GAAwC,EAAE,CAAC;QACrD,gCAAmB,KAAK,EAAC;IAwB3B,CAAC;IAvBC,YAAY,CAAC,OAAuB;QAClC,IAAI,uBAAA,IAAI,6BAAQ,EAAE,CAAC;YACjB,OAAO;QACT,CAAC;QACD,IAAI,OAAO,CAAC,UAAU,EAAE,CAAC;YACvB,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;QACzC,CAAC;QACD,uBAAA,IAAI,yBAAW,IAAI,MAAA,CAAC;IACtB,CAAC;IACD,aAAa,CAAC,UAAmC;QAC/C,KAAK,MAAM,cAAc,IAAI,UAAU,EAAE,CAAC;YACxC,MAAM,aAAa,GAAG,cAAc,CAAC,aAAa,CAAC;YACnD,IAAI,aAAa,KAAK,SAAS,EAAE,CAAC;gBAChC,MAAM,IAAI,KAAK,CACb,qBAAqB,cAAc,CAAC,IAAI,8BAA8B,CACvE,CAAC;YACJ,CAAC;YACD,IAAI,IAAI,CAAC,UAAU,CAAC,cAAc,CAAC,aAAa,CAAC,EAAE,CAAC;gBAClD,OAAO,CAAC,KAAK,CAAC,wBAAwB,aAAa,SAAS,cAAc,GAAG,CAAC,CAAC;YACjF,CAAC;YACD,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,GAAG,cAAc,CAAC;QAClD,CAAC;IACH,CAAC;CACF;;AAEY,QAAA,aAAa,GAAG,IAAI,aAAa,EAAE,CAAC;AAEjD,qBAAa,CAAC,aAAa,CAAC,8BAAiB,CAAC,CAAC"}
|
|
@@ -43,7 +43,7 @@ class ComponentDefinitionData {
|
|
|
43
43
|
return __classPrivateFieldGet(this, _ComponentDefinitionData_dynamicElementKey, "f");
|
|
44
44
|
}
|
|
45
45
|
addLookup(expression) {
|
|
46
|
-
const hashExpression =
|
|
46
|
+
const hashExpression = expr => {
|
|
47
47
|
const copy = JSON.parse(JSON.stringify(expr));
|
|
48
48
|
(0, utils_1.removeKeys)(copy, ["start", "end", "loc"]);
|
|
49
49
|
return JSON.stringify(copy);
|
|
@@ -64,7 +64,10 @@ class ComponentDefinitionData {
|
|
|
64
64
|
return [this.component.propsIdentifier, this.component.componentIdentifier];
|
|
65
65
|
}
|
|
66
66
|
wrapDynamicElementCall(key, functionName, remainingArgs) {
|
|
67
|
-
this.dynamicElements[key] = (0, types_1.callExpression)(this.getFunctionIdentifier(functionName), [
|
|
67
|
+
this.dynamicElements[key] = (0, types_1.callExpression)(this.getFunctionIdentifier(functionName), [
|
|
68
|
+
this.dynamicElements[key],
|
|
69
|
+
...remainingArgs
|
|
70
|
+
]);
|
|
68
71
|
}
|
|
69
72
|
getNextmiscStashKey() {
|
|
70
73
|
var _a;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ComponentDefinitionData.js","sourceRoot":"","sources":["../../src/consolidation/ComponentDefinitionData.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAMA,wCAMsB;AAItB,
|
|
1
|
+
{"version":3,"file":"ComponentDefinitionData.js","sourceRoot":"","sources":["../../src/consolidation/ComponentDefinitionData.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,7 +12,7 @@ const utils_1 = require("./utils");
|
|
|
12
12
|
*/
|
|
13
13
|
function hoistTextNodes(component) {
|
|
14
14
|
const nodesToDelete = [];
|
|
15
|
-
component.extractedNodes.forEach(
|
|
15
|
+
component.extractedNodes.forEach(node => {
|
|
16
16
|
if (node instanceof models_1.DynamicTextNode) {
|
|
17
17
|
if ((0, utils_1.getSiblings)(node, component.extractedNodes).length === 0) {
|
|
18
18
|
const parent = node.parent;
|
|
@@ -22,7 +22,7 @@ function hoistTextNodes(component) {
|
|
|
22
22
|
}
|
|
23
23
|
}
|
|
24
24
|
});
|
|
25
|
-
nodesToDelete.forEach(
|
|
25
|
+
nodesToDelete.forEach(node => {
|
|
26
26
|
component.extractedNodes.splice(component.extractedNodes.indexOf(node), 1);
|
|
27
27
|
});
|
|
28
28
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"consolidateComponent.js","sourceRoot":"","sources":["../../src/consolidation/consolidateComponent.ts"],"names":[],"mappings":";;AA8BA,
|
|
1
|
+
{"version":3,"file":"consolidateComponent.js","sourceRoot":"","sources":["../../src/consolidation/consolidateComponent.ts"],"names":[],"mappings":";;AA8BA,oDAQC;AAtCD,sCAAuD;AACvD,6CAAyD;AACzD,uEAAoE;AACpE,iDAA8C;AAC9C,mCAAsC;AAEtC;;;GAGG;AACH,SAAS,cAAc,CAAC,SAAoB;IAC1C,MAAM,aAAa,GAAG,EAAE,CAAC;IACzB,SAAS,CAAC,cAAc,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;QACtC,IAAI,IAAI,YAAY,wBAAe,EAAE,CAAC;YACpC,IAAI,IAAA,mBAAW,EAAC,IAAI,EAAE,SAAS,CAAC,cAAc,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBAC7D,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;gBAC3B,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,CAAC;gBACrC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBACzB,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC;YACxB,CAAC;QACH,CAAC;IACH,CAAC,CAAC,CAAC;IACH,aAAa,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;QAC3B,SAAS,CAAC,cAAc,CAAC,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC;IAC7E,CAAC,CAAC,CAAC;AACL,CAAC;AAED;;GAEG;AACH,SAAgB,oBAAoB,CAAC,SAAoB;IACvD,MAAM,mBAAmB,GAAG,IAAI,iDAAuB,CAAC,SAAS,CAAC,CAAC;IACnE,cAAc,CAAC,SAAS,CAAC,CAAC;IAC1B,IAAA,2BAAY,EAAC,SAAS,EAAE,mBAAmB,CAAC,CAAC;IAC7C,IAAA,sCAAyB,EAAC,mBAAmB,CAAC,OAAO,CAAC,CAAC;IACvD,uEAAuE;IACvE,mBAAmB,CAAC,IAAI,GAAG,SAAS,CAAC,WAAW,CAAC,SAAS,CAAC;IAC3D,OAAO,mBAAmB,CAAC;AAC7B,CAAC"}
|
|
@@ -14,7 +14,7 @@ function addBindInstruction(node) {
|
|
|
14
14
|
const attribute = inputType === "checkbox" ? "checked" : "value";
|
|
15
15
|
node.bindInstructions.forEach(({ eventName, expression }) => {
|
|
16
16
|
node.watchAttribute(attribute, expression);
|
|
17
|
-
const callback = t.assignmentExpression("=", expression, t.memberExpression(t.memberExpression(t.identifier(constants_1.
|
|
17
|
+
const callback = t.assignmentExpression("=", expression, t.memberExpression(t.memberExpression(t.identifier(constants_1.EVENT_CALLBACK_ARGS.event), t.identifier("target")), t.identifier(attribute)));
|
|
18
18
|
node.addEventListener(eventName, callback);
|
|
19
19
|
});
|
|
20
20
|
}
|
|
@@ -23,8 +23,8 @@ function addBindInstruction(node) {
|
|
|
23
23
|
}
|
|
24
24
|
}
|
|
25
25
|
function ensureToggleTargetsHaveTriggers(node) {
|
|
26
|
-
node.toggleTargets.forEach(
|
|
27
|
-
const match = node.toggleTriggers.find(
|
|
26
|
+
node.toggleTargets.forEach(target => {
|
|
27
|
+
const match = node.toggleTriggers.find(trigger => trigger.name == target.name);
|
|
28
28
|
if (!match) {
|
|
29
29
|
(0, errors_1.error)(node.path, errors_1.ERROR_MESSAGES.TOGGLE_TARGETS_WITHOUT_TOGGLE_TRIGGERS);
|
|
30
30
|
}
|
|
@@ -35,7 +35,7 @@ function extractCssClasses(value) {
|
|
|
35
35
|
return value
|
|
36
36
|
.trim()
|
|
37
37
|
.split(" ")
|
|
38
|
-
.map(
|
|
38
|
+
.map(v => t.stringLiteral(v));
|
|
39
39
|
}
|
|
40
40
|
else {
|
|
41
41
|
return [t.spreadElement(value)];
|
|
@@ -45,22 +45,22 @@ function extractCssClasses(value) {
|
|
|
45
45
|
// a) they allow multiple classes
|
|
46
46
|
// b) it's less brittle around truthiness
|
|
47
47
|
function addToggleCallbackStatement(componentDefinition, node, addCallbackStatement) {
|
|
48
|
-
node.toggleTriggers.forEach(
|
|
49
|
-
const target = node.toggleTargets.find(
|
|
48
|
+
node.toggleTriggers.forEach(trigger => {
|
|
49
|
+
const target = node.toggleTargets.find(target => target.name == trigger.name);
|
|
50
50
|
const classesToToggle = target
|
|
51
51
|
? extractCssClasses(target.value)
|
|
52
52
|
: [t.stringLiteral(trigger.name)];
|
|
53
53
|
const toBoolExpression = trigger.expression;
|
|
54
54
|
const lookupKey = componentDefinition.addLookup(toBoolExpression);
|
|
55
|
-
const getCallback = (method) => (0, types_1.callExpression)((0, types_1.memberExpression)((0, types_1.memberExpression)((0, types_1.identifier)(constants_1.
|
|
55
|
+
const getCallback = (method) => (0, types_1.callExpression)((0, types_1.memberExpression)((0, types_1.memberExpression)((0, types_1.identifier)(constants_1.WATCH_CALLBACK_ARGS.element), (0, types_1.identifier)("classList")), (0, types_1.identifier)(method)), classesToToggle);
|
|
56
56
|
addCallbackStatement(lookupKey, [
|
|
57
|
-
t.ifStatement(t.identifier(constants_1.
|
|
57
|
+
t.ifStatement(t.identifier(constants_1.WATCH_CALLBACK_ARGS.newValue), (0, types_1.blockStatement)([(0, types_1.expressionStatement)(getCallback("add"))]), (0, types_1.blockStatement)([(0, types_1.expressionStatement)(getCallback("remove"))]))
|
|
58
58
|
]);
|
|
59
59
|
});
|
|
60
60
|
}
|
|
61
61
|
// TODO: break this up.
|
|
62
62
|
function processNodes(component, componentDefinition) {
|
|
63
|
-
component.extractedNodes.forEach(
|
|
63
|
+
component.extractedNodes.forEach(node => {
|
|
64
64
|
if (node.isRepeatedComponent) {
|
|
65
65
|
// The watch should already have been added to the parent node, which is already
|
|
66
66
|
// processed. All we do here is run some extra checks.
|
|
@@ -89,10 +89,7 @@ function processNodes(component, componentDefinition) {
|
|
|
89
89
|
stubName ||
|
|
90
90
|
repeatInstruction;
|
|
91
91
|
// TODO: should ref really save the element?
|
|
92
|
-
const shouldSaveElement = createWatch ||
|
|
93
|
-
ref ||
|
|
94
|
-
node.eventListeners.length > 0 ||
|
|
95
|
-
node.hasConditionalChildren;
|
|
92
|
+
const shouldSaveElement = createWatch || ref || node.eventListeners.length > 0 || node.hasConditionalChildren;
|
|
96
93
|
ensureToggleTargetsHaveTriggers(node);
|
|
97
94
|
if (shouldSaveElement) {
|
|
98
95
|
const nestedComponentCls = node.isNestedComponent
|
|
@@ -119,34 +116,37 @@ function processNodes(component, componentDefinition) {
|
|
|
119
116
|
const componentWatch = {
|
|
120
117
|
elementKey: node.elementKey,
|
|
121
118
|
callbacks: {},
|
|
122
|
-
address: node.address
|
|
119
|
+
address: node.address
|
|
123
120
|
};
|
|
124
121
|
componentDefinition.watches.push(componentWatch);
|
|
125
|
-
node.watches.forEach(
|
|
126
|
-
|
|
127
|
-
|
|
122
|
+
node.watches.forEach(watch => {
|
|
123
|
+
if (watch.expression == constants_1.SPECIAL_SYMBOLS.alwaysUpdate) {
|
|
124
|
+
addCallbackStatement(constants_1.SPECIAL_SYMBOLS.alwaysUpdate, (0, utils_1.codeToNode)(watch.callback));
|
|
125
|
+
}
|
|
126
|
+
else {
|
|
127
|
+
const lookupKey = componentDefinition.addLookup(watch.expression);
|
|
128
|
+
addCallbackStatement(lookupKey, (0, utils_1.codeToNode)(watch.callback));
|
|
129
|
+
}
|
|
128
130
|
});
|
|
129
131
|
if (node.isNestedComponent) {
|
|
130
132
|
const props = node.getProps();
|
|
131
133
|
const ctrlArg = (0, types_1.memberExpression)(component.componentIdentifier, (0, types_1.identifier)(constants_1.SPECIAL_SYMBOLS.ctrl));
|
|
132
|
-
const args = props
|
|
133
|
-
? [props, ctrlArg]
|
|
134
|
-
: [(0, types_1.identifier)("undefined"), ctrlArg];
|
|
134
|
+
const args = props ? [props, ctrlArg] : [(0, types_1.identifier)("undefined"), ctrlArg];
|
|
135
135
|
addCallbackStatement(constants_1.SPECIAL_SYMBOLS.alwaysUpdate, [
|
|
136
|
-
(0, types_1.expressionStatement)((0, types_1.callExpression)((0, types_1.memberExpression)((0, types_1.identifier)(constants_1.
|
|
136
|
+
(0, types_1.expressionStatement)((0, types_1.callExpression)((0, types_1.memberExpression)((0, types_1.identifier)(constants_1.WATCH_AlWAYS_CALLBACK_ARGS.element), (0, types_1.identifier)(constants_1.COMPONENT_METHODS.render)), args))
|
|
137
137
|
]);
|
|
138
138
|
}
|
|
139
139
|
if (node.toggleTriggers.length) {
|
|
140
140
|
addToggleCallbackStatement(componentDefinition, node, addCallbackStatement);
|
|
141
141
|
}
|
|
142
|
-
// Need to be careful with WATCH_CALLBACK_PARAMS as `e` is actually a reference
|
|
143
|
-
// to the nested component, and that's what we want to render.
|
|
144
142
|
if (stubName) {
|
|
145
143
|
addCallbackStatement(constants_1.SPECIAL_SYMBOLS.alwaysUpdate, [
|
|
146
|
-
(0, types_1.expressionStatement)((0, types_1.callExpression)((0, types_1.memberExpression)(
|
|
144
|
+
(0, types_1.expressionStatement)((0, types_1.callExpression)((0, types_1.memberExpression)(
|
|
145
|
+
// In this case "element" is in fact the nested component.
|
|
146
|
+
(0, types_1.identifier)(constants_1.WATCH_AlWAYS_CALLBACK_ARGS.element), (0, types_1.identifier)(constants_1.COMPONENT_METHODS.render)), [
|
|
147
147
|
component.propsIdentifier,
|
|
148
|
-
(0, types_1.memberExpression)(component.componentIdentifier, (0, types_1.identifier)(constants_1.SPECIAL_SYMBOLS.ctrl))
|
|
149
|
-
]))
|
|
148
|
+
(0, types_1.memberExpression)(component.componentIdentifier, (0, types_1.identifier)(constants_1.SPECIAL_SYMBOLS.ctrl))
|
|
149
|
+
]))
|
|
150
150
|
]);
|
|
151
151
|
}
|
|
152
152
|
if (visibilityToggle) {
|
|
@@ -154,7 +154,7 @@ function processNodes(component, componentDefinition) {
|
|
|
154
154
|
componentWatch.shieldInfo = {
|
|
155
155
|
skipCount: 0, // gets set later once we've processed all the nodes.
|
|
156
156
|
key: shieldLookupKey,
|
|
157
|
-
reverse: visibilityToggle.reverse
|
|
157
|
+
reverse: visibilityToggle.reverse
|
|
158
158
|
};
|
|
159
159
|
if (visibilityToggle.detach) {
|
|
160
160
|
if (node.parent.detacherStashKey === undefined) {
|
|
@@ -163,7 +163,7 @@ function processNodes(component, componentDefinition) {
|
|
|
163
163
|
componentWatch.shieldInfo.detacher = {
|
|
164
164
|
index: node.address[node.address.length - 1],
|
|
165
165
|
stashKey: node.parent.detacherStashKey,
|
|
166
|
-
parentKey: node.parent.elementKey
|
|
166
|
+
parentKey: node.parent.elementKey
|
|
167
167
|
};
|
|
168
168
|
}
|
|
169
169
|
}
|
|
@@ -171,7 +171,7 @@ function processNodes(component, componentDefinition) {
|
|
|
171
171
|
componentDefinition.component.module.requireImport(constants_1.IMPORTABLES.getSequentialRepeater);
|
|
172
172
|
const poolInstance = repeatInstruction.poolExpression ||
|
|
173
173
|
(0, types_1.callExpression)((0, types_1.identifier)(constants_1.IMPORTABLES.getSequentialRepeater), [
|
|
174
|
-
(0, types_1.identifier)(repeatInstruction.componentCls)
|
|
174
|
+
(0, types_1.identifier)(repeatInstruction.componentCls)
|
|
175
175
|
]);
|
|
176
176
|
// TODO: couple the stash index with the call to save - if possible?
|
|
177
177
|
// Or make it an object and pass the key when saving.
|
|
@@ -179,20 +179,14 @@ function processNodes(component, componentDefinition) {
|
|
|
179
179
|
componentDefinition.wrapDynamicElementCall(node.elementKey, constants_1.IMPORTABLES.stashMisc, [(0, types_1.identifier)(constants_1.COMPONENT_BUILD_PARAMS.component), poolInstance]);
|
|
180
180
|
addCallbackStatement(constants_1.SPECIAL_SYMBOLS.alwaysUpdate, [
|
|
181
181
|
(0, types_1.expressionStatement)((0, types_1.callExpression)((0, types_1.memberExpression)((0, types_1.memberExpression)((0, types_1.memberExpression)(component.componentIdentifier, (0, types_1.identifier)(constants_1.SPECIAL_SYMBOLS.objectStash)), (0, types_1.numericLiteral)(miscStashKey), true), (0, types_1.identifier)(constants_1.SPECIAL_SYMBOLS.patch)), [
|
|
182
|
-
(0, types_1.identifier)(constants_1.
|
|
182
|
+
(0, types_1.identifier)(constants_1.WATCH_AlWAYS_CALLBACK_ARGS.element),
|
|
183
183
|
repeatInstruction.expression,
|
|
184
|
-
(0, types_1.memberExpression)(component.componentIdentifier, (0, types_1.identifier)(constants_1.SPECIAL_SYMBOLS.ctrl))
|
|
185
|
-
]))
|
|
184
|
+
(0, types_1.memberExpression)(component.componentIdentifier, (0, types_1.identifier)(constants_1.SPECIAL_SYMBOLS.ctrl))
|
|
185
|
+
]))
|
|
186
186
|
]);
|
|
187
187
|
}
|
|
188
188
|
for (const key in _callbacks) {
|
|
189
|
-
const args = key === constants_1.SPECIAL_SYMBOLS.alwaysUpdate
|
|
190
|
-
? [
|
|
191
|
-
(0, types_1.identifier)(constants_1.WATCH_CALLBACK_PARAMS.element),
|
|
192
|
-
component.propsIdentifier,
|
|
193
|
-
component.componentIdentifier,
|
|
194
|
-
]
|
|
195
|
-
: (0, utils_2.buildWatchCallbackParams)();
|
|
189
|
+
const args = (0, utils_2.buildWatchCallbackParams)(component, key === constants_1.SPECIAL_SYMBOLS.alwaysUpdate);
|
|
196
190
|
componentWatch.callbacks[key] = (0, types_1.functionExpression)(null, args, (0, types_1.blockStatement)(_callbacks[key]));
|
|
197
191
|
}
|
|
198
192
|
}
|
|
@@ -201,7 +195,10 @@ function processNodes(component, componentDefinition) {
|
|
|
201
195
|
(0, errors_1.error)(node.path, errors_1.ERROR_MESSAGES.REFS_MUST_BE_UNIQUE_WITHIN_EACH_COMPONENT);
|
|
202
196
|
}
|
|
203
197
|
componentDefinition.collectedRefs.push(ref);
|
|
204
|
-
componentDefinition.wrapDynamicElementCall(node.elementKey, constants_1.IMPORTABLES.saveRef, [
|
|
198
|
+
componentDefinition.wrapDynamicElementCall(node.elementKey, constants_1.IMPORTABLES.saveRef, [
|
|
199
|
+
(0, types_1.identifier)(constants_1.COMPONENT_BUILD_PARAMS.component),
|
|
200
|
+
(0, types_1.stringLiteral)(ref)
|
|
201
|
+
]);
|
|
205
202
|
}
|
|
206
203
|
// TODO: improve this, as we are basically renaming things specifically for the
|
|
207
204
|
// build function that have already been renamed, which can get confusing.
|
|
@@ -210,13 +207,13 @@ function processNodes(component, componentDefinition) {
|
|
|
210
207
|
const eventVariableMapping = {
|
|
211
208
|
[component.componentIdentifier.name]: constants_1.COMPONENT_BUILD_PARAMS.component,
|
|
212
209
|
[component.componentIdentifier.name + "." + constants_1.SPECIAL_SYMBOLS.ctrl]: `${constants_1.COMPONENT_BUILD_PARAMS.component}.${constants_1.SPECIAL_SYMBOLS.ctrl}`,
|
|
213
|
-
[component.propsIdentifier.name]: `${constants_1.COMPONENT_BUILD_PARAMS.component}.props
|
|
210
|
+
[component.propsIdentifier.name]: `${constants_1.COMPONENT_BUILD_PARAMS.component}.props`
|
|
214
211
|
};
|
|
215
|
-
node.eventListeners.forEach(
|
|
212
|
+
node.eventListeners.forEach(listener => {
|
|
216
213
|
const updatedExpression = (0, utils_2.renameVariablesInExpression)(listener.callback, eventVariableMapping);
|
|
217
214
|
componentDefinition.wrapDynamicElementCall(node.elementKey, constants_1.IMPORTABLES.onEvent, [
|
|
218
215
|
(0, types_1.stringLiteral)(listener.eventName),
|
|
219
|
-
(0, types_1.functionExpression)(null, [(0, types_1.identifier)(constants_1.
|
|
216
|
+
(0, types_1.functionExpression)(null, [(0, types_1.identifier)(constants_1.EVENT_CALLBACK_ARGS.event)], (0, types_1.blockStatement)([(0, types_1.expressionStatement)(updatedExpression)]))
|
|
220
217
|
]);
|
|
221
218
|
});
|
|
222
219
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"processNodes.js","sourceRoot":"","sources":["../../src/consolidation/processNodes.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"processNodes.js","sourceRoot":"","sources":["../../src/consolidation/processNodes.ts"],"names":[],"mappings":";;AAqHA,oCAkQC;AAtXD,wCASsB;AACtB,kCAAkC;AAClC,oCAAsC;AAEtC,sCAAkD;AAClD,4CAQsB;AAGtB,mCAKiB;AAEjB,SAAS,kBAAkB,CAAC,IAAmB;IAC7C,IAAI,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,IAAI,OAAO,EAAE,CAAC;QAC1C,aAAa;QACb,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC;QAClD,MAAM,SAAS,GAAG,SAAS,KAAK,UAAU,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC;QACjE,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC,EAAE,SAAS,EAAE,UAAU,EAAE,EAAE,EAAE;YAC1D,IAAI,CAAC,cAAc,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC;YAC3C,MAAM,QAAQ,GAAG,CAAC,CAAC,oBAAoB,CACrC,GAAG,EACH,UAAwB,EACxB,CAAC,CAAC,gBAAgB,CAChB,CAAC,CAAC,gBAAgB,CAChB,CAAC,CAAC,UAAU,CAAC,+BAAmB,CAAC,KAAK,CAAC,EACvC,CAAC,CAAC,UAAU,CAAC,QAAQ,CAAC,CACvB,EACD,CAAC,CAAC,UAAU,CAAC,SAAS,CAAC,CACxB,CACF,CAAC;YACF,IAAI,CAAC,gBAAgB,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;QAC7C,CAAC,CAAC,CAAC;IACL,CAAC;SAAM,CAAC;QACN,IAAA,cAAK,EAAC,IAAI,CAAC,IAAI,EAAE,uBAAc,CAAC,0BAA0B,CAAC,CAAC;IAC9D,CAAC;AACH,CAAC;AAED,SAAS,+BAA+B,CAAC,IAAmB;IAC1D,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE;QAClC,MAAM,KAAK,GAAG,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,IAAI,IAAI,MAAM,CAAC,IAAI,CAAC,CAAC;QAC/E,IAAI,CAAC,KAAK,EAAE,CAAC;YACX,IAAA,cAAK,EAAC,IAAI,CAAC,IAAI,EAAE,uBAAc,CAAC,sCAAsC,CAAC,CAAC;QAC1E,CAAC;IACH,CAAC,CAAC,CAAC;AACL,CAAC;AAED,SAAS,iBAAiB,CAAC,KAA4B;IACrD,IAAI,OAAO,KAAK,IAAI,QAAQ,EAAE,CAAC;QAC7B,OAAO,KAAK;aACT,IAAI,EAAE;aACN,KAAK,CAAC,GAAG,CAAC;aACV,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC;IAClC,CAAC;SAAM,CAAC;QACN,OAAO,CAAC,CAAC,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC,CAAC;IAClC,CAAC;AACH,CAAC;AAED,wDAAwD;AACxD,kCAAkC;AAClC,0CAA0C;AAE1C,SAAS,0BAA0B,CACjC,mBAA4C,EAC5C,IAAmB,EACnB,oBAAmF;IAEnF,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE;QACpC,MAAM,MAAM,GAAG,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;QAC9E,MAAM,eAAe,GAAG,MAAM;YAC5B,CAAC,CAAC,iBAAiB,CAAC,MAAM,CAAC,KAAK,CAAC;YACjC,CAAC,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;QACpC,MAAM,gBAAgB,GAAG,OAAO,CAAC,UAAU,CAAC;QAC5C,MAAM,SAAS,GAAG,mBAAmB,CAAC,SAAS,CAAC,gBAAgB,CAAC,CAAC;QAClE,MAAM,WAAW,GAAG,CAAC,MAAwB,EAAE,EAAE,CAC/C,IAAA,sBAAc,EACZ,IAAA,wBAAgB,EACd,IAAA,wBAAgB,EACd,IAAA,kBAAU,EAAC,+BAAmB,CAAC,OAAO,CAAC,EACvC,IAAA,kBAAU,EAAC,WAAW,CAAC,CACxB,EACD,IAAA,kBAAU,EAAC,MAAM,CAAC,CACnB,EACD,eAAe,CAChB,CAAC;QAEJ,oBAAoB,CAAC,SAAS,EAAE;YAC9B,CAAC,CAAC,WAAW,CACX,CAAC,CAAC,UAAU,CAAC,+BAAmB,CAAC,QAAQ,CAAC,EAC1C,IAAA,sBAAc,EAAC,CAAC,IAAA,2BAAmB,EAAC,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EACzD,IAAA,sBAAc,EAAC,CAAC,IAAA,2BAAmB,EAAC,WAAW,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAC7D;SACF,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC;AAED,uBAAuB;AACvB,SAAgB,YAAY,CAC1B,SAAoB,EACpB,mBAA4C;IAE5C,SAAS,CAAC,cAAc,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;QACtC,IAAI,IAAI,CAAC,mBAAmB,EAAE,CAAC;YAC7B,gFAAgF;YAChF,sDAAsD;YACtD,MAAM,QAAQ,GAAG,IAAA,mBAAW,EAAC,IAAI,EAAE,SAAS,CAAC,cAAc,CAAC,CAAC;YAC7D,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACxB,IAAA,cAAK,EAAC,IAAI,CAAC,IAAI,EAAE,uBAAc,CAAC,8BAA8B,CAAC,CAAC;YAClE,CAAC;YACD,MAAM,QAAQ,GAAG,IAAA,mBAAW,EAAC,IAAI,EAAE,SAAS,CAAC,cAAc,CAAC,CAAC;YAC7D,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACxB,IAAA,cAAK,EAAC,IAAI,CAAC,IAAI,EAAE,uBAAc,CAAC,8BAA8B,CAAC,CAAC;YAClE,CAAC;YACD,OAAO;QACT,CAAC;QAED,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,EAAE,CAAC;QAChC,MAAM,iBAAiB,GAAG,QAAQ;YAChC,CAAC,CAAC,CAAC,CAAC,cAAc,CACd,CAAC,CAAC,gBAAgB,CAChB,CAAC,CAAC,UAAU,CAAC,kCAAsB,CAAC,SAAS,CAAC,EAC9C,CAAC,CAAC,UAAU,CAAC,6BAAiB,CAAC,OAAO,CAAC,CACxC,EACD,CAAC,CAAC,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC,CAC5B;YACH,CAAC,CAAC,SAAS,CAAC;QACd,MAAM,gBAAgB,GAAG,IAAI,CAAC,mBAAmB,EAAE,CAAC;QACpD,MAAM,GAAG,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC;QAC1B,MAAM,iBAAiB,GAAG,IAAI,CAAC,oBAAoB,EAAE,CAAC;QACtD,MAAM,WAAW,GACf,IAAI,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC;YACvB,IAAI,CAAC,gBAAgB,CAAC,MAAM,GAAG,CAAC;YAChC,IAAI,CAAC,cAAc,CAAC,MAAM,GAAG,CAAC;YAC9B,gBAAgB;YAChB,IAAI,CAAC,iBAAiB;YACtB,QAAQ;YACR,iBAAiB,CAAC;QAEpB,4CAA4C;QAC5C,MAAM,iBAAiB,GACrB,WAAW,IAAI,GAAG,IAAI,IAAI,CAAC,cAAc,CAAC,MAAM,GAAG,CAAC,IAAI,IAAI,CAAC,sBAAsB,CAAC;QAEtF,+BAA+B,CAAC,IAAI,CAAC,CAAC;QAEtC,IAAI,iBAAiB,EAAE,CAAC;YACtB,MAAM,kBAAkB,GAAG,IAAI,CAAC,iBAAiB;gBAC/C,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC;gBAC5B,CAAC,CAAC,iBAAiB,CAAC;YACtB,IAAI,CAAC,UAAU,GAAG,kBAAkB;gBAClC,CAAC,CAAC,mBAAmB,CAAC,0BAA0B,CAAC,IAAI,CAAC,OAAO,EAAE,kBAAkB,CAAC;gBAClF,CAAC,CAAC,mBAAmB,CAAC,kBAAkB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YAEzD,IAAI,IAAI,CAAC,gBAAgB,CAAC,MAAM,EAAE,CAAC;gBACjC,kBAAkB,CAAC,IAAI,CAAC,CAAC;YAC3B,CAAC;YAED,IAAI,IAAI,CAAC,sBAAsB,EAAE,CAAC;gBAChC,IAAI,CAAC,gBAAgB,GAAG,mBAAmB,CAAC,mBAAmB,EAAE,CAAC;gBAClE,mBAAmB,CAAC,sBAAsB,CACxC,IAAI,CAAC,UAAU,EACf,uBAAW,CAAC,SAAS,EACrB,CAAC,IAAA,kBAAU,EAAC,kCAAsB,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC,gBAAgB,CAAC,EAAE,CAAC,CAAC,CACvE,CAAC;YACJ,CAAC;YAED,IAAI,WAAW,EAAE,CAAC;gBAChB,MAAM,UAAU,GAAiD,EAAE,CAAC;gBACpE,MAAM,oBAAoB,GAAG,CAAC,GAAoB,EAAE,UAAuB,EAAE,EAAE;oBAC7E,IAAI,CAAC,UAAU,CAAC,cAAc,CAAC,GAAG,CAAC,EAAE,CAAC;wBACpC,UAAU,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC;oBACvB,CAAC;oBACD,UAAU,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,GAAG,UAAU,CAAC,CAAC;gBACtC,CAAC,CAAC;gBAEF,MAAM,cAAc,GAAmB;oBACrC,UAAU,EAAE,IAAI,CAAC,UAAU;oBAC3B,SAAS,EAAE,EAAE;oBACb,OAAO,EAAE,IAAI,CAAC,OAAO;iBACtB,CAAC;gBACF,mBAAmB,CAAC,OAAO,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;gBAEjD,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;oBAC3B,IAAI,KAAK,CAAC,UAAU,IAAI,2BAAe,CAAC,YAAY,EAAE,CAAC;wBACrD,oBAAoB,CAClB,2BAAe,CAAC,YAAY,EAC5B,IAAA,kBAAU,EAAC,KAAK,CAAC,QAAQ,CAAC,CAC3B,CAAC;oBACJ,CAAC;yBAAM,CAAC;wBACN,MAAM,SAAS,GAAG,mBAAmB,CAAC,SAAS,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;wBAClE,oBAAoB,CAAC,SAAS,EAAE,IAAA,kBAAU,EAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC;oBAC9D,CAAC;gBACH,CAAC,CAAC,CAAC;gBAEH,IAAI,IAAI,CAAC,iBAAiB,EAAE,CAAC;oBAC3B,MAAM,KAAK,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC;oBAC9B,MAAM,OAAO,GAAG,IAAA,wBAAgB,EAC9B,SAAS,CAAC,mBAAmB,EAC7B,IAAA,kBAAU,EAAC,2BAAe,CAAC,IAAI,CAAC,CACjC,CAAC;oBACF,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,IAAA,kBAAU,EAAC,WAAW,CAAC,EAAE,OAAO,CAAC,CAAC;oBAC3E,oBAAoB,CAAC,2BAAe,CAAC,YAAY,EAAE;wBACjD,IAAA,2BAAmB,EACjB,IAAA,sBAAc,EACZ,IAAA,wBAAgB,EACd,IAAA,kBAAU,EAAC,sCAA0B,CAAC,OAAO,CAAC,EAC9C,IAAA,kBAAU,EAAC,6BAAiB,CAAC,MAAM,CAAC,CACrC,EACD,IAAI,CACL,CACF;qBACF,CAAC,CAAC;gBACL,CAAC;gBAED,IAAI,IAAI,CAAC,cAAc,CAAC,MAAM,EAAE,CAAC;oBAC/B,0BAA0B,CAAC,mBAAmB,EAAE,IAAI,EAAE,oBAAoB,CAAC,CAAC;gBAC9E,CAAC;gBAED,IAAI,QAAQ,EAAE,CAAC;oBACb,oBAAoB,CAAC,2BAAe,CAAC,YAAY,EAAE;wBACjD,IAAA,2BAAmB,EACjB,IAAA,sBAAc,EACZ,IAAA,wBAAgB;wBACd,0DAA0D;wBAC1D,IAAA,kBAAU,EAAC,sCAA0B,CAAC,OAAO,CAAC,EAC9C,IAAA,kBAAU,EAAC,6BAAiB,CAAC,MAAM,CAAC,CACrC,EACD;4BACE,SAAS,CAAC,eAAe;4BACzB,IAAA,wBAAgB,EACd,SAAS,CAAC,mBAAmB,EAC7B,IAAA,kBAAU,EAAC,2BAAe,CAAC,IAAI,CAAC,CACjC;yBACF,CACF,CACF;qBACF,CAAC,CAAC;gBACL,CAAC;gBAED,IAAI,gBAAgB,EAAE,CAAC;oBACrB,MAAM,eAAe,GAAG,mBAAmB,CAAC,SAAS,CACnD,gBAAgB,CAAC,UAAU,CAC5B,CAAC;oBACF,cAAc,CAAC,UAAU,GAAG;wBAC1B,SAAS,EAAE,CAAC,EAAE,qDAAqD;wBACnE,GAAG,EAAE,eAAe;wBACpB,OAAO,EAAE,gBAAgB,CAAC,OAAO;qBAClC,CAAC;oBACF,IAAI,gBAAgB,CAAC,MAAM,EAAE,CAAC;wBAC5B,IAAI,IAAI,CAAC,MAAM,CAAC,gBAAgB,KAAK,SAAS,EAAE,CAAC;4BAC/C,MAAM,IAAI,KAAK,CAAC,uCAAuC,CAAC,CAAC;wBAC3D,CAAC;wBACD,cAAc,CAAC,UAAU,CAAC,QAAQ,GAAG;4BACnC,KAAK,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC;4BAC5C,QAAQ,EAAE,IAAI,CAAC,MAAM,CAAC,gBAAgB;4BACtC,SAAS,EAAE,IAAI,CAAC,MAAM,CAAC,UAAU;yBAClC,CAAC;oBACJ,CAAC;gBACH,CAAC;gBAED,IAAI,iBAAiB,EAAE,CAAC;oBACtB,mBAAmB,CAAC,SAAS,CAAC,MAAM,CAAC,aAAa,CAChD,uBAAW,CAAC,qBAAqB,CAClC,CAAC;oBACF,MAAM,YAAY,GAChB,iBAAiB,CAAC,cAAc;wBAChC,IAAA,sBAAc,EAAC,IAAA,kBAAU,EAAC,uBAAW,CAAC,qBAAqB,CAAC,EAAE;4BAC5D,IAAA,kBAAU,EAAC,iBAAiB,CAAC,YAAY,CAAC;yBAC3C,CAAC,CAAC;oBAEL,oEAAoE;oBACpE,qDAAqD;oBACrD,MAAM,YAAY,GAAG,mBAAmB,CAAC,mBAAmB,EAAE,CAAC;oBAC/D,mBAAmB,CAAC,sBAAsB,CACxC,IAAI,CAAC,UAAU,EACf,uBAAW,CAAC,SAAS,EACrB,CAAC,IAAA,kBAAU,EAAC,kCAAsB,CAAC,SAAS,CAAC,EAAE,YAAY,CAAC,CAC7D,CAAC;oBACF,oBAAoB,CAAC,2BAAe,CAAC,YAAY,EAAE;wBACjD,IAAA,2BAAmB,EACjB,IAAA,sBAAc,EACZ,IAAA,wBAAgB,EACd,IAAA,wBAAgB,EACd,IAAA,wBAAgB,EACd,SAAS,CAAC,mBAAmB,EAC7B,IAAA,kBAAU,EAAC,2BAAe,CAAC,WAAW,CAAC,CACxC,EACD,IAAA,sBAAc,EAAC,YAAY,CAAC,EAC5B,IAAI,CACL,EACD,IAAA,kBAAU,EAAC,2BAAe,CAAC,KAAK,CAAC,CAClC,EACD;4BACE,IAAA,kBAAU,EAAC,sCAA0B,CAAC,OAAO,CAAC;4BAC9C,iBAAiB,CAAC,UAAU;4BAC5B,IAAA,wBAAgB,EACd,SAAS,CAAC,mBAAmB,EAC7B,IAAA,kBAAU,EAAC,2BAAe,CAAC,IAAI,CAAC,CACjC;yBACF,CACF,CACF;qBACF,CAAC,CAAC;gBACL,CAAC;gBAED,KAAK,MAAM,GAAG,IAAI,UAAU,EAAE,CAAC;oBAC7B,MAAM,IAAI,GAAG,IAAA,gCAAwB,EACnC,SAAS,EACT,GAAG,KAAK,2BAAe,CAAC,YAAY,CACrC,CAAC;oBACF,cAAc,CAAC,SAAS,CAAC,GAAG,CAAC,GAAG,IAAA,0BAAkB,EAChD,IAAI,EACJ,IAAI,EACJ,IAAA,sBAAc,EAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAChC,CAAC;gBACJ,CAAC;YACH,CAAC;YAED,IAAI,GAAG,EAAE,CAAC;gBACR,IAAI,mBAAmB,CAAC,aAAa,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;oBACpD,IAAA,cAAK,EAAC,IAAI,CAAC,IAAI,EAAE,uBAAc,CAAC,yCAAyC,CAAC,CAAC;gBAC7E,CAAC;gBACD,mBAAmB,CAAC,aAAa,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;gBAC5C,mBAAmB,CAAC,sBAAsB,CAAC,IAAI,CAAC,UAAU,EAAE,uBAAW,CAAC,OAAO,EAAE;oBAC/E,IAAA,kBAAU,EAAC,kCAAsB,CAAC,SAAS,CAAC;oBAC5C,IAAA,qBAAa,EAAC,GAAG,CAAC;iBACnB,CAAC,CAAC;YACL,CAAC;YAED,+EAA+E;YAC/E,0EAA0E;YAC1E,0EAA0E;YAC1E,kDAAkD;YAClD,MAAM,oBAAoB,GAA8B;gBACtD,CAAC,SAAS,CAAC,mBAAmB,CAAC,IAAI,CAAC,EAAE,kCAAsB,CAAC,SAAS;gBACtE,CAAC,SAAS,CAAC,mBAAmB,CAAC,IAAI,GAAG,GAAG,GAAG,2BAAe,CAAC,IAAI,CAAC,EAC/D,GAAG,kCAAsB,CAAC,SAAS,IAAI,2BAAe,CAAC,IAAI,EAAE;gBAC/D,CAAC,SAAS,CAAC,eAAe,CAAC,IAAI,CAAC,EAAE,GAAG,kCAAsB,CAAC,SAAS,QAAQ;aAC9E,CAAC;YACF,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE;gBACrC,MAAM,iBAAiB,GAAG,IAAA,mCAA2B,EACnD,QAAQ,CAAC,QAAQ,EACjB,oBAAoB,CACrB,CAAC;gBAEF,mBAAmB,CAAC,sBAAsB,CAAC,IAAI,CAAC,UAAU,EAAE,uBAAW,CAAC,OAAO,EAAE;oBAC/E,IAAA,qBAAa,EAAC,QAAQ,CAAC,SAAS,CAAC;oBACjC,IAAA,0BAAkB,EAChB,IAAI,EACJ,CAAC,IAAA,kBAAU,EAAC,+BAAmB,CAAC,KAAK,CAAC,CAAC,EACvC,IAAA,sBAAc,EAAC,CAAC,IAAA,2BAAmB,EAAC,iBAAiB,CAAC,CAAC,CAAC,CACzD;iBACF,CAAC,CAAC;YACL,CAAC,CAAC,CAAC;QACL,CAAC;IACH,CAAC,CAAC,CAAC;AACL,CAAC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import type { ArrayExpression, Expression, CallExpression } from "@babel/types";
|
|
2
|
-
import { ExtractedNode, Module } from "../models";
|
|
2
|
+
import { Component, ExtractedNode, Module } from "../models";
|
|
3
3
|
import { NodeAddress } from "./types";
|
|
4
4
|
export declare function getSiblings(node: ExtractedNode, allNodes: Array<ExtractedNode>): ExtractedNode[];
|
|
5
5
|
export declare function getChildren(node: ExtractedNode, allNodes: Array<ExtractedNode>): ExtractedNode[];
|
|
@@ -15,7 +15,6 @@ export declare function renameVariablesInExpression(originalExpression: Expressi
|
|
|
15
15
|
[key: string]: string;
|
|
16
16
|
}): Expression;
|
|
17
17
|
/**
|
|
18
|
-
*
|
|
19
|
-
* as they won't clash with anything.
|
|
18
|
+
* Must match how it is called in wallace/lib/component.
|
|
20
19
|
*/
|
|
21
|
-
export declare function buildWatchCallbackParams(): import("@babel/types").Identifier[];
|
|
20
|
+
export declare function buildWatchCallbackParams(component: Component, alwaysUpdate: boolean): import("@babel/types").Identifier[];
|
|
@@ -11,19 +11,19 @@ exports.buildWatchCallbackParams = buildWatchCallbackParams;
|
|
|
11
11
|
const types_1 = require("@babel/types");
|
|
12
12
|
const constants_1 = require("../constants");
|
|
13
13
|
function getSiblings(node, allNodes) {
|
|
14
|
-
return allNodes.filter(
|
|
14
|
+
return allNodes.filter(n => n.parent === node.parent && n !== node);
|
|
15
15
|
}
|
|
16
16
|
function getChildren(node, allNodes) {
|
|
17
|
-
return allNodes.filter(
|
|
17
|
+
return allNodes.filter(n => n.parent === node);
|
|
18
18
|
}
|
|
19
19
|
function buildAddressArray(address) {
|
|
20
|
-
return (0, types_1.arrayExpression)(address.map(
|
|
20
|
+
return (0, types_1.arrayExpression)(address.map(i => (0, types_1.numericLiteral)(i)));
|
|
21
21
|
}
|
|
22
22
|
function buildFindElementCall(module, address) {
|
|
23
23
|
module.requireImport(constants_1.IMPORTABLES.findElement);
|
|
24
24
|
return (0, types_1.callExpression)((0, types_1.identifier)(constants_1.IMPORTABLES.findElement), [
|
|
25
25
|
(0, types_1.identifier)(constants_1.COMPONENT_BUILD_PARAMS.rootElement),
|
|
26
|
-
buildAddressArray(address)
|
|
26
|
+
buildAddressArray(address)
|
|
27
27
|
]);
|
|
28
28
|
}
|
|
29
29
|
function buildNestedClassCall(module, address, componentCls) {
|
|
@@ -31,7 +31,7 @@ function buildNestedClassCall(module, address, componentCls) {
|
|
|
31
31
|
return (0, types_1.callExpression)((0, types_1.identifier)(constants_1.IMPORTABLES.nestComponent), [
|
|
32
32
|
(0, types_1.identifier)(constants_1.COMPONENT_BUILD_PARAMS.rootElement),
|
|
33
33
|
buildAddressArray(address),
|
|
34
|
-
componentCls
|
|
34
|
+
componentCls
|
|
35
35
|
]);
|
|
36
36
|
}
|
|
37
37
|
function removeKeys(obj, keys) {
|
|
@@ -75,16 +75,21 @@ function renameVariablesInExpression(originalExpression, variableMapping) {
|
|
|
75
75
|
return traverseAndReplace(clonedExpression);
|
|
76
76
|
}
|
|
77
77
|
/**
|
|
78
|
-
*
|
|
79
|
-
* as they won't clash with anything.
|
|
78
|
+
* Must match how it is called in wallace/lib/component.
|
|
80
79
|
*/
|
|
81
|
-
function buildWatchCallbackParams() {
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
80
|
+
function buildWatchCallbackParams(component, alwaysUpdate) {
|
|
81
|
+
// TODO: figure out why the always watch needs to be different.
|
|
82
|
+
return alwaysUpdate
|
|
83
|
+
? [
|
|
84
|
+
(0, types_1.identifier)(constants_1.WATCH_CALLBACK_ARGS.element),
|
|
85
|
+
component.propsIdentifier,
|
|
86
|
+
component.componentIdentifier
|
|
87
|
+
]
|
|
88
|
+
: [
|
|
89
|
+
(0, types_1.identifier)(constants_1.WATCH_CALLBACK_ARGS.element),
|
|
90
|
+
(0, types_1.identifier)(constants_1.WATCH_CALLBACK_ARGS.props),
|
|
91
|
+
(0, types_1.identifier)(constants_1.WATCH_CALLBACK_ARGS.component),
|
|
92
|
+
(0, types_1.identifier)(constants_1.WATCH_CALLBACK_ARGS.newValue)
|
|
93
|
+
];
|
|
89
94
|
}
|
|
90
95
|
//# sourceMappingURL=utils.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/consolidation/utils.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/consolidation/utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,7 +10,7 @@ const utils_1 = require("../utils");
|
|
|
10
10
|
function setSkipCounts(watch, index, watches) {
|
|
11
11
|
watch.shieldInfo.skipCount = watches
|
|
12
12
|
.slice(index)
|
|
13
|
-
.filter(
|
|
13
|
+
.filter(w => (0, utils_1.arrayStartsWith)(watch.address, w.address)).length;
|
|
14
14
|
}
|
|
15
15
|
function processeVisibilityToggles(watches) {
|
|
16
16
|
watches.forEach((watch, index) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"visibility.js","sourceRoot":"","sources":["../../src/consolidation/visibility.ts"],"names":[],"mappings":";;AAkBA,8DAMC;AAxBD,oCAA2C;AAG3C;;;;GAIG;AACH,SAAS,aAAa,CACpB,KAAqB,EACrB,KAAa,EACb,OAA8B;IAE9B,KAAK,CAAC,UAAU,CAAC,SAAS,GAAG,OAAO;SACjC,KAAK,CAAC,KAAK,CAAC;SACZ,MAAM,CAAC,CAAC,CAAC,EAAE,
|
|
1
|
+
{"version":3,"file":"visibility.js","sourceRoot":"","sources":["../../src/consolidation/visibility.ts"],"names":[],"mappings":";;AAkBA,8DAMC;AAxBD,oCAA2C;AAG3C;;;;GAIG;AACH,SAAS,aAAa,CACpB,KAAqB,EACrB,KAAa,EACb,OAA8B;IAE9B,KAAK,CAAC,UAAU,CAAC,SAAS,GAAG,OAAO;SACjC,KAAK,CAAC,KAAK,CAAC;SACZ,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,IAAA,uBAAe,EAAC,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC;AACnE,CAAC;AAED,SAAgB,yBAAyB,CAAC,OAA8B;IACtE,OAAO,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE;QAC/B,IAAI,KAAK,CAAC,UAAU,EAAE,CAAC;YACrB,aAAa,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;QACvC,CAAC;IACH,CAAC,CAAC,CAAC;AACL,CAAC"}
|
package/dist/constants.d.ts
CHANGED
|
@@ -1,10 +1,3 @@
|
|
|
1
|
-
export declare enum WATCH_CALLBACK_PARAMS {
|
|
2
|
-
newValue = "n",
|
|
3
|
-
oldValue = "o",
|
|
4
|
-
element = "e",
|
|
5
|
-
props = "p",
|
|
6
|
-
component = "c"
|
|
7
|
-
}
|
|
8
1
|
export declare enum COMPONENT_BUILD_PARAMS {
|
|
9
2
|
component = "component",
|
|
10
3
|
rootElement = "root"
|
|
@@ -23,10 +16,32 @@ export declare enum IMPORTABLES {
|
|
|
23
16
|
onEvent = "onEvent",
|
|
24
17
|
getSequentialRepeater = "getSequentialRepeater"
|
|
25
18
|
}
|
|
26
|
-
|
|
19
|
+
/**
|
|
20
|
+
* The names allowed in xargs.
|
|
21
|
+
* The value is not indicative of the final variable name.
|
|
22
|
+
*/
|
|
23
|
+
export declare enum XARGS {
|
|
27
24
|
controller = "ctrl",
|
|
28
25
|
component = "self",
|
|
29
|
-
event = "
|
|
26
|
+
event = "event",
|
|
27
|
+
element = "element",
|
|
28
|
+
ev = "ev",
|
|
29
|
+
el = "el"
|
|
30
|
+
}
|
|
31
|
+
export declare enum WATCH_CALLBACK_ARGS {
|
|
32
|
+
newValue = "n",
|
|
33
|
+
oldValue = "o",
|
|
34
|
+
element = "element",
|
|
35
|
+
props = "p",
|
|
36
|
+
component = "c"
|
|
37
|
+
}
|
|
38
|
+
export declare enum WATCH_AlWAYS_CALLBACK_ARGS {
|
|
39
|
+
element = "element",
|
|
40
|
+
props = "p",
|
|
41
|
+
component = "c"
|
|
42
|
+
}
|
|
43
|
+
export declare enum EVENT_CALLBACK_ARGS {
|
|
44
|
+
event = "event"
|
|
30
45
|
}
|
|
31
46
|
export declare enum SPECIAL_SYMBOLS {
|
|
32
47
|
objectStash = "_s",
|
package/dist/constants.js
CHANGED
|
@@ -1,14 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.domEventNames = exports.SPECIAL_SYMBOLS = exports.
|
|
4
|
-
var WATCH_CALLBACK_PARAMS;
|
|
5
|
-
(function (WATCH_CALLBACK_PARAMS) {
|
|
6
|
-
WATCH_CALLBACK_PARAMS["newValue"] = "n";
|
|
7
|
-
WATCH_CALLBACK_PARAMS["oldValue"] = "o";
|
|
8
|
-
WATCH_CALLBACK_PARAMS["element"] = "e";
|
|
9
|
-
WATCH_CALLBACK_PARAMS["props"] = "p";
|
|
10
|
-
WATCH_CALLBACK_PARAMS["component"] = "c";
|
|
11
|
-
})(WATCH_CALLBACK_PARAMS || (exports.WATCH_CALLBACK_PARAMS = WATCH_CALLBACK_PARAMS = {}));
|
|
3
|
+
exports.domEventNames = exports.SPECIAL_SYMBOLS = exports.EVENT_CALLBACK_ARGS = exports.WATCH_AlWAYS_CALLBACK_ARGS = exports.WATCH_CALLBACK_ARGS = exports.XARGS = exports.IMPORTABLES = exports.COMPONENT_METHODS = exports.COMPONENT_BUILD_PARAMS = void 0;
|
|
12
4
|
var COMPONENT_BUILD_PARAMS;
|
|
13
5
|
(function (COMPONENT_BUILD_PARAMS) {
|
|
14
6
|
COMPONENT_BUILD_PARAMS["component"] = "component";
|
|
@@ -30,12 +22,38 @@ var IMPORTABLES;
|
|
|
30
22
|
IMPORTABLES["onEvent"] = "onEvent";
|
|
31
23
|
IMPORTABLES["getSequentialRepeater"] = "getSequentialRepeater";
|
|
32
24
|
})(IMPORTABLES || (exports.IMPORTABLES = IMPORTABLES = {}));
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
25
|
+
/**
|
|
26
|
+
* The names allowed in xargs.
|
|
27
|
+
* The value is not indicative of the final variable name.
|
|
28
|
+
*/
|
|
29
|
+
var XARGS;
|
|
30
|
+
(function (XARGS) {
|
|
31
|
+
XARGS["controller"] = "ctrl";
|
|
32
|
+
XARGS["component"] = "self";
|
|
33
|
+
XARGS["event"] = "event";
|
|
34
|
+
XARGS["element"] = "element";
|
|
35
|
+
// These two are allowed, they just get renamed.
|
|
36
|
+
XARGS["ev"] = "ev";
|
|
37
|
+
XARGS["el"] = "el";
|
|
38
|
+
})(XARGS || (exports.XARGS = XARGS = {}));
|
|
39
|
+
var WATCH_CALLBACK_ARGS;
|
|
40
|
+
(function (WATCH_CALLBACK_ARGS) {
|
|
41
|
+
WATCH_CALLBACK_ARGS["newValue"] = "n";
|
|
42
|
+
WATCH_CALLBACK_ARGS["oldValue"] = "o";
|
|
43
|
+
WATCH_CALLBACK_ARGS["element"] = "element";
|
|
44
|
+
WATCH_CALLBACK_ARGS["props"] = "p";
|
|
45
|
+
WATCH_CALLBACK_ARGS["component"] = "c";
|
|
46
|
+
})(WATCH_CALLBACK_ARGS || (exports.WATCH_CALLBACK_ARGS = WATCH_CALLBACK_ARGS = {}));
|
|
47
|
+
var WATCH_AlWAYS_CALLBACK_ARGS;
|
|
48
|
+
(function (WATCH_AlWAYS_CALLBACK_ARGS) {
|
|
49
|
+
WATCH_AlWAYS_CALLBACK_ARGS["element"] = "element";
|
|
50
|
+
WATCH_AlWAYS_CALLBACK_ARGS["props"] = "p";
|
|
51
|
+
WATCH_AlWAYS_CALLBACK_ARGS["component"] = "c";
|
|
52
|
+
})(WATCH_AlWAYS_CALLBACK_ARGS || (exports.WATCH_AlWAYS_CALLBACK_ARGS = WATCH_AlWAYS_CALLBACK_ARGS = {}));
|
|
53
|
+
var EVENT_CALLBACK_ARGS;
|
|
54
|
+
(function (EVENT_CALLBACK_ARGS) {
|
|
55
|
+
EVENT_CALLBACK_ARGS["event"] = "event";
|
|
56
|
+
})(EVENT_CALLBACK_ARGS || (exports.EVENT_CALLBACK_ARGS = EVENT_CALLBACK_ARGS = {}));
|
|
39
57
|
var SPECIAL_SYMBOLS;
|
|
40
58
|
(function (SPECIAL_SYMBOLS) {
|
|
41
59
|
SPECIAL_SYMBOLS["objectStash"] = "_s";
|
|
@@ -131,6 +149,6 @@ exports.domEventNames = [
|
|
|
131
149
|
"onTransitionStart",
|
|
132
150
|
"onVolumeChange",
|
|
133
151
|
"onWaiting",
|
|
134
|
-
"onWheel"
|
|
152
|
+
"onWheel"
|
|
135
153
|
];
|
|
136
154
|
//# sourceMappingURL=constants.js.map
|
package/dist/constants.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../src/constants.ts"],"names":[],"mappings":";;;AAAA,IAAY,
|
|
1
|
+
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../src/constants.ts"],"names":[],"mappings":"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"}
|
|
@@ -25,7 +25,7 @@ class AbstractContextHandler {
|
|
|
25
25
|
// error(this.path.parentPath, ERROR_MESSAGES.CAPITALISED_COMPONENT_NAME);
|
|
26
26
|
// }
|
|
27
27
|
const scope = this.path.scope;
|
|
28
|
-
this.component = new models_1.Component(this.module, scope.generateUidIdentifier("
|
|
28
|
+
this.component = new models_1.Component(this.module, scope.generateUidIdentifier("props"), scope.generateUidIdentifier("component"));
|
|
29
29
|
this.module.requireImport(constants_1.IMPORTABLES.defineComponent);
|
|
30
30
|
this.functionPath = this.path;
|
|
31
31
|
this.isMatch = true;
|
|
@@ -52,8 +52,7 @@ function getAssignedName(path) {
|
|
|
52
52
|
class AssignedJsxFunction extends AbstractContextHandler {
|
|
53
53
|
constructor(path, module) {
|
|
54
54
|
super(path, module);
|
|
55
|
-
if ((0, helpers_1.functionReturnsOnlyJSX)(path) &&
|
|
56
|
-
path.parentPath.isVariableDeclarator()) {
|
|
55
|
+
if ((0, helpers_1.functionReturnsOnlyJSX)(path) && path.parentPath.isVariableDeclarator()) {
|
|
57
56
|
this.initialiseComponent();
|
|
58
57
|
}
|
|
59
58
|
}
|
|
@@ -65,8 +64,7 @@ class AssignedJsxFunction extends AbstractContextHandler {
|
|
|
65
64
|
class JsxFunctionAssignedToMember extends AbstractContextHandler {
|
|
66
65
|
constructor(path, module) {
|
|
67
66
|
super(path, module);
|
|
68
|
-
if ((0, helpers_1.functionReturnsOnlyJSX)(path) &&
|
|
69
|
-
path.parentPath.isAssignmentExpression()) {
|
|
67
|
+
if ((0, helpers_1.functionReturnsOnlyJSX)(path) && path.parentPath.isAssignmentExpression()) {
|
|
70
68
|
this.initialiseComponent();
|
|
71
69
|
}
|
|
72
70
|
}
|
|
@@ -133,14 +131,14 @@ const contextClasses = [
|
|
|
133
131
|
AssignedJsxFunction,
|
|
134
132
|
JsxFunctionAssignedToMember,
|
|
135
133
|
JsxFunctionInProperty,
|
|
136
|
-
JsxFunctionInObjectMethod
|
|
134
|
+
JsxFunctionInObjectMethod
|
|
137
135
|
];
|
|
138
136
|
function identifyContextToBeHandled(path, module) {
|
|
139
137
|
const contexts = [];
|
|
140
|
-
contextClasses.forEach(
|
|
138
|
+
contextClasses.forEach(contextClass => {
|
|
141
139
|
contexts.push(new contextClass(path, module));
|
|
142
140
|
});
|
|
143
|
-
const matches = contexts.filter(
|
|
141
|
+
const matches = contexts.filter(context => context.isMatch);
|
|
144
142
|
if (matches.length > 1) {
|
|
145
143
|
throw new Error("Function matches more than one context. This is an error with the plugin.");
|
|
146
144
|
}
|