@autofleet/sadot 0.3.2 → 0.3.3

package/dist/models/index.js

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -29,7 +20,7 @@ const testModels = [TestModel_1.default, AssociatedTestModel_1.default];
 const SADOT_MIGRATION_PREFIX = 'sadot-migration';
 const SCHEMA_VERSION = 1;
 const CUSTOM_FIELDS_SCHEMA_VERSION = `${SADOT_MIGRATION_PREFIX}_${SCHEMA_VERSION}`;
-const initTables = (sequelize, getUser) => __awaiter(void 0, void 0, void 0, function* () {
+const initTables = async (sequelize, getUser) => {
     logger_1.default.info('custom-fields: initialize custom-fields tables');
     // Detect models and import them to the orm
     // eslint-disable-next-line @typescript-eslint/explicit-function-return-type
@@ -39,7 +30,7 @@ const initTables = (sequelize, getUser) => __awaiter(void 0, void 0, void 0, fun
     sequelize.addModels(productionModels);
     CustomFieldDefinition_1.default.addScope('userScope', () => {
         const user = getUser();
-        if (user === null || user === void 0 ? void 0 : user.permissions) {
+        if (user?.permissions) {
             return {
                 where: {
                     entityId: [
@@ -66,19 +57,19 @@ const initTables = (sequelize, getUser) => __awaiter(void 0, void 0, void 0, fun
         timestamps: false,
         schema: 'public',
     });
-    const migrations = yield SequelizeMeta.findAll({ raw: true });
+    const migrations = await SequelizeMeta.findAll({ raw: true });
     const currentSadotSchemaVersion = migrations
         .reverse().find((m) => m.name.includes(SADOT_MIGRATION_PREFIX));
     if (!currentSadotSchemaVersion
         || currentSadotSchemaVersion.name !== CUSTOM_FIELDS_SCHEMA_VERSION) {
-        yield CustomFieldDefinition_1.default.sync({ alter: true });
-        yield CustomFieldValue_1.default.sync({ alter: true });
-        yield SequelizeMeta.create({ name: CUSTOM_FIELDS_SCHEMA_VERSION });
+        await CustomFieldDefinition_1.default.sync({ alter: true });
+        await CustomFieldValue_1.default.sync({ alter: true });
+        await SequelizeMeta.create({ name: CUSTOM_FIELDS_SCHEMA_VERSION });
         logger_1.default.info('custom-fields: models synced');
     }
-});
+};
 exports.initTables = initTables;
-const initTestModels = (sequelize) => __awaiter(void 0, void 0, void 0, function* () {
+const initTestModels = async (sequelize) => {
     logger_1.default.info('custom-fields: initialize custom-fields test models');
     // Detect models and import them to the orm
     // eslint-disable-next-line @typescript-eslint/explicit-function-return-type
@@ -86,12 +77,11 @@ const initTestModels = (sequelize) => __awaiter(void 0, void 0, void 0, function
         throw new Error('sequelize instance must have addModels function');
     }
     sequelize.addModels(testModels);
-    yield sequelize.dropSchema('custom-fields', { logging: false });
-    yield sequelize.createSchema('custom-fields', { logging: false });
+    await sequelize.dropSchema('custom-fields', { logging: false });
+    await sequelize.createSchema('custom-fields', { logging: false });
     logger_1.default.info('custom-fields: test models added');
-    yield TestModel_1.default.sync({ alter: true });
-    yield AssociatedTestModel_1.default.sync({ alter: true });
+    await TestModel_1.default.sync({ alter: true });
+    await AssociatedTestModel_1.default.sync({ alter: true });
     logger_1.default.info('custom-fields: test models synced');
-});
+};
 exports.initTestModels = initTestModels;
-//# sourceMappingURL=index.js.map

package/dist/models/tests/AssociatedTestModel.js

@@ -69,4 +69,3 @@ AssociatedTestModel = __decorate([
     (0, sequelize_typescript_1.Table)({ schema: 'custom-fields', createdAt: false, updatedAt: false })
 ], AssociatedTestModel);
 exports.default = AssociatedTestModel;
-//# sourceMappingURL=AssociatedTestModel.js.map

package/dist/models/tests/TestModel.js

@@ -61,4 +61,3 @@ TestModel = __decorate([
     (0, sequelize_typescript_1.Table)({ schema: 'custom-fields', createdAt: false, updatedAt: false })
 ], TestModel);
 exports.default = TestModel;
-//# sourceMappingURL=TestModel.js.map

package/dist/repository/definition.js

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getRequiredFields = exports.destroy = exports.disable = exports.update = exports.findDefinitionsByModels = exports.findByWhere = exports.findByEntityIds = exports.findByEntityId = exports.findById = exports.findByIds = exports.findAll = exports.create = void 0;
 const sequelize_1 = require("sequelize");
@@ -35,44 +26,40 @@ const findById = (id, options = { withDisabled: false }) => {
     return models_1.CustomFieldDefinition.scope('userScope').findByPk(id);
 };
 exports.findById = findById;
-const findByEntityId = (entityId, options = {}) => __awaiter(void 0, void 0, void 0, function* () {
-    return models_1.CustomFieldDefinition.findAll({
-        where: { entityId },
-        transaction: options.transaction,
-    });
+const findByEntityId = async (entityId, options = {}) => models_1.CustomFieldDefinition.findAll({
+    where: { entityId },
+    transaction: options.transaction,
 });
 exports.findByEntityId = findByEntityId;
-const findByEntityIds = (modelType, entityIds, options = {}) => __awaiter(void 0, void 0, void 0, function* () {
-    return models_1.CustomFieldDefinition.findAll({
-        where: {
-            modelType,
-            entityId: entityIds,
-        },
-        transaction: options.transaction,
-        raw: true,
-    });
+const findByEntityIds = async (modelType, entityIds, options = {}) => models_1.CustomFieldDefinition.findAll({
+    where: {
+        modelType,
+        entityId: entityIds,
+    },
+    transaction: options.transaction,
+    raw: true,
 });
 exports.findByEntityIds = findByEntityIds;
 const findByWhere = (where) => models_1.CustomFieldDefinition.scope('userScope').findOne({
     where,
 });
 exports.findByWhere = findByWhere;
-const findDefinitionsByModels = (modelTypes, options) => __awaiter(void 0, void 0, void 0, function* () {
+const findDefinitionsByModels = async (modelTypes, options) => {
     const query = { modelType: { [sequelize_1.Op.in]: modelTypes } };
     return models_1.CustomFieldDefinition.findAll({
         where: query,
-        transaction: options === null || options === void 0 ? void 0 : options.transaction,
+        transaction: options?.transaction,
     });
-});
+};
 exports.findDefinitionsByModels = findDefinitionsByModels;
-const update = (id, data) => __awaiter(void 0, void 0, void 0, function* () {
-    const updatedDefinition = (yield models_1.CustomFieldDefinition.scope('userScope').update(data, {
+const update = async (id, data) => {
+    const updatedDefinition = (await models_1.CustomFieldDefinition.scope('userScope').update(data, {
         where: { id },
         returning: true,
         individualHooks: true,
     }))[1][0];
     return updatedDefinition;
-});
+};
 exports.update = update;
 const disable = (id) => models_1.CustomFieldDefinition.update({ disabled: true }, { where: { id } });
 exports.disable = disable;
@@ -81,14 +68,13 @@ exports.destroy = destroy;
 /**
  * Return the names of the required fields for a given model
  */
-const getRequiredFields = (modelType, modelId, entityId) => __awaiter(void 0, void 0, void 0, function* () {
+const getRequiredFields = async (modelType, modelId, entityId) => {
     const entityIds = Array.isArray(entityId) ? entityId : [entityId];
-    const requiredFields = yield models_1.CustomFieldDefinition.findAll({
+    const requiredFields = await models_1.CustomFieldDefinition.findAll({
         where: { required: true, modelType, entityId: { [sequelize_1.Op.in]: entityIds } },
         logging: true,
     });
     const requiredFieldsNames = requiredFields.map((definition) => definition.name);
     return [...new Set(requiredFieldsNames)];
-});
+};
 exports.getRequiredFields = getRequiredFields;
-//# sourceMappingURL=definition.js.map

package/dist/repository/value.js

@@ -22,15 +22,6 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -41,32 +32,32 @@ const models_1 = require("../models");
 const DefinitionRepo = __importStar(require("./definition"));
 const logger_1 = __importDefault(require("../utils/logger"));
 const errors_1 = require("../errors");
-const findByModelIdAndDefinition = (modelId, customFieldDefinitionId) => __awaiter(void 0, void 0, void 0, function* () { return models_1.CustomFieldValue.findAll({ where: { modelId, customFieldDefinitionId }, include: [models_1.CustomFieldDefinition] }); });
+const findByModelIdAndDefinition = async (modelId, customFieldDefinitionId) => models_1.CustomFieldValue.findAll({ where: { modelId, customFieldDefinitionId }, include: [models_1.CustomFieldDefinition] });
 exports.findByModelIdAndDefinition = findByModelIdAndDefinition;
-const create = (data, withAssociations = false) => __awaiter(void 0, void 0, void 0, function* () {
-    const created = yield models_1.CustomFieldValue.create(data);
+const create = async (data, withAssociations = false) => {
+    const created = await models_1.CustomFieldValue.create(data);
     if (withAssociations) {
-        const createdWithAssociations = yield (0, exports.findByModelIdAndDefinition)(created.modelId, created.customFieldDefinitionId);
-        return createdWithAssociations === null || createdWithAssociations === void 0 ? void 0 : createdWithAssociations[0];
+        const createdWithAssociations = await (0, exports.findByModelIdAndDefinition)(created.modelId, created.customFieldDefinitionId);
+        return createdWithAssociations?.[0];
     }
     return created;
-});
+};
 exports.create = create;
-const findAllValues = () => __awaiter(void 0, void 0, void 0, function* () { return models_1.CustomFieldValue.findAll({ include: [models_1.CustomFieldDefinition] }); });
+const findAllValues = async () => models_1.CustomFieldValue.findAll({ include: [models_1.CustomFieldDefinition] });
 exports.findAllValues = findAllValues;
 /**
  * Get all values for model instance id (with their definitions)
  * @param modelId
  * @returns CustomFieldValue[]
  */
-const findValuesByModelId = (modelId) => __awaiter(void 0, void 0, void 0, function* () { return models_1.CustomFieldValue.findAll({ where: { modelId }, include: [models_1.CustomFieldDefinition] }); });
+const findValuesByModelId = async (modelId) => models_1.CustomFieldValue.findAll({ where: { modelId }, include: [models_1.CustomFieldDefinition] });
 exports.findValuesByModelId = findValuesByModelId;
 /**
 * Retrieves custom field values for given model IDs
 * @param modelIds - An array of model IDs to query custom field values for.
 * @param options - Optional configuration object.
 */
-const findValuesByModelIds = (modelIds, options) => __awaiter(void 0, void 0, void 0, function* () {
+const findValuesByModelIds = async (modelIds, options) => {
     const { transaction } = options;
     return models_1.CustomFieldValue.findAll({
         where: { modelId: modelIds },
@@ -74,25 +65,25 @@ const findValuesByModelIds = (modelIds, options) => __awaiter(void 0, void 0, vo
         raw: true,
         nest: true,
     });
-});
+};
 exports.findValuesByModelIds = findValuesByModelIds;
 /**
  * Try to update custom field values for a model instance.
  * Create new value record if not exists, but fails if value's definition not exist.
  * Return the updated values
  */
-const updateValues = (modelType, modelId, identifiers, valuesToUpdate, options = {}) => __awaiter(void 0, void 0, void 0, function* () {
+const updateValues = async (modelType, modelId, identifiers, valuesToUpdate, options = {}) => {
     logger_1.default.info(`custom-fields: updating values for ${modelType} ${modelId}`, { valuesToUpdate });
     const names = Object.keys(valuesToUpdate);
-    const fieldDefinitions = (yield DefinitionRepo.findAll({ modelType, name: names, entityId: identifiers }, { withDisabled: true, transaction: options.transaction })) || [];
+    const fieldDefinitions = await DefinitionRepo.findAll({ modelType, name: names, entityId: identifiers }, { withDisabled: true, transaction: options.transaction }) || [];
     const disabledDefinitions = fieldDefinitions.filter((def) => def.disabled);
     if (fieldDefinitions.length !== names.length) {
         const missingDefinitions = names.filter((name) => !fieldDefinitions.some((def) => def.name === name));
         throw new errors_1.MissingDefinitionError(missingDefinitions);
     }
-    const disabledNames = (disabledDefinitions === null || disabledDefinitions === void 0 ? void 0 : disabledDefinitions.map((def) => def.name)) || [];
+    const disabledNames = disabledDefinitions?.map((def) => def.name) || [];
     const valuesWithDisabledDefinitions = names.filter((name) => disabledNames.includes(name));
-    if ((valuesWithDisabledDefinitions === null || valuesWithDisabledDefinitions === void 0 ? void 0 : valuesWithDisabledDefinitions.length) > 0) {
+    if (valuesWithDisabledDefinitions?.length > 0) {
         logger_1.default.warn(`custom-fields: trying to update disabled values: ${valuesWithDisabledDefinitions.join(', ')}`);
     }
     const values = names.map((name) => ({
@@ -101,17 +92,16 @@ const updateValues = (modelType, modelId, identifiers, valuesToUpdate, options =
         updatedAt: new Date(),
         customFieldDefinitionId: fieldDefinitions.find((def) => def.name === name).id,
     }));
-    return Promise.all(values.map((value) => __awaiter(void 0, void 0, void 0, function* () {
-        const [cfv] = yield models_1.CustomFieldValue.upsert(value, {
+    return Promise.all(values.map(async (value) => {
+        const [cfv] = await models_1.CustomFieldValue.upsert(value, {
             transaction: options.transaction,
         });
         return cfv;
-    })));
-});
+    }));
+};
 exports.updateValues = updateValues;
 const deleteValue = (id, options = {}) => models_1.CustomFieldValue.update({ deletedAt: new Date() }, {
     where: { id },
     transaction: options.transaction,
 });
 exports.deleteValue = deleteValue;
-//# sourceMappingURL=value.js.map

package/dist/tests/api/test-api.js

@@ -22,45 +22,35 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 const express_1 = __importStar(require("express"));
 const models_1 = require("../../models");
 const app = (0, express_1.default)();
 app.use(express_1.default.json());
 const api = (0, express_1.Router)();
-api.get('/v1/test-models', (req, res) => __awaiter(void 0, void 0, void 0, function* () {
-    const testModels = yield models_1.TestModel.findAll();
+api.get('/v1/test-models', async (req, res) => {
+    const testModels = await models_1.TestModel.findAll();
     return res.json(testModels);
-}));
-api.get('/v1/test-models/:testModelId', (req, res) => __awaiter(void 0, void 0, void 0, function* () {
+});
+api.get('/v1/test-models/:testModelId', async (req, res) => {
     const { params: { testModelId } } = req;
-    const testModel = yield models_1.TestModel.findByPk(testModelId);
+    const testModel = await models_1.TestModel.findByPk(testModelId);
     return res.json(testModel);
-}));
-api.post('/v1/test-models', (req, res) => __awaiter(void 0, void 0, void 0, function* () {
+});
+api.post('/v1/test-models', async (req, res) => {
     const { body } = req;
-    const testModel = yield models_1.TestModel.create(body);
+    const testModel = await models_1.TestModel.create(body);
     return res.json(testModel);
-}));
-api.patch('/v1/test-models/:testModelId', (req, res) => __awaiter(void 0, void 0, void 0, function* () {
+});
+api.patch('/v1/test-models/:testModelId', async (req, res) => {
     const { body, params: { testModelId } } = req;
-    const testModel = yield models_1.TestModel.update(body, {
+    const testModel = await models_1.TestModel.update(body, {
         where: {
             id: testModelId,
         },
         returning: true,
     });
     return res.json(testModel[1][0]);
-}));
+});
 app.use('/api', api);
 exports.default = app;
-//# sourceMappingURL=test-api.js.map

package/dist/tests/helpers/database-config.d.ts

@@ -1,7 +1,7 @@
 declare const _default: {
     test: {
         username: string;
-        password: string;
+        password: string | null;
         database: string;
         host: string;
         dialect: string;

package/dist/tests/helpers/database-config.js

@@ -14,4 +14,3 @@ exports.default = {
         logging: false,
     },
 };
-//# sourceMappingURL=database-config.js.map

package/dist/tests/helpers/index.js

@@ -1,23 +1,14 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getModel = exports.cleanup = void 0;
 const models_1 = require("../../models");
 // eslint-disable-next-line import/prefer-default-export
-const cleanup = () => __awaiter(void 0, void 0, void 0, function* () {
+const cleanup = async () => {
     if (process.env.NODE_ENV === 'test' || process.env.NODE_ENV === 'development') {
-        yield models_1.CustomFieldDefinition.unscoped().destroy({ where: {} });
-        yield models_1.TestModel.destroy({ where: {} });
+        await models_1.CustomFieldDefinition.unscoped().destroy({ where: {} });
+        await models_1.TestModel.destroy({ where: {} });
     }
-});
+};
 exports.cleanup = cleanup;
 const getModel = (name) => {
     // eslint-disable-next-line global-require, @typescript-eslint/no-var-requires
@@ -25,4 +16,3 @@ const getModel = (name) => {
     return models[name];
 };
 exports.getModel = getModel;
-//# sourceMappingURL=index.js.map

package/dist/tests/mocks/definition.mock.d.ts

@@ -2,33 +2,33 @@ import { CreateCustomFieldDefinition, CustomFieldDefinitionDTO } from '../../typ
 export declare const coolFieldDefinition: CreateCustomFieldDefinition;
 export declare const coolFieldDefinition2: {
     name: string;
-    required?: boolean;
-    createdAt?: Date;
-    updatedAt?: Date;
-    deletedAt?: Date;
-    disabled?: boolean;
-    displayName?: string;
+    required?: boolean | undefined;
+    disabled?: boolean | undefined;
+    description?: string | undefined;
+    createdAt?: Date | undefined;
+    updatedAt?: Date | undefined;
+    deletedAt?: Date | undefined;
+    displayName?: string | undefined;
     validation?: any;
     fieldType: string;
     entityId: string;
     entityType: string;
     modelType: string;
-    description?: string;
 };
 export declare const coolFieldDefinition3: {
     name: string;
-    required?: boolean;
-    createdAt?: Date;
-    updatedAt?: Date;
-    deletedAt?: Date;
-    disabled?: boolean;
-    displayName?: string;
+    required?: boolean | undefined;
+    disabled?: boolean | undefined;
+    description?: string | undefined;
+    createdAt?: Date | undefined;
+    updatedAt?: Date | undefined;
+    deletedAt?: Date | undefined;
+    displayName?: string | undefined;
     validation?: any;
     fieldType: string;
     entityId: string;
     entityType: string;
     modelType: string;
-    description?: string;
 };
 export declare const booleanField: (modelType: string) => CreateCustomFieldDefinition;
 export declare const enumField: (modelType: string, options: any) => CreateCustomFieldDefinition;

package/dist/tests/mocks/definition.mock.js

@@ -9,8 +9,14 @@ exports.coolFieldDefinition = {
     entityId: (0, uuid_1.v4)(),
     entityType: 'fleetId',
 };
-exports.coolFieldDefinition2 = Object.assign(Object.assign({}, exports.coolFieldDefinition), { name: 'cool field2' });
-exports.coolFieldDefinition3 = Object.assign(Object.assign({}, exports.coolFieldDefinition), { name: 'cool field3' });
+exports.coolFieldDefinition2 = {
+    ...exports.coolFieldDefinition,
+    name: 'cool field2',
+};
+exports.coolFieldDefinition3 = {
+    ...exports.coolFieldDefinition,
+    name: 'cool field3',
+};
 const booleanField = (modelType) => ({
     name: 'shapeless',
     modelType,
@@ -41,19 +47,18 @@ const rangeField = (modelType) => ({
 exports.rangeField = rangeField;
 // eslint-disable-next-line max-len
 const createDefinition = (defaults) => ({
-    name: (defaults === null || defaults === void 0 ? void 0 : defaults.name) || `def_${(0, uuid_1.v4)()}`,
-    modelType: (defaults === null || defaults === void 0 ? void 0 : defaults.modelType) || 'TestModel',
-    fieldType: (defaults === null || defaults === void 0 ? void 0 : defaults.fieldType) || 'boolean',
-    entityId: (defaults === null || defaults === void 0 ? void 0 : defaults.entityId) || (0, uuid_1.v4)(),
-    entityType: (defaults === null || defaults === void 0 ? void 0 : defaults.entityType) || 'fleetId',
+    name: defaults?.name || `def_${(0, uuid_1.v4)()}`,
+    modelType: defaults?.modelType || 'TestModel',
+    fieldType: defaults?.fieldType || 'boolean',
+    entityId: defaults?.entityId || (0, uuid_1.v4)(),
+    entityType: defaults?.entityType || 'fleetId',
 });
 exports.createDefinition = createDefinition;
 const createDefinitions = (defaults, length = 1) => (Array(length).fill({}).map((_) => ({
-    name: (defaults === null || defaults === void 0 ? void 0 : defaults.name) || `def_${(0, uuid_1.v4)()}`,
-    modelType: (defaults === null || defaults === void 0 ? void 0 : defaults.modelType) || 'TestModel',
-    fieldType: (defaults === null || defaults === void 0 ? void 0 : defaults.fieldType) || 'boolean',
-    entityId: (defaults === null || defaults === void 0 ? void 0 : defaults.entityId) || (0, uuid_1.v4)(),
-    entityType: (defaults === null || defaults === void 0 ? void 0 : defaults.entityType) || 'fleetId',
+    name: defaults?.name || `def_${(0, uuid_1.v4)()}`,
+    modelType: defaults?.modelType || 'TestModel',
+    fieldType: defaults?.fieldType || 'boolean',
+    entityId: defaults?.entityId || (0, uuid_1.v4)(),
+    entityType: defaults?.entityType || 'fleetId',
 })));
 exports.createDefinitions = createDefinitions;
-//# sourceMappingURL=definition.mock.js.map

package/dist/tests/mocks/events.mock.js

@@ -17,4 +17,3 @@ const mockDimCustomFieldDefinitionEvent = (events, numberOfEvents) => (0, export
 exports.mockDimCustomFieldDefinitionEvent = mockDimCustomFieldDefinitionEvent;
 const mockDimCustomFieldValueEvent = (events, numberOfEvents) => (0, exports.mockEvent)(events, 'dim_custom_field_value', numberOfEvents);
 exports.mockDimCustomFieldValueEvent = mockDimCustomFieldValueEvent;
-//# sourceMappingURL=events.mock.js.map

package/dist/tests/mocks/testModel.d.ts

@@ -1,7 +1,7 @@
 import { TestModel } from '../../models';
 export declare const createTestModel: (payload?: {}) => Promise<TestModel>;
 export declare const createTestModels: (fleetId: any, total: number) => Promise<TestModel[]>;
-export declare const upsertTestModel: (payload: any) => Promise<[TestModel, boolean]>;
+export declare const upsertTestModel: (payload: any) => Promise<[TestModel, boolean | null]>;
 export declare const destroyTestModels: () => Promise<number>;
 export declare const getTestModel: (id: string, options?: {}) => Promise<TestModel>;
 export declare const getSomeTestModels: (options?: {

package/dist/tests/mocks/testModel.js

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getTestModelWithAssociation = exports.createTestModelWithAssociation = exports.updateTestModel = exports.getSomeTestModels = exports.getTestModel = exports.destroyTestModels = exports.upsertTestModel = exports.createTestModels = exports.createTestModel = void 0;
 const models_1 = require("../../models");
@@ -32,14 +23,13 @@ exports.getSomeTestModels = getSomeTestModels;
 const updateTestModel = (payload, query) => models_1.TestModel.update(payload, query);
 exports.updateTestModel = updateTestModel;
 // Associations
-const createTestModelWithAssociation = () => __awaiter(void 0, void 0, void 0, function* () {
-    const model = yield models_1.TestModel.create({});
-    yield models_1.AssociatedTestModel.create({ testModelId: model.id });
+const createTestModelWithAssociation = async () => {
+    const model = await models_1.TestModel.create({});
+    await models_1.AssociatedTestModel.create({ testModelId: model.id });
     return model;
-});
+};
 exports.createTestModelWithAssociation = createTestModelWithAssociation;
 const getTestModelWithAssociation = (limit = 1) => models_1.TestModel.findAll({
     limit, include: [models_1.AssociatedTestModel],
 });
 exports.getTestModelWithAssociation = getTestModelWithAssociation;
-//# sourceMappingURL=testModel.js.map

package/dist/types/definition/index.js

@@ -1,3 +1,2 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-//# sourceMappingURL=index.js.map

package/dist/types/index.js

@@ -1,3 +1,2 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-//# sourceMappingURL=index.js.map

package/dist/types/value/index.js

@@ -1,3 +1,2 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-//# sourceMappingURL=index.js.map

package/dist/utils/constants/index.js

@@ -3,4 +3,3 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.supportedEntities = void 0;
 // eslint-disable-next-line import/prefer-default-export
 exports.supportedEntities = ['businessModelId', 'fleetId', 'demandSourceId'];
-//# sourceMappingURL=index.js.map

package/dist/utils/db/index.js

@@ -22,4 +22,3 @@ CREATE TABLE IF NOT EXISTS "SequelizeMeta" (
 );
 `, { type: sequelize_1.QueryTypes.SELECT });
 exports.createSequelizeMeta = createSequelizeMeta;
-//# sourceMappingURL=index.js.map

package/dist/utils/logger/index.js

@@ -4,4 +4,3 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const Logger = require('@autofleet/logger');
 const logger = Logger();
 exports.default = logger;
-//# sourceMappingURL=index.js.map

package/dist/utils/validations/custom-fields.js

@@ -8,4 +8,3 @@ exports.CustomFieldsSchema = void 0;
 const joi_1 = __importDefault(require("@hapi/joi"));
 const CustomFieldsSchema = joi_1.default.object().pattern(joi_1.default.string(), joi_1.default.any());
 exports.CustomFieldsSchema = CustomFieldsSchema;
-//# sourceMappingURL=custom-fields.js.map

package/dist/utils/validations/custom.js

@@ -32,7 +32,7 @@ exports.validateValidation = validateValidation;
  * @returns true if the value is valid according to the validation rules, false otherwise.
  */
 const customValidation = (value, valueType, validation) => {
-    const validator = validators_1.default === null || validators_1.default === void 0 ? void 0 : validators_1.default[valueType];
+    const validator = validators_1.default?.[valueType];
     if (!validation || !validator) {
         return (0, exports.validateValidation)(valueType, validation);
     }
@@ -40,4 +40,3 @@ const customValidation = (value, valueType, validation) => {
     return value === null || validator(value, validation);
 };
 exports.default = customValidation;
-//# sourceMappingURL=custom.js.map

package/dist/utils/validations/index.js

@@ -18,4 +18,3 @@ const validateValue = (value, valueType, customValidations) => {
     return true;
 };
 exports.default = validateValue;
-//# sourceMappingURL=index.js.map

package/dist/utils/validations/type.js

@@ -48,4 +48,3 @@ const validateValueType = (value, valueType) => {
     }
 };
 exports.default = validateValueType;
-//# sourceMappingURL=type.js.map

package/dist/utils/validations/validators.js

@@ -31,4 +31,3 @@ const validators = {
     [CustomValidations.RANGE]: validateRange,
 };
 exports.default = validators;
-//# sourceMappingURL=validators.js.map

package/package.json

@@ -1,7 +1,6 @@
 {
   "name": "@autofleet/sadot",
-  "version": "0.3.2",
-  "type": "module",
+  "version": "0.3.3",
   "description": "",
   "main": "dist/index.js",
   "scripts": {