not-node 4.0.12 → 4.0.17

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "not-node",
-  "version": "4.0.12",
+  "version": "4.0.17",
   "description": "node complimentary part for client side notFramework.",
   "main": "index.js",
   "scripts": {
@@ -63,6 +63,7 @@
     "not-path": "*",
     "rate-limiter-flexible": "^2.3.6",
     "redis": "^4.0.0",
+    "rfdc": "^1.3.0",
     "rmdir": "^1.2.0",
     "serve-static": "*",
     "simple-git": "*",
@@ -73,7 +74,7 @@
     "babel-eslint": "^10.1.0",
     "chai": "*",
     "chai-as-promised": "*",
-    "eslint": "^8.3.0",
+    "eslint": "^7.0.0",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-promise": "^5.2.0",
     "eslint-plugin-sonarjs": "^0.11.0",

package/src/common.js

@@ -92,6 +92,21 @@ 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
+**/
+module.exports.partCopyObj = (obj, list) => {
+  let partObj =  Object.keys(obj).reduce((prev, curr)=>{
+    if(list.includes(curr)){
+      prev[curr] = obj[curr];
+    }
+    return prev;
+  }, {});
+  return JSON.parse(JSON.stringify(partObj));
+};
+
 
 /**
 * Test argument type to be 'function'

package/src/domain.js

@@ -100,7 +100,7 @@ class notDomain extends EventEmitter {
       notApp: this,
       fields: this.options.fields
     });
-    this.importModule(mod, moduleName || mod.getModuleName());
+    this.importModule(mod, moduleName || mod.getName());
     return this;
   }
 
@@ -235,7 +235,7 @@ class notDomain extends EventEmitter {
       return this.modules[moduleName];
     } else {
       for (let t in this.modules) {
-        if (this.modules[t].getModuleName() === moduleName) {
+        if (this.modules[t].getName() === moduleName) {
           return this.modules[t];
         }
       }

package/src/fields/index.js

@@ -1,3 +1,4 @@
+const clone = require('rfdc')();
 const fs = require('fs');
 const path = require('path');
 const {objHas, tryFile} = require('../common');
@@ -82,7 +83,7 @@ module.exports.initField = (field, resultOnly = true, type = 'ui') => {
     destName = srcName = field;
   }
   let proto = (objHas(FIELDS, srcName) && objHas(FIELDS[srcName], type)) ? FIELDS[srcName][type]:{};
-  let result = Object.assign({}, proto, mutation);
+  let result = Object.assign({}, clone(proto), mutation);
   if (resultOnly) {
     return result;
   } else {

package/src/form/fabric.js

@@ -5,7 +5,7 @@ module.exports = class FormFabric {
     FIELDS,
     MODULE_NAME,
     FORM_NAME,
-    exractor
+    extractor
   }) {
     return class extends Form {
       constructor() {
@@ -21,7 +21,7 @@ module.exports = class FormFabric {
        * @return {Object}        forma data
        **/
       extract(req) {
-        return exractor(req);
+        return extractor(req);
       }
     };
   }

package/src/form/form.js

@@ -25,15 +25,20 @@ class Form {
     FORM_NAME
   }) {
     this.FORM_NAME = FORM_NAME;
-    this.FIELDS = FIELDS;
-    this.SCHEMA = byFieldsValidators(initFields(FIELDS, 'model'));
+    this.PROTO_FIELDS = FIELDS;
     if (mongoose.modelNames().indexOf(FORM_NAME)===-1){
+      this.SCHEMA = byFieldsValidators(initFields(this.PROTO_FIELDS, 'model'));
       this.MODEL = mongoose.model(FORM_NAME, Schema(this.SCHEMA));
     }else{
       this.MODEL = mongoose.connection.model(FORM_NAME);
+      this.SCHEMA = this.MODEL.schema;
     }
   }
 
+  getFields(){
+    return Object.keys(this.SCHEMA);
+  }
+
   /**
    * Extract data from ExpressRequest object and validates it
    * returns it or throws
@@ -43,7 +48,7 @@ class Form {
    **/
   async run(req) {
     let data = await this.extract(req);
-    await this.validate(data);
+    await this._validate(data);
     return data;
   }
 
