Draft: Main

src/lib/types.ts

@@ -38,22 +38,15 @@ export type CookieNames = {
   oauthCodeVerifier: string;
 };
 
+type Extract<T> =
+  T extends AriseIdConnect<infer Session, infer User>
+    ? { session: Session; user: User }
+    : never;
+
 export interface Locals<
   T extends AriseIdConnect<DefaultSessionAttributes, DefaultUserAttributes>,
 > {
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  user:
-    | ((T extends AriseIdConnect<any, infer UserAttributes>
-        ? UserAttributes
-        : never) &
-        User)
-    | null;
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  session:
-    | ((T extends AriseIdConnect<infer SessionAttributes, any>
-        ? SessionAttributes
-        : never) &
-        Session)
-    | null;
+  user: (Extract<T>["user"] & User) | null;
+  session: (Extract<T>["session"] & Session) | null;
   authPaths: Paths;
 }