vsn 0.1.57 → 0.1.60

package/demo/xhr.html

@@ -0,0 +1,17 @@
+<div id="huh-wut" vsn-scope>
+    <style>
+        bb {
+            display: block;
+        }
+    </style>
+    <script vsn-script type="text/vsn">
+        huh_wut = 1;
+        func add(a, b) {
+            ?(bb).@text = `asd 123 ${a} ${b} hmm?`;
+            return a + b;
+        }
+    </script>
+    <bb>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/ArithmeticAssignmentNode.d.ts

@@ -13,10 +13,11 @@ export declare class ArithmeticAssignmentNode extends Node implements TreeNode {
     constructor(left: RootScopeMemberNode | ScopeMemberNode, right: TreeNode, type: TokenType);
     protected _getChildNodes(): Node[];
     evaluate(scope: Scope, dom: DOM, tag?: Tag): Promise<any>;
+    handle(name: any, left: any, right: any, localScope: any): any;
     handleNumber(key: any, left: any, right: any, scope: any): any;
     handleString(key: any, left: any, right: any, scope: any): any;
     handleUnit(key: any, left: any, right: any, scope: any): any;
-    handleDOMObject(key: string, dom: DOM, domObject: DOMObject, tag: Tag): Promise<any>;
+    handleDOMObject(key: string, dom: DOM, scope: Scope, domObject: DOMObject, tag: Tag): Promise<any>;
     handleArray(key: any, left: any, right: any, scope: any): any;
     static match(tokens: Token[]): boolean;
     static parse(lastNode: any, token: any, tokens: Token[]): ArithmeticAssignmentNode;

package/dist/AST/ArithmeticAssignmentNode.js

@@ -134,7 +134,7 @@ var ArithmeticAssignmentNode = /** @class */ (function (_super) {
                         if (!(_i < scopes_1.length)) return [3 /*break*/, 13];
                         localScope = scopes_1[_i];
                         if (!(localScope instanceof DOMObject_1.DOMObject)) return [3 /*break*/, 9];
-                        return [4 /*yield*/, this.handleDOMObject(name, dom, localScope, tag)];
+                        return [4 /*yield*/, this.handleDOMObject(name, dom, scope, localScope, tag)];
                     case 8:
                         _a.sent();
                         return [3 /*break*/, 12];
@@ -148,18 +148,7 @@ var ArithmeticAssignmentNode = /** @class */ (function (_super) {
                         return [4 /*yield*/, this.right.evaluate(scope, dom, tag)];
                     case 11:
                         right = _a.sent();
-                        if (left instanceof Array) {
-                            left = this.handleArray(name, left, right, localScope);
-                        }
-                        else if (left instanceof UnitLiteralNode_1.UnitLiteral || right instanceof UnitLiteralNode_1.UnitLiteral) {
-                            left = this.handleUnit(name, left, right, localScope);
-                        }
-                        else if (Number.isFinite(left)) {
-                            left = this.handleNumber(name, left, right, localScope);
-                        }
-                        else {
-                            left = this.handleString(name, left, right, localScope);
-                        }
+                        left = this.handle(name, left, right, localScope);
                         values.push(left);
                         _a.label = 12;
                     case 12:
@@ -170,6 +159,21 @@ var ArithmeticAssignmentNode = /** @class */ (function (_super) {
             });
         });
     };
+    ArithmeticAssignmentNode.prototype.handle = function (name, left, right, localScope) {
+        if (left instanceof Array) {
+            left = this.handleArray(name, left, right, localScope);
+        }
+        else if (left instanceof UnitLiteralNode_1.UnitLiteral || right instanceof UnitLiteralNode_1.UnitLiteral) {
+            left = this.handleUnit(name, left, right, localScope);
+        }
+        else if (Number.isFinite(left)) {
+            left = this.handleNumber(name, left, right, localScope);
+        }
+        else {
+            left = this.handleString(name, left, right, localScope);
+        }
+        return left;
+    };
     ArithmeticAssignmentNode.prototype.handleNumber = function (key, left, right, scope) {
         if (right !== null && !Number.isFinite(right))
             right = parseFloat("" + right);
@@ -244,19 +248,17 @@ var ArithmeticAssignmentNode = /** @class */ (function (_super) {
         scope.set(key, left);
         return left;
     };
-    ArithmeticAssignmentNode.prototype.handleDOMObject = function (key, dom, domObject, tag) {
+    ArithmeticAssignmentNode.prototype.handleDOMObject = function (key, dom, scope, domObject, tag) {
         return __awaiter(this, void 0, void 0, function () {
             var left, right;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         left = domObject.scope.get(key);
-                        return [4 /*yield*/, this.right.evaluate(domObject.scope, dom, tag)];
+                        return [4 /*yield*/, this.right.evaluate(scope, dom, tag)];
                     case 1:
                         right = _a.sent();
-                        if (left instanceof Array)
-                            return [2 /*return*/, this.handleArray(key, left, right, domObject.scope)];
-                        return [2 /*return*/, this.handleString(key, left, right, domObject.scope)];
+                        return [2 /*return*/, this.handle(key, left, right, domObject.scope)];
                 }
             });
         });

package/dist/AST/ArithmeticAssignmentNode.js.map

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

package/dist/AST/FunctionCallNode.js

@@ -59,6 +59,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.FunctionCallNode = void 0;
 var Node_1 = require("./Node");
 var ScopeMemberNode_1 = require("./ScopeMemberNode");
+var FunctionNode_1 = require("./FunctionNode");
 var FunctionCallNode = /** @class */ (function (_super) {
     __extends(FunctionCallNode, _super);
     function FunctionCallNode(fnc, args) {
@@ -76,22 +77,26 @@ 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;
-            var _a;
-            return __generator(this, function (_b) {
-                switch (_b.label) {
+            var functionScope, values, func;
+            return __generator(this, function (_a) {
+                switch (_a.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 = _b.sent();
-                        _b.label = 2;
+                        functionScope = _a.sent();
+                        _a.label = 2;
                     case 2: return [4 /*yield*/, this.args.evaluate(scope, dom, tag)];
                     case 3:
-                        values = _b.sent();
+                        values = _a.sent();
                         return [4 /*yield*/, this.fnc.evaluate(scope, dom, tag)];
-                    case 4: return [2 /*return*/, (_a = (_b.sent())).call.apply(_a, __spreadArray([functionScope.wrapped || functionScope], values))];
+                    case 4:
+                        func = _a.sent();
+                        if (!(func instanceof FunctionNode_1.FunctionNode)) return [3 /*break*/, 6];
+                        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))];
                 }
             });
         });

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;AAElD;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;wBAChD,qBAAM,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,KAAK,EAAE,GAAG,EAAE,GAAG,CAAC,EAAA;4BAAhD,sBAAO,CAAA,KAAA,CAAC,SAAwC,CAAC,CAAA,CAAC,IAAI,0BAAC,aAAa,CAAC,OAAO,IAAI,aAAa,GAAK,MAAM,IAAE;;;;KAC7G;IACL,uBAAC;AAAD,CAAC,AAvBD,CAA+C,WAAI,GAuBlD;AAvBY,4CAAgB"}
+{"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"}

package/dist/AST/FunctionNode.d.ts

@@ -3,16 +3,15 @@ import { DOM } from "../DOM";
 import { Tag } from "../Tag";
 import { Token, TreeNode } from "../AST";
 import { Node } from "./Node";
-import { LiteralNode } from "./LiteralNode";
-import { RootScopeMemberNode } from "./RootScopeMemberNode";
-import { ScopeMemberNode } from "./ScopeMemberNode";
+import { BlockNode } from "./BlockNode";
 export declare class FunctionNode extends Node implements TreeNode {
-    readonly name: LiteralNode<string>;
-    readonly variables: LiteralNode<string>[];
-    readonly block: RootScopeMemberNode | ScopeMemberNode;
-    constructor(name: LiteralNode<string>, variables: LiteralNode<string>[], block: RootScopeMemberNode | ScopeMemberNode);
+    readonly name: string;
+    readonly args: string[];
+    readonly block: BlockNode;
+    protected requiresPrep: boolean;
+    constructor(name: string, args: string[], block: BlockNode);
     protected _getChildNodes(): Node[];
     prepare(scope: Scope, dom: DOM, tag?: Tag): Promise<void>;
-    evaluate(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;
 }

package/dist/AST/FunctionNode.js

@@ -52,14 +52,17 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FunctionNode = void 0;
+var Scope_1 = require("../Scope");
+var AST_1 = require("../AST");
 var Node_1 = require("./Node");
 var FunctionNode = /** @class */ (function (_super) {
     __extends(FunctionNode, _super);
-    function FunctionNode(name, variables, block) {
+    function FunctionNode(name, args, block) {
         var _this = _super.call(this) || this;
         _this.name = name;
-        _this.variables = variables;
+        _this.args = args;
         _this.block = block;
+        _this.requiresPrep = true;
         return _this;
     }
     FunctionNode.prototype._getChildNodes = function () {
@@ -69,18 +72,59 @@ var FunctionNode = /** @class */ (function (_super) {
     };
     FunctionNode.prototype.prepare = 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*/];
-        }); });
+        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)];
+                    case 1:
+                        _a.sent();
+                        return [2 /*return*/];
+                }
+            });
+        });
     };
     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) {
-            return [2 /*return*/];
-        }); });
+        return __awaiter(this, void 0, void 0, function () {
+            var _this = this;
+            return __generator(this, function (_a) {
+                return [2 /*return*/, function () {
+                        var args = [];
+                        for (var _i = 0; _i < arguments.length; _i++) {
+                            args[_i] = arguments[_i];
+                        }
+                        return __awaiter(_this, void 0, void 0, function () {
+                            var functionScope, _a, _b, arg;
+                            return __generator(this, function (_c) {
+                                switch (_c.label) {
+                                    case 0:
+                                        functionScope = new Scope_1.Scope(scope);
+                                        for (_a = 0, _b = this.args; _a < _b.length; _a++) {
+                                            arg = _b[_a];
+                                            functionScope.set(arg, args.shift());
+                                        }
+                                        return [4 /*yield*/, this.block.evaluate(functionScope, dom, tag)];
+                                    case 1: return [2 /*return*/, _c.sent()];
+                                }
+                            });
+                        });
+                    }];
+            });
+        });
     };
     FunctionNode.parse = function (lastNode, token, tokens) {
-        return new FunctionNode(null, null, null);
+        tokens.shift(); // skip 'func'
+        var name = tokens.shift();
+        var argTokens = AST_1.Tree.getBlockTokens(tokens);
+        var funcArgs = [];
+        for (var _i = 0, argTokens_1 = argTokens; _i < argTokens_1.length; _i++) {
+            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);
     };
     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":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAIA,+BAA4B;AAK5B;IAAkC,gCAAI;IAClC,sBACoB,IAAyB,EACzB,SAAgC,EAChC,KAA4C;QAHhE,YAKI,iBAAO,SACV;QALmB,UAAI,GAAJ,IAAI,CAAqB;QACzB,eAAS,GAAT,SAAS,CAAuB;QAChC,WAAK,GAAL,KAAK,CAAuC;;IAGhE,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;;;;KAAI;IACnD,+BAAQ,GAArB,UAAsB,KAAY,EAAE,GAAQ,EAAE,GAAe;QAAf,oBAAA,EAAA,UAAe;;;;KAAI;IAEnD,kBAAK,GAAnB,UAAoB,QAAQ,EAAE,KAAK,EAAE,MAAe;QAChD,OAAO,IAAI,YAAY,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;IAC9C,CAAC;IACL,mBAAC;AAAD,CAAC,AArBD,CAAkC,WAAI,GAqBrC;AArBY,oCAAY"}
