appflare 0.2.29 → 0.2.31

package/cli/templates/handlers/generators/types/query-definitions/schema-and-table-types.ts

@@ -1,246 +1,278 @@
-export function generateSchemaAndTableTypesSection(): string {
-	return `const mergedSchema = {
-	...authSchema,
-	...schema,
-};
-
-export const createDb = (database: D1Database) =>
-	drizzle(database, { schema: mergedSchema });
-
-export type AppflareDb = ReturnType<typeof createDb>;
-
-type SchemaRelations = ExtractTablesWithRelations<typeof mergedSchema>;
-type TableName = Extract<keyof SchemaRelations, string>;
-type TableRelationConfig<TName extends TableName> =
-	TName extends keyof SchemaRelations ? SchemaRelations[TName] : never;
-type TableFindManyArgs<TName extends TableName> = DBQueryConfig<
-	"many",
-	true,
-	SchemaRelations,
-	TableRelationConfig<TName>
->;
-type NativeFindManyWith<TName extends TableName> =
-	NonNullable<TableFindManyArgs<TName>> extends { with?: infer TWith }
-		? TWith
-		: never;
-type ResolveNativeFindManyWith<
-	TName extends TableName,
-	TArgs extends QueryFindManyArgs<TName> | undefined,
-> = TArgs extends { with?: infer TWith }
-	? Extract<TWith, NativeFindManyWith<TName>> extends infer TResolved
-		? [TResolved] extends [never]
-			? TWith extends Record<string, unknown>
-				? NativeFindManyWith<TName>
-				: never
-			: TResolved
-		: never
-	: never;
-type ResolveTableFindManySelection<
-	TName extends TableName,
-	TArgs extends QueryFindManyArgs<TName> | undefined,
-> = TArgs extends undefined
-	? true
-	: Omit<TArgs, "where" | "with"> &
-			(ResolveNativeFindManyWith<TName, TArgs> extends never
-				? {}
-				: { with: ResolveNativeFindManyWith<TName, TArgs> });
-type TableModel<TName extends TableName> = InferSelectModel<
-	(typeof mergedSchema)[TName]
->;
-type ManyToManySchemaMap = typeof schema extends {
-	__appflareManyToMany: infer TMap extends Record<string, unknown>;
-}
-	? TMap
-	: {};
-type ManyToManySourceTableMap<TSourceTable extends TableName> =
-	TSourceTable extends keyof ManyToManySchemaMap
-		? ManyToManySchemaMap[TSourceTable] extends Record<string, unknown>
-			? ManyToManySchemaMap[TSourceTable]
-			: {}
-		: {};
-type ManyToManyTargetTableName<
-	TSourceTable extends TableName,
-	TRelationName extends string,
-> = TRelationName extends keyof ManyToManySourceTableMap<TSourceTable>
-	? ManyToManySourceTableMap<TSourceTable>[TRelationName] extends {
-				targetTable: infer TTarget extends string;
-		  }
-			? Extract<TTarget, TableName>
-			: never
-	: never;
-type RuntimeRelationsSchemaMap = typeof schema extends {
-	__appflareRelations: infer TMap extends Record<string, unknown>;
-}
-	? TMap
-	: {};
-type RuntimeRelationsSourceTableMap<TSourceTable extends TableName> =
-	TSourceTable extends keyof RuntimeRelationsSchemaMap
-		? RuntimeRelationsSchemaMap[TSourceTable] extends Record<string, unknown>
-			? RuntimeRelationsSchemaMap[TSourceTable]
-			: {}
-		: {};
-type RuntimeRelationName<TSourceTable extends TableName> =
-	Extract<keyof RuntimeRelationsSourceTableMap<TSourceTable>, string>;
-type RuntimeRelationConfig<
-	TSourceTable extends TableName,
-	TRelationName extends string,
-> = TRelationName extends keyof RuntimeRelationsSourceTableMap<TSourceTable>
-	? RuntimeRelationsSourceTableMap<TSourceTable>[TRelationName]
-	: never;
-type RuntimeRelationKind<
-	TSourceTable extends TableName,
-	TRelationName extends string,
-> = RuntimeRelationConfig<TSourceTable, TRelationName> extends {
-	kind: infer TKind extends string;
-}
-	? TKind
-	: never;
-type RuntimeRelationTargetTable<
-	TSourceTable extends TableName,
-	TRelationName extends string,
-> = RuntimeRelationConfig<TSourceTable, TRelationName> extends {
-	targetTable: infer TTarget extends string;
-}
-	? Extract<TTarget, TableName>
-	: never;
-type TableInsertScalarModel<TName extends TableName> = TableInsertModel<TName>;
-type FindManyWithFromArgs<TArgs> = TArgs extends { with?: infer TWith }
-	? TWith
-	: undefined;
-type ManyToManyRelationRows<
-	TTargetTable extends TableName,
-	TRelationArgs,
-> = TRelationArgs extends true
-	? Array<TableModel<TTargetTable>>
-	: TRelationArgs extends Record<string, unknown>
-		? Awaited<
-				TableFindManyResult<
-					TTargetTable,
-					Extract<
-						Omit<TRelationArgs, "_count" | "_avg">,
-						QueryFindManyArgs<TTargetTable>
-					>
-				>
-		  >
-		: Array<TableModel<TTargetTable>>;
-type ReplaceManyToManyRelationsInRow<
-	TSourceTable extends TableName,
-	TRow,
-	TWith,
-> = TRow extends Record<string, unknown>
-	? {
-			[K in keyof TRow]: K extends string
-				? TWith extends Record<string, unknown>
-					? K extends keyof TWith
-						? [ManyToManyTargetTableName<TSourceTable, K>] extends [never]
-							? TRow[K]
-							: ManyToManyRelationRows<
-									Extract<ManyToManyTargetTableName<TSourceTable, K>, TableName>,
-									TWith[K]
-							  >
-						: TRow[K]
-					: TRow[K]
-				: TRow[K];
-	  }
-	: TRow;
-type ApplyManyToManyFindManyResult<
-	TSourceTable extends TableName,
-	TArgs extends QueryFindManyArgs<TSourceTable> | undefined,
-	TResult,
-> = TResult extends Promise<infer TRows>
-	? TRows extends Array<infer TRow>
-		? Promise<
-				Array<
-					ReplaceManyToManyRelationsInRow<
-						TSourceTable,
-						TRow,
-						FindManyWithFromArgs<TArgs>
-					>
-				>
-		  >
-		: TResult
-	: TResult;
-type ApplyManyToManyFindFirstResult<
-	TSourceTable extends TableName,
-	TArgs extends QueryFindFirstArgs<TSourceTable> | undefined,
-	TResult,
-> = TResult extends Promise<infer TRow>
-	? Promise<
-			TRow extends null
-				? null
-				: ReplaceManyToManyRelationsInRow<
-						TSourceTable,
-						TRow,
-						FindManyWithFromArgs<TArgs>
-				  >
-	  >
-	: TResult;
-type TableFindManyResult<
-	TName extends TableName,
-	TArgs extends QueryFindManyArgs<TName> | undefined =
-		| QueryFindManyArgs<TName>
-		| undefined,
-> = ApplyManyToManyFindManyResult<
-	TName,
-	TArgs,
-	TArgs extends undefined
-		? Promise<Array<TableModel<TName>>>
-		: Promise<
-				Array<
-					BuildQueryResult<
-						SchemaRelations,
-						TableRelationConfig<TName>,
-						ResolveTableFindManySelection<TName, TArgs>
-					>
-				>
-		  >
->;
-type TableFindFirstArgs<TName extends TableName> = Omit<
-	TableFindManyArgs<TName>,
-	"limit"
->;
-type NativeFindFirstWith<TName extends TableName> = NativeFindManyWith<TName>;
-type ResolveNativeFindFirstWith<
-	TName extends TableName,
-	TArgs extends QueryFindFirstArgs<TName> | undefined,
-> = TArgs extends { with?: infer TWith }
-	? Extract<TWith, NativeFindFirstWith<TName>> extends infer TResolved
-		? [TResolved] extends [never]
-			? TWith extends Record<string, unknown>
-				? NativeFindFirstWith<TName>
-				: never
-			: TResolved
-		: never
-	: never;
-type ResolveTableFindFirstSelection<
-	TName extends TableName,
-	TArgs extends QueryFindFirstArgs<TName> | undefined,
-> = TArgs extends undefined
-	? true
-	: Omit<TArgs, "where" | "with"> &
-			(ResolveNativeFindFirstWith<TName, TArgs> extends never
-				? {}
-				: { with: ResolveNativeFindFirstWith<TName, TArgs> });
-type TableFindFirstResult<
-	TName extends TableName,
-	TArgs extends QueryFindFirstArgs<TName> | undefined =
-		| QueryFindFirstArgs<TName>
-		| undefined,
-> = ApplyManyToManyFindFirstResult<
-	TName,
-	TArgs,
-	TArgs extends undefined
-		? Promise<TableModel<TName> | null>
-		: Promise<
-				BuildQueryResult<
-					SchemaRelations,
-					TableRelationConfig<TName>,
-					ResolveTableFindFirstSelection<TName, TArgs>
-				> | null
-		  >
->;
-type TableInsertModel<TName extends TableName> = InferInsertModel<
-	(typeof mergedSchema)[TName]
->;
-`;
-}
+export function generateSchemaAndTableTypesSection(): string {
+	return `const mergedSchema = {
+	...authSchema,
+	...schema,
+};
+
+export const createDb = (database: D1Database) =>
+	drizzle(database, { schema: mergedSchema });
+
+export type AppflareDb = ReturnType<typeof createDb>;
+
+type SchemaRelations = ExtractTablesWithRelations<typeof mergedSchema>;
+type TableName = Extract<keyof SchemaRelations, string>;
+type TableRelationConfig<TName extends TableName> =
+	TName extends keyof SchemaRelations ? SchemaRelations[TName] : never;
+type TableFindManyArgs<TName extends TableName> = DBQueryConfig<
+	"many",
+	true,
+	SchemaRelations,
+	TableRelationConfig<TName>
+>;
+type NativeFindManyWith<TName extends TableName> =
+	NonNullable<TableFindManyArgs<TName>> extends { with?: infer TWith }
+		? TWith
+		: never;
+type NormalizeWhereInWith<TWith, TNativeWith> = TWith extends Record<string, unknown>
+	? {
+			[K in keyof TWith]: K extends keyof TNativeWith
+				? TWith[K] extends Record<string, unknown>
+					? Omit<TWith[K], 'where'> & { where?: NonNullable<Extract<TNativeWith[K], Record<string, unknown>>['where']> } & (TWith[K] extends { with: infer TNestedWith }
+						? { with: NormalizeWhereInWith<TNestedWith, TNativeWith[K]> }
+						: {})
+					: TWith[K]
+				: TWith[K];
+		}
+	: TWith;
+
+type ResolveNativeFindManyWith<
+	TName extends TableName,
+	TArgs extends QueryFindManyArgs<TName> | undefined,
+> = TArgs extends { with?: infer TWith }
+	? Extract<TWith, NativeFindManyWith<TName>> extends infer TResolved
+		? [TResolved] extends [never]
+			? TWith extends Record<string, unknown>
+				? NormalizeWhereInWith<TWith, NativeFindManyWith<TName>>
+				: never
+			: TResolved
+		: never
+	: never;
+type ResolveTableFindManySelection<
+	TName extends TableName,
+	TArgs extends QueryFindManyArgs<TName> | undefined,
+> = TArgs extends undefined
+	? true
+	: Omit<TArgs, "where" | "with"> &
+			(ResolveNativeFindManyWith<TName, TArgs> extends never
+				? {}
+				: { with: ResolveNativeFindManyWith<TName, TArgs> });
+type TableModel<TName extends TableName> = InferSelectModel<
+	(typeof mergedSchema)[TName]
+>;
+type ManyToManySchemaMap = typeof schema extends {
+	__appflareManyToMany: infer TMap extends Record<string, unknown>;
+}
+	? TMap
+	: {};
+type ManyToManySourceTableMap<TSourceTable extends TableName> =
+	TSourceTable extends keyof ManyToManySchemaMap
+		? ManyToManySchemaMap[TSourceTable] extends Record<string, unknown>
+			? ManyToManySchemaMap[TSourceTable]
+			: {}
+		: {};
+type ManyToManyTargetTableName<
+	TSourceTable extends TableName,
+	TRelationName extends string,
+> = TRelationName extends keyof ManyToManySourceTableMap<TSourceTable>
+	? ManyToManySourceTableMap<TSourceTable>[TRelationName] extends {
+				targetTable: infer TTarget extends string;
+		  }
+			? Extract<TTarget, TableName>
+			: never
+	: never;
+type RuntimeRelationsSchemaMap = typeof schema extends {
+	__appflareRelations: infer TMap extends Record<string, unknown>;
+}
+	? TMap
+	: {};
+type RuntimeRelationsSourceTableMap<TSourceTable extends TableName> =
+	TSourceTable extends keyof RuntimeRelationsSchemaMap
+		? RuntimeRelationsSchemaMap[TSourceTable] extends Record<string, unknown>
+			? RuntimeRelationsSchemaMap[TSourceTable]
+			: {}
+		: {};
+type RuntimeRelationName<TSourceTable extends TableName> =
+	Extract<keyof RuntimeRelationsSourceTableMap<TSourceTable>, string>;
+type RuntimeRelationConfig<
+	TSourceTable extends TableName,
+	TRelationName extends string,
+> = TRelationName extends keyof RuntimeRelationsSourceTableMap<TSourceTable>
+	? RuntimeRelationsSourceTableMap<TSourceTable>[TRelationName]
+	: never;
+type RuntimeRelationKind<
+	TSourceTable extends TableName,
+	TRelationName extends string,
+> = RuntimeRelationConfig<TSourceTable, TRelationName> extends {
+	kind: infer TKind extends string;
+}
+	? TKind
+	: never;
+type RuntimeRelationTargetTable<
+	TSourceTable extends TableName,
+	TRelationName extends string,
+> = RuntimeRelationConfig<TSourceTable, TRelationName> extends {
+	targetTable: infer TTarget extends string;
+}
+	? Extract<TTarget, TableName>
+	: never;
+
+type TargetTableForRelation<
+	TSource extends TableName,
+	TRelation extends string,
+> = RuntimeRelationTargetTable<TSource, TRelation> extends never
+	? ManyToManyTargetTableName<TSource, TRelation> extends never
+		? never
+		: Extract<ManyToManyTargetTableName<TSource, TRelation>, TableName>
+	: RuntimeRelationTargetTable<TSource, TRelation>;
+
+type TableInsertScalarModel<TName extends TableName> = TableInsertModel<TName>;
+type FindManyWithFromArgs<TArgs> = TArgs extends { with?: infer TWith }
+	? TWith
+	: undefined;
+type ManyToManyRelationRows<
+	TTargetTable extends TableName,
+	TRelationArgs,
+> = TRelationArgs extends true
+	? Array<TableModel<TTargetTable>>
+	: TRelationArgs extends Record<string, unknown>
+		? Awaited<
+				TableFindManyResult<
+					TTargetTable,
+					Extract<
+						Omit<TRelationArgs, "_count" | "_avg">,
+						QueryFindManyArgs<TTargetTable>
+					>
+				>
+		  >
+		: Array<TableModel<TTargetTable>>;
+type ReplaceManyToManyRelationsInRow<
+	TSourceTable extends string,
+	TRow,
+	TWith,
+> = TRow extends Record<string, unknown>
+	? {
+			[K in keyof TRow]: K extends string
+				? TWith extends Record<string, unknown>
+					? K extends keyof TWith
+						? [ManyToManyTargetTableName<Extract<TSourceTable, TableName>, K>] extends [never]
+							? ReplaceManyToManyRelationsInRow<
+									[RuntimeRelationTargetTable<Extract<TSourceTable, TableName>, K>] extends [never] 
+										? K 
+										: RuntimeRelationTargetTable<Extract<TSourceTable, TableName>, K>,
+									TRow[K],
+									TWith[K] extends { with: infer TNestedWith }
+										? TNestedWith
+										: undefined
+							  >
+							: ManyToManyRelationRows<
+									Extract<ManyToManyTargetTableName<Extract<TSourceTable, TableName>, K>, TableName>,
+									TWith[K]
+							  >
+						: TRow[K]
+					: TRow[K]
+				: TRow[K];
+	  }
+	: TRow extends Array<infer TEntry>
+		? Array<ReplaceManyToManyRelationsInRow<TSourceTable, TEntry, TWith>>
+		: TRow;
+type ApplyManyToManyFindManyResult<
+	TSourceTable extends TableName,
+	TArgs extends QueryFindManyArgs<TSourceTable> | undefined,
+	TResult,
+> = TResult extends Promise<infer TRows>
+	? TRows extends Array<infer TRow>
+		? Promise<
+				Array<
+					ReplaceManyToManyRelationsInRow<
+						TSourceTable,
+						TRow,
+						FindManyWithFromArgs<TArgs>
+					>
+				>
+		  >
+		: TResult
+	: TResult;
+type ApplyManyToManyFindFirstResult<
+	TSourceTable extends TableName,
+	TArgs extends QueryFindFirstArgs<TSourceTable> | undefined,
+	TResult,
+> = TResult extends Promise<infer TRow>
+	? Promise<
+			TRow extends null
+				? null
+				: ReplaceManyToManyRelationsInRow<
+						TSourceTable,
+						TRow,
+						FindManyWithFromArgs<TArgs>
+				  >
+	  >
+	: TResult;
+type TableFindManyResult<
+	TName extends TableName,
+	TArgs extends QueryFindManyArgs<TName> | undefined =
+		| QueryFindManyArgs<TName>
+		| undefined,
+> = ApplyManyToManyFindManyResult<
+	TName,
+	TArgs,
+	TArgs extends undefined
+		? Promise<Array<TableModel<TName>>>
+		: Promise<
+				Array<
+					BuildQueryResult<
+						SchemaRelations,
+						TableRelationConfig<TName>,
+						ResolveTableFindManySelection<TName, TArgs>
+					>
+				>
+		  >
+>;
+type TableFindFirstArgs<TName extends TableName> = Omit<
+	TableFindManyArgs<TName>,
+	"limit"
+>;
+type NativeFindFirstWith<TName extends TableName> = NativeFindManyWith<TName>;
+type ResolveNativeFindFirstWith<
+	TName extends TableName,
+	TArgs extends QueryFindFirstArgs<TName> | undefined,
+> = TArgs extends { with?: infer TWith }
+	? Extract<TWith, NativeFindFirstWith<TName>> extends infer TResolved
+		? [TResolved] extends [never]
+			? TWith extends Record<string, unknown>
+				? NormalizeWhereInWith<TWith, NativeFindFirstWith<TName>>
+				: never
+			: TResolved
+		: never
+	: never;
+type ResolveTableFindFirstSelection<
+	TName extends TableName,
+	TArgs extends QueryFindFirstArgs<TName> | undefined,
+> = TArgs extends undefined
+	? true
+	: Omit<TArgs, "where" | "with"> &
+			(ResolveNativeFindFirstWith<TName, TArgs> extends never
+				? {}
+				: { with: ResolveNativeFindFirstWith<TName, TArgs> });
+type TableFindFirstResult<
+	TName extends TableName,
+	TArgs extends QueryFindFirstArgs<TName> | undefined =
+		| QueryFindFirstArgs<TName>
+		| undefined,
+> = ApplyManyToManyFindFirstResult<
+	TName,
+	TArgs,
+	TArgs extends undefined
+		? Promise<TableModel<TName> | null>
+		: Promise<
+				BuildQueryResult<
+					SchemaRelations,
+					TableRelationConfig<TName>,
+					ResolveTableFindFirstSelection<TName, TArgs>
+				> | null
+		  >
+>;
+type TableInsertModel<TName extends TableName> = InferInsertModel<
+	(typeof mergedSchema)[TName]
+>;
+`;
+}

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

