not-node 5.0.1 → 5.0.4

package/.idea/codeStyles/Project.xml

@@ -0,0 +1,16 @@
+<component name="ProjectCodeStyleConfiguration">
+  <code_scheme name="Project" version="173">
+    <JSCodeStyleSettings version="0">
+      <option name="FORCE_SEMICOLON_STYLE" value="true" />
+    </JSCodeStyleSettings>
+    <codeStyleSettings language="JavaScript">
+      <option name="INDENT_CASE_FROM_SWITCH" value="false" />
+      <option name="ALIGN_MULTILINE_PARAMETERS" value="false" />
+      <option name="ALIGN_MULTILINE_FOR" value="false" />
+      <indentOptions>
+        <option name="INDENT_SIZE" value="2" />
+        <option name="CONTINUATION_INDENT_SIZE" value="2" />
+      </indentOptions>
+    </codeStyleSettings>
+  </code_scheme>
+</component>

package/.idea/codeStyles/codeStyleConfig.xml

@@ -0,0 +1,5 @@
+<component name="ProjectCodeStyleConfiguration">
+  <state>
+    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
+  </state>
+</component>

package/.idea/inspectionProfiles/Project_Default.xml

@@ -0,0 +1,6 @@
+<component name="InspectionProjectProfileManager">
+  <profile version="1.0">
+    <option name="myName" value="Project Default" />
+    <inspection_tool class="Eslint" enabled="true" level="WARNING" enabled_by_default="true" />
+  </profile>
+</component>

package/.idea/modules.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/project.iml" filepath="$PROJECT_DIR$/.idea/project.iml" />
+    </modules>
+  </component>
+</project>

package/.idea/project.iml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="WEB_MODULE" version="4">
+  <component name="NewModuleRootManager">
+    <content url="file://$MODULE_DIR$">
+      <excludeFolder url="file://$MODULE_DIR$/temp" />
+      <excludeFolder url="file://$MODULE_DIR$/.tmp" />
+      <excludeFolder url="file://$MODULE_DIR$/tmp" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>

package/.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+</project>

package/.idea/workspace.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ChangeListManager">
+    <list default="true" id="74929b6a-6f9b-4d33-bcd5-317dea0a2db1" name="Changes" comment="" />
+    <option name="SHOW_DIALOG" value="false" />
+    <option name="HIGHLIGHT_CONFLICTS" value="true" />
+    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
+    <option name="LAST_RESOLUTION" value="IGNORE" />
+  </component>
+  <component name="Git.Settings">
+    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
+  </component>
+  <component name="ProjectId" id="22q8JXHHJZy9UWkJAROmOSSPtVz" />
+  <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
+  <component name="PropertiesComponent">
+    <property name="node.js.detected.package.eslint" value="true" />
+    <property name="node.js.selected.package.eslint" value="(autodetect)" />
+    <property name="vue.rearranger.settings.migration" value="true" />
+  </component>
+  <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
+  <component name="TypeScriptGeneratedFilesManager">
+    <option name="version" value="3" />
+  </component>
+</project>

package/bin/not-builder.js

@@ -31,7 +31,8 @@ let opts = {
 		'to': argv.to || false,
 		'config': argv.config || './project.manifest.json',
 		'rollup': argv.rollup || path.join(process.cwd(),'./node_modules/.bin/rollup'),
-		'role': argv.role || null
+		'role': argv.role || null,
+		'verbose': argv.verbose || false
 	},
 	configName = path.join(process.cwd(), opts.config),
 	config = {};
@@ -258,7 +259,7 @@ async function loadNPMModule(){
 					list.push(...commons);
 					result[role].templates.push(...list);
 				}
-				console.log('result', result);
+				opts.verbose && console.log('result', result);
 			}else{
 				console.info('...no templates');
 			}
@@ -275,7 +276,7 @@ async function loadNPMModule(){
 					list.push(...commons);
 					result[role].styles.push(...list);
 				}
