not-node 6.5.32 → 6.5.33

package/package.json

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

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

@@ -50,8 +50,12 @@ module.exports = [
         message: "not-node:identity_field_sid_is_undefined",
     },
     {
-        validator(val) {
-            return objHas(val, "ip") && typeof val.ip === "string";
+        validator(val, { validator }) {
+            return (
+                objHas(val, "ip") &&
+                typeof val.ip === "string" &&
+                validator.isIP(val.ip)
+            );
         },
         message: "not-node:identity_field_ip_is_not_valid",
     },

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

@@ -1,7 +1,11 @@
 module.exports = [
     {
         validator: (val, { validator }) => {
-            return validator.isMongoId(val);
+            return (
+                (typeof val === "string" && validator.isMongoId(val)) ||
+                (typeof val.toString === "function" &&
+                    validator.isMongoId(val.toString()))
+            );
         },
         message: `not-node:value_item_format_is_not_objectId`,
     },

package/src/core/fields/validators/objectId.list.js

@@ -1,14 +1,11 @@
+const objectId = require("./objectId.js");
+
 module.exports = [
     {
         validator: (val) => {
             return Array.isArray(val);
         },
         message: `not-node:value_is_not_array`,
-    },    
-    {
-        validator: (val, { validator }) => {
-            return val.every((itm) => validator.isMongoId(itm));
-        },
-        message: `not-node:value_item_format_is_not_objectId`,
     },
+    ...objectId,
 ];

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

@@ -1,16 +1,8 @@
+const objectId = require("./objectId");
+
 module.exports = [
     {
-        validator(val, { validator }) {
-            if (typeof val === "string") {
-                return validator.isMongoId(val);
-            } else {
-                return (
-                    val &&
-                    typeof val === "object" &&
-                    val.constructor.name === "ObjectId"
-                );
-            }
-        },
+        ...objectId[0],
         message: "not-node:owner_is_not_valid",
     },
 ];

package/src/core/fields/validators/positive.or.zero.number.js

@@ -4,10 +4,10 @@ module.exports = [
             return !isNaN(val);
         },
         message: "not-node:value_is_not_number",
-    },      
+    },
     {
         validator(val) {
-            return (val > 0) && (val === 0);
+            return val >= 0;
         },
         message: "not-node:value_should_be_greater_than_zero",
     },

package/src/form/form.js

@@ -3,8 +3,12 @@ const validator = require("validator");
 const notPath = require("not-path");
 const notConfig = require("not-config");
 const FormFabric = require("./fabric");
+const notEnv = require("../env.js");
 const Auth = require("../auth");
-const { createSchemaFromFields, normalizeFieldsDescriptionsList } = require("../fields");
+const {
+    createSchemaFromFields,
+    normalizeFieldsDescriptionsList,
+} = require("../fields");
 const notFieldsFilter = require("../fields/filter.js");
 const getApp = require("../getApp.js");
 const {
@@ -36,6 +40,11 @@ const DEFAULT_AFTER_EXTRACT_TRANSFORMERS = [];
 const notAppIdentity = require("../identity/index.js");
 const { ACTION_DATA_TYPES } = require("../const.js");
 
+const DEFAULT_VALIDATOR_ENVS = {
+    validator,
+    env: true, //some env variables for validators
+};
+
 /**
  * Generic form validation class
  * @class Form
@@ -427,15 +436,27 @@ class Form {
      * Returns function that works as a getter for additional environment variables for
      * validators.
      * validationFunction(value, additionalEnvVars = {}){}
+     * @return {function}   getter of validator envs
      **/
     getValidatorEnvGetter() {
-        return () => {
+        //app wide validation envs
+        const appLevelValidationEnvsGetter = notEnv.get("validationEnv");
+        if (typeof appLevelValidationEnvsGetter === "function") {
             //should be sync function
-            return {
-                validator,
-                env: true, //some env variables for validators
+            return () => {
+                return Object.freeze({
+                    ...DEFAULT_VALIDATOR_ENVS,
+                    ...appLevelValidationEnvsGetter(),
+                });
             };
-        };
+        } else {
+            return () => {
+                //should be sync function
+                return Object.freeze({
+                    ...DEFAULT_VALIDATOR_ENVS,
+                });
+            };
+        }
     }
 
     /**
@@ -743,6 +764,8 @@ class Form {
             case String:
             case Schema.Types.String:
                 return ["xss"];
+            case Schema.Types.Number:
+                return ["parseNumber"];
             default:
                 return [];
         }

package/src/form/transformers/index.js

@@ -6,5 +6,6 @@ module.exports = {
     stringToJSON: require("./stringToJSON.js"),
     xss: require("./xss.js"),
     boolean: require("./boolean.js"),
+    parseNumber: require("./parseNumber.js"),
     __CLEAR__: require("./__CLEAR__.js"),
 };

package/src/form/transformers/parseNumber.js

@@ -0,0 +1,3 @@
+module.exports = (input) => {
+    return ~~input;
+};