not-node 5.0.5 → 5.0.8

package/bin/not-builder.js

@@ -261,7 +261,7 @@ async function loadNPMModule(){
 				}
 				opts.verbose && console.log('result', result);
 			}else{
-				ops.verbose && console.info('...no templates');
+				opts.verbose && console.info('...no templates');
 			}
 			if(mod.paths.styles){
 				let commons;
@@ -278,7 +278,7 @@ async function loadNPMModule(){
 				}
 				opts.verbose && console.log('result', result);
 			}else{
-				ops.verbose && console.info('...no styles');
+				opts.verbose && console.info('...no styles');
 			}
 		}
 	}catch(e){
@@ -314,7 +314,7 @@ async function loadServerModule(){
 					}
 				}
 			}else{
-				ops.verbose && console.info('...no controllers');
+				opts.verbose && console.info('...no controllers');
 			}
 			if(mod.paths.templates){
 				let commons;
@@ -339,7 +339,7 @@ async function loadServerModule(){
 
 				}
 			}else{
-				ops.verbose && console.info('...no templates');
+				opts.verbose && console.info('...no templates');
 			}
 			if(mod.paths.styles){
 				let commons;
@@ -364,7 +364,7 @@ async function loadServerModule(){
 
 				}
 			}else{
-				ops.verbose && console.info('...no styles');
+				opts.verbose && console.info('...no styles');
 			}
 		}
 	}catch(e){
@@ -503,8 +503,8 @@ async function build_Server(pathToRoot, roles, targetName, targetManifest){
 			let indexFile = path.join(pathToRoot, targetManifest.src, 'index.' + role + '.js');
 			let rollupFile = path.join(pathToRoot, targetManifest.root, 'rollup.' + role + '.js');
 			let bundleFile = path.join(pathToRoot, targetManifest.build, role + '.js');
-			let templateFile = path.join(pathToRoot, targetManifest.build, role + '.html');
-			await lib.renderScript(path.join(pathToRoot,targetManifest.index), {
+			//let templateFile = path.join(pathToRoot, targetManifest.build, role + '.html');
+			await lib.renderScript(path.join(pathToRoot, targetManifest.index), {
 				mods:list[role].controllers,
 				scss: list[role].styles,
 				env: opts.environment,
@@ -522,7 +522,7 @@ async function build_Server(pathToRoot, roles, targetName, targetManifest){
 					NODE_ENV: opts.environment
 				}
 			});
-			await lib.joinToFile(templateFile, list[role].templates);
+			//await lib.joinToFile(templateFile, list[role].templates);
 		}catch(e){
 			console.error(e);
 		}

package/package.json

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

package/src/form/form.js

@@ -4,10 +4,6 @@ const {
   createSchemaFromFields
 } = require('../fields');
 
-const {
-  byFieldsValidators
-} = require('../model/enrich');
-
 const {objHas} = require('../common');
 
 const ValidationBuilder = require('not-validation').Builder;
@@ -154,9 +150,7 @@ class Form {
   }
 
   #createModelSchema(app){
-    return byFieldsValidators(
-      createSchemaFromFields(app, this.#PROTO_FIELDS, 'model', this.#FORM_NAME)
-    );
+    return createSchemaFromFields(app, this.#PROTO_FIELDS, 'model', this.#FORM_NAME);
   }
 
 
@@ -173,7 +167,6 @@ class Form {
     this.#SCHEMA = ValidationBuilder(this.#SCHEMA, this.getValidatorEnvGetter());
   }
 
-
   /**
    * Validates form data or throws
    * @param {Object} data    form data

package/src/model/buildValidator.js

@@ -1,13 +1,13 @@
 /** @module Model/Validator */
 const validate = require('mongoose-validator');
-const {objHas, executeObjectFunction, isFunc} = require('../common');
+const {objHas, executeObjectFunction, isFunc, isAsync} = 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 {};};
+    return ()=>{return {validate};};
   }
 }
 
@@ -23,9 +23,15 @@ 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]);
-  };
+  if(isAsync(rule.validator)){
+    result.validator = async (val) => {
+      return await executeObjectFunction(rule, 'validator', [val, validationEnv]);
+    };
+  }else{
+    result.validator = (val) => {
+      return executeObjectFunction(rule, 'validator', [val, validationEnv]);
+    };
+  }
   return result;
 }