vsn 0.1.144 → 0.1.146

package/dist/AST/FunctionCallNode.d.ts

@@ -9,5 +9,6 @@ export declare class FunctionCallNode<T = any> extends Node implements TreeNode
     readonly args: FunctionArgumentNode<any[]>;
     constructor(fnc: TreeNode<(...args: any[]) => any>, args: FunctionArgumentNode<any[]>);
     protected _getChildNodes(): Node[];
+    protected callFunction(func: any, functionScope: any, dom: any, tag: any, ...values: any[]): Promise<[any, boolean]>;
     protected _evaluate(scope: Scope, dom: DOM, tag?: Tag): Promise<any>;
 }

package/dist/AST/FunctionCallNode.js

@@ -50,17 +50,6 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
 };
-var __values = (this && this.__values) || function(o) {
-    var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
-    if (m) return m.call(o);
-    if (o && typeof o.length === "number") return {
-        next: function () {
-            if (o && i >= o.length) o = void 0;
-            return { value: o && o[i++], done: !o };
-        }
-    };
-    throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
-};
 var __read = (this && this.__read) || function (o, n) {
     var m = typeof Symbol === "function" && o[Symbol.iterator];
     if (!m) return o;
@@ -82,15 +71,24 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from) {
         to[j] = from[i];
     return to;
 };
