vsn 0.1.146 → 0.1.148
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/memory-leak-test.html +34 -1
- package/demo/resources/xhr-memory-leak-test.html +1 -1
- package/demo/vsn.js +2 -2
- package/dist/AST/FunctionCallNode.js +22 -22
- package/dist/AST/FunctionCallNode.js.map +1 -1
- package/dist/EventDispatcher.js +51 -37
- package/dist/EventDispatcher.js.map +1 -1
- package/dist/demo/ServiceDemo.js +1 -0
- package/dist/demo/ServiceDemo.js.map +1 -1
- package/dist/version.d.ts +1 -1
- package/dist/version.js +1 -1
- package/package.json +1 -1
- package/src/AST/FunctionCallNode.ts +3 -7
- package/src/EventDispatcher.ts +5 -0
- package/src/demo/ServiceDemo.ts +1 -0
- package/src/version.ts +1 -1
- package/test/AST/FunctionNode.spec.ts +28 -0
- package/test/Controller.spec.ts +0 -8
|
@@ -84,6 +84,7 @@ var __values = (this && this.__values) || function(o) {
|
|
|
84
84
|
};
|
|
85
85
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
86
86
|
exports.FunctionCallNode = void 0;
|
|
87
|
+
var Scope_1 = require("../Scope");
|
|
87
88
|
var Tag_1 = require("../Tag");
|
|
88
89
|
var Node_1 = require("./Node");
|
|
89
90
|
var ScopeMemberNode_1 = require("./ScopeMemberNode");
|
|
@@ -176,27 +177,26 @@ var FunctionCallNode = /** @class */ (function (_super) {
|
|
|
176
177
|
_functionScope = functionScope;
|
|
177
178
|
_c.label = 7;
|
|
178
179
|
case 7:
|
|
179
|
-
_c.trys.push([7,
|
|
180
|
+
_c.trys.push([7, 16, 17, 18]);
|
|
180
181
|
tags_1 = __values(tags), tags_1_1 = tags_1.next();
|
|
181
182
|
_c.label = 8;
|
|
182
183
|
case 8:
|
|
183
|
-
if (!!tags_1_1.done) return [3 /*break*/,
|
|
184
|
+
if (!!tags_1_1.done) return [3 /*break*/, 15];
|
|
184
185
|
_tag = tags_1_1.value;
|
|
185
|
-
if (_tag
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
if (!_functionScope.has(functionName)) return [3 /*break*/, 9];
|
|
186
|
+
if (!(_tag && _tag.scope.has(functionName))) return [3 /*break*/, 9];
|
|
187
|
+
func = _tag.scope.get(functionName);
|
|
188
|
+
_functionScope = _tag.scope;
|
|
189
|
+
return [3 /*break*/, 12];
|
|
190
|
+
case 9:
|
|
191
|
+
if (!(_functionScope instanceof Scope_1.Scope && _functionScope.has(functionName))) return [3 /*break*/, 10];
|
|
192
192
|
func = _functionScope.get(functionName);
|
|
193
|
-
return [3 /*break*/,
|
|
194
|
-
case
|
|
195
|
-
case
|
|
193
|
+
return [3 /*break*/, 12];
|
|
194
|
+
case 10: return [4 /*yield*/, this.fnc.evaluate(scope, dom, _tag)];
|
|
195
|
+
case 11:
|
|
196
196
|
func = _c.sent();
|
|
197
|
-
_c.label =
|
|
198
|
-
case
|
|
199
|
-
case
|
|
197
|
+
_c.label = 12;
|
|
198
|
+
case 12: return [4 /*yield*/, this.callFunction.apply(this, __spreadArray([func, _functionScope, dom, _tag], __read(values)))];
|
|
199
|
+
case 13:
|
|
200
200
|
_a = __read.apply(void 0, [_c.sent(), 2]), result = _a[0], success = _a[1];
|
|
201
201
|
if (success) {
|
|
202
202
|
returnValues.push(result);
|
|
@@ -205,22 +205,22 @@ var FunctionCallNode = /** @class */ (function (_super) {
|
|
|
205
205
|
else {
|
|
206
206
|
console.warn("Function " + functionName + " was not found in current scope.");
|
|
207
207
|
}
|
|
208
|
-
_c.label =
|
|
209
|
-
case
|
|
208
|
+
_c.label = 14;
|
|
209
|
+
case 14:
|
|
210
210
|
tags_1_1 = tags_1.next();
|
|
211
211
|
return [3 /*break*/, 8];
|
|
212
|
-
case
|
|
213
|
-
case
|
|
212
|
+
case 15: return [3 /*break*/, 18];
|
|
213
|
+
case 16:
|
|
214
214
|
e_1_1 = _c.sent();
|
|
215
215
|
e_1 = { error: e_1_1 };
|
|
216
|
-
return [3 /*break*/,
|
|
217
|
-
case
|
|
216
|
+
return [3 /*break*/, 18];
|
|
217
|
+
case 17:
|
|
218
218
|
try {
|
|
219
219
|
if (tags_1_1 && !tags_1_1.done && (_b = tags_1.return)) _b.call(tags_1);
|
|
220
220
|
}
|
|
221
221
|
finally { if (e_1) throw e_1.error; }
|
|
222
222
|
return [7 /*endfinally*/];
|
|
223
|
-
case
|
|
223
|
+
case 18:
|
|
224
224
|
if (calls === 1) {
|
|
225
225
|
return [2 /*return*/, returnValues[0]];
|
|
226
226
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FunctionCallNode.js","sourceRoot":"","sources":["../../src/AST/FunctionCallNode.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"FunctionCallNode.js","sourceRoot":"","sources":["../../src/AST/FunctionCallNode.ts"],"names":[],"mappings":"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"}
|
package/dist/EventDispatcher.js
CHANGED
|
@@ -70,7 +70,7 @@ var EventDispatcher = /** @class */ (function () {
|
|
|
70
70
|
EventDispatcher.sources.push(this);
|
|
71
71
|
}
|
|
72
72
|
EventDispatcher.prototype.deconstruct = function () {
|
|
73
|
-
var e_1, _a, e_2, _b;
|
|
73
|
+
var e_1, _a, e_2, _b, e_3, _c;
|
|
74
74
|
this.dispatch('deconstruct', this);
|
|
75
75
|
var sourceIndex = EventDispatcher.sources.indexOf(this);
|
|
76
76
|
if (sourceIndex > -1) {
|
|
@@ -78,36 +78,50 @@ var EventDispatcher = /** @class */ (function () {
|
|
|
78
78
|
}
|
|
79
79
|
for (var k in this._listeners) {
|
|
80
80
|
try {
|
|
81
|
-
for (var
|
|
82
|
-
var cb =
|
|
81
|
+
for (var _d = (e_1 = void 0, __values(this._listeners[k])), _e = _d.next(); !_e.done; _e = _d.next()) {
|
|
82
|
+
var cb = _e.value;
|
|
83
83
|
cb.deconstruct();
|
|
84
84
|
}
|
|
85
85
|
}
|
|
86
86
|
catch (e_1_1) { e_1 = { error: e_1_1 }; }
|
|
87
87
|
finally {
|
|
88
88
|
try {
|
|
89
|
-
if (
|
|
89
|
+
if (_e && !_e.done && (_a = _d.return)) _a.call(_d);
|
|
90
90
|
}
|
|
91
91
|
finally { if (e_1) throw e_1.error; }
|
|
92
92
|
}
|
|
93
93
|
delete this._listeners[k];
|
|
94
94
|
}
|
|
95
95
|
try {
|
|
96
|
-
for (var
|
|
97
|
-
var cb =
|
|
96
|
+
for (var _f = __values(this._allListeners), _g = _f.next(); !_g.done; _g = _f.next()) {
|
|
97
|
+
var cb = _g.value;
|
|
98
98
|
cb.deconstruct();
|
|
99
99
|
}
|
|
100
100
|
}
|
|
101
101
|
catch (e_2_1) { e_2 = { error: e_2_1 }; }
|
|
102
102
|
finally {
|
|
103
103
|
try {
|
|
104
|
-
if (
|
|
104
|
+
if (_g && !_g.done && (_b = _f.return)) _b.call(_f);
|
|
105
105
|
}
|
|
106
106
|
finally { if (e_2) throw e_2.error; }
|
|
107
107
|
}
|
|
108
108
|
this._listeners = {};
|
|
109
109
|
this._relays.length = 0;
|
|
110
110
|
this._allListeners.length = 0;
|
|
111
|
+
try {
|
|
112
|
+
for (var _h = __values(EventDispatcher.sources), _j = _h.next(); !_j.done; _j = _h.next()) {
|
|
113
|
+
var source = _j.value;
|
|
114
|
+
source.removeRelay(this);
|
|
115
|
+
source.noneWithContext(this);
|
|
116
|
+
}
|
|
117
|
+
}
|
|
118
|
+
catch (e_3_1) { e_3 = { error: e_3_1 }; }
|
|
119
|
+
finally {
|
|
120
|
+
try {
|
|
121
|
+
if (_j && !_j.done && (_c = _h.return)) _c.call(_h);
|
|
122
|
+
}
|
|
123
|
+
finally { if (e_3) throw e_3.error; }
|
|
124
|
+
}
|
|
111
125
|
};
|
|
112
126
|
EventDispatcher.prototype.addRelay = function (relay) {
|
|
113
127
|
this._relays.push(relay);
|
|
@@ -143,7 +157,7 @@ var EventDispatcher = /** @class */ (function () {
|
|
|
143
157
|
});
|
|
144
158
|
};
|
|
145
159
|
EventDispatcher.prototype.off = function (event, key) {
|
|
146
|
-
var
|
|
160
|
+
var e_4, _a;
|
|
147
161
|
if (!(event in this._listeners))
|
|
148
162
|
return false;
|
|
149
163
|
if (key) {
|
|
@@ -156,12 +170,12 @@ var EventDispatcher = /** @class */ (function () {
|
|
|
156
170
|
}
|
|
157
171
|
}
|
|
158
172
|
}
|
|
159
|
-
catch (
|
|
173
|
+
catch (e_4_1) { e_4 = { error: e_4_1 }; }
|
|
160
174
|
finally {
|
|
161
175
|
try {
|
|
162
176
|
if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
|
|
163
177
|
}
|
|
164
|
-
finally { if (
|
|
178
|
+
finally { if (e_4) throw e_4.error; }
|
|
165
179
|
}
|
|
166
180
|
}
|
|
167
181
|
else {
|
|
@@ -171,7 +185,7 @@ var EventDispatcher = /** @class */ (function () {
|
|
|
171
185
|
return false;
|
|
172
186
|
};
|
|
173
187
|
EventDispatcher.prototype.offWithContext = function (event, context) {
|
|
174
|
-
var
|
|
188
|
+
var e_5, _a, e_6, _b;
|
|
175
189
|
if (!(event in this._listeners))
|
|
176
190
|
return 0;
|
|
177
191
|
var toRemove = [], cnt = 0;
|
|
@@ -183,12 +197,12 @@ var EventDispatcher = /** @class */ (function () {
|
|
|
183
197
|
}
|
|
184
198
|
}
|
|
185
199
|
}
|
|
186
|
-
catch (
|
|
200
|
+
catch (e_5_1) { e_5 = { error: e_5_1 }; }
|
|
187
201
|
finally {
|
|
188
202
|
try {
|
|
189
203
|
if (_d && !_d.done && (_a = _c.return)) _a.call(_c);
|
|
190
204
|
}
|
|
191
|
-
finally { if (
|
|
205
|
+
finally { if (e_5) throw e_5.error; }
|
|
192
206
|
}
|
|
193
207
|
try {
|
|
194
208
|
for (var toRemove_1 = __values(toRemove), toRemove_1_1 = toRemove_1.next(); !toRemove_1_1.done; toRemove_1_1 = toRemove_1.next()) {
|
|
@@ -197,17 +211,17 @@ var EventDispatcher = /** @class */ (function () {
|
|
|
197
211
|
cnt++;
|
|
198
212
|
}
|
|
199
213
|
}
|
|
200
|
-
catch (
|
|
214
|
+
catch (e_6_1) { e_6 = { error: e_6_1 }; }
|
|
201
215
|
finally {
|
|
202
216
|
try {
|
|
203
217
|
if (toRemove_1_1 && !toRemove_1_1.done && (_b = toRemove_1.return)) _b.call(toRemove_1);
|
|
204
218
|
}
|
|
205
|
-
finally { if (
|
|
219
|
+
finally { if (e_6) throw e_6.error; }
|
|
206
220
|
}
|
|
207
221
|
return cnt;
|
|
208
222
|
};
|
|
209
223
|
EventDispatcher.prototype.getListener = function (event, key) {
|
|
210
|
-
var
|
|
224
|
+
var e_7, _a;
|
|
211
225
|
try {
|
|
212
226
|
for (var _b = __values(this._listeners[event]), _c = _b.next(); !_c.done; _c = _b.next()) {
|
|
213
227
|
var cb = _c.value;
|
|
@@ -215,12 +229,12 @@ var EventDispatcher = /** @class */ (function () {
|
|
|
215
229
|
return cb;
|
|
216
230
|
}
|
|
217
231
|
}
|
|
218
|
-
catch (
|
|
232
|
+
catch (e_7_1) { e_7 = { error: e_7_1 }; }
|
|
219
233
|
finally {
|
|
220
234
|
try {
|
|
221
235
|
if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
|
|
222
236
|
}
|
|
223
|
-
finally { if (
|
|
237
|
+
finally { if (e_7) throw e_7.error; }
|
|
224
238
|
}
|
|
225
239
|
};
|
|
226
240
|
EventDispatcher.prototype.all = function (fct, context, once) {
|
|
@@ -230,7 +244,7 @@ var EventDispatcher = /** @class */ (function () {
|
|
|
230
244
|
return this._lastKey;
|
|
231
245
|
};
|
|
232
246
|
EventDispatcher.prototype.none = function (key) {
|
|
233
|
-
var
|
|
247
|
+
var e_8, _a;
|
|
234
248
|
try {
|
|
235
249
|
for (var _b = __values(this._allListeners), _c = _b.next(); !_c.done; _c = _b.next()) {
|
|
236
250
|
var cb = _c.value;
|
|
@@ -240,17 +254,17 @@ var EventDispatcher = /** @class */ (function () {
|
|
|
240
254
|
}
|
|
241
255
|
}
|
|
242
256
|
}
|
|
243
|
-
catch (
|
|
257
|
+
catch (e_8_1) { e_8 = { error: e_8_1 }; }
|
|
244
258
|
finally {
|
|
245
259
|
try {
|
|
246
260
|
if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
|
|
247
261
|
}
|
|
248
|
-
finally { if (
|
|
262
|
+
finally { if (e_8) throw e_8.error; }
|
|
249
263
|
}
|
|
250
264
|
return false;
|
|
251
265
|
};
|
|
252
266
|
EventDispatcher.prototype.noneWithContext = function (context) {
|
|
253
|
-
var
|
|
267
|
+
var e_9, _a, e_10, _b, e_11, _c, e_12, _d;
|
|
254
268
|
var toRemoveAll = [];
|
|
255
269
|
var cnt = 0;
|
|
256
270
|
try {
|
|
@@ -261,43 +275,43 @@ var EventDispatcher = /** @class */ (function () {
|
|
|
261
275
|
}
|
|
262
276
|
}
|
|
263
277
|
}
|
|
264
|
-
catch (
|
|
278
|
+
catch (e_9_1) { e_9 = { error: e_9_1 }; }
|
|
265
279
|
finally {
|
|
266
280
|
try {
|
|
267
281
|
if (_f && !_f.done && (_a = _e.return)) _a.call(_e);
|
|
268
282
|
}
|
|
269
|
-
finally { if (
|
|
283
|
+
finally { if (e_9) throw e_9.error; }
|
|
270
284
|
}
|
|
271
285
|
for (var k in this._listeners) {
|
|
272
286
|
var toRemove = [];
|
|
273
287
|
try {
|
|
274
|
-
for (var _g = (
|
|
288
|
+
for (var _g = (e_10 = void 0, __values(this._listeners[k])), _h = _g.next(); !_h.done; _h = _g.next()) {
|
|
275
289
|
var cb = _h.value;
|
|
276
290
|
if (context == cb.context) {
|
|
277
291
|
toRemove.push(cb);
|
|
278
292
|
}
|
|
279
293
|
}
|
|
280
294
|
}
|
|
281
|
-
catch (
|
|
295
|
+
catch (e_10_1) { e_10 = { error: e_10_1 }; }
|
|
282
296
|
finally {
|
|
283
297
|
try {
|
|
284
298
|
if (_h && !_h.done && (_b = _g.return)) _b.call(_g);
|
|
285
299
|
}
|
|
286
|
-
finally { if (
|
|
300
|
+
finally { if (e_10) throw e_10.error; }
|
|
287
301
|
}
|
|
288
302
|
try {
|
|
289
|
-
for (var toRemove_2 = (
|
|
303
|
+
for (var toRemove_2 = (e_11 = void 0, __values(toRemove)), toRemove_2_1 = toRemove_2.next(); !toRemove_2_1.done; toRemove_2_1 = toRemove_2.next()) {
|
|
290
304
|
var cb = toRemove_2_1.value;
|
|
291
305
|
this._listeners[k].splice(this._listeners[k].indexOf(cb), 1);
|
|
292
306
|
cnt++;
|
|
293
307
|
}
|
|
294
308
|
}
|
|
295
|
-
catch (
|
|
309
|
+
catch (e_11_1) { e_11 = { error: e_11_1 }; }
|
|
296
310
|
finally {
|
|
297
311
|
try {
|
|
298
312
|
if (toRemove_2_1 && !toRemove_2_1.done && (_c = toRemove_2.return)) _c.call(toRemove_2);
|
|
299
313
|
}
|
|
300
|
-
finally { if (
|
|
314
|
+
finally { if (e_11) throw e_11.error; }
|
|
301
315
|
}
|
|
302
316
|
}
|
|
303
317
|
try {
|
|
@@ -307,17 +321,17 @@ var EventDispatcher = /** @class */ (function () {
|
|
|
307
321
|
cnt++;
|
|
308
322
|
}
|
|
309
323
|
}
|
|
310
|
-
catch (
|
|
324
|
+
catch (e_12_1) { e_12 = { error: e_12_1 }; }
|
|
311
325
|
finally {
|
|
312
326
|
try {
|
|
313
327
|
if (toRemoveAll_1_1 && !toRemoveAll_1_1.done && (_d = toRemoveAll_1.return)) _d.call(toRemoveAll_1);
|
|
314
328
|
}
|
|
315
|
-
finally { if (
|
|
329
|
+
finally { if (e_12) throw e_12.error; }
|
|
316
330
|
}
|
|
317
331
|
return cnt;
|
|
318
332
|
};
|
|
319
333
|
EventDispatcher.prototype.dispatch = function (event) {
|
|
320
|
-
var
|
|
334
|
+
var e_13, _a, e_14, _b, _c;
|
|
321
335
|
var args = [];
|
|
322
336
|
for (var _i = 1; _i < arguments.length; _i++) {
|
|
323
337
|
args[_i - 1] = arguments[_i];
|
|
@@ -344,12 +358,12 @@ var EventDispatcher = /** @class */ (function () {
|
|
|
344
358
|
cb.call(args);
|
|
345
359
|
}
|
|
346
360
|
}
|
|
347
|
-
catch (
|
|
361
|
+
catch (e_13_1) { e_13 = { error: e_13_1 }; }
|
|
348
362
|
finally {
|
|
349
363
|
try {
|
|
350
364
|
if (_e && !_e.done && (_a = _d.return)) _a.call(_d);
|
|
351
365
|
}
|
|
352
|
-
finally { if (
|
|
366
|
+
finally { if (e_13) throw e_13.error; }
|
|
353
367
|
}
|
|
354
368
|
try {
|
|
355
369
|
for (var _f = __values(this._relays), _g = _f.next(); !_g.done; _g = _f.next()) {
|
|
@@ -357,12 +371,12 @@ var EventDispatcher = /** @class */ (function () {
|
|
|
357
371
|
relay.dispatch.apply(relay, __spreadArray([event], __read(args)));
|
|
358
372
|
}
|
|
359
373
|
}
|
|
360
|
-
catch (
|
|
374
|
+
catch (e_14_1) { e_14 = { error: e_14_1 }; }
|
|
361
375
|
finally {
|
|
362
376
|
try {
|
|
363
377
|
if (_g && !_g.done && (_b = _f.return)) _b.call(_f);
|
|
364
378
|
}
|
|
365
|
-
finally { if (
|
|
379
|
+
finally { if (e_14) throw e_14.error; }
|
|
366
380
|
}
|
|
367
381
|
if (this === EventDispatcher.stream)
|
|
368
382
|
return;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EventDispatcher.js","sourceRoot":"","sources":["../src/EventDispatcher.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAMA;IAEI,uBACoB,GAAQ,EACR,GAAW,EACX,IAAa,EACb,OAAa;QAHb,QAAG,GAAH,GAAG,CAAK;QACR,QAAG,GAAH,GAAG,CAAQ;QACX,SAAI,GAAJ,IAAI,CAAS;QACb,YAAO,GAAP,OAAO,CAAM;QAE7B,IAAI,CAAC,KAAK,GAAG,CAAC,CAAC;IACnB,CAAC;IAED,4BAAI,GAAJ;;QAAK,cAAc;aAAd,UAAc,EAAd,qBAAc,EAAd,IAAc;YAAd,yBAAc;;QACf,IAAG,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,KAAK,GAAG,CAAC;YAC1B,OAAO,KAAK,CAAC;QAEjB,CAAA,KAAA,IAAI,CAAC,GAAG,CAAA,CAAC,KAAK,0BAAC,IAAI,CAAC,OAAO,UAAK,IAAI,IAAE;QACtC,IAAI,CAAC,KAAK,IAAI,CAAC,CAAC;QAChB,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,mCAAW,GAAX;QACI,IAAM,IAAI,GAAG,IAAW,CAAC;QACzB,IAAI,CAAC,GAAG,GAAG,IAAI,CAAC;QAChB,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;IACxB,CAAC;IACL,oBAAC;AAAD,CAAC,AAzBD,IAyBC;AAzBY,sCAAa;AA8B1B;IAQI;QAJiB,kBAAa,GAAoB,EAAE,CAAC;QACpC,YAAO,GAAsB,EAAE,CAAC;QAI7C,IAAI,CAAC,QAAQ,GAAG,CAAC,CAAC;QAClB,IAAI,CAAC,UAAU,GAAG,EAAE,CAAC;QACrB,eAAe,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACvC,CAAC;IAED,qCAAW,GAAX;;QACI,IAAI,CAAC,QAAQ,CAAC,aAAa,EAAE,IAAI,CAAC,CAAC;QACnC,IAAM,WAAW,GAAG,eAAe,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAC1D,IAAI,WAAW,GAAG,CAAC,CAAC,EAAE;YAClB,eAAe,CAAC,OAAO,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC;SAClD;QAED,KAAK,IAAM,CAAC,IAAI,IAAI,CAAC,UAAU,EAAE;;gBAC7B,KAAiB,IAAA,oBAAA,SAAA,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAA,CAAA,gBAAA,4BAAE;oBAAhC,IAAM,EAAE,WAAA;oBACT,EAAE,CAAC,WAAW,EAAE,CAAC;iBACpB;;;;;;;;;YACD,OAAO,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;SAC7B;;YAED,KAAiB,IAAA,KAAA,SAAA,IAAI,CAAC,aAAa,CAAA,gBAAA,4BAAE;gBAAhC,IAAM,EAAE,WAAA;gBACT,EAAE,CAAC,WAAW,EAAE,CAAC;aACpB;;;;;;;;;QACA,IAAY,CAAC,UAAU,GAAG,EAAE,CAAC;QAC9B,IAAI,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC;QACxB,IAAI,CAAC,aAAa,CAAC,MAAM,GAAG,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"EventDispatcher.js","sourceRoot":"","sources":["../src/EventDispatcher.ts"],"names":[],"mappings":"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"}
|
package/dist/demo/ServiceDemo.js
CHANGED
|
@@ -70,6 +70,7 @@ var ServiceDemo = /** @class */ (function (_super) {
|
|
|
70
70
|
if (num === void 0) { num = 1; }
|
|
71
71
|
return __awaiter(this, void 0, void 0, function () {
|
|
72
72
|
return __generator(this, function (_a) {
|
|
73
|
+
console.log('ServiceDemo.add', this, num);
|
|
73
74
|
return [2 /*return*/, this.count += num];
|
|
74
75
|
});
|
|
75
76
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ServiceDemo.js","sourceRoot":"","sources":["../../src/demo/ServiceDemo.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,8BAAoE;AAGpE;IAAiC,+BAAO;IAAxC;QAAA,
|
|
1
|
+
{"version":3,"file":"ServiceDemo.js","sourceRoot":"","sources":["../../src/demo/ServiceDemo.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,8BAAoE;AAGpE;IAAiC,+BAAO;IAAxC;QAAA,qEAQC;QANU,WAAK,GAAW,CAAC,CAAC;;IAM7B,CAAC;IAJS,yBAAG,GAAT,UAAU,GAAa;QAAb,oBAAA,EAAA,OAAa;;;gBACnB,OAAO,CAAC,GAAG,CAAC,iBAAiB,EAAE,IAAI,EAAE,GAAG,CAAC,CAAC;gBAC1C,sBAAO,IAAI,CAAC,KAAK,IAAI,GAAG,EAAC;;;KAC5B;IALD;QADC,cAAQ,CAAC,qBAAe,CAAC;8CACD;IAFhB,WAAW;QADvB,cAAQ,CAAC,OAAO,CAAC,aAAa,CAAC;OACnB,WAAW,CAQvB;IAAD,kBAAC;CAAA,AARD,CAAiC,aAAO,GAQvC;AARY,kCAAW"}
|
package/dist/version.d.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
export declare const VERSION = "0.1.
|
|
1
|
+
export declare const VERSION = "0.1.148";
|
package/dist/version.js
CHANGED
package/package.json
CHANGED
|
@@ -35,7 +35,6 @@ export class FunctionCallNode<T = any> extends Node implements TreeNode {
|
|
|
35
35
|
}
|
|
36
36
|
|
|
37
37
|
protected async _evaluate(scope: Scope, dom: DOM, tag: Tag = null) {
|
|
38
|
-
// @todo: Need to rewrite/refactor this. It's a bit of a mess with element queries.
|
|
39
38
|
let tags: Tag[] = [];
|
|
40
39
|
let functionScope: Scope = scope;
|
|
41
40
|
if (this.fnc instanceof ScopeMemberNode) {
|
|
@@ -65,13 +64,10 @@ export class FunctionCallNode<T = any> extends Node implements TreeNode {
|
|
|
65
64
|
let _functionScope: Scope = functionScope;
|
|
66
65
|
|
|
67
66
|
for (const _tag of tags) {
|
|
68
|
-
if (_tag
|
|
69
|
-
|
|
70
|
-
} else {
|
|
67
|
+
if (_tag && _tag.scope.has(functionName)) {
|
|
68
|
+
func = _tag.scope.get(functionName);
|
|
71
69
|
_functionScope = _tag.scope;
|
|
72
|
-
}
|
|
73
|
-
|
|
74
|
-
if (_functionScope.has(functionName)) {
|
|
70
|
+
} else if (_functionScope instanceof Scope && _functionScope.has(functionName)) {
|
|
75
71
|
func = _functionScope.get(functionName);
|
|
76
72
|
} else {
|
|
77
73
|
func = await this.fnc.evaluate(scope, dom, _tag);
|
package/src/EventDispatcher.ts
CHANGED
|
@@ -68,6 +68,11 @@ export class EventDispatcher {
|
|
|
68
68
|
(this as any)._listeners = {};
|
|
69
69
|
this._relays.length = 0;
|
|
70
70
|
this._allListeners.length = 0;
|
|
71
|
+
|
|
72
|
+
for (const source of EventDispatcher.sources) {
|
|
73
|
+
source.removeRelay(this);
|
|
74
|
+
source.noneWithContext(this);
|
|
75
|
+
}
|
|
71
76
|
}
|
|
72
77
|
|
|
73
78
|
addRelay(relay: EventDispatcher) {
|
package/src/demo/ServiceDemo.ts
CHANGED
package/src/version.ts
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export const VERSION = '0.1.
|
|
1
|
+
export const VERSION = '0.1.148';
|
|
2
2
|
|
|
@@ -1,5 +1,19 @@
|
|
|
1
1
|
import {Tree} from "../../src/AST";
|
|
2
2
|
import {Scope} from "../../src/Scope";
|
|
3
|
+
import {Registry} from "../../src/Registry";
|
|
4
|
+
import {DOM, Service, Tag} from "../../src/vsn";
|
|
5
|
+
|
|
6
|
+
|
|
7
|
+
@Registry.service('FunctionNodeScopeTestService')
|
|
8
|
+
class FunctionNodeScopeTestController extends Service {
|
|
9
|
+
test1() {
|
|
10
|
+
return this.test2();
|
|
11
|
+
}
|
|
12
|
+
|
|
13
|
+
test2() {
|
|
14
|
+
return 99;
|
|
15
|
+
}
|
|
16
|
+
}
|
|
3
17
|
|
|
4
18
|
|
|
5
19
|
describe('FunctionNode', () => {
|
|
@@ -20,4 +34,18 @@ describe('FunctionNode', () => {
|
|
|
20
34
|
const v = await tree.evaluate(scope, null, null);
|
|
21
35
|
expect(v).toBe(3);
|
|
22
36
|
});
|
|
37
|
+
|
|
38
|
+
it("methods should be callable with correct binding", async () => {
|
|
39
|
+
document.body.innerHTML = `
|
|
40
|
+
<div id="service-test" vsn-service:test="FunctionNodeScopeTestService"></div>
|
|
41
|
+
`;
|
|
42
|
+
const dom = new DOM(document.body);
|
|
43
|
+
await new Promise((resolve, reject) => {
|
|
44
|
+
dom.once('built', async () => {
|
|
45
|
+
const result = await dom.exec('test.test1()');
|
|
46
|
+
expect(result).toBe(99);
|
|
47
|
+
resolve(null);
|
|
48
|
+
});
|
|
49
|
+
});
|
|
50
|
+
});
|
|
23
51
|
});
|
package/test/Controller.spec.ts
CHANGED
|
@@ -35,14 +35,6 @@ describe('Controller', () => {
|
|
|
35
35
|
const tag = await dom.exec('#controller');
|
|
36
36
|
expect(tag).toBeInstanceOf(Tag);
|
|
37
37
|
expect(tag.scope).toBeInstanceOf(Scope);
|
|
38
|
-
/*
|
|
39
|
-
expect(tag.scope.keys).toEqual(['test']);
|
|
40
|
-
expect(tag.scope.get('test').wrapped).toBeInstanceOf(TestController);
|
|
41
|
-
expect(await tag.exec('test.isValid()')).toBe(false);
|
|
42
|
-
expect(await tag.exec('test.test')).toBe('notTest');
|
|
43
|
-
await tag.exec('test.test = "test"');
|
|
44
|
-
expect(await tag.exec('test.isValid()')).toBe(true);
|
|
45
|
-
*/
|
|
46
38
|
resolve(null);
|
|
47
39
|
});
|
|
48
40
|
});
|