neo.mjs 6.17.1 → 6.18.0

package/src/util/Date.mjs

@@ -40,7 +40,7 @@ class DateUtil extends Base {
      * @returns {Date|null} the cloned date object
      */
     static clone(date) {
-        return date && new Date(date.valueOf()) || null;
+        return date && new Date(date.valueOf()) || null
     }
 
     /**
@@ -49,7 +49,7 @@ class DateUtil extends Base {
      * @returns {String} the yyyy-mm-dd formatted date
      */
     static convertToyyyymmdd(date) {
-        return new Date(date.getTime() - (date.getTimezoneOffset() * 60000)).toISOString().split('T')[0];
+        return new Date(date.getTime() - (date.getTimezoneOffset() * 60000)).toISOString().split('T')[0]
     }
 
     /**
@@ -58,7 +58,7 @@ class DateUtil extends Base {
      * @returns {Number} days inside the month
      */
     static getDaysInMonth(date) {
-        return new Date(date.getFullYear(), date.getMonth() + 1, 0).getDate();
+        return new Date(date.getFullYear(), date.getMonth() + 1, 0).getDate()
     }
 
     /**
@@ -70,7 +70,7 @@ class DateUtil extends Base {
         let firstDayInMonth = DateUtil.getFirstDayOfMonth(date),
             firstDayOffset  = firstDayInMonth - weekStartDay;
 
-        return firstDayOffset < 0 ? firstDayOffset + 7 : firstDayOffset;
+        return firstDayOffset < 0 ? firstDayOffset + 7 : firstDayOffset
     }
 
     /**
@@ -79,7 +79,7 @@ class DateUtil extends Base {
      * @returns {Number} 0-6 (Sun-Sat)
      */
     static getFirstDayOfMonth(date) {
-        return new Date(date.getFullYear(), date.getMonth(), 1).getDay();
+        return new Date(date.getFullYear(), date.getMonth(), 1).getDay()
     }
 
     /**
@@ -98,10 +98,10 @@ class DateUtil extends Base {
         date.setUTCMonth(0, 1);
 
         if (date.getUTCDay() !== 4) {
-            date.setUTCMonth(0, 1 + ((4 - date.getUTCDay()) + 7) % 7);
+            date.setUTCMonth(0, 1 + ((4 - date.getUTCDay()) + 7) % 7)
         }
 
-        return Math.ceil((firstThursday - date) /  (7 * 24 * 3600 * 1000)) + 1;
+        return Math.ceil((firstThursday - date) /  (7 * 24 * 3600 * 1000)) + 1
     }
 
     /**
@@ -113,7 +113,7 @@ class DateUtil extends Base {
         let daysInMonth    = DateUtil.getDaysInMonth(date),
             firstDayOffset = DateUtil.getFirstDayOffset(date, weekStartDay);
 
-        return (daysInMonth + firstDayOffset) / 7 > 5 ? 6 : 5;
+        return (daysInMonth + firstDayOffset) / 7 > 5 ? 6 : 5
     }
 
     /**
@@ -125,7 +125,7 @@ class DateUtil extends Base {
     static matchDate(date1, date2) {
         return date1.getFullYear() === date2.getFullYear() &&
                date1.getMonth()    === date2.getMonth()    &&
-               date1.getDate()     === date2.getDate();
+               date1.getDate()     === date2.getDate()
     }
 }
 

package/src/util/Function.mjs

@@ -32,7 +32,7 @@ export function buffer(callback, scope, delay=300) {
             timeoutId = 0;
             wrapper.isPending = false;
             callback.apply(scope, args)
-        }, delay);
+        }, delay)
     };
 
     wrapper.cancel = () => {
@@ -71,7 +71,7 @@ export function createSequence(target, methodName, fn, scope) {
 
     return (target[methodName] = function() {
         method.apply(this, arguments);
-        return fn.apply(scope || this, arguments);
+        return fn.apply(scope || this, arguments)
     })
 }
 

package/src/util/HashHistory.mjs

@@ -59,8 +59,8 @@ class HashHistory extends Base {
      * @param {Number} data.windowId
      */
     push(data) {
-        let me    = this,
-            stack = me.stack;
+        let me      = this,
+            {stack} = me;
 
         if (stack[0]?.hashString !== data.hashString) {
             stack.unshift(data);
@@ -81,6 +81,4 @@ class HashHistory extends Base {
     }
 }
 
-let instance = Neo.setupClass(HashHistory);
-
-export default instance;
+export default Neo.setupClass(HashHistory);

package/src/util/KeyNavigation.mjs

@@ -34,7 +34,7 @@ class KeyNavigation extends Base {
     }
 
     add(value) {
-        this._keys.push(...this.parseKeys(value));
+        this._keys.push(...this.parseKeys(value))
     }
 
     /**
@@ -42,7 +42,7 @@ class KeyNavigation extends Base {
      * @returns {Neo.component.Base}
      */
     beforeGetComponent() {
-        return Neo.getComponent(this._component);
+        return Neo.getComponent(this._component)
     }
 
     /**
@@ -51,7 +51,7 @@ class KeyNavigation extends Base {
      * @returns {String} the component id
      */
     beforeSetComponent(value) {
-        return value?.id;
+        return value?.id
     }
 
     /**
@@ -59,7 +59,7 @@ class KeyNavigation extends Base {
      */
     destroy() {
         this.unregister();
-        super.destroy();
+        super.destroy()
     }
 
     /**
@@ -78,9 +78,9 @@ class KeyNavigation extends Base {
                 scope = Neo.get(key.scope);
 
                 if (key.key.toUpperCase() === upperCaseKey) {
-                    scope[key.fn]?.apply(scope, [data]);
+                    scope[key.fn]?.apply(scope, [data])
                 }
-            });
+            })
         }
     }
 
@@ -102,11 +102,11 @@ class KeyNavigation extends Base {
                     })
                 });
 
-                value = keyArray;
+                value = keyArray
             }
         }
 
-        return value;
+        return value
     }
 
     /**
@@ -119,22 +119,22 @@ class KeyNavigation extends Base {
         switch (key) {
             case ' ':
                 key = 'SPACE';
-                break;
+                break
             case 'ARROWDOWN':
                 key = 'DOWN';
-                break;
+                break
             case 'ARROWLEFT':
                 key = 'LEFT';
-                break;
+                break
             case 'ARROWRIGHT':
                 key = 'RIGHT';
-                break;
+                break
             case 'ARROWUP':
                 key = 'UP';
-                break;
+                break
         }
 
-        return key;
+        return key
     }
 
     /**
@@ -152,7 +152,7 @@ class KeyNavigation extends Base {
                 fn    : me.onKeyDown,
                 scope : me
             }
-        });
+        })
     }
 
     /**
@@ -171,7 +171,7 @@ class KeyNavigation extends Base {
 
             if (Neo.isEqual(key, config)) {
                 NeoArray.remove(keys, key);
-                break;
+                break
             }
         }
     }
@@ -181,7 +181,7 @@ class KeyNavigation extends Base {
      * @param {Array} items
      */
     removeKeys(items) {
-        Array.isArray(items) && items.forEach(item => this.removeKey(item));
+        Array.isArray(items) && items.forEach(item => this.removeKey(item))
     }
 
     /**

package/src/util/Logger.mjs

@@ -129,7 +129,7 @@ class Logger extends Base {
                     // get the part after the last /
                     caller_path = line.match(/([^\/]+)$/)[1].match(/([^ ]+)$/)[1];
 
-                    break;
+                    break
                 }
             }
         }
@@ -165,7 +165,7 @@ class Logger extends Base {
      * @param {Object} data
      */
     onContextMenu(data) {
-        let config = Neo.config;
+        let {config} = Neo;
 
         if (
             data.ctrlKey
@@ -199,8 +199,8 @@ class Logger extends Base {
      * @protected
      */
     resolveArgs(...args) {
-        const identifier = args[0];
-        let argsObject   = {};
+        let identifier = args[0],
+            argsObject = {};
 
         if (args.length === 1) {
             if (Neo.isString(identifier)) {
@@ -208,9 +208,9 @@ class Logger extends Base {
             } else if (Neo.isObject(identifier)) {
                 argsObject = identifier
             }
-        } else if (args.length === 2) {
+        } else if (args.length > 2) {
             argsObject.msg  = args[0];
-            argsObject.data = args[1]
+            argsObject.data = args.slice(1)
         }
 
         return argsObject
@@ -237,6 +237,8 @@ class Logger extends Base {
             return
         }
 
+        console.log('#', args.msg, level);
+
         let logColor = me.logColors[level],
             logChar  = me.logChars[level],
             bg       = `background-color:${logColor}; color: white; font-weight: 900;`,
@@ -253,6 +255,4 @@ class Logger extends Base {
     }
 }
 
-let instance = Neo.setupClass(Logger);
-
-export default instance;
+export default Neo.setupClass(Logger);

package/src/util/Matrix.mjs

@@ -23,7 +23,7 @@ class Matrix extends Base {
      * shortcut for getElement
      */
     e(i, j) {
-        return this.getElement(i, j);
+        return this.getElement(i, j)
     }
 
     /**
@@ -36,10 +36,10 @@ class Matrix extends Base {
         let items = this.items;
 
         if (i < 1 || i > items.length || j < 1 || j > items[0].length) {
-            return null;
+            return null
         }
 
-        return items[i - 1][j - 1];
+        return items[i - 1][j - 1]
     }
 
     /**
@@ -57,7 +57,7 @@ class Matrix extends Base {
         s += `${me.e(4,1).toFixed(p)},${me.e(4,2).toFixed(p)},${me.e(4,3).toFixed(p)},${me.e(4,4).toFixed(p)}`;
         s += ')';
 
-        return s;
+        return s
     }
 
     /**
@@ -66,14 +66,14 @@ class Matrix extends Base {
      * @returns {*}
      */
     multiply(matrix) {
-        let me    = this,
-            M     = matrix.items || matrix,
-            items = me.items,
-            ni    = items.length,
-            ki    = ni,
-            kj    = M[0].length,
-            cols  = items[0].length,
-            els   = [],
+        let me      = this,
+            M       = matrix.items || matrix,
+            {items} = me,
+            ni      = items.length,
+            ki      = ni,
+            kj      = M[0].length,
+            cols    = items[0].length,
+            els     = [],
             c, i, j, nc, nj, sum;
 
         do {
@@ -87,15 +87,15 @@ class Matrix extends Base {
 
                 do {
                     c = cols - nc;
-                    sum += items[i][c] * M[c][j];
+                    sum += items[i][c] * M[c][j]
                 } while (--nc);
-                els[i][j] = sum;
+                els[i][j] = sum
             } while (--nj);
         } while (--ni);
 
         matrix.items = els;
 
-        return matrix;
+        return matrix
     }
 
     /**
@@ -111,7 +111,7 @@ class Matrix extends Base {
             [0, c, -s, 0],
             [0, s,  c, 0],
             [0, 0,  0, 1]
-        ];
+        ]
     }
 
     /**
@@ -127,7 +127,7 @@ class Matrix extends Base {
             [0, 1,  0, 0],
             [s, 0,  c, 0],
             [0, 0,  0, 1]
-        ];
+        ]
     }
 
     /**
@@ -143,14 +143,14 @@ class Matrix extends Base {
             [s,  c, 0, 0],
             [0,  0, 1, 0],
             [0,  0, 0, 1]
-        ];
+        ]
     }
 
     /**
      * shortcut for multiply
      */
     x(matrix) {
-        return this.multiply(matrix);
+        return this.multiply(matrix)
     }
 }
 

package/src/util/String.mjs

@@ -45,11 +45,11 @@ class StringUtil extends Base {
     static escapeHtml(value) {
         let me = this; // inside a static method, we are pointing to the class prototype
 
-        if (Neo.typeOf(value) !== 'String') {
-            return value;
+        if (!Neo.isString(value)) {
+            return value
         }
 
-        return value.replace(me.charPattern, me.getEntityFromChar.bind(me));
+        return value.replace(me.charPattern, me.getEntityFromChar.bind(me))
     }
 
     /**
@@ -57,8 +57,8 @@ class StringUtil extends Base {
      * @param {String} entity
      */
     static getCharFromEntity(entity) {
-        const mappedChar = Object.keys(this.charEntityMap).find(key => this.charEntityMap[key] === entity);
-        return mappedChar || entity;
+        let mappedChar = Object.keys(this.charEntityMap).find(key => this.charEntityMap[key] === entity);
+        return mappedChar || entity
     }
 
     /**
@@ -66,7 +66,7 @@ class StringUtil extends Base {
      * @param {String} char
      */
     static getEntityFromChar(char) {
-        return this.charEntityMap[char] || char;
+        return this.charEntityMap[char] || char
     }
 
     /**
@@ -76,11 +76,11 @@ class StringUtil extends Base {
     static unescapeHtml(value) {
         let me = this; // inside a static method, we are pointing to the class prototype
 
-        if (Neo.typeOf(value) !== 'String') {
-            return value;
+        if (!Neo.isString(value)) {
+            return value
         }
 
-        return value.replace(me.entityPattern, me.getCharFromEntity.bind(me));
+        return value.replace(me.entityPattern, me.getCharFromEntity.bind(me))
     }
 
     /**

package/src/util/Style.mjs

@@ -25,39 +25,39 @@ class Style extends Base {
         let styles = {};
 
         if (Neo.isString(newStyle)) {
-            newStyle = Neo.core.Util.createStyleObject(newStyle);
+            newStyle = Neo.createStyleObject(newStyle)
         }
 
         if (Neo.isString(oldStyle)) {
-            oldStyle = Neo.core.Util.createStyleObject(oldStyle);
+            oldStyle = Neo.createStyleObject(oldStyle)
         }
 
         if (!newStyle && !oldStyle) {
-            return null;
+            return null
         } else if (!oldStyle) {
-            return Neo.clone(newStyle);
+            return Neo.clone(newStyle)
         } else if (!newStyle) {
             Object.keys(oldStyle).forEach(function(style) {
-                styles[style] = null;
+                styles[style] = null
             });
         } else {
-            Object.keys(newStyle).forEach(function(style) {
+            Object.keys(newStyle).forEach(style => {
                 if (!oldStyle.hasOwnProperty(style) || oldStyle[style] !== newStyle[style]) {
-                    styles[style] = newStyle[style];
+                    styles[style] = newStyle[style]
                 }
             });
 
-            Object.keys(oldStyle).forEach(function(style) {
+            Object.keys(oldStyle).forEach(style => {
                 if (!newStyle.hasOwnProperty(style)) {
-                    styles[style] = null;
+                    styles[style] = null
                 }
             });
 
             if (Object.keys(styles).length > 0) {
-                return styles;
+                return styles
             }
 
-            return null;
+            return null
         }
     }
 }

package/src/util/VDom.mjs

@@ -19,7 +19,7 @@ class VDom extends Base {
      * @returns {Object} cloned vdom
      */
     static clone(vdom, removeIds=true) {
-        const clone = Neo.clone(vdom, true);
+        let clone = Neo.clone(vdom, true);
 
         if (removeIds) {
             delete clone.id
@@ -47,7 +47,7 @@ class VDom extends Base {
      */
     static findVdomChild(vdom, opts, index, parentNode) {
         index = index || 0;
-        opts  = typeof opts !== 'string' ? opts : {id: opts};
+        opts  = !Neo.isString(opts) ? opts : {id: opts};
 
         let child      = null,
             matchArray = [],
@@ -74,7 +74,7 @@ class VDom extends Base {
                             // todo: either search the vdom array for all keys or compare if the arrays are equal.
                             throw new Error('findVdomChild: cls matching not supported for target & source types of Arrays')
                         }
-                        break;
+                        break
                     case 'style':
                         if (typeof value === 'string' && typeof vdom[key] === 'string') {
                             if (vdom[key] === value) {
@@ -93,18 +93,18 @@ class VDom extends Base {
                         } else {
                             throw new Error('findVdomChild: style matching not supported for mixed target & source types (Object VS String)')
                         }
-                        break;
+                        break
                     default:
                         if (vdom[key] === value) {
                             matchArray.push(true)
                         }
-                        break;
+                        break
                 }
             }
         });
 
         if (matchArray.length === optsLength) {
-            return {index, parentNode, vdom};
+            return {index, parentNode, vdom}
         }
 
         if (vdom.cn) {
@@ -134,7 +134,7 @@ class VDom extends Base {
      * @returns {Object} vdom
      */
     static getByFlag(vdom, flag) {
-        let node = VDom.findVdomChild(vdom, {flag: flag});
+        let node = VDom.findVdomChild(vdom, {flag});
         return node?.vdom
     }
 
@@ -166,13 +166,11 @@ class VDom extends Base {
     static getColumnNodes(vdom, index) {
         let columnNodes = [];
 
-        if (vdom.cn) {
-            vdom.cn.forEach(row => {
-                if (row.cn?.[index]) {
-                    columnNodes.push(row.cn[index])
-                }
-            })
-        }
+        vdom.cn?.forEach(row => {
+            if (row.cn?.[index]) {
+                columnNodes.push(row.cn[index])
+            }
+        })
 
         return columnNodes
     }