neo.mjs 6.12.1 → 6.13.0

package/src/util/HashHistory.mjs

@@ -80,6 +80,6 @@ class HashHistory extends Base {
     }
 }
 
-let instance = Neo.applyClassConfig(HashHistory);
+let instance = Neo.setupClass(HashHistory);
 
 export default instance;

package/src/util/KeyNavigation.mjs

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

package/src/util/Logger.mjs

@@ -12,24 +12,6 @@ class Logger extends Base {
          * @protected
          */
         className: 'Neo.util.Logger',
-        /**
-         * Set this config to false to disable the logging in production
-         * To change this on the fly use:
-         *
-         *     Neo.util.Logger.enableLogsInProduction = true;
-         *
-         * @member {Boolean} enableLogsInProduction=true
-         */
-        enableLogsInProduction: false,
-        /**
-         * Set this config to false to disable the component logging using Ctrl-Right Click
-         * To turn it on, add:
-         *
-         *      Neo.util.Logger.enableComponentLogger = true;
-         *
-         * @member {Boolean} enableComponentLogger=true
-         */
-        enableComponentLogger: true,
         /**
          * Set the minimum level, which you want to output.
          * Change this at any time using a value of logLevels: ['info', 'log', 'warn', 'error']
@@ -77,10 +59,8 @@ class Logger extends Base {
     construct(config) {
         super.construct(config);
 
-        let me = this;
-
         // aliases
-        Neo.applyFromNs(Neo, me, {
+        Neo.applyFromNs(Neo, this, {
             error   : 'error',
             info    : 'info',
             log     : 'log',
@@ -89,14 +69,14 @@ class Logger extends Base {
         }, true);
 
         setTimeout(() => {
-            if (!me.enableLogsInProduction && Neo.config.environment === 'dist/production') {
-                me.write = Neo.emptyFn
+            if (!Neo.config.enableLogsInProduction && Neo.config.environment === 'dist/production') {
+                this.write = Neo.emptyFn
             }
         }, 50)
     }
 
     /**
-     * Ctrl-Right Click will show the current component
+     * Ctrl-Right-Click will show the current component
      * @param {Neo.component.Base} view
      */
     addContextMenuListener(view) {
@@ -185,10 +165,12 @@ class Logger extends Base {
      * @param {Object} data
      */
     onContextMenu(data) {
+        let config = Neo.config;
+
         if (
             data.ctrlKey
-            && this.enableComponentLogger
-            && !(Neo.config.env === 'dist/production' && this.enableLogsInProduction)
+            && config.enableComponentLogger
+            && !(config.env === 'dist/production' && config.enableLogsInProduction)
         ) {
             let isGroupSet = false,
                 component;
@@ -271,6 +253,6 @@ class Logger extends Base {
     }
 }
 
-let instance = Neo.applyClassConfig(Logger);
+let instance = Neo.setupClass(Logger);
 
 export default instance;

package/src/util/Matrix.mjs

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

package/src/util/String.mjs

@@ -85,7 +85,7 @@ class StringUtil extends Base {
 
     /**
      * Returns the passed string with the first letter uncapitalized.
-     * @param {String} value 
+     * @param {String} value
      * @returns  {String}
      */
     static uncapitalize(value) {
@@ -93,6 +93,6 @@ class StringUtil extends Base {
     }
 }
 
-Neo.applyClassConfig(StringUtil);
+Neo.setupClass(StringUtil);
 
 export default StringUtil;

package/src/util/Style.mjs

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

package/src/util/VDom.mjs

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

package/src/util/VNode.mjs

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

package/src/util/_export.mjs

@@ -2,7 +2,7 @@ import NeoArray         from './Array.mjs';
 import ClassSystem      from './ClassSystem.mjs';
 import Css              from './Css.mjs';
 import Date             from './Date.mjs';
-import Function         from './Function.mjs';
+import * as Function    from './Function.mjs';
 import HashHistory      from './HashHistory.mjs';
 import KeyNavigation    from './KeyNavigation.mjs';
 import Logger           from './Logger.mjs';

package/src/vdom/Helper.mjs

@@ -82,6 +82,7 @@ class Helper extends Base {
      * @param {String} opts.parentId
      * @param {Number} opts.parentIndex
      * @param {Object} opts.vdom
+     * @param {Number} opts.windowId
      * @returns {Neo.vdom.VNode|Promise<Neo.vdom.VNode>}
      */
     create(opts) {
@@ -90,12 +91,14 @@ class Helper extends Base {
             autoMount   = opts.autoMount === true,
             parentId    = opts.parentId,
             parentIndex = opts.parentIndex,
+            windowId    = opts.windowId,
             node;
 
         delete opts.appName;
         delete opts.autoMount;
         delete opts.parentId;
         delete opts.parentIndex;
+        delete opts.windowId;
 
         node           = me.parseHelper(opts);
         node.outerHTML = me.createStringFromVnode(node);
@@ -105,8 +108,9 @@ class Helper extends Base {
                 appName,
                 autoMount: true,
                 parentId,
-                parentIndex
-            });
+                parentIndex,
+                windowId
+            })
         }
 
         return Neo.config.useVdomWorker ? node : Promise.resolve(node);
@@ -821,6 +825,6 @@ class Helper extends Base {
     }
 }
 
-let instance = Neo.applyClassConfig(Helper);
+let instance = Neo.setupClass(Helper);
 
 export default instance;

package/src/worker/App.mjs

@@ -276,13 +276,14 @@ class App extends Base {
     /**
      * In case you don't want to include prototype based CSS files, use the className param instead
      * @param {String} appName
+     * @param {Number} windowId
      * @param {Neo.core.Base} [proto]
      * @param {String} [className]
      */
-    insertThemeFiles(appName, proto, className) {
+    insertThemeFiles(appName, windowId, proto, className) {
         if (Neo.config.themes.length > 0) {
             className = className || proto.className;
-
+            //console.log(windowId, className);
             let me       = this,
                 lAppName = appName.toLowerCase(),
                 cssMap   = Neo.cssMap,
@@ -290,7 +291,7 @@ class App extends Base {
                 classPath, classRoot, fileName, mapClassName, ns, themeFolders;
 
             if (!cssMap) {
-                me.themeFilesCache.push([appName, proto])
+                me.themeFilesCache.push([appName, windowId, proto])
             } else {
                 // we need to modify app related class names
                 if (!className.startsWith('Neo.')) {
@@ -304,18 +305,18 @@ class App extends Base {
                 }
 
                 if (parent && parent !== Neo.core.Base.prototype) {
-                    if (!Neo.ns(`${lAppName}.${parent.className}`, false, cssMap)) {
-                        me.insertThemeFiles(appName, parent)
+                    if (!Neo.ns(`${windowId}.${parent.className}`, false, cssMap)) {
+                        me.insertThemeFiles(appName, windowId, parent)
                     }
                 }
 
                 themeFolders = Neo.ns(mapClassName || className, false, cssMap.fileInfo);
-
-                if (themeFolders && !Neo.ns(`${lAppName}.${className}`, false, cssMap)) {
+                //console.log(cssMap);
+                if (themeFolders && !Neo.ns(`${windowId}.${className}`, false, cssMap)) {
                     classPath = className.split('.');
                     fileName  = classPath.pop();
                     classPath = classPath.join('.');
-                    ns        = Neo.ns(`${lAppName}.${classPath}`, true, cssMap);
+                    ns        = Neo.ns(`${windowId}.${classPath}`, true, cssMap);
 
                     ns[fileName] = true;
 
@@ -508,6 +509,6 @@ class App extends Base {
     }
 }
 
-let instance = Neo.applyClassConfig(App);
+let instance = Neo.setupClass(App);
 
 export default instance;

package/src/worker/Base.mjs

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

package/src/worker/Canvas.mjs

@@ -80,6 +80,6 @@ class Canvas extends Base {
     }
 }
 
-let instance = Neo.applyClassConfig(Canvas);
+let instance = Neo.setupClass(Canvas);
 
 export default instance;

package/src/worker/Data.mjs

@@ -109,6 +109,6 @@ class Data extends Base {
     }
 }
 
-let instance = Neo.applyClassConfig(Data);
+let instance = Neo.setupClass(Data);
 
 export default instance;

package/src/worker/Manager.mjs

@@ -87,6 +87,9 @@ class Manager extends Base {
             data: {
                 fileName: devMode ? 'Data.mjs'   : 'dataworker.js'
             },
+            task: {
+                fileName: devMode ? 'Task.mjs'   : 'taskworker.js'
+            },
             vdom: {
                 fileName: devMode ? 'VDom.mjs'   : 'vdomworker.js'
             }
@@ -124,7 +127,7 @@ class Manager extends Base {
             'message:readDom'           : {fn: DomAccess.onReadDom,            scope: DomAccess},
             'message:registerRemote'    : {fn: me.onRegisterRemote,            scope: me},
             'message:workerConstructed' : {fn: me.onWorkerConstructed,         scope: me}
-        });
+        })
     }
 
     /**
@@ -135,9 +138,10 @@ class Manager extends Base {
         Object.keys(this.workers).forEach(name => {
             if (!(
                 name === 'canvas' && !NeoConfig.useCanvasWorker ||
+                name === 'task'   && !NeoConfig.useTaskWorker   ||
                 name === 'vdom'   && !NeoConfig.useVdomWorker
             )) {
-                this.sendMessage(name, msg);
+                this.sendMessage(name, msg)
             }
         });
     }
@@ -163,7 +167,7 @@ class Manager extends Base {
 
         me.activeWorkers++;
 
-        return worker;
+        return worker
     }
 
     /**
@@ -193,17 +197,18 @@ class Manager extends Base {
 
         for ([key, value] of Object.entries(me.workers)) {
             if (key === 'canvas' && !config.useCanvasWorker ||
+                key === 'task'   && !config.useTaskWorker   ||
                 key === 'vdom'   && !config.useVdomWorker
             ) {
-                continue;
+                continue
             }
 
             try {
-                value.worker = me.createWorker(value);
+                value.worker = me.createWorker(value)
             } catch (e) {
                 document.body.innerHTML = e;
                 me.stopCommunication = true;
-                break;
+                break
             }
 
             me.sendMessage(key, {
@@ -223,13 +228,13 @@ class Manager extends Base {
         NeoConfig.hasTouchEvents = ('ontouchstart' in window) || (navigator.maxTouchPoints > 0);
 
         if (window.Worker) {
-            me.webWorkersEnabled = true;
+            me.webWorkersEnabled = true
         } else {
-            throw new Error('Your browser does not support Web Workers');
+            throw new Error('Your browser does not support Web Workers')
         }
 
         if (window.SharedWorker) {
-            me.sharedWorkersEnabled = true;
+            me.sharedWorkersEnabled = true
         }
     }
 
@@ -239,10 +244,10 @@ class Manager extends Base {
      */
     getWorker(name) {
         if (name === 'service') {
-            return navigator.serviceWorker?.controller || this.serviceWorker;
+            return navigator.serviceWorker?.controller || this.serviceWorker
         }
 
-        return name instanceof Worker ? name : this.workers[name].worker;
+        return name instanceof Worker ? name : this.workers[name].worker
     }
 
     /**
@@ -253,7 +258,7 @@ class Manager extends Base {
             action       : 'loadApplication',
             path,
             resourcesPath: NeoConfig.resourcesPath
-        });
+        })
     }
 
     /**
@@ -265,9 +270,9 @@ class Manager extends Base {
         me.constructedThreads++;
 
         if (me.constructedThreads === me.activeWorkers) {
-            NeoConfig.appPath && setTimeout(() => { // better save than sorry => all remotes need to be registered
+            NeoConfig.appPath && setTimeout(() => { // better safe than sorry => all remotes need to be registered
                 me.loadApplication(NeoConfig.appPath);
-            }, NeoConfig.loadApplicationDelay);
+            }, NeoConfig.loadApplicationDelay)
         }
     }
 
@@ -277,7 +282,7 @@ class Manager extends Base {
      */
     onWorkerError(e) {
         // starting a worker from a JS module will show JS errors in a correct way
-        !devMode && console.log('Worker Error:', e);
+        !devMode && console.log('Worker Error:', e)
     }
 
     /**
@@ -307,12 +312,12 @@ class Manager extends Base {
                     // we want to delay the message until the rendering queue has processed it
                     // see: https://github.com/neomjs/neo/issues/2864
                     me.promiseForwardMessage(data).then(msgData => {
-                        me.sendMessage(msgData.destination, msgData);
-                    });
+                        me.sendMessage(msgData.destination, msgData)
+                    })
                 }
             } else {
                 if (data.destination === 'main') {
-                    data = data.data;
+                    data = data.data
                 }
 
                 promise[data.reject ? 'reject' : 'resolve'](data);
@@ -322,7 +327,7 @@ class Manager extends Base {
 
         if (dest !== 'main' && action !== 'reply') {
             if (data.transfer) {
-                transfer = [data.transfer];
+                transfer = [data.transfer]
             }
 
             me.promiseMessage(dest, data, transfer).then(response => {
@@ -333,8 +338,8 @@ class Manager extends Base {
                     reject : true,
                     replyId: data.id,
                     error  : err.message
-                });
-            });
+                })
+            })
         }
 
         // only needed for SharedWorkers
@@ -344,11 +349,11 @@ class Manager extends Base {
             me.broadcast({
                 action : 'registerApp',
                 appName: data.appName
-            });
+            })
         }
 
         else if (dest === 'main' && action === 'remoteMethod') {
-            me.onRemoteMethod(data);
+            me.onRemoteMethod(data)
         }
     }
 
@@ -359,8 +364,8 @@ class Manager extends Base {
      */
     promiseForwardMessage(data) {
         return new Promise((resolve, reject) => {
-            this.promises[data.replyId] = { data, reject, resolve };
-        });
+            this.promises[data.replyId] = { data, reject, resolve }
+        })
     }
 
     /**
@@ -378,8 +383,8 @@ class Manager extends Base {
             let message = me.sendMessage(dest, opts, transfer),
                 msgId   = message.id;
 
-            me.promises[msgId] = { reject, resolve };
-        });
+            me.promises[msgId] = { reject, resolve }
+        })
     }
 
     /**
@@ -391,7 +396,7 @@ class Manager extends Base {
 
             if (promise) {
                 promise.resolve(promise.data);
-                delete this.promises[replyId];
+                delete this.promises[replyId]
             }
         }
     }
@@ -412,13 +417,13 @@ class Manager extends Base {
         if (!me.stopCommunication) {
             if (opts.channelPort) {
                 worker = opts.channelPort;
-                delete opts.channelPort;
+                delete opts.channelPort
             } else {
-                worker = me.getWorker(dest);
+                worker = me.getWorker(dest)
             }
 
             if (!worker) {
-                throw new Error('Called sendMessage for a worker that does not exist: ' + dest);
+                throw new Error('Called sendMessage for a worker that does not exist: ' + dest)
             }
 
             opts.destination = dest;
@@ -426,11 +431,11 @@ class Manager extends Base {
             message = new Message(opts);
 
             (worker.port ? worker.port : worker).postMessage(message, transfer);
-            return message;
+            return message
         }
     }
 }
 
-let instance = Neo.applyClassConfig(Manager);
+let instance = Neo.setupClass(Manager);
 
 export default instance;

package/src/worker/ServiceBase.mjs

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

package/src/worker/Task.mjs

@@ -0,0 +1,67 @@
+import Neo       from '../Neo.mjs';
+import Base      from './Base.mjs';
+import * as core from '../core/_export.mjs';
+
+/**
+ * The Task worker can get filled with custom remote methods as needed.
+ * To activate it, set useTaskWorker to true inside your neo-config.json and add a task.mjs file as the entry point.
+ * @class Neo.worker.Task
+ * @extends Neo.worker.Base
+ * @singleton
+ */
+class Task extends Base {
+    static config = {
+        /**
+         * @member {String} className='Neo.worker.Task'
+         * @protected
+         */
+        className: 'Neo.worker.Task',
+        /**
+         * @member {Boolean} singleton=true
+         * @protected
+         */
+        singleton: true,
+        /**
+         * @member {String} workerId='task'
+         * @protected
+         */
+        workerId: 'task'
+    }
+
+    /**
+     *
+     */
+    afterConnect() {
+        let me             = this,
+            channel        = new MessageChannel(),
+            {port1, port2} = channel;
+
+        port1.onmessage = me.onMessage.bind(me);
+
+        me.sendMessage('app', {action: 'registerPort', transfer: port2}, [port2]);
+
+        me.channelPorts.app = port1
+    }
+
+    /**
+     * @param {Object} msg
+     */
+    onRegisterNeoConfig(msg) {
+        super.onRegisterNeoConfig(msg);
+
+        let path = Neo.config.appPath.slice(0, -8); // removing "/app.mjs"
+
+        import(
+            /* webpackInclude: /\/task.mjs$/ */
+            /* webpackExclude: /\/node_modules/ */
+            /* webpackMode: "lazy" */
+            `../../${path}/task.mjs`
+        ).then(module => {
+            module.onStart()
+        })
+    }
+}
+
+let instance = Neo.setupClass(Task);
+
+export default instance;

package/src/worker/VDom.mjs

@@ -43,6 +43,6 @@ class VDom extends Base {
     }
 }
 
-let instance = Neo.applyClassConfig(VDom);
+let instance = Neo.setupClass(VDom);
 
 export default instance;

package/src/worker/mixin/RemoteMethodAccess.mjs

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

package/test/components/app.mjs

@@ -3,7 +3,7 @@
 
 import '../../src/button/Base.mjs';
 import '../../src/component/DateSelector.mjs';
+import '../../src/list/Chip.mjs';
 import '../../src/form/field/Select.mjs';
-import '../../src/list/Chip.mjs'
 
 export const onStart = () => Neo.app({name: 'AppEmpty'})

package/test/components/files/form/field/Select.mjs

@@ -35,7 +35,7 @@ StartTest(t => {
         return testId;
     }
 
-    // Clear the eway for each test
+    // Clear the way for each test
     t.beforeEach(async t => {
         if (testId) {
             await Neo.worker.App.destroyNeoInstance(testId);
@@ -217,7 +217,7 @@ StartTest(t => {
 
         await t.waitForSelector('.neo-list-item:contains(Foo)');
 
-        // All data ityems represented
+        // All data items represented
         t.selectorCountIs('.neo-list-item', 3);
     });
 });