not-node 4.0.15 → 4.0.16

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "not-node",
-  "version": "4.0.15",
+  "version": "4.0.16",
   "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/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/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,11 +77,14 @@ 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', {
             FORM_NAME: this.FORM_NAME,
-            FIELDS: this.FIELDS,
+            PROTO_FIELDS: this.PROTO_FIELDS,
+            FORM_FIELDS: this.getFields(),
             data
           },
           e
@@ -85,6 +93,10 @@ class Form {
     }
   }
 
+  async validate(data){
+    await this.MODEL.validate(data, this.getFields());
+  }
+
   static fabric(){
     return FormFabric;
   }

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;
   }
 
@@ -61,7 +61,7 @@ class ModelEnricher{
   static byFieldsValidators (mongooseSchema) {
     if (mongooseSchema) {
       for (let fieldName in mongooseSchema) {
-        if (Object.prototype.hasOwnProperty.call(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);
         }
       }