@autofleet/sadot 1.0.1-beta → 1.0.2

package/dist/api/v1/validator/validations.js

@@ -4,34 +4,36 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const joi_1 = __importDefault(require("joi"));
+// Schema for validating JSON Schema objects
 const jsonSchemaValidation = joi_1.default.object().unknown(true);
-const schemaObject = joi_1.default.object({
-    type: joi_1.default.string().valid('object'),
-    properties: joi_1.default.object({
-        before: jsonSchemaValidation,
-        after: jsonSchemaValidation,
-    }).required(),
-    required: joi_1.default.array().items(joi_1.default.string()), // 👈 כאן הוספנו
-    allOf: joi_1.default.array().items(joi_1.default.object()), // 👈 אופציונלי
-    anyOf: joi_1.default.array().items(joi_1.default.object()), // 👈 אופציונלי
-    oneOf: joi_1.default.array().items(joi_1.default.object()), // 👈 אופציונלי
-    additionalProperties: joi_1.default.alternatives().try(joi_1.default.boolean(), joi_1.default.object()),
-    $id: joi_1.default.string(),
-    $schema: joi_1.default.string(),
-    if: joi_1.default.object(),
-    then: joi_1.default.object(),
-    else: joi_1.default.object(),
-});
 const validationSchemas = {
     create: joi_1.default.object({
         entityId: joi_1.default.string().uuid().required(),
         entityType: joi_1.default.string().required(),
-        schema: schemaObject.required(), // schema חייב להיות קיים
+        schema: joi_1.default.object({
+            type: joi_1.default.string().valid('object').required(),
+            properties: joi_1.default.object({
+                before: jsonSchemaValidation,
+                after: jsonSchemaValidation,
+            }).required(),
+            if: joi_1.default.object().optional(),
+            then: joi_1.default.object().optional(),
+            else: joi_1.default.object().optional(),
+        }).required(),
     }),
     update: joi_1.default.object({
         entityId: joi_1.default.string().uuid(),
         entityType: joi_1.default.string(),
-        schema: schemaObject,
+        schema: joi_1.default.object({
+            type: joi_1.default.string().valid('object'),
+            properties: joi_1.default.object({
+                before: jsonSchemaValidation,
+                after: jsonSchemaValidation,
+            }),
+            if: joi_1.default.object().optional(),
+            then: joi_1.default.object().optional(),
+            else: joi_1.default.object().optional(),
+        }),
         disabled: joi_1.default.boolean(),
     }).min(1),
 };

package/dist/hooks/hooks.js

@@ -90,19 +90,6 @@ const getCompleteCustomFields = async (instance, options) => {
     }
     return instance.customFields || {};
 };
