@autofleet/sadot 0.0.2-beta → 0.1.0

package/src/hooks/enrich.ts

@@ -2,30 +2,22 @@
 import * as ValueRepo from '../repository/value';
 import * as DefinitionRepo from '../repository/definition';
 import CustomFieldValue from '../models/CustomFieldValue';
-import CustomFieldDefinition from '../models/CustomFieldDefinition';
 import { SerializedCustomFields } from '../types/definition';
-import logger from '../utils/logger';
 
 /**
  * Serialize custom fields value into the format of {[name] -> [fieldData]}
  */
-const serializeCustomFields = (
-  customFieldValues: CustomFieldValue[],
-  customFieldDefinitionsHash: Record<string, CustomFieldDefinition>,
-): SerializedCustomFields => {
+const serializeCustomFields = (customFieldValues: CustomFieldValue[]): SerializedCustomFields => {
   const customFields = customFieldValues.reduce((acc, cfv) => ({
     ...acc,
-    ...(
-      customFieldDefinitionsHash[cfv.customFieldDefinitionId]
-      && { [customFieldDefinitionsHash[cfv.customFieldDefinitionId].name]: cfv.value }
-    ),
+    [cfv.customFieldDefinition.name]: cfv.value,
   }), {});
   return customFields;
 };
 /**
  * A hook to attach the custom fields when fetching a model instances.
  */
-const enrichResults = (modelType: string, scopeAttributes: string[]) => async (
+const enrichResults = (scopeAttributes: string[]) => async (
   instancesOrInstance: any | any[],
   options,
 ): Promise<void> => {
@@ -41,31 +33,21 @@ const enrichResults = (modelType: string, scopeAttributes: string[]) => async (
     ? instancesOrInstance
     : [instancesOrInstance];
 
-  instances = instances.filter(Boolean);
+  instances = instances.filter((instance) => !!instance);
 
   const identifiers = instances.map((instance) =>
     scopeAttributes
       .map((attr) => instance[attr])).flat();
 
-  const uniqueIdentifiers = [...new Set(identifiers)].filter(Boolean);
-  const identifierCustomFieldDefinitionsMapping = uniqueIdentifiers.reduce((map, identifier) => ({
-    ...map,
-    [identifier]: [],
-  }), {});
-  const customFieldDefinitions = await DefinitionRepo.findByEntityIds(
-    modelType,
-    uniqueIdentifiers,
-    { transaction: options.transaction },
-  );
-
-  const definitionsMap = customFieldDefinitions.reduce((map, definition) => ({
-    ...map,
-    [definition.id]: definition,
-  }), {});
-
-  customFieldDefinitions.forEach((cfd) => {
-    identifierCustomFieldDefinitionsMapping[cfd.entityId].push(cfd);
-  });
+  const uniqueIdentifiers = [...new Set(identifiers)].filter((identifier) => !!identifier);
+  const identifierCustomFieldDefinitionsMapping = {};
+  await Promise.all(uniqueIdentifiers.map(async (identifier) => {
+    const customFieldDefinitions = await DefinitionRepo.findByEntityId(
+      identifier,
+      { transaction: options.transaction },
+    );
+    identifierCustomFieldDefinitionsMapping[identifier] = customFieldDefinitions;
+  }));
 
   // Get the values per instates ids:
   const instancesIds = instances.map((i) => i[primaryKey]);
@@ -93,27 +75,22 @@ const enrichResults = (modelType: string, scopeAttributes: string[]) => async (
     const { id } = instance;
     const instanceValues = valuesGroupByInstance[id];
     if (instanceValues) {
-      const serializedCustomFields = serializeCustomFields(instanceValues, definitionsMap);
+      const serializedCustomFields = serializeCustomFields(instanceValues);
       Object.assign(customFields, serializedCustomFields);
     }
 
     scopeAttributes.forEach((attribute) => {
       const identifier = instance[attribute];
-      const entityCustomFieldDefinitions = identifierCustomFieldDefinitionsMapping[identifier];
-      if (entityCustomFieldDefinitions?.length > 0) {
-        entityCustomFieldDefinitions.forEach((customFieldDefinition) => {
+      const customFieldDefinitions = identifierCustomFieldDefinitionsMapping[identifier];
+      if (customFieldDefinitions?.length > 0) {
+        customFieldDefinitions.forEach((customFieldDefinition) => {
           if (customFields[customFieldDefinition.name] === undefined) {
             customFields[customFieldDefinition.name] = null;
           }
         });
       }
     });
-    if (customFields && Object.keys(customFields).length > 0) {
-      logger.info('sadot - enrichResults - customFields', customFields);
-      instance.customFields = customFields;
-    } else {
-      logger.info('sadot - enrichResults - no customFields');
-    }
+    instance.customFields = customFields;
     options.attributesToRemove?.forEach?.((attribute) => {
       delete instance.dataValues?.[attribute];
       // if raw:

package/src/hooks/find.ts

@@ -1,5 +1,4 @@
 /* eslint-disable no-param-reassign */
-import logger from '../utils/logger';
 
 const doScopeAttributesMissing = (
   scopeAttributes: string[],
@@ -18,7 +17,6 @@ export const beforeFind = (scopeAttributes: string[]) => (options): void => {
   const { attributes: queryAttributes } = options;
   if (queryAttributes?.includes('customFields')) {
     const missingScopeAttributes = doScopeAttributesMissing(scopeAttributes, queryAttributes);
-    logger.debug('sadot - before find hook');
     if (missingScopeAttributes?.length > 0) {
       queryAttributes.push(...missingScopeAttributes);
       options.attributesToRemove = missingScopeAttributes;

package/src/hooks/update.ts

@@ -1,4 +1,3 @@
-import logger from '../utils/logger';
 import * as ValueRepo from '../repository/value';
 
 /**
@@ -18,7 +17,6 @@ export const beforeUpdate = (scopeAttributes: string[]) => async (
   instance,
   options,
 ): Promise<void> => {
-  logger.debug('sadot - before update hook');
   const { fields } = options;
   const modelType = instance.constructor.name;
   const identifiers = scopeAttributes.map((attribute) => instance[attribute]);

package/src/index.ts

@@ -1,7 +1,6 @@
 import type { Application } from 'express';
 import { DataTypes } from 'sequelize';
-import { Sequelize } from 'sequelize-typescript';
-import { initTables, initTestModels } from './models';
+import { initTables } from './models';
 import api from './api';
 import {
   beforeFind,
@@ -21,13 +20,7 @@ const addHooks = (models: ModelOptions[], getModel: ModelFetcher) => {
   models.forEach(async ({ name, scopeAttributes }) => {
     try {
       const model = getModel(name);
-      if (!model) {
-        logger.warn('sadot - tried to addHooks to a model that does not exist yet', {
-          name,
-          scopeAttributes,
-        });
-        return;
-      }
+      if (!model) return;
       model.rawAttributes.customFields = {
         type: DataTypes.VIRTUAL,
       };
@@ -39,9 +32,8 @@ const addHooks = (models: ModelOptions[], getModel: ModelFetcher) => {
       model.addHook('beforeBulkUpdate', 'sadot-beforeBulkUpdate', beforeBulkUpdate);
       model.addHook('beforeCreate', 'sadot-beforeCreate', beforeCreate(scopeAttributes));
       model.addHook('beforeUpdate', 'sadot-beforeUpdate', beforeUpdate(scopeAttributes));
-      model.addHook('afterFind', 'sadot-afterFind', enrichResults(name, scopeAttributes));
-      model.addHook('afterUpdate', 'sadot-afterUpdate', enrichResults(name, scopeAttributes));
-      model.addHook('afterCreate', 'sadot-afterCreate', enrichResults(name, scopeAttributes));
+      model.addHook('afterFind', 'sadot-afterFind', enrichResults(scopeAttributes));
+      model.addHook('afterUpdate', 'sadot-afterUpdate', enrichResults(scopeAttributes));
     } catch (e) {
       logger.error(`Could not add custom fields hook to model ${name}. `, e);
     }
@@ -56,19 +48,14 @@ const useCustomFields = async (
   app: Application | null,
   getModel: ModelFetcher,
   options: CustomFieldOptions,
-): Promise<Sequelize> => {
+): Promise<void> => {
   const { models } = options;
   if (app) {
     app.use('/api', api);
   }
   const sequelize = initDB(options.databaseConfig);
-  if (process.env.NODE_ENV === 'test') {
-    await initTestModels(sequelize);
-  }
-  addHooks(models, getModel);
   await initTables(sequelize, options.getUser);
-  logger.debug('sadot - custom fields finished initializing with models', models);
-  return sequelize;
+  addHooks(models, getModel);
 };
 
 export default useCustomFields;

package/src/models/CustomFieldDefinition.ts

@@ -23,7 +23,7 @@ import { UnsupportedCustomFieldTypeError, UnsupportedCustomValidationError } fro
   indexes: [
     {
       name: 'unique_name_model_type',
-      fields: ['model_type', 'entity_id', 'name'],
+      fields: ['name', 'model_type', 'entity_id'],
       unique: true,
     },
   ],

package/src/models/index.ts

@@ -1,5 +1,4 @@
 /* eslint-disable no-param-reassign */
-import { DataTypes } from 'sequelize';
 import type { Sequelize } from 'sequelize-typescript';
 import logger from '../utils/logger';
 import CustomFieldDefinition from './CustomFieldDefinition';
@@ -8,11 +7,7 @@ import TestModel from './tests/TestModel';
 import AssociatedTestModel from './tests/AssociatedTestModel';
 
 const productionModels = [CustomFieldDefinition, CustomFieldValue];
-const testModels = [TestModel, AssociatedTestModel];
-
-const SADOT_MIGRATION_PREFIX = 'sadot-migration';
-const SCHEMA_VERSION = 1;
-const CUSTOM_FIELDS_SCHEMA_VERSION = `${SADOT_MIGRATION_PREFIX}_${SCHEMA_VERSION}`;
+const testModels = [...productionModels, TestModel, AssociatedTestModel];
 
 const initTables = async (sequelize: Sequelize, getUser): Promise<void> => {
   logger.info('custom-fields: initialize custom-fields tables');
@@ -21,7 +16,22 @@ const initTables = async (sequelize: Sequelize, getUser): Promise<void> => {
   if (!sequelize.addModels) {
     throw new Error('sequelize instance must have addModels function');
   }
-  sequelize.addModels(productionModels);
+
+  const models = process.env.NODE_ENV === 'test' ? testModels : productionModels;
+
+  sequelize.addModels(models);
+  await sequelize.dropSchema('custom-fields', { logging: false });
+  await sequelize.createSchema('custom-fields', { logging: false });
+
+  logger.info('custom-fields: models added');
+  await CustomFieldDefinition.sync({ alter: true });
+  await CustomFieldValue.sync({ alter: true });
+
+  if (process.env.NODE_ENV === 'test') {
+    await TestModel.sync({ alter: true });
+    await AssociatedTestModel.sync({ alter: true });
+  }
+  logger.info('custom-fields: models synced');
 
   CustomFieldDefinition.addScope('userScope', () => {
     const user = getUser();
@@ -38,57 +48,6 @@ const initTables = async (sequelize: Sequelize, getUser): Promise<void> => {
     }
     return {};
   });
-
-  logger.info('custom-fields: models added');
-
-  const SequelizeMeta = sequelize.define(
-    'SequelizeMeta',
-    {
-      name: {
-        type: DataTypes.STRING,
-        allowNull: false,
-        unique: true,
-        primaryKey: true,
-        autoIncrement: false,
-      },
-    },
-    {
-      tableName: 'SequelizeMeta',
-      timestamps: false,
-      schema: 'public',
-    },
-  );
-  const migrations = await SequelizeMeta.findAll({ raw: true });
-  const currentSadotSchemaVersion = migrations
-    .reverse().find((m: any) => m.name.includes(SADOT_MIGRATION_PREFIX));
-
-  if (
-    !currentSadotSchemaVersion
-    || (currentSadotSchemaVersion as any).name !== CUSTOM_FIELDS_SCHEMA_VERSION
-  ) {
-    await CustomFieldDefinition.sync({ alter: true });
-    await CustomFieldValue.sync({ alter: true });
-    await SequelizeMeta.create({ name: CUSTOM_FIELDS_SCHEMA_VERSION });
-    logger.info('custom-fields: models synced');
-  }
-};
-
-const initTestModels = async (sequelize: Sequelize): Promise<void> => {
-  logger.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
-  if (!sequelize.addModels) {
-    throw new Error('sequelize instance must have addModels function');
-  }
-
-  sequelize.addModels(testModels);
-  await sequelize.dropSchema('custom-fields', { logging: false });
-  await sequelize.createSchema('custom-fields', { logging: false });
-
-  logger.info('custom-fields: test models added');
-  await TestModel.sync({ alter: true });
-  await AssociatedTestModel.sync({ alter: true });
-  logger.info('custom-fields: test models synced');
 };
 
 export {
@@ -97,5 +56,4 @@ export {
   TestModel,
   AssociatedTestModel,
   initTables,
-  initTestModels,
 };

package/src/repository/definition.ts

@@ -1,5 +1,5 @@
 import { Op, WhereOptions } from 'sequelize';
-import { CustomFieldDefinition } from '../models';
+import { CustomFieldDefinition, CustomFieldValue } from '../models';
 import type { CreateCustomFieldDefinition, UpdateCustomFieldDefinition } from '../types/definition';
 
 export const create = (data: CreateCustomFieldDefinition): Promise<CustomFieldDefinition> =>
@@ -9,14 +9,11 @@ export const findAll = (
   where: any,
   options: any = { withDisabled: false },
 ): Promise<CustomFieldDefinition[]> => {
-  const queryModel = options.withDisabled
-    ? CustomFieldDefinition.unscoped()
-    : CustomFieldDefinition;
-  return queryModel.scope('userScope').findAll({
-    where,
-    transaction: options.transaction,
-    raw: true,
-  });
+  if (options.withDisabled) {
+    return CustomFieldDefinition.unscoped().scope('userScope').findAll({ where });
+  }
+
+  return CustomFieldDefinition.scope('userScope').findAll({ where });
 };
 
 export const findByIds = (
@@ -43,22 +40,10 @@ export const findByEntityId = async (
   transaction: options.transaction,
 });
 
-export const findByEntityIds = async (
-  modelType: string,
-  entityIds: string[],
-  options: any = {},
-): Promise<CustomFieldDefinition[]> => CustomFieldDefinition.findAll({
-  where: {
-    modelType,
-    entityId: entityIds,
-  },
-  transaction: options.transaction,
-  raw: true,
-});
-
 export const findByWhere = (where): Promise<CustomFieldDefinition | null> =>
   CustomFieldDefinition.scope('userScope').findOne({
     where,
+    include: [CustomFieldValue],
   });
 
 export const findDefinitionsByModels = async (
@@ -68,6 +53,7 @@ export const findDefinitionsByModels = async (
   const query: WhereOptions<CreateCustomFieldDefinition> = { modelType: { [Op.in]: modelTypes } };
   return CustomFieldDefinition.findAll({
     where: query,
+    include: [CustomFieldValue],
     transaction: options?.transaction,
   });
 };
@@ -100,10 +86,27 @@ export const getRequiredFields = async (
   modelType: string,
   modelId: string | string[],
   entityId: string | string[],
+  onlyNull = false,
 ): Promise<string[]> => {
   const entityIds = Array.isArray(entityId) ? entityId : [entityId];
+  const modelIds = Array.isArray(modelId) ? modelId : [modelId];
+  // const valueQuery = Object.assign(
+  //   {
+  //     modelId: { [Op.in]: modelIds },
+  //   },
+  //   onlyNull ? { value: { [Op.eq]: null } } : null,
+  // );
+  const valueQuery = onlyNull ? {
+    modelId: { [Op.in]: modelIds },
+    value: { [Op.eq]: null },
+  } : {};
   const requiredFields = await CustomFieldDefinition.findAll({
     where: { required: true, modelType, entityId: { [Op.in]: entityIds } },
+    include: {
+      model: CustomFieldValue,
+      where: { ...valueQuery },
+      required: false,
+    },
     logging: true,
   });
   const requiredFieldsNames = requiredFields.map((definition) => definition.name);

package/src/repository/value.ts

@@ -34,9 +34,8 @@ export const findValuesByModelIds = async (modelIds: string[], options?): Promis
   const { transaction } = options;
   return CustomFieldValue.findAll({
     where: { modelId: modelIds },
+    include: [CustomFieldDefinition],
     transaction,
-    raw: true,
-    nest: true,
   });
 };
 

package/src/types/index.ts

@@ -9,7 +9,7 @@ export type ModelOptions = {
 }
 
 export type CustomFieldOptions= {
-  models: ModelOptions[];
-  databaseConfig: any;
-  getUser: () => any;
-};
+    models: ModelOptions[];
+    databaseConfig: any;
+    getUser: () => any;
+  };

package/src/utils/db/index.ts

@@ -1,5 +1,4 @@
 import { Sequelize } from 'sequelize-typescript';
-import { QueryTypes } from 'sequelize';
 
 export default (databaseConfig: any): Sequelize => {
   const ENV_DEV = 'test';
@@ -13,9 +12,3 @@ export default (databaseConfig: any): Sequelize => {
   }
   return sequelize;
 };
-
-export const createSequelizeMeta = (sequelize: Sequelize) => sequelize.query(`
-CREATE TABLE IF NOT EXISTS "SequelizeMeta" (
-  name character varying(255) PRIMARY KEY
-);
-`, { type: QueryTypes.SELECT });

package/src/utils/logger/index.ts

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

package/src/utils/validations/type.ts

@@ -35,8 +35,7 @@ const validateValueType = (value: unknown, valueType: CustomFieldDefinitionType)
     case CustomFieldDefinitionType.SELECT:
       return true; // custom validation
     case CustomFieldDefinitionType.IMAGE:
-      return !Joi.array().min(1).unique().items(Joi.string().uri())
-        .validate(value).error;
+      return !Joi.string().uri().validate(value).error;
     default:
       return false;
   }

package/tsconfig.json

@@ -1,13 +1,29 @@
 {
   "compilerOptions": {
-    "target": "es2020",
-    "module": "commonjs",
-    "declaration": true,
-    "outDir": "./dist",
-    "esModuleInterop": true,
-    "experimentalDecorators": true,
-    "emitDecoratorMetadata": true,
-    "allowJs": true
+      "lib": [
+        "es2019"
+      ],
+      "incremental": true,
+      "module": "commonjs",
+      "esModuleInterop": true,
+      "target": "es6",
+      "moduleResolution": "node",
+      "sourceMap": true,
+      "outDir": "./dist",
+      "baseUrl": ".",
+      "experimentalDecorators": true,
+      "emitDecoratorMetadata": true,
+      "allowJs": true,
+      "paths": {
+          "*": [
+              "node_modules/*"
+          ]
+      }
   },
-  "exclude": ["node_modules", "**/*.test.ts"]
+  "include": [
+    "src/**/*", "test"
+  ],
+  "exclude": [
+    "**/*.test.*",
+  ]
 }

package/dist/jest.config.d.ts

@@ -1,12 +0,0 @@
-export const testEnvironment: string;
-export const roots: string[];
-export const transform: {
-    '^.+\\.tsx?$': string;
-};
-export const testRegex: string;
-export const moduleFileExtensions: string[];
-export namespace coverageThreshold {
-    namespace global {
-        const lines: number;
-    }
-}

package/dist/src/api/index.d.ts

@@ -1,2 +0,0 @@
-declare const router: import("express-serve-static-core").Router;
-export default router;

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

@@ -1,2 +0,0 @@
-declare const router: import("express-serve-static-core").Router;
-export default router;

package/dist/src/api/v1/definition/validations.d.ts

@@ -1,2 +0,0 @@
-export declare const validateCustomFieldDefinitionCreation: (payload: any) => any;
-export declare const validateCustomFieldDefinitionUpdate: (payload: any) => any;

package/dist/src/api/v1/errors.d.ts

@@ -1,2 +0,0 @@
-declare const _default: (err: any, res: any, additionalData?: {}) => any;
-export default _default;

package/dist/src/api/v1/index.d.ts

@@ -1,2 +0,0 @@
-declare const router: import("express-serve-static-core").Router;
-export default router;

package/dist/src/errors/index.d.ts

@@ -1,16 +0,0 @@
-import { BadRequest } from '@autofleet/errors';
-export declare class MissingRequiredCustomFieldError extends BadRequest {
-    constructor(missingFields: string[]);
-}
-export declare class UnsupportedCustomFieldTypeError extends BadRequest {
-    constructor(fieldType: string);
-}
-export declare class UnsupportedCustomValidationError extends BadRequest {
-    constructor(fieldType: string);
-}
-export declare class InvalidValueError extends BadRequest {
-    constructor(value: any, fieldType: string);
-}
-export declare class MissingDefinitionError extends BadRequest {
-    constructor(fieldNames: string[]);
-}

package/dist/src/events/index.d.ts

@@ -1,4 +0,0 @@
-import Events from '@autofleet/events';
-declare const events: Events;
-export declare const sendDimEvent: (instance: any) => void;
-export default events;

package/dist/src/hooks/create.d.ts

@@ -1,9 +0,0 @@
-/**
- * A hook to create the custom fields when updating a model (more then one instance).
- */
-export declare const beforeBulkCreate: (options: any) => void;
-/**
- * A hook to create the custom fields when updating a model instance.
- * TODO - cleanup if update fail
- */
-export declare const beforeCreate: (scopeAttributes: string[]) => (instance: any, options: any) => Promise<void>;

package/dist/src/hooks/enrich.d.ts

@@ -1,5 +0,0 @@
-/**
- * A hook to attach the custom fields when fetching a model instances.
- */
-declare const enrichResults: (modelType: string, scopeAttributes: string[]) => (instancesOrInstance: any | any[], options: any) => Promise<void>;
-export default enrichResults;

package/dist/src/hooks/find.d.ts

@@ -1 +0,0 @@
-export declare const beforeFind: (scopeAttributes: string[]) => (options: any) => void;

package/dist/src/hooks/index.d.ts

@@ -1,6 +0,0 @@
-import enrichResults from './enrich';
-import { beforeFind } from './find';
-import { beforeBulkUpdate, beforeUpdate } from './update';
-import { beforeBulkCreate, beforeCreate } from './create';
-import workaround from './workaround';
-export { enrichResults, beforeFind, beforeBulkUpdate, beforeUpdate, beforeBulkCreate, beforeCreate, workaround, };

package/dist/src/hooks/update.d.ts

@@ -1,9 +0,0 @@
-/**
- * A hook to update the custom fields when updating a model (more then one instance).
- */
-export declare const beforeBulkUpdate: (options: any) => void;
-/**
- * A hook to update the custom fields when updating a model instance.
- * TODO - cleanup if update fail
- */
-export declare const beforeUpdate: (scopeAttributes: string[]) => (instance: any, options: any) => Promise<void>;

package/dist/src/hooks/workaround.d.ts

@@ -1,10 +0,0 @@
-/**
- * Workaround to a bug in sequelize.🐛
- *
- * **afterFind hook** isn't working on nested (included) models.
- * The solution here is to add a global afterFind hook,
- * which manually calls the afterFind hook of each model, recursively
- * https://github.com/sequelize/sequelize/issues/4627
- */
-declare const handleChildrenAfterFindHook: (instances: any, options: any, level?: number) => any;
-export default handleChildrenAfterFindHook;

package/dist/src/index.d.ts

@@ -1,11 +0,0 @@
-import type { Application } from 'express';
-import { Sequelize } from 'sequelize-typescript';
-import { CustomFieldOptions, ModelFetcher } from './types';
-export * from './utils/validations/custom-fields';
-/**
- * Adding custom fields enrichment to the models inside the MODELS_FILE_NAME json file
- * @see {@link 'custom-fields/config'} for configurations
- */
-declare const useCustomFields: (app: Application | null, getModel: ModelFetcher, options: CustomFieldOptions) => Promise<Sequelize>;
-export default useCustomFields;
-export declare const disableCustomFields: (models: any, getModel: any) => void;

package/dist/src/models/CustomFieldDefinition.d.ts

@@ -1,23 +0,0 @@
-import { Model } from 'sequelize-typescript';
-import { CustomFieldDefinitionType } from '../utils/validations/type';
-import { CustomFieldValue } from '.';
-declare class CustomFieldDefinition extends Model {
-    id: string;
-    name: string;
-    displayName?: string;
-    fieldType: CustomFieldDefinitionType;
-    validation?: any;
-    entityId: string; /** Client association entity id */
-    entityType: string; /** Client association entity type (demand source / fleet / etc.) */
-    modelType: string; /** Model type. e.g. Vehicle / StopPoint / etc. */
-    description?: string;
-    required?: boolean;
-    disabled?: boolean;
-    createdAt?: Date;
-    updatedAt?: Date;
-    deletedAt?: Date;
-    values: CustomFieldValue[];
-    static displayNameDefaultValue(instance: CustomFieldDefinition): void;
-    static afterSaveHandler(instance: CustomFieldDefinition, options: any): void;
-}
-export default CustomFieldDefinition;

package/dist/src/models/CustomFieldValue.d.ts

@@ -1,15 +0,0 @@
-import { Model } from 'sequelize-typescript';
-import { CustomFieldDefinition } from '.';
-declare class CustomFieldValue extends Model {
-    modelId: string;
-    customFieldDefinitionId: string;
-    value: any;
-    createdAt?: Date;
-    updatedAt?: Date;
-    deletedAt?: Date;
-    customFieldDefinition: CustomFieldDefinition;
-    static validateValues(instances: CustomFieldValue[]): Promise<void>;
-    static validateValue(instance: CustomFieldValue): Promise<void>;
-    static afterSaveHandler(instance: CustomFieldValue, options: any): void;
-}
-export default CustomFieldValue;