not-node 6.2.9 → 6.2.11

package/package.json

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

package/src/common.js

@@ -205,6 +205,20 @@ module.exports.tryFile = (filePath) => {
     }
 };
 
+/**
+ *  Trying to parse input to JSON or returns def
+ * @param {string}     input  string to be parsed
+ * @param {any}     def  what to return if parse failed, default undefined
+ * @return {Object}            JSON
+ **/
+module.exports.tryParse = (input, def = undefined) => {
+    try {
+        return JSON.parse(input);
+    } catch (e) {
+        return def;
+    }
+};
+
 /**
  * Generates paths object for module/index.js files based on content and relative
  * path

package/src/init/lib/app.js

@@ -21,6 +21,7 @@ module.exports = class InitApp {
 
     static async setAppEnvs({ config, options, master, emit }) {
         await emit("app.setEnv.pre", { config, options, master });
+        master.setEnv("validationEnv", options.validationEnv);
         master.setEnv("hostname", config.get("hostname"));
         master.setEnv("server", `https://` + config.get("host"));
         master.setEnv("appPath", config.get("appPath"));

package/src/model/buildValidator.js

@@ -1,19 +1,25 @@
 /** @module Model/Validator */
 const validate = require("mongoose-validator");
 const { objHas, executeObjectFunction, isFunc, isAsync } = require("../common");
+const notEnv = require("../env");
 
 function extractValidationEnvGetter(options) {
     if (
         options &&
-        objHas(options, "getValidationEnv") &&
-        isFunc(options.getValidationEnv)
+        objHas(options, "validationEnv") &&
+        isFunc(options.validationEnv)
     ) {
-        return options.getValidationEnv;
+        return options.validationEnv;
     } else {
-        //should return at least empty object
-        return () => {
-            return { validate };
-        };
+        const globalValidationEnvGetter = notEnv.getEnv("validationEnv");
+        if (globalValidationEnvGetter && isFunc(globalValidationEnvGetter)) {
+            return globalValidationEnvGetter;
+        } else {
+            //should return at least empty object
+            return () => {
+                return { validate };
+            };
+        }
     }
 }