@contember/client-content 2.1.0-alpha.30 → 2.1.0-alpha.35

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@contember/client-content",
   "license": "Apache-2.0",
-  "version": "2.1.0-alpha.30",
+  "version": "2.1.0-alpha.35",
   "main": "./dist/production/index.js",
   "exports": {
     ".": {
@@ -29,17 +29,17 @@
     "ae:test": "api-extractor run"
   },
   "dependencies": {
-    "@contember/graphql-builder": "2.1.0-alpha.30",
-    "@contember/graphql-client": "2.1.0-alpha.30",
-    "@contember/schema": "2.1.0-alpha.30"
+    "@contember/graphql-builder": "workspace:*",
+    "@contember/graphql-client": "workspace:*",
+    "@contember/schema": "workspace:*"
   },
   "devDependencies": {
-    "@contember/client-content-generator": "2.1.0-alpha.30",
+    "@contember/client-content-generator": "workspace:*",
     "expect-type": "^1.1.0"
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/contember/interface.git",
+    "url": "git+https://github.com/contember/contember.git",
     "directory": "packages/client-content"
   }
 }

package/src/ContentClient.ts

@@ -7,9 +7,7 @@ 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(
@@ -17,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)
@@ -28,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()
@@ -41,13 +47,14 @@ 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 }> {
+	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(

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}`
@@ -61,15 +64,16 @@ export class ContentQueryBuilder {
 		return new ContentOperation('query', fieldName, typedArgs, selection.selectionSet, 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 +93,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 +103,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 +112,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 +123,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 +132,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 +149,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 +171,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 +197,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 +209,6 @@ export class ContentQueryBuilder {
 		return items
 	}
 
-
 	private resolveSelection(
 		fields: EntitySelectionOrCallback,
 		context: ContentEntitySelectionContext<string>,

package/src/MutationFailedError.ts

@@ -1,12 +1,14 @@
 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 {
+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>,

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,12 @@ 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>
+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 +31,11 @@ export type EntitySelectionAnyArgs =
 
 export type ContentEntitySelectionOrCallback = ContentEntitySelectionCallback | ContentEntitySelection
 
-
 export type ContentTransformContext = {
 	rootValue: unknown
 }
 
 export class ContentEntitySelection {
-
 	/**
 	 * @internal
 	 */
@@ -47,14 +49,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]
@@ -130,11 +135,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(
@@ -155,14 +163,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) {
@@ -193,7 +200,6 @@ export class ContentEntitySelection {
 		return selectionWithField.withFieldTransform(alias, it => it.map(nestedTransform))
 	}
 
-
 	private _manyBy(
 		name: string,
 		args: EntitySelectionManyByArgs,
@@ -289,7 +295,6 @@ export class ContentEntitySelection {
 		return selectionWithField.withFieldTransform(alias, (it, ctx) => it !== null ? nestedTransform(it, ctx) : null)
 	}
 
-
 	private withField(field: GraphQlField) {
 		return new ContentEntitySelection(this.context, [
 			...this.selectionSet,

package/src/nodes/TypedEntitySelection.ts

@@ -2,42 +2,49 @@ import { EntityTypeLike, SchemaTypeLike } from '../types'
 import { ContentClientInput } from '../types'
 import { ContentEntitySelectionContext } from './ContentEntitySelection'
 
-
 export interface TypedEntitySelection<TSchema extends SchemaTypeLike, TEntityName extends string, TEntity extends EntityTypeLike, TValue> {
-
 	/** @internal */
 	readonly context: ContentEntitySelectionContext<TEntityName>
 
-	$$(): TypedEntitySelection<TSchema, TEntityName, TEntity, TValue & {
-		[key in keyof TEntity['columns']]: TEntity['columns'][key]
-	}>
-
+	$$(): TypedEntitySelection<
+		TSchema,
+		TEntityName,
+		TEntity,
+		& TValue
+		& {
+			[key in keyof TEntity['columns']]: TEntity['columns'][key]
+		}
+	>
 
 	transform<T>(cb: (value: TValue) => T): TypedEntitySelection<TSchema, TEntityName, TEntity, T>
 
 	$<
 		TNestedValue,
 		TKey extends (keyof TEntity['columns'] | keyof TEntity['hasMany'] | keyof TEntity['hasManyBy'] | keyof TEntity['hasOne']) & string,
-		TAlias extends string | null = null
+		TAlias extends string | null = null,
 	>(
 		name: TKey,
 		...args: TypedEntitySelectionParams<TSchema, TEntity, TKey, TNestedValue, TAlias>
-	): TypedEntitySelection<TSchema, TEntityName, TEntity, TValue & {
-		[key in TAlias extends null ? TKey : TAlias]: TypedEntitySelectionResult<TEntity, TKey, TNestedValue>
-	}>
+	): TypedEntitySelection<
+		TSchema,
+		TEntityName,
+		TEntity,
+		& TValue
+		& {
+			[key in TAlias extends null ? TKey : TAlias]: TypedEntitySelectionResult<TEntity, TKey, TNestedValue>
+		}
+	>
 
 	omit<TField extends keyof TValue>(
 		...fields: TField[]
 	): TypedEntitySelection<TSchema, TEntityName, TEntity, Omit<TValue, TField>>
 
-
 	meta<
-		TField extends (keyof TEntity['columns'] | keyof TEntity['hasMany'] | keyof TEntity['hasOne'])
+		TField extends (keyof TEntity['columns'] | keyof TEntity['hasMany'] | keyof TEntity['hasOne']),
 	>(
 		field: TField,
 		flags: ('readable' | 'updatable')[],
 	): TypedEntitySelection<TSchema, TEntityName, TEntity, TValue>
-
 }
 
 export type TypedEntitySelectionCallback<
@@ -47,75 +54,112 @@ export type TypedEntitySelectionCallback<
 	TValue,
 > = (select: TypedEntitySelection<TSchema, EntityName, TEntity, {}>) => TypedEntitySelection<TSchema, EntityName, TEntity, TValue>
 
-
 export type TypedHasManyArgs<TEntity extends EntityTypeLike, TKey extends keyof TEntity['hasMany'] & string, TAlias extends string | null = null> =
 	& ContentClientInput.HasManyRelationInput<TEntity['hasMany'][TKey]>
 	& { as?: TAlias }
 
-export type TypedHasManyFields<TSchema extends SchemaTypeLike, TEntity extends EntityTypeLike, TKey extends keyof TEntity['hasMany'] & string, TNestedValue> =
+export type TypedHasManyFields<
+	TSchema extends SchemaTypeLike,
+	TEntity extends EntityTypeLike,
+	TKey extends keyof TEntity['hasMany'] & string,
+	TNestedValue,
+> =
 	| TypedEntitySelectionCallback<TSchema, TEntity['hasMany'][TKey]['name'], TEntity['hasMany'][TKey], TNestedValue>
 	| TypedEntitySelection<TSchema, TEntity['hasMany'][TKey]['name'], TEntity['hasMany'][TKey], TNestedValue>
 
-export type TypedHasManyParams<TSchema extends SchemaTypeLike, TEntity extends EntityTypeLike, TKey extends keyof TEntity['hasMany'] & string, TNestedValue, TAlias extends string | null = null> =
+export type TypedHasManyParams<
+	TSchema extends SchemaTypeLike,
+	TEntity extends EntityTypeLike,
+	TKey extends keyof TEntity['hasMany'] & string,
+	TNestedValue,
+	TAlias extends string | null = null,
+> =
 	| [
-			args: TypedHasManyArgs<TEntity, TKey, TAlias>,
-			fields: TypedHasManyFields<TSchema, TEntity, TKey, TNestedValue>,
+		args: TypedHasManyArgs<TEntity, TKey, TAlias>,
+		fields: TypedHasManyFields<TSchema, TEntity, TKey, TNestedValue>,
 	]
 	| [
-			fields: TypedHasManyFields<TSchema, TEntity, TKey, TNestedValue>,
+		fields: TypedHasManyFields<TSchema, TEntity, TKey, TNestedValue>,
 	]
 
-
-export type TypedHasManyByArgs<TEntity extends EntityTypeLike, TKey extends keyof TEntity['hasManyBy'] & string, TAlias extends string | null = null> =
+export type TypedHasManyByArgs<
+	TEntity extends EntityTypeLike,
+	TKey extends keyof TEntity['hasManyBy'] & string,
+	TAlias extends string | null = null,
+> =
 	& ContentClientInput.HasManyByRelationInput<TEntity['hasManyBy'][TKey]['entity'], TEntity['hasManyBy'][TKey]['by']>
 	& { as?: TAlias }
 
-export type TypedHasManyByFields<TSchema extends SchemaTypeLike, TEntity extends EntityTypeLike, TKey extends keyof TEntity['hasManyBy'] & string, TNestedValue> =
+export type TypedHasManyByFields<
+	TSchema extends SchemaTypeLike,
+	TEntity extends EntityTypeLike,
+	TKey extends keyof TEntity['hasManyBy'] & string,
+	TNestedValue,
+> =
 	| TypedEntitySelectionCallback<TSchema, TEntity['hasManyBy'][TKey]['entity']['name'], TEntity['hasManyBy'][TKey]['entity'], TNestedValue>
 	| TypedEntitySelection<TSchema, TEntity['hasManyBy'][TKey]['entity']['name'], TEntity['hasManyBy'][TKey]['entity'], TNestedValue>
 
-export type TypedHasManyByParams<TSchema extends SchemaTypeLike, TEntity extends EntityTypeLike, TKey extends keyof TEntity['hasManyBy'] & string, TNestedValue, TAlias extends string | null = null> =
-	| [
-		args: TypedHasManyByArgs<TEntity, TKey, TAlias>,
-		fields: TypedHasManyByFields<TSchema, TEntity, TKey, TNestedValue>
-	]
-
+export type TypedHasManyByParams<
+	TSchema extends SchemaTypeLike,
+	TEntity extends EntityTypeLike,
+	TKey extends keyof TEntity['hasManyBy'] & string,
+	TNestedValue,
+	TAlias extends string | null = null,
+> = [
+	args: TypedHasManyByArgs<TEntity, TKey, TAlias>,
+	fields: TypedHasManyByFields<TSchema, TEntity, TKey, TNestedValue>,
+]
 
 export type TypedHasOneArgs<TEntity extends EntityTypeLike, TKey extends keyof TEntity['hasOne'] & string, TAlias extends string | null = null> =
 	& ContentClientInput.HasOneRelationInput<TEntity['hasOne'][TKey]>
 	& { as?: TAlias }
 
-export type TypedHasOneFields<TSchema extends SchemaTypeLike, TEntity extends EntityTypeLike, TKey extends keyof TEntity['hasOne'] & string, TNestedValue> =
+export type TypedHasOneFields<
+	TSchema extends SchemaTypeLike,
+	TEntity extends EntityTypeLike,
+	TKey extends keyof TEntity['hasOne'] & string,
+	TNestedValue,
+> =
 	| TypedEntitySelectionCallback<TSchema, TEntity['hasOne'][TKey]['name'], TEntity['hasOne'][TKey], TNestedValue>
 	| TypedEntitySelection<TSchema, TEntity['hasOne'][TKey]['name'], TEntity['hasOne'][TKey], TNestedValue>
 
-export type TypedHasOneParams<TSchema extends SchemaTypeLike, TEntity extends EntityTypeLike, TKey extends keyof TEntity['hasOne'] & string, TNestedValue, TAlias extends string | null = null> =
+export type TypedHasOneParams<
+	TSchema extends SchemaTypeLike,
+	TEntity extends EntityTypeLike,
+	TKey extends keyof TEntity['hasOne'] & string,
+	TNestedValue,
+	TAlias extends string | null = null,
+> =
 	| [
-			args: TypedHasOneArgs<TEntity, TKey, TAlias>,
-			fields: TypedHasOneFields<TSchema, TEntity, TKey, TNestedValue>
+		args: TypedHasOneArgs<TEntity, TKey, TAlias>,
+		fields: TypedHasOneFields<TSchema, TEntity, TKey, TNestedValue>,
 	]
 	| [
-			fields: TypedHasOneFields<TSchema, TEntity, TKey, TNestedValue>
+		fields: TypedHasOneFields<TSchema, TEntity, TKey, TNestedValue>,
 	]
 
-
 export type TypedColumnArgs<TAlias extends string | null = null> = { as?: TAlias }
 export type TypedColumnParams<TAlias extends string | null = null> =
 	| [
-			args: TypedColumnArgs<TAlias>
+		args: TypedColumnArgs<TAlias>,
 	]
 	| []
 
-export type TypedEntitySelectionParams<TSchema extends SchemaTypeLike, TEntity extends EntityTypeLike, TKey extends string, TNestedValue, TAlias extends string | null = null> =
-	TKey extends keyof TEntity['columns'] ? TypedColumnParams<TAlias>
-		: TKey extends keyof TEntity['hasMany'] ? TypedHasManyParams<TSchema, TEntity, TKey, TNestedValue, TAlias>
-			: TKey extends keyof TEntity['hasManyBy'] ? TypedHasManyByParams<TSchema, TEntity, TKey, TNestedValue, TAlias>
-				: TKey extends keyof TEntity['hasOne'] ? TypedHasOneParams<TSchema, TEntity, TKey, TNestedValue, TAlias>
-					: never
-
-export type TypedEntitySelectionResult<TEntity extends EntityTypeLike, TKey extends string, TValue> =
-	TKey extends keyof TEntity['columns'] ? TEntity['columns'][TKey]
-		: TKey extends keyof TEntity['hasMany'] ? TValue[]
-			: TKey extends keyof TEntity['hasManyBy'] ? null | TValue
-				: TKey extends keyof TEntity['hasOne'] ? null | TValue
-					: never
+export type TypedEntitySelectionParams<
+	TSchema extends SchemaTypeLike,
+	TEntity extends EntityTypeLike,
+	TKey extends string,
+	TNestedValue,
+	TAlias extends string | null = null,
+> = TKey extends keyof TEntity['columns'] ? TypedColumnParams<TAlias>
+	: TKey extends keyof TEntity['hasMany'] ? TypedHasManyParams<TSchema, TEntity, TKey, TNestedValue, TAlias>
+	: TKey extends keyof TEntity['hasManyBy'] ? TypedHasManyByParams<TSchema, TEntity, TKey, TNestedValue, TAlias>
+	: TKey extends keyof TEntity['hasOne'] ? TypedHasOneParams<TSchema, TEntity, TKey, TNestedValue, TAlias>
+	: never
+
+export type TypedEntitySelectionResult<TEntity extends EntityTypeLike, TKey extends string, TValue> = TKey extends keyof TEntity['columns']
+	? TEntity['columns'][TKey]
+	: TKey extends keyof TEntity['hasMany'] ? TValue[]
+	: TKey extends keyof TEntity['hasManyBy'] ? null | TValue
+	: TKey extends keyof TEntity['hasOne'] ? null | TValue
+	: never