appflare 0.2.30 → 0.2.32

package/cli/templates/handlers/generators/types/query-definitions/filter-and-where-types.ts

@@ -1,259 +1,281 @@
-export function generateFilterAndWhereTypesSection(): string {
-	return `type Primitive = string | number | boolean | Date;
-type NonNil<T> = Exclude<T, null | undefined>;
-type Friendly<T> = T extends Date ? Date | number : T;
-type Comparable<T> = Friendly<Extract<NonNil<T>, Primitive>>;
-type RegexOperand<T> = T extends string ? string : never;
-
-type GeoPoint = {
-	latitude: number;
-	longitude: number;
-};
-
-type GeoCoordinates = {
-	type?: "Point";
-	coordinates: [number, number] | readonly [number, number];
-};
-
-type GeoWithinOperand = {
-	$geometry: GeoPoint | GeoCoordinates;
-	latitudeField?: string;
-	longitudeField?: string;
-	$minDistance?: number;
-	$maxDistance?: number;
-	gt?: number;
-	gte?: number;
-	lt?: number;
-	lte?: number;
-	$gt?: number;
-	$gte?: number;
-	$lt?: number;
-	$lte?: number;
-};
-
-type GeoWithinOperandForField<TFieldKey extends string> = Omit<
-	GeoWithinOperand,
-	"latitudeField" | "longitudeField"
-> & {
-	latitudeField?: TFieldKey;
-	longitudeField?: TFieldKey;
-};
-
-type FieldOperators<T, TFieldKey extends string = string> = {
-	eq?: Friendly<NonNil<T>>;
-	$eq?: Friendly<NonNil<T>>;
-	ne?: Friendly<NonNil<T>>;
-	$ne?: Friendly<NonNil<T>>;
-	in?: ReadonlyArray<Friendly<NonNil<T>>>;
-	$in?: ReadonlyArray<Friendly<NonNil<T>>>;
-	nin?: ReadonlyArray<Friendly<NonNil<T>>>;
-	$nin?: ReadonlyArray<Friendly<NonNil<T>>>;
-	gt?: Comparable<T>;
-	$gt?: Comparable<T>;
-	gte?: Comparable<T>;
-	$gte?: Comparable<T>;
-	lt?: Comparable<T>;
-	$lt?: Comparable<T>;
-	lte?: Comparable<T>;
-	$lte?: Comparable<T>;
-	exists?: boolean;
-	regex?: RegexOperand<T>;
-	$options?: string;
-	geoWithin?: GeoWithinOperandForField<TFieldKey>;
-};
-
-type WhereFieldValue<T, TFieldKey extends string> =
-	| Friendly<NonNil<T>>
-	| FieldOperators<T, TFieldKey>;
-
-export type WhereInput<TModel extends Record<string, unknown>> = {
-	[K in keyof TModel]?: WhereFieldValue<
-		TModel[K],
-		Extract<keyof TModel, string>
-	>;
-} & {
-	geoWithin?: GeoWithinOperandForField<Extract<keyof TModel, string>>;
-	$geoWithin?: GeoWithinOperandForField<Extract<keyof TModel, string>>;
-};
-
-type ColumnData<TColumn> = TColumn extends { _: { data: infer TData } }
-	? TData
-	: unknown;
-
-type InferRelationWhereFields<TConfig> = TConfig extends { where?: infer TWhere }
-	? TWhere extends (...args: infer TArgs) => unknown
-		? TArgs extends [infer TFields, ...unknown[]]
-			? TFields extends Record<string, unknown>
-				? TFields
-				: never
-			: never
-		: never
-	: never;
-
-type RelationModelFromConfig<TConfig extends Record<string, unknown>> =
-	InferRelationWhereFields<TConfig> extends infer TFields
-		? TFields extends Record<string, unknown>
-			? {
-					[K in Extract<keyof TFields, string>]: ColumnData<TFields[K]>;
-			  }
-			: Record<string, unknown>
-		: Record<string, unknown>;
-
-type NumericModelFieldKey<TModel extends Record<string, unknown>> = Extract<
-	{
-		[K in keyof TModel]-?: NonNullable<TModel[K]> extends number ? K : never;
-	}[keyof TModel],
-	string
->;
-
-type RelationAvgSelectionInput<TModel extends Record<string, unknown>> =
-	Partial<Record<NumericModelFieldKey<TModel>, boolean>>;
-
-type RelationAggregateSelectionInput<TModel extends Record<string, unknown>> = {
-	_count?: boolean;
-	_avg?: RelationAvgSelectionInput<TModel>;
-};
-
-type QueryNativeWithRelationInput<TEntry> =
-	| (Extract<TEntry, true> extends never ? never : true)
-	| (Extract<TEntry, Record<string, unknown>> extends infer TRelation
-			? TRelation extends Record<string, unknown>
-				? Omit<TRelation, "where" | "with" | "_count" | "_avg"> &
-						RelationAggregateSelectionInput<RelationModelFromConfig<TRelation>> & {
-						where?: WhereInput<RelationModelFromConfig<TRelation>>;
-						with?: TRelation extends { with?: infer TNestedWith }
-							? QueryWithInputForTable<TableName, TNestedWith>
-							: never;
-				  }
-				: never
-			: never);
-
-type QueryManyToManyWithRelationInput<TTargetTable extends TableName> =
-	| true
-	| (Omit<NonNullable<TableFindManyArgs<TTargetTable>>, "where" | "with"> &
-			RelationAggregateSelectionInput<TableModel<TTargetTable>> & {
-				where?: WhereInput<TableModel<TTargetTable>>;
-				with?: QueryWithInputForTable<
-					TTargetTable,
-					NativeFindManyWith<TTargetTable>
-				>;
-		  });
-
-type QueryWithRelationInputForTable<
-	TSourceTable extends TableName,
-	TRelationName extends string,
-	TEntry,
-> = [ManyToManyTargetTableName<TSourceTable, TRelationName>] extends [never]
-	? QueryNativeWithRelationInput<TEntry>
-	: QueryManyToManyWithRelationInput<
-			Extract<ManyToManyTargetTableName<TSourceTable, TRelationName>, TableName>
-	  >;
-
-type QueryWithInputForTable<
-	TSourceTable extends TableName,
-	TWith,
-> = TWith extends Record<string, unknown>
-	? {
-			[K in keyof TWith]?: QueryWithRelationInputForTable<
-				TSourceTable,
-				Extract<K, string>,
-				TWith[K]
-			>;
-	  }
-	: TWith;
-
-type QueryWithInput<TName extends TableName, TWith> = QueryWithInputForTable<
-	TName,
-	TWith
->;
-
-export type QueryFindManyArgs<TName extends TableName> = Omit<
-	NonNullable<TableFindManyArgs<TName>>,
-	"where" | "with"
-> & {
-	where?: WhereInput<TableModel<TName>>;
-	with?: QueryWithInput<TName, NativeFindManyWith<TName>>;
-};
-
-export type QueryFindFirstArgs<TName extends TableName> = Omit<
-	NonNullable<TableFindFirstArgs<TName>>,
-	"where" | "with"
-> & {
-	where?: WhereInput<TableModel<TName>>;
-	with?: QueryWithInput<TName, NativeFindFirstWith<TName>>;
-};
-
-type RelationInsertItem<TTargetTable extends TableName> =
-	| TableModel<TTargetTable>
-	| TableInsertModel<TTargetTable>
-	| ("id" extends keyof TableModel<TTargetTable>
-			? TableModel<TTargetTable>["id"]
-			: never);
-
-type RelationInsertValue<
-	TSourceTable extends TableName,
-	TRelationName extends RuntimeRelationName<TSourceTable>,
-> = RuntimeRelationTargetTable<TSourceTable, TRelationName> extends infer TTargetTable
-	? TTargetTable extends TableName
-		? RuntimeRelationKind<TSourceTable, TRelationName> extends "one"
-			? RelationInsertItem<TTargetTable>
-			: RelationInsertItem<TTargetTable> | Array<RelationInsertItem<TTargetTable>>
-		: never
-	: never;
-
-type RelationInsertFields<TName extends TableName> = {
-	[TRelationName in RuntimeRelationName<TName>]?: RelationInsertValue<
-		TName,
-		TRelationName
-	>;
-};
-
-type QueryInsertValue<TName extends TableName> = TableInsertScalarModel<TName> &
-	RelationInsertFields<TName>;
-
-type InsertItemValue<TArgs> = TArgs extends { values: infer TValue }
-	? TValue extends Array<infer TItem>
-		? TItem
-		: TValue
-	: never;
-
-type InsertRelationNameFromArgs<
-	TName extends TableName,
-	TArgs,
-> = Extract<keyof InsertItemValue<TArgs>, RuntimeRelationName<TName>>;
-
-type InsertRelationResultValue<
-	TSourceTable extends TableName,
-	TRelationName extends RuntimeRelationName<TSourceTable>,
-> = RuntimeRelationTargetTable<TSourceTable, TRelationName> extends infer TTargetTable
-	? TTargetTable extends TableName
-		? RuntimeRelationKind<TSourceTable, TRelationName> extends "one"
-			? TableModel<TTargetTable> | null
-			: Array<TableModel<TTargetTable>>
-		: never
-	: never;
-
-export type QueryInsertResultRow<
-	TName extends TableName,
-	TArgs extends QueryInsertArgs<TName>,
-> = TableModel<TName> & {
-	[TRelationName in InsertRelationNameFromArgs<TName, TArgs>]:
-		InsertRelationResultValue<TName, TRelationName>;
-};
-
-export type QueryInsertArgs<TName extends TableName> = {
-	values: QueryInsertValue<TName> | Array<QueryInsertValue<TName>>;
-};
-
-export type QueryUpdateArgs<TName extends TableName> = {
-	set: Partial<TableInsertModel<TName>>;
-	where?: WhereInput<TableModel<TName>>;
-	limit?: number;
-};
-
-export type QueryDeleteArgs<TName extends TableName> = {
-	where?: WhereInput<TableModel<TName>>;
-	limit?: number;
-};
-`;
-}
+export function generateFilterAndWhereTypesSection(): string {
+	return `type Primitive = string | number | boolean | Date;
+type NonNil<T> = Exclude<T, null | undefined>;
+type Friendly<T> = T extends Date ? Date | number : T;
+type Comparable<T> = Friendly<Extract<NonNil<T>, Primitive>>;
+type RegexOperand<T> = T extends string ? string : never;
+
+type GeoPoint = {
+	latitude: number;
+	longitude: number;
+};
+
+type GeoCoordinates = {
+	type?: "Point";
+	coordinates: [number, number] | readonly [number, number];
+};
+
+type GeoWithinOperand = {
+	$geometry: GeoPoint | GeoCoordinates;
+	latitudeField?: string;
+	longitudeField?: string;
+	$minDistance?: number;
+	$maxDistance?: number;
+	gt?: number;
+	gte?: number;
+	lt?: number;
+	lte?: number;
+	$gt?: number;
+	$gte?: number;
+	$lt?: number;
+	$lte?: number;
+};
+
+type GeoWithinOperandForField<TFieldKey extends string> = Omit<
+	GeoWithinOperand,
+	"latitudeField" | "longitudeField"
+> & {
+	latitudeField?: TFieldKey;
+	longitudeField?: TFieldKey;
+};
+
+type FieldOperators<T, TFieldKey extends string = string> = {
+	eq?: Friendly<NonNil<T>>;
+	$eq?: Friendly<NonNil<T>>;
+	ne?: Friendly<NonNil<T>>;
+	$ne?: Friendly<NonNil<T>>;
+	in?: ReadonlyArray<Friendly<NonNil<T>>>;
+	$in?: ReadonlyArray<Friendly<NonNil<T>>>;
+	nin?: ReadonlyArray<Friendly<NonNil<T>>>;
+	$nin?: ReadonlyArray<Friendly<NonNil<T>>>;
+	gt?: Comparable<T>;
+	$gt?: Comparable<T>;
+	gte?: Comparable<T>;
+	$gte?: Comparable<T>;
+	lt?: Comparable<T>;
+	$lt?: Comparable<T>;
+	lte?: Comparable<T>;
+	$lte?: Comparable<T>;
+	exists?: boolean;
+	regex?: RegexOperand<T>;
+	$options?: string;
+	geoWithin?: GeoWithinOperandForField<TFieldKey>;
+};
+
+type WhereFieldValue<T, TFieldKey extends string> =
+	| Friendly<NonNil<T>>
+	| FieldOperators<T, TFieldKey>;
+
+type RelationWhereInput<TModel extends Record<string, unknown>, TName extends TableName | any = any> = {
+	[K in keyof TModel]?: 
+		| WhereFieldValue<TModel[K], Extract<keyof TModel, string>>
+		| (TModel[K] extends Record<string, unknown> ? RelationWhereInput<TModel[K]> : never);
+} & {
+	geoWithin?: GeoWithinOperandForField<Extract<keyof TModel, string>>;
+	$geoWithin?: GeoWithinOperandForField<Extract<keyof TModel, string>>;
+} & (TName extends TableName ? {
+	[TRelation in keyof NativeFindManyWith<TName>]?: NativeFindManyWith<TName>[TRelation] extends infer TRelationConfig
+		? TRelationConfig extends Record<string, unknown>
+			? RelationWhereInput<
+					RelationModelFromConfig<TRelationConfig>,
+					any
+			  >
+			: never
+		: never;
+} : {});
+
+export type WhereInput<TModel extends Record<string, unknown>, TName extends TableName | any = any> = RelationWhereInput<TModel, TName>;
+
+type ColumnData<TColumn> = TColumn extends { _: { data: infer TData } }
+	? TData
+	: unknown;
+
+type InferRelationWhereFields<TConfig> = TConfig extends { where?: infer TWhere }
+	? TWhere extends (...args: infer TArgs) => unknown
+		? TArgs extends [infer TFields, ...unknown[]]
+			? TFields extends Record<string, unknown>
+				? TFields
+				: never
+			: never
+		: never
+	: never;
+
+type InferRelationNativeWith<TConfig> = TConfig extends { with?: infer TWith }
+	? TWith
+	: never;
+
+type RelationModelFromConfig<TConfig extends Record<string, unknown>> =
+	InferRelationWhereFields<TConfig> extends infer TFields
+		? TFields extends Record<string, unknown>
+			? {
+					[K in Extract<keyof TFields, string>]: ColumnData<TFields[K]>;
+			  }
+			: Record<string, unknown>
+		: Record<string, unknown>;
+
+type NumericModelFieldKey<TModel extends Record<string, unknown>> = Extract<
+	{
+		[K in keyof TModel]-?: NonNullable<TModel[K]> extends number ? K : never;
+	}[keyof TModel],
+	string
+>;
+
+type RelationAvgSelectionInput<TModel extends Record<string, unknown>> =
+	Partial<Record<NumericModelFieldKey<TModel>, boolean>>;
+
+type RelationAggregateSelectionInput<TModel extends Record<string, unknown>> = {
+	_count?: boolean;
+	_avg?: RelationAvgSelectionInput<TModel>;
+};
+
+type QueryNativeWithRelationInput<TEntry, TTargetTable> =
+	| (Extract<TEntry, true> extends never ? never : true)
+	| (Extract<TEntry, Record<string, unknown>> extends infer TRelation
+			? TRelation extends Record<string, unknown>
+				? Omit<TRelation, "where" | "with" | "_count" | "_avg"> &
+						RelationAggregateSelectionInput<RelationModelFromConfig<TRelation>> & {
+						where?: WhereInput<RelationModelFromConfig<TRelation>, Extract<TTargetTable, TableName>>;
+						with?: TRelation extends { with?: infer TNestedWith }
+							? QueryWithInputForTable<Extract<TTargetTable, TableName>, TNestedWith>
+							: never;
+				  }
+				: never
+			: never);
+
+type QueryManyToManyWithRelationInput<TTargetTable extends TableName> =
+	| true
+	| (Omit<NonNullable<TableFindManyArgs<TTargetTable>>, "where" | "with"> &
+			RelationAggregateSelectionInput<TableModel<TTargetTable>> & {
+				where?: WhereInput<TableModel<TTargetTable>, TTargetTable>;
+				with?: QueryWithInputForTable<
+					TTargetTable,
+					NativeFindManyWith<TTargetTable>
+				>;
+		  });
+
+type QueryWithRelationInputForTable<
+	TSourceTable extends TableName,
+	TRelationName extends string,
+	TEntry,
+> = [ManyToManyTargetTableName<TSourceTable, TRelationName>] extends [never]
+	? QueryNativeWithRelationInput<TEntry, RuntimeRelationTargetTable<TSourceTable, TRelationName>>
+	: QueryManyToManyWithRelationInput<
+			Extract<ManyToManyTargetTableName<TSourceTable, TRelationName>, TableName>
+	  >;
+
+type QueryWithInputForTable<
+	TSourceTable extends TableName,
+	TWith,
+> = TWith extends Record<string, unknown>
+	? {
+			[K in keyof TWith]?: QueryWithRelationInputForTable<
+				TSourceTable,
+				Extract<K, string>,
+				TWith[K]
+			>;
+	  }
+	: TWith;
+
+type QueryWithInput<TName extends TableName, TWith> = QueryWithInputForTable<
+	TName,
+	TWith
+>;
+
+export type OrderByDirection = "asc" | "desc";
+
+export type OrderByInput<TName extends TableName> =
+	| { column: Extract<keyof TableModel<TName>, string>; direction?: OrderByDirection }
+	| Array<{ column: Extract<keyof TableModel<TName>, string>; direction?: OrderByDirection }>;
+
+export type QueryFindManyArgs<TName extends TableName> = Omit<
+	NonNullable<TableFindManyArgs<TName>>,
+	"where" | "with" | "orderBy"
+> & {
+	where?: WhereInput<TableModel<TName>, TName>;
+	with?: QueryWithInput<TName, NativeFindManyWith<TName>>;
+	orderBy?: OrderByInput<TName>;
+};
+
+export type QueryFindFirstArgs<TName extends TableName> = Omit<
+	NonNullable<TableFindFirstArgs<TName>>,
+	"where" | "with" | "orderBy"
+> & {
+	where?: WhereInput<TableModel<TName>, TName>;
+	with?: QueryWithInput<TName, NativeFindFirstWith<TName>>;
+	orderBy?: OrderByInput<TName>;
+};
+
+type RelationInsertItem<TTargetTable extends TableName> =
+	| TableModel<TTargetTable>
+	| TableInsertModel<TTargetTable>
+	| ("id" extends keyof TableModel<TTargetTable>
+			? TableModel<TTargetTable>["id"]
+			: never);
+
+type RelationInsertValue<
+	TSourceTable extends TableName,
+	TRelationName extends RuntimeRelationName<TSourceTable>,
+> = RuntimeRelationTargetTable<TSourceTable, TRelationName> extends infer TTargetTable
+	? TTargetTable extends TableName
+		? RuntimeRelationKind<TSourceTable, TRelationName> extends "one"
+			? RelationInsertItem<TTargetTable>
+			: RelationInsertItem<TTargetTable> | Array<RelationInsertItem<TTargetTable>>
+		: never
+	: never;
+
+type RelationInsertFields<TName extends TableName> = {
+	[TRelationName in RuntimeRelationName<TName>]?: RelationInsertValue<
+		TName,
+		TRelationName
+	>;
+};
+
+type QueryInsertValue<TName extends TableName> = TableInsertScalarModel<TName> &
+	RelationInsertFields<TName>;
+
+type InsertItemValue<TArgs> = TArgs extends { values: infer TValue }
+	? TValue extends Array<infer TItem>
+		? TItem
+		: TValue
+	: never;
+
+type InsertRelationNameFromArgs<
+	TName extends TableName,
+	TArgs,
+> = Extract<keyof InsertItemValue<TArgs>, RuntimeRelationName<TName>>;
+
+type InsertRelationResultValue<
+	TSourceTable extends TableName,
+	TRelationName extends RuntimeRelationName<TSourceTable>,
+> = RuntimeRelationTargetTable<TSourceTable, TRelationName> extends infer TTargetTable
+	? TTargetTable extends TableName
+		? RuntimeRelationKind<TSourceTable, TRelationName> extends "one"
+			? TableModel<TTargetTable> | null
+			: Array<TableModel<TTargetTable>>
+		: never
+	: never;
+
+export type QueryInsertResultRow<
+	TName extends TableName,
+	TArgs extends QueryInsertArgs<TName>,
+> = TableModel<TName> & {
+	[TRelationName in InsertRelationNameFromArgs<TName, TArgs>]:
+		InsertRelationResultValue<TName, TRelationName>;
+};
+
+export type QueryInsertArgs<TName extends TableName> = {
+	values: QueryInsertValue<TName> | Array<QueryInsertValue<TName>>;
+};
+
+export type QueryUpdateArgs<TName extends TableName> = {
+	set: Partial<TableInsertModel<TName>>;
+	where?: WhereInput<TableModel<TName>, TName>;
+	limit?: number;
+};
+
+export type QueryDeleteArgs<TName extends TableName> = {
+	where?: WhereInput<TableModel<TName>, TName>;
+	limit?: number;
+};
+`;
+}