neo.mjs 6.42.0 → 6.44.0

package/apps/sharedcovid/view/MainContainerController.mjs

@@ -675,6 +675,4 @@ class MainContainerController extends ComponentController {
     }
 }
 
-Neo.setupClass(MainContainerController);
-
-export default MainContainerController;
+export default Neo.setupClass(MainContainerController);

package/apps/sharedcovid/view/MainContainerModel.mjs

@@ -45,6 +45,4 @@ class MainContainerModel extends Component {
     }
 }
 
-Neo.setupClass(MainContainerModel);
-
-export default MainContainerModel;
+export default Neo.setupClass(MainContainerModel);

package/apps/sharedcovid/view/TableContainer.mjs

@@ -200,6 +200,4 @@ class TableContainer extends Container {
     }
 }
 
-Neo.setupClass(TableContainer);
-
-export default TableContainer;
+export default Neo.setupClass(TableContainer);

package/apps/sharedcovid/view/TableContainerController.mjs

@@ -295,6 +295,4 @@ class TableContainerController extends ComponentController {
     }
 }
 
-Neo.setupClass(TableContainerController);
-
-export default TableContainerController;
+export default Neo.setupClass(TableContainerController);

package/apps/sharedcovid/view/WorldMapComponent.mjs

@@ -92,17 +92,15 @@ class WorldMapComponent extends AmChartComponent {
                 id       : item.countryInfo.iso2,
                 name     : item.country,
                 recovered: item.recovered,
-            });
+            })
         });
 
         Neo.main.addon.AmCharts.updateData({
             data    : chartData,
             dataPath: this.dataPath,
             id      : this.id
-        });
+        })
     }
 }
 
-Neo.setupClass(WorldMapComponent);
-
-export default WorldMapComponent;
+export default Neo.setupClass(WorldMapComponent);

package/apps/sharedcovid/view/WorldMapContainer.mjs

@@ -78,6 +78,4 @@ class WorldMapContainer extends Container {
     }
 }
 
-Neo.setupClass(WorldMapContainer);
-
-export default WorldMapContainer;
+export default Neo.setupClass(WorldMapContainer);

package/apps/sharedcovid/view/WorldMapContainerController.mjs

@@ -85,11 +85,9 @@ class WorldMapContainerController extends ComponentController {
 
             countryData.sort((a, b) => b[data.component.series] - a[data.component.series]);
 
-            me.getReference('heatRuleField').value = Math.ceil(countryData[9][data.component.series] / 100) * 100;
-        });
+            me.getReference('heatRuleField').value = Math.ceil(countryData[9][data.component.series] / 100) * 100
+        })
     }
 }
 
-Neo.setupClass(WorldMapContainerController);
-
-export default WorldMapContainerController;
+export default Neo.setupClass(WorldMapContainerController);

package/apps/sharedcovid/view/country/Gallery.mjs

@@ -171,6 +171,4 @@ class CountryGallery extends Gallery {
     }
 }
 
-Neo.setupClass(CountryGallery);
-
-export default CountryGallery;
+export default Neo.setupClass(CountryGallery);

package/apps/sharedcovid/view/country/Helix.mjs

@@ -179,6 +179,4 @@ class CountryHelix extends Helix {
     }
 }
 
-Neo.setupClass(CountryHelix);
-
-export default CountryHelix;
+export default Neo.setupClass(CountryHelix);

package/apps/sharedcovid/view/country/HistoricalDataTable.mjs

@@ -85,6 +85,4 @@ class HistoricalDataTable extends Container {
     }
 }
 
-Neo.setupClass(HistoricalDataTable);
-
-export default HistoricalDataTable;
+export default Neo.setupClass(HistoricalDataTable);

package/apps/sharedcovid/view/country/LineChartComponent.mjs

@@ -133,6 +133,4 @@ class LineChartComponent extends AmChartComponent {
     }
 }
 
-Neo.setupClass(LineChartComponent);
-
-export default LineChartComponent;
+export default Neo.setupClass(LineChartComponent);

package/apps/sharedcovid/view/country/Table.mjs

@@ -166,6 +166,4 @@ class Table extends Container {
     }
 }
 
-Neo.setupClass(Table);
-
-export default Table;
+export default Neo.setupClass(Table);

package/apps/sharedcovid/view/mapboxGl/Component.mjs

@@ -113,6 +113,4 @@ class Component extends BaseComponent {
     }
 }
 