@@ -62,9 +67,9 @@ class Form {
    * @return {Object}
    * @throws {notValidationError}
    **/
-  async validate(data) {
+  async _validate(data) {
     try {
-      await this.MODEL.validate(data, this.FIELDS);
+      await this.validate(data);
     } catch (e) {
       let fields = {};
       if (e instanceof mongoose.Error.ValidationError) {
@@ -72,12 +77,17 @@ class Form {
           fields[name] = [e.errors[name].message];
         });
         throw new notValidationError(e.message, fields, e, data);
-      } else {
+      } else if (e instanceof notValidationError){
+        throw e;
+      }else {
         throw new notError(
-          'core:form_validation_error', {
+          'core:form_validation_error',
+          {
             FORM_NAME: this.FORM_NAME,
-            FIELDS: this.FIELDS,
-            data
+            PROTO_FIELDS: this.PROTO_FIELDS,
+            FORM_FIELDS: this.getFields(),
+            data,
+            message: e.message
           },
           e
         );
@@ -85,6 +95,10 @@ class Form {
     }
   }
 
+  async validate(data){
+    await this.MODEL.validate(data, this.getFields());
+  }
+
   static fabric(){
     return FormFabric;
   }

package/src/init/rateLimiter.js

@@ -1,5 +1,6 @@
 const emit = require('./additional').run;
 const log = require('not-log')(module, 'RateLimiter');
+const {partCopyObj} = require('../common');
 
 const DEFAULT_OPTIONS = {
   keyPrefix: 'rateLimiterMiddleware',
@@ -7,6 +8,8 @@ const DEFAULT_OPTIONS = {
   duration: 1
 };
 
+const DEFAULT_CLIENT = 'ioredis';
+
 module.exports = class InitRateLimiter{
 
   static createMiddleware({rateLimiter}){
@@ -29,18 +32,20 @@ module.exports = class InitRateLimiter{
   }
 
 
-  getOptions({config}){
+  static getOptions({config}){
+    const opts = partCopyObj(config.get('modules.rateLimiter', {}), Object.keys(DEFAULT_OPTIONS));
     return {
       ...DEFAULT_OPTIONS,
-      ...config.get('modules.rateLimiter', {})
+      ...opts
     };
   }
 
   static createRateLimiter({master, config}){
     const {RateLimiterRedis} = require('rate-limiter-flexible');
+    const storeClient = config.get('modules.rateLimiter.client', DEFAULT_CLIENT);
     return new RateLimiterRedis({
-      storeClient:  master.getEnv('db.redis'),
-      ...this.getOptions({master, config})
+      storeClient:  master.getEnv(`db.${storeClient}`),
+      ...InitRateLimiter.getOptions({master, config})
     });
   }
 };

package/src/init/sessions/redis.js

@@ -1,17 +1,20 @@
 const log = require('not-log')(module, 'not-node//init');
 const ADDS = require('../additional');
 
+const DEFAULT_CLIENT = 'ioredis';
+
 module.exports = class InitSessionsRedis{
   async run({config, options, master}) {
     log.info('Setting up user sessions handler(redis)...');
     await ADDS.run('sessions.pre', {config, options, master});
     const expressSession = require('express-session');
-    const redisClient = master.getEnv('db.redis');
+    const storeClient = config.get('session.client', DEFAULT_CLIENT);
+    const redisClient = master.getEnv(`db.${storeClient}`);
     const redisStore = require('connect-redis')(expressSession);
     master.getServer().use(expressSession({
-      secret:             config.get('session:secret'),
-      key:                config.get('session:key'),
-      cookie:             config.get('session:cookie'),
+      secret:             config.get('session.secret'),
+      key:                config.get('session.key'),
+      cookie:             config.get('session.cookie'),
       resave:             false,
       saveUninitialized:  true,
       store: new redisStore({

package/src/manifest/module.js

@@ -56,17 +56,11 @@ class notModule {
     };
     this.fieldsImportRules = (objHas(options, 'fields') && options.fields) ? options.fields : {};
 
-    log.info(`Creating module: ${this.getModuleName()}`);
+    log.info(`Creating module: ${this.getName()}`);
     this.init();
     return this;
   }
 
-  getModuleName() {
-    if(this.module && this.module.name){
-      return this.module.name;
-    }
-    return this.path;
-  }
 
   init() {
     if (this.path) {
@@ -174,7 +168,7 @@ class notModule {
   }
 
   fabricateModel(model) {
-    protoModel.fabricate(model, {}, this.mongoose);
+    protoModel.fabricate(model, this.getOptions(), this.mongoose);
   }
 
   fabricateModels() {
@@ -318,7 +312,14 @@ class notModule {
   }
 
   getName(){
-    return this.module.name;
+    if(this.module && this.module.name){
+      return this.module.name;
+    }
+    return this.path;
+  }
+
+  getOptions(){
+    return (this.module && this.module.options)?this.module.options:{};
   }
 
   setRouteWS({

package/src/model/buildValidator.js

@@ -1,5 +1,40 @@
 /** @module Model/Validator */
 const validate = require('mongoose-validator');
+const {objHas, executeObjectFunction, isFunc} = require('../common');
+
+function extractValidationEnvGetter(options){
+  if(options && objHas(options, 'getValidationEnv') && isFunc(options.getValidationEnv)){
+    return options.getValidationEnv;
+  }else{
+    //should return at least empty object
+    return ()=>{return {};};
+  }
+}
+
+function extendObsolete(rule){
+  return validate(rule);
+}
+
+function extendModern(rule, options){
+  const result = {...rule};
+  delete result.validator;
+  const validationEnv = extractValidationEnvGetter(options)();
+  result.validator = async (val) => {
+    return await executeObjectFunction(rule, 'validator', [val, validationEnv]);
+  };
+  return result;
+}
+
+
+function extendValidation(rule, options){
+  if(typeof rule.validator === 'string'){
+    //will extend from text description to validatejs lib validation function
+    return extendObsolete(rule);
+  }else{
+    //more complex validation
+    return extendModern(rule, options);
+  }
+}
 
 /**
  *  Take array of validator (https://www.npmjs.com/package/validator) rules
@@ -7,10 +42,8 @@ const validate = require('mongoose-validator');
  *  then return it
  **/
 
-module.exports = function(validators) {
-  var result = null;
-  result = validators.map((item) => {
-    return validate(item);
-  });
+module.exports = function(validators, options) {
+  let result = null;
+  result = validators.map(rule => extendValidation(rule, options));
   return result;
 };

package/src/model/enrich.js

@@ -1,7 +1,7 @@
 /** @module Model/Enrich */
 
 const Schema = require('mongoose').Schema,
-  firstLetterToLower = require('../common').firstLetterToLower,
+  {firstLetterToLower,isFunc} = require('../common'),
   buildValidator = require('./buildValidator');
 
 class ModelEnricher{
@@ -49,7 +49,7 @@ class ModelEnricher{
     mongooseSchema.statics.__incModel = modelName;
     if(options && options.filter){
       mongooseSchema.statics.__incFilter = options.filter;
-    }    
+    }
     return mongooseSchema;
   }
 
@@ -58,11 +58,11 @@ class ModelEnricher{
     return mongooseSchema;
   }
 
-  static byFieldsValidators (mongooseSchema) {
+  static byFieldsValidators (mongooseSchema, options) {
     if (mongooseSchema) {
       for (let fieldName in mongooseSchema) {
-        if (Object.prototype.hasOwnProperty.call(mongooseSchema[fieldName], 'validate')) {
-          mongooseSchema[fieldName].validate = buildValidator(mongooseSchema[fieldName].validate);
+        if (Object.prototype.hasOwnProperty.call(mongooseSchema[fieldName], 'validate') && mongooseSchema[fieldName].validate.length && !isFunc(mongooseSchema[fieldName].validate[0])) {
+          mongooseSchema[fieldName].validate = buildValidator(mongooseSchema[fieldName].validate, options);
         }
       }
     }

package/src/model/proto.js

@@ -59,10 +59,10 @@ module.exports = class ModelFabricate{
     this.extendSchemaFrom(targetModule.thisPost, schema.post.bind(schema));
   }
 
-  static enrichByFields(targetModule){
+  static enrichByFields(targetModule, options){
     if (targetModule.enrich) {
       if (targetModule.enrich.validators) {
-        targetModule.thisSchema = enrich.byFieldsValidators(targetModule.thisSchema, targetModule.thisModelName);
+        targetModule.thisSchema = enrich.byFieldsValidators(targetModule.thisSchema, options);
       }
       if (targetModule.enrich.versioning) {
         targetModule.thisSchema = enrich.byFieldsForVersioning(targetModule.thisSchema, targetModule.thisModelName);
@@ -125,7 +125,7 @@ module.exports = class ModelFabricate{
     if (ModelFabricate.isNotExtendable(targetModule)) {
       return new Schema(targetModule.thisSchema, options.schemaOptions);
     } else {
-      ModelFabricate.enrichByFields(targetModule);
+      ModelFabricate.enrichByFields(targetModule, options);
       //collecting information of unique fields, removing unique flag from schema
       let fieldsForIndexes = ModelFabricate.collectFieldsForIndexes(targetModule);
       //creating schema for model

package/test/notDomain.js

@@ -390,12 +390,12 @@ describe('notDomain', function() {
     it('exists, but with custom name', function() {
       const route = 'Jungle';
       const targetMod = {
-        getModuleName(){ return 'Jungle'; }
+        getName(){ return 'Jungle'; }
       };
       const ctx = {
         modules:{
           loop:{
-            getModuleName(){return 'loop'; }
+            getName(){return 'loop'; }
           },
           trees: targetMod
         }
@@ -408,12 +408,12 @@ describe('notDomain', function() {
     it('not exists', function() {
       const route = 'Jungle';
       const targetMod = {
-        getModuleName(){ return 'Jungle1'; }
+        getName(){ return 'Jungle1'; }
       };
       const ctx = {
         modules:{
           loop:{
-            getModuleName(){return 'loop'; }
+            getName(){return 'loop'; }
           },
           trees: targetMod
         }

package/test/notModule.js

@@ -144,14 +144,14 @@ describe('notModule', function() {
           name: 'fake my name'
         }
       }
-      expect(notModule.prototype.getModuleName.call(ctx)).to.be.equal('fake my name');
+      expect(notModule.prototype.getName.call(ctx)).to.be.equal('fake my name');
     });
 
     it('no module.name, no path', function() {
       const ctx = {
         module: {}
       }
-      expect(notModule.prototype.getModuleName.call(ctx)).to.be.undefined;
+      expect(notModule.prototype.getName.call(ctx)).to.be.undefined;
     });
   });