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

package/src/nodes/TypedEntitySelection.ts

@@ -2,38 +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<
@@ -43,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

package/src/types/Input.ts

@@ -1,7 +1,6 @@
 import { Input, JSONObject } from '@contember/schema'
 import { EntityTypeLike } from './Schema'
 
-
 export namespace ContentClientInput {
 	export type ConnectRelationInput<TEntity extends EntityTypeLike> = {
 		/** @internal */
@@ -55,7 +54,7 @@ export namespace ContentClientInput {
 		readonly upsert: {
 			readonly by: UniqueWhere<TEntity>
 			readonly update: UpdateDataInput<TEntity>
-			readonly  create: CreateDataInput<TEntity>
+			readonly create: CreateDataInput<TEntity>
 		}
 	}
 
@@ -108,7 +107,6 @@ export namespace ContentClientInput {
 
 	export type CreateManyRelationInput<TEntity extends EntityTypeLike> = readonly CreateOneRelationInput<TEntity>[]
 
-
 	export type UpdateDataInput<TEntity extends EntityTypeLike> =
 		& {
 			/**
@@ -197,7 +195,6 @@ export namespace ContentClientInput {
 	export type HasManyRelationInput<TEntity extends EntityTypeLike> = ListQueryInput<TEntity>
 	export type HasManyRelationPaginateInput<TEntity extends EntityTypeLike> = PaginationQueryInput<TEntity>
 
-
 	export type UpdateOneRelationInput<TEntity extends EntityTypeLike> =
 		| CreateRelationInput<TEntity>
 		| ConnectRelationInput<TEntity>
@@ -216,10 +213,8 @@ export namespace ContentClientInput {
 		| UpdateSpecifiedRelationInput<TEntity>
 		| UpsertSpecifiedRelationInput<TEntity>
 
-
 	export type UpdateManyRelationInput<TEntity extends EntityTypeLike> = Array<UpdateManyRelationInputItem<TEntity>>
 
-
 	export type FieldOrderBy<TEntity extends EntityTypeLike> =
 		& {
 			/** @internal */
@@ -241,7 +236,6 @@ export namespace ContentClientInput {
 		}
 		& FieldOrderBy<TEntity>
 
-
 	export type UniqueWhere<TEntity extends EntityTypeLike> =
 		& {
 			/**
@@ -251,7 +245,6 @@ export namespace ContentClientInput {
 		}
 		& TEntity['unique']
 
-
 	export type Where<TEntity extends EntityTypeLike> =
 		& {
 			/** @internal */
@@ -270,7 +263,6 @@ export namespace ContentClientInput {
 			readonly [key in keyof TEntity['hasOne']]?: Where<TEntity['hasOne'][key]> | null
 		}
 
-
 	export type AnyOrderBy = Input.OrderBy<`${Input.OrderDirection}`>[]
 	export type AnyListQueryInput =
 		& Omit<Input.ListQueryInput, 'orderBy'>

package/src/types/Result.ts

@@ -1,26 +1,58 @@
 import { Result } from '@contember/schema'
 
-export type TransactionResult<V> = {
-	readonly ok: boolean
-	readonly errorMessage: string | null
+export type TransactionOkResult<V> = {
+	readonly ok: true
+	readonly errorMessage: null
+	readonly errors: []
+	readonly validation: ValidationOkResult
+	readonly data: V
+}
+export type TransactionFailResult<V> = {
+	readonly ok: false
+	readonly errorMessage: string
 	readonly errors: MutationError[]
 	readonly validation: ValidationResult
 	readonly data: V
 }
 
-export type MutationResult<Value = unknown> = {
+export type TransactionResult<V> =
+	| TransactionOkResult<V>
+	| TransactionFailResult<V>
+
+export type MutationOkResult<Value = unknown> = {
+	readonly ok: true
+	readonly errorMessage: null
+	readonly errors: []
+	readonly node: Value | null // still may be null
+	readonly validation: ValidationOkResult
+}
+
+export type MutationFailResult = {
 	readonly ok: boolean
-	readonly errorMessage: string | null
+	readonly errorMessage: string
 	readonly errors: MutationError[]
-	readonly node: Value | null
-	readonly validation?: ValidationResult
+	readonly node: null
+	readonly validation: ValidationResult
 }
 
-export type ValidationResult = {
-	readonly valid: boolean
+export type MutationResult<Value = unknown> =
+	| MutationOkResult<Value>
+	| MutationFailResult
+
+export type ValidationOkResult = {
+	readonly valid: true
+	readonly errors: []
+}
+
+export type ValidationFailResult = {
+	readonly valid: false
 	readonly errors: ValidationError[]
 }
 
+export type ValidationResult =
+	| ValidationOkResult
+	| ValidationFailResult
+
 export type ValidationError = {
 	readonly path: Path
 	readonly message: { text: string }

package/src/types/Schema.ts

@@ -49,4 +49,3 @@ export type SchemaTypeLike = {
 		[entityName: string]: EntityTypeLike
 	}
 }
-

package/src/utils/createListArgs.ts

@@ -1,7 +1,11 @@
 import { SchemaEntityNames } from '../types'
 import { GraphQlFieldTypedArgs } from '@contember/graphql-builder'
 
-export const createListArgs = (entity: SchemaEntityNames<string>, args: { filter?: any; orderBy?: any; limit?: number; offset?: number }, type: 'list' | 'paginate' = 'list'): GraphQlFieldTypedArgs => {
+export const createListArgs = (
+	entity: SchemaEntityNames<string>,
+	args: { filter?: any; orderBy?: any; limit?: number; offset?: number },
+	type: 'list' | 'paginate' = 'list',
+): GraphQlFieldTypedArgs => {
 	return {
 		filter: {
 			graphQlType: `${entity.name}Where`,

package/src/utils/createMutationOperationSet.ts

@@ -8,7 +8,6 @@ export const createMutationOperationSet = (
 		| ContentMutation<any>
 		| ContentMutation<any>[],
 ): ContentOperationSet<any> => {
-
 	if (input instanceof ContentOperation) {
 		return new ContentOperationSet(
 			[new GraphQlField('mut', input.fieldName, input.args, input.selection)],
@@ -32,11 +31,14 @@ export const createMutationOperationSet = (
 			}
 			return new GraphQlField(alias, mutation.fieldName, mutation.args, mutation.selection)
 		}),
-		res => Object.fromEntries(Object.entries(input).map(([alias, mutation]) => {
-			if (mutation.type === 'query') {
-				return [alias, mutation.parse(res[alias]?.value ?? null)]
-			}
-			return [alias, mutation.parse(res[alias] ?? null)]
-		})),
+		res =>
+			Object.fromEntries(
+				Object.entries(input).map(([alias, mutation]) => {
+					if (mutation.type === 'query') {
+						return [alias, mutation.parse(res[alias]?.value ?? null)]
+					}
+					return [alias, mutation.parse(res[alias] ?? null)]
+				}),
+			),
 	)
 }

package/src/utils/createQueryOperationSet.ts

@@ -5,7 +5,6 @@ import { GraphQlField } from '@contember/graphql-builder'
 export const createQueryOperationSet = (
 	input: Record<string, ContentQuery<any>> | ContentQuery<any>,
 ): ContentOperationSet<any> => {
-
 	if (input instanceof ContentOperation) {
 		return new ContentOperationSet(
 			[new GraphQlField('value', input.fieldName, input.args, input.selection)],