@contember/engine-content-api 2.1.0-beta.1 → 2.2.0-alpha.1

package/src/input-validation/index.ts

@@ -1,11 +1,12 @@
-export * from './dependencies'
-export * from './preValidation'
-export * from './ColumnValueResolver'
-export * from './EntityRulesResolver'
-export * from './exceptions'
-export * from './InputValidator'
-export * from './QueryAstFactory'
-export * from './ValidationContext'
-export * from './ValidationDataSelector'
-export * from './ValidationEvaluation'
-export * from './ValidationPath'
+export * from './dependencies/index.js'
+export * from './preValidation/index.js'
+export * from './ColumnValueResolver.js'
+export * from './EntityRulesResolver.js'
+export * from './exceptions.js'
+export * from './InputValidator.js'
+export * from './JsonSchemaValidator.js'
+export * from './QueryAstFactory.js'
+export * from './ValidationContext.js'
+export * from './ValidationDataSelector.js'
+export * from './ValidationEvaluation.js'
+export * from './ValidationPath.js'

package/src/input-validation/preValidation/CreateInputPreValidationProcessor.ts

@@ -1,8 +1,8 @@
-import { CreateInputProcessor } from '../../inputProcessing'
+import { CreateInputProcessor } from '../../inputProcessing/index.js'
 import { Input, Model } from '@contember/schema'
-import { appendRelationToPath, ValidationPath } from '../ValidationPath'
-import { Mapper, MapperInput } from '../../mapper'
-import { InputPreValidator } from './InputPreValidator'
+import { appendRelationToPath, ValidationPath } from '../ValidationPath.js'
+import { Mapper, MapperInput } from '../../mapper/index.js'
+import { InputPreValidator } from './InputPreValidator.js'
 
 type Result = any
 const NoResult = () => Promise.resolve([])

package/src/input-validation/preValidation/InputPreValidator.ts

@@ -1,21 +1,22 @@
 import { acceptEveryFieldVisitor } from '@contember/schema-utils'
-import { isIt, tuple } from '../../utils'
+import { isIt, tuple } from '../../utils/index.js'
 import { Input, Model, Validation, Value } from '@contember/schema'
 import { InputValidation } from '@contember/schema-definition'
