not-node 4.0.6 → 4.0.10

package/bin/not-builder.js

@@ -16,7 +16,7 @@ var argv = require('yargs').argv,
 	path = require('path'),
 	child_process = require('child_process'),
 	deepMerge = require('deepmerge'),
-	
+
 	lib = require('../src/lib.js');
 
 const TEMPLATES_EXT = '.html';
@@ -31,6 +31,7 @@ let opts = {
 		'to': argv.to || false,
 		'config': argv.config || './project.manifest.json',
 		'rollup': argv.rollup || path.join(process.cwd(),'./node_modules/.bin/rollup'),
+		'role': argv.role || null
 	},
 	configName = path.join(process.cwd(), opts.config),
 	config = {};
@@ -493,7 +494,10 @@ async function build_Server(pathToRoot, roles, targetName, targetManifest){
 	console.log('List:', list);
 	////forming index.js and rollup.js
 	for(let i = 0; i < roles.length; i++){
-		let role = roles[i];
+		const role = roles[i];
+		if((opts.role !== null) && opts.role !== role){
+			continue;
+		}
 		try{
 			let indexFile = path.join(pathToRoot, targetManifest.src, 'index.' + role + '.js');
 			let rollupFile = path.join(pathToRoot, targetManifest.root, 'rollup.' + role + '.js');

package/package.json

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

package/src/form/index.js

@@ -22,7 +22,11 @@ module.exports = class Form {
     this.FORM_NAME = FORM_NAME;
     this.FIELDS = FIELDS;
     this.SCHEMA = byFieldsValidators(initFields(FIELDS, 'model'));
-    this.MODEL = mongoose.model(FORM_NAME + '_' + Math.random().toString(), Schema(this.SCHEMA));
+    if (mongoose.modelNames().indexOf(FORM_NAME)===-1){
+      this.MODEL = mongoose.model(FORM_NAME, Schema(this.SCHEMA));
+    }else{
+      this.MODEL = mongoose.connection.model(FORM_NAME);
+    }
   }
 
   /**

package/src/manifest/route.js

@@ -162,14 +162,18 @@ class notRoute{
   }
 
   async executeRoute(modRoute, actionName, {req, res, next}){
-    //waiting preparation
-    let prepared = await this.executeFunction(modRoute, CONST_BEFORE_ACTION, [req, res, next]);
-    //waiting results
-    let result = await this.executeFunction(modRoute, actionName, [req, res, next, prepared]);
-    //filter result IF actionData.return specified
-    this.filterResultByReturnRule(req, result);
-    //run after with results, continue without waiting when it finished
-    return this.executeFunction(modRoute, CONST_AFTER_ACTION, [req, res, next, result]);
+    try{
+      //waiting preparation
+      let prepared = await this.executeFunction(modRoute, CONST_BEFORE_ACTION, [req, res, next]);
+      //waiting results
+      let result = await this.executeFunction(modRoute, actionName, [req, res, next, prepared]);
+      //filter result IF actionData.return specified
+      this.filterResultByReturnRule(req, result);
+      //run after with results, continue without waiting when it finished
+      return this.executeFunction(modRoute, CONST_AFTER_ACTION, [req, res, next, result]);
+    }catch(e){
+      next(e);
+    }
   }
 
   async executeFunction(obj, name, params) {