vsn 0.1.60 → 0.1.61

package/package.json

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

package/src/AST/ClassNode.ts

@@ -0,0 +1,49 @@
+import {Scope} from "../Scope";
+import {DOM} from "../DOM";
+import {Tag} from "../Tag";
+import {BlockType, Token, TokenType, Tree, TreeNode} from "../AST";
+import {Node} from "./Node";
+import {BlockNode} from "./BlockNode";
+import {Registry} from "../Registry";
+
+export class ClassNode extends Node implements TreeNode {
+    public static readonly classes: {[name: string]: ClassNode} = {};
+    protected requiresPrep: boolean = true;
+    public readonly classScope: Scope = new Scope();
+
+    constructor(
+        public readonly name: string,
+        public readonly block: BlockNode
+    ) {
+        super();
+    }
+
+    public async prepare(scope: Scope, dom: DOM, tag: Tag = null): Promise<void> {
+        if (ClassNode.classes[this.name]) return; // Don't re-prepare same classes
+        ClassNode.classes[this.name] = this;
+        await this.block.prepare(this.classScope, dom, tag);
+        Registry.class(this);
+    }
+
+    public async prepareTag(tag: Tag, dom: DOM) {
+        tag.createScope(true);
+        await this.block.prepare(tag.scope, dom, tag);
+    }
+
+    public async evaluate(scope: Scope, dom: DOM, tag: Tag = null) {
+        return null;
+    }
+
+    public static parse(lastNode, token, tokens: Token[]): ClassNode {
+        tokens.shift(); // skip 'class'
+        const nameParts: string[] = [];
+        for (const t of tokens) {
+            if (t.type === TokenType.L_BRACE) break;
+            nameParts.push(t.value);
+        }
+        const name = nameParts.join('');
+        tokens.splice(0, nameParts.length);
+        const block = Tree.processTokens(Tree.getNextStatementTokens(tokens, true, true));
+        return new ClassNode(name, block);
+    }
+}

package/src/AST/FunctionCallNode.ts

@@ -6,6 +6,8 @@ import {Node} from "./Node";
 import {FunctionArgumentNode} from "./FunctionArgumentNode";
 import {ScopeMemberNode} from "./ScopeMemberNode";
 import {FunctionNode} from "./FunctionNode";
