move types

packages/core/src/adapters.ts

@@ -47,7 +47,7 @@
  * @module adapters
  */
 
-import type { Account, Awaitable, User } from "./lib/types"
+import type { Account, Awaitable, User } from "./types.js"
 
 // TODO: Discuss if we should expose methods to serialize and deserialize
 // the data? Many adapters share this logic, so it could be useful to

packages/core/src/index.ts

@@ -34,16 +34,16 @@ import { logger, setLogger, type LoggerInstance } from "./lib/utils/logger.js"
 import { toInternalRequest, toResponse } from "./lib/web.js"
 
 import type { Adapter } from "./adapters.js"
-import type { JWTOptions } from "./jwt/types.js"
 import type {
   CallbacksOptions,
   CookiesOptions,
   EventCallbacks,
   PagesOptions,
   SessionOptions,
   Theme,
-} from "./lib/types.js"
+} from "./types.js"
 import type { Provider } from "./providers/index.js"
+import { JWTOptions } from "./jwt.js"
 
 /**
  * Core functionality provided by Auth.js.

packages/core/src/jwt.ts

@@ -15,7 +15,7 @@
 import { hkdf } from "@panva/hkdf"
 import { EncryptJWT, jwtDecrypt } from "jose"
 import { SessionStore } from "./lib/cookie.js"
-import { Awaitable } from "./lib/types.js"
+import { Awaitable } from "./types.js"
 import type { LoggerInstance } from "./lib/utils/logger.js"
 
 const DEFAULT_MAX_AGE = 30 * 24 * 60 * 60 // 30 days

packages/core/src/lib/assert.ts

@@ -10,7 +10,7 @@ import {
   UntrustedHost,
 } from "./errors.js"
 
-import type { AuthConfig, RequestInternal } from "./types.js"
+import type { AuthConfig, RequestInternal } from "../types.js"
 import type { WarningCode } from "./utils/logger.js"
 
 type ConfigError =

packages/core/src/lib/callback-handler.ts

@@ -2,7 +2,7 @@ import { AccountNotLinked } from "./errors.js"
 import { fromDate } from "./utils/date.js"
 
 import type { AdapterSession, AdapterUser } from "../adapters.js"
-import type { Account, InternalOptions, User } from "./types.js"
+import type { Account, InternalOptions, User } from "../types.js"
 import type { JWT } from "../jwt.js"
 import type { OAuthConfig } from "../providers/index.js"
 import type { SessionToken } from "./cookie.js"

packages/core/src/lib/callback-url.ts

@@ -1,4 +1,4 @@
-import type { InternalOptions } from "../lib/types.js"
+import type { InternalOptions } from "../types.js"
 
 interface CreateCallbackUrlParams {
   options: InternalOptions

packages/core/src/lib/cookie.ts

@@ -3,7 +3,7 @@ import type {
   CookiesOptions,
   LoggerInstance,
   SessionStrategy,
-} from "../lib/types.js"
+} from "../types.js"
 
 // Uncomment to recalculate the estimated size
 // of an empty session cookie

packages/core/src/lib/csrf-token.ts

@@ -1,6 +1,6 @@
 import { createHash, randomString } from "./web.js"
 
-import type { InternalOptions } from "./types.js"
+import type { InternalOptions } from "../types.js"
 interface CreateCSRFTokenParams {
   options: InternalOptions
   cookieValue?: string

packages/core/src/lib/default-callbacks.ts

@@ -1,4 +1,4 @@
-import type { CallbacksOptions } from "./types.js"
+import type { CallbacksOptions } from "../types.js"
 
 export const defaultCallbacks: CallbacksOptions = {
   signIn() {

packages/core/src/lib/email/signin.ts

@@ -1,6 +1,6 @@
 import { createHash, randomString } from "../web.js"
 
-import type { InternalOptions } from "../types"
+import type { InternalOptions } from "../../types.js"
 /**
  * Starts an e-mail login flow, by generating a token,
  * and sending it to the user's e-mail (with the help of a DB adapter)

packages/core/src/lib/index.ts

@@ -9,7 +9,7 @@ import type {
   ResponseInternal,
   AuthConfig,
   ErrorPageParam,
-} from "./types.js"
+} from "../types.js"
 
 export async function AuthInternal<
   Body extends string | Record<string, any> | any[]

packages/core/src/lib/init.ts

@@ -13,7 +13,7 @@ import type {
   EventCallbacks,
   InternalOptions,
   RequestInternal,
-} from "./types.js"
+} from "../types.js"
 
 interface InitParams {
   url: URL

packages/core/src/lib/oauth/authorization-url.ts

@@ -5,7 +5,7 @@ import type {
   InternalOptions,
   RequestInternal,
   ResponseInternal,
-} from "../types.js"
+} from "../../types.js"
 import type { Cookie } from "../cookie.js"
 
 /**

packages/core/src/lib/oauth/callback.ts

@@ -10,7 +10,7 @@ import type {
   Profile,
   RequestInternal,
   TokenSet,
-} from "../types"
+} from "../../types.js"
 import type { OAuthConfigInternal } from "../../providers/index.js"
 import type { Cookie } from "../cookie.js"
 

packages/core/src/lib/oauth/nonce-handler.ts

@@ -1,7 +1,7 @@
 import * as o from "oauth4webapi"
 import * as jwt from "../../jwt.js"
 
-import type { InternalOptions } from "../types"
+import type { InternalOptions } from "../../types.js"
 import type { Cookie } from "../cookie.js"
 
 const NONCE_MAX_AGE = 60 * 15 // 15 minutes in seconds

packages/core/src/lib/oauth/pkce-handler.ts

@@ -1,7 +1,7 @@
 import * as o from "oauth4webapi"
 import * as jwt from "../../jwt.js"
 
-import type { InternalOptions } from "../types"
+import type { InternalOptions } from "../../types.js"
 import type { Cookie } from "../cookie.js"
 
 const PKCE_CODE_CHALLENGE_METHOD = "S256"

packages/core/src/lib/oauth/state-handler.ts

@@ -1,5 +1,5 @@
 import * as o from "oauth4webapi"
-import type { InternalOptions, RequestInternal } from "../types"
+import type { InternalOptions, RequestInternal } from "../../types.js"
 import type { Cookie } from "../cookie.js"
 import { InvalidState } from "../errors.js"
 

packages/core/src/lib/pages/error.tsx

@@ -1,4 +1,4 @@
-import type { ErrorPageParam, Theme } from "../types.js"
+import type { ErrorPageParam, Theme } from "../../types.js"
 
 /**
  * The following errors are passed as error query parameters to the default or overridden error page.

packages/core/src/lib/pages/index.ts

@@ -10,7 +10,7 @@ import type {
   InternalOptions,
   RequestInternal,
   ResponseInternal,
-} from "../types.js"
+} from "../../types.js"
 import type { Cookie } from "../cookie.js"
 
 function send({ html, title, status, cookies, theme }: any): ResponseInternal {

packages/core/src/lib/pages/signin.tsx

@@ -1,4 +1,8 @@
-import type { InternalProvider, SignInPageErrorParam, Theme } from "../types"
+import type {
+  InternalProvider,
+  SignInPageErrorParam,
+  Theme,
+} from "../../types.js"
 
 const signinErrors: Record<
   Lowercase<SignInPageErrorParam | "default">,

packages/core/src/lib/pages/signout.tsx

@@ -1,4 +1,4 @@
-import type { Theme } from "../types.js"
+import type { Theme } from "../../types.js"
 
 export interface SignoutProps {
   url: URL

packages/core/src/lib/pages/verify-request.tsx

@@ -1,4 +1,4 @@
-import type { Theme } from "../types.js"
+import type { Theme } from "../../types.js"
 
 interface VerifyRequestPageProps {
   url: URL

packages/core/src/lib/providers.ts

@@ -1,6 +1,6 @@
 import { merge } from "./utils/merge.js"
 
-import type { InternalProvider } from "./types"
+import type { InternalProvider } from "../types.js"
 import type {
   OAuthConfig,
   OAuthConfigInternal,

packages/core/src/lib/routes/callback.ts

@@ -5,9 +5,9 @@ import { createHash } from "../web.js"
 import { handleAuthorized } from "./shared.js"
 
 import type { AdapterSession } from "../../adapters.js"
-import type { RequestInternal, ResponseInternal, User } from "../types.js"
+import type { RequestInternal, ResponseInternal, User } from "../../types.js"
 import type { Cookie, SessionStore } from "../cookie.js"
-import type { InternalOptions } from "../types.js"
+import type { InternalOptions } from "../../types.js"
 
 /** Handle callbacks from login services */
 export async function callback(params: {

packages/core/src/lib/routes/providers.ts

@@ -1,4 +1,4 @@
-import type { InternalProvider, ResponseInternal } from "../types.js"
+import type { InternalProvider, ResponseInternal } from "../../types.js"
 
 export interface PublicProvider {
   id: string

packages/core/src/lib/routes/session.ts

@@ -2,7 +2,7 @@ import { JWTSessionError, SessionTokenError } from "../errors.js"
 import { fromDate } from "../utils/date.js"
 
 import type { Adapter } from "../../adapters.js"
-import type { InternalOptions, ResponseInternal, Session } from "../types.js"
+import type { InternalOptions, ResponseInternal, Session } from "../../types.js"
 import type { SessionStore } from "../cookie.js"
 
 /** Return a session object filtered via `callbacks.session` */

packages/core/src/lib/routes/shared.ts

@@ -1,5 +1,5 @@
 import { AuthorizedCallbackError } from "../errors.js"
-import { InternalOptions } from "../types.js"
+import { InternalOptions } from "../../types.js"
 
 import type { Adapter, AdapterUser } from "../../adapters.js"
 

packages/core/src/lib/routes/signin.ts

@@ -8,7 +8,7 @@ import type {
   InternalOptions,
   RequestInternal,
   ResponseInternal,
-} from "../types"
+} from "../../types.js"
 
 /**
  * Initiates the sign in process for OAuth and Email flows .

packages/core/src/lib/routes/signout.ts

@@ -1,6 +1,6 @@
 import { SignOutError } from "../errors.js"
 
-import type { InternalOptions, ResponseInternal } from "../types.js"
+import type { InternalOptions, ResponseInternal } from "../../types.js"
 import type { SessionStore } from "../cookie.js"
 
 /**