-Neo.setupClass(Component);
-
-export default Component;
+export default Neo.setupClass(Component);

package/apps/sharedcovid/view/mapboxGl/Container.mjs

@@ -140,6 +140,4 @@ class Container extends BaseContainer {
     }
 }
 
-Neo.setupClass(Container);
-
-export default Container;
+export default Neo.setupClass(Container);

package/apps/sharedcovid/view/mapboxGl/ContainerController.mjs

@@ -27,7 +27,7 @@ class ContainerController extends ComponentController {
             layerId: layerId,
             key    : 'visibility',
             value  : visibility
-        });
+        })
     }
 
     /**
@@ -37,24 +37,22 @@ class ContainerController extends ComponentController {
         const visibility = data.value ? 'visible' : 'none';
 
         this.changeLayerVisibility('covid19-circle',      visibility);
-        this.changeLayerVisibility('covid19-circle-text', visibility);
+        this.changeLayerVisibility('covid19-circle-text', visibility)
     }
 
     /**
      * @param {Object} data
      */
     onHeatMapChange(data) {
-        this.changeLayerVisibility('covid19-heat', data.value ? 'visible' : 'none');
+        this.changeLayerVisibility('covid19-heat', data.value ? 'visible' : 'none')
     }
 
     /**
      * @param {Object} data
      */
     onTerrainChange(data) {
-        this.changeLayerVisibility('hillshading', data.value ? 'visible' : 'none');
+        this.changeLayerVisibility('hillshading', data.value ? 'visible' : 'none')
     }
 }
 
-Neo.setupClass(ContainerController);
-
-export default ContainerController;
+export default Neo.setupClass(ContainerController);

package/apps/shareddialog/childapps/shareddialog2/view/MainContainer.mjs

@@ -57,6 +57,4 @@ class MainContainer extends Viewport {
     }
 }
 
-Neo.setupClass(MainContainer);
-
-export default MainContainer;
+export default Neo.setupClass(MainContainer);

package/apps/shareddialog/childapps/shareddialog2/view/MainContainerController.mjs

@@ -17,10 +17,8 @@ class MainContainerController extends ComponentController {
      * @param {Object} data
      */
     onCreateDialogButtonClick(data) {
-        Neo.apps['SharedDialog']?.mainView.controller.createDialog(data, this.component.appName);
+        Neo.apps['SharedDialog']?.mainView.controller.createDialog(data, this.component.appName)
     }
 }
 
-Neo.setupClass(MainContainerController);
-
-export default MainContainerController;
+export default Neo.setupClass(MainContainerController);

package/apps/shareddialog/view/DemoDialog.mjs

@@ -52,6 +52,4 @@ class DemoDialog extends Dialog {
     }
 }
 
-Neo.setupClass(DemoDialog);
-
-export default DemoDialog;
+export default Neo.setupClass(DemoDialog);

package/apps/shareddialog/view/MainContainer.mjs

@@ -115,6 +115,4 @@ class MainContainer extends Viewport {
     }
 }
 
-Neo.setupClass(MainContainer);
-
-export default MainContainer;
+export default Neo.setupClass(MainContainer);

package/apps/shareddialog/view/MainContainerController.mjs

@@ -307,14 +307,14 @@ class MainContainerController extends ComponentController {
         NeoArray.add(me.connectedApps, name);
 
         if (name !== 'SharedDialog' && me.currentTheme !== 'neo-theme-light') {
-            me.switchThemeForApp(name, me.currentTheme);
+            me.switchThemeForApp(name, me.currentTheme)
         }
 
         if (name === me.dockedWindowAppName) {
-            me.getOpenDockedWindowButton().disabled = true;
+            me.getOpenDockedWindowButton().disabled = true
         }
 
-        me.enableOpenDialogButtons(!me.dialog);
+        me.enableOpenDialogButtons(!me.dialog)
     }
 
     /**
@@ -330,18 +330,18 @@ class MainContainerController extends ComponentController {
             NeoArray.remove(me.connectedApps, 'SharedDialog');
 
             Neo.Main.windowClose({
-                names: me.connectedApps,
-            });
+                names: me.connectedApps
+            })
         } else {
             NeoArray.remove(me.connectedApps, name);
 
             Neo.main.addon.WindowPosition.unregisterWindow({
                 name: name
-            });
+            })
         }
 
         if (name === me.dockedWindowAppName) {
-            me.getOpenDockedWindowButton().disabled = false;
+            me.getOpenDockedWindowButton().disabled = false
         }
     }
 
@@ -349,14 +349,14 @@ class MainContainerController extends ComponentController {
      * @param {Object} data
      */
     onCreateDialogButtonClick(data) {
-        this.createDialog(data, this.component.appName);
+        this.createDialog(data, this.component.appName)
     }
 
     /**
      *
      */
     onDialogClose() {
-        this.enableOpenDialogButtons(true);
+        this.enableOpenDialogButtons(true)
     }
 
     /**
@@ -364,7 +364,7 @@ class MainContainerController extends ComponentController {
      */
     onDockedPositionChange(data) {
         if (data.value === true) {
-            this.dockedWindowSide = data.component.value;
+            this.dockedWindowSide = data.component.value
         }
     }
 
