@urso/core 0.3.9 → 0.4.0

package/src/js/modules/objects/cache.js

@@ -1,99 +1,99 @@
-class ModulesObjectsCache {
-    constructor() {
-        this.singleton = true;
-        this._data = null;
-        this.reset();
-    };
-
-    reset() {
-        this._data = {
-            ids: {},
-            names: {},
-            classes: {}
-        }
-    }
-
-    addId(key, object) {
-        if (this._data.ids[key])
-            Urso.logger.error('ModulesObjectsCache error: id will be uniq ' + key);
-
-        this._data.ids[key] = object;
-    }
-
-    removeId(key, object) {
-        if (!this._data.ids[key])
-            Urso.logger.error('ModulesObjectsCache error: no id to remove ' + key);
-
-        if (this._data.ids[key]._uid !== object._uid)
-            Urso.logger.error('ModulesObjectsCache error: invalid object with id ' + key);
-
-        delete this._data.ids[key];
-    }
-
-    addName(key, object) {
-        if (this._data.names[key])
-            Urso.logger.error('ModulesObjectsCache error: name will be uniq ' + key);
-
-        this._data.names[key] = object;
-    }
-
-    removeName(key, object) {
-        if (!this._data.names[key])
-            Urso.logger.error('ModulesObjectsCache error: no name to remove ' + key);
-
-        if (this._data.names[key]._uid !== object._uid)
-            Urso.logger.error('ModulesObjectsCache error: invalid object with name ' + key);
-
-        delete this._data.names[key];
-    }
-
-    addClass(key, object) {
-        let classNamesArray = key.split(' ');
-
-        for (const className of classNamesArray)
-            this._addClass(className, object);
-    }
-
-    removeClass(key, object) {
-        let classNamesArray = key.split(' ');
-
-        for (const className of classNamesArray)
-            this._removeClass(className, object);
-    }
-
-    getId(key) {
-        return this._data.ids[key] || false;
-    }
-
-    getName(key) {
-        return this._data.names[key] || false;
-    }
-
-    getClass(key) {
-        if (this._data.classes[key])
-            return Object.values(this._data.classes[key]);
-
-        return false;
-    }
-
-    _addClass(key, object) {
-        if (!this._data.classes[key])
-            this._data.classes[key] = {};
-
-        if (!this._data.classes[key][object._uid])
-            this._data.classes[key][object._uid] = object;
-    }
-
-    _removeClass(key, object) {
-        if (!this._data.classes[key])
-            return;
-
-        if (this._data.classes[key][object._uid])
-            delete this._data.classes[key][object._uid];
-
-        if (!Object.keys(this._data.classes[key]).length)
-            delete this._data.classes[key];
-    }
-}
-
-module.exports = ModulesObjectsCache;
+class ModulesObjectsCache {
+    constructor() {
+        this.singleton = true;
+        this._data = null;
+        this.reset();
+    };
+
+    reset() {
+        this._data = {
+            ids: {},
+            names: {},
+            classes: {}
+        }
+    }
+
+    addId(key, object) {
+        if (this._data.ids[key])
+            Urso.logger.error('ModulesObjectsCache error: id will be uniq ' + key);
+
+        this._data.ids[key] = object;
+    }
+
+    removeId(key, object) {
+        if (!this._data.ids[key])
+            Urso.logger.error('ModulesObjectsCache error: no id to remove ' + key);
+
+        if (this._data.ids[key]._uid !== object._uid)
+            Urso.logger.error('ModulesObjectsCache error: invalid object with id ' + key);
+
+        delete this._data.ids[key];
+    }
+
+    addName(key, object) {
+        if (this._data.names[key])
+            Urso.logger.error('ModulesObjectsCache error: name will be uniq ' + key);
+
+        this._data.names[key] = object;
+    }
+
+    removeName(key, object) {
+        if (!this._data.names[key])
+            Urso.logger.error('ModulesObjectsCache error: no name to remove ' + key);
+
+        if (this._data.names[key]._uid !== object._uid)
+            Urso.logger.error('ModulesObjectsCache error: invalid object with name ' + key);
+
+        delete this._data.names[key];
+    }
+
+    addClass(key, object) {
+        let classNamesArray = key.split(' ');
+
+        for (const className of classNamesArray)
+            this._addClass(className, object);
+    }
+
+    removeClass(key, object) {
+        let classNamesArray = key.split(' ');
+
+        for (const className of classNamesArray)
+            this._removeClass(className, object);
+    }
+
+    getId(key) {
+        return this._data.ids[key] || false;
+    }
+
+    getName(key) {
+        return this._data.names[key] || false;
+    }
+
+    getClass(key) {
+        if (this._data.classes[key])
+            return Object.values(this._data.classes[key]);
+
+        return false;
+    }
+
+    _addClass(key, object) {
+        if (!this._data.classes[key])
+            this._data.classes[key] = {};
+
+        if (!this._data.classes[key][object._uid])
+            this._data.classes[key][object._uid] = object;
+    }
+
+    _removeClass(key, object) {
+        if (!this._data.classes[key])
+            return;
+
+        if (this._data.classes[key][object._uid])
+            delete this._data.classes[key][object._uid];
+
+        if (!Object.keys(this._data.classes[key]).length)
+            delete this._data.classes[key];
+    }
+}
+
+module.exports = ModulesObjectsCache;

