@contember/client-content 1.3.0-alpha.9 → 2.0.0-alpha.2

package/src/nodes/ContentEntitySelection.ts

@@ -28,6 +28,10 @@ export type EntitySelectionAnyArgs =
 export type ContentEntitySelectionOrCallback = ContentEntitySelectionCallback | ContentEntitySelection
 
 
+export type ContentTransformContext = {
+	rootValue: unknown
+}
+
 export class ContentEntitySelection {
 
 	/**
@@ -38,6 +42,8 @@ export class ContentEntitySelection {
 		public readonly context: ContentEntitySelectionContext<string>,
 		/** @internal */
 		public readonly selectionSet: GraphQlSelectionSet,
+		/** @internal */
+		public readonly transformFn?: (value: any, ctx: ContentTransformContext) => any,
 	) {
 	}
 
@@ -93,6 +99,13 @@ export class ContentEntitySelection {
 		return new ContentEntitySelection(this.context, nodes)
 	}
 
+
+	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)
+		})
+	}
+
 	private _column(
 		name: string,
 		args: EntitySelectionCommonInput = {},
@@ -141,7 +154,12 @@ export class ContentEntitySelection {
 			createListArgs(entity, args),
 			entitySelection.selectionSet,
 		)
-		return this.withField(newObjectField)
+		const selectionWithField = this.withField(newObjectField)
+		const nestedTransform = entitySelection.transformFn
+		if (!nestedTransform) {
+			return selectionWithField
+		}
+		return this.withFieldTransform(alias, it => it.map(nestedTransform))
 	}
 
 
@@ -188,7 +206,12 @@ export class ContentEntitySelection {
 			argsWithType,
 			entitySelection.selectionSet,
 		)
-		return this.withField(newObjectField)
+		const selectionWithField = this.withField(newObjectField)
+		const nestedTransform = entitySelection.transformFn
+		if (!nestedTransform) {
+			return selectionWithField
+		}
+		return this.withFieldTransform(alias, (it, ctx) => it !== null ? nestedTransform(it, ctx) : null)
 	}
 
 	private _one(
@@ -227,7 +250,12 @@ export class ContentEntitySelection {
 			argsWithType,
 			entitySelection.selectionSet,
 		)
-		return this.withField(newObjectField)
+		const selectionWithField = this.withField(newObjectField)
+		const nestedTransform = entitySelection.transformFn
+		if (!nestedTransform) {
+			return selectionWithField
+		}
+		return this.withFieldTransform(alias, (it, ctx) => it !== null ? nestedTransform(it, ctx) : null)
 	}
 
 
@@ -235,6 +263,17 @@ export class ContentEntitySelection {
 		return new ContentEntitySelection(this.context, [
 			...this.selectionSet,
 			field,
-		])
+		], this.transformFn)
+	}
+
+	private withFieldTransform(alias: string, transform: (value: any, ctx: ContentTransformContext) => any) {
+		return new ContentEntitySelection(this.context, this.selectionSet, (value, ctx) => {
+			const transformedValue = transform(value[alias], ctx)
+			const newValue = {
+				...value,
+				[alias]: transformedValue,
+			}
+			return this.transformFn ? this.transformFn(newValue, ctx) : newValue
+		})
 	}
 }

package/src/nodes/TypedEntitySelection.ts

@@ -1,107 +1,108 @@
-import { EntityTypeLike, SchemaTypeLike } from '../types/Schema'
+import { EntityTypeLike, SchemaTypeLike } from '../types'
 import { ContentClientInput } from '../types'
+import { ContentEntitySelectionContext } from './ContentEntitySelection'
 
-export type TypedEntitySelectionCallback<
-	TSchema extends SchemaTypeLike,
-	EntityName extends string,
-	TEntity extends EntityTypeLike,
-	TValue
-> = (select: TypedEntitySelection<TSchema, EntityName, TEntity, {}>) => TypedEntitySelection<TSchema, EntityName, TEntity, TValue>
 
 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]
 	}>
 
+
+	transform<T>(cb: (value: TValue) => T): TypedEntitySelection<TSchema, TEntityName, TEntity, T>
+
 	$<
