@better-auth/core 1.5.6 → 1.5.7-beta.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@better-auth/core",
-  "version": "1.5.6",
+  "version": "1.5.7-beta.1",
   "description": "The most comprehensive authentication framework for TypeScript.",
   "type": "module",
   "license": "MIT",
@@ -148,18 +148,18 @@
     "@opentelemetry/api": "^1.9.0",
     "@opentelemetry/sdk-trace-base": "^1.30.0",
     "@opentelemetry/sdk-trace-node": "^1.30.0",
-    "better-call": "1.3.2",
+    "better-call": "2.0.2",
     "@cloudflare/workers-types": "^4.20250121.0",
     "jose": "^6.1.3",
-    "kysely": "^0.28.12",
+    "kysely": "^0.28.14",
     "nanostores": "^1.1.1",
-    "tsdown": "0.21.0-beta.2"
+    "tsdown": "0.21.1"
   },
   "peerDependencies": {
     "@better-auth/utils": "0.3.1",
     "@better-fetch/fetch": "1.1.21",
     "@opentelemetry/api": "^1.9.0",
-    "better-call": "1.3.2",
+    "better-call": "2.0.2",
     "@cloudflare/workers-types": ">=4",
     "jose": "^6.1.0",
     "kysely": "^0.28.5",

package/src/api/index.ts

@@ -1,7 +1,15 @@
 import type {
+	Endpoint,
 	EndpointContext,
-	EndpointOptions,
-	StrictEndpoint,
+	EndpointMetadata,
+	EndpointRuntimeOptions,
+	HTTPMethod,
+	Middleware,
+	ResolveBodyInput,
+	ResolveErrorInput,
+	ResolveMetaInput,
+	ResolveQueryInput,
+	StandardSchemaV1,
 } from "better-call";
 import { createEndpoint, createMiddleware } from "better-call";
 import { runWithEndpointContext } from "../context";
@@ -33,47 +41,145 @@ export const createAuthMiddleware = createMiddleware.create({
 
 const use = [optionsMiddleware];
 
-type EndpointHandler<
-	Path extends string,
-	Options extends EndpointOptions,
-	R,
-> = (context: EndpointContext<Path, Options, AuthContext>) => Promise<R>;
+type BodyOption<M, B extends object | undefined = undefined> = M extends
+	| "GET"
+	| "HEAD"
+	| ("GET" | "HEAD")[]
+	? { body?: never }
+	: { body?: B };
+
+type AuthEndpointOptions<
+	Method extends HTTPMethod | HTTPMethod[] | "*",
+	BodySchema extends object | undefined,
+	QuerySchema extends object | undefined,
+	Use extends Middleware[],
+	ReqHeaders extends boolean,
+	ReqRequest extends boolean,
+	Meta extends EndpointMetadata | undefined,
+	ErrorSchema extends StandardSchemaV1 | undefined = undefined,
+> = { method: Method } & BodyOption<Method, BodySchema> & {
+		query?: QuerySchema;
+		use?: [...Use];
+		requireHeaders?: ReqHeaders;
+		requireRequest?: ReqRequest;
+		error?: ErrorSchema;
+		cloneRequest?: boolean;
+		disableBody?: boolean;
+		metadata?: Meta;
+		[key: string]: any;
+	};
+
+/**
+ * Normalize readonly tuples produced by `const` type parameters
+ * into mutable arrays so downstream `M extends Array<any>` checks work.
+ */
+type NormalizeMethod<M> = M extends readonly (infer E)[] ? E[] : M;
 
+// Path + options + handler overload
 export function createAuthEndpoint<
 	Path extends string,
-	Options extends EndpointOptions,
-	R,
+	const Method extends HTTPMethod | HTTPMethod[] | "*",
+	BodySchema extends object | undefined = undefined,
+	QuerySchema extends object | undefined = undefined,
+	Use extends Middleware[] = [],
+	ReqHeaders extends boolean = false,
+	ReqRequest extends boolean = false,
+	R = unknown,
+	Meta extends EndpointMetadata | undefined = undefined,
+	ErrorSchema extends StandardSchemaV1 | undefined = undefined,
 >(
 	path: Path,
-	options: Options,
-	handler: EndpointHandler<Path, Options, R>,
-): StrictEndpoint<Path, Options, R>;
-
-export function createAuthEndpoint<
-	Path extends string,
-	Options extends EndpointOptions,
+	options: AuthEndpointOptions<
+		Method,
+		BodySchema,
+		QuerySchema,
+		Use,
+		ReqHeaders,
+		ReqRequest,
+		Meta,
+		ErrorSchema
+	>,
+	handler: (
+		ctx: EndpointContext<
+			Path,
+			Method,
+			BodySchema,
+			QuerySchema,
+			Use,
+			ReqHeaders,
+			ReqRequest,
+			AuthContext,
+			Meta
+		>,
+	) => Promise<R>,
+): Endpoint<
+	Path,
+	NormalizeMethod<Method>,
+	ResolveBodyInput<BodySchema, Meta>,
+	ResolveQueryInput<QuerySchema, Meta>,
+	Use,
 	R,
->(
-	options: Options,
-	handler: EndpointHandler<Path, Options, R>,
-): StrictEndpoint<Path, Options, R>;
+	ResolveMetaInput<Meta>,
+	ResolveErrorInput<ErrorSchema, Meta>
+>;
 
+// Options-only (virtual/path-less) overload
 export function createAuthEndpoint<
-	Path extends string,
-	Opts extends EndpointOptions,
-	R,
+	const Method extends HTTPMethod | HTTPMethod[] | "*",
+	BodySchema extends object | undefined = undefined,
+	QuerySchema extends object | undefined = undefined,
+	Use extends Middleware[] = [],
+	ReqHeaders extends boolean = false,
+	ReqRequest extends boolean = false,
+	R = unknown,
+	Meta extends EndpointMetadata | undefined = undefined,
+	ErrorSchema extends StandardSchemaV1 | undefined = undefined,
 >(
-	pathOrOptions: Path | Opts,
-	handlerOrOptions: EndpointHandler<Path, Opts, R> | Opts,
+	options: AuthEndpointOptions<
+		Method,
+		BodySchema,
+		QuerySchema,
+		Use,
+		ReqHeaders,
+		ReqRequest,
+		Meta,
+		ErrorSchema
+	>,
+	handler: (
+		ctx: EndpointContext<
+			string,
+			Method,
+			BodySchema,
+			QuerySchema,
+			Use,
+			ReqHeaders,
+			ReqRequest,
+			AuthContext,
+			Meta
+		>,
+	) => Promise<R>,
+): Endpoint<
+	string,
+	NormalizeMethod<Method>,
+	ResolveBodyInput<BodySchema, Meta>,
+	ResolveQueryInput<QuerySchema, Meta>,
+	Use,
+	R,
+	ResolveMetaInput<Meta>,
+	ResolveErrorInput<ErrorSchema, Meta>
+>;
+
+// Implementation
+export function createAuthEndpoint(
+	pathOrOptions: any,
+	handlerOrOptions: any,
 	handlerOrNever?: any,
 ) {
-	const path: Path | undefined =
+	const path: string | undefined =
 		typeof pathOrOptions === "string" ? pathOrOptions : undefined;
-	const options: Opts =
-		typeof handlerOrOptions === "object"
-			? handlerOrOptions
-			: (pathOrOptions as Opts);
-	const handler: EndpointHandler<Path, Opts, R> =
+	const options: EndpointRuntimeOptions =
+		typeof handlerOrOptions === "object" ? handlerOrOptions : pathOrOptions;
+	const handler =
 		typeof handlerOrOptions === "function" ? handlerOrOptions : handlerOrNever;
 
 	if (path) {
@@ -82,9 +188,9 @@ export function createAuthEndpoint<
 			{
 				...options,
 				use: [...(options?.use || []), ...use],
-			},
+			} as any,
 			// todo: prettify the code, we want to call `runWithEndpointContext` to top level
-			async (ctx) => runWithEndpointContext(ctx as any, () => handler(ctx)),
+			async (ctx: any) => runWithEndpointContext(ctx, () => handler(ctx)),
 		);
 	}
 
@@ -92,15 +198,19 @@ export function createAuthEndpoint<
 		{
 			...options,
 			use: [...(options?.use || []), ...use],
-		},
+		} as any,
 		// todo: prettify the code, we want to call `runWithEndpointContext` to top level
