@contember/client-content 2.1.0-alpha.8 → 2.1.0-beta.1

package/src/ContentClient.ts

@@ -4,10 +4,10 @@ import { GraphQlQueryPrinter } from '@contember/graphql-builder'
 import { ContentMutation, ContentQuery } from './nodes'
 import { createMutationOperationSet } from './utils/createMutationOperationSet'
 import { createQueryOperationSet } from './utils/createQueryOperationSet'
+import { MutationError, ValidationResult } from './types'
+import { MutationFailedError } from './MutationFailedError'
 
-
-export type QueryExecutorOptions =
-	& GraphQlClientRequestOptions
+export type QueryExecutorOptions = GraphQlClientRequestOptions
 
 export class ContentClient {
 	constructor(
@@ -15,9 +15,11 @@ export class ContentClient {
 	) {
 	}
 
-
 	public async query<Value>(query: ContentQuery<Value>, options?: QueryExecutorOptions): Promise<Value>
-	public async query<Values extends Record<string, any>>(queries: {[K in keyof Values]: ContentQuery<Values[K]>}, options?: QueryExecutorOptions): Promise<Values>
+	public async query<Values extends Record<string, any>>(
+		queries: { [K in keyof Values]: ContentQuery<Values[K]> },
+		options?: QueryExecutorOptions,
+	): Promise<Values>
 	public async query(queries: Record<string, ContentQuery<any>> | ContentQuery<any>, options?: QueryExecutorOptions): Promise<any> {
 		const printer = new GraphQlQueryPrinter()
 		const operationSet = createQueryOperationSet(queries)
@@ -26,10 +28,16 @@ export class ContentClient {
 		return operationSet.parse(result)
 	}
 
-	public async mutate<Value>(mutation: ContentMutation<Value>, options?: QueryExecutorOptions,): Promise<Value>
-	public async mutate<Value>(mutations: ContentMutation<Value>[], options?: QueryExecutorOptions,): Promise<Value[]>
-	public async mutate<Values extends Record<string, any>>(mutations: { [K in keyof Values]: ContentMutation<Values[K]> | ContentQuery<Values[K]> }, options?: QueryExecutorOptions): Promise<Values>
-	public async mutate(input: Record<string, ContentMutation<any> | ContentQuery<any>> | ContentMutation<any> | ContentMutation<any>[], options?: QueryExecutorOptions): Promise<any> {
+	public async mutate<Value>(mutation: ContentMutation<Value>, options?: QueryExecutorOptions): Promise<Value>
+	public async mutate<Value>(mutations: ContentMutation<Value>[], options?: QueryExecutorOptions): Promise<Value[]>
+	public async mutate<Values extends Record<string, any>>(
+		mutations: { [K in keyof Values]: ContentMutation<Values[K]> | ContentQuery<Values[K]> },
+		options?: QueryExecutorOptions,
+	): Promise<Values>
+	public async mutate(
+		input: Record<string, ContentMutation<any> | ContentQuery<any>> | ContentMutation<any> | ContentMutation<any>[],
+		options?: QueryExecutorOptions,
+	): Promise<any> {
 		const operationSet = createMutationOperationSet(input)
 
 		const printer = new GraphQlQueryPrinter()
@@ -38,4 +46,23 @@ export class ContentClient {
 
 		return operationSet.parse(result)
 	}
+
+	public async mutateOrThrow<
+		Value extends {
+			readonly ok: boolean
+			readonly errorMessage: string | null
+			readonly errors: MutationError[]
+			readonly validation: ValidationResult
+		},
+	>(mutation: ContentMutation<Value>, options?: QueryExecutorOptions): Promise<Value & { readonly ok: true; readonly errorMessage: null }> {
+		const result = await this.mutate(mutation, options)
+		if (!result.ok) {
+			throw new MutationFailedError(
+				result.errorMessage ?? 'Unknown error',
+				mutation as ContentMutation<Value & { readonly ok: false; readonly errorMessage: string }>,
+				result as Value & { readonly ok: false; readonly errorMessage: string },
+			)
+		}
+		return result as Value & { readonly ok: true; readonly errorMessage: null }
+	}
 }

package/src/ContentQueryBuilder.ts

@@ -1,5 +1,12 @@
 import { ContentClientInput, MutationResult, SchemaNames, TransactionResult } from './types'
-import { ContentEntitySelection, ContentEntitySelectionCallback, ContentEntitySelectionContext, ContentMutation, ContentOperation, ContentQuery } from './nodes'
+import {
+	ContentEntitySelection,
+	ContentEntitySelectionCallback,
+	ContentEntitySelectionContext,
+	ContentMutation,
+	ContentOperation,
+	ContentQuery,
+} from './nodes'
 import { createListArgs } from './utils/createListArgs'
 import { createTypedArgs } from './utils/createTypedArgs'
 import { Input } from '@contember/schema'
@@ -21,7 +28,6 @@ export class ContentQueryBuilder {
 	constructor(private readonly schema: SchemaNames) {
 	}
 
-
 	public fragment(name: string, fieldsCallback?: ContentEntitySelectionCallback): ContentEntitySelection {
 		const context = this.createContext(name)
 
@@ -32,8 +38,6 @@ export class ContentQueryBuilder {
 		return fieldsCallback(entitySelection)
 	}
 
-
-
 	public count(name: string, args: Pick<ContentClientInput.AnyListQueryInput, 'filter'>): ContentQuery<number> {
 		const context = this.createContext(name)
 		const fieldName = `paginate${name}`
@@ -51,7 +55,6 @@ export class ContentQueryBuilder {
 		})
 	}
 
-
 	public list(name: string, args: ContentClientInput.AnyListQueryInput, fields: EntitySelectionOrCallback): ContentQuery<any[]> {
 		const context = this.createContext(name)
 		const fieldName = `list${name}`
@@ -59,17 +62,19 @@ export class ContentQueryBuilder {
 		const selection = this.resolveSelection(fields, context)
 
 		return new ContentOperation('query', fieldName, typedArgs, selection.selectionSet, it => {
+			if (!it) return it
 			const transformFn = selection.transformFn
 			if (transformFn) {
-				return it.map((el: any) => transformFn(el, {
-					rootValue: it,
-				}))
+				return it.map((el: any) =>
+					transformFn(el, {
+						rootValue: it,
+					})
+				)
 			}
 			return it
 		})
 	}
 
-
 	public get(name: string, args: Input.UniqueQueryInput, fields: EntitySelectionOrCallback): ContentQuery<Record<string, unknown> | null> {
 		const context = this.createContext(name)
 		const fieldName = `get${name}`
@@ -89,9 +94,7 @@ export class ContentQueryBuilder {
 		})
 	}
 
-
 	public create(name: string, args: Input.CreateInput, fields?: EntitySelectionOrCallback): ContentMutation<MutationResult> {
-
 		const entity = this.getEntity(name)
 		const typedArgs = createTypedArgs(args, {
 			data: `${entity.name}CreateInput!`,
@@ -101,7 +104,6 @@ export class ContentQueryBuilder {
 	}
 
 	public update(name: string, args: Input.UpdateInput, fields?: EntitySelectionOrCallback): ContentMutation<MutationResult> {
-
 		const entity = this.getEntity(name)
 		const typedArgs = createTypedArgs(args, {
 			data: `${entity.name}UpdateInput!`,
@@ -111,9 +113,7 @@ export class ContentQueryBuilder {
 		return this.createMutationOperation(name, 'update', typedArgs, fields)
 	}
 
-
 	public upsert(name: string, args: Input.UpsertInput, fields?: EntitySelectionOrCallback): ContentMutation<MutationResult> {
-
 		const entity = this.getEntity(name)
 		const typedArgs = createTypedArgs(args, {
 			update: `${entity.name}UpdateInput!`,
@@ -124,9 +124,7 @@ export class ContentQueryBuilder {
 		return this.createMutationOperation(name, 'upsert', typedArgs, fields)
 	}
 
-
 	public delete(name: string, args: Input.UniqueQueryInput, fields?: EntitySelectionOrCallback): ContentMutation<MutationResult> {
-
 		const entity = this.getEntity(name)
 		const typedArgs = createTypedArgs(args, {
 			by: `${entity.name}UniqueWhere!`,
@@ -135,9 +133,12 @@ export class ContentQueryBuilder {
 		return this.createMutationOperation(name, 'delete', typedArgs, fields)
 	}
 
-
-	private createMutationOperation(name: string, operation: MutationOperation, args: GraphQlFieldTypedArgs, fields?: EntitySelectionOrCallback): ContentMutation<MutationResult> {
-
+	private createMutationOperation(
+		name: string,
+		operation: MutationOperation,
+		args: GraphQlFieldTypedArgs,
+		fields?: EntitySelectionOrCallback,
+	): ContentMutation<MutationResult> {
 		const context = this.createContext(name)
 		const fieldName = `${operation}${name}`
 		const nodeSelection = fields ? this.resolveSelection(fields, context) : undefined
@@ -149,9 +150,11 @@ export class ContentQueryBuilder {
 			}
 			return {
 				...it,
-				node: it.node ? nodeSelection.transformFn(it.node, {
-					rootValue: it.node,
-				}) : null,
+				node: it.node
+					? nodeSelection.transformFn(it.node, {
+						rootValue: it.node,
+					})
+					: null,
 			}
 		})
 	}
@@ -169,15 +172,21 @@ export class ContentQueryBuilder {
 			...this.createMutationSelection('transaction'),
 			...combined.selection,
 		]
-		return new ContentOperation<TransactionResult<any>, 'mutation'>('mutation', 'transaction', transactionArgs, items, ({ ok, errorMessage, errors, validation, ...data }) => {
-			return {
-				ok,
-				errorMessage,
-				errors,
-				validation,
-				data: combined.parse(data),
-			}
-		})
+		return new ContentOperation<TransactionResult<any>, 'mutation'>(
+			'mutation',
+			'transaction',
+			transactionArgs,
+			items,
+			({ ok, errorMessage, errors, validation, ...data }) => {
+				return {
+					ok,
+					errorMessage,
+					errors,
+					validation,
+					data: combined.parse(data),
+				}
+			},
+		)
 	}
 
 	private createMutationSelection(operation: MutationOperation, selection?: GraphQlSelectionSet): GraphQlSelectionSet {
@@ -189,9 +198,11 @@ export class ContentQueryBuilder {
 			]),
 		]
 		if (operation !== 'delete') {
-			items.push(new GraphQlField(null, 'validation', {}, [
-				new GraphQlFragmentSpread('ValidationResult'),
-			]))
+			items.push(
+				new GraphQlField(null, 'validation', {}, [
+					new GraphQlFragmentSpread('ValidationResult'),
+				]),
+			)
 		}
 		if (selection) {
 			items.push(new GraphQlField(null, 'node', {}, selection))
@@ -199,7 +210,6 @@ export class ContentQueryBuilder {
 		return items
 	}
 
-
 	private resolveSelection(
 		fields: EntitySelectionOrCallback,
 		context: ContentEntitySelectionContext<string>,

package/src/MutationFailedError.ts

@@ -0,0 +1,19 @@
+import { MutationError, ValidationResult } from './types'
+import { ContentMutation } from './nodes'
+
+export class MutationFailedError<
+	Value extends {
+		readonly ok: false
+		readonly errorMessage: string
+		readonly errors: MutationError[]
+		readonly validation: ValidationResult
+	},
+> extends Error {
+	constructor(
+		message: string,
+		public readonly request: ContentMutation<Value>,
+		public readonly result: Value,
+	) {
+		super(message)
+	}
+}

package/src/TypedContentQueryBuilder.ts

@@ -2,14 +2,11 @@ import { ContentClientInput, MutationResult, SchemaTypeLike, TransactionResult }
 import { ContentMutation, ContentQuery, TypedEntitySelection, TypedEntitySelectionCallback } from './nodes'
 import { MutationTransactionOptions } from './ContentQueryBuilder'
 
-
 export type TypedContentEntitySelectionOrCallback<TSchema extends SchemaTypeLike, TEntityName extends keyof TSchema['entities'] & string, TValue> =
 	| TypedEntitySelection<TSchema, TEntityName, TSchema['entities'][TEntityName], TValue>
 	| TypedEntitySelectionCallback<TSchema, TEntityName, TSchema['entities'][TEntityName], TValue>
 
-
 export interface TypedContentQueryBuilder<TSchema extends SchemaTypeLike> {
-
 	fragment<EntityName extends keyof TSchema['entities'] & string>(
 		name: EntityName,
 	): TypedEntitySelection<TSchema, EntityName, TSchema['entities'][EntityName], {}>
@@ -73,4 +70,3 @@ export interface TypedContentQueryBuilder<TSchema extends SchemaTypeLike> {
 		options?: MutationTransactionOptions,
 	): ContentMutation<TransactionResult<Values>>
 }
-

package/src/nodes/ContentEntitySelection.ts

@@ -14,8 +14,13 @@ export type ContentEntitySelectionContext<Name extends string> = {
 export type ContentEntitySelectionCallback = (select: ContentEntitySelection) => ContentEntitySelection
 
 export type EntitySelectionCommonInput<Alias extends string | null = string | null> = { as?: Alias }
-export type EntitySelectionManyArgs<Alias extends string | null = string | null> = ContentClientInput.AnyListQueryInput & EntitySelectionCommonInput<Alias>
-export type EntitySelectionManyByArgs<Alias extends string | null = string | null> = { by: Input.UniqueWhere; filter?: Input.Where } & EntitySelectionCommonInput<Alias>
+export type EntitySelectionManyArgs<Alias extends string | null = string | null> =
+	& ContentClientInput.AnyListQueryInput
+	& EntitySelectionCommonInput<Alias>
+	& { totalCount?: boolean }
+export type EntitySelectionManyByArgs<Alias extends string | null = string | null> =
+	& { by: Input.UniqueWhere; filter?: Input.Where }
+	& EntitySelectionCommonInput<Alias>
 export type EntitySelectionOneArgs<Alias extends string | null = string | null> = { filter?: Input.Where } & EntitySelectionCommonInput<Alias>
 export type EntitySelectionColumnArgs<Alias extends string | null = string | null> = EntitySelectionCommonInput<Alias>
 
@@ -27,13 +32,11 @@ export type EntitySelectionAnyArgs =
 
 export type ContentEntitySelectionOrCallback = ContentEntitySelectionCallback | ContentEntitySelection
 
-
 export type ContentTransformContext = {
 	rootValue: unknown
 }
 
 export class ContentEntitySelection {
-
 	/**
 	 * @internal
 	 */
@@ -47,14 +50,17 @@ export class ContentEntitySelection {
 	) {
 	}
 
-
 	$(field: string, args?: EntitySelectionColumnArgs): ContentEntitySelection
 	$(field: string, args: EntitySelectionManyArgs, selection: ContentEntitySelectionOrCallback): ContentEntitySelection
 	$(field: string, args: EntitySelectionManyByArgs, selection: ContentEntitySelectionOrCallback): ContentEntitySelection
 	$(field: string, args: EntitySelectionOneArgs, selection: ContentEntitySelectionOrCallback): ContentEntitySelection
 	$(field: string, selection: ContentEntitySelectionOrCallback): ContentEntitySelection
 
-	$(field: string, argsOrSelection?: EntitySelectionAnyArgs | ContentEntitySelectionOrCallback, selectionIn?: ContentEntitySelectionOrCallback): ContentEntitySelection {
+	$(
+		field: string,
+		argsOrSelection?: EntitySelectionAnyArgs | ContentEntitySelectionOrCallback,
+		selectionIn?: ContentEntitySelectionOrCallback,
+	): ContentEntitySelection {
 		const [args, selection] = typeof argsOrSelection === 'function' || argsOrSelection instanceof ContentEntitySelection
 			? [{}, argsOrSelection]
 			: [argsOrSelection ?? {}, selectionIn]
@@ -99,6 +105,19 @@ export class ContentEntitySelection {
 		return new ContentEntitySelection(this.context, nodes)
 	}
 
+	omit(...fields: string[]): ContentEntitySelection {
+		return new ContentEntitySelection(
+			this.context,
+			this.selectionSet.filter(it => {
+				if (!(it instanceof GraphQlField)) {
+					return true
+				}
+				const alias = it.alias ?? it.name
+				return !fields.includes(alias)
+			}),
+		)
+	}
+
 	meta(field: string, flags: ('readable' | 'updatable')[]): ContentEntitySelection {
 		const metaField = this.selectionSet.find((it): it is GraphQlField => it instanceof GraphQlField && it.name === '_meta')
 		const selectionWithoutMeta = metaField ? this.selectionSet.filter(it => it !== metaField) : this.selectionSet
@@ -117,11 +136,14 @@ export class ContentEntitySelection {
 		])
 	}
 
-
 	transform(transform: (value: any, context: ContentTransformContext) => any): ContentEntitySelection {
-		return new ContentEntitySelection(this.context, this.selectionSet, !this.transformFn ? transform : (value, ctx) => {
-			return transform(this.transformFn!(value, ctx), ctx)
-		})
+		return new ContentEntitySelection(
+			this.context,
+			this.selectionSet,
+			!this.transformFn ? transform : (value, ctx) => {
+				return transform(this.transformFn!(value, ctx), ctx)
+			},
+		)
 	}
 
 	private _column(
@@ -142,14 +164,13 @@ export class ContentEntitySelection {
 		return this.withField(field)
 	}
 
-
 	private _many(
 		name: string,
 		args: EntitySelectionManyArgs,
 		fields:
 			| ContentEntitySelectionCallback
 			| ContentEntitySelection,
-	): ContentEntitySelection{
+	): ContentEntitySelection {
 		const alias = args.as ?? name
 		const fieldInfo = this.context.entity.fields[name]
 		if (!fieldInfo) {
@@ -166,20 +187,44 @@ export class ContentEntitySelection {
 		}
 
 		const entitySelection = typeof fields === 'function' ? fields(new ContentEntitySelection(newContext, [])) : fields
+
+		// Always use paginateRelation API (relay-like Connection format)
+		const paginateFieldName = `paginate${name.charAt(0).toUpperCase()}${name.slice(1)}`
+		const paginateSelectionSet: GraphQlSelectionSet = [
+			...(args.totalCount
+				? [
+					new GraphQlField(null, 'pageInfo', {}, [
+						new GraphQlField(null, 'totalCount'),
+					]),
+				]
+				: []),
+			new GraphQlField(null, 'edges', {}, [
+				new GraphQlField(null, 'node', {}, entitySelection.selectionSet),
+			]),
+		]
 		const newObjectField = new GraphQlField(
 			alias,
-			name,
-			createListArgs(entity, args),
-			entitySelection.selectionSet,
+			paginateFieldName,
+			createListArgs(entity, args, 'paginate'),
+			paginateSelectionSet,
 		)
 		const selectionWithField = this.withField(newObjectField)
+		const includeTotalCount = args.totalCount ?? false
 		const nestedTransform = entitySelection.transformFn
-		if (!nestedTransform) {
-			return selectionWithField
-		}
-		return this.withFieldTransform(alias, it => it.map(nestedTransform))
-	}
 
+		// Transform: unwrap Connection → flat array, optionally attach totalCount
+		return selectionWithField.withFieldTransform(alias, (connection, ctx) => {
+			const items = connection.edges.map((edge: any) => nestedTransform ? nestedTransform(edge.node, ctx) : edge.node)
+			if (includeTotalCount && connection.pageInfo) {
+				Object.defineProperty(items, 'totalCount', {
+					value: connection.pageInfo.totalCount,
+					enumerable: false,
+					writable: false,
+				})
+			}
+			return items
+		})
+	}
 
 	private _manyBy(
 		name: string,
@@ -229,7 +274,7 @@ export class ContentEntitySelection {
 		if (!nestedTransform) {
 			return selectionWithField
 		}
-		return this.withFieldTransform(alias, (it, ctx) => it !== null ? nestedTransform(it, ctx) : null)
+		return selectionWithField.withFieldTransform(alias, (it, ctx) => it !== null ? nestedTransform(it, ctx) : null)
 	}
 
 	private _one(
@@ -273,10 +318,9 @@ export class ContentEntitySelection {
 		if (!nestedTransform) {
 			return selectionWithField
 		}
-		return this.withFieldTransform(alias, (it, ctx) => it !== null ? nestedTransform(it, ctx) : null)
+		return selectionWithField.withFieldTransform(alias, (it, ctx) => it !== null ? nestedTransform(it, ctx) : null)
 	}
 
-
 	private withField(field: GraphQlField) {
 		return new ContentEntitySelection(this.context, [
 			...this.selectionSet,