vsn 0.1.128 → 0.1.130

package/dist/vsn.js.map

@@ -1 +1 @@
-{"version":3,"file":"vsn.js","sourceRoot":"","sources":["../src/vsn.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"vsn.js","sourceRoot":"","sources":["../src/vsn.ts"],"names":[],"mappings":"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"}

package/package.json

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

package/src/AST/FunctionNode.ts

@@ -50,6 +50,7 @@ export class FunctionNode extends Node implements TreeNode {
             } else {
                 functionScope = scope;
             }
+
             for (const arg of this.args) {
                 functionScope.set(arg, args.shift());
             }

package/src/AST/IndexNode.ts

@@ -11,6 +11,7 @@ export class IndexNode extends Node implements TreeNode {
         public readonly indexTwo: Node = null
     ) {
         super();
+        console.log('index node', object, index, indexTwo);
     }
 
     protected _getChildNodes(): Node[] {
@@ -42,6 +43,9 @@ export class IndexNode extends Node implements TreeNode {
             }
             return values;
         } else {
+            if (obj instanceof Scope) {
+                return obj.get(index as string);
+            }
             return (obj)[index];
         }
     }

package/src/AST.ts

@@ -132,6 +132,50 @@ export enum TokenType {
     DISPATCH_EVENT,
 }
 
+export interface BlockTypeConfiguration {
+    open: number,
+    close: number,
+}
+
+export const BlockTypeConfigurations: {[key: number]: BlockTypeConfiguration} = {
+    [BlockType.BRACE]: {
+        open: TokenType.L_BRACE,
+        close: TokenType.R_BRACE,
+    },
+    [BlockType.BRACKET]: {
+        open: TokenType.L_BRACKET,
+        close: TokenType.R_BRACKET,
+    },
+    [BlockType.PAREN]: {
+        open: TokenType.L_PAREN,
+        close: TokenType.R_PAREN,
+    },
+};
+
+export const BlockOpenToTypeMap = {
+    [TokenType.L_BRACE]: BlockType.BRACE,
+    [TokenType.L_BRACKET]: BlockType.BRACKET,
+    [TokenType.L_PAREN]: BlockType.PAREN,
+};
+
+export const BlockCloseToTypeMap = {
+    [TokenType.R_BRACE]: BlockType.BRACE,
+    [TokenType.R_BRACKET]: BlockType.BRACKET,
+    [TokenType.R_PAREN]: BlockType.PAREN,
+};
+
+export function getTokenBlockOpenerConfig(opener: TokenType) {
+    return BlockTypeConfigurations[BlockOpenToTypeMap[opener]];
+}
+
+export function tokenIsBlockOpener(token: TokenType): boolean {
+    return BlockOpenToTypeMap[token] !== undefined;
+}
+
+export function tokenIsBlockCloser(token: TokenType): boolean {
+    return BlockCloseToTypeMap[token] !== undefined;
+}
+
 const TOKEN_PATTERNS: TokenPattern[] = [
     {
         type: TokenType.WHITESPACE,
@@ -766,37 +810,41 @@ export class Tree {
 
     public static getBlockTokens(tokens: Token[], groupBy: TokenType | null = TokenType.COMMA): Token[][] {
         const blockInfo: IBlockInfo = Tree.getBlockInfo(tokens);
-        let openBlocks: number = 0;
         const args: Token[][] = [];
         let arg: Token[] = [];
-        for (let i: number = 0; i < tokens.length; i++) {
-            const token: Token = tokens[i];
-            if (token.type === blockInfo.open) {
-                openBlocks += 1;
-                if (openBlocks > 1)
-                    arg.push(token);
-            } else if (token.type === blockInfo.close) {
-                openBlocks -= 1;
-                if (openBlocks > 0)
-                    arg.push(token);
-            } else if (groupBy !== null && token.type === groupBy && openBlocks == 1) {
+        let isOpen = true;
+
+        // consume opener
+        tokens.shift();
+
+        while (isOpen) {
+            const token: Token = tokens[0];
+
+            if (token === undefined)
+                throw Error(`Invalid Syntax, missing ${blockInfo.closeCharacter}`);
+
+            if (token.type === blockInfo.close) {
+                isOpen = false;
+                tokens.shift();
+                //arg.push(token);
+            } else if (tokenIsBlockOpener(token.type)) {
+                const opener = tokens.shift();
+                const innerBlock = Tree.getTokensUntil(tokens, getTokenBlockOpenerConfig(token.type).close, true, true);
+                innerBlock.unshift(opener);
+                arg.push(...innerBlock);
+                //args.push(innerBlock);
+            } else if (groupBy !== null && token.type === groupBy) {
                 args.push(arg);
                 arg = [];
+                tokens.shift();
             } else if (token.type !== TokenType.WHITESPACE) {
-                arg.push(token);
-            }
-
-            // Consume token
-            tokens.shift()
-            i--;
-            if (openBlocks === 0) {
-                if (arg.length > 0)
-                    args.push(arg);
-
-                return args;
+                arg.push(tokens.shift());
             }
         }
-        throw Error(`Invalid Syntax, missing ${blockInfo.closeCharacter}`);
+        if (arg.length > 0)
+            args.push(arg);
+
+        return args;
     }
 
     public static getTokensUntil(tokens: Token[], terminator: TokenType = TokenType.SEMICOLON, consumeTerminator: boolean = true, includeTerminator: boolean = false, validIfTerminatorNotFound: boolean = false, blockInfo: IBlockInfo = null): Token[] {

package/src/DOM/AbstractDOM.ts

@@ -155,10 +155,19 @@ export abstract class AbstractDOM extends EventDispatcher {
         return this.rootElement.querySelector(q);
     }
 
-    public async exec(code: string) {
+    public async exec(code: string, data?: object) {
+        let scope = this.root.scope;
+        if (data) {
+            if (data instanceof Scope) {
+                scope = data
+            } else {
+                scope = new Scope();
+                scope.wrap(data);
+            }
+        }
         const tree = new Tree(code);
-        await tree.prepare(this.root.scope, this);
-        return await tree.evaluate(this.root.scope, this);
+        await tree.prepare(scope, this);
+        return await tree.evaluate(scope, this);
     }
 
     public async evaluate() {

package/src/Registry.ts

@@ -1,5 +1,4 @@
 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) {
@@ -28,11 +27,10 @@ export class RegistryStore<T = any> extends EventDispatcher {
         this.dispatch(`registered:${key}`, item);
     }
 
-    get(key: string): IPromise<any> {
-        const deferred: IDeferred<any> = SimplePromise.defer();
-
-        if (!!this.store[key]) {
-            deferred.resolve(this.store[key]);
+    get(key: string): Promise<any> {
+        return new Promise((resolve, reject) => {
+            if (!!this.store[key]) {
+            resolve(this.store[key]);
         } else {
             console.warn(`Waiting for ${key} to be registered.`);
             this.timeouts[key] = setTimeout(() => {
@@ -40,11 +38,10 @@ export class RegistryStore<T = any> extends EventDispatcher {
             }, 5000);
             this.once(`registered:${key}`, (cls) => {
                 clearTimeout(this.timeouts[key]);
-                deferred.resolve(cls);
+                resolve(cls);
             })
         }
-
-        return deferred.promise;
+        });
     }
 
     getSynchronous(key: string) {

package/src/version.ts

@@ -1,2 +1,2 @@
-export const VERSION = '0.1.128';
+export const VERSION = '0.1.130';
 

package/src/vsn.ts

@@ -61,8 +61,8 @@ export class Vision extends EventDispatcher {
         return this._dom;
     }
 
-    public async exec(code: string) {
-        return await this._dom.exec(code);
+    public async exec(code: string, data?: any) {
+        return await this._dom.exec(code, data);
     }
 
     public async setup() {
@@ -101,6 +101,5 @@ export {Model} from './Model';
 export {Service} from './Service';
 export {EventDispatcher} from './EventDispatcher';
 export {MessageList} from './MessageList';
-export {SimplePromise} from './SimplePromise';
 export {Tag} from './Tag';
 export const vision: Vision = Vision.instance;

package/test/AST/FunctionNode.spec.ts

@@ -11,4 +11,13 @@ describe('FunctionNode', () => {
         const v = await tree.evaluate(scope, null, null);
         expect(v).toBe(3);
     });
+
+    it("should take a multitude of arguments", async () => {
+        const tree = new Tree(`func add(a_int, a_dict, a_arr) { log(a_int, a_dict['a'], a_arr[0]); return a_int + a_dict['a'] + a_arr[0]; }; add(1, {'a':1, 'b': 2}, [1]);`);
+        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/test/AST.spec.ts

@@ -2,7 +2,6 @@ import {WrappedArray} from '../src/Scope/WrappedArray';
 import {Scope} from "../src/Scope";
 import {Tree} from "../src/AST";
 import {DOM} from "../src/DOM";
-import {IDeferred, SimplePromise} from "../src/SimplePromise";
 
 describe('Tree', () => {
     let scope: Scope = null,
@@ -242,14 +241,13 @@ describe('Tree', () => {
 
     it("should be able to block properly with promises", async () => {
         scope.set('blockingFunction', async (num, toAdd, fin: boolean = false) => {
-            const deferred: IDeferred<number> = SimplePromise.defer();
-            expect(scope.get('test')).toBe(num);
+            return new Promise((resolve, reject) => {
+                expect(scope.get('test')).toBe(num);
 
-            setTimeout(() => {
-                deferred.resolve(num + toAdd);
-            }, 1);
-
-            return deferred.promise;
+                setTimeout(() => {
+                    resolve(num + toAdd);
+                }, 1);
+            });
         });
 
         let tree: Tree = new Tree(`

package/test/Controller.spec.ts

@@ -1,6 +1,5 @@
 import {Controller} from '../src/Controller';
 import {DOM} from "../src/DOM";
-import {SimplePromise} from "../src/SimplePromise";
 import {Registry} from "../src/Registry";
 import {property} from "../src/Scope/properties/Property";
 import {Property, Scope, Tag} from "../src/vsn";
@@ -31,21 +30,21 @@ describe('Controller', () => {
             <div id="controller" vsn-controller:test="ControllerTestController" vsn-set:test.test="notTest" vsn-bind="test.test"></div>
         `;
         const dom = new DOM(document.body);
-        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 new Promise((resolve, reject) => {
+            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);
+                 */
+                resolve(null);
+            });
         });
-        await deferred.promise;
     });
 });

package/dist/SimplePromise.d.ts

@@ -1,42 +0,0 @@
-import { EventDispatcher } from "./EventDispatcher";
-export interface IDeferred<T> {
-    [key: string]: any;
-    promise: SimplePromise<T>;
-    resolve(result?: T): void;
-    reject(reason: string): void;
-}
-export declare type TResolve<T> = (result: T) => void;
-export declare type TReject = (reason: string) => void;
-export declare type TResult<T> = T | string | null;
-export declare enum EPromiseStates {
-    PENDING = 0,
-    FULFILLED = 1,
-    REJECTED = 2
-}
-export interface IPromise<T> extends EventDispatcher {
-    state: EPromiseStates;
-    result: TResult<T>;
-    then<X = T>(success?: (result?: T) => X, error?: (reason?: string) => string): IPromise<X>;
-    catch(onRejected: (reason: string) => string): IPromise<string>;
-    finally<X = T>(finallyCallback: (result: T | string) => X | string): IPromise<X>;
-}
-export declare function noop<T = any>(result?: T): T;
-export declare class SimplePromise<T> extends EventDispatcher implements IPromise<T> {
-    protected _state: EPromiseStates;
-    protected _result: TResult<T>;
-    private promiseClass;
-    constructor(executor: (resolve: TResolve<T>, reject: TReject) => void);
-    get state(): EPromiseStates;
-    get result(): TResult<T>;
-    static defer<T>(): IDeferred<T>;
-    static resolve<T>(result?: T): IPromise<T>;
-    static reject(reason: string): IPromise<void>;
-    static all<T>(iter: IPromise<T>[]): IPromise<T[]>;
-    static poolResults<T>(iter: IPromise<T>[], deferred: IDeferred<T[]>): void;
-    static race<T>(iter: IPromise<T>[]): IPromise<T>;
-    then<X = T>(success?: (result: T) => X, error?: (reason: string) => string): IPromise<X>;
-    catch(onRejected: (reason: string) => string): IPromise<string>;
-    finally<X = T>(finallyCallback: (result: T | string) => X | string): IPromise<X>;
-    protected _resolve(result: T): void;
-    protected _reject(reason: string): void;
-}

package/dist/SimplePromise.js

@@ -1,258 +0,0 @@
-"use strict";
-var __extends = (this && this.__extends) || (function () {
-    var extendStatics = function (d, b) {
-        extendStatics = Object.setPrototypeOf ||
-            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
-            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
-        return extendStatics(d, b);
-    };
-    return function (d, b) {
-        if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
-        extendStatics(d, b);
-        function __() { this.constructor = d; }
-        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
-    };
-})();
-var __values = (this && this.__values) || function(o) {
-    var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
-    if (m) return m.call(o);
-    if (o && typeof o.length === "number") return {
-        next: function () {
-            if (o && i >= o.length) o = void 0;
-            return { value: o && o[i++], done: !o };
-        }
-    };
-    throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.SimplePromise = exports.noop = exports.EPromiseStates = void 0;
-var EventDispatcher_1 = require("./EventDispatcher");
-var EPromiseStates;
-(function (EPromiseStates) {
-    EPromiseStates[EPromiseStates["PENDING"] = 0] = "PENDING";
-    EPromiseStates[EPromiseStates["FULFILLED"] = 1] = "FULFILLED";
-    EPromiseStates[EPromiseStates["REJECTED"] = 2] = "REJECTED";
-})(EPromiseStates = exports.EPromiseStates || (exports.EPromiseStates = {}));
-function noop(result) { return result; }
-exports.noop = noop;
-var SimplePromise = /** @class */ (function (_super) {
-    __extends(SimplePromise, _super);
-    function SimplePromise(executor) {
-        var _this = _super.call(this) || this;
-        _this._result = null;
-        _this._state = EPromiseStates.PENDING;
-        _this.promiseClass = (Object.getPrototypeOf(_this).constructor);
-        try {
-            executor(_this._resolve.bind(_this), _this._reject.bind(_this));
-        }
-        catch (e) {
-            _this._reject(e);
-        }
-        return _this;
-    }
-    Object.defineProperty(SimplePromise.prototype, "state", {
-        get: function () {
-            return this._state;
-        },
-        enumerable: false,
-        configurable: true
-    });
-    Object.defineProperty(SimplePromise.prototype, "result", {
-        get: function () {
-            return this._result;
-        },
-        enumerable: false,
-        configurable: true
-    });
-    SimplePromise.defer = function () {
-        var promise = new SimplePromise(function (res, rej) { });
-        return {
-            promise: promise,
-            resolve: promise._resolve.bind(promise),
-            reject: promise._reject.bind(promise)
-        };
-    };
-    /*
-     * Returns a Promise object that is resolved with the given value. If the value is a thenable (i.e. has a then
-     * method), the returned promise will "follow" that thenable, adopting its eventual state; otherwise the returned
-     * promise will be fulfilled with the value. Generally, if you don't know if a value is a promise or not,
-     * Promise.resolve(value) it instead and work with the return value as a promise.
-     */
-    SimplePromise.resolve = function (result) {
-        return new SimplePromise(function (resolve) {
-            if (result instanceof SimplePromise) {
-                result.then(function (innerResult) {
-                    resolve(innerResult);
-                });
-            }
-            else {
-                resolve(result);
-            }
-        });
-    };
-    /*
-     * Returns a Promise object that is rejected with the given reason.
-     */
-    SimplePromise.reject = function (reason) {
-        return new SimplePromise(function (resolve, reject) {
-            reject(reason);
-        });
-    };
-    /*
-     * Returns a promise that either fulfills when all of the promises in the iterable argument have fulfilled or
-     * rejects as soon as one of the promises in the iterable argument rejects. If the returned promise fulfills, it is
-     * fulfilled with an array of the values from the fulfilled promises in the same order as defined in the iterable.
-     * If the returned promise rejects, it is rejected with the reason from the first promise in the iterable that
-     * rejected. This method can be useful for aggregating results of multiple promises.
-     */
-    SimplePromise.all = function (iter) {
-        var e_1, _a;
-        var deferred = SimplePromise.defer();
-        var done = true;
-        try {
-            for (var iter_1 = __values(iter), iter_1_1 = iter_1.next(); !iter_1_1.done; iter_1_1 = iter_1.next()) {
-                var promise = iter_1_1.value;
-                if (promise.state == EPromiseStates.PENDING) {
-                    done = false;
-                    promise.once('fulfilled', function (result) {
-                        SimplePromise.poolResults(iter, deferred);
-                    });
-                    promise.once('rejected', function (reason) {
-                        deferred.reject(reason);
-                    });
-                }
-                else if (promise.state == EPromiseStates.REJECTED) {
-                    deferred.reject(promise.result);
-                    done = false;
-                    break;
-                }
-            }
-        }
-        catch (e_1_1) { e_1 = { error: e_1_1 }; }
-        finally {
-            try {
-                if (iter_1_1 && !iter_1_1.done && (_a = iter_1.return)) _a.call(iter_1);
-            }
-            finally { if (e_1) throw e_1.error; }
-        }
-        if (done)
-            SimplePromise.poolResults(iter, deferred);
-        return deferred.promise;
-    };
-    SimplePromise.poolResults = function (iter, deferred) {
-        var e_2, _a;
-        var done = true;
-        var results = [];
-        try {
-            for (var iter_2 = __values(iter), iter_2_1 = iter_2.next(); !iter_2_1.done; iter_2_1 = iter_2.next()) {
-                var p = iter_2_1.value;
-                if (p.state === EPromiseStates.REJECTED) {
-                    deferred.reject(p.result);
-                    break;
-                }
-                else if (p.state === EPromiseStates.PENDING) {
-                    done = false;
-                }
-                results.push(p.result);
-            }
-        }
-        catch (e_2_1) { e_2 = { error: e_2_1 }; }
-        finally {
-            try {
-                if (iter_2_1 && !iter_2_1.done && (_a = iter_2.return)) _a.call(iter_2);
-            }
-            finally { if (e_2) throw e_2.error; }
-        }
-        if (done)
-            deferred.resolve(results);
-    };
-    /*
-     * Returns a promise that fulfills or rejects as soon as one of the promises in the iterable fulfills or rejects,
-     * with the value or reason from that promise.
-     */
-    SimplePromise.race = function (iter) {
-        var e_3, _a;
-        var deferred = SimplePromise.defer();
-        try {
-            for (var iter_3 = __values(iter), iter_3_1 = iter_3.next(); !iter_3_1.done; iter_3_1 = iter_3.next()) {
-                var promise = iter_3_1.value;
-                promise.once('fulfilled', function (result) {
-                    deferred.resolve(result);
-                });
-                promise.once('rejected', function (reason) {
-                    deferred.reject(reason);
-                });
-            }
-        }
-        catch (e_3_1) { e_3 = { error: e_3_1 }; }
-        finally {
-            try {
-                if (iter_3_1 && !iter_3_1.done && (_a = iter_3.return)) _a.call(iter_3);
-            }
-            finally { if (e_3) throw e_3.error; }
-        }
-        return deferred.promise;
-    };
-    /*
-     * Appends fulfillment and rejection handlers to the promise, and returns a new promise resolving to the return
-     * value of the called handler, or to its original settled value if the promise was not handled (i.e. if the
-     * relevant handler onFulfilled or onRejected is not a function).
-     */
-    SimplePromise.prototype.then = function (success, error) {
-        var _this = this;
-        return new this.promiseClass(function (resolve, reject) {
-            if (_this.state === EPromiseStates.FULFILLED) {
-                if (success)
-                    resolve(success(_this.result));
-            }
-            else if (_this.state === EPromiseStates.REJECTED) {
-                if (error)
-                    reject(error(_this.result));
-            }
-            else {
-                _this.once('fulfilled', function (result) {
-                    if (success)
-                        resolve(success(result));
-                });
-                _this.once('rejected', function (reason) {
-                    if (error)
-                        reject(error(reason));
-                });
-            }
-        });
-    };
-    /*
-     * Appends a rejection handler callback to the promise, and returns a new promise resolving to the return value of
-     * the callback if it is called, or to its original fulfillment value if the promise is instead fulfilled.
-     */
-    SimplePromise.prototype.catch = function (onRejected) {
-        return this.then(undefined, onRejected);
-    };
-    /*
-     * Appends a handler to the promise, and returns a new promise which is resolved when the original promise is
-     * resolved. The handler is called when the promise is settled, whether fulfilled or rejected.
-     */
-    SimplePromise.prototype.finally = function (finallyCallback) {
-        var success = function (result) { return finallyCallback(result); };
-        var error = function (reason) { return finallyCallback(reason); };
-        return this.then(success, error);
-    };
-    SimplePromise.prototype._resolve = function (result) {
-        if (this.state !== EPromiseStates.PENDING)
-            return;
-        this._state = EPromiseStates.FULFILLED;
-        this._result = result;
-        this.dispatch('fulfilled', result);
-    };
-    SimplePromise.prototype._reject = function (reason) {
-        if (this.state !== EPromiseStates.PENDING)
-            return;
-        this._state = EPromiseStates.REJECTED;
-        this._result = reason;
-        this.dispatch('rejected', reason);
-    };
-    return SimplePromise;
-}(EventDispatcher_1.EventDispatcher));
-exports.SimplePromise = SimplePromise;
-//# sourceMappingURL=SimplePromise.js.map

package/dist/SimplePromise.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"SimplePromise.js","sourceRoot":"","sources":["../src/SimplePromise.ts"],"names":[],"mappings":"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"}