refactor: remove type utils for converting

Author: miello

packages/core/src/auth/handlers/index.ts

@@ -5,18 +5,22 @@ import { resetPasswordEmail } from './reset-password'
 import { signOut } from './sign-out'
 import { signUp } from './sign-up'
 
+import type { MinimalContext } from '../../config'
 import { type AuthContext } from '../context'
 
-export function createAuthHandlers<TAuthContext extends AuthContext>(authContext: TAuthContext) {
+export function createAuthHandlers<
+  TAuthContext extends AuthContext,
+  TContext extends MinimalContext,
+>(authContext: TAuthContext) {
   const handlers = {
     //  No authentication required
-    signUp: signUp(authContext),
-    loginEmail: loginEmail(authContext),
-    signOut: signOut(authContext),
-    resetPasswordEmail: resetPasswordEmail(authContext),
-    forgotPasswordEmail: forgotPasswordEmail(authContext),
+    signUp: signUp<TAuthContext, TContext>(authContext),
+    loginEmail: loginEmail<TAuthContext, TContext>(authContext),
+    signOut: signOut<TAuthContext, TContext>(authContext),
+    resetPasswordEmail: resetPasswordEmail<TAuthContext, TContext>(authContext),
+    forgotPasswordEmail: forgotPasswordEmail<TAuthContext, TContext>(authContext),
     // Authentication required
-    me: me(authContext),
+    me: me<TAuthContext, TContext>(authContext),
   } as const
 
   return {

packages/core/src/auth/index.ts

@@ -92,18 +92,6 @@ export interface AuthConfig {
   }
 }
 
-type ChangeAuthHandlerContextToMinimalContext<
-  TContext extends MinimalContext,
-  THandlers extends Record<string, { handler: ApiRouteHandler<any, any> }>,
-> = {
-  [K in keyof THandlers]: THandlers[K]['handler'] extends ApiRouteHandler<
-    any,
-    infer TApiRouteSchema
-  >
-    ? { schema: TApiRouteSchema; handler: ApiRouteHandler<TContext, TApiRouteSchema> }
-    : never
-}
-
 type AddObjectKeyPrefix<T extends Record<string, any>, TPrefix extends string> = Simplify<{
   [K in keyof T as K extends string ? `${TPrefix}.${K}` : never]: T[K]
 }>
@@ -115,15 +103,7 @@ export type Auth<
   config: TAuthConfig
   context: Context<TContext>
   authContext: AuthContext
-  handlers: Simplify<
-    AddObjectKeyPrefix<
-      ChangeAuthHandlerContextToMinimalContext<
-        TContext,
-        ReturnType<typeof createAuthHandlers>['handlers']
-      >,
-      'auth'
-    >
-  >
+  handlers: Simplify<AddObjectKeyPrefix<ReturnType<typeof createAuthHandlers>['handlers'], 'auth'>>
 }
 
 export type AuthHandlers = Auth<any, any>['handlers']
@@ -162,22 +142,13 @@ export function createAuth<TContext extends MinimalContext<any> = MinimalContext
       return h.handler({ ...args, context: wrappedContext } as any) as any
     }
     return { schema: h.schema, handler }
-  }) as ChangeAuthHandlerContextToMinimalContext<
-    TContext,
-    ReturnType<typeof createAuthHandlers>['handlers']
-  >
+  }) as ReturnType<typeof createAuthHandlers>['handlers']
 
   const prefixedHandlers = Object.fromEntries(
     Object.entries(handlers).map(([key, value]) => {
       return [`auth.${key}`, value]
     })
-  ) as unknown as AddObjectKeyPrefix<
-    ChangeAuthHandlerContextToMinimalContext<
-      TContext,
-      ReturnType<typeof createAuthHandlers>['handlers']
-    >,
-    'auth'
-  >
+  ) as unknown as AddObjectKeyPrefix<ReturnType<typeof createAuthHandlers>['handlers'], 'auth'>
 
   return {
     config,