types: replace any with unknown, re-export $Infer

Author: onmax

src/module.ts

@@ -100,7 +100,7 @@ declare module '#auth/secondary-storage' {
       getContents: () => `
 // Type augmentation support
 export * from '${resolver.resolve('./runtime/types/augment')}'
-export type { AuthMeta, AuthMode, AuthRouteRules, UserMatch, RequireSessionOptions } from '${resolver.resolve('./runtime/types')}'
+export type { AuthMeta, AuthMode, AuthRouteRules, UserMatch, RequireSessionOptions, Auth, InferUser, InferSession } from '${resolver.resolve('./runtime/types')}'
 `,
     })
 
@@ -110,13 +110,18 @@ export type { AuthMeta, AuthMode, AuthRouteRules, UserMatch, RequireSessionOptio
       getContents: () => `
 // Auto-generated types from auth.config.ts
 import type { InferUser, InferSession } from 'better-auth'
+import type { RuntimeConfig } from 'nuxt/schema'
 import type configFn from '${serverConfigPath}'
 
 type _Config = ReturnType<typeof configFn>
 
 declare module '#nuxt-better-auth' {
   interface AuthUser extends InferUser<_Config> {}
   interface AuthSession { session: InferSession<_Config>['session'], user: InferUser<_Config> }
+  interface ServerAuthContext {
+    runtimeConfig: RuntimeConfig
+    ${hasDb ? `db: typeof import('hub:db')['db']` : ''}
+  }
 }
 `,
     })
@@ -270,4 +275,4 @@ async function setupBetterAuthSchema(nuxt: any, serverConfigPath: string) {
 
 // Re-export config helpers
 export { defineClientAuth, defineServerAuth } from './runtime/config'
-export type { AuthMeta, AuthMode, AuthRouteRules, AuthSession, AuthUser, RequireSessionOptions, UserMatch } from './runtime/types'
+export type { Auth, AuthMeta, AuthMode, AuthRouteRules, AuthSession, AuthUser, InferSession, InferUser, RequireSessionOptions, ServerAuthContext, UserMatch } from './runtime/types'

src/runtime/app/composables/useUserSession.ts

@@ -85,9 +85,9 @@ export function useUserSession() {
   type SignIn = NonNullable<AppAuthClient>['signIn']
   type SignUp = NonNullable<AppAuthClient>['signUp']
 
-  function wrapAuthMethod<T extends (...args: any[]) => Promise<any>>(method: T): T {
-    return (async (...args: any[]) => {
-      const [data, options] = args
+  function wrapAuthMethod<T extends (...args: unknown[]) => Promise<unknown>>(method: T): T {
+    return (async (...args: unknown[]) => {
+      const [data, options] = args as [unknown, { onSuccess?: (ctx: unknown) => void } | undefined]
       const originalOnSuccess = options?.onSuccess
 
       // If no onSuccess callback, pass options through unchanged
@@ -97,7 +97,7 @@ export function useUserSession() {
       // Wrap onSuccess to wait for session sync before calling
       const wrappedOptions = {
         ...options,
-        onSuccess: async (ctx: any) => {
+        onSuccess: async (ctx: unknown) => {
           await waitForSession()
           await originalOnSuccess(ctx)
         },

src/runtime/config.ts

@@ -1,10 +1,9 @@
 import type { BetterAuthOptions } from 'better-auth'
 import type { ClientOptions } from 'better-auth/client'
+import type { ServerAuthContext } from './types/augment'
 
-export interface ServerAuthContext {
-  runtimeConfig: any
-  db?: any // optional in database-less mode
-}
+// Re-export for declaration merging with generated types
+export type { ServerAuthContext }
 
 export interface ClientAuthContext {
   siteUrl: string

src/runtime/server/utils/auth.ts

@@ -35,7 +35,7 @@ export async function serverAuth(): Promise<AuthInstance> {
 
   // Dynamic import hub:db only when using database
   let database: ReturnType<typeof drizzleAdapter> | undefined
-  let db: any
+  let db: unknown
   if (useDatabase) {
     const hubDb = await import('hub:db')
     db = hubDb.db

src/runtime/types.ts

@@ -2,7 +2,10 @@ import type { NitroRouteRules } from 'nitropack/types'
 import type { AuthSession, AuthUser } from './types/augment'
 
 // Re-export augmentable types
-export type { AuthSession, AuthUser, UserSessionComposable } from './types/augment'
+export type { AuthSession, AuthUser, ServerAuthContext, UserSessionComposable } from './types/augment'
+
+// Re-export better-auth types for $Infer access
+export type { Auth, InferSession, InferUser } from 'better-auth'
 
 export type AuthMode = 'guest' | 'user'
 

src/runtime/types/augment.ts

@@ -26,6 +26,12 @@ export interface AuthSession {
   userAgent?: string | null
 }
 
+// Server auth context - extended by generated types with hub:db types
+export interface ServerAuthContext {
+  runtimeConfig: Record<string, unknown>
+  db?: unknown
+}
+
 // Composable return type
 export interface UserSessionComposable {
   user: Ref<AuthUser | null>