package/src/js/modules/objects/controller.js

@@ -1,121 +1,131 @@
-class ModulesObjectsController {
-    constructor() {
-        this.singleton = true;
-
-        Urso.find = this.find.bind(this);
-        Urso.findOne = this.findOne.bind(this);
-        Urso.findAll = this.findAll.bind(this);
-
-        this._newResolutionHandler = this._newResolutionHandler.bind(this);
-        this._resetWorld = this._resetWorld.bind(this);
-        this._applyClassesToWorld = this._applyClassesToWorld.bind(this);
-    };
-
-    create(objects, parent, doNotRefreshStylesFlag) { //TODO parse template for assets and objects (groups, components)
-        let result;
-
-        if (Array.isArray(objects)) {
-            result = [];
-            for (const object of objects) {
-                result.push(this.getInstance('Create').add(object, parent));
-            }
-        } else
-            result = this.getInstance('Create').add(objects, parent);
-
-        if (!doNotRefreshStylesFlag)
-            this.refreshStyles(parent);
-
-        return result;
-    }
-
-    find(selector) {
-        return this.getInstance('Find').do(selector);
-    }
-
-    findOne(selector) {
-        let result = this.getInstance('Find').do(selector, true);
-        return result ? result[0] : false;
-    }
-
-    findAll(selector) {
-        let result = this.getInstance('Find').do(selector);
-        return result ? result : []; //todo make collections
-    }
-
-    addIdToCache(id, object) {
-        this.getInstance('Cache').addId(id, object);
-    }
-
-    removeIdFromCache(id, object) {
-        this.getInstance('Cache').removeId(id, object);
-    }
-
-    addNameToCache(name, object) {
-        this.getInstance('Cache').addName(name, object);
-    }
-
-    removeNameFromCache(name, object) {
-        this.getInstance('Cache').removeName(name, object);
-    }
-
-    addClassToCache(className, object) {
-        this.getInstance('Cache').addClass(className, object);
-    }
-
-    removeClassFromCache(className, object) {
-        this.getInstance('Cache').removeClass(className, object);
-    }
-
-    refreshStyles(parent) {
-        return this.getInstance('Styles').refresh(parent);
-    }
-
-    refreshByChangedClassName(className) {
-        return this.getInstance('Styles').refreshByChangedClassName(className);
-    }
-
-    getWorld() {
-        return this.getInstance('Create').getWorld();
-    }
-
-    addChild(parent, child, doNotRefreshStylesFlag) {
-        this.getInstance('Create').addChild(parent, child, doNotRefreshStylesFlag);
-    }
-
-    removeChild(parent, child, doNotRefreshStylesFlag) {
-        this.getInstance('Create').removeChild(parent, child, doNotRefreshStylesFlag);
-    }
-
-    destroy(object, doNotRefreshStylesFlag) {
-        this.getInstance('Create').destroy(object, doNotRefreshStylesFlag);
-    }
-
-    //do not use outside engine
-    _safeSetValueToTarget(target, key, value) {
-        this.getInstance('Proxy').safeSetValueToTarget(target, key, value);
-    }
-
-    _updateCommonProperties(object) {
-        this.getInstance('Create')._updateCommonProperties(object);
-    }
-
-    _newResolutionHandler(params) {
-        this.getInstance('Create').updateWorldBounds(params);
-    }
-
-    _resetWorld() {
-        this.getInstance('Create').resetWorld();
-    }
-
-    _applyClassesToWorld() {
-        this.getInstance('Create').applyClassesToWorld();
-    }
-
-    _subscribeOnce() {
-        this.addListener(Urso.events.MODULES_SCENES_NEW_RESOLUTION, this._newResolutionHandler, true);
-        this.addListener(Urso.events.MODULES_SCENES_NEW_SCENE_INIT, this._resetWorld, true);
-        this.addListener(Urso.events.MODULES_INSTANCES_MODES_CHANGED, this._applyClassesToWorld, true);
-    }
-}
-
-module.exports = ModulesObjectsController;
+class ModulesObjectsController {
+    constructor() {
+        this.singleton = true;
+
+        Urso.find = this.find.bind(this);
+        Urso.findOne = this.findOne.bind(this);
+        Urso.findAll = this.findAll.bind(this);
+
+        this._newResolutionHandler = this._newResolutionHandler.bind(this);
+        this._resetWorld = this._resetWorld.bind(this);
+        this._applyClassesToWorld = this._applyClassesToWorld.bind(this);
+    };
+
+    create(objects, parent, doNotRefreshStylesFlag) {
+        let result;
+
+        if (Array.isArray(objects)) {
+            result = [];
+
+            for (const object of objects) {
+                result.push(this._createSingleObject(object, parent, doNotRefreshStylesFlag));
+            }
+        } else
+            result = this._createSingleObject(objects, parent, doNotRefreshStylesFlag);
+
+        if (!doNotRefreshStylesFlag)
+            this.refreshStyles(parent);
+
+        return result;
+    }
+
+    _createSingleObject(object, parent, doNotRefreshStylesFlag) {
+        //parse template for assets and objects (groups, components)
+        if (!object._parsed) { //todo only for objects, contains components && groups in future
+            return Urso.scenes.addObject(object, parent, doNotRefreshStylesFlag);
+        }
+
+        return this.getInstance('Create').add(object, parent);
+    }
+
+    find(selector) {
+        return this.getInstance('Find').do(selector);
+    }
+
+    findOne(selector) {
+        let result = this.getInstance('Find').do(selector, true);
+        return result ? result[0] : false;
+    }
+
+    findAll(selector) {
+        let result = this.getInstance('Find').do(selector);
+        return result ? result : []; //todo make collections
+    }
+
+    addIdToCache(id, object) {
+        this.getInstance('Cache').addId(id, object);
+    }
+
+    removeIdFromCache(id, object) {
+        this.getInstance('Cache').removeId(id, object);
+    }
+
+    addNameToCache(name, object) {
+        this.getInstance('Cache').addName(name, object);
+    }
+
+    removeNameFromCache(name, object) {
+        this.getInstance('Cache').removeName(name, object);
+    }
+
+    addClassToCache(className, object) {
+        this.getInstance('Cache').addClass(className, object);
+    }
+
+    removeClassFromCache(className, object) {
+        this.getInstance('Cache').removeClass(className, object);
+    }
+
+    refreshStyles(parent) {
+        return this.getInstance('Styles').refresh(parent);
+    }
+
+    refreshByChangedClassName(className) {
+        return this.getInstance('Styles').refreshByChangedClassName(className);
+    }
+
+    getWorld() {
+        return this.getInstance('Create').getWorld();
+    }
+
+    addChild(parent, child, doNotRefreshStylesFlag) {
+        this.getInstance('Create').addChild(parent, child, doNotRefreshStylesFlag);
+    }
+
+    removeChild(parent, child, doNotRefreshStylesFlag) {
+        this.getInstance('Create').removeChild(parent, child, doNotRefreshStylesFlag);
+    }
+
+    destroy(object, doNotRefreshStylesFlag) {
+        this.getInstance('Create').destroy(object, doNotRefreshStylesFlag);
+    }
+
+    //do not use outside engine
+    _safeSetValueToTarget(target, key, value) {
+        this.getInstance('Proxy').safeSetValueToTarget(target, key, value);
+    }
+
+    _updateCommonProperties(object) {
+        this.getInstance('Create')._updateCommonProperties(object);
+    }
+
+    _newResolutionHandler(params) {
+        this.getInstance('Create').updateWorldBounds(params);
+    }
+
+    _resetWorld() {
+        this.getInstance('Create').resetWorld();
+    }
+
+    _applyClassesToWorld() {
+        this.getInstance('Create').applyClassesToWorld();
+    }
+
+    _subscribeOnce() {
+        this.addListener(Urso.events.MODULES_SCENES_NEW_RESOLUTION, this._newResolutionHandler, true);
+        this.addListener(Urso.events.MODULES_SCENES_NEW_SCENE_INIT, this._resetWorld, true);
+        this.addListener(Urso.events.MODULES_INSTANCES_MODES_CHANGED, this._applyClassesToWorld, true);
+    }
+}
+
+module.exports = ModulesObjectsController;