vsn 0.1.111 → 0.1.113

package/dist/attributes/XHRAttribute.d.ts

@@ -0,0 +1,12 @@
+import { Attribute } from "../Attribute";
+import { Tree } from "../AST";
+export declare class XHRAttribute extends Attribute {
+    static readonly canDefer: boolean;
+    protected tree: Tree;
+    get code(): any;
+    compile(): Promise<void>;
+    connect(): Promise<void>;
+    get isForm(): boolean;
+    get isAnchor(): boolean;
+    handleEvent(e: any): Promise<void>;
+}

package/dist/attributes/XHRAttribute.js

@@ -0,0 +1,180 @@
+"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 __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) {
+        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.XHRAttribute = void 0;
+var Registry_1 = require("../Registry");
+var Attribute_1 = require("../Attribute");
+var AST_1 = require("../AST");
+var XHRAttribute = /** @class */ (function (_super) {
+    __extends(XHRAttribute, _super);
+    function XHRAttribute() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    Object.defineProperty(XHRAttribute.prototype, "code", {
+        get: function () {
+            return this.getAttributeValue();
+        },
+        enumerable: false,
+        configurable: true
+    });
+    XHRAttribute.prototype.compile = function () {
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        this.tree = new AST_1.Tree(this.code);
+                        return [4 /*yield*/, this.tree.prepare(this.tag.scope, this.tag.dom, this.tag)];
+                    case 1:
+                        _a.sent();
+                        return [4 /*yield*/, _super.prototype.compile.call(this)];
+                    case 2:
+                        _a.sent();
+                        return [2 /*return*/];
+                }
+            });
+        });
+    };
+    XHRAttribute.prototype.connect = function () {
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        if (this.isForm) {
+                            this.tag.addEventHandler('submit', this.getAttributeModifiers(), this.handleEvent, this);
+                        }
+                        else if (this.isAnchor) {
+                            this.tag.addEventHandler('click', this.getAttributeModifiers(), this.handleEvent, this);
+                        }
+                        return [4 /*yield*/, _super.prototype.connect.call(this)];
+                    case 1:
+                        _a.sent();
+                        return [2 /*return*/];
+                }
+            });
+        });
+    };
+    Object.defineProperty(XHRAttribute.prototype, "isForm", {
+        get: function () {
+            return this.tag.element.tagName === 'FORM';
+        },
+        enumerable: false,
+        configurable: true
+    });
+    Object.defineProperty(XHRAttribute.prototype, "isAnchor", {
+        get: function () {
+            return this.tag.element.tagName === 'A';
+        },
+        enumerable: false,
+        configurable: true
+    });
+    XHRAttribute.prototype.handleEvent = function (e) {
+        return __awaiter(this, void 0, void 0, function () {
+            var request, method, url, data;
+            var _this = this;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        e.preventDefault();
+                        request = new XMLHttpRequest();
+                        request.setRequestHeader('X-Requested-With', 'XMLHttpRequest');
+                        if (this.isForm) {
+                            url = this.tag.element.getAttribute('action');
+                            method = this.getAttributeBinding(this.tag.element.getAttribute('method'));
+                            data = new FormData(this.tag.element);
+                        }
+                        else if (this.isAnchor) {
+                            url = this.tag.element.getAttribute('href');
+                            method = this.getAttributeBinding('GET');
+                        }
+                        request.onload = function () { return __awaiter(_this, void 0, void 0, function () {
+                            return __generator(this, function (_a) {
+                                switch (_a.label) {
+                                    case 0:
+                                        this.tag.scope.set('status', request.status);
+                                        if (!(request.status >= 200 && request.status < 300)) return [3 /*break*/, 2];
+                                        this.tag.scope.set('response', request.response);
+                                        return [4 /*yield*/, this.tree.evaluate(this.tag.scope, this.tag.dom, this.tag)];
+                                    case 1:
+                                        _a.sent();
+                                        return [3 /*break*/, 3];
+                                    case 2:
+                                        console.error(request.statusText);
+                                        _a.label = 3;
+                                    case 3: return [2 /*return*/];
+                                }
+                            });
+                        }); };
+                        request.open(method, url);
+                        request.send(data);
+                        return [4 /*yield*/, this.tree.evaluate(this.tag.scope, this.tag.dom, this.tag)];
+                    case 1:
+                        _a.sent();
+                        return [2 /*return*/];
+                }
+            });
+        });
+    };
+    XHRAttribute.canDefer = false;
+    XHRAttribute = __decorate([
+        Registry_1.Registry.attribute('vsn-xhr')
+    ], XHRAttribute);
+    return XHRAttribute;
+}(Attribute_1.Attribute));
+exports.XHRAttribute = XHRAttribute;
+//# sourceMappingURL=XHRAttribute.js.map

