vsn 0.1.113 → 0.1.115

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

@@ -37,7 +37,6 @@ export class XHRAttribute extends Attribute {
     public async handleEvent(e) {
         e.preventDefault();
         const request = new XMLHttpRequest();
-        request.setRequestHeader('X-Requested-With', 'XMLHttpRequest');
         let method;
         let url;
         let data;
@@ -60,6 +59,7 @@ export class XHRAttribute extends Attribute {
             }
         }
         request.open(method, url);
+        request.setRequestHeader('X-Requested-With', 'XMLHttpRequest');
         request.send(data);
 
         await this.tree.evaluate(this.tag.scope, this.tag.dom, this.tag);

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.113';
+export const VERSION = '0.1.115';
 

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: {