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

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)],