+import {ClassNode} from "./ClassNode";
+import {Registry} from "../Registry";
 
 export class FunctionCallNode<T = any> extends Node implements TreeNode {
     constructor(
@@ -27,9 +29,23 @@ export class FunctionCallNode<T = any> extends Node implements TreeNode {
         if (this.fnc instanceof ScopeMemberNode) {
             functionScope = await this.fnc.scope.evaluate(scope, dom, tag);
         }
+
         const values = await this.args.evaluate(scope, dom, tag);
         const func = await this.fnc.evaluate(scope, dom, tag);
-        if (func instanceof FunctionNode) {
+        if (!func) {
+            const functionName = await (this.fnc as any).name.evaluate(scope, dom, tag);
+            const classes: ClassNode[] = [];
+            for (const className of Array.from(tag.element.classList)) {
+                const cls = Registry.instance.classes.getSynchronous(className);
+                if (cls) classes.push(cls);
+            }
+            for (const cls of classes) {
+                if (cls.classScope.has(functionName)) {
+                    const fnc = cls.classScope.get(functionName);
+                    return (await fnc.evaluate(functionScope, dom, tag))(...values);
+                }
+            }
+        } else if (func instanceof FunctionNode) {
             return (await func.evaluate(functionScope, dom, tag) as any)(...values);
         } else {
             return func.call(functionScope.wrapped || functionScope, ...values);

package/src/AST/FunctionNode.ts

@@ -1,4 +1,4 @@
-import {Scope} from "../Scope";
+import {FunctionScope, Scope} from "../Scope";
 import {DOM} from "../DOM";
 import {Tag} from "../Tag";
 import {Token, Tree, TreeNode} from "../AST";
@@ -29,7 +29,7 @@ export class FunctionNode extends Node implements TreeNode {
 
     public async evaluate(scope: Scope, dom: DOM, tag: Tag = null) {
         return async (...args) => {
-            const functionScope = new Scope(scope);
+            const functionScope = new FunctionScope(scope);
             for (const arg of this.args) {
                 functionScope.set(arg, args.shift());
             }
@@ -45,7 +45,7 @@ export class FunctionNode extends Node implements TreeNode {
         for (const t of argTokens) {
             funcArgs.push(t[0].value);
         }
-        const block = Tree.processTokens(Tree.getBlockTokens(tokens, null)[0]);
+        const block = Tree.processTokens(Tree.getNextStatementTokens(tokens, true, true));
         return new FunctionNode(name.value, funcArgs, block);
     }
 }

package/src/AST.ts

@@ -27,6 +27,7 @@ import {NotNode} from "./AST/NotNode";
 import {XHRNode} from "./AST/XHRNode";
 import {StringFormatNode} from "./AST/StringFormatNode";
 import {FunctionNode} from "./AST/FunctionNode";
+import {ClassNode} from "./AST/ClassNode";
 
 function lower(str: string): string {
     return str ? str.toLowerCase() : null;
@@ -67,6 +68,7 @@ export enum TokenType {
     ELSE_IF,
     ELSE,
     FUNC,
+    CLASS,
     NAME,
     L_BRACE,
     R_BRACE,
@@ -200,6 +202,10 @@ const TOKEN_PATTERNS: TokenPattern[] = [
         type: TokenType.FUNC,
         pattern: /^func\s/
     },
+    {
+        type: TokenType.CLASS,
+        pattern: /^class\s/
+    },
     {
         type: TokenType.ELEMENT_ATTRIBUTE,
         pattern: /^\.?@[-_a-zA-Z0-9]*/
@@ -492,6 +498,10 @@ export class Tree {
                 node = FunctionNode.parse(node, token, tokens);
                 blockNodes.push(node);
                 node = null;
+            } else if (token.type === TokenType.CLASS) {
+                node = ClassNode.parse(node, token, tokens);
+                blockNodes.push(node);
+                node = null;
             } else if (StringFormatNode.match(tokens)) {
                 node = StringFormatNode.parse(node, tokens[0], tokens);
             } else if (token.type === TokenType.STRING_LITERAL) {

package/src/DOM.ts

@@ -7,6 +7,8 @@ import {WrappedWindow} from "./DOM/WrappedWindow";
 import {WrappedDocument} from "./DOM/WrappedDocument";
 import {Scope} from "./Scope";
 import {EventDispatcher} from "./EventDispatcher";
+import {Registry} from "./Registry";
+import {ClassNode} from "./AST/ClassNode";
 
 export class DOM extends EventDispatcher {
     protected static _instance: DOM;
@@ -26,6 +28,7 @@ export class DOM extends EventDispatcher {
     ) {
         super();
         this.observer = new MutationObserver(this.mutation.bind(this));
+        Registry.instance.classes.on('register', this.prepareDOMClass.bind(this));
         this.tags = [];
 
         this.window = new WrappedWindow(window);
@@ -56,6 +59,18 @@ export class DOM extends EventDispatcher {
         }
     }
 
+    public async prepareDOMClass(className: string, classObject: ClassNode) {
+        for (const element of Array.from(this.querySelectorAll(`.${className}`))) {
+            const tag: Tag = await this.getTagForElement(element as HTMLElement, true);
+            if (tag) {
+                await classObject.prepareTag(tag, this);
+                if (classObject.classScope.has('construct')) {
+                    await tag.exec('construct()');
+                }
+            }
+        }
+    }
+
     public async getFromTag(tag: Tag, selector: string, create: boolean = false) {
         const nodes = this.querySelectorElement(tag.element, selector);
         return await this.getTagsForElements(Array.from(nodes) as Element[], create);

package/src/Registry.ts

@@ -1,5 +1,6 @@
 import {EventDispatcher} from "./EventDispatcher";
 import {IDeferred, IPromise, SimplePromise} from "./SimplePromise";
+import {ClassNode} from "./AST/ClassNode";
 
 export function register(store: string, key: string = null, setup: () => void = null) {
     return function(target: any, _key: string = null) {
@@ -23,6 +24,7 @@ export class RegistryStore extends EventDispatcher {
 
     register(key: string, item: any) {
         this.store[key] = item;
+        this.dispatch('register', key, item);
         this.dispatch(`registered:${key}`, item);
     }
 
@@ -52,7 +54,7 @@ export class RegistryStore extends EventDispatcher {
 
 export class Registry extends EventDispatcher {
     protected static _instance: Registry;
-    public readonly components: RegistryStore;
+    public readonly controllers: RegistryStore;
     public readonly classes: RegistryStore;
     public readonly models: RegistryStore;
     public readonly templates: RegistryStore;
@@ -63,7 +65,7 @@ export class Registry extends EventDispatcher {
 
     constructor() {
         super();
-        this.components = new RegistryStore();
+        this.controllers = new RegistryStore();
         this.classes = new RegistryStore();
         this.models = new RegistryStore();
         this.templates = new RegistryStore();
@@ -73,16 +75,12 @@ export class Registry extends EventDispatcher {
         this.attributes = new RegistryStore();
     }
 
-    public static component(key: string = null, setup = null) {
-        return register('components', key, setup);
-    }
-
-    public static class(key: string = null, setup = null) {
-        return register('classes', key, setup);
+    public static class(cls: ClassNode) {
+        Registry.instance.classes.register(cls.name, cls);
     }
 
     public static controller(key: string = null, setup = null) {
-        return register('classes', key, setup);
+        return register('controllers', key, setup);
     }
 
     public static model(key: string = null, setup = null) {

package/src/Scope.ts

@@ -227,3 +227,12 @@ export class Scope extends EventDispatcher {
         return scope;
     }
 }
+
+export class FunctionScope extends Scope {
+    set(key: string, value: any) {
+        if (this.parentScope.has(key) || ['$', '@'].indexOf(key[0]) > -1)
+            this.parentScope.set(key, value);
+        else
+            super.set(key, value);
+    }
+}

package/src/attributes/ControllerAttribute.ts

@@ -1,4 +1,32 @@
-import {ClassConstructor} from "./ClassConstructor";
+import {Scope} from "../Scope";
+import {Attribute} from "../Attribute";
+import {Registry} from "../Registry";
 
-export class ControllerAttribute extends ClassConstructor {
+@Registry.attribute('vsn-controller')
+export class ControllerAttribute extends Attribute {
+    public static readonly canDefer: boolean = false;
+    public static readonly scoped: 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.controllers.get(this.className);
+        this.instantiateClass(cls);
+
+        if (this.attributeKey && parentScope)
+            parentScope.set(this.attributeKey, this.tag.scope);
+        await super.setup();
+    }
+
+    protected instantiateClass(cls) {
+        this.tag.wrap(cls);
+    }
 }

package/src/attributes/ListItem.ts

@@ -21,7 +21,7 @@ export class ListItem extends Attribute {
 
         this.tag.scope.set(this.listItemName, this.tag.scope);
         const modelName: string = (await this.getList()).listItemModel;
-        const cls = await Registry.instance.classes.get(modelName);
+        const cls = await Registry.instance.controllers.get(modelName);
         this.instantiateModel(cls);
         await super.setup();
     }

package/src/attributes/ModelAttribute.ts

@@ -1,5 +1,5 @@
-import {ClassConstructor} from "./ClassConstructor";
+import {ControllerAttribute} from "./ControllerAttribute";
 
-export class ModelAttribute extends ClassConstructor {
+export class ModelAttribute extends ControllerAttribute {
     public static readonly canDefer: boolean = false;
 }

package/src/attributes/ScopeAttribute.ts

@@ -28,6 +28,9 @@ export class ScopeAttribute extends Attribute {
                 this.tag.scope.set(key, value.data[key]);
             }
         }
+        const binding = this.getAttributeBinding();
+        if (binding)
+            this.tag.scope.parentScope.set(binding, this.tag.scope);
         await super.extract();
     }
 }

package/src/attributes/SetAttribute.ts

@@ -36,10 +36,12 @@ export class SetAttribute extends Attribute {
 
     public async extract() {
         let value = this.getAttributeValue(null);
-        const typeIndex: number = value && value.indexOf('|') || -1;
-        if (typeIndex > -1) {
-            this.boundScope.setType(this.key, value.substr(typeIndex + 1));
-            value = value.substr(0, typeIndex);
+        for (const m of this.getAttributeModifiers()) {
+            const t = Registry.instance.types.getSynchronous(m);
+            if (t) {
+                this.boundScope.setType(this.key, m);
+                break;
+            }
         }
         this.boundScope.set(this.key, value);
     }

package/src/vsn.ts

@@ -25,9 +25,9 @@ export class Vision extends EventDispatcher {
         } else {
             console.warn('No dom, running in CLI mode.');
         }
-        this.registry.classes.register('Object', Object);
-        this.registry.classes.register('WrappedArray', WrappedArray);
-        this.registry.classes.register('Data', DynamicScopeData);
+        this.registry.controllers.register('Object', Object);
+        this.registry.controllers.register('WrappedArray', WrappedArray);
+        this.registry.controllers.register('Data', DynamicScopeData);
 
         if (VisionHelper.window) {
             window['Vision'] = Vision;

package/test/DOM.spec.ts

@@ -2,7 +2,7 @@ import "../src/vsn";
 import {DOM} from "../src/DOM";
 import {Registry} from "../src/Registry";
 
-@Registry.class('TestController')
+@Registry.controller('TestController')
 class TestController {}
 
 describe('DOM', () => {
@@ -20,9 +20,9 @@ describe('DOM', () => {
 
     it("should use scopes correctly", (done) => {
         document.body.innerHTML = `
-            <div id="parent" vsn-set:asd="123|integer">
+            <div id="parent" vsn-set:asd|integer="123">
                 <div id="testing" vsn-controller:test="TestController" vsn-set:asd="234|integer">
-                    <div vsn-set:asd="345|integer"></div>
+                    <div vsn-set:asd|integer="345"></div>
                 </div>
             </div>
         `;

package/test/attributes/ListItem.spec.ts

@@ -5,14 +5,14 @@ import {ListItem} from "../../src/attributes/ListItem";
 import {Registry} from "../../src/Registry";
 import {List} from "../../src/attributes/List";
 
-@Registry.class('ListItemController')
+@Registry.controller('ListItemController')
 class ListItemController{
     items: ListItemSpecTestItem[] = [];
 
     do() {}
 }
 
-@Registry.class('ListItemSpecTestItem')
+@Registry.controller('ListItemSpecTestItem')
 class ListItemSpecTestItem {
     test: number = null;
 
@@ -96,7 +96,7 @@ describe('ListItem', () => {
 
     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="1|integer"></li></ul>
+            <ul vsn-list:list id="test"><li vsn-list-item:item="ListItemSpecTestItem" id="test-item" vsn-set:item.testing|integer="1"></li></ul>
         `;
 
         const dom = new DOM(document);

package/test/attributes/SetAttribute.spec.ts

@@ -37,9 +37,9 @@ describe('Bind', () => {
 
     it("vsn-set to work with a typed value", (done) => {
         document.body.innerHTML = `
-            <span id="test-int" vsn-set:int="142.3|integer">testing</span>
-            <span id="test-float" vsn-set:float="142.3|float">testing</span>
-            <span id="test-bool" vsn-set:bool="false|boolean">testing</span>
+            <span id="test-int" vsn-set:int|integer="142.3">testing</span>
+            <span id="test-float" vsn-set:float|float="142.3">testing</span>
+            <span id="test-bool" vsn-set:bool|boolean="false">testing</span>
         `;
         const dom = new DOM(document);
         dom.once('built', async () => {

package/src/attributes/ClassConstructor.ts

@@ -1,32 +0,0 @@
-import {Scope} from "../Scope";
-import {Attribute} from "../Attribute";
-import {Registry} from "../Registry";
-
-@Registry.attribute('vsn-controller')
-export class ClassConstructor extends Attribute {
-    public static readonly canDefer: boolean = false;
-    public static readonly scoped: 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.classes.get(this.className);
-        this.instantiateClass(cls);
-
-        if (this.attributeKey && parentScope)
-            parentScope.set(this.attributeKey, this.tag.scope);
-        await super.setup();
-    }
-
-    protected instantiateClass(cls) {
-        this.tag.wrap(cls);
-    }
-}