babel-plugin-wallace 0.0.6 → 0.0.7
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/ast-helpers.d.ts +1 -1
- package/dist/ast-helpers.js +2 -10
- package/dist/ast-helpers.js.map +1 -1
- package/dist/consolidation/ComponentDefinitionData.d.ts +5 -5
- package/dist/consolidation/ComponentDefinitionData.js +18 -21
- package/dist/consolidation/ComponentDefinitionData.js.map +1 -1
- package/dist/consolidation/consolidateComponent.d.ts +1 -1
- package/dist/consolidation/consolidateComponent.js +2 -2
- package/dist/consolidation/consolidateComponent.js.map +1 -1
- package/dist/consolidation/processNodes.js +43 -26
- package/dist/consolidation/processNodes.js.map +1 -1
- package/dist/consolidation/types.d.ts +8 -2
- package/dist/consolidation/visibility.d.ts +1 -4
- package/dist/consolidation/visibility.js +10 -31
- package/dist/consolidation/visibility.js.map +1 -1
- package/dist/constants.d.ts +2 -2
- package/dist/constants.js +2 -2
- package/dist/constants.js.map +1 -1
- package/dist/directives.js +22 -5
- package/dist/directives.js.map +1 -1
- package/dist/errors.d.ts +3 -3
- package/dist/errors.js +3 -3
- package/dist/errors.js.map +1 -1
- package/dist/models/component.js +4 -2
- package/dist/models/component.js.map +1 -1
- package/dist/models/index.d.ts +2 -2
- package/dist/models/node.d.ts +7 -3
- package/dist/models/node.js +16 -101
- package/dist/models/node.js.map +1 -1
- package/dist/utils.js +1 -1
- package/dist/utils.js.map +1 -1
- package/dist/visitors/attribute.js +6 -1
- package/dist/visitors/attribute.js.map +1 -1
- package/dist/writers/define-component.js +29 -25
- package/dist/writers/define-component.js.map +1 -1
- package/package.json +2 -2
package/dist/ast-helpers.d.ts
CHANGED
|
@@ -7,4 +7,4 @@ export declare function getJSXElementName(path: NodePath<JSXElement>): string |
|
|
|
7
7
|
/**
|
|
8
8
|
* An Expression can be one of dozens of types, most of which are not usable.
|
|
9
9
|
*/
|
|
10
|
-
export declare function getPlaceholderExpression(path: NodePath, expression: Expression | JSXEmptyExpression): Expression;
|
|
10
|
+
export declare function getPlaceholderExpression(path: NodePath, expression: Expression | JSXEmptyExpression): Expression | undefined;
|
package/dist/ast-helpers.js
CHANGED
|
@@ -31,22 +31,14 @@ function getJSXElementName(path) {
|
|
|
31
31
|
* An Expression can be one of dozens of types, most of which are not usable.
|
|
32
32
|
*/
|
|
33
33
|
function getPlaceholderExpression(path, expression) {
|
|
34
|
-
// if (
|
|
35
|
-
// // TODO: I probably need to expand this...
|
|
36
|
-
// t.isIdentifier(expression) ||
|
|
37
|
-
// t.isMemberExpression(expression) ||
|
|
38
|
-
// t.isCallExpression(expression)
|
|
39
|
-
// ) {
|
|
40
|
-
// return expression;
|
|
41
|
-
// } else
|
|
42
34
|
if (t.isJSXEmptyExpression(expression)) {
|
|
43
|
-
|
|
35
|
+
// This is really to handle comments
|
|
36
|
+
return undefined;
|
|
44
37
|
}
|
|
45
38
|
else if (t.isObjectExpression(expression)) {
|
|
46
39
|
// The code is copied, so the object would be created afresh each time.
|
|
47
40
|
(0, errors_1.error)(path, errors_1.ERROR_MESSAGES.PLACEHOLDER_MAY_NOT_BE_LITERAL_OBJECT);
|
|
48
41
|
}
|
|
49
|
-
//error(path, ERROR_MESSAGES.INVALID_PLACEHOLDER_EXPRESSION);
|
|
50
42
|
return expression;
|
|
51
43
|
}
|
|
52
44
|
//# sourceMappingURL=ast-helpers.js.map
|
package/dist/ast-helpers.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ast-helpers.js","sourceRoot":"","sources":["../src/ast-helpers.ts"],"names":[],"mappings":";;AAKA,8CAoBC;AAKD,
|
|
1
|
+
{"version":3,"file":"ast-helpers.js","sourceRoot":"","sources":["../src/ast-helpers.ts"],"names":[],"mappings":";;AAKA,8CAoBC;AAKD,4DAYC;AA1CD,kCAAkC;AAGlC,qCAAiD;AAEjD,SAAgB,iBAAiB,CAC/B,IAA0B;IAE1B,MAAM,kBAAkB,GAAG,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC;IACzD,IAAI,CAAC,CAAC,eAAe,CAAC,kBAAkB,CAAC,EAAE,CAAC;QAC1C,OAAO,kBAAkB,CAAC,IAAI,CAAC;IACjC,CAAC;SAAM,IAAI,CAAC,CAAC,mBAAmB,CAAC,kBAAkB,CAAC,EAAE,CAAC;QACrD,MAAM,EAAE,SAAS,EAAE,IAAI,EAAE,GAAG,kBAAkB,CAAC;QAC/C,OAAO,EAAE,SAAS,EAAE,SAAS,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC;IACxD,CAAC;SAAM,IAAI,CAAC,CAAC,qBAAqB,CAAC,kBAAkB,CAAC,EAAE,CAAC;QACvD,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,kBAAkB,CAAC;QAChD,IAAI,CAAC,CAAC,eAAe,CAAC,MAAM,CAAC,EAAE,CAAC;YAC9B,OAAO,EAAE,SAAS,EAAE,MAAM,CAAC,IAAI,EAAE,IAAI,EAAE,QAAQ,CAAC,IAAI,EAAE,CAAC;QACzD,CAAC;aAAM,CAAC;YACN,IAAA,cAAK,EAAC,IAAI,EAAE,uBAAc,CAAC,2BAA2B,CAAC,CAAC;QAC1D,CAAC;IACH,CAAC;SAAM,CAAC;QACN,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACzB,MAAM,KAAK,CAAC,wBAAwB,kBAAkB,EAAE,CAAC,CAAC;IAC5D,CAAC;AACH,CAAC;AAED;;GAEG;AACH,SAAgB,wBAAwB,CACtC,IAAc,EACd,UAA2C;IAE3C,IAAI,CAAC,CAAC,oBAAoB,CAAC,UAAU,CAAC,EAAE,CAAC;QACvC,oCAAoC;QACpC,OAAO,SAAS,CAAC;IACnB,CAAC;SAAM,IAAI,CAAC,CAAC,kBAAkB,CAAC,UAAU,CAAC,EAAE,CAAC;QAC5C,uEAAuE;QACvE,IAAA,cAAK,EAAC,IAAI,EAAE,uBAAc,CAAC,qCAAqC,CAAC,CAAC;IACpE,CAAC;IACD,OAAO,UAAwB,CAAC;AAClC,CAAC"}
|
|
@@ -10,7 +10,7 @@ export declare class ComponentDefinitionData {
|
|
|
10
10
|
component: Component;
|
|
11
11
|
html: string;
|
|
12
12
|
watches: Array<ComponentWatch>;
|
|
13
|
-
|
|
13
|
+
dynamicElements: {
|
|
14
14
|
[key: string]: CallExpression;
|
|
15
15
|
};
|
|
16
16
|
baseComponent: Expression | undefined;
|
|
@@ -19,11 +19,11 @@ export declare class ComponentDefinitionData {
|
|
|
19
19
|
};
|
|
20
20
|
collectedRefs: Array<string>;
|
|
21
21
|
constructor(component: Component);
|
|
22
|
-
|
|
23
|
-
|
|
22
|
+
saveDynamicElement(address: NodeAddress): string;
|
|
23
|
+
saveNestedAsDynamicElement(address: NodeAddress, componentCls: Expression): string;
|
|
24
24
|
addLookup(expression: Expression): string;
|
|
25
25
|
getFunctionIdentifier(name: IMPORTABLES): Identifier;
|
|
26
26
|
getLookupCallBackParams(): Array<Identifier>;
|
|
27
|
-
|
|
28
|
-
|
|
27
|
+
wrapDynamicElementCall(key: string, functionName: IMPORTABLES, remainingArgs: Expression[]): void;
|
|
28
|
+
getNextmiscStashKey(): number;
|
|
29
29
|
}
|
|
@@ -10,7 +10,7 @@ var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (
|
|
|
10
10
|
if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
|
|
11
11
|
return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
|
|
12
12
|
};
|
|
13
|
-
var
|
|
13
|
+
var _ComponentDefinitionData_dynamicElementKey, _ComponentDefinitionData_miscStashKey, _ComponentDefinitionData_lookupKeys;
|
|
14
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
15
|
exports.ComponentDefinitionData = void 0;
|
|
16
16
|
const types_1 = require("@babel/types");
|
|
@@ -21,27 +21,27 @@ const utils_1 = require("./utils");
|
|
|
21
21
|
class ComponentDefinitionData {
|
|
22
22
|
constructor(component) {
|
|
23
23
|
this.watches = [];
|
|
24
|
-
this.
|
|
24
|
+
this.dynamicElements = {};
|
|
25
25
|
this.lookups = {};
|
|
26
26
|
this.collectedRefs = [];
|
|
27
|
-
|
|
28
|
-
|
|
27
|
+
_ComponentDefinitionData_dynamicElementKey.set(this, 0);
|
|
28
|
+
_ComponentDefinitionData_miscStashKey.set(this, 0);
|
|
29
29
|
_ComponentDefinitionData_lookupKeys.set(this, []);
|
|
30
30
|
this.component = component;
|
|
31
31
|
this.baseComponent = component.baseComponent;
|
|
32
32
|
}
|
|
33
|
-
|
|
33
|
+
saveDynamicElement(address) {
|
|
34
34
|
var _a;
|
|
35
|
-
__classPrivateFieldSet(this,
|
|
36
|
-
const key = String(__classPrivateFieldGet(this,
|
|
37
|
-
this.
|
|
35
|
+
__classPrivateFieldSet(this, _ComponentDefinitionData_dynamicElementKey, (_a = __classPrivateFieldGet(this, _ComponentDefinitionData_dynamicElementKey, "f"), _a++, _a), "f");
|
|
36
|
+
const key = String(__classPrivateFieldGet(this, _ComponentDefinitionData_dynamicElementKey, "f"));
|
|
37
|
+
this.dynamicElements[key] = (0, utils_1.buildFindElementCall)(this.component.module, address);
|
|
38
38
|
return key;
|
|
39
39
|
}
|
|
40
|
-
|
|
40
|
+
saveNestedAsDynamicElement(address, componentCls) {
|
|
41
41
|
var _a;
|
|
42
|
-
__classPrivateFieldSet(this,
|
|
43
|
-
const key = String(__classPrivateFieldGet(this,
|
|
44
|
-
this.
|
|
42
|
+
__classPrivateFieldSet(this, _ComponentDefinitionData_dynamicElementKey, (_a = __classPrivateFieldGet(this, _ComponentDefinitionData_dynamicElementKey, "f"), _a++, _a), "f");
|
|
43
|
+
const key = String(__classPrivateFieldGet(this, _ComponentDefinitionData_dynamicElementKey, "f"));
|
|
44
|
+
this.dynamicElements[key] = (0, utils_1.buildNestedClassCall)(this.component.module, address, componentCls);
|
|
45
45
|
return key;
|
|
46
46
|
}
|
|
47
47
|
addLookup(expression) {
|
|
@@ -65,18 +65,15 @@ class ComponentDefinitionData {
|
|
|
65
65
|
getLookupCallBackParams() {
|
|
66
66
|
return [this.component.propsIdentifier, this.component.componentIdentifier];
|
|
67
67
|
}
|
|
68
|
-
|
|
69
|
-
this.
|
|
70
|
-
this.stash[key],
|
|
71
|
-
...remainingArgs,
|
|
72
|
-
]);
|
|
68
|
+
wrapDynamicElementCall(key, functionName, remainingArgs) {
|
|
69
|
+
this.dynamicElements[key] = (0, types_1.callExpression)(this.getFunctionIdentifier(functionName), [this.dynamicElements[key], ...remainingArgs]);
|
|
73
70
|
}
|
|
74
|
-
|
|
71
|
+
getNextmiscStashKey() {
|
|
75
72
|
var _a;
|
|
76
|
-
__classPrivateFieldSet(this,
|
|
77
|
-
return __classPrivateFieldGet(this,
|
|
73
|
+
__classPrivateFieldSet(this, _ComponentDefinitionData_miscStashKey, (_a = __classPrivateFieldGet(this, _ComponentDefinitionData_miscStashKey, "f"), _a++, _a), "f");
|
|
74
|
+
return __classPrivateFieldGet(this, _ComponentDefinitionData_miscStashKey, "f") - 1;
|
|
78
75
|
}
|
|
79
76
|
}
|
|
80
77
|
exports.ComponentDefinitionData = ComponentDefinitionData;
|
|
81
|
-
|
|
78
|
+
_ComponentDefinitionData_dynamicElementKey = new WeakMap(), _ComponentDefinitionData_miscStashKey = new WeakMap(), _ComponentDefinitionData_lookupKeys = new WeakMap();
|
|
82
79
|
//# sourceMappingURL=ComponentDefinitionData.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ComponentDefinitionData.js","sourceRoot":"","sources":["../../src/consolidation/ComponentDefinitionData.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAMA,wCAMsB;AAItB,mCAIiB;AAEjB;;GAEG;AACH,MAAa,uBAAuB;IAWlC,YAAY,SAAoB;QARhC,YAAO,GAA0B,EAAE,CAAC;QACpC,
|
|
1
|
+
{"version":3,"file":"ComponentDefinitionData.js","sourceRoot":"","sources":["../../src/consolidation/ComponentDefinitionData.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { Component } from "../models";
|
|
2
2
|
import { ComponentDefinitionData } from "./ComponentDefinitionData";
|
|
3
3
|
/**
|
|
4
|
-
* Deals with
|
|
4
|
+
* Deals with visibility toggles, setting ref keys and such.
|
|
5
5
|
*/
|
|
6
6
|
export declare function consolidateComponent(component: Component): ComponentDefinitionData;
|
|
@@ -27,13 +27,13 @@ function hoistTextNodes(component) {
|
|
|
27
27
|
});
|
|
28
28
|
}
|
|
29
29
|
/**
|
|
30
|
-
* Deals with
|
|
30
|
+
* Deals with visibility toggles, setting ref keys and such.
|
|
31
31
|
*/
|
|
32
32
|
function consolidateComponent(component) {
|
|
33
33
|
const componentDefinition = new ComponentDefinitionData_1.ComponentDefinitionData(component);
|
|
34
34
|
hoistTextNodes(component);
|
|
35
35
|
(0, processNodes_1.processNodes)(component, componentDefinition);
|
|
36
|
-
(0, visibility_1.
|
|
36
|
+
(0, visibility_1.processeVisibilityToggles)(componentDefinition.watches);
|
|
37
37
|
// This must be done after all the processing, as DOM may have changed.
|
|
38
38
|
componentDefinition.html = component.rootElement.outerHTML;
|
|
39
39
|
return componentDefinition;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"consolidateComponent.js","sourceRoot":"","sources":["../../src/consolidation/consolidateComponent.ts"],"names":[],"mappings":";;AA8BA,oDAUC;AAxCD,sCAAuD;AACvD,
|
|
1
|
+
{"version":3,"file":"consolidateComponent.js","sourceRoot":"","sources":["../../src/consolidation/consolidateComponent.ts"],"names":[],"mappings":";;AA8BA,oDAUC;AAxCD,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,CAAC,IAAI,EAAE,EAAE;QACxC,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,CAAC,IAAI,EAAE,EAAE;QAC7B,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,CAClC,SAAoB;IAEpB,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"}
|
|
@@ -22,14 +22,6 @@ function addBindInstruction(node) {
|
|
|
22
22
|
(0, errors_1.error)(node.path, errors_1.ERROR_MESSAGES.BIND_ONLY_ALLOWED_ON_INPUT);
|
|
23
23
|
}
|
|
24
24
|
}
|
|
25
|
-
function addShieldInfo(componentDefinition, componentWatch, shieldInfo) {
|
|
26
|
-
const shieldLookupKey = componentDefinition.addLookup(shieldInfo.expression);
|
|
27
|
-
componentWatch.shieldInfo = {
|
|
28
|
-
count: 0,
|
|
29
|
-
key: shieldLookupKey,
|
|
30
|
-
reverse: shieldInfo.reverse,
|
|
31
|
-
};
|
|
32
|
-
}
|
|
33
25
|
function ensureToggleTargetsHaveTriggers(node) {
|
|
34
26
|
node.toggleTargets.forEach((target) => {
|
|
35
27
|
const match = node.toggleTriggers.find((trigger) => trigger.name == target.name);
|
|
@@ -86,28 +78,39 @@ function processNodes(component, componentDefinition) {
|
|
|
86
78
|
const stubComponentName = stubName
|
|
87
79
|
? t.memberExpression(t.identifier(constants_1.COMPONENT_BUILD_PARAMS.component), t.identifier(stubName))
|
|
88
80
|
: undefined;
|
|
89
|
-
const
|
|
81
|
+
const visibilityToggle = node.getVisibilityToggle();
|
|
90
82
|
const ref = node.getRef();
|
|
91
83
|
const repeatInstruction = node.getRepeatInstruction();
|
|
92
84
|
const createWatch = node.watches.length > 0 ||
|
|
93
85
|
node.bindInstructions.length > 0 ||
|
|
94
86
|
node.toggleTriggers.length > 0 ||
|
|
95
|
-
|
|
87
|
+
visibilityToggle ||
|
|
96
88
|
node.isNestedClass ||
|
|
97
89
|
stubName ||
|
|
98
90
|
repeatInstruction;
|
|
99
|
-
|
|
91
|
+
// TODO: should ref really save the element?
|
|
92
|
+
const shouldSaveElement = createWatch ||
|
|
93
|
+
ref ||
|
|
94
|
+
node.eventListeners.length > 0 ||
|
|
95
|
+
node.hasConditionalChildren;
|
|
100
96
|
ensureToggleTargetsHaveTriggers(node);
|
|
101
|
-
if (
|
|
97
|
+
if (shouldSaveElement) {
|
|
102
98
|
const nestedComponentCls = node.isNestedClass
|
|
103
99
|
? t.identifier(node.tagName)
|
|
104
100
|
: stubComponentName;
|
|
105
|
-
|
|
106
|
-
? componentDefinition.
|
|
107
|
-
: componentDefinition.
|
|
101
|
+
node.elementKey = nestedComponentCls
|
|
102
|
+
? componentDefinition.saveNestedAsDynamicElement(node.address, nestedComponentCls)
|
|
103
|
+
: componentDefinition.saveDynamicElement(node.address);
|
|
108
104
|
if (node.bindInstructions.length) {
|
|
109
105
|
addBindInstruction(node);
|
|
110
106
|
}
|
|
107
|
+
if (node.hasConditionalChildren) {
|
|
108
|
+
node.detacherStashKey = componentDefinition.getNextmiscStashKey();
|
|
109
|
+
componentDefinition.wrapDynamicElementCall(node.elementKey, constants_1.IMPORTABLES.stashMisc, [
|
|
110
|
+
(0, types_1.identifier)(constants_1.COMPONENT_BUILD_PARAMS.component),
|
|
111
|
+
t.objectExpression([]),
|
|
112
|
+
]);
|
|
113
|
+
}
|
|
111
114
|
if (createWatch) {
|
|
112
115
|
const _callbacks = {};
|
|
113
116
|
const addCallbackStatement = (key, statements) => {
|
|
@@ -117,7 +120,7 @@ function processNodes(component, componentDefinition) {
|
|
|
117
120
|
_callbacks[key].push(...statements);
|
|
118
121
|
};
|
|
119
122
|
const componentWatch = {
|
|
120
|
-
|
|
123
|
+
elementKey: node.elementKey,
|
|
121
124
|
callbacks: {},
|
|
122
125
|
address: node.address,
|
|
123
126
|
};
|
|
@@ -142,19 +145,36 @@ function processNodes(component, componentDefinition) {
|
|
|
142
145
|
(0, types_1.expressionStatement)((0, types_1.callExpression)((0, types_1.memberExpression)((0, types_1.identifier)(constants_1.WATCH_CALLBACK_PARAMS.element), (0, types_1.identifier)("render")), [component.propsIdentifier])),
|
|
143
146
|
]);
|
|
144
147
|
}
|
|
145
|
-
if (
|
|
146
|
-
|
|
148
|
+
if (visibilityToggle) {
|
|
149
|
+
const shieldLookupKey = componentDefinition.addLookup(visibilityToggle.expression);
|
|
150
|
+
componentWatch.shieldInfo = {
|
|
151
|
+
skipCount: 0, // gets set later once we've processed all the nodes.
|
|
152
|
+
key: shieldLookupKey,
|
|
153
|
+
reverse: visibilityToggle.reverse,
|
|
154
|
+
};
|
|
155
|
+
if (visibilityToggle.detach) {
|
|
156
|
+
if (node.parent.detacherStashKey === undefined) {
|
|
157
|
+
throw new Error("Parent node was not given a stash key");
|
|
158
|
+
}
|
|
159
|
+
componentWatch.shieldInfo.detacher = {
|
|
160
|
+
index: node.address[node.address.length - 1],
|
|
161
|
+
stashKey: node.parent.detacherStashKey,
|
|
162
|
+
parentKey: node.parent.elementKey,
|
|
163
|
+
};
|
|
164
|
+
}
|
|
147
165
|
}
|
|
148
166
|
if (repeatInstruction) {
|
|
149
|
-
const miscObjectKey = componentDefinition.getNextMiscObjectKey();
|
|
150
167
|
componentDefinition.component.module.requireImport(constants_1.IMPORTABLES.getSequentialPool);
|
|
151
168
|
const poolInstance = repeatInstruction.poolExpression ||
|
|
152
169
|
(0, types_1.callExpression)((0, types_1.identifier)(constants_1.IMPORTABLES.getSequentialPool), [
|
|
153
170
|
(0, types_1.identifier)(repeatInstruction.componentCls),
|
|
154
171
|
]);
|
|
155
|
-
|
|
172
|
+
// TODO: couple the stash index with the call to save - if possible?
|
|
173
|
+
// Or make it an object and pass the key when saving.
|
|
174
|
+
const miscStashKey = componentDefinition.getNextmiscStashKey();
|
|
175
|
+
componentDefinition.wrapDynamicElementCall(node.elementKey, constants_1.IMPORTABLES.stashMisc, [(0, types_1.identifier)(constants_1.COMPONENT_BUILD_PARAMS.component), poolInstance]);
|
|
156
176
|
addCallbackStatement(constants_1.SPECIAL_SYMBOLS.alwaysUpdate, [
|
|
157
|
-
(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)(
|
|
177
|
+
(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)), [
|
|
158
178
|
(0, types_1.identifier)(constants_1.WATCH_CALLBACK_PARAMS.element),
|
|
159
179
|
repeatInstruction.expression,
|
|
160
180
|
component.componentIdentifier,
|
|
@@ -177,10 +197,7 @@ function processNodes(component, componentDefinition) {
|
|
|
177
197
|
(0, errors_1.error)(node.path, errors_1.ERROR_MESSAGES.REFS_MUST_BE_UNIQUE_WITHIN_EACH_COMPONENT);
|
|
178
198
|
}
|
|
179
199
|
componentDefinition.collectedRefs.push(ref);
|
|
180
|
-
componentDefinition.
|
|
181
|
-
(0, types_1.identifier)(constants_1.COMPONENT_BUILD_PARAMS.component),
|
|
182
|
-
(0, types_1.stringLiteral)(ref),
|
|
183
|
-
]);
|
|
200
|
+
componentDefinition.wrapDynamicElementCall(node.elementKey, constants_1.IMPORTABLES.saveRef, [(0, types_1.identifier)(constants_1.COMPONENT_BUILD_PARAMS.component), (0, types_1.stringLiteral)(ref)]);
|
|
184
201
|
}
|
|
185
202
|
// Note that some things will already have been renamed, but here we are renaming
|
|
186
203
|
// specifically inside the buildComponent scope.
|
|
@@ -191,7 +208,7 @@ function processNodes(component, componentDefinition) {
|
|
|
191
208
|
};
|
|
192
209
|
node.eventListeners.forEach((listener) => {
|
|
193
210
|
const updatedExpression = (0, utils_2.renameVariablesInExpression)(listener.callback, eventVariableMapping);
|
|
194
|
-
componentDefinition.
|
|
211
|
+
componentDefinition.wrapDynamicElementCall(node.elementKey, constants_1.IMPORTABLES.onEvent, [
|
|
195
212
|
(0, types_1.stringLiteral)(listener.eventName),
|
|
196
213
|
(0, types_1.functionExpression)(null, [(0, types_1.identifier)(constants_1.EVENT_CALLBACK_VARIABLES.event)], (0, types_1.blockStatement)([(0, types_1.expressionStatement)(updatedExpression)])),
|
|
197
214
|
]);
|
|
@@ -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":"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"}
|
|
@@ -1,12 +1,18 @@
|
|
|
1
1
|
import type { FunctionExpression } from "@babel/types";
|
|
2
2
|
export type NodeAddress = Array<number>;
|
|
3
|
+
export interface Detacher {
|
|
4
|
+
index: number;
|
|
5
|
+
stashKey: number;
|
|
6
|
+
parentKey: string;
|
|
7
|
+
}
|
|
3
8
|
export interface ShieldInfo {
|
|
4
9
|
key: string;
|
|
5
10
|
reverse: boolean;
|
|
6
|
-
|
|
11
|
+
skipCount: number;
|
|
12
|
+
detacher?: Detacher;
|
|
7
13
|
}
|
|
8
14
|
export interface ComponentWatch {
|
|
9
|
-
|
|
15
|
+
elementKey: string;
|
|
10
16
|
shieldInfo?: ShieldInfo | undefined;
|
|
11
17
|
callbacks: {
|
|
12
18
|
[key: string]: FunctionExpression;
|
|
@@ -1,5 +1,2 @@
|
|
|
1
1
|
import { ComponentWatch } from "./types";
|
|
2
|
-
|
|
3
|
-
* Must be done after processing watches as we need to know how many watches to skip.
|
|
4
|
-
*/
|
|
5
|
-
export declare function processShields(watches: Array<ComponentWatch>): void;
|
|
2
|
+
export declare function processeVisibilityToggles(watches: Array<ComponentWatch>): void;
|
|
@@ -1,42 +1,21 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
3
|
+
exports.processeVisibilityToggles = processeVisibilityToggles;
|
|
4
4
|
const utils_1 = require("../utils");
|
|
5
|
-
/*
|
|
6
|
-
* Given an array of addresses such as:
|
|
7
|
-
*
|
|
8
|
-
* [
|
|
9
|
-
* [0],
|
|
10
|
-
* [0, 1],
|
|
11
|
-
* [0, 2],
|
|
12
|
-
* [1],
|
|
13
|
-
* ]
|
|
14
|
-
*
|
|
15
|
-
* It returns an array with the count of nested items, like so:
|
|
16
|
-
*
|
|
17
|
-
* [2, 0, 0, 0]
|
|
18
|
-
*/
|
|
19
|
-
function calculateShieldCounts(addresses) {
|
|
20
|
-
const processedAddresses = [];
|
|
21
|
-
addresses.forEach((path) => {
|
|
22
|
-
processedAddresses.forEach((processed) => {
|
|
23
|
-
if ((0, utils_1.arrayStartsWith)(processed.path, path)) {
|
|
24
|
-
processed.count++;
|
|
25
|
-
}
|
|
26
|
-
});
|
|
27
|
-
processedAddresses.push({ path: path, count: 0 });
|
|
28
|
-
});
|
|
29
|
-
return processedAddresses.map((i) => i.count);
|
|
30
|
-
}
|
|
31
5
|
/**
|
|
6
|
+
* Sets the skipCount of each watch's shieldInfo.
|
|
7
|
+
* This indicates how many watches to skip if that element is hidden.
|
|
32
8
|
* Must be done after processing watches as we need to know how many watches to skip.
|
|
33
9
|
*/
|
|
34
|
-
function
|
|
35
|
-
|
|
36
|
-
|
|
10
|
+
function setSkipCounts(watch, index, watches) {
|
|
11
|
+
watch.shieldInfo.skipCount = watches
|
|
12
|
+
.slice(index)
|
|
13
|
+
.filter((w) => (0, utils_1.arrayStartsWith)(watch.address, w.address)).length;
|
|
14
|
+
}
|
|
15
|
+
function processeVisibilityToggles(watches) {
|
|
37
16
|
watches.forEach((watch, index) => {
|
|
38
17
|
if (watch.shieldInfo) {
|
|
39
|
-
watch
|
|
18
|
+
setSkipCounts(watch, index, watches);
|
|
40
19
|
}
|
|
41
20
|
});
|
|
42
21
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"visibility.js","sourceRoot":"","sources":["../../src/consolidation/visibility.ts"],"names":[],"mappings":";;
|
|
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,EAAE,CAAC,IAAA,uBAAe,EAAC,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC;AACrE,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
|
@@ -15,7 +15,7 @@ export declare enum IMPORTABLES {
|
|
|
15
15
|
findElement = "findElement",
|
|
16
16
|
nestComponent = "nestComponent",
|
|
17
17
|
saveRef = "saveRef",
|
|
18
|
-
|
|
18
|
+
stashMisc = "stashMisc",
|
|
19
19
|
onEvent = "onEvent",
|
|
20
20
|
getSequentialPool = "getSequentialPool"
|
|
21
21
|
}
|
|
@@ -25,7 +25,7 @@ export declare enum EVENT_CALLBACK_VARIABLES {
|
|
|
25
25
|
event = "_event"
|
|
26
26
|
}
|
|
27
27
|
export declare enum SPECIAL_SYMBOLS {
|
|
28
|
-
objectStash = "
|
|
28
|
+
objectStash = "_s",
|
|
29
29
|
alwaysUpdate = "__",
|
|
30
30
|
patch = "patch"
|
|
31
31
|
}
|
package/dist/constants.js
CHANGED
|
@@ -21,7 +21,7 @@ var IMPORTABLES;
|
|
|
21
21
|
IMPORTABLES["findElement"] = "findElement";
|
|
22
22
|
IMPORTABLES["nestComponent"] = "nestComponent";
|
|
23
23
|
IMPORTABLES["saveRef"] = "saveRef";
|
|
24
|
-
IMPORTABLES["
|
|
24
|
+
IMPORTABLES["stashMisc"] = "stashMisc";
|
|
25
25
|
IMPORTABLES["onEvent"] = "onEvent";
|
|
26
26
|
IMPORTABLES["getSequentialPool"] = "getSequentialPool";
|
|
27
27
|
})(IMPORTABLES || (exports.IMPORTABLES = IMPORTABLES = {}));
|
|
@@ -33,7 +33,7 @@ var EVENT_CALLBACK_VARIABLES;
|
|
|
33
33
|
})(EVENT_CALLBACK_VARIABLES || (exports.EVENT_CALLBACK_VARIABLES = EVENT_CALLBACK_VARIABLES = {}));
|
|
34
34
|
var SPECIAL_SYMBOLS;
|
|
35
35
|
(function (SPECIAL_SYMBOLS) {
|
|
36
|
-
SPECIAL_SYMBOLS["objectStash"] = "
|
|
36
|
+
SPECIAL_SYMBOLS["objectStash"] = "_s";
|
|
37
37
|
SPECIAL_SYMBOLS["alwaysUpdate"] = "__";
|
|
38
38
|
SPECIAL_SYMBOLS["patch"] = "patch";
|
|
39
39
|
})(SPECIAL_SYMBOLS || (exports.SPECIAL_SYMBOLS = SPECIAL_SYMBOLS = {}));
|
package/dist/constants.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../src/constants.ts"],"names":[],"mappings":";;;AAAA,IAAY,qBAMX;AAND,WAAY,qBAAqB;IAC/B,uCAAc,CAAA;IACd,uCAAc,CAAA;IACd,sCAAa,CAAA;IACb,oCAAW,CAAA;IACX,wCAAe,CAAA;AACjB,CAAC,EANW,qBAAqB,qCAArB,qBAAqB,QAMhC;AAED,IAAY,sBAGX;AAHD,WAAY,sBAAsB;IAChC,iDAAuB,CAAA;IACvB,8CAAoB,CAAA;AACtB,CAAC,EAHW,sBAAsB,sCAAtB,sBAAsB,QAGjC;AAED,IAAY,WASX;AATD,WAAY,WAAW;IACrB,kDAAmC,CAAA;IACnC,kDAAmC,CAAA;IACnC,0CAA2B,CAAA;IAC3B,8CAA+B,CAAA;IAC/B,kCAAmB,CAAA;IACnB,
|
|
1
|
+
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../src/constants.ts"],"names":[],"mappings":";;;AAAA,IAAY,qBAMX;AAND,WAAY,qBAAqB;IAC/B,uCAAc,CAAA;IACd,uCAAc,CAAA;IACd,sCAAa,CAAA;IACb,oCAAW,CAAA;IACX,wCAAe,CAAA;AACjB,CAAC,EANW,qBAAqB,qCAArB,qBAAqB,QAMhC;AAED,IAAY,sBAGX;AAHD,WAAY,sBAAsB;IAChC,iDAAuB,CAAA;IACvB,8CAAoB,CAAA;AACtB,CAAC,EAHW,sBAAsB,sCAAtB,sBAAsB,QAGjC;AAED,IAAY,WASX;AATD,WAAY,WAAW;IACrB,kDAAmC,CAAA;IACnC,kDAAmC,CAAA;IACnC,0CAA2B,CAAA;IAC3B,8CAA+B,CAAA;IAC/B,kCAAmB,CAAA;IACnB,sCAAuB,CAAA;IACvB,kCAAmB,CAAA;IACnB,sDAAuC,CAAA;AACzC,CAAC,EATW,WAAW,2BAAX,WAAW,QAStB;AAED,IAAY,wBAIX;AAJD,WAAY,wBAAwB;IAClC,oDAAwB,CAAA;IACxB,gDAAoB,CAAA;IACpB,4CAAgB,CAAA;AAClB,CAAC,EAJW,wBAAwB,wCAAxB,wBAAwB,QAInC;AAED,IAAY,eAIX;AAJD,WAAY,eAAe;IACzB,qCAAkB,CAAA;IAClB,sCAAmB,CAAA;IACnB,kCAAe,CAAA;AACjB,CAAC,EAJW,eAAe,+BAAf,eAAe,QAI1B"}
|
package/dist/directives.js
CHANGED
|
@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.builtinDirectives = void 0;
|
|
4
4
|
const models_1 = require("./models");
|
|
5
5
|
const constants_1 = require("./constants");
|
|
6
|
+
const errors_1 = require("./errors");
|
|
6
7
|
class BaseDirective extends models_1.Directive {
|
|
7
8
|
apply(node, value, qualifier, base) {
|
|
8
9
|
node.setBaseComponent(value.expression);
|
|
@@ -72,15 +73,30 @@ HelpDirective.help = `
|
|
|
72
73
|
class HideDirective extends models_1.Directive {
|
|
73
74
|
apply(node, value, qualifier, base) {
|
|
74
75
|
// this.ensureValueType();
|
|
75
|
-
node.
|
|
76
|
+
node.setVisibilityToggle(value.expression, false, false);
|
|
76
77
|
}
|
|
77
78
|
}
|
|
78
79
|
HideDirective.attributeName = "hide";
|
|
79
80
|
HideDirective.help = `
|
|
80
|
-
|
|
81
|
+
Hides an element by toggling its hidden attribute.
|
|
81
82
|
|
|
82
83
|
/h <div hide={}></div>
|
|
83
84
|
`;
|
|
85
|
+
class IfDirective extends models_1.Directive {
|
|
86
|
+
apply(node, value, qualifier, base) {
|
|
87
|
+
// this.ensureValueType();
|
|
88
|
+
if (node.isRepeatedNode || node.isNestedClass) {
|
|
89
|
+
(0, errors_1.error)(node.path, errors_1.ERROR_MESSAGES.CANNOT_USE_IF_ON_NESTED_OR_REPEATED_ELEMENT);
|
|
90
|
+
}
|
|
91
|
+
node.setVisibilityToggle(value.expression, true, true);
|
|
92
|
+
}
|
|
93
|
+
}
|
|
94
|
+
IfDirective.attributeName = "if";
|
|
95
|
+
IfDirective.help = `
|
|
96
|
+
Conditionally includes/exludes an element from the DOM.
|
|
97
|
+
|
|
98
|
+
/h <div if={}></div>
|
|
99
|
+
`;
|
|
84
100
|
class OnEventDirective extends models_1.Directive {
|
|
85
101
|
apply(node, value, qualifier, base) {
|
|
86
102
|
// TODO: change behaviour if value vs expression
|
|
@@ -111,19 +127,19 @@ class RefDirective extends models_1.Directive {
|
|
|
111
127
|
}
|
|
112
128
|
RefDirective.attributeName = "ref";
|
|
113
129
|
RefDirective.help = `
|
|
114
|
-
Saves a reference to an element:
|
|
130
|
+
Saves a reference to an element or nested component:
|
|
115
131
|
|
|
116
132
|
/h <div ref:title></div>
|
|
117
133
|
`;
|
|
118
134
|
class ShowDirective extends models_1.Directive {
|
|
119
135
|
apply(node, value, _qualifier, _base) {
|
|
120
136
|
// this.ensureValueType();
|
|
121
|
-
node.
|
|
137
|
+
node.setVisibilityToggle(value.expression, true, false);
|
|
122
138
|
}
|
|
123
139
|
}
|
|
124
140
|
ShowDirective.attributeName = "show";
|
|
125
141
|
ShowDirective.help = `
|
|
126
|
-
|
|
142
|
+
Shows an element by toggling its hidden attribute.
|
|
127
143
|
|
|
128
144
|
/h <div show={}></div>
|
|
129
145
|
`;
|
|
@@ -183,6 +199,7 @@ exports.builtinDirectives = [
|
|
|
183
199
|
ClassDirective,
|
|
184
200
|
HelpDirective,
|
|
185
201
|
HideDirective,
|
|
202
|
+
IfDirective,
|
|
186
203
|
OnEventDirective,
|
|
187
204
|
PropsDirective,
|
|
188
205
|
RefDirective,
|
package/dist/directives.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"directives.js","sourceRoot":"","sources":["../src/directives.ts"],"names":[],"mappings":";;;AAAA,qCAAoE;AACpE,2CAAoD;
|
|
1
|
+
{"version":3,"file":"directives.js","sourceRoot":"","sources":["../src/directives.ts"],"names":[],"mappings":"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"}
|
package/dist/errors.d.ts
CHANGED
|
@@ -4,16 +4,16 @@ export declare const ERROR_MESSAGES: {
|
|
|
4
4
|
FOUND_JSX_IN_INVALID_LOCATION: string;
|
|
5
5
|
CLASS_METHOD_MUST_BE_PROPERTY_JSX: string;
|
|
6
6
|
CAPITALISED_COMPONENT_NAME: string;
|
|
7
|
+
CANNOT_USE_IF_ON_ROOT_ELEMENT: string;
|
|
8
|
+
CANNOT_USE_IF_ON_NESTED_OR_REPEATED_ELEMENT: string;
|
|
7
9
|
NESTED_COMPONENT_MUST_BE_CAPTIALIZED: string;
|
|
8
10
|
INCORRECTLY_NESTED_COMPONENT: string;
|
|
9
11
|
ARROW_FUNCTION_NOT_ASSIGNED: string;
|
|
10
|
-
PLACEHOLDER_MAY_NOT_BE_EMPTY: string;
|
|
11
12
|
BIND_ONLY_ALLOWED_ON_INPUT: string;
|
|
12
13
|
PLACEHOLDER_MAY_NOT_BE_LITERAL_OBJECT: string;
|
|
13
|
-
INVALID_PLACEHOLDER_EXPRESSION: string;
|
|
14
14
|
JSX_ELEMENTS_NOT_ALLOWED_IN_EXPRESSIONS: string;
|
|
15
15
|
UNSUPPORTED_ATTRIBUTE_VALUE: string;
|
|
16
|
-
|
|
16
|
+
VISIBILITY_TOGGLE_DISPLAY_ALREADY_DEFINED: string;
|
|
17
17
|
REF_ALREADY_DEFINED: string;
|
|
18
18
|
STUB_ALREADY_DEFINED: string;
|
|
19
19
|
PROPS_ALREADY_DEFINED: string;
|
package/dist/errors.js
CHANGED
|
@@ -8,16 +8,16 @@ exports.ERROR_MESSAGES = {
|
|
|
8
8
|
FOUND_JSX_IN_INVALID_LOCATION: "Found JSX in invalid location.",
|
|
9
9
|
CLASS_METHOD_MUST_BE_PROPERTY_JSX: "Function returning JSX in a class must be assigned to property 'jsx'",
|
|
10
10
|
CAPITALISED_COMPONENT_NAME: "Component name must be capitalized.",
|
|
11
|
+
CANNOT_USE_IF_ON_ROOT_ELEMENT: "Cannot use 'if' on root element.",
|
|
12
|
+
CANNOT_USE_IF_ON_NESTED_OR_REPEATED_ELEMENT: "Cannot use 'if' on nested or repeated element.",
|
|
11
13
|
NESTED_COMPONENT_MUST_BE_CAPTIALIZED: "Nested component must be capitalized.",
|
|
12
14
|
INCORRECTLY_NESTED_COMPONENT: "Nest components using <Name.nest /> or <Name.repeat />.",
|
|
13
15
|
ARROW_FUNCTION_NOT_ASSIGNED: "Component function must be assigned to a variable.",
|
|
14
|
-
PLACEHOLDER_MAY_NOT_BE_EMPTY: "Placeholder expressions may not be empty.",
|
|
15
16
|
BIND_ONLY_ALLOWED_ON_INPUT: "The `bind` directive may only be used on `input` tags.",
|
|
16
17
|
PLACEHOLDER_MAY_NOT_BE_LITERAL_OBJECT: "Literal objects in placeholders not allowed as they will become constants.",
|
|
17
|
-
INVALID_PLACEHOLDER_EXPRESSION: "Invalid expressions for a placeholder",
|
|
18
18
|
JSX_ELEMENTS_NOT_ALLOWED_IN_EXPRESSIONS: "JSX elements are not allowed in expressions.",
|
|
19
19
|
UNSUPPORTED_ATTRIBUTE_VALUE: "Attribute value must be a string or expression.",
|
|
20
|
-
|
|
20
|
+
VISIBILITY_TOGGLE_DISPLAY_ALREADY_DEFINED: "Can only define one visibility toggle on element.",
|
|
21
21
|
REF_ALREADY_DEFINED: "Ref already defined on element.",
|
|
22
22
|
STUB_ALREADY_DEFINED: "Stub already defined on element.",
|
|
23
23
|
PROPS_ALREADY_DEFINED: "Props already defined on element.",
|
package/dist/errors.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"errors.js","sourceRoot":"","sources":["../src/errors.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"errors.js","sourceRoot":"","sources":["../src/errors.ts"],"names":[],"mappings":";;;AAoDA,sBAEC;AAED,wBAQC;AA9DY,QAAA,cAAc,GAAG;IAC5B,8BAA8B,EAAE,iCAAiC;IACjE,6BAA6B,EAAE,gCAAgC;IAC/D,iCAAiC,EAC/B,sEAAsE;IACxE,0BAA0B,EAAE,qCAAqC;IACjE,6BAA6B,EAAE,kCAAkC;IACjE,2CAA2C,EACzC,gDAAgD;IAClD,oCAAoC,EAAE,uCAAuC;IAC7E,4BAA4B,EAC1B,yDAAyD;IAC3D,2BAA2B,EACzB,oDAAoD;IACtD,0BAA0B,EACxB,wDAAwD;IAC1D,qCAAqC,EACnC,4EAA4E;IAC9E,uCAAuC,EACrC,8CAA8C;IAChD,2BAA2B,EACzB,iDAAiD;IACnD,yCAAyC,EACvC,mDAAmD;IACrD,mBAAmB,EAAE,iCAAiC;IACtD,oBAAoB,EAAE,kCAAkC;IACxD,qBAAqB,EAAE,mCAAmC;IAC1D,8BAA8B,EAAE,4CAA4C;IAC5E,6BAA6B,EAC3B,kDAAkD;IACpD,yCAAyC,EACvC,4CAA4C;IAC9C,sBAAsB,EAAE,oCAAoC;IAC5D,2BAA2B,EACzB,mDAAmD;IACrD,qBAAqB,EAAE,8CAA8C;IACrE,8BAA8B,EAC5B,qEAAqE;IACvE,8BAA8B,EAAE,kCAAkC;IAClE,sCAAsC,EACpC,2CAA2C;IAC7C,qBAAqB,EAAE,6CAA6C;IACpE,sBAAsB,EAAE,CAAC,KAAe,EAAE,EAAE,CAC1C,2BAA2B,KAAK;SAC7B,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,IAAI,GAAG,CAAC;SAC1B,IAAI,CAAC,IAAI,CAAC,4CAA4C;IAC3D,kBAAkB,EAAE,CAAC,IAAY,EAAE,EAAE,CACnC,wBAAwB,IAAI,gEAAgE;CAC/F,CAAC;AAEF,SAAgB,KAAK,CAAC,IAAmB,EAAE,YAAoB;IAC7D,MAAM,IAAI,CAAC,mBAAmB,CAAC,YAAY,CAAC,CAAC;AAC/C,CAAC;AAED,SAAgB,MAAM,CACpB,SAAkB,EAClB,IAAmB,EACnB,YAAoB;IAEpB,IAAI,CAAC,SAAS,EAAE,CAAC;QACf,KAAK,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC;IAC5B,CAAC;AACH,CAAC"}
|
package/dist/models/component.js
CHANGED
|
@@ -71,8 +71,10 @@ class Component {
|
|
|
71
71
|
processJSXExpressionInText(path, tracker) {
|
|
72
72
|
__classPrivateFieldGet(this, _Component_instances, "m", _Component_enterLevel).call(this, tracker.childIndex);
|
|
73
73
|
const expression = (0, ast_helpers_1.getPlaceholderExpression)(path, path.node.expression);
|
|
74
|
-
|
|
75
|
-
|
|
74
|
+
if (expression) {
|
|
75
|
+
const extractedNode = new node_1.DynamicTextNode(path, __classPrivateFieldGet(this, _Component_instances, "m", _Component_getCurrentAddress).call(this), tracker.parent, expression);
|
|
76
|
+
__classPrivateFieldGet(this, _Component_instances, "m", _Component_addNode).call(this, extractedNode, path, tracker);
|
|
77
|
+
}
|
|
76
78
|
__classPrivateFieldGet(this, _Component_instances, "m", _Component_exitLevel).call(this);
|
|
77
79
|
}
|
|
78
80
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"component.js","sourceRoot":"","sources":["../../src/models/component.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"component.js","sourceRoot":"","sources":["../../src/models/component.ts"],"names":[],"mappings":"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"}
|
package/dist/models/index.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { Module } from "./module";
|
|
2
2
|
import { Directive, NodeValue, Qualifier } from "./directive";
|
|
3
3
|
import { Component, WalkTracker } from "./component";
|
|
4
|
-
import { ExtractedNode, TagNode, DynamicTextNode, PlainTextNode,
|
|
5
|
-
export { Component,
|
|
4
|
+
import { ExtractedNode, TagNode, DynamicTextNode, PlainTextNode, VisibilityToggle } from "./node";
|
|
5
|
+
export { Component, VisibilityToggle, Directive, NodeValue, ExtractedNode, TagNode, DynamicTextNode, PlainTextNode, Module, Qualifier, WalkTracker, };
|
package/dist/models/node.d.ts
CHANGED
|
@@ -21,9 +21,10 @@ interface BindInstruction {
|
|
|
21
21
|
eventName: string;
|
|
22
22
|
expression: Expression;
|
|
23
23
|
}
|
|
24
|
-
export interface
|
|
24
|
+
export interface VisibilityToggle {
|
|
25
25
|
expression: Expression;
|
|
26
26
|
reverse: boolean;
|
|
27
|
+
detach: boolean;
|
|
27
28
|
}
|
|
28
29
|
interface ToggleTrigger {
|
|
29
30
|
name: string;
|
|
@@ -39,6 +40,8 @@ export declare class ExtractedNode {
|
|
|
39
40
|
component: any;
|
|
40
41
|
tagName: string;
|
|
41
42
|
element: HTMLElement | Text | undefined;
|
|
43
|
+
elementKey: string | undefined;
|
|
44
|
+
detacherStashKey: number | undefined;
|
|
42
45
|
isRepeatedNode: boolean;
|
|
43
46
|
repeatNode: ExtractedNode | undefined;
|
|
44
47
|
address: Array<number>;
|
|
@@ -48,6 +51,7 @@ export declare class ExtractedNode {
|
|
|
48
51
|
eventListeners: EventListener[];
|
|
49
52
|
bindInstructions: BindInstruction[];
|
|
50
53
|
isNestedClass: boolean;
|
|
54
|
+
hasConditionalChildren: boolean;
|
|
51
55
|
repeatExpression: Expression | undefined;
|
|
52
56
|
poolExpression: Expression | undefined;
|
|
53
57
|
/**
|
|
@@ -69,8 +73,8 @@ export declare class ExtractedNode {
|
|
|
69
73
|
watchText(expression: Expression): void;
|
|
70
74
|
setProps(expression: Expression): void;
|
|
71
75
|
getProps(): Expression | undefined;
|
|
72
|
-
|
|
73
|
-
|
|
76
|
+
setVisibilityToggle(expression: Expression, reverse: boolean, detach: boolean): void;
|
|
77
|
+
getVisibilityToggle(): VisibilityToggle | undefined;
|
|
74
78
|
setRef(name: string): void;
|
|
75
79
|
getRef(): string | undefined;
|
|
76
80
|
setRepeatExpression(expression: Expression): void;
|
package/dist/models/node.js
CHANGED
|
@@ -10,7 +10,7 @@ var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (
|
|
|
10
10
|
if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
|
|
11
11
|
return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
|
|
12
12
|
};
|
|
13
|
-
var _ExtractedNode_stubName,
|
|
13
|
+
var _ExtractedNode_stubName, _ExtractedNode_visibilityToggle, _ExtractedNode_ref, _ExtractedNode_props, _ExtractedNode_forExpression, _ExtractedNode_forVariable;
|
|
14
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
15
|
exports.PlainTextNode = exports.DynamicTextNode = exports.StubNode = exports.TagNode = exports.ExtractedNode = void 0;
|
|
16
16
|
const utils_1 = require("../utils");
|
|
@@ -23,6 +23,7 @@ class ExtractedNode {
|
|
|
23
23
|
this.eventListeners = [];
|
|
24
24
|
this.bindInstructions = [];
|
|
25
25
|
this.isNestedClass = false;
|
|
26
|
+
this.hasConditionalChildren = false;
|
|
26
27
|
/**
|
|
27
28
|
* The sets of classes that may be toggled.
|
|
28
29
|
*/
|
|
@@ -32,7 +33,7 @@ class ExtractedNode {
|
|
|
32
33
|
*/
|
|
33
34
|
this.toggleTriggers = [];
|
|
34
35
|
_ExtractedNode_stubName.set(this, void 0);
|
|
35
|
-
|
|
36
|
+
_ExtractedNode_visibilityToggle.set(this, void 0);
|
|
36
37
|
_ExtractedNode_ref.set(this, void 0);
|
|
37
38
|
_ExtractedNode_props.set(this, void 0);
|
|
38
39
|
_ExtractedNode_forExpression.set(this, void 0);
|
|
@@ -91,14 +92,20 @@ class ExtractedNode {
|
|
|
91
92
|
getProps() {
|
|
92
93
|
return __classPrivateFieldGet(this, _ExtractedNode_props, "f");
|
|
93
94
|
}
|
|
94
|
-
|
|
95
|
-
if (__classPrivateFieldGet(this,
|
|
96
|
-
(0, errors_1.error)(this.path, errors_1.ERROR_MESSAGES.
|
|
95
|
+
setVisibilityToggle(expression, reverse, detach) {
|
|
96
|
+
if (__classPrivateFieldGet(this, _ExtractedNode_visibilityToggle, "f")) {
|
|
97
|
+
(0, errors_1.error)(this.path, errors_1.ERROR_MESSAGES.VISIBILITY_TOGGLE_DISPLAY_ALREADY_DEFINED);
|
|
98
|
+
}
|
|
99
|
+
__classPrivateFieldSet(this, _ExtractedNode_visibilityToggle, { expression, reverse, detach }, "f");
|
|
100
|
+
if (detach) {
|
|
101
|
+
if (!this.parent) {
|
|
102
|
+
(0, errors_1.error)(this.path, errors_1.ERROR_MESSAGES.CANNOT_USE_IF_ON_ROOT_ELEMENT);
|
|
103
|
+
}
|
|
104
|
+
this.parent.hasConditionalChildren = true;
|
|
97
105
|
}
|
|
98
|
-
__classPrivateFieldSet(this, _ExtractedNode_conditionalDisplay, { expression, reverse }, "f");
|
|
99
106
|
}
|
|
100
|
-
|
|
101
|
-
return __classPrivateFieldGet(this,
|
|
107
|
+
getVisibilityToggle() {
|
|
108
|
+
return __classPrivateFieldGet(this, _ExtractedNode_visibilityToggle, "f");
|
|
102
109
|
}
|
|
103
110
|
setRef(name) {
|
|
104
111
|
if (__classPrivateFieldGet(this, _ExtractedNode_ref, "f")) {
|
|
@@ -169,7 +176,7 @@ class ExtractedNode {
|
|
|
169
176
|
}
|
|
170
177
|
}
|
|
171
178
|
exports.ExtractedNode = ExtractedNode;
|
|
172
|
-
_ExtractedNode_stubName = new WeakMap(),
|
|
179
|
+
_ExtractedNode_stubName = new WeakMap(), _ExtractedNode_visibilityToggle = new WeakMap(), _ExtractedNode_ref = new WeakMap(), _ExtractedNode_props = new WeakMap(), _ExtractedNode_forExpression = new WeakMap(), _ExtractedNode_forVariable = new WeakMap();
|
|
173
180
|
class TagNode extends ExtractedNode {
|
|
174
181
|
// directives: ExtractedDirective[] = [];
|
|
175
182
|
constructor(path, address, parent, component, // TODO: fix type circular import.
|
|
@@ -232,96 +239,4 @@ class PlainTextNode extends ExtractedNode {
|
|
|
232
239
|
}
|
|
233
240
|
}
|
|
234
241
|
exports.PlainTextNode = PlainTextNode;
|
|
235
|
-
// class NodeData {
|
|
236
|
-
// constructor(path, module, component, parentNodeData, nodeTreeAddress) {
|
|
237
|
-
// this.path = path;
|
|
238
|
-
// this.module = module;
|
|
239
|
-
// this.component = component;
|
|
240
|
-
// this.parentNodeData = parentNodeData;
|
|
241
|
-
// this.nodeTreeAddress = nodeTreeAddress;
|
|
242
|
-
// this.nestedClass = undefined;
|
|
243
|
-
// this.isRepeat = false;
|
|
244
|
-
// this.props = undefined;
|
|
245
|
-
// this.shieldQuery = undefined;
|
|
246
|
-
// this.reverseShield = 0;
|
|
247
|
-
// this.buildCalls = [];
|
|
248
|
-
// this.watches = [];
|
|
249
|
-
// this.seq = 0;
|
|
250
|
-
// }
|
|
251
|
-
// isDynamic() {
|
|
252
|
-
// return (
|
|
253
|
-
// this.watches.length > 0 ||
|
|
254
|
-
// this.buildCalls.length > 0 ||
|
|
255
|
-
// this.props ||
|
|
256
|
-
// this.nestedClass ||
|
|
257
|
-
// this.shieldQuery
|
|
258
|
-
// );
|
|
259
|
-
// }
|
|
260
|
-
// /**
|
|
261
|
-
// * Creates a watch on this node.
|
|
262
|
-
// *
|
|
263
|
-
// * @param {string} watch - the field or function to watch.
|
|
264
|
-
// * @param {string} converter - the value to pass to method, or free function call if
|
|
265
|
-
// * property is not supplied.
|
|
266
|
-
// * @param {string} property - the method on the wrapper (Can even be dotted
|
|
267
|
-
// * `style.color`).
|
|
268
|
-
// */
|
|
269
|
-
// addWatch(watch, converter, property) {
|
|
270
|
-
// this.watches.push({ watch, converter, property });
|
|
271
|
-
// }
|
|
272
|
-
// /**
|
|
273
|
-
// * Creates an event listener on this node.
|
|
274
|
-
// * Slot will be expanded.
|
|
275
|
-
// *
|
|
276
|
-
// * @param {string} event
|
|
277
|
-
// * @param {string} slot
|
|
278
|
-
// */
|
|
279
|
-
// addEventListener(event, code) {
|
|
280
|
-
// this.module.requireImport(builderCalls.onEvent);
|
|
281
|
-
// const callback = `function(${eventCallbackArgs}) {${code}}`;
|
|
282
|
-
// this.addBuildCall(builderCalls.onEvent, [
|
|
283
|
-
// componentRefInBuild,
|
|
284
|
-
// `'${event.toLowerCase()}'`,
|
|
285
|
-
// callback,
|
|
286
|
-
// ]);
|
|
287
|
-
// }
|
|
288
|
-
// addBuildCall(functionName, args) {
|
|
289
|
-
// this.buildCalls.push([functionName, ...args]);
|
|
290
|
-
// }
|
|
291
|
-
// saveAs(name) {
|
|
292
|
-
// this.module.requireImport(builderCalls.saveAs);
|
|
293
|
-
// this.addBuildCall(builderCalls.saveAs, [
|
|
294
|
-
// componentRefInBuild,
|
|
295
|
-
// literal(name),
|
|
296
|
-
// ]);
|
|
297
|
-
// }
|
|
298
|
-
// requireImport(name, source, alias) {
|
|
299
|
-
// // TODO: make it use alias
|
|
300
|
-
// this.module.requireImport(name, source, alias);
|
|
301
|
-
// }
|
|
302
|
-
// repeat(data, key) {
|
|
303
|
-
// // There is no transform here. Should we allow it?
|
|
304
|
-
// const parent = this.parentNodeData;
|
|
305
|
-
// if (parent === undefined) {
|
|
306
|
-
// // TODO: throw better error, and assert parent has no other children.
|
|
307
|
-
// throw Error("For must be used under a parent.");
|
|
308
|
-
// }
|
|
309
|
-
// let getPoolCall;
|
|
310
|
-
// if (key) {
|
|
311
|
-
// const keyFn = `function(props) {return props.${key}}`;
|
|
312
|
-
// this.requireImport(builderCalls.getKeyedPool);
|
|
313
|
-
// getPoolCall = `${builderCalls.getKeyedPool}(${this.nestedClass}, ${keyFn})`;
|
|
314
|
-
// } else {
|
|
315
|
-
// this.requireImport(builderCalls.getSequentialPool);
|
|
316
|
-
// getPoolCall = `${builderCalls.getSequentialPool}(${this.nestedClass})`;
|
|
317
|
-
// }
|
|
318
|
-
// this.requireImport(builderCalls.initRepeater);
|
|
319
|
-
// parent.addBuildCall(builderCalls.initRepeater, [
|
|
320
|
-
// componentRefInBuild,
|
|
321
|
-
// getPoolCall,
|
|
322
|
-
// ]);
|
|
323
|
-
// parent.addWatch(alwaysUpdate, `w.gkItems(${data})`);
|
|
324
|
-
// this.isRepeat = true;
|
|
325
|
-
// }
|
|
326
|
-
// }
|
|
327
242
|
//# sourceMappingURL=node.js.map
|
package/dist/models/node.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"node.js","sourceRoot":"","sources":["../../src/models/node.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAOA,oCAA+E;AAC/E,sCAAkD;AAClD,4CAAqD;AA+CrD,MAAa,aAAa;
|
|
1
|
+
{"version":3,"file":"node.js","sourceRoot":"","sources":["../../src/models/node.ts"],"names":[],"mappings":"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"}
|
package/dist/utils.js
CHANGED
package/dist/utils.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":";;AAQA,sCAEC;AAED,wCAEC;AAED,oDAIC;AAID,sCAEC;AAED,gDAEC;AAED,gDAEC;AAKD,8BAOC;AAED,0CAUC;AAED,gCAMC;AAlED,iCAA8B;AAE9B,qCAAqC;AAErC,2CAAoD;AAEpD,MAAM,QAAQ,GAAG,IAAI,aAAK,CAAC,iBAAiB,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC;AAE9D,SAAgB,aAAa,CAAC,OAAe;IAC3C,OAAO,QAAQ,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;AACzC,CAAC;AAED,SAAgB,cAAc,CAAC,IAAY;IACzC,OAAO,QAAQ,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;AACvC,CAAC;AAED,SAAgB,oBAAoB,CAAC,OAAe;IAClD,OAAO,GAAG,OAAO,KAAK,OAAO,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,OAAO,CAAC;IACtD,OAAO,GAAG,iCAAqB,CAAC,OAAO,IAAI,OAAO,MAAM,iCAAqB,CAAC,QAAQ,EAAE,CAAC;IACzF,sEAAsE;AACxE,CAAC;AAED,MAAM,iBAAiB,GAAG,IAAI,MAAM,CAAC,UAAU,CAAC,CAAC;AAEjD,SAAgB,aAAa,CAAC,CAAS;IACrC,OAAO,iBAAiB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AACnC,CAAC;AAED,SAAgB,kBAAkB,CAAC,IAAY;IAC7C,OAAO,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;AACnC,CAAC;AAED,SAAgB,kBAAkB,CAAC,IAAY;IAC7C,OAAO,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;AACnC,CAAC;AAED;;GAEG;AACH,SAAgB,SAAS,CAAC,UAAkB;IAC1C,OAAO,UAAU;SACd,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC;SAClB,OAAO,CAAC,WAAW,EAAE,IAAI,CAAC;SAC1B,OAAO,CAAC,YAAY,EAAE,IAAI,CAAC;SAC3B,OAAO,CAAC,aAAa,EAAE,IAAI,CAAC;SAC5B,IAAI,EAAE,CAAC;AACZ,CAAC;AAED,SAAgB,eAAe,CAAC,MAAkB,EAAE,IAAgB;IAClE,IAAI,
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":";;AAQA,sCAEC;AAED,wCAEC;AAED,oDAIC;AAID,sCAEC;AAED,gDAEC;AAED,gDAEC;AAKD,8BAOC;AAED,0CAUC;AAED,gCAMC;AAlED,iCAA8B;AAE9B,qCAAqC;AAErC,2CAAoD;AAEpD,MAAM,QAAQ,GAAG,IAAI,aAAK,CAAC,iBAAiB,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC;AAE9D,SAAgB,aAAa,CAAC,OAAe;IAC3C,OAAO,QAAQ,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;AACzC,CAAC;AAED,SAAgB,cAAc,CAAC,IAAY;IACzC,OAAO,QAAQ,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;AACvC,CAAC;AAED,SAAgB,oBAAoB,CAAC,OAAe;IAClD,OAAO,GAAG,OAAO,KAAK,OAAO,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,OAAO,CAAC;IACtD,OAAO,GAAG,iCAAqB,CAAC,OAAO,IAAI,OAAO,MAAM,iCAAqB,CAAC,QAAQ,EAAE,CAAC;IACzF,sEAAsE;AACxE,CAAC;AAED,MAAM,iBAAiB,GAAG,IAAI,MAAM,CAAC,UAAU,CAAC,CAAC;AAEjD,SAAgB,aAAa,CAAC,CAAS;IACrC,OAAO,iBAAiB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AACnC,CAAC;AAED,SAAgB,kBAAkB,CAAC,IAAY;IAC7C,OAAO,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;AACnC,CAAC;AAED,SAAgB,kBAAkB,CAAC,IAAY;IAC7C,OAAO,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;AACnC,CAAC;AAED;;GAEG;AACH,SAAgB,SAAS,CAAC,UAAkB;IAC1C,OAAO,UAAU;SACd,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC;SAClB,OAAO,CAAC,WAAW,EAAE,IAAI,CAAC;SAC1B,OAAO,CAAC,YAAY,EAAE,IAAI,CAAC;SAC3B,OAAO,CAAC,aAAa,EAAE,IAAI,CAAC;SAC5B,IAAI,EAAE,CAAC;AACZ,CAAC;AAED,SAAgB,eAAe,CAAC,MAAkB,EAAE,IAAgB;IAClE,IAAI,MAAM,CAAC,MAAM,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;QACjC,OAAO,KAAK,CAAC;IACf,CAAC;IACD,KAAK,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,MAAM,CAAC,OAAO,EAAE,EAAE,CAAC;QACtC,IAAI,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,EAAE,CAAC;YAClB,OAAO,KAAK,CAAC;QACf,CAAC;IACH,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED,SAAgB,UAAU,CAAC,IAAY;IACrC,MAAM,SAAS,GAAG,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IAC3C,IAAI,SAAS,YAAY,KAAK,EAAE,CAAC;QAC/B,OAAO,SAAS,CAAC;IACnB,CAAC;IACD,OAAO,CAAC,SAAS,CAAC,CAAC;AACrB,CAAC"}
|
|
@@ -37,7 +37,9 @@ function extractValue(path) {
|
|
|
37
37
|
}
|
|
38
38
|
else if (t.isJSXExpressionContainer(value)) {
|
|
39
39
|
const expression = (0, ast_helpers_1.getPlaceholderExpression)(path, value.expression);
|
|
40
|
-
|
|
40
|
+
if (expression) {
|
|
41
|
+
return { type: "expression", expression: expression };
|
|
42
|
+
}
|
|
41
43
|
}
|
|
42
44
|
else if (value === null) {
|
|
43
45
|
return { type: "null" };
|
|
@@ -54,6 +56,9 @@ exports.attributeVisitors = {
|
|
|
54
56
|
}
|
|
55
57
|
const { base, qualifier } = extractName(path);
|
|
56
58
|
const extractedValue = extractValue(path);
|
|
59
|
+
if (!extractedValue) {
|
|
60
|
+
return;
|
|
61
|
+
}
|
|
57
62
|
const isEventHandler = extractedValue.type === "expression" && base.startsWith("on");
|
|
58
63
|
const directiveClass = isEventHandler
|
|
59
64
|
? config_1.gleekitConfig.directives["on*"]
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"attribute.js","sourceRoot":"","sources":["../../src/visitors/attribute.ts"],"names":[],"mappings":";;;AAAA,kCAAkC;AAGlC,sCAA0C;AAE1C,sCAAkD;AAClD,gDAA0D;AAM1D;;;;;GAKG;AACH,SAAS,WAAW,CAAC,IAA4B;IAI/C,MAAM,EAAE,IAAI,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC;IAC3B,IAAI,IAAY,EAAE,SAA6B,CAAC;IAChD,IAAI,CAAC,CAAC,mBAAmB,CAAC,IAAI,CAAC,EAAE,CAAC;QAChC,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC;QAC3B,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC;IAC7B,CAAC;SAAM,CAAC;QACN,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC;IACnB,CAAC;IACD,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;AAC7B,CAAC;AAED;;;;;;GAMG;AACH,SAAS,YAAY,CAAC,IAA4B;IAChD,MAAM,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC;IAC5B,IAAI,CAAC,CAAC,eAAe,CAAC,KAAK,CAAC,EAAE,CAAC;QAC7B,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,EAAE,CAAC;IAChD,CAAC;SAAM,IAAI,CAAC,CAAC,wBAAwB,CAAC,KAAK,CAAC,EAAE,CAAC;QAC7C,MAAM,UAAU,GAAG,IAAA,sCAAwB,EAAC,IAAI,EAAE,KAAK,CAAC,UAAU,CAAC,CAAC;QACpE,OAAO,EAAE,IAAI,EAAE,YAAY,EAAE,UAAU,EAAE,UAAU,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"attribute.js","sourceRoot":"","sources":["../../src/visitors/attribute.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,13 +14,16 @@ function buildComponentBaseArg(componentDefinition) {
|
|
|
14
14
|
function buildTemplateArg(componentDefinition) {
|
|
15
15
|
return t.stringLiteral((0, utils_1.escapeSingleQuotes)((0, utils_1.stripHtml)(componentDefinition.html)));
|
|
16
16
|
}
|
|
17
|
-
|
|
17
|
+
/**
|
|
18
|
+
* Creates an ObjectExpression from an object.
|
|
19
|
+
*/
|
|
20
|
+
function buildObjectExpression(object) {
|
|
18
21
|
const properties = [];
|
|
19
22
|
for (const [key, value] of Object.entries(object)) {
|
|
20
23
|
properties.push({
|
|
21
24
|
type: "ObjectProperty",
|
|
22
25
|
key: (0, types_1.identifier)(key),
|
|
23
|
-
value:
|
|
26
|
+
value: value,
|
|
24
27
|
computed: false,
|
|
25
28
|
shorthand: false,
|
|
26
29
|
});
|
|
@@ -29,31 +32,32 @@ function buildObjectExpression(object, fn) {
|
|
|
29
32
|
}
|
|
30
33
|
function buildWatchesArg(componentDefinition) {
|
|
31
34
|
const watchDeclarations = componentDefinition.watches.map((watch) => {
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
}
|
|
35
|
+
const watchArg = {
|
|
36
|
+
e: t.stringLiteral(watch.elementKey),
|
|
37
|
+
c: buildObjectExpression(watch.callbacks),
|
|
38
|
+
};
|
|
39
|
+
if (watch.shieldInfo) {
|
|
40
|
+
const visibilityToggle = {
|
|
41
|
+
q: t.stringLiteral(watch.shieldInfo.key),
|
|
42
|
+
s: t.numericLiteral(watch.shieldInfo.skipCount || 0),
|
|
43
|
+
r: t.numericLiteral(watch.shieldInfo.reverse ? 1 : 0),
|
|
44
|
+
};
|
|
45
|
+
if (watch.shieldInfo.detacher) {
|
|
46
|
+
const detacher = watch.shieldInfo.detacher;
|
|
47
|
+
visibilityToggle["d"] = buildObjectExpression({
|
|
48
|
+
i: t.numericLiteral(detacher.index),
|
|
49
|
+
s: t.numericLiteral(detacher.stashKey),
|
|
50
|
+
e: t.stringLiteral(detacher.parentKey),
|
|
51
|
+
});
|
|
52
|
+
}
|
|
53
|
+
watchArg["v"] = buildObjectExpression(visibilityToggle);
|
|
42
54
|
}
|
|
43
|
-
return
|
|
44
|
-
t.stringLiteral(watch.stashRef),
|
|
45
|
-
watch.shieldInfo
|
|
46
|
-
? t.stringLiteral(watch.shieldInfo.key)
|
|
47
|
-
: t.numericLiteral(0),
|
|
48
|
-
t.numericLiteral(((_a = watch.shieldInfo) === null || _a === void 0 ? void 0 : _a.reverse) ? 1 : 0),
|
|
49
|
-
t.numericLiteral(((_b = watch.shieldInfo) === null || _b === void 0 ? void 0 : _b.count) || 0),
|
|
50
|
-
t.objectExpression(callbacks),
|
|
51
|
-
]);
|
|
55
|
+
return buildObjectExpression(watchArg);
|
|
52
56
|
});
|
|
53
57
|
return t.arrayExpression([...watchDeclarations]);
|
|
54
58
|
}
|
|
55
59
|
function buildLookupsArg(componentDefinition) {
|
|
56
|
-
return buildObjectExpression(componentDefinition.lookups
|
|
60
|
+
return buildObjectExpression(componentDefinition.lookups);
|
|
57
61
|
}
|
|
58
62
|
/**
|
|
59
63
|
*
|
|
@@ -63,9 +67,9 @@ function buildLookupsArg(componentDefinition) {
|
|
|
63
67
|
};
|
|
64
68
|
*/
|
|
65
69
|
function buildComponentBuildFunction(componentDefinition) {
|
|
66
|
-
const
|
|
67
|
-
const
|
|
68
|
-
const statements = [t.expressionStatement(
|
|
70
|
+
const dynamicElementsValueObject = buildObjectExpression(componentDefinition.dynamicElements);
|
|
71
|
+
const dynamicElementsAssignment = t.assignmentExpression("=", t.memberExpression(t.identifier("component"), t.identifier("_e")), dynamicElementsValueObject);
|
|
72
|
+
const statements = [t.expressionStatement(dynamicElementsAssignment)];
|
|
69
73
|
return t.functionExpression(null, [
|
|
70
74
|
t.identifier(constants_1.COMPONENT_BUILD_PARAMS.component),
|
|
71
75
|
t.identifier(constants_1.COMPONENT_BUILD_PARAMS.rootElement),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"define-component.js","sourceRoot":"","sources":["../../src/writers/define-component.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"define-component.js","sourceRoot":"","sources":["../../src/writers/define-component.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "babel-plugin-wallace",
|
|
3
|
-
"version": "0.0.
|
|
3
|
+
"version": "0.0.7",
|
|
4
4
|
"author": "Andrew Buchan",
|
|
5
5
|
"description": "The babel plugin for wallace",
|
|
6
6
|
"license": "ISC",
|
|
@@ -23,5 +23,5 @@
|
|
|
23
23
|
"source-map-support": "^0.5.21",
|
|
24
24
|
"typescript": "^5.6.3"
|
|
25
25
|
},
|
|
26
|
-
"gitHead": "
|
|
26
|
+
"gitHead": "625563b34b61857f1180da42d4b1f7bc229440c9"
|
|
27
27
|
}
|