@@ -380,16 +380,16 @@ class MainContainerController extends ComponentController {
                 side                = me.dockedWindowSide;
 
             if (dialog.appName === me.dockedWindowAppName) {
-                side = me.getOppositeSide(me.dockedWindowSide);
+                side = me.getOppositeSide(me.dockedWindowSide)
             }
 
             if (Rectangle.leavesSide(dragStartWindowRect, proxyRect, side)) {
                 if (Rectangle.excludes(dragStartWindowRect, proxyRect)) {
                     me.mountDialogInOtherWindow({
                         proxyRect: proxyRect
-                    });
+                    })
                 } else {
-                    me.dropDialogBetweenWindows(proxyRect);
+                    me.dropDialogBetweenWindows(proxyRect)
                 }
             }
         }
@@ -441,15 +441,15 @@ class MainContainerController extends ComponentController {
 
                     // The other window has most likely not loaded The dialog JS module yet,
                     // but the drag proxy is using some CSS rules of it.
-                    Neo.currentWorker.insertThemeFiles(dockedWindowAppName, Neo.dialog.Base.prototype);
+                    Neo.currentWorker.insertThemeFiles(dockedWindowAppName, Neo.dialog.Base.prototype)
                 } else {
                     me.updateDockedWindowProxyStyle({
                         ...proxyPosition,
                         visibility: null
-                    });
+                    })
                 }
             } else {
-                me.updateDockedWindowProxyStyle({visibility: 'hidden'});
+                me.updateDockedWindowProxyStyle({visibility: 'hidden'})
             }
         }
     }
@@ -468,7 +468,7 @@ class MainContainerController extends ComponentController {
             for (let item of data.eventData.path) {
                 if (item.tagName === 'body') {
                     me.dragStartWindowRect = item.rect;
-                    break;
+                    break
                 }
             }
 
@@ -476,8 +476,8 @@ class MainContainerController extends ComponentController {
                 Neo.Main.getWindowData({
                     appName: me.dialog.appName === appName ? me.dockedWindowAppName : appName
                 }).then(data => {
-                    me.targetWindowSize = dockedHorizontal ? data.innerWidth : data.innerHeight;
-                });
+                    me.targetWindowSize = dockedHorizontal ? data.innerWidth : data.innerHeight
+                })
             }
         }
     }
