vsn 0.1.86 → 0.1.87

package/dist/vsn.min.js.LICENSE.txt

@@ -0,0 +1,9 @@
+/**
+ * @license
+ * Copyright (c) 2016 The Polymer Project Authors. All rights reserved.
+ * This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+ * The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+ * The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+ * Code distributed by Google as part of the polymer project is also
+ * subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
+ */

package/package.json

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

package/src/Registry.ts

@@ -68,6 +68,7 @@ export class Registry extends EventDispatcher {
     public readonly classes: RegistryStore;
     public readonly models: RegistryStore;
     public readonly templates: RegistryStore;
+    public readonly services: RegistryStore;
     public readonly types: RegistryStore;
     public readonly validators: RegistryStore;
     public readonly formats: RegistryStore;
@@ -81,6 +82,7 @@ export class Registry extends EventDispatcher {
         this.classes = new RegistryStore();
         this.models = new RegistryStore();
         this.templates = new RegistryStore<HTMLTemplateElement>();
+        this.services = new RegistryStore();
         this.types = new RegistryStore();
         this.validators = new RegistryStore();
         this.formats = new RegistryStore();
@@ -111,6 +113,10 @@ export class Registry extends EventDispatcher {
         return register('templates', key, setup);
     }
 
+    public static service(key: string = null, setup = null) {
+        return register('services', key, setup);
+    }
+
     public static type(key: string = null, setup = null) {
         return register('types', key, setup);
     }

package/src/Service.ts

@@ -0,0 +1,24 @@
+import {ScopeData} from "./Scope/ScopeData";
+import {Scope} from "./Scope";
+
+export class Service extends ScopeData {
+    protected static _instance: Service;
+    protected _scope: Scope;
+
+    constructor() {
+        super();
+        this._scope = new Scope();
+        this._scope.wrap(this);
+    }
+
+    public get scope(): Scope {
+        return this._scope;
+    }
+
+    public static get instance(): Service {
+        if (!this._instance) {
+            this._instance = new this();
+        }
+        return this._instance;
+    }
+}

package/src/attributes/ControllerAttribute.ts

@@ -6,6 +6,8 @@ import {Registry} from "../Registry";
 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;
@@ -18,15 +20,21 @@ export class ControllerAttribute extends Attribute {
         this.attributeKey = this.getAttributeBinding();
         this.className = this.getAttributeValue(this.defaultClassName);
 
-        const cls = await Registry.instance.controllers.get(this.className);
-        this.instantiateClass(cls);
+        const cls = await Registry.instance[this.registryName].get(this.className);
+        const obj = this.instantiateClass(cls);
 
-        if (this.attributeKey && parentScope)
-            parentScope.set(this.attributeKey, this.tag.scope);
+        if (this.attributeKey && obj) {
+            if (this.assignToParent && parentScope) {
+                parentScope.set(this.attributeKey, obj);
+            } else {
+                this.tag.scope.set(this.attributeKey, obj);
+            }
+        }
         await super.setup();
     }
 
-    protected instantiateClass(cls) {
+    protected instantiateClass(cls): any {
         this.tag.wrap(cls);
+        return this.tag.scope;
     }
 }

package/src/attributes/ModelAttribute.ts

@@ -1,5 +1,8 @@
 import {ControllerAttribute} from "./ControllerAttribute";
+import {Registry} from "../Registry";
 
+@Registry.attribute('vsn-model')
 export class ModelAttribute extends ControllerAttribute {
     public static readonly canDefer: boolean = false;
+    public readonly registryName: string = 'models'
 }

package/src/attributes/ServiceAttribute.ts

@@ -0,0 +1,13 @@
+import {ControllerAttribute} from "./ControllerAttribute";
+import {Registry} from "../Registry";
+
+@Registry.attribute('vsn-service')
+export class ServiceAttribute extends ControllerAttribute {
+    public static readonly canDefer: boolean = false;
+    public readonly registryName: string = 'services'
+    public readonly assignToParent: boolean = false;
+
+    protected instantiateClass(cls): any {
+        return cls.instance.scope;
+    }
+}

package/src/attributes/_imports.ts

@@ -21,6 +21,7 @@ export {RootAttribute} from "./RootAttribute";
 export {ScopeAttribute} from "./ScopeAttribute";
 export {ScopeChange} from "./ScopeChange";
 export {ScriptAttribute} from "./ScriptAttribute";
+export {ServiceAttribute} from "./ServiceAttribute";
 export {SetAttribute} from "./SetAttribute";
 export {StandardAttribute} from "./StandardAttribute";
 export {StyleAttribute} from "./StyleAttribute";

package/src/version.ts

@@ -1,2 +1,2 @@
-export const VERSION = '0.1.86';
+export const VERSION = '0.1.87';
 

package/src/vsn.ts

@@ -91,6 +91,7 @@ export {ScopeReference} from './Scope/ScopeReference';
 export {WrappedArray} from './Scope/WrappedArray';
 export {Controller} from './Controller';
 export {Model} from './Model';
+export {Service} from './Service';
 export {EventDispatcher} from './EventDispatcher';
 export {MessageList} from './MessageList';
 export {SimplePromise} from './SimplePromise';

package/test/attributes/ServiceAttribute.spec.ts

@@ -0,0 +1,34 @@
+import {DOM} from "../../src/DOM";
+import "../../src/Types";
+import "../../src/attributes/_imports";
+import {Registry} from "../../src/Registry";
+import {Service} from "../../src/Service";
+import {property} from "../../src/Scope/properties/Property";
+
+
+@Registry.service('TestService')
+class TestService extends Service {
+    @property()
+    public test: string;
+
+    constructor() {
+        super();
+    }
+
+}
+
+
+describe('ServiceAttribute', () => {
+    it("vsn-styles 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>
+        `;
+        const dom = new DOM(document);
+        dom.once('built', async () => {
+            expect(TestService.instance.test).toBe('testing');
+            expect(await dom.exec('#test.test1.test')).toBe('testing');
+            done();
+        });
+    });
+});