neo.mjs 3.0.6 → 3.1.3

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;

package/buildScripts/buildAll.js

@@ -1,148 +0,0 @@
-'use strict';
-
-const chalk       = require('chalk'),
-      { program } = require('commander'),
-      cp          = require('child_process'),
-      cwd         = process.cwd(),
-      cpOpts      = {env: process.env, cwd: cwd, stdio: 'inherit', shell: true},
-      envinfo     = require('envinfo'),
-      inquirer    = require('inquirer'),
-      os          = require('os'),
-      npmCmd      = os.platform().startsWith('win') ? 'npm.cmd' : 'npm', // npm binary based on OS
-      path        = require('path'),
-      packageJson = require(path.resolve(cwd, 'package.json')),
-      neoPath     = path.resolve(packageJson.name === 'neo.mjs' ? './' : './node_modules/neo.mjs/'),
-      webpackPath = path.resolve(neoPath, 'buildScripts/webpack'),
-      programName = `${packageJson.name} buildAll`,
-      questions   = [];
-
-program
-    .name(programName)
-    .version(packageJson.version)
-    .option('-i, --info',               'print environment debug info')
-    .option('-e, --env <value>',        '"all", "dev", "prod"')
-    .option('-l, --npminstall <value>', '"yes", "no"')
-    .option('-f, --framework')
-    .option('-n, --noquestions')
-    .option('-p, --parsedocs <value>',  '"yes", "no"')
-    .option('-t, --themes <value>',     '"yes", "no"')
-    .option('-w, --threads <value>',    '"yes", "no"')
-    .allowUnknownOption()
-    .on('--help', () => {
-        console.log('\nIn case you have any issues, please create a ticket here:');
-        console.log(chalk.cyan(packageJson.bugs.url));
-    })
-    .parse(process.argv);
-
-const programOpts = program.opts();
-
-if (programOpts.info) {
-    console.log(chalk.bold('\nEnvironment Info:'));
-    console.log(`\n  current version of ${packageJson.name}: ${packageJson.version}`);
-    console.log(`  running from ${__dirname}`);
-    return envinfo
-        .run({
-            System     : ['OS', 'CPU'],
-            Binaries   : ['Node', 'npm', 'Yarn'],
-            Browsers   : ['Chrome', 'Edge', 'Firefox', 'Safari'],
-            npmPackages: ['neo.mjs']
-        }, {
-            duplicates  : true,
-            showNotFound: true
-        })
-        .then(console.log);
-}
-
-console.log(chalk.green(programName));
-
-if (!programOpts.noquestions) {
-    if (!programOpts.npminstall) {
-        questions.push({
-            type   : 'list',
-            name   : 'npminstall',
-            message: 'Run npm install?:',
-            choices: ['yes', 'no'],
-            default: 'all'
-        });
-    }
-
-    if (!programOpts.env) {
-        questions.push({
-            type   : 'list',
-            name   : 'env',
-            message: 'Please choose the environment:',
-            choices: ['all', 'dev', 'prod'],
-            default: 'all'
-        });
-    }
-
-    if (!programOpts.npminstall) {
-        questions.push({
-            type   : 'list',
-            name   : 'themes',
-            message: 'Build the themes?',
-            choices: ['yes', 'no'],
-            default: 'yes'
-        });
-    }
-
-    if (!programOpts.threads) {
-        questions.push({
-            type   : 'list',
-            name   : 'threads',
-            message: 'Build the threads?',
-            choices: ['yes', 'no'],
-            default: 'yes'
-        });
-    }
-
-    if (!programOpts.parsedocs) {
-        questions.push({
-            type   : 'list',
-            name   : 'parsedocs',
-            message: 'Trigger the jsdocx parsing?',
-            choices: ['yes', 'no'],
-            default: 'yes'
-        });
-    }
-}
-
-inquirer.prompt(questions).then(answers => {
-    const env        = answers.env        || programOpts.env        || 'all',
-          npminstall = answers.npminstall || programOpts.npminstall || 'yes',
-          parsedocs  = answers.parsedocs  || programOpts.parsedocs  || 'yes',
-          themes     = answers.themes     || programOpts.themes     || 'yes',
-          threads    = answers.threads    || programOpts.threads    || 'yes',
-          insideNeo  = !!programOpts.framework || false,
-          cpArgs     = ['-e', env],
-          startDate  = new Date();
-
-    if (programOpts.noquestions) {
-        cpArgs.push('-n');
-    }
-
-    if (insideNeo) {
-        cpArgs.push('-f');
-    }
-
-    if (npminstall === 'yes') {
-        cp.spawnSync(npmCmd, ['i'], cpOpts);
-    }
-
-    if (themes === 'yes') {
-        cp.spawnSync('node', [`${neoPath}/buildScripts/buildThemes.js`].concat(cpArgs), cpOpts);
-    }
-
-    if (threads === 'yes') {
-        cp.spawnSync('node', [`${webpackPath}/buildThreads.js`].concat(cpArgs), cpOpts);
-    }
-
-    if (parsedocs === 'yes') {
-        cp.spawnSync(npmCmd, ['run', 'generate-docs-json'], cpOpts);
-    }
-
-    const processTime = (Math.round((new Date - startDate) * 100) / 100000).toFixed(2);
-    console.log(`\nTotal time for ${programName}: ${processTime}s`);
-
-    process.exit();
-});