not-node 6.5.34 → 6.5.36

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "not-node",
-	"version": "6.5.34",
+	"version": "6.5.36",
 	"description": "node complimentary part for client side notFramework.",
 	"main": "index.js",
 	"scripts": {
@@ -36,6 +36,7 @@
 		"url": "https://github.com/interrupter/not-node/issues"
 	},
 	"dependencies": {
+		"ajv": "^8.17.1",
 		"body-parser": "^1.20.2",
 		"commander": "^12.1.0",
 		"compression": "^1.7.4",

package/src/common.js

@@ -496,3 +496,43 @@ module.exports.isAction = isAction;
 const isArrayOfActions = (list) => list.every(isAction);
 
 module.exports.isArrayOfActions = isArrayOfActions;
+
+/**
+ * Creates functions that executes validator function from array of objects
+ * {validator:function, message:string}
+ * If validator returns false - it throws message from object, if all validator returns true -
+ * function returns true
+ * @param {Array<Object>} validators
+ * @param {any} val
+ * @param {Object} envs
+ * @return {function}
+ */
+const createValidatorsRunner = (validators, val, envs) => {
+    return () => {
+        for (let { message, validator } of validators) {
+            if (!validator(val, envs)) {
+                throw new Error(message);
+            }
+        }
+        return true;
+    };
+};
+module.exports.createValidatorsRunner = createValidatorsRunner;
+
+/**
+ * Changes default message if custom set to true, by replacing part of it with another string
+ *
+ * @param {string} message
+ * @param {boolean} custom
+ * @param {string} find
+ * @param {string} replace
+ * @return {string}
+ */
+const createCustomMessage = (message, custom, find, replace) => {
+    if (custom) {
+        return message.replace(find, replace);
+    } else {
+        return message;
+    }
+};
+module.exports.createCustomMessage = createCustomMessage;

package/src/core/fields/ID.js

@@ -1,3 +1,5 @@
+const Validators = require("../validators");
+
 module.exports = {
     ui: {
         component: "UITextfield",
@@ -9,5 +11,10 @@ module.exports = {
         type: Number,
         required: true,
         safe: require("../safety.protocols").ownerRootAdmin,
+        validate: [
+            ...Validators.Number.type,
+            ...Validators.Number.int,
+            ...Validators.Number.positive,
+        ],
     },
 };

package/src/core/fields/__version.js

@@ -1,3 +1,5 @@
+const Validators = require("../validators");
+
 module.exports = {
     ui: {
         component: "UIHidden",
@@ -7,6 +9,10 @@ module.exports = {
         type: Number,
         default: 0,
         required: true,
-        validate: require('./validators/ID')
+        validate: [
+            ...Validators.Number.type,
+            ...Validators.Number.int,
+            ...Validators.Number.positiveOrZero,
+        ],
     },
 };

package/src/core/fields/__versions.js

@@ -1,9 +1,11 @@
+const Validators = require("../validators");
+
 module.exports = {
     ui: {
         component: "UIHidden",
     },
     model: {
         safe: require("../safety.protocols").systemManageable,
-        validate: require('./validators/objectId.list')
+        validate: Validators.ObjectId.list,
     },
 };

package/src/core/fields/_id.js

@@ -1,4 +1,5 @@
-const ObjectId = require('mongoose').SchemaTypes.ObjectId;
+const Validators = require("../validators");
+const ObjectId = require("mongoose").SchemaTypes.ObjectId;
 
 module.exports = {
     ui: {
@@ -10,6 +11,6 @@ module.exports = {
     model: {
         type: ObjectId,
         safe: require("../safety.protocols").systemManageable,
-        validate: require('./validators/objectId')
+        validate: Validators.ObjectId.type,
     },
 };

package/src/core/fields/boolean.js

@@ -1,3 +1,5 @@
+const Validators = require("../validators");
+
 module.exports = {
     ui: {
         component: "UISwitch",
@@ -9,5 +11,6 @@ module.exports = {
         default: false,
         required: true,
         safe: require("../safety.protocols").ownerRootAdmin,
+        validate: Validators.Boolean.type,
     },
 };

package/src/core/fields/boolean.system.js

@@ -1,4 +1,6 @@
-module.exports = {   
+const Validators = require("../validators");
+
+module.exports = {
     ui: {
         component: "UIHidden",
     },
@@ -6,6 +8,7 @@ module.exports = {
         type: Boolean,
         default: false,
         required: true,
-        safe: require("not-node/src/core/safety.protocols").systemManageable,
+        safe: require("../safety.protocols").systemManageable,
+        validate: Validators.Boolean.type,
     },
 };

package/src/core/fields/codeName.js

@@ -1,3 +1,5 @@
+const Validators = require("../validators");
+
 module.exports = {
     ui: {
         component: "UITextfield",
@@ -10,5 +12,6 @@ module.exports = {
         required: true,
         transformers: ["xss"],
         safe: require("../safety.protocols").ownerRootAdmin,
+        validate: [...Validators.String.type, ...Validators.String.notEmpty],
     },
 };

package/src/core/fields/createdAt.js

@@ -1,3 +1,5 @@
+const Validators = require("../validators");
+
 module.exports = {
     ui: {
         component: "UIDate",
@@ -12,6 +14,6 @@ module.exports = {
         searchable: true,
         sortable: true,
         safe: require("../safety.protocols").systemManageable,
-        validate: require('./validators/date')
+        validate: [...Validators.Date.type],
     },
 };

package/src/core/fields/description.js

@@ -1,3 +1,5 @@
+const Validators = require("../validators");
+
 module.exports = {
     ui: {
         component: "UITextarea",
@@ -12,5 +14,9 @@ module.exports = {
         sortable: true,
         transformers: ["xss"],
         safe: require("../safety.protocols").ownerRootAdmin,
+        validate: [
+            ...Validators.String.type,
+            ...Validators.String.from10to10000,
+        ],
     },
 };

package/src/core/fields/email.js

@@ -1,3 +1,5 @@
+const Validators = require("../validators");
+
 module.exports = {
     ui: {
         component: "UIEmail",
@@ -10,5 +12,6 @@ module.exports = {
         required: true,
         transformers: ["xss"],
         safe: require("../safety.protocols").ownerRootAdmin,
+        validate: [...Validators.String.type, ...Validators.String.email],
     },
 };

package/src/core/fields/expiredAt.js

@@ -1,3 +1,5 @@
+const Validators = require("../validators");
+
 module.exports = {
     ui: {
         component: "UITextfield",
@@ -11,6 +13,6 @@ module.exports = {
         searchable: true,
         sortable: true,
         safe: require("../safety.protocols").ownerRootAdmin,
-        validate: require('./validators/date')
+        validate: Validators.Date.type,
     },
 };

package/src/core/fields/height.js

@@ -1,3 +1,5 @@
+const Validators = require("../validators");
+
 module.exports = {
     ui: {
         component: "UITextfield",
@@ -11,6 +13,9 @@ module.exports = {
         searchable: true,
         sortable: true,
         safe: require("../safety.protocols").ownerRootAdmin,
-        validate: require('./validators/positive.or.zero.number')
+        validate: [
+            ...Validators.Number.type,
+            ...Validators.Number.positiveOrZero,
+        ],
     },
 };

package/src/core/fields/identity.js

@@ -1,3 +1,4 @@
+const Validators = require("../validators");
 const Schema = require("mongoose").Schema;
 
 module.exports = {
@@ -5,5 +6,6 @@ module.exports = {
         type: Schema.Types.Mixed,
         required: true,
         safe: require("../safety.protocols").ownerRootAdmin,
+        validate: Validators.Object.identity,
     },
 };

package/src/core/fields/ip.js

@@ -1,3 +1,5 @@
+const Validators = require("../validators");
+
 module.exports = {
     ui: {
         component: "UITextfield",
@@ -11,5 +13,6 @@ module.exports = {
         required: true,
         safe: require("../safety.protocols").ownerRootAdmin,
         transformers: ["xss"],
+        validate: [...Validators.String.type, ...Validators.String.ip],
     },
 };

package/src/core/fields/objectId.js

@@ -1,3 +1,4 @@
+const Validators = require("../validators");
 const ObjectId = require("mongoose").Schema.Types.ObjectId;
 
 module.exports = {
@@ -7,6 +8,7 @@ module.exports = {
         default: null,
         transformers: ["xss", "__CLEAR__"],
         safe: require("../safety.protocols").ownerRootAdmin,
+        validate: Validators.ObjectId.type,
     },
     ui: {
         default: null,

package/src/core/fields/ownerModel.js

@@ -1,10 +1,12 @@
+const Validators = require("../validators");
+
 module.exports = {
     model: {
         type: String,
         required: false,
         safe: require("../safety.protocols").ownerRootAdmin,
         transformers: ["xss"],
-        validate: require('./validators/modelName')
+        validate: [...Validators.String.type, ...Validators.String.notEmpty],
     },
     ui: {
         component: "UIHidden",

package/src/core/fields/price.js

@@ -1,3 +1,5 @@
+const Validators = require("../validators");
+
 module.exports = {
     ui: {
         component: "UITextfield",
@@ -11,6 +13,9 @@ module.exports = {
         searchable: true,
         sortable: true,
         safe: require("../safety.protocols").ownerRootAdmin,
-        validate: require('./validators/positive.or.zero.number')
+        validate: [
+            ...Validators.Number.type,
+            ...Validators.Number.positiveOrZero,
+        ],
     },
 };

package/src/core/fields/requiredObject.js

@@ -1,4 +1,5 @@
 const Schema = require("mongoose").Schema;
+const Validators = require("../validators");
 
 module.exports = {
     model: {
@@ -6,6 +7,7 @@ module.exports = {
         required: true,
         default: {},
         safe: require("../safety.protocols").ownerRootAdmin,
+        validate: Validators.Object.type,
     },
     ui: {
         default: {},

package/src/core/fields/session.js

@@ -1,3 +1,5 @@
+const Validators = require("../validators");
+
 module.exports = {
     ui: {
         component: "UITextfield",
@@ -11,5 +13,6 @@ module.exports = {
         required: true,
         transformers: ["xss"],
         safe: require("../safety.protocols").systemManageable,
+        validate: [...Validators.String.type, ...Validators.String.notEmpty],
     },
 };

package/src/core/fields/size.js

@@ -1,3 +1,5 @@
+const Validators = require("../validators");
+
 module.exports = {
     ui: {
         component: "UINumber",
@@ -11,6 +13,9 @@ module.exports = {
         searchable: true,
         sortable: true,
         safe: require("../safety.protocols").ownerRootAdmin,
-        validate: require("./validators/positive.or.zero.number"),
+        validate: [
+            ...Validators.Number.type,
+            ...Validators.Number.positiveOrZero,
+        ],
     },
 };

package/src/core/fields/title.js

@@ -1,3 +1,5 @@
+const Validators = require("../validators");
+
 module.exports = {
     ui: {
         component: "UITextfield",
@@ -12,5 +14,6 @@ module.exports = {
         sortable: true,
         safe: require("../safety.protocols").ownerRootAdmin,
         transformers: ["xss"],
+        validate: [...Validators.String.type, ...Validators.String.notEmpty],
     },
 };

package/src/core/fields/updatedAt.js

@@ -1,3 +1,5 @@
+const Validators = require("../validators");
+
 module.exports = {
     ui: {
         component: "UIDate",
@@ -11,7 +13,7 @@ module.exports = {
         type: Date,
         required: true,
         default: Date.now,
-        validate: require('./validators/date'),
+        validate: [...Validators.Date.type],
         safe: require("../safety.protocols").systemManageable,
     },
 };

package/src/core/fields/uuid.js

@@ -1,3 +1,5 @@
+const Validators = require("../validators");
+
 module.exports = {
     ui: {
         component: "UITextfield",
@@ -12,5 +14,6 @@ module.exports = {
         required: true,
         transformers: ["xss"],
         safe: require("../safety.protocols").ownerRootAdmin,
+        validate: [...Validators.String.type, ...Validators.String.uuid],
     },
 };

package/src/core/fields/width.js

@@ -1,3 +1,5 @@
+const Validators = require("../validators");
+
 module.exports = {
     ui: {
         component: "UITextfield",
@@ -11,6 +13,9 @@ module.exports = {
         searchable: true,
         sortable: true,
         safe: require("../safety.protocols").ownerRootAdmin,
-        validate: require('./validators/positive.or.zero.number')
+        validate: [
+            ...Validators.Number.type,
+            ...Validators.Number.positiveOrZero,
+        ],
     },
 };

package/src/core/index.js

@@ -1,5 +1,6 @@
 const { generatePaths } = require("../common");
-const {MODULE_NAME} = require('./const.js');
+const { MODULE_NAME } = require("./const.js");
+
 module.exports = {
     name: MODULE_NAME,
     paths: generatePaths(["fields", "locales"], __dirname),

package/src/core/validators/boolean.false.js

@@ -0,0 +1,8 @@
+module.exports = [
+    {
+        validator(val) {
+            return typeof val === "boolean" && !val;
+        },
+        message: "not-node:value_type_is_not_boolean_false",
+    },
+];

package/src/core/validators/boolean.js

@@ -0,0 +1,8 @@
+module.exports = [
+    {
+        validator(val) {
+            return typeof val === "boolean";
+        },
+        message: "not-node:value_type_is_not_boolean",
+    },
+];

package/src/core/validators/boolean.true.js

@@ -0,0 +1,8 @@
+module.exports = [
+    {
+        validator(val) {
+            return typeof val === "boolean" && val;
+        },
+        message: "not-node:value_type_is_not_boolean_true",
+    },
+];

package/src/core/validators/date.js

@@ -0,0 +1,11 @@
+module.exports = [
+    {
+        validator(val, { validator }) {
+            return (
+                val instanceof Date ||
+                (typeof val === "string" && validator.isISO8601(val))
+            );
+        },
+        message: "not-node:value_type_is_not_date",
+    },
+];

package/src/core/validators/index.js

@@ -0,0 +1,33 @@
+module.exports = Object.freeze({
+    Boolean: {
+        type: require("./boolean"),
+        true: require("./boolean.true"),
+        false: require("./boolean.false"),
+    },
+    Date: {
+        type: require("./date"),
+    },
+    Number: {
+        type: require("./number"),
+        int: require("./number.int"),
+        positive: require("./number.positive"),
+        positiveOrZero: require("./number.positive.or.zero"),
+    },
+    Object: {
+        type: require("./object"),
+        identity: require("./object.identity"),
+    },
+    ObjectId: {
+        type: require("./objectId"),
+        list: require("./objectId.list"),
+    },
+    String: {
+        type: require("./string"),
+        from10to10000: require("./string.10-10000"),
+        email: require("./string.email"),
+        ip: require("./string.ip"),
+        notEmpty: require("./string.not.empty"),
+        telephone: require("./string.telephone"),
+        uuid: require("./string.uuid"),
+    },
+});

package/src/core/validators/number.int.js

@@ -0,0 +1,9 @@
+module.exports = [
+    ...require("./number"),
+    {
+        validator(val) {
+            return val.toString() === Math.round(val).toString();
+        },
+        message: "not-node:value_is_not_integer",
+    },
+];

package/src/core/validators/number.js

@@ -0,0 +1,8 @@
+module.exports = [
+    {
+        validator(val) {
+            return typeof val === "number";
+        },
+        message: "not-node:value_is_not_number",
+    },
+];

package/src/core/validators/number.positive.js

@@ -0,0 +1,9 @@
+module.exports = [
+    ...require("./number"),
+    {
+        validator(val) {
+            return val > 0;
+        },
+        message: "not-node:value_should_be_greater_than_zero",
+    },
+];

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

@@ -0,0 +1,9 @@
+module.exports = [
+    ...require("./number"),
+    {
+        validator(val) {
+            return val >= 0;
+        },
+        message: "not-node:value_should_be_zero_or_greater",
+    },
+];

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

@@ -0,0 +1,110 @@
+//const { objHas } = require("../../common");
+const {
+    DEFAULT_USER_ROLE_FOR_ROOT,
+    DEFAULT_USER_ROLE_FOR_ADMIN,
+    DEFAULT_USER_ROLE_FOR_GUEST,
+} = require("../../auth/const");
+const notValidationError = require("not-error/src/validation.error.node.cjs");
+
+const schema = {
+    type: "object",
+    properties: {
+        root: { type: "boolean" },
+        admin: { type: "boolean" },
+        auth: { type: "boolean" },
+        role: {
+            type: "array",
+            items: { type: "string" },
+        },
+        primaryRole: {
+            type: "string",
+            enum: ["root", "admin", "client", "user", "guest"],
+        },
+        uid: { type: "string" },
+        sid: { type: "string" },
+        ip: { type: "string" },
+        provider: { type: "string" },
+    },
+    required: [
+        "root",
+        "admin",
+        "auth",
+        "role",
+        "primaryRole",
+        "uid",
+        "sid",
+        "provider",
+    ],
+};
+
+module.exports = [
+    {
+        validator(val, { ajv }) {
+            const validate = ajv.compile(schema);
+            if (validate(val)) {
+                return true;
+            } else {
+                const fields = {};
+                validate.errors.forEach((error) => {
+                    const propName = error.instancePath.replaceAll("/", ".");
+                    fields[propName] = [error.message];
+                });
+                throw new notValidationError(
+                    "not-node:identity_object_is_not_valid",
+                    fields
+                );
+            }
+        },
+    },
+    {
+        validator(val) {
+            const superuser = val.root || val.admin;
+            if (superuser) {
+                return val.auth;
+            }
+            return true;
+        },
+        message: "not-node:identity_root_and_admin_should_be_auth",
+    },
+    {
+        validator(val) {
+            return !(val.admin && val.root);
+        },
+        message: "not-node:identity_root_and_admin_cant_be_both_true",
+    },
+    {
+        validator(val) {
+            if (val.root) {
+                return val.primaryRole === DEFAULT_USER_ROLE_FOR_ROOT;
+            }
+            return true;
+        },
+        message: "not-node:identity_root_should_have_primaryRole_root",
+    },
+    {
+        validator(val) {
+            if (val.admin) {
+                return val.primaryRole === DEFAULT_USER_ROLE_FOR_ADMIN;
+            } else {
+                return true;
+            }
+        },
+        message: "not-node:identity_admin_should_have_primaryRole_admin",
+    },
+    {
+        validator(val) {
+            if (!val.auth) {
+                return val.primaryRole === DEFAULT_USER_ROLE_FOR_GUEST;
+            }
+            return true;
+        },
+        message: "not-node:identity_guest_should_have_primaryRole_guest",
+    },
+
+    {
+        validator(val) {
+            return val.role.includes(val.primaryRole);
+        },
+        message: "not-node:identity_role_should_contain_primaryRole",
+    },
+];