@urso/core 0.3.5 → 0.3.6

package/src/js/modules/instances/controller.js

@@ -1,219 +1,219 @@
-class ModulesInstancesController {
-    constructor() {
-        this._modes = [];
-        this._cache = {};
-
-        this.getInstance = this.getInstance.bind(this);
-        this.getByPath = this.getByPath.bind(this);
-        this._setComonFunctions = this._setComonFunctions.bind(this);
-
-        this.getModes = this.getModes.bind(this);
-        this.addMode = this.addMode.bind(this);
-        this.removeMode = this.removeMode.bind(this);
-    }
-
-    getByPath(path, noModes, modeName) {
-        let callback = (a) => {
-            return a;
-        };
-
-        return this._findClass({ path, callback, noModes, modeName });
-    }
-
-    getModes() {
-        return this._modes;
-    }
-
-    addMode(mode) {
-        if (this._modes.indexOf(mode) !== -1)
-            return false;
-
-        this._modes.push(mode);
-        Urso.observer.emit(Urso.events.MODULES_INSTANCES_MODES_CHANGED);
-        return true;
-    }
-
-    removeMode(mode) {
-        let index = this._modes.indexOf(mode);
-
-        if (index === -1)
-            return false;
-
-        this._modes.splice(index, 1);
-        Urso.observer.emit(Urso.events.MODULES_INSTANCES_MODES_CHANGED);
-        return true;
-    }
-
-    getInstance(path, params, noModes, modeName) {
-        let callback = (classObject) => {
-            if (typeof classObject !== "function") { //typeof class is a function
-                Urso.logger.error('getInstance type error');
-            }
-
-            if (classObject._instance && classObject._instance.singleton)
-                return classObject._instance;
-
-            this._setComonFunctions(classObject, path);
-
-            let instance = new classObject(params);
-
-            if (instance.singleton)
-                classObject._instance = instance;
-
-            this._launchDefaultFunctions(instance);
-
-            return instance;
-        };
-
-        return this._findClass({ path, callback, noModes, modeName });
-    }
-
-    _setComonFunctions(classObject, path) {
-        classObject.prototype.getInstance = this._entityGetInstance(path);
-        classObject.prototype.addListener = this._entityAddListener;
-        classObject.prototype.removeListener = this._entityRemoveListener;
-        classObject.prototype.emit = this._entityEmit;
-    }
-
-    _setComonEntityFunctions(classObject, callerObject) {
-        if (callerObject.common && !classObject.common) { //components common
-            classObject.common = callerObject.common;
-
-            //getInstance calls in constructor
-            if (classObject.__entities)
-                classObject.__entities.forEach(entity => this._setComonEntityFunctions(entity, classObject));
-        }
-    }
-
-    _launchDefaultFunctions(instance) {
-        //_subscribe
-        if (instance && instance._subscribe)
-            instance._subscribe();
-
-        //_subscribeOnce
-        if (instance && instance._subscribeOnce && !instance.__subscribedOnce) {
-            instance.__subscribedOnce = true;
-            instance._subscribeOnce();
-        }
-    }
-
-    _entityGetInstance(path) {
-        const entityPath = Urso.helper.initial(path.split('.')).join('.');
-        const self = this;
-
-        return function (layer, params, noModes, modeName) {
-            let instance = self.getInstance(
-                entityPath + '.' + layer,
-                params, noModes, modeName
-            );
-
-            self._addEntityToClass(instance, this);
-
-            if (instance)
-                self._setComonEntityFunctions(instance, this);
-
-            return instance;
-        };
-    }
-
-    _addEntityToClass(classObject, callerObject) {
-        if (!callerObject.__entities)
-            callerObject.__entities = [];
-
-        callerObject.__entities.push(classObject);
-    }
-
-    _entityAddListener() {
-        Urso.observer.add.apply(Urso.observer, arguments);
-    }
-
-    _entityRemoveListener() {
-        Urso.observer.remove.apply(Urso.observer, arguments);
-    }
-
-    _entityEmit() {
-        Urso.observer.fire.apply(Urso.observer, arguments);
-    }
-
-    _findClass(params) {
-        //put all params exept callback in key
-        let cacheKey = [
-            params.path,
-            params.modeName || 'none',
-            params.noModes || 'false'
-        ].join('_');
-
-        //check cache
-        if (cacheKey in this._cache)
-            return this._cache[cacheKey] ? params.callback(this._cache[cacheKey]) : false;
-
-        //no class in cache - we will find class by path
-        let classObject = this._getClassByPath(params.path, params.noModes);
-
-        if (!classObject)
-            return false;
-
-        let finalPath = params.path;
-
-        //setup __path to classObject
-        if (typeof classObject === 'function') //class
-            classObject.prototype.__path = finalPath;
-        else if (typeof classObject === 'object')
-            classObject.__path = finalPath;
-
-        //add to cache
-        this._cache[cacheKey] = classObject;
-
-        return params.callback(this._cache[cacheKey]);
-    }
-
-    _getClassByPath(path, noModes) {
-        let pathArr = path.split('.');
-        let entitiesArray = Urso.helper.mergeArrays(['Urso', 'Game'], pathArr);
-        return this._checkPathExist(entitiesArray, noModes);
-    }
-
-    /**
-     * check if object exist
-     * @param {Object} entitiesArray like ['Urso', 'Game', 'Lib', 'Helper']
-     * @returns {mixed}
-     */
-    _checkPathExist(entitiesArray, noModes) {
-        let currentTestObject = window;
-        let testMode;
-
-        for (let entitiesIndex = 0; entitiesIndex < entitiesArray.length; entitiesIndex++) {
-            if (!noModes && this._modes && entitiesIndex === entitiesArray.length - 1)
-                testMode = this._checkPathWithModes(currentTestObject, entitiesArray, entitiesIndex);
-
-            if (testMode)
-                currentTestObject = testMode;
-            else if (currentTestObject[entitiesArray[entitiesIndex]])
-                currentTestObject = currentTestObject[entitiesArray[entitiesIndex]];
-            else
-                return false;
-        }
-
-        return currentTestObject;
-    }
-
-    _checkPathWithModes(currentTestObject, entitiesArray, entitiesIndex) {
-        for (let mode of this._modes) {
-            const capMode = Urso.helper.capitaliseFirstLetter(mode);
-
-            if (currentTestObject[capMode]) {
-                const checkResult = this._checkPathWithModes(currentTestObject[capMode], entitiesArray, entitiesIndex);
-
-                if (checkResult)
-                    return checkResult;
-            }
-        }
-
-        if (currentTestObject[entitiesArray[entitiesIndex]])
-            return currentTestObject[entitiesArray[entitiesIndex]];
-
-        return false;
-    }
-}
-
-module.exports = ModulesInstancesController;
+class ModulesInstancesController {
+    constructor() {
+        this._modes = [];
+        this._cache = {};
+
+        this.getInstance = this.getInstance.bind(this);
+        this.getByPath = this.getByPath.bind(this);
+        this._setComonFunctions = this._setComonFunctions.bind(this);
+
+        this.getModes = this.getModes.bind(this);
+        this.addMode = this.addMode.bind(this);
+        this.removeMode = this.removeMode.bind(this);
+    }
+
+    getByPath(path, noModes, modeName) {
+        let callback = (a) => {
+            return a;
+        };
+
+        return this._findClass({ path, callback, noModes, modeName });
+    }
+
+    getModes() {
+        return this._modes;
+    }
+
+    addMode(mode) {
+        if (this._modes.indexOf(mode) !== -1)
+            return false;
+
+        this._modes.push(mode);
+        Urso.observer.emit(Urso.events.MODULES_INSTANCES_MODES_CHANGED);
+        return true;
+    }
+
+    removeMode(mode) {
+        let index = this._modes.indexOf(mode);
+
+        if (index === -1)
+            return false;
+
+        this._modes.splice(index, 1);
+        Urso.observer.emit(Urso.events.MODULES_INSTANCES_MODES_CHANGED);
+        return true;
+    }
+
+    getInstance(path, params, noModes, modeName) {
+        let callback = (classObject) => {
+            if (typeof classObject !== "function") { //typeof class is a function
+                Urso.logger.error('getInstance type error');
+            }
+
+            if (classObject._instance && classObject._instance.singleton)
+                return classObject._instance;
+
+            this._setComonFunctions(classObject, path);
+
+            let instance = new classObject(params);
+
+            if (instance.singleton)
+                classObject._instance = instance;
+
+            this._launchDefaultFunctions(instance);
+
+            return instance;
+        };
+
+        return this._findClass({ path, callback, noModes, modeName });
+    }
+
+    _setComonFunctions(classObject, path) {
+        classObject.prototype.getInstance = this._entityGetInstance(path);
+        classObject.prototype.addListener = this._entityAddListener;
+        classObject.prototype.removeListener = this._entityRemoveListener;
+        classObject.prototype.emit = this._entityEmit;
+    }
+
+    _setComonEntityFunctions(classObject, callerObject) {
+        if (callerObject.common && !classObject.common) { //components common
+            classObject.common = callerObject.common;
+
+            //getInstance calls in constructor
+            if (classObject.__entities)
+                classObject.__entities.forEach(entity => this._setComonEntityFunctions(entity, classObject));
+        }
+    }
+
+    _launchDefaultFunctions(instance) {
+        //_subscribe
+        if (instance && instance._subscribe)
+            instance._subscribe();
+
+        //_subscribeOnce
+        if (instance && instance._subscribeOnce && !instance.__subscribedOnce) {
+            instance.__subscribedOnce = true;
+            instance._subscribeOnce();
+        }
+    }
+
+    _entityGetInstance(path) {
+        const entityPath = Urso.helper.initial(path.split('.')).join('.');
+        const self = this;
+
+        return function (layer, params, noModes, modeName) {
+            let instance = self.getInstance(
+                entityPath + '.' + layer,
+                params, noModes, modeName
+            );
+
+            self._addEntityToClass(instance, this);
+
+            if (instance)
+                self._setComonEntityFunctions(instance, this);
+
+            return instance;
+        };
+    }
+
+    _addEntityToClass(classObject, callerObject) {
+        if (!callerObject.__entities)
+            callerObject.__entities = [];
+
+        callerObject.__entities.push(classObject);
+    }
+
+    _entityAddListener() {
+        Urso.observer.add.apply(Urso.observer, arguments);
+    }
+
+    _entityRemoveListener() {
+        Urso.observer.remove.apply(Urso.observer, arguments);
+    }
+
+    _entityEmit() {
+        Urso.observer.fire.apply(Urso.observer, arguments);
+    }
+
+    _findClass(params) {
+        //put all params exept callback in key
+        let cacheKey = [
+            params.path,
+            params.modeName || 'none',
+            params.noModes || 'false'
+        ].join('_');
+
+        //check cache
+        if (cacheKey in this._cache)
+            return this._cache[cacheKey] ? params.callback(this._cache[cacheKey]) : false;
+
+        //no class in cache - we will find class by path
+        let classObject = this._getClassByPath(params.path, params.noModes);
+
+        if (!classObject)
+            return false;
+
+        let finalPath = params.path;
+
+        //setup __path to classObject
+        if (typeof classObject === 'function') //class
+            classObject.prototype.__path = finalPath;
+        else if (typeof classObject === 'object')
+            classObject.__path = finalPath;
+
+        //add to cache
+        this._cache[cacheKey] = classObject;
+
+        return params.callback(this._cache[cacheKey]);
+    }
+
+    _getClassByPath(path, noModes) {
+        let pathArr = path.split('.');
+        let entitiesArray = Urso.helper.mergeArrays(['Urso', 'Game'], pathArr);
+        return this._checkPathExist(entitiesArray, noModes);
+    }
+
+    /**
+     * check if object exist
+     * @param {Object} entitiesArray like ['Urso', 'Game', 'Lib', 'Helper']
+     * @returns {mixed}
+     */
+    _checkPathExist(entitiesArray, noModes) {
+        let currentTestObject = window;
+        let testMode;
+
+        for (let entitiesIndex = 0; entitiesIndex < entitiesArray.length; entitiesIndex++) {
+            if (!noModes && this._modes && entitiesIndex === entitiesArray.length - 1)
+                testMode = this._checkPathWithModes(currentTestObject, entitiesArray, entitiesIndex);
+
+            if (testMode)
+                currentTestObject = testMode;
+            else if (currentTestObject[entitiesArray[entitiesIndex]])
+                currentTestObject = currentTestObject[entitiesArray[entitiesIndex]];
+            else
+                return false;
+        }
+
+        return currentTestObject;
+    }
+
+    _checkPathWithModes(currentTestObject, entitiesArray, entitiesIndex) {
+        for (let mode of this._modes) {
+            const capMode = Urso.helper.capitaliseFirstLetter(mode);
+
+            if (currentTestObject[capMode]) {
+                const checkResult = this._checkPathWithModes(currentTestObject[capMode], entitiesArray, entitiesIndex);
+
+                if (checkResult)
+                    return checkResult;
+            }
+        }
+
+        if (currentTestObject[entitiesArray[entitiesIndex]])
+            return currentTestObject[entitiesArray[entitiesIndex]];
+
+        return false;
+    }
+}
+
+module.exports = ModulesInstancesController;

