neo.mjs 6.17.2 → 6.18.1

package/src/container/Panel.mjs

@@ -100,7 +100,7 @@ class Panel extends Container {
             });
         }
 
-        return {...config, ...header};
+        return {...config, ...header}
     }
 
     /**
@@ -122,18 +122,18 @@ class Panel extends Container {
                 topHeaders           = headers.filter(header => {return header.dock === (hf ?'top'   : 'left')}),
                 hasHorizontalHeaders = bottomHeaders.length > 0 || topHeaders  .length > 0,
                 hasVerticalHeaders   = leftHeaders  .length > 0 || rightHeaders.length > 0,
-                items                = me.items,
+                {items}              = me,
                 horizontalItems      = [],
                 verticalItems        = [],
                 config;
 
             topHeaders.forEach(header => {
-                verticalItems.push(Panel.createHeaderConfig(header));
+                verticalItems.push(Panel.createHeaderConfig(header))
             });
 
             if (hasVerticalHeaders && (hf && hasHorizontalHeaders || !hf && hasHorizontalHeaders)) {
                 leftHeaders.forEach(header => {
-                    horizontalItems.push(Panel.createHeaderConfig(header));
+                    horizontalItems.push(Panel.createHeaderConfig(header))
                 });
 
                 config = {
@@ -147,7 +147,7 @@ class Panel extends Container {
                 horizontalItems.push({...me.headerDefaults, ...config});
 
                 rightHeaders.forEach(header => {
-                    horizontalItems.push(Panel.createHeaderConfig(header));
+                    horizontalItems.push(Panel.createHeaderConfig(header))
                 });
 
                 verticalItems.push({
@@ -167,18 +167,18 @@ class Panel extends Container {
                     ...containerConfig
                 };
 
-                verticalItems.push({...me.headerDefaults, ...config});
+                verticalItems.push({...me.headerDefaults, ...config})
             }
 
             bottomHeaders.forEach(header => {
-                verticalItems.push(Panel.createHeaderConfig(header));
+                verticalItems.push(Panel.createHeaderConfig(header))
             });
 
             me.items = verticalItems;
 
             me.itemDefaults = null;
 
-            super.createItems();
+            super.createItems()
         }
     }
 
@@ -186,7 +186,7 @@ class Panel extends Container {
      * @returns {Boolean}
      */
     hasHeaders() {
-        return Array.isArray(this.headers) && this.headers.length > 0;
+        return Array.isArray(this.headers) && this.headers.length > 0
     }
 }
 

package/src/controller/Base.mjs

