@autofleet/sadot 1.6.18-beta.7 → 1.6.18

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

@@ -0,0 +1 @@
+{"version":3,"file":"validations.js","names":["validationSchemas: ValidationSchemas"],"sources":["../../../../src/api/v1/validator/validations.ts"],"sourcesContent":["import Joi from 'joi';\n\nconst jsonSchemaValidation = Joi.object().unknown(true);\n\nexport interface SchemaObject {\n  type: 'object';\n  properties?: {\n    before?: object;\n    after?: object;\n  };\n  required?: string[];\n  allOf?: object[];\n  anyOf?: object[];\n  oneOf?: object[];\n  additionalProperties?: boolean | object;\n  $id?: string;\n  $schema?: string;\n  if?: object;\n  then?: object;\n  else?: object;\n}\n\nconst schemaObject = Joi.object<SchemaObject>({\n  type: Joi.string().valid('object'),\n  properties: Joi.object({\n    before: jsonSchemaValidation,\n    after: jsonSchemaValidation,\n  }).required(),\n  required: Joi.array().items(Joi.string()),\n  allOf: Joi.array().items(Joi.object()),\n  anyOf: Joi.array().items(Joi.object()),\n  oneOf: Joi.array().items(Joi.object()),\n  additionalProperties: Joi.alternatives().try(Joi.boolean(), Joi.object()),\n  $id: Joi.string(),\n  $schema: Joi.string(),\n  if: Joi.object(),\n  then: Joi.object(),\n  else: Joi.object(),\n});\n\nexport interface CreateValidatorPayload {\n  entityId: string;\n  entityType: string;\n  schema: SchemaObject;\n}\n\nexport interface UpdateValidatorPayload extends Partial<CreateValidatorPayload> {\n  disabled?: boolean;\n}\n\ninterface ValidationSchemas {\n  create: Joi.ObjectSchema<CreateValidatorPayload>;\n  update: Joi.ObjectSchema<UpdateValidatorPayload>;\n}\n\nconst validationSchemas: ValidationSchemas = {\n  create: Joi.object<CreateValidatorPayload>({\n    entityId: Joi.string().uuid().required(),\n    entityType: Joi.string().required(),\n    schema: schemaObject.required(),\n  }),\n\n  update: Joi.object<UpdateValidatorPayload>({\n    entityId: Joi.string().uuid(),\n    entityType: Joi.string(),\n    schema: schemaObject,\n    disabled: Joi.boolean(),\n  }).min(1),\n};\n\nexport default validationSchemas;\n"],"mappings":"mBAEA,MAAM,EAAuB,EAAI,QAAQ,CAAC,QAAQ,GAAK,CAoBjD,EAAe,EAAI,OAAqB,CAC5C,KAAM,EAAI,QAAQ,CAAC,MAAM,SAAS,CAClC,WAAY,EAAI,OAAO,CACrB,OAAQ,EACR,MAAO,EACR,CAAC,CAAC,UAAU,CACb,SAAU,EAAI,OAAO,CAAC,MAAM,EAAI,QAAQ,CAAC,CACzC,MAAO,EAAI,OAAO,CAAC,MAAM,EAAI,QAAQ,CAAC,CACtC,MAAO,EAAI,OAAO,CAAC,MAAM,EAAI,QAAQ,CAAC,CACtC,MAAO,EAAI,OAAO,CAAC,MAAM,EAAI,QAAQ,CAAC,CACtC,qBAAsB,EAAI,cAAc,CAAC,IAAI,EAAI,SAAS,CAAE,EAAI,QAAQ,CAAC,CACzE,IAAK,EAAI,QAAQ,CACjB,QAAS,EAAI,QAAQ,CACrB,GAAI,EAAI,QAAQ,CAChB,KAAM,EAAI,QAAQ,CAClB,KAAM,EAAI,QAAQ,CACnB,CAAC,CAgCF,IAAA,EAf6C,CAC3C,OAAQ,EAAI,OAA+B,CACzC,SAAU,EAAI,QAAQ,CAAC,MAAM,CAAC,UAAU,CACxC,WAAY,EAAI,QAAQ,CAAC,UAAU,CACnC,OAAQ,EAAa,UAAU,CAChC,CAAC,CAEF,OAAQ,EAAI,OAA+B,CACzC,SAAU,EAAI,QAAQ,CAAC,MAAM,CAC7B,WAAY,EAAI,QAAQ,CACxB,OAAQ,EACR,SAAU,EAAI,SAAS,CACxB,CAAC,CAAC,IAAI,EAAE,CACV"}

package/dist/errors/index.cjs

@@ -1,62 +1,3 @@
-const require_rolldown_runtime = require('../_virtual/rolldown_runtime.cjs');
-let _autofleet_errors = require("@autofleet/errors");
-
-//#region src/errors/index.ts
-var MissingRequiredCustomFieldError = class extends _autofleet_errors.BadRequest {
-	constructor(missingFields) {
-		const err = /* @__PURE__ */ new Error(`The following custom fields are required: ${missingFields.join(",")}`);
-		super([err], void 0, missingFields);
-		this.message = "MISSING_REQUIRED_CUSTOM_FIELDS";
-	}
-};
-var UnsupportedCustomFieldTypeError = class extends _autofleet_errors.BadRequest {
-	constructor(fieldType) {
-		const err = /* @__PURE__ */ new Error(`Type "${fieldType}" is not supported`);
-		super([err], void 0, null);
-		this.message = "UNSUPPORTED_CUSTOM_FIELD_TYPE";
-	}
-};
-var UnsupportedCustomValidationError = class extends _autofleet_errors.BadRequest {
-	constructor(fieldType) {
-		const err = /* @__PURE__ */ new Error(`Validation for "${fieldType}" is not supported`);
-		super([err], void 0, null);
-		this.message = "UNSUPPORTED_CUSTOM_VALIDATION_TYPE";
-	}
-};
-var InvalidFieldTypeError = class extends _autofleet_errors.BadRequest {
-	constructor(fieldType) {
-		const err = /* @__PURE__ */ new Error(`Invalid field type ${fieldType}`);
-		super([err], void 0, null);
-		this.message = "INVALID_FIELD_TYPE";
-	}
-};
-var InvalidValueError = class extends _autofleet_errors.BadRequest {
-	constructor(value, fieldDefinitionName, joiValidationError) {
-		const invalidValueMessage = `Invalid Value on field '${fieldDefinitionName}'. ${joiValidationError.message.replace(/"/g, "").replace("value", `'${fieldDefinitionName}'`)}. received: '${typeof value === "object" ? JSON.stringify(value) : value}'`;
-		super([new Error(invalidValueMessage)], void 0, null);
-		this.message = invalidValueMessage;
-	}
-};
-var InvalidEntriesError = class extends _autofleet_errors.BadRequest {
-	constructor(modelId, validationErrors) {
-		const errors = validationErrors.map((validationError) => new InvalidValueError(validationError.value, validationError.fieldDefinitionName, validationError.joiValidationError));
-		super(errors, void 0, null);
-		this.message = `Invalid entries on ${modelId}\n${validationErrors.map((validationError) => `${validationError.fieldDefinitionName} - ${validationError.joiValidationError.message}`).join("\n")}`;
-	}
-};
-var MissingDefinitionError = class extends _autofleet_errors.BadRequest {
-	constructor(fieldNames) {
-		const err = /* @__PURE__ */ new Error(`Missing custom field definition for field ${fieldNames.join(",")}`);
-		super([err], void 0, null);
-		this.message = "MISSING_DEFINITION";
-	}
-};
-
-//#endregion
-exports.InvalidEntriesError = InvalidEntriesError;
-exports.InvalidFieldTypeError = InvalidFieldTypeError;
-exports.InvalidValueError = InvalidValueError;
-exports.MissingDefinitionError = MissingDefinitionError;
-exports.MissingRequiredCustomFieldError = MissingRequiredCustomFieldError;
-exports.UnsupportedCustomFieldTypeError = UnsupportedCustomFieldTypeError;
-exports.UnsupportedCustomValidationError = UnsupportedCustomValidationError;
+const e=require(`../_virtual/rolldown_runtime.cjs`);let t=require(`@autofleet/errors`);var n=class extends t.BadRequest{constructor(e){let t=Error(`The following custom fields are required: ${e.join(`,`)}`);super([t],void 0,e),this.message=`MISSING_REQUIRED_CUSTOM_FIELDS`}},r=class extends t.BadRequest{constructor(e){let t=Error(`Type "${e}" is not supported`);super([t],void 0,null),this.message=`UNSUPPORTED_CUSTOM_FIELD_TYPE`}},i=class extends t.BadRequest{constructor(e){let t=Error(`Validation for "${e}" is not supported`);super([t],void 0,null),this.message=`UNSUPPORTED_CUSTOM_VALIDATION_TYPE`}},a=class extends t.BadRequest{constructor(e){let t=Error(`Invalid field type ${e}`);super([t],void 0,null),this.message=`INVALID_FIELD_TYPE`}},o=class extends t.BadRequest{constructor(e,t,n){let r=`Invalid Value on field '${t}'. ${n.message.replace(/"/g,``).replace(`value`,`'${t}'`)}. received: '${typeof e==`object`?JSON.stringify(e):e}'`;super([Error(r)],void 0,null),this.message=r}},s=class extends t.BadRequest{constructor(e,t){let n=t.map(e=>new o(e.value,e.fieldDefinitionName,e.joiValidationError));super(n,void 0,null),this.message=`Invalid entries on ${e}\n${t.map(e=>`${e.fieldDefinitionName} - ${e.joiValidationError.message}`).join(`
+`)}`}},c=class extends t.BadRequest{constructor(e){let t=Error(`Missing custom field definition for field ${e.join(`,`)}`);super([t],void 0,null),this.message=`MISSING_DEFINITION`}};exports.InvalidEntriesError=s,exports.InvalidFieldTypeError=a,exports.InvalidValueError=o,exports.MissingDefinitionError=c,exports.MissingRequiredCustomFieldError=n,exports.UnsupportedCustomFieldTypeError=r,exports.UnsupportedCustomValidationError=i;
+//# sourceMappingURL=index.cjs.map