+var __values = (this && this.__values) || function(o) {
+    var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
+    if (m) return m.call(o);
+    if (o && typeof o.length === "number") return {
+        next: function () {
+            if (o && i >= o.length) o = void 0;
+            return { value: o && o[i++], done: !o };
+        }
+    };
+    throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FunctionCallNode = void 0;
 var Tag_1 = require("../Tag");
 var Node_1 = require("./Node");
 var ScopeMemberNode_1 = require("./ScopeMemberNode");
 var FunctionNode_1 = require("./FunctionNode");
-var Registry_1 = require("../Registry");
 var ElementQueryNode_1 = require("./ElementQueryNode");
-var ClassNode_1 = require("./ClassNode");
 var FunctionCallNode = /** @class */ (function (_super) {
     __extends(FunctionCallNode, _super);
     function FunctionCallNode(fnc, args) {
@@ -105,162 +103,134 @@ var FunctionCallNode = /** @class */ (function (_super) {
             this.args
         ];
     };
+    FunctionCallNode.prototype.callFunction = function (func, functionScope, dom, tag) {
+        var values = [];
+        for (var _i = 4; _i < arguments.length; _i++) {
+            values[_i - 4] = arguments[_i];
+        }
+        return __awaiter(this, void 0, void 0, function () {
+            var r;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        if (!(func instanceof FunctionNode_1.FunctionNode)) return [3 /*break*/, 4];
+                        return [4 /*yield*/, func.evaluate(functionScope, dom, tag)];
+                    case 1: return [4 /*yield*/, (_a.sent()).apply(void 0, __spreadArray([], __read(values)))];
+                    case 2:
+                        r = _a.sent();
+                        return [4 /*yield*/, func.collectGarbage()];
+                    case 3:
+                        _a.sent();
+                        return [2 /*return*/, [r, true]];
+                    case 4:
+                        if (typeof func === 'function') {
+                            return [2 /*return*/, [func.call.apply(func, __spreadArray([functionScope.wrapped || functionScope], __read(values))), true]];
+                        }
+                        _a.label = 5;
+                    case 5: return [2 /*return*/, [null, false]];
+                }
+            });
+        });
+    };
     FunctionCallNode.prototype._evaluate = function (scope, dom, tag) {
         if (tag === void 0) { tag = null; }
         return __awaiter(this, void 0, void 0, function () {
-            var tags, functionScope, functionName, instanceOfScopeMemberNode, _tags, values, func, functionName_1, returnValues, toCleanup, calls, tags_1, tags_1_1, _tag, tagNum, _a, _b, className, cls, fnc, _c, _d, e_1_1, e_2_1, toCleanup_1, toCleanup_1_1, fnc, e_3_1, r;
-            var e_2, _e, e_1, _f, e_3, _g;
-            return __generator(this, function (_h) {
-                switch (_h.label) {
+            var tags, functionScope, _tags, values, functionName, returnValues, calls, func, _functionScope, tags_1, tags_1_1, _tag, _a, result, success, e_1_1;
+            var e_1, _b;
+            return __generator(this, function (_c) {
+                switch (_c.label) {
                     case 0:
                         tags = [];
                         functionScope = scope;
-                        functionName = '';
-                        instanceOfScopeMemberNode = false;
-                        if (!(this.fnc instanceof ScopeMemberNode_1.ScopeMemberNode)) return [3 /*break*/, 5];
-                        instanceOfScopeMemberNode = true;
+                        if (!(this.fnc instanceof ScopeMemberNode_1.ScopeMemberNode)) return [3 /*break*/, 4];
+                        if (!(this.fnc.scope instanceof ElementQueryNode_1.ElementQueryNode)) return [3 /*break*/, 2];
                         return [4 /*yield*/, this.fnc.scope.evaluate(scope, dom, tag)];
                     case 1:
-                        functionScope = _h.sent();
-                        return [4 /*yield*/, this.fnc.name.evaluate(scope, dom, tag)];
-                    case 2:
-                        functionName = _h.sent();
-                        if (!(this.fnc.scope instanceof ElementQueryNode_1.ElementQueryNode)) return [3 /*break*/, 4];
-                        return [4 /*yield*/, this.fnc.scope.evaluate(scope, dom, tag)];
-                    case 3:
-                        _tags = _h.sent();
+                        _tags = _c.sent();
                         if (_tags instanceof Array) {
                             tags = _tags;
                         }
                         else if (_tags instanceof Tag_1.Tag) {
                             tags = [_tags];
+                            functionScope = _tags.scope;
                         }
                         else {
                             throw new Error('Invalid element query result');
                         }
-                        return [3 /*break*/, 5];
+                        return [3 /*break*/, 4];
+                    case 2: return [4 /*yield*/, this.fnc.scope.evaluate(scope, dom, tag)];
+                    case 3:
+                        functionScope = _c.sent();
+                        _c.label = 4;
                     case 4:
-                        tags = [tag];
-                        _h.label = 5;
-                    case 5: return [4 /*yield*/, this.args.evaluate(scope, dom, tag)];
-                    case 6:
-                        values = _h.sent();
-                        return [4 /*yield*/, this.fnc.evaluate(scope, dom, tag)];
-                    case 7:
-                        func = _h.sent();
-                        if (!(!func || func instanceof Array)) return [3 /*break*/, 31];
+                        if (tags.length === 0)
+                            tags.push(tag);
+                        return [4 /*yield*/, this.args.evaluate(scope, dom, tag)];
+                    case 5:
+                        values = _c.sent();
                         return [4 /*yield*/, this.fnc.name.evaluate(scope, dom, tag)];
-                    case 8:
-                        functionName_1 = _h.sent();
+                    case 6:
+                        functionName = _c.sent();
                         returnValues = [];
-                        toCleanup = [];
                         calls = 0;
-                        _h.label = 9;
-                    case 9:
-                        _h.trys.push([9, 21, 22, 23]);
+                        _functionScope = functionScope;
+                        _c.label = 7;
+                    case 7:
+                        _c.trys.push([7, 15, 16, 17]);
                         tags_1 = __values(tags), tags_1_1 = tags_1.next();
-                        _h.label = 10;
-                    case 10:
-                        if (!!tags_1_1.done) return [3 /*break*/, 20];
+                        _c.label = 8;
+                    case 8:
+                        if (!!tags_1_1.done) return [3 /*break*/, 14];
                         _tag = tags_1_1.value;
-                        tagNum = 0;
-                        _h.label = 11;
-                    case 11:
-                        _h.trys.push([11, 17, 18, 19]);
-                        _a = (e_1 = void 0, __values(_tag.element[ClassNode_1.ClassNode.ClassesVariable] || [])), _b = _a.next();
-                        _h.label = 12;
+                        if (_tag === null) {
+                            _functionScope = functionScope;
+                        }
+                        else {
+                            _functionScope = _tag.scope;
+                        }
+                        if (!_functionScope.has(functionName)) return [3 /*break*/, 9];
+                        func = _functionScope.get(functionName);
+                        return [3 /*break*/, 11];
+                    case 9: return [4 /*yield*/, this.fnc.evaluate(scope, dom, _tag)];
+                    case 10:
+                        func = _c.sent();
+                        _c.label = 11;
+                    case 11: return [4 /*yield*/, this.callFunction.apply(this, __spreadArray([func, _functionScope, dom, _tag], __read(values)))];
                     case 12:
-                        if (!!_b.done) return [3 /*break*/, 16];
-                        className = _b.value;
-                        tagNum++;
-                        cls = Registry_1.Registry.instance.classes.getSynchronous(className);
-                        if (!cls) return [3 /*break*/, 15];
-                        if (!cls.classScope.has(functionName_1)) return [3 /*break*/, 15];
-                        fnc = cls.classScope.get(functionName_1);
-                        toCleanup.push(fnc);
-                        _d = (_c = returnValues).push;
-                        return [4 /*yield*/, fnc.evaluate(_tag.scope, dom, _tag)];
-                    case 13: return [4 /*yield*/, (_h.sent()).apply(void 0, __spreadArray([], __read(values)))];
-                    case 14:
-                        _d.apply(_c, [_h.sent()]);
-                        calls++;
-                        _h.label = 15;
+                        _a = __read.apply(void 0, [_c.sent(), 2]), result = _a[0], success = _a[1];
+                        if (success) {
+                            returnValues.push(result);
+                            calls++;
+                        }
+                        else {
+                            console.warn("Function " + functionName + " was not found in current scope.");
+                        }
+                        _c.label = 13;
+                    case 13:
+                        tags_1_1 = tags_1.next();
+                        return [3 /*break*/, 8];
+                    case 14: return [3 /*break*/, 17];
                     case 15:
-                        _b = _a.next();
-                        return [3 /*break*/, 12];
-                    case 16: return [3 /*break*/, 19];
-                    case 17:
-                        e_1_1 = _h.sent();
+                        e_1_1 = _c.sent();
                         e_1 = { error: e_1_1 };
-                        return [3 /*break*/, 19];
-                    case 18:
+                        return [3 /*break*/, 17];
+                    case 16:
                         try {
-                            if (_b && !_b.done && (_f = _a.return)) _f.call(_a);
+                            if (tags_1_1 && !tags_1_1.done && (_b = tags_1.return)) _b.call(tags_1);
                         }
                         finally { if (e_1) throw e_1.error; }
                         return [7 /*endfinally*/];
-                    case 19:
-                        tags_1_1 = tags_1.next();
-                        return [3 /*break*/, 10];
-                    case 20: return [3 /*break*/, 23];
-                    case 21:
-                        e_2_1 = _h.sent();
-                        e_2 = { error: e_2_1 };
-                        return [3 /*break*/, 23];
-                    case 22:
-                        try {
-                            if (tags_1_1 && !tags_1_1.done && (_e = tags_1.return)) _e.call(tags_1);
-                        }
-                        finally { if (e_2) throw e_2.error; }
-                        return [7 /*endfinally*/];
-                    case 23:
-                        _h.trys.push([23, 28, 29, 30]);
-                        toCleanup_1 = __values(toCleanup), toCleanup_1_1 = toCleanup_1.next();
-                        _h.label = 24;
-                    case 24:
-                        if (!!toCleanup_1_1.done) return [3 /*break*/, 27];
-                        fnc = toCleanup_1_1.value;
-                        return [4 /*yield*/, fnc.collectGarbage()];
-                    case 25:
-                        _h.sent();
-                        _h.label = 26;
-                    case 26:
-                        toCleanup_1_1 = toCleanup_1.next();
-                        return [3 /*break*/, 24];
-                    case 27: return [3 /*break*/, 30];
-                    case 28:
-                        e_3_1 = _h.sent();
-                        e_3 = { error: e_3_1 };
-                        return [3 /*break*/, 30];
-                    case 29:
-                        try {
-                            if (toCleanup_1_1 && !toCleanup_1_1.done && (_g = toCleanup_1.return)) _g.call(toCleanup_1);
-                        }
-                        finally { if (e_3) throw e_3.error; }
-                        return [7 /*endfinally*/];
-                    case 30:
+                    case 17:
                         if (calls === 1) {
                             return [2 /*return*/, returnValues[0]];
                         }
                         else if (calls === 0) {
-                            throw new Error("Function " + functionName_1 + " not found");
+                            throw new Error("Function " + functionName + " not found");
                         }
                         else {
                             return [2 /*return*/, returnValues];
                         }
-                        return [3 /*break*/, 36];
-                    case 31:
-                        if (!(func instanceof FunctionNode_1.FunctionNode)) return [3 /*break*/, 35];
-                        return [4 /*yield*/, func.evaluate(functionScope, dom, tag)];
-                    case 32: return [4 /*yield*/, (_h.sent()).apply(void 0, __spreadArray([], __read(values)))];
-                    case 33:
-                        r = _h.sent();
-                        return [4 /*yield*/, func.collectGarbage()];
-                    case 34:
-                        _h.sent();
-                        return [2 /*return*/, r];
-                    case 35: return [2 /*return*/, func.call.apply(func, __spreadArray([functionScope.wrapped || functionScope], __read(values)))];
-                    case 36: return [2 /*return*/];
+                        return [2 /*return*/];
                 }
             });
         });

package/dist/AST/FunctionCallNode.js.map

@@ -1 +1 @@
-{"version":3,"file":"FunctionCallNode.js","sourceRoot":"","sources":["../../src/AST/FunctionCallNode.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"FunctionCallNode.js","sourceRoot":"","sources":["../../src/AST/FunctionCallNode.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEA,8BAA2B;AAE3B,+BAA4B;AAE5B,qDAAkD;AAClD,+CAA4C;AAC5C,uDAAoD;AAEpD;IAA+C,oCAAI;IAC/C,0BACoB,GAAsC,EACtC,IAAiC;QAFrD,YAII,iBAAO,SACV;QAJmB,SAAG,GAAH,GAAG,CAAmC;QACtC,UAAI,GAAJ,IAAI,CAA6B;;IAGrD,CAAC;IAES,yCAAc,GAAxB;QACI,OAAO;YACH,IAAI,CAAC,GAAW;YAChB,IAAI,CAAC,IAAY;SACpB,CAAA;IACL,CAAC;IAEe,uCAAY,GAA5B,UAA6B,IAAI,EAAE,aAAa,EAAE,GAAG,EAAE,GAAG;QAAE,gBAAS;aAAT,UAAS,EAAT,qBAAS,EAAT,IAAS;YAAT,+BAAS;;;;;;;6BAC7D,CAAA,IAAI,YAAY,2BAAY,CAAA,EAA5B,wBAA4B;wBACX,qBAAM,IAAI,CAAC,QAAQ,CAAC,aAAa,EAAE,GAAG,EAAE,GAAG,CAAC,EAAA;4BAAnD,qBAAM,CAAC,SAAoD,CAAA,wCAAI,MAAM,KAAC;;wBAA1E,CAAC,GAAG,SAAsE;wBAChF,qBAAM,IAAI,CAAC,cAAc,EAAE,EAAA;;wBAA3B,SAA2B,CAAC;wBAC5B,sBAAO,CAAC,CAAC,EAAE,IAAI,CAAC,EAAC;;wBACd,IAAI,OAAO,IAAI,KAAK,UAAU,EAAE;4BACnC,sBAAO,CAAC,IAAI,CAAC,IAAI,OAAT,IAAI,iBAAM,aAAa,CAAC,OAAO,IAAI,aAAa,UAAK,MAAM,KAAG,IAAI,CAAC,EAAC;yBAC/E;;4BACD,sBAAO,CAAC,IAAI,EAAE,KAAK,CAAC,EAAC;;;;KACxB;IAEe,oCAAS,GAAzB,UAA0B,KAAY,EAAE,GAAQ,EAAE,GAAe;QAAf,oBAAA,EAAA,UAAe;;;;;;;wBAEzD,IAAI,GAAU,EAAE,CAAC;wBACjB,aAAa,GAAU,KAAK,CAAC;6BAC7B,CAAA,IAAI,CAAC,GAAG,YAAY,iCAAe,CAAA,EAAnC,wBAAmC;6BAC/B,CAAA,IAAI,CAAC,GAAG,CAAC,KAAK,YAAY,mCAAgB,CAAA,EAA1C,wBAA0C;wBAC5B,qBAAM,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,QAAQ,CAAC,KAAK,EAAE,GAAG,EAAE,GAAG,CAAC,EAAA;;wBAAtD,KAAK,GAAG,SAA8C;wBAC5D,IAAI,KAAK,YAAY,KAAK,EAAE;4BACxB,IAAI,GAAG,KAAK,CAAC;yBAChB;6BAAM,IAAI,KAAK,YAAY,SAAG,EAAE;4BAC7B,IAAI,GAAG,CAAC,KAAK,CAAC,CAAC;4BACf,aAAa,GAAG,KAAK,CAAC,KAAK,CAAC;yBAC/B;6BAAM;4BACH,MAAM,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAC;yBACnD;;4BAEe,qBAAM,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,QAAQ,CAAC,KAAK,EAAE,GAAG,EAAE,GAAG,CAAC,EAAA;;wBAA9D,aAAa,GAAG,SAA8C,CAAC;;;wBAIvE,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC;4BACjB,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;wBAEJ,qBAAM,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,GAAG,EAAE,GAAG,CAAC,EAAA;;wBAAlD,MAAM,GAAG,SAAyC;wBACnC,qBAAO,IAAI,CAAC,GAAW,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,GAAG,EAAE,GAAG,CAAC,EAAA;;wBAArE,YAAY,GAAG,SAAsD;wBACrE,YAAY,GAAG,EAAE,CAAC;wBACpB,KAAK,GAAG,CAAC,CAAC;wBAEV,cAAc,GAAU,aAAa,CAAC;;;;wBAEvB,SAAA,SAAA,IAAI,CAAA;;;;wBAAZ,IAAI;wBACX,IAAI,IAAI,KAAK,IAAI,EAAE;4BACf,cAAc,GAAG,aAAa,CAAC;yBAClC;6BAAM;4BACH,cAAc,GAAG,IAAI,CAAC,KAAK,CAAC;yBAC/B;6BAEG,cAAc,CAAC,GAAG,CAAC,YAAY,CAAC,EAAhC,wBAAgC;wBAChC,IAAI,GAAG,cAAc,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;;4BAEjC,qBAAM,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,KAAK,EAAE,GAAG,EAAE,IAAI,CAAC,EAAA;;wBAAhD,IAAI,GAAG,SAAyC,CAAC;;6BAG3B,qBAAM,IAAI,CAAC,YAAY,OAAjB,IAAI,iBAAc,IAAI,EAAE,cAAc,EAAE,GAAG,EAAE,IAAI,UAAK,MAAM,KAAC;;wBAAvF,KAAA,sBAAoB,SAAmE,KAAA,EAAtF,MAAM,QAAA,EAAE,OAAO,QAAA;wBACtB,IAAI,OAAO,EAAE;4BACT,YAAY,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;4BAC1B,KAAK,EAAE,CAAC;yBACX;6BAAM;4BACH,OAAO,CAAC,IAAI,CAAC,cAAY,YAAY,qCAAkC,CAAC,CAAC;yBAC5E;;;;;;;;;;;;;;;;;wBAGL,IAAI,KAAK,KAAK,CAAC,EAAE;4BACb,sBAAO,YAAY,CAAC,CAAC,CAAC,EAAC;yBAC1B;6BAAM,IAAI,KAAK,KAAK,CAAC,EAAE;4BACpB,MAAM,IAAI,KAAK,CAAC,cAAY,YAAY,eAAY,CAAC,CAAC;yBACzD;6BAAM;4BACH,sBAAO,YAAY,EAAC;yBACvB;;;;;KACJ;IACL,uBAAC;AAAD,CAAC,AAtFD,CAA+C,WAAI,GAsFlD;AAtFY,4CAAgB"}

package/dist/AST.d.ts

@@ -146,7 +146,7 @@ export declare class Tree {
     evaluate(scope: Scope, dom: DOM, tag?: Tag): Promise<any>;
     prepare(scope: Scope, dom: DOM, tag?: Tag): Promise<void>;
     bindToScopeChanges(scope: any, fnc: any, dom: DOM, tag?: Tag): Promise<void>;
-    static reprepareExecutingTrees(): void;
+    static reprepareExecutingTrees(): Promise<void>;
     static tokenize(code: string): Token[];
     static stripWhiteSpace(tokens: Token[]): Token[];
     static processTokens(tokens: Token[], _node?: Node, _lastBlock?: Node): BlockNode;

package/dist/AST.js

@@ -71,6 +71,7 @@ var _a, _b, _c;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Tree = exports.TreeCache = exports.AttributableNodes = exports.tokenIsBlockCloser = exports.tokenIsBlockOpener = exports.getTokenBlockOpenerConfig = exports.BlockCloseToTypeMap = exports.BlockOpenToTypeMap = exports.BlockTypeConfigurations = exports.TokenType = exports.BlockType = void 0;
 var DOM_1 = require("./DOM");
+var Tag_1 = require("./Tag");
 var RootScopeMemberNode_1 = require("./AST/RootScopeMemberNode");
 var ScopeMemberNode_1 = require("./AST/ScopeMemberNode");
 var ElementAttributeNode_1 = require("./AST/ElementAttributeNode");
@@ -606,68 +607,111 @@ var Tree = /** @class */ (function () {
     Tree.prototype.bindToScopeChanges = function (scope, fnc, dom, tag) {
         if (tag === void 0) { tag = null; }
         return __awaiter(this, void 0, void 0, function () {
-            var _a, _b, node, _scope, name_1, e_2_1;
-            var e_2, _c;
-            return __generator(this, function (_d) {
-                switch (_d.label) {
+            var _a, _b, node, _scope, name_1, ref, ref_1, ref_1_1, tag_1, e_2_1;
+            var e_2, _c, e_3, _d;
+            return __generator(this, function (_e) {
+                switch (_e.label) {
                     case 0:
-                        _d.trys.push([0, 9, 10, 11]);
+                        _e.trys.push([0, 8, 9, 10]);
                         _a = __values(this._root.findChildrenByTypes([RootScopeMemberNode_1.RootScopeMemberNode, ScopeMemberNode_1.ScopeMemberNode, ElementAttributeNode_1.ElementAttributeNode], 'ScopeMemberNodes')), _b = _a.next();
-                        _d.label = 1;
+                        _e.label = 1;
                     case 1:
-                        if (!!_b.done) return [3 /*break*/, 8];
+                        if (!!_b.done) return [3 /*break*/, 7];
                         node = _b.value;
                         _scope = scope;
-                        if (!(node instanceof ScopeMemberNode_1.ScopeMemberNode)) return [3 /*break*/, 3];
-                        return [4 /*yield*/, node.scope.evaluate(scope, dom)];
+                        return [4 /*yield*/, node.name.evaluate(scope, dom, tag)];
                     case 2:
-                        _scope = _d.sent();
-                        return [3 /*break*/, 5];
+                        name_1 = _e.sent();
+                        if (!(node instanceof ScopeMemberNode_1.ScopeMemberNode)) return [3 /*break*/, 4];
+                        return [4 /*yield*/, node.scope.evaluate(scope, dom)];
                     case 3:
-                        if (!(node instanceof ElementAttributeNode_1.ElementAttributeNode && node.elementRef)) return [3 /*break*/, 5];
-                        return [4 /*yield*/, node.elementRef.evaluate(scope, dom, tag)];
+                        _scope = _e.sent();
+                        _scope.on("change:" + name_1, fnc);
+                        return [3 /*break*/, 6];
                     case 4:
-                        _scope = (_d.sent())[0].scope;
-                        _d.label = 5;
-                    case 5: return [4 /*yield*/, node.name.evaluate(scope, dom, tag)];
+                        if (!(node instanceof ElementAttributeNode_1.ElementAttributeNode && node.elementRef)) return [3 /*break*/, 6];
+                        return [4 /*yield*/, node.elementRef.evaluate(scope, dom, tag)];
+                    case 5:
+                        ref = _e.sent();
+                        if (ref instanceof Tag_1.Tag) {
+                            ref.scope.on("change:" + name_1, fnc);
+                        }
+                        else if (ref instanceof Array) {
+                            try {
+                                for (ref_1 = (e_3 = void 0, __values(ref)), ref_1_1 = ref_1.next(); !ref_1_1.done; ref_1_1 = ref_1.next()) {
+                                    tag_1 = ref_1_1.value;
+                                    tag_1.scope.on("change:" + name_1, fnc);
+                                }
+                            }
+                            catch (e_3_1) { e_3 = { error: e_3_1 }; }
+                            finally {
+                                try {
+                                    if (ref_1_1 && !ref_1_1.done && (_d = ref_1.return)) _d.call(ref_1);
+                                }
+                                finally { if (e_3) throw e_3.error; }
+                            }
+                        }
+                        else {
+                            console.warn("Cannot bind to changes for " + name_1 + ".");
+                        }
+                        _e.label = 6;
                     case 6:
-                        name_1 = _d.sent();
-                        _scope.on("change:" + name_1, fnc);
-                        _d.label = 7;
-                    case 7:
                         _b = _a.next();
                         return [3 /*break*/, 1];
-                    case 8: return [3 /*break*/, 11];
-                    case 9:
-                        e_2_1 = _d.sent();
+                    case 7: return [3 /*break*/, 10];
+                    case 8:
+                        e_2_1 = _e.sent();
                         e_2 = { error: e_2_1 };
-                        return [3 /*break*/, 11];
-                    case 10:
+                        return [3 /*break*/, 10];
+                    case 9:
                         try {
                             if (_b && !_b.done && (_c = _a.return)) _c.call(_a);
                         }
                         finally { if (e_2) throw e_2.error; }
                         return [7 /*endfinally*/];
-                    case 11: return [2 /*return*/];
+                    case 10: return [2 /*return*/];
                 }
             });
         });
     };
     Tree.reprepareExecutingTrees = function () {
-        var _this = this;
-        Tree.executing.forEach(function (context) { return __awaiter(_this, void 0, void 0, function () {
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0: return [4 /*yield*/, context.tree.prepare(context.scope, context.dom, context.tag)];
+        return __awaiter(this, void 0, void 0, function () {
+            var _a, _b, context, e_4_1;
+            var e_4, _c;
+            return __generator(this, function (_d) {
+                switch (_d.label) {
+                    case 0:
+                        _d.trys.push([0, 5, 6, 7]);
+                        _a = __values(this.executing), _b = _a.next();
+                        _d.label = 1;
                     case 1:
-                        _a.sent();
-                        return [2 /*return*/];
+                        if (!!_b.done) return [3 /*break*/, 4];
+                        context = _b.value;
+                        return [4 /*yield*/, context.tree.prepare(context.scope, context.dom, context.tag)];
+                    case 2:
+                        _d.sent();
+                        _d.label = 3;
+                    case 3:
+                        _b = _a.next();
+                        return [3 /*break*/, 1];
+                    case 4: return [3 /*break*/, 7];
+                    case 5:
+                        e_4_1 = _d.sent();
+                        e_4 = { error: e_4_1 };
+                        return [3 /*break*/, 7];
+                    case 6:
+                        try {
+                            if (_b && !_b.done && (_c = _a.return)) _c.call(_a);
+                        }
+                        finally { if (e_4) throw e_4.error; }
+                        return [7 /*endfinally*/];
+                    case 7: return [2 /*return*/];
                 }
             });
-        }); });
+        });
     };
     Tree.tokenize = function (code) {
-        var e_3, _a;
+        var e_5, _a;
         var tokens = [];
         if (!code || code.length === 0)
             return tokens;
@@ -675,7 +719,7 @@ var Tree = /** @class */ (function () {
         do {
             foundToken = false;
             try {
-                for (var TOKEN_PATTERNS_1 = (e_3 = void 0, __values(TOKEN_PATTERNS)), TOKEN_PATTERNS_1_1 = TOKEN_PATTERNS_1.next(); !TOKEN_PATTERNS_1_1.done; TOKEN_PATTERNS_1_1 = TOKEN_PATTERNS_1.next()) {
+                for (var TOKEN_PATTERNS_1 = (e_5 = void 0, __values(TOKEN_PATTERNS)), TOKEN_PATTERNS_1_1 = TOKEN_PATTERNS_1.next(); !TOKEN_PATTERNS_1_1.done; TOKEN_PATTERNS_1_1 = TOKEN_PATTERNS_1.next()) {
                     var tp = TOKEN_PATTERNS_1_1.value;
                     var match = tp.pattern.exec(code);
                     if (match) {
@@ -691,12 +735,12 @@ var Tree = /** @class */ (function () {
                     }
                 }
             }
-            catch (e_3_1) { e_3 = { error: e_3_1 }; }
+            catch (e_5_1) { e_5 = { error: e_5_1 }; }
             finally {
                 try {
                     if (TOKEN_PATTERNS_1_1 && !TOKEN_PATTERNS_1_1.done && (_a = TOKEN_PATTERNS_1.return)) _a.call(TOKEN_PATTERNS_1);
                 }
-                finally { if (e_3) throw e_3.error; }
+                finally { if (e_5) throw e_5.error; }
             }
         } while (code.length > 0 && foundToken);
         return tokens;
@@ -711,7 +755,7 @@ var Tree = /** @class */ (function () {
         return tokens;
     };
     Tree.processTokens = function (tokens, _node, _lastBlock) {
-        var e_4, _a;
+        var e_6, _a;
         if (_node === void 0) { _node = null; }
         if (_lastBlock === void 0) { _lastBlock = null; }
         var blockNodes = [];
@@ -832,17 +876,17 @@ var Tree = /** @class */ (function () {
                 var funcArgs = Tree.getBlockTokens(tokens);
                 var nodes = [];
                 try {
-                    for (var funcArgs_1 = (e_4 = void 0, __values(funcArgs)), funcArgs_1_1 = funcArgs_1.next(); !funcArgs_1_1.done; funcArgs_1_1 = funcArgs_1.next()) {
+                    for (var funcArgs_1 = (e_6 = void 0, __values(funcArgs)), funcArgs_1_1 = funcArgs_1.next(); !funcArgs_1_1.done; funcArgs_1_1 = funcArgs_1.next()) {
                         var arg = funcArgs_1_1.value;
                         nodes.push(Tree.processTokens(arg));
                     }
                 }
-                catch (e_4_1) { e_4 = { error: e_4_1 }; }
+                catch (e_6_1) { e_6 = { error: e_6_1 }; }
                 finally {
                     try {
                         if (funcArgs_1_1 && !funcArgs_1_1.done && (_a = funcArgs_1.return)) _a.call(funcArgs_1);
                     }
-                    finally { if (e_4) throw e_4.error; }
+                    finally { if (e_6) throw e_6.error; }
                 }
                 if (node) {
                     node = new FunctionCallNode_1.FunctionCallNode(node, // Previous node should be a NAME
@@ -1068,7 +1112,7 @@ var Tree = /** @class */ (function () {
         return statementTokens;
     };
     Tree.consumeTypes = function (tokens, types) {
-        var e_5, _a;
+        var e_7, _a;
         var matching = [];
         try {
             for (var tokens_1 = __values(tokens), tokens_1_1 = tokens_1.next(); !tokens_1_1.done; tokens_1_1 = tokens_1.next()) {
@@ -1081,12 +1125,12 @@ var Tree = /** @class */ (function () {
                 }
             }
         }
-        catch (e_5_1) { e_5 = { error: e_5_1 }; }
+        catch (e_7_1) { e_7 = { error: e_7_1 }; }
         finally {
             try {
                 if (tokens_1_1 && !tokens_1_1.done && (_a = tokens_1.return)) _a.call(tokens_1);
             }
-            finally { if (e_5) throw e_5.error; }
+            finally { if (e_7) throw e_7.error; }
         }
         tokens.splice(0, matching.length);
         return matching;