neo.mjs 4.0.61 → 4.0.64

package/buildScripts/createClass.mjs

@@ -27,7 +27,7 @@ const
        * folder (parent of cwd, child of sourceRootDirs[n]) will then be used as the
        * namespace for this created class.
        * Can be overwritten with the -s option.
-       * @type {string[]}
+       * @type {String[]}
        */
       sourceRootDirs = ['apps'];
 
@@ -94,7 +94,7 @@ if (programOpts.info) {
             type   : 'input',
             name   : 'className',
             message: 'Please choose the namespace for your class:',
-            default: 'Covid.view.HeaderContainerController'
+            default: 'Covid.view.MyContainer'
         });
     }
 
@@ -103,7 +103,7 @@ if (programOpts.info) {
             type   : 'list',
             name   : 'baseClass',
             message: 'Please pick the base class, which you want to extend:',
-            choices: ['component.Base', 'container.Base', 'controller.Component', 'core.Base'],
+            choices: ['component.Base', 'container.Base', 'controller.Component', 'core.Base', 'model.Component'],
             default: 'container.Base'
         });
     }
@@ -113,7 +113,7 @@ if (programOpts.info) {
             className = programOpts.className || answers.className,
             isDrop    = programOpts.drop,
             startDate = new Date(),
-            classFolder, file, folderDelta, index, ns, root, rootLowerCase, viewFile;
+            baseType, classFolder, configName, file, folderDelta, index, ns, root, rootLowerCase, viewFile;
 
         if (className.endsWith('.mjs')) {
             className = className.slice(0, -4);
@@ -201,13 +201,27 @@ if (programOpts.info) {
             fs.writeFileSync(path.join(classFolder, file + '.mjs'), createContent({baseClass, className, file, folderDelta, ns, root}));
 
             if (baseClass === 'controller.Component') {
-                index = file.indexOf('Controller');
+                baseType   = 'Neo.controller.Component';
+                configName = 'controller';
+                index      = file.indexOf('Controller');
 
                 if (index > 0) {
                     viewFile = path.join(classFolder, file.substr(0, index) + '.mjs');
 
                     if (fs.existsSync(viewFile)) {
-                        adjustView({file, viewFile});
+                        adjustView({baseType, configName, file, viewFile});
+                    }
+                }
+            } else if (baseClass === 'model.Component') {
+                baseType   = 'Neo.model.Component';
+                configName = 'model';
+                index      = file.indexOf('Model');
+
+                if (index > 0) {
+                    viewFile = path.join(classFolder, file.substr(0, index) + '.mjs');
+
+                    if (fs.existsSync(viewFile)) {
+                        adjustView({baseType, configName, file, viewFile});
                     }
                 }
             }
@@ -222,27 +236,57 @@ if (programOpts.info) {
     /**
      * Adds a comma to the last element of the contentArray
      * @param {String[]} contentArray
+     * @param {Number} index=contentArray.length - 1
      * @returns {String[]}
      */
-    function addComma(contentArray) {
-        contentArray[contentArray.length - 1] += ',';
+    function addComma(contentArray, index=contentArray.length - 1) {
+        contentArray[index] += ',';
         return contentArray;
     }
 
+    /**
+     * Adds a config to the given index of the contentArray
+     * @param {Object} opts
+     * @param {String} opts.baseType
+     * @param {String} opts.className
+     * @param {String} opts.configName
+     * @param {String[]} opts.contentArray
+     * @param {Boolean} opts.isLastConfig
+     * @param {Number} opts.index
+     * @returns {String[]}
+     */
+    function addConfig(opts) {
+        const config = [
+            '        /**',
+            `         * @member {${opts.baseType}} ${opts.configName}=${opts.className}`,
+            '         */',
+            `        ${opts.configName}: ${opts.className}`
+        ];
+
+        !opts.isLastConfig && addComma(config);
+
+        opts.contentArray.splice(opts.index, 0, config.join(os.EOL));
+        return opts.contentArray;
+    }
+
     /**
      * Adjusts the views related to controller.Component or model.Component
      * @param {Object} opts
+     * @param {String} opts.baseType
+     * @param {String} opts.configName
      * @param {String} opts.file
      * @param {String} opts.viewFile
      */
     function adjustView(opts) {
-        let file            = opts.file,
+        let baseType        = opts.baseType,
+            configName      = opts.configName,
+            file            = opts.file,
             viewFile        = opts.viewFile,
             content         = fs.readFileSync(viewFile).toString().split(os.EOL),
             fromMaxPosition = 0,
             i               = 0,
             len             = content.length,
-            adjustSpaces, codeLine, fromPosition, importLength, importName, j, spaces;
+            adjustSpaces, className, codeLine, fromPosition, importLength, importName, j, nextLine, spaces;
 
         // find the index where we want to insert our import statement
         for (; i < len; i++) {
@@ -296,10 +340,60 @@ if (programOpts.info) {
             }
         }
 
-        fs.writeFileSync(viewFile, content.join(os.EOL));
+        i   = 0;
+        len = content.length;
+
+        // find the starting point
+        for (; i < len; i++) {
+            if (content[i].includes('static getConfig')) {
+                break;
+            }
+        }
+
+        for (; i < len; i++) {
+            codeLine = content[i];
+
+            if (codeLine.includes('}}')) {
+                addComma(content, i - 1);
+                addConfig({
+                    baseType,
+                    className   : file,
+                    configName,
+                    contentArray: content,
+                    index       : i,
+                    isLastConfig: true
+                });
+                break;
+            }
 
-        console.log(i, opts.file);
-        console.log(content);
+            if (codeLine.includes('*/')) {
+                nextLine  = content[i + 1]
+                className = nextLine.substring(0, nextLine.indexOf(':')).trim();
+
+                if (className === 'className' || className === 'ntype') {
+                    continue;
+                }
+
+                if (className > configName) {
+                    for (j=i; j > 0; j--) {
+                        if (content[j].includes('/**')) {
+                            addConfig({
+                                baseType,
+                                className   : file,
+                                configName,
+                                contentArray: content,
+                                index       : j,
+                                isLastConfig: false
+                            });
+                            break;
+                        }
+                    }
+                    break;
+                }
+            }
+        }
+
+        fs.writeFileSync(viewFile, content.join(os.EOL));
     }
 
     /**

package/package.json

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

package/src/DefaultConfig.mjs

@@ -98,7 +98,10 @@ const DefaultConfig = {
     /**
      * Add addons for the main thread
      * Possible values: AmCharts, AnalyticsByGoogle, DragDrop, HighlightJS, LocalStorage, MapboxGL, Markdown, Siesta, Stylesheet, WindowPosition
-     * (src/main/addon)
+     * (src/main/addon) contains all framework related options.
+     * You can also create your own addons within your workspace scope. Make sure to put them inside 'src/main/addon/'
+     * and prefix them with 'WS/' inside your neo-config.json file.
+     * Example: ['DragDrop', 'Stylesheet', 'WS/MyAddon']
      * @default ['DragDrop','Stylesheet']
      * @memberOf! module:Neo
      * @name config.mainThreadAddons

package/src/Main.mjs

@@ -215,7 +215,11 @@ class Main extends core.Base {
         }
 
         mainThreadAddons.forEach(addon => {
-            imports.push(import(`./main/addon/${addon}.mjs`));
+            if (addon.startsWith('WS/')) {
+                imports.push(import(`../../../src/main/addon/${addon.substr(3)}.mjs`));
+            } else {
+                imports.push(import(`./main/addon/${addon}.mjs`));
+            }
         });
 
         modules = await Promise.all(imports);