package/dist/attributes/XHRAttribute.js.map

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

package/dist/attributes/_imports.d.ts

@@ -27,3 +27,4 @@ export { StandardAttribute } from "./StandardAttribute";
 export { StyleAttribute } from "./StyleAttribute";
 export { TemplateAttribute } from "./TemplateAttribute";
 export { TypeAttribute } from "./TypeAttribute";
+export { XHRAttribute } from "./XHRAttribute";

package/dist/attributes/_imports.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.TypeAttribute = exports.TemplateAttribute = exports.StyleAttribute = exports.StandardAttribute = exports.SetAttribute = exports.ServiceAttribute = exports.ScriptAttribute = exports.ScopeChange = exports.ScopeAttribute = exports.RootAttribute = exports.Referenced = exports.On = exports.Name = exports.ModelAttribute = exports.ListItemModel = exports.ListItem = exports.List = exports.LazyAttribute = exports.KeyUp = exports.KeyDown = exports.JSONAttribute = exports.If = exports.Format = exports.Exec = exports.DisableIf = exports.ControllerAttribute = exports.ComponentAttribute = exports.Bind = exports.AddClassIf = void 0;
+exports.XHRAttribute = exports.TypeAttribute = exports.TemplateAttribute = exports.StyleAttribute = exports.StandardAttribute = exports.SetAttribute = exports.ServiceAttribute = exports.ScriptAttribute = exports.ScopeChange = exports.ScopeAttribute = exports.RootAttribute = exports.Referenced = exports.On = exports.Name = exports.ModelAttribute = exports.ListItemModel = exports.ListItem = exports.List = exports.LazyAttribute = exports.KeyUp = exports.KeyDown = exports.JSONAttribute = exports.If = exports.Format = exports.Exec = exports.DisableIf = exports.ControllerAttribute = exports.ComponentAttribute = exports.Bind = exports.AddClassIf = void 0;
 var AddClassIf_1 = require("./AddClassIf");
 Object.defineProperty(exports, "AddClassIf", { enumerable: true, get: function () { return AddClassIf_1.AddClassIf; } });
 var Bind_1 = require("./Bind");
@@ -59,4 +59,6 @@ var TemplateAttribute_1 = require("./TemplateAttribute");
 Object.defineProperty(exports, "TemplateAttribute", { enumerable: true, get: function () { return TemplateAttribute_1.TemplateAttribute; } });
 var TypeAttribute_1 = require("./TypeAttribute");
 Object.defineProperty(exports, "TypeAttribute", { enumerable: true, get: function () { return TypeAttribute_1.TypeAttribute; } });
+var XHRAttribute_1 = require("./XHRAttribute");
+Object.defineProperty(exports, "XHRAttribute", { enumerable: true, get: function () { return XHRAttribute_1.XHRAttribute; } });
 //# sourceMappingURL=_imports.js.map

package/dist/attributes/_imports.js.map

