vsn 0.1.60 → 0.1.63

package/demo/xhr.html

@@ -1,17 +1,60 @@
 <div id="huh-wut" vsn-scope>
     <style>
-        bb {
+        bb,
+        .something-special {
             display: block;
         }
     </style>
     <script vsn-script type="text/vsn">
-        huh_wut = 1;
+        class something-special {
+            func construct() {
+                $color = "#ff00ff";
+                something = "something";
+                @originaltext = @text;
+                @text = 'huh?';
+            }
+
+            func deconstruct() {
+                $color = '#000000';
+                something = null;
+                @text = @originaltext;
+            }
+
+            on click() {
+                console.log('clicky');
+            }
+
+            func t() {
+                if ($color == 'red') {
+                    $color = 'blue';
+                    @text = 'huh?';
+                } else {
+                    $color = 'red';
+                    @text = 'wut?';
+                }
+            }
+        }
+
+        class reset-button {
+            func construct() {
+                @text = 'reset';
+                $color = 'red';
+            }
+
+            on click() {
+                ?>(:parent:parent).@html = << './xhr.html';
+            }
+        }
+
+        ?>(:parent).huh_wut = 1;
         func add(a, b) {
             ?(bb).@text = `asd 123 ${a} ${b} hmm?`;
             return a + b;
         }
     </script>
-    <bb>bb</bb>
+    <div class="something-special" vsn-on:click="t()">asd</div>
+    <div class="something-special" vsn-on:click="t()">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>
 </div>

package/dist/AST/ClassNode.d.ts

@@ -0,0 +1,22 @@
+import { Scope } from "../Scope";
+import { DOM } from "../DOM";
+import { Tag } from "../Tag";
+import { Token, TreeNode } from "../AST";
+import { Node } from "./Node";
+import { BlockNode } from "./BlockNode";
+export declare class ClassNode extends Node implements TreeNode {
+    readonly name: string;
+    readonly block: BlockNode;
+    static readonly classes: {
+        [name: string]: ClassNode;
+    };
+    protected requiresPrep: boolean;
+    readonly classScope: Scope;
+    constructor(name: string, block: BlockNode);
+    prepare(scope: Scope, dom: DOM, tag?: Tag): 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>;
+}

package/dist/AST/ClassNode.js

@@ -0,0 +1,248 @@
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    };
+    return function (d, b) {
+        if (typeof b !== "function" && b !== null)
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (_) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ClassNode = void 0;
+var Scope_1 = require("../Scope");
+var AST_1 = require("../AST");
+var Node_1 = require("./Node");
+var Registry_1 = require("../Registry");
+var OnNode_1 = require("./OnNode");
+var ClassNode = /** @class */ (function (_super) {
+    __extends(ClassNode, _super);
+    function ClassNode(name, block) {
+        var _this = _super.call(this) || this;
+        _this.name = name;
+        _this.block = block;
+        _this.requiresPrep = true;
+        _this.classScope = new Scope_1.Scope();
+        return _this;
+    }
+    ClassNode.prototype.prepare = function (scope, dom, tag) {
+        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) {
+                    case 0:
+                        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)];
+                    case 1:
+                        _b.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*/];
+                }
+            });
+        });
+    };
+    ClassNode.prototype.prepareTag = function (tag, dom, hasConstructor) {
+        if (hasConstructor === void 0) { hasConstructor = null; }
+        return __awaiter(this, void 0, void 0, function () {
+            var 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)];
+                    case 1:
+                        _a.sent();
+                        if (!hasConstructor) return [3 /*break*/, 3];
+                        fnc = this.classScope.get('construct');
+                        return [4 /*yield*/, fnc.evaluate(tag.scope, dom, tag)];
+                    case 2:
+                        (_a.sent())();
+                        _a.label = 3;
+                    case 3:
+                        /*
+                        for (const key of this.classScope.keys) {
+                            if (this.classScope.get(key) instanceof OnNode) {
+                                const on = this.classScope.get(key) as OnNode;
+                                tag.addEventHandler(on.name, [], await on.getFunction(tag.scope, dom, tag), on);
+                            }
+                        }
+                         */
+                        tag.preppedClasses.push(this.name);
+                        return [2 /*return*/];
+                }
+            });
+        });
+    };
+    ClassNode.prototype.tearDownTag = function (tag, dom, hasDeconstructor) {
+        if (hasDeconstructor === void 0) { hasDeconstructor = null; }
+        return __awaiter(this, void 0, void 0, function () {
+            var fnc, _i, _a, key, on;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        if (hasDeconstructor === null)
+                            hasDeconstructor = this.classScope.has('deconstruct');
+                        if (!hasDeconstructor) return [3 /*break*/, 2];
+                        fnc = this.classScope.get('deconstruct');
+                        return [4 /*yield*/, fnc.evaluate(tag.scope, dom, tag)];
+                    case 1:
+                        (_b.sent())();
+                        _b.label = 2;
+                    case 2:
+                        for (_i = 0, _a = this.classScope.keys; _i < _a.length; _i++) {
+                            key = _a[_i];
+                            if (this.classScope.get(key) instanceof OnNode_1.OnNode) {
+                                on = this.classScope.get(key);
+                                tag.removeContextEventHandlers(on);
+                            }
+                        }
+                        tag.preppedClasses.splice(tag.preppedClasses.indexOf(this.name), 1);
+                        return [2 /*return*/];
+                }
+            });
+        });
+    };
+    ClassNode.prototype.evaluate = function (scope, dom, tag) {
+        if (tag === void 0) { tag = null; }
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+                return [2 /*return*/, null];
+            });
+        });
+    };
+    ClassNode.parse = function (lastNode, token, tokens) {
+        tokens.shift(); // skip 'class'
+        var nameParts = [];
+        for (var _i = 0, tokens_1 = tokens; _i < tokens_1.length; _i++) {
+            var t = tokens_1[_i];
+            if (t.type === AST_1.TokenType.L_BRACE)
+                break;
+            nameParts.push(t.value);
+        }
+        var name = nameParts.join('');
+        tokens.splice(0, nameParts.length);
+        var block = AST_1.Tree.processTokens(AST_1.Tree.getNextStatementTokens(tokens, true, true));
+        return new ClassNode(name, block);
+    };
+    ClassNode.checkForClassChanges = function (element, dom, tag) {
+        if (tag === void 0) { tag = null; }
+        return __awaiter(this, void 0, void 0, function () {
+            var classes, addedClasses, removedClasses, _i, addedClasses_1, addedClass, classNode, _a, removedClasses_1, removedClass, classNode;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        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];
+                        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();
+                        _b.label = 3;
+                    case 3:
+                        _i = 0, addedClasses_1 = addedClasses;
+                        _b.label = 4;
+                    case 4:
+                        if (!(_i < addedClasses_1.length)) return [3 /*break*/, 7];
+                        addedClass = addedClasses_1[_i];
+                        classNode = Registry_1.Registry.instance.classes.getSynchronous(addedClass);
+                        if (!classNode) return [3 /*break*/, 6];
+                        return [4 /*yield*/, classNode.prepareTag(tag, dom)];
+                    case 5:
+                        _b.sent();
+                        _b.label = 6;
+                    case 6:
+                        _i++;
+                        return [3 /*break*/, 4];
+                    case 7:
+                        _a = 0, removedClasses_1 = removedClasses;
+                        _b.label = 8;
+                    case 8:
+                        if (!(_a < removedClasses_1.length)) return [3 /*break*/, 11];
+                        removedClass = removedClasses_1[_a];
+                        classNode = Registry_1.Registry.instance.classes.getSynchronous(removedClass);
+                        if (!classNode) return [3 /*break*/, 10];
+                        return [4 /*yield*/, classNode.tearDownTag(tag, dom)];
+                    case 9:
+                        _b.sent();
+                        _b.label = 10;
+                    case 10:
+                        _a++;
+                        return [3 /*break*/, 8];
+                    case 11: return [2 /*return*/];
+                }
+            });
+        });
+    };
+    ClassNode.classes = {};
+    return ClassNode;
+}(Node_1.Node));
+exports.ClassNode = ClassNode;
+//# sourceMappingURL=ClassNode.js.map

