@autofleet/sadot 1.6.18-beta.2 → 1.6.18-beta.21

package/dist/utils/validations/schema/validator-schema.cjs

@@ -0,0 +1,102 @@
+const require_rolldown_runtime = require('../../../_virtual/rolldown_runtime.cjs');
+const require_index = require('../../logger/index.cjs');
+let _autofleet_errors = require("@autofleet/errors");
+let ajv = require("ajv");
+ajv = require_rolldown_runtime.__toESM(ajv);
+let ajv_formats = require("ajv-formats");
+ajv_formats = require_rolldown_runtime.__toESM(ajv_formats);
+
+//#region src/utils/validations/schema/validator-schema.ts
+const metaValidator = new ajv.default({
+	allErrors: true,
+	strict: false,
+	strictTypes: false,
+	$data: true
+});
+(0, ajv_formats.default)(metaValidator);
+/**
+* Schema for validating JSON Schema objects in custom validators
+* This is a meta-schema to ensure that custom validator schemas are valid Ajv schemas
+*/
+const validatorMetaSchema = {
+	type: "object",
+	properties: {
+		type: {
+			type: "string",
+			enum: ["object"]
+		},
+		properties: {
+			type: "object",
+			properties: {
+				before: {
+					type: "object",
+					properties: {
+						type: {
+							type: "string",
+							enum: ["object"]
+						},
+						properties: { type: "object" }
+					}
+				},
+				after: {
+					type: "object",
+					properties: {
+						type: {
+							type: "string",
+							enum: ["object"]
+						},
+						properties: { type: "object" }
+					}
+				}
+			}
+		},
+		required: {
+			type: "array",
+			items: { type: "string" }
+		},
+		if: { type: "object" },
+		then: { type: "object" },
+		else: { type: "object" }
+	},
+	required: ["type", "properties"]
+};
+/**
+* Validates that a given schema is a valid Ajv schema
+* This function is used to validate schemas passed to custom validators
+*
+* @param schema The schema to validate
+* @returns true if valid, throws an error if invalid
+*/
+const validateValidatorSchema = (schema) => {
+	try {
+		const validateMetaSchema = metaValidator.compile(validatorMetaSchema);
+		if (!validateMetaSchema(schema)) {
+			const errorDetails = validateMetaSchema.errors?.map((err) => `${err.instancePath || ""} ${err.message || "Invalid schema structure"}`).join(", ");
+			require_index.default.error("Invalid validator schema structure", {
+				errors: validateMetaSchema.errors,
+				schema
+			});
+			throw new _autofleet_errors.BadRequest([/* @__PURE__ */ new Error(`Invalid validator schema structure: ${errorDetails}`)], ["Invalid validator schema structure"]);
+		}
+		try {
+			metaValidator.compile(schema);
+			return true;
+		} catch (compileError) {
+			require_index.default.error("Failed to compile validator schema", {
+				error: compileError,
+				schema
+			});
+			throw new _autofleet_errors.BadRequest([/* @__PURE__ */ new Error(`Failed to compile validator schema: ${compileError.message}`)], ["Invalid validator schema"]);
+		}
+	} catch (error) {
+		if (error instanceof _autofleet_errors.BadRequest) throw error;
+		require_index.default.error("Error validating validator schema", {
+			error,
+			schema
+		});
+		throw new _autofleet_errors.BadRequest([/* @__PURE__ */ new Error(`Error validating validator schema: ${error.message}`)], ["Invalid validator schema"]);
+	}
+};
+
+//#endregion
+exports.validateValidatorSchema = validateValidatorSchema;

package/dist/utils/validations/schema/validator-schema.js

