vsn 0.1.63 → 0.1.66

package/demo/xhr.html

@@ -21,7 +21,8 @@
             }
 
             on click() {
-                console.log('clicky');
+                log('clicky');
+                t();
             }
 
             func t() {
@@ -35,6 +36,12 @@
             }
         }
 
+        class something-normal {
+            on click() {
+                log('also clicky');
+            }
+        }
+
         class reset-button {
             func construct() {
                 @text = 'reset';
@@ -52,8 +59,8 @@
             return a + b;
         }
     </script>
-    <div class="something-special" vsn-on:click="t()">asd</div>
-    <div class="something-special" vsn-on:click="t()">asd</div>
+    <div class="something-special something-normal" id="dual-class">asd</div>
+    <div class="something-special">asd</div>
     <bb class="reset-button">bb</bb>
     <span vsn-bind="huh_wut"></span>
     <a href="" vsn-on:click|preventdefault="huh_wut = add(huh_wut, 1)">Click me!</a>

package/dist/AST/ClassNode.d.ts

@@ -13,10 +13,12 @@ export declare class ClassNode extends Node implements TreeNode {
     protected requiresPrep: boolean;
     readonly classScope: Scope;
     constructor(name: string, block: BlockNode);
-    prepare(scope: Scope, dom: DOM, tag?: Tag): Promise<void>;
+    updateMeta(meta?: any): any;
+    prepare(scope: Scope, dom: DOM, tag?: Tag, meta?: any): Promise<void>;
     prepareTag(tag: Tag, dom: DOM, hasConstructor?: boolean | null): Promise<void>;
     tearDownTag(tag: Tag, dom: DOM, hasDeconstructor?: boolean | null): Promise<void>;
     evaluate(scope: Scope, dom: DOM, tag?: Tag): Promise<any>;
     static parse(lastNode: any, token: any, tokens: Token[]): ClassNode;
     static checkForClassChanges(element: HTMLElement, dom: DOM, tag?: Tag): Promise<void>;
+    static isClass(cls: string): boolean;
 }

package/dist/AST/ClassNode.js

@@ -67,38 +67,27 @@ var ClassNode = /** @class */ (function (_super) {
         _this.classScope = new Scope_1.Scope();
         return _this;
     }
-    ClassNode.prototype.prepare = function (scope, dom, tag) {
+    ClassNode.prototype.updateMeta = function (meta) {
+        meta = meta || {};
+        meta['ClassNode'] = this;
+        return meta;
+    };
+    ClassNode.prototype.prepare = function (scope, dom, tag, meta) {
         if (tag === void 0) { tag = null; }
         return __awaiter(this, void 0, void 0, function () {
-            var hasConstructor, _i, _a, element, tag_1;
-            return __generator(this, function (_b) {
-                switch (_b.label) {
+            return __generator(this, function (_a) {
+                switch (_a.label) {
                     case 0:
+                        meta = meta || {};
+                        meta['ClassNodePrepare'] = true;
                         if (ClassNode.classes[this.name])
                             return [2 /*return*/]; // Don't re-prepare same classes
                         ClassNode.classes[this.name] = this;
-                        return [4 /*yield*/, this.block.prepare(this.classScope, dom, tag)];
+                        return [4 /*yield*/, this.block.prepare(this.classScope, dom, tag, meta)];
                     case 1:
-                        _b.sent();
+                        _a.sent();
                         Registry_1.Registry.class(this);
-                        hasConstructor = this.classScope.has('construct');
-                        _i = 0, _a = Array.from(dom.querySelectorAll("." + this.name));
-                        _b.label = 2;
-                    case 2:
-                        if (!(_i < _a.length)) return [3 /*break*/, 6];
-                        element = _a[_i];
-                        return [4 /*yield*/, dom.getTagForElement(element, true)];
-                    case 3:
-                        tag_1 = _b.sent();
-                        if (!tag_1) return [3 /*break*/, 5];
-                        return [4 /*yield*/, this.prepareTag(tag_1, dom, hasConstructor)];
-                    case 4:
-                        _b.sent();
-                        _b.label = 5;
-                    case 5:
-                        _i++;
-                        return [3 /*break*/, 2];
-                    case 6: return [2 /*return*/];
+                        return [2 /*return*/];
                 }
             });
         });
@@ -106,14 +95,15 @@ var ClassNode = /** @class */ (function (_super) {
     ClassNode.prototype.prepareTag = function (tag, dom, hasConstructor) {
         if (hasConstructor === void 0) { hasConstructor = null; }
         return __awaiter(this, void 0, void 0, function () {
-            var fnc;
+            var meta, fnc;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         if (hasConstructor === null)
                             hasConstructor = this.classScope.has('construct');
                         tag.createScope(true);
-                        return [4 /*yield*/, this.block.prepare(tag.scope, dom, tag)];
+                        meta = this.updateMeta();
+                        return [4 /*yield*/, this.block.prepare(tag.scope, dom, tag, meta)];
                     case 1:
                         _a.sent();
                         if (!hasConstructor) return [3 /*break*/, 3];
@@ -183,7 +173,7 @@ var ClassNode = /** @class */ (function (_super) {
                 break;
             nameParts.push(t.value);
         }
-        var name = nameParts.join('');
+        var name = nameParts.join('').trim();
         tokens.splice(0, nameParts.length);
         var block = AST_1.Tree.processTokens(AST_1.Tree.getNextStatementTokens(tokens, true, true));
         return new ClassNode(name, block);
@@ -198,49 +188,51 @@ var ClassNode = /** @class */ (function (_super) {
                         classes = Array.from(element.classList);
                         addedClasses = classes.filter(function (c) { return Registry_1.Registry.instance.classes.has(c); });
                         removedClasses = [];
-                        if (!tag) return [3 /*break*/, 1];
+                        if (!!tag) return [3 /*break*/, 2];
+                        return [4 /*yield*/, dom.getTagForElement(element, true)];
+                    case 1:
+                        tag = _b.sent();
+                        _b.label = 2;
+                    case 2:
                         addedClasses = addedClasses.filter(function (c) { return !tag.preppedClasses.includes(c); });
                         removedClasses = tag.preppedClasses.filter(function (c) { return !classes.includes(c); });
-                        return [3 /*break*/, 3];
-                    case 1: return [4 /*yield*/, dom.getTagForElement(element, true)];
-                    case 2:
-                        tag = _b.sent();
+                        _i = 0, addedClasses_1 = addedClasses;
                         _b.label = 3;
                     case 3:
-                        _i = 0, addedClasses_1 = addedClasses;
-                        _b.label = 4;
-                    case 4:
-                        if (!(_i < addedClasses_1.length)) return [3 /*break*/, 7];
+                        if (!(_i < addedClasses_1.length)) return [3 /*break*/, 6];
                         addedClass = addedClasses_1[_i];
                         classNode = Registry_1.Registry.instance.classes.getSynchronous(addedClass);
-                        if (!classNode) return [3 /*break*/, 6];
+                        if (!classNode) return [3 /*break*/, 5];
                         return [4 /*yield*/, classNode.prepareTag(tag, dom)];
-                    case 5:
+                    case 4:
                         _b.sent();
-                        _b.label = 6;
-                    case 6:
+                        _b.label = 5;
+                    case 5:
                         _i++;
-                        return [3 /*break*/, 4];
-                    case 7:
+                        return [3 /*break*/, 3];
+                    case 6:
                         _a = 0, removedClasses_1 = removedClasses;
-                        _b.label = 8;
-                    case 8:
-                        if (!(_a < removedClasses_1.length)) return [3 /*break*/, 11];
+                        _b.label = 7;
+                    case 7:
+                        if (!(_a < removedClasses_1.length)) return [3 /*break*/, 10];
                         removedClass = removedClasses_1[_a];
                         classNode = Registry_1.Registry.instance.classes.getSynchronous(removedClass);
-                        if (!classNode) return [3 /*break*/, 10];
+                        if (!classNode) return [3 /*break*/, 9];
                         return [4 /*yield*/, classNode.tearDownTag(tag, dom)];
-                    case 9:
+                    case 8:
                         _b.sent();
-                        _b.label = 10;
-                    case 10:
+                        _b.label = 9;
+                    case 9:
                         _a++;
-                        return [3 /*break*/, 8];
-                    case 11: return [2 /*return*/];
+                        return [3 /*break*/, 7];
+                    case 10: return [2 /*return*/];
                 }
             });
         });
     };
+    ClassNode.isClass = function (cls) {
+        return this.classes[cls] instanceof ClassNode;
+    };
     ClassNode.classes = {};
     return ClassNode;
 }(Node_1.Node));

package/dist/AST/ClassNode.js.map

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

package/dist/AST/ElementAttributeNode.d.ts

@@ -14,5 +14,5 @@ export declare class ElementAttributeNode extends Node implements TreeNode {
     protected _getChildNodes(): Node[];
     get attributeName(): string;
     evaluate(scope: Scope, dom: DOM, tag?: Tag): Promise<any>;
-    prepare(scope: Scope, dom: DOM, tag?: Tag): Promise<void>;
+    prepare(scope: Scope, dom: DOM, tag?: Tag, meta?: any): Promise<void>;
 }

package/dist/AST/ElementAttributeNode.js

@@ -115,15 +115,16 @@ var ElementAttributeNode = /** @class */ (function (_super) {
             });
         });
     };
-    ElementAttributeNode.prototype.prepare = function (scope, dom, tag) {
+    ElementAttributeNode.prototype.prepare = function (scope, dom, tag, meta) {
         if (tag === void 0) { tag = null; }
+        if (meta === void 0) { meta = null; }
         return __awaiter(this, void 0, void 0, function () {
             var tags, _i, tags_1, t;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         if (!this.elementRef) return [3 /*break*/, 7];
-                        return [4 /*yield*/, this.elementRef.prepare(scope, dom, tag)];
+                        return [4 /*yield*/, this.elementRef.prepare(scope, dom, tag, meta)];
                     case 1:
                         _a.sent();
                         return [4 /*yield*/, this.elementRef.evaluate(scope, dom, tag, true)];

package/dist/AST/ElementAttributeNode.js.map

@@ -1 +1 @@
-{"version":3,"file":"ElementAttributeNode.js","sourceRoot":"","sources":["../../src/AST/ElementAttributeNode.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAGA,oCAAoC;AAEpC,+BAA4B;AAE5B,6CAA0C;AAE1C;IAA0C,wCAAI;IAG1C,8BACoB,UAAmC,EACnC,IAAY;QAFhC,YAII,iBAAO,SACV;QAJmB,gBAAU,GAAV,UAAU,CAAyB;QACnC,UAAI,GAAJ,IAAI,CAAQ;QAJtB,kBAAY,GAAY,IAAI,CAAC;;IAOvC,CAAC;IAED,sBAAW,sCAAI;aAAf;YACI,OAAO,IAAI,yBAAW,CAAS,MAAI,IAAI,CAAC,aAAe,CAAC,CAAC;QAC7D,CAAC;;;OAAA;IAES,6CAAc,GAAxB;QACI,IAAI,KAAK,GAAG,EAAE,CAAC;QACf,IAAI,IAAI,CAAC,UAAU;YACf,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CAAA;QAC/B,OAAO,KAAK,CAAC;IACjB,CAAC;IAED,sBAAI,+CAAa;aAAjB;YACI,IAAI,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC;gBACzB,OAAO,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;YAClC,OAAO,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;QAClC,CAAC;;;OAAA;IAEK,uCAAQ,GAAd,UAAe,KAAY,EAAE,GAAQ,EAAE,GAAe;QAAf,oBAAA,EAAA,UAAe;;;;;;;6BAE9C,IAAI,CAAC,UAAU,EAAf,wBAAe;wBACR,qBAAM,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,CAAC,EAAA;;wBAA5D,IAAI,GAAG,SAAqD,CAAC;;;wBAC1D,IAAI,GAAG,EAAE;4BACZ,IAAI,GAAG,IAAI,cAAO,CAAC,GAAG,CAAC,CAAA;yBAC1B;6BAAM;4BACH,sBAAO;yBACV;;;wBAED,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC;4BACjB,sBAAO,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,MAAI,IAAI,CAAC,aAAe,CAAC,EAAC;wBAEvD,sBAAO,IAAI,CAAC,GAAG,CAAC,UAAC,GAAG,IAAK,OAAA,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,MAAI,KAAI,CAAC,aAAe,CAAC,EAAvC,CAAuC,CAAC,EAAC;;;;KACrE;IAEK,sCAAO,GAAb,UAAc,KAAY,EAAE,GAAQ,EAAE,GAAe;QAAf,oBAAA,EAAA,UAAe;;;;;;6BAC7C,IAAI,CAAC,UAAU,EAAf,wBAAe;wBACf,qBAAM,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,EAAE,GAAG,CAAC,EAAA;;wBAA9C,SAA8C,CAAC;wBACzB,qBAAM,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,CAAC,EAAA;;wBAArE,IAAI,GAAY,SAAqD;8BACvD,EAAJ,aAAI;;;6BAAJ,CAAA,kBAAI,CAAA;wBAAT,CAAC;wBACR,qBAAM,CAAC,CAAC,cAAc,CAAC,IAAI,CAAC,aAAa,CAAC,EAAA;;wBAA1C,SAA0C,CAAC;;;wBAD/B,IAAI,CAAA;;;;6BAEd,GAAG,EAAH,wBAAG;wBACT,qBAAM,GAAG,CAAC,cAAc,CAAC,IAAI,CAAC,aAAa,CAAC,EAAA;;wBAA5C,SAA4C,CAAC;;;;;;KAEpD;IACL,2BAAC;AAAD,CAAC,AArDD,CAA0C,WAAI,GAqD7C;AArDY,oDAAoB"}
+{"version":3,"file":"ElementAttributeNode.js","sourceRoot":"","sources":["../../src/AST/ElementAttributeNode.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAGA,oCAAoC;AAEpC,+BAA4B;AAE5B,6CAA0C;AAE1C;IAA0C,wCAAI;IAG1C,8BACoB,UAAmC,EACnC,IAAY;QAFhC,YAII,iBAAO,SACV;QAJmB,gBAAU,GAAV,UAAU,CAAyB;QACnC,UAAI,GAAJ,IAAI,CAAQ;QAJtB,kBAAY,GAAY,IAAI,CAAC;;IAOvC,CAAC;IAED,sBAAW,sCAAI;aAAf;YACI,OAAO,IAAI,yBAAW,CAAS,MAAI,IAAI,CAAC,aAAe,CAAC,CAAC;QAC7D,CAAC;;;OAAA;IAES,6CAAc,GAAxB;QACI,IAAI,KAAK,GAAG,EAAE,CAAC;QACf,IAAI,IAAI,CAAC,UAAU;YACf,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CAAA;QAC/B,OAAO,KAAK,CAAC;IACjB,CAAC;IAED,sBAAI,+CAAa;aAAjB;YACI,IAAI,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC;gBACzB,OAAO,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;YAClC,OAAO,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;QAClC,CAAC;;;OAAA;IAEK,uCAAQ,GAAd,UAAe,KAAY,EAAE,GAAQ,EAAE,GAAe;QAAf,oBAAA,EAAA,UAAe;;;;;;;6BAE9C,IAAI,CAAC,UAAU,EAAf,wBAAe;wBACR,qBAAM,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,CAAC,EAAA;;wBAA5D,IAAI,GAAG,SAAqD,CAAC;;;wBAC1D,IAAI,GAAG,EAAE;4BACZ,IAAI,GAAG,IAAI,cAAO,CAAC,GAAG,CAAC,CAAA;yBAC1B;6BAAM;4BACH,sBAAO;yBACV;;;wBAED,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC;4BACjB,sBAAO,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,MAAI,IAAI,CAAC,aAAe,CAAC,EAAC;wBAEvD,sBAAO,IAAI,CAAC,GAAG,CAAC,UAAC,GAAG,IAAK,OAAA,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,MAAI,KAAI,CAAC,aAAe,CAAC,EAAvC,CAAuC,CAAC,EAAC;;;;KACrE;IAEK,sCAAO,GAAb,UAAc,KAAY,EAAE,GAAQ,EAAE,GAAe,EAAE,IAAgB;QAAjC,oBAAA,EAAA,UAAe;QAAE,qBAAA,EAAA,WAAgB;;;;;;6BAC/D,IAAI,CAAC,UAAU,EAAf,wBAAe;wBACf,qBAAM,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,CAAC,EAAA;;wBAApD,SAAoD,CAAC;wBAC/B,qBAAM,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,CAAC,EAAA;;wBAArE,IAAI,GAAY,SAAqD;8BACvD,EAAJ,aAAI;;;6BAAJ,CAAA,kBAAI,CAAA;wBAAT,CAAC;wBACR,qBAAM,CAAC,CAAC,cAAc,CAAC,IAAI,CAAC,aAAa,CAAC,EAAA;;wBAA1C,SAA0C,CAAC;;;wBAD/B,IAAI,CAAA;;;;6BAEd,GAAG,EAAH,wBAAG;wBACT,qBAAM,GAAG,CAAC,cAAc,CAAC,IAAI,CAAC,aAAa,CAAC,EAAA;;wBAA5C,SAA4C,CAAC;;;;;;KAEpD;IACL,2BAAC;AAAD,CAAC,AArDD,CAA0C,WAAI,GAqD7C;AArDY,oDAAoB"}

package/dist/AST/ElementQueryNode.d.ts

@@ -1,15 +1,15 @@
 import { Scope } from "../Scope";
-import { DOM } from "../DOM";
+import { DOM, EQuerySelectDirection } from "../DOM";
 import { Tag } from "../Tag";
 import { Token, TreeNode } from "../AST";
 import { Node } from "./Node";
 export declare class ElementQueryNode extends Node implements TreeNode {
     readonly query: string;
     readonly first: boolean;
-    readonly global: boolean;
+    readonly direction: EQuerySelectDirection;
     protected requiresPrep: boolean;
-    constructor(query: string, first?: boolean, global?: boolean);
+    constructor(query: string, first?: boolean, direction?: EQuerySelectDirection);
     evaluate(scope: Scope, dom: DOM, tag?: Tag, forceList?: boolean): Promise<any>;
-    prepare(scope: Scope, dom: DOM, tag?: Tag): Promise<void>;
+    prepare(scope: Scope, dom: DOM, tag?: Tag, meta?: any): Promise<any>;
     static parse(lastNode: any, token: any, tokens: Token[]): ElementQueryNode;
 }

package/dist/AST/ElementQueryNode.js

@@ -52,16 +52,17 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ElementQueryNode = void 0;
+var DOM_1 = require("../DOM");
 var Node_1 = require("./Node");
 var ElementQueryNode = /** @class */ (function (_super) {
     __extends(ElementQueryNode, _super);
-    function ElementQueryNode(query, first, global) {
+    function ElementQueryNode(query, first, direction) {
         if (first === void 0) { first = false; }
-        if (global === void 0) { global = false; }
+        if (direction === void 0) { direction = DOM_1.EQuerySelectDirection.ALL; }
         var _this = _super.call(this) || this;
         _this.query = query;
         _this.first = first;
-        _this.global = global;
+        _this.direction = direction;
         _this.requiresPrep = true;
         return _this;
     }
@@ -81,7 +82,7 @@ var ElementQueryNode = /** @class */ (function (_super) {
                         _b.label = 2;
                     case 2:
                         tag = _a;
-                        return [4 /*yield*/, dom.get(this.query, true, this.global ? null : tag)];
+                        return [4 /*yield*/, dom.get(this.query, true, tag, this.direction)];
                     case 3:
                         elements = _b.sent();
                         return [2 /*return*/, this.first && !forceList ? elements[0] : elements];
@@ -89,8 +90,9 @@ var ElementQueryNode = /** @class */ (function (_super) {
             });
         });
     };
-    ElementQueryNode.prototype.prepare = function (scope, dom, tag) {
+    ElementQueryNode.prototype.prepare = function (scope, dom, tag, meta) {
         if (tag === void 0) { tag = null; }
+        if (meta === void 0) { meta = null; }
         return __awaiter(this, void 0, void 0, function () {
             var _a;
             return __generator(this, function (_b) {
@@ -114,7 +116,16 @@ var ElementQueryNode = /** @class */ (function (_super) {
     };
     ElementQueryNode.parse = function (lastNode, token, tokens) {
         tokens.shift();
-        return new ElementQueryNode(token.value, false, !token.full.startsWith('?>'));
+        var first = false;
+        var direction = DOM_1.EQuerySelectDirection.ALL;
+        if (token.full.startsWith('?>')) {
+            direction = DOM_1.EQuerySelectDirection.DOWN;
+        }
+        else if (token.full.startsWith('?<')) {
+            direction = DOM_1.EQuerySelectDirection.UP;
+            first = true;
+        }
+        return new ElementQueryNode(token.value, first, direction);
     };
     return ElementQueryNode;
 }(Node_1.Node));

package/dist/AST/ElementQueryNode.js.map

@@ -1 +1 @@
-{"version":3,"file":"ElementQueryNode.js","sourceRoot":"","sources":["../../src/AST/ElementQueryNode.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAIA,+BAA4B;AAE5B;IAAsC,oCAAI;IAGtC,0BACoB,KAAa,EACb,KAAsB,EACtB,MAAuB;QADvB,sBAAA,EAAA,aAAsB;QACtB,uBAAA,EAAA,cAAuB;QAH3C,YAKI,iBAAO,SACV;QALmB,WAAK,GAAL,KAAK,CAAQ;QACb,WAAK,GAAL,KAAK,CAAiB;QACtB,YAAM,GAAN,MAAM,CAAiB;QALjC,kBAAY,GAAY,IAAI,CAAC;;IAQvC,CAAC;IAEK,mCAAQ,GAAd,UAAe,KAAY,EAAE,GAAQ,EAAE,GAAe,EAAE,SAA0B;QAA3C,oBAAA,EAAA,UAAe;QAAE,0BAAA,EAAA,iBAA0B;;;;;;wBACxE,KAAA,GAAG,CAAA;gCAAH,wBAAG;wBAAI,qBAAM,GAAG,CAAC,cAAc,CAAC,KAAK,CAAC,EAAA;;8BAA/B,SAA+B;;;wBAA5C,GAAG,KAAyC,CAAC;wBAC5B,qBAAM,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,EAAA;;wBAApE,QAAQ,GAAG,SAAyD;wBAC1E,sBAAO,IAAI,CAAC,KAAK,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAC;;;;KAC5D;IAEK,kCAAO,GAAb,UAAc,KAAY,EAAE,GAAQ,EAAE,GAAe;QAAf,oBAAA,EAAA,UAAe;;;;;;wBAC3C,KAAA,GAAG,CAAA;gCAAH,wBAAG;wBAAI,qBAAM,GAAG,CAAC,cAAc,CAAC,KAAK,CAAC,EAAA;;8BAA/B,SAA+B;;;wBAA5C,GAAG,KAAyC,CAAC;wBAC7C,qBAAM,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,EAAE,GAAG,CAAC,EAAA;;wBAApC,SAAoC,CAAC;;;;;KACxC;IAEa,sBAAK,GAAnB,UAAoB,QAAQ,EAAE,KAAK,EAAE,MAAe;QAChD,MAAM,CAAC,KAAK,EAAE,CAAC;QACf,OAAO,IAAI,gBAAgB,CAAC,KAAK,CAAC,KAAK,EAAE,KAAK,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC;IAClF,CAAC;IACL,uBAAC;AAAD,CAAC,AA1BD,CAAsC,WAAI,GA0BzC;AA1BY,4CAAgB"}
+{"version":3,"file":"ElementQueryNode.js","sourceRoot":"","sources":["../../src/AST/ElementQueryNode.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,8BAAkD;AAGlD,+BAA4B;AAE5B;IAAsC,oCAAI;IAGtC,0BACoB,KAAa,EACb,KAAsB,EACtB,SAA4D;QAD5D,sBAAA,EAAA,aAAsB;QACtB,0BAAA,EAAA,YAAmC,2BAAqB,CAAC,GAAG;QAHhF,YAKI,iBAAO,SACV;QALmB,WAAK,GAAL,KAAK,CAAQ;QACb,WAAK,GAAL,KAAK,CAAiB;QACtB,eAAS,GAAT,SAAS,CAAmD;QALtE,kBAAY,GAAY,IAAI,CAAC;;IAQvC,CAAC;IAEK,mCAAQ,GAAd,UAAe,KAAY,EAAE,GAAQ,EAAE,GAAe,EAAE,SAA0B;QAA3C,oBAAA,EAAA,UAAe;QAAE,0BAAA,EAAA,iBAA0B;;;;;;wBACxE,KAAA,GAAG,CAAA;gCAAH,wBAAG;wBAAI,qBAAM,GAAG,CAAC,cAAc,CAAC,KAAK,CAAC,EAAA;;8BAA/B,SAA+B;;;wBAA5C,GAAG,KAAyC,CAAC;wBAC5B,qBAAM,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,EAAE,GAAG,EAAE,IAAI,CAAC,SAAS,CAAC,EAAA;;wBAA/D,QAAQ,GAAG,SAAoD;wBACrE,sBAAO,IAAI,CAAC,KAAK,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAC;;;;KAC5D;IAEK,kCAAO,GAAb,UAAc,KAAY,EAAE,GAAQ,EAAE,GAAe,EAAE,IAAgB;QAAjC,oBAAA,EAAA,UAAe;QAAE,qBAAA,EAAA,WAAgB;;;;;;wBAC7D,KAAA,GAAG,CAAA;gCAAH,wBAAG;wBAAI,qBAAM,GAAG,CAAC,cAAc,CAAC,KAAK,CAAC,EAAA;;8BAA/B,SAA+B;;;wBAA5C,GAAG,KAAyC,CAAC;wBAC7C,qBAAM,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,EAAE,GAAG,CAAC,EAAA;;wBAApC,SAAoC,CAAC;;;;;KACxC;IAEa,sBAAK,GAAnB,UAAoB,QAAQ,EAAE,KAAK,EAAE,MAAe;QAChD,MAAM,CAAC,KAAK,EAAE,CAAC;QACf,IAAI,KAAK,GAAG,KAAK,CAAC;QAClB,IAAI,SAAS,GAAG,2BAAqB,CAAC,GAAG,CAAC;QAC1C,IAAI,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE;YAC7B,SAAS,GAAG,2BAAqB,CAAC,IAAI,CAAC;SAC1C;aAAM,IAAI,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE;YACpC,SAAS,GAAG,2BAAqB,CAAC,EAAE,CAAC;YACrC,KAAK,GAAG,IAAI,CAAC;SAChB;QACD,OAAO,IAAI,gBAAgB,CAAC,KAAK,CAAC,KAAK,EAAE,KAAK,EAAE,SAAS,CAAC,CAAC;IAC/D,CAAC;IACL,uBAAC;AAAD,CAAC,AAlCD,CAAsC,WAAI,GAkCzC;AAlCY,4CAAgB"}

package/dist/AST/ElementStyleNode.d.ts

@@ -14,5 +14,5 @@ export declare class ElementStyleNode extends Node implements TreeNode {
     protected _getChildNodes(): Node[];
     get attributeName(): string;
     evaluate(scope: Scope, dom: DOM, tag?: Tag): Promise<any>;
-    prepare(scope: Scope, dom: DOM, tag?: Tag): Promise<void>;
+    prepare(scope: Scope, dom: DOM, tag?: Tag, meta?: any): Promise<void>;
 }

package/dist/AST/ElementStyleNode.js

@@ -115,15 +115,16 @@ var ElementStyleNode = /** @class */ (function (_super) {
             });
         });
     };
-    ElementStyleNode.prototype.prepare = function (scope, dom, tag) {
+    ElementStyleNode.prototype.prepare = function (scope, dom, tag, meta) {
         if (tag === void 0) { tag = null; }
+        if (meta === void 0) { meta = null; }
         return __awaiter(this, void 0, void 0, function () {
             var tags, _i, tags_1, t;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         if (!this.elementRef) return [3 /*break*/, 7];
-                        return [4 /*yield*/, this.elementRef.prepare(scope, dom, tag)];
+                        return [4 /*yield*/, this.elementRef.prepare(scope, dom, tag, meta)];
                     case 1:
                         _a.sent();
                         return [4 /*yield*/, this.elementRef.evaluate(scope, dom, tag, true)];

package/dist/AST/ElementStyleNode.js.map

@@ -1 +1 @@
-{"version":3,"file":"ElementStyleNode.js","sourceRoot":"","sources":["../../src/AST/ElementStyleNode.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAGA,oCAAoC;AAEpC,+BAA4B;AAE5B,6CAA0C;AAE1C;IAAsC,oCAAI;IAGtC,0BACoB,UAAmC,EACnC,IAAY;QAFhC,YAII,iBAAO,SACV;QAJmB,gBAAU,GAAV,UAAU,CAAyB;QACnC,UAAI,GAAJ,IAAI,CAAQ;QAJtB,kBAAY,GAAY,IAAI,CAAC;;IAOvC,CAAC;IAED,sBAAW,kCAAI;aAAf;YACI,OAAO,IAAI,yBAAW,CAAS,MAAI,IAAI,CAAC,aAAe,CAAC,CAAC;QAC7D,CAAC;;;OAAA;IAES,yCAAc,GAAxB;QACI,IAAI,KAAK,GAAG,EAAE,CAAC;QACf,IAAI,IAAI,CAAC,UAAU;YACf,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CAAA;QAC/B,OAAO,KAAK,CAAC;IACjB,CAAC;IAED,sBAAI,2CAAa;aAAjB;YACI,IAAI,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC;gBACzB,OAAO,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;YAClC,OAAO,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;QAClC,CAAC;;;OAAA;IAEK,mCAAQ,GAAd,UAAe,KAAY,EAAE,GAAQ,EAAE,GAAe;QAAf,oBAAA,EAAA,UAAe;;;;;;;6BAE9C,IAAI,CAAC,UAAU,EAAf,wBAAe;wBACR,qBAAM,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,CAAC,EAAA;;wBAA5D,IAAI,GAAG,SAAqD,CAAC;;;wBAC1D,IAAI,GAAG,EAAE;4BACZ,IAAI,GAAG,IAAI,cAAO,CAAC,GAAG,CAAC,CAAA;yBAC1B;6BAAM;4BACH,sBAAO;yBACV;;;wBAED,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC;4BACjB,sBAAO,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,MAAI,IAAI,CAAC,aAAe,CAAC,EAAC;wBAEvD,sBAAO,IAAI,CAAC,GAAG,CAAC,UAAC,GAAG,IAAK,OAAA,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,MAAI,KAAI,CAAC,aAAe,CAAC,EAAvC,CAAuC,CAAC,EAAC;;;;KACrE;IAEK,kCAAO,GAAb,UAAc,KAAY,EAAE,GAAQ,EAAE,GAAe;QAAf,oBAAA,EAAA,UAAe;;;;;;6BAC7C,IAAI,CAAC,UAAU,EAAf,wBAAe;wBACf,qBAAM,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,EAAE,GAAG,CAAC,EAAA;;wBAA9C,SAA8C,CAAC;wBACzB,qBAAM,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,CAAC,EAAA;;wBAArE,IAAI,GAAY,SAAqD;8BACvD,EAAJ,aAAI;;;6BAAJ,CAAA,kBAAI,CAAA;wBAAT,CAAC;wBACR,qBAAM,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC,aAAa,CAAC,EAAA;;wBAAtC,SAAsC,CAAC;;;wBAD3B,IAAI,CAAA;;;;6BAEd,GAAG,EAAH,wBAAG;wBACT,qBAAM,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC,aAAa,CAAC,EAAA;;wBAAxC,SAAwC,CAAC;;;;;;KAEhD;IACL,uBAAC;AAAD,CAAC,AArDD,CAAsC,WAAI,GAqDzC;AArDY,4CAAgB"}
+{"version":3,"file":"ElementStyleNode.js","sourceRoot":"","sources":["../../src/AST/ElementStyleNode.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAGA,oCAAoC;AAEpC,+BAA4B;AAE5B,6CAA0C;AAE1C;IAAsC,oCAAI;IAGtC,0BACoB,UAAmC,EACnC,IAAY;QAFhC,YAII,iBAAO,SACV;QAJmB,gBAAU,GAAV,UAAU,CAAyB;QACnC,UAAI,GAAJ,IAAI,CAAQ;QAJtB,kBAAY,GAAY,IAAI,CAAC;;IAOvC,CAAC;IAED,sBAAW,kCAAI;aAAf;YACI,OAAO,IAAI,yBAAW,CAAS,MAAI,IAAI,CAAC,aAAe,CAAC,CAAC;QAC7D,CAAC;;;OAAA;IAES,yCAAc,GAAxB;QACI,IAAI,KAAK,GAAG,EAAE,CAAC;QACf,IAAI,IAAI,CAAC,UAAU;YACf,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CAAA;QAC/B,OAAO,KAAK,CAAC;IACjB,CAAC;IAED,sBAAI,2CAAa;aAAjB;YACI,IAAI,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC;gBACzB,OAAO,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;YAClC,OAAO,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;QAClC,CAAC;;;OAAA;IAEK,mCAAQ,GAAd,UAAe,KAAY,EAAE,GAAQ,EAAE,GAAe;QAAf,oBAAA,EAAA,UAAe;;;;;;;6BAE9C,IAAI,CAAC,UAAU,EAAf,wBAAe;wBACR,qBAAM,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,CAAC,EAAA;;wBAA5D,IAAI,GAAG,SAAqD,CAAC;;;wBAC1D,IAAI,GAAG,EAAE;4BACZ,IAAI,GAAG,IAAI,cAAO,CAAC,GAAG,CAAC,CAAA;yBAC1B;6BAAM;4BACH,sBAAO;yBACV;;;wBAED,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC;4BACjB,sBAAO,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,MAAI,IAAI,CAAC,aAAe,CAAC,EAAC;wBAEvD,sBAAO,IAAI,CAAC,GAAG,CAAC,UAAC,GAAG,IAAK,OAAA,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,MAAI,KAAI,CAAC,aAAe,CAAC,EAAvC,CAAuC,CAAC,EAAC;;;;KACrE;IAEK,kCAAO,GAAb,UAAc,KAAY,EAAE,GAAQ,EAAE,GAAe,EAAE,IAAgB;QAAjC,oBAAA,EAAA,UAAe;QAAE,qBAAA,EAAA,WAAgB;;;;;;6BAC/D,IAAI,CAAC,UAAU,EAAf,wBAAe;wBACf,qBAAM,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,CAAC,EAAA;;wBAApD,SAAoD,CAAC;wBAC/B,qBAAM,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,CAAC,EAAA;;wBAArE,IAAI,GAAY,SAAqD;8BACvD,EAAJ,aAAI;;;6BAAJ,CAAA,kBAAI,CAAA;wBAAT,CAAC;wBACR,qBAAM,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC,aAAa,CAAC,EAAA;;wBAAtC,SAAsC,CAAC;;;wBAD3B,IAAI,CAAA;;;;6BAEd,GAAG,EAAH,wBAAG;wBACT,qBAAM,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC,aAAa,CAAC,EAAA;;wBAAxC,SAAwC,CAAC;;;;;;KAEhD;IACL,uBAAC;AAAD,CAAC,AArDD,CAAsC,WAAI,GAqDzC;AArDY,4CAAgB"}

package/dist/AST/FunctionNode.d.ts

@@ -11,7 +11,7 @@ export declare class FunctionNode extends Node implements TreeNode {
     protected requiresPrep: boolean;
     constructor(name: string, args: string[], block: BlockNode);
     protected _getChildNodes(): Node[];
-    prepare(scope: Scope, dom: DOM, tag?: Tag): Promise<void>;
+    prepare(scope: Scope, dom: DOM, tag?: Tag, meta?: any): Promise<void>;
     evaluate(scope: Scope, dom: DOM, tag?: Tag): Promise<(...args: any[]) => Promise<any>>;
     getFunction(scope: Scope, dom: DOM, tag?: Tag): Promise<(...args: any[]) => Promise<any>>;
     static parse<T = FunctionNode>(lastNode: any, token: any, tokens: Token[], cls?: any): FunctionNode;

package/dist/AST/FunctionNode.js

@@ -70,14 +70,15 @@ var FunctionNode = /** @class */ (function (_super) {
             this.block
         ];
     };
-    FunctionNode.prototype.prepare = function (scope, dom, tag) {
+    FunctionNode.prototype.prepare = function (scope, dom, tag, meta) {
         if (tag === void 0) { tag = null; }
         return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        scope.set(this.name, this);
-                        return [4 /*yield*/, _super.prototype.prepare.call(this, scope, dom, tag)];
+                        if (!(meta === null || meta === void 0 ? void 0 : meta.ClassNode)) // Don't muddle up tag scope if we're in a class
+                            scope.set(this.name, this);
+                        return [4 /*yield*/, _super.prototype.prepare.call(this, scope, dom, tag, meta)];
                     case 1:
                         _a.sent();
                         return [2 /*return*/];

package/dist/AST/FunctionNode.js.map

@@ -1 +1 @@
-{"version":3,"file":"FunctionNode.js","sourceRoot":"","sources":["../../src/AST/FunctionNode.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,kCAA8C;AAG9C,8BAA6C;AAC7C,+BAA4B;AAG5B;IAAkC,gCAAI;IAGlC,sBACoB,IAAY,EACZ,IAAc,EACd,KAAgB;QAHpC,YAKI,iBAAO,SACV;QALmB,UAAI,GAAJ,IAAI,CAAQ;QACZ,UAAI,GAAJ,IAAI,CAAU;QACd,WAAK,GAAL,KAAK,CAAW;QAL1B,kBAAY,GAAY,IAAI,CAAC;;IAQvC,CAAC;IAES,qCAAc,GAAxB;QACI,OAAO;YACH,IAAI,CAAC,KAAK;SACb,CAAC;IACN,CAAC;IAEY,8BAAO,GAApB,UAAqB,KAAY,EAAE,GAAQ,EAAE,GAAe;QAAf,oBAAA,EAAA,UAAe;;;;;wBACxD,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;wBAC3B,qBAAM,iBAAM,OAAO,YAAC,KAAK,EAAE,GAAG,EAAE,GAAG,CAAC,EAAA;;wBAApC,SAAoC,CAAC;;;;;KACxC;IAEY,+BAAQ,GAArB,UAAsB,KAAY,EAAE,GAAQ,EAAE,GAAe;QAAf,oBAAA,EAAA,UAAe;;;;4BAClD,qBAAM,IAAI,CAAC,WAAW,CAAC,KAAK,EAAE,GAAG,EAAE,GAAG,CAAC,EAAA;4BAA9C,sBAAO,SAAuC,EAAC;;;;KAClD;IAEY,kCAAW,GAAxB,UAAyB,KAAY,EAAE,GAAQ,EAAE,GAAe;QAAf,oBAAA,EAAA,UAAe;;;;gBAC5D,sBAAO;wBAAO,cAAO;6BAAP,UAAO,EAAP,qBAAO,EAAP,IAAO;4BAAP,yBAAO;;;;;;;wCACX,aAAa,GAAG,IAAI,qBAAa,CAAC,KAAK,CAAC,CAAC;wCAC/C,WAA2B,EAAT,KAAA,IAAI,CAAC,IAAI,EAAT,cAAS,EAAT,IAAS,EAAE;4CAAlB,GAAG;4CACV,aAAa,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC;yCACxC;wCACM,qBAAM,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,aAAa,EAAE,GAAG,EAAE,GAAG,CAAC,EAAA;4CAAzD,sBAAO,SAAkD,EAAC;;;;qBAC7D,EAAA;;;KACJ;IAEa,kBAAK,GAAnB,UAAsC,QAAQ,EAAE,KAAK,EAAE,MAAe,EAAE,GAAuB;QAAvB,oBAAA,EAAA,kBAAuB;QAC3F,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,cAAc;QAC9B,IAAM,IAAI,GAAG,MAAM,CAAC,KAAK,EAAE,CAAC;QAC5B,IAAM,SAAS,GAAG,UAAI,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;QAC9C,IAAM,QAAQ,GAAa,EAAE,CAAC;QAC9B,KAAgB,UAAS,EAAT,uBAAS,EAAT,uBAAS,EAAT,IAAS,EAAE;YAAtB,IAAM,CAAC,kBAAA;YACR,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;SAC7B;QACD,IAAM,KAAK,GAAG,UAAI,CAAC,aAAa,CAAC,UAAI,CAAC,sBAAsB,CAAC,MAAM,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC;QAClF,OAAO,IAAI,GAAG,CAAC,IAAI,CAAC,KAAK,EAAE,QAAQ,EAAE,KAAK,CAAC,CAAC;IAChD,CAAC;IACL,mBAAC;AAAD,CAAC,AA/CD,CAAkC,WAAI,GA+CrC;AA/CY,oCAAY"}
+{"version":3,"file":"FunctionNode.js","sourceRoot":"","sources":["../../src/AST/FunctionNode.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,kCAA8C;AAG9C,8BAA6C;AAC7C,+BAA4B;AAG5B;IAAkC,gCAAI;IAGlC,sBACoB,IAAY,EACZ,IAAc,EACd,KAAgB;QAHpC,YAKI,iBAAO,SACV;QALmB,UAAI,GAAJ,IAAI,CAAQ;QACZ,UAAI,GAAJ,IAAI,CAAU;QACd,WAAK,GAAL,KAAK,CAAW;QAL1B,kBAAY,GAAY,IAAI,CAAC;;IAQvC,CAAC;IAES,qCAAc,GAAxB;QACI,OAAO;YACH,IAAI,CAAC,KAAK;SACb,CAAC;IACN,CAAC;IAEY,8BAAO,GAApB,UAAqB,KAAY,EAAE,GAAQ,EAAE,GAAe,EAAE,IAAU;QAA3B,oBAAA,EAAA,UAAe;;;;;wBACxD,IAAI,CAAC,CAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,SAAS,CAAA,EAAE,gDAAgD;4BAClE,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;wBAC/B,qBAAM,iBAAM,OAAO,YAAC,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,CAAC,EAAA;;wBAA1C,SAA0C,CAAC;;;;;KAC9C;IAEY,+BAAQ,GAArB,UAAsB,KAAY,EAAE,GAAQ,EAAE,GAAe;QAAf,oBAAA,EAAA,UAAe;;;;4BAClD,qBAAM,IAAI,CAAC,WAAW,CAAC,KAAK,EAAE,GAAG,EAAE,GAAG,CAAC,EAAA;4BAA9C,sBAAO,SAAuC,EAAC;;;;KAClD;IAEY,kCAAW,GAAxB,UAAyB,KAAY,EAAE,GAAQ,EAAE,GAAe;QAAf,oBAAA,EAAA,UAAe;;;;gBAC5D,sBAAO;wBAAO,cAAO;6BAAP,UAAO,EAAP,qBAAO,EAAP,IAAO;4BAAP,yBAAO;;;;;;;wCACX,aAAa,GAAG,IAAI,qBAAa,CAAC,KAAK,CAAC,CAAC;wCAC/C,WAA2B,EAAT,KAAA,IAAI,CAAC,IAAI,EAAT,cAAS,EAAT,IAAS,EAAE;4CAAlB,GAAG;4CACV,aAAa,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC;yCACxC;wCACM,qBAAM,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,aAAa,EAAE,GAAG,EAAE,GAAG,CAAC,EAAA;4CAAzD,sBAAO,SAAkD,EAAC;;;;qBAC7D,EAAA;;;KACJ;IAEa,kBAAK,GAAnB,UAAsC,QAAQ,EAAE,KAAK,EAAE,MAAe,EAAE,GAAuB;QAAvB,oBAAA,EAAA,kBAAuB;QAC3F,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,cAAc;QAC9B,IAAM,IAAI,GAAG,MAAM,CAAC,KAAK,EAAE,CAAC;QAC5B,IAAM,SAAS,GAAG,UAAI,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;QAC9C,IAAM,QAAQ,GAAa,EAAE,CAAC;QAC9B,KAAgB,UAAS,EAAT,uBAAS,EAAT,uBAAS,EAAT,IAAS,EAAE;YAAtB,IAAM,CAAC,kBAAA;YACR,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;SAC7B;QACD,IAAM,KAAK,GAAG,UAAI,CAAC,aAAa,CAAC,UAAI,CAAC,sBAAsB,CAAC,MAAM,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC;QAClF,OAAO,IAAI,GAAG,CAAC,IAAI,CAAC,KAAK,EAAE,QAAQ,EAAE,KAAK,CAAC,CAAC;IAChD,CAAC;IACL,mBAAC;AAAD,CAAC,AAhDD,CAAkC,WAAI,GAgDrC;AAhDY,oCAAY"}

package/dist/AST/Node.d.ts

@@ -11,7 +11,7 @@ export declare abstract class Node implements TreeNode {
     };
     abstract evaluate(scope: Scope, dom: DOM, tag?: Tag): any;
     isPreparationRequired(): boolean;
-    prepare(scope: Scope, dom: DOM, tag?: Tag): Promise<void>;
+    prepare(scope: Scope, dom: DOM, tag?: Tag, meta?: any): Promise<void>;
     protected _getChildNodes(): Node[];
     getChildNodes(): Node[];
     findChildrenByType<T = Node>(t: any): T[];

package/dist/AST/Node.js

@@ -56,8 +56,9 @@ var Node = /** @class */ (function () {
         }
         return false;
     };
-    Node.prototype.prepare = function (scope, dom, tag) {
+    Node.prototype.prepare = function (scope, dom, tag, meta) {
         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) {
@@ -68,7 +69,7 @@ var Node = /** @class */ (function () {
                     case 1:
                         if (!(_i < _a.length)) return [3 /*break*/, 4];
                         node = _a[_i];
-                        return [4 /*yield*/, node.prepare(scope, dom, tag)];
+                        return [4 /*yield*/, node.prepare(scope, dom, tag, meta)];
                     case 2:
                         _b.sent();
                         _b.label = 3;

package/dist/AST/Node.js.map

@@ -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;IA4DtD,CAAC;IAzDG,oCAAqB,GAArB;QACI,IAAI,IAAI,CAAC,YAAY;YACjB,OAAO,IAAI,CAAC;QAEhB,IAAI,IAAI,CAAC,sBAAsB,KAAK,SAAS;YACzC,OAAO,IAAI,CAAC,sBAAsB,CAAC;QAEvC,KAAmB,UAAoB,EAApB,KAAA,IAAI,CAAC,aAAa,EAAE,EAApB,cAAoB,EAApB,IAAoB,EAAE;YAApC,IAAM,IAAI,SAAA;YACX,IAAI,IAAI,CAAC,qBAAqB,EAAE,EAAE;gBAC9B,IAAI,CAAC,sBAAsB,GAAG,IAAI,CAAC;gBACnC,OAAO,IAAI,CAAC;aACf;SACJ;QAED,OAAO,KAAK,CAAC;IACjB,CAAC;IAEK,sBAAO,GAAb,UAAc,KAAY,EAAE,GAAQ,EAAE,GAAe;QAAf,oBAAA,EAAA,UAAe;;;;;;8BACV,EAApB,KAAA,IAAI,CAAC,aAAa,EAAE;;;6BAApB,CAAA,cAAoB,CAAA;wBAA5B,IAAI;wBACX,qBAAM,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,EAAE,GAAG,CAAC,EAAA;;wBAAnC,SAAmC,CAAC;;;wBADrB,IAAoB,CAAA;;;;;;KAG1C;IAES,6BAAc,GAAxB;QACI,OAAO,EAAE,CAAC;IACd,CAAC;IAED,4BAAa,GAAb;QACI,IAAI,IAAI,CAAC,UAAU,KAAK,SAAS,EAAE;YAC/B,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,cAAc,EAAE,CAAC;SAC3C;QACD,OAAO,IAAI,CAAC,UAAU,CAAC;IAC3B,CAAC;IAED,iCAAkB,GAAlB,UAA6B,CAAM;QAC/B,OAAO,IAAI,CAAC,mBAAmB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IACzC,CAAC;IAED,kCAAmB,GAAnB,UAA8B,KAAY,EAAE,QAAuB;QAAvB,yBAAA,EAAA,eAAuB;QAC/D,IAAI,QAAQ,KAAK,IAAI,IAAI,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC;YAC7C,OAAO,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAQ,CAAC;QAE3C,IAAM,KAAK,GAAQ,EAAE,CAAC;QACtB,KAAoB,UAAoB,EAApB,KAAA,IAAI,CAAC,aAAa,EAAE,EAApB,cAAoB,EAApB,IAAoB,EAAE;YAArC,IAAM,KAAK,SAAA;YACZ,KAAgB,UAAK,EAAL,eAAK,EAAL,mBAAK,EAAL,IAAK,EAAE;gBAAlB,IAAM,CAAC,cAAA;gBACR,IAAI,KAAK,YAAY,CAAC;oBAClB,KAAK,CAAC,IAAI,CAAC,KAAiB,CAAC,CAAC;gBAClC,IAAM,UAAU,GAAQ,KAAK,CAAC,kBAAkB,CAAI,CAAC,CAAC,CAAC;gBACvD,KAAK,CAAC,IAAI,OAAV,KAAK,EAAS,UAAU,EAAE;aAC7B;SACJ;QAED,IAAI,QAAQ,KAAK,IAAI;YACjB,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,GAAG,KAAY,CAAC;QAE5C,OAAO,KAAK,CAAC;IACjB,CAAC;IACL,WAAC;AAAD,CAAC,AAhED,IAgEC;AAhEqB,oBAAI"}
+{"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;IA4DtD,CAAC;IAzDG,oCAAqB,GAArB;QACI,IAAI,IAAI,CAAC,YAAY;YACjB,OAAO,IAAI,CAAC;QAEhB,IAAI,IAAI,CAAC,sBAAsB,KAAK,SAAS;YACzC,OAAO,IAAI,CAAC,sBAAsB,CAAC;QAEvC,KAAmB,UAAoB,EAApB,KAAA,IAAI,CAAC,aAAa,EAAE,EAApB,cAAoB,EAApB,IAAoB,EAAE;YAApC,IAAM,IAAI,SAAA;YACX,IAAI,IAAI,CAAC,qBAAqB,EAAE,EAAE;gBAC9B,IAAI,CAAC,sBAAsB,GAAG,IAAI,CAAC;gBACnC,OAAO,IAAI,CAAC;aACf;SACJ;QAED,OAAO,KAAK,CAAC;IACjB,CAAC;IAEK,sBAAO,GAAb,UAAc,KAAY,EAAE,GAAQ,EAAE,GAAe,EAAE,IAAgB;QAAjC,oBAAA,EAAA,UAAe;QAAE,qBAAA,EAAA,WAAgB;;;;;;8BAC5B,EAApB,KAAA,IAAI,CAAC,aAAa,EAAE;;;6BAApB,CAAA,cAAoB,CAAA;wBAA5B,IAAI;wBACX,qBAAM,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,CAAC,EAAA;;wBAAzC,SAAyC,CAAC;;;wBAD3B,IAAoB,CAAA;;;;;;KAG1C;IAES,6BAAc,GAAxB;QACI,OAAO,EAAE,CAAC;IACd,CAAC;IAED,4BAAa,GAAb;QACI,IAAI,IAAI,CAAC,UAAU,KAAK,SAAS,EAAE;YAC/B,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,cAAc,EAAE,CAAC;SAC3C;QACD,OAAO,IAAI,CAAC,UAAU,CAAC;IAC3B,CAAC;IAED,iCAAkB,GAAlB,UAA6B,CAAM;QAC/B,OAAO,IAAI,CAAC,mBAAmB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IACzC,CAAC;IAED,kCAAmB,GAAnB,UAA8B,KAAY,EAAE,QAAuB;QAAvB,yBAAA,EAAA,eAAuB;QAC/D,IAAI,QAAQ,KAAK,IAAI,IAAI,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC;YAC7C,OAAO,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAQ,CAAC;QAE3C,IAAM,KAAK,GAAQ,EAAE,CAAC;QACtB,KAAoB,UAAoB,EAApB,KAAA,IAAI,CAAC,aAAa,EAAE,EAApB,cAAoB,EAApB,IAAoB,EAAE;YAArC,IAAM,KAAK,SAAA;YACZ,KAAgB,UAAK,EAAL,eAAK,EAAL,mBAAK,EAAL,IAAK,EAAE;gBAAlB,IAAM,CAAC,cAAA;gBACR,IAAI,KAAK,YAAY,CAAC;oBAClB,KAAK,CAAC,IAAI,CAAC,KAAiB,CAAC,CAAC;gBAClC,IAAM,UAAU,GAAQ,KAAK,CAAC,kBAAkB,CAAI,CAAC,CAAC,CAAC;gBACvD,KAAK,CAAC,IAAI,OAAV,KAAK,EAAS,UAAU,EAAE;aAC7B;SACJ;QAED,IAAI,QAAQ,KAAK,IAAI;YACjB,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,GAAG,KAAY,CAAC;QAE5C,OAAO,KAAK,CAAC;IACjB,CAAC;IACL,WAAC;AAAD,CAAC,AAhED,IAgEC;AAhEqB,oBAAI"}

package/dist/AST/OnNode.d.ts

@@ -4,6 +4,6 @@ import { Scope } from "../Scope";
 import { DOM } from "../DOM";
 import { Tag } from "../Tag";
 export declare class OnNode extends FunctionNode implements TreeNode {
-    prepare(scope: Scope, dom: DOM, tag?: Tag): Promise<void>;
+    prepare(scope: Scope, dom: DOM, tag: Tag, meta: any): Promise<void>;
     static parse(lastNode: any, token: any, tokens: Token[]): OnNode;
 }

package/dist/AST/OnNode.js

@@ -58,21 +58,22 @@ var OnNode = /** @class */ (function (_super) {
     function OnNode() {
         return _super !== null && _super.apply(this, arguments) || this;
     }
-    OnNode.prototype.prepare = function (scope, dom, tag) {
+    OnNode.prototype.prepare = function (scope, dom, tag, meta) {
         if (tag === void 0) { tag = null; }
         return __awaiter(this, void 0, void 0, function () {
-            var _a, _b, _c;
+            var classPrep, _a, _b, _c;
             return __generator(this, function (_d) {
                 switch (_d.label) {
                     case 0:
-                        if (!tag) return [3 /*break*/, 2];
+                        classPrep = meta === null || meta === void 0 ? void 0 : meta.ClassNodePrepare;
+                        if (!(tag && !classPrep)) return [3 /*break*/, 2];
                         _b = (_a = tag).addEventHandler;
                         _c = [this.name, []];
                         return [4 /*yield*/, this.getFunction(scope, dom, tag)];
                     case 1:
                         _b.apply(_a, _c.concat([_d.sent(), this]));
                         _d.label = 2;
-                    case 2: return [4 /*yield*/, _super.prototype.prepare.call(this, scope, dom, tag)];
+                    case 2: return [4 /*yield*/, _super.prototype.prepare.call(this, scope, dom, tag, meta)];
                     case 3:
                         _d.sent();
                         return [2 /*return*/];

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;;IAWA,CAAC;IAVgB,wBAAO,GAApB,UAAqB,KAAY,EAAE,GAAQ,EAAE,GAAe;QAAf,oBAAA,EAAA,UAAe;;;;;;6BACpD,GAAG,EAAH,wBAAG;wBACH,KAAA,CAAA,KAAA,GAAG,CAAA,CAAC,eAAe,CAAA;8BAAC,IAAI,CAAC,IAAI,EAAE,EAAE;wBAAE,qBAAM,IAAI,CAAC,WAAW,CAAC,KAAK,EAAE,GAAG,EAAE,GAAG,CAAC,EAAA;;wBAA1E,wBAAmC,SAAuC,EAAE,IAAI,GAAC,CAAC;;4BAEtF,qBAAM,iBAAM,OAAO,YAAC,KAAK,EAAE,GAAG,EAAE,GAAG,CAAC,EAAA;;wBAApC,SAAoC,CAAC;;;;;KACxC;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,AAXD,CAA4B,2BAAY,GAWvC;AAXY,wBAAM"}
+{"version":3,"file":"OnNode.js","sourceRoot":"","sources":["../../src/AST/OnNode.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,+CAA4C;AAK5C;IAA4B,0BAAY;IAAxC;;IAWA,CAAC;IAVgB,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;wBACjB,KAAA,CAAA,KAAA,GAAG,CAAA,CAAC,eAAe,CAAA;8BAAC,IAAI,CAAC,IAAI,EAAE,EAAE;wBAAE,qBAAM,IAAI,CAAC,WAAW,CAAC,KAAK,EAAE,GAAG,EAAE,GAAG,CAAC,EAAA;;wBAA1E,wBAAmC,SAAuC,EAAE,IAAI,GAAC,CAAC;;4BACtF,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,AAXD,CAA4B,2BAAY,GAWvC;AAXY,wBAAM"}

package/dist/AST.d.ts

@@ -85,7 +85,7 @@ export declare enum TokenType {
 }
 export interface TreeNode<T = any> {
     evaluate(scope: Scope, dom: DOM, tag?: Tag): any;
-    prepare(scope: Scope, dom: DOM, tag?: Tag): any;
+    prepare(scope: Scope, dom: DOM, tag?: Tag, meta?: any): any;
 }
 export interface IBlockInfo {
     type: BlockType;

package/dist/AST.js

@@ -247,7 +247,7 @@ var TOKEN_PATTERNS = [
     },
     {
         type: TokenType.ELEMENT_QUERY,
-        pattern: /^\?>?\(([#.\[\]:,=\-_a-zA-Z0-9*\s]*[\]_a-zA-Z0-9*])\)/
+        pattern: /^\?[>|<]?\(([#.\[\]:,=\-_a-zA-Z0-9*\s]*[\]_a-zA-Z0-9*])\)/
     },
     {
         type: TokenType.NAME,