package/dist/errors/index.cjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.cjs","names":["BadRequest"],"sources":["../../src/errors/index.ts"],"sourcesContent":["import { BadRequest } from '@autofleet/errors';\nimport type { ValidationError } from 'joi';\nimport type { EntriesValidationError } from '../types/entries';\n\nexport class MissingRequiredCustomFieldError extends BadRequest {\n  constructor(missingFields: string[]) {\n    const err = new Error(`The following custom fields are required: ${missingFields.join(',')}`);\n    super([err], undefined, missingFields);\n    this.message = 'MISSING_REQUIRED_CUSTOM_FIELDS';\n  }\n}\n\nexport class UnsupportedCustomFieldTypeError extends BadRequest {\n  constructor(fieldType: string) {\n    const err = new Error(`Type \"${fieldType}\" is not supported`);\n    super([err], undefined, null);\n    this.message = 'UNSUPPORTED_CUSTOM_FIELD_TYPE';\n  }\n}\n\nexport class UnsupportedCustomValidationError extends BadRequest {\n  constructor(fieldType: string) {\n    const err = new Error(`Validation for \"${fieldType}\" is not supported`);\n    super([err], undefined, null);\n    this.message = 'UNSUPPORTED_CUSTOM_VALIDATION_TYPE';\n  }\n}\n\nexport class InvalidFieldTypeError extends BadRequest {\n  constructor(fieldType: string) {\n    const err = new Error(`Invalid field type ${fieldType}`);\n    super([err], undefined, null);\n    this.message = 'INVALID_FIELD_TYPE';\n  }\n}\n\nexport class InvalidValueError extends BadRequest {\n  constructor(value: any, fieldDefinitionName: string, joiValidationError: ValidationError) {\n    const formattedErrorMessage = joiValidationError.message\n      .replace(/\"/g, '')\n      .replace('value', `'${fieldDefinitionName}'`);\n\n    const formattedValue = typeof value === 'object' ? JSON.stringify(value) : value;\n\n    const invalidValueMessage = `Invalid Value on field '${fieldDefinitionName}'. ${formattedErrorMessage}. received: '${formattedValue}'`;\n\n    const err = new Error(invalidValueMessage);\n    super([err], undefined, null);\n    this.message = invalidValueMessage;\n  }\n}\n\nexport class InvalidEntriesError extends BadRequest {\n  constructor(modelId: string, validationErrors: EntriesValidationError[]) {\n    const errors = validationErrors.map(validationError => new InvalidValueError(validationError.value, validationError.fieldDefinitionName, validationError.joiValidationError));\n    super(errors, undefined, null);\n    this.message = `Invalid entries on ${modelId}\\n${validationErrors.map(validationError => (\n      `${validationError.fieldDefinitionName} - ${validationError.joiValidationError.message}`\n    )).join('\\n')}`;\n  }\n}\n\nexport class MissingDefinitionError extends BadRequest {\n  constructor(fieldNames: string[]) {\n    const err = new Error(`Missing custom field definition for field ${fieldNames.join(',')}`);\n    super([err], undefined, null);\n    this.message = 'MISSING_DEFINITION';\n  }\n}\n"],"mappings":"uFAIA,IAAa,EAAb,cAAqDA,EAAAA,UAAW,CAC9D,YAAY,EAAyB,CACnC,IAAM,EAAU,MAAM,6CAA6C,EAAc,KAAK,IAAI,GAAG,CAC7F,MAAM,CAAC,EAAI,CAAE,IAAA,GAAW,EAAc,CACtC,KAAK,QAAU,mCAIN,EAAb,cAAqDA,EAAAA,UAAW,CAC9D,YAAY,EAAmB,CAC7B,IAAM,EAAU,MAAM,SAAS,EAAU,oBAAoB,CAC7D,MAAM,CAAC,EAAI,CAAE,IAAA,GAAW,KAAK,CAC7B,KAAK,QAAU,kCAIN,EAAb,cAAsDA,EAAAA,UAAW,CAC/D,YAAY,EAAmB,CAC7B,IAAM,EAAU,MAAM,mBAAmB,EAAU,oBAAoB,CACvE,MAAM,CAAC,EAAI,CAAE,IAAA,GAAW,KAAK,CAC7B,KAAK,QAAU,uCAIN,EAAb,cAA2CA,EAAAA,UAAW,CACpD,YAAY,EAAmB,CAC7B,IAAM,EAAU,MAAM,sBAAsB,IAAY,CACxD,MAAM,CAAC,EAAI,CAAE,IAAA,GAAW,KAAK,CAC7B,KAAK,QAAU,uBAIN,EAAb,cAAuCA,EAAAA,UAAW,CAChD,YAAY,EAAY,EAA6B,EAAqC,CAOxF,IAAM,EAAsB,2BAA2B,EAAoB,KAN7C,EAAmB,QAC9C,QAAQ,KAAM,GAAG,CACjB,QAAQ,QAAS,IAAI,EAAoB,GAAG,CAIuD,eAF/E,OAAO,GAAU,SAAW,KAAK,UAAU,EAAM,CAAG,EAEyD,GAGpI,MAAM,CADU,MAAM,EAAoB,CAC/B,CAAE,IAAA,GAAW,KAAK,CAC7B,KAAK,QAAU,IAIN,EAAb,cAAyCA,EAAAA,UAAW,CAClD,YAAY,EAAiB,EAA4C,CACvE,IAAM,EAAS,EAAiB,IAAI,GAAmB,IAAI,EAAkB,EAAgB,MAAO,EAAgB,oBAAqB,EAAgB,mBAAmB,CAAC,CAC7K,MAAM,EAAQ,IAAA,GAAW,KAAK,CAC9B,KAAK,QAAU,sBAAsB,EAAQ,IAAI,EAAiB,IAAI,GACpE,GAAG,EAAgB,oBAAoB,KAAK,EAAgB,mBAAmB,UAC/E,CAAC,KAAK;EAAK,KAIJ,EAAb,cAA4CA,EAAAA,UAAW,CACrD,YAAY,EAAsB,CAChC,IAAM,EAAU,MAAM,6CAA6C,EAAW,KAAK,IAAI,GAAG,CAC1F,MAAM,CAAC,EAAI,CAAE,IAAA,GAAW,KAAK,CAC7B,KAAK,QAAU"}

package/dist/errors/index.js

@@ -1,55 +1,3 @@
-import { BadRequest } from "@autofleet/errors";
-
-//#region src/errors/index.ts
-var MissingRequiredCustomFieldError = class extends BadRequest {
-	constructor(missingFields) {
-		const err = /* @__PURE__ */ new Error(`The following custom fields are required: ${missingFields.join(",")}`);
-		super([err], void 0, missingFields);
-		this.message = "MISSING_REQUIRED_CUSTOM_FIELDS";
-	}
-};
-var UnsupportedCustomFieldTypeError = class extends BadRequest {
-	constructor(fieldType) {
-		const err = /* @__PURE__ */ new Error(`Type "${fieldType}" is not supported`);
-		super([err], void 0, null);
-		this.message = "UNSUPPORTED_CUSTOM_FIELD_TYPE";
-	}
-};
-var UnsupportedCustomValidationError = class extends BadRequest {
-	constructor(fieldType) {
-		const err = /* @__PURE__ */ new Error(`Validation for "${fieldType}" is not supported`);
-		super([err], void 0, null);
-		this.message = "UNSUPPORTED_CUSTOM_VALIDATION_TYPE";
-	}
-};
-var InvalidFieldTypeError = class extends BadRequest {
-	constructor(fieldType) {
-		const err = /* @__PURE__ */ new Error(`Invalid field type ${fieldType}`);
-		super([err], void 0, null);
-		this.message = "INVALID_FIELD_TYPE";
-	}
-};
-var InvalidValueError = class extends BadRequest {
-	constructor(value, fieldDefinitionName, joiValidationError) {
-		const invalidValueMessage = `Invalid Value on field '${fieldDefinitionName}'. ${joiValidationError.message.replace(/"/g, "").replace("value", `'${fieldDefinitionName}'`)}. received: '${typeof value === "object" ? JSON.stringify(value) : value}'`;
-		super([new Error(invalidValueMessage)], void 0, null);
-		this.message = invalidValueMessage;
-	}
-};
-var InvalidEntriesError = class extends BadRequest {
-	constructor(modelId, validationErrors) {
-		const errors = validationErrors.map((validationError) => new InvalidValueError(validationError.value, validationError.fieldDefinitionName, validationError.joiValidationError));
-		super(errors, void 0, null);
-		this.message = `Invalid entries on ${modelId}\n${validationErrors.map((validationError) => `${validationError.fieldDefinitionName} - ${validationError.joiValidationError.message}`).join("\n")}`;
-	}
-};
-var MissingDefinitionError = class extends BadRequest {
-	constructor(fieldNames) {
-		const err = /* @__PURE__ */ new Error(`Missing custom field definition for field ${fieldNames.join(",")}`);
-		super([err], void 0, null);
-		this.message = "MISSING_DEFINITION";
-	}
-};
-
-//#endregion
-export { InvalidEntriesError, InvalidFieldTypeError, InvalidValueError, MissingDefinitionError, MissingRequiredCustomFieldError, UnsupportedCustomFieldTypeError, UnsupportedCustomValidationError };
+import{BadRequest as e}from"@autofleet/errors";var t=class extends e{constructor(e){let t=Error(`The following custom fields are required: ${e.join(`,`)}`);super([t],void 0,e),this.message=`MISSING_REQUIRED_CUSTOM_FIELDS`}},n=class extends e{constructor(e){let t=Error(`Type "${e}" is not supported`);super([t],void 0,null),this.message=`UNSUPPORTED_CUSTOM_FIELD_TYPE`}},r=class extends e{constructor(e){let t=Error(`Validation for "${e}" is not supported`);super([t],void 0,null),this.message=`UNSUPPORTED_CUSTOM_VALIDATION_TYPE`}},i=class extends e{constructor(e){let t=Error(`Invalid field type ${e}`);super([t],void 0,null),this.message=`INVALID_FIELD_TYPE`}},a=class extends e{constructor(e,t,n){let r=`Invalid Value on field '${t}'. ${n.message.replace(/"/g,``).replace(`value`,`'${t}'`)}. received: '${typeof e==`object`?JSON.stringify(e):e}'`;super([Error(r)],void 0,null),this.message=r}},o=class extends e{constructor(e,t){let n=t.map(e=>new a(e.value,e.fieldDefinitionName,e.joiValidationError));super(n,void 0,null),this.message=`Invalid entries on ${e}\n${t.map(e=>`${e.fieldDefinitionName} - ${e.joiValidationError.message}`).join(`
+`)}`}},s=class extends e{constructor(e){let t=Error(`Missing custom field definition for field ${e.join(`,`)}`);super([t],void 0,null),this.message=`MISSING_DEFINITION`}};export{o as InvalidEntriesError,i as InvalidFieldTypeError,a as InvalidValueError,s as MissingDefinitionError,t as MissingRequiredCustomFieldError,n as UnsupportedCustomFieldTypeError,r as UnsupportedCustomValidationError};
+//# sourceMappingURL=index.js.map

package/dist/errors/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","names":[],"sources":["../../src/errors/index.ts"],"sourcesContent":["import { BadRequest } from '@autofleet/errors';\nimport type { ValidationError } from 'joi';\nimport type { EntriesValidationError } from '../types/entries';\n\nexport class MissingRequiredCustomFieldError extends BadRequest {\n  constructor(missingFields: string[]) {\n    const err = new Error(`The following custom fields are required: ${missingFields.join(',')}`);\n    super([err], undefined, missingFields);\n    this.message = 'MISSING_REQUIRED_CUSTOM_FIELDS';\n  }\n}\n\nexport class UnsupportedCustomFieldTypeError extends BadRequest {\n  constructor(fieldType: string) {\n    const err = new Error(`Type \"${fieldType}\" is not supported`);\n    super([err], undefined, null);\n    this.message = 'UNSUPPORTED_CUSTOM_FIELD_TYPE';\n  }\n}\n\nexport class UnsupportedCustomValidationError extends BadRequest {\n  constructor(fieldType: string) {\n    const err = new Error(`Validation for \"${fieldType}\" is not supported`);\n    super([err], undefined, null);\n    this.message = 'UNSUPPORTED_CUSTOM_VALIDATION_TYPE';\n  }\n}\n\nexport class InvalidFieldTypeError extends BadRequest {\n  constructor(fieldType: string) {\n    const err = new Error(`Invalid field type ${fieldType}`);\n    super([err], undefined, null);\n    this.message = 'INVALID_FIELD_TYPE';\n  }\n}\n\nexport class InvalidValueError extends BadRequest {\n  constructor(value: any, fieldDefinitionName: string, joiValidationError: ValidationError) {\n    const formattedErrorMessage = joiValidationError.message\n      .replace(/\"/g, '')\n      .replace('value', `'${fieldDefinitionName}'`);\n\n    const formattedValue = typeof value === 'object' ? JSON.stringify(value) : value;\n\n    const invalidValueMessage = `Invalid Value on field '${fieldDefinitionName}'. ${formattedErrorMessage}. received: '${formattedValue}'`;\n\n    const err = new Error(invalidValueMessage);\n    super([err], undefined, null);\n    this.message = invalidValueMessage;\n  }\n}\n\nexport class InvalidEntriesError extends BadRequest {\n  constructor(modelId: string, validationErrors: EntriesValidationError[]) {\n    const errors = validationErrors.map(validationError => new InvalidValueError(validationError.value, validationError.fieldDefinitionName, validationError.joiValidationError));\n    super(errors, undefined, null);\n    this.message = `Invalid entries on ${modelId}\\n${validationErrors.map(validationError => (\n      `${validationError.fieldDefinitionName} - ${validationError.joiValidationError.message}`\n    )).join('\\n')}`;\n  }\n}\n\nexport class MissingDefinitionError extends BadRequest {\n  constructor(fieldNames: string[]) {\n    const err = new Error(`Missing custom field definition for field ${fieldNames.join(',')}`);\n    super([err], undefined, null);\n    this.message = 'MISSING_DEFINITION';\n  }\n}\n"],"mappings":"+CAIA,IAAa,EAAb,cAAqD,CAAW,CAC9D,YAAY,EAAyB,CACnC,IAAM,EAAU,MAAM,6CAA6C,EAAc,KAAK,IAAI,GAAG,CAC7F,MAAM,CAAC,EAAI,CAAE,IAAA,GAAW,EAAc,CACtC,KAAK,QAAU,mCAIN,EAAb,cAAqD,CAAW,CAC9D,YAAY,EAAmB,CAC7B,IAAM,EAAU,MAAM,SAAS,EAAU,oBAAoB,CAC7D,MAAM,CAAC,EAAI,CAAE,IAAA,GAAW,KAAK,CAC7B,KAAK,QAAU,kCAIN,EAAb,cAAsD,CAAW,CAC/D,YAAY,EAAmB,CAC7B,IAAM,EAAU,MAAM,mBAAmB,EAAU,oBAAoB,CACvE,MAAM,CAAC,EAAI,CAAE,IAAA,GAAW,KAAK,CAC7B,KAAK,QAAU,uCAIN,EAAb,cAA2C,CAAW,CACpD,YAAY,EAAmB,CAC7B,IAAM,EAAU,MAAM,sBAAsB,IAAY,CACxD,MAAM,CAAC,EAAI,CAAE,IAAA,GAAW,KAAK,CAC7B,KAAK,QAAU,uBAIN,EAAb,cAAuC,CAAW,CAChD,YAAY,EAAY,EAA6B,EAAqC,CAOxF,IAAM,EAAsB,2BAA2B,EAAoB,KAN7C,EAAmB,QAC9C,QAAQ,KAAM,GAAG,CACjB,QAAQ,QAAS,IAAI,EAAoB,GAAG,CAIuD,eAF/E,OAAO,GAAU,SAAW,KAAK,UAAU,EAAM,CAAG,EAEyD,GAGpI,MAAM,CADU,MAAM,EAAoB,CAC/B,CAAE,IAAA,GAAW,KAAK,CAC7B,KAAK,QAAU,IAIN,EAAb,cAAyC,CAAW,CAClD,YAAY,EAAiB,EAA4C,CACvE,IAAM,EAAS,EAAiB,IAAI,GAAmB,IAAI,EAAkB,EAAgB,MAAO,EAAgB,oBAAqB,EAAgB,mBAAmB,CAAC,CAC7K,MAAM,EAAQ,IAAA,GAAW,KAAK,CAC9B,KAAK,QAAU,sBAAsB,EAAQ,IAAI,EAAiB,IAAI,GACpE,GAAG,EAAgB,oBAAoB,KAAK,EAAgB,mBAAmB,UAC/E,CAAC,KAAK;EAAK,KAIJ,EAAb,cAA4C,CAAW,CACrD,YAAY,EAAsB,CAChC,IAAM,EAAU,MAAM,6CAA6C,EAAW,KAAK,IAAI,GAAG,CAC1F,MAAM,CAAC,EAAI,CAAE,IAAA,GAAW,KAAK,CAC7B,KAAK,QAAU"}

package/dist/events/index.cjs

@@ -1,52 +1,2 @@
-const require_rolldown_runtime = require('../_virtual/rolldown_runtime.cjs');
-const require_index = require('../utils/logger/index.cjs');
-let _autofleet_zehut = require("@autofleet/zehut");
-let _autofleet_events = require("@autofleet/events");
-_autofleet_events = require_rolldown_runtime.__toESM(_autofleet_events);
-
-//#region src/events/index.ts
-const events = new _autofleet_events.default({
-	logger: require_index.default,
-	getUserId: (payload) => payload?.user_id ?? (0, _autofleet_zehut.getUser)()?.id ?? null
-});
-const KEYS_TO_CONVERT = [
-	"value",
-	"defaultValue",
-	"blockEditingFromUI"
-];
-const stringifyBooleans = (savedObject, keysToConvert) => {
-	const savedObjectKeySet = new Set(Object.keys(savedObject));
-	if (keysToConvert.every((key) => !savedObjectKeySet.has(key))) return savedObject;
-	return {
-		...savedObject,
-		...Object.fromEntries(keysToConvert.map((key) => [key, typeof savedObject[key] === "boolean" ? savedObject[key].toString() : savedObject[key]]))
-	};
-};
-const modelTableMapping = {
-	CustomFieldDefinition: {
-		tableName: "dim_custom_field_definition",
-		eventVersion: "1"
-	},
-	CustomFieldValue: {
-		tableName: "dim_custom_field_value",
-		eventVersion: "1"
-	},
-	CustomFieldEntries: {
-		tableName: "dim_custom_field_entries",
-		eventVersion: "1"
-	}
-};
-const sendDimEvent = (instance) => {
-	const mapping = modelTableMapping[instance.constructor.name];
-	if (!mapping) return;
-	let objectToSend = instance.get();
-	try {
-		objectToSend = stringifyBooleans(instance.get(), KEYS_TO_CONVERT);
-	} catch (err) {
-		require_index.default.error("Failed to convert booleans in dim event payload", err);
-	}
-	events.sendObject(mapping.tableName, mapping.eventVersion, objectToSend).catch(() => null);
-};
-
-//#endregion
-exports.sendDimEvent = sendDimEvent;
+const e=require(`../_virtual/rolldown_runtime.cjs`),t=require(`../utils/logger/index.cjs`);let n=require(`@autofleet/zehut`),r=require(`@autofleet/events`);r=e.__toESM(r);const i=new r.default({logger:t.default,getUserId:e=>e?.user_id??(0,n.getUser)()?.id??null}),a=[`value`,`defaultValue`,`blockEditingFromUI`],o=(e,t)=>{let n=new Set(Object.keys(e));return t.every(e=>!n.has(e))?e:{...e,...Object.fromEntries(t.map(t=>[t,typeof e[t]==`boolean`?e[t].toString():e[t]]))}},s={CustomFieldDefinition:{tableName:`dim_custom_field_definition`,eventVersion:`1`},CustomFieldValue:{tableName:`dim_custom_field_value`,eventVersion:`1`},CustomFieldEntries:{tableName:`dim_custom_field_entries`,eventVersion:`1`}},c=e=>{let n=s[e.constructor.name];if(!n)return;let r=e.get();try{r=o(e.get(),a)}catch(e){t.default.error(`Failed to convert booleans in dim event payload`,e)}i.sendObject(n.tableName,n.eventVersion,r).catch(()=>null)};exports.sendDimEvent=c;
+//# sourceMappingURL=index.cjs.map

package/dist/events/index.cjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.cjs","names":["events: Events","Events"],"sources":["../../src/events/index.ts"],"sourcesContent":["import Events from '@autofleet/events';\nimport { getUser } from '@autofleet/zehut';\nimport logger from '../utils/logger';\nimport type {\n  CustomFieldDefinition,\n  CustomFieldEntries,\n  CustomFieldValue,\n  CustomValidator,\n} from '../models';\n\nconst events: Events = new Events({\n  logger,\n  getUserId: payload => payload?.user_id ?? getUser()?.id ?? null,\n});\n\nconst KEYS_TO_CONVERT = ['value', 'defaultValue', 'blockEditingFromUI'];\n\nconst stringifyBooleans = (savedObject: any, keysToConvert: string[]) => {\n  const savedObjectKeySet = new Set(Object.keys(savedObject));\n  if (keysToConvert.every(key => !savedObjectKeySet.has(key))) {\n    return savedObject;\n  }\n  return {\n    ...savedObject,\n    ...Object.fromEntries(keysToConvert.map(key => [key, typeof savedObject[key] === 'boolean' ? savedObject[key].toString() : savedObject[key]])),\n  };\n};\n\nconst modelTableMapping = {\n  CustomFieldDefinition: {\n    tableName: 'dim_custom_field_definition',\n    eventVersion: '1',\n  },\n  CustomFieldValue: {\n    tableName: 'dim_custom_field_value',\n    eventVersion: '1',\n  },\n  CustomFieldEntries: {\n    tableName: 'dim_custom_field_entries',\n    eventVersion: '1',\n  },\n};\n\nexport const sendDimEvent = (instance: CustomFieldDefinition | CustomFieldValue | CustomFieldEntries | CustomValidator): void => {\n  const mapping = modelTableMapping[instance.constructor.name as keyof typeof modelTableMapping];\n  if (!mapping) {\n    return;\n  }\n  let objectToSend = instance.get();\n  try {\n    objectToSend = stringifyBooleans(instance.get(), KEYS_TO_CONVERT);\n  } catch (err) {\n    logger.error('Failed to convert booleans in dim event payload', err);\n  }\n\n  events.sendObject(\n    mapping.tableName,\n    mapping.eventVersion,\n    objectToSend,\n  ).catch(() => null);\n};\n\nexport default events;\n"],"mappings":"2KAUA,MAAMA,EAAiB,IAAIC,EAAAA,QAAO,CAChC,OAAA,EAAA,QACA,UAAW,GAAW,GAAS,UAAA,EAAA,EAAA,UAAoB,EAAE,IAAM,KAC5D,CAAC,CAEI,EAAkB,CAAC,QAAS,eAAgB,qBAAqB,CAEjE,GAAqB,EAAkB,IAA4B,CACvE,IAAM,EAAoB,IAAI,IAAI,OAAO,KAAK,EAAY,CAAC,CAI3D,OAHI,EAAc,MAAM,GAAO,CAAC,EAAkB,IAAI,EAAI,CAAC,CAClD,EAEF,CACL,GAAG,EACH,GAAG,OAAO,YAAY,EAAc,IAAI,GAAO,CAAC,EAAK,OAAO,EAAY,IAAS,UAAY,EAAY,GAAK,UAAU,CAAG,EAAY,GAAK,CAAC,CAAC,CAC/I,EAGG,EAAoB,CACxB,sBAAuB,CACrB,UAAW,8BACX,aAAc,IACf,CACD,iBAAkB,CAChB,UAAW,yBACX,aAAc,IACf,CACD,mBAAoB,CAClB,UAAW,2BACX,aAAc,IACf,CACF,CAEY,EAAgB,GAAoG,CAC/H,IAAM,EAAU,EAAkB,EAAS,YAAY,MACvD,GAAI,CAAC,EACH,OAEF,IAAI,EAAe,EAAS,KAAK,CACjC,GAAI,CACF,EAAe,EAAkB,EAAS,KAAK,CAAE,EAAgB,OAC1D,EAAK,CACZ,EAAA,QAAO,MAAM,kDAAmD,EAAI,CAGtE,EAAO,WACL,EAAQ,UACR,EAAQ,aACR,EACD,CAAC,UAAY,KAAK"}

package/dist/events/index.js

@@ -1,50 +1,2 @@
-import logger_default from "../utils/logger/index.js";
-import { getUser } from "@autofleet/zehut";
-import Events from "@autofleet/events";
-
-//#region src/events/index.ts
-const events = new Events({
-	logger: logger_default,
-	getUserId: (payload) => payload?.user_id ?? getUser()?.id ?? null
-});
-const KEYS_TO_CONVERT = [
-	"value",
-	"defaultValue",
-	"blockEditingFromUI"
-];
-const stringifyBooleans = (savedObject, keysToConvert) => {
-	const savedObjectKeySet = new Set(Object.keys(savedObject));
-	if (keysToConvert.every((key) => !savedObjectKeySet.has(key))) return savedObject;
-	return {
-		...savedObject,
-		...Object.fromEntries(keysToConvert.map((key) => [key, typeof savedObject[key] === "boolean" ? savedObject[key].toString() : savedObject[key]]))
-	};
-};
-const modelTableMapping = {
-	CustomFieldDefinition: {
-		tableName: "dim_custom_field_definition",
-		eventVersion: "1"
-	},
-	CustomFieldValue: {
-		tableName: "dim_custom_field_value",
-		eventVersion: "1"
-	},
-	CustomFieldEntries: {
-		tableName: "dim_custom_field_entries",
-		eventVersion: "1"
-	}
-};
-const sendDimEvent = (instance) => {
-	const mapping = modelTableMapping[instance.constructor.name];
-	if (!mapping) return;
-	let objectToSend = instance.get();
-	try {
-		objectToSend = stringifyBooleans(instance.get(), KEYS_TO_CONVERT);
-	} catch (err) {
-		logger_default.error("Failed to convert booleans in dim event payload", err);
-	}
-	events.sendObject(mapping.tableName, mapping.eventVersion, objectToSend).catch(() => null);
-};
-
-//#endregion
-export { sendDimEvent };
+import e from"../utils/logger/index.js";import{getUser as t}from"@autofleet/zehut";import n from"@autofleet/events";const r=new n({logger:e,getUserId:e=>e?.user_id??t()?.id??null}),i=[`value`,`defaultValue`,`blockEditingFromUI`],a=(e,t)=>{let n=new Set(Object.keys(e));return t.every(e=>!n.has(e))?e:{...e,...Object.fromEntries(t.map(t=>[t,typeof e[t]==`boolean`?e[t].toString():e[t]]))}},o={CustomFieldDefinition:{tableName:`dim_custom_field_definition`,eventVersion:`1`},CustomFieldValue:{tableName:`dim_custom_field_value`,eventVersion:`1`},CustomFieldEntries:{tableName:`dim_custom_field_entries`,eventVersion:`1`}},s=t=>{let n=o[t.constructor.name];if(!n)return;let s=t.get();try{s=a(t.get(),i)}catch(t){e.error(`Failed to convert booleans in dim event payload`,t)}r.sendObject(n.tableName,n.eventVersion,s).catch(()=>null)};export{s as sendDimEvent};
+//# sourceMappingURL=index.js.map

package/dist/events/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","names":["events: Events"],"sources":["../../src/events/index.ts"],"sourcesContent":["import Events from '@autofleet/events';\nimport { getUser } from '@autofleet/zehut';\nimport logger from '../utils/logger';\nimport type {\n  CustomFieldDefinition,\n  CustomFieldEntries,\n  CustomFieldValue,\n  CustomValidator,\n} from '../models';\n\nconst events: Events = new Events({\n  logger,\n  getUserId: payload => payload?.user_id ?? getUser()?.id ?? null,\n});\n\nconst KEYS_TO_CONVERT = ['value', 'defaultValue', 'blockEditingFromUI'];\n\nconst stringifyBooleans = (savedObject: any, keysToConvert: string[]) => {\n  const savedObjectKeySet = new Set(Object.keys(savedObject));\n  if (keysToConvert.every(key => !savedObjectKeySet.has(key))) {\n    return savedObject;\n  }\n  return {\n    ...savedObject,\n    ...Object.fromEntries(keysToConvert.map(key => [key, typeof savedObject[key] === 'boolean' ? savedObject[key].toString() : savedObject[key]])),\n  };\n};\n\nconst modelTableMapping = {\n  CustomFieldDefinition: {\n    tableName: 'dim_custom_field_definition',\n    eventVersion: '1',\n  },\n  CustomFieldValue: {\n    tableName: 'dim_custom_field_value',\n    eventVersion: '1',\n  },\n  CustomFieldEntries: {\n    tableName: 'dim_custom_field_entries',\n    eventVersion: '1',\n  },\n};\n\nexport const sendDimEvent = (instance: CustomFieldDefinition | CustomFieldValue | CustomFieldEntries | CustomValidator): void => {\n  const mapping = modelTableMapping[instance.constructor.name as keyof typeof modelTableMapping];\n  if (!mapping) {\n    return;\n  }\n  let objectToSend = instance.get();\n  try {\n    objectToSend = stringifyBooleans(instance.get(), KEYS_TO_CONVERT);\n  } catch (err) {\n    logger.error('Failed to convert booleans in dim event payload', err);\n  }\n\n  events.sendObject(\n    mapping.tableName,\n    mapping.eventVersion,\n    objectToSend,\n  ).catch(() => null);\n};\n\nexport default events;\n"],"mappings":"oHAUA,MAAMA,EAAiB,IAAI,EAAO,CAChC,OAAA,EACA,UAAW,GAAW,GAAS,SAAW,GAAS,EAAE,IAAM,KAC5D,CAAC,CAEI,EAAkB,CAAC,QAAS,eAAgB,qBAAqB,CAEjE,GAAqB,EAAkB,IAA4B,CACvE,IAAM,EAAoB,IAAI,IAAI,OAAO,KAAK,EAAY,CAAC,CAI3D,OAHI,EAAc,MAAM,GAAO,CAAC,EAAkB,IAAI,EAAI,CAAC,CAClD,EAEF,CACL,GAAG,EACH,GAAG,OAAO,YAAY,EAAc,IAAI,GAAO,CAAC,EAAK,OAAO,EAAY,IAAS,UAAY,EAAY,GAAK,UAAU,CAAG,EAAY,GAAK,CAAC,CAAC,CAC/I,EAGG,EAAoB,CACxB,sBAAuB,CACrB,UAAW,8BACX,aAAc,IACf,CACD,iBAAkB,CAChB,UAAW,yBACX,aAAc,IACf,CACD,mBAAoB,CAClB,UAAW,2BACX,aAAc,IACf,CACF,CAEY,EAAgB,GAAoG,CAC/H,IAAM,EAAU,EAAkB,EAAS,YAAY,MACvD,GAAI,CAAC,EACH,OAEF,IAAI,EAAe,EAAS,KAAK,CACjC,GAAI,CACF,EAAe,EAAkB,EAAS,KAAK,CAAE,EAAgB,OAC1D,EAAK,CACZ,EAAO,MAAM,kDAAmD,EAAI,CAGtE,EAAO,WACL,EAAQ,UACR,EAAQ,aACR,EACD,CAAC,UAAY,KAAK"}

package/dist/hooks/enrich.cjs

@@ -1,175 +1,2 @@
-const require_definition = require('../repository/definition.cjs');
-const require_value = require('../repository/value.cjs');
-const require_entries = require('../repository/entries.cjs');
-const require_scopeAttributes = require('../utils/scopeAttributes.cjs');
-
-//#region src/hooks/enrich.ts
-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 {};
-	const customFieldEntries = await require_entries.findEntriesByModelIds(instancesIds, options ?? {});
-	const customFieldEntriesByInstanceId = Object.fromEntries(customFieldEntries.map((instanceEntries) => {
-		const { modelId, customFields } = instanceEntries?.dataValues ?? {};
-		if (!modelId) return;
-		return [modelId, customFields];
-	}).filter((v) => v !== void 0));
-	instancesIds.forEach((instanceId) => {
-		customFieldEntriesByInstanceId[instanceId] ??= {};
-	});
-	return customFieldEntriesByInstanceId;
-};
-const getValuesGroupByInstance = async ({ instancesIds, options, sadotOptions }) => {
-	if (sadotOptions.useCustomFieldsEntries) return {};
-	return (await require_value.findValuesByModelIds(instancesIds, options ?? {})).reduce((acc, v) => {
-		const { modelId } = v;
-		acc[modelId] ??= [];
-		acc[modelId].push(v);
-		return acc;
-	}, {});
-};
-/**
-* Serialize custom fields value into the format of {[name] -> [fieldData]}
-*/
-const serializeCustomFields = (customFieldValues, customFieldDefinitionsHash) => {
-	return customFieldValues.reduce((acc, cfv) => ({
-		...acc,
-		...customFieldDefinitionsHash[cfv.customFieldDefinitionId] && { [customFieldDefinitionsHash[cfv.customFieldDefinitionId].name]: cfv.value }
-	}), {});
-};
-/**
-* A hook to attach the custom fields when fetching a model instances.
-*/
-const enrichResults = (modelType, scopeAttributes, hookType, modelOptions = {}, sadotOptions = {
-	useCustomFieldsEntries: false,
-	hasTypeId: false
-}) => async (instancesOrInstance, options) => {
-	if (options.originalAttributes?.length > 0 && !options.originalAttributes?.includes?.("customFields")) return;
-	const primaryKey = "id";
-	let instances = Array.isArray(instancesOrInstance) ? instancesOrInstance : [instancesOrInstance];
-	instances = instances.filter(Boolean);
-	const identifiers = require_scopeAttributes.default(instances, scopeAttributes);
-	const uniqueIdentifiers = [...new Set(identifiers)].filter(Boolean);
-	const identifierCustomFieldDefinitionsMapping = uniqueIdentifiers.reduce((map, identifier) => ({
-		...map,
-		[identifier]: []
-	}), {});
-	let customFieldDefinitionsPromise;
-	let cacheKey;
-	if (options.transaction) {
-		options.transaction.definitionCache ??= /* @__PURE__ */ new Map();
-		cacheKey = `${modelType}:${uniqueIdentifiers.slice().sort().join(",")}`;
-		customFieldDefinitionsPromise = options.transaction.definitionCache.get(cacheKey);
-	}
-	let modelTypeDefinitionsMap;
-	if (!customFieldDefinitionsPromise) {
-		const shouldApplyTypeFiltering = sadotOptions.hasTypeId && instances.length > 0 && instances[0].typeId;
-		const fetchDefinitions = async (transaction = options.transaction) => {
-			if (shouldApplyTypeFiltering) {
-				const uniqueTypeIds = [...new Set(instances.map((instance) => instance.typeId).filter(Boolean))];
-				modelTypeDefinitionsMap = /* @__PURE__ */ new Map();
-				uniqueTypeIds.forEach((typeId) => modelTypeDefinitionsMap.set(typeId, /* @__PURE__ */ new Set()));
-				const allDefinitions = (await Promise.all(uniqueTypeIds.map(async (typeId) => {
-					const defs = await require_definition.findByModelTypeId(typeId, {
-						withDisabled: false,
-						entityIds: uniqueIdentifiers,
-						modelType,
-						modelOptions,
-						transaction
-					});
-					defs.forEach((def) => modelTypeDefinitionsMap.get(typeId).add(def.id));
-					return defs;
-				}))).flat();
-				const uniqueDefinitionsMap = /* @__PURE__ */ new Map();
-				allDefinitions.forEach((def) => {
-					uniqueDefinitionsMap.set(def.id, def);
-				});
-				return Array.from(uniqueDefinitionsMap.values());
-			}
-			return require_definition.findByEntityIds(modelType, uniqueIdentifiers, {
-				transaction,
-				modelOptions,
-				attributes: CUSTOM_FIELD_DEFINITION_ATTRIBUTES_TO_PULL
-			});
-		};
-		customFieldDefinitionsPromise = fetchDefinitions();
-		if (!shouldApplyTypeFiltering) options.transaction?.definitionCache?.set(cacheKey, customFieldDefinitionsPromise);
-	}
-	const customFieldDefinitions = await customFieldDefinitionsPromise;
-	if (customFieldDefinitions.length === 0) {
-		instances.forEach((instance) => {
-			instance.customFields = {};
-		});
-		return;
-	}
-	if (modelOptions?.include && modelOptions.useEntityIdFromInclude) modelOptions.include(identifiers).forEach(({ model }) => {
-		customFieldDefinitions.forEach((cfd) => {
-			const entityId = cfd[model.name]?.entityId || cfd[`${model.name}.entityId`];
-			if (entityId && !identifierCustomFieldDefinitionsMapping[entityId]) identifierCustomFieldDefinitionsMapping[entityId] = [];
-		});
-	});
-	const definitionsMap = customFieldDefinitions.reduce((map, definition) => ({
-		...map,
-		[definition.id]: definition
-	}), {});
-	customFieldDefinitions.forEach((cfd) => {
-		let entityIdToUse = cfd.entityId;
-		if (modelOptions?.useEntityIdFromInclude && modelOptions.include) {
-			const contextIncludes = modelOptions.include(identifiers);
-			for (const { model } of contextIncludes) {
-				const joinedEntityId = cfd[model.name]?.entityId || cfd[`${model.name}.entityId`];
-				if (joinedEntityId) {
-					entityIdToUse = joinedEntityId;
-					break;
-				}
-			}
-		}
-		if (identifierCustomFieldDefinitionsMapping[entityIdToUse]) identifierCustomFieldDefinitionsMapping[entityIdToUse].push(cfd);
-	});
-	const instancesIds = instances.map((i) => i[primaryKey]);
-	const [valuesGroupByInstance, customFieldEntriesByInstanceId] = await Promise.all([getValuesGroupByInstance({
-		instancesIds,
-		options,
-		sadotOptions
-	}), getCustomFieldEntriesByInstanceId({
-		instancesIds,
-		options,
-		sadotOptions
-	})]);
-	instances.forEach((instance) => {
-		const { id } = instance;
-		const instanceValues = valuesGroupByInstance[id];
-		const serializedCustomFieldsValues = instanceValues ? serializeCustomFields(instanceValues, definitionsMap) : {};
-		const customFields = sadotOptions.useCustomFieldsEntries ? customFieldEntriesByInstanceId[id] : serializedCustomFieldsValues;
-		scopeAttributes.forEach((attribute) => {
-			const entityCustomFieldDefinitions = identifierCustomFieldDefinitionsMapping[instance[attribute]];
-			if (entityCustomFieldDefinitions && entityCustomFieldDefinitions.length > 0) entityCustomFieldDefinitions.forEach((customFieldDefinition) => {
-				if (modelTypeDefinitionsMap) {
-					if (!modelTypeDefinitionsMap.get(instance.typeId)?.has(customFieldDefinition.id)) return;
-				}
-				if (customFields[customFieldDefinition.name] === void 0) customFields[customFieldDefinition.name] = null;
-			});
-		});
-		instance.customFields = customFields;
-		options.attributesToRemove?.forEach?.((attribute) => {
-			delete instance.dataValues?.[attribute];
-			delete instance?.[attribute];
-		});
-		if (hookType === "afterFind") instance?.changed?.("customFields", false);
-	});
-};
-var enrich_default = enrichResults;
-
-//#endregion
-exports.default = enrich_default;
+const e=require(`../repository/definition.cjs`),t=require(`../repository/value.cjs`),n=require(`../repository/entries.cjs`),r=require(`../utils/scopeAttributes.cjs`),i=[`id`,`name`,`entityId`,`fieldType`,`displayName`,`validation`,`entityType`,`modelType`,`required`,`disabled`,`defaultValue`],a=async({instancesIds:e,options:t,sadotOptions:r})=>{if(!r.useCustomFieldsEntries)return{};let i=await n.findEntriesByModelIds(e,t??{}),a=Object.fromEntries(i.map(e=>{let{modelId:t,customFields:n}=e?.dataValues??{};if(t)return[t,n]}).filter(e=>e!==void 0));return e.forEach(e=>{a[e]??={}}),a},o=async({instancesIds:e,options:n,sadotOptions:r})=>r.useCustomFieldsEntries?{}:(await t.findValuesByModelIds(e,n??{})).reduce((e,t)=>{let{modelId:n}=t;return e[n]??=[],e[n].push(t),e},{}),s=(e,t)=>e.reduce((e,n)=>({...e,...t[n.customFieldDefinitionId]&&{[t[n.customFieldDefinitionId].name]:n.value}}),{}),c=(t,n,c,l={},u={useCustomFieldsEntries:!1,hasTypeId:!1})=>async(d,f)=>{if(f.originalAttributes?.length>0&&!f.originalAttributes?.includes?.(`customFields`))return;let p=Array.isArray(d)?d:[d];p=p.filter(Boolean);let m=r.default(p,n),h=[...new Set(m)].filter(Boolean),g=h.reduce((e,t)=>({...e,[t]:[]}),{}),_,v;f.transaction&&(f.transaction.definitionCache??=new Map,v=`${t}:${h.slice().sort().join(`,`)}`,_=f.transaction.definitionCache.get(v));let y;if(!_){let n=u.hasTypeId&&p.length>0&&p[0].typeId;_=(async(r=f.transaction)=>{if(n){let n=[...new Set(p.map(e=>e.typeId).filter(Boolean))];y=new Map,n.forEach(e=>y.set(e,new Set));let i=(await Promise.all(n.map(async n=>{let i=await e.findByModelTypeId(n,{withDisabled:!1,entityIds:h,modelType:t,modelOptions:l,transaction:r});return i.forEach(e=>y.get(n).add(e.id)),i}))).flat(),a=new Map;return i.forEach(e=>{a.set(e.id,e)}),Array.from(a.values())}return e.findByEntityIds(t,h,{transaction:r,modelOptions:l,attributes:i})})(),n||f.transaction?.definitionCache?.set(v,_)}let b=await _;if(b.length===0){p.forEach(e=>{e.customFields={}});return}l?.include&&l.useEntityIdFromInclude&&l.include(m).forEach(({model:e})=>{b.forEach(t=>{let n=t[e.name]?.entityId||t[`${e.name}.entityId`];n&&!g[n]&&(g[n]=[])})});let x=b.reduce((e,t)=>({...e,[t.id]:t}),{});b.forEach(e=>{let t=e.entityId;if(l?.useEntityIdFromInclude&&l.include){let n=l.include(m);for(let{model:r}of n){let n=e[r.name]?.entityId||e[`${r.name}.entityId`];if(n){t=n;break}}}g[t]&&g[t].push(e)});let S=p.map(e=>e.id),[C,w]=await Promise.all([o({instancesIds:S,options:f,sadotOptions:u}),a({instancesIds:S,options:f,sadotOptions:u})]);p.forEach(e=>{let{id:t}=e,r=C[t],i=r?s(r,x):{},a=u.useCustomFieldsEntries?w[t]:i;n.forEach(t=>{let n=g[e[t]];n&&n.length>0&&n.forEach(t=>{y&&!y.get(e.typeId)?.has(t.id)||a[t.name]===void 0&&(a[t.name]=null)})}),e.customFields=a,f.attributesToRemove?.forEach?.(t=>{delete e.dataValues?.[t],delete e?.[t]}),c===`afterFind`&&e?.changed?.(`customFields`,!1)})};var l=c;exports.default=l;
+//# sourceMappingURL=enrich.cjs.map

package/dist/hooks/enrich.cjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"enrich.cjs","names":["applyScopeToInstance","cacheKey: string | undefined","modelTypeDefinitionsMap: Map<string, Set<string>> | undefined"],"sources":["../../src/hooks/enrich.ts"],"sourcesContent":["import * as ValueRepo from '../repository/value';\nimport * as DefinitionRepo from '../repository/definition';\nimport * as EntriesRepo from '../repository/entries';\nimport type CustomFieldValue from '../models/CustomFieldValue';\nimport type CustomFieldDefinition from '../models/CustomFieldDefinition';\nimport type { SerializedCustomFields } from '../types/definition';\nimport type { CustomFieldOptions, ModelOptions, TransactionOptions } from '../types';\nimport applyScopeToInstance from '../utils/scopeAttributes';\n\n// Include all required fields for proper functioning\nconst CUSTOM_FIELD_DEFINITION_ATTRIBUTES_TO_PULL = [\n  'id',\n  'name',\n  'entityId',\n  'fieldType',\n  'displayName',\n  'validation',\n  'entityType',\n  'modelType',\n  'required',\n  'disabled',\n  'defaultValue',\n];\n\ntype SupportedHookTypes = 'afterFind' | 'afterCreate' | 'afterUpdate';\n\ntype CustomFieldEntries = Record<string, any>;\n\n// eslint-disable-next-line @typescript-eslint/consistent-indexed-object-style\ninterface GetValuesGroupByInstanceResponse {\n  [modelId: string]: CustomFieldValue[];\n}\n\n// eslint-disable-next-line @typescript-eslint/consistent-indexed-object-style\ninterface GetCustomFieldEntriesByInstanceIdResponse {\n  [modelId: string]: CustomFieldEntries;\n}\n\nexport const getCustomFieldEntriesByInstanceId = async ({\n  instancesIds,\n  options,\n  sadotOptions,\n}: {\n  instancesIds: string[];\n  options?: TransactionOptions;\n  sadotOptions: Pick<CustomFieldOptions, 'useCustomFieldsEntries'>;\n}): Promise<GetCustomFieldEntriesByInstanceIdResponse> => {\n  if (!sadotOptions.useCustomFieldsEntries) {\n    return {};\n  }\n\n  const customFieldEntries = await EntriesRepo.findEntriesByModelIds(\n    instancesIds,\n    options ?? {},\n  );\n\n  const customFieldEntriesByInstanceId = Object.fromEntries(customFieldEntries.map((instanceEntries) => {\n    const { modelId, customFields } = instanceEntries?.dataValues ?? {};\n    if (!modelId) {\n      return undefined;\n    }\n    return [modelId, customFields];\n  }).filter(v => v !== undefined));\n\n  instancesIds.forEach((instanceId) => {\n    customFieldEntriesByInstanceId[instanceId] ??= {};\n  });\n\n  return customFieldEntriesByInstanceId;\n};\n\nexport const getValuesGroupByInstance = async ({\n  instancesIds,\n  options,\n  sadotOptions,\n}: {\n  instancesIds: string[];\n  options?: TransactionOptions;\n  sadotOptions: Pick<CustomFieldOptions, 'useCustomFieldsEntries'>;\n}): Promise<GetValuesGroupByInstanceResponse> => {\n  if (sadotOptions.useCustomFieldsEntries) {\n    return {};\n  }\n\n  const customFieldValues = await ValueRepo.findValuesByModelIds(\n    instancesIds,\n    options ?? {},\n  );\n\n  // Group fields by modelId\n  return customFieldValues.reduce<Record<string, CustomFieldValue[]>>((acc, v) => {\n    const { modelId } = v;\n    acc[modelId] ??= [];\n    acc[modelId].push(v);\n    return acc;\n  }, {});\n};\n\n/**\n * Serialize custom fields value into the format of {[name] -> [fieldData]}\n */\nconst serializeCustomFields = (\n  customFieldValues: CustomFieldValue[],\n  customFieldDefinitionsHash: Record<string, CustomFieldDefinition>,\n): SerializedCustomFields => {\n  const customFields = customFieldValues.reduce((acc, cfv) => ({\n    ...acc,\n    ...(\n      customFieldDefinitionsHash[cfv.customFieldDefinitionId]\n      && { [customFieldDefinitionsHash[cfv.customFieldDefinitionId].name]: cfv.value }\n    ),\n  }), {});\n  return customFields;\n};\n/**\n * A hook to attach the custom fields when fetching a model instances.\n */\nconst enrichResults = (\n  modelType: string,\n  scopeAttributes: string[],\n  hookType?: SupportedHookTypes,\n  modelOptions: ModelOptions = {},\n  sadotOptions: Pick<CustomFieldOptions, 'useCustomFieldsEntries' | 'hasTypeId'> = { useCustomFieldsEntries: false, hasTypeId: false },\n) => async (\n  instancesOrInstance: any | any[],\n  options: TransactionOptions,\n): Promise<void> => {\n  if (options.originalAttributes?.length > 0 && !options.originalAttributes?.includes?.('customFields')) {\n    return;\n  }\n\n  const primaryKey = 'id';\n  let instances = Array.isArray(instancesOrInstance)\n    ? instancesOrInstance\n    : [instancesOrInstance];\n\n  instances = instances.filter(Boolean);\n\n  const identifiers = applyScopeToInstance(instances, scopeAttributes);\n\n  const uniqueIdentifiers = [...new Set(identifiers)].filter(Boolean);\n\n  const identifierCustomFieldDefinitionsMapping = uniqueIdentifiers.reduce((map, identifier) => ({\n    ...map,\n    [identifier]: [],\n  }), {});\n\n  // Cache for definitions by model type and transaction to avoid redundant DB queries\n  let customFieldDefinitionsPromise;\n  let cacheKey: string | undefined;\n\n  if (options.transaction) {\n    // Initialize definition cache Map if not already present directly on the transaction object\n    options.transaction.definitionCache ??= new Map();\n    cacheKey = `${modelType}:${uniqueIdentifiers.slice().sort().join(',')}`;\n    customFieldDefinitionsPromise = options.transaction.definitionCache.get(cacheKey);\n  }\n\n  let modelTypeDefinitionsMap: Map<string, Set<string>> | undefined;\n\n  // Fetch from database (either first time in this transaction or no transaction).\n  if (!customFieldDefinitionsPromise) {\n    const shouldApplyTypeFiltering = sadotOptions.hasTypeId && instances.length > 0 && instances[0].typeId;\n\n    const fetchDefinitions = async (transaction = options.transaction) => {\n      if (shouldApplyTypeFiltering) {\n        const uniqueTypeIds = [...new Set(instances.map(instance => instance.typeId).filter(Boolean))];\n\n        modelTypeDefinitionsMap = new Map<string, Set<string>>();\n        uniqueTypeIds.forEach(typeId => modelTypeDefinitionsMap!.set(typeId, new Set()));\n\n        const definitionsResults = await Promise.all(\n          uniqueTypeIds.map(async (typeId) => {\n            const defs = await DefinitionRepo.findByModelTypeId(typeId, { withDisabled: false, entityIds: uniqueIdentifiers, modelType, modelOptions, transaction });\n            defs.forEach(def => modelTypeDefinitionsMap!.get(typeId)!.add(def.id));\n            return defs;\n          }),\n        );\n\n        const allDefinitions = definitionsResults.flat();\n        const uniqueDefinitionsMap = new Map();\n        allDefinitions.forEach((def) => {\n          uniqueDefinitionsMap.set(def.id, def);\n        });\n        return Array.from(uniqueDefinitionsMap.values());\n      }\n      return DefinitionRepo.findByEntityIds(\n        modelType,\n        uniqueIdentifiers,\n        { transaction, modelOptions, attributes: CUSTOM_FIELD_DEFINITION_ATTRIBUTES_TO_PULL },\n      );\n    };\n\n    customFieldDefinitionsPromise = fetchDefinitions();\n\n    if (!shouldApplyTypeFiltering) {\n      options.transaction?.definitionCache?.set(cacheKey!, customFieldDefinitionsPromise);\n    }\n  }\n  const customFieldDefinitions = await customFieldDefinitionsPromise;\n\n  if (customFieldDefinitions.length === 0) {\n    // if no custom fields, we can return\n    instances.forEach((instance) => {\n      instance.customFields = {};\n    });\n    return;\n  }\n\n  if (modelOptions?.include && modelOptions.useEntityIdFromInclude) {\n    // if we pass useEntityIdFromInclude,\n    //  map the entity from the options to the identifierCustomFieldDefinitionsMapping\n    modelOptions.include(identifiers).forEach(({ model }) => {\n      customFieldDefinitions.forEach((cfd: any) => {\n        // try 2 ways to get the entityId from the joined model - for raw and non-raw\n        const entityId = cfd[model!.name]?.entityId || cfd[`${model!.name}.entityId` as keyof CustomFieldDefinition];\n        if (entityId && !identifierCustomFieldDefinitionsMapping[entityId]) {\n          identifierCustomFieldDefinitionsMapping[entityId] = [];\n        }\n      });\n    });\n  }\n\n  const definitionsMap = customFieldDefinitions.reduce((map, definition) => ({\n    ...map,\n    [definition.id]: definition,\n  }), {});\n\n  customFieldDefinitions.forEach((cfd: any) => {\n    let entityIdToUse = cfd.entityId;\n\n    if (modelOptions?.useEntityIdFromInclude && modelOptions.include) {\n      const contextIncludes = modelOptions.include(identifiers);\n      for (const { model } of contextIncludes) {\n        const joinedEntityId = cfd[model!.name]?.entityId || cfd[`${model!.name}.entityId` as keyof CustomFieldDefinition];\n        if (joinedEntityId) {\n          entityIdToUse = joinedEntityId;\n          break;\n        }\n      }\n    }\n\n    if (identifierCustomFieldDefinitionsMapping[entityIdToUse]) {\n      identifierCustomFieldDefinitionsMapping[entityIdToUse].push(cfd);\n    }\n  });\n\n  // Get the values per instates ids:\n  const instancesIds = instances.map(i => i[primaryKey]);\n\n  // Group fields by modelId\n  const [valuesGroupByInstance, customFieldEntriesByInstanceId] = await Promise.all([\n    getValuesGroupByInstance({\n      instancesIds,\n      options,\n      sadotOptions,\n    }),\n    getCustomFieldEntriesByInstanceId({\n      instancesIds,\n      options,\n      sadotOptions,\n    }),\n  ]);\n\n  // Attach custom fields to the instances\n  instances.forEach((instance) => {\n    const { id } = instance;\n\n    const instanceValues = valuesGroupByInstance[id];\n    const serializedCustomFieldsValues = instanceValues ? serializeCustomFields(instanceValues, definitionsMap) : {};\n\n    const customFields = sadotOptions.useCustomFieldsEntries\n      ? customFieldEntriesByInstanceId[id]\n      : serializedCustomFieldsValues;\n\n    scopeAttributes.forEach((attribute) => {\n      const identifier = instance[attribute];\n\n      const entityCustomFieldDefinitions = identifierCustomFieldDefinitionsMapping[identifier] as CustomFieldDefinition[] | undefined;\n      if (entityCustomFieldDefinitions && entityCustomFieldDefinitions.length > 0) {\n        entityCustomFieldDefinitions.forEach((customFieldDefinition) => {\n          if (modelTypeDefinitionsMap) {\n            const applicableDefinitionIds = modelTypeDefinitionsMap.get(instance.typeId);\n            if (!applicableDefinitionIds?.has(customFieldDefinition.id)) {\n              return;\n            }\n          }\n\n          if (customFields[customFieldDefinition.name] === undefined) {\n            customFields[customFieldDefinition.name] = null;\n          }\n        });\n      }\n    });\n    instance.customFields = customFields;\n    (options.attributesToRemove as string[] | undefined)?.forEach?.((attribute) => {\n      delete instance.dataValues?.[attribute];\n      // if raw:\n      delete instance?.[attribute];\n    });\n    // sequelize will think customFields changed also in 'find', so we need to mark it as unchanged\n    if (hookType === 'afterFind') {\n      // changed() could be undefined, i.e in raw: true\n      instance?.changed?.('customFields', false);\n    }\n  });\n};\n\nexport default enrichResults;\n"],"mappings":"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"}