@@ -0,0 +1,99 @@
+import logger_default from "../../logger/index.js";
+import { BadRequest } from "@autofleet/errors";
+import Ajv from "ajv";
+import addFormats from "ajv-formats";
+
+//#region src/utils/validations/schema/validator-schema.ts
+const metaValidator = new Ajv({
+	allErrors: true,
+	strict: false,
+	strictTypes: false,
+	$data: true
+});
+addFormats(metaValidator);
+/**
+* Schema for validating JSON Schema objects in custom validators
+* This is a meta-schema to ensure that custom validator schemas are valid Ajv schemas
+*/
+const validatorMetaSchema = {
+	type: "object",
+	properties: {
+		type: {
+			type: "string",
+			enum: ["object"]
+		},
+		properties: {
+			type: "object",
+			properties: {
+				before: {
+					type: "object",
+					properties: {
+						type: {
+							type: "string",
+							enum: ["object"]
+						},
+						properties: { type: "object" }
+					}
+				},
+				after: {
+					type: "object",
+					properties: {
+						type: {
+							type: "string",
+							enum: ["object"]
+						},
+						properties: { type: "object" }
+					}
+				}
+			}
+		},
+		required: {
+			type: "array",
+			items: { type: "string" }
+		},
+		if: { type: "object" },
+		then: { type: "object" },
+		else: { type: "object" }
+	},
+	required: ["type", "properties"]
+};
+/**
+* Validates that a given schema is a valid Ajv schema
+* This function is used to validate schemas passed to custom validators
+*
+* @param schema The schema to validate
+* @returns true if valid, throws an error if invalid
+*/
+const validateValidatorSchema = (schema) => {
+	try {
+		const validateMetaSchema = metaValidator.compile(validatorMetaSchema);
+		if (!validateMetaSchema(schema)) {
+			const errorDetails = validateMetaSchema.errors?.map((err) => `${err.instancePath || ""} ${err.message || "Invalid schema structure"}`).join(", ");
+			logger_default.error("Invalid validator schema structure", {
+				errors: validateMetaSchema.errors,
+				schema
+			});
+			throw new BadRequest([/* @__PURE__ */ new Error(`Invalid validator schema structure: ${errorDetails}`)], ["Invalid validator schema structure"]);
+		}
+		try {
+			metaValidator.compile(schema);
+			return true;
+		} catch (compileError) {
+			logger_default.error("Failed to compile validator schema", {
+				error: compileError,
+				schema
+			});
+			throw new BadRequest([/* @__PURE__ */ new Error(`Failed to compile validator schema: ${compileError.message}`)], ["Invalid validator schema"]);
+		}
+	} catch (error) {
+		if (error instanceof BadRequest) throw error;
+		logger_default.error("Error validating validator schema", {
+			error,
+			schema
+		});
+		throw new BadRequest([/* @__PURE__ */ new Error(`Error validating validator schema: ${error.message}`)], ["Invalid validator schema"]);
+	}
+};
+
+//#endregion
+export { validateValidatorSchema };

package/dist/utils/validations/validators/index.cjs

@@ -0,0 +1,45 @@
+const require_rolldown_runtime = require('../../../_virtual/rolldown_runtime.cjs');
+const require_index = require('../../constants/index.cjs');
+const require_select_validator = require('./select.validator.cjs');
+const require_status_validator = require('./status.validator.cjs');
+const require_multi_select_status_validator = require('./multi-select-status.validator.cjs');
+const require_multi_select_dropdown_validator = require('./multi-select-dropdown.validator.cjs');
+let joi = require("joi");
+joi = require_rolldown_runtime.__toESM(joi);
+
+//#region src/utils/validations/validators/index.ts
+/**
+* Custom field types that must have custom validation.
+* TODO: remove this after moving to schema-based validation
+*/
+const CustomValidationTypes = {
+	[require_index.CustomFieldDefinitionType.SELECT]: require_index.CustomFieldDefinitionType.SELECT,
+	[require_index.CustomFieldDefinitionType.STATUS]: require_index.CustomFieldDefinitionType.STATUS,
+	[require_index.CustomFieldDefinitionType.MULTI_SELECT_STATUS]: require_index.CustomFieldDefinitionType.MULTI_SELECT_STATUS,
+	[require_index.CustomFieldDefinitionType.MULTI_SELECT_DROPDOWN]: require_index.CustomFieldDefinitionType.MULTI_SELECT_DROPDOWN
+};
+/**
+* Validators for custom fields
+*/
+const validators = {
+	[require_index.CustomFieldDefinitionType.SELECT]: require_select_validator.validateSelect,
+	[require_index.CustomFieldDefinitionType.STATUS]: require_status_validator.validateStatus,
+	[require_index.CustomFieldDefinitionType.MULTI_SELECT_STATUS]: require_multi_select_status_validator.validateMultiSelectStatus,
+	[require_index.CustomFieldDefinitionType.MULTI_SELECT_DROPDOWN]: require_multi_select_dropdown_validator.validateMultiSelectDropdown,
+	[require_index.CustomFieldDefinitionType.TEXT]: (value) => joi.default.string().min(0).validate(value),
+	[require_index.CustomFieldDefinitionType.NUMBER]: (value) => joi.default.number().strict(true).validate(value),
+	[require_index.CustomFieldDefinitionType.BOOLEAN]: (value) => joi.default.boolean().strict().validate(value),
+	[require_index.CustomFieldDefinitionType.DATE]: (value) => joi.default.date().validate(value),
+	[require_index.CustomFieldDefinitionType.DATETIME]: (value) => joi.default.date().validate(value),
+	[require_index.CustomFieldDefinitionType.IMAGE]: (value) => joi.default.array().min(1).unique().items(joi.default.string().uri()).validate(value),
+	[require_index.CustomFieldDefinitionType.FILE]: (value) => joi.default.array().min(1).unique().items(joi.default.object({
+		name: joi.default.string().required(),
+		type: joi.default.string(),
+		size: joi.default.string(),
+		addedBy: joi.default.string().uuid()
+	})).validate(value)
+};
+
+//#endregion
+exports.CustomValidationTypes = CustomValidationTypes;
+exports.validators = validators;