@@ -1,13 +1,13 @@
-import { generateFilterAndWhereTypesSection } from "./query-definitions/filter-and-where-types";
-import { generateQueryApiTypesSection } from "./query-definitions/query-api-types";
-import { generateQueryHelperFunctionsSection } from "./query-definitions/query-helper-functions";
-import { generateSchemaAndTableTypesSection } from "./query-definitions/schema-and-table-types";
-
-export function generateTypesQueryDefinitionsSection(): string {
-	return [
-		generateSchemaAndTableTypesSection(),
-		generateFilterAndWhereTypesSection(),
-		generateQueryApiTypesSection(),
-		generateQueryHelperFunctionsSection(),
-	].join("\n\n");
-}
+import { generateFilterAndWhereTypesSection } from "./query-definitions/filter-and-where-types";
+import { generateQueryApiTypesSection } from "./query-definitions/query-api-types";
+import { generateQueryHelperFunctionsSection } from "./query-definitions/query-helper-functions";
+import { generateSchemaAndTableTypesSection } from "./query-definitions/schema-and-table-types";
+
+export function generateTypesQueryDefinitionsSection(): string {
+	return [
+		generateSchemaAndTableTypesSection(),
+		generateFilterAndWhereTypesSection(),
+		generateQueryApiTypesSection(),
+		generateQueryHelperFunctionsSection(),
+	].join("\n\n");
+}

package/cli/templates/handlers/generators/types/query-runtime/handled-error.ts

@@ -1,13 +1,13 @@
-export function generateQueryRuntimeHandledErrorSection(): string {
-	return `export class AppflareHandledError extends Error {
-	public readonly status: number;
-	public readonly payload: unknown;
-
-	public constructor(status: number, payload: unknown) {
-		super(typeof payload === "object" ? "Handled error" : String(payload));
-		this.status = status;
-		this.payload = payload;
-	}
-}
-`;
-}
+export function generateQueryRuntimeHandledErrorSection(): string {
+	return `export class AppflareHandledError extends Error {
+	public readonly status: number;
+	public readonly payload: unknown;
+
+	public constructor(status: number, payload: unknown) {
+		super(typeof payload === "object" ? "Handled error" : String(payload));
+		this.status = status;
+		this.payload = payload;
+	}
+}
+`;
+}