@urso/core 0.5.4 → 0.5.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@urso/core",
-  "version": "0.5.4",
+  "version": "0.5.5",
   "description": "HTML5 game engine",
   "main": "build/js/index.js",
   "author": "Megbrimef",

package/src/js/components/fullscreen/controller.js

@@ -31,7 +31,7 @@ class ComponentsFullscreenController extends ComponentsBaseController {
   }
 
   get _isCriOS() {
-    return navigator.userAgent.indexOf('CriOS') !== -1;
+    return navigator.userAgent.includes('CriOS');
   }
 
   get _orientationsConfig() {

package/src/js/modules/assets/service.js

@@ -112,7 +112,7 @@ class ModulesAssetsService {
                 let texture = imageData.textures[i];
                 let newFilename = frame.filename;
 
-                if (frame.filename.indexOf('/') === -1)
+                if (!frame.filename.includes('/'))
                     newFilename = folderPath + '/' + frame.filename;
 
                 Urso.cache.addFile(newFilename, texture);

package/src/js/modules/objects/_info.js

@@ -3,9 +3,10 @@ Urso.Core.Modules.Objects = {
     Cache: require('./cache.js'),
     Controller: require('./controller.js'),
     Find: require('./find.js'),
+    PropertyAdapter: require('./propertyAdapter.js'),
     Proxy: require('./proxy.js'),
+    Selector: require('./selector.js'),
     Service: require('./service.js'),
-    Styles: require('./styles.js'),
-    PropertyAdapter: require('./propertyAdapter.js')
+    Styles: require('./styles.js')
 };
 require('./models/_info.js');

package/src/js/modules/objects/find.js

@@ -1,25 +1,35 @@
 class ModulesObjectsFind {
+
     constructor() {
         this.singleton = true;
+        this._selector = this.getInstance('Selector');
     };
 
+    /**
+     * find object(s) by selector  (find, findOne, findAll)
+     * @param {String} selector
+     * @param {Boolean} findOneFlag
+     * @returns {mixed}
+     */
     do(selector, findOneFlag) {
         let result = [];
-        let selectorsPartsParsed = this._parseSelector(selector);
+        let selectorsPartsParsed = this._selector.parse(selector);
         let lastRule = selectorsPartsParsed[selectorsPartsParsed.length - 1][0];
 
-        //get elements
+        //get elements by last rule
         let testObjects = this.getInstance('Cache')[
             'get' + Urso.helper.capitaliseFirstLetter(lastRule.type)
         ](lastRule.value);
 
-        if (lastRule.type !== 'class')
+        //if its name or id we will transform one element to array of elements to test
+        if (lastRule.type !== 'class' && testObjects)
             testObjects = [testObjects];
 
+        //no objects found to test --> return false
         if (!testObjects || testObjects.length === 0)
             return false;
 
-        //return findOneFlag with simple selector
+        //return findOneFlag with simple selector (selector with one rule)
         if (
             findOneFlag &&
             selectorsPartsParsed.length === 1 &&
@@ -27,9 +37,9 @@ class ModulesObjectsFind {
         )
             return testObjects;
 
-        //check test objects all selectors parts
+        //check test objects for all selectors parts conformity
         for (let testObject of testObjects) {
-            let testResult = this._testObjectsForSelector(
+            let testResult = this._selector.testObjectWithParsedSelector(
                 testObject,
                 selectorsPartsParsed
             );
@@ -43,98 +53,6 @@ class ModulesObjectsFind {
 
         return result;
     };
-
-    _testObjectsForSelector(testObject, selectorsPartsParsed) {
-        let properties = selectorsPartsParsed[
-            selectorsPartsParsed.length - 1
-        ];
-
-        if (!this._testObjectsProperties(testObject, properties))
-            return false;
-
-        if (selectorsPartsParsed.length === 1)
-            return true;
-
-        //now we will check objects parents (for complex selectors)
-        let parent = testObject.parent;
-
-        for (let i = selectorsPartsParsed.length - 2; i >= 0; i--) {
-            let parentProperties = selectorsPartsParsed[i];
-            let expectedParentFoundFlag = 0;
-
-            while (expectedParentFoundFlag !== 1 && parent) {
-                if (this._testObjectsProperties(parent, parentProperties))
-                    expectedParentFoundFlag = 1;
-
-                parent = parent.parent;
-            }
-
-            if (expectedParentFoundFlag === 1 && i === 0) //last propertie from selector and all is good
-                return true;
-
-            if (expectedParentFoundFlag === 0)
-                return false;
-        }
-    }
-
-    _testObjectsProperties(object, properties) {
-        for (let propertie of properties) {
-            if (propertie.type === 'class') {
-                if (
-                    !object[propertie.type] ||
-                    object[propertie.type].split(' ').indexOf(propertie.value) === -1
-                )
-                    return false;
-
-            } else if (object[propertie.type] !== propertie.value)
-                return false;
-        }
-
-        return true;
-    };
-
-    _parseSelector(selector) {
-        let selectorsParts = selector.split(' ');
-        let selectorsPartsParsed = [];
-
-        for (let selectorsPart of selectorsParts) {
-            let selectorPartParsed = this._parseSelectorPart(selectorsPart);
-
-            if (!selectorPartParsed)
-                Urso.logger.error('ModulesObjectsService error, cannot parse selector part: ' + selectorsPart);
-
-            selectorsPartsParsed.push(selectorPartParsed);
-        }
-
-        return selectorsPartsParsed;
-    };
-
-    _parseSelectorPart(selectorPart) {
-        const characterEncoding = "(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+";
-        const matchExpr = {
-            "id": new RegExp("^#(" + characterEncoding + ")"),
-            "name": new RegExp("^\\^(" + characterEncoding + ")"),
-            "class": new RegExp("^\\.(" + characterEncoding + ")")
-        };
-
-        let result = [];
-
-        for (let type in matchExpr) {
-            let foundItem = matchExpr[type].exec(selectorPart);
-
-            if (foundItem) {
-                result.push({ type: type, value: foundItem[1] });
-
-                let restSelectorPart = Urso.helper.stringReplace(foundItem[0], '', selectorPart);
-                let restItems = this._parseSelectorPart(restSelectorPart);
-
-                if (restItems)
-                    return Urso.helper.mergeArrays(result, restItems);
-            }
-        }
-
-        return (result && result.length > 0) ? result : false;
-    };
 }
 
 module.exports = ModulesObjectsFind;

package/src/js/modules/objects/proxy.js

@@ -155,7 +155,7 @@ class ModulesObjectsProxy {
 
     _checkSelectorProperties(key) {
         if (!this._safeFlag && this._getSelectorProperties().includes(key)) {
-            Urso.logger.error('ModulesObjectsProxy error: you are trying to change selector propertie: ' + key);
+            Urso.logger.error('ModulesObjectsProxy error: you are trying to change selector property: ' + key);
             Urso.logger.error('Notice: use functions addClass, removeClass, setId, setName');
         }
     }

package/src/js/modules/objects/selector.js

@@ -0,0 +1,136 @@
+/**
+ * tools for selector parse and objects check
+ */
+class ModulesObjectsSelector {
+
+    constructor() {
+        this.singleton = true;
+    };
+
+    /**
+     * test object for selector
+     * @param {Object} testObject
+     * @param {String} selector
+     * @returns {Boolean}
+     */
+    testObject(testObject, selector) {
+        let selectorsPartsParsed = this.parse(selector);
+        return this.testObjectWithParsedSelector(testObject, selectorsPartsParsed);
+    }
+
+    /**
+     * test object for selector parts array
+     * @param {Object} testObject
+     * @param {Array} selectorsPartsParsed
+     * @returns {Boolean}
+     */
+    testObjectWithParsedSelector(testObject, selectorsPartsParsed) {
+        let properties = selectorsPartsParsed[
+            selectorsPartsParsed.length - 1
+        ];
+
+        if (!this._testObjectsProperties(testObject, properties))
+            return false;
+
+        if (selectorsPartsParsed.length === 1)
+            return true;
+
+        //now we will check objects parents (for complex selectors)
+        let parent = testObject.parent;
+
+        for (let i = selectorsPartsParsed.length - 2; i >= 0; i--) {
+            let parentProperties = selectorsPartsParsed[i];
+            let expectedParentFoundFlag = 0;
+
+            while (expectedParentFoundFlag !== 1 && parent) {
+                if (this._testObjectsProperties(parent, parentProperties))
+                    expectedParentFoundFlag = 1;
+
+                parent = parent.parent;
+            }
+
+            if (expectedParentFoundFlag === 1 && i === 0) //last property from selector and all is good
+                return true;
+
+            if (expectedParentFoundFlag === 0)
+                return false;
+        }
+    }
+
+    /**
+     * test object for properties list
+     * @param {Object} object
+     * @param {Array} properties - class, id or name with value. [{type:'class',value:'someClassName'}...]
+     * @returns {Boolean}
+     */
+    _testObjectsProperties(object, properties) {
+        for (let property of properties) {
+            if (property.type === 'class') {
+                if (
+                    !object[property.type] ||
+                    !object[property.type].split(' ').includes(property.value)
+                )
+                    return false;
+
+            } else if (object[property.type] !== property.value)
+                return false;
+        }
+
+        return true;
+    };
+
+    /**
+     * parse selector to a array of parts
+     * @param {String} selector
+     * @returns {Array}
+     */
+    parse(selector) {
+        let selectorsParts = selector.split(' ');
+        let selectorsPartsParsed = [];
+
+        for (let selectorsPart of selectorsParts) {
+            let selectorPartParsed = this._parseSelectorPart(selectorsPart);
+
+            if (!selectorPartParsed)
+                Urso.logger.error('ModulesObjectsService error, cannot parse selector part: ' + selectorsPart);
+
+            selectorsPartsParsed.push(selectorPartParsed);
+        }
+
+        return selectorsPartsParsed;
+    };
+
+    /**
+     * parse selectors one object part
+     * @param {String} selectorPart
+     * @returns {mixed}
+     */
+    _parseSelectorPart(selectorPart) {
+        const characterEncoding = "(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+";
+        const matchExpr = {
+            "id": new RegExp("^#(" + characterEncoding + ")"),
+            "name": new RegExp("^\\^(" + characterEncoding + ")"),
+            "class": new RegExp("^\\.(" + characterEncoding + ")")
+        };
+
+        let result = [];
+
+        for (let type in matchExpr) {
+            let foundItem = matchExpr[type].exec(selectorPart);
+
+            if (foundItem) {
+                result.push({ type: type, value: foundItem[1] });
+
+                let restSelectorPart = Urso.helper.stringReplace(foundItem[0], '', selectorPart);
+                let restItems = this._parseSelectorPart(restSelectorPart);
+
+                if (restItems)
+                    return Urso.helper.mergeArrays(result, restItems);
+            }
+        }
+
+        return (result && result.length > 0) ? result : false;
+    };
+}
+
+module.exports = ModulesObjectsSelector;

package/src/js/modules/objects/styles.js

@@ -5,8 +5,13 @@ class ModulesObjectsStyles {
         this._cache = {};
         this._tempObject = this.getInstance('BaseModel', {})
         this._tempTextObject = this.getInstance('Models.Text', {})
+        this._selector = this.getInstance('Selector');
     }
 
+    /**
+     * refresh styles
+     * @param {mixed} parent
+     */
     refresh(parent) {
         if (!parent)
             parent = this.getInstance('Controller').getWorld();
@@ -14,6 +19,16 @@ class ModulesObjectsStyles {
         let template = Urso.template.get();
         let styles = template.styles;
 
+        this._removeInactualStylesAndAddNew(parent, styles);
+    }
+
+    /**
+     * @deprecated
+     * remove all styles and re-add
+     * @param {Object} parent
+     * @param {Object} styles
+     */
+    _removeAllStylesAndReAdd(parent, styles) {
         this._globalResetStyles();
 
         //todo consider parent
@@ -22,6 +37,22 @@ class ModulesObjectsStyles {
             this._apply(selector, style);
     }
 
+    /**
+     * remove inactual styles and add new if need
+     * @param {Object} parent
+     * @param {Object} styles
+     */
+    _removeInactualStylesAndAddNew(parent, styles) {
+        this._resetInactualStyles();
+
+        for (let [selector, style] of Object.entries(styles))
+            this._apply(selector, style);
+    }
+
+    /**
+     * refresh styles by changed className (when addClass or removeClass)
+     * @param {String} className
+     */
     refreshByChangedClassName(className) {
         let template = Urso.template.get();
         let styles = template.styles;
@@ -29,25 +60,46 @@ class ModulesObjectsStyles {
         this._restoreDefaultsByCache(className);
 
         for (let [selector, style] of Object.entries(styles))
-            if (selector.indexOf('.' + className) !== -1)
+            if (selector.includes('.' + className))
                 this._apply(selector, style);
     }
 
+    /**
+     * remove object from styles cache
+     * @param {Object} object
+     */
     removeFromCache(object) {
         for (let selector in this._cache) {
             if (this._cache[selector][object._uid]) {
-                delete this._cache[selector][object._uid];
-
-                if (!Object.keys(this._cache[selector]).length)
-                    delete this._cache[selector];
+                this._deleteFromCacheBySelector(selector, object);
             }
         }
     }
 
+    /**
+     * delete object from inner cache by selector
+     * @param {String} selector 
+     * @param {Object} object 
+     */
+    _deleteFromCacheBySelector(selector, object) {
+        delete this._cache[selector][object._uid];
+
+        if (!Object.keys(this._cache[selector]).length)
+            delete this._cache[selector];
+    }
+
+    /**
+     * apply style to selector
+     * @param {String} selector
+     * @param {Object} style
+     */
     _apply(selector, style) {
         let objectsArray = this.getInstance('Controller').findAll(selector);
 
         for (let object of objectsArray) {
+            if (object._styles[selector])
+                continue;
+
             this._addObjectToCache(selector, object);
             object._styles[selector] = style;
 
@@ -57,6 +109,11 @@ class ModulesObjectsStyles {
         }
     }
 
+    /**
+     * add object to inner cache by selector
+     * @param {String} selector
+     * @param {Object} object
+     */
     _addObjectToCache(selector, object) {
         if (!this._cache[selector])
             this._cache[selector] = {};
@@ -64,6 +121,10 @@ class ModulesObjectsStyles {
         this._cache[selector][object._uid] = object;
     }
 
+    /**
+     * global reset(remove) all styles
+     * @deprecated
+     */
     _globalResetStyles() {
         for (let [selector, selectorCache] of Object.entries(this._cache)) {
             for (let [uid, object] of Object.entries(selectorCache))
@@ -73,9 +134,26 @@ class ModulesObjectsStyles {
         }
     }
 
+    /**
+     * reset(remove) inactual styles
+     */
+    _resetInactualStyles() {
+        for (let [selector, selectorCache] of Object.entries(this._cache)) {
+            for (let [uid, object] of Object.entries(selectorCache))
+                if (!this._selector.testObject(object, selector)) {
+                    this._removeSelectorStyles(object, selector);
+                    this._deleteFromCacheBySelector(selector, object);
+                }
+        }
+    }
+
+    /**
+     * restore default values after reset styles (when addClass or removeClass)
+     * @param {String} className
+     */
     _restoreDefaultsByCache(className) {
         for (let [selector, selectorCache] of Object.entries(this._cache))
-            if (selector.indexOf('.' + className) !== -1) {
+            if (selector.includes('.' + className)) {
                 for (let [uid, object] of Object.entries(selectorCache))
                     this._removeSelectorStyles(object, selector);
 
@@ -83,12 +161,18 @@ class ModulesObjectsStyles {
             }
     }
 
+    /**
+     * remove all selector styles
+     * @param {Object} object
+     * @param {String} selector
+     * @param {Boolean} globalResetFlag
+     */
     _removeSelectorStyles(object, selector, globalResetFlag) {
         delete object._styles[selector];
         let template = Urso.template.get();
         let styles = template.styles[selector];
 
-        if(!styles){
+        if (!styles) {
             return;
         }
 
@@ -98,6 +182,12 @@ class ModulesObjectsStyles {
 
     }
 
+    /**
+     * restore value by key from original model
+     * @param {String} key
+     * @param {Object} object
+     * @param {Boolean} globalResetFlag
+     */
     _restoreValueByKey(key, object, globalResetFlag) {
         //check own
         if (object._originalModel[key])