package/dist/utils/validations/validators/index.js

@@ -0,0 +1,42 @@
+import { CustomFieldDefinitionType } from "../../constants/index.js";
+import { validateSelect } from "./select.validator.js";
+import { validateStatus } from "./status.validator.js";
+import { validateMultiSelectStatus } from "./multi-select-status.validator.js";
+import { validateMultiSelectDropdown } from "./multi-select-dropdown.validator.js";
+import Joi from "joi";
+
+//#region src/utils/validations/validators/index.ts
+/**
+* Custom field types that must have custom validation.
+* TODO: remove this after moving to schema-based validation
+*/
+const CustomValidationTypes = {
+	[CustomFieldDefinitionType.SELECT]: CustomFieldDefinitionType.SELECT,
+	[CustomFieldDefinitionType.STATUS]: CustomFieldDefinitionType.STATUS,
+	[CustomFieldDefinitionType.MULTI_SELECT_STATUS]: CustomFieldDefinitionType.MULTI_SELECT_STATUS,
+	[CustomFieldDefinitionType.MULTI_SELECT_DROPDOWN]: CustomFieldDefinitionType.MULTI_SELECT_DROPDOWN
+};
+/**
+* Validators for custom fields
+*/
+const validators = {
+	[CustomFieldDefinitionType.SELECT]: validateSelect,
+	[CustomFieldDefinitionType.STATUS]: validateStatus,
+	[CustomFieldDefinitionType.MULTI_SELECT_STATUS]: validateMultiSelectStatus,
+	[CustomFieldDefinitionType.MULTI_SELECT_DROPDOWN]: validateMultiSelectDropdown,
+	[CustomFieldDefinitionType.TEXT]: (value) => Joi.string().min(0).validate(value),
+	[CustomFieldDefinitionType.NUMBER]: (value) => Joi.number().strict(true).validate(value),
+	[CustomFieldDefinitionType.BOOLEAN]: (value) => Joi.boolean().strict().validate(value),
+	[CustomFieldDefinitionType.DATE]: (value) => Joi.date().validate(value),
+	[CustomFieldDefinitionType.DATETIME]: (value) => Joi.date().validate(value),
+	[CustomFieldDefinitionType.IMAGE]: (value) => Joi.array().min(1).unique().items(Joi.string().uri()).validate(value),
+	[CustomFieldDefinitionType.FILE]: (value) => Joi.array().min(1).unique().items(Joi.object({
+		name: Joi.string().required(),
+		type: Joi.string(),
+		size: Joi.string(),
+		addedBy: Joi.string().uuid()
+	})).validate(value)
+};
+
+//#endregion
+export { CustomValidationTypes, validators };

package/dist/utils/validations/validators/multi-select-dropdown.validator.cjs

@@ -0,0 +1,7 @@
+const require_multi_select_helpers = require('./multi-select.helpers.cjs');
+
+//#region src/utils/validations/validators/multi-select-dropdown.validator.ts
+const validateMultiSelectDropdown = (value, options) => require_multi_select_helpers.validateMultiSelect(value, options ?? []);
+
+//#endregion
+exports.validateMultiSelectDropdown = validateMultiSelectDropdown;

package/dist/utils/validations/validators/multi-select-dropdown.validator.js

@@ -0,0 +1,7 @@
+import { validateMultiSelect } from "./multi-select.helpers.js";
+
+//#region src/utils/validations/validators/multi-select-dropdown.validator.ts
+const validateMultiSelectDropdown = (value, options) => validateMultiSelect(value, options ?? []);
+
+//#endregion
+export { validateMultiSelectDropdown };

package/dist/utils/validations/validators/multi-select-status.validator.cjs

@@ -0,0 +1,10 @@
+const require_multi_select_helpers = require('./multi-select.helpers.cjs');
+
+//#region src/utils/validations/validators/multi-select-status.validator.ts
+/**
+* Validate that the value is an array containing only the allowed multi-select values
+*/
+const validateMultiSelectStatus = (value, multiSelectOptions) => require_multi_select_helpers.validateMultiSelect(value, (multiSelectOptions ?? []).map((option) => option.value));
+
+//#endregion
+exports.validateMultiSelectStatus = validateMultiSelectStatus;

