neo.mjs 4.0.71 → 4.0.74

package/README.md

@@ -235,8 +235,9 @@ More infos: <a href="./BACKERS.md">Sponsors & Backers</a>
 
 </br></br>
 <h2 id="jobs">14. Jobs</h2>
-Accenture is hiring multiple neo.mjs developers for the new Cloud Technology Studio in Kaiserslauern (Germany):</br>
-</br>
+Accenture is hiring multiple neo.mjs developers for the new Cloud Technology Studio in Kaiserslauern (Germany):
+<a href="https://www.accenture.com/de-de/careers/jobdetails?id=R00057924_de">Senior neo.mjs Frontend Developer /Architect (all genders)</a></br></br>
+
 These full-time roles are based on German contracts, so they require living in (or relocating to) Germany.
 Ping us on LinkedIn or Slack for details.
 

package/buildScripts/createClass.mjs

@@ -90,13 +90,18 @@ if (programOpts.info) {
         }
     }
 
+    let answers = {},
+        answer;
+
     if (!programOpts.className) {
-        questions.push({
+        answer = await inquirer.prompt({
             type   : 'input',
             name   : 'className',
             message: 'Please choose the namespace for your class:',
             default: 'Covid.view.MyContainer'
         });
+
+        Object.assign(answers, answer);
     }
 
     if (!programOpts.baseClass) {
@@ -104,7 +109,7 @@ if (programOpts.info) {
             type   : 'list',
             name   : 'baseClass',
             message: 'Please pick the base class, which you want to extend:',
-            default: 'container.Base',
+            default: guessBaseClass(programOpts.className || answers.className),
 
             choices: [
                 'component.Base',
@@ -128,187 +133,189 @@ if (programOpts.info) {
         });
     }
 
-    inquirer.prompt(questions).then(answers => {
-        let baseClass   = programOpts.baseClass || answers.baseClass,
-            className   = programOpts.className || answers.className,
-            singleton   = programOpts.singleton || answers.singleton || 'no',
-            isDrop      = programOpts.drop,
-            isSingleton = singleton === 'yes',
-            startDate   = new Date(),
-            baseFileName, baseType, classFolder, configName, file, folderDelta, importName, importPath, index, ns, root, rootLowerCase, viewFile;
-
-        if (className.endsWith('.mjs')) {
-            className = className.slice(0, -4);
-        }
+    answer = await inquirer.prompt(questions);
 
-        if (!isDrop) {
-            ns            = className.split('.');
-            file          = ns.pop();
-            root          = ns.shift();
-            rootLowerCase = root.toLowerCase();
-        }
+    Object.assign(answers, answer);
 
-        if (root === 'Neo') {
-            console.log('todo: create the file inside the src folder');
-        } else {
-            if (isDrop === true) {
-                ns = [];
-
-                let pathInfo = path.parse(cwd),
-                    sep      = path.sep,
-                    baseName, loc = baseName = '',
-                    tmpNs;
-
-                sourceRootDirs.some(dir => {
-                    loc   = cwd;
-                    tmpNs = [];
-
-                    while (pathInfo.root !== loc) {
-                        baseName = path.resolve(loc, './').split(sep).pop();
-
-                        if (baseName === dir) {
-                            ns          = tmpNs.reverse();
-                            classFolder = path.resolve(loc, ns.join(sep));
-                            file        = className;
-                            className   = ns.concat(className).join('.');
-                            loc         = path.resolve(loc, ns.join(sep));
-                            return true;
-                        }
+    let baseClass   = programOpts.baseClass || answers.baseClass,
+        className   = programOpts.className || answers.className,
+        singleton   = programOpts.singleton || answers.singleton || 'no',
+        isDrop      = programOpts.drop,
+        isSingleton = singleton === 'yes',
+        startDate   = new Date(),
+        baseFileName, baseType, classFolder, configName, file, folderDelta, importName, importPath, index, ns, root, rootLowerCase, viewFile;
+
+    if (className.endsWith('.mjs')) {
+        className = className.slice(0, -4);
+    }
+
+    if (!isDrop) {
+        ns            = className.split('.');
+        file          = ns.pop();
+        root          = ns.shift();
+        rootLowerCase = root.toLowerCase();
+    }
 
-                        tmpNs.push(baseName);
-                        loc = path.resolve(loc, '../');
+    if (root === 'Neo') {
+        console.log('todo: create the file inside the src folder');
+    } else {
+        if (isDrop === true) {
+            ns = [];
+
+            let pathInfo = path.parse(cwd),
+                sep      = path.sep,
+                baseName, loc = baseName = '',
+                tmpNs;
+
+            sourceRootDirs.some(dir => {
+                loc   = cwd;
+                tmpNs = [];
+
+                while (pathInfo.root !== loc) {
+                    baseName = path.resolve(loc, './').split(sep).pop();
+
+                    if (baseName === dir) {
+                        ns          = tmpNs.reverse();
+                        classFolder = path.resolve(loc, ns.join(sep));
+                        file        = className;
+                        className   = ns.concat(className).join('.');
+                        loc         = path.resolve(loc, ns.join(sep));
+                        return true;
                     }
-                });
 
-                if (!ns.length) {
-                    console.error(chalk.red(
-                        'Could not determine namespace for application. Did you provide the ' +
-                            `correct source parent with -s? (was: ${sourceRootDirs.join(',')}`));
-                    process.exit(1);
+                    tmpNs.push(baseName);
+                    loc = path.resolve(loc, '../');
                 }
+            });
 
-                console.info(
-                    chalk.yellow(`Creating ${chalk.bgGreen(className)} extending ${chalk.bgGreen(baseClass)} in ${loc}${sep}${file}.mjs`)
-                );
-
-                let delta_l = path.normalize(__dirname),
-                    delta_r = path.normalize(loc);
+            if (!ns.length) {
+                console.error(chalk.red(
+                    'Could not determine namespace for application. Did you provide the ' +
+                    `correct source parent with -s? (was: ${sourceRootDirs.join(',')}`));
+                process.exit(1);
+            }
 
-                if (delta_r.indexOf(delta_l) !== 0) {
-                    console.error(chalk.red(`Could not determine ${loc} being a child of ${__dirname}`));
-                    process.exit(1);
-                }
+            console.info(
+                chalk.yellow(`Creating ${chalk.bgGreen(className)} extending ${chalk.bgGreen(baseClass)} in ${loc}${sep}${file}.mjs`)
+            );
 
-                let delta = delta_r.replace(delta_l, ''),
-                    parts = delta.split(sep);
+            let delta_l = path.normalize(__dirname),
+                delta_r = path.normalize(loc);
 
-                folderDelta = parts.length;
+            if (delta_r.indexOf(delta_l) !== 0) {
+                console.error(chalk.red(`Could not determine ${loc} being a child of ${__dirname}`));
+                process.exit(1);
             }
 
-            if (isDrop !== true) {
-                if (fs.existsSync(path.resolve(cwd, 'apps', rootLowerCase))) {
-                    classFolder = path.resolve(cwd, 'apps', rootLowerCase, ns.join('/'));
-                } else {
-                    console.log('\nNon existing neo app name:', chalk.red(root));
-                    process.exit(1);
-                }
-            }
+            let delta = delta_r.replace(delta_l, ''),
+                parts = delta.split(sep);
 
-            if (folderDelta === undefined) {
-                folderDelta = ns.length + 2;
+            folderDelta = parts.length;
+        }
+
+        if (isDrop !== true) {
+            if (fs.existsSync(path.resolve(cwd, 'apps', rootLowerCase))) {
+                classFolder = path.resolve(cwd, 'apps', rootLowerCase, ns.join('/'));
+            } else {
+                console.log('\nNon existing neo app name:', chalk.red(root));
+                process.exit(1);
             }
+        }
+
+        if (folderDelta === undefined) {
+            folderDelta = ns.length + 2;
+        }
 
-            fs.mkdirpSync(classFolder);
+        fs.mkdirpSync(classFolder);
 
-            baseFileName = baseClass.split('.').pop();
+        baseFileName = baseClass.split('.').pop();
 
-            if (baseFileName === file) {
-                baseFileName = baseClass.split('.');
-                baseFileName = baseFileName.map(e => capitalize(e)).join('');
-            }
+        if (baseFileName === file) {
+            baseFileName = baseClass.split('.');
+            baseFileName = baseFileName.map(e => capitalize(e)).join('');
+        }
 
-            fs.writeFileSync(path.join(classFolder, file + '.mjs'), createContent({
-                baseClass,
-                baseFileName,
-                className,
-                isSingleton,
-                file,
-                folderDelta,
-                ns,
-                root
-            }));
-
-            switch(baseClass) {
-                case 'controller.Component': {
-                    baseType   = 'Neo.controller.Component';
-                    configName = 'controller';
-                    importName = file;
-                    importPath = `./${importName}.mjs`;
-                    index      = file.indexOf('Controller');
-
-                    if (index > 0) {
-                        viewFile = path.join(classFolder, file.substr(0, index) + '.mjs');
-
-                        if (fs.existsSync(viewFile)) {
-                            adjustView({baseType, configName, importName, importPath, viewFile});
-                        }
+        fs.writeFileSync(path.join(classFolder, file + '.mjs'), createContent({
+            baseClass,
+            baseFileName,
+            className,
+            isSingleton,
+            file,
+            folderDelta,
+            ns,
+            root
+        }));
+
+        switch(baseClass) {
+            case 'controller.Component': {
+                baseType   = 'Neo.controller.Component';
+                configName = 'controller';
+                importName = file;
+                importPath = `./${importName}.mjs`;
+                index      = file.indexOf('Controller');
+
+                if (index > 0) {
+                    viewFile = path.join(classFolder, file.substr(0, index) + '.mjs');
+
+                    if (fs.existsSync(viewFile)) {
+                        adjustView({baseType, configName, importName, importPath, viewFile});
                     }
-                    break;
                 }
+                break;
+            }
 
-                case 'data.Store': {
-                    baseType   = 'Neo.data.Model';
-                    configName = 'model';
-                    importName = className.replace('.store.', '.model.');
+            case 'data.Store': {
+                baseType   = 'Neo.data.Model';
+                configName = 'model';
+                importName = className.replace('.store.', '.model.');
 
-                    if (importName.endsWith('ies')) {
-                        importName.replace(new RegExp('ies$'), 'y')
-                    } else {
-                        importName = importName.slice(0, -1);
-                    }
+                if (importName.endsWith('ies')) {
+                    importName.replace(new RegExp('ies$'), 'y')
+                } else {
+                    importName = importName.slice(0, -1);
+                }
 
-                    viewFile = importName.split('.');
-                    viewFile.shift();
+                viewFile = importName.split('.');
+                viewFile.shift();
 
-                    importPath = `../${viewFile.join('/')}.mjs`;
-                    viewFile   = path.join(classFolder, importPath);
+                importPath = `../${viewFile.join('/')}.mjs`;
+                viewFile   = path.join(classFolder, importPath);
 
-                    // checking for the data.Model file
-                    if (fs.existsSync(viewFile)) {
-                        // adjusting the data.Store file
-                        viewFile   = path.join(classFolder, file + '.mjs');
-                        importName = importName.split('.');
-                        importName = importName.pop();
+                // checking for the data.Model file
+                if (fs.existsSync(viewFile)) {
+                    // adjusting the data.Store file
+                    viewFile   = path.join(classFolder, file + '.mjs');
+                    importName = importName.split('.');
+                    importName = importName.pop();
 
-                        adjustView({baseType, configName, importName, importPath, viewFile});
-                    }
-                    break;
+                    adjustView({baseType, configName, importName, importPath, viewFile});
                 }
+                break;
+            }
 
-                case 'model.Component': {
-                    baseType   = 'Neo.model.Component';
-                    configName = 'model';
-                    importName = file;
-                    importPath = `./${importName}.mjs`;
-                    index      = file.indexOf('Model');
+            case 'model.Component': {
+                baseType   = 'Neo.model.Component';
+                configName = 'model';
+                importName = file;
+                importPath = `./${importName}.mjs`;
+                index      = file.indexOf('Model');
 
-                    if (index > 0) {
-                        viewFile = path.join(classFolder, file.substr(0, index) + '.mjs');
+                if (index > 0) {
+                    viewFile = path.join(classFolder, file.substr(0, index) + '.mjs');
 
-                        if (fs.existsSync(viewFile)) {
-                            adjustView({baseType, configName, importName, importPath, viewFile});
-                        }
+                    if (fs.existsSync(viewFile)) {
+                        adjustView({baseType, configName, importName, importPath, viewFile});
                     }
-                    break;
                 }
+                break;
             }
         }
+    }
 
-        const processTime = (Math.round((new Date - startDate) * 100) / 100000).toFixed(2);
-        console.log(`\nTotal time for ${programName}: ${processTime}s`);
+    const processTime = (Math.round((new Date - startDate) * 100) / 100000).toFixed(2);
+    console.log(`\nTotal time for ${programName}: ${processTime}s`);
 
-        process.exit();
-    });
+    process.exit();
 
     /**
      * Adds a comma to the last element of the contentArray
@@ -592,4 +599,24 @@ if (programOpts.info) {
 
         return classContent.join(os.EOL);
     }
+
+    function guessBaseClass(className) {
+        if (className.includes('.model.')) {
+            return 'data.Model';
+        }
+
+        if (className.includes('.store.')) {
+            return 'data.Store';
+        }
+
+        if (className.endsWith('Controller')) {
+            return 'controller.Component';
+        }
+
+        if (className.endsWith('Model')) {
+            return 'model.Component';
+        }
+
+        return 'container.Base';
+    }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "neo.mjs",
-    "version": "4.0.71",
+    "version": "4.0.74",
     "description": "The webworkers driven UI framework",
     "type": "module",
     "repository": {
@@ -45,12 +45,12 @@
         "autoprefixer": "^10.4.7",
         "chalk": "^5.0.1",
         "clean-webpack-plugin": "^4.0.0",
-        "commander": "^9.3.0",
+        "commander": "^9.4.0",
         "cssnano": "^5.1.12",
         "envinfo": "^7.8.1",
         "fs-extra": "^10.1.0",
         "highlightjs-line-numbers.js": "^2.8.0",
-        "inquirer": "^9.0.0",
+        "inquirer": "^9.0.1",
         "neo-jsdoc": "^1.0.1",
         "neo-jsdoc-x": "^1.0.4",
         "postcss": "^8.4.14",

package/src/DefaultConfig.mjs

@@ -78,6 +78,14 @@ const DefaultConfig = {
      * @type Boolean
      */
     isInsideSiesta: false,
+    /**
+     * delay in ms for the worker.Manager:loadApplication() call
+     * @default 20
+     * @memberOf! module:Neo
+     * @name config.loadApplicationDelay
+     * @type Number
+     */
+    loadApplicationDelay: 20,
     /**
      * Used by Intl.DateTimeFormat, for details take a look at:
      * https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/DateTimeFormat

package/src/collection/Base.mjs

@@ -397,10 +397,7 @@ class Base extends CoreBase {
      * Removes all items and clears the map
      */
     clear() {
-        let me = this;
-
-        me._items.splice(0, me.getCount());
-        me.map.clear();
+        this.splice(0, this.getCount());
     }
 
     /**
@@ -411,6 +408,16 @@ class Base extends CoreBase {
         this.filters = restoreOriginalFilters ? Neo.clone(this.originalConfig.filters, true, true) : null;
     }
 
+    /**
+     * Removes all items and clears the map, without firing a mutate event
+     */
+    clearSilent() {
+        let me = this;
+
+        me._items.splice(0, me.getCount());
+        me.map.clear();
+    }
+
     /**
      * Clears all current sorters and optionally restores the original ones in case they existed.
      * Without restoreInitialState as true this will not affect the current sorting of this collection.
@@ -460,7 +467,7 @@ class Base extends CoreBase {
     destroy() {
         let me = this;
 
-        me.items.splice(0, me._items.length);
+        me._items.splice(0, me._items.length);
         me.map.clear();
 
         super.destroy();
@@ -658,7 +665,7 @@ class Base extends CoreBase {
                 needsSorting = true;
             }
 
-            me.clear();
+            me.clearSilent();
 
             me.items = [...me.allItems._items];
             me.map.set(...me.allItems.map);
@@ -1092,8 +1099,8 @@ class Base extends CoreBase {
      * If the toRemoveArray is used, then the index is not used for removing, the entries are found by key and removed from where they are.
      * If index is not passed, toAddArray is appended to the Collection.
      * @param {Number|null} index
-     * @param {Number|Array} [removeCountOrToRemoveArray]
-     * @param {Array| Object} [toAddArray]
+     * @param {Number|Object[]} [removeCountOrToRemoveArray]
+     * @param {Object|Object[]} [toAddArray]
      * @returns {Object} An object containing the addedItems & removedItems arrays
      */
     splice(index, removeCountOrToRemoveArray, toAddArray) {
@@ -1108,7 +1115,7 @@ class Base extends CoreBase {
             toRemoveArray      = Array.isArray(removeCountOrToRemoveArray) ? removeCountOrToRemoveArray : null,
             i, item, key, len, toAddMap;
 
-        if (!index && removeCountAtIndex) {
+        if (!Util.isNumber(index) && removeCountAtIndex) {
             Logger.error(me.id + ': If index is not passed, removeCountAtIndex cannot be used');
         }
 

package/src/controller/Base.mjs

@@ -33,7 +33,12 @@ class Base extends CoreBase {
     construct(config) {
         super.construct(config);
 
-        HashHistory.on('change', this.onHashChange, this);
+        let me          = this,
+            currentHash = HashHistory.first();
+
+        currentHash && me.onHashChange(currentHash, null);
+
+        HashHistory.on('change', me.onHashChange, me);
     }
 
     /**

package/src/table/Container.mjs

@@ -228,9 +228,7 @@ class Container extends BaseContainer {
      * @protected
      */
     beforeSetSelectionModel(value, oldValue) {
-        if (oldValue) {
-            oldValue.destroy();
-        }
+        oldValue?.destroy();
 
         return ClassSystemUtil.beforeSetInstance(value, RowModel);
     }
@@ -242,9 +240,7 @@ class Container extends BaseContainer {
      * @protected
      */
     beforeSetStore(value, oldValue) {
-        if (oldValue) {
-            oldValue.destroy();
-        }
+        oldValue?.destroy();
 
         if (value) {
             let me = this,
@@ -285,7 +281,7 @@ class Container extends BaseContainer {
     }
 
     /**
-     * @param columns
+     * @param {Object[]} columns
      * @returns {*}
      */
     createColumns(columns) {
@@ -302,9 +298,7 @@ class Container extends BaseContainer {
                 Neo.logError('Attempting to create a docked column without a defined width', column, me.id);
             }
 
-            if (columnDefaults) {
-                Neo.assignDefaults(column, columnDefaults);
-            }
+            columnDefaults && Neo.assignDefaults(column, columnDefaults);
 
             if (sorters?.[0]) {
                 if (column.dataField === sorters[0].property) {
@@ -431,7 +425,7 @@ class Container extends BaseContainer {
     }
 
     /**
-     * @param {Array} data
+     * @param {Object[]} data
      * @protected
      */
     onStoreLoad(data) {

package/src/util/HashHistory.mjs

@@ -22,11 +22,6 @@ class HashHistory extends Base {
          * @protected
          */
         className: 'Neo.util.HashHistory',
-        /**
-         * @member {String} ntype='hash-history'
-         * @protected
-         */
-        ntype: 'hash-history',
         /**
          * @member {Boolean} singleton=true
          * @protected
@@ -71,10 +66,10 @@ class HashHistory extends Base {
         stack.unshift(data);
 
         if (stack.length > me.maxItems) {
-            stack.length = me.maxItems;
+            stack.pop();
         }
 
-        me.fire('change', data, stack[1]);
+        me.fire('change', data, stack[1] || null);
     }
 }
 

package/src/worker/Base.mjs

@@ -246,10 +246,7 @@ class Base extends CoreBase {
             let message = me.sendMessage(dest, opts, transfer),
                 msgId   = message.id;
 
-            me.promises[msgId] = {
-                resolve,
-                reject
-            };
+            me.promises[msgId] = { reject, resolve };
         });
     }
 

package/src/worker/Manager.mjs

@@ -252,7 +252,7 @@ class Manager extends Base {
         if (me.constructedThreads === me.activeWorkers) {
             NeoConfig.appPath && setTimeout(() => { // better save than sorry => all remotes need to be registered
                 me.loadApplication(NeoConfig.appPath);
-            }, 20);
+            }, NeoConfig.loadApplicationDelay);
         }
     }
 

package/src/worker/mixin/RemoteMethodAccess.mjs

@@ -52,7 +52,6 @@ class RemoteMethodAccess extends Base {
         if (remote.destination === Neo.workerId) {
             let me        = this,
                 className = remote.className,
-                exists    = false,
                 methods   = remote.methods,
                 pkg       = Neo.ns(className, true);
 
@@ -63,15 +62,8 @@ class RemoteMethodAccess extends Base {
 
                 if (!pkg[method] ) {
                     pkg[method] = me.generateRemote(remote, method);
-                } else {
-                    exists = true;
                 }
             });
-
-            // todo: inspect if this can get removed
-            if (!exists && Neo.workerId !== 'main') {
-                me.fire('remoteregistered', remote);
-            }
         }
     }
 

package/test/siesta/tests/CollectionBase.mjs

@@ -251,4 +251,28 @@ StartTest(t => {
         t.isStrict(collection3.getCount(), 5, 'collection3 count is 5');
         t.isStrict(collection3.allItems.getCount(), 9, 'collection3 allItems count is 9');
     });
+
+    t.it('Add & remove at same time', t => {
+        collection = Neo.create(Collection, {
+            items: [
+                {id: 'a'},
+                {id: 'b'},
+                {id: 'c'},
+                {id: 'd'},
+                {id: 'e'},
+                {id: 'f'}
+            ]
+        });
+
+        collection.splice(2, [{id: 'a'}, {id: 'd'}, {id: 'f'}], [{id: 'x'}, {id: 'y'}, {id: 'z'}]);
+
+        t.isDeeplyStrict(collection.getRange(), [
+            {id: 'b'},
+            {id: 'c'},
+            {id: 'x'},
+            {id: 'y'},
+            {id: 'z'},
+            {id: 'e'}
+        ], 'collection.getRange()');
+    });
 });