vsn 0.1.122 → 0.1.124

package/dist/AST/IfStatementNode.js

@@ -50,11 +50,38 @@ 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 __read = (this && this.__read) || function (o, n) {
+    var m = typeof Symbol === "function" && o[Symbol.iterator];
+    if (!m) return o;
+    var i = m.call(o), r, ar = [], e;
+    try {
+        while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
+    }
+    catch (error) { e = { error: error }; }
+    finally {
+        try {
+            if (r && !r.done && (m = i["return"])) m.call(i);
+        }
+        finally { if (e) throw e.error; }
+    }
+    return ar;
+};
 var __spreadArray = (this && this.__spreadArray) || function (to, from) {
     for (var i = 0, il = from.length, j = to.length; i < il; i++, j++)
         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.IfStatementNode = void 0;
 var AST_1 = require("../AST");
@@ -69,30 +96,43 @@ var IfStatementNode = /** @class */ (function (_super) {
         return _this;
     }
     IfStatementNode.prototype._getChildNodes = function () {
-        return __spreadArray([], this.nodes);
+        return __spreadArray([], __read(this.nodes));
     };
     IfStatementNode.prototype.evaluate = function (scope, dom, tag) {
         if (tag === void 0) { tag = null; }
         return __awaiter(this, void 0, void 0, function () {
-            var _i, _a, condition, uno;
-            return __generator(this, function (_b) {
-                switch (_b.label) {
+            var _a, _b, condition, uno, e_1_1;
+            var e_1, _c;
+            return __generator(this, function (_d) {
+                switch (_d.label) {
                     case 0:
-                        _i = 0, _a = this.nodes;
-                        _b.label = 1;
+                        _d.trys.push([0, 6, 7, 8]);
+                        _a = __values(this.nodes), _b = _a.next();
+                        _d.label = 1;
                     case 1:
-                        if (!(_i < _a.length)) return [3 /*break*/, 5];
-                        condition = _a[_i];
+                        if (!!_b.done) return [3 /*break*/, 5];
+                        condition = _b.value;
                         return [4 /*yield*/, condition.evaluate(scope, dom, tag)];
                     case 2:
-                        uno = _b.sent();
+                        uno = _d.sent();
                         if (!uno) return [3 /*break*/, 4];
                         return [4 /*yield*/, condition.block.evaluate(scope, dom, tag)];
-                    case 3: return [2 /*return*/, _b.sent()];
+                    case 3: return [2 /*return*/, _d.sent()];
                     case 4:
-                        _i++;
+                        _b = _a.next();
                         return [3 /*break*/, 1];
-                    case 5: return [2 /*return*/];
+                    case 5: return [3 /*break*/, 8];
+                    case 6:
+                        e_1_1 = _d.sent();
+                        e_1 = { error: e_1_1 };
+                        return [3 /*break*/, 8];
+                    case 7:
+                        try {
+                            if (_b && !_b.done && (_c = _a.return)) _c.call(_a);
+                        }
+                        finally { if (e_1) throw e_1.error; }
+                        return [7 /*endfinally*/];
+                    case 8: return [2 /*return*/];
                 }
             });
         });

package/dist/AST/IfStatementNode.js.map

@@ -1 +1 @@
-{"version":3,"file":"IfStatementNode.js","sourceRoot":"","sources":["../../src/AST/IfStatementNode.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAGA,8BAAwD;AACxD,+BAA4B;AAC5B,qDAAkD;AAClD,6CAA0C;AAE1C;IAAqC,mCAAI;IACrC,yBACc,KAAwB;QADtC,YAGI,iBAAO,SACV;QAHa,WAAK,GAAL,KAAK,CAAmB;;IAGtC,CAAC;IAES,wCAAc,GAAxB;QACI,yBACQ,IAAI,CAAC,KAAgB,EAC5B;IACL,CAAC;IAEY,kCAAQ,GAArB,UAAsB,KAAY,EAAE,GAAQ,EAAE,GAAe;QAAf,oBAAA,EAAA,UAAe;;;;;;8BACvB,EAAV,KAAA,IAAI,CAAC,KAAK;;;6BAAV,CAAA,cAAU,CAAA;wBAAvB,SAAS;wBACK,qBAAM,SAAS,CAAC,QAAQ,CAAC,KAAK,EAAE,GAAG,EAAE,GAAG,CAAC,EAAA;;wBAAxD,GAAG,GAAY,SAAyC;6BAC1D,GAAG,EAAH,wBAAG;wBACI,qBAAM,SAAS,CAAC,KAAK,CAAC,QAAQ,CAAC,KAAK,EAAE,GAAG,EAAE,GAAG,CAAC,EAAA;4BAAtD,sBAAO,SAA+C,EAAC;;wBAHvC,IAAU,CAAA;;;;;;KAMrC;IAEa,gCAAgB,GAA9B,UAA+B,MAAe;QAC1C,IAAI;YACA,eAAS,CAAC,EAAE;YACZ,eAAS,CAAC,OAAO;SACpB,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAG;YAC/B,MAAM,WAAW,CAAC,gBAAgB,CAAC,CAAC;SACvC;QAED,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,yBAAyB;QAC9C,OAAO,IAAI,iCAAe,CACtB,UAAI,CAAC,aAAa,CAAC,UAAI,CAAC,cAAc,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,EACxD,UAAI,CAAC,aAAa,CAAC,UAAI,CAAC,cAAc,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAC3D,CAAC;IACN,CAAC;IAEa,qBAAK,GAAnB,UAAoB,QAAQ,EAAE,KAAK,EAAE,MAAe;QAChD,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,eAAS,CAAC,OAAO,EAAE;YACtC,MAAM,WAAW,CAAC,0EAA0E,CAAC,CAAC;SACjG;QACD,IAAM,KAAK,GAAsB,EAAE,CAAC;QACpC,KAAK,CAAC,IAAI,CAAC,eAAe,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC,CAAC;QAErD,OAAM,MAAM,CAAC,MAAM,GAAG,CAAC,IAAI,eAAS,CAAC,OAAO,KAAK,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE;YAC7D,KAAK,CAAC,IAAI,CAAC,eAAe,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC,CAAC;SACxD;QAED,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,IAAI,eAAS,CAAC,IAAI,KAAK,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE;YACxD,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,eAAe;YACpC,KAAK,CAAC,IAAI,CAAC,IAAI,iCAAe,CAC1B,IAAI,yBAAW,CAAC,IAAI,CAAC,EACrB,UAAI,CAAC,aAAa,CAAC,UAAI,CAAC,cAAc,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAC3D,CAAC,CAAA;SACL;QAED,OAAO,IAAI,eAAe,CAAC,KAAK,CAAC,CAAC;IACtC,CAAC;IACL,sBAAC;AAAD,CAAC,AA1DD,CAAqC,WAAI,GA0DxC;AA1DY,0CAAe"}
+{"version":3,"file":"IfStatementNode.js","sourceRoot":"","sources":["../../src/AST/IfStatementNode.ts"],"names":[],"mappings":"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"}

package/dist/AST/IndexNode.js

@@ -50,6 +50,17 @@ 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.");
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.IndexNode = void 0;
 var AST_1 = require("../AST");
@@ -112,11 +123,21 @@ var IndexNode = /** @class */ (function (_super) {
         return tokens[0].type === AST_1.TokenType.L_BRACKET;
     };
     IndexNode.parse = function (lastNode, token, tokens) {
+        var e_1, _a;
         var valueTokens = AST_1.Tree.getBlockTokens(tokens, AST_1.TokenType.COLON);
         var values = [];
-        for (var _i = 0, valueTokens_1 = valueTokens; _i < valueTokens_1.length; _i++) {
-            var arg = valueTokens_1[_i];
-            values.push(AST_1.Tree.processTokens(arg));
+        try {
+            for (var valueTokens_1 = __values(valueTokens), valueTokens_1_1 = valueTokens_1.next(); !valueTokens_1_1.done; valueTokens_1_1 = valueTokens_1.next()) {
+                var arg = valueTokens_1_1.value;
+                values.push(AST_1.Tree.processTokens(arg));
+            }
+        }
+        catch (e_1_1) { e_1 = { error: e_1_1 }; }
+        finally {
+            try {
+                if (valueTokens_1_1 && !valueTokens_1_1.done && (_a = valueTokens_1.return)) _a.call(valueTokens_1);
+            }
+            finally { if (e_1) throw e_1.error; }
         }
         return new IndexNode(lastNode, values[0], values.length > 1 && values[1]);
     };

package/dist/AST/IndexNode.js.map

@@ -1 +1 @@
-{"version":3,"file":"IndexNode.js","sourceRoot":"","sources":["../../src/AST/IndexNode.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"IndexNode.js","sourceRoot":"","sources":["../../src/AST/IndexNode.ts"],"names":[],"mappings":"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"}

package/dist/AST/ModifierNode.js

@@ -80,7 +80,7 @@ var ModifierNode = /** @class */ (function (_super) {
     ModifierNode.parse = function (lastNode, token, tokens) {
         var modifier = tokens.shift().value.substr(1);
         if (lastNode) {
-            lastNode.modifiers.push(modifier);
+            lastNode.modifiers.add(modifier);
         }
         return lastNode;
     };

package/dist/AST/ModifierNode.js.map

@@ -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,IAAI,QAAQ,EAAE;YACV,QAAQ,CAAC,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;SACrC;QACD,OAAO,QAAQ,CAAC;IACpB,CAAC;IACL,mBAAC;AAAD,CAAC,AAvBD,CAAkC,WAAI,GAuBrC;AAvBY,oCAAY"}
+{"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,IAAI,QAAQ,EAAE;YACV,QAAQ,CAAC,SAAS,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;SACpC;QACD,OAAO,QAAQ,CAAC;IACpB,CAAC;IACL,mBAAC;AAAD,CAAC,AAvBD,CAAkC,WAAI,GAuBrC;AAvBY,oCAAY"}

package/dist/AST/NamedStackNode.js

@@ -52,6 +52,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.NamedStackNode = void 0;
+var Scope_1 = require("../Scope");
 var AST_1 = require("../AST");
 var Node_1 = require("./Node");
 var LiteralNode_1 = require("./LiteralNode");
@@ -76,7 +77,11 @@ var NamedStackNode = /** @class */ (function (_super) {
             var stackName, execute;
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.stackName.evaluate(scope, dom, tag)];
+                    case 0:
+                        if (scope instanceof Scope_1.FunctionScope) { // NamedStackNode doesn't work with FunctionScope
+                            scope = scope.parentScope;
+                        }
+                        return [4 /*yield*/, this.stackName.evaluate(scope, dom, tag)];
                     case 1:
                         stackName = _a.sent();
                         execute = false;

package/dist/AST/NamedStackNode.js.map

@@ -1 +1 @@
-{"version":3,"file":"NamedStackNode.js","sourceRoot":"","sources":["../../src/AST/NamedStackNode.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"NamedStackNode.js","sourceRoot":"","sources":["../../src/AST/NamedStackNode.ts"],"names":[],"mappings":"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"}

package/dist/AST/Node.d.ts

@@ -2,6 +2,7 @@ import { Scope } from "../Scope";
 import { DOM } from "../DOM";
 import { Tag } from "../Tag";
 import { Token, TreeNode } from "../AST";
+import { Modifiers } from "../Modifiers";
 export interface INodeMeta {
     [key: string]: string | number | boolean | null;
 }
@@ -12,7 +13,7 @@ export declare abstract class Node implements TreeNode {
     protected nodeCache: {
         [key: string]: Node[];
     };
-    readonly modifiers: string[];
+    readonly modifiers: Modifiers;
     abstract evaluate(scope: Scope, dom: DOM, tag?: Tag): any;
     isPreparationRequired(): boolean;
     prepare(scope: Scope, dom: DOM, tag?: Tag, meta?: INodeMeta): Promise<void>;
@@ -22,5 +23,5 @@ export declare abstract class Node implements TreeNode {
     findChildrenByType<T = Node>(t: any): T[];
     findChildrenByTypes<T = Node>(types: any[], cacheKey?: string): T[];
     hasModifier(modifier: string): boolean;
-    static moveModifiers(from: Token[], to: Token[]): void;
+    static moveModifiers(from: Token[], to?: Token[]): Token[];
 }

package/dist/AST/Node.js

@@ -35,26 +35,69 @@ 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;
+    var i = m.call(o), r, ar = [], e;
+    try {
+        while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
+    }
+    catch (error) { e = { error: error }; }
+    finally {
+        try {
+            if (r && !r.done && (m = i["return"])) m.call(i);
+        }
+        finally { if (e) throw e.error; }
+    }
+    return ar;
+};
+var __spreadArray = (this && this.__spreadArray) || function (to, from) {
+    for (var i = 0, il = from.length, j = to.length; i < il; i++, j++)
+        to[j] = from[i];
+    return to;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Node = void 0;
 var AST_1 = require("../AST");
+var Modifiers_1 = require("../Modifiers");
 var Node = /** @class */ (function () {
     function Node() {
         this.requiresPrep = false;
         this.nodeCache = {};
-        this.modifiers = [];
+        this.modifiers = new Modifiers_1.Modifiers();
     }
     Node.prototype.isPreparationRequired = function () {
+        var e_1, _a;
         if (this.requiresPrep)
             return true;
         if (this._isPreparationRequired !== undefined)
             return this._isPreparationRequired;
-        for (var _i = 0, _a = this.getChildNodes(); _i < _a.length; _i++) {
-            var node = _a[_i];
-            if (node.isPreparationRequired()) {
-                this._isPreparationRequired = true;
-                return true;
+        try {
+            for (var _b = __values(this.getChildNodes()), _c = _b.next(); !_c.done; _c = _b.next()) {
+                var node = _c.value;
+                if (node.isPreparationRequired()) {
+                    this._isPreparationRequired = true;
+                    return true;
+                }
+            }
+        }
+        catch (e_1_1) { e_1 = { error: e_1_1 }; }
+        finally {
+            try {
+                if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
             }
+            finally { if (e_1) throw e_1.error; }
         }
         return false;
     };
@@ -62,46 +105,72 @@ var Node = /** @class */ (function () {
         if (tag === void 0) { tag = null; }
         if (meta === void 0) { meta = null; }
         return __awaiter(this, void 0, void 0, function () {
-            var _i, _a, node;
-            return __generator(this, function (_b) {
-                switch (_b.label) {
+            var _a, _b, node, e_2_1;
+            var e_2, _c;
+            return __generator(this, function (_d) {
+                switch (_d.label) {
                     case 0:
-                        _i = 0, _a = this.getChildNodes();
-                        _b.label = 1;
+                        _d.trys.push([0, 5, 6, 7]);
+                        _a = __values(this.getChildNodes()), _b = _a.next();
+                        _d.label = 1;
                     case 1:
-                        if (!(_i < _a.length)) return [3 /*break*/, 4];
-                        node = _a[_i];
+                        if (!!_b.done) return [3 /*break*/, 4];
+                        node = _b.value;
                         return [4 /*yield*/, node.prepare(scope, dom, tag, meta)];
                     case 2:
-                        _b.sent();
-                        _b.label = 3;
+                        _d.sent();
+                        _d.label = 3;
                     case 3:
-                        _i++;
+                        _b = _a.next();
                         return [3 /*break*/, 1];
-                    case 4: return [2 /*return*/];
+                    case 4: return [3 /*break*/, 7];
+                    case 5:
+                        e_2_1 = _d.sent();
+                        e_2 = { error: e_2_1 };
+                        return [3 /*break*/, 7];
+                    case 6:
+                        try {
+                            if (_b && !_b.done && (_c = _a.return)) _c.call(_a);
+                        }
+                        finally { if (e_2) throw e_2.error; }
+                        return [7 /*endfinally*/];
+                    case 7: return [2 /*return*/];
                 }
             });
         });
     };
     Node.prototype.cleanup = function (scope, dom, tag) {
         return __awaiter(this, void 0, void 0, function () {
-            var _i, _a, node;
-            return __generator(this, function (_b) {
-                switch (_b.label) {
+            var _a, _b, node, e_3_1;
+            var e_3, _c;
+            return __generator(this, function (_d) {
+                switch (_d.label) {
                     case 0:
-                        _i = 0, _a = this.getChildNodes();
-                        _b.label = 1;
+                        _d.trys.push([0, 5, 6, 7]);
+                        _a = __values(this.getChildNodes()), _b = _a.next();
+                        _d.label = 1;
                     case 1:
-                        if (!(_i < _a.length)) return [3 /*break*/, 4];
-                        node = _a[_i];
+                        if (!!_b.done) return [3 /*break*/, 4];
+                        node = _b.value;
                         return [4 /*yield*/, node.cleanup(scope, dom, tag)];
                     case 2:
-                        _b.sent();
-                        _b.label = 3;
+                        _d.sent();
+                        _d.label = 3;
                     case 3:
-                        _i++;
+                        _b = _a.next();
                         return [3 /*break*/, 1];
-                    case 4: return [2 /*return*/];
+                    case 4: return [3 /*break*/, 7];
+                    case 5:
+                        e_3_1 = _d.sent();
+                        e_3 = { error: e_3_1 };
+                        return [3 /*break*/, 7];
+                    case 6:
+                        try {
+                            if (_b && !_b.done && (_c = _a.return)) _c.call(_a);
+                        }
+                        finally { if (e_3) throw e_3.error; }
+                        return [7 /*endfinally*/];
+                    case 7: return [2 /*return*/];
                 }
             });
         });
@@ -119,31 +188,55 @@ var Node = /** @class */ (function () {
         return this.findChildrenByTypes([t]);
     };
     Node.prototype.findChildrenByTypes = function (types, cacheKey) {
+        var e_4, _a, e_5, _b;
         if (cacheKey === void 0) { cacheKey = null; }
         if (cacheKey !== null && this.nodeCache[cacheKey])
             return this.nodeCache[cacheKey];
         var nodes = [];
-        for (var _i = 0, _a = this.getChildNodes(); _i < _a.length; _i++) {
-            var child = _a[_i];
-            for (var _b = 0, types_1 = types; _b < types_1.length; _b++) {
-                var t = types_1[_b];
-                if (child instanceof t)
-                    nodes.push(child);
-                var childNodes = child.findChildrenByType(t);
-                nodes.push.apply(nodes, childNodes);
+        try {
+            for (var _c = __values(this.getChildNodes()), _d = _c.next(); !_d.done; _d = _c.next()) {
+                var child = _d.value;
+                try {
+                    for (var types_1 = (e_5 = void 0, __values(types)), types_1_1 = types_1.next(); !types_1_1.done; types_1_1 = types_1.next()) {
+                        var t = types_1_1.value;
+                        if (child instanceof t)
+                            nodes.push(child);
+                        var childNodes = child.findChildrenByType(t);
+                        nodes.push.apply(nodes, __spreadArray([], __read(childNodes)));
+                    }
+                }
+                catch (e_5_1) { e_5 = { error: e_5_1 }; }
+                finally {
+                    try {
+                        if (types_1_1 && !types_1_1.done && (_b = types_1.return)) _b.call(types_1);
+                    }
+                    finally { if (e_5) throw e_5.error; }
+                }
+            }
+        }
+        catch (e_4_1) { e_4 = { error: e_4_1 }; }
+        finally {
+            try {
+                if (_d && !_d.done && (_a = _c.return)) _a.call(_c);
             }
+            finally { if (e_4) throw e_4.error; }
         }
         if (cacheKey !== null)
             this.nodeCache[cacheKey] = nodes;
         return nodes;
     };
     Node.prototype.hasModifier = function (modifier) {
-        return this.modifiers.indexOf(modifier) !== -1;
+        return this.modifiers.has(modifier);
     };
     Node.moveModifiers = function (from, to) {
-        while (from[0].type == AST_1.TokenType.MODIFIER) {
-            to.unshift(from.shift());
+        if (to === void 0) { to = null; }
+        to = to || [];
+        if (from && from.length) {
+            while (from[0] && from[0].type == AST_1.TokenType.MODIFIER) {
+                to.unshift(from.shift());
+            }
         }
+        return to;
     };
     return Node;
 }());

package/dist/AST/Node.js.map

@@ -1 +1 @@
-{"version":3,"file":"Node.js","sourceRoot":"","sources":["../../src/AST/Node.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Node.js","sourceRoot":"","sources":["../../src/AST/Node.ts"],"names":[],"mappings":"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"}

package/dist/AST/ObjectNode.js

@@ -50,6 +50,22 @@ 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 __read = (this && this.__read) || function (o, n) {
+    var m = typeof Symbol === "function" && o[Symbol.iterator];
+    if (!m) return o;
+    var i = m.call(o), r, ar = [], e;
+    try {
+        while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
+    }
+    catch (error) { e = { error: error }; }
+    finally {
+        try {
+            if (r && !r.done && (m = i["return"])) m.call(i);
+        }
+        finally { if (e) throw e.error; }
+    }
+    return ar;
+};
 var __spreadArray = (this && this.__spreadArray) || function (to, from) {
     for (var i = 0, il = from.length, j = to.length; i < il; i++, j++)
         to[j] = from[i];
@@ -69,7 +85,7 @@ var ObjectNode = /** @class */ (function (_super) {
         return _this;
     }
     ObjectNode.prototype._getChildNodes = function () {
-        return new (Array.bind.apply(Array, __spreadArray([void 0], this.values)))();
+        return new (Array.bind.apply(Array, __spreadArray([void 0], __read(this.values))))();
     };
     ObjectNode.prototype.evaluate = function (scope, dom, tag) {
         if (tag === void 0) { tag = null; }

package/dist/AST/ObjectNode.js.map

@@ -1 +1 @@
-{"version":3,"file":"ObjectNode.js","sourceRoot":"","sources":["../../src/AST/ObjectNode.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,kCAA+B;AAG/B,8BAAmE;AACnE,+BAA4B;AAE5B;IAAgC,8BAAI;IAChC,oBACoB,IAAY,EACZ,MAAc;QAFlC,YAII,iBAAO,SACV;QAJmB,UAAI,GAAJ,IAAI,CAAQ;QACZ,YAAM,GAAN,MAAM,CAAQ;;IAGlC,CAAC;IAES,mCAAc,GAAxB;QACI,YAAW,KAAK,YAAL,KAAK,0BAAI,IAAI,CAAC,MAAM,MAAE;IACrC,CAAC;IAEK,6BAAQ,GAAd,UAAe,KAAY,EAAE,GAAQ,EAAE,GAAe;QAAf,oBAAA,EAAA,UAAe;;;;;;wBAC5C,GAAG,GAAU,IAAI,aAAK,EAAE,CAAC;wBACtB,CAAC,GAAG,CAAC;;;6BAAE,CAAA,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,CAAA;wBAC5B,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;wBACnB,GAAG,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;wBAC3B,KAAA,CAAA,KAAA,GAAG,CAAA,CAAC,GAAG,CAAA;wBAAC,qBAAM,GAAG,CAAC,QAAQ,CAAC,KAAK,EAAE,GAAG,EAAE,GAAG,CAAC,EAAA;;8BAAnC,SAAmC;wBAAE,qBAAM,GAAG,CAAC,QAAQ,CAAC,KAAK,EAAE,GAAG,EAAE,GAAG,CAAC,EAAA;;wBAAhF,wBAA6C,SAAmC,EAAE,IAAI,GAAC,CAAC;;;wBAHpD,CAAC,EAAE,CAAA;;4BAK3C,sBAAO,GAAG,EAAC;;;;KACd;IAEa,gBAAK,GAAnB,UAAoB,MAAe;QAC/B,OAAO,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,eAAS,CAAC,OAAO,CAAC;IAChD,CAAC;IAEa,gBAAK,GAAnB,UAAoB,QAAQ,EAAE,KAAK,EAAE,MAAe;QAChD,IAAM,WAAW,GAAY,UAAI,CAAC,sBAAsB,CAAC,MAAM,CAAC,CAAC;QACjE,IAAM,IAAI,GAAW,EAAE,CAAC;QACxB,IAAM,MAAM,GAAW,EAAE,CAAC;QAE1B,OAAO,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE;YAC3B,IAAM,GAAG,GAAY,UAAI,CAAC,cAAc,CAAC,WAAW,EAAE,eAAS,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;YAC9E,IAAI,WAAW,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,eAAS,CAAC,KAAK;gBACvC,MAAM,KAAK,CAAC,4CAA4C,CAAC,CAAC;YAC9D,WAAW,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,YAAY;YACtC,IAAM,GAAG,GAAY,UAAI,CAAC,cAAc,CAAC,WAAW,EAAE,eAAS,CAAC,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE;gBACtF,IAAI,EAAE,eAAS,CAAC,SAAS;gBACzB,IAAI,EAAE,IAAI;gBACV,KAAK,EAAE,IAAI;gBACX,aAAa,EAAE,IAAI;gBACnB,cAAc,EAAE,IAAI;aACvB,CAAC,CAAC;YACH,IAAI,CAAC,IAAI,CAAC,UAAI,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC;YACnC,MAAM,CAAC,IAAI,CAAC,UAAI,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC;SACxC;QACD,OAAO,IAAI,UAAU,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IACxC,CAAC;IACL,iBAAC;AAAD,CAAC,AAhDD,CAAgC,WAAI,GAgDnC;AAhDY,gCAAU"}
+{"version":3,"file":"ObjectNode.js","sourceRoot":"","sources":["../../src/AST/ObjectNode.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,kCAA+B;AAG/B,8BAAmE;AACnE,+BAA4B;AAE5B;IAAgC,8BAAI;IAChC,oBACoB,IAAY,EACZ,MAAc;QAFlC,YAII,iBAAO,SACV;QAJmB,UAAI,GAAJ,IAAI,CAAQ;QACZ,YAAM,GAAN,MAAM,CAAQ;;IAGlC,CAAC;IAES,mCAAc,GAAxB;QACI,YAAW,KAAK,YAAL,KAAK,iCAAI,IAAI,CAAC,MAAM,OAAE;IACrC,CAAC;IAEK,6BAAQ,GAAd,UAAe,KAAY,EAAE,GAAQ,EAAE,GAAe;QAAf,oBAAA,EAAA,UAAe;;;;;;wBAC5C,GAAG,GAAU,IAAI,aAAK,EAAE,CAAC;wBACtB,CAAC,GAAG,CAAC;;;6BAAE,CAAA,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,CAAA;wBAC5B,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;wBACnB,GAAG,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;wBAC3B,KAAA,CAAA,KAAA,GAAG,CAAA,CAAC,GAAG,CAAA;wBAAC,qBAAM,GAAG,CAAC,QAAQ,CAAC,KAAK,EAAE,GAAG,EAAE,GAAG,CAAC,EAAA;;8BAAnC,SAAmC;wBAAE,qBAAM,GAAG,CAAC,QAAQ,CAAC,KAAK,EAAE,GAAG,EAAE,GAAG,CAAC,EAAA;;wBAAhF,wBAA6C,SAAmC,EAAE,IAAI,GAAC,CAAC;;;wBAHpD,CAAC,EAAE,CAAA;;4BAK3C,sBAAO,GAAG,EAAC;;;;KACd;IAEa,gBAAK,GAAnB,UAAoB,MAAe;QAC/B,OAAO,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,eAAS,CAAC,OAAO,CAAC;IAChD,CAAC;IAEa,gBAAK,GAAnB,UAAoB,QAAQ,EAAE,KAAK,EAAE,MAAe;QAChD,IAAM,WAAW,GAAY,UAAI,CAAC,sBAAsB,CAAC,MAAM,CAAC,CAAC;QACjE,IAAM,IAAI,GAAW,EAAE,CAAC;QACxB,IAAM,MAAM,GAAW,EAAE,CAAC;QAE1B,OAAO,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE;YAC3B,IAAM,GAAG,GAAY,UAAI,CAAC,cAAc,CAAC,WAAW,EAAE,eAAS,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;YAC9E,IAAI,WAAW,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,eAAS,CAAC,KAAK;gBACvC,MAAM,KAAK,CAAC,4CAA4C,CAAC,CAAC;YAC9D,WAAW,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,YAAY;YACtC,IAAM,GAAG,GAAY,UAAI,CAAC,cAAc,CAAC,WAAW,EAAE,eAAS,CAAC,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE;gBACtF,IAAI,EAAE,eAAS,CAAC,SAAS;gBACzB,IAAI,EAAE,IAAI;gBACV,KAAK,EAAE,IAAI;gBACX,aAAa,EAAE,IAAI;gBACnB,cAAc,EAAE,IAAI;aACvB,CAAC,CAAC;YACH,IAAI,CAAC,IAAI,CAAC,UAAI,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC;YACnC,MAAM,CAAC,IAAI,CAAC,UAAI,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC;SACxC;QACD,OAAO,IAAI,UAAU,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IACxC,CAAC;IACL,iBAAC;AAAD,CAAC,AAhDD,CAAgC,WAAI,GAgDnC;AAhDY,gCAAU"}

package/dist/AST/OnNode.js

@@ -50,6 +50,27 @@ 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 __read = (this && this.__read) || function (o, n) {
+    var m = typeof Symbol === "function" && o[Symbol.iterator];
+    if (!m) return o;
+    var i = m.call(o), r, ar = [], e;
+    try {
+        while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
+    }
+    catch (error) { e = { error: error }; }
+    finally {
+        try {
+            if (r && !r.done && (m = i["return"])) m.call(i);
+        }
+        finally { if (e) throw e.error; }
+    }
+    return ar;
+};
+var __spreadArray = (this && this.__spreadArray) || function (to, from) {
+    for (var i = 0, il = from.length, j = to.length; i < il; i++, j++)
+        to[j] = from[i];
+    return to;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.OnNode = void 0;
 var FunctionNode_1 = require("./FunctionNode");
@@ -71,7 +92,7 @@ var OnNode = /** @class */ (function (_super) {
                         return [4 /*yield*/, this.getFunction(scope, dom, tag)];
                     case 1:
                         func_1 = _a.sent();
-                        tag.addEventHandler(this.name, [], function () {
+                        tag.addEventHandler(this.name, this.modifiers, function () {
                             var args = [];
                             for (var _i = 0; _i < arguments.length; _i++) {
                                 args[_i] = arguments[_i];
@@ -79,7 +100,7 @@ var OnNode = /** @class */ (function (_super) {
                             return __awaiter(_this, void 0, void 0, function () {
                                 return __generator(this, function (_a) {
                                     switch (_a.label) {
-                                        case 0: return [4 /*yield*/, func_1.apply(void 0, args)];
+                                        case 0: return [4 /*yield*/, func_1.apply(void 0, __spreadArray([], __read(args)))];
                                         case 1:
                                             _a.sent();
                                             return [4 /*yield*/, this.collectGarbage()];

package/dist/AST/OnNode.js.map

@@ -1 +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"}
+{"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,IAAI,CAAC,SAAS,EAAE;4BAAO,cAAO;iCAAP,UAAO,EAAP,qBAAO,EAAP,IAAO;gCAAP,yBAAO;;;;;gDACzD,qBAAM,MAAI,wCAAI,IAAI,KAAC;;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"}