not-node 4.0.18 → 5.0.1

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

@@ -1,12 +1,12 @@
 {
   "name": "not-node",
-  "version": "4.0.18",
+  "version": "5.0.1",
   "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,7 +33,7 @@
     "url": "https://github.com/interrupter/not-node/issues"
   },
   "dependencies": {
-    "body-parser": "^1.19.0",
+    "body-parser": "^1.19.1",
     "compression": "^1.7.4",
     "connect-mongodb-session": "^3.1.1",
     "connect-redis": "^6.0.0",
@@ -42,7 +42,7 @@
     "deepmerge": "^4.2.2",
     "ejs": "^3.1.6",
     "escape-string-regexp": "*",
-    "express": "^4.17.1",
+    "express": "^4.17.2",
     "express-fileupload": "^1.2.1",
     "express-session": "^1.17.2",
     "fs-extra": "*",
@@ -61,22 +61,22 @@
     "not-log": "^0.0.20",
     "not-monitor": "^0.0.13",
     "not-path": "*",
+    "not-validation": "^0.0.1",
     "rate-limiter-flexible": "^2.3.6",
-    "redis": "^4.0.0",
+    "redis": "^4.0.1",
     "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.4.1",
     "eslint-plugin-node": "^11.1.0",
-    "eslint-plugin-promise": "^5.2.0",
     "eslint-plugin-sonarjs": "^0.11.0",
     "ink-docstrap": "^1.3.2",
     "ioredis": "^4.28.2",

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

@@ -1,4 +1,5 @@
 const fs = require('fs');
+const path = require('path');
 const notPath = require('not-path');
 
 /** @module Common */
@@ -8,7 +9,7 @@ const notPath = require('not-path');
  * @return {string}        result
  */
 
-module.exports.firstLetterToLower = function (string) {
+module.exports.firstLetterToLower = function(string) {
   return string.charAt(0).toLowerCase() + string.slice(1);
 };
 
@@ -18,7 +19,7 @@ module.exports.firstLetterToLower = function (string) {
  * @return {string}        result
  */
 
-module.exports.firstLetterToUpper = function (string) {
+module.exports.firstLetterToUpper = function(string) {
   return string.charAt(0).toUpperCase() + string.slice(1);
 };
 
@@ -27,10 +28,10 @@ module.exports.firstLetterToUpper = function (string) {
  *  @param  {string}  id   ObjectId string to validate
  *  @return {booelean}  true if check is not failed
  */
-module.exports.validateObjectId = (id)=>{
-  try{
-    return id.match(/^[0-9a-fA-F]{24}$/)?true:false;
-  }catch(e){
+module.exports.validateObjectId = (id) => {
+  try {
+    return id.match(/^[0-9a-fA-F]{24}$/) ? true : false;
+  } catch (e) {
     return false;
   }
 };
@@ -41,24 +42,24 @@ module.exports.validateObjectId = (id)=>{
  *  @param  {string|ObjectId}  secondId   second id
  *  @return {booelean}        true if equal
  */
-module.exports.compareObjectIds = (firstId, secondId)=>{
-  try{
-    let a = firstId, b = secondId;
-    if(typeof firstId !== 'string'){
+module.exports.compareObjectIds = (firstId, secondId) => {
+  try {
+    let a = firstId,
+      b = secondId;
+    if (typeof firstId !== 'string') {
       a = a.toString();
     }
-    if(typeof secondId !== 'string'){
+    if (typeof secondId !== 'string') {
       b = b.toString();
     }
-    if(
-      !module.exports.validateObjectId(a)
-      ||
+    if (
+      !module.exports.validateObjectId(a) ||
       !module.exports.validateObjectId(b)
-    ){
+    ) {
       return false;
     }
     return a === b;
-  }catch(e){
+  } catch (e) {
     return false;
   }
 };
@@ -67,9 +68,9 @@ module.exports.compareObjectIds = (firstId, secondId)=>{
  *  Returns today Date object without hours, minutes, seconds
  *  @return {number}  current date with 00:00:00 in ms of unix time
  */
-module.exports.getTodayDate = ()=>{
+module.exports.getTodayDate = () => {
   let t = new Date();
-  return (new Date(t.getFullYear(), t.getMonth(),t.getDate())).getTime();
+  return (new Date(t.getFullYear(), t.getMonth(), t.getDate())).getTime();
 };
 
 
@@ -84,22 +85,22 @@ module.exports.objHas = objHas;
 
 
 /**
-* Copies object to secure it from changes
-* @param {object}   obj     original object
-* @return {object}          copy of object
-**/
+ * Copies object to secure it from changes
+ * @param {object}   obj     original object
+ * @return {object}          copy of object
+ **/
 module.exports.copyObj = (obj) => {
   return JSON.parse(JSON.stringify(obj));
 };
 
 /**
-* Copies object to secure it from changes
-* @param {object}   obj     original object
-* @return {object}          copy of object
-**/
+ * Copies object to secure it from changes
+ * @param {object}   obj     original object
+ * @return {object}          copy of object
+ **/
 module.exports.partCopyObj = (obj, list) => {
-  let partObj =  Object.keys(obj).reduce((prev, curr)=>{
-    if(list.includes(curr)){
+  let partObj = Object.keys(obj).reduce((prev, curr) => {
+    if (list.includes(curr)) {
       prev[curr] = obj[curr];
     }
     return prev;
@@ -109,38 +110,38 @@ module.exports.partCopyObj = (obj, list) => {
 
 
 /**
-* Test argument type to be 'function'
-* @param {any}  func    possible function
-* @return {boolean}     if this is a function
-**/
+ * Test argument type to be 'function'
+ * @param {any}  func    possible function
+ * @return {boolean}     if this is a function
+ **/
 const isFunc = module.exports.isFunc = (func) => {
   return typeof func === 'function';
 };
 
 /**
-* Returns true if argument is Async function
-* @param {function} func  to test
-* @return {boolean}       if this function is constructed as AsyncFunction
-**/
+ * Returns true if argument is Async function
+ * @param {function} func  to test
+ * @return {boolean}       if this function is constructed as AsyncFunction
+ **/
 const isAsync = module.exports.isAsync = (func) => {
   return func.constructor.name === 'AsyncFunction';
 };
 
 
 /**
-*  Executes method of object in appropriate way inside Promise
-* @param {object}   obj     original object
-* @param {string}   name    method name to execute
-* @param {Array}     params  array of params
-* @return {Promise}          results of method execution
-**/
+ *  Executes method of object in appropriate way inside Promise
+ * @param {object}   obj     original object
+ * @param {string}   name    method name to execute
+ * @param {Array}     params  array of params
+ * @return {Promise}          results of method execution
+ **/
 module.exports.executeObjectFunction = async (obj, name, params) => {
-  if (obj){
+  if (obj) {
     const proc = notPath.get(':' + name, obj);
-    if(isFunc(proc)){
-      if(isAsync(proc)){
+    if (isFunc(proc)) {
+      if (isAsync(proc)) {
         return await proc(...params);
-      }else{
+      } else {
         return proc(...params);
       }
     }
@@ -149,14 +150,14 @@ module.exports.executeObjectFunction = async (obj, name, params) => {
 
 
 /**
-*  Executes method of object in apropriate way inside Promise
-* @param {Object}   from     original object
-* @param {Object}   name    method name to execute
-* @param {Array}     list  array of params
-* @return {Promise}          results of method execution
-**/
+ *  Executes method of object in apropriate way inside Promise
+ * @param {Object}   from     original object
+ * @param {Object}   name    method name to execute
+ * @param {Array}     list  array of params
+ * @return {Promise}          results of method execution
+ **/
 module.exports.mapBind = (from, to, list) => {
-  list.forEach((item)=>{
+  list.forEach((item) => {
     if (typeof from[item] === 'function') {
       to[item] = from[item].bind(from);
     }
@@ -165,10 +166,10 @@ module.exports.mapBind = (from, to, list) => {
 
 
 /**
-*  Synchronously check file existence and if it's really a file
-* @param {string}     filePath  full path to file
-* @return {boolean}            true if path exists and it's a file
-**/
+ *  Synchronously check file existence and if it's really a file
+ * @param {string}     filePath  full path to file
+ * @return {boolean}            true if path exists and it's a file
+ **/
 module.exports.tryFile = (filePath) => {
   try {
     const stat = fs.lstatSync(filePath);
@@ -177,3 +178,18 @@ module.exports.tryFile = (filePath) => {
     return false;
   }
 };
+
+/**
+ * Generates paths object for module/index.js files based on content and relative
+ * path
+ * @param {Array<string>}  content  list of module components ['models', 'logics', 'routes',...]
+ * @param {string}         relative  path to parent folder of components
+ * @param {Object}         paths object for module/index.js
+ **/
+module.exports.generatePaths = (content = [], relative = 'src') => {
+  const toPath = (name) => path.join(relative, name);
+  return content.reduce((prev, cur) => {
+    prev[cur] = toPath(cur);
+    return prev;
+  }, {});
+};

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/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

@@ -5,8 +5,11 @@ module.exports = {
     refPath: 'ownerModel',
     required: false,
     safe: {
-      update: ['@owner', 'root', 'admin'],
+      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/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/owner.js

@@ -0,0 +1,4 @@
+module.exports = [{
+  validator: 'isMongoId',
+  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)
+};