neo.mjs 6.12.1 → 6.14.0

package/src/core/Observable.mjs

@@ -29,28 +29,46 @@ class Observable extends Base {
      * @param {Object} [scope]
      * @param {String} [eventId]
      * @param {Object} [data]
-     * @param {Number} [order]
+     * @param {Number|String} [order]
      * @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,
             listener, existing, eventConfig;
 
         if (nameObject) {
+            if (name.hasOwnProperty('delay')) {
+                delay = name.delay;
+                delete name.delay
+            }
+
+            if (name.hasOwnProperty('once')) {
+                once = name.once;
+                delete name.once
+            }
+
             if (name.hasOwnProperty('scope')) {
                 scope = name.scope;
-                delete name.scope;
+                delete name.scope
             }
 
             Object.entries(name).forEach(([key, value]) => {
-                me.addListener(key, value, scope);
-            });
+                if (Neo.isObject(value)) {
+                    me.addListener(key, {delay, once, scope, ...value})
+                } else {
+                    me.addListener(key, {delay, fn: value, once, scope})
+                }
+            })
         } else if (typeof opts === 'object') {
-            scope    = scope || opts.scope;
-            listener = opts.fn;
-            order    = order || opts.order;
+            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') {
@@ -61,10 +79,12 @@ class Observable extends Base {
 
         if (!nameObject) {
             eventConfig = {
-                fn: listener,
-                scope,
                 data,
-                id: eventId || Neo.getId('event')
+                delay,
+                fn: listener,
+                id: eventId || Neo.getId('event'),
+                once,
+                scope
             };
 
             if (existing = me.listeners?.[name]) {
@@ -85,10 +105,10 @@ class Observable extends Base {
                 me.listeners[name] = [eventConfig];
             }
 
-            return eventConfig.id;
+            return eventConfig.id
         }
 
-        return null;
+        return null
     }
 
     /**
@@ -101,11 +121,22 @@ class Observable extends Base {
     callback(fn, scope=this, args) {
         if (fn) {
             const handler = this.resolveCallback(fn, scope);
-
-            handler.fn.apply(handler.scope, args);
+            handler.fn.apply(handler.scope, args)
         }
     }
 
+    /**
+     * Internal helper method for events which use the delay option
+     * @param {Object} cb
+     * @param {Array} args
+     * @param {Number} delay
+     */
+    delayedCallback(cb, args, delay) {
+        setTimeout(() => {
+            cb.fn.apply(cb.scope, args)
+        }, delay)
+    }
+
     /**
      * @param name
      */
@@ -113,29 +144,38 @@ class Observable extends Base {
         let me        = this,
             args      = [].slice.call(arguments, 1),
             listeners = me.listeners,
-            handler, handlers, i, len;
+            delay, handler, handlers, i, len;
 
         if (listeners && listeners[name]) {
             handlers = [...listeners[name]];
-            len    = handlers.length;
+            len      = handlers.length;
 
             for (i = 0; i < len; i++) {
                 handler = handlers[i];
+                delay   = handler.delay;
 
-                // Resolve function name on the scope (oe me), or, if it starts with 'up.'
+                // Resolve function name on the scope (or me), or, if it starts with 'up.'
                 // look in the ownership hierarchy from me.
                 const cb = me.resolveCallback(handler.fn, handler.scope || me);
 
-                // remove the listener, in case the scope no longer exists
+                // remove the listener if the scope no longer exists
                 if (cb.scope && !cb.scope.id) {
-                    listeners[name].splice(i, 1);
+                    listeners[name].splice(i, 1)
                 } else {
                     if (!me.suspendEvents) {
                         // Object event format. Inject firer reference in as 'source'
-                        if (args.length === 1 && typeof(args[0]) === 'object') {
-                            args[0].source = me.id;
+                        if (args.length === 1 && Neo.isObject(args[0])) {
+                            args[0].source = me.id
+                        }
+
+                        // remove the listener if it has the once flag
+                        handler.once && listeners[name].splice(i, 1)
+
+                        if (Neo.isNumber(delay) && delay > 0) {
+                            me.delayedCallback(cb, handler.data ? args.concat(handler.data) : args, delay)
+                        } else {
+                            cb.fn.apply(cb.scope, handler.data ? args.concat(handler.data) : args)
                         }
-                        cb.fn.apply(cb.scope, handler.data ? args.concat(handler.data) : args);
                     }
                 }
             }
@@ -291,6 +331,6 @@ class Observable extends Base {
     }
 }
 
-Neo.applyClassConfig(Observable);
+Neo.setupClass(Observable);
 
 export default Observable;

package/src/core/Util.mjs

@@ -209,7 +209,7 @@ class Util extends Base {
     }
 }
 
-Neo.applyClassConfig(Util);
+Neo.setupClass(Util);
 
 // aliases
 Neo.applyFromNs(Neo, Util, {

package/src/dashboard/Container.mjs

@@ -19,6 +19,6 @@ class Container extends BaseContainer {
     }
 }
 
-Neo.applyClassConfig(Container);
+Neo.setupClass(Container);
 
 export default Container;

package/src/data/Model.mjs

@@ -65,6 +65,6 @@ class Model extends Base {
     }
 }
 
-Neo.applyClassConfig(Model);
+Neo.setupClass(Model);
 
 export default Model;

package/src/data/RecordFactory.mjs

@@ -42,10 +42,10 @@ class RecordFactory extends Base {
         let recordClass = Neo.ns(`${this.recordNamespace}.${model.className}.${model.id}`);
 
         if (!recordClass) {
-            recordClass = this.createRecordClass(model);
+            recordClass = this.createRecordClass(model)
         }
 
-        return new recordClass(config);
+        return new recordClass(config)
     }
 
     /**
@@ -61,7 +61,7 @@ class RecordFactory extends Base {
             if (!ns) {
                 nsArray = className.split('.');
                 key     = nsArray.pop();
-                ns      = Neo.ns(nsArray, true),
+                ns      = Neo.ns(nsArray, true);
                 cls     = ns[key] = class Record {
                     constructor(config) {
                         let me = this,
@@ -81,7 +81,7 @@ class RecordFactory extends Base {
                                     parsedValue;
 
                                 if (!Object.hasOwn(config, field.name) && Object.hasOwn(field, 'defaultValue')) {
-                                    value = field.defaultValue;
+                                    value = field.defaultValue
                                 }
 
                                 parsedValue = instance.parseRecordValue(me, field, value, config);
@@ -113,7 +113,7 @@ class RecordFactory extends Base {
                                                     fields: [{name: field.name, oldValue, value}],
                                                     model,
                                                     record: me
-                                                });
+                                                })
                                             }
                                         }
                                     }
@@ -174,14 +174,14 @@ class RecordFactory extends Base {
                 field = fields[i];
 
                 if (!Neo.isEqual(record[field], record[this.ovPrefix + field])) {
-                    return true;
+                    return true
                 }
             }
 
-            return false;
+            return false
         }
 
-        return record._isModified;
+        return record._isModified
     }
 
     /**
@@ -191,13 +191,13 @@ class RecordFactory extends Base {
      */
     isModifiedField(record, fieldName) {
         if (!record.hasOwnProperty(fieldName)) {
-            Logger.logError('The record does not contain the field', fieldName, record);
+            Logger.logError('The record does not contain the field', fieldName, record)
         }
 
         let modifiedField = this.ovPrefix + fieldName;
 
         if (record.hasOwnProperty(modifiedField)) {
-            return !Neo.isEqual(record[fieldName], record[modifiedField]);
+            return !Neo.isEqual(record[fieldName], record[modifiedField])
         }
 
         return null;
@@ -209,7 +209,7 @@ class RecordFactory extends Base {
      * @returns {Boolean}
      */
     isRecord(record) {
-        return record?.isRecord;
+        return record?.isRecord
     }
 
     /**
@@ -221,7 +221,7 @@ class RecordFactory extends Base {
      * @param {Object} opts.record
      */
     onRecordChange(opts) {
-        Neo.get(opts.model.storeId)?.onRecordChange(opts);
+        Neo.get(opts.model.storeId)?.onRecordChange(opts)
     }
 
     /**
@@ -234,11 +234,11 @@ class RecordFactory extends Base {
      */
     parseRecordValue(record, field, value, recordConfig=null) {
         if (field.calculate) {
-            return field.calculate(record, field, recordConfig);
+            return field.calculate(record, field, recordConfig)
         }
 
         if (field.convert) {
-            value = field.convert(value);
+            value = field.convert(value)
         }
 
         let fieldName = field.name,
@@ -256,44 +256,52 @@ class RecordFactory extends Base {
                 key = ns.pop();
 
             ns    = Neo.ns(ns, true, recordConfig);
-            value = ns[key];
+            value = ns[key]
         }
 
         if (Object.hasOwn(field, 'maxLength')) {
             if (value?.toString().length > maxLength) {
                 console.warn(`Setting record field: ${fieldName} value: ${value} conflicts with maxLength: ${maxLength}`);
-                return oldValue;
+                return oldValue
             }
         }
 
         if (Object.hasOwn(field, 'minLength')) {
             if (value?.toString().length < minLength) {
                 console.warn(`Setting record field: ${fieldName} value: ${value} conflicts with minLength: ${minLength}`);
-                return oldValue;
+                return oldValue
             }
         }
 
         if (Object.hasOwn(field, 'nullable')) {
             if (nullable === false && value === null) {
                 console.warn(`Setting record field: ${fieldName} value: ${value} conflicts with nullable: ${nullable}`);
-                return oldValue;
+                return oldValue
             }
         }
 
         if (type === 'date' && Neo.typeOf(value) !== 'Date') {
-            return new Date(value);
+            return new Date(value)
         }
 
-        if (type === 'html' && value) {
-            value = value + '';
+        else if (type === 'float' && value) {
+            value = parseFloat(value)
+        }
+
+        else if (type === 'html' && value) {
+            value = value + ''
         }
 
-        if (type === 'string' && value) {
+        else if ((type === 'int' || type === 'integer') && value) {
+            value = parseInt(value)
+        }
+
+        else if (type === 'string' && value) {
             value = value + '';
-            value =  value.replace(/(<([^>]+)>)/ig, '');
+            value =  value.replace(/(<([^>]+)>)/ig, '')
         }
 
-        return value;
+        return value
     }
 
     /**
@@ -313,20 +321,16 @@ class RecordFactory extends Base {
             if (!Neo.isEqual(oldValue, value)) {
                 record[Symbol.for(key)] = value; // silent update
                 record._isModified = true;
-                changedFields.push({name: key, oldValue, value});
+                changedFields.push({name: key, oldValue, value})
             }
         });
 
         if (!silent && Object.keys(changedFields).length > 0) {
-            Neo.get(model.storeId)?.onRecordChange({fields: changedFields, model, record});
+            Neo.get(model.storeId)?.onRecordChange({fields: changedFields, model, record})
         }
     }
 }
 
-Neo.applyClassConfig(RecordFactory);
-
-instance = Neo.create(RecordFactory);
-
-Neo.applyToGlobalNs(instance);
+instance = Neo.setupClass(RecordFactory);
 
 export default instance;

package/src/data/Store.mjs

@@ -468,6 +468,6 @@ class Store extends Base {
     }
 }
 
-Neo.applyClassConfig(Store);
+Neo.setupClass(Store);
 
 export default Store;

package/src/data/connection/Fetch.mjs

@@ -122,6 +122,6 @@ class Fetch extends Base {
     }
 }
 
-Neo.applyClassConfig(Fetch);
+Neo.setupClass(Fetch);
 
 export default Fetch;

package/src/data/connection/WebSocket.mjs

@@ -251,6 +251,6 @@ class Socket extends Base {
     }
 }
 
-Neo.applyClassConfig(Socket);
+Neo.setupClass(Socket);
 
 export default Socket;

package/src/data/connection/Xhr.mjs

@@ -228,6 +228,6 @@ class Xhr extends Base {
     }
 }
 
-Neo.applyClassConfig(Xhr);
+Neo.setupClass(Xhr);
 
 export default Xhr;

package/src/dialog/Base.mjs

@@ -738,6 +738,6 @@ class Base extends Panel {
     }
 }
 
-Neo.applyClassConfig(Base);
+Neo.setupClass(Base);
 
 export default Base;

package/src/dialog/header/Toolbar.mjs

@@ -99,6 +99,6 @@ class Toolbar extends Base {
     }
 }
 
-Neo.applyClassConfig(Toolbar);
+Neo.setupClass(Toolbar);
 
 export default Toolbar;

package/src/draggable/DragProxyComponent.mjs

@@ -58,6 +58,6 @@ class DragProxyComponent extends Base {
     }
 }
 
-Neo.applyClassConfig(DragProxyComponent);
+Neo.setupClass(DragProxyComponent);
 
 export default DragProxyComponent;

package/src/draggable/DragZone.mjs

@@ -166,7 +166,7 @@ class DragZone extends Base {
      */
     afterSetAppName(value, oldValue) {
         if (value) {
-            Neo.currentWorker.insertThemeFiles(value, this.__proto__);
+            Neo.currentWorker.insertThemeFiles(value, this.owner.windowId, this.__proto__);
         }
     }
 
@@ -445,6 +445,6 @@ class DragZone extends Base {
     }
 }
 
-Neo.applyClassConfig(DragZone);
+Neo.setupClass(DragZone);
 
 export default DragZone;

package/src/draggable/DropZone.mjs

@@ -81,6 +81,6 @@ class DropZone extends Base {
     }
 }
 
-Neo.applyClassConfig(DropZone);
+Neo.setupClass(DropZone);
 
 export default DropZone;

package/src/draggable/list/DragZone.mjs

@@ -144,6 +144,6 @@ class DragZone extends BaseDragZone {
     }
 }
 
-Neo.applyClassConfig(DragZone);
+Neo.setupClass(DragZone);
 
 export default DragZone;

package/src/draggable/list/SortZone.mjs

@@ -19,6 +19,6 @@ class SortZone extends DragZone {
     }
 }
 
-Neo.applyClassConfig(SortZone);
+Neo.setupClass(SortZone);
 
 export default SortZone;

package/src/draggable/tab/header/toolbar/SortZone.mjs

@@ -65,6 +65,6 @@ class SortZone extends BaseSortZone {
     }
 }
 
-Neo.applyClassConfig(SortZone);
+Neo.setupClass(SortZone);
 
 export default SortZone;

package/src/draggable/toolbar/DragZone.mjs

@@ -111,6 +111,6 @@ class DragZone extends BaseDragZone {
     }
 }
 
-Neo.applyClassConfig(DragZone);
+Neo.setupClass(DragZone);
 
 export default DragZone;

package/src/draggable/toolbar/SortZone.mjs

@@ -300,6 +300,6 @@ class SortZone extends DragZone {
     }
 }
 