@@ -513,25 +513,25 @@ class MainContainerController extends ComponentController {
                     left   = data.screenLeft;
                     top    = data.outerHeight + data.screenTop - 52;
                     width  = data.outerWidth;
-                    break;
+                    break
                 case 'left':
                     height = data.outerHeight - 78;
                     left   = data.screenLeft  - size;
                     top    = data.screenTop   + 28;
                     width  = size;
-                    break;
+                    break
                 case 'right':
                     height = data.outerHeight - 78;
                     left   = data.outerWidth  + data.screenLeft;
                     top    = data.screenTop   + 28;
                     width  = size;
-                    break;
+                    break
                 case 'top':
                     height = size;
                     left   = data.screenLeft;
                     top    = data.screenTop - size + 28;
                     width  = data.outerWidth;
-                    break;
+                    break
             }
 
             Neo.Main.windowOpen({
@@ -544,8 +544,8 @@ class MainContainerController extends ComponentController {
                 dock: dock,
                 name: me.dockedWindowAppName,
                 size: size
-            });
-        });
+            })
+        })
     }
 
     /**
@@ -568,7 +568,7 @@ class MainContainerController extends ComponentController {
         }
 
         me.connectedApps.forEach(appName => {
-            me.switchThemeForApp(appName, theme);
+            me.switchThemeForApp(appName, theme)
         });
 
         button.set({
@@ -581,10 +581,10 @@ class MainContainerController extends ComponentController {
 
             NeoArray.removeAdd(cls, me.currentTheme, theme);
 
-            dialog.cls = cls;
+            dialog.cls = cls
         }
 
-        me.currentTheme = theme;
+        me.currentTheme = theme
     }
 
     /**
@@ -596,7 +596,7 @@ class MainContainerController extends ComponentController {
             appName: appName,
             add    : [theme],
             remove : [this.currentTheme]
-        });
+        })
     }
 
     /**
@@ -606,11 +606,9 @@ class MainContainerController extends ComponentController {
         let dockedWindowProxy = this.dockedWindowProxy;
 
         if (dockedWindowProxy) {
-            dockedWindowProxy.style = Object.assign(dockedWindowProxy.style || {}, style);
+            dockedWindowProxy.style = Object.assign(dockedWindowProxy.style || {}, style)
         }
     }
 }
 
-Neo.setupClass(MainContainerController);
-
-export default MainContainerController;
+export default Neo.setupClass(MainContainerController);

package/buildScripts/createApp.mjs

@@ -266,9 +266,7 @@ if (programOpts.info) {
                 "    }",
                 "}",
                 "",
-                "Neo.setupClass(MainContainer);",
-                "",
-                "export default MainContainer;"
+                "export default Neo.setupClass(MainContainer);"
             ].join(os.EOL);
 
             fs.writeFileSync(path.join(folder + '/view/MainContainer.mjs'), mainContainerContent);

package/buildScripts/createAppMinimal.mjs

@@ -234,8 +234,8 @@ class ${className} extends Base {
         items:      [{module:MainView}],
     }
 }
-Neo.setupClass(${className});
-export default ${className};
+
+export default Neo.setupClass(${className});
 `;
             fs.writeFileSync(path.join(`${folder}/view/${className}.mjs`), content);
 
@@ -262,16 +262,11 @@ class ${className} extends Base {
     }
 }
 
-Neo.setupClass(${className});
-
-export default ${className};
-            `;
+export default Neo.setupClass(${className});
+`;
             fs.writeFileSync(path.join(`${folder}/view/${className}.mjs`), content);
 
 
-
-
-
             // -------------------------------------------------------------------------
 
             className = 'MainViewController';
@@ -284,16 +279,10 @@ class ${className} extends Base {
     }
 }
 
-Neo.setupClass(${className});
-
-export default ${className};
-            `;
+export default Neo.setupClass(${className});
+`;
             fs.writeFileSync(path.join(`${folder}/view/${className}.mjs`), content);
 
-
-
-
-
             // -------------------------------------------------------------------------
 
             className = 'MainViewModel';
@@ -308,16 +297,10 @@ class ${className} extends Base {
     }
 }
 
-Neo.setupClass(${className});
-
-export default ${className};
-            `;
+export default Neo.setupClass(${className});
+`;
             fs.writeFileSync(path.join(`${folder}/view/${className}.mjs`), content);
 
-
-
-
-
             // -------------------------------------------------------------------------
 
             let appJsonPath = path.resolve(cwd, 'buildScripts/myApps.json'),

package/buildScripts/createClass.mjs

@@ -691,24 +691,8 @@ if (programOpts.info) {
         classContent.push(
             "    }",
             "}",
-            ""
-        );
-
-        if (isSingleton) {
-            classContent.push(
-                `let instance = Neo.setupClass(${file});`,
-                "",
-                "export default instance;"
-            );
-        } else {
-            classContent.push(
-                `Neo.setupClass(${file});`,
-                "",
-                `export default ${file};`
-            );
-        }
-
-        classContent.push(
+            "",
+            `export default Neo.setupClass(${file});`,
             ""
         );
 

package/buildScripts/webpack/development/webpack.config.appworker.mjs

@@ -1,8 +1,10 @@
-import fs      from 'fs-extra';
-import path    from 'path';
-import webpack from 'webpack';
+import fs          from 'fs-extra';
+import path        from 'path';
+import {spawnSync} from 'child_process';
+import webpack     from 'webpack';
 
 const cwd                   = process.cwd(),
+      cpOpts                = {env: process.env, cwd: cwd, stdio: 'inherit', shell: true},
       requireJson           = path => JSON.parse(fs.readFileSync((path))),
       packageJson           = requireJson(path.resolve(cwd, 'package.json')),
       neoPath               = packageJson.name === 'neo.mjs' ? './' : './node_modules/neo.mjs/',
@@ -32,6 +34,17 @@ export default env => {
     fs.mkdirpSync(path.resolve(cwd, buildTarget.folder, 'src/'));
     fs.copySync(inputPath, outputPath);
 
+    const copyResources = resourcesPath => {
+        let inputPath  = path.resolve(cwd, resourcesPath),
+            outputPath = path.resolve(cwd, buildTarget.folder, resourcesPath),
+            childProcess;
+
+        if (fs.existsSync(inputPath)) {
+            childProcess = spawnSync('node', [`${neoPath}/buildScripts/copyFolder.mjs -s ${inputPath} -t ${outputPath}`], cpOpts);
+            childProcess.status && process.exit(childProcess.status);
+        }
+    };
+
     const createStartingPoint = (key, folder) => {
         let basePath       = '',
             workerBasePath = '',
@@ -96,6 +109,7 @@ export default env => {
     parseFolder(apps, path.join(cwd, 'apps'), 0, '');
 
     apps.forEach(key => {
+        copyResources(path.join('apps', key, '/resources'));
         createStartingPoint(key.substr(1), 'apps');
     });
 
@@ -109,6 +123,7 @@ export default env => {
         parseFolder(examples, examplesPath, 0, '');
 
         examples.forEach(key => {
+            copyResources(path.join('examples', key, '/resources'));
             createStartingPoint(key.substr(1), 'examples');
         });
     }

package/buildScripts/webpack/production/webpack.config.appworker.mjs

@@ -1,8 +1,10 @@
-import fs      from 'fs-extra';
-import path    from 'path';
-import webpack from 'webpack';
+import fs          from 'fs-extra';
+import path        from 'path';
+import {spawnSync} from 'child_process';
+import webpack     from 'webpack';
 
 const cwd                   = process.cwd(),
+      cpOpts                = {env: process.env, cwd: cwd, stdio: 'inherit', shell: true},
       requireJson           = path => JSON.parse(fs.readFileSync((path))),
       packageJson           = requireJson(path.resolve(cwd, 'package.json')),
       neoPath               = packageJson.name === 'neo.mjs' ? './' : './node_modules/neo.mjs/',
@@ -36,6 +38,17 @@ export default env => {
     fs.mkdirpSync(path.resolve(cwd, buildTarget.folder, 'src/'));
     fs.writeFileSync(outputPath, content);
 
+    const copyResources = resourcesPath => {
+        let inputPath  = path.resolve(cwd, resourcesPath),
+            outputPath = path.resolve(cwd, buildTarget.folder, resourcesPath),
+            childProcess;
+
+        if (fs.existsSync(inputPath)) {
+            childProcess = spawnSync('node', [`${neoPath}/buildScripts/copyFolder.mjs -s ${inputPath} -t ${outputPath}`], cpOpts);
+            childProcess.status && process.exit(childProcess.status);
+        }
+    };
+
     const createStartingPoint = (key, folder) => {
         let basePath       = '',
             workerBasePath = '',
@@ -105,6 +118,7 @@ export default env => {
     parseFolder(apps, path.join(cwd, 'apps'), 0, '');
 
     apps.forEach(key => {
+        copyResources(path.join('apps', key, '/resources'));
         createStartingPoint(key.substr(1), 'apps');
     });
 
@@ -118,6 +132,7 @@ export default env => {
         parseFolder(examples, examplesPath, 0, '');
 
         examples.forEach(key => {
+            copyResources(path.join('examples', key, '/resources'));
             createStartingPoint(key.substr(1), 'examples');
         });
     }

package/docs/app/model/Api.mjs

@@ -45,6 +45,4 @@ class Api extends Model {
     }
 }
 
-Neo.setupClass(Api);
-
-export default Api;
+export default Neo.setupClass(Api);

package/docs/app/model/Example.mjs

@@ -36,6 +36,4 @@ class Example extends Model {
     }
 }
 
-Neo.setupClass(Example);
-
-export default Example;
+export default Neo.setupClass(Example);

package/docs/app/store/Api.mjs

@@ -27,6 +27,4 @@ class Api extends Store {
     }
 }
 
-Neo.setupClass(Api);
-
-export default Api;
+export default Neo.setupClass(Api);