@urso/core 0.5.3 → 0.5.6

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/service.js

@@ -1,240 +1,240 @@
-class ModulesObjectsService {
-    constructor() {
-        this.singleton = true;
-
-        this._world = null;
-        this._counter = 0;
-        this._objectsTypesFlipped;
-    }
-
-    _checkWorld() {
-        if (this._world)
-            return this._world;
-
-        this.resetWorld();
-
-        return this._world;
-    }
-
-    resetWorld() {
-        const model = this.getInstance('Models.World', { name: 'WORLD' });
-        const proxy = this.getInstance('Proxy').get(model);
-
-        this._world = proxy;
-
-        this.updateWorldBounds({ template: Urso.scenes.getTemplateSize() })
-        this.getInstance('Cache').reset();
-        this.applyClassesToWorld();
-        this._addToCache(proxy);
-    }
-
-    updateWorldBounds(params) {
-        if (!this._world)
-            return;
-
-        Urso.objects._safeSetValueToTarget(this._world, 'width', params.template.width);
-        Urso.objects._safeSetValueToTarget(this._world, 'height', params.template.height);
-    }
-
-    applyClassesToWorld() {
-        if (!this._world) {
-            return; //world do not created yet
-        }
-
-        //remove old classes
-        if (this._world.class) {
-            this._world.class.split(' ').forEach((className) => this._world.removeClass(className, true));
-        }
-
-        //apply new classes
-        Urso.getInstancesModes().forEach((className) => this._world.addClass(className, true));
-
-        //refresh styles
-        Urso.objects.refreshStyles();
-    }
-
-    _getUid() {
-        this._counter++;
-        return 'object_' + this._counter;
-    }
-
-    getWorld() {
-        return this._world;
-    }
-
-    add(object, parent) {
-        const world = this._checkWorld();
-
-        if (!parent)
-            parent = world;
-
-        let model, contents;
-
-        if (object.contents) {
-            contents = object.contents;
-            object.contents = []; //clear contents. We will put here just correct models
-        }
-
-        if (!this._objectsTypesFlipped)
-            this._objectsTypesFlipped = Urso.helper.objectFlip(Urso.types.objects);
-
-        //set uid
-        object._uid = this._getUid();
-
-        switch (object.type) {
-            //exceptions with camelCase namings
-            case Urso.types.objects.ATLASIMAGE:
-                model = this.getInstance('Models.AtlasImage', object);
-                break;
-            case Urso.types.objects.BITMAPTEXT:
-                model = this.getInstance('Models.BitmapText', object);
-                break;
-            case Urso.types.objects.HITAREA:
-                model = this.getInstance('Models.HitArea', object);
-                break;
-            case Urso.types.objects.IMAGESANIMATION:
-                model = this.getInstance('Models.ImagesAnimation', object);
-                break;
-            case Urso.types.objects.TEXTINPUT:
-                model = this.getInstance('Models.TextInput', object);
-                break;
-            case Urso.types.objects.NINESLICEPLANE:
-                model = this.getInstance('Models.NineSlicePlane', object);
-                break;
-            case Urso.types.objects.EMITTERFX:
-                model = this.getInstance('Models.EmitterFx', object);
-                break;
-
-            default:
-                const objectName = Urso.helper.capitaliseFirstLetter(
-                    this._objectsTypesFlipped[object.type].toLowerCase()
-                );
-
-                model = this.getInstance(`Models.${objectName}`, object);
-                break;
-        }
-
-        if (!model)
-            Urso.logger.error('ModulesObjectsCreate model type error', object.type, object);
-
-        if (!model._baseObject)
-            Urso.logger.error('ModulesObjectsCreate baseObject error', model);
-
-        //proxing model
-        let proxy = this.getInstance('Proxy').get(model);
-
-        //link to component(if its compinent)
-        if (object.type === Urso.types.objects.COMPONENT)
-            object._controller.common.object = proxy;
-
-        //add child baseObject
-        this.addChild(parent, proxy, true);
-
-        //set properties from originalModel
-        this._updateCommonProperties(proxy);
-
-        //check is mask
-        if (model.type === Urso.types.objects.MASK)
-            parent._baseObject.mask = model._baseObject;
-
-        //contents
-        if (contents) {
-            for (const child of contents) {
-                this.add(child, proxy);
-            }
-        }
-
-        //cache
-        this._addToCache(proxy);
-
-        return proxy;
-    }
-
-    addChild(newParent, child, doNotRefreshStylesFlag) {
-        if (child.parent) {
-            this.removeChild(child.parent, child, true);
-        }
-
-        if (child._baseObject) { //regular our object
-            newParent.contents.push(child);
-            let childBase = child._baseObject;
-            newParent._baseObject.addChild(childBase);
-            child.parent = newParent;
-
-            if (!doNotRefreshStylesFlag)
-                Urso.objects.refreshStyles(); //todo optimization
-        } else { //pixi system object
-            newParent._baseObject.addChild(child);
-        }
-    }
-
-    removeChild(parent, child, doNotRefreshStylesFlag) {
-        child.parent = null;
-        let childIndex = parent.contents.indexOf(child);
-        parent.contents.splice(childIndex, 1);
-        parent._baseObject.removeChild(child._baseObject);
-
-        if (!doNotRefreshStylesFlag)
-            Urso.objects.refreshStyles(); //todo optimization
-    }
-
-    destroy(object, doNotRefreshStylesFlag) {
-        if (object.parent)
-            this.removeChild(object.parent, object, true);
-
-        //children
-        if (object.contents)
-            //for (const child of object.contents)
-            while (object.contents.length > 0)
-                this.destroy(object.contents[0], true);
-
-        object._customDestroy();
-        object._baseObject && object._baseObject.destroy();
-        this._removeFromCache(object);
-        this.getInstance('Styles').removeFromCache(object);
-
-        //null all properties. example: _controller object
-        if (object._controller) {
-            if (object._controller.common.object) {
-                object._controller.common.object = null;
-            }
-
-            object._controller = null;
-            object.instance = null;
-        }
-
-        if (!doNotRefreshStylesFlag)
-            Urso.objects.refreshStyles(); //todo optimization
-
-        object.destroyed = true;
-    }
-
-    _updateCommonProperties(proxy) {
-        for (let key in proxy._originalModel) {
-            if (proxy._originalModel.hasOwnProperty(key)) {
-                let value = proxy._originalModel[key];
-                Urso.objects._safeSetValueToTarget(proxy, key, value);
-            }
-        }
-    }
-
-    _addToCache(proxy) {
-        if (proxy.id)
-            this.getInstance('Cache').addId(proxy.id, proxy);
-        if (proxy.name)
-            this.getInstance('Cache').addName(proxy.name, proxy);
-        if (proxy.class)
-            this.getInstance('Cache').addClass(proxy.class, proxy);
-    }
-
-    _removeFromCache(proxy) {
-        if (proxy.id)
-            this.getInstance('Cache').removeId(proxy.id, proxy);
-        if (proxy.name)
-            this.getInstance('Cache').removeName(proxy.name, proxy);
-        if (proxy.class)
-            this.getInstance('Cache').removeClass(proxy.class, proxy);
-    }
-}
-
-module.exports = ModulesObjectsService;
+class ModulesObjectsService {
+    constructor() {
+        this.singleton = true;
+
+        this._world = null;
+        this._counter = 0;
+        this._objectsTypesFlipped;
+    }
+
+    _checkWorld() {
+        if (this._world)
+            return this._world;
+
+        this.resetWorld();
+
+        return this._world;
+    }
+
+    resetWorld() {
+        const model = this.getInstance('Models.World', { name: 'WORLD' });
+        const proxy = this.getInstance('Proxy').get(model);
+
+        this._world = proxy;
+
+        this.updateWorldBounds({ template: Urso.scenes.getTemplateSize() })
+        this.getInstance('Cache').reset();
+        this.applyClassesToWorld();
+        this._addToCache(proxy);
+    }
+
+    updateWorldBounds(params) {
+        if (!this._world)
+            return;
+
+        Urso.objects._safeSetValueToTarget(this._world, 'width', params.template.width);
+        Urso.objects._safeSetValueToTarget(this._world, 'height', params.template.height);
+    }
+
+    applyClassesToWorld() {
+        if (!this._world) {
+            return; //world do not created yet
+        }
+
+        //remove old classes
+        if (this._world.class) {
+            this._world.class.split(' ').forEach((className) => this._world.removeClass(className, true));
+        }
+
+        //apply new classes
+        Urso.getInstancesModes().forEach((className) => this._world.addClass(className, true));
+
+        //refresh styles
+        Urso.objects.refreshStyles();
+    }
+
+    _getUid() {
+        this._counter++;
+        return 'object_' + this._counter;
+    }
+
+    getWorld() {
+        return this._world;
+    }
+
+    add(object, parent) {
+        const world = this._checkWorld();
+
+        if (!parent)
+            parent = world;
+
+        let model, contents;
+
+        if (object.contents) {
+            contents = object.contents;
+            object.contents = []; //clear contents. We will put here just correct models
+        }
+
+        if (!this._objectsTypesFlipped)
+            this._objectsTypesFlipped = Urso.helper.objectFlip(Urso.types.objects);
+
+        //set uid
+        object._uid = this._getUid();
+
+        switch (object.type) {
+            //exceptions with camelCase namings
+            case Urso.types.objects.ATLASIMAGE:
+                model = this.getInstance('Models.AtlasImage', object);
+                break;
+            case Urso.types.objects.BITMAPTEXT:
+                model = this.getInstance('Models.BitmapText', object);
+                break;
+            case Urso.types.objects.HITAREA:
+                model = this.getInstance('Models.HitArea', object);
+                break;
+            case Urso.types.objects.IMAGESANIMATION:
+                model = this.getInstance('Models.ImagesAnimation', object);
+                break;
+            case Urso.types.objects.TEXTINPUT:
+                model = this.getInstance('Models.TextInput', object);
+                break;
+            case Urso.types.objects.NINESLICEPLANE:
+                model = this.getInstance('Models.NineSlicePlane', object);
+                break;
+            case Urso.types.objects.EMITTERFX:
+                model = this.getInstance('Models.EmitterFx', object);
+                break;
+
+            default:
+                const objectName = Urso.helper.capitaliseFirstLetter(
+                    this._objectsTypesFlipped[object.type].toLowerCase()
+                );
+
+                model = this.getInstance(`Models.${objectName}`, object);
+                break;
+        }
+
+        if (!model)
+            Urso.logger.error('ModulesObjectsCreate model type error', object.type, object);
+
+        if (!model._baseObject)
+            Urso.logger.error('ModulesObjectsCreate baseObject error', model);
+
+        //proxing model
+        let proxy = this.getInstance('Proxy').get(model);
+
+        //link to component(if its compinent)
+        if (object.type === Urso.types.objects.COMPONENT)
+            object._controller.common.object = proxy;
+
+        //add child baseObject
+        this.addChild(parent, proxy, true);
+
+        //set properties from originalModel
+        this._updateCommonProperties(proxy);
+
+        //check is mask
+        if (model.type === Urso.types.objects.MASK)
+            parent._baseObject.mask = model._baseObject;
+
+        //contents
+        if (contents) {
+            for (const child of contents) {
+                this.add(child, proxy);
+            }
+        }
+
+        //cache
+        this._addToCache(proxy);
+
+        return proxy;
+    }
+
+    addChild(newParent, child, doNotRefreshStylesFlag) {
+        if (child.parent) {
+            this.removeChild(child.parent, child, true);
+        }
+
+        if (child._baseObject) { //regular our object
+            newParent.contents.push(child);
+            let childBase = child._baseObject;
+            newParent._baseObject.addChild(childBase);
+            child.parent = newParent;
+
+            if (!doNotRefreshStylesFlag)
+                Urso.objects.refreshStyles(); //todo optimization
+        } else { //pixi system object
+            newParent._baseObject.addChild(child);
+        }
+    }
+
+    removeChild(parent, child, doNotRefreshStylesFlag) {
+        child.parent = null;
+        let childIndex = parent.contents.indexOf(child);
+        parent.contents.splice(childIndex, 1);
+        parent._baseObject.removeChild(child._baseObject);
+
+        if (!doNotRefreshStylesFlag)
+            Urso.objects.refreshStyles(); //todo optimization
+    }
+
+    destroy(object, doNotRefreshStylesFlag) {
+        if (object.parent)
+            this.removeChild(object.parent, object, true);
+
+        //children
+        if (object.contents)
+            //for (const child of object.contents)
+            while (object.contents.length > 0)
+                this.destroy(object.contents[0], true);
+
+        object._customDestroy();
+        object._baseObject && object._baseObject.destroy();
+        this._removeFromCache(object);
+        this.getInstance('Styles').removeFromCache(object);
+
+        //null all properties. example: _controller object
+        if (object._controller) {
+            if (object._controller.common.object) {
+                object._controller.common.object = null;
+            }
+
+            object._controller = null;
+            object.instance = null;
+        }
+
+        if (!doNotRefreshStylesFlag)
+            Urso.objects.refreshStyles(); //todo optimization
+
+        object.destroyed = true;
+    }
+
+    _updateCommonProperties(proxy) {
+        for (let key in proxy._originalModel) {
+            if (proxy._originalModel.hasOwnProperty(key)) {
+                let value = proxy._originalModel[key];
+                Urso.objects._safeSetValueToTarget(proxy, key, value);
+            }
+        }
+    }
+
+    _addToCache(proxy) {
+        if (proxy.id)
+            this.getInstance('Cache').addId(proxy.id, proxy);
+        if (proxy.name)
+            this.getInstance('Cache').addName(proxy.name, proxy);
+        if (proxy.class)
+            this.getInstance('Cache').addClass(proxy.class, proxy);
+    }
+
+    _removeFromCache(proxy) {
+        if (proxy.id)
+            this.getInstance('Cache').removeId(proxy.id, proxy);
+        if (proxy.name)
+            this.getInstance('Cache').removeName(proxy.name, proxy);
+        if (proxy.class)
+            this.getInstance('Cache').removeClass(proxy.class, proxy);
+    }
+}
+
+module.exports = ModulesObjectsService;