@autofleet/sadot 1.1.4-beta → 1.1.5-beta

package/dist/hooks/hooks.js

@@ -90,7 +90,7 @@ const getCompleteCustomFields = async (instance, options) => {
     }
     return instance.customFields || {};
 };
-const buildBeforeFromInstance = (instance) => {
+const buildPreChangeState = (instance) => {
     const beforeFull = { ...instance.dataValues };
     const changedKeys = instance.changed?.() || [];
     changedKeys.forEach((key) => {
@@ -150,10 +150,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);
@@ -168,7 +165,7 @@ const validateModel = async (instance, options, scopeAttributes, modelOptions =
     // For updates, get the previous values
     let originalValues = null;
     if (!isCreate) {
-        originalValues = buildBeforeFromInstance(instance);
+        originalValues = buildPreChangeState(instance);
     }
     // 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/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,12 @@ 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;
+}) => 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/package.json

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

package/src/hooks/hooks.ts

@@ -78,7 +78,7 @@ const getCompleteCustomFields = async (instance, options): Promise<Record<string
   return instance.customFields || {};
 };
 
-const buildBeforeFromInstance = (instance: any) => {
+const buildPreChangeState = (instance: any) => {
   const beforeFull: any = { ...instance.dataValues };
 
   const changedKeys: string[] = instance.changed?.() || [];
@@ -191,7 +191,7 @@ const validateModel = async (
   // For updates, get the previous values
   let originalValues = null;
   if (!isCreate) {
-    originalValues = buildBeforeFromInstance(instance);
+    originalValues = buildPreChangeState(instance);
   }
 
   // Get complete custom fields by merging DB values with update values