@urso/core 0.6.16-dev → 0.6.17

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

@@ -1,137 +1,137 @@
-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;
+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;

package/src/js/modules/template/types.js

@@ -1,47 +1,47 @@
-class ModulesTemplateTypes {
-    constructor() {
-        this.list = {
-            assets: {
-                ATLAS: 1,
-                AUDIOSPRITE: 2,
-                BITMAPFONT: 3,
-                CONTAINER: 4,
-                FONT: 5,
-                IMAGE: 6,
-                JSON: 7,
-                SOUND: 8,
-                SPINE: 9
-            },
-
-            objects: {
-                ATLASIMAGE: 1,
-                BITMAPTEXT: 2,
-                BUTTON: 3,
-                BUTTONCOMPOSITE: 4,
-                CHECKBOX: 5,
-                COLLECTION: 6,
-                COMPONENT: 7,
-                CONTAINER: 8,
-                DRAGCONTAINER: 9,
-                EMITTER: 10,
-                EMITTERFX: 11,
-                GRAPHICS: 12,
-                GROUP: 13,
-                HITAREA: 14,
-                IMAGE: 15,
-                IMAGESANIMATION: 16,
-                MASK: 17,
-                NINESLICEPLANE: 18,
-                SCROLLBOX: 19,
-                SLIDER: 20,
-                SPINE: 21,
-                TEXT: 22,
-                TEXTINPUT: 23,
-                TOGGLE: 24,
-                WORLD: 25
-            }
-        }
-    }
-};
-
+class ModulesTemplateTypes {
+    constructor() {
+        this.list = {
+            assets: {
+                ATLAS: 1,
+                AUDIOSPRITE: 2,
+                BITMAPFONT: 3,
+                CONTAINER: 4,
+                FONT: 5,
+                IMAGE: 6,
+                JSON: 7,
+                SOUND: 8,
+                SPINE: 9
+            },
+
+            objects: {
+                ATLASIMAGE: 1,
+                BITMAPTEXT: 2,
+                BUTTON: 3,
+                BUTTONCOMPOSITE: 4,
+                CHECKBOX: 5,
+                COLLECTION: 6,
+                COMPONENT: 7,
+                CONTAINER: 8,
+                DRAGCONTAINER: 9,
+                EMITTER: 10,
+                EMITTERFX: 11,
+                GRAPHICS: 12,
+                GROUP: 13,
+                HITAREA: 14,
+                IMAGE: 15,
+                IMAGESANIMATION: 16,
+                MASK: 17,
+                NINESLICEPLANE: 18,
+                SCROLLBOX: 19,
+                SLIDER: 20,
+                SPINE: 21,
+                TEXT: 22,
+                TEXTINPUT: 23,
+                TOGGLE: 24,
+                WORLD: 25
+            }
+        }
+    }
+};
+
 module.exports = ModulesTemplateTypes;

package/src/js/modules/transport/_info.js

@@ -1,9 +1,9 @@
-Urso.Core.Modules.Transport = {
-    BaseConnectionType: require('./baseConnectionType'),
-    Config: require('./config'),
-    Controller: require('./controller'),
-    Decorator: require('./decorator'),
-    Service: require('./service'),
-};
-
+Urso.Core.Modules.Transport = {
+    BaseConnectionType: require('./baseConnectionType'),
+    Config: require('./config'),
+    Controller: require('./controller'),
+    Decorator: require('./decorator'),
+    Service: require('./service'),
+};
+
 require('./connectionTypes/_info');

package/src/js/modules/transport/baseConnectionType.js

@@ -1,24 +1,24 @@
-class ModulesTransportBaseConnectionType {
-    constructor({ callbacks, host }) {
-        this._host = host || false;
-        this._callbacks = callbacks || {};
-        this._ready = false;
-    }
-    
-    close(){};
-
-    readyCheck(){
-        return this._ready;
-    };
-
-    reconnect(){};
-
-    send(message){};
-
-    _runCallback(name, params){
-        if(this._callbacks[name])
-            this._callbacks[name](params);
-    };
-}
-
-module.exports = ModulesTransportBaseConnectionType;
+class ModulesTransportBaseConnectionType {
+    constructor({ callbacks, host }) {
+        this._host = host || false;
+        this._callbacks = callbacks || {};
+        this._ready = false;
+    }
+    
+    close(){};
+
+    readyCheck(){
+        return this._ready;
+    };
+
+    reconnect(){};
+
+    send(message){};
+
+    _runCallback(name, params){
+        if(this._callbacks[name])
+            this._callbacks[name](params);
+    };
+}
+
+module.exports = ModulesTransportBaseConnectionType;

package/src/js/modules/transport/config.js

@@ -1,13 +1,13 @@
-class ModulesTransportConfig {
-
-    getConfig() {
-        return {
-                autoReconnect: true,
-                reconnectTimeout: 5000,
-                type: 'websocket', // websocket | xhr
-                host: Urso.helper.parseGetParams('wsHost')
-            }
-        }
-}
-
-module.exports = ModulesTransportConfig;
+class ModulesTransportConfig {
+
+    getConfig() {
+        return {
+                autoReconnect: true,
+                reconnectTimeout: 5000,
+                type: 'websocket', // websocket | xhr
+                host: Urso.helper.parseGetParams('wsHost')
+            }
+        }
+}
+
+module.exports = ModulesTransportConfig;