package/dist/AST/ClassNode.js.map

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

package/dist/AST/FunctionCallNode.js

@@ -60,6 +60,7 @@ exports.FunctionCallNode = void 0;
 var Node_1 = require("./Node");
 var ScopeMemberNode_1 = require("./ScopeMemberNode");
 var FunctionNode_1 = require("./FunctionNode");
+var Registry_1 = require("../Registry");
 var FunctionCallNode = /** @class */ (function (_super) {
     __extends(FunctionCallNode, _super);
     function FunctionCallNode(fnc, args) {
@@ -77,26 +78,63 @@ var FunctionCallNode = /** @class */ (function (_super) {
     FunctionCallNode.prototype.evaluate = function (scope, dom, tag) {
         if (tag === void 0) { tag = null; }
         return __awaiter(this, void 0, void 0, function () {
-            var functionScope, values, func;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
+            var functionScope, values, func, functionName, returnValues, calls, _i, _a, className, cls, fnc, _b, _c;
+            return __generator(this, function (_d) {
+                switch (_d.label) {
                     case 0:
                         functionScope = scope;
                         if (!(this.fnc instanceof ScopeMemberNode_1.ScopeMemberNode)) return [3 /*break*/, 2];
                         return [4 /*yield*/, this.fnc.scope.evaluate(scope, dom, tag)];
                     case 1:
-                        functionScope = _a.sent();
-                        _a.label = 2;
+                        functionScope = _d.sent();
+                        _d.label = 2;
                     case 2: return [4 /*yield*/, this.args.evaluate(scope, dom, tag)];
                     case 3:
-                        values = _a.sent();
+                        values = _d.sent();
                         return [4 /*yield*/, this.fnc.evaluate(scope, dom, tag)];
                     case 4:
-                        func = _a.sent();
-                        if (!(func instanceof FunctionNode_1.FunctionNode)) return [3 /*break*/, 6];
+                        func = _d.sent();
+                        if (!!func) return [3 /*break*/, 10];
+                        return [4 /*yield*/, this.fnc.name.evaluate(scope, dom, tag)];
+                    case 5:
+                        functionName = _d.sent();
+                        returnValues = [];
+                        calls = 0;
+                        _i = 0, _a = tag.preppedClasses;
+                        _d.label = 6;
+                    case 6:
+                        if (!(_i < _a.length)) return [3 /*break*/, 9];
+                        className = _a[_i];
+                        cls = Registry_1.Registry.instance.classes.getSynchronous(className);
+                        if (!cls) return [3 /*break*/, 8];
+                        if (!cls.classScope.has(functionName)) return [3 /*break*/, 8];
+                        fnc = cls.classScope.get(functionName);
+                        _c = (_b = returnValues).push;
+                        return [4 /*yield*/, fnc.evaluate(functionScope, dom, tag)];
+                    case 7:
+                        _c.apply(_b, [(_d.sent()).apply(void 0, values)]);
+                        calls++;
+                        _d.label = 8;
+                    case 8:
+                        _i++;
+                        return [3 /*break*/, 6];
+                    case 9:
+                        if (calls === 1) {
+                            return [2 /*return*/, returnValues[0]];
+                        }
+                        else if (calls === 0) {
+                            throw new Error("Function " + functionName + " not found");
+                        }
+                        else {
+                            return [2 /*return*/, returnValues];
+                        }
+                        return [3 /*break*/, 13];
+                    case 10:
+                        if (!(func instanceof FunctionNode_1.FunctionNode)) return [3 /*break*/, 12];
                         return [4 /*yield*/, func.evaluate(functionScope, dom, tag)];
-                    case 5: return [2 /*return*/, (_a.sent()).apply(void 0, values)];
-                    case 6: return [2 /*return*/, func.call.apply(func, __spreadArray([functionScope.wrapped || functionScope], values))];
+                    case 11: return [2 /*return*/, (_d.sent()).apply(void 0, values)];
+                    case 12: return [2 /*return*/, func.call.apply(func, __spreadArray([functionScope.wrapped || functionScope], values))];
+                    case 13: return [2 /*return*/];
                 }
             });
         });

package/dist/AST/FunctionCallNode.js.map

@@ -1 +1 @@
-{"version":3,"file":"FunctionCallNode.js","sourceRoot":"","sources":["../../src/AST/FunctionCallNode.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAIA,+BAA4B;AAE5B,qDAAkD;AAClD,+CAA4C;AAE5C;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;IAEY,mCAAQ,GAArB,UAAsB,KAAY,EAAE,GAAQ,EAAE,GAAe;QAAf,oBAAA,EAAA,UAAe;;;;;;wBACrD,aAAa,GAAU,KAAK,CAAC;6BAC7B,CAAA,IAAI,CAAC,GAAG,YAAY,iCAAe,CAAA,EAAnC,wBAAmC;wBACnB,qBAAM,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,QAAQ,CAAC,KAAK,EAAE,GAAG,EAAE,GAAG,CAAC,EAAA;;wBAA9D,aAAa,GAAG,SAA8C,CAAC;;4BAEpD,qBAAM,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,GAAG,EAAE,GAAG,CAAC,EAAA;;wBAAlD,MAAM,GAAG,SAAyC;wBAC3C,qBAAM,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,KAAK,EAAE,GAAG,EAAE,GAAG,CAAC,EAAA;;wBAA/C,IAAI,GAAG,SAAwC;6BACjD,CAAA,IAAI,YAAY,2BAAY,CAAA,EAA5B,wBAA4B;wBACpB,qBAAM,IAAI,CAAC,QAAQ,CAAC,aAAa,EAAE,GAAG,EAAE,GAAG,CAAC,EAAA;4BAApD,sBAAO,CAAC,SAAoD,CAAA,eAAI,MAAM,GAAE;4BAExE,sBAAO,IAAI,CAAC,IAAI,OAAT,IAAI,iBAAM,aAAa,CAAC,OAAO,IAAI,aAAa,GAAK,MAAM,IAAE;;;;KAE3E;IACL,uBAAC;AAAD,CAAC,AA5BD,CAA+C,WAAI,GA4BlD;AA5BY,4CAAgB"}
+{"version":3,"file":"FunctionCallNode.js","sourceRoot":"","sources":["../../src/AST/FunctionCallNode.ts"],"names":[],"mappings":"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"}

package/dist/AST/FunctionNode.d.ts

@@ -13,5 +13,6 @@ export declare class FunctionNode extends Node implements TreeNode {
     protected _getChildNodes(): Node[];
     prepare(scope: Scope, dom: DOM, tag?: Tag): Promise<void>;
     evaluate(scope: Scope, dom: DOM, tag?: Tag): Promise<(...args: any[]) => Promise<any>>;
-    static parse(lastNode: any, token: any, tokens: Token[]): FunctionNode;
+    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

@@ -86,6 +86,17 @@ var FunctionNode = /** @class */ (function (_super) {
         });
     };
     FunctionNode.prototype.evaluate = function (scope, dom, tag) {
+        if (tag === void 0) { tag = null; }
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, this.getFunction(scope, dom, tag)];
+                    case 1: return [2 /*return*/, _a.sent()];
+                }
+            });
+        });
+    };
+    FunctionNode.prototype.getFunction = function (scope, dom, tag) {
         if (tag === void 0) { tag = null; }
         return __awaiter(this, void 0, void 0, function () {
             var _this = this;
@@ -100,7 +111,7 @@ var FunctionNode = /** @class */ (function (_super) {
                             return __generator(this, function (_c) {
                                 switch (_c.label) {
                                     case 0:
-                                        functionScope = new Scope_1.Scope(scope);
+                                        functionScope = new Scope_1.FunctionScope(scope);
                                         for (_a = 0, _b = this.args; _a < _b.length; _a++) {
                                             arg = _b[_a];
                                             functionScope.set(arg, args.shift());
@@ -114,7 +125,8 @@ var FunctionNode = /** @class */ (function (_super) {
             });
         });
     };
-    FunctionNode.parse = function (lastNode, token, tokens) {
+    FunctionNode.parse = function (lastNode, token, tokens, cls) {
+        if (cls === void 0) { cls = FunctionNode; }
         tokens.shift(); // skip 'func'
         var name = tokens.shift();
         var argTokens = AST_1.Tree.getBlockTokens(tokens);
@@ -123,8 +135,8 @@ var FunctionNode = /** @class */ (function (_super) {
             var t = argTokens_1[_i];
             funcArgs.push(t[0].value);
         }
-        var block = AST_1.Tree.processTokens(AST_1.Tree.getBlockTokens(tokens, null)[0]);
-        return new FunctionNode(name.value, funcArgs, block);
+        var block = AST_1.Tree.processTokens(AST_1.Tree.getNextStatementTokens(tokens, true, true));
+        return new cls(name.value, funcArgs, block);
     };
     return FunctionNode;
 }(Node_1.Node));

package/dist/AST/FunctionNode.js.map

@@ -1 +1 @@
-{"version":3,"file":"FunctionNode.js","sourceRoot":"","sources":["../../src/AST/FunctionNode.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,kCAA+B;AAG/B,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;;;;gBACzD,sBAAO;wBAAO,cAAO;6BAAP,UAAO,EAAP,qBAAO,EAAP,IAAO;4BAAP,yBAAO;;;;;;;wCACX,aAAa,GAAG,IAAI,aAAK,CAAC,KAAK,CAAC,CAAC;wCACvC,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,UAAoB,QAAQ,EAAE,KAAK,EAAE,MAAe;QAChD,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,cAAc,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QACvE,OAAO,IAAI,YAAY,CAAC,IAAI,CAAC,KAAK,EAAE,QAAQ,EAAE,KAAK,CAAC,CAAC;IACzD,CAAC;IACL,mBAAC;AAAD,CAAC,AA3CD,CAAkC,WAAI,GA2CrC;AA3CY,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;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"}

package/dist/AST/OnNode.d.ts

@@ -0,0 +1,9 @@
+import { Token, TreeNode } from "../AST";
+import { FunctionNode } from "./FunctionNode";
+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>;
+    static parse(lastNode: any, token: any, tokens: Token[]): OnNode;
+}

package/dist/{attributes/ClassConstructor.js → AST/OnNode.js}

@@ -14,12 +14,6 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
-var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-};
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -57,48 +51,39 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     }
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ClassConstructor = void 0;
-var Attribute_1 = require("../Attribute");
-var Registry_1 = require("../Registry");
-var ClassConstructor = /** @class */ (function (_super) {
-    __extends(ClassConstructor, _super);
-    function ClassConstructor() {
+exports.OnNode = void 0;
+var FunctionNode_1 = require("./FunctionNode");
+var OnNode = /** @class */ (function (_super) {
+    __extends(OnNode, _super);
+    function OnNode() {
         return _super !== null && _super.apply(this, arguments) || this;
     }
-    ClassConstructor.prototype.setup = function () {
+    OnNode.prototype.prepare = function (scope, dom, tag) {
+        if (tag === void 0) { tag = null; }
         return __awaiter(this, void 0, void 0, function () {
-            var parentScope, cls;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
+            var _a, _b, _c;
+            return __generator(this, function (_d) {
+                switch (_d.label) {
                     case 0:
-                        parentScope = this.tag.parentTag.scope;
-                        if (!parentScope)
-                            return [2 /*return*/];
-                        this.attributeKey = this.getAttributeBinding();
-                        this.className = this.getAttributeValue(this.defaultClassName);
-                        return [4 /*yield*/, Registry_1.Registry.instance.classes.get(this.className)];
+                        if (!tag) return [3 /*break*/, 2];
+                        _b = (_a = tag).addEventHandler;
+                        _c = [this.name, []];
+                        return [4 /*yield*/, this.getFunction(scope, dom, tag)];
                     case 1:
-                        cls = _a.sent();
-                        this.instantiateClass(cls);
-                        if (this.attributeKey && parentScope)
-                            parentScope.set(this.attributeKey, this.tag.scope);
-                        return [4 /*yield*/, _super.prototype.setup.call(this)];
-                    case 2:
-                        _a.sent();
+                        _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 3:
+                        _d.sent();
                         return [2 /*return*/];
                 }
             });
         });
     };
-    ClassConstructor.prototype.instantiateClass = function (cls) {
-        this.tag.wrap(cls);
+    OnNode.parse = function (lastNode, token, tokens) {
+        return _super.parse.call(this, lastNode, token, tokens, OnNode);
     };
-    ClassConstructor.canDefer = false;
-    ClassConstructor.scoped = true;
-    ClassConstructor = __decorate([
-        Registry_1.Registry.attribute('vsn-controller')
-    ], ClassConstructor);
-    return ClassConstructor;
-}(Attribute_1.Attribute));
-exports.ClassConstructor = ClassConstructor;
-//# sourceMappingURL=ClassConstructor.js.map
+    return OnNode;
+}(FunctionNode_1.FunctionNode));
+exports.OnNode = OnNode;
+//# sourceMappingURL=OnNode.js.map

package/dist/AST/OnNode.js.map

@@ -0,0 +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"}