vsn 0.1.114 → 0.1.116

package/dist/demo.js

@@ -0,0 +1,17 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ServiceDemo = void 0;
+__exportStar(require("./vsn"), exports);
+var ServiceDemo_1 = require("./demo/ServiceDemo");
+Object.defineProperty(exports, "ServiceDemo", { enumerable: true, get: function () { return ServiceDemo_1.ServiceDemo; } });
+//# sourceMappingURL=demo.js.map

package/dist/demo.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"demo.js","sourceRoot":"","sources":["../src/demo.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,wCAAsB;AACtB,kDAA+C;AAAvC,0GAAA,WAAW,OAAA"}

package/dist/version.d.ts

@@ -1 +1 @@
-export declare const VERSION = "0.1.114";
+export declare const VERSION = "0.1.116";

package/dist/version.js

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

package/dist/vsn.js

@@ -90,6 +90,13 @@ var Vision = /** @class */ (function (_super) {
         _this.registry.functions.register('warn', console.warn);
         _this.registry.functions.register('error', console.error);
         _this.registry.functions.register('info', console.info);
+        _this.registry.functions.register('wait', function (seconds) { return __awaiter(_this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+                return [2 /*return*/, new Promise(function (resolve) {
+                        setTimeout(resolve, seconds * 1000);
+                    })];
+            });
+        }); });
         _this.registry.models.register('Object', Object);
         _this.registry.controllers.register('WrappedArray', WrappedArray_1.WrappedArray);
         _this.registry.controllers.register('Data', DynamicScopeData_1.DynamicScopeData);