-		TKey extends (keyof TEntity['columns']) & string,
+		TNestedValue,
+		TKey extends (keyof TEntity['columns'] | keyof TEntity['hasMany'] | keyof TEntity['hasManyBy'] | keyof TEntity['hasOne']) & string,
 		TAlias extends string | null = null
 	>(
 		name: TKey,
-		args?: {as?: TAlias},
+		...args: TypedEntitySelectionParams<TSchema, TEntity, TKey, TNestedValue, TAlias>
 	): TypedEntitySelection<TSchema, TEntityName, TEntity, TValue & {
-		[key in TAlias extends null ? TKey : TAlias]: TEntity['columns'][key]
+		[key in TAlias extends null ? TKey : TAlias]: TypedEntitySelectionResult<TEntity, TKey, TNestedValue>
 	}>
+}
 
-	$<
-		TNestedValue,
-		TNestedKey extends keyof TEntity['hasMany'] & string,
-		TAlias extends string | null = null,
-	>(
-		name: TNestedKey,
-		args: ContentClientInput.HasManyRelationInput<TEntity['hasMany'][TNestedKey]> & { as?: TAlias },
-		fields:
-			| TypedEntitySelectionCallback<TSchema, TEntity['hasMany'][TNestedKey]['name'], TEntity['hasMany'][TNestedKey], TNestedValue>
-			| TypedEntitySelection<TSchema, TEntity['hasMany'][TNestedKey]['name'], TEntity['hasMany'][TNestedKey], TNestedValue>,
-	): TypedEntitySelection<TSchema, TEntityName, TEntity, TValue & {
-		[key in TAlias extends null ? TNestedKey : TAlias]: TNestedValue[]
-	}>
+export type TypedEntitySelectionCallback<
+	TSchema extends SchemaTypeLike,
+	EntityName extends string,
+	TEntity extends EntityTypeLike,
+	TValue,
+> = (select: TypedEntitySelection<TSchema, EntityName, TEntity, {}>) => TypedEntitySelection<TSchema, EntityName, TEntity, TValue>
 
-	$<
-		TNestedValue,
-		TNestedKey extends keyof TEntity['hasMany'] & string,
-		TAlias extends string | null = null,
-	>(
-		name: TNestedKey,
-		fields:
-			| TypedEntitySelectionCallback<TSchema, TEntity['hasMany'][TNestedKey]['name'], TEntity['hasMany'][TNestedKey], TNestedValue>
-			| TypedEntitySelection<TSchema, TEntity['hasMany'][TNestedKey]['name'], TEntity['hasMany'][TNestedKey], TNestedValue>,
-	): TypedEntitySelection<TSchema, TEntityName, TEntity, TValue & {
-		[key in TAlias extends null ? TNestedKey : TAlias]: TNestedValue[]
-	}>
 
-	$<
-		TNestedValue,
-		TNestedKey extends keyof TEntity['hasManyBy'] & string,
-		TAlias extends string | null = null,
-	>(
-		name: TNestedKey,
-		args: ContentClientInput.HasManyByRelationInput<TEntity['hasManyBy'][TNestedKey]['entity'], TEntity['hasManyBy'][TNestedKey]['by']> & { as?: TAlias },
-		fields:
-			| TypedEntitySelectionCallback<TSchema, TEntity['hasManyBy'][TNestedKey]['entity']['name'], TEntity['hasManyBy'][TNestedKey]['entity'], TNestedValue>
-			| TypedEntitySelection<TSchema, TEntity['hasManyBy'][TNestedKey]['entity']['name'], TEntity['hasManyBy'][TNestedKey]['entity'], TNestedValue>,
-	): TypedEntitySelection<TSchema, TEntityName, TEntity, TValue & {
-		[key in TAlias extends null ? TNestedKey : TAlias]: null | TNestedValue
-	}>
+export type TypedHasManyArgs<TEntity extends EntityTypeLike, TKey extends keyof TEntity['hasMany'] & string, TAlias extends string | null = null> =
+	& ContentClientInput.HasManyRelationInput<TEntity['hasMany'][TKey]>
+	& { as?: TAlias }
 