-const buildBeforeFromInstance = (instance) => {
-    const beforeFull = { ...instance.dataValues };
-    const changedKeys = instance.changed?.() || [];
-    for (const k of changedKeys) {
-        const prevVal = instance.previous?.(k);
-        if (prevVal !== undefined)
-            beforeFull[k] = prevVal;
-    }
-    const prevCF = instance.previous?.('customFields');
-    if (prevCF !== undefined)
-        beforeFull.customFields = prevCF;
-    return beforeFull;
-};
 const formatAjvErrors = (errors) => errors.reduce((acc, err) => {
     const basePath = (err.instancePath || '')
         .split('/')
@@ -148,10 +135,7 @@ const validateModel = async (instance, options, scopeAttributes, modelOptions =
         validatorsPromise = ValidatorRepo.findAllByModelType(modelType, entityId, {
             transaction: options.transaction,
             attributes: CUSTOM_VALIDATOR_ATTRIBUTES_TO_PULL,
-            ...(modelOptions.include && {
-                include: modelOptions.include?.(entityId),
-            }),
-            raw: true,
+            modelOptions,
         });
         if (options.transaction) {
             options?.transaction?.validationsCache.set(cacheKey, validatorsPromise);
@@ -166,7 +150,10 @@ const validateModel = async (instance, options, scopeAttributes, modelOptions =
     // For updates, get the previous values
     let originalValues = null;
     if (!isCreate) {
-        originalValues = buildBeforeFromInstance(instance);
+        // Create originalValues with our helper function
+        originalValues = manualObjectCopy(instance.previous());
+        // Add customFields separately
+        originalValues.customFields = instance.previous('customFields') || {};
     }
     // Get complete custom fields by merging DB values with update values
     // This is especially important for partial updates to ensure all related fields are available

package/dist/index.d.ts

@@ -8,6 +8,6 @@ export * from './utils/helpers';
  * Adding custom fields enrichment to the models inside the MODELS_FILE_NAME json file
  * @see {@link 'custom-fields/config'} for configurations
  */
-declare const useCustomFields: (app: Application | null, getModel: ModelFetcher, options: CustomFieldOptions) => Promise<Sequelize>;
+declare const useCustomFields: (app: Pick<Application, 'use'> | null, getModel: ModelFetcher, options: CustomFieldOptions) => Promise<Sequelize>;
 export default useCustomFields;
 export declare const disableCustomFields: (models: Models[], getModel: ModelFetcher) => void;

package/dist/repository/validator.d.ts

@@ -1,5 +1,6 @@
-import type { IncludeOptions, Transactionable } from 'sequelize';
+import type { FindOptions, IncludeOptions, Transactionable } from 'sequelize';
 import { CustomValidator } from '../models';
+import type { ModelOptions } from '../types';
 export interface FindValidatorOptions extends Transactionable {
     withDisabled?: boolean;
     attributes?: string[];
@@ -15,7 +16,13 @@ export interface ValidatorAttributes {
     [key: string]: unknown;
 }
 export declare const create: (validatorAttributes: ValidatorAttributes, options?: Transactionable) => Promise<CustomValidator>;
-export declare const findAll: (where?: {}, options?: FindValidatorOptions) => Promise<CustomValidator[]>;
-export declare const findAllByModelType: (modelType: string, entityId: string, options?: FindValidatorOptions) => Promise<CustomValidator[]>;
+export declare const findAll: (where?: {}, options?: FindOptions & {
+    modelOptions?: ModelOptions;
+    withDisabled?: boolean;
+}) => Promise<CustomValidator[]>;
+export declare const findAllByModelType: (modelType: string, entityId: string, options?: FindOptions & {
+    modelOptions?: ModelOptions;
+    withDisabled?: boolean;
+}) => Promise<CustomValidator[]>;
 export declare const update: (id: string, updates: Partial<ValidatorAttributes>, options?: Transactionable) => Promise<[number, CustomValidator[]]>;
 export declare const disable: (id: string, options?: Transactionable) => Promise<[number, CustomValidator[]]>;

package/dist/repository/validator.js

@@ -13,9 +13,9 @@ const create = async (validatorAttributes, options = {}) => {
     return validator;
 };
 exports.create = create;
-const findAll = async (where = {}, options = { withDisabled: false }) => {
+const findAll = async (where = {}, options = {}) => {
     logger_1.default.debug('custom-validator - find all validators');
-    const { transaction, withDisabled } = options;
+    const { transaction, withDisabled, include, attributes, raw, } = options;
     let validators;
     if (withDisabled) {
         // If withDisabled is true, use unscoped to ignore the default scope that filters disabled items
@@ -23,6 +23,9 @@ const findAll = async (where = {}, options = { withDisabled: false }) => {
         validators = await models_1.CustomValidator.unscoped().scope('userScope').findAll({
             where,
             transaction,
+            include,
+            attributes,
+            raw,
         });
     }
     else {
@@ -31,19 +34,23 @@ const findAll = async (where = {}, options = { withDisabled: false }) => {
         validators = await models_1.CustomValidator.scope(['defaultScope', 'userScope']).findAll({
             where,
             transaction,
+            include,
+            attributes,
+            raw,
         });
     }
     return validators;
 };
 exports.findAll = findAll;
-const findAllByModelType = async (modelType, entityId, options = { withDisabled: false }) => {
+const findAllByModelType = async (modelType, entityId, options = {}) => {
     logger_1.default.debug('custom-validator - find all validators by model type');
     return (0, exports.findAll)({
         modelType,
-        ...(!options.include && {
-            entityId,
-        }),
-    }, options);
+        ...(!options?.modelOptions?.useEntityIdFromInclude && { entityId }),
+    }, {
+        ...options,
+        include: options?.modelOptions?.include?.(entityId),
+    });
 };
 exports.findAllByModelType = findAllByModelType;
 const update = async (id, updates, options) => {

package/dist/types/index.d.ts

@@ -14,7 +14,7 @@ export type ModelOptions = {
     /**
      * Include options for the model
      */
-    include?: (entityIds: string[]) => IncludeOptions[];
+    include?: (entityIds: string | string[]) => IncludeOptions[];
     /**
       * Custom association for the model
       * @param model - The model to associate with

package/dist/utils/init.js

@@ -106,6 +106,7 @@ exports.addScopes = addScopes;
 const applyCustomAssociation = (models) => {
     models.forEach(({ modelOptions }) => {
         modelOptions?.customAssociation?.(models_1.CustomFieldDefinition);
+        modelOptions?.customAssociation?.(models_1.CustomValidator);
     });
 };
 exports.applyCustomAssociation = applyCustomAssociation;

package/dist/utils/logger/index.js

@@ -1,4 +1,27 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -8,8 +31,8 @@ const logger_1 = __importDefault(require("@autofleet/logger"));
 const logger = (0, logger_1.default)();
 async function tryAddingTraceIdMiddleware() {
     try {
-        // const { outbreak } = await import('@autofleet/zehut');
-        // logger.addContextMiddleware(() => ({ traceId: outbreak.getCurrentContextTraceId() }));
+        const { outbreak } = await Promise.resolve().then(() => __importStar(require('@autofleet/zehut')));
+        logger.addContextMiddleware(() => ({ traceId: outbreak.getCurrentContextTraceId() }));
     }
     catch (err) {
         logger.error('Failed to add traceId middleware', { err });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autofleet/sadot",
-  "version": "1.0.1-beta",
+  "version": "1.0.2",
   "description": "",
   "main": "dist/index.js",
   "scripts": {

package/src/api/v1/validator/validations.ts

@@ -1,36 +1,37 @@
 import Joi from 'joi';
 
+// Schema for validating JSON Schema objects
 const jsonSchemaValidation = Joi.object().unknown(true);
 
-const schemaObject = Joi.object({
-  type: Joi.string().valid('object'),
-  properties: Joi.object({
-    before: jsonSchemaValidation,
-    after: jsonSchemaValidation,
-  }).required(),
-  required: Joi.array().items(Joi.string()),
-  allOf: Joi.array().items(Joi.object()),
-  anyOf: Joi.array().items(Joi.object()),
-  oneOf: Joi.array().items(Joi.object()),
-  additionalProperties: Joi.alternatives().try(Joi.boolean(), Joi.object()),
-  $id: Joi.string(),
-  $schema: Joi.string(),
-  if: Joi.object(),
-  then: Joi.object(),
-  else: Joi.object(),
-});
-
 const validationSchemas = {
   create: Joi.object({
     entityId: Joi.string().uuid().required(),
     entityType: Joi.string().required(),
-    schema: schemaObject.required(),
+    schema: Joi.object({
+      type: Joi.string().valid('object').required(),
+      properties: Joi.object({
+        before: jsonSchemaValidation,
+        after: jsonSchemaValidation,
+      }).required(),
+      if: Joi.object().optional(),
+      then: Joi.object().optional(),
+      else: Joi.object().optional(),
+    }).required(),
   }),
 
   update: Joi.object({
     entityId: Joi.string().uuid(),
     entityType: Joi.string(),
-    schema: schemaObject,
+    schema: Joi.object({
+      type: Joi.string().valid('object'),
+      properties: Joi.object({
+        before: jsonSchemaValidation,
+        after: jsonSchemaValidation,
+      }),
+      if: Joi.object().optional(),
+      then: Joi.object().optional(),
+      else: Joi.object().optional(),
+    }),
     disabled: Joi.boolean(),
   }).min(1),
 };

package/src/hooks/hooks.ts

@@ -78,25 +78,6 @@ const getCompleteCustomFields = async (instance, options): Promise<Record<string
   return instance.customFields || {};
 };
 
-const buildBeforeFromInstance = (instance: any) => {
-  const beforeFull: any = { ...instance.dataValues };
-
-  const changedKeys: string[] = instance.changed?.() || [];
-  changedKeys.forEach((key) => {
-    const prevVal = instance.previous?.(key);
-    if (prevVal !== undefined) {
-      beforeFull[key] = prevVal;
-    }
-  });
-
-  const prevCF = instance.previous?.('customFields');
-  if (prevCF !== undefined) {
-    beforeFull.customFields = prevCF;
-  }
-
-  return beforeFull;
-};
-
 const formatAjvErrors = (
   errors: {
   instancePath?: string;
@@ -169,10 +150,7 @@ const validateModel = async (
       {
         transaction: options.transaction,
         attributes: CUSTOM_VALIDATOR_ATTRIBUTES_TO_PULL,
-        ...(modelOptions.include && {
-          include: modelOptions.include?.(entityId),
-        }),
-        raw: true,
+        modelOptions,
       },
     );
     if (options.transaction) {
@@ -191,7 +169,11 @@ const validateModel = async (
   // For updates, get the previous values
   let originalValues = null;
   if (!isCreate) {
-    originalValues = buildBeforeFromInstance(instance);
+    // Create originalValues with our helper function
+    originalValues = manualObjectCopy(instance.previous());
+
+    // Add customFields separately
+    originalValues.customFields = instance.previous('customFields') || {};
   }
 
   // Get complete custom fields by merging DB values with update values

package/src/index.ts

@@ -22,7 +22,7 @@ export * from './utils/helpers';
  * @see {@link 'custom-fields/config'} for configurations
  */
 const useCustomFields = async (
-  app: Application | null,
+  app: Pick<Application, 'use'> | null,
   getModel: ModelFetcher,
   options: CustomFieldOptions,
 ): Promise<Sequelize> => {

package/src/repository/validator.ts

@@ -1,6 +1,7 @@
-import type { IncludeOptions, Transactionable } from 'sequelize';
+import type { FindOptions, IncludeOptions, Transactionable } from 'sequelize';
 import logger from '../utils/logger';
 import { CustomValidator } from '../models';
+import type { ModelOptions } from '../types';
 
 export interface FindValidatorOptions extends Transactionable {
   withDisabled?: boolean;
@@ -33,11 +34,16 @@ export const create = async (
 
 export const findAll = async (
   where = {},
-  options: FindValidatorOptions = { withDisabled: false },
+  options: FindOptions & {
+    modelOptions?: ModelOptions,
+     withDisabled?: boolean
+    } = {},
 ): Promise<CustomValidator[]> => {
   logger.debug('custom-validator - find all validators');
 
-  const { transaction, withDisabled } = options;
+  const {
+    transaction, withDisabled, include, attributes, raw,
+  } = options;
 
   let validators;
   if (withDisabled) {
@@ -46,6 +52,9 @@ export const findAll = async (
     validators = await CustomValidator.unscoped().scope('userScope').findAll({
       where,
       transaction,
+      include,
+      attributes,
+      raw,
     });
   } else {
     // Use defaultScope and userScope to filter both disabled and by permissions
@@ -53,6 +62,9 @@ export const findAll = async (
     validators = await CustomValidator.scope(['defaultScope', 'userScope']).findAll({
       where,
       transaction,
+      include,
+      attributes,
+      raw,
     });
   }
 
@@ -62,18 +74,21 @@ export const findAll = async (
 export const findAllByModelType = async (
   modelType: string,
   entityId: string,
-  options: FindValidatorOptions = { withDisabled: false },
+  options: FindOptions & {
+    modelOptions?: ModelOptions,
+    withDisabled?: boolean
+  } = {},
 ): Promise<CustomValidator[]> => {
   logger.debug('custom-validator - find all validators by model type');
-
   return findAll(
     {
       modelType,
-      ...(!options.include && {
-        entityId,
-      }),
+      ...(!options?.modelOptions?.useEntityIdFromInclude && { entityId }),
+    },
+    {
+      ...options,
+      include: options?.modelOptions?.include?.(entityId),
     },
-    options,
   );
 };
 

package/src/types/index.ts

@@ -17,7 +17,7 @@ export type ModelOptions = {
   /**
    * Include options for the model
    */
-  include?: (entityIds: string[]) => IncludeOptions[];
+  include?: (entityIds: string | string[]) => IncludeOptions[];
   /**
     * Custom association for the model
     * @param model - The model to associate with

package/src/utils/init.ts

@@ -5,6 +5,7 @@ import { CUSTOM_FIELDS_SORT_SCOPE } from '@autofleet/common-types/lib/custom-fie
 import {
   CustomFieldDefinition,
   CustomFieldValue,
+  CustomValidator,
 } from '../models';
 import {
   beforeFind,
@@ -116,5 +117,6 @@ export const addScopes = (models: Models[], getModel: ModelFetcher, options: Pic
 export const applyCustomAssociation = (models: Models[]): void => {
   models.forEach(({ modelOptions }) => {
     modelOptions?.customAssociation?.(CustomFieldDefinition);
+    modelOptions?.customAssociation?.(CustomValidator);
   });
 };