@@ -1 +1 @@
-{"version":3,"file":"_imports.js","sourceRoot":"","sources":["../../src/attributes/_imports.ts"],"names":[],"mappings":";;;AAAA,2CAAwC;AAAhC,wGAAA,UAAU,OAAA;AAClB,+BAA4B;AAApB,4FAAA,IAAI,OAAA;AACZ,2DAAwD;AAAhD,wHAAA,kBAAkB,OAAA;AAC1B,6DAA0D;AAAlD,0HAAA,mBAAmB,OAAA;AAC3B,yCAAsC;AAA9B,sGAAA,SAAS,OAAA;AACjB,+BAA4B;AAApB,4FAAA,IAAI,OAAA;AACZ,mCAAgC;AAAxB,gGAAA,MAAM,OAAA;AACd,2BAAwB;AAAhB,wFAAA,EAAE,OAAA;AACV,iDAA8C;AAAtC,8GAAA,aAAa,OAAA;AACrB,qCAAkC;AAA1B,kGAAA,OAAO,OAAA;AACf,iCAA8B;AAAtB,8FAAA,KAAK,OAAA;AACb,iDAA8C;AAAtC,8GAAA,aAAa,OAAA;AACrB,+BAA4B;AAApB,4FAAA,IAAI,OAAA;AACZ,uCAAoC;AAA5B,oGAAA,QAAQ,OAAA;AAChB,iDAA8C;AAAtC,8GAAA,aAAa,OAAA;AACrB,mDAAgD;AAAxC,gHAAA,cAAc,OAAA;AACtB,+BAA4B;AAApB,4FAAA,IAAI,OAAA;AACZ,2BAAwB;AAAhB,wFAAA,EAAE,OAAA;AACV,2CAAwC;AAAhC,wGAAA,UAAU,OAAA;AAClB,iDAA8C;AAAtC,8GAAA,aAAa,OAAA;AACrB,mDAAgD;AAAxC,gHAAA,cAAc,OAAA;AACtB,6CAA0C;AAAlC,0GAAA,WAAW,OAAA;AACnB,qDAAkD;AAA1C,kHAAA,eAAe,OAAA;AACvB,uDAAoD;AAA5C,oHAAA,gBAAgB,OAAA;AACxB,+CAA4C;AAApC,4GAAA,YAAY,OAAA;AACpB,yDAAsD;AAA9C,sHAAA,iBAAiB,OAAA;AACzB,mDAAgD;AAAxC,gHAAA,cAAc,OAAA;AACtB,yDAAsD;AAA9C,sHAAA,iBAAiB,OAAA;AACzB,iDAA8C;AAAtC,8GAAA,aAAa,OAAA"}
+{"version":3,"file":"_imports.js","sourceRoot":"","sources":["../../src/attributes/_imports.ts"],"names":[],"mappings":";;;AAAA,2CAAwC;AAAhC,wGAAA,UAAU,OAAA;AAClB,+BAA4B;AAApB,4FAAA,IAAI,OAAA;AACZ,2DAAwD;AAAhD,wHAAA,kBAAkB,OAAA;AAC1B,6DAA0D;AAAlD,0HAAA,mBAAmB,OAAA;AAC3B,yCAAsC;AAA9B,sGAAA,SAAS,OAAA;AACjB,+BAA4B;AAApB,4FAAA,IAAI,OAAA;AACZ,mCAAgC;AAAxB,gGAAA,MAAM,OAAA;AACd,2BAAwB;AAAhB,wFAAA,EAAE,OAAA;AACV,iDAA8C;AAAtC,8GAAA,aAAa,OAAA;AACrB,qCAAkC;AAA1B,kGAAA,OAAO,OAAA;AACf,iCAA8B;AAAtB,8FAAA,KAAK,OAAA;AACb,iDAA8C;AAAtC,8GAAA,aAAa,OAAA;AACrB,+BAA4B;AAApB,4FAAA,IAAI,OAAA;AACZ,uCAAoC;AAA5B,oGAAA,QAAQ,OAAA;AAChB,iDAA8C;AAAtC,8GAAA,aAAa,OAAA;AACrB,mDAAgD;AAAxC,gHAAA,cAAc,OAAA;AACtB,+BAA4B;AAApB,4FAAA,IAAI,OAAA;AACZ,2BAAwB;AAAhB,wFAAA,EAAE,OAAA;AACV,2CAAwC;AAAhC,wGAAA,UAAU,OAAA;AAClB,iDAA8C;AAAtC,8GAAA,aAAa,OAAA;AACrB,mDAAgD;AAAxC,gHAAA,cAAc,OAAA;AACtB,6CAA0C;AAAlC,0GAAA,WAAW,OAAA;AACnB,qDAAkD;AAA1C,kHAAA,eAAe,OAAA;AACvB,uDAAoD;AAA5C,oHAAA,gBAAgB,OAAA;AACxB,+CAA4C;AAApC,4GAAA,YAAY,OAAA;AACpB,yDAAsD;AAA9C,sHAAA,iBAAiB,OAAA;AACzB,mDAAgD;AAAxC,gHAAA,cAAc,OAAA;AACtB,yDAAsD;AAA9C,sHAAA,iBAAiB,OAAA;AACzB,iDAA8C;AAAtC,8GAAA,aAAa,OAAA;AACrB,+CAA4C;AAApC,4GAAA,YAAY,OAAA"}

