@autofleet/sadot 0.7.4 → 0.7.5

package/.nvmrc

@@ -1 +1 @@
-18.17.1
+22.9.0

package/dist/models/tests/contextAwareModels/ContextAwareTestModel.js

@@ -28,9 +28,7 @@ __decorate([
 ], ContextAwareTestModel.prototype, "id", void 0);
 __decorate([
     (0, sequelize_typescript_1.ForeignKey)(() => ContextTestModel_1.default),
-    (0, sequelize_typescript_1.Column)({
-        type: sequelize_typescript_1.DataType.UUID,
-    }),
+    (0, sequelize_typescript_1.Column)({ type: sequelize_typescript_1.DataType.UUID }),
     __metadata("design:type", String)
 ], ContextAwareTestModel.prototype, "contextId", void 0);
 __decorate([

package/dist/scopes/filter.js

@@ -1,18 +1,15 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.customFieldsSortScope = exports.scopeName = exports.customFieldsFilterScope = void 0;
 /* eslint-disable import/prefer-default-export */
 const sequelize_1 = require("sequelize");
 const sequelize_typescript_1 = require("sequelize-typescript");
 const common_types_1 = require("@autofleet/common-types");
-const moment_1 = __importDefault(require("moment"));
 const helpers_1 = require("../utils/helpers");
 const { CUSTOM_FIELDS_FILTER_SCOPE } = common_types_1.customFields;
+const isDate = (input) => input instanceof Date || Object.prototype.toString.call(input) === '[object Date]';
 const castIfNeeded = (conditionValue) => {
-    if (moment_1.default.isDate(conditionValue)) {
+    if (isDate(conditionValue)) {
         return '::timestamp';
     }
     if (!Number.isNaN(Number(conditionValue))) {

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

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createDefinitions = exports.createDefinition = exports.statusField = exports.selectField = exports.booleanField = exports.coolFieldDefinition3 = exports.coolFieldDefinition2 = exports.coolFieldDefinition = exports.contextAwareFieldDefinition = void 0;
-const uuid_1 = require("uuid");
+const node_crypto_1 = require("node:crypto");
 exports.contextAwareFieldDefinition = {
     name: 'cool field',
     modelType: 'ContextAwareTestModel',
@@ -12,7 +12,7 @@ exports.coolFieldDefinition = {
     name: 'cool field',
     modelType: 'TestModel',
     fieldType: 'number',
-    entityId: (0, uuid_1.v4)(),
+    entityId: (0, node_crypto_1.randomUUID)(),
     entityType: 'fleetId',
 };
 exports.coolFieldDefinition2 = {
@@ -27,7 +27,7 @@ const booleanField = (modelType) => ({
     name: 'shapeless',
     modelType,
     fieldType: 'boolean',
-    entityId: (0, uuid_1.v4)(),
+    entityId: (0, node_crypto_1.randomUUID)(),
     entityType: 'fleetId',
 });
 exports.booleanField = booleanField;
@@ -36,7 +36,7 @@ const selectField = (modelType, options) => ({
     modelType,
     fieldType: 'select',
     validation: options,
-    entityId: (0, uuid_1.v4)(),
+    entityId: (0, node_crypto_1.randomUUID)(),
     entityType: 'fleetId',
 });
 exports.selectField = selectField;
@@ -45,25 +45,25 @@ const statusField = (modelType, options) => ({
     modelType,
     fieldType: 'status',
     validation: options,
-    entityId: (0, uuid_1.v4)(),
+    entityId: (0, node_crypto_1.randomUUID)(),
     entityType: 'fleetId',
 });
 exports.statusField = statusField;
 // eslint-disable-next-line max-len
 const createDefinition = (defaults) => ({
-    name: defaults?.name || `def_${(0, uuid_1.v4)()}`,
+    name: defaults?.name || `def_${(0, node_crypto_1.randomUUID)()}`,
     modelType: defaults?.modelType || 'TestModel',
     fieldType: defaults?.fieldType || 'boolean',
-    entityId: defaults?.entityId || (0, uuid_1.v4)(),
+    entityId: defaults?.entityId || (0, node_crypto_1.randomUUID)(),
     entityType: defaults?.entityType || 'fleetId',
     ...(defaults?.defaultValue && { defaultValue: defaults.defaultValue }),
 });
 exports.createDefinition = createDefinition;
 const createDefinitions = (defaults, length = 1) => (Array(length).fill({}).map((_) => ({
-    name: defaults?.name || `def_${(0, uuid_1.v4)()}`,
+    name: defaults?.name || `def_${(0, node_crypto_1.randomUUID)()}`,
     modelType: defaults?.modelType || 'TestModel',
     fieldType: defaults?.fieldType || 'boolean',
-    entityId: defaults?.entityId || (0, uuid_1.v4)(),
+    entityId: defaults?.entityId || (0, node_crypto_1.randomUUID)(),
     entityType: defaults?.entityType || 'fleetId',
 })));
 exports.createDefinitions = createDefinitions;

package/dist/utils/logger/index.d.ts

@@ -1,2 +1,2 @@
-declare const logger: any;
+declare const logger: import("@autofleet/logger").LoggerInstanceManager;
 export default logger;

package/dist/utils/logger/index.js

@@ -1,6 +1,8 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-// eslint-disable-next-line @typescript-eslint/no-var-requires
-const Logger = require('@autofleet/logger');
-const logger = Logger();
+const logger_1 = __importDefault(require("@autofleet/logger"));
+const logger = (0, logger_1.default)();
 exports.default = logger;

package/package.json

@@ -1,27 +1,24 @@
 {
   "name": "@autofleet/sadot",
-  "version": "0.7.4",
+  "version": "0.7.5",
   "description": "",
   "main": "dist/index.js",
   "scripts": {
-    "start": "ts-node  src/index.ts",
+    "start": "ts-node src/index.ts",
     "build": "rm -rf dist && tsc",
-    "linter": "./node_modules/.bin/eslint .",
+    "linter": "eslint .",
     "test": "jest --forceExit --runInBand",
     "coverage": "jest --coverage --forceExit --runInBand && rm -rf ./coverage",
-    "build-to-local-repo": "npm run build && cp -r dist/* ../$REPO/node_modules/$npm_package_name/dist",
+    "build-to-local-repo": "node --run build && cp -r dist/* ../$REPO/node_modules/$npm_package_name/dist",
     "dev": "nodemon",
     "watch": "npm-watch build-to-local-repo",
-    "publish-dev": "npm run build && npm publish --tag dev"
+    "publish-dev": "node --run build && npm publish --tag dev"
   },
   "watch": {
     "build-to-local-repo": {
       "extensions": [
         "js",
-        "jsx",
-        "ts",
-        "tsx",
-        "css"
+        "ts"
       ],
       "patterns": [
         "src"
@@ -30,27 +27,24 @@
     }
   },
   "dependencies": {
-    "@autofleet/common-types": "^1.7.42",
-    "@autofleet/errors": "^1.0.10",
+    "@autofleet/common-types": "^1.7.58",
+    "@autofleet/errors": "^1.2.3",
     "@autofleet/events": "^2.0.0",
-    "@autofleet/logger": "^2.0.5",
+    "@autofleet/logger": "^4.1.0",
     "express": "^4.18.2",
     "joi": "^17.7.0",
-    "moment": "^2.30.1",
     "pg": "^8.10.0",
     "reflect-metadata": "^0.1.13",
     "sequelize": "^6.31.1",
-    "sequelize-typescript": "^2.1.5",
-    "uuid": "^9.0.0"
+    "sequelize-typescript": "^2.1.5"
   },
   "devDependencies": {
     "@types/express": "^4.17.17",
-    "@types/jest": "^27.0.9",
-    "@types/uuid": "^9.0.2",
-    "@typescript-eslint/eslint-plugin": "^6.4.0",
-    "@typescript-eslint/parser": "^6.4.0",
-    "eslint": "^7.32.0",
-    "eslint-config-airbnb-typescript": "^12.0.0",
+    "@types/jest": "^29.5.13",
+    "@typescript-eslint/eslint-plugin": "^7.18.0",
+    "@typescript-eslint/parser": "^7.18.0",
+    "eslint": "^8.57.0",
+    "eslint-config-airbnb-base": "^15.0.0",
     "eslint-plugin-import": "^2.22.1",
     "jest": "^29.7.0",
     "npm-watch": "^0.11.0",

package/src/api/v1/definition/index.ts

@@ -65,8 +65,7 @@ router.get('/', async (req, res) => {
     if (entityIds?.length > 0) {
       where.entityId = entityIds;
     }
-    const customFieldDefinitions = await DefinitionRepo.findAll({ ...where },
-      { withDisabled: true });
+    const customFieldDefinitions = await DefinitionRepo.findAll({ ...where }, { withDisabled: true });
     return res.json(customFieldDefinitions);
   } catch (err) {
     logger.error('Failed to fetch custom field definitions', err);

package/src/hooks/create.ts

@@ -28,8 +28,7 @@ export const beforeCreate = (scopeAttributes: string[], modelOptions: ModelOptio
   const identifiers = applyScopeToInstance(instance, scopeAttributes);
 
   // get all model's required definitions
-  const requiredFieldsNames = await DefinitionRepo.getRequiredFields(modelType,
-    instance.id, identifiers, modelOptions);
+  const requiredFieldsNames = await DefinitionRepo.getRequiredFields(modelType, instance.id, identifiers, modelOptions);
 
   const customFieldsIdx = fields.indexOf('customFields');
   const { customFields } = instance;

package/src/models/CustomFieldDefinition.ts

@@ -46,18 +46,18 @@ class CustomFieldDefinition extends Model {
     defaultValue: DataType.UUIDV4,
     allowNull: false,
   })
-  id!: string;
+    id!: string;
 
   @Column({
     type: DataType.STRING,
     allowNull: false,
   })
-  name!: string;
+    name!: string;
 
   @Column({
     type: DataType.STRING,
   })
-  displayName?: string; // Defaulted to name with beforeCreate hook
+    displayName?: string; // Defaulted to name with beforeCreate hook
 
   @Is('SupportedType', (value) => {
     if (!Object.values(CustomFieldDefinitionType).includes(value as CustomFieldDefinitionType)) {
@@ -68,65 +68,65 @@ class CustomFieldDefinition extends Model {
     type: DataType.STRING,
     allowNull: false,
   })
-  fieldType!: CustomFieldDefinitionType;
+    fieldType!: CustomFieldDefinitionType;
 
   @Column({
     type: DataType.JSONB,
   })
-  validation?: any;
+    validation?: any;
 
   @Column({
     type: DataType.UUID,
     allowNull: false,
   })
-  entityId!: string; /** Client association entity id */
+    entityId!: string; /** Client association entity id */
 
   @Column({
     type: DataType.STRING,
     allowNull: false,
   })
-  entityType!: string; /** Client association entity type (demand source / fleet / etc.) */
+    entityType!: string; /** Client association entity type (demand source / fleet / etc.) */
 
   @Column({
     type: DataType.STRING,
     allowNull: false,
   })
-  modelType!: string; /** Model type. e.g. Vehicle / StopPoint / etc. */
+    modelType!: string; /** Model type. e.g. Vehicle / StopPoint / etc. */
 
   @Column({
     type: DataType.TEXT,
   })
-  description?: string;
+    description?: string;
 
   @Column({
     type: DataType.BOOLEAN,
     defaultValue: false,
   })
-  required?: boolean;
+    required?: boolean;
 
   @Column({
     type: DataType.BOOLEAN,
     defaultValue: false,
   })
-  disabled?: boolean;
+    disabled?: boolean;
 
-    @Column({
-      type: DataType.JSONB,
-      allowNull: true,
-    })
-      defaultValue?: any;
+  @Column({
+    type: DataType.JSONB,
+    allowNull: true,
+  })
+    defaultValue?: any;
 
   @Column
-  createdAt?: Date;
+    createdAt?: Date;
 
   @Column
-  updatedAt?: Date;
+    updatedAt?: Date;
 
   @Column
-  deletedAt?: Date;
+    deletedAt?: Date;
 
   @HasMany(() => CustomFieldValue)
-  values: CustomFieldValue[];
+    values: CustomFieldValue[];
 
   @BeforeCreate
   static displayNameDefaultValue(instance: CustomFieldDefinition): void {

package/src/models/CustomFieldValue.ts

@@ -28,7 +28,7 @@ class CustomFieldValue extends Model {
     type: DataType.UUID,
     allowNull: false,
   })
-  modelId!: string;
+    modelId!: string;
 
   @PrimaryKey
   @ForeignKey(() => CustomFieldDefinition)
@@ -36,25 +36,25 @@ class CustomFieldValue extends Model {
     type: DataType.UUID,
     allowNull: false,
   })
-  customFieldDefinitionId!: string;
+    customFieldDefinitionId!: string;
 
   @Column({
     type: DataType.JSONB,
     allowNull: true,
   })
-  value!: any;
+    value!: any;
 
   @Column
-  createdAt?: Date;
+    createdAt?: Date;
 
   @Column
-  updatedAt?: Date;
+    updatedAt?: Date;
 
   @Column
-  deletedAt?: Date;
+    deletedAt?: Date;
 
   @BelongsTo(() => CustomFieldDefinition, { scope: { disabled: false } })
-  customFieldDefinition: CustomFieldDefinition;
+    customFieldDefinition: CustomFieldDefinition;
 
   @BeforeBulkCreate
   @BeforeBulkUpdate

package/src/models/tests/AssociatedTestModel.ts

@@ -18,40 +18,40 @@ class AssociatedTestModel extends Model {
     defaultValue: DataType.UUIDV4,
     allowNull: false,
   })
-  id!: string;
+    id!: string;
 
   @ForeignKey(() => TestModel)
   @Column({
     type: DataType.UUID,
     allowNull: false,
   })
-  testModelId!: string;
+    testModelId!: string;
 
   @Column({
     type: DataType.UUID,
     allowNull: false,
   })
-  fleetId: string;
+    fleetId: string;
 
   @Column({
     type: DataType.UUID,
     allowNull: true,
   })
-  businessModelId: string;
+    businessModelId: string;
 
   @Column({
     type: DataType.UUID,
     allowNull: true,
   })
-  demandSourceId: string;
+    demandSourceId: string;
 
   @Column({
     type: DataType.BOOLEAN,
   })
-  anotherAttribute?: boolean;
+    anotherAttribute?: boolean;
 
   @BelongsTo(() => TestModel)
-  testModel: TestModel;
+    testModel: TestModel;
 }
 
 export default AssociatedTestModel;

package/src/models/tests/TestModel.ts

@@ -17,38 +17,38 @@ class TestModel extends Model {
     defaultValue: DataType.UUIDV4,
     allowNull: false,
   })
-  id!: string;
+    id!: string;
 
   @Column({
     type: DataType.UUID,
     allowNull: false,
   })
-  fleetId: string;
+    fleetId: string;
 
   @Column({
     type: DataType.UUID,
     allowNull: true,
   })
-  businessModelId: string;
+    businessModelId: string;
 
   @Column({
     type: DataType.UUID,
     allowNull: true,
   })
-  demandSourceId: string;
+    demandSourceId: string;
 
   @Column({
     type: DataType.BOOLEAN,
   })
-  coolAttribute?: boolean;
+    coolAttribute?: boolean;
 
   @HasMany(() => AssociatedTestModel)
-  associatedModels: AssociatedTestModel[];
+    associatedModels: AssociatedTestModel[];
 
   @Column({
     type: DataType.VIRTUAL,
   })
-  customFields?: any;
+    customFields?: any;
 }
 
 export default TestModel;

package/src/models/tests/contextAwareModels/ContextAwareTestModel.ts

@@ -14,32 +14,30 @@ import ContextTestModel from './ContextTestModel';
 
 @Table({ createdAt: false, updatedAt: false })
 class ContextAwareTestModel extends Model {
-    @PrimaryKey
-    @Column({
-      type: DataType.UUID,
-      defaultValue: DataType.UUIDV4,
-      allowNull: false,
-    })
+  @PrimaryKey
+  @Column({
+    type: DataType.UUID,
+    defaultValue: DataType.UUIDV4,
+    allowNull: false,
+  })
     id!: string;
 
   @ForeignKey(() => ContextTestModel)
-    @Column({
-      type: DataType.UUID,
-    })
-      contextId: string;
+  @Column({ type: DataType.UUID })
+    contextId: string;
 
-    @Column({
-      type: DataType.BOOLEAN,
-    })
+  @Column({
+    type: DataType.BOOLEAN,
+  })
     coolAttribute?: boolean;
 
-    @Column({
-      type: DataType.VIRTUAL,
-    })
+  @Column({
+    type: DataType.VIRTUAL,
+  })
     customFields?: any;
 
   @BelongsTo(() => ContextTestModel)
-  context: ContextTestModel;
+    context: ContextTestModel;
 }
 
 export default ContextAwareTestModel;

package/src/scopes/filter.ts

@@ -2,7 +2,6 @@
 import { Op, type WhereOptions } from 'sequelize';
 import { Sequelize } from 'sequelize-typescript';
 import { customFields } from '@autofleet/common-types';
-import moment from 'moment';
 import { generateRandomString } from '../utils/helpers';
 
 const { CUSTOM_FIELDS_FILTER_SCOPE } = customFields;
@@ -33,8 +32,10 @@ type customFieldsFilterScopeParams = {
     scopeValue: Record<string, ConditionValue>;
 }
 
+const isDate = (input: any): input is Date => input instanceof Date || Object.prototype.toString.call(input) === '[object Date]';
+
 const castIfNeeded = (conditionValue: string): string => {
-  if (moment.isDate(conditionValue)) {
+  if (isDate(conditionValue)) {
     return '::timestamp';
   }
   if (!Number.isNaN(Number(conditionValue))) {

package/src/tests/mocks/definition.mock.ts

@@ -1,4 +1,4 @@
-import { v4 as uuidv4 } from 'uuid';
+import { randomUUID as uuidv4 } from 'node:crypto';
 import type { CreateCustomFieldDefinition, CustomFieldDefinitionDTO } from '../../types/definition';
 
 export const contextAwareFieldDefinition = {

package/src/utils/logger/index.ts

@@ -1,5 +1,4 @@
-// eslint-disable-next-line @typescript-eslint/no-var-requires
-const Logger = require('@autofleet/logger');
+import Logger from '@autofleet/logger';
 
 const logger = Logger();