@urso/core 0.3.9 → 0.4.0

package/src/js/modules/statesManager/helper.js

@@ -1,27 +1,27 @@
-class ModulesStatesManagerHelper {
-    constructor() {
-        this.singleton = true;
-    }
-
-    getActionByConfig(config) {
-        let actionType = Object.keys(config)[0];
-        let actionParams = config[actionType];
-
-        if (actionType === "action") {
-            //actionParams is action name
-            let actionName = actionParams;
-
-            let customActionInstance = this.getInstance('Actions.' + Urso.helper.capitaliseFirstLetter(actionName));
-
-            if (customActionInstance) {
-                return customActionInstance;
-            }
-        }
-
-        let className = Urso.helper.capitaliseFirstLetter(actionType);
-        return this.getInstance(className, actionParams);
-    };
-
-}
-
-module.exports = ModulesStatesManagerHelper;
+class ModulesStatesManagerHelper {
+    constructor() {
+        this.singleton = true;
+    }
+
+    getActionByConfig(config) {
+        let actionType = Object.keys(config)[0];
+        let actionParams = config[actionType];
+
+        if (actionType === "action") {
+            //actionParams is action name
+            let actionName = actionParams;
+
+            let customActionInstance = this.getInstance('Actions.' + Urso.helper.capitaliseFirstLetter(actionName));
+
+            if (customActionInstance) {
+                return customActionInstance;
+            }
+        }
+
+        let className = Urso.helper.capitaliseFirstLetter(actionType);
+        return this.getInstance(className, actionParams);
+    };
+
+}
+
+module.exports = ModulesStatesManagerHelper;

package/src/js/modules/statesManager/race.js

@@ -1,75 +1,75 @@
-Action = require('./action.js');
-
-class ModulesStatesManagerRace extends Action {
-    constructor(params) {
-        super();
-
-        this.name = 'Race';
-        this._actions = [];
-        this.params = params;
-
-        for (let config of params) {
-            this._actions.push(this.getInstance('Helper').getActionByConfig(config));
-        }
-
-        this._actionSuccessHandler = this._actionSuccessHandler.bind(this);
-    }
-
-    //can we start this action?
-    guard() {
-        for (let action of this._actions)
-            if (action.guard())
-                return true;
-
-        return false;
-    }
-
-    run(onFinishCallback) {
-        log(`%c action run ---> ${this.name}`, 'color: orange', this.params);
-
-        this.finished = false;
-        this._onFinishCallback = onFinishCallback;
-
-        for (let action of this._actions)
-            if (action.guard())
-                action.run(this._actionSuccessHandler);
-            else
-                action.finished = true;
-    }
-
-    _actionSuccessHandler() {
-        if (!this._checkFinish())
-            this.terminate();
-    }
-
-    _checkFinish() {
-        for (let action of this._actions)
-            if (!action.finished)
-                return false;
-
-        this._onFinish();
-
-        return true;
-    }
-
-    terminate() {
-        if (this._terminating)
-            return;
-
-        log(`%c action terminate X ${this.name}`, 'color: orange');
-
-        this._terminating = true;
-
-        for (let action of this._actions)
-            if (!action.finished)
-                action.terminate();
-    }
-
-    _onFinish() {
-        this.finished = true;
-        log(`%c action finish <--- ${this.name}`, 'color: orange');
-        this._onFinishCallback();
-    }
-}
-
-module.exports = ModulesStatesManagerRace;
+Action = require('./action.js');
+
+class ModulesStatesManagerRace extends Action {
+    constructor(params) {
+        super();
+
+        this.name = 'Race';
+        this._actions = [];
+        this.params = params;
+
+        for (let config of params) {
+            this._actions.push(this.getInstance('Helper').getActionByConfig(config));
+        }
+
+        this._actionSuccessHandler = this._actionSuccessHandler.bind(this);
+    }
+
+    //can we start this action?
+    guard() {
+        for (let action of this._actions)
+            if (action.guard())
+                return true;
+
+        return false;
+    }
+
+    run(onFinishCallback) {
+        log(`%c action run ---> ${this.name}`, 'color: orange', this.params);
+
+        this.finished = false;
+        this._onFinishCallback = onFinishCallback;
+
+        for (let action of this._actions)
+            if (action.guard())
+                action.run(this._actionSuccessHandler);
+            else
+                action.finished = true;
+    }
+
+    _actionSuccessHandler() {
+        if (!this._checkFinish())
+            this.terminate();
+    }
+
+    _checkFinish() {
+        for (let action of this._actions)
+            if (!action.finished)
+                return false;
+
+        this._onFinish();
+
+        return true;
+    }
+
+    terminate() {
+        if (this._terminating)
+            return;
+
+        log(`%c action terminate X ${this.name}`, 'color: orange');
+
+        this._terminating = true;
+
+        for (let action of this._actions)
+            if (!action.finished)
+                action.terminate();
+    }
+
+    _onFinish() {
+        this.finished = true;
+        log(`%c action finish <--- ${this.name}`, 'color: orange');
+        this._onFinishCallback();
+    }
+}
+
+module.exports = ModulesStatesManagerRace;

package/src/js/modules/statesManager/sequence.js

@@ -1,47 +1,47 @@
-All = require('./all.js');
-
-class ModulesStatesManagerSequence extends All {
-    constructor(params) {
-        super(params);
-        this.name = 'Sequence';
-    }
-
-    run(onFinishCallback) {
-        log(`%c action run ---> ${this.name}`, 'color: orange', this.params);
-
-        this.finished = false;
-        this._onFinishCallback = onFinishCallback;
-
-        this._checkFinish();
-    }
-
-    _checkFinish() {
-        if (!this._terminating)
-            for (let action of this._actions)
-                if (!action.finished) {
-                    if (action.guard())
-                        return action.run(this._actionSuccessHandler);
-                    else
-                        action.finished = true;
-                }
-
-        this._onFinish();
-
-        return true;
-    }
-
-    terminate() {
-        if (this._terminating)
-            return;
-
-        log(`%c action terminate X ${this.name}`, 'color: orange');
-
-        this._terminating = true;
-
-        for (let action of this._actions)
-            if (!action.finished)
-                return action.terminate(); //only one action is currently running
-    }
-}
-
-module.exports = ModulesStatesManagerSequence;
+All = require('./all.js');
+
+class ModulesStatesManagerSequence extends All {
+    constructor(params) {
+        super(params);
+        this.name = 'Sequence';
+    }
+
+    run(onFinishCallback) {
+        log(`%c action run ---> ${this.name}`, 'color: orange', this.params);
+
+        this.finished = false;
+        this._onFinishCallback = onFinishCallback;
+
+        this._checkFinish();
+    }
+
+    _checkFinish() {
+        if (!this._terminating)
+            for (let action of this._actions)
+                if (!action.finished) {
+                    if (action.guard())
+                        return action.run(this._actionSuccessHandler);
+                    else
+                        action.finished = true;
+                }
+
+        this._onFinish();
+
+        return true;
+    }
+
+    terminate() {
+        if (this._terminating)
+            return;
+
+        log(`%c action terminate X ${this.name}`, 'color: orange');
+
+        this._terminating = true;
+
+        for (let action of this._actions)
+            if (!action.finished)
+                return action.terminate(); //only one action is currently running
+    }
+}
+
+module.exports = ModulesStatesManagerSequence;

package/src/js/modules/template/_info.js

@@ -1,6 +1,6 @@
-Urso.Core.Modules.Template = {
-    Controller: require('./controller.js'),
-    Model: require('./model.js'),
-    Service: require('./service.js'),
-    Types: require('./types.js')
-};
+Urso.Core.Modules.Template = {
+    Controller: require('./controller.js'),
+    Model: require('./model.js'),
+    Service: require('./service.js'),
+    Types: require('./types.js')
+};

package/src/js/modules/template/controller.js

@@ -1,28 +1,28 @@
-class ModulesTemplateController {
-    constructor() {
-        this.singleton = true;
-
-        //set types
-        Urso.types = this.getInstance('Types').list;
-    };
-
-    get() {
-        return this.getInstance('Service').getTemplate();
-    }
-
-    scene(name) {
-        return this.getInstance('Service').getSceneOrGroup(name, 'Scenes');
-    };
-
-    group(name) {
-        return this.getInstance('Service').getSceneOrGroup(name, 'Groups');
-    };
-
-    //make template
-    parse(template) {
-        return this.getInstance('Service').parse(template);
-    }
-
-}
-
-module.exports = ModulesTemplateController;
+class ModulesTemplateController {
+    constructor() {
+        this.singleton = true;
+
+        //set types
+        Urso.types = this.getInstance('Types').list;
+    };
+
+    get() {
+        return this.getInstance('Service').getTemplate();
+    }
+
+    scene(name) {
+        return this.getInstance('Service').getSceneOrGroup(name, 'Scenes');
+    };
+
+    group(name) {
+        return this.getInstance('Service').getSceneOrGroup(name, 'Groups');
+    };
+
+    //make template
+    parse(template, additionalTemplateFlag) {
+        return this.getInstance('Service').parse(template, additionalTemplateFlag);
+    }
+
+}
+
+module.exports = ModulesTemplateController;

package/src/js/modules/template/model.js

@@ -1,11 +1,11 @@
-class ModulesTemplateModel {
-    constructor() {
-        this.styles = {};
-        this.assets = [];
-        this.objects = [];
-        this.components = [];
-        this._templatePath = false;
-    }
-}
-
-module.exports = ModulesTemplateModel;
+class ModulesTemplateModel {
+    constructor() {
+        this.styles = {};
+        this.assets = [];
+        this.objects = [];
+        this.components = [];
+        this._templatePath = false;
+    }
+}
+
+module.exports = ModulesTemplateModel;

package/src/js/modules/template/service.js

@@ -1,125 +1,137 @@
-class ModulesTemplateService {
-    constructor() {
-        this.singleton = true;
-
-        this._currentTemplate = this.getInstance('Model');
-    };
-
-    getTemplate() {
-        return this._currentTemplate;
-    }
-
-    getSceneOrGroup(name, namespace) {
-        let nameCapitalise = Urso.helper.capitaliseFirstLetter(name);
-        let path = `Templates.${namespace}.${nameCapitalise}`;
-        let entity = Urso.getInstance(path);
-        this._setTemplatePath(entity, path);
-        return entity;
-    }
-
-    parse(template) {
-        this._currentTemplate = Urso.helper.mergeObjectsRecursive(this.getInstance('Model'), template);
-
-        this._parseAssets(this._currentTemplate.assets, template._templatePath);
-        this._parseObjects(this._currentTemplate.objects, template._templatePath);
-
-        return this._currentTemplate;
-    }
-
-    _setTemplatePath(target, templatePath) {
-        target._templatePath = templatePath;
-    }
-
-    _parseAssets(assets, templatePath) {
-        for (let asset of assets) {
-            this._setTemplatePath(asset, templatePath);
-        }
-    }
-
-    //parseForComponentsAndGroups
-    _parseObjects(objects, templatePath) {
-        for (let obj of objects) {
-            this._setTemplatePath(obj, templatePath);
-
-            if (obj.contents)
-                this._parseObjects(obj.contents, templatePath);
-
-            if (obj.type === Urso.types.objects.GROUP)
-                this._processGroup(obj);
-
-            if (obj.type === Urso.types.objects.COMPONENT)
-                this._processComponent(obj);
-        }
-    }
-
-    _processGroup(obj) {
-        let groupTemplate = this.getInstance('Controller').group(obj.groupName);
-
-        if (!groupTemplate)
-            Urso.logger.error('ModulesTemplateController group Template error ' + obj.groupName);
-
-        if (groupTemplate.assets)
-            this._parseAssets(groupTemplate.assets, groupTemplate._templatePath);
-
-        if (groupTemplate.objects)
-            this._parseObjects(groupTemplate.objects, groupTemplate._templatePath);
-
-        this._mergeStylesAndAssets({ styles: groupTemplate.styles, assets: groupTemplate.assets })
-
-        //objects
-        obj.contents = groupTemplate.objects;
-    }
-
-    _processComponent(obj) {
-        let path = 'Components.' + Urso.helper.capitaliseFirstLetter(obj.componentName) + '.Controller';
-        let componentInstance = Urso.getInstance(path, obj.options);
-
-        if (!componentInstance) {
-            Urso.logger.error(`ModulesTemplateController Component error. Component ${obj.componentName} not found. Please check components _info.js file.`);
-            Urso.logger.error(`To use only templates use Groups please.`);
-        }
-
-        let data = componentInstance.assetsMount();
-
-        if (data.assets)
-            this._parseAssets(data.assets, path);
-
-        this._mergeStylesAndAssets(data);
-
-        //objects
-        let componentsObjects = componentInstance.objectsMount();
-
-        if (componentsObjects)
-            this._parseObjects(componentsObjects, path);
-
-        obj.contents = obj.contents ? Urso.helper.mergeArrays(obj.contents, componentsObjects) : (componentsObjects || []);
-
-        //instance to object
-        obj._controller = componentInstance;
-
-        //object to instance
-        componentInstance.object = obj;
-
-        this._currentTemplate.components.push(componentInstance);
-    }
-
-    _mergeStylesAndAssets(data) {
-        //styles
-        if (data.styles)
-            this._currentTemplate.styles = Urso.helper.mergeObjectsRecursive(
-                this._currentTemplate.styles,
-                data.styles,
-                true
-            );
-
-        //assets
-        if (data.assets)
-            this._currentTemplate.assets = Urso.helper.mergeArrays(
-                this._currentTemplate.assets,
-                data.assets
-            );
-    }
-
-}
-
-module.exports = ModulesTemplateService;
+class ModulesTemplateService {
+    constructor() {
+        this.singleton = true;
+
+        this._currentTemplate = this.getInstance('Model');
+        this._actualTemplate;
+    };
+
+    getTemplate() {
+        return this._actualTemplate;
+    }
+
+    getSceneOrGroup(name, namespace) {
+        let nameCapitalise = Urso.helper.capitaliseFirstLetter(name);
+        let path = `Templates.${namespace}.${nameCapitalise}`;
+        let entity = Urso.getInstance(path);
+        this._setTemplatePath(entity, path);
+        return entity;
+    }
+
+    parse(template, additionalTemplateFlag) {
+        this._currentTemplate = Urso.helper.mergeObjectsRecursive(this.getInstance('Model'), template);
+
+        this._parseAssets(this._currentTemplate.assets, template._templatePath);
+        this._parseObjects(this._currentTemplate.objects, template._templatePath);
+
+        if (additionalTemplateFlag) {
+            this._actualTemplate.assets = Urso.helper.mergeArrays(this._actualTemplate.assets, this._currentTemplate.assets);
+            this._actualTemplate.components = Urso.helper.mergeArrays(this._actualTemplate.components, this._currentTemplate.components);
+            this._actualTemplate.objects = Urso.helper.mergeArrays(this._actualTemplate.objects, this._currentTemplate.objects);
+            Urso.helper.mergeObjectsRecursive(this._actualTemplate.styles, this._currentTemplate.styles);
+        } else {
+            this._actualTemplate = this._currentTemplate;
+        }
+
+        return this._currentTemplate;
+    }
+
+    _setTemplatePath(target, templatePath) {
+        target._templatePath = templatePath;
+    }
+
+    _parseAssets(assets, templatePath) {
+        for (let asset of assets) {
+            this._setTemplatePath(asset, templatePath);
+        }
+    }
+
+    //parseForComponentsAndGroups
+    _parseObjects(objects, templatePath) {
+        for (let obj of objects) {
+            this._setTemplatePath(obj, templatePath);
+
+            if (obj.contents)
+                this._parseObjects(obj.contents, templatePath);
+
+            if (obj.type === Urso.types.objects.GROUP)
+                this._processGroup(obj);
+
+            if (obj.type === Urso.types.objects.COMPONENT)
+                this._processComponent(obj);
+
+            obj._parsed = true;
+        }
+    }
+
+    _processGroup(obj) {
+        let groupTemplate = this.getInstance('Controller').group(obj.groupName);
+
+        if (!groupTemplate)
+            Urso.logger.error('ModulesTemplateController group Template error ' + obj.groupName);
+
+        if (groupTemplate.assets)
+            this._parseAssets(groupTemplate.assets, groupTemplate._templatePath);
+
+        if (groupTemplate.objects)
+            this._parseObjects(groupTemplate.objects, groupTemplate._templatePath);
+
+        this._mergeStylesAndAssets({ styles: groupTemplate.styles, assets: groupTemplate.assets })
+
+        //objects
+        obj.contents = groupTemplate.objects;
+    }
+
+    _processComponent(obj) {
+        let path = 'Components.' + Urso.helper.capitaliseFirstLetter(obj.componentName) + '.Controller';
+        let componentInstance = Urso.getInstance(path, obj.options);
+
+        if (!componentInstance) {
+            Urso.logger.error(`ModulesTemplateController Component error. Component ${obj.componentName} not found. Please check components _info.js file.`);
+            Urso.logger.error(`To use only templates use Groups please.`);
+        }
+
+        let data = componentInstance.assetsMount();
+
+        if (data.assets)
+            this._parseAssets(data.assets, path);
+
+        this._mergeStylesAndAssets(data);
+
+        //objects
+        let componentsObjects = componentInstance.objectsMount();
+
+        if (componentsObjects)
+            this._parseObjects(componentsObjects, path);
+
+        obj.contents = obj.contents ? Urso.helper.mergeArrays(obj.contents, componentsObjects) : (componentsObjects || []);
+
+        //instance to object
+        obj._controller = componentInstance;
+
+        //object to instance
+        componentInstance.object = obj;
+
+        this._currentTemplate.components.push(componentInstance);
+    }
+
+    _mergeStylesAndAssets(data) {
+        //styles
+        if (data.styles)
+            this._currentTemplate.styles = Urso.helper.mergeObjectsRecursive(
+                this._currentTemplate.styles,
+                data.styles,
+                true
+            );
+
+        //assets
+        if (data.assets)
+            this._currentTemplate.assets = Urso.helper.mergeArrays(
+                this._currentTemplate.assets,
+                data.assets
+            );
+    }
+
+}
+
+module.exports = ModulesTemplateService;