neo.mjs 3.1.0 → 3.1.4

package/apps/covid/Util.mjs

@@ -135,16 +135,16 @@ class Util extends Base {
         imageName = map[imageName] || imageName;
 
         if (Neo.config.isGitHubPages) {
-            let path = '../../../../resources/images/flaticon/country_flags/png/' + imageName + '.png';
+            let path = `../../../../resources/images/flaticon/country_flags/png/${imageName}.png`;
 
             if (Neo.config.environment !== 'development') {
-                path = '../../' + path;
+                path = `../../${path}`;
             }
 
             return path;
         }
 
-        return 'https://raw.githubusercontent.com/neomjs/pages/master/resources/images/flaticon/country_flags/png/' + imageName + '.png';
+        return `https://raw.githubusercontent.com/neomjs/pages/master/resources/images/flaticon/country_flags/png/${imageName}.png`;
     }
 
     /**

package/apps/sharedcovid/Util.mjs

@@ -135,16 +135,16 @@ class Util extends Base {
         imageName = map[imageName] || imageName;
 
         if (Neo.config.isGitHubPages) {
-            let path = '../../../../resources/images/flaticon/country_flags/png/' + imageName + '.png';
+            let path = `../../../../resources/images/flaticon/country_flags/png/${imageName}.png`;
 
             if (Neo.config.environment !== 'development') {
-                path = '../../' + path;
+                path = `../../${path}`;
             }
 
             return path;
         }
 
-        return 'https://raw.githubusercontent.com/neomjs/pages/master/resources/images/flaticon/country_flags/png/' + imageName + '.png';
+        return `https://raw.githubusercontent.com/neomjs/pages/master/resources/images/flaticon/country_flags/png/${imageName}.png`;
     }
 
     /**

package/apps/sharedcovid/view/MainContainerController.mjs

@@ -167,7 +167,7 @@ class MainContainerController extends ComponentController {
 
         Neo.Main.getWindowData().then(winData => {
             me.component.getDomRect(me.getReference(containerReference).id).then(data => {
-                let {height, left, top, width} = data[0];
+                let {height, left, top, width} = data;
 
                 height -= 50; // popup header in Chrome
                 left   += winData.screenLeft;

package/buildScripts/buildAll.mjs

@@ -131,6 +131,6 @@ if (programOpts.info) {
         const processTime = (Math.round((new Date - startDate) * 100) / 100000).toFixed(2);
         console.log(`\nTotal time for ${programName}: ${processTime}s`);
 
-        process.exit();
+        process.exit(0);
     });
 }

package/buildScripts/buildThemes.mjs

@@ -9,7 +9,8 @@ import path         from 'path';
 import postcss      from 'postcss';
 import sass         from 'sass';
 
-const cwd                = process.cwd(),
+const __dirname          = path.resolve(),
+      cwd                = process.cwd(),
       requireJson        = path => JSON.parse(fs.readFileSync((path))),
       packageJson        = requireJson(path.resolve(cwd, 'package.json')),
       neoPath            = packageJson.name === 'neo.mjs' ? './' : './node_modules/neo.mjs/',
@@ -114,7 +115,6 @@ if (programOpts.info) {
         let themeMap, themeMapNoVars;
 
         /**
-         *
          * @param {Object} file
          * @param {String} target
          * @param {Boolean} useCssVars
@@ -137,16 +137,13 @@ if (programOpts.info) {
         }
 
         /**
-         *
          * @param {String} p
          * @param {String} mode development or production
          */
         function buildEnv(p, mode) {
             if (cssVars !== 'no') {
                 parseScssFiles(getAllScssFiles(path.join(p, 'src')), mode, 'src', true);
-            }
 
-            if (cssVars !== 'no') {
                 themeFolders.forEach(themeFolder => {
                     if (themes === 'all' || themes === themeFolder) {
                         parseScssFiles(getAllScssFiles(path.join(p, themeFolder)), mode, themeFolder, true);
@@ -164,7 +161,6 @@ if (programOpts.info) {
         }
 
         /**
-         *
          * @param {String} dirPath
          * @returns {Object[]}
          */
@@ -179,7 +175,6 @@ if (programOpts.info) {
         }
 
         /**
-         *
          * @param {String} dirPath
          * @param [arrayOfFiles=[]]
          * @param [relativePath='']
@@ -210,10 +205,10 @@ if (programOpts.info) {
                         }
 
                         arrayOfFiles.push({
-                            className   : className,
-                            name        : fileInfo.name,
-                            path        : filePath,
-                            relativePath: relativePath
+                            className,
+                            name: fileInfo.name,
+                            path: filePath,
+                            relativePath
                         });
                     }
                 }
@@ -223,7 +218,6 @@ if (programOpts.info) {
         }
 
         /**
-         *
          * @param {String} filePath
          * @returns {Object}
          */
@@ -247,10 +241,9 @@ if (programOpts.info) {
         }
 
         /**
-         *
          * @param {Array|String} names The class name string containing dots or an Array of the string parts
          * @param {Boolean} [create] Set create to true to create empty objects for non existing parts
-         * @param {Object} [scope] Set a different starting point as self
+         * @param {Object} [scope] Set a different starting point as globalThis
          * @returns {Object} reference to the toplevel namespace
          */
         function ns(names, create, scope) {
@@ -263,11 +256,10 @@ if (programOpts.info) {
                 if (prev) {
                     return prev[current];
                 }
-            }, scope);
+            }, scope || globalThis);
         }
 
         /**
-         *
          * @param {Object[]} files
          * @param {String} mode development or production
          * @param {String} target src or a theme
@@ -400,7 +392,6 @@ if (programOpts.info) {
         }
 
         /**
-         *
          * @param {String} content
          * @param {String} baseDir
          * @returns {String}
@@ -432,13 +423,13 @@ if (programOpts.info) {
         // dist/development
         if (env === 'all' || env === 'dev') {
             console.log(chalk.blue(`${programName} starting dist/development`));
-            buildEnv(path.join(scssPath), 'development');
+            buildEnv(scssPath, 'development');
         }
 
         // dist/production
         if (env === 'all' || env === 'prod') {
             console.log(chalk.blue(`${programName} starting dist/production`));
-            buildEnv(path.join(scssPath), 'production');
+            buildEnv(scssPath, 'production');
         }
     });
 }

package/buildScripts/docs/jsdocx.mjs

@@ -1,7 +1,7 @@
-import fs      from 'fs-extra';
-import helper  from 'neo-jsdoc-x/src/lib/helper.js';
-import jsdocx  from 'neo-jsdoc-x';
-import path    from 'path';
+import fs     from 'fs-extra';
+import helper from 'neo-jsdoc-x/src/lib/helper.js';
+import jsdocx from 'neo-jsdoc-x';
+import path   from 'path';
 
 const __dirname   = path.resolve(),
       cwd         = process.cwd(),
@@ -51,7 +51,7 @@ function ns(names, create) {
         if (prev) {
             return prev[current];
         }
-    }, global);
+    }, globalThis);
 }
 
 const neoStructure = [{

package/buildScripts/webpack/buildMyApps.mjs

@@ -7,7 +7,7 @@ import inquirer      from 'inquirer';
 import os            from 'os';
 import path          from 'path';
 
-const __dirname    = path.resolve(),
+const __dirname   = path.resolve(),
       cwd         = process.cwd(),
       cpOpts      = {env: process.env, cwd: cwd, stdio: 'inherit', shell: true},
       requireJson = path => JSON.parse(fs.readFileSync((path))),

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "neo.mjs",
-    "version": "3.1.0",
+    "version": "3.1.4",
     "description": "The webworkers driven UI framework",
     "type": "module",
     "repository": {

package/src/DefaultConfig.mjs

@@ -1,4 +1,4 @@
-const Neo = self.Neo || {};
+const Neo = globalThis.Neo || {};
 
 Neo.config = Neo.config || {};
 

package/src/Neo.mjs

@@ -22,9 +22,9 @@ const configSymbol = Symbol.for('configSymbol'),
  * @borrows Neo.core.Util.toArray           as toArray
  * @tutorial 01_Concept
  */
-let Neo = self.Neo || {};
+let Neo = globalThis.Neo || {};
 
-Neo = self.Neo = Object.assign({
+Neo = globalThis.Neo = Object.assign({
     /**
      * A map containing ntypes as key and Neo classes or singletons as values
      * @memberOf! module:Neo
@@ -90,7 +90,7 @@ Neo = self.Neo = Object.assign({
                     else if (!Neo.hasPropertySetter(element, key)) {
                         Object.defineProperty(element, key, {
                             enumerable: true,
-                            value     : value,
+                            value,
                             writable  : true
                         });
                     }
@@ -343,6 +343,9 @@ Neo = self.Neo = Object.assign({
         return instance;
     },
 
+    /**
+     *
+     */
     emptyFn() {},
 
     /**
@@ -397,15 +400,15 @@ Neo = self.Neo = Object.assign({
      * @example
      * Neo.ns('Neo.button.Base', true);
      * // =>
-     * // self.Neo = self.Neo || {};
-     * // self.Neo.component = self.Neo.component || {};
-     * // self.Neo.button.Base = self.Neo.button.Base || {};
-     * // return self.Neo.button.Base;
+     * // globalThis.Neo             = globalThis.Neo             || {};
+     * // globalThis.Neo.button      = globalThis.Neo.button      || {};
+     * // globalThis.Neo.button.Base = globalThis.Neo.button.Base || {};
+     * // return globalThis.Neo.button.Base;
      *
      * @memberOf module:Neo
      * @param {Array|String} names The class name string containing dots or an Array of the string parts
      * @param {Boolean} [create] Set create to true to create empty objects for non existing parts
-     * @param {Object} [scope] Set a different starting point as self
+     * @param {Object} [scope] Set a different starting point as globalThis
      * @returns {Object} reference to the toplevel namespace
      */
     ns(names, create, scope) {
@@ -418,7 +421,7 @@ Neo = self.Neo = Object.assign({
             if (prev) {
                 return prev[current];
             }
-        }, scope || self);
+        }, scope || globalThis);
     },
 
     /**
@@ -504,7 +507,6 @@ const ignoreMixin = [
 ];
 
 /**
- *
  * @param {Neo.core.Base} cls
  * @param {Array} mixins
  * @private
@@ -639,14 +641,13 @@ function exists(className) {
     try {
         return !!className.split('.').reduce((prev, current) => {
             return prev[current];
-        }, self);
+        }, globalThis);
     } catch(e) {
         return false;
     }
 }
 
 /**
- *
  * @param {Neo.core.Base} proto
  * @param {Neo.core.Base} mixinProto
  * @returns {Function}
@@ -678,7 +679,6 @@ function mixinProperty(proto, mixinProto) {
 }
 
 /**
- *
  * @param mixinCls
  * @returns {Function}
  * @private

package/src/core/Base.mjs

@@ -121,17 +121,18 @@ class Base {
      * @protected
      */
     afterSetId(value, oldValue) {
-        let me = this;
+        let me         = this,
+            hasManager = Base.instanceManagerAvailable === true;
 
         if (oldValue) {
-            if (Base.instanceManagerAvailable === true) {
+            if (hasManager) {
                 Neo.manager.Instance.unregister(oldValue);
             } else {
                 delete Neo.idMap[oldValue];
             }
         }
 
-        if (Base.instanceManagerAvailable === true) {
+        if (hasManager) {
             Neo.manager.Instance.register(me);
         } else {
             Neo.idMap = Neo.idMap || {};
@@ -400,11 +401,12 @@ class Base {
      * @returns {Object}
      */
     setFields(config) {
-        let configNames = this.constructor.config;
+        let me          = this,
+            configNames = me.constructor.config;
 
         Object.entries(config).forEach(([key, value]) => {
-            if (!configNames.hasOwnProperty(key) && !Neo.hasPropertySetter(this, key)) {
-                this[key] = value;
+            if (!configNames.hasOwnProperty(key) && !Neo.hasPropertySetter(me, key)) {
+                me[key] = value;
                 delete config[key];
             }
         });

package/src/main/addon/AmCharts.mjs

@@ -158,9 +158,9 @@ class AmCharts extends Base {
         if (!me.scriptsLoaded) {
             me.chartsToCreate.push(data);
         } else {
-            // todo: check if self[data.package] exists, if not load it and call create afterwards
+            // todo: check if globalThis[data.package] exists, if not load it and call create afterwards
 
-            me.charts[data.id] = am4core.createFromConfig(data.config, data.id, self[data.package][data.type || 'XYChart']);
+            me.charts[data.id] = am4core.createFromConfig(data.config, data.id, globalThis[data.package][data.type || 'XYChart']);
 
             if (data.combineSeriesTooltip) {
                 me.combineSeriesTooltip(me.charts[data.id]);

package/src/manager/DomEvent.mjs

@@ -107,7 +107,7 @@ class DomEvent extends Base {
                                 if (!preventFire) {
                                     // console.log(Neo.get(id));
                                     data.component = component;
-                                    listener.fn.apply(listener.scope || self, [data]);
+                                    listener.fn.apply(listener.scope || globalThis, [data]);
 
                                     if (!listener.bubble) {
                                         bubble = false;

package/src/worker/Base.mjs

@@ -55,19 +55,20 @@ class Base extends CoreBase {
     construct(config) {
         super.construct(config);
 
-        let me = this;
+        let me = this,
+            gt = globalThis;
 
         Object.assign(me, {
             channelPorts  : {},
-            isSharedWorker: self.toString() === '[object SharedWorkerGlobalScope]',
+            isSharedWorker: gt.toString() === '[object SharedWorkerGlobalScope]',
             ports         : [],
             promises      : {}
         });
 
         if (me.isSharedWorker) {
-            self.onconnect = me.onConnected.bind(me);
+            gt.onconnect = me.onConnected.bind(me);
         } else {
-            self.onmessage = me.onMessage.bind(me);
+            gt.onmessage = me.onMessage.bind(me);
         }
 
         Neo.workerId      = me.workerId;
@@ -251,7 +252,7 @@ class Base extends CoreBase {
         if (me.channelPorts[dest]) {
             port = me.channelPorts[dest];
         } else if (!me.isSharedWorker) {
-            port = self;
+            port = globalThis;
         } else {
             if (opts.port) {
                 port = me.getPort({id: opts.port}).port;