From 7246015278df33e6f1c257950bb3632ae0317523 Mon Sep 17 00:00:00 2001
From: Richard Solomou <richard@solomou.io>
Date: Thu, 23 Oct 2025 14:45:00 +0300
Subject: [PATCH 1/2] fix: preserve BetterAuth options type in CreateAuth and
 getStaticAuth for proper type inference

---
 src/client/index.ts | 123 +++++++++++++++++++++++---------------------
 1 file changed, 63 insertions(+), 60 deletions(-)

diff --git a/src/client/index.ts b/src/client/index.ts
index b461fa4..823df0b 100644
--- a/src/client/index.ts
+++ b/src/client/index.ts
@@ -19,7 +19,7 @@ import {
 } from "convex/server";
 import { type GenericId, Infer, v } from "convex/values";
 import { convexAdapter } from "./adapter";
-import { AdapterInstance, betterAuth } from "better-auth";
+import { AdapterInstance, betterAuth, type Auth, type BetterAuthOptions } from "better-auth";
 import { asyncMap } from "convex-helpers";
 import { partial } from "convex-helpers/validators";
 import {
@@ -44,16 +44,19 @@ export type CreateAdapter = <Ctx extends GenericCtx<GenericDataModel>>(
   ctx: Ctx
 ) => AdapterInstance;
 
-export type CreateAuth<DataModel extends GenericDataModel> =
-  | ((ctx: GenericCtx<DataModel>) => ReturnType<typeof betterAuth>)
-  | ((
-      ctx: GenericCtx<DataModel>,
-      opts?: { optionsOnly?: boolean }
-    ) => ReturnType<typeof betterAuth>);
+export type CreateAuth<
+  DataModel extends GenericDataModel,
+  Options extends BetterAuthOptions = any
+> =
+  | ((ctx: GenericCtx<DataModel>) => Auth<Options>)
+  | ((ctx: GenericCtx<DataModel>, opts?: { optionsOnly?: boolean }) => Auth<Options>);
 
-export const getStaticAuth = <DataModel extends GenericDataModel>(
-  createAuth: CreateAuth<DataModel>
-) => {
+export const getStaticAuth = <
+  DataModel extends GenericDataModel,
+  Options extends BetterAuthOptions = any
+>(
+  createAuth: CreateAuth<DataModel, Options>
+): Auth<Options> => {
   return createAuth({} as any, { optionsOnly: true });
 };
 
@@ -407,34 +410,34 @@ export type Triggers<
   DataModel extends GenericDataModel,
   Schema extends SchemaDefinition<any, any>,
 > = {
-  [K in keyof Schema["tables"]]?: {
-    onCreate?: <Ctx extends GenericMutationCtx<DataModel>>(
-      ctx: Ctx,
-      doc: Infer<Schema["tables"][K]["validator"]> & {
-        _id: string;
-        _creationTime: number;
-      }
-    ) => Promise<void>;
-    onUpdate?: <Ctx extends GenericMutationCtx<DataModel>>(
-      ctx: Ctx,
-      newDoc: Infer<Schema["tables"][K]["validator"]> & {
-        _id: string;
-        _creationTime: number;
-      },
-      oldDoc: Infer<Schema["tables"][K]["validator"]> & {
-        _id: string;
-        _creationTime: number;
-      }
-    ) => Promise<void>;
-    onDelete?: <Ctx extends GenericMutationCtx<DataModel>>(
-      ctx: Ctx,
-      doc: Infer<Schema["tables"][K]["validator"]> & {
-        _id: string;
-        _creationTime: number;
-      }
-    ) => Promise<void>;
+    [K in keyof Schema["tables"]]?: {
+      onCreate?: <Ctx extends GenericMutationCtx<DataModel>>(
+        ctx: Ctx,
+        doc: Infer<Schema["tables"][K]["validator"]> & {
+          _id: string;
+          _creationTime: number;
+        }
+      ) => Promise<void>;
+      onUpdate?: <Ctx extends GenericMutationCtx<DataModel>>(
+        ctx: Ctx,
+        newDoc: Infer<Schema["tables"][K]["validator"]> & {
+          _id: string;
+          _creationTime: number;
+        },
+        oldDoc: Infer<Schema["tables"][K]["validator"]> & {
+          _id: string;
+          _creationTime: number;
+        }
+      ) => Promise<void>;
+      onDelete?: <Ctx extends GenericMutationCtx<DataModel>>(
+        ctx: Ctx,
+        doc: Infer<Schema["tables"][K]["validator"]> & {
+          _id: string;
+          _creationTime: number;
+        }
+      ) => Promise<void>;
+    };
   };
-};
 
 export const createClient = <
   DataModel extends GenericDataModel,
@@ -650,13 +653,13 @@ export const createClient = <
       createAuth: CreateAuth<DataModel>,
       opts: {
         cors?:
-          | boolean
-          | {
-              // These values are appended to the default values
-              allowedOrigins?: string[];
-              allowedHeaders?: string[];
-              exposedHeaders?: string[];
-            };
+        | boolean
+        | {
+          // These values are appended to the default values
+          allowedOrigins?: string[];
+          allowedHeaders?: string[];
+          exposedHeaders?: string[];
+        };
       } = {}
     ) => {
       const staticAuth = getStaticAuth(createAuth);
@@ -761,14 +764,14 @@ export const createClient = <
 
 export type OpaqueIds<T> =
   T extends GenericId<infer _T>
-    ? string
-    : T extends (infer U)[]
-      ? OpaqueIds<U>[]
-      : T extends ArrayBuffer
-        ? ArrayBuffer
-        : T extends object
-          ? { [K in keyof T]: OpaqueIds<T[K]> }
-          : T;
+  ? string
+  : T extends (infer U)[]
+  ? OpaqueIds<U>[]
+  : T extends ArrayBuffer
+  ? ArrayBuffer
+  : T extends object
+  ? { [K in keyof T]: OpaqueIds<T[K]> }
+  : T;
 
 export type UseApi<API> = Expand<{
   [mod in keyof API]: API[mod] extends FunctionReference<
@@ -778,12 +781,12 @@ export type UseApi<API> = Expand<{
     infer FReturnType,
     infer FComponentPath
   >
-    ? FunctionReference<
-        FType,
-        "internal",
-        OpaqueIds<FArgs>,
-        OpaqueIds<FReturnType>,
-        FComponentPath
-      >
-    : UseApi<API[mod]>;
+  ? FunctionReference<
+    FType,
+    "internal",
+    OpaqueIds<FArgs>,
+    OpaqueIds<FReturnType>,
+    FComponentPath
+  >
+  : UseApi<API[mod]>;
 }>;

From 6911663baa65aad20edec068cc5381820ba5f227 Mon Sep 17 00:00:00 2001
From: Richard Solomou <richard@solomou.io>
Date: Thu, 23 Oct 2025 14:49:30 +0300
Subject: [PATCH 2/2] fix whitespace

---
 src/client/index.ts | 100 ++++++++++++++++++++++----------------------
 1 file changed, 50 insertions(+), 50 deletions(-)

diff --git a/src/client/index.ts b/src/client/index.ts
index 823df0b..1ee5333 100644
--- a/src/client/index.ts
+++ b/src/client/index.ts
@@ -410,34 +410,34 @@ export type Triggers<
   DataModel extends GenericDataModel,
   Schema extends SchemaDefinition<any, any>,
 > = {
-    [K in keyof Schema["tables"]]?: {
-      onCreate?: <Ctx extends GenericMutationCtx<DataModel>>(
-        ctx: Ctx,
-        doc: Infer<Schema["tables"][K]["validator"]> & {
-          _id: string;
-          _creationTime: number;
-        }
-      ) => Promise<void>;
-      onUpdate?: <Ctx extends GenericMutationCtx<DataModel>>(
-        ctx: Ctx,
-        newDoc: Infer<Schema["tables"][K]["validator"]> & {
-          _id: string;
-          _creationTime: number;
-        },
-        oldDoc: Infer<Schema["tables"][K]["validator"]> & {
-          _id: string;
-          _creationTime: number;
-        }
-      ) => Promise<void>;
-      onDelete?: <Ctx extends GenericMutationCtx<DataModel>>(
-        ctx: Ctx,
-        doc: Infer<Schema["tables"][K]["validator"]> & {
-          _id: string;
-          _creationTime: number;
-        }
-      ) => Promise<void>;
-    };
+  [K in keyof Schema["tables"]]?: {
+    onCreate?: <Ctx extends GenericMutationCtx<DataModel>>(
+      ctx: Ctx,
+      doc: Infer<Schema["tables"][K]["validator"]> & {
+        _id: string;
+        _creationTime: number;
+      }
+    ) => Promise<void>;
+    onUpdate?: <Ctx extends GenericMutationCtx<DataModel>>(
+      ctx: Ctx,
+      newDoc: Infer<Schema["tables"][K]["validator"]> & {
+        _id: string;
+        _creationTime: number;
+      },
+      oldDoc: Infer<Schema["tables"][K]["validator"]> & {
+        _id: string;
+        _creationTime: number;
+      }
+    ) => Promise<void>;
+    onDelete?: <Ctx extends GenericMutationCtx<DataModel>>(
+      ctx: Ctx,
+      doc: Infer<Schema["tables"][K]["validator"]> & {
+        _id: string;
+        _creationTime: number;
+      }
+    ) => Promise<void>;
   };
+};
 
 export const createClient = <
   DataModel extends GenericDataModel,
@@ -653,13 +653,13 @@ export const createClient = <
       createAuth: CreateAuth<DataModel>,
       opts: {
         cors?:
-        | boolean
-        | {
-          // These values are appended to the default values
-          allowedOrigins?: string[];
-          allowedHeaders?: string[];
-          exposedHeaders?: string[];
-        };
+          | boolean
+          | {
+              // These values are appended to the default values
+              allowedOrigins?: string[];
+              allowedHeaders?: string[];
+              exposedHeaders?: string[];
+            };
       } = {}
     ) => {
       const staticAuth = getStaticAuth(createAuth);
@@ -764,14 +764,14 @@ export const createClient = <
 
 export type OpaqueIds<T> =
   T extends GenericId<infer _T>
-  ? string
-  : T extends (infer U)[]
-  ? OpaqueIds<U>[]
-  : T extends ArrayBuffer
-  ? ArrayBuffer
-  : T extends object
-  ? { [K in keyof T]: OpaqueIds<T[K]> }
-  : T;
+    ? string
+    : T extends (infer U)[]
+      ? OpaqueIds<U>[]
+      : T extends ArrayBuffer
+        ? ArrayBuffer
+        : T extends object
+          ? { [K in keyof T]: OpaqueIds<T[K]> }
+          : T;
 
 export type UseApi<API> = Expand<{
   [mod in keyof API]: API[mod] extends FunctionReference<
@@ -781,12 +781,12 @@ export type UseApi<API> = Expand<{
     infer FReturnType,
     infer FComponentPath
   >
-  ? FunctionReference<
-    FType,
-    "internal",
-    OpaqueIds<FArgs>,
-    OpaqueIds<FReturnType>,
-    FComponentPath
-  >
-  : UseApi<API[mod]>;
+    ? FunctionReference<
+        FType,
+        "internal",
+        OpaqueIds<FArgs>,
+        OpaqueIds<FReturnType>,
+        FComponentPath
+      >
+    : UseApi<API[mod]>;
 }>;