appflare 0.1.12 → 0.2.0

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

@@ -17,21 +17,83 @@ type TableFindManyArgs<TName extends TableName> = TableQuery<TName> extends {
 }
 	? TArgs
 	: never;
-type TableFindManyResult<TName extends TableName> = TableQuery<TName> extends {
-	findMany: (args?: unknown) => infer TResult;
+type TableFindManyMethod<TName extends TableName> = TableQuery<TName> extends {
+	findMany: infer TMethod;
 }
+	? TMethod
+	: never;
+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>>
+	: never;
+type ResolveTableFindManyArgs<
+	TName extends TableName,
+	TArgs extends QueryFindManyArgs<TName> | undefined,
+> = TArgs extends undefined
+	? undefined
+	: Omit<NonNullable<TableFindManyArgs<TName>>, "where" | "with"> &
+			(ResolveNativeFindManyWith<TName, TArgs> extends never
+				? {}
+				: { with?: ResolveNativeFindManyWith<TName, TArgs> });
+type TableFindManyResult<
+	TName extends TableName,
+	TArgs extends QueryFindManyArgs<TName> | undefined =
+		| QueryFindManyArgs<TName>
+		| undefined,
+> = TableFindManyMethod<TName> extends (
+	args?: ResolveTableFindManyArgs<TName, TArgs>,
+) => infer TResult
 	? TResult
-	: Promise<Array<TableModel<TName>>>;
+	: TableFindManyMethod<TName> extends (args?: unknown) => infer TResult
+		? TResult
+		: Promise<Array<TableModel<TName>>>;
 type TableFindFirstArgs<TName extends TableName> = TableQuery<TName> extends {
 	findFirst: (args?: infer TArgs) => Promise<unknown>;
 }
 	? TArgs
 	: never;
-type TableFindFirstResult<TName extends TableName> = TableQuery<TName> extends {
-	findFirst: (args?: unknown) => infer TResult;
+type TableFindFirstMethod<TName extends TableName> = TableQuery<TName> extends {
+	findFirst: infer TMethod;
 }
+	? TMethod
+	: never;
+type NativeFindFirstWith<TName extends TableName> =
+	NonNullable<TableFindFirstArgs<TName>> extends { with?: infer TWith }
+		? TWith
+		: never;
+type ResolveNativeFindFirstWith<
+	TName extends TableName,
+	TArgs extends QueryFindFirstArgs<TName> | undefined,
+> = TArgs extends { with?: infer TWith }
+	? Extract<TWith, NativeFindFirstWith<TName>>
+	: never;
+type ResolveTableFindFirstArgs<
+	TName extends TableName,
+	TArgs extends QueryFindFirstArgs<TName> | undefined,
+> = TArgs extends undefined
+	? undefined
+	: Omit<NonNullable<TableFindFirstArgs<TName>>, "where" | "with"> &
+			(ResolveNativeFindFirstWith<TName, TArgs> extends never
+				? {}
+				: { with?: ResolveNativeFindFirstWith<TName, TArgs> });
+type TableFindFirstResult<
+	TName extends TableName,
+	TArgs extends QueryFindFirstArgs<TName> | undefined =
+		| QueryFindFirstArgs<TName>
+		| undefined,
+> = TableFindFirstMethod<TName> extends (
+	args?: ResolveTableFindFirstArgs<TName, TArgs>,
+) => infer TResult
 	? TResult
-	: Promise<TableModel<TName> | null>;
+	: TableFindFirstMethod<TName> extends (args?: unknown) => infer TResult
+		? TResult
+		: Promise<TableModel<TName> | null>;
 type TableModel<TName extends TableName> = InferSelectModel<
 	(typeof mergedSchema)[TName]
 >;
@@ -176,22 +238,16 @@ type QueryWithInput<TWith> = TWith extends Record<string, unknown>
 
 export type QueryFindManyArgs<TName extends TableName> = Omit<
 	NonNullable<TableFindManyArgs<TName>>,
-	"where" | "with"
+	"where"
 > & {
 	where?: WhereInput<TableModel<TName>>;
-	with?: TableFindManyArgs<TName> extends { with?: infer TWith }
-		? QueryWithInput<TWith>
-		: never;
 };
 
 export type QueryFindFirstArgs<TName extends TableName> = Omit<
 	NonNullable<TableFindFirstArgs<TName>>,
-	"where" | "with"
+	"where"
 > & {
 	where?: WhereInput<TableModel<TName>>;
-	with?: TableFindFirstArgs<TName> extends { with?: infer TWith }
-		? QueryWithInput<TWith>
-		: never;
 };
 
 export type QueryInsertArgs<TName extends TableName> = {
@@ -303,20 +359,20 @@ export type QueryUpsertArgs<TName extends TableName> = {
 };
 
 export type QueryTableApi<TName extends TableName> = {
-	findMany: <
+	findMany: TableFindManyMethod<TName> & (<
 		TArgs extends QueryFindManyArgs<TName> | undefined =
 			| QueryFindManyArgs<TName>
 			| undefined,
 	>(
 		args?: TArgs,
-	) => ApplyFindManyWithAggregateResult<TableFindManyResult<TName>, TArgs>;
-	findFirst: <
+	) => ApplyFindManyWithAggregateResult<TableFindManyResult<TName, TArgs>, TArgs>);
+	findFirst: TableFindFirstMethod<TName> & (<
 		TArgs extends QueryFindFirstArgs<TName> | undefined =
 			| QueryFindFirstArgs<TName>
 			| undefined,
 	>(
 		args?: TArgs,
-	) => ApplyFindFirstWithAggregateResult<TableFindFirstResult<TName>, TArgs>;
+	) => ApplyFindFirstWithAggregateResult<TableFindFirstResult<TName, TArgs>, TArgs>);
 	insert: (args: QueryInsertArgs<TName>) => Promise<Array<TableModel<TName>>>;
 	update: (args: QueryUpdateArgs<TName>) => Promise<Array<TableModel<TName>>>;
 	upsert: (args: QueryUpsertArgs<TName>) => Promise<Array<TableModel<TName>>>;

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

@@ -46,6 +46,14 @@ export function generateTypesQueryRuntimeSection(): string {
 						? (args?.where as Record<string, unknown>)
 						: undefined;
 					const whereFilter = buildWhereFilter(table, where, tableName);
+					const passthroughArgs =
+						where !== undefined && !whereFilter
+							? (() => {
+								const nextArgs = { ...(args ?? {}) };
+								delete nextArgs.where;
+								return nextArgs;
+							})()
+							: args;
 					const withValue = args?.with;
 					const transformedWithResult =
 						withValue === undefined
@@ -57,11 +65,11 @@ export function generateTypesQueryRuntimeSection(): string {
 					const transformedWith = transformedWithResult.with;
 					const aggregatePlan = transformedWithResult.aggregatePlan;
 					if (!whereFilter && transformedWith === withValue && !aggregatePlan) {
-						return queryTable.findMany(args);
+						return queryTable.findMany(passthroughArgs);
 					}
 
 					const queryPromise = queryTable.findMany({
-						...(args ?? {}),
+						...(passthroughArgs ?? {}),
 						...(whereFilter ? { where: () => whereFilter } : {}),
 						...(transformedWith !== undefined ? { with: transformedWith } : {}),
 					});
@@ -79,6 +87,14 @@ export function generateTypesQueryRuntimeSection(): string {
 						? (args?.where as Record<string, unknown>)
 						: undefined;
 					const whereFilter = buildWhereFilter(table, where, tableName);
+					const passthroughArgs =
+						where !== undefined && !whereFilter
+							? (() => {
+								const nextArgs = { ...(args ?? {}) };
+								delete nextArgs.where;
+								return nextArgs;
+							})()
+							: args;
 					const withValue = args?.with;
 					const transformedWithResult =
 						withValue === undefined
@@ -90,11 +106,11 @@ export function generateTypesQueryRuntimeSection(): string {
 					const transformedWith = transformedWithResult.with;
 					const aggregatePlan = transformedWithResult.aggregatePlan;
 					if (!whereFilter && transformedWith === withValue && !aggregatePlan) {
-						return queryTable.findFirst(args);
+						return queryTable.findFirst(passthroughArgs);
 					}
 
 					const queryPromise = queryTable.findFirst({
-						...(args ?? {}),
+						...(passthroughArgs ?? {}),
 						...(whereFilter ? { where: () => whereFilter } : {}),
 						...(transformedWith !== undefined ? { with: transformedWith } : {}),
 					});

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "appflare",
-	"version": "0.1.12",
+	"version": "0.2.0",
 	"bin": {
 		"appflare": "./cli/index.ts"
 	},