not-node 6.2.5 → 6.2.6

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "not-node",
-	"version": "6.2.5",
+	"version": "6.2.6",
 	"description": "node complimentary part for client side notFramework.",
 	"main": "index.js",
 	"scripts": {

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

@@ -1,6 +1,8 @@
 module.exports = [
     {
-        validator: "isEmail",
+        validator(val, { validator }) {
+            return validator.isEmail(val);
+        },
         message: "not-node:email_is_not_valid",
     },
 ];

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

@@ -1,6 +1,8 @@
 module.exports = [
     {
-        validator: "isMongoId",
+        validator(val, { validator }) {
+            return validator.isMongoId(val);
+        },
         message: "not-node:owner_is_not_valid",
     },
 ];

package/src/form/form.js

@@ -1,3 +1,5 @@
+const validator = require("validator");
+
 const FormFabric = require("./fabric");
 
 const { createSchemaFromFields } = require("../fields");
@@ -186,6 +188,7 @@ class Form {
         return () => {
             //should be sync function
             return {
+                validator,
                 env: true, //some env variables for validators
             };
         };
@@ -368,9 +371,9 @@ class Form {
         }
         if (
             req?.notRouteData?.rule?.fields &&
-            Array.isArray(req.notRouteData.rule.fields.flat(2))
+            Array.isArray(req.notRouteData.rule.fields)
         ) {
-            return req.notRouteData.rule.fields;
+            return req.notRouteData.rule.fields.flat(2);
         }
         return [];
     }

package/src/manifest/registrator/fields.js

@@ -2,7 +2,7 @@ const path = require("path");
 const fs = require("fs");
 const { tryFile, objHas } = require("../../common");
 const Fields = require("../../fields");
-
+const { log } = require("not-log")(module, "register//fields");
 module.exports = class notModuleRegistratorFields {
     static openFile = require;
     static fieldsManager = Fields;
@@ -39,9 +39,14 @@ module.exports = class notModuleRegistratorFields {
     }
 
     registerField({ nModule, name, field, fromPath }) {
-        this.extendByFrontValidators({ name, field, fromPath });
+        const fieldValidatorsCount = this.extendByFrontValidators({
+            name,
+            field,
+            fromPath: path.dirname(fromPath),
+        });
         nModule.setField(name, field);
-        //log(`${nModule.getName()}//${name}`);
+        const MODULE_NAME = nModule.getName();
+        log(`${MODULE_NAME}//${name} with ${fieldValidatorsCount} validators`);
     }
 
     /**
@@ -54,7 +59,7 @@ module.exports = class notModuleRegistratorFields {
         //load validators
         const validatorName = path.join(fromPath, "validators", name + ".js");
         if (!tryFile(validatorName)) {
-            return;
+            return 0;
         }
         const validators = notModuleRegistratorFields.openFile(validatorName);
         //inject into field.model
@@ -62,6 +67,7 @@ module.exports = class notModuleRegistratorFields {
             field.model.validate = [];
         }
         field.model.validate.push(...validators);
+        return validators.length;
     }
 
     /**

package/src/model/proto.js

@@ -22,7 +22,16 @@ module.exports = class ModelFabricate {
             }
         }
         if (targetModule.schemaOptions) {
-            options.schemaOptions = targetModule.schemaOptions;
+            options = {
+                ...options,
+                schemaOptions: targetModule.schemaOptions,
+            };
+        }
+        if (targetModule.options) {
+            options = {
+                ...options,
+                ...targetModule.options,
+            };
         }
         return options;
     }
@@ -64,6 +73,11 @@ module.exports = class ModelFabricate {
 
     static enrichByFields(targetModule, options) {
         if (targetModule.enrich) {
+            const model_name = targetModule.thisModelName;
+            console.log(
+                `MODEL: ${model_name}`,
+                JSON.stringify(options, null, 4)
+            );
             if (targetModule.enrich.validators) {
                 targetModule.thisSchema = enrich.byFieldsValidators(
                     targetModule.thisSchema,