@@ -96,9 +96,9 @@ class Base extends CoreBase {
      *
      */
     async onConstructed() {
-        let me          = this,
-            currentHash = HashHistory.first(),
-            defaultHash = me.defaultHash;
+        let me            = this,
+            currentHash   = HashHistory.first(),
+            {defaultHash} = me;
 
         // get outside the construction chain => a related cmp & vm has to be constructed too
         await me.timeout(1);
@@ -128,14 +128,13 @@ class Base extends CoreBase {
             return
         }
 
-        let me                = this,
-            counter           = 0,
-            hasRouteBeenFound = false,
-            handleRoutes      = me.handleRoutes,
-            routeKeys         = Object.keys(handleRoutes),
-            routeKeysLength   = routeKeys.length,
-            routes            = me.routes,
-            handler, key, paramObject, preHandler, responsePreHandler, result, route;
+        let me                     = this,
+            counter                = 0,
+            hasRouteBeenFound      = false,
+            {handleRoutes, routes} = me,
+            routeKeys              = Object.keys(handleRoutes),
+            routeKeysLength        = routeKeys.length,
+            arrayParamIds, arrayParamValues, handler, key, paramObject, preHandler, responsePreHandler, result, route;
 
         while (routeKeysLength > 0 && counter < routeKeysLength && !hasRouteBeenFound) {
             key                = routeKeys[counter];
@@ -146,9 +145,8 @@ class Base extends CoreBase {
             result             = value.hashString.match(handleRoutes[key]);
 
             if (result) {
-                const
-                    arrayParamIds    = key.match(routeParamRegex),
-                    arrayParamValues = result.splice(1, result.length - 1);
+                arrayParamIds    = key.match(routeParamRegex);
+                arrayParamValues = result.splice(1, result.length - 1);
 
                 if (arrayParamIds && arrayParamIds.length !== arrayParamValues.length) {
                     throw 'Number of IDs and number of Values do not match'

package/src/controller/Component.mjs

@@ -43,8 +43,8 @@ class Component extends Base {
     construct(config) {
         super.construct(config);
 
-        let me        = this,
-            component = me.component,
+        let me          = this,
+            {component} = me,
             listenerId;
 
         me.references = {};
@@ -55,7 +55,7 @@ class Component extends Base {
             listenerId = component.on('constructed', () => {
                 component.un('constructed', listenerId);
                 me.onComponentConstructed()
-            });
+            })
         }
     }
 
@@ -75,8 +75,8 @@ class Component extends Base {
      * @returns {Neo.controller.Component|Boolean|null}
      */
     getHandlerScope(handlerName, component) {
-        let me     = this,
-            parent = me.parent;
+        let me       = this,
+            {parent} = me;
 
         if (component) {
             // Look for ths function *name* first in the Component itself.
@@ -101,7 +101,7 @@ class Component extends Base {
      * @param {Boolean} [sameLevelOnly=false]
      */
     getModel(sameLevelOnly=false) {
-        let component = this.component;
+        let {component} = this;
         return sameLevelOnly ? component.model : component.getModel()
     }
 
@@ -110,10 +110,11 @@ class Component extends Base {
      * @returns {Neo.controller.Component|null}
      */
     getParent() {
-        let me = this;
+        let me       = this,
+            {parent} = me;
 
-        if (me.parent) {
-            return me.parent;
+        if (parent) {
+            return parent;
         }
 
         return me.component.parent?.getController() || null
@@ -158,11 +159,8 @@ class Component extends Base {
      * @param {Neo.component.Base} component=this.component
      */
     parseConfig(component=this.component) {
-        let me        = this,
-            handler   = component.handler,
-            listeners = component.listeners,
-            reference = component.reference,
-            validator = component.validator,
+        let me = this,
+            {handler, listeners, reference, validator} = component,
             eventHandler, handlerScope;
 
         if (handler && typeof handler === 'string') {
@@ -174,36 +172,34 @@ class Component extends Base {
             }
         }
 
-        if (listeners) {
-            Object.entries(listeners).forEach(([key, value]) => {
-                if (key !== 'scope' && key !== 'delegate') {
-                    if (Neo.isString(value)) {
-                        eventHandler = value;
-                        handlerScope = me.getHandlerScope(eventHandler, component);
-
-                        if (!handlerScope) {
-                            Logger.logError('Unknown event handler for', eventHandler, component)
-                        } else if (handlerScope !== true) {
-                            listeners[key] = {};
-                            listeners[key].fn = handlerScope[eventHandler].bind(handlerScope)
-                        }
-                    } else {
-                        value.forEach(listener => {
-                            if (Neo.isObject(listener) && listener.hasOwnProperty('fn') && Neo.isString(listener.fn)) {
-                                eventHandler = listener.fn;
-                                handlerScope = me.getHandlerScope(eventHandler, component);
-
-                                if (!handlerScope) {
-                                    console.error('Unknown event handler for', eventHandler, component)
-                                } else if (handlerScope !== true) {
-                                    listener.fn = handlerScope[eventHandler].bind(handlerScope)
-                                }
-                            }
-                        });
+        listeners && Object.entries(listeners).forEach(([key, value]) => {
+            if (key !== 'scope' && key !== 'delegate') {
+                if (Neo.isString(value)) {
+                    eventHandler = value;
+                    handlerScope = me.getHandlerScope(eventHandler, component);
+
+                    if (!handlerScope) {
+                        Logger.logError('Unknown event handler for', eventHandler, component)
+                    } else if (handlerScope !== true) {
+                        listeners[key] = {};
+                        listeners[key].fn = handlerScope[eventHandler].bind(handlerScope)
                     }
+                } else {
+                    value.forEach(listener => {
+                        if (Neo.isObject(listener) && listener.hasOwnProperty('fn') && Neo.isString(listener.fn)) {
+                            eventHandler = listener.fn;
+                            handlerScope = me.getHandlerScope(eventHandler, component);
+
+                            if (!handlerScope) {
+                                console.error('Unknown event handler for', eventHandler, component)
+                            } else if (handlerScope !== true) {
+                                listener.fn = handlerScope[eventHandler].bind(handlerScope)
+                            }
+                        }
+                    })
                 }
-            });
-        }
+            }
+        });
 
         if (Neo.isString(validator)) {
             handlerScope = me.getHandlerScope(validator);
@@ -224,35 +220,33 @@ class Component extends Base {
      * @param {Neo.component.Base} component=this.component
      */
     parseDomListeners(component=this.component) {
-        let me           = this,
-            domListeners = component.domListeners,
+        let me             = this,
+            {domListeners} = component,
             eventHandler, scope;
 
-        if (domListeners) {
-            domListeners.forEach(domListener => {
-                Object.entries(domListener).forEach(([key, value]) => {
-                    eventHandler = null;
+        domListeners?.forEach(domListener => {
+            Object.entries(domListener).forEach(([key, value]) => {
+                eventHandler = null;
 
-                    if (key !== 'scope' && key !== 'delegate') {
-                        if (Neo.isString(value)) {
-                            eventHandler = value;
-                        } else if (Neo.isObject(value) && value.hasOwnProperty('fn') && Neo.isString(value.fn)) {
-                            eventHandler = value.fn;
-                        }
+                if (key !== 'scope' && key !== 'delegate') {
+                    if (Neo.isString(value)) {
+                        eventHandler = value;
+                    } else if (Neo.isObject(value) && value.hasOwnProperty('fn') && Neo.isString(value.fn)) {
+                        eventHandler = value.fn;
+                    }
 
-                        if (eventHandler) {
-                            scope = me.getHandlerScope(eventHandler);
+                    if (eventHandler) {
+                        scope = me.getHandlerScope(eventHandler);
 
-                            if (!scope) {
-                                Logger.logError('Unknown domEvent handler for', eventHandler, component)
-                            } else {
-                                domListener[key] = scope[eventHandler].bind(scope)
-                            }
+                        if (!scope) {
+                            Logger.logError('Unknown domEvent handler for', eventHandler, component)
+                        } else {
+                            domListener[key] = scope[eventHandler].bind(scope)
                         }
                     }
-                })
+                }
             })
-        }
+        })
     }
 
     /**
@@ -260,14 +254,14 @@ class Component extends Base {
      * @param {Neo.component.Base} component
      */
     removeReference(component) {
-        let me = this,
-            references = me.references,
+        let me           = this,
+            {references} = me,
             key;
 
         for (key in references) {
             if (component === references[key]) {
                 delete references[key];
-                break;
+                break
             }
         }
 

package/src/core/Base.mjs

@@ -382,11 +382,9 @@ class Base {
      * @protected
      */
     initRemote() {
-        let me            = this,
-            remote        = me.remote,
-            className     = me.className,
-            currentWorker = Neo.currentWorker,
-            listenerId;
+        let me                  = this,
+            {className, remote} = me,
+            {currentWorker}     = Neo;
 
         if (!me.singleton && !me.isMainThreadAddon) {
             throw new Error('Remote method access is only functional for Singleton classes ' + className)
@@ -394,10 +392,9 @@ class Base {
 
         if (!Neo.config.unitTestMode && Neo.isObject(remote)) {
             if (Neo.workerId !== 'main' && currentWorker.isSharedWorker && !currentWorker.isConnected) {
-                listenerId = currentWorker.on('connected', () => {
-                    currentWorker.un('connected', listenerId);
+                currentWorker.on('connected', () => {
                     Base.sendRemotes(className, remote)
-                });
+                }, me, {once: true})
             } else {
                 Base.sendRemotes(className, remote)
             }

package/src/core/IdGenerator.mjs

@@ -72,6 +72,4 @@ class IdGenerator {
     onConstructed() {}
 }
 
-let instance = Neo.setupClass(IdGenerator);
-
-export default instance;
+export default Neo.setupClass(IdGenerator);

package/src/core/Observable.mjs

@@ -33,12 +33,28 @@ class Observable extends Base {
      * @returns {String|null} eventId null in case an object gets passed as the name (multiple ids)
      */
     addListener(name, opts, scope, eventId, data, order) {
-        let me         = this,
-            delay      = 0,
-            nameObject = typeof name === 'object',
-            once       = false,
+        let me            = this,
+            delay         = 0,
+            eventIdObject = typeof eventId === 'object',
+            nameObject    = typeof name    === 'object',
+            once          = false,
+            optsType      = typeof opts,
             listener, existing, eventConfig;
 
+        /*
+         * let us support the following format too:
+         *
+         * currentWorker.on('connected', () => {
+         *     Base.sendRemotes(className, remote)
+         * }, me, {once: true})
+         */
+        if (eventIdObject && optsType === 'function') {
+            eventId.fn = opts;
+            opts     = eventId;
+            optsType = 'object';
+            eventId  = null;
+        }
+
         if (nameObject) {
             if (name.hasOwnProperty('delay')) {
                 delay = name.delay;
@@ -62,19 +78,19 @@ class Observable extends Base {
                     me.addListener(key, {delay, fn: value, once, scope})
                 }
             })
-        } else if (typeof opts === 'object') {
+        } else if (optsType === 'object') {
             delay    = delay   || opts.delay;
             eventId  = eventId || opts.eventId;
             listener = opts.fn;
             once     = once    || opts.once;
             order    = order   || opts.order;
-            scope    = scope   || opts.scope;
-        } else if (typeof opts === 'function') {
-            listener = opts;
-        } else if (typeof opts === 'string') {
-            listener = opts; // VC hook, can get parsed after onConstructed in case the view uses the parent VC
+            scope    = scope   || opts.scope
+        } else if (optsType === 'function') {
+            listener = opts
+        } else if (optsType === 'string') {
+            listener = opts // VC hook, can get parsed after onConstructed in case the view uses the parent VC
         } else {
-            throw new Error('Invalid addListener call: ' + name);
+            throw new Error('Invalid addListener call: ' + name)
         }
 
         if (!nameObject) {
@@ -90,19 +106,19 @@ class Observable extends Base {
             if (existing = me.listeners?.[name]) {
                 existing.forEach(cfg => {
                     if (cfg.id === eventId || (cfg.fn === listener && cfg.scope === scope)) {
-                        console.error('Duplicate event handler attached:', name, me);
+                        console.error('Duplicate event handler attached:', name, me)
                     }
                 });
 
                 if (typeof order === 'number') {
-                    existing.splice(order, 0, eventConfig);
+                    existing.splice(order, 0, eventConfig)
                 } else if (order === 'before') {
-                    existing.unshift(eventConfig);
+                    existing.unshift(eventConfig)
                 } else {
-                    existing.push(eventConfig);
+                    existing.push(eventConfig)
                 }
             } else {
-                me.listeners[name] = [eventConfig];
+                me.listeners[name] = [eventConfig]
             }
 
             return eventConfig.id
@@ -193,7 +209,7 @@ class Observable extends Base {
 
         if (config.listeners) {
             me.listeners = config.listeners;
-            delete config.listeners;
+            delete config.listeners
         }
 
         listeners = me.listeners;
@@ -202,7 +218,7 @@ class Observable extends Base {
 
         if (listeners) {
             if (Neo.isObject(listeners)) {
-                listeners = {...listeners};
+                listeners = {...listeners}
             }
 
             me.addListener(listeners);
@@ -219,10 +235,10 @@ class Observable extends Base {
                     on            : me.on,
                     removeListener: me.removeListener,
                     un            : me.un
-                });
+                })
             }
 
-            proto = proto.__proto__;
+            proto = proto.__proto__
         }
     }
 
@@ -237,7 +253,7 @@ class Observable extends Base {
      * @returns {String} eventId
      */
     on(...args) {
-        return this.addListener(...args);
+        return this.addListener(...args)
     }
 
     /**
@@ -290,7 +306,7 @@ class Observable extends Base {
                         listener.scope   === scope
                     ) {
                         listeners.splice(i, 1);
-                        break;
+                        break
                     }
                 }
             });
@@ -300,12 +316,12 @@ class Observable extends Base {
 
             listeners.forEach((eventConfig, idx) => {
                 if (eventConfig.id === eventId) {
-                    return match = idx;
+                    return match = idx
                 }
             });
 
             if (match !== false) {
-                listeners.splice(match, 1);
+                listeners.splice(match, 1)
             }
         }
     }

package/src/core/Util.mjs

@@ -32,8 +32,8 @@ class Util extends Base {
      */
     static bindMethods(scope, values) {
         values.forEach(value => {
-            scope[value] = scope[value].bind(scope);
-        });
+            scope[value] = scope[value].bind(scope)
+        })
     }
 
     /**
@@ -54,17 +54,17 @@ class Util extends Base {
             parts = el.split((/:(.+)/)).map(function (x) {
                 let num = parseFloat(x);
 
-                return x == num ? num : x.trim();
+                return x == num ? num : x.trim()
             });
 
             if (parts[0] !== '') {
                 parts[0] = parts[0].replace(/-([a-z])/g, (str, letter) => {
-                    return letter.toUpperCase();
+                    return letter.toUpperCase()
                 });
 
                 obj[parts[0]] = parts[1]
             }
-            return obj;
+            return obj
         }, {})
     }
 

package/src/data/Model.mjs

@@ -43,7 +43,7 @@ class Model extends Base {
      * @property {Boolean} isRecord=true
      * @readonly
      */
-    isRecord = true;
+    isRecord = true
 
     /**
      * Finds a field config by a given field name
@@ -57,11 +57,11 @@ class Model extends Base {
 
         for (; i < len; i++) {
             if (me.fields[i].name === name) {
-                return me.fields[i];
+                return me.fields[i]
             }
         }
 
-        return null;
+        return null
     }
 }
 

package/src/data/RecordFactory.mjs

@@ -98,7 +98,7 @@ class RecordFactory extends Base {
                                         configurable: true,
                                         enumerable  : true,
                                         get() {
-                                            return this[symbol];
+                                            return this[symbol]
                                         },
                                         set(value) {
                                             let me       = this,
@@ -203,7 +203,7 @@ class RecordFactory extends Base {
             return !Neo.isEqual(record[fieldName], record[modifiedField])
         }
 
-        return null;
+        return null
     }
 
     /**
@@ -245,10 +245,7 @@ class RecordFactory extends Base {
         }
 
         let fieldName = field.name,
-            mapping   = field.mapping,
-            maxLength = field.maxLength,
-            minLength = field.minLength,
-            nullable  = field.nullable,
+            {mapping, maxLength, minLength, nullable} = field,
             oldValue  = recordConfig?.[fieldName] || record[fieldName],
             type      = field.type?.toLowerCase();