vsn 0.1.84 → 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.84",
+  "version": "0.1.87",
   "description": "SEO Friendly Javascript/Typescript Framework",
   "keywords": [
     "framework",

package/src/AST/ScopeNodeAbstract.ts

@@ -14,7 +14,7 @@ export abstract class ScopeNodeAbstract extends Node implements TreeNode {
                 break;
             }
         }
-        if (type)
+        if (type && scope instanceof Scope)
             scope.setType(name, type);
     }
 }

package/src/Model.ts

@@ -1,8 +1,9 @@
 import {MessageList} from "./MessageList";
 import {ScopeData} from "./Scope/ScopeData";
 import {IScopeData} from "./Scope/ScopeDataAbstract";
+import {Registry} from "./Registry";
 
-
+@Registry.model('Model')
 export class Model extends ScopeData {
     _errors!: MessageList;
     _hasErrors: boolean;

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/Scope/ScopeData.ts

@@ -9,7 +9,6 @@ export class ScopeData extends ScopeDataAbstract {
                 if(!_self['__'+name+'__'])
                     return;
 
-                _self.__properties__.push(name);
                 const _property = _self['__'+name+'__'],
                     propertyType = _property[0],
                     config = _property[1] || {};

package/src/Scope/ScopeDataAbstract.ts

@@ -19,6 +19,9 @@ export class ScopeDataAbstract extends EventDispatcher {
     }
 
     createProperty(name: string, propertyType: any = Property, config?: IPropertyConfig): any {
+        if (this.hasProperty(name)) {
+            return this.getProperty(name);
+        }
         config = config || {};
         const instance = new propertyType(config.default, config),
             propDesc = Object.getOwnPropertyDescriptor(this, name);
@@ -98,6 +101,14 @@ export class ScopeDataAbstract extends EventDispatcher {
         return data;
     }
 
+    get(key: string) {
+        return this[key];
+    }
+
+    set(key: string, value: any) {
+        this[key] = value;
+    }
+
     getProperties(): string[] {
         return this.__properties__;
     }

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/List.ts

@@ -102,7 +102,7 @@ export class List extends Attribute {
     }
 
     public get listItemModel(): string {
-        return this.tag.getRawAttributeValue('vsn-list-item-model', 'Object');
+        return this.tag.getRawAttributeValue('vsn-list-item-model');
     }
 
     public remove(item: any) {
@@ -126,17 +126,20 @@ export class List extends Attribute {
         } else {
             element = clone as HTMLElement;
         }
+        delete element[Tag.TaggedVariable];
 
         this.tag.element.appendChild(element);
 
         await this.tag.dom.buildFrom(this.tag.element);
         const tag: Tag = await this.tag.dom.getTagForElement(element);
         this.tags.push(tag);
-        tag.scope.clear();
 
         if (obj) {
-            tag.unwrap();
-            tag.wrap(obj);
+            if (tag.scope.wrapped) {
+                tag.scope.data.setData(obj);
+            } else {
+                tag.wrap(obj);
+            }
         }
 
         this.tag.dispatch('add', obj);

package/src/attributes/ListItem.ts

@@ -18,11 +18,12 @@ export class ListItem extends Attribute {
         this._list = this.tag.findAncestorByAttribute('vsn-list');
         if (!this._list)
             throw Error(ListItem.ERROR_NO_PARENT);
-
-        this.tag.scope.set(this.listItemName, this.tag.scope);
         const modelName: string = (await this.getList()).listItemModel;
-        const cls = await Registry.instance.controllers.get(modelName);
-        this.instantiateModel(cls);
+        if (modelName) {
+            const cls = await Registry.instance.models.get(modelName);
+            this.instantiateModel(cls);
+        }
+        this.tag.scope.set(this.listItemName, this.tag.scope);
         await super.setup();
     }
 

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

package/src/vsn.ts

@@ -32,7 +32,7 @@ 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.controllers.register('Object', Object);
+        this.registry.models.register('Object', Object);
         this.registry.controllers.register('WrappedArray', WrappedArray);
         this.registry.controllers.register('Data', DynamicScopeData);
 
@@ -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/ListItem.spec.ts

@@ -4,6 +4,8 @@ import {DOM} from "../../src/DOM";
 import {ListItem} from "../../src/attributes/ListItem";
 import {Registry} from "../../src/Registry";
 import {List} from "../../src/attributes/List";
+import {Model} from "../../src/Model";
+import {property} from "../../src/Scope/properties/Property";
 
 @Registry.controller('ListItemController')
 class ListItemController{
@@ -12,26 +14,19 @@ class ListItemController{
     do() {}
 }
 
-@Registry.controller('ListItemSpecTestItem')
-class ListItemSpecTestItem {
+@Registry.model('ListItemSpecTestItem')
+class ListItemSpecTestItem extends Model {
+    @property()
     test: number = null;
 
-    constructor(
-        public readonly v: number = 123,
-        test: number
-    ) {
-        this.test = test;
-    }
-
-    getValue() {
-        return this.v
-    }
+    @property()
+    v: number;
 }
 
 describe('ListItem', () => {
     it("vsn-list-item should find it's parent list or complain", async () => {
         document.body.innerHTML = `
-            <ul id="test"><li vsn-list-item:item="ListItemSpecTestItem" id="test-item"></li></ul>
+            <ul  id="test"><li vsn-list-item:item id="test-item"></li></ul>
         `;
         let errorThrown: boolean = false;
         try {
@@ -46,7 +41,7 @@ describe('ListItem', () => {
 
     it("vsn-list-item should find it's parent list", (done) => {
         document.body.innerHTML = `
-            <ul vsn-list:list id="test"><li vsn-list-item:item="ListItemSpecTestItem" id="test-item"></li></ul>
+            <ul vsn-list:list vsn-list-item-model="ListItemSpecTestItem" id="test"><li vsn-list-item:item id="test-item"></li></ul>
         `;
 
         const dom = new DOM(document);
@@ -63,8 +58,8 @@ describe('ListItem', () => {
     it("should properly wrap list item class", (done) => {
         document.body.innerHTML = `
             <div vsn-controller:controller="ListItemController">
-                <ul vsn-list:controller.items id="test">
-                    <li vsn-template vsn-list-item:item="ListItemSpecTestItem"></li>
+                <ul vsn-list:controller.items vsn-list-item-model="ListItemSpecTestItem" id="test">
+                    <li vsn-template vsn-list-item:item></li>
                 </ul>
             </div>
         `;
@@ -77,25 +72,24 @@ describe('ListItem', () => {
             list.on('add', () => {
                 const listItem = listAttr.tags[0];
 
-                expect(listItem.scope.wrapped instanceof ListItemSpecTestItem).toBeTrue();
-                expect(controller.items[0] instanceof ListItemSpecTestItem).toBeTrue();
-                expect(listItem.scope.wrapped === controller.items[0]).toBeTrue();
+                expect(listItem.scope.data instanceof ListItemSpecTestItem).toBeTrue();
                 expect(controller.items.length).toBe(1);
-                expect(controller.items.indexOf(listItem.scope.wrapped) > -1).toBeTrue();
-                expect(controller.items.indexOf(listItem.scope.wrapped) > -1).toBeTrue();
-                expect(listItem.scope.get('test')).toBe(1);
-                expect(listItem.scope.get('v')).toBe(555);
+                expect(controller.items[0] instanceof ListItemSpecTestItem).toBeTrue();
+
                 done();
             });
 
             listAttr.items.length = 0;
-            listAttr.items.push(new ListItemSpecTestItem(555, 1));
+            listAttr.items.push(new ListItemSpecTestItem({
+                test: 1,
+                v: 555
+            }));
         });
     });
 
     it("vsn-list-item should work with vsn-set", (done) => {
         document.body.innerHTML = `
-            <ul vsn-list:list id="test"><li vsn-list-item:item="ListItemSpecTestItem" id="test-item" vsn-set:item.testing|integer="1"></li></ul>
+            <ul vsn-list:list vsn-list-item-model="ListItemSpecTestItem" id="test"><li vsn-list-item:item id="test-item" vsn-set:item.testing|integer="1"></li></ul>
         `;
 
         const dom = new DOM(document);
@@ -111,7 +105,7 @@ describe('ListItem', () => {
 
     it("vsn-list-item should work with vsn-exec", (done) => {
         document.body.innerHTML = `
-            <ul vsn-list:list id="test"><li vsn-list-item:item="ListItemSpecTestItem" id="test-item" vsn-exec="item.testing = 1"></li></ul>
+            <ul vsn-list:list vsn-list-item-model="ListItemSpecTestItem" id="test"><li vsn-list-item:item id="test-item" vsn-exec="item.test = 1"></li></ul>
         `;
 
         const dom = new DOM(document);
@@ -119,8 +113,8 @@ describe('ListItem', () => {
             const list = await dom.getTagForElement(document.getElementById('test'));
             const listItem = await dom.getTagForElement(document.getElementById('test-item'));
             const listItemAttr: ListItem = await listItem.getAttribute('vsn-list-item') as ListItem;
-
-            expect(listItem.scope.get('testing')).toBe(1);
+            console.log('test keys', listItem.scope.keys);
+            expect(listItem.scope.get('test')).toBe(1);
             done();
         });
     });

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();
+        });
+    });
+});