not-node 4.0.21 → 5.0.3

package/.eslintrc.json

@@ -1,5 +1,4 @@
 {
-  "parser": "@babel/eslint-parser",
   "parserOptions": {
     "requireConfigFile": false,
     "sourceType": "module",
@@ -7,7 +6,7 @@
     "ecmaFeatures": {
       "globalReturn": false
     },
-    "ecmaVersion": 2020
+    "ecmaVersion": "latest"
   },
   "env": {
     "es6": true,
@@ -18,10 +17,8 @@
   "extends": [
     "eslint:recommended",
     "plugin:node/recommended",
-		"plugin:sonarjs/recommended",
-    "plugin:promise/recommended"
+		"plugin:sonarjs/recommended"
   ],
-	"plugins": ["promise"],
   "rules": {
     "node/exports-style": ["error", "module.exports"],
     "node/file-extension-in-import": ["error", "always"],
@@ -30,8 +27,6 @@
     "node/prefer-global/process": ["error", "always"],
     "node/prefer-global/url-search-params": ["error", "always"],
     "node/prefer-global/url": ["error", "always"],
-    "node/prefer-promises/dns": "error",
-    "node/prefer-promises/fs": "error",
     "node/no-unpublished-require": "warn",
     "indent": ["error", 2],
     "linebreak-style": [

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/package.json

@@ -1,12 +1,12 @@
 {
   "name": "not-node",
-  "version": "4.0.21",
+  "version": "5.0.3",
   "description": "node complimentary part for client side notFramework.",
   "main": "index.js",
   "scripts": {
     "test": "./node_modules/.bin/mocha --require mocha-suppress-logs --reporter spec  --timeout 12000",
-    "lint": "./node_modules/.bin/eslint ./src/**/**/**/**.js --fix",
-    "pretest": "./node_modules/.bin/eslint ./src/**/**/**/**.js",
+    "lint": "./node_modules/.bin/eslint ./src --fix",
+    "pretest": "./node_modules/.bin/eslint ./src",
     "docs": "./node_modules/.bin/jsdoc -c jsdoc.json",
     "js-watch": "watch 'npm run cover' ./src ./test --interval=5",
     "watch:build:cover:dev": "npm-run-all --parallel js-watch",
@@ -33,60 +33,60 @@
     "url": "https://github.com/interrupter/not-node/issues"
   },
   "dependencies": {
-    "body-parser": "^1.19.0",
+    "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.1",
-    "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.7",
     "rate-limiter-flexible": "^2.3.6",
-    "redis": "^4.0.0",
+    "redis": "^4.0.6",
     "rfdc": "^1.3.0",
     "rmdir": "^1.2.0",
     "serve-static": "*",
     "simple-git": "*",
+    "validator": "*",
     "yargs": "*"
   },
   "devDependencies": {
-    "@babel/eslint-parser": "^7.16.3",
     "babel-eslint": "^10.1.0",
     "chai": "*",
     "chai-as-promised": "*",
-    "eslint": "^7.0.0",
+    "eslint": "^8.12.0",
     "eslint-plugin-node": "^11.1.0",
-    "eslint-plugin-promise": "^5.2.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/app.js

@@ -61,8 +61,8 @@ class notApp extends notDomain {
    **/
   collectManifest(creds){
     let manifest = {};
-    for (let modName of Object.keys(this.modules)) {
-      manifest = merge(manifest, this.modules[modName].getManifest(creds));
+    for (let modName of this.getModulesNames()) {
+      manifest = merge(manifest, this.getModule(modName).getManifest(creds));
     }
     return manifest;
   }

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/config.json

@@ -54,8 +54,6 @@
   },
   "lang": {},
   "modules": {
-    "options": {},
-    "informer": {},
     "filter": {
       "size": 15,
       "default": {
@@ -73,25 +71,13 @@
     }
   },
   "middleware": {
-    "not-user": {},
-    "not-locale": {},
-    "not-options": {}
+    "not-locale": {}
   },
   "importModulesFromNPM": [
-    "not-user",
-    "not-notification",
-    "not-inform",
     "not-locale",
-    "not-inform-rule-tag",
-    "not-inform-sink-email",
-    "not-inform-sink-notification",
-    "not-inform-sink-ws",
     "not-dbdump",
     "not-ws",
-    "not-options",
     "not-filter",
-    "not-one-time-code",
-    "not-error",
-    "not-key"
+    "not-error"
   ]
 }

package/src/core/fields/ID.js

@@ -1,8 +1,8 @@
 module.exports = {
   ui: {
     component: 'UITextfield',
-    placeholder: 'core:field_ID_placeholder',
-    label: 'core:field_ID_label',
+    placeholder: 'not-node:field_ID_placeholder',
+    label: 'not-node:field_ID_label',
     readonly: true
   }
 };

package/src/core/fields/__closed.js

@@ -0,0 +1,5 @@
+module.exports = {
+  ui:{
+    component: 'UIHidden'
+  }
+};

package/src/core/fields/__latest.js

@@ -0,0 +1,5 @@
+module.exports = {
+  ui:{
+    component: 'UIHidden'
+  }
+};

package/src/core/fields/__version.js

@@ -0,0 +1,5 @@
+module.exports = {
+  ui:{
+    component: 'UIHidden'
+  }
+};

package/src/core/fields/__versions.js

@@ -0,0 +1,5 @@
+module.exports = {
+  ui:{
+    component: 'UIHidden'
+  }
+};

package/src/core/fields/active.js

@@ -1,7 +1,7 @@
 module.exports = {
   ui:{
     component: 'UISwitch',
-    label: 'core:field_active_label'
+    label: 'not-node:field_active_label'
   },
   model:{
     type: Boolean,

package/src/core/fields/codeName.js

@@ -1,8 +1,8 @@
 module.exports = {
   ui: {
     component: 'UITextfield',
-    placeholder: 'core:field_codeName_placeholder',
-    label: 'core:field_codeName_label'
+    placeholder: 'not-node:field_codeName_placeholder',
+    label: 'not-node:field_codeName_label'
   },
   model: {
     type: String,

package/src/core/fields/createdAt.js

@@ -1,8 +1,8 @@
 module.exports = {
   ui:{
     component: 'UITextfield',
-    label: 'core:field_createdAt_label',
-    placeholder: "core:field_createdAt_placeholder",
+    label: 'not-node:field_createdAt_label',
+    placeholder: "not-node:field_createdAt_placeholder",
     readonly: true
   },
   model: {

package/src/core/fields/default.js

@@ -1,7 +1,7 @@
 module.exports = {
   ui:{
     component: 'UISwitch',
-    label: 'core:field_default_label'
+    label: 'not-node:field_default_label'
   },
   model:{
     type: Boolean,

package/src/core/fields/description.js

@@ -1,8 +1,8 @@
 module.exports = {
   ui:{
     component: 'UITextarea',
-    placeholder: 'core:field_description_placeholder',
-    label: 'core:field_description_label'
+    placeholder: 'not-node:field_description_placeholder',
+    label: 'not-node:field_description_label'
   },
   model:{
     type: String,

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/enabled.js

@@ -1,7 +1,7 @@
 module.exports = {
   ui:{
     component: 'UISwitch',
-    label: 'core:field_enabled_label'
+    label: 'not-node:field_enabled_label'
   },
   model:{
     type: Boolean,

package/src/core/fields/expiredAt.js

@@ -1,8 +1,8 @@
 module.exports = {
   ui:{
     component: 'UITextfield',
-    label: 'core:field_expiredAt_label',
-    placeholder: 'core:field_expiredAt_placeholder',
+    label: 'not-node:field_expiredAt_label',
+    placeholder: 'not-node:field_expiredAt_placeholder',
     readonly: true
   },
   model:{

package/src/core/fields/height.js

@@ -1,8 +1,8 @@
 module.exports = {
   ui:{
     component: 'UITextfield',
-    label: 'core:field_height_label',
-    placeholder: 'core:field_height_placeholder'
+    label: 'not-node:field_height_label',
+    placeholder: 'not-node:field_height_placeholder'
   },
   model:{
     type: Number,

package/src/core/fields/ip.js

@@ -1,8 +1,8 @@
 module.exports = {
   ui:{
     component: 'UITextfield',
-    label: 'core:field_IP_label',
-    placeholder: 'core:field_IP_placeholder'
+    label: 'not-node:field_IP_label',
+    placeholder: 'not-node:field_IP_placeholder'
   },
   model:{
     type: String,

package/src/core/fields/objectId.js

@@ -0,0 +1,13 @@
+const ObjectId = require('mongoose').Schema.Types.ObjectId;
+
+module.exports = {
+  model: {
+    type: ObjectId,
+    required: true,
+    default: {},
+    safe: {
+      update: ['@owner', 'root', 'admin'],
+      read: ['@owner', 'root', 'admin']
+    }
+  }
+};

package/src/core/fields/owner.js

@@ -8,5 +8,8 @@ module.exports = {
       update: ['root', 'admin'],
       read: ['@owner', 'root', 'admin']
     }
+  },
+  ui:{
+    component: 'UIHidden'
   }
 };

package/src/core/fields/ownerModel.js

@@ -6,5 +6,8 @@ module.exports = {
       update: ['@owner', 'root', 'admin'],
       read: ['@owner', 'root', 'admin']
     }
+  },
+  ui:{
+    component: 'UIHidden'
   }
 };

package/src/core/fields/price.js

@@ -1,8 +1,8 @@
 module.exports = {
   ui:{
     component: 'UITextfield',
-    placeholder: 'core:field_price_placeholder',
-    label: 'core:field_price_label'
+    placeholder: 'not-node:field_price_placeholder',
+    label: 'not-node:field_price_label'
   },
   model:{
     type: Number,

package/src/core/fields/session.js

@@ -1,8 +1,8 @@
 module.exports = {
   ui:{
     component: 'UITextfield',
-    label: 'core:field_session_label',
-    placeholder: 'core:field_session_placeholder'
+    label: 'not-node:field_session_label',
+    placeholder: 'not-node:field_session_placeholder'
   },
   model:{
     type: String,

package/src/core/fields/size.js

@@ -1,8 +1,8 @@
 module.exports = {
   ui:{
     component: 'UITextfield',
-    label: 'core:field_size_label',
-    placeholder: 'core:field_size_placeholder'
+    label: 'not-node:field_size_label',
+    placeholder: 'not-node:field_size_placeholder'
   },
   model:{
     type: Number,

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/title.js

@@ -1,8 +1,8 @@
 module.exports = {
   ui: {
     component: 'UITextfield',
-    label: 'core:field_title_label',
-    placeholder: 'core:field_title_placeholder',
+    label: 'not-node:field_title_label',
+    placeholder: 'not-node:field_title_placeholder',
   },
   model: {
     type: String,

package/src/core/fields/updatedAt.js

@@ -1,8 +1,8 @@
 module.exports = {
   ui:{
     component: 'UITextfield',
-    label: 'core:field_updatedAt_label',
-    placeholder: 'core:field_updatedAt_placeholder',
+    label: 'not-node:field_updatedAt_label',
+    placeholder: 'not-node:field_updatedAt_placeholder',
     readonly: true
   },
   model: {

package/src/core/fields/userId.js

@@ -4,8 +4,8 @@ const Schema = require('mongoose').Schema;
 module.exports = {
   ui:{
     component: 'UITextfield',
-    label: 'core:field_userId_label',
-    placeholder: 'core:field_userId_placeholder'
+    label: 'not-node:field_userId_label',
+    placeholder: 'not-node:field_userId_placeholder'
   },
   model: {
     type: Schema.Types.ObjectId,

package/src/core/fields/uuid.js

@@ -1,8 +1,8 @@
 module.exports = {
   ui: {
     component: 'UITextfield',
-    placeholder: 'core:field_UUID_placeholder',
-    label: 'core:field_UUID_label',
+    placeholder: 'not-node:field_UUID_placeholder',
+    label: 'not-node:field_UUID_label',
     readonly: true
   },
   model:{

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/fields/validators/owner.js

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

package/src/core/fields/width.js

@@ -1,8 +1,8 @@
 module.exports = {
   ui:{
     component: 'UITextfield',
-    placeholder: 'core:field_width_placeholder',
-    label: 'core:field_width_label'
+    placeholder: 'not-node:field_width_placeholder',
+    label: 'not-node:field_width_label'
   },
   model:{
     type: Number,

package/src/core/index.js

@@ -0,0 +1,6 @@
+const {generatePaths} = require('../common');
+
+module.exports = {
+  name: 'not-node',
+  paths: generatePaths(['fields', 'locales'], __dirname)
+};

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",