package/dist/utils/validations/validators/multi-select-status.validator.js

@@ -0,0 +1,10 @@
+import { validateMultiSelect } from "./multi-select.helpers.js";
+
+//#region src/utils/validations/validators/multi-select-status.validator.ts
+/**
+* Validate that the value is an array containing only the allowed multi-select values
+*/
+const validateMultiSelectStatus = (value, multiSelectOptions) => validateMultiSelect(value, (multiSelectOptions ?? []).map((option) => option.value));
+
+//#endregion
+export { validateMultiSelectStatus };

package/dist/utils/validations/validators/multi-select.helpers.cjs

@@ -0,0 +1,12 @@
+const require_rolldown_runtime = require('../../../_virtual/rolldown_runtime.cjs');
+let joi = require("joi");
+joi = require_rolldown_runtime.__toESM(joi);
+
+//#region src/utils/validations/validators/multi-select.helpers.ts
+const validateMultiSelect = (value, allowedValues) => {
+	if (!allowedValues.length) return joi.default.valid(null).messages({ "any.only": "custom field definition has no allowed values" }).validate(value);
+	return joi.default.array().allow(null).items(joi.default.string().valid(...allowedValues)).unique().validate(value);
+};
+
+//#endregion
+exports.validateMultiSelect = validateMultiSelect;

package/dist/utils/validations/validators/multi-select.helpers.js

@@ -0,0 +1,10 @@
+import Joi from "joi";
+
+//#region src/utils/validations/validators/multi-select.helpers.ts
+const validateMultiSelect = (value, allowedValues) => {
+	if (!allowedValues.length) return Joi.valid(null).messages({ "any.only": "custom field definition has no allowed values" }).validate(value);
+	return Joi.array().allow(null).items(Joi.string().valid(...allowedValues)).unique().validate(value);
+};
+
+//#endregion
+export { validateMultiSelect };

package/dist/utils/validations/validators/select.validator.cjs

@@ -0,0 +1,12 @@
+const require_rolldown_runtime = require('../../../_virtual/rolldown_runtime.cjs');
+let joi = require("joi");
+joi = require_rolldown_runtime.__toESM(joi);
+
+//#region src/utils/validations/validators/select.validator.ts
+/**
+* Validate that the value is one of the select values
+*/
+const validateSelect = (value, selectValues) => joi.default.string().allow(null).valid(...selectValues).validate(value);
+
+//#endregion
+exports.validateSelect = validateSelect;

package/dist/utils/validations/validators/select.validator.js

@@ -0,0 +1,10 @@
+import Joi from "joi";
+
+//#region src/utils/validations/validators/select.validator.ts
+/**
+* Validate that the value is one of the select values
+*/
+const validateSelect = (value, selectValues) => Joi.string().allow(null).valid(...selectValues).validate(value);
+
+//#endregion
+export { validateSelect };

package/dist/utils/validations/validators/status.validator.cjs

@@ -0,0 +1,12 @@
+const require_rolldown_runtime = require('../../../_virtual/rolldown_runtime.cjs');
+let joi = require("joi");
+joi = require_rolldown_runtime.__toESM(joi);
+
+//#region src/utils/validations/validators/status.validator.ts
+/**
+* Validate that the value is one of the status values
+*/
+const validateStatus = (value, statusValues) => joi.default.string().allow(null).valid(...statusValues.map((statusValue) => statusValue.value)).validate(value);
+
+//#endregion
+exports.validateStatus = validateStatus;

package/dist/utils/validations/validators/status.validator.js

@@ -0,0 +1,10 @@
+import Joi from "joi";
+
+//#region src/utils/validations/validators/status.validator.ts
+/**
+* Validate that the value is one of the status values
+*/
+const validateStatus = (value, statusValues) => Joi.string().allow(null).valid(...statusValues.map((statusValue) => statusValue.value)).validate(value);
+
+//#endregion
+export { validateStatus };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autofleet/sadot",
-  "version": "1.6.18-beta.2",
+  "version": "1.6.18-beta.21",
   "description": "",
   "type": "module",
   "main": "./dist/index.js",
@@ -53,10 +53,10 @@
     "express": "^4.21.2",
     "npm-watch": "^0.11.0",
     "supertest": "^7.0.0",
-    "@autofleet/errors": "^3.3.7",
-    "@autofleet/zehut": "^4.13.3",
     "@autofleet/node-common": "^4.3.22",
-    "@autofleet/logger": "^4.7.0"
+    "@autofleet/logger": "^4.7.0",
+    "@autofleet/errors": "^3.3.7",
+    "@autofleet/zehut": "^4.13.4"
   },
   "peerDependencies": {
     "@autofleet/errors": "^3",