-		async (ctx) => runWithEndpointContext(ctx as any, () => handler(ctx)),
+		async (ctx: any) => runWithEndpointContext(ctx, () => handler(ctx)),
 	);
 }
 
-export type AuthEndpoint<
-	Path extends string,
-	Opts extends EndpointOptions,
-	R,
-> = ReturnType<typeof createAuthEndpoint<Path, Opts, R>>;
-export type AuthMiddleware = ReturnType<typeof createAuthMiddleware>;
+export type AuthEndpoint = ReturnType<typeof createAuthEndpoint>;
+/**
+ * The handler type for plugin hooks.
+ *
+ * Accepts both `Middleware` instances (from `createAuthMiddleware`)
+ * and plain async functions for better-call v1/v2 compatibility.
+ */
+export type AuthMiddleware = (
+	inputContext: Record<string, any>,
+) => Promise<unknown>;

package/src/context/endpoint-context.ts

@@ -5,7 +5,8 @@ import type { AuthContext } from "../types";
 import { __getBetterAuthGlobal } from "./global";
 
 export type AuthEndpointContext = Partial<
-	InputContext<string, any> & EndpointContext<string, any>
+	InputContext<string, any, any, any, any, any> &
+		EndpointContext<string, any, any, any, any, any, any, AuthContext>
 > & {
 	context: AuthContext;
 };

package/src/types/context.ts

@@ -79,9 +79,7 @@ export type BetterAuthPluginRegistryIdentifier = keyof BetterAuthPluginRegistry<
 
 export type GenericEndpointContext<
 	Options extends BetterAuthOptions = BetterAuthOptions,
-> = EndpointContext<string, any> & {
-	context: AuthContext<Options>;
-};
+> = EndpointContext<string, any, any, any, any, any, any, AuthContext<Options>>;
 
 export interface InternalAdapter<
 	_Options extends BetterAuthOptions = BetterAuthOptions,

package/src/types/plugin.ts

@@ -19,7 +19,20 @@ type DeepPartial<T> = T extends Function
 		: T;
 
 export type HookEndpointContext = Partial<
-	EndpointContext<string, any> & Omit<InputContext<string, any>, "method">
+	EndpointContext<
+		string,
+		any,
+		any,
+		any,
+		any,
+		any,
+		any,
+		AuthContext & {
+			returned?: unknown | undefined;
+			responseHeaders?: Headers | undefined;
+		}
+	> &
+		Omit<InputContext<string, any, any, any, any, any>, "method">
 > & {
 	path?: string;
 	context: AuthContext & {