-Neo.applyClassConfig(SortZone);
+Neo.setupClass(SortZone);
 
 export default SortZone;

package/src/draggable/tree/DragZone.mjs

@@ -96,6 +96,6 @@ class DragZone extends BaseDragZone {
     }
 }
 
-Neo.applyClassConfig(DragZone);
+Neo.setupClass(DragZone);
 
 export default DragZone;

package/src/draggable/tree/SortZone.mjs

@@ -19,6 +19,6 @@ class SortZone extends DragZone {
     }
 }
 
-Neo.applyClassConfig(SortZone);
+Neo.setupClass(SortZone);
 
 export default SortZone;

package/src/filter/BooleanContainer.mjs

@@ -98,6 +98,6 @@ class BooleanContainer extends Container {
     }
 }
 
-Neo.applyClassConfig(BooleanContainer);
+Neo.setupClass(BooleanContainer);
 
 export default BooleanContainer;

package/src/filter/DateContainer.mjs

@@ -24,6 +24,6 @@ class DateContainer extends NumberContainer {
     }
 }
 
-Neo.applyClassConfig(DateContainer);
+Neo.setupClass(DateContainer);
 
 export default DateContainer;

package/src/filter/NumberContainer.mjs

@@ -118,6 +118,6 @@ class NumberContainer extends Container {
     }
 }
 
-Neo.applyClassConfig(NumberContainer);
+Neo.setupClass(NumberContainer);
 
 export default NumberContainer;

package/src/filter/ToggleOperatorsButton.mjs

@@ -91,6 +91,6 @@ class ToggleOperatorsButton extends Button {
     }
 }
 
-Neo.applyClassConfig(ToggleOperatorsButton);
+Neo.setupClass(ToggleOperatorsButton);
 
 export default ToggleOperatorsButton;

package/src/form/Container.mjs

@@ -410,6 +410,6 @@ class Container extends BaseContainer {
     }
 }
 
-Neo.applyClassConfig(Container);
+Neo.setupClass(Container);
 
 export default Container;

package/src/form/Fieldset.mjs

@@ -233,6 +233,6 @@ class Fieldset extends FormContainer {
     }
 }
 
-Neo.applyClassConfig(Fieldset);
+Neo.setupClass(Fieldset);
 
 export default Fieldset;