vsn 0.1.68 → 0.1.71
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/demo/vsn.js +2 -2
- package/demo/xhr.html +5 -61
- package/dist/AST/ClassNode.js +18 -12
- package/dist/AST/ClassNode.js.map +1 -1
- package/dist/AST/FunctionCallNode.js +74 -34
- package/dist/AST/FunctionCallNode.js.map +1 -1
- package/dist/AST/FunctionNode.d.ts +4 -2
- package/dist/AST/FunctionNode.js +25 -2
- package/dist/AST/FunctionNode.js.map +1 -1
- package/dist/AST/ModifierNode.d.ts +14 -0
- package/dist/AST/ModifierNode.js +88 -0
- package/dist/AST/ModifierNode.js.map +1 -0
- package/dist/AST/Node.d.ts +2 -0
- package/dist/AST/Node.js +24 -0
- package/dist/AST/Node.js.map +1 -1
- package/dist/AST/OnNode.js +26 -8
- package/dist/AST/OnNode.js.map +1 -1
- package/dist/AST/RootScopeMemberNode.d.ts +2 -1
- package/dist/AST/RootScopeMemberNode.js +5 -2
- package/dist/AST/RootScopeMemberNode.js.map +1 -1
- package/dist/AST/ScopeMemberNode.d.ts +2 -1
- package/dist/AST/ScopeMemberNode.js +9 -6
- package/dist/AST/ScopeMemberNode.js.map +1 -1
- package/dist/AST/ScopeNodeAbstract.d.ts +8 -0
- package/dist/AST/ScopeNodeAbstract.js +82 -0
- package/dist/AST/ScopeNodeAbstract.js.map +1 -0
- package/dist/AST.d.ts +2 -1
- package/dist/AST.js +9 -0
- package/dist/AST.js.map +1 -1
- package/dist/Scope.d.ts +4 -0
- package/dist/Scope.js +32 -3
- package/dist/Scope.js.map +1 -1
- package/dist/vsn.min.js +2 -2
- package/package.json +1 -1
- package/src/AST/ClassNode.ts +7 -4
- package/src/AST/FunctionCallNode.ts +29 -10
- package/src/AST/FunctionNode.ts +17 -2
- package/src/AST/ModifierNode.ts +30 -0
- package/src/AST/Node.ts +7 -0
- package/src/AST/OnNode.ts +7 -2
- package/src/AST/RootScopeMemberNode.ts +3 -1
- package/src/AST/ScopeMemberNode.ts +3 -1
- package/src/AST/ScopeNodeAbstract.ts +20 -0
- package/src/AST.ts +8 -0
- package/src/Scope.ts +32 -3
- package/test/AST/ClassNode.spec.ts +29 -0
package/demo/xhr.html
CHANGED
|
@@ -1,67 +1,11 @@
|
|
|
1
1
|
<div id="huh-wut" vsn-scope>
|
|
2
|
-
<style>
|
|
3
|
-
bb,
|
|
4
|
-
.something-special {
|
|
5
|
-
display: block;
|
|
6
|
-
}
|
|
7
|
-
</style>
|
|
8
2
|
<script vsn-script type="text/vsn">
|
|
9
|
-
class
|
|
10
|
-
func
|
|
11
|
-
|
|
12
|
-
something = "something";
|
|
13
|
-
@originaltext = @text;
|
|
14
|
-
@text = 'huh?';
|
|
15
|
-
}
|
|
16
|
-
|
|
17
|
-
func deconstruct() {
|
|
18
|
-
$color = '#000000';
|
|
19
|
-
something = null;
|
|
20
|
-
@text = @originaltext;
|
|
21
|
-
}
|
|
22
|
-
|
|
23
|
-
on click() {
|
|
24
|
-
log('clicky');
|
|
25
|
-
t();
|
|
26
|
-
}
|
|
27
|
-
|
|
28
|
-
func t() {
|
|
29
|
-
if ($color == 'red') {
|
|
30
|
-
$color = 'blue';
|
|
31
|
-
@text = 'huh?';
|
|
32
|
-
} else {
|
|
33
|
-
$color = 'red';
|
|
34
|
-
@text = 'wut?';
|
|
35
|
-
}
|
|
36
|
-
}
|
|
37
|
-
}
|
|
38
|
-
|
|
39
|
-
class something-normal {
|
|
40
|
-
on click() {
|
|
41
|
-
log('also clicky');
|
|
42
|
-
}
|
|
43
|
-
}
|
|
44
|
-
|
|
45
|
-
class reset-button {
|
|
46
|
-
func construct() {
|
|
47
|
-
@text = 'reset';
|
|
48
|
-
$color = 'red';
|
|
3
|
+
class simple {
|
|
4
|
+
func test() {
|
|
5
|
+
return "test";
|
|
49
6
|
}
|
|
50
|
-
|
|
51
|
-
on click() {
|
|
52
|
-
?>(:parent:parent).@html = << './xhr.html';
|
|
53
|
-
}
|
|
54
|
-
}
|
|
55
|
-
|
|
56
|
-
?>(:parent).huh_wut = 1;
|
|
57
|
-
func add(a, b) {
|
|
58
|
-
?(bb).@text = `asd 123 ${a} ${b} hmm?`;
|
|
59
|
-
return a + b;
|
|
60
7
|
}
|
|
61
8
|
</script>
|
|
62
|
-
<div class="
|
|
63
|
-
<div class="
|
|
64
|
-
<bb class="reset-button">bb</bb>
|
|
65
|
-
<span vsn-bind="huh_wut"></span>
|
|
66
|
-
<a href="" vsn-on:click|preventdefault="huh_wut = add(huh_wut, 1)">Click me!</a>
|
|
9
|
+
<div class="simple">asd</div>
|
|
10
|
+
<div class="simple">asd</div>
|
|
67
11
|
</div>
|
package/dist/AST/ClassNode.js
CHANGED
|
@@ -110,7 +110,7 @@ var ClassNode = /** @class */ (function (_super) {
|
|
|
110
110
|
ClassNode.prototype.prepareTag = function (tag, dom, hasConstructor) {
|
|
111
111
|
if (hasConstructor === void 0) { hasConstructor = null; }
|
|
112
112
|
return __awaiter(this, void 0, void 0, function () {
|
|
113
|
-
var meta, fnc;
|
|
113
|
+
var meta, fncCls, fnc;
|
|
114
114
|
return __generator(this, function (_a) {
|
|
115
115
|
switch (_a.label) {
|
|
116
116
|
case 0:
|
|
@@ -121,13 +121,16 @@ var ClassNode = /** @class */ (function (_super) {
|
|
|
121
121
|
return [4 /*yield*/, this.block.prepare(tag.scope, dom, tag, meta)];
|
|
122
122
|
case 1:
|
|
123
123
|
_a.sent();
|
|
124
|
-
if (!hasConstructor) return [3 /*break*/,
|
|
125
|
-
|
|
126
|
-
return [4 /*yield*/,
|
|
124
|
+
if (!hasConstructor) return [3 /*break*/, 4];
|
|
125
|
+
fncCls = this.classScope.get('construct');
|
|
126
|
+
return [4 /*yield*/, fncCls.getFunction(tag.scope, dom, tag, false)];
|
|
127
127
|
case 2:
|
|
128
|
-
|
|
129
|
-
|
|
128
|
+
fnc = _a.sent();
|
|
129
|
+
return [4 /*yield*/, fnc()];
|
|
130
130
|
case 3:
|
|
131
|
+
_a.sent();
|
|
132
|
+
_a.label = 4;
|
|
133
|
+
case 4:
|
|
131
134
|
tag.preppedClasses.push(this.name);
|
|
132
135
|
return [2 /*return*/];
|
|
133
136
|
}
|
|
@@ -137,19 +140,22 @@ var ClassNode = /** @class */ (function (_super) {
|
|
|
137
140
|
ClassNode.prototype.tearDownTag = function (tag, dom, hasDeconstructor) {
|
|
138
141
|
if (hasDeconstructor === void 0) { hasDeconstructor = null; }
|
|
139
142
|
return __awaiter(this, void 0, void 0, function () {
|
|
140
|
-
var fnc, _i, _a, key, on;
|
|
143
|
+
var fncCls, fnc, _i, _a, key, on;
|
|
141
144
|
return __generator(this, function (_b) {
|
|
142
145
|
switch (_b.label) {
|
|
143
146
|
case 0:
|
|
144
147
|
if (hasDeconstructor === null)
|
|
145
148
|
hasDeconstructor = this.classScope.has('deconstruct');
|
|
146
|
-
if (!hasDeconstructor) return [3 /*break*/,
|
|
147
|
-
|
|
148
|
-
return [4 /*yield*/,
|
|
149
|
+
if (!hasDeconstructor) return [3 /*break*/, 3];
|
|
150
|
+
fncCls = this.classScope.get('deconstruct');
|
|
151
|
+
return [4 /*yield*/, fncCls.getFunction(tag.scope, dom, tag, false)];
|
|
149
152
|
case 1:
|
|
150
|
-
|
|
151
|
-
|
|
153
|
+
fnc = _b.sent();
|
|
154
|
+
return [4 /*yield*/, fnc()];
|
|
152
155
|
case 2:
|
|
156
|
+
_b.sent();
|
|
157
|
+
_b.label = 3;
|
|
158
|
+
case 3:
|
|
153
159
|
for (_i = 0, _a = this.classScope.keys; _i < _a.length; _i++) {
|
|
154
160
|
key = _a[_i];
|
|
155
161
|
if (this.classScope.get(key) instanceof OnNode_1.OnNode) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ClassNode.js","sourceRoot":"","sources":["../../src/AST/ClassNode.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,kCAA+B;AAE/B,8BAA2B;AAC3B,8BAAwD;AACxD,+BAA4B;AAE5B,wCAAqC;AACrC,mCAAgC;
|
|
1
|
+
{"version":3,"file":"ClassNode.js","sourceRoot":"","sources":["../../src/AST/ClassNode.ts"],"names":[],"mappings":"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"}
|
|
@@ -61,6 +61,7 @@ var Node_1 = require("./Node");
|
|
|
61
61
|
var ScopeMemberNode_1 = require("./ScopeMemberNode");
|
|
62
62
|
var FunctionNode_1 = require("./FunctionNode");
|
|
63
63
|
var Registry_1 = require("../Registry");
|
|
64
|
+
var ElementQueryNode_1 = require("./ElementQueryNode");
|
|
64
65
|
var FunctionCallNode = /** @class */ (function (_super) {
|
|
65
66
|
__extends(FunctionCallNode, _super);
|
|
66
67
|
function FunctionCallNode(fnc, args) {
|
|
@@ -78,47 +79,80 @@ var FunctionCallNode = /** @class */ (function (_super) {
|
|
|
78
79
|
FunctionCallNode.prototype.evaluate = function (scope, dom, tag) {
|
|
79
80
|
if (tag === void 0) { tag = null; }
|
|
80
81
|
return __awaiter(this, void 0, void 0, function () {
|
|
81
|
-
var functionScope, values, func, functionName, returnValues, calls, _i, _a, className, cls, fnc,
|
|
82
|
-
return __generator(this, function (
|
|
83
|
-
switch (
|
|
82
|
+
var tags, functionScope, values, func, functionName, returnValues, toCleanup, calls, _i, tags_1, _tag, tagNum, _a, _b, className, cls, fnc, _c, _d, _e, toCleanup_1, fnc, r;
|
|
83
|
+
return __generator(this, function (_f) {
|
|
84
|
+
switch (_f.label) {
|
|
84
85
|
case 0:
|
|
85
86
|
functionScope = scope;
|
|
86
|
-
if (!(this.fnc instanceof ScopeMemberNode_1.ScopeMemberNode)) return [3 /*break*/,
|
|
87
|
+
if (!(this.fnc instanceof ScopeMemberNode_1.ScopeMemberNode)) return [3 /*break*/, 4];
|
|
87
88
|
return [4 /*yield*/, this.fnc.scope.evaluate(scope, dom, tag)];
|
|
88
89
|
case 1:
|
|
89
|
-
functionScope =
|
|
90
|
-
|
|
91
|
-
|
|
90
|
+
functionScope = _f.sent();
|
|
91
|
+
if (!(this.fnc.scope instanceof ElementQueryNode_1.ElementQueryNode)) return [3 /*break*/, 3];
|
|
92
|
+
return [4 /*yield*/, this.fnc.scope.evaluate(scope, dom, tag)];
|
|
93
|
+
case 2:
|
|
94
|
+
tags = (_f.sent());
|
|
95
|
+
return [3 /*break*/, 4];
|
|
92
96
|
case 3:
|
|
93
|
-
|
|
97
|
+
tags = [tag];
|
|
98
|
+
_f.label = 4;
|
|
99
|
+
case 4: return [4 /*yield*/, this.args.evaluate(scope, dom, tag)];
|
|
100
|
+
case 5:
|
|
101
|
+
values = _f.sent();
|
|
94
102
|
return [4 /*yield*/, this.fnc.evaluate(scope, dom, tag)];
|
|
95
|
-
case
|
|
96
|
-
func =
|
|
97
|
-
if (
|
|
103
|
+
case 6:
|
|
104
|
+
func = _f.sent();
|
|
105
|
+
if (!(!func || func instanceof Array)) return [3 /*break*/, 19];
|
|
98
106
|
return [4 /*yield*/, this.fnc.name.evaluate(scope, dom, tag)];
|
|
99
|
-
case
|
|
100
|
-
functionName =
|
|
107
|
+
case 7:
|
|
108
|
+
functionName = _f.sent();
|
|
101
109
|
returnValues = [];
|
|
110
|
+
toCleanup = [];
|
|
102
111
|
calls = 0;
|
|
103
|
-
_i = 0,
|
|
104
|
-
|
|
105
|
-
case
|
|
106
|
-
if (!(_i <
|
|
107
|
-
|
|
112
|
+
_i = 0, tags_1 = tags;
|
|
113
|
+
_f.label = 8;
|
|
114
|
+
case 8:
|
|
115
|
+
if (!(_i < tags_1.length)) return [3 /*break*/, 14];
|
|
116
|
+
_tag = tags_1[_i];
|
|
117
|
+
tagNum = 0;
|
|
118
|
+
_a = 0, _b = _tag.preppedClasses;
|
|
119
|
+
_f.label = 9;
|
|
120
|
+
case 9:
|
|
121
|
+
if (!(_a < _b.length)) return [3 /*break*/, 13];
|
|
122
|
+
className = _b[_a];
|
|
123
|
+
tagNum++;
|
|
108
124
|
cls = Registry_1.Registry.instance.classes.getSynchronous(className);
|
|
109
|
-
if (!cls) return [3 /*break*/,
|
|
110
|
-
if (!cls.classScope.has(functionName)) return [3 /*break*/,
|
|
125
|
+
if (!cls) return [3 /*break*/, 12];
|
|
126
|
+
if (!cls.classScope.has(functionName)) return [3 /*break*/, 12];
|
|
111
127
|
fnc = cls.classScope.get(functionName);
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
128
|
+
toCleanup.push(fnc);
|
|
129
|
+
_d = (_c = returnValues).push;
|
|
130
|
+
return [4 /*yield*/, fnc.evaluate(_tag.scope, dom, _tag)];
|
|
131
|
+
case 10: return [4 /*yield*/, (_f.sent()).apply(void 0, values)];
|
|
132
|
+
case 11:
|
|
133
|
+
_d.apply(_c, [_f.sent()]);
|
|
116
134
|
calls++;
|
|
117
|
-
|
|
118
|
-
case
|
|
135
|
+
_f.label = 12;
|
|
136
|
+
case 12:
|
|
137
|
+
_a++;
|
|
138
|
+
return [3 /*break*/, 9];
|
|
139
|
+
case 13:
|
|
119
140
|
_i++;
|
|
120
|
-
return [3 /*break*/,
|
|
121
|
-
case
|
|
141
|
+
return [3 /*break*/, 8];
|
|
142
|
+
case 14:
|
|
143
|
+
_e = 0, toCleanup_1 = toCleanup;
|
|
144
|
+
_f.label = 15;
|
|
145
|
+
case 15:
|
|
146
|
+
if (!(_e < toCleanup_1.length)) return [3 /*break*/, 18];
|
|
147
|
+
fnc = toCleanup_1[_e];
|
|
148
|
+
return [4 /*yield*/, fnc.collectGarbage()];
|
|
149
|
+
case 16:
|
|
150
|
+
_f.sent();
|
|
151
|
+
_f.label = 17;
|
|
152
|
+
case 17:
|
|
153
|
+
_e++;
|
|
154
|
+
return [3 /*break*/, 15];
|
|
155
|
+
case 18:
|
|
122
156
|
if (calls === 1) {
|
|
123
157
|
return [2 /*return*/, returnValues[0]];
|
|
124
158
|
}
|
|
@@ -128,13 +162,19 @@ var FunctionCallNode = /** @class */ (function (_super) {
|
|
|
128
162
|
else {
|
|
129
163
|
return [2 /*return*/, returnValues];
|
|
130
164
|
}
|
|
131
|
-
return [3 /*break*/,
|
|
132
|
-
case
|
|
133
|
-
if (!(func instanceof FunctionNode_1.FunctionNode)) return [3 /*break*/,
|
|
165
|
+
return [3 /*break*/, 24];
|
|
166
|
+
case 19:
|
|
167
|
+
if (!(func instanceof FunctionNode_1.FunctionNode)) return [3 /*break*/, 23];
|
|
134
168
|
return [4 /*yield*/, func.evaluate(functionScope, dom, tag)];
|
|
135
|
-
case
|
|
136
|
-
case
|
|
137
|
-
|
|
169
|
+
case 20: return [4 /*yield*/, (_f.sent()).apply(void 0, values)];
|
|
170
|
+
case 21:
|
|
171
|
+
r = _f.sent();
|
|
172
|
+
return [4 /*yield*/, func.collectGarbage()];
|
|
173
|
+
case 22:
|
|
174
|
+
_f.sent();
|
|
175
|
+
return [2 /*return*/, r];
|
|
176
|
+
case 23: return [2 /*return*/, func.call.apply(func, __spreadArray([functionScope.wrapped || functionScope], values))];
|
|
177
|
+
case 24: return [2 /*return*/];
|
|
138
178
|
}
|
|
139
179
|
});
|
|
140
180
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FunctionCallNode.js","sourceRoot":"","sources":["../../src/AST/FunctionCallNode.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAIA,+BAA4B;AAE5B,qDAAkD;AAClD,+CAA4C;AAC5C,wCAAqC;
|
|
1
|
+
{"version":3,"file":"FunctionCallNode.js","sourceRoot":"","sources":["../../src/AST/FunctionCallNode.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { Scope } from "../Scope";
|
|
1
|
+
import { FunctionScope, Scope } from "../Scope";
|
|
2
2
|
import { DOM } from "../DOM";
|
|
3
3
|
import { Tag } from "../Tag";
|
|
4
4
|
import { Token, TreeNode } from "../AST";
|
|
@@ -9,10 +9,12 @@ export declare class FunctionNode extends Node implements TreeNode {
|
|
|
9
9
|
readonly args: string[];
|
|
10
10
|
readonly block: BlockNode;
|
|
11
11
|
protected requiresPrep: boolean;
|
|
12
|
+
protected garbage: FunctionScope[];
|
|
12
13
|
constructor(name: string, args: string[], block: BlockNode);
|
|
13
14
|
protected _getChildNodes(): Node[];
|
|
14
15
|
prepare(scope: Scope, dom: DOM, tag?: Tag, meta?: any): Promise<void>;
|
|
15
16
|
evaluate(scope: Scope, dom: DOM, tag?: Tag): Promise<(...args: any[]) => Promise<any>>;
|
|
16
|
-
|
|
17
|
+
collectGarbage(): Promise<void>;
|
|
18
|
+
getFunction(scope: Scope, dom: DOM, tag?: Tag, createFunctionScope?: boolean): Promise<(...args: any[]) => Promise<any>>;
|
|
17
19
|
static parse<T = FunctionNode>(lastNode: any, token: any, tokens: Token[], cls?: any): FunctionNode;
|
|
18
20
|
}
|
package/dist/AST/FunctionNode.js
CHANGED
|
@@ -63,6 +63,7 @@ var FunctionNode = /** @class */ (function (_super) {
|
|
|
63
63
|
_this.args = args;
|
|
64
64
|
_this.block = block;
|
|
65
65
|
_this.requiresPrep = true;
|
|
66
|
+
_this.garbage = [];
|
|
66
67
|
return _this;
|
|
67
68
|
}
|
|
68
69
|
FunctionNode.prototype._getChildNodes = function () {
|
|
@@ -97,11 +98,27 @@ var FunctionNode = /** @class */ (function (_super) {
|
|
|
97
98
|
});
|
|
98
99
|
});
|
|
99
100
|
};
|
|
100
|
-
FunctionNode.prototype.
|
|
101
|
+
FunctionNode.prototype.collectGarbage = function () {
|
|
102
|
+
return __awaiter(this, void 0, void 0, function () {
|
|
103
|
+
var _i, _a, f;
|
|
104
|
+
return __generator(this, function (_b) {
|
|
105
|
+
for (_i = 0, _a = this.garbage; _i < _a.length; _i++) {
|
|
106
|
+
f = _a[_i];
|
|
107
|
+
f.collectGarbage();
|
|
108
|
+
}
|
|
109
|
+
this.garbage = [];
|
|
110
|
+
return [2 /*return*/];
|
|
111
|
+
});
|
|
112
|
+
});
|
|
113
|
+
};
|
|
114
|
+
FunctionNode.prototype.getFunction = function (scope, dom, tag, createFunctionScope) {
|
|
101
115
|
if (tag === void 0) { tag = null; }
|
|
116
|
+
if (createFunctionScope === void 0) { createFunctionScope = true; }
|
|
102
117
|
return __awaiter(this, void 0, void 0, function () {
|
|
118
|
+
var self;
|
|
103
119
|
var _this = this;
|
|
104
120
|
return __generator(this, function (_a) {
|
|
121
|
+
self = this;
|
|
105
122
|
return [2 /*return*/, function () {
|
|
106
123
|
var args = [];
|
|
107
124
|
for (var _i = 0; _i < arguments.length; _i++) {
|
|
@@ -112,7 +129,13 @@ var FunctionNode = /** @class */ (function (_super) {
|
|
|
112
129
|
return __generator(this, function (_c) {
|
|
113
130
|
switch (_c.label) {
|
|
114
131
|
case 0:
|
|
115
|
-
|
|
132
|
+
if (createFunctionScope && !(scope instanceof Scope_1.FunctionScope)) {
|
|
133
|
+
functionScope = new Scope_1.FunctionScope(scope);
|
|
134
|
+
self.garbage.push(functionScope);
|
|
135
|
+
}
|
|
136
|
+
else {
|
|
137
|
+
functionScope = scope;
|
|
138
|
+
}
|
|
116
139
|
for (_a = 0, _b = this.args; _a < _b.length; _a++) {
|
|
117
140
|
arg = _b[_a];
|
|
118
141
|
functionScope.set(arg, args.shift());
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FunctionNode.js","sourceRoot":"","sources":["../../src/AST/FunctionNode.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,kCAA8C;AAG9C,8BAA6C;AAC7C,+BAA4B;AAG5B;IAAkC,gCAAI;
|
|
1
|
+
{"version":3,"file":"FunctionNode.js","sourceRoot":"","sources":["../../src/AST/FunctionNode.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
import { Scope } from "../Scope";
|
|
2
|
+
import { DOM } from "../DOM";
|
|
3
|
+
import { Tag } from "../Tag";
|
|
4
|
+
import { Token, TreeNode } from "../AST";
|
|
5
|
+
import { Node } from "./Node";
|
|
6
|
+
import { BlockNode } from "./BlockNode";
|
|
7
|
+
export declare class ModifierNode extends Node implements TreeNode {
|
|
8
|
+
readonly name: string;
|
|
9
|
+
readonly block: BlockNode;
|
|
10
|
+
constructor(name: string, block: BlockNode);
|
|
11
|
+
prepare(scope: Scope, dom: DOM, tag?: Tag, meta?: any): Promise<void>;
|
|
12
|
+
evaluate(scope: Scope, dom: DOM, tag?: Tag): Promise<any>;
|
|
13
|
+
static parse(lastNode: any, token: any, tokens: Token[]): Node;
|
|
14
|
+
}
|
|
@@ -0,0 +1,88 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __extends = (this && this.__extends) || (function () {
|
|
3
|
+
var extendStatics = function (d, b) {
|
|
4
|
+
extendStatics = Object.setPrototypeOf ||
|
|
5
|
+
({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
|
|
6
|
+
function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
|
|
7
|
+
return extendStatics(d, b);
|
|
8
|
+
};
|
|
9
|
+
return function (d, b) {
|
|
10
|
+
if (typeof b !== "function" && b !== null)
|
|
11
|
+
throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
|
|
12
|
+
extendStatics(d, b);
|
|
13
|
+
function __() { this.constructor = d; }
|
|
14
|
+
d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
|
|
15
|
+
};
|
|
16
|
+
})();
|
|
17
|
+
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
18
|
+
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
19
|
+
return new (P || (P = Promise))(function (resolve, reject) {
|
|
20
|
+
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
21
|
+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
22
|
+
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
23
|
+
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
24
|
+
});
|
|
25
|
+
};
|
|
26
|
+
var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
27
|
+
var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
|
|
28
|
+
return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
|
|
29
|
+
function verb(n) { return function (v) { return step([n, v]); }; }
|
|
30
|
+
function step(op) {
|
|
31
|
+
if (f) throw new TypeError("Generator is already executing.");
|
|
32
|
+
while (_) try {
|
|
33
|
+
if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
|
|
34
|
+
if (y = 0, t) op = [op[0] & 2, t.value];
|
|
35
|
+
switch (op[0]) {
|
|
36
|
+
case 0: case 1: t = op; break;
|
|
37
|
+
case 4: _.label++; return { value: op[1], done: false };
|
|
38
|
+
case 5: _.label++; y = op[1]; op = [0]; continue;
|
|
39
|
+
case 7: op = _.ops.pop(); _.trys.pop(); continue;
|
|
40
|
+
default:
|
|
41
|
+
if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
|
|
42
|
+
if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
|
|
43
|
+
if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
|
|
44
|
+
if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
|
|
45
|
+
if (t[2]) _.ops.pop();
|
|
46
|
+
_.trys.pop(); continue;
|
|
47
|
+
}
|
|
48
|
+
op = body.call(thisArg, _);
|
|
49
|
+
} catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
|
|
50
|
+
if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
|
|
51
|
+
}
|
|
52
|
+
};
|
|
53
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
54
|
+
exports.ModifierNode = void 0;
|
|
55
|
+
var Node_1 = require("./Node");
|
|
56
|
+
var ModifierNode = /** @class */ (function (_super) {
|
|
57
|
+
__extends(ModifierNode, _super);
|
|
58
|
+
function ModifierNode(name, block) {
|
|
59
|
+
var _this = _super.call(this) || this;
|
|
60
|
+
_this.name = name;
|
|
61
|
+
_this.block = block;
|
|
62
|
+
return _this;
|
|
63
|
+
}
|
|
64
|
+
ModifierNode.prototype.prepare = function (scope, dom, tag, meta) {
|
|
65
|
+
if (tag === void 0) { tag = null; }
|
|
66
|
+
return __awaiter(this, void 0, void 0, function () {
|
|
67
|
+
return __generator(this, function (_a) {
|
|
68
|
+
return [2 /*return*/, null];
|
|
69
|
+
});
|
|
70
|
+
});
|
|
71
|
+
};
|
|
72
|
+
ModifierNode.prototype.evaluate = function (scope, dom, tag) {
|
|
73
|
+
if (tag === void 0) { tag = null; }
|
|
74
|
+
return __awaiter(this, void 0, void 0, function () {
|
|
75
|
+
return __generator(this, function (_a) {
|
|
76
|
+
return [2 /*return*/, null];
|
|
77
|
+
});
|
|
78
|
+
});
|
|
79
|
+
};
|
|
80
|
+
ModifierNode.parse = function (lastNode, token, tokens) {
|
|
81
|
+
var modifier = tokens.shift().value.substr(1);
|
|
82
|
+
lastNode.modifiers.push(modifier);
|
|
83
|
+
return lastNode;
|
|
84
|
+
};
|
|
85
|
+
return ModifierNode;
|
|
86
|
+
}(Node_1.Node));
|
|
87
|
+
exports.ModifierNode = ModifierNode;
|
|
88
|
+
//# sourceMappingURL=ModifierNode.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"ModifierNode.js","sourceRoot":"","sources":["../../src/AST/ModifierNode.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAIA,+BAA4B;AAI5B;IAAkC,gCAAI;IAClC,sBACoB,IAAY,EACZ,KAAgB;QAFpC,YAII,iBAAO,SACV;QAJmB,UAAI,GAAJ,IAAI,CAAQ;QACZ,WAAK,GAAL,KAAK,CAAW;;IAGpC,CAAC;IAEY,8BAAO,GAApB,UAAqB,KAAY,EAAE,GAAQ,EAAE,GAAe,EAAE,IAAU;QAA3B,oBAAA,EAAA,UAAe;;;gBACxD,sBAAO,IAAI,EAAC;;;KACf;IAEY,+BAAQ,GAArB,UAAsB,KAAY,EAAE,GAAQ,EAAE,GAAe;QAAf,oBAAA,EAAA,UAAe;;;gBACzD,sBAAO,IAAI,EAAC;;;KACf;IAEa,kBAAK,GAAnB,UAAoB,QAAQ,EAAE,KAAK,EAAE,MAAe;QAChD,IAAM,QAAQ,GAAG,MAAM,CAAC,KAAK,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;QAChD,QAAQ,CAAC,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAClC,OAAO,QAAQ,CAAC;IACpB,CAAC;IACL,mBAAC;AAAD,CAAC,AArBD,CAAkC,WAAI,GAqBrC;AArBY,oCAAY"}
|
package/dist/AST/Node.d.ts
CHANGED
|
@@ -9,9 +9,11 @@ export declare abstract class Node implements TreeNode {
|
|
|
9
9
|
protected nodeCache: {
|
|
10
10
|
[key: string]: Node[];
|
|
11
11
|
};
|
|
12
|
+
readonly modifiers: string[];
|
|
12
13
|
abstract evaluate(scope: Scope, dom: DOM, tag?: Tag): any;
|
|
13
14
|
isPreparationRequired(): boolean;
|
|
14
15
|
prepare(scope: Scope, dom: DOM, tag?: Tag, meta?: any): Promise<void>;
|
|
16
|
+
cleanup(scope: Scope, dom: DOM, tag: Tag): Promise<void>;
|
|
15
17
|
protected _getChildNodes(): Node[];
|
|
16
18
|
getChildNodes(): Node[];
|
|
17
19
|
findChildrenByType<T = Node>(t: any): T[];
|
package/dist/AST/Node.js
CHANGED
|
@@ -41,6 +41,7 @@ var Node = /** @class */ (function () {
|
|
|
41
41
|
function Node() {
|
|
42
42
|
this.requiresPrep = false;
|
|
43
43
|
this.nodeCache = {};
|
|
44
|
+
this.modifiers = [];
|
|
44
45
|
}
|
|
45
46
|
Node.prototype.isPreparationRequired = function () {
|
|
46
47
|
if (this.requiresPrep)
|
|
@@ -81,6 +82,29 @@ var Node = /** @class */ (function () {
|
|
|
81
82
|
});
|
|
82
83
|
});
|
|
83
84
|
};
|
|
85
|
+
Node.prototype.cleanup = function (scope, dom, tag) {
|
|
86
|
+
return __awaiter(this, void 0, void 0, function () {
|
|
87
|
+
var _i, _a, node;
|
|
88
|
+
return __generator(this, function (_b) {
|
|
89
|
+
switch (_b.label) {
|
|
90
|
+
case 0:
|
|
91
|
+
_i = 0, _a = this.getChildNodes();
|
|
92
|
+
_b.label = 1;
|
|
93
|
+
case 1:
|
|
94
|
+
if (!(_i < _a.length)) return [3 /*break*/, 4];
|
|
95
|
+
node = _a[_i];
|
|
96
|
+
return [4 /*yield*/, node.cleanup(scope, dom, tag)];
|
|
97
|
+
case 2:
|
|
98
|
+
_b.sent();
|
|
99
|
+
_b.label = 3;
|
|
100
|
+
case 3:
|
|
101
|
+
_i++;
|
|
102
|
+
return [3 /*break*/, 1];
|
|
103
|
+
case 4: return [2 /*return*/];
|
|
104
|
+
}
|
|
105
|
+
});
|
|
106
|
+
});
|
|
107
|
+
};
|
|
84
108
|
Node.prototype._getChildNodes = function () {
|
|
85
109
|
return [];
|
|
86
110
|
};
|
package/dist/AST/Node.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Node.js","sourceRoot":"","sources":["../../src/AST/Node.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAKA;IAAA;QACc,iBAAY,GAAY,KAAK,CAAC;QAG9B,cAAS,GAA4B,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"Node.js","sourceRoot":"","sources":["../../src/AST/Node.ts"],"names":[],"mappings":"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"}
|
package/dist/AST/OnNode.js
CHANGED
|
@@ -61,21 +61,39 @@ var OnNode = /** @class */ (function (_super) {
|
|
|
61
61
|
OnNode.prototype.prepare = function (scope, dom, tag, meta) {
|
|
62
62
|
if (tag === void 0) { tag = null; }
|
|
63
63
|
return __awaiter(this, void 0, void 0, function () {
|
|
64
|
-
var classPrep,
|
|
65
|
-
|
|
66
|
-
|
|
64
|
+
var classPrep, func_1;
|
|
65
|
+
var _this = this;
|
|
66
|
+
return __generator(this, function (_a) {
|
|
67
|
+
switch (_a.label) {
|
|
67
68
|
case 0:
|
|
68
69
|
classPrep = meta === null || meta === void 0 ? void 0 : meta.ClassNodePrepare;
|
|
69
70
|
if (!(tag && !classPrep)) return [3 /*break*/, 2];
|
|
70
|
-
_b = (_a = tag).addEventHandler;
|
|
71
|
-
_c = [this.name, []];
|
|
72
71
|
return [4 /*yield*/, this.getFunction(scope, dom, tag)];
|
|
73
72
|
case 1:
|
|
74
|
-
|
|
75
|
-
|
|
73
|
+
func_1 = _a.sent();
|
|
74
|
+
tag.addEventHandler(this.name, [], function () {
|
|
75
|
+
var args = [];
|
|
76
|
+
for (var _i = 0; _i < arguments.length; _i++) {
|
|
77
|
+
args[_i] = arguments[_i];
|
|
78
|
+
}
|
|
79
|
+
return __awaiter(_this, void 0, void 0, function () {
|
|
80
|
+
return __generator(this, function (_a) {
|
|
81
|
+
switch (_a.label) {
|
|
82
|
+
case 0: return [4 /*yield*/, func_1.apply(void 0, args)];
|
|
83
|
+
case 1:
|
|
84
|
+
_a.sent();
|
|
85
|
+
return [4 /*yield*/, this.collectGarbage()];
|
|
86
|
+
case 2:
|
|
87
|
+
_a.sent();
|
|
88
|
+
return [2 /*return*/];
|
|
89
|
+
}
|
|
90
|
+
});
|
|
91
|
+
});
|
|
92
|
+
}, this);
|
|
93
|
+
_a.label = 2;
|
|
76
94
|
case 2: return [4 /*yield*/, _super.prototype.prepare.call(this, scope, dom, tag, meta)];
|
|
77
95
|
case 3:
|
|
78
|
-
|
|
96
|
+
_a.sent();
|
|
79
97
|
return [2 /*return*/];
|
|
80
98
|
}
|
|
81
99
|
});
|
package/dist/AST/OnNode.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OnNode.js","sourceRoot":"","sources":["../../src/AST/OnNode.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,+CAA4C;AAK5C;IAA4B,0BAAY;IAAxC;;
|
|
1
|
+
{"version":3,"file":"OnNode.js","sourceRoot":"","sources":["../../src/AST/OnNode.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,+CAA4C;AAK5C;IAA4B,0BAAY;IAAxC;;IAgBA,CAAC;IAfgB,wBAAO,GAApB,UAAqB,KAAY,EAAE,GAAQ,EAAE,GAAe,EAAE,IAAI;QAArB,oBAAA,EAAA,UAAe;;;;;;;wBAClD,SAAS,GAAG,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,gBAAgB,CAAC;6BACrC,CAAA,GAAG,IAAI,CAAC,SAAS,CAAA,EAAjB,wBAAiB;wBACJ,qBAAM,IAAI,CAAC,WAAW,CAAC,KAAK,EAAE,GAAG,EAAE,GAAG,CAAC,EAAA;;wBAA9C,SAAO,SAAuC;wBACpD,GAAG,CAAC,eAAe,CAAC,IAAI,CAAC,IAAI,EAAE,EAAE,EAAE;4BAAO,cAAO;iCAAP,UAAO,EAAP,qBAAO,EAAP,IAAO;gCAAP,yBAAO;;;;;gDAC7C,qBAAM,MAAI,eAAI,IAAI,GAAC;;4CAAnB,SAAmB,CAAC;4CACpB,qBAAM,IAAI,CAAC,cAAc,EAAE,EAAA;;4CAA3B,SAA2B,CAAC;;;;;yBAC/B,EAAE,IAAI,CAAC,CAAC;;4BAEb,qBAAM,iBAAM,OAAO,YAAC,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,CAAC,EAAA;;wBAA1C,SAA0C,CAAC;;;;;KAC9C;IAEa,YAAK,GAAnB,UAAoB,QAAQ,EAAE,KAAK,EAAE,MAAe;QAChD,OAAO,OAAM,KAAK,YAAS,QAAQ,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;IAChE,CAAC;IACL,aAAC;AAAD,CAAC,AAhBD,CAA4B,2BAAY,GAgBvC;AAhBY,wBAAM"}
|