package/dist/version.d.ts

@@ -1 +1 @@
-export declare const VERSION = "0.1.111";
+export declare const VERSION = "0.1.113";

package/dist/version.js

@@ -1,5 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.VERSION = void 0;
-exports.VERSION = '0.1.111';
+exports.VERSION = '0.1.113';
 //# sourceMappingURL=version.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vsn",
-  "version": "0.1.111",
+  "version": "0.1.113",
   "description": "SEO Friendly Javascript/Typescript Framework",
   "keywords": [
     "framework",

package/src/AST/FunctionCallNode.ts

@@ -29,8 +29,12 @@ export class FunctionCallNode<T = any> extends Node implements TreeNode {
         // @todo: Need to rewrite/refactor this. It's a bit of a mess with element queries.
         let tags: Tag[] = [];
         let functionScope: Scope = scope;
+        let functionName: string = '';
+        let instanceOfScopeMemberNode = false;
         if (this.fnc instanceof ScopeMemberNode) {
+            instanceOfScopeMemberNode = true
             functionScope = await this.fnc.scope.evaluate(scope, dom, tag);
+            functionName = await this.fnc.name.evaluate(scope, dom, tag);
             if (this.fnc.scope instanceof ElementQueryNode) {
                 const _tags = await this.fnc.scope.evaluate(scope, dom, tag);
                 if (_tags instanceof Array) {
@@ -47,6 +51,7 @@ export class FunctionCallNode<T = any> extends Node implements TreeNode {
 
         const values = await this.args.evaluate(scope, dom, tag);
         let func = await this.fnc.evaluate(scope, dom, tag);
+        console.log(tag?.element, functionName, func, scope.keys, functionScope?.keys, instanceOfScopeMemberNode);
         if (!func || func instanceof Array) {
             const functionName = await (this.fnc as any).name.evaluate(scope, dom, tag);
             const returnValues = [];

package/src/AST/ScopeMemberNode.ts

@@ -51,6 +51,8 @@ export class ScopeMemberNode extends ScopeNodeAbstract implements TreeNode {
             }
             const name = await this.name.evaluate(scope, dom, tag);
             await this.applyModifiers(name, parent, dom, tag);
+            if (!parent.get)
+                console.log('nani?', parent);
             const value: any = parent.get(name, false);
             values.push(value instanceof Scope && value.wrapped || value);
         }

package/src/Controller.ts

@@ -7,6 +7,15 @@ export abstract class Controller extends ScopeData {
     protected _tag: Tag;
     protected _element: HTMLElement;
 
+    constructor() {
+        super();
+        for (const k in this) {
+            if (this[k] as any instanceof Function) {
+                this.__properties__.push(k);
+            }
+        }
+    }
+
     public get scope(): Scope {
         return this._scope;
     }
@@ -24,12 +33,4 @@ export abstract class Controller extends ScopeData {
         this._tag = tag;
         this._element = element;
     }
-
-    public get(key: string): any {
-        return this._scope?.get(key);
-    }
-
-    public set(key: string, value: any): void {
-        this._scope?.set(key, value);
-    }
 }

package/src/Scope/ScopeDataAbstract.ts

@@ -23,8 +23,8 @@ export class ScopeDataAbstract extends EventDispatcher {
             return this.getProperty(name);
         }
         config = config || {};
-        const instance = new propertyType(config.default, config),
-            propDesc = Object.getOwnPropertyDescriptor(this, name);
+        const instance = new propertyType(config.default, config);
+        const propDesc = Object.getOwnPropertyDescriptor(this, name);
         this['__'+name] = instance;
         this.__properties__.push(name);
 
@@ -101,11 +101,11 @@ export class ScopeDataAbstract extends EventDispatcher {
         return data;
     }
 
-    get(key: string) {
+    public get(key: string) {
         return this[key];
     }
 
-    set(key: string, value: any) {
+    public set(key: string, value: any) {
         this[key] = value;
     }
 

package/src/Tag.ts

@@ -38,7 +38,8 @@ export class Tag extends DOMObject {
         '@text',
         '@html',
         '@class',
-        '@value'
+        '@value',
+        '@disabled'
     ];
 
     protected inputTags: string[] = [
@@ -395,6 +396,12 @@ export class Tag extends DOMObject {
                 const classes: string[] = value instanceof Array ? value : [value];
                 if (classes.length)
                     this.element.classList.add(...classes);
+            } else if (key === '@disabled') {
+                if (!!value) {
+                    this.element.setAttribute('disabled', '');
+                } else {
+                    this.element.removeAttribute('disabled');
+                }
             }
         } else {
             this.element.setAttribute(key, value);
@@ -411,6 +418,8 @@ export class Tag extends DOMObject {
                 return this.value;
             else if (key === '@class') {
                 return Array.from(this.element.classList);
+            } else if (key === '@disabled') {
+                return this.element.hasAttribute('disabled');
             }
         }
         return this.element.getAttribute(key);

package/src/attributes/ControllerAttribute.ts

@@ -1,34 +1,32 @@
 import {Scope} from "../Scope";
 import {Attribute} from "../Attribute";
 import {Registry} from "../Registry";
+import {Controller} from "../Controller";
 
 @Registry.attribute('vsn-controller')
 export class ControllerAttribute extends Attribute {
     public static readonly canDefer: boolean = false;
     public static readonly scoped: boolean = true;
     public readonly registryName: string = 'controllers'
-    public readonly assignToParent: boolean = true;
     protected attributeKey: string;
     protected className: string;
     protected defaultClassName: string;
 
     public async setup() {
-        const parentScope: Scope = this.tag.parentTag.scope;
-        if (!parentScope)
-            return;
-
         this.attributeKey = this.getAttributeBinding();
         this.className = this.getAttributeValue(this.defaultClassName);
-
         const cls = await Registry.instance[this.registryName].get(this.className);
-        const obj = this.instantiateClass(cls);
 
-        if (this.attributeKey && obj) {
-            if (this.assignToParent && parentScope) {
-                parentScope.set(this.attributeKey, obj);
-            } else {
-                this.tag.scope.set(this.attributeKey, obj);
+        if (this.attributeKey) {
+            const controllerScope = new Scope(this.tag.scope);
+            const obj = new cls();
+            if (obj instanceof Controller) {
+                obj.init(this.tag.scope, this.tag, this.tag.element);
             }
+            controllerScope.wrap(obj);
+            this.tag.scope.set(this.attributeKey, controllerScope);
+        } else {
+            this.instantiateClass(cls);
         }
         await super.setup();
     }

package/src/attributes/SetAttribute.ts

@@ -21,7 +21,7 @@ export class SetAttribute extends Attribute {
         return this.boundScope.get(this.key, false);
     }
 
-    public async setup() {
+    public async extract() {
         this.property = this.getAttributeBinding();
         let ref: ScopeReference;
         try {
@@ -31,10 +31,6 @@ export class SetAttribute extends Attribute {
         }
         this.key = await ref.getKey();
         this.boundScope = await ref.getScope();
-        await super.setup();
-    }
-
-    public async extract() {
         let value = this.getAttributeValue(null);
         for (const m of this.getAttributeModifiers()) {
             const t = Registry.instance.types.getSynchronous(m);

package/src/attributes/XHRAttribute.ts

@@ -0,0 +1,67 @@
+import {Registry} from "../Registry";
+import {Attribute} from "../Attribute";
+import {Tree} from "../AST";
+
+@Registry.attribute('vsn-xhr')
+export class XHRAttribute extends Attribute {
+    public static readonly canDefer: boolean = false;
+    protected tree: Tree;
+
+    public get code() {
+        return this.getAttributeValue();
+    }
+
+    public async compile() {
+        this.tree = new Tree(this.code);
+        await this.tree.prepare(this.tag.scope, this.tag.dom, this.tag);
+        await super.compile();
+    }
+
+    public async connect() {
+        if (this.isForm) {
+            this.tag.addEventHandler('submit', this.getAttributeModifiers(), this.handleEvent, this);
+        } else if (this.isAnchor) {
+            this.tag.addEventHandler('click', this.getAttributeModifiers(), this.handleEvent, this);
+        }
+        await super.connect();
+    }
+
+    public get isForm() {
+        return this.tag.element.tagName === 'FORM';
+    }
+
+    public get isAnchor() {
+        return this.tag.element.tagName === 'A';
+    }
+
+    public async handleEvent(e) {
+        e.preventDefault();
+        const request = new XMLHttpRequest();
+        request.setRequestHeader('X-Requested-With', 'XMLHttpRequest');
+        let method;
+        let url;
+        let data;
+        if (this.isForm) {
+            url = this.tag.element.getAttribute('action');
+            method = this.getAttributeBinding(this.tag.element.getAttribute('method'));
+            data = new FormData(this.tag.element as HTMLFormElement);
+        } else if (this.isAnchor) {
+            url = this.tag.element.getAttribute('href');
+            method = this.getAttributeBinding('GET');
+        }
+
+        request.onload = async () => {
+            this.tag.scope.set('status', request.status);
+            if (request.status >= 200 && request.status < 300) {
+                this.tag.scope.set('response', request.response);
+                await this.tree.evaluate(this.tag.scope, this.tag.dom, this.tag);
+            } else {
+                console.error(request.statusText);
+            }
+        }
+        request.open(method, url);
+        request.send(data);
+
+        await this.tree.evaluate(this.tag.scope, this.tag.dom, this.tag);
+    }
+}

package/src/attributes/_imports.ts

@@ -27,3 +27,4 @@ export {StandardAttribute} from "./StandardAttribute";
 export {StyleAttribute} from "./StyleAttribute";
 export {TemplateAttribute} from "./TemplateAttribute";
 export {TypeAttribute} from "./TypeAttribute";
+export {XHRAttribute} from "./XHRAttribute";

package/src/version.ts

@@ -1,2 +1,2 @@
-export const VERSION = '0.1.111';
+export const VERSION = '0.1.113';
 

package/test/Controller.spec.ts

@@ -28,15 +28,18 @@ class TestController extends Controller {
 describe('Controller', () => {
     it("methods should be callable from vsn-script", async () => {
         document.body.innerHTML = `
-            <div vsn-controller:test="ControllerTestController" vsn-set:test.test="notTest" vsn-bind="test.test"></div>
+            <div id="controller" vsn-controller:test="ControllerTestController" vsn-set:test.test="notTest" vsn-bind="test.test"></div>
         `;
         const dom = new DOM(document);
         const deferred = SimplePromise.defer();
         dom.once('built', async () => {
-            expect(await dom.exec('test.test')).toBe('notTest');
-            expect(await dom.exec('test.isValid()')).toBe(false);
-            await dom.exec('test.test = "test"');
-            expect(await dom.exec('test.isValid()')).toBe(true);
+            const tag = await dom.exec('#controller');
+            expect(tag.scope.keys).toEqual(['test']);
+            expect(tag.scope.get('test').wrapped).toBeInstanceOf(TestController);
+            expect(await tag.exec('test.isValid()')).toBe(false);
+            expect(await tag.exec('test.test')).toBe('notTest');
+            await tag.exec('test.test = "test"');
+            expect(await tag.exec('test.isValid()')).toBe(true);
             deferred.resolve();
         });
         await deferred.promise;