+{"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"}

package/dist/AST.d.ts

@@ -33,52 +33,53 @@ export declare enum TokenType {
     IF = 11,
     ELSE_IF = 12,
     ELSE = 13,
-    NAME = 14,
-    L_BRACE = 15,
-    R_BRACE = 16,
-    L_BRACKET = 17,
-    R_BRACKET = 18,
-    L_PAREN = 19,
-    R_PAREN = 20,
-    TILDE = 21,
-    PERIOD = 22,
-    COMMA = 23,
-    COLON = 24,
-    SEMICOLON = 25,
-    STRING_FORMAT = 26,
-    STRING_LITERAL = 27,
-    NUMBER_LITERAL = 28,
-    BOOLEAN_LITERAL = 29,
-    NULL_LITERAL = 30,
-    STRICT_EQUALS = 31,
-    STRICT_NOT_EQUALS = 32,
-    EQUALS = 33,
-    NOT_EQUALS = 34,
-    GREATER_THAN_EQUAL = 35,
-    LESS_THAN_EQUAL = 36,
-    GREATER_THAN = 37,
-    LESS_THAN = 38,
-    ASSIGN = 39,
-    AND = 40,
-    OR = 41,
-    ADD = 42,
-    SUBTRACT = 43,
-    MULTIPLY = 44,
-    DIVIDE = 45,
-    ADD_ASSIGN = 46,
-    SUBTRACT_ASSIGN = 47,
-    MULTIPLY_ASSIGN = 48,
-    DIVIDE_ASSIGN = 49,
-    EXCLAMATION_POINT = 50,
-    ELEMENT_REFERENCE = 51,
-    ELEMENT_ATTRIBUTE = 52,
-    ELEMENT_STYLE = 53,
-    ELEMENT_QUERY = 54,
-    UNIT = 55,
-    XHR_GET = 56,
-    XHR_POST = 57,
-    XHR_PUT = 58,
-    XHR_DELETE = 59
+    FUNC = 14,
+    NAME = 15,
+    L_BRACE = 16,
+    R_BRACE = 17,
+    L_BRACKET = 18,
+    R_BRACKET = 19,
+    L_PAREN = 20,
+    R_PAREN = 21,
+    TILDE = 22,
+    PERIOD = 23,
+    COMMA = 24,
+    COLON = 25,
+    SEMICOLON = 26,
+    STRING_FORMAT = 27,
+    STRING_LITERAL = 28,
+    NUMBER_LITERAL = 29,
+    BOOLEAN_LITERAL = 30,
+    NULL_LITERAL = 31,
+    STRICT_EQUALS = 32,
+    STRICT_NOT_EQUALS = 33,
+    EQUALS = 34,
+    NOT_EQUALS = 35,
+    GREATER_THAN_EQUAL = 36,
+    LESS_THAN_EQUAL = 37,
+    GREATER_THAN = 38,
+    LESS_THAN = 39,
+    ASSIGN = 40,
+    AND = 41,
+    OR = 42,
+    ADD = 43,
+    SUBTRACT = 44,
+    MULTIPLY = 45,
+    DIVIDE = 46,
+    ADD_ASSIGN = 47,
+    SUBTRACT_ASSIGN = 48,
+    MULTIPLY_ASSIGN = 49,
+    DIVIDE_ASSIGN = 50,
+    EXCLAMATION_POINT = 51,
+    ELEMENT_REFERENCE = 52,
+    ELEMENT_ATTRIBUTE = 53,
+    ELEMENT_STYLE = 54,
+    ELEMENT_QUERY = 55,
+    UNIT = 56,
+    XHR_GET = 57,
+    XHR_POST = 58,
+    XHR_PUT = 59,
+    XHR_DELETE = 60
 }
 export interface TreeNode<T = any> {
     evaluate(scope: Scope, dom: DOM, tag?: Tag): any;

package/dist/AST.js

@@ -61,6 +61,7 @@ var BooleanLiteralNode_1 = require("./AST/BooleanLiteralNode");
 var NotNode_1 = require("./AST/NotNode");
 var XHRNode_1 = require("./AST/XHRNode");
 var StringFormatNode_1 = require("./AST/StringFormatNode");
+var FunctionNode_1 = require("./AST/FunctionNode");
 function lower(str) {
     return str ? str.toLowerCase() : null;
 }
@@ -87,52 +88,53 @@ var TokenType;
     TokenType[TokenType["IF"] = 11] = "IF";
     TokenType[TokenType["ELSE_IF"] = 12] = "ELSE_IF";
     TokenType[TokenType["ELSE"] = 13] = "ELSE";
-    TokenType[TokenType["NAME"] = 14] = "NAME";
-    TokenType[TokenType["L_BRACE"] = 15] = "L_BRACE";
-    TokenType[TokenType["R_BRACE"] = 16] = "R_BRACE";
-    TokenType[TokenType["L_BRACKET"] = 17] = "L_BRACKET";
-    TokenType[TokenType["R_BRACKET"] = 18] = "R_BRACKET";
-    TokenType[TokenType["L_PAREN"] = 19] = "L_PAREN";
-    TokenType[TokenType["R_PAREN"] = 20] = "R_PAREN";
-    TokenType[TokenType["TILDE"] = 21] = "TILDE";
-    TokenType[TokenType["PERIOD"] = 22] = "PERIOD";
-    TokenType[TokenType["COMMA"] = 23] = "COMMA";
-    TokenType[TokenType["COLON"] = 24] = "COLON";
-    TokenType[TokenType["SEMICOLON"] = 25] = "SEMICOLON";
-    TokenType[TokenType["STRING_FORMAT"] = 26] = "STRING_FORMAT";
-    TokenType[TokenType["STRING_LITERAL"] = 27] = "STRING_LITERAL";
-    TokenType[TokenType["NUMBER_LITERAL"] = 28] = "NUMBER_LITERAL";
-    TokenType[TokenType["BOOLEAN_LITERAL"] = 29] = "BOOLEAN_LITERAL";
-    TokenType[TokenType["NULL_LITERAL"] = 30] = "NULL_LITERAL";
-    TokenType[TokenType["STRICT_EQUALS"] = 31] = "STRICT_EQUALS";
-    TokenType[TokenType["STRICT_NOT_EQUALS"] = 32] = "STRICT_NOT_EQUALS";
-    TokenType[TokenType["EQUALS"] = 33] = "EQUALS";
-    TokenType[TokenType["NOT_EQUALS"] = 34] = "NOT_EQUALS";
-    TokenType[TokenType["GREATER_THAN_EQUAL"] = 35] = "GREATER_THAN_EQUAL";
-    TokenType[TokenType["LESS_THAN_EQUAL"] = 36] = "LESS_THAN_EQUAL";
-    TokenType[TokenType["GREATER_THAN"] = 37] = "GREATER_THAN";
-    TokenType[TokenType["LESS_THAN"] = 38] = "LESS_THAN";
-    TokenType[TokenType["ASSIGN"] = 39] = "ASSIGN";
-    TokenType[TokenType["AND"] = 40] = "AND";
-    TokenType[TokenType["OR"] = 41] = "OR";
-    TokenType[TokenType["ADD"] = 42] = "ADD";
-    TokenType[TokenType["SUBTRACT"] = 43] = "SUBTRACT";
-    TokenType[TokenType["MULTIPLY"] = 44] = "MULTIPLY";
-    TokenType[TokenType["DIVIDE"] = 45] = "DIVIDE";
-    TokenType[TokenType["ADD_ASSIGN"] = 46] = "ADD_ASSIGN";
-    TokenType[TokenType["SUBTRACT_ASSIGN"] = 47] = "SUBTRACT_ASSIGN";
-    TokenType[TokenType["MULTIPLY_ASSIGN"] = 48] = "MULTIPLY_ASSIGN";
-    TokenType[TokenType["DIVIDE_ASSIGN"] = 49] = "DIVIDE_ASSIGN";
-    TokenType[TokenType["EXCLAMATION_POINT"] = 50] = "EXCLAMATION_POINT";
-    TokenType[TokenType["ELEMENT_REFERENCE"] = 51] = "ELEMENT_REFERENCE";
-    TokenType[TokenType["ELEMENT_ATTRIBUTE"] = 52] = "ELEMENT_ATTRIBUTE";
-    TokenType[TokenType["ELEMENT_STYLE"] = 53] = "ELEMENT_STYLE";
-    TokenType[TokenType["ELEMENT_QUERY"] = 54] = "ELEMENT_QUERY";
-    TokenType[TokenType["UNIT"] = 55] = "UNIT";
-    TokenType[TokenType["XHR_GET"] = 56] = "XHR_GET";
-    TokenType[TokenType["XHR_POST"] = 57] = "XHR_POST";
-    TokenType[TokenType["XHR_PUT"] = 58] = "XHR_PUT";
-    TokenType[TokenType["XHR_DELETE"] = 59] = "XHR_DELETE";
+    TokenType[TokenType["FUNC"] = 14] = "FUNC";
+    TokenType[TokenType["NAME"] = 15] = "NAME";
+    TokenType[TokenType["L_BRACE"] = 16] = "L_BRACE";
+    TokenType[TokenType["R_BRACE"] = 17] = "R_BRACE";
+    TokenType[TokenType["L_BRACKET"] = 18] = "L_BRACKET";
+    TokenType[TokenType["R_BRACKET"] = 19] = "R_BRACKET";
+    TokenType[TokenType["L_PAREN"] = 20] = "L_PAREN";
+    TokenType[TokenType["R_PAREN"] = 21] = "R_PAREN";
+    TokenType[TokenType["TILDE"] = 22] = "TILDE";
+    TokenType[TokenType["PERIOD"] = 23] = "PERIOD";
+    TokenType[TokenType["COMMA"] = 24] = "COMMA";
+    TokenType[TokenType["COLON"] = 25] = "COLON";
+    TokenType[TokenType["SEMICOLON"] = 26] = "SEMICOLON";
+    TokenType[TokenType["STRING_FORMAT"] = 27] = "STRING_FORMAT";
+    TokenType[TokenType["STRING_LITERAL"] = 28] = "STRING_LITERAL";
+    TokenType[TokenType["NUMBER_LITERAL"] = 29] = "NUMBER_LITERAL";
+    TokenType[TokenType["BOOLEAN_LITERAL"] = 30] = "BOOLEAN_LITERAL";
+    TokenType[TokenType["NULL_LITERAL"] = 31] = "NULL_LITERAL";
+    TokenType[TokenType["STRICT_EQUALS"] = 32] = "STRICT_EQUALS";
+    TokenType[TokenType["STRICT_NOT_EQUALS"] = 33] = "STRICT_NOT_EQUALS";
+    TokenType[TokenType["EQUALS"] = 34] = "EQUALS";
+    TokenType[TokenType["NOT_EQUALS"] = 35] = "NOT_EQUALS";
+    TokenType[TokenType["GREATER_THAN_EQUAL"] = 36] = "GREATER_THAN_EQUAL";
+    TokenType[TokenType["LESS_THAN_EQUAL"] = 37] = "LESS_THAN_EQUAL";
+    TokenType[TokenType["GREATER_THAN"] = 38] = "GREATER_THAN";
+    TokenType[TokenType["LESS_THAN"] = 39] = "LESS_THAN";
+    TokenType[TokenType["ASSIGN"] = 40] = "ASSIGN";
+    TokenType[TokenType["AND"] = 41] = "AND";
+    TokenType[TokenType["OR"] = 42] = "OR";
+    TokenType[TokenType["ADD"] = 43] = "ADD";
+    TokenType[TokenType["SUBTRACT"] = 44] = "SUBTRACT";
+    TokenType[TokenType["MULTIPLY"] = 45] = "MULTIPLY";
+    TokenType[TokenType["DIVIDE"] = 46] = "DIVIDE";
+    TokenType[TokenType["ADD_ASSIGN"] = 47] = "ADD_ASSIGN";
+    TokenType[TokenType["SUBTRACT_ASSIGN"] = 48] = "SUBTRACT_ASSIGN";
+    TokenType[TokenType["MULTIPLY_ASSIGN"] = 49] = "MULTIPLY_ASSIGN";
+    TokenType[TokenType["DIVIDE_ASSIGN"] = 50] = "DIVIDE_ASSIGN";
+    TokenType[TokenType["EXCLAMATION_POINT"] = 51] = "EXCLAMATION_POINT";
+    TokenType[TokenType["ELEMENT_REFERENCE"] = 52] = "ELEMENT_REFERENCE";
+    TokenType[TokenType["ELEMENT_ATTRIBUTE"] = 53] = "ELEMENT_ATTRIBUTE";
+    TokenType[TokenType["ELEMENT_STYLE"] = 54] = "ELEMENT_STYLE";
+    TokenType[TokenType["ELEMENT_QUERY"] = 55] = "ELEMENT_QUERY";
+    TokenType[TokenType["UNIT"] = 56] = "UNIT";
+    TokenType[TokenType["XHR_GET"] = 57] = "XHR_GET";
+    TokenType[TokenType["XHR_POST"] = 58] = "XHR_POST";
+    TokenType[TokenType["XHR_PUT"] = 59] = "XHR_PUT";
+    TokenType[TokenType["XHR_DELETE"] = 60] = "XHR_DELETE";
 })(TokenType = exports.TokenType || (exports.TokenType = {}));
 var TOKEN_PATTERNS = [
     {
@@ -215,6 +217,10 @@ var TOKEN_PATTERNS = [
         type: TokenType.ELSE,
         pattern: /^else\s?(?=\{)/
     },
+    {
+        type: TokenType.FUNC,
+        pattern: /^func\s/
+    },
     {
         type: TokenType.ELEMENT_ATTRIBUTE,
         pattern: /^\.?@[-_a-zA-Z0-9]*/
@@ -518,6 +524,11 @@ var Tree = /** @class */ (function () {
                 blockNodes.push(node);
                 node = null;
             }
+            else if (token.type === TokenType.FUNC) {
+                node = FunctionNode_1.FunctionNode.parse(node, token, tokens);
+                blockNodes.push(node);
+                node = null;
+            }
             else if (StringFormatNode_1.StringFormatNode.match(tokens)) {
                 node = StringFormatNode_1.StringFormatNode.parse(node, tokens[0], tokens);
             }