package/src/js/modules/transport/connectionTypes/_info.js

@@ -1,4 +1,4 @@
-Urso.Core.Modules.Transport.ConnectionTypes = {
-    Websocket: require('./websocket'),
-    Xhr: require('./xhr')
+Urso.Core.Modules.Transport.ConnectionTypes = {
+    Websocket: require('./websocket'),
+    Xhr: require('./xhr')
 };

package/src/js/modules/transport/connectionTypes/websocket.js

@@ -1,75 +1,75 @@
-class ModulesTransportConnectionTypesWebsocket extends Urso.Core.Modules.Transport.BaseConnectionType {
-    constructor(params){
-        super(params);
-
-        this._reconnectTimeout = null;
-        this._socket = null;
-        this._createSocket();
-    }
-
-    close(){
-        this._socket.close();
-        log('[SOCKET]: CLOSED')
-    };
-
-    reconnect(delay){
-        log('[SOCKET]: RECONNECTING in ', delay)
-        
-        if(this._ready)
-            this.close();
-        
-
-        // TODO: REPLACE TO ENGINE TIMEOUT LOGIC
-        this._reconnectTimeout = setTimeout(() => {
-            this._clearTimeout();
-            this._createSocket();
-            log('[SOCKET]: RECONNECTED')
-        }, delay);
-    };
-
-    send(message){
-        const preparedMessage = JSON.stringify(message);
-        this._socket.send(preparedMessage);
-        log('[SOCKET]: SEND:', preparedMessage)
-    };
-
-    _clearTimeout(){
-        clearTimeout(this._reconnectTimeout);
-        this._reconnectTimeout = null;
-    }
-
-    _createSocket(){
-        this._socket = new WebSocket(this._host);
-        this._socket.onopen = this._onOpen.bind(this);
-        this._socket.onmessage = this._onMessage.bind(this);
-        this._socket.onerror = this._onError.bind(this);
-        this._socket.onclose = this._onClose.bind(this);
-        log('[SOCKET]: CREATED')
-    };
-
-    _onOpen(){
-        this._ready = true;
-        this._runCallback('ready');
-        log('[SOCKET]: READY')
-    };
-
-    _onMessage(message){
-        // const res = JSON.parse(message.data);
-        log('[SOCKET]: RECEIVED ', message.data)
-        this._runCallback('response', message.data);
-    };
-
-    _onClose(){
-        this._ready = false;
-        this._socket = null;
-        this._runCallback('close');
-    };
-
-    _onError(){
-        this._ready = false;
-        this._runCallback('error');
-        log('[SOCKET]: ERROR')
-    };
-}
-
+class ModulesTransportConnectionTypesWebsocket extends Urso.Core.Modules.Transport.BaseConnectionType {
+    constructor(params){
+        super(params);
+
+        this._reconnectTimeout = null;
+        this._socket = null;
+        this._createSocket();
+    }
+
+    close(){
+        this._socket.close();
+        log('[SOCKET]: CLOSED')
+    };
+
+    reconnect(delay){
+        log('[SOCKET]: RECONNECTING in ', delay)
+        
+        if(this._ready)
+            this.close();
+        
+
+        // TODO: REPLACE TO ENGINE TIMEOUT LOGIC
+        this._reconnectTimeout = setTimeout(() => {
+            this._clearTimeout();
+            this._createSocket();
+            log('[SOCKET]: RECONNECTED')
+        }, delay);
+    };
+
+    send(message){
+        const preparedMessage = JSON.stringify(message);
+        this._socket.send(preparedMessage);
+        log('[SOCKET]: SEND:', preparedMessage)
+    };
+
+    _clearTimeout(){
+        clearTimeout(this._reconnectTimeout);
+        this._reconnectTimeout = null;
+    }
+
+    _createSocket(){
+        this._socket = new WebSocket(this._host);
+        this._socket.onopen = this._onOpen.bind(this);
+        this._socket.onmessage = this._onMessage.bind(this);
+        this._socket.onerror = this._onError.bind(this);
+        this._socket.onclose = this._onClose.bind(this);
+        log('[SOCKET]: CREATED')
+    };
+
+    _onOpen(){
+        this._ready = true;
+        this._runCallback('ready');
+        log('[SOCKET]: READY')
+    };
+
+    _onMessage(message){
+        // const res = JSON.parse(message.data);
+        log('[SOCKET]: RECEIVED ', message.data)
+        this._runCallback('response', message.data);
+    };
+
+    _onClose(){
+        this._ready = false;
+        this._socket = null;
+        this._runCallback('close');
+    };
+
+    _onError(){
+        this._ready = false;
+        this._runCallback('error');
+        log('[SOCKET]: ERROR')
+    };
+}
+
 module.exports = ModulesTransportConnectionTypesWebsocket;