better-auth 1.6.17 → 1.6.18

package/dist/client/lynx/index.d.mts

@@ -1,7 +1,7 @@
 import { ExtractPluginField, HasRequiredKeys, InferPluginFieldFromTuple, IsAny, OverrideMerge, Prettify, PrettifyDeep, RequiredKeysOf, StripEmptyObjects, UnionToIntersection } from "../../types/helper.mjs";
 import { InferActions, InferClientAPI, InferErrorCodes, IsSignal, SessionQueryParams } from "../types.mjs";
 import { useStore } from "./lynx-store.mjs";
-import { BetterAuthClientOptions, BetterAuthClientPlugin } from "@better-auth/core";
+import { BetterAuthClientOptions } from "@better-auth/core";
 import { BASE_ERROR_CODES } from "@better-auth/core/error";
 import * as nanostores from "nanostores";
 import * as _better_fetch_fetch0 from "@better-fetch/fetch";
@@ -12,7 +12,9 @@ export * from "@better-fetch/fetch";
 //#region src/client/lynx/index.d.ts
 type InferResolvedHooks<O extends BetterAuthClientOptions> = O extends {
   plugins: Array<infer Plugin>;
-} ? UnionToIntersection<Plugin extends BetterAuthClientPlugin ? Plugin["getAtoms"] extends ((fetch: any) => infer Atoms) ? Atoms extends Record<string, any> ? { [key in keyof Atoms as IsSignal<key> extends true ? never : key extends string ? `use${Capitalize<key>}` : never]: () => ReturnType<Atoms[key]["get"]> } : {} : {} : {}> : {};
+} ? UnionToIntersection<Plugin extends {
+  getAtoms?: infer GetAtoms;
+} ? GetAtoms extends ((fetch: any) => infer Atoms) ? Atoms extends Record<string, any> ? { [key in keyof Atoms as IsSignal<key> extends true ? never : key extends string ? `use${Capitalize<key>}` : never]: () => ReturnType<Atoms[key]["get"]> } : {} : {} : {}> : {};
 declare function createAuthClient<Option extends BetterAuthClientOptions>(options?: Option | undefined): UnionToIntersection<InferResolvedHooks<Option>> & InferClientAPI<Option> & InferActions<Option> & {
   useSession: () => {
     data: InferClientAPI<Option> extends {

package/dist/client/react/index.d.mts

@@ -1,7 +1,7 @@
 import { ExtractPluginField, HasRequiredKeys, InferPluginFieldFromTuple, IsAny, OverrideMerge, Prettify, PrettifyDeep, RequiredKeysOf, StripEmptyObjects, UnionToIntersection } from "../../types/helper.mjs";
 import { InferActions, InferClientAPI, InferErrorCodes, IsSignal, SessionQueryParams } from "../types.mjs";
 import { useStore } from "./react-store.mjs";
-import { BetterAuthClientOptions, BetterAuthClientPlugin } from "@better-auth/core";
+import { BetterAuthClientOptions } from "@better-auth/core";
 import { BASE_ERROR_CODES } from "@better-auth/core/error";
 import * as nanostores from "nanostores";
 import * as _better_fetch_fetch0 from "@better-fetch/fetch";
@@ -12,7 +12,9 @@ export * from "@better-fetch/fetch";
 //#region src/client/react/index.d.ts
 type InferResolvedHooks<O extends BetterAuthClientOptions> = O extends {
   plugins: Array<infer Plugin>;
-} ? UnionToIntersection<Plugin extends BetterAuthClientPlugin ? Plugin["getAtoms"] extends ((fetch: any) => infer Atoms) ? Atoms extends Record<string, any> ? { [key in keyof Atoms as IsSignal<key> extends true ? never : key extends string ? `use${Capitalize<key>}` : never]: () => ReturnType<Atoms[key]["get"]> } : {} : {} : {}> : {};
+} ? UnionToIntersection<Plugin extends {
+  getAtoms?: infer GetAtoms;
+} ? GetAtoms extends ((fetch: any) => infer Atoms) ? Atoms extends Record<string, any> ? { [key in keyof Atoms as IsSignal<key> extends true ? never : key extends string ? `use${Capitalize<key>}` : never]: () => ReturnType<Atoms[key]["get"]> } : {} : {} : {}> : {};
 declare function createAuthClient<Option extends BetterAuthClientOptions>(options?: Option | undefined): UnionToIntersection<InferResolvedHooks<Option>> & InferClientAPI<Option> & InferActions<Option> & {
   useSession: () => {
     data: InferClientAPI<Option> extends {

package/dist/client/solid/index.d.mts

@@ -1,6 +1,6 @@
 import { ExtractPluginField, HasRequiredKeys, InferPluginFieldFromTuple, IsAny, OverrideMerge, Prettify, PrettifyDeep, RequiredKeysOf, StripEmptyObjects, UnionToIntersection } from "../../types/helper.mjs";
 import { InferActions, InferClientAPI, InferErrorCodes, IsSignal, SessionQueryParams } from "../types.mjs";
-import { BetterAuthClientOptions, BetterAuthClientPlugin } from "@better-auth/core";
+import { BetterAuthClientOptions } from "@better-auth/core";
 import { BASE_ERROR_CODES } from "@better-auth/core/error";
 import * as _better_fetch_fetch0 from "@better-fetch/fetch";
 import { BetterFetchError } from "@better-fetch/fetch";
@@ -11,7 +11,9 @@ export * from "@better-fetch/fetch";
 //#region src/client/solid/index.d.ts
 type InferResolvedHooks<O extends BetterAuthClientOptions> = O extends {
   plugins: Array<infer Plugin>;
-} ? UnionToIntersection<Plugin extends BetterAuthClientPlugin ? Plugin["getAtoms"] extends ((fetch: any) => infer Atoms) ? Atoms extends Record<string, any> ? { [key in keyof Atoms as IsSignal<key> extends true ? never : key extends string ? `use${Capitalize<key>}` : never]: () => Accessor<ReturnType<Atoms[key]["get"]>> } : {} : {} : {}> : {};
+} ? UnionToIntersection<Plugin extends {
+  getAtoms?: infer GetAtoms;
+} ? GetAtoms extends ((fetch: any) => infer Atoms) ? Atoms extends Record<string, any> ? { [key in keyof Atoms as IsSignal<key> extends true ? never : key extends string ? `use${Capitalize<key>}` : never]: () => Accessor<ReturnType<Atoms[key]["get"]>> } : {} : {} : {}> : {};
 declare function createAuthClient<Option extends BetterAuthClientOptions>(options?: Option | undefined): UnionToIntersection<InferResolvedHooks<Option>> & InferClientAPI<Option> & InferActions<Option> & {
   useSession: () => Accessor<{
     data: InferClientAPI<Option> extends {

package/dist/client/svelte/index.d.mts

@@ -1,6 +1,6 @@
 import { ExtractPluginField, HasRequiredKeys, InferPluginFieldFromTuple, IsAny, OverrideMerge, Prettify, PrettifyDeep, RequiredKeysOf, StripEmptyObjects, UnionToIntersection } from "../../types/helper.mjs";
 import { InferActions, InferClientAPI, InferErrorCodes, IsSignal, SessionQueryParams } from "../types.mjs";
-import { BetterAuthClientOptions, BetterAuthClientPlugin } from "@better-auth/core";
+import { BetterAuthClientOptions } from "@better-auth/core";
 import { BASE_ERROR_CODES } from "@better-auth/core/error";
 import * as nanostores from "nanostores";
 import { Atom } from "nanostores";
@@ -12,7 +12,9 @@ export * from "@better-fetch/fetch";
 //#region src/client/svelte/index.d.ts
 type InferResolvedHooks<O extends BetterAuthClientOptions> = O extends {
   plugins: Array<infer Plugin>;
-} ? UnionToIntersection<Plugin extends BetterAuthClientPlugin ? Plugin["getAtoms"] extends ((fetch: any) => infer Atoms) ? Atoms extends Record<string, any> ? { [key in keyof Atoms as IsSignal<key> extends true ? never : key extends string ? `use${Capitalize<key>}` : never]: () => Atoms[key] } : {} : {} : {}> : {};
+} ? UnionToIntersection<Plugin extends {
+  getAtoms?: infer GetAtoms;
+} ? GetAtoms extends ((fetch: any) => infer Atoms) ? Atoms extends Record<string, any> ? { [key in keyof Atoms as IsSignal<key> extends true ? never : key extends string ? `use${Capitalize<key>}` : never]: () => Atoms[key] } : {} : {} : {}> : {};
 declare function createAuthClient<Option extends BetterAuthClientOptions>(options?: Option | undefined): UnionToIntersection<InferResolvedHooks<Option>> & InferClientAPI<Option> & InferActions<Option> & {
   useSession: () => Atom<{
     data: InferClientAPI<Option> extends {

package/dist/client/types.d.mts

@@ -3,25 +3,32 @@ import { StripEmptyObjects, UnionToIntersection } from "../types/helper.mjs";
 import { InferRoutes } from "./path-to-object.mjs";
 import { Session as Session$1, User as User$1 } from "../types/models.mjs";
 import { Auth } from "../types/auth.mjs";
-import { BetterAuthClientOptions as BetterAuthClientOptions$1, BetterAuthClientPlugin as BetterAuthClientPlugin$1, ClientAtomListener, ClientStore as ClientStore$1 } from "@better-auth/core";
-import { BetterAuthPluginDBSchema, InferDBFieldsOutput } from "@better-auth/core/db";
-import { RawError } from "@better-auth/core/utils/error-codes";
+import { BetterAuthClientOptions as BetterAuthClientOptions$1, BetterAuthClientPlugin, ClientAtomListener, ClientStore as ClientStore$1 } from "@better-auth/core";
+import { DBFieldAttribute, InferDBFieldsOutput } from "@better-auth/core/db";
 
 //#region src/client/types.d.ts
+type ClientPluginError<K extends string = string> = {
+  readonly code: K;
+  message: string;
+};
 type InferPluginEndpoints<Plugins> = Plugins extends Array<infer Pl> ? UnionToIntersection<Pl extends {
-  $InferServerPlugin: infer Plug;
+  $InferServerPlugin?: infer Plug;
 } ? Plug extends {
-  endpoints: infer Endpoints;
-} ? Endpoints : {} : {}> : {};
+  endpoints?: infer Endpoints;
+} ? Endpoints extends Record<string, unknown> ? Endpoints : {} : {} : {}> : {};
 type InferClientAPI<O extends BetterAuthClientOptions$1> = InferRoutes<O["plugins"] extends Array<any> ? Omit<Auth["api"], keyof InferPluginEndpoints<O["plugins"]>> & InferPluginEndpoints<O["plugins"]> : Auth["api"], O>;
-type InferActions<O extends BetterAuthClientOptions$1> = (O["plugins"] extends Array<infer Plugin> ? UnionToIntersection<Plugin extends BetterAuthClientPlugin$1 ? Plugin["getActions"] extends ((...args: any) => infer Actions) ? Actions : {} : {}> : {}) & InferRoutes<O["$InferAuth"] extends {
+type InferActions<O extends BetterAuthClientOptions$1> = (O["plugins"] extends Array<infer Plugin> ? UnionToIntersection<Plugin extends {
+  getActions?: infer GetActions;
+} ? GetActions extends ((...args: any) => infer Actions) ? Actions : {} : {}> : {}) & InferRoutes<O["$InferAuth"] extends {
   plugins: infer Plugins;
 } ? Plugins extends Array<infer Plugin> ? Plugin extends {
-  endpoints: infer Endpoints;
-} ? Endpoints : {} : {} : {}, O>;
-type InferErrorCodes<O extends BetterAuthClientOptions$1> = O["plugins"] extends Array<infer Plugin> ? UnionToIntersection<Plugin extends BetterAuthClientPlugin$1 ? Plugin["$InferServerPlugin"] extends {
-  $ERROR_CODES: infer E;
-} ? { [K in keyof E & string]: E[K] extends RawError ? RawError<K> : never } : {} : {}> : {};
+  endpoints?: infer Endpoints;
+} ? Endpoints extends Record<string, unknown> ? Endpoints : {} : {} : {} : {}, O>;
+type InferErrorCodes<O extends BetterAuthClientOptions$1> = O["plugins"] extends Array<infer Plugin> ? UnionToIntersection<Plugin extends {
+  $InferServerPlugin?: infer ServerPlugin;
+} ? ServerPlugin extends {
+  $ERROR_CODES?: infer E;
+} ? { [K in keyof E & string]: E[K] extends ClientPluginError ? ClientPluginError<K> : never } : {} : {}> : {};
 /**
  * signals are just used to recall a computed value.
  * as a convention they start with "$"
@@ -29,12 +36,16 @@ type InferErrorCodes<O extends BetterAuthClientOptions$1> = O["plugins"] extends
 type IsSignal<T> = T extends `$${infer _}` ? true : false;
 type InferSessionFromClient<O extends BetterAuthClientOptions$1> = StripEmptyObjects<Session$1 & UnionToIntersection<InferAdditionalFromClient<O, "session", "output">>>;
 type InferUserFromClient<O extends BetterAuthClientOptions$1> = StripEmptyObjects<User$1 & UnionToIntersection<InferAdditionalFromClient<O, "user", "output">>>;
-type InferAdditionalFromClient<Options extends BetterAuthClientOptions$1, Key extends string, Format extends "input" | "output" = "output"> = Options["plugins"] extends Array<infer Plugin> ? Plugin extends BetterAuthClientPlugin$1 ? Plugin["$InferServerPlugin"] extends {
-  schema: infer Schema;
-} ? Schema extends BetterAuthPluginDBSchema ? Format extends "input" ? InferFieldsInputClient<Schema[Key]["fields"]> : InferDBFieldsOutput<Schema[Key]["fields"]> : {} : {} : {} : {};
+type InferAdditionalFromClient<Options extends BetterAuthClientOptions$1, Key extends string, Format extends "input" | "output" = "output"> = Options["plugins"] extends Array<infer Plugin> ? Plugin extends {
+  $InferServerPlugin?: infer ServerPlugin;
+} ? ServerPlugin extends {
+  schema?: infer Schema;
+} ? Schema extends Record<Key, {
+  fields: infer Fields;
+}> ? Fields extends Record<string, DBFieldAttribute> ? Format extends "input" ? InferFieldsInputClient<Fields> : InferDBFieldsOutput<Fields> : {} : {} : {} : {} : {};
 type SessionQueryParams = {
   disableCookieCache?: boolean | undefined;
   disableRefresh?: boolean | undefined;
 };
 //#endregion
-export { type BetterAuthClientOptions$1 as BetterAuthClientOptions, type BetterAuthClientPlugin$1 as BetterAuthClientPlugin, type ClientAtomListener, type ClientStore$1 as ClientStore, InferActions, InferAdditionalFromClient, InferClientAPI, InferErrorCodes, InferSessionFromClient, InferUserFromClient, IsSignal, SessionQueryParams };
+export { type BetterAuthClientOptions$1 as BetterAuthClientOptions, type BetterAuthClientPlugin, type ClientAtomListener, type ClientStore$1 as ClientStore, InferActions, InferAdditionalFromClient, InferClientAPI, InferErrorCodes, InferSessionFromClient, InferUserFromClient, IsSignal, SessionQueryParams };

package/dist/client/vanilla.d.mts

@@ -1,6 +1,6 @@
 import { PrettifyDeep, UnionToIntersection } from "../types/helper.mjs";
 import { InferActions, InferClientAPI, InferErrorCodes, IsSignal, SessionQueryParams } from "./types.mjs";
-import { BetterAuthClientOptions, BetterAuthClientPlugin } from "@better-auth/core";
+import { BetterAuthClientOptions } from "@better-auth/core";
 import { BASE_ERROR_CODES } from "@better-auth/core/error";
 import * as nanostores from "nanostores";
 import { Atom } from "nanostores";
@@ -10,7 +10,9 @@ import { BetterFetchError } from "@better-fetch/fetch";
 //#region src/client/vanilla.d.ts
 type InferResolvedHooks<O extends BetterAuthClientOptions> = O extends {
   plugins: Array<infer Plugin>;
-} ? UnionToIntersection<Plugin extends BetterAuthClientPlugin ? Plugin["getAtoms"] extends ((fetch: any) => infer Atoms) ? Atoms extends Record<string, any> ? { [key in keyof Atoms as IsSignal<key> extends true ? never : key extends string ? `use${Capitalize<key>}` : never]: Atoms[key] } : {} : {} : {}> : {};
+} ? UnionToIntersection<Plugin extends {
+  getAtoms?: infer GetAtoms;
+} ? GetAtoms extends ((fetch: any) => infer Atoms) ? Atoms extends Record<string, any> ? { [key in keyof Atoms as IsSignal<key> extends true ? never : key extends string ? `use${Capitalize<key>}` : never]: Atoms[key] } : {} : {} : {}> : {};
 declare function createAuthClient<Option extends BetterAuthClientOptions>(options?: Option | undefined): UnionToIntersection<InferResolvedHooks<Option>> & InferClientAPI<Option> & InferActions<Option> & {
   useSession: Atom<{
     data: InferClientAPI<Option> extends {

package/dist/client/vue/index.d.mts

@@ -1,6 +1,6 @@
 import { ExtractPluginField, HasRequiredKeys, InferPluginFieldFromTuple, IsAny, OverrideMerge, Prettify, PrettifyDeep, RequiredKeysOf, StripEmptyObjects, UnionToIntersection } from "../../types/helper.mjs";
 import { InferActions, InferClientAPI, InferErrorCodes, IsSignal, SessionQueryParams } from "../types.mjs";
-import { BetterAuthClientOptions, BetterAuthClientPlugin } from "@better-auth/core";
+import { BetterAuthClientOptions } from "@better-auth/core";
 import { BASE_ERROR_CODES } from "@better-auth/core/error";
 import * as nanostores from "nanostores";
 import * as _better_fetch_fetch0 from "@better-fetch/fetch";
@@ -12,7 +12,9 @@ export * from "@better-fetch/fetch";
 //#region src/client/vue/index.d.ts
 type InferResolvedHooks<O extends BetterAuthClientOptions> = O extends {
   plugins: Array<infer Plugin>;
-} ? UnionToIntersection<Plugin extends BetterAuthClientPlugin ? Plugin["getAtoms"] extends ((fetch: any) => infer Atoms) ? Atoms extends Record<string, any> ? { [key in keyof Atoms as IsSignal<key> extends true ? never : key extends string ? `use${Capitalize<key>}` : never]: () => DeepReadonly<Ref<ReturnType<Atoms[key]["get"]>>> } : {} : {} : {}> : {};
+} ? UnionToIntersection<Plugin extends {
+  getAtoms?: infer GetAtoms;
+} ? GetAtoms extends ((fetch: any) => infer Atoms) ? Atoms extends Record<string, any> ? { [key in keyof Atoms as IsSignal<key> extends true ? never : key extends string ? `use${Capitalize<key>}` : never]: () => DeepReadonly<Ref<ReturnType<Atoms[key]["get"]>>> } : {} : {} : {}> : {};
 declare function createAuthClient<Option extends BetterAuthClientOptions>(options?: Option | undefined): UnionToIntersection<InferResolvedHooks<Option>> & InferClientAPI<Option> & InferActions<Option> & {
   useSession: {
     (): DeepReadonly<Ref<{

package/dist/package.mjs

@@ -1,4 +1,4 @@
 //#region package.json
-var version = "1.6.17";
+var version = "1.6.18";
 //#endregion
 export { version };

package/dist/plugins/index.d.mts

@@ -48,7 +48,7 @@ import { OAUTH_POPUP_COMPLETE_SCRIPT, OAUTH_POPUP_SCRIPT_CSP_HASH, oauthPopup }
 import { OAuthProxyOptions, oAuthProxy } from "./oauth-proxy/index.mjs";
 import { OneTapOptions, oneTap } from "./one-tap/index.mjs";
 import { OneTimeTokenOptions, oneTimeToken } from "./one-time-token/index.mjs";
-import { FieldSchema, OpenAPIModelSchema, Path, generator } from "./open-api/generator.mjs";
+import { FieldSchema, OpenAPIModelSchema, OpenAPIParameter, OpenAPISchema, Path, generator } from "./open-api/generator.mjs";
 import { OpenAPIOptions, openAPI } from "./open-api/index.mjs";
 import { PhoneNumberOptions, UserWithPhoneNumber } from "./phone-number/types.mjs";
 import { phoneNumber } from "./phone-number/index.mjs";
@@ -66,4 +66,4 @@ import { USERNAME_ERROR_CODES } from "./username/error-codes.mjs";
 import { UsernameOptions, username } from "./username/index.mjs";
 import { hasPermission } from "./organization/has-permission.mjs";
 import { DefaultOrganizationPlugin, DynamicAccessControlEndpoints, OrganizationCreator, OrganizationEndpoints, OrganizationPlugin, TeamEndpoints, organization, parseRoles } from "./organization/organization.mjs";
-export { AccessControl, AdminOptions, AnonymousOptions, AnonymousSession, ArrayElement, Auth0Options, AuthorizationQuery, AuthorizeResponse, BackupCodeOptions, BaseCaptchaOptions, BaseOAuthProviderOptions, BearerOptions, CaptchaFoxOptions, CaptchaOptions, Client, CloudflareTurnstileOptions, CodeVerificationValue, CustomSessionPluginOptions, DefaultOrganizationPlugin, DeviceAuthorizationOptions, DynamicAccessControlEndpoints, MULTI_SESSION_ERROR_CODES as ERROR_CODES, EmailOTPOptions, ExactRoleStatements, FieldSchema, GenericOAuthConfig, GenericOAuthOptions, GoogleRecaptchaOptions, GumroadOptions, HCaptchaOptions, HIDE_METADATA, HaveIBeenPwnedOptions, HubSpotOptions, InferAdminRolesFromOption, InferInvitation, InferMember, InferOptionSchema, InferOrganization, InferOrganizationRolesFromOption, InferOrganizationZodRolesFromOption, InferPluginContext, InferPluginErrorCodes, InferPluginIDs, InferTeam, Invitation, InvitationInput, InvitationStatus, JWKOptions, JWSAlgorithms, Jwk, JwtOptions, KeycloakOptions, LastLoginMethodOptions, LineOptions, LoginResult, MagicLinkOptions, Member, MemberInput, MicrosoftEntraIdOptions, MultiSessionConfig, OAUTH_POPUP_COMPLETE_SCRIPT, OAUTH_POPUP_DATA_ELEMENT_ID, OAUTH_POPUP_ERROR_CODES, OAUTH_POPUP_MESSAGE_TYPE, OAUTH_POPUP_SCRIPT_CSP_HASH, OAuthAccessToken, OAuthPopupData, OAuthPopupMessage, OAuthProxyOptions, OIDCMetadata, OIDCOptions, OTPOptions, OktaOptions, OneTapOptions, OneTimeTokenOptions, OpenAPIModelSchema, OpenAPIOptions, Organization, OrganizationCreator, OrganizationEndpoints, OrganizationInput, OrganizationOptions, OrganizationPlugin, OrganizationRole, OrganizationSchema, POPUP_MARKER_COOKIE, Path, PatreonOptions, PhoneNumberOptions, Provider, Role, RoleAuthorizeRequest, RoleInput, RoleStatements, SIWEPluginOptions, SessionWithImpersonatedBy, SlackOptions, Statements, SubArray, Subset, TOTPOptions, TWO_FACTOR_ERROR_CODES, Team, TeamEndpoints, TeamInput, TeamMember, TeamMemberInput, TestCookie, TestHelpers, TestUtilsOptions, TimeString, TokenBody, TwoFactorOptions, TwoFactorProvider, TwoFactorTable, USERNAME_ERROR_CODES, UserWithAnonymous, UserWithPhoneNumber, UserWithRole, UserWithTwoFactor, UsernameOptions, admin, anonymous, auth0, backupCode2fa, bearer, captcha, createAccessControl, createJwk, customSession, defaultRolesSchema, deviceAuthorization, deviceAuthorizationOptionsSchema, emailOTP, encodeBackupCodes, generateBackupCodes, generateExportedKeyPair, generator, genericOAuth, getBackupCodes, getClient, getJwtToken, getMCPProtectedResourceMetadata, getMCPProviderMetadata, getMetadata, getOrgAdapter, gumroad, hasPermission, haveIBeenPwned, hubspot, invitationSchema, invitationStatus, jwt, keycloak, lastLoginMethod, line, magicLink, mcp, memberSchema, microsoftEntraId, ms, multiSession, oAuthDiscoveryMetadata, oAuthProtectedResourceMetadata, oAuthProxy, oauthPopup, oidcProvider, okta, oneTap, oneTimeToken, openAPI, organization, organizationRoleSchema, organizationSchema, otp2fa, parseRoles, patreon, phoneNumber, role, roleSchema, sec, signJWT, siwe, slack, teamMemberSchema, teamSchema, testUtils, toExpJWT, totp2fa, twoFactor, twoFactorClient, username, verifyBackupCode, verifyJWT, withMcpAuth };
+export { AccessControl, AdminOptions, AnonymousOptions, AnonymousSession, ArrayElement, Auth0Options, AuthorizationQuery, AuthorizeResponse, BackupCodeOptions, BaseCaptchaOptions, BaseOAuthProviderOptions, BearerOptions, CaptchaFoxOptions, CaptchaOptions, Client, CloudflareTurnstileOptions, CodeVerificationValue, CustomSessionPluginOptions, DefaultOrganizationPlugin, DeviceAuthorizationOptions, DynamicAccessControlEndpoints, MULTI_SESSION_ERROR_CODES as ERROR_CODES, EmailOTPOptions, ExactRoleStatements, FieldSchema, GenericOAuthConfig, GenericOAuthOptions, GoogleRecaptchaOptions, GumroadOptions, HCaptchaOptions, HIDE_METADATA, HaveIBeenPwnedOptions, HubSpotOptions, InferAdminRolesFromOption, InferInvitation, InferMember, InferOptionSchema, InferOrganization, InferOrganizationRolesFromOption, InferOrganizationZodRolesFromOption, InferPluginContext, InferPluginErrorCodes, InferPluginIDs, InferTeam, Invitation, InvitationInput, InvitationStatus, JWKOptions, JWSAlgorithms, Jwk, JwtOptions, KeycloakOptions, LastLoginMethodOptions, LineOptions, LoginResult, MagicLinkOptions, Member, MemberInput, MicrosoftEntraIdOptions, MultiSessionConfig, OAUTH_POPUP_COMPLETE_SCRIPT, OAUTH_POPUP_DATA_ELEMENT_ID, OAUTH_POPUP_ERROR_CODES, OAUTH_POPUP_MESSAGE_TYPE, OAUTH_POPUP_SCRIPT_CSP_HASH, OAuthAccessToken, OAuthPopupData, OAuthPopupMessage, OAuthProxyOptions, OIDCMetadata, OIDCOptions, OTPOptions, OktaOptions, OneTapOptions, OneTimeTokenOptions, OpenAPIModelSchema, OpenAPIOptions, OpenAPIParameter, OpenAPISchema, Organization, OrganizationCreator, OrganizationEndpoints, OrganizationInput, OrganizationOptions, OrganizationPlugin, OrganizationRole, OrganizationSchema, POPUP_MARKER_COOKIE, Path, PatreonOptions, PhoneNumberOptions, Provider, Role, RoleAuthorizeRequest, RoleInput, RoleStatements, SIWEPluginOptions, SessionWithImpersonatedBy, SlackOptions, Statements, SubArray, Subset, TOTPOptions, TWO_FACTOR_ERROR_CODES, Team, TeamEndpoints, TeamInput, TeamMember, TeamMemberInput, TestCookie, TestHelpers, TestUtilsOptions, TimeString, TokenBody, TwoFactorOptions, TwoFactorProvider, TwoFactorTable, USERNAME_ERROR_CODES, UserWithAnonymous, UserWithPhoneNumber, UserWithRole, UserWithTwoFactor, UsernameOptions, admin, anonymous, auth0, backupCode2fa, bearer, captcha, createAccessControl, createJwk, customSession, defaultRolesSchema, deviceAuthorization, deviceAuthorizationOptionsSchema, emailOTP, encodeBackupCodes, generateBackupCodes, generateExportedKeyPair, generator, genericOAuth, getBackupCodes, getClient, getJwtToken, getMCPProtectedResourceMetadata, getMCPProviderMetadata, getMetadata, getOrgAdapter, gumroad, hasPermission, haveIBeenPwned, hubspot, invitationSchema, invitationStatus, jwt, keycloak, lastLoginMethod, line, magicLink, mcp, memberSchema, microsoftEntraId, ms, multiSession, oAuthDiscoveryMetadata, oAuthProtectedResourceMetadata, oAuthProxy, oauthPopup, oidcProvider, okta, oneTap, oneTimeToken, openAPI, organization, organizationRoleSchema, organizationSchema, otp2fa, parseRoles, patreon, phoneNumber, role, roleSchema, sec, signJWT, siwe, slack, teamMemberSchema, teamSchema, testUtils, toExpJWT, totp2fa, twoFactor, twoFactorClient, username, verifyBackupCode, verifyJWT, withMcpAuth };

package/dist/plugins/open-api/generator.d.mts

@@ -4,63 +4,72 @@ import { OpenAPIParameter, OpenAPISchemaType } from "better-call";
 
 //#region src/plugins/open-api/generator.d.ts
 interface Path {
-  get?: {
-    tags?: string[];
-    operationId?: string;
-    description?: string;
-    security?: [{
-      bearerAuth: string[];
-    }];
-    parameters?: OpenAPIParameter[];
-    responses?: { [key in string]: {
-      description?: string;
-      content: {
-        "application/json": {
-          schema: {
-            type?: OpenAPISchemaType;
-            properties?: Record<string, any>;
-            required?: string[];
-            $ref?: string;
-          };
-        };
-      };
-    } };
-  } | undefined;
-  post?: {
-    tags?: string[];
-    operationId?: string;
-    description?: string;
-    security?: [{
-      bearerAuth: string[];
-    }];
-    parameters?: OpenAPIParameter[];
-    requestBody?: {
-      content: {
-        "application/json": {
-          schema: {
-            type?: OpenAPISchemaType;
-            properties?: Record<string, any>;
-            required?: string[];
-            $ref?: string;
-          };
-        };
-      };
-    };
-    responses?: { [key in string]: {
-      description?: string;
-      content: {
-        "application/json": {
-          schema: {
-            type?: OpenAPISchemaType;
-            properties?: Record<string, any>;
-            required?: string[];
-            $ref?: string;
-          };
-        };
-      };
-    } };
-  } | undefined;
+  get?: OpenAPIOperation | undefined;
+  post?: OpenAPIOperation | undefined;
+  put?: OpenAPIOperation | undefined;
+  patch?: OpenAPIOperation | undefined;
+  delete?: OpenAPIOperation | undefined;
 }
+type OpenAPISchemaPrimitiveType = OpenAPISchemaType | "null";
+type OpenAPISchema = {
+  type?: OpenAPISchemaPrimitiveType | OpenAPISchemaPrimitiveType[];
+  properties?: Record<string, OpenAPISchema>;
+  required?: string[];
+  $ref?: string;
+  description?: string;
+  default?: unknown;
+  readOnly?: boolean;
+  format?: string;
+  deprecated?: boolean;
+  enum?: unknown[];
+  items?: OpenAPISchema;
+  minLength?: number;
+  maxLength?: number;
+  minimum?: number;
+  maximum?: number;
+  additionalProperties?: boolean | OpenAPISchema;
+  propertyNames?: OpenAPISchema;
+  allOf?: OpenAPISchema[];
+  anyOf?: OpenAPISchema[];
+  oneOf?: OpenAPISchema[];
+  const?: unknown;
+  example?: unknown;
+};
+type OpenAPIParameter$1 = Omit<OpenAPIParameter, "schema"> & {
+  schema?: OpenAPISchema;
+};
+type OpenAPIMediaTypeObject = {
+  schema?: OpenAPISchema;
+};
+type OpenAPIResponseContent = {
+  "application/json"?: OpenAPIMediaTypeObject;
+  "text/plain"?: OpenAPIMediaTypeObject;
+  "text/html"?: OpenAPIMediaTypeObject;
+  [contentType: string]: OpenAPIMediaTypeObject | undefined;
+};
+type OpenAPIResponse = {
+  description?: string;
+  content?: OpenAPIResponseContent;
+};
+type OpenAPIRequestBody = {
+  required?: boolean;
+  content: {
+    "application/json": {
+      schema: OpenAPISchema;
+    };
+  };
+};
+type OpenAPIOperation = {
+  tags?: string[];
+  operationId?: string;
+  description?: string;
+  security?: [{
+    bearerAuth: string[];
+  }];
+  parameters?: OpenAPIParameter$1[];
+  requestBody?: OpenAPIRequestBody;
+  responses?: Record<string, OpenAPIResponse>;
+};
 type FieldSchema = {
   type: DBFieldType;
   default?: (DBFieldAttributeConfig["defaultValue"] | "Generated at runtime") | undefined;
@@ -111,4 +120,4 @@ declare function generator(ctx: AuthContext, options: BetterAuthOptions): Promis
   paths: Record<string, Path>;
 }>;
 //#endregion
-export { FieldSchema, OpenAPIModelSchema, Path, generator };
+export { FieldSchema, OpenAPIModelSchema, OpenAPIParameter$1 as OpenAPIParameter, OpenAPISchema, Path, generator };

package/dist/plugins/open-api/generator.mjs

@@ -3,17 +3,17 @@ import { getEndpoints } from "../../api/index.mjs";
 import * as z from "zod";
 import { toPascalCase } from "@better-auth/core/utils/string";
 //#region src/plugins/open-api/generator.ts
-const allowedType = new Set([
+const OPEN_API_SCHEMA_TYPES = new Set([
 	"string",
 	"number",
 	"boolean",
 	"array",
 	"object"
 ]);
-function getTypeFromZodType(zodType) {
-	if (zodType instanceof z.ZodDefault) return getTypeFromZodType(zodType.unwrap());
+function getOpenApiTypeFromZodType(zodType) {
+	if (zodType instanceof z.ZodDefault || zodType instanceof z.ZodPrefault) return getOpenApiTypeFromZodType(unwrapZodSchema(zodType));
 	const type = zodType.type;
-	return allowedType.has(type) ? type : "string";
+	return OPEN_API_SCHEMA_TYPES.has(type) ? type : "string";
 }
 function getFieldSchema(field) {
 	const schema = {
@@ -24,6 +24,48 @@ function getFieldSchema(field) {
 	if (field.input === false) schema.readOnly = true;
 	return schema;
 }
+function asZodSchema(schema) {
+	return schema;
+}
+function unwrapZodSchema(zodType) {
+	return asZodSchema(zodType.unwrap());
+}
+function getZodDef(zodType) {
+	return zodType._def;
+}
+function getZodDescription(zodType) {
+	return zodType.description;
+}
+function withDescription(schema, zodType) {
+	const description = getZodDescription(zodType);
+	return description ? {
+		...schema,
+		description
+	} : schema;
+}
+function addNullType(schema) {
+	if (schema.type) {
+		const type = Array.isArray(schema.type) ? schema.type : [schema.type];
+		const nullableType = Array.from(new Set([...type, "null"]));
+		return {
+			...schema,
+			type: nullableType
+		};
+	}
+	return { anyOf: [schema, { type: "null" }] };
+}
+function getZodStringSchemaConstraints(zodType) {
+	const minLength = zodType.minLength;
+	const maxLength = zodType.maxLength;
+	return {
+		...typeof minLength === "number" ? { minLength } : {},
+		...typeof maxLength === "number" ? { maxLength } : {}
+	};
+}
+function getZodPipeSchema(zodType) {
+	const def = getZodDef(zodType);
+	return def.in instanceof z.ZodTransform && def.out instanceof z.ZodType ? def.out : def.in;
+}
 function getParameters(options) {
 	const parameters = [];
 	if (options.metadata?.openapi?.parameters) {
@@ -31,62 +73,93 @@ function getParameters(options) {
 		return parameters;
 	}
 	if (options.query instanceof z.ZodObject) Object.entries(options.query.shape).forEach(([key, value]) => {
-		if (value instanceof z.ZodType) parameters.push({
-			name: key,
-			in: "query",
-			schema: {
-				...processZodType(value),
-				..."minLength" in value && value.minLength ? { minLength: value.minLength } : {}
-			}
-		});
+		if (value instanceof z.ZodType) {
+			const parameterSchema = toOpenApiSchema(value);
+			parameters.push({
+				name: key,
+				in: "query",
+				schema: parameterSchema
+			});
+		}
 	});
 	return parameters;
 }
+function getRequestBodySchemaInfo(zodType) {
+	return {
+		required: !schemaAcceptsUndefined(zodType),
+		schema: zodType
+	};
+}
+function schemaAcceptsUndefined(zodType) {
+	if (zodType instanceof z.ZodOptional || zodType instanceof z.ZodDefault || zodType instanceof z.ZodPrefault || zodType instanceof z.ZodCatch || zodType instanceof z.ZodUndefined || zodType instanceof z.ZodVoid) return true;
+	if (zodType instanceof z.ZodNonOptional) return false;
+	if (zodType instanceof z.ZodNullable || zodType instanceof z.ZodReadonly) return schemaAcceptsUndefined(unwrapZodSchema(zodType));
+	if (zodType instanceof z.ZodPipe) return schemaAcceptsUndefined(getZodPipeSchema(zodType));
+	if (zodType instanceof z.ZodUnion) return getZodDef(zodType).options.some((option) => schemaAcceptsUndefined(option));
+	if (zodType instanceof z.ZodIntersection) {
+		const def = getZodDef(zodType);
+		return schemaAcceptsUndefined(def.left) && schemaAcceptsUndefined(def.right);
+	}
+	return false;
+}
+function isUndefinedOnlySchema(zodType) {
+	return zodType instanceof z.ZodUndefined || zodType instanceof z.ZodVoid;
+}
+function isMergeableObjectSchema(schema) {
+	const type = schema?.type;
+	return !!schema && (type === "object" || Array.isArray(type) && type.includes("object")) && schema.$ref === void 0 && schema.allOf === void 0 && schema.anyOf === void 0;
+}
+function schemaAllowsNull(schema) {
+	const type = schema?.type;
+	return Array.isArray(type) && type.includes("null");
+}
+function areSchemasEqual(left, right) {
+	return JSON.stringify(left) === JSON.stringify(right);
+}
+function areSchemaMembersCompatible(left, right) {
+	if (left === void 0 || right === void 0) return true;
+	if (typeof left === "boolean" || typeof right === "boolean") return left === right;
+	return areSchemasEqual(left, right);
+}
+function mergeObjectSchemas(left, right, description) {
+	const properties = { ...left.properties || {} };
+	for (const [key, value] of Object.entries(right.properties || {})) {
+		if (properties[key] !== void 0 && !areSchemasEqual(properties[key], value)) return;
+		properties[key] = value;
+	}
+	const required = Array.from(new Set([...left.required || [], ...right.required || []]));
+	const leftAdditionalProperties = left.additionalProperties;
+	const rightAdditionalProperties = right.additionalProperties;
+	if (!areSchemaMembersCompatible(leftAdditionalProperties, rightAdditionalProperties)) return;
+	const leftPropertyNames = left.propertyNames;
+	const rightPropertyNames = right.propertyNames;
+	if (!areSchemaMembersCompatible(leftPropertyNames, rightPropertyNames)) return;
+	const additionalProperties = leftAdditionalProperties ?? rightAdditionalProperties;
+	const propertyNames = leftPropertyNames ?? rightPropertyNames;
+	return {
+		type: schemaAllowsNull(left) && schemaAllowsNull(right) ? ["object", "null"] : "object",
+		...Object.keys(properties).length > 0 ? { properties } : {},
+		...required.length > 0 ? { required } : {},
+		...additionalProperties !== void 0 ? { additionalProperties } : {},
+		...propertyNames !== void 0 ? { propertyNames } : {},
+		...description ?? left.description ?? right.description ? { description: description ?? left.description ?? right.description } : {}
+	};
+}
 function getRequestBody(options) {
 	if (options.metadata?.openapi?.requestBody) return options.metadata.openapi.requestBody;
 	if (!options.body) return void 0;
-	if (options.body instanceof z.ZodObject || options.body instanceof z.ZodOptional) {
-		const shape = options.body.shape;
-		if (!shape) return void 0;
-		const properties = {};
-		const required = [];
-		Object.entries(shape).forEach(([key, value]) => {
-			if (value instanceof z.ZodType) {
-				properties[key] = processZodType(value);
-				if (!(value instanceof z.ZodOptional)) required.push(key);
-			}
-		});
-		return {
-			required: options.body instanceof z.ZodOptional ? false : options.body ? true : false,
-			content: { "application/json": { schema: {
-				type: "object",
-				properties,
-				required
-			} } }
-		};
-	}
+	const requestBodySchemaInfo = getRequestBodySchemaInfo(options.body);
+	const schema = toOpenApiSchema(requestBodySchemaInfo.schema);
+	return {
+		required: requestBodySchemaInfo.required,
+		content: { "application/json": { schema } }
+	};
 }
-function processZodType(zodType) {
-	if (zodType instanceof z.ZodOptional) {
-		const innerSchema = processZodType(zodType.unwrap());
-		if (innerSchema.type) {
-			const type = Array.isArray(innerSchema.type) ? innerSchema.type : [innerSchema.type];
-			return {
-				...innerSchema,
-				type: Array.from(new Set([...type, "null"]))
-			};
-		}
-		return { anyOf: [innerSchema, { type: "null" }] };
-	}
-	if (zodType instanceof z.ZodDefault) {
-		const innerSchema = processZodType(zodType.unwrap());
-		const defaultValueDef = zodType._def.defaultValue;
-		const defaultValue = typeof defaultValueDef === "function" ? defaultValueDef() : defaultValueDef;
-		return {
-			...innerSchema,
-			default: defaultValue
-		};
-	}
+function toOpenApiSchema(zodType) {
+	if (zodType instanceof z.ZodOptional) return toOpenApiSchema(unwrapZodSchema(zodType));
+	if (zodType instanceof z.ZodNullable) return addNullType(toOpenApiSchema(unwrapZodSchema(zodType)));
+	if (zodType instanceof z.ZodDefault || zodType instanceof z.ZodPrefault || zodType instanceof z.ZodNonOptional) return toOpenApiSchema(unwrapZodSchema(zodType));
+	if (zodType instanceof z.ZodAny) return withDescription({}, zodType);
 	if (zodType instanceof z.ZodObject) {
 		const shape = zodType.shape;
 		if (shape) {
@@ -94,22 +167,64 @@ function processZodType(zodType) {
 			const required = [];
 			Object.entries(shape).forEach(([key, value]) => {
 				if (value instanceof z.ZodType) {
-					properties[key] = processZodType(value);
-					if (!(value instanceof z.ZodOptional)) required.push(key);
+					properties[key] = toOpenApiSchema(value);
+					if (!schemaAcceptsUndefined(value)) required.push(key);
 				}
 			});
-			return {
+			return withDescription({
 				type: "object",
 				properties,
-				...required.length > 0 ? { required } : {},
-				description: zodType.description
-			};
+				...required.length > 0 ? { required } : {}
+			}, zodType);
 		}
 	}
-	return {
-		type: getTypeFromZodType(zodType),
-		description: zodType.description
-	};
+	if (zodType instanceof z.ZodRecord) {
+		const def = getZodDef(zodType);
+		return withDescription({
+			type: "object",
+			propertyNames: toOpenApiSchema(def.keyType),
+			additionalProperties: toOpenApiSchema(def.valueType)
+		}, zodType);
+	}
+	if (zodType instanceof z.ZodIntersection) {
+		const def = getZodDef(zodType);
+		const leftSchema = toOpenApiSchema(def.left);
+		const rightSchema = toOpenApiSchema(def.right);
+		if (isMergeableObjectSchema(leftSchema) && isMergeableObjectSchema(rightSchema)) {
+			const mergedSchema = mergeObjectSchemas(leftSchema, rightSchema, getZodDescription(zodType));
+			if (mergedSchema) return mergedSchema;
+		}
+		return withDescription({ allOf: [leftSchema, rightSchema] }, zodType);
+	}
+	if (zodType instanceof z.ZodUnion) {
+		const def = getZodDef(zodType);
+		const schemas = def.options.filter((option) => !isUndefinedOnlySchema(option)).map((option) => toOpenApiSchema(option));
+		if (schemas.length === 0) return withDescription({}, zodType);
+		if (schemas.length === 1) {
+			const schema = schemas[0];
+			if (!schema) return withDescription({}, zodType);
+			return withDescription(schema, zodType);
+		}
+		return withDescription(def.inclusive === false ? { oneOf: schemas } : { anyOf: schemas }, zodType);
+	}
+	if (zodType instanceof z.ZodArray) return withDescription({
+		type: "array",
+		items: toOpenApiSchema(getZodDef(zodType).element)
+	}, zodType);
+	if (zodType instanceof z.ZodLiteral) return withDescription({ enum: Array.from(zodType.values) }, zodType);
+	if (zodType instanceof z.ZodEnum) return withDescription({
+		type: "string",
+		enum: zodType.options
+	}, zodType);
+	if (zodType instanceof z.ZodPipe) return withDescription(toOpenApiSchema(getZodPipeSchema(zodType)), zodType);
+	if (zodType instanceof z.ZodCatch || zodType instanceof z.ZodReadonly) return withDescription(toOpenApiSchema(getZodDef(zodType).innerType), zodType);
+	if (zodType instanceof z.ZodNull) return withDescription({ type: "null" }, zodType);
+	if (zodType instanceof z.ZodUndefined) return withDescription({}, zodType);
+	if (zodType instanceof z.ZodVoid) return withDescription({}, zodType);
+	return withDescription({
+		type: getOpenApiTypeFromZodType(zodType),
+		...zodType instanceof z.ZodString ? getZodStringSchemaConstraints(zodType) : {}
+	}, zodType);
 }
 function getResponse(responses) {
 	return {

package/dist/plugins/open-api/index.d.mts

@@ -1,4 +1,4 @@
-import { FieldSchema, OpenAPIModelSchema, Path, generator } from "./generator.mjs";
+import { FieldSchema, OpenAPIModelSchema, OpenAPIParameter, OpenAPISchema, Path, generator } from "./generator.mjs";
 import { LiteralString } from "@better-auth/core";
 import * as better_call0 from "better-call";
 
@@ -94,4 +94,4 @@ declare const openAPI: <O extends OpenAPIOptions>(options?: O | undefined) => {
   options: NoInfer<O>;
 };
 //#endregion
-export { type FieldSchema, type OpenAPIModelSchema, OpenAPIOptions, type Path, generator, openAPI };
+export { type FieldSchema, type OpenAPIModelSchema, OpenAPIOptions, OpenAPIParameter, OpenAPISchema, type Path, generator, openAPI };

package/dist/test-utils/test-instance.d.mts

@@ -5,7 +5,6 @@ import { InferAPI } from "../types/api.mjs";
 import { Session, User } from "../types/models.mjs";
 import { Auth } from "../types/auth.mjs";
 import { setCookieToHeader } from "../cookies/cookie-utils.mjs";
-import * as _better_auth_core0 from "@better-auth/core";
 import { Awaitable, BetterAuthClientOptions, BetterAuthOptions } from "@better-auth/core";
 import * as _better_auth_core_oauth20 from "@better-auth/core/oauth2";
 import * as _better_auth_core_utils_error_codes0 from "@better-auth/core/utils/error-codes";
@@ -38,7 +37,9 @@ declare function getTestInstance<O extends Partial<BetterAuthOptions>, C extends
     };
   } ? T extends {
     plugins: Array<infer Plugin>;
-  } ? UnionToIntersection<Plugin extends _better_auth_core0.BetterAuthClientPlugin ? Plugin["getAtoms"] extends ((fetch: any) => infer Atoms) ? Atoms extends Record<string, any> ? { [key in keyof Atoms as IsSignal<key> extends true ? never : key extends string ? `use${Capitalize<key>}` : never]: Atoms[key] } : {} : {} : {}> : {} : never : never> & UnionToIntersection<InferRoute<((C extends undefined ? {} : C) & {
+  } ? UnionToIntersection<Plugin extends {
+    getAtoms?: infer GetAtoms;
+  } ? GetAtoms extends ((fetch: any) => infer Atoms) ? Atoms extends Record<string, any> ? { [key in keyof Atoms as IsSignal<key> extends true ? never : key extends string ? `use${Capitalize<key>}` : never]: Atoms[key] } : {} : {} : {}> : {} : never : never> & UnionToIntersection<InferRoute<((C extends undefined ? {} : C) & {
     baseURL: string | undefined;
     fetchOptions: {
       customFetchImpl: (url: string | URL | Request, init?: RequestInit | undefined) => Promise<Response>;
@@ -2010,10 +2011,10 @@ declare function getTestInstance<O extends Partial<BetterAuthOptions>, C extends
       customFetchImpl: (url: string | URL | Request, init?: RequestInit | undefined) => Promise<Response>;
     };
   })["plugins"] ? T_1 extends (infer Pl)[] ? UnionToIntersection<Pl extends {
-    $InferServerPlugin: infer Plug;
+    $InferServerPlugin?: infer Plug;
   } ? Plug extends {
-    endpoints: infer Endpoints;
-  } ? Endpoints : {} : {}> : {} : never : never)> & (((C extends undefined ? {} : C) & {
+    endpoints?: infer Endpoints;
+  } ? Endpoints extends Record<string, unknown> ? Endpoints : {} : {} : {}> : {} : never : never)> & (((C extends undefined ? {} : C) & {
     baseURL: string | undefined;
     fetchOptions: {
       customFetchImpl: (url: string | URL | Request, init?: RequestInit | undefined) => Promise<Response>;
@@ -2024,10 +2025,10 @@ declare function getTestInstance<O extends Partial<BetterAuthOptions>, C extends
       customFetchImpl: (url: string | URL | Request, init?: RequestInit | undefined) => Promise<Response>;
     };
   })["plugins"] ? T_2 extends (infer Pl)[] ? UnionToIntersection<Pl extends {
-    $InferServerPlugin: infer Plug;
+    $InferServerPlugin?: infer Plug;
   } ? Plug extends {
-    endpoints: infer Endpoints;
-  } ? Endpoints : {} : {}> : {} : never : never) : InferAPI<Prettify$1<{
+    endpoints?: infer Endpoints;
+  } ? Endpoints extends Record<string, unknown> ? Endpoints : {} : {} : {}> : {} : never : never) : InferAPI<Prettify$1<{
     readonly ok: better_call0.StrictEndpoint<"/ok", {
       method: "GET";
       metadata: {
@@ -3993,7 +3994,9 @@ declare function getTestInstance<O extends Partial<BetterAuthOptions>, C extends
     fetchOptions: {
       customFetchImpl: (url: string | URL | Request, init?: RequestInit | undefined) => Promise<Response>;
     };
-  })["plugins"] extends (infer Plugin_1)[] ? UnionToIntersection<Plugin_1 extends _better_auth_core0.BetterAuthClientPlugin ? Plugin_1["getActions"] extends ((...args: any) => infer Actions) ? Actions : {} : {}> : {}) & UnionToIntersection<InferRoute<((C extends undefined ? {} : C) & {
+  })["plugins"] extends (infer Plugin_1)[] ? UnionToIntersection<Plugin_1 extends {
+    getActions?: infer GetActions;
+  } ? GetActions extends ((...args: any) => infer Actions) ? Actions : {} : {}> : {}) & UnionToIntersection<InferRoute<((C extends undefined ? {} : C) & {
     baseURL: string | undefined;
     fetchOptions: {
       customFetchImpl: (url: string | URL | Request, init?: RequestInit | undefined) => Promise<Response>;
@@ -4001,8 +4004,8 @@ declare function getTestInstance<O extends Partial<BetterAuthOptions>, C extends
   })["$InferAuth"] extends {
     plugins: infer Plugins;
   } ? Plugins extends (infer Plugin_2)[] ? Plugin_2 extends {
-    endpoints: infer Endpoints_1;
-  } ? Endpoints_1 : {} : {} : {}, (C extends undefined ? {} : C) & {
+    endpoints?: infer Endpoints_1;
+  } ? Endpoints_1 extends Record<string, unknown> ? Endpoints_1 : {} : {} : {} : {}, (C extends undefined ? {} : C) & {
     baseURL: string | undefined;
     fetchOptions: {
       customFetchImpl: (url: string | URL | Request, init?: RequestInit | undefined) => Promise<Response>;
@@ -5981,10 +5984,10 @@ declare function getTestInstance<O extends Partial<BetterAuthOptions>, C extends
           customFetchImpl: (url: string | URL | Request, init?: RequestInit | undefined) => Promise<Response>;
         };
       })["plugins"] ? T_3 extends (infer Pl)[] ? UnionToIntersection<Pl extends {
-        $InferServerPlugin: infer Plug;
+        $InferServerPlugin?: infer Plug;
       } ? Plug extends {
-        endpoints: infer Endpoints;
-      } ? Endpoints : {} : {}> : {} : never : never)> & (((C extends undefined ? {} : C) & {
+        endpoints?: infer Endpoints;
+      } ? Endpoints extends Record<string, unknown> ? Endpoints : {} : {} : {}> : {} : never : never)> & (((C extends undefined ? {} : C) & {
         baseURL: string | undefined;
         fetchOptions: {
           customFetchImpl: (url: string | URL | Request, init?: RequestInit | undefined) => Promise<Response>;
@@ -5995,10 +5998,10 @@ declare function getTestInstance<O extends Partial<BetterAuthOptions>, C extends
           customFetchImpl: (url: string | URL | Request, init?: RequestInit | undefined) => Promise<Response>;
         };
       })["plugins"] ? T_4 extends (infer Pl)[] ? UnionToIntersection<Pl extends {
-        $InferServerPlugin: infer Plug;
+        $InferServerPlugin?: infer Plug;
       } ? Plug extends {
-        endpoints: infer Endpoints;
-      } ? Endpoints : {} : {}> : {} : never : never) : InferAPI<Prettify$1<{
+        endpoints?: infer Endpoints;
+      } ? Endpoints extends Record<string, unknown> ? Endpoints : {} : {} : {}> : {} : never : never) : InferAPI<Prettify$1<{
         readonly ok: better_call0.StrictEndpoint<"/ok", {
           method: "GET";
           metadata: {
@@ -10024,10 +10027,10 @@ declare function getTestInstance<O extends Partial<BetterAuthOptions>, C extends
           customFetchImpl: (url: string | URL | Request, init?: RequestInit | undefined) => Promise<Response>;
         };
       })["plugins"] ? T_5 extends (infer Pl)[] ? UnionToIntersection<Pl extends {
-        $InferServerPlugin: infer Plug;
+        $InferServerPlugin?: infer Plug;
       } ? Plug extends {
-        endpoints: infer Endpoints;
-      } ? Endpoints : {} : {}> : {} : never : never)> & (((C extends undefined ? {} : C) & {
+        endpoints?: infer Endpoints;
+      } ? Endpoints extends Record<string, unknown> ? Endpoints : {} : {} : {}> : {} : never : never)> & (((C extends undefined ? {} : C) & {
         baseURL: string | undefined;
         fetchOptions: {
           customFetchImpl: (url: string | URL | Request, init?: RequestInit | undefined) => Promise<Response>;
@@ -10038,10 +10041,10 @@ declare function getTestInstance<O extends Partial<BetterAuthOptions>, C extends
           customFetchImpl: (url: string | URL | Request, init?: RequestInit | undefined) => Promise<Response>;
         };
       })["plugins"] ? T_6 extends (infer Pl)[] ? UnionToIntersection<Pl extends {
-        $InferServerPlugin: infer Plug;
+        $InferServerPlugin?: infer Plug;
       } ? Plug extends {
-        endpoints: infer Endpoints;
-      } ? Endpoints : {} : {}> : {} : never : never) : InferAPI<Prettify$1<{
+        endpoints?: infer Endpoints;
+      } ? Endpoints extends Record<string, unknown> ? Endpoints : {} : {} : {}> : {} : never : never) : InferAPI<Prettify$1<{
         readonly ok: better_call0.StrictEndpoint<"/ok", {
           method: "GET";
           metadata: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "better-auth",
-  "version": "1.6.17",
+  "version": "1.6.18",
   "description": "The most comprehensive authentication framework for TypeScript.",
   "type": "module",
   "license": "MIT",
@@ -489,13 +489,13 @@
     "kysely": "^0.28.17 || ^0.29.0",
     "nanostores": "^1.1.1",
     "zod": "^4.3.6",
-    "@better-auth/core": "1.6.17",
-    "@better-auth/drizzle-adapter": "1.6.17",
-    "@better-auth/kysely-adapter": "1.6.17",
-    "@better-auth/memory-adapter": "1.6.17",
-    "@better-auth/mongo-adapter": "1.6.17",
-    "@better-auth/prisma-adapter": "1.6.17",
-    "@better-auth/telemetry": "1.6.17"
+    "@better-auth/core": "1.6.18",
+    "@better-auth/drizzle-adapter": "1.6.18",
+    "@better-auth/kysely-adapter": "1.6.18",
+    "@better-auth/memory-adapter": "1.6.18",
+    "@better-auth/mongo-adapter": "1.6.18",
+    "@better-auth/prisma-adapter": "1.6.18",
+    "@better-auth/telemetry": "1.6.18"
   },
   "devDependencies": {
     "@lynx-js/react": "^0.116.3",