package/src/js/modules/logic/_info.js

@@ -1,5 +1,5 @@
-Urso.Core.Modules.Logic = {
-    Controller: require('./controller.js'),
-    Sounds: require('./sounds.js')
-};
+Urso.Core.Modules.Logic = {
+    Controller: require('./controller.js'),
+    Sounds: require('./sounds.js')
+};
 require('./config/_info');

package/src/js/modules/logic/config/_info.js

@@ -1,3 +1,3 @@
-Urso.Core.Modules.Logic.Config = {
-    Sounds: require('./sounds.js')
+Urso.Core.Modules.Logic.Config = {
+    Sounds: require('./sounds.js')
 };

package/src/js/modules/logic/config/sounds.js

@@ -1,23 +1,23 @@
-class ModulesLogicConfigSounds {
-    constructor(){
-        this.singleton = true;
-        this.soundsConfig = this.getSoundsConfig();
-    }
-
-    getSoundsConfig(){
-        return {
-            main: [
-                { soundKey: 'sound1', event: 'sound1.play.once', action: 'play' },
-                { soundKey: 'sound_check', event: 'soundCheck.play.once', action: 'play' },
-                { soundKey: 'sound_check', event: 'soundCheck.stop', action: 'stop' },
-                { soundKey: 'sound_check', event: 'soundCheck.pause', action: 'pause' },
-                { soundKey: 'sound_check', event: 'soundCheck.resume', action: 'resume' },
-                { soundKey: 'sound_check', event: 'soundCheck.play.loop', action: 'play', relaunch: true, loop: true }
-            ]
-        };
-    };
-
-};
-
-module.exports = ModulesLogicConfigSounds;
-
+class ModulesLogicConfigSounds {
+    constructor(){
+        this.singleton = true;
+        this.soundsConfig = this.getSoundsConfig();
+    }
+
+    getSoundsConfig(){
+        return {
+            main: [
+                { soundKey: 'sound1', event: 'sound1.play.once', action: 'play' },
+                { soundKey: 'sound_check', event: 'soundCheck.play.once', action: 'play' },
+                { soundKey: 'sound_check', event: 'soundCheck.stop', action: 'stop' },
+                { soundKey: 'sound_check', event: 'soundCheck.pause', action: 'pause' },
+                { soundKey: 'sound_check', event: 'soundCheck.resume', action: 'resume' },
+                { soundKey: 'sound_check', event: 'soundCheck.play.loop', action: 'play', relaunch: true, loop: true }
+            ]
+        };
+    };
+
+};
+
+module.exports = ModulesLogicConfigSounds;
+

package/src/js/modules/logic/controller.js

@@ -1,48 +1,48 @@
-class ModulesLogicController {
-    constructor() { 
-        this._baseLogicBlocks = ['sounds', 'buttons'];
-        const additionalLogicBlocks = this.getAdditionalLogicBlocks();
-        this.logicBlocks = [...this._baseLogicBlocks, ...additionalLogicBlocks];
-
-        this._instances = {};
-        this._init();
-    };
-    
-    _init(){
-        this._createLogicInstances();
-    };
-
-    getAdditionalLogicBlocks(){
-        return [];
-    };
-
-    _createLogicInstances(){
-        //console.log('[Modules.Brain.Controller]', ' Creating logic blocks:', JSON.stringify(this.logicBlocks));
-
-        for (let i = 0; i < this.logicBlocks.length; i++) {
-            const blockName = this.logicBlocks[i];
-            const blockNameNormalized = Urso.helper.capitaliseFirstLetter(blockName);
-            this._instances[blockName] = this.getInstance(blockNameNormalized);
-        }
-    };
-
-    do(){
-        const results = [];
-        const params =  [ ...arguments ];
-        const funName = params.shift(); 
-
-        for (let blockName in this._instances) {
-            const instance = this._instances[blockName];
-
-            if(instance && instance[funName]){
-                results[blockName] = instance[funName].apply(this, params);
-            }
-        }
-
-       return results;
-    };
-
-    _subscribe(){};
-}
-
-module.exports = ModulesLogicController;
+class ModulesLogicController {
+    constructor() { 
+        this._baseLogicBlocks = ['sounds', 'buttons'];
+        const additionalLogicBlocks = this.getAdditionalLogicBlocks();
+        this.logicBlocks = [...this._baseLogicBlocks, ...additionalLogicBlocks];
+
+        this._instances = {};
+        this._init();
+    };
+    
+    _init(){
+        this._createLogicInstances();
+    };
+
+    getAdditionalLogicBlocks(){
+        return [];
+    };
+
+    _createLogicInstances(){
+        //console.log('[Modules.Brain.Controller]', ' Creating logic blocks:', JSON.stringify(this.logicBlocks));
+
+        for (let i = 0; i < this.logicBlocks.length; i++) {
+            const blockName = this.logicBlocks[i];
+            const blockNameNormalized = Urso.helper.capitaliseFirstLetter(blockName);
+            this._instances[blockName] = this.getInstance(blockNameNormalized);
+        }
+    };
+
+    do(){
+        const results = [];
+        const params =  [ ...arguments ];
+        const funName = params.shift(); 
+
+        for (let blockName in this._instances) {
+            const instance = this._instances[blockName];
+
+            if(instance && instance[funName]){
+                results[blockName] = instance[funName].apply(this, params);
+            }
+        }
+
+       return results;
+    };
+
+    _subscribe(){};
+}
+
+module.exports = ModulesLogicController;