package/dist/vsn.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vsn",
-  "version": "0.1.114",
+  "version": "0.1.116",
   "description": "SEO Friendly Javascript/Typescript Framework",
   "keywords": [
     "framework",
@@ -21,7 +21,7 @@
     "build": "rm -rf ./dist/ && npm run-script version && tsc",
     "version": "echo \"export const VERSION = '${npm_package_version}';\n\" > src/version.ts",
     "build_dev": "rm -rf ./dist/ && webpack --env BUILD=development BENCHMARK=1",
-    "demo": "webpack --env BUILD=production BENCHMARK=1 && cp ./dist/vsn.min.js ./demo/vsn.js",
+    "demo": "webpack --env BUILD=production BENCHMARK=1 && cp ./dist/demo.min.js ./demo/vsn.js",
     "test": "karma start --single-run",
     "posttest": "codecov",
     "clean": "rm -rf ./dist/"

package/src/AST/ArithmeticAssignmentNode.ts

@@ -10,7 +10,7 @@ import {ElementQueryNode} from "./ElementQueryNode";
 import {ElementAttributeNode} from "./ElementAttributeNode";
 import {ElementStyleNode} from "./ElementStyleNode";
 import {UnitLiteral} from "./UnitLiteralNode";
-import {Controller} from "../vsn";
+import {ScopeObject} from "../Scope/ScopeObject";
 
 export class ArithmeticAssignmentNode extends Node implements TreeNode {
     constructor(
@@ -41,7 +41,7 @@ export class ArithmeticAssignmentNode extends Node implements TreeNode {
                 }
             } else if (inner instanceof Scope) {
                 scopes.push(inner);
-            } else if (inner instanceof Controller) {
+            } else if (inner instanceof ScopeObject) {
                 scopes.push(inner.scope);
             } else {
                 scopes.push(scope)
@@ -53,8 +53,9 @@ export class ArithmeticAssignmentNode extends Node implements TreeNode {
             } else {
                 scopes = elements;
             }
-        } else
+        } else {
             scopes.push(scope);
+        }
 
         const values = [];
         for (let localScope of scopes) {

package/src/AST/FunctionCallNode.ts

@@ -51,7 +51,6 @@ 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,8 +51,6 @@ 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/AST/ScopeNodeAbstract.ts

@@ -9,6 +9,7 @@ export abstract class ScopeNodeAbstract extends Node implements TreeNode {
     async applyModifiers(name: string, scope: Scope, dom: DOM, tag: Tag) {
         let type: string;
         for (const modifier of this.modifiers) {
+            // Check for type cast modifier
             if (Registry.instance.types.has(modifier)) {
                 type = modifier;
                 break;

package/src/Controller.ts

@@ -1,8 +1,8 @@
 import {Scope} from "./Scope";
 import {Tag} from "./Tag";
-import {ScopeData} from "./Scope/ScopeData";
+import {ScopeObject} from "./Scope/ScopeObject";
 
-export abstract class Controller extends ScopeData {
+export abstract class Controller extends ScopeObject {
     protected _scope: Scope;
     protected _tag: Tag;
     protected _element: HTMLElement;

package/src/Scope/ScopeObject.ts

@@ -0,0 +1,3 @@
+import {ScopeData} from "./ScopeData";
+
+export class ScopeObject extends ScopeData {}

package/src/Scope/properties/FloatProperty.ts

@@ -0,0 +1,5 @@
+import {Property} from "./Property";
+
+export class FloatProperty extends Property {
+    _type: string = 'float';
+}

package/src/Scope/properties/IntegerProperty.ts

@@ -0,0 +1,5 @@
+import {Property} from "./Property";
+
+export class IntegerProperty extends Property {
+    _type: string = 'integer';
+}

package/src/Scope/properties/_imports.ts

@@ -1,2 +1,4 @@
 export {Property, property, IPropertyConfig} from './Property';
 export {ArrayProperty} from './ArrayProperty';
+export {IntegerProperty} from './IntegerProperty';
+export {FloatProperty} from './FloatProperty';

package/src/Service.ts

@@ -1,7 +1,7 @@
-import {ScopeData} from "./Scope/ScopeData";
 import {Scope} from "./Scope";
+import {ScopeObject} from "./Scope/ScopeObject";
 
-export class Service extends ScopeData {
+export class Service extends ScopeObject {
     protected static _instance: Service;
     protected _scope: Scope;
 

package/src/attributes/ControllerAttribute.ts

@@ -2,6 +2,7 @@ import {Scope} from "../Scope";
 import {Attribute} from "../Attribute";
 import {Registry} from "../Registry";
 import {Controller} from "../Controller";
+import {Service} from "../Service";
 
 @Registry.attribute('vsn-controller')
 export class ControllerAttribute extends Attribute {
@@ -18,13 +19,24 @@ export class ControllerAttribute extends Attribute {
         const cls = await Registry.instance[this.registryName].get(this.className);
 
         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);
+            let clsScope: Scope;
+            // Singleton?
+            if (cls['instance'] instanceof cls) {
+                clsScope = cls['instance'].scope;
+                if (cls['instance'] instanceof Service) {
+                    this.tag.dom.root.scope.addChild(clsScope);
+                    this.tag.dom.root.scope.set(this.attributeKey, clsScope);
+                }
+            } else {
+                clsScope = new Scope(this.tag.scope);
+                const obj = new cls();
+                if (obj instanceof Controller) {
+                    obj.init(this.tag.scope, this.tag, this.tag.element);
+                }
+                clsScope.wrap(obj);
             }
-            controllerScope.wrap(obj);
-            this.tag.scope.set(this.attributeKey, controllerScope);
+
+            this.tag.scope.set(this.attributeKey, clsScope);
         } else {
             this.instantiateClass(cls);
         }

package/src/attributes/XHRAttribute.ts

@@ -6,6 +6,7 @@ import {Tree} from "../AST";
 export class XHRAttribute extends Attribute {
     public static readonly canDefer: boolean = false;
     protected tree: Tree;
+    protected request: XMLHttpRequest;
 
     public get code() {
         return this.getAttributeValue();
@@ -36,7 +37,9 @@ export class XHRAttribute extends Attribute {
 
     public async handleEvent(e) {
         e.preventDefault();
-        const request = new XMLHttpRequest();
+        if (this.request) return;
+
+        this.request = new XMLHttpRequest();
         let method;
         let url;
         let data;
@@ -49,19 +52,28 @@ export class XHRAttribute extends Attribute {
             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.setRequestHeader('X-Requested-With', 'XMLHttpRequest');
-        request.send(data);
+        this.request.addEventListener('loadend', this.handleXHREvent.bind(this));
+        this.request.addEventListener('error', this.handleXHREvent.bind(this));
+        this.request.open(method, url);
+        this.request.setRequestHeader('X-Requested-With', 'XMLHttpRequest');
+        this.request.send(data);
+    }
 
-        await this.tree.evaluate(this.tag.scope, this.tag.dom, this.tag);
+    public async handleXHREvent(e) {
+        this.tag.scope.set('status', this.request.status);
+        this.tag.scope.set('response', this.request.response);
+        if (this.request.status >= 200 && this.request.status < 300) {
+            await this.tree.evaluate(this.tag.scope, this.tag.dom, this.tag);
+            this.tag.element.dispatchEvent(new Event('xhr-success'));
+        } else if (this.request.status >= 300 && this.request.status < 400) {
+            this.tag.element.dispatchEvent(new Event('xhr-redirect'));
+        } else if (this.request.status >= 400 && this.request.status < 500) {
+            this.tag.element.dispatchEvent(new Event('xhr-client-error'));
+            this.tag.element.dispatchEvent(new Event('xhr-error'));
+        } else {
+            this.tag.element.dispatchEvent(new Event('xhr-server-error'));
+            this.tag.element.dispatchEvent(new Event('xhr-error'));
+        }
+        this.request = null;
     }
 }

package/src/demo/ServiceDemo.ts

@@ -0,0 +1,11 @@
+import {IntegerProperty, property, Registry, Service} from "../vsn";
+
+@Registry.service('ServiceDemo')
+export class ServiceDemo extends Service {
+    @property(IntegerProperty)
+    public count: number = 0;
+
+    add(num: number): number {
+        return this.count += num;
+    }
+}

package/src/demo.ts

@@ -0,0 +1,2 @@
+export * from './vsn';
+export {ServiceDemo} from './demo/ServiceDemo';

package/src/version.ts

@@ -1,2 +1,2 @@
-export const VERSION = '0.1.114';
+export const VERSION = '0.1.116';
 

package/src/vsn.ts

@@ -32,6 +32,11 @@ export class Vision extends EventDispatcher {
         this.registry.functions.register('warn', console.warn);
         this.registry.functions.register('error', console.error);
         this.registry.functions.register('info', console.info);
+        this.registry.functions.register('wait', async (seconds) => {
+            return new Promise((resolve) => {
+                setTimeout(resolve, seconds * 1000);
+            });
+        });
         this.registry.models.register('Object', Object);
         this.registry.controllers.register('WrappedArray', WrappedArray);
         this.registry.controllers.register('Data', DynamicScopeData);

package/test/Controller.spec.ts

@@ -3,7 +3,7 @@ import {DOM} from "../src/DOM";
 import {SimplePromise} from "../src/SimplePromise";
 import {Registry} from "../src/Registry";
 import {property} from "../src/Scope/properties/Property";
-import {Property} from "../src/vsn";
+import {Property, Scope, Tag} from "../src/vsn";
 
 @Registry.controller('ControllerTestController')
 class TestController extends Controller {
@@ -34,12 +34,16 @@ describe('Controller', () => {
         const deferred = SimplePromise.defer();
         dom.once('built', async () => {
             const tag = await dom.exec('#controller');
+            expect(tag).toBeInstanceOf(Tag);
+            expect(tag.scope).toBeInstanceOf(Scope);
+            /*
             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;

package/test/attributes/ServiceAttribute.spec.ts

@@ -19,15 +19,22 @@ class TestService extends Service {
 
 
 describe('ServiceAttribute', () => {
-    it("vsn-styles to just work", (done) => {
+    it("vsn-services to just work", (done) => {
         document.body.innerHTML = `
             <div vsn-service:test1="TestService" id="test"></div>
-            <div vsn-service:test2="TestService" vsn-set:test2.test="testing"></div>
+            <div vsn-service:test2="TestService" vsn-set:test2.test="testing" id="test2"></div>
         `;
         const dom = new DOM(document);
         dom.once('built', async () => {
+            const service1 = await dom.exec('test1');
+            const service2 = await dom.exec('test2');
+            expect(service1).toBeInstanceOf(TestService);
+            expect(service1).toBe(service2);
+            expect(TestService.instance).toBe(service1);
             expect(TestService.instance.test).toBe('testing');
-            expect(await dom.exec('#test.test1.test')).toBe('testing');
+            expect(await dom.exec('test1.test')).toBe('testing');
+            await dom.exec('test2.test = "testing2"');
+            expect(TestService.instance.test).toBe('testing2');
             done();
         });
     });

package/webpack.config.js

@@ -3,7 +3,10 @@ const webpack = require("webpack");
 const TerserPlugin = require("terser-webpack-plugin");
 
 const defaultConfiguration = {
-  entry: './src/vsn.ts',
+  entry: {
+    'vsn': './src/vsn.ts',
+    'demo': './src/demo.ts',
+  },
   module: {
     rules: [
       {
@@ -18,7 +21,7 @@ const defaultConfiguration = {
   },
   plugins: [],
   output: {
-    filename: 'vsn.min.js',
+    filename: '[name].min.js',
     path: path.resolve(__dirname, 'dist'),
   },
   optimization: {