-	$<
-		TNestedValue,
-		TNestedKey extends keyof TEntity['hasManyBy'] & string,
-		TAlias extends string | null = null,
-	>(
-		name: TNestedKey,
-		fields:
-			| TypedEntitySelectionCallback<TSchema, TEntity['hasManyBy'][TNestedKey]['entity']['name'], TEntity['hasManyBy'][TNestedKey]['entity'], TNestedValue>
-			| TypedEntitySelection<TSchema, TEntity['hasManyBy'][TNestedKey]['entity']['name'], TEntity['hasManyBy'][TNestedKey]['entity'], TNestedValue>,
-	): TypedEntitySelection<TSchema, TEntityName, TEntity, TValue & {
-		[key in TAlias extends null ? TNestedKey : TAlias]: null | 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>
 
-	$<
-		TNestedValue extends { [K in string]: unknown },
-		TNestedKey extends keyof TEntity['hasOne'] & string,
-		TAlias extends string | null = null,
-	>(
-		name: TNestedKey,
-		args: ContentClientInput.HasOneRelationInput<TEntity['hasOne'][TNestedKey]> & { as?: TAlias },
-		fields:
-			| TypedEntitySelectionCallback<TSchema, TEntity['hasOne'][TNestedKey]['name'], TEntity['hasOne'][TNestedKey], TNestedValue>
-			| TypedEntitySelection<TSchema, TEntity['hasOne'][TNestedKey]['name'], TEntity['hasOne'][TNestedKey], TNestedValue>,
-	): TypedEntitySelection<TSchema, TEntityName, TEntity, TValue & {
-		[key in TAlias extends null ? TNestedKey : TAlias]: TNestedValue | 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>,
+	]
+	| [
+			fields: TypedHasManyFields<TSchema, TEntity, TKey, TNestedValue>,
+	]
 
-	$<
-		TNestedValue extends { [K in string]: unknown },
-		TNestedKey extends keyof TEntity['hasOne'] & string,
-		TAlias extends string | null = null,
-	>(
-		name: TNestedKey,
-		fields:
-			| TypedEntitySelectionCallback<TSchema, TEntity['hasOne'][TNestedKey]['name'], TEntity['hasOne'][TNestedKey], TNestedValue>
-			| TypedEntitySelection<TSchema, TEntity['hasOne'][TNestedKey]['name'], TEntity['hasOne'][TNestedKey], TNestedValue>,
-	): TypedEntitySelection<TSchema, TEntityName, TEntity, TValue & {
-		[key in TAlias extends null ? TNestedKey : TAlias]: TNestedValue | 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> =
+	| 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 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> =
+	| 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> =
+	| [
+			args: TypedHasOneArgs<TEntity, TKey, TAlias>,
+			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>
+	]
+	| []
+
+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

@@ -4,31 +4,45 @@ import { EntityTypeLike } from './Schema'
 
 export namespace ContentClientInput {
 	export type ConnectRelationInput<TEntity extends EntityTypeLike> = {
+		/** @internal */
+		readonly __typeGuard?: TEntity['name']
 		readonly connect: UniqueWhere<TEntity>
 	}
 
 	export type CreateRelationInput<TEntity extends EntityTypeLike> = {
+		/** @internal */
+		readonly __typeGuard?: TEntity['name']
 		readonly create: CreateDataInput<TEntity>
 	}
 
 	export type ConnectOrCreateInput<TEntity extends EntityTypeLike> = {
+		/** @internal */
+		readonly __typeGuard?: TEntity['name']
 		readonly connect: UniqueWhere<TEntity>
 		readonly create: CreateDataInput<TEntity>
 	}
 
 	export type ConnectOrCreateRelationInput<TEntity extends EntityTypeLike> = {
+		/** @internal */
+		readonly __typeGuard?: TEntity['name']
 		readonly connectOrCreate: ConnectOrCreateInput<TEntity>
 	}
 
 	export type DisconnectSpecifiedRelationInput<TEntity extends EntityTypeLike> = {
+		/** @internal */
+		readonly __typeGuard?: TEntity['name']
 		readonly disconnect: UniqueWhere<TEntity>
 	}
 
 	export type DeleteSpecifiedRelationInput<TEntity extends EntityTypeLike> = {
+		/** @internal */
+		readonly __typeGuard?: TEntity['name']
 		readonly delete: UniqueWhere<TEntity>
 	}
 
 	export type UpdateSpecifiedRelationInput<TEntity extends EntityTypeLike> = {
+		/** @internal */
+		readonly __typeGuard?: TEntity['name']
 		readonly update: {
 			readonly by: UniqueWhere<TEntity>
 			readonly data: UpdateDataInput<TEntity>
@@ -36,6 +50,8 @@ export namespace ContentClientInput {
 	}
 
 	export type UpsertSpecifiedRelationInput<TEntity extends EntityTypeLike> = {
+		/** @internal */
+		readonly __typeGuard?: TEntity['name']
 		readonly upsert: {
 			readonly by: UniqueWhere<TEntity>
 			readonly update: UpdateDataInput<TEntity>
@@ -43,19 +59,27 @@ export namespace ContentClientInput {
 		}
 	}
 
-	export type DisconnectRelationInput = {
+	export type DisconnectRelationInput<TEntity extends EntityTypeLike> = {
+		/** @internal */
+		readonly __typeGuard?: TEntity['name']
 		readonly disconnect: true
 	}
 
 	export type UpdateRelationInput<TEntity extends EntityTypeLike> = {
+		/** @internal */
+		readonly __typeGuard?: TEntity['name']
 		readonly update: UpdateDataInput<TEntity>
 	}
 
-	export type DeleteRelationInput = {
+	export type DeleteRelationInput<TEntity extends EntityTypeLike> = {
+		/** @internal */
+		readonly __typeGuard?: TEntity['name']
 		readonly delete: true
 	}
 
 	export type UpsertRelationInput<TEntity extends EntityTypeLike> = {
+		/** @internal */
+		readonly __typeGuard?: TEntity['name']
 		readonly upsert: {
 			readonly update: UpdateDataInput<TEntity>
 			readonly create: CreateDataInput<TEntity>
@@ -63,6 +87,10 @@ export namespace ContentClientInput {
 	}
 
 	export type CreateDataInput<TEntity extends EntityTypeLike> =
+		& {
+			/** @internal */
+			readonly __typeGuard?: TEntity['name']
+		}
 		& {
 			readonly [key in keyof TEntity['columns']]?: TEntity['columns'][key]
 		}
@@ -80,7 +108,14 @@ export namespace ContentClientInput {
 
 	export type CreateManyRelationInput<TEntity extends EntityTypeLike> = readonly CreateOneRelationInput<TEntity>[]
 
+
 	export type UpdateDataInput<TEntity extends EntityTypeLike> =
+		& {
+			/**
+			 * @internal
+			 */
+			readonly __typeGuard?: TEntity['name']
+		}
 		& {
 			readonly [key in keyof TEntity['columns']]?: TEntity['columns'][key]
 		}
@@ -92,12 +127,16 @@ export namespace ContentClientInput {
 		}
 
 	export type UpdateInput<TEntity extends EntityTypeLike> = {
+		/** @internal */
+		readonly __typeGuard?: TEntity['name']
 		readonly by: UniqueWhere<TEntity>
 		readonly filter?: Where<TEntity>
 		readonly data: UpdateDataInput<TEntity>
 	}
 
 	export type UpsertInput<TEntity extends EntityTypeLike> = {
+		/** @internal */
+		readonly __typeGuard?: TEntity['name']
 		readonly by: UniqueWhere<TEntity>
 		readonly filter?: Where<TEntity>
 		readonly update: UpdateDataInput<TEntity>
@@ -105,20 +144,28 @@ export namespace ContentClientInput {
 	}
 
 	export type CreateInput<TEntity extends EntityTypeLike> = {
+		/** @internal */
+		readonly __typeGuard?: TEntity['name']
 		readonly data: CreateDataInput<TEntity>
 	}
 
 	export type DeleteInput<TEntity extends EntityTypeLike> = {
+		/** @internal */
+		readonly __typeGuard?: TEntity['name']
 		readonly by: UniqueWhere<TEntity>
 		readonly filter?: Where<TEntity>
 	}
 
 	export type UniqueQueryInput<TEntity extends EntityTypeLike> = {
+		/** @internal */
+		readonly __typeGuard?: TEntity['name']
 		readonly by: UniqueWhere<TEntity>
 		readonly filter?: Where<TEntity>
 	}
 
 	export type ListQueryInput<TEntity extends EntityTypeLike> = {
+		/** @internal */
+		readonly __typeGuard?: TEntity['name']
 		readonly filter?: Where<TEntity>
 		readonly orderBy?: readonly OrderBy<TEntity>[]
 		readonly offset?: number
@@ -126,6 +173,8 @@ export namespace ContentClientInput {
 	}
 
 	export type PaginationQueryInput<TEntity extends EntityTypeLike> = {
+		/** @internal */
+		readonly __typeGuard?: TEntity['name']
 		readonly filter?: Where<TEntity>
 		readonly orderBy?: readonly OrderBy<TEntity>[]
 		readonly skip?: number
@@ -133,10 +182,14 @@ export namespace ContentClientInput {
 	}
 
 	export type HasOneRelationInput<TEntity extends EntityTypeLike> = {
+		/** @internal */
+		readonly __typeGuard?: TEntity['name']
 		readonly filter?: Where<TEntity>
 	}
 
 	export type HasManyByRelationInput<TEntity extends EntityTypeLike, TUnique extends JSONObject> = {
+		/** @internal */
+		readonly __typeGuard?: TEntity['name']
 		readonly by: TUnique
 		readonly filter?: Where<TEntity>
 	}
@@ -149,8 +202,8 @@ export namespace ContentClientInput {
 		| CreateRelationInput<TEntity>
 		| ConnectRelationInput<TEntity>
 		| ConnectOrCreateRelationInput<TEntity>
-		| DeleteRelationInput
-		| DisconnectRelationInput
+		| DeleteRelationInput<TEntity>
+		| DisconnectRelationInput<TEntity>
 		| UpdateRelationInput<TEntity>
 		| UpsertRelationInput<TEntity>
 
@@ -169,10 +222,11 @@ export namespace ContentClientInput {
 
 	export type FieldOrderBy<TEntity extends EntityTypeLike> =
 		& {
-			readonly [key in keyof TEntity['columns']]?: `${Input.OrderDirection}` | null
+			/** @internal */
+			readonly __typeGuard?: TEntity['name']
 		}
 		& {
-			readonly [key in keyof TEntity['hasMany']]?: FieldOrderBy<TEntity['hasMany'][key]> | null
+			readonly [key in keyof TEntity['columns']]?: `${Input.OrderDirection}` | null
 		}
 		& {
 			readonly [key in keyof TEntity['hasOne']]?: FieldOrderBy<TEntity['hasOne'][key]> | null
@@ -180,17 +234,28 @@ export namespace ContentClientInput {
 
 	export type OrderBy<TEntity extends EntityTypeLike> =
 		& {
+			/** @internal */
+			readonly __typeGuard?: TEntity['name']
 			readonly _random?: boolean
 			readonly _randomSeeded?: number
 		}
 		& FieldOrderBy<TEntity>
 
 
-	export type UniqueWhere<TEntity extends EntityTypeLike> = TEntity['unique']
+	export type UniqueWhere<TEntity extends EntityTypeLike> =
+		& {
+			/**
+			 * @internal
+			 */
+			readonly __typeGuard?: TEntity['name']
+		}
+		& TEntity['unique']
 
 
 	export type Where<TEntity extends EntityTypeLike> =
 		& {
+			/** @internal */
+			readonly __typeGuard?: TEntity['name']
 			readonly and?: (readonly (Where<TEntity>)[]) | null
 			readonly or?: (readonly (Where<TEntity>)[]) | null
 			readonly not?: Where<TEntity> | null

package/src/types/Schema.ts

@@ -28,14 +28,14 @@ export type EntityTypeLike = {
 		[columnName: string]: any
 	}
 	hasOne: {
-		[relationName: string]: EntityTypeLike
+		[relationName: string]: any
 	}
 	hasMany: {
-		[relationName: string]: EntityTypeLike
+		[relationName: string]: any
 	}
 	hasManyBy: {
 		[relationName: string]: {
-			entity: EntityTypeLike
+			entity: any
 			by: JSONObject
 		}
 	}

package/src/utils/createTypedArgs.ts

@@ -6,6 +6,9 @@ export const createTypedArgs = <TArgs extends Record<string, any>>(
 ): GraphQlFieldTypedArgs => {
 	const typedArgs: GraphQlFieldTypedArgs = {}
 	for (const key in args) {
+		if (!types.hasOwnProperty(key)) {
+			throw new Error(`Unknown argument ${key}`)
+		}
 		typedArgs[key] = {
 			graphQlType: types[key],
 			value: args[key],