-				console.log('result', result);
+				opts.verbose && console.log('result', result);
 			}else{
 				console.info('...no styles');
 			}
@@ -491,7 +492,7 @@ async function build_Server(pathToRoot, roles, targetName, targetManifest){
 	}else{
 		console.info('no modules in manifest');
 	}
-	console.log('List:', list);
+	opts.verbose && console.log('List:', list);
 	////forming index.js and rollup.js
 	for(let i = 0; i < roles.length; i++){
 		const role = roles[i];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "not-node",
-  "version": "5.0.1",
+  "version": "5.0.4",
   "description": "node complimentary part for client side notFramework.",
   "main": "index.js",
   "scripts": {
@@ -33,37 +33,37 @@
     "url": "https://github.com/interrupter/not-node/issues"
   },
   "dependencies": {
-    "body-parser": "^1.19.1",
+    "body-parser": "^1.20.0",
     "compression": "^1.7.4",
     "connect-mongodb-session": "^3.1.1",
-    "connect-redis": "^6.0.0",
+    "connect-redis": "^6.1.3",
     "cors": "^2.8.5",
     "deep-diff": "*",
     "deepmerge": "^4.2.2",
     "ejs": "^3.1.6",
     "escape-string-regexp": "*",
-    "express": "^4.17.2",
-    "express-fileupload": "^1.2.1",
+    "express": "^4.17.3",
+    "express-fileupload": "^1.3.1",
     "express-session": "^1.17.2",
     "fs-extra": "*",
-    "helmet": "^4.6.0",
+    "helmet": "^5.0.2",
     "lower-case": "*",
     "method-override": "^3.0.0",
     "mock-require": "^3.0.3",
     "mongoose": "*",
     "mongoose-validator": "*",
     "nconf": "*",
-    "not-config": "^0.1.4",
-    "not-error": "^0.2.1",
+    "not-config": "^0.1.5",
+    "not-error": "^0.2.5",
     "not-filter": "*",
-    "not-inform": "^0.0.27",
+    "not-inform": "^0.0.28",
     "not-locale": "*",
     "not-log": "^0.0.20",
     "not-monitor": "^0.0.13",
     "not-path": "*",
-    "not-validation": "^0.0.1",
+    "not-validation": "^0.0.7",
     "rate-limiter-flexible": "^2.3.6",
-    "redis": "^4.0.1",
+    "redis": "^4.0.6",
     "rfdc": "^1.3.0",
     "rmdir": "^1.2.0",
     "serve-static": "*",
@@ -75,18 +75,18 @@
     "babel-eslint": "^10.1.0",
     "chai": "*",
     "chai-as-promised": "*",
-    "eslint": "^8.4.1",
+    "eslint": "^8.12.0",
     "eslint-plugin-node": "^11.1.0",
-    "eslint-plugin-sonarjs": "^0.11.0",
+    "eslint-plugin-sonarjs": "^0.13.0",
     "ink-docstrap": "^1.3.2",
-    "ioredis": "^4.28.2",
-    "jsdoc": "^3.6.7",
+    "ioredis": "^5.0.3",
+    "jsdoc": "^3.6.10",
     "mocha": "*",
     "mocha-suppress-logs": "^0.3.1",
-    "mongodb-memory-server": "^8.0.4",
+    "mongodb-memory-server": "^8.4.2",
     "npm-run-all": "^4.1.5",
     "nyc": "^15.1.0",
-    "retire": "^3.0.3"
+    "retire": "^3.0.6"
   },
   "homepage": "https://github.com/interrupter/not-node#readme",
   "nyc": {

package/src/common.js

@@ -80,7 +80,11 @@ module.exports.getTodayDate = () => {
  *  @param  {string}    name  field name
  *  @return {boolean}          if object contains field with name
  **/
-const objHas = (obj, name) => Object.prototype.hasOwnProperty.call(obj, name);
+const objHas = (obj, name) => {
+  if(typeof obj === 'undefined') return false;
+  if(obj === null) return false;
+  return Object.prototype.hasOwnProperty.call(obj, name);
+};
 module.exports.objHas = objHas;
 
 

package/src/core/fields/email.js

@@ -0,0 +1,11 @@
+module.exports = {
+  ui: {
+    component: 'UIEmail',
+    placeholder: 'not-node:field_email_placeholder',
+    label: 'not-node:field_email_label'
+  },
+  model: {
+    type: String,
+    required: true
+  }
+};

package/src/core/fields/telephone.js

@@ -0,0 +1,11 @@
+module.exports = {
+  ui: {
+    component: 'UITelephone',
+    placeholder: 'not-node:field_telephone_placeholder',
+    label: 'not-node:field_telephone_label'
+  },
+  model: {
+    type: String,
+    required: true
+  }
+};

package/src/core/fields/validators/email.js

@@ -0,0 +1,4 @@
+module.exports = [{
+  validator: 'isEmail',
+  message: 'not-node:email_is_not_valid'
+}];

package/src/core/locales/en.json

@@ -22,6 +22,12 @@
   "field_size_label": "Size",
   "field_size_placeholder": "Size",
 
+  "field_email_label": "Email",
+  "field_email_placeholder": "email@server.com",
+
+  "field_telephone_label": "Tel.",
+  "field_telephone_placeholder": "+1 (111) 111-11-11",
+
   "field_ID_label": "ID",
   "field_ID_placeholder": "ID",
 

package/src/core/locales/ru.json

@@ -22,6 +22,12 @@
   "field_size_label": "Size",
   "field_size_placeholder": "Size",
 
+  "field_email_label": "Email",
+  "field_email_placeholder": "email@server.ru",
+
+  "field_telephone_label": "Тел.",
+  "field_telephone_placeholder": "+7 (111) 111-11-11",
+
   "field_ID_label": "ID",
   "field_ID_placeholder": "ID",
 

package/src/fields/index.js

@@ -124,14 +124,14 @@ module.exports.initManifestFields = (
     rawKeys
       .filter((key) => !privateFields.includes(key))
       .forEach((key) => {
-      let mutation = getMutationForField(key, mutationsList);
-      if (mutation) {
-        list.push(mutation);
-        mutationsList.splice(mutationsList.indexOf(mutation), 1);
-      } else {
-        list.push(key);
-      }
-    });
+        let mutation = getMutationForField(key, mutationsList);
+        if (mutation) {
+          list.push(mutation);
+          mutationsList.splice(mutationsList.indexOf(mutation), 1);
+        } else {
+          list.push(key);
+        }
+      });
     list.push(...mutationsList);
     return module.exports.createSchemaFromFields(app, list, 'ui', moduleName);
   }else{

package/src/form/form.js

@@ -170,7 +170,7 @@ class Form {
   }
 
   #augmentValidationSchema(app){
-    ValidationBuilder(this.#SCHEMA, this.getValidatorEnvGetter());
+    this.#SCHEMA = ValidationBuilder(this.#SCHEMA, this.getValidatorEnvGetter());
   }
 
 

package/src/init/index.js

@@ -127,7 +127,7 @@ class Init {
     additional
   }) {
     try {
-      log.info('Kick start app...'+ os.platform()+os.arch());
+      log.info('Kick start app...'+ os.platform()+' '+os.arch());
       ADDS.init(additional);
       const initSequence = new InitSequence(STANDART_INIT_SEQUENCE);
       await ADDS.run('pre', {
@@ -153,7 +153,8 @@ class Init {
       await ADDS.run('post', {
         config,
         options,
-        manifest
+        manifest,
+        master: Init
       });
       log.info('Application initalization finished');
     } catch (e) {

package/src/manifest/module.js

@@ -59,7 +59,7 @@ class notModule {
     };
     this.fieldsImportRules = (objHas(options, 'fields') && options.fields) ? options.fields : {};
 
-  //  log.info(`Creating module: ${this.getName()}`);
+    //  log.info(`Creating module: ${this.getName()}`);
     this.init();
     return this;
   }