neo.mjs 6.17.1 → 6.18.0

package/src/data/Store.mjs

@@ -132,7 +132,7 @@ class Store extends Base {
      * @returns {Number} the collection count
      */
     add(item) {
-        return super.add(this.beforeSetData(item));
+        return super.add(this.beforeSetData(item))
     }
 
     /**
@@ -142,7 +142,7 @@ class Store extends Base {
      * @protected
      */
     afterSetCurrentPage(value, oldValue) {
-        oldValue && this.load();
+        oldValue && this.load()
     }
 
     /**
@@ -156,12 +156,12 @@ class Store extends Base {
         if (me.configsApplied) {
             if (value) {
                 if (oldValue) {
-                    me.clear();
+                    me.clear()
                 } else {
-                    me.initialData = [...value];
+                    me.initialData = [...value]
                 }
 
-                me.add(value);
+                me.add(value)
             }
         }
     }
@@ -178,7 +178,7 @@ class Store extends Base {
 
         me._currentPage = 1; // silent update
 
-        oldValue && me.remoteFilter && me.load();
+        oldValue && me.remoteFilter && me.load()
     }
 
     /**
@@ -198,7 +198,7 @@ class Store extends Base {
     afterSetModel(value, oldValue) {
         if (value) {
             value.storeId = this.id;
-            RecordFactory.createRecordClass(value);
+            RecordFactory.createRecordClass(value)
         }
     }
 
@@ -211,7 +211,7 @@ class Store extends Base {
     afterSetPageSize(value, oldValue) {
         if (oldValue) {
             this._currentPage = 1; // silent update
-            this.load();
+            this.load()
         }
     }
 
@@ -227,7 +227,7 @@ class Store extends Base {
 
         me._currentPage = 1; // silent update
 
-        oldValue && me.remoteSort && me.load();
+        oldValue && me.remoteSort && me.load()
     }
 
     /**
@@ -243,10 +243,10 @@ class Store extends Base {
                 destroy: value + '.destroy',
                 read   : value + '.read',
                 update : value + '.update'
-            };
+            }
         }
 
-        return value;
+        return value
     }
 
     /**
@@ -260,7 +260,7 @@ class Store extends Base {
 
         if (value) {
             if (!Array.isArray(value)) {
-                value = [value];
+                value = [value]
             }
 
             // todo: add a config to make the cloning optional
@@ -268,12 +268,12 @@ class Store extends Base {
 
             value.forEach((key, index) => {
                 if (!RecordFactory.isRecord(key)) {
-                    value[index] = RecordFactory.createRecord(me.model, key);
+                    value[index] = RecordFactory.createRecord(me.model, key)
                 }
-            });
+            })
         }
 
-        return value;
+        return value
     }
 
     /**
@@ -284,10 +284,10 @@ class Store extends Base {
      */
     beforeSetInitialData(value, oldValue) {
         if (!value && oldValue) {
-            return oldValue;
+            return oldValue
         }
 
-        return value;
+        return value
     }
 
     /**
@@ -299,14 +299,14 @@ class Store extends Base {
     beforeSetModel(value, oldValue) {
         oldValue?.destroy();
 
-        return ClassSystemUtil.beforeSetInstance(value, Model);
+        return ClassSystemUtil.beforeSetInstance(value, Model)
     }
 
     /**
      * @param {Object} config
      */
     createRecord(config) {
-        RecordFactory.createRecord(config);
+        RecordFactory.createRecord(config)
     }
 
     /**
@@ -325,11 +325,11 @@ class Store extends Base {
             params = {page: me.currentPage, pageSize: me.pageSize, ...opts.params};
 
         if (me.remoteFilter) {
-            params.filters = me.exportFilters();
+            params.filters = me.exportFilters()
         }
 
         if (me.remoteSort) {
-            params.sorters = me.exportSorters();
+            params.sorters = me.exportSorters()
         }
 
         if (me.api) {
@@ -338,7 +338,7 @@ class Store extends Base {
                 service  = Neo.ns(apiArray.join('.'));
 
             if (!service) {
-                console.log('Api is not defined', this);
+                console.log('Api is not defined', this)
             } else {
                 service[fn](params).then(response => {
                     response = Neo.ns(me.responseRoot, false, response);
@@ -347,15 +347,15 @@ class Store extends Base {
                         me.totalCount = response.totalCount;
                         me.data       = Neo.ns(me.responseRoot, false, response); // fires the load event
                     }
-                });
+                })
             }
         } else {
             opts.url ??= me.url;
 
             Neo.Xhr.promiseJson(opts).catch(err => {
-                console.log('Error for Neo.Xhr.request', err, me.id);
+                console.log('Error for Neo.Xhr.request', err, me.id)
             }).then(data => {
-                me.data = Neo.ns(me.responseRoot, false, data.json) || data.json;
+                me.data = Neo.ns(me.responseRoot, false, data.json) || data.json
                 // we do not need to fire a load event => onCollectionMutate()
             })
         }
@@ -369,7 +369,7 @@ class Store extends Base {
 
         if (me.configsApplied) {
             // console.log('onCollectionMutate', opts);
-            me.fire('load', me.items);
+            me.fire('load', me.items)
         }
     }
 
@@ -399,8 +399,8 @@ class Store extends Base {
 
         if (me.autoLoad) {
             setTimeout(() => { // todo
-                me.load();
-            }, 100);
+                me.load()
+            }, 100)
         }
     }
 
@@ -413,9 +413,9 @@ class Store extends Base {
 
         if (me.remoteFilter) {
             me._currentPage = 1; // silent update
-            me.load();
+            me.load()
         } else {
-            super.onFilterChange(opts);
+            super.onFilterChange(opts)
         }
     }
 
@@ -431,7 +431,7 @@ class Store extends Base {
         this.fire('recordChange', {
             ...data,
             index: this.indexOf(data.record)
-        });
+        })
     }
 
     /**
@@ -449,11 +449,11 @@ class Store extends Base {
                 me.sorters = [{
                     direction: opts.direction,
                     property : opts.property
-                }];
+                }]
             } else {
                 if (!me.remoteSort) {
                     me.startUpdate();
-                    me.clear();
+                    me.clear()
                 }
 
                 me.sorters = [];
@@ -461,7 +461,7 @@ class Store extends Base {
                 if (!me.remoteSort) {
                     me.add([...me.initialData]);
                     me.endUpdate();
-                    me.fire('sort');
+                    me.fire('sort')
                 }
             }
         }

package/src/data/connection/Fetch.mjs

@@ -94,9 +94,9 @@ class Fetch extends Base {
     request(url, config={}, method, data) {
         if (!Neo.isString(url)) {
             config = url;
-            url    = config.url;
+            url    = config.url
         } else {
-            config.url = config;
+            config.url = config
         }
 
         return fetch(url, {
@@ -117,7 +117,7 @@ class Fetch extends Base {
                 .then(data => {
                     response.data = data;
                 })
-                .then(() => (resp.ok ? response : Promise.reject(response)));
+                .then(() => (resp.ok ? response : Promise.reject(response)))
         })
     }
 }

package/src/data/connection/WebSocket.mjs

@@ -65,7 +65,7 @@ class Socket extends Base {
      */
     construct(config) {
         super.construct(config);
-        this.createSocket();
+        this.createSocket()
     }
 
     /**
@@ -84,7 +84,7 @@ class Socket extends Base {
                 callback,
                 scope : scope || me,
                 single: true
-            });
+            })
         }
     }
 
@@ -94,12 +94,10 @@ class Socket extends Base {
      * @returns {String}
      */
     beforeSend(data) {
-        let me      = this,
-            channel = me.channel;
-
-        console.log('WS: Sending message', (channel ? '\nChannel: ' + channel : ''), '\nData:', data);
+        let me        = this,
+            {channel} = me;
 
-        return JSON.stringify(channel ? {channel, data} : data);
+        return JSON.stringify(channel ? {channel, data} : data)
     }
 
     /**
@@ -120,10 +118,10 @@ class Socket extends Base {
                 onopen   : me.onOpen   .bind(me)
             });
 
-            createInterceptor(value, 'send', me.beforeSend, me);
+            createInterceptor(value, 'send', me.beforeSend, me)
         }
 
-        return value;
+        return value
     }
 
     /**
@@ -131,14 +129,14 @@ class Socket extends Base {
      * @param {String} [reason]
      */
     close(code, reason) {
-        this.socket.close(code, reason);
+        this.socket.close(code, reason)
     }
 
     /**
      *
      */
     createSocket() {
-        this.socket = new WebSocket(this.serverAddress);
+        this.socket = new WebSocket(this.serverAddress)
     }
 
     /**
@@ -146,7 +144,7 @@ class Socket extends Base {
      */
     destroy(...args) {
         this.close();
-        super.destroy(...args);
+        super.destroy(...args)
     }
 
     /**
@@ -171,14 +169,14 @@ class Socket extends Base {
      * @param {Boolean}    wasClean Indicates whether or not the connection was cleanly closed.
      */
     onClose(event, reason, wasClean) {
-        console.log('onClose', event, reason, wasClean);
+        console.log('onClose', event, reason, wasClean)
     }
 
     /**
      *
      */
     onError() {
-        console.log('onError', arguments);
+        console.log('onError', arguments)
     }
 
     /**
@@ -188,11 +186,9 @@ class Socket extends Base {
         let me   = this,
             data = JSON.parse(event.data);
 
-        console.log('onMessage', data);
-
         if (data.mId) {
             me.messageCallbacks[data.mId].resolve(data.data);
-            delete me.messageCallbacks[data.mId];
+            delete me.messageCallbacks[data.mId]
         }
     }
 
@@ -200,7 +196,7 @@ class Socket extends Base {
      *
      */
     onOpen() {
-        this.fire('open', {scope: this});
+        this.fire('open', {scope: this})
     }
 
     /**
@@ -214,17 +210,17 @@ class Socket extends Base {
             me.messageCallbacks[me.messageId] = {reject, resolve};
 
             me.sendMessage({data, mId: me.messageId});
-            me.messageId++;
-        });
+            me.messageId++
+        })
     }
 
     /**
      * @param {Object} data
      */
     sendMessage(data) {
-        let me     = this,
-            socket = me.socket,
-            d      = data;
+        let me       = this,
+            {socket} = me,
+            d        = data;
 
         // CONNECTING  0   The connection is not yet open.
         // OPEN        1   The connection is open and ready to communicate.
@@ -241,8 +237,8 @@ class Socket extends Base {
                 break;
             case WebSocket.CONNECTING:
                 me.on('open', function() {
-                    me.sendMessage(d);
-                }, me, {single: true});
+                    me.sendMessage(d)
+                }, me, {once: true});
                 break;
             case WebSocket.OPEN:
                 socket.send(data);

package/src/data/connection/Xhr.mjs

@@ -43,15 +43,16 @@ class Xhr extends Base {
      * @param {Object} event
      */
     getResponse(event) {
-        let target = event.target;
+        let {target} = event,
+            {readyState, response, status, statusText} = target;
 
         return {
-            readyState: target.readyState,
-            response  : target.response,
-            status    : target.status,
-            statusText: target.statusText,
-            headers   : target.getAllResponseHeaders()
-        };
+            readyState,
+            response,
+            status,
+            statusText,
+            headers: target.getAllResponseHeaders()
+        }
     }
 
     /**
@@ -69,7 +70,7 @@ class Xhr extends Base {
             request[key] = null;
         });
 
-        delete me.requests[id];
+        delete me.requests[id]
     }
 
     /**
@@ -84,10 +85,10 @@ class Xhr extends Base {
         cb?.apply(request.scope || me, [me.getResponse(e), true]);
 
         Object.entries(request).forEach(([key, value]) => {
-            request[key] = null;
+            request[key] = null
         });
 
-        delete me.requests[id];
+        delete me.requests[id]
     }
 
     /**
@@ -111,19 +112,20 @@ class Xhr extends Base {
                     try {
                         json = JSON.parse(data.response);
 
-                        resolve(Object.assign(data, { json }));
+                        resolve(Object.assign(data, { json }))
                     } catch(err) {
                         reject({
-                            reject : true,
-                            error  : err.message
-                        });
+                            reject: true,
+                            error : err.message
+                        })
                     }
                 } else {
-                    reject(data);
+                    reject(data)
                 }
             };
-            me.request(opts);
-        });
+
+            me.request(opts)
+        })
     }
 
     /**
@@ -136,13 +138,14 @@ class Xhr extends Base {
         return new Promise((resolve, reject) => {
             opts.callback = function(data, success) {
                 if (success) {
-                    resolve(data);
+                    resolve(data)
                 } else {
-                    reject(data);
+                    reject(data)
                 }
             };
-            me.request(opts);
-        });
+
+            me.request(opts)
+        })
     }
 
     /**
@@ -167,16 +170,16 @@ class Xhr extends Base {
             xhr     = new XMLHttpRequest();
 
         if (!opts.url) {
-            console.error('Neo.Xhr.request without a given url' + JSON.stringify(opts));
+            console.error('Neo.Xhr.request without a given url' + JSON.stringify(opts))
         } else {
             if (!opts.insideNeo && location.href.includes('/node_modules/neo.mjs/') && !location.href.startsWith('https://neomjs.com/')) {
                 if (opts.url.startsWith('./') || opts.url.startsWith('../')) {
-                    opts.url = '../../' + opts.url;
+                    opts.url = '../../' + opts.url
                 }
             }
 
             if (opts.params) {
-                opts.url += ('?' + new URLSearchParams(opts.params).toString());
+                opts.url += ('?' + new URLSearchParams(opts.params).toString())
             }
 
             xhr.neoId = id;
@@ -198,12 +201,12 @@ class Xhr extends Base {
             xhr.open(method, opts.url, true);
 
             Object.entries(headers).forEach(([key, value]) => {
-                xhr.setRequestHeader(key, value);
+                xhr.setRequestHeader(key, value)
             });
 
             xhr.send(opts.data);
 
-            return xhr;
+            return xhr
         }
     }
 
@@ -215,7 +218,7 @@ class Xhr extends Base {
     sendForm(form, opts) {
         opts.data = new FormData(form);
 
-        return this.request(opts);
+        return this.request(opts)
     }
 
     /**
@@ -224,7 +227,7 @@ class Xhr extends Base {
      * @param {Object} value
      */
     setDefaultHeaders(value) {
-        this.defaultHeaders = value;
+        this.defaultHeaders = value
     }
 }
 

package/src/date/DayViewComponent.mjs

@@ -127,7 +127,7 @@ class DayViewComponent extends Base {
      */
     createContent(silent=false, containerEl) {
         let me              = this,
-            currentDate     = me.currentDate,
+            {currentDate}   = me,
             currentDay      = currentDate.getDate(),
             currentMonth    = currentDate.getMonth(),
             currentYear     = currentDate.getFullYear(),

package/src/date/SelectorContainer.mjs

@@ -215,8 +215,8 @@ class SelectorContainer extends Container {
      * @protected
      */
     afterSetShowCellBorders(value, oldValue) {
-        let me  = this,
-            cls = me.cls;
+        let me    = this,
+            {cls} = me;
 
         NeoArray.toggle(cls, 'neo-hide-inner-borders', !value);
         me.cls = cls