-import { CreateInputVisitor, UpdateInputVisitor } from '../../inputProcessing'
-import { CreateInputPreValidationProcessor } from './CreateInputPreValidationProcessor'
-import { ValidationContext } from '../ValidationContext'
-import { evaluateValidation } from '../ValidationEvaluation'
-import { ValidationPath } from '../ValidationPath'
-import { EntityRulesResolver } from '../EntityRulesResolver'
-import { FieldValidationResult, ValidationResult } from '../InputValidator'
-import { UpdateInputPreValidationProcessor } from './UpdateInputPreValidationProcessor'
-import { ColumnValueResolver } from '../ColumnValueResolver'
-import { Mapper, MapperInput } from '../../mapper'
-import { Dependencies, DependencyCollector } from '../dependencies'
-import { DependencyMerger } from '../dependencies'
-import { NotSupportedError } from '../exceptions'
-import { ValidationDataSelector } from '../ValidationDataSelector'
+import { CreateInputVisitor, UpdateInputVisitor } from '../../inputProcessing/index.js'
+import { CreateInputPreValidationProcessor } from './CreateInputPreValidationProcessor.js'
+import { ValidationContext } from '../ValidationContext.js'
+import { evaluateValidation } from '../ValidationEvaluation.js'
+import { ValidationPath } from '../ValidationPath.js'
+import { EntityRulesResolver } from '../EntityRulesResolver.js'
+import { FieldValidationResult, ValidationResult } from '../InputValidator.js'
+import { UpdateInputPreValidationProcessor } from './UpdateInputPreValidationProcessor.js'
+import { ColumnValueResolver } from '../ColumnValueResolver.js'
+import { Mapper, MapperInput } from '../../mapper/index.js'
+import { Dependencies, DependencyCollector } from '../dependencies/index.js'
+import { DependencyMerger } from '../dependencies/index.js'
+import { NotSupportedError } from '../exceptions.js'
+import { ValidationDataSelector } from '../ValidationDataSelector.js'
+import { validateJsonSchema } from '../JsonSchemaValidator.js'
 
 export interface CreateValidationArgs {
 	mapper: Mapper
@@ -54,11 +55,13 @@ export class InputPreValidator {
 
 		const fieldsResult = this.validateFields(rules, context, path)
 
+		const jsonSchemaResult = this.validateJsonSchemaColumns(entity, data, path)
+
 		const processor = new CreateInputPreValidationProcessor(this, path, mapper)
 		const visitor = new CreateInputVisitor(processor, this.model, data)
 		const relationResult = await this.validateRelations(entity, visitor)
 
-		return [...fieldsResult, ...relationResult]
+		return [...fieldsResult, ...jsonSchemaResult, ...relationResult]
 	}
 
 	async validateUpdate({ entity, data, path, mapper, where }: UpdateValidationArgs): Promise<ValidationResult> {
@@ -69,11 +72,51 @@ export class InputPreValidator {
 		const context = await this.createContextForUpdate(mapper, entity, where, data, dependencies)
 		const fieldsResult: ValidationResult = this.validateFields(rules, context, path)
 
+		const jsonSchemaResult = this.validateJsonSchemaColumns(entity, data, path)
+
 		const processor = new UpdateInputPreValidationProcessor(this, path, mapper)
 		const visitor = new UpdateInputVisitor(processor, this.model, data)
 		const relationResult = await this.validateRelations(entity, visitor)
 
-		return [...fieldsResult, ...relationResult]
+		return [...fieldsResult, ...jsonSchemaResult, ...relationResult]
+	}
+
+	/**
+	 * Validates JSON columns that have a JSON Schema attached. Only fields present in the input
+	 * are validated; `null` values are skipped (use `notNull()` to forbid them).
+	 */
+	private validateJsonSchemaColumns(
+		entity: Model.Entity,
+		data: MapperInput.CreateDataInput | MapperInput.UpdateDataInput,
+		path: ValidationPath,
+	): ValidationResult {
+		const result: ValidationResult = []
+		for (const field of Object.values(entity.fields)) {
+			if (field.type !== Model.ColumnType.Json) {
+				continue
+			}
+			const schema = (field as Model.AnyColumn).schema
+			if (schema === undefined) {
+				continue
+			}
+			if (!(field.name in data)) {
+				continue
+			}
+			const value = data[field.name] as Input.ColumnValue
+			if (value === null || value === undefined) {
+				continue
+			}
+			const errors = validateJsonSchema(schema, value)
+			for (const error of errors) {
+				result.push({
+					path: [...path, { field: field.name }],
+					message: {
+						text: error.path ? `${error.path}: ${error.message}` : error.message,
+					},
+				})
+			}
+		}
+		return result
 	}
 
 	private createContextForCreate(entity: Model.Entity, data: MapperInput.CreateDataInput): ValidationContext.NodeContext {

package/src/input-validation/preValidation/UpdateInputPreValidationProcessor.ts

@@ -1,8 +1,8 @@
-import { UpdateInputProcessor } from '../../inputProcessing'
+import { UpdateInputProcessor } from '../../inputProcessing/index.js'
 import { Input, Model } from '@contember/schema'
-import { appendRelationToPath, ValidationPath } from '../ValidationPath'
-import { Mapper, MapperInput } from '../../mapper'
-import { InputPreValidator } from './InputPreValidator'
+import { appendRelationToPath, ValidationPath } from '../ValidationPath.js'
+import { Mapper, MapperInput } from '../../mapper/index.js'
+import { InputPreValidator } from './InputPreValidator.js'
 
 type Result = any
 

package/src/input-validation/preValidation/index.ts

@@ -1,3 +1,3 @@
-export * from './CreateInputPreValidationProcessor'
-export * from './InputPreValidator'
-export * from './UpdateInputPreValidationProcessor'
+export * from './CreateInputPreValidationProcessor.js'
+export * from './InputPreValidator.js'
+export * from './UpdateInputPreValidationProcessor.js'

package/src/inputProcessing/CreateInputProcessor.ts

@@ -1,6 +1,6 @@
 import { Input, Model } from '@contember/schema'
-import { CheckedPrimary } from '../mapper/CheckedPrimary'
-import { MapperInput } from '../mapper'
+import { CheckedPrimary } from '../mapper/CheckedPrimary.js'
+import { MapperInput } from '../mapper/index.js'
 
 interface CreateInputProcessor<Result = void> {
 	column(context: Model.ColumnContext & { input: Input.ColumnValue | undefined }): Promise<Result>

package/src/inputProcessing/CreateInputVisitor.ts

@@ -1,8 +1,8 @@
-import { filterObject } from '../utils'
+import { filterObject } from '../utils/index.js'
 import { Input, Model } from '@contember/schema'
-import { CreateInputProcessor } from './CreateInputProcessor'
-import { ImplementationException, UserError } from '../exception'
-import { MapperInput } from '../mapper'
+import { CreateInputProcessor } from './CreateInputProcessor.js'
+import { ImplementationException, UserError } from '../exception.js'
+import { MapperInput } from '../mapper/index.js'
 
 export class CreateInputVisitor<Result> implements Model.ColumnVisitor<Promise<Result[]>>, Model.RelationByTypeVisitor<Promise<Result[]>> {
 	constructor(

package/src/inputProcessing/ObjectNode.ts

@@ -1,4 +1,4 @@
-import { FieldNode } from './FieldNode'
+import { FieldNode } from './FieldNode.js'
 
 export class ObjectNode<Args = any, Extensions extends Record<string, any> = Record<string, any>> {
 	constructor(

package/src/inputProcessing/UniqueWhereExpander.ts

@@ -1,8 +1,8 @@
 import { Input, Model, Writable } from '@contember/schema'
 import { getTargetEntity } from '@contember/schema-utils'
-import { UserError } from '../exception'
-import { getFieldsForUniqueWhere } from '../utils'
-import { CheckedPrimary } from '../mapper/CheckedPrimary'
+import { UserError } from '../exception.js'
+import { getFieldsForUniqueWhere } from '../utils/index.js'
+import { CheckedPrimary } from '../mapper/CheckedPrimary.js'
 
 type ExtendedUniqueWhere = Input.UniqueWhere<Input.PrimaryValue[]>
 

package/src/inputProcessing/UpdateInputProcessor.ts

@@ -1,6 +1,6 @@
 import { Input, Model } from '@contember/schema'
-import { CheckedPrimary } from '../mapper/CheckedPrimary'
-import { MapperInput } from '../mapper'
+import { CheckedPrimary } from '../mapper/CheckedPrimary.js'
+import { MapperInput } from '../mapper/index.js'
 
 interface UpdateInputProcessor<Result = void> {
 	column(context: Model.ColumnContext & { input: Input.ColumnValue | undefined }): Promise<Result>

package/src/inputProcessing/UpdateInputVisitor.ts

@@ -1,8 +1,8 @@
 import { Input, Model } from '@contember/schema'
-import { filterObject } from '../utils'
-import { UpdateInputProcessor } from './UpdateInputProcessor'
-import { ImplementationException, UserError } from '../exception'
-import { MapperInput } from '../mapper'
+import { filterObject } from '../utils/index.js'
+import { UpdateInputProcessor } from './UpdateInputProcessor.js'
+import { ImplementationException, UserError } from '../exception.js'
+import { MapperInput } from '../mapper/index.js'
 
 export class UpdateInputVisitor<Result> implements Model.ColumnVisitor<Promise<Result[]>>, Model.RelationByTypeVisitor<Promise<Result[]>> {
 	constructor(

package/src/inputProcessing/index.ts

@@ -1,7 +1,7 @@
-export * from './CreateInputProcessor'
-export * from './CreateInputVisitor'
-export * from './FieldNode'
-export * from './ObjectNode'
-export * from './UniqueWhereExpander'
-export * from './UpdateInputProcessor'
-export * from './UpdateInputVisitor'
+export * from './CreateInputProcessor.js'
+export * from './CreateInputVisitor.js'
+export * from './FieldNode.js'
+export * from './ObjectNode.js'
+export * from './UniqueWhereExpander.js'
+export * from './UpdateInputProcessor.js'
+export * from './UpdateInputVisitor.js'

package/src/introspection/IntrospectionSchemaDefinitionFactory.ts

@@ -1,7 +1,7 @@
 import { GraphQLSchema, GraphQLSchemaConfig } from 'graphql'
-import * as ContentSchema from './content-schema.types'
-import { IntrospectionSchemaFactory } from './IntrospectionSchemaFactory'
-import { createSchemaConfig } from './introspection.schema'
+import * as ContentSchema from './content-schema.types.js'
+import { IntrospectionSchemaFactory } from './IntrospectionSchemaFactory.js'
+import { createSchemaConfig } from './introspection.schema.js'
 
 export class IntrospectionSchemaDefinitionFactory {
 	constructor(private readonly introspectionSchemaFactory: IntrospectionSchemaFactory) {}

package/src/introspection/IntrospectionSchemaFactory.ts

@@ -1,8 +1,8 @@
 import { Acl, Model, Validation } from '@contember/schema'
-import { EntityRulesResolver } from '../input-validation'
-import { Authorizator } from '../acl'
-import * as ContentSchema from './content-schema.types'
-import { assertNever } from '../utils'
+import { EntityRulesResolver } from '../input-validation/index.js'
+import { Authorizator } from '../acl/index.js'
+import * as ContentSchema from './content-schema.types.js'
+import { assertNever } from '../utils/index.js'
 import { acceptEveryFieldVisitor, getEntity } from '@contember/schema-utils'
 
 type AdditionalFieldInfo =

package/src/introspection/index.ts

@@ -1,4 +1,4 @@
-export * as ContentSchemaTypes from './content-schema.types'
-export { IntrospectionSchemaDefinitionFactory } from './IntrospectionSchemaDefinitionFactory'
-export { default as ContentSchema } from './introspection.schema'
-export * from './IntrospectionSchemaFactory'
+export * as ContentSchemaTypes from './content-schema.types.js'
+export { IntrospectionSchemaDefinitionFactory } from './IntrospectionSchemaDefinitionFactory.js'
+export { default as ContentSchema } from './introspection.schema.js'
+export * from './IntrospectionSchemaFactory.js'

package/src/mapper/ErrorUtils.ts

@@ -7,9 +7,9 @@ import {
 	MutationResultHint,
 	MutationResultList,
 	MutationSqlError,
-} from './Result'
+} from './Result.js'
 import * as Database from '@contember/database'
-import { UniqueWhereError } from '../inputProcessing'
+import { UniqueWhereError } from '../inputProcessing/index.js'
 import { Model } from '@contember/schema'
 import { acceptFieldVisitor, tryGetColumnName } from '@contember/schema-utils'
 import { logger } from '@contember/logger'

package/src/mapper/EventManager.ts

@@ -1,6 +1,6 @@
 import { Input, Model, Value } from '@contember/schema'
-import { Mapper } from './Mapper'
-import { ColumnValue } from './ColumnValue'
+import { Mapper } from './Mapper.js'
+import { ColumnValue } from './ColumnValue.js'
 
 export class BeforeInsertEvent {
 	public type = 'BeforeInsertEvent' as const

package/src/mapper/JunctionTableManager.ts

@@ -1,6 +1,6 @@
 import { getEntity } from '@contember/schema-utils'
-import { PathFactory, WhereBuilder } from './select'
-import { PredicateFactory } from '../acl'
+import { PathFactory, WhereBuilder } from './select/index.js'
+import { PredicateFactory } from '../acl/index.js'
 import { Client, ConflictActionType, DeleteBuilder, InsertBuilder, Literal, Operator, SelectBuilder } from '@contember/database'
 import { Acl, Input, Model } from '@contember/schema'
 import {
@@ -10,10 +10,10 @@ import {
 	MutationResultList,
 	MutationResultType,
 	NothingToDoReason,
-} from './Result'
-import { ImplementationException } from '../exception'
-import { AfterJunctionUpdateEvent, BeforeJunctionUpdateEvent } from './EventManager'
-import { Mapper } from './Mapper'
+} from './Result.js'
+import { ImplementationException } from '../exception.js'
+import { AfterJunctionUpdateEvent, BeforeJunctionUpdateEvent } from './EventManager.js'
+import { Mapper } from './Mapper.js'
 
 type OkResultFactory = () => MutationJunctionUpdateOk
 

package/src/mapper/Mapper.ts

@@ -9,21 +9,21 @@ import {
 	SelectIndexedResultObjects,
 	SelectResultObject,
 	WhereBuilder,
-} from './select'
+} from './select/index.js'
 import { Client, Connection, ConstraintHelper, DatabaseMetadata, SelectBuilder } from '@contember/database'
-import { PredicatesInjector } from '../acl'
-import { JunctionTableManager } from './JunctionTableManager'
-import { DeletedEntitiesStorage, DeleteExecutor } from './delete'
-import { MutationEntryNotFoundError, MutationResultList } from './Result'
-import { UpdateBuilder, Updater } from './update'
-import { InsertBuilder, Inserter } from './insert'
-import { tryMutation } from './ErrorUtils'
-import { ObjectNode, UniqueWhereExpander } from '../inputProcessing'
-import { Mutex } from '../utils'
-import { CheckedPrimary } from './CheckedPrimary'
-import { ImplementationException } from '../exception'
-import { EventManager } from './EventManager'
-import { MapperInput } from './types'
+import { PredicatesInjector } from '../acl/index.js'
+import { JunctionTableManager } from './JunctionTableManager.js'
+import { DeletedEntitiesStorage, DeleteExecutor } from './delete/index.js'
+import { MutationEntryNotFoundError, MutationResultList } from './Result.js'
+import { UpdateBuilder, Updater } from './update/index.js'
+import { InsertBuilder, Inserter } from './insert/index.js'
+import { tryMutation } from './ErrorUtils.js'
+import { ObjectNode, UniqueWhereExpander } from '../inputProcessing/index.js'
+import { Mutex } from '../utils/index.js'
+import { CheckedPrimary } from './CheckedPrimary.js'
+import { ImplementationException } from '../exception.js'
+import { EventManager } from './EventManager.js'
+import { MapperInput } from './types.js'
 
 export class Mapper<ConnectionType extends Connection.ConnectionLike = Connection.ConnectionLike> {
 	private systemVariablesSetupDone: Promise<void> | undefined

package/src/mapper/MapperFactory.ts

@@ -1,13 +1,13 @@
-import { PredicatesInjector } from '../acl'
-import { PathFactory, SelectBuilderFactory, WhereBuilder } from './select'
-import { UniqueWhereExpander } from '../inputProcessing'
-import { JunctionTableManager } from './JunctionTableManager'
-import { DeleteExecutor } from './delete'
-import { Updater } from './update'
-import { Inserter } from './insert'
+import { PredicatesInjector } from '../acl/index.js'
+import { PathFactory, SelectBuilderFactory, WhereBuilder } from './select/index.js'
+import { UniqueWhereExpander } from '../inputProcessing/index.js'
+import { JunctionTableManager } from './JunctionTableManager.js'
+import { DeleteExecutor } from './delete/index.js'
+import { Updater } from './update/index.js'
+import { Inserter } from './insert/index.js'
 import { Model } from '@contember/schema'
 import { Client, Connection, DatabaseMetadata } from '@contember/database'
-import { Mapper } from './Mapper'
+import { Mapper } from './Mapper.js'
 import { Providers } from '@contember/schema-utils'
 
 export type MapperFactoryHook = (mapper: Mapper) => void

package/src/mapper/MutationProcessorHelper.ts

@@ -1,4 +1,4 @@
-import { MutationResultList, prependPath } from './Result'
+import { MutationResultList, prependPath } from './Result.js'
 import { Model } from '@contember/schema'
 
 export const hasManyProcessor = <Context extends { relation: Model.AnyRelation; index: number; alias?: string }, Args>(

package/src/mapper/Result.ts

@@ -1,5 +1,5 @@
 import { Input, Model, Value } from '@contember/schema'
-import { MapperInput } from './types'
+import { MapperInput } from './types.js'
 
 export enum MutationResultType {
 	ok = 'ok',

package/src/mapper/delete/DeleteExecutor.ts

@@ -1,9 +1,9 @@
 import { Acl, Input, Model } from '@contember/schema'
-import { assertNever } from '../../utils'
+import { assertNever } from '../../utils/index.js'
 import { Client, DeleteBuilder, Literal, SelectBuilder } from '@contember/database'
-import { PathFactory, WhereBuilder } from '../select'
-import { PredicateFactory } from '../../acl'
-import { UpdateBuilderFactory } from '../update'
+import { PathFactory, WhereBuilder } from '../select/index.js'
+import { PredicateFactory } from '../../acl/index.js'
+import { UpdateBuilderFactory } from '../update/index.js'
 import {
 	ConstraintType,
 	MutationConstraintViolationError,
@@ -14,20 +14,20 @@ import {
 	MutationResultList,
 	MutationUpdateOk,
 	NothingToDoReason,
-} from '../Result'
-import { Mapper } from '../Mapper'
-import { CheckedPrimary } from '../CheckedPrimary'
-import { DeleteState } from './DeleteState'
+} from '../Result.js'
+import { Mapper } from '../Mapper.js'
+import { CheckedPrimary } from '../CheckedPrimary.js'
+import { DeleteState } from './DeleteState.js'
 import {
 	EntityReferenceRow,
 	findOwningRelations,
 	findRelationsWithOrphanRemoval,
 	formatConstraintViolationMessage,
 	OneHasOneOwningRelationTuple,
-} from './helpers'
+} from './helpers.js'
 import { getEntity } from '@contember/schema-utils'
-import { AfterUpdateEvent, BeforeDeleteEvent, BeforeUpdateEvent, EventManager } from '../EventManager'
-import { ImplementationException } from '../../exception'
+import { AfterUpdateEvent, BeforeDeleteEvent, BeforeUpdateEvent, EventManager } from '../EventManager.js'
+import { ImplementationException } from '../../exception.js'
 
 type DeleteQueue = [entity: Model.Entity, ids: Input.PrimaryValue[]][]
 

package/src/mapper/delete/DeleteState.ts

@@ -1,7 +1,7 @@
-import { DeletedEntitiesStorage } from './DeletedEntitiesStorage'
+import { DeletedEntitiesStorage } from './DeletedEntitiesStorage.js'
 import { Input } from '@contember/schema'
-import { ImplementationException } from '../../exception'
-import { MutationResult, MutationResultList } from '../Result'
+import { ImplementationException } from '../../exception.js'
+import { MutationResult, MutationResultList } from '../Result.js'
 
 export class DeleteState {
 	private plannedDelete = new DeletedEntitiesStorage()

package/src/mapper/delete/index.ts

@@ -1,2 +1,2 @@
-export * from './DeletedEntitiesStorage'
-export * from './DeleteExecutor'
+export * from './DeletedEntitiesStorage.js'
+export * from './DeleteExecutor.js'

package/src/mapper/index.ts

@@ -1,15 +1,15 @@
-export * from './delete'
-export * from './insert'
-export * from './select'
-export * from './update'
-export * from './ColumnValue'
-export * from './Constraints'
-export * from './ErrorUtils'
-export * from './EventManager'
-export * from './JunctionTableManager'
-export * from './Mapper'
-export * from '../ExecutionContainer'
-export * from './MapperFactory'
-export * from './MutationProcessorHelper'
-export * from './Result'
-export * from './types'
+export * from './delete/index.js'
+export * from './insert/index.js'
+export * from './select/index.js'
+export * from './update/index.js'
+export * from './ColumnValue.js'
+export * from './Constraints.js'
+export * from './ErrorUtils.js'
+export * from './EventManager.js'
+export * from './JunctionTableManager.js'
+export * from './Mapper.js'
+export * from '../ExecutionContainer.js'
+export * from './MapperFactory.js'
+export * from './MutationProcessorHelper.js'
+export * from './Result.js'
+export * from './types.js'

package/src/mapper/insert/InsertBuilder.ts

@@ -1,11 +1,11 @@
 import { Acl, Input, Model, Value } from '@contember/schema'
 import { InsertBuilder as DbInsertBuilder, QueryBuilder, Value as DbValue } from '@contember/database'
-import { PathFactory, WhereBuilder } from '../select'
+import { PathFactory, WhereBuilder } from '../select/index.js'
 import { getColumnName, getColumnType } from '@contember/schema-utils'
-import { ColumnValue, normalizeDbValue } from '../ColumnValue'
-import { PredicateFactory } from '../../acl'
-import { AfterInsertEvent, BeforeInsertEvent } from '../EventManager'
-import { Mapper } from '../Mapper'
+import { ColumnValue, normalizeDbValue } from '../ColumnValue.js'
+import { PredicateFactory } from '../../acl/index.js'
+import { AfterInsertEvent, BeforeInsertEvent } from '../EventManager.js'
+import { Mapper } from '../Mapper.js'
 
 export interface InsertResult {
 	values: ColumnValue[]

package/src/mapper/insert/InsertBuilderFactory.ts

@@ -1,7 +1,7 @@
-import { PathFactory, WhereBuilder } from '../select'
+import { PathFactory, WhereBuilder } from '../select/index.js'
 import { Model } from '@contember/schema'
-import { InsertBuilder } from './InsertBuilder'
-import { PredicateFactory } from '../../acl'
+import { InsertBuilder } from './InsertBuilder.js'
+import { PredicateFactory } from '../../acl/index.js'
 
 export class InsertBuilderFactory {
 	constructor(

package/src/mapper/insert/Inserter.ts

@@ -1,14 +1,14 @@
-import { MutationCreateOk, MutationNoResultError, MutationResultList } from '../Result'
-import { CreateInputVisitor } from '../../inputProcessing'
-import { SqlCreateInputProcessor, SqlCreateInputProcessorResult } from './SqlCreateInputProcessor'
-import { Mapper } from '../Mapper'
+import { MutationCreateOk, MutationNoResultError, MutationResultList } from '../Result.js'
+import { CreateInputVisitor } from '../../inputProcessing/index.js'
+import { SqlCreateInputProcessor, SqlCreateInputProcessorResult } from './SqlCreateInputProcessor.js'
+import { Mapper } from '../Mapper.js'
 import { Model } from '@contember/schema'
 import { acceptFieldVisitor, Providers } from '@contember/schema-utils'
-import { InsertBuilderFactory } from './InsertBuilderFactory'
-import { InsertBuilder } from './InsertBuilder'
-import { rowDataToFieldValues } from '../ColumnValue'
+import { InsertBuilderFactory } from './InsertBuilderFactory.js'
+import { InsertBuilder } from './InsertBuilder.js'
+import { rowDataToFieldValues } from '../ColumnValue.js'
 import { DatabaseMetadata } from '@contember/database'
-import { MapperInput } from '../types'
+import { MapperInput } from '../types.js'
 
 export class Inserter {
 	constructor(

package/src/mapper/insert/SqlCreateInputProcessor.ts

@@ -1,15 +1,15 @@
 import { Input, Model, Value } from '@contember/schema'
-import { Mapper } from '../Mapper'
-import { InsertBuilder } from './InsertBuilder'
+import { Mapper } from '../Mapper.js'
+import { InsertBuilder } from './InsertBuilder.js'
 import { Providers, resolveColumnValue } from '@contember/schema-utils'
-import { CreateInputProcessor } from '../../inputProcessing'
-import { MutationResultList } from '../Result'
-import { hasManyProcessor, hasOneProcessor } from '../MutationProcessorHelper'
-import { OneHasOneInverseCreateInputProcessor } from './relations/OneHasOneInverseCreateInputProcessor'
-import { OneHasOneOwningCreateInputProcessor } from './relations/OneHasOneOwningCreateInputProcessor'
-import { OneHasManyCreateInputProcessor } from './relations/OneHasManyCreateInputProcessor'
-import { ManyHasOneCreateInputProcessor } from './relations/ManyHasOneCreateInputProcessor'
-import { ManyHasManyCreateInputProcessor } from './relations/ManyHasManyCreateInputProcessor'
+import { CreateInputProcessor } from '../../inputProcessing/index.js'
+import { MutationResultList } from '../Result.js'
+import { hasManyProcessor, hasOneProcessor } from '../MutationProcessorHelper.js'
+import { OneHasOneInverseCreateInputProcessor } from './relations/OneHasOneInverseCreateInputProcessor.js'
+import { OneHasOneOwningCreateInputProcessor } from './relations/OneHasOneOwningCreateInputProcessor.js'
+import { OneHasManyCreateInputProcessor } from './relations/OneHasManyCreateInputProcessor.js'
+import { ManyHasOneCreateInputProcessor } from './relations/ManyHasOneCreateInputProcessor.js'
+import { ManyHasManyCreateInputProcessor } from './relations/ManyHasManyCreateInputProcessor.js'
 
 export type SqlCreateInputProcessorResult = MutationResultList | ((ctx: { primary: Input.PrimaryValue }) => Promise<MutationResultList>)
 export class SqlCreateInputProcessor implements CreateInputProcessor<SqlCreateInputProcessorResult> {

package/src/mapper/insert/index.ts

@@ -1,4 +1,4 @@
-export * from './InsertBuilder'
-export * from './InsertBuilderFactory'
-export * from './Inserter'
-export * from './SqlCreateInputProcessor'
+export * from './InsertBuilder.js'
+export * from './InsertBuilderFactory.js'
+export * from './Inserter.js'
+export * from './SqlCreateInputProcessor.js'

package/src/mapper/insert/relations/ManyHasManyCreateInputProcessor.ts

@@ -1,10 +1,10 @@
 import { Input, Model } from '@contember/schema'
-import { getInsertPrimary, MutationEntryNotFoundError } from '../../Result'
-import { Mapper } from '../../Mapper'
-import { CreateInputProcessor } from '../../../inputProcessing'
-import { SqlCreateInputProcessorResult } from '../SqlCreateInputProcessor'
-import { CheckedPrimary } from '../../CheckedPrimary'
-import { MapperInput } from '../../types'
+import { getInsertPrimary, MutationEntryNotFoundError } from '../../Result.js'
+import { Mapper } from '../../Mapper.js'
+import { CreateInputProcessor } from '../../../inputProcessing/index.js'
+import { SqlCreateInputProcessorResult } from '../SqlCreateInputProcessor.js'
+import { CheckedPrimary } from '../../CheckedPrimary.js'
+import { MapperInput } from '../../types.js'
 
 type Context = Model.ManyHasManyOwningContext | Model.ManyHasManyInverseContext