neo.mjs 4.0.50 → 4.0.51

package/buildScripts/createClass.mjs

@@ -54,7 +54,7 @@ if (programOpts.info) {
             type   : 'input',
             name   : 'className',
             message: 'Please choose the namespace for your class:',
-            default: 'Covid.view.FooContainer'
+            default: 'Covid.view.HeaderContainerController'
         });
     }
 
@@ -63,8 +63,8 @@ if (programOpts.info) {
             type   : 'list',
             name   : 'baseClass',
             message: 'Please pick the base class, which you want to extend:',
-            choices: ['component.Base', 'container.Base'],
-            default: 'component.Base'
+            choices: ['component.Base', 'container.Base', 'controller.Component', 'core.Base'],
+            default: 'container.Base'
         });
     }
 
@@ -72,7 +72,7 @@ if (programOpts.info) {
         let baseClass = programOpts.baseClass || answers.baseClass,
             className = programOpts.className || answers.className,
             startDate = new Date(),
-            classFolder, file, folderDelta, ns, root, rootLowerCase;
+            classFolder, file, folderDelta, index, ns, root, rootLowerCase, viewFile;
 
         if (className.endsWith('.mjs')) {
             className = className.slice(0, -4);
@@ -93,6 +93,18 @@ if (programOpts.info) {
                 fs.mkdirpSync(classFolder);
 
                 fs.writeFileSync(path.join(classFolder, file + '.mjs'), createContent({baseClass, className, file, folderDelta, ns, root}));
+
+                if (baseClass === 'controller.Component') {
+                    index = file.indexOf('Controller');
+
+                    if (index > 0) {
+                        viewFile = path.join(classFolder, file.substr(0, index) + '.mjs');
+
+                        if (fs.existsSync(viewFile)) {
+                            adjustView({file, viewFile});
+                        }
+                    }
+                }
             } else {
                 console.log('\nNon existing neo app name:', chalk.red(root));
                 process.exit(1);
@@ -108,9 +120,84 @@ if (programOpts.info) {
     /**
      * Adds a comma to the last element of the contentArray
      * @param {String[]} contentArray
+     * @returns {String[]}
      */
     function addComma(contentArray) {
         contentArray[contentArray.length - 1] += ',';
+        return contentArray;
+    }
+
+    /**
+     * Adjusts the views related to controller.Component or model.Component
+     * @param {Object} opts
+     * @param {String} opts.file
+     * @param {String} opts.viewFile
+     */
+    function adjustView(opts) {
+        let 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;
+
+        // find the index where we want to insert our import statement
+        for (; i < len; i++) {
+            codeLine = content[i];
+
+            if (codeLine === '') {
+                break;
+            }
+
+            importName   = codeLine.substr(7);
+            importName   = importName.substr(0, importName.indexOf(' '));
+            importLength = importName.length;
+
+            if (importName > file) {
+                break;
+            }
+        }
+
+        content.splice(i, 0, `import ${file} from './${file}.mjs';`);
+
+        // find the longest import module name
+        for (i=0; i < len; i++) {
+            codeLine = content[i];
+
+            if (codeLine === '') {
+                break;
+            }
+
+            fromMaxPosition = Math.max(fromMaxPosition, codeLine.indexOf('from'));
+        }
+
+        // adjust the block-formatting for imports
+        for (i=0; i < len; i++) {
+            codeLine = content[i];
+
+            if (codeLine === '') {
+                break;
+            }
+
+            fromPosition = codeLine.indexOf('from');
+            adjustSpaces = fromMaxPosition - fromPosition;
+
+            if (adjustSpaces > 0) {
+                spaces = '';
+
+                for (j=0; j < adjustSpaces; j++) {
+                    spaces += ' ';
+                }
+
+                content[i] = codeLine.substr(0, fromPosition) + spaces + codeLine.substr(fromPosition);
+            }
+        }
+
+        fs.writeFileSync(viewFile, content.join(os.EOL));
+
+        console.log(i, opts.file);
+        console.log(content);
     }
 
     /**
@@ -125,13 +212,13 @@ if (programOpts.info) {
      * @returns {String}
      */
     function createContent(opts) {
-        let baseClass     = opts.baseClass,
-            baseClassNs   = baseClass.split('.'),
+        let baseClass    = opts.baseClass,
+            baseClassNs  = baseClass.split('.'),
             baseFileName = baseClassNs.pop(),
-            className     = opts.className,
-            file          = opts.file,
-            i             = 0,
-            importDelta   = '';
+            className    = opts.className,
+            file         = opts.file,
+            i            = 0,
+            importDelta  = '';
 
         for (; i < opts.folderDelta; i++) {
             importDelta += '../';
@@ -141,8 +228,8 @@ if (programOpts.info) {
             `import ${baseFileName} from '${importDelta}${(insideNeo ? '' : 'node_modules/neo.mjs/')}src/${baseClassNs.join('/')}/${baseFileName}.mjs';`,
             "",
             "/**",
-            " * @class " + className,
-            " * @extends Neo." + baseClass,
+            ` * @class ${className}`,
+            ` * @extends Neo.${baseClass}`,
             " */",
             `class ${file} extends ${baseFileName} {`,
             "    static getConfig() {return {",
@@ -153,28 +240,20 @@ if (programOpts.info) {
             `        className: '${className}'`
         ];
 
-        if (baseClass === 'component.Base') {
-            addComma(classContent);
-
-            classContent.push(
+        baseClass === 'container.Base' && addComma(classContent).push(
             "        /*",
-            "         * @member {Object} _vdom",
+            "         * @member {Object[]} items",
             "         */",
-            "        _vdom:",
-            "        {}",
-            );
-        }
-
-        if (baseClass === 'container.Base') {
-            addComma(classContent);
+            "        items: []"
+        );
 
-            classContent.push(
+        baseClass === 'component.Base' && addComma(classContent).push(
             "        /*",
-            "         * @member {Object[]} items",
+            "         * @member {Object} _vdom",
             "         */",
-            "        items: []",
-            );
-        }
+            "        _vdom:",
+            "        {}"
+        );
 
         classContent.push(
             "    }}",

package/package.json

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

package/src/form/field/Number.mjs

@@ -174,6 +174,28 @@ class Number extends Text {
         return this.beforeSetEnumValue(value, oldValue, 'triggerPosition');
     }
 
+    /**
+     * @returns {Boolean}
+     */
+    isValid() {
+        let me    = this,
+            value = me.value;
+
+        if (Neo.isNumber(me.maxValue) && value > me.maxValue) {
+            return false;
+        }
+
+        if (Neo.isNumber(me.minValue) && value < me.minValue) {
+            return false;
+        }
+
+        if (value % me.stepSize !== 0) {
+            return false;
+        }
+
+        return super.isValid();
+    }
+
     /**
      *
      */

package/src/form/field/Text.mjs

@@ -93,6 +93,16 @@ class Text extends Base {
          * @member {Number|String} labelWidth_=150
          */
         labelWidth_: 150,
+        /**
+         * The maximum amount of chars which you can enter into this field
+         * @member {Number|null} maxLength_=null
+         */
+        maxLength_: null,
+        /**
+         * The minimum amount of chars which you can enter into this field
+         * @member {Number|null} minLength_=null
+         */
+        minLength_: null,
         /**
          * @member {String|null} placeholderText_=null
          */
@@ -358,6 +368,26 @@ class Text extends Base {
         }
     }
 
+    /**
+     * Triggered after the maxLength config got changed
+     * @param {Number|null} value
+     * @param {Number|null} oldValue
+     * @protected
+     */
+    afterSetMaxLength(value, oldValue) {
+        this.changeInputElKey('maxlength', value);
+    }
+
+    /**
+     * Triggered after the minLength config got changed
+     * @param {Number|null} value
+     * @param {Number|null} oldValue
+     * @protected
+     */
+    afterSetMinLength(value, oldValue) {
+        this.changeInputElKey('minlength', value);
+    }
+
     /**
      * Triggered after the mounted config got changed
      * @param {Boolean} value
@@ -776,9 +806,19 @@ class Text extends Base {
      * @returns {Boolean}
      */
     isValid() {
-        let me = this;
+        let me          = this,
+            value       = me.value,
+            valueLength = value?.toString().length;
+
+        if (me.required && (!value || valueLength < 1)) {
+            return false;
+        }
+
+        if (Neo.isNumber(me.maxLength) && valueLength > me.maxLength) {
+            return false;
+        }
 
-        if (me.required && (!me.value || me.value?.length < 1)) {
+        if (Neo.isNumber(me.minLength) && valueLength < me.minLength) {
             return false;
         }