@contember/engine-content-api 2.0.0-alpha.35 → 2.0.0-alpha.37

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contember/engine-content-api",
-  "version": "2.0.0-alpha.35",
+  "version": "2.0.0-alpha.37",
   "license": "Apache-2.0",
   "main": "./dist/production/index.js",
   "typings": "./dist/types/index.d.ts",
@@ -26,18 +26,18 @@
     "generate": "gql-gen --config graphql.codegen.yml"
   },
   "dependencies": {
-    "@contember/database": "2.0.0-alpha.35",
-    "@contember/dic": "2.0.0-alpha.35",
-    "@contember/graphql-utils": "2.0.0-alpha.35",
-    "@contember/logger": "2.0.0-alpha.35",
-    "@contember/schema": "2.0.0-alpha.35",
-    "@contember/schema-definition": "2.0.0-alpha.35",
-    "@contember/schema-utils": "2.0.0-alpha.35",
+    "@contember/database": "2.0.0-alpha.37",
+    "@contember/dic": "2.0.0-alpha.37",
+    "@contember/graphql-utils": "2.0.0-alpha.37",
+    "@contember/logger": "2.0.0-alpha.37",
+    "@contember/schema": "2.0.0-alpha.37",
+    "@contember/schema-definition": "2.0.0-alpha.37",
+    "@contember/schema-utils": "2.0.0-alpha.37",
     "fast-deep-equal": "^3.1.3"
   },
   "devDependencies": {
-    "@contember/database-tester": "2.0.0-alpha.35",
-    "@contember/schema-definition": "2.0.0-alpha.35",
+    "@contember/database-tester": "2.0.0-alpha.37",
+    "@contember/schema-definition": "2.0.0-alpha.37",
     "@types/node": "^20.16.11",
     "graphql": "^16.9.0",
     "pg": "^8.12.0"

package/src/extensions/hasManyToHasOneReducer/HasManyToHasOneRelationReducerVisitor.ts

@@ -54,6 +54,40 @@ export class HasManyToHasOneRelationReducerFieldVisitor implements
 			return []
 		}
 		const uniqueConstraints = getFieldsForUniqueWhere(this.schema, targetEntity)
+
+		const uniqueKeys: (readonly string[])[] = uniqueConstraints
+			.map(it => it.filter(it => it !== targetRelation.name))
+			.filter(it => it.length > 0)
+			.filter(uniqueKey => uniqueKey
+				.every(it =>
+					acceptFieldVisitor(this.schema, targetEntity.name, it, new FieldAccessVisitor(Acl.Operation.read, this.authorizator)),
+				))
+
+		const graphQlName = relation.name + GqlTypeName`By`
+		const uniqueWhere: GraphQLInputObjectType = new GraphQLInputObjectType({
+			name: GqlTypeName`${entity.name}${relation.name}UniqueWhere`,
+			fields: () => {
+				return this.whereTypeProvider.getUniqueWhereFields(targetEntity, uniqueKeys)
+			},
+		})
+
+		const entityType = this.entityTypeProvider.getEntity(targetEntity.name)
+		const universalUnique: Result | null = graphQlName in entity.fields ? null : [
+			graphQlName,
+			{
+				type: entityType,
+				extensions: {
+					relationName: relation.name,
+					extensionKey: HasManyToHasOneReducer.extensionName,
+				},
+				args: {
+					by: { type: new GraphQLNonNull(uniqueWhere) },
+					filter: { type: this.whereTypeProvider.getEntityWhereType(targetEntity.name) },
+				},
+				resolve: aliasAwareResolver,
+			},
+		]
+
 		const composedUnique = uniqueConstraints
 			.filter(fields => fields.length === 2) //todo support all uniques
 			.filter(fields => fields.includes(targetRelation.name))
@@ -89,8 +123,6 @@ export class HasManyToHasOneRelationReducerFieldVisitor implements
 					},
 				})
 
-				const entityType = this.entityTypeProvider.getEntity(targetEntity.name)
-
 				return [
 					graphQlName,
 					{
@@ -107,6 +139,7 @@ export class HasManyToHasOneRelationReducerFieldVisitor implements
 					},
 				]
 			})
+			.concat([universalUnique])
 			.filter((it): it is Result => it !== null)
 	}
 }

package/src/input-validation/ColumnValueResolver.ts

@@ -4,7 +4,7 @@ import { Model, Value } from '@contember/schema'
 export class ColumnValueResolver {
 	constructor(private readonly providers: Providers) {}
 
-	getDefaultValidationValue(context: Model.ColumnContext & { input: Value.FieldValue | undefined }): Value.AtomicValue | undefined {
+	getDefaultValidationValue(context: Model.ColumnContext & { input: Value.FieldValue | undefined }): Value.FieldValue | undefined {
 		if (context.column.name === context.entity.primary) {
 			return '00000000-0000-0000-0000-000000000000'
 		}

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

@@ -1,7 +1,7 @@
 import { CreateInputProcessor } from '../../inputProcessing'
 import { Input, Model } from '@contember/schema'
 import { appendRelationToPath, ValidationPath } from '../ValidationPath'
-import { Mapper } from '../../mapper'
+import { Mapper, MapperInput } from '../../mapper'
 import { InputPreValidator } from './InputPreValidator'
 
 type Result = any
@@ -51,7 +51,7 @@ export class CreateInputPreValidationProcessor implements CreateInputProcessor<R
 	async validateCreate(context: {
 		targetEntity: Model.Entity
 		relation: Model.AnyRelation
-		input: Input.CreateDataInput
+		input: MapperInput.CreateDataInput
 		targetRelation: Model.AnyRelation | null
 		index?: number
 		alias?: string

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

@@ -11,7 +11,7 @@ import { EntityRulesResolver } from '../EntityRulesResolver'
 import { FieldValidationResult, ValidationResult } from '../InputValidator'
 import { UpdateInputPreValidationProcessor } from './UpdateInputPreValidationProcessor'
 import { ColumnValueResolver } from '../ColumnValueResolver'
-import { Mapper } from '../../mapper'
+import { Mapper, MapperInput } from '../../mapper'
 import { Dependencies, DependencyCollector } from '../dependencies'
 import { DependencyMerger } from '../dependencies'
 import { NotSupportedError } from '../exceptions'
@@ -20,7 +20,7 @@ import { ValidationDataSelector } from '../ValidationDataSelector'
 export interface CreateValidationArgs {
 	mapper: Mapper
 	entity: Model.Entity
-	data: Input.CreateDataInput
+	data: MapperInput.CreateDataInput
 	path: ValidationPath
 	overRelation: Model.AnyRelation | null
 }
@@ -29,7 +29,7 @@ export interface UpdateValidationArgs {
 	mapper: Mapper
 	entity: Model.Entity
 	where: Input.UniqueWhere
-	data: Input.UpdateDataInput
+	data: MapperInput.UpdateDataInput
 	path: ValidationPath
 }
 
@@ -76,7 +76,7 @@ export class InputPreValidator {
 		return [...fieldsResult, ...relationResult]
 	}
 
-	private createContextForCreate(entity: Model.Entity, data: Input.CreateDataInput): ValidationContext.NodeContext {
+	private createContextForCreate(entity: Model.Entity, data: MapperInput.CreateDataInput): ValidationContext.NodeContext {
 		const nodeData = acceptEveryFieldVisitor(this.model, entity, {
 			visitColumn: ({ entity, column }) => {
 				const value = data[column.name] as Input.ColumnValue | undefined
@@ -84,7 +84,7 @@ export class InputPreValidator {
 				return validationValue === undefined ? null : validationValue
 			},
 			visitHasOne: ({ relation }) => {
-				const value = data[relation.name] as Input.CreateOneRelationInput | undefined
+				const value = data[relation.name] as MapperInput.CreateOneRelationInput | undefined
 				return value ? true : null
 			},
 			// more complex validation on relations are not possible in pre-validation phase
@@ -97,7 +97,7 @@ export class InputPreValidator {
 		mapper: Mapper,
 		entity: Model.Entity,
 		where: Input.UniqueWhere,
-		data: Input.UpdateDataInput,
+		data: MapperInput.UpdateDataInput,
 		dependencies: Dependencies,
 	): Promise<ValidationContext.NodeContext> {
 		const inputNodeData = acceptEveryFieldVisitor(this.model, entity, {
@@ -105,7 +105,7 @@ export class InputPreValidator {
 				return data[column.name] as Input.ColumnValue | undefined
 			},
 			visitHasOne: ({ relation }) => {
-				const value = data[relation.name] as Input.CreateOneRelationInput | Input.UpdateOneRelationInput | undefined | null
+				const value = data[relation.name] as MapperInput.CreateOneRelationInput | MapperInput.UpdateOneRelationInput | undefined | null
 				if (value === undefined || value === null) {
 					return undefined
 				}

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

@@ -1,7 +1,7 @@
 import { UpdateInputProcessor } from '../../inputProcessing'
 import { Input, Model } from '@contember/schema'
 import { appendRelationToPath, ValidationPath } from '../ValidationPath'
-import { Mapper } from '../../mapper'
+import { Mapper, MapperInput } from '../../mapper'
 import { InputPreValidator } from './InputPreValidator'
 
 type Result = any
@@ -79,7 +79,7 @@ export class UpdateInputPreValidationProcessor implements UpdateInputProcessor<R
 		targetEntity: Model.Entity
 		relation: Model.AnyRelation
 		targetRelation: Model.AnyRelation | null
-		input: Input.CreateDataInput
+		input: MapperInput.CreateDataInput
 		index?: number
 		alias?: string
 	}) {
@@ -124,7 +124,7 @@ export class UpdateInputPreValidationProcessor implements UpdateInputProcessor<R
 	async processUpdate(context: {
 		targetEntity: Model.Entity
 		relation: Model.AnyRelation
-		input: Input.UpdateDataInput
+		input: MapperInput.UpdateDataInput
 		targetRelation: Model.AnyRelation | null
 		index?: number
 		alias?: string

package/src/inputProcessing/CreateInputProcessor.ts

@@ -1,4 +1,6 @@
 import { Input, Model } from '@contember/schema'
+import { CheckedPrimary } from '../mapper/CheckedPrimary'
+import { MapperInput } from '../mapper'
 
 interface CreateInputProcessor<Result = void> {
 	column(context: Model.ColumnContext & { input: Input.ColumnValue | undefined }): Promise<Result>
@@ -17,15 +19,15 @@ namespace CreateInputProcessor {
 
 	export interface HasOneRelationProcessor<Context, Result> {
 		nothing?: (context: Context & { input: undefined }) => Promise<Result>
-		connect: (context: Context & { input: Input.UniqueWhere }) => Promise<Result>
-		create: (context: Context & { input: Input.CreateDataInput }) => Promise<Result>
-		connectOrCreate: (context: Context & { input: Input.ConnectOrCreateInput }) => Promise<Result>
+		connect: (context: Context & { input: Input.UniqueWhere | CheckedPrimary }) => Promise<Result>
+		create: (context: Context & { input: MapperInput.CreateDataInput }) => Promise<Result>
+		connectOrCreate: (context: Context & { input: MapperInput.ConnectOrCreateInput }) => Promise<Result>
 	}
 
 	export interface HasManyRelationProcessor<Context, Result> {
-		connect: (context: Context & { input: Input.UniqueWhere } & { index: number; alias?: string }) => Promise<Result>
-		create: (context: Context & { input: Input.CreateDataInput } & { index: number; alias?: string }) => Promise<Result>
-		connectOrCreate: (context: Context & { input: Input.ConnectOrCreateInput } & { index: number; alias?: string }) => Promise<Result>
+		connect: (context: Context & { input: Input.UniqueWhere | CheckedPrimary } & { index: number; alias?: string }) => Promise<Result>
+		create: (context: Context & { input: MapperInput.CreateDataInput } & { index: number; alias?: string }) => Promise<Result>
+		connectOrCreate: (context: Context & { input: MapperInput.ConnectOrCreateInput } & { index: number; alias?: string }) => Promise<Result>
 	}
 }
 

package/src/inputProcessing/CreateInputVisitor.ts

@@ -1,9 +1,8 @@
-import { isIt } from '../utils'
+import { filterObject } from '../utils'
 import { Input, Model } from '@contember/schema'
 import { CreateInputProcessor } from './CreateInputProcessor'
-import { filterObject } from '../utils'
-import { UserError } from '../exception'
-import { ImplementationException } from '../exception'
+import { ImplementationException, UserError } from '../exception'
+import { MapperInput } from '../mapper'
 
 export class CreateInputVisitor<Result> implements
 	Model.ColumnVisitor<Promise<Result[]>>,
@@ -12,7 +11,7 @@ export class CreateInputVisitor<Result> implements
 	constructor(
 		private readonly createInputProcessor: CreateInputProcessor<Result>,
 		private readonly schema: Model.Schema,
-		private readonly data: Input.CreateDataInput,
+		private readonly data: MapperInput.CreateDataInput,
 	) {}
 
 	public async visitColumn(context: Model.ColumnContext): Promise<Result[]> {
@@ -26,7 +25,7 @@ export class CreateInputVisitor<Result> implements
 		return this.processManyRelationInput(
 			this.createInputProcessor.manyHasManyInverse,
 			context,
-			this.data[context.relation.name] as Input.CreateManyRelationInput,
+			this.data[context.relation.name] as MapperInput.CreateManyRelationInput,
 		)
 	}
 
@@ -34,7 +33,7 @@ export class CreateInputVisitor<Result> implements
 		return this.processManyRelationInput(
 			this.createInputProcessor.manyHasManyOwning,
 			context,
-			this.data[context.relation.name] as Input.CreateManyRelationInput,
+			this.data[context.relation.name] as MapperInput.CreateManyRelationInput,
 		)
 	}
 
@@ -42,7 +41,7 @@ export class CreateInputVisitor<Result> implements
 		return this.processRelationInput(
 			this.createInputProcessor.manyHasOne,
 			context,
-			this.data[context.relation.name] as Input.CreateOneRelationInput,
+			this.data[context.relation.name] as MapperInput.CreateOneRelationInput,
 		)
 	}
 
@@ -50,7 +49,7 @@ export class CreateInputVisitor<Result> implements
 		return this.processManyRelationInput(
 			this.createInputProcessor.oneHasMany,
 			context,
-			this.data[context.relation.name] as Input.CreateManyRelationInput,
+			this.data[context.relation.name] as MapperInput.CreateManyRelationInput,
 		)
 	}
 
@@ -58,7 +57,7 @@ export class CreateInputVisitor<Result> implements
 		return this.processRelationInput(
 			this.createInputProcessor.oneHasOneInverse,
 			context,
-			this.data[context.relation.name] as Input.CreateOneRelationInput,
+			this.data[context.relation.name] as MapperInput.CreateOneRelationInput,
 		)
 	}
 
@@ -66,14 +65,14 @@ export class CreateInputVisitor<Result> implements
 		return this.processRelationInput(
 			this.createInputProcessor.oneHasOneOwning,
 			context,
-			this.data[context.relation.name] as Input.CreateOneRelationInput,
+			this.data[context.relation.name] as MapperInput.CreateOneRelationInput,
 		)
 	}
 
 	private async processRelationInput<Context>(
 		processor: CreateInputProcessor.HasOneRelationProcessor<Context, Result>,
 		context: Context,
-		input: Input.CreateOneRelationInput | undefined,
+		input: MapperInput.CreateOneRelationInput | undefined,
 	): Promise<Result[]> {
 		if (input === undefined || input === null) {
 			if (processor.nothing) {
@@ -83,13 +82,13 @@ export class CreateInputVisitor<Result> implements
 		}
 		input = filterObject(input, (k, v) => v !== null && v !== undefined)
 		this.verifyOperations(input)
-		if (isIt<Input.ConnectRelationInput>(input, 'connect')) {
+		if ('connect' in input) {
 			return [await processor.connect({ ...context, input: input.connect })]
 		}
-		if (isIt<Input.CreateRelationInput>(input, 'create')) {
+		if ('create' in input) {
 			return [await processor.create({ ...context, input: input.create })]
 		}
-		if (isIt<Input.ConnectOrCreateRelationInput>(input, 'connectOrCreate')) {
+		if ('connectOrCreate' in input) {
 			return [await processor.connectOrCreate({ ...context, input: input.connectOrCreate })]
 		}
 		throw new ImplementationException()
@@ -98,7 +97,7 @@ export class CreateInputVisitor<Result> implements
 	private async processManyRelationInput<Context>(
 		processor: CreateInputProcessor.HasManyRelationProcessor<Context, Result>,
 		context: Context,
-		input: Input.CreateManyRelationInput | undefined,
+		input: MapperInput.CreateManyRelationInput | undefined,
 	): Promise<Result[]> {
 		if (input === undefined || input === null) {
 			return Promise.resolve([])
@@ -110,13 +109,13 @@ export class CreateInputVisitor<Result> implements
 			element = filterObject(element, (k, v) => v !== null && v !== undefined)
 			this.verifyOperations(element)
 			let result
-			if (isIt<Input.ConnectRelationInput>(element, 'connect')) {
+			if ('connect' in element) {
 				result = processor.connect({ ...context, input: element.connect, index: i++, alias })
 			}
-			if (isIt<Input.CreateRelationInput>(element, 'create')) {
+			if ('create' in element) {
 				result = processor.create({ ...context, input: element.create, index: i++, alias })
 			}
-			if (isIt<Input.ConnectOrCreateRelationInput>(element, 'connectOrCreate')) {
+			if ('connectOrCreate' in element) {
 				result = processor.connectOrCreate({ ...context, input: element.connectOrCreate, index: i++, alias })
 			}
 			if (result !== undefined) {

package/src/inputProcessing/UpdateInputProcessor.ts

@@ -1,4 +1,6 @@
 import { Input, Model } from '@contember/schema'
+import { CheckedPrimary } from '../mapper/CheckedPrimary'
+import { MapperInput } from '../mapper'
 
 
 interface UpdateInputProcessor<Result = void> {
@@ -18,22 +20,22 @@ interface UpdateInputProcessor<Result = void> {
 }
 
 namespace UpdateInputProcessor {
-	export type UpsertInput = { update: Input.UpdateDataInput; create: Input.CreateDataInput }
-	export type UpdateManyInput = { where: Input.UniqueWhere; data: Input.UpdateDataInput }
+	export type UpsertInput = { update: MapperInput.UpdateDataInput; create: MapperInput.CreateDataInput }
+	export type UpdateManyInput = { where: Input.UniqueWhere; data: MapperInput.UpdateDataInput }
 	export type UpsertManyInput = {
 		where: Input.UniqueWhere
-		update: Input.UpdateDataInput
-		create: Input.CreateDataInput
+		update: MapperInput.UpdateDataInput
+		create: MapperInput.CreateDataInput
 	}
 
 	export interface HasOneRelationInputProcessor<Context, Result> {
-		connect(context: Context & { input: Input.UniqueWhere }): Promise<Result>
+		connect(context: Context & { input: Input.UniqueWhere | CheckedPrimary }): Promise<Result>
 
-		create(context: Context & { input: Input.CreateDataInput }): Promise<Result>
+		create(context: Context & { input: MapperInput.CreateDataInput }): Promise<Result>
 
-		connectOrCreate(context: Context & { input: Input.ConnectOrCreateInput }): Promise<Result>
+		connectOrCreate(context: Context & { input: MapperInput.ConnectOrCreateInput }): Promise<Result>
 
-		update(context: Context & { input: Input.UpdateDataInput }): Promise<Result>
+		update(context: Context & { input: MapperInput.UpdateDataInput }): Promise<Result>
 
 		upsert(context: Context & { input: UpdateInputProcessor.UpsertInput }): Promise<Result>
 
@@ -43,11 +45,11 @@ namespace UpdateInputProcessor {
 	}
 
 	export interface HasManyRelationInputProcessor<Context, Result> {
-		connect(context: Context & { input: Input.UniqueWhere; index: number; alias?: string }): Promise<Result>
+		connect(context: Context & { input: Input.UniqueWhere | CheckedPrimary; index: number; alias?: string }): Promise<Result>
 
-		create(context: Context & { input: Input.CreateDataInput; index: number; alias?: string }): Promise<Result>
+		create(context: Context & { input: MapperInput.CreateDataInput; index: number; alias?: string }): Promise<Result>
 
-		connectOrCreate(context: Context & { input: Input.ConnectOrCreateInput; index: number; alias?: string }): Promise<Result>
+		connectOrCreate(context: Context & { input: MapperInput.ConnectOrCreateInput; index: number; alias?: string }): Promise<Result>
 
 		update(context: Context & { input: UpdateInputProcessor.UpdateManyInput; index: number; alias?: string }): Promise<Result>
 

package/src/inputProcessing/UpdateInputVisitor.ts

@@ -1,7 +1,8 @@
 import { Input, Model } from '@contember/schema'
-import { filterObject, isIt } from '../utils'
+import { filterObject } from '../utils'
 import { UpdateInputProcessor } from './UpdateInputProcessor'
 import { ImplementationException, UserError } from '../exception'
+import { MapperInput } from '../mapper'
 
 export class UpdateInputVisitor<Result> implements
 	Model.ColumnVisitor<Promise<Result[]>>,
@@ -10,7 +11,7 @@ export class UpdateInputVisitor<Result> implements
 	constructor(
 		private readonly updateInputProcessor: UpdateInputProcessor<Result>,
 		private readonly schema: Model.Schema,
-		private readonly data: Input.UpdateDataInput,
+		private readonly data: MapperInput.UpdateDataInput,
 	) {}
 
 	public async visitColumn({ entity, column }: Model.ColumnContext): Promise<Result[]> {
@@ -25,7 +26,7 @@ export class UpdateInputVisitor<Result> implements
 		return this.processManyRelationInput(
 			this.updateInputProcessor.manyHasManyInverse,
 			context,
-			this.data[context.relation.name] as Input.CreateManyRelationInput,
+			this.data[context.relation.name] as MapperInput.CreateManyRelationInput,
 		)
 	}
 
@@ -33,7 +34,7 @@ export class UpdateInputVisitor<Result> implements
 		return this.processManyRelationInput(
 			this.updateInputProcessor.manyHasManyOwning,
 			context,
-			this.data[context.relation.name] as Input.CreateManyRelationInput,
+			this.data[context.relation.name] as MapperInput.CreateManyRelationInput,
 		)
 	}
 
@@ -41,7 +42,7 @@ export class UpdateInputVisitor<Result> implements
 		return this.processRelationInput(
 			this.updateInputProcessor.manyHasOne,
 			context,
-			this.data[context.relation.name] as Input.CreateOneRelationInput,
+			this.data[context.relation.name] as MapperInput.CreateOneRelationInput,
 		)
 	}
 
@@ -49,7 +50,7 @@ export class UpdateInputVisitor<Result> implements
 		return this.processManyRelationInput(
 			this.updateInputProcessor.oneHasMany,
 			context,
-			this.data[context.relation.name] as Input.CreateManyRelationInput,
+			this.data[context.relation.name] as MapperInput.CreateManyRelationInput,
 		)
 	}
 
@@ -57,7 +58,7 @@ export class UpdateInputVisitor<Result> implements
 		return this.processRelationInput(
 			this.updateInputProcessor.oneHasOneInverse,
 			context,
-			this.data[context.relation.name] as Input.CreateOneRelationInput,
+			this.data[context.relation.name] as MapperInput.CreateOneRelationInput,
 		)
 	}
 
@@ -65,39 +66,39 @@ export class UpdateInputVisitor<Result> implements
 		return this.processRelationInput(
 			this.updateInputProcessor.oneHasOneOwning,
 			context,
-			this.data[context.relation.name] as Input.CreateOneRelationInput,
+			this.data[context.relation.name] as MapperInput.CreateOneRelationInput,
 		)
 	}
 
 	private async processRelationInput<Context>(
 		processor: UpdateInputProcessor.HasOneRelationInputProcessor<Context, Result>,
 		context: Context,
-		input: Input.UpdateOneRelationInput | undefined,
+		input: MapperInput.UpdateOneRelationInput | undefined,
 	): Promise< Result[]> {
 		if (input === undefined || input === null) {
 			return Promise.resolve([])
 		}
 		input = filterObject(input, (k, v) => v !== null && v !== undefined)
 		this.verifyOperations(input)
-		if (isIt<Input.ConnectRelationInput>(input, 'connect')) {
+		if ('connect' in input) {
 			return [await processor.connect({ ...context, input: input.connect })]
 		}
-		if (isIt<Input.CreateRelationInput>(input, 'create')) {
+		if ('create' in input) {
 			return [await processor.create({ ...context, input: input.create })]
 		}
-		if (isIt<Input.ConnectOrCreateRelationInput>(input, 'connectOrCreate')) {
+		if ('connectOrCreate' in input) {
 			return [await processor.connectOrCreate({ ...context, input: input.connectOrCreate })]
 		}
-		if (isIt<Input.DeleteRelationInput>(input, 'delete')) {
+		if ('delete' in input) {
 			return [await processor.delete({ ...context, input: undefined })]
 		}
-		if (isIt<Input.DisconnectRelationInput>(input, 'disconnect')) {
+		if ('disconnect' in input) {
 			return [await processor.disconnect({ ...context, input: undefined })]
 		}
-		if (isIt<Input.UpdateRelationInput>(input, 'update')) {
+		if ('update' in input) {
 			return [await processor.update({ ...context, input: input.update })]
 		}
-		if (isIt<Input.UpsertRelationInput>(input, 'upsert')) {
+		if ('upsert' in input) {
 			return [await processor.upsert({ ...context, input: input.upsert })]
 		}
 		throw new ImplementationException()
@@ -106,7 +107,7 @@ export class UpdateInputVisitor<Result> implements
 	private async processManyRelationInput<Context>(
 		processor: UpdateInputProcessor.HasManyRelationInputProcessor<Context, Result>,
 		context: Context,
-		input: Input.UpdateManyRelationInput | undefined,
+		input: MapperInput.UpdateManyRelationInput | undefined,
 	): Promise<Result[]> {
 		if (input === undefined || input === null) {
 			return Promise.resolve([])
@@ -118,22 +119,22 @@ export class UpdateInputVisitor<Result> implements
 			element = filterObject(element, (k, v) => v !== null && v !== undefined)
 			this.verifyOperations(element)
 			let result
-			if (isIt<Input.ConnectRelationInput>(element, 'connect')) {
+			if ('connect' in element) {
 				result = processor.connect({ ...context, input: element.connect, index: i, alias })
 			}
-			if (isIt<Input.CreateRelationInput>(element, 'create')) {
+			if ('create' in element) {
 				result = processor.create({ ...context, input: element.create, index: i, alias })
 			}
-			if (isIt<Input.ConnectOrCreateRelationInput>(element, 'connectOrCreate')) {
+			if ('connectOrCreate' in element) {
 				result = processor.connectOrCreate({ ...context, input: element.connectOrCreate, index: i, alias })
 			}
-			if (isIt<Input.DeleteSpecifiedRelationInput>(element, 'delete')) {
+			if ('delete' in element) {
 				result = processor.delete({ ...context, input: element.delete, index: i, alias })
 			}
-			if (isIt<Input.DisconnectSpecifiedRelationInput>(element, 'disconnect')) {
+			if ('disconnect' in element) {
 				result = processor.disconnect({ ...context, input: element.disconnect, index: i, alias })
 			}
-			if (isIt<Input.UpdateSpecifiedRelationInput>(element, 'update')) {
+			if ('update' in element) {
 				result = processor.update({
 					...context,
 					input: { where: element.update.by, data: element.update.data },
@@ -141,7 +142,7 @@ export class UpdateInputVisitor<Result> implements
 					alias,
 				})
 			}
-			if (isIt<Input.UpsertSpecifiedRelationInput>(element, 'upsert')) {
+			if ('upsert' in element) {
 				result = processor.upsert({
 					...context,
 					input: { where: element.upsert.by, update: element.upsert.update, create: element.upsert.create },

package/src/mapper/ColumnValue.ts

@@ -1,36 +1,22 @@
 import { Value } from '@contember/schema'
-import { getFulfilledValues, getRejections } from '../utils'
 
-export type ColumnValue<E = never> = {
-	value: PromiseLike<Value.FieldValue<E> | undefined>
+export type ColumnValue = {
+	value: Value.FieldValue
 	fieldName: string
 	columnName: string
 	columnType: string
 }
 
-export type ResolvedColumnValue<E = never> = ColumnValue<E> & {
-	resolvedValue: Value.FieldValue<E>
-}
 
-export const resolveGenericValue = <T>(value: Value.GenericValueLike<T>): Promise<T> => {
-	if (value instanceof Function) {
-		value = value()
-	}
-	return Promise.resolve(value)
-}
+export const rowDataToFieldValues = (values: ColumnValue[]): Record<string, Value.FieldValue> =>
+	Object.fromEntries(values.map(it => [it.fieldName, it.value]))
 
-export const resolveRowData = async <E>(
-	values: ColumnValue<E>[],
-): Promise<ResolvedColumnValue<Exclude<E, undefined>>[]> => {
-	const valuePromises = values.map(async (it): Promise<ResolvedColumnValue<E | undefined>> => ({ ...it, resolvedValue: await it.value }))
-	const settledValues = await Promise.allSettled(valuePromises)
-	const failed = getRejections(settledValues)
-	if (failed.length > 0) {
-		throw failed[0]
+export const normalizeDbValue = (value: Value.FieldValue, type: string): Value.FieldValue => {
+	if (value === null) {
+		return null
 	}
-	const fulfilled = getFulfilledValues(settledValues)
-	return fulfilled.filter((it): it is ResolvedColumnValue<Exclude<E, undefined>> => it.resolvedValue !== undefined)
+	if ((type === 'jsonb' || type === 'json') && typeof value === 'object') {
+		return JSON.stringify(value)
+	}
+	return value
 }
-
-export const rowDataToFieldValues = (values: ResolvedColumnValue[]): Record<string, Value.AtomicValue> =>
-	values.reduce((acc, { fieldName, value }) => ({ ...acc, [fieldName]: value }), {})