vsn 0.1.57 → 0.1.60

package/package.json

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

package/src/AST/ArithmeticAssignmentNode.ts

@@ -59,7 +59,7 @@ export class ArithmeticAssignmentNode extends Node implements TreeNode {
         const values = [];
         for (let localScope of scopes) {
             if (localScope instanceof DOMObject) {
-                await this.handleDOMObject(name, dom, localScope, tag);
+                await this.handleDOMObject(name, dom, scope, localScope, tag);
             } else {
                 if (localScope['$wrapped'] && localScope['$scope']) {
                     localScope = localScope['$scope'];
@@ -68,16 +68,7 @@ export class ArithmeticAssignmentNode extends Node implements TreeNode {
                 // We get the values from the passed scope, but set the value on the local scope
                 let left: number | Array<any> | string = await this.left.evaluate(scope, dom, tag);
                 let right: number | Array<any> | string = await this.right.evaluate(scope, dom, tag);
-
-                if (left instanceof Array) {
-                    left = this.handleArray(name, left, right, localScope);
-                } else if ((left as any) instanceof UnitLiteral || right instanceof UnitLiteral) {
-                    left = this.handleUnit(name, left, right, localScope);
-                } else if (Number.isFinite(left)) {
-                    left = this.handleNumber(name, left, right, localScope);
-                } else {
-                    left = this.handleString(name, left, right, localScope);
-                }
+                left = this.handle(name, left, right, localScope);
 
                 values.push(left);
             }
@@ -85,6 +76,20 @@ export class ArithmeticAssignmentNode extends Node implements TreeNode {
         return values.length > 1 ? values : values[0];
     }
 
+    public handle(name, left, right, localScope) {
+        if (left instanceof Array) {
+            left = this.handleArray(name, left, right, localScope);
+        } else if ((left as any) instanceof UnitLiteral || right instanceof UnitLiteral) {
+            left = this.handleUnit(name, left, right, localScope);
+        } else if (Number.isFinite(left)) {
+            left = this.handleNumber(name, left, right, localScope);
+        } else {
+            left = this.handleString(name, left, right, localScope);
+        }
+
+        return left;
+    }
+
     public handleNumber(key, left, right, scope) {
         if (right !== null && !Number.isFinite(right))
             right = parseFloat(`${right}`);
@@ -167,13 +172,10 @@ export class ArithmeticAssignmentNode extends Node implements TreeNode {
         return left;
     }
 
-    public async handleDOMObject(key: string, dom: DOM, domObject: DOMObject, tag: Tag) {
+    public async handleDOMObject(key: string, dom: DOM, scope: Scope, domObject: DOMObject, tag: Tag) {
         let left = domObject.scope.get(key);
-        let right: number | Array<any> | string = await this.right.evaluate(domObject.scope, dom, tag);
-        if (left instanceof Array)
-            return this.handleArray(key, left, right, domObject.scope);
-
-        return this.handleString(key, left, right, domObject.scope);
+        let right: number | Array<any> | string = await this.right.evaluate(scope, dom, tag);
+        return this.handle(key, left, right, domObject.scope);
     }
 
     public handleArray(key, left, right, scope) {

package/src/AST/FunctionCallNode.ts

@@ -5,6 +5,7 @@ import {TreeNode} from "../AST";
 import {Node} from "./Node";
 import {FunctionArgumentNode} from "./FunctionArgumentNode";
 import {ScopeMemberNode} from "./ScopeMemberNode";
+import {FunctionNode} from "./FunctionNode";
 
 export class FunctionCallNode<T = any> extends Node implements TreeNode {
     constructor(
@@ -27,6 +28,11 @@ export class FunctionCallNode<T = any> extends Node implements TreeNode {
             functionScope = await this.fnc.scope.evaluate(scope, dom, tag);
         }
         const values = await this.args.evaluate(scope, dom, tag);
-        return (await this.fnc.evaluate(scope, dom, tag)).call(functionScope.wrapped || functionScope, ...values);
+        const func = await this.fnc.evaluate(scope, dom, tag);
+        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,17 +1,17 @@
 import {Scope} from "../Scope";
 import {DOM} from "../DOM";
 import {Tag} from "../Tag";
-import {Token, TreeNode} from "../AST";
+import {Token, Tree, TreeNode} from "../AST";
 import {Node} from "./Node";
-import {LiteralNode} from "./LiteralNode";
-import {RootScopeMemberNode} from "./RootScopeMemberNode";
-import {ScopeMemberNode} from "./ScopeMemberNode";
+import {BlockNode} from "./BlockNode";
 
 export class FunctionNode extends Node implements TreeNode {
+    protected requiresPrep: boolean = true;
+
     constructor(
-        public readonly name: LiteralNode<string>,
-        public readonly variables: LiteralNode<string>[],
-        public readonly block: RootScopeMemberNode | ScopeMemberNode,
+        public readonly name: string,
+        public readonly args: string[],
+        public readonly block: BlockNode
     ) {
         super();
     }
@@ -22,10 +22,30 @@ export class FunctionNode extends Node implements TreeNode {
         ];
     }
 
-    public async prepare(scope: Scope, dom: DOM, tag: Tag = null) {}
-    public async evaluate(scope: Scope, dom: DOM, tag: Tag = null) {}
+    public async prepare(scope: Scope, dom: DOM, tag: Tag = null): Promise<void> {
+        scope.set(this.name, this);
+        await super.prepare(scope, dom, tag);
+    }
+
+    public async evaluate(scope: Scope, dom: DOM, tag: Tag = null) {
+        return async (...args) => {
+            const functionScope = new Scope(scope);
+            for (const arg of this.args) {
+                functionScope.set(arg, args.shift());
+            }
+            return await this.block.evaluate(functionScope, dom, tag);
+        }
+    }
 
     public static parse(lastNode, token, tokens: Token[]): FunctionNode {
-        return new FunctionNode(null, null, null);
+        tokens.shift(); // skip 'func'
+        const name = tokens.shift();
+        const argTokens = Tree.getBlockTokens(tokens);
+        const funcArgs: string[] = [];
+        for (const t of argTokens) {
+            funcArgs.push(t[0].value);
+        }
+        const block = Tree.processTokens(Tree.getBlockTokens(tokens, null)[0]);
+        return new FunctionNode(name.value, funcArgs, block);
     }
 }

package/src/AST.ts

@@ -26,6 +26,7 @@ import {BooleanLiteralNode} from "./AST/BooleanLiteralNode";
 import {NotNode} from "./AST/NotNode";
 import {XHRNode} from "./AST/XHRNode";
 import {StringFormatNode} from "./AST/StringFormatNode";
+import {FunctionNode} from "./AST/FunctionNode";
 
 function lower(str: string): string {
     return str ? str.toLowerCase() : null;
@@ -65,6 +66,7 @@ export enum TokenType {
     IF,
     ELSE_IF,
     ELSE,
+    FUNC,
     NAME,
     L_BRACE,
     R_BRACE,
@@ -194,6 +196,10 @@ const TOKEN_PATTERNS: TokenPattern[] = [
         type: TokenType.ELSE,
         pattern: /^else\s?(?=\{)/
     },
+    {
+        type: TokenType.FUNC,
+        pattern: /^func\s/
+    },
     {
         type: TokenType.ELEMENT_ATTRIBUTE,
         pattern: /^\.?@[-_a-zA-Z0-9]*/
@@ -482,6 +488,10 @@ export class Tree {
                 node = ForStatementNode.parse(node, token, tokens);
                 blockNodes.push(node);
                 node = null;
+            } else if (token.type === TokenType.FUNC) {
+                node = FunctionNode.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/Scope.ts

@@ -220,4 +220,10 @@ export class Scope extends EventDispatcher {
             delete toUnwrap[field];
         }
     }
+
+    public static fromObject(obj, parentScope?: Scope): Scope {
+        const scope = new Scope(parentScope);
+        scope.wrap(obj);
+        return scope;
+    }
 }

package/src/Tag.ts

@@ -271,7 +271,7 @@ export class Tag extends DOMObject {
             return this._scope;
 
         if (this.uniqueScope)
-            return this.createScope();
+            return this.createScope(true);
 
         if (!!this.parentTag)
             return this.parentTag.scope;
@@ -601,18 +601,16 @@ export class Tag extends DOMObject {
     public createScope(force: boolean = false): Scope {
         // Standard attribute requires a unique scope
         // @todo: Does this cause any issues with attribute bindings on the parent scope prior to having its own scope? hmm...
-        if ((!this.uniqueScope && force) || this.uniqueScope) {
+        if (!this._scope && (force || this.uniqueScope)) {
             this._uniqueScope = true;
             this._scope = new Scope();
 
             if (this.parentTag) {
                 this.scope.parentScope = this.parentTag.scope;
             }
-
-            return this._scope;
         }
 
-        return null;
+        return this._scope;
     }
 
     async watchAttribute(attributeName: string) {

package/src/attributes/Exec.ts

@@ -7,8 +7,12 @@ export class Exec extends Attribute {
     public static readonly canDefer: boolean = false;
     protected tree: Tree;
 
+    public get code() {
+        return this.getAttributeValue();
+    }
+
     public async compile() {
-        this.tree = new Tree(this.getAttributeValue());
+        this.tree = new Tree(this.code);
         await this.tree.prepare(this.tag.scope, this.tag.dom, this.tag);
         await super.compile();
     }

package/src/attributes/RootAttribute.ts

@@ -1,6 +1,7 @@
 import {Attribute} from "../Attribute";
 import {VisionHelper} from "../helpers/VisionHelper";
 import {Registry} from "../Registry";
+import {Scope} from "../Scope";
 
 @Registry.attribute('vsn-root')
 export class RootAttribute extends Attribute {
@@ -9,6 +10,8 @@ export class RootAttribute extends Attribute {
 
     public async setup() {
         this.tag.scope.set('$mobile', VisionHelper.isMobile());
+        if (console && !this.tag.scope.get('console'))
+            this.tag.scope.set('console', Scope.fromObject(console));
         await super.setup();
     }
 }

package/src/attributes/ScriptAttribute.ts

@@ -0,0 +1,9 @@
+import {Registry} from "../Registry";
+import {Exec} from "./Exec";
+
+@Registry.attribute('vsn-script')
+export class ScriptAttribute extends Exec {
+    public get code() {
+        return this.tag.element.innerText;
+    }
+}

package/src/attributes/_imports.ts

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

package/src/vsn.ts

@@ -55,7 +55,7 @@ export class Vision extends EventDispatcher {
         await this._dom.buildFrom(document, true);
         const now = (new Date()).getTime();
         const setupTime = now - startTime;
-        console.warn(`Took ${setupTime}ms to start up VisionJS. https://www.vsnjs.com/`, window ? `v${window['VSN_VERSION']}` : null);
+        console.info(`Took ${setupTime}ms to start up VisionJS. https://www.vsnjs.com/`, window ? `v${window['VSN_VERSION']}` : null);
     }
 
     public static get instance() {

package/test/AST/FunctionNode.spec.ts

@@ -0,0 +1,14 @@
+import {Tree} from "../../src/AST";
+import {Scope} from "../../src/Scope";
+
+
+describe('FunctionNode', () => {
+    it("properly define a simple function", async () => {
+        const tree = new Tree(`func add(a, b) { return a + b; }; add(1, 2);`);
+        const scope = new Scope();
+        await tree.prepare(scope, null, null);
+        expect(scope.get('add')).toBeDefined();
+        const v = await tree.evaluate(scope, null, null);
+        expect(v).toBe(3);
+    });
+});

package/demo/xhr.vsn

@@ -1,4 +0,0 @@
-<component>
-    <script></script>
-    <template></template>
-</component>