@autofleet/sadot 0.13.3-beta.0 → 0.13.4

package/dist/hooks/enrich.js

@@ -32,7 +32,20 @@ const ValueRepo = __importStar(require("../repository/value"));
 const DefinitionRepo = __importStar(require("../repository/definition"));
 const EntriesRepo = __importStar(require("../repository/entries"));
 const scopeAttributes_1 = __importDefault(require("../utils/scopeAttributes"));
-const CUSTOM_FIELD_DEFINITION_ATTRIBUTES_TO_PULL = ['id', 'name', 'entityId'];
+// Include all required fields for proper functioning
+const CUSTOM_FIELD_DEFINITION_ATTRIBUTES_TO_PULL = [
+    'id',
+    'name',
+    'entityId',
+    'fieldType',
+    'displayName',
+    'validation',
+    'entityType',
+    'modelType',
+    'required',
+    'disabled',
+    'defaultValue',
+];
 const getCustomFieldEntriesByInstanceId = async ({ instancesIds, options, sadotOptions, }) => {
     if (!sadotOptions.useCustomFieldsEntries) {
         return {};
@@ -116,6 +129,7 @@ const enrichResults = (modelType, scopeAttributes, hookType, modelOptions = {},
         instances.forEach((instance) => {
             instance.customFields = {};
         });
+        return;
     }
     if (modelOptions?.include && modelOptions.useEntityIdFromInclude) {
         // if we pass useEntityIdFromInclude,

package/dist/hooks/hooks.js

@@ -38,7 +38,8 @@ const errors_2 = require("../errors");
 const scopeAttributes_1 = __importDefault(require("../utils/scopeAttributes"));
 const updateInstanceValues_1 = __importDefault(require("./utils/updateInstanceValues"));
 const constants_1 = require("../utils/constants");
-const CUSTOM_VALIDATOR_ATTRIBUTES_TO_PULL = ['schema'];
+// Include all required fields for proper validation
+const CUSTOM_VALIDATOR_ATTRIBUTES_TO_PULL = ['id', 'schema', 'modelType', 'entityId', 'disabled'];
 // Initialize Ajv with relaxed settings to avoid warnings
 const ajv = new ajv_1.default({
     allErrors: true,
@@ -120,6 +121,7 @@ const validateModel = async (instance, options, scopeAttributes, isCreate = fals
         validatorsPromise = ValidatorRepo.findAllByModelType(modelType, entityId, {
             transaction: options.transaction,
             attributes: CUSTOM_VALIDATOR_ATTRIBUTES_TO_PULL,
+            raw: true,
         });
         if (options.transaction) {
             options?.transaction?.validationsCache.set(cacheKey, validatorsPromise);

package/dist/repository/validator.d.ts

@@ -3,6 +3,7 @@ import { CustomValidator } from '../models';
 export interface FindValidatorOptions extends Transactionable {
     withDisabled?: boolean;
     attributes?: string[];
+    raw?: boolean;
 }
 export interface ValidatorAttributes {
     entityId: string;

package/package.json

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

package/src/hooks/enrich.ts

@@ -8,7 +8,20 @@ import type { SerializedCustomFields } from '../types/definition';
 import type { CustomFieldOptions, ModelOptions, TransactionOptions } from '../types';
 import applyScopeToInstance from '../utils/scopeAttributes';
 
-const CUSTOM_FIELD_DEFINITION_ATTRIBUTES_TO_PULL = ['id', 'name', 'entityId'];
+// Include all required fields for proper functioning
+const CUSTOM_FIELD_DEFINITION_ATTRIBUTES_TO_PULL = [
+  'id',
+  'name',
+  'entityId',
+  'fieldType',
+  'displayName',
+  'validation',
+  'entityType',
+  'modelType',
+  'required',
+  'disabled',
+  'defaultValue',
+];
 
 type SupportedHookTypes = 'afterFind' | 'afterCreate' | 'afterUpdate';
 
@@ -162,6 +175,7 @@ const enrichResults = (
     instances.forEach((instance) => {
       instance.customFields = {};
     });
+    return;
   }
 
   if (modelOptions?.include && modelOptions.useEntityIdFromInclude) {

package/src/hooks/hooks.ts

@@ -13,7 +13,8 @@ import updateInstanceValues from './utils/updateInstanceValues';
 import { CustomFieldDefinitionType } from '../utils/constants';
 import type { CustomFieldDefinition } from '../models';
 
-const CUSTOM_VALIDATOR_ATTRIBUTES_TO_PULL = ['schema'];
+// Include all required fields for proper validation
+const CUSTOM_VALIDATOR_ATTRIBUTES_TO_PULL = ['id', 'schema', 'modelType', 'entityId', 'disabled'];
 
 // Initialize Ajv with relaxed settings to avoid warnings
 const ajv = new Ajv({
@@ -123,6 +124,7 @@ const validateModel = async (
       {
         transaction: options.transaction,
         attributes: CUSTOM_VALIDATOR_ATTRIBUTES_TO_PULL,
+        raw: true,
       },
     );
     if (options.transaction) {

package/src/repository/validator.ts

@@ -5,6 +5,7 @@ import { CustomValidator } from '../models';
 export interface FindValidatorOptions extends Transactionable {
   withDisabled?: boolean;
   attributes?: string[];
+  raw?: boolean;
 }
 
 // Make sure this interface is compatible with the Sequelize model