@urso/core 0.1.95 → 0.2.3-dev

package/src/js/modules/statesManager/functionsStorage.js

@@ -0,0 +1,83 @@
+
+class ModulesStatesManagerFunctionsStorage {
+    constructor() {
+        this._functionsCounter = 0;
+        this._functions = {};
+    }
+
+    //guards
+    add(key, guard, onlyOneFlag = false) {
+        this._addToStorage(key, guard, onlyOneFlag);
+    }
+
+    run(key) {
+        if (this._functions[key]) {
+            const functionsArray = Object.values(this._functions[key]);
+
+            for (const func of functionsArray) {
+                func();
+            }
+        }
+    }
+
+    runAndCallbackOnFinish(key, onFinishCallback) {
+        if (this._functions[key]) {
+            const functionsArray = Object.values(this._functions[key]);
+
+            const promises = [];
+
+            for (const func of functionsArray) {
+                promises.push(new Promise((resolve, reject) => { func(resolve); }));
+            }
+
+            Promise.all(promises).then(onFinishCallback);
+        } else {
+            onFinishCallback();
+        }
+    }
+
+    checkGuard(key) {
+        if (this._functions[key]) {
+            const guardsArray = Object.values(this._functions[key]);
+
+            for (const guard of guardsArray) {
+                if (!guard())
+                    return false;
+            }
+        }
+
+        return true;
+    }
+
+    remove(key, guard) {
+        this._removeFromStorage(key, guard);
+    }
+
+    _addToStorage(key, func, onlyOneFlag) {
+        if (!this._functions[key])
+            this._functions[key] = {};
+        else if (onlyOneFlag) {
+            Urso.logger.error('ModulesStatesManagerFunctionsStorage: action or state can have only one guard', key, func);
+            return;
+        }
+
+        const guid = this._getGuardsUid();
+        func._guid = guid;
+        this._functions[key][guid] = func;
+    }
+
+    _removeFromStorage(key, func) {
+        const guid = func._guid;
+        delete this._functions[key][guid];
+
+        if (Urso.helper.getObjectSize(this._functions[key]) === 0)
+            delete this._functions[key];
+    }
+
+    _getGuardsUid() {
+        this._functionsCounter++;
+        return 'guard_' + this._functionsCounter;
+    }
+}
+
+module.exports = ModulesStatesManagerFunctionsStorage;

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

@@ -1,37 +1,27 @@
-class ModulesStatesManagerHelper {
-    constructor() {
-        this.singleton = true;
-    }
-
-    getActionByConfig(config) {
-        let actionType = Object.keys(config)[0];
-        let actionParams = config[actionType];
-        let configActions = this.getInstance('ConfigActions').get();
-
-        if (actionType === "action") {
-            //actionParams is action name
-            let actionName = actionParams;
-
-            if (configActions[actionName]) {
-                let actionParamsConfig = Urso.helper.objectClone(configActions[actionName]);
-
-                if (!actionParamsConfig.name)
-                    actionParamsConfig.name = actionName;
-
-                actionParams = this.getInstance('ActionModel', actionParamsConfig); //replace params to action model
-            }
-
-            let customActionInstance = this.getInstance('Actions.' + Urso.helper.capitaliseFirstLetter(actionName), actionParams);
-
-            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,80 +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 false;
-
-        return true;
-    }
-
-    //can action be terminated ?
-    isTerminable() {
-        return true;
-    }
-
-    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 false;
+
+        return true;
+    }
+
+    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) {
+        return this.getInstance('Service').parse(template);
+    }
+
+}
+
+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;