diff --git a/packages/datasource-customizer/src/collection-customizer.ts b/packages/datasource-customizer/src/collection-customizer.ts index a718fa9e8b..9a8bf20789 100644 --- a/packages/datasource-customizer/src/collection-customizer.ts +++ b/packages/datasource-customizer/src/collection-customizer.ts @@ -17,7 +17,6 @@ import { OperatorDefinition } from './decorators/operators-emulate/types'; import { RelationDefinition } from './decorators/relation/types'; import { SearchDefinition } from './decorators/search/types'; import { SegmentDefinition } from './decorators/segment/types'; -import ActionValidator from './decorators/validation/action'; import { WriteDefinition } from './decorators/write/write-replace/types'; import { ActionConfigurationValidationError, @@ -27,6 +26,7 @@ import addExternalRelation from './plugins/add-external-relation'; import importField from './plugins/import-field'; import { TCollectionName, TColumnName, TFieldName, TSchema, TSortClause } from './templates'; import { OneToManyEmbeddedDefinition, Plugin } from './types'; +import ActionValidator from './validators/action'; export default class CollectionCustomizer< S extends TSchema = TSchema, diff --git a/packages/datasource-customizer/src/decorators/validation/action.ts b/packages/datasource-customizer/src/validators/action.ts similarity index 91% rename from packages/datasource-customizer/src/decorators/validation/action.ts rename to packages/datasource-customizer/src/validators/action.ts index b37314a7df..b475fe8390 100644 --- a/packages/datasource-customizer/src/decorators/validation/action.ts +++ b/packages/datasource-customizer/src/validators/action.ts @@ -2,12 +2,12 @@ import Ajv from 'ajv'; // A library for validating JSON objects import ajvErrors from 'ajv-errors'; import ajvKeywords from 'ajv-keywords'; +import { ActionDefinition, actionSchema } from '../decorators/actions/types/actions'; +import { DynamicField, fieldActionSchema } from '../decorators/actions/types/fields'; import { ActionConfigurationValidationError, ActionFieldConfigurationValidationError, -} from '../../errors'; -import { ActionDefinition, actionSchema } from '../actions/types/actions'; -import { DynamicField, fieldActionSchema } from '../actions/types/fields'; +} from '../errors'; const ajv = new Ajv({ allErrors: true }); ajvErrors(ajv); // NOTICE: this library adds support for custom invalidity error messages. diff --git a/packages/datasource-customizer/test/decorators/validation/action.test.ts b/packages/datasource-customizer/test/decorators/validation/action.test.ts index 637ca58868..783716c181 100644 --- a/packages/datasource-customizer/test/decorators/validation/action.test.ts +++ b/packages/datasource-customizer/test/decorators/validation/action.test.ts @@ -1,6 +1,6 @@ import { ActionDefinition } from '../../../src/decorators/actions/types/actions'; import { DynamicField } from '../../../src/decorators/actions/types/fields'; -import ActionValidator from '../../../src/decorators/validation/action'; +import ActionValidator from '../../../src/validators/action'; describe('ActionValidator', () => { describe('validateActionConfiguration', () => {