better-auth 1.6.27 → 1.6.28

package/dist/api/routes/update-user.d.mts

@@ -1,13 +1,14 @@
 import { AdditionalUserFieldsInput } from "../../types/models.mjs";
-import "../../types/index.mjs";
 import { BetterAuthOptions } from "@better-auth/core";
+import * as _$better_call0 from "better-call";
 import * as z from "zod";
+
 //#region src/api/routes/update-user.d.ts
-declare const updateUser: <O extends BetterAuthOptions>() => import("better-call").StrictEndpoint<"/update-user", {
+declare const updateUser: <O extends BetterAuthOptions>() => _$better_call0.StrictEndpoint<"/update-user", {
   method: "POST";
   operationId: string;
   body: z.ZodRecord<z.ZodString, z.ZodAny>;
-  use: import("better-call").Middleware<import("better-call").MiddlewareOptions, (inputContext: import("better-call").MiddlewareInputContext<import("better-call").MiddlewareOptions>) => Promise<{
+  use: _$better_call0.Middleware<_$better_call0.MiddlewareOptions, (inputContext: _$better_call0.MiddlewareInputContext<_$better_call0.MiddlewareOptions>) => Promise<{
     session: {
       session: Record<string, any> & {
         id: string;
@@ -83,7 +84,7 @@ declare const updateUser: <O extends BetterAuthOptions>() => import("better-call
 }, {
   status: boolean;
 }>;
-declare const changePassword: import("better-call").StrictEndpoint<"/change-password", {
+declare const changePassword: _$better_call0.StrictEndpoint<"/change-password", {
   method: "POST";
   operationId: string;
   body: z.ZodObject<{
@@ -91,7 +92,7 @@ declare const changePassword: import("better-call").StrictEndpoint<"/change-pass
     currentPassword: z.ZodString;
     revokeOtherSessions: z.ZodOptional<z.ZodBoolean>;
   }, z.core.$strip>;
-  use: import("better-call").Middleware<import("better-call").MiddlewareOptions, (inputContext: import("better-call").MiddlewareInputContext<import("better-call").MiddlewareOptions>) => Promise<{
+  use: _$better_call0.Middleware<_$better_call0.MiddlewareOptions, (inputContext: _$better_call0.MiddlewareInputContext<_$better_call0.MiddlewareOptions>) => Promise<{
     session: {
       session: Record<string, any> & {
         id: string;
@@ -199,12 +200,12 @@ declare const changePassword: import("better-call").StrictEndpoint<"/change-pass
     image?: string | null | undefined;
   };
 }>;
-declare const setPassword: import("better-call").StrictEndpoint<string, {
+declare const setPassword: _$better_call0.StrictEndpoint<string, {
   method: "POST";
   body: z.ZodObject<{
     newPassword: z.ZodString;
   }, z.core.$strip>;
-  use: import("better-call").Middleware<import("better-call").MiddlewareOptions, (inputContext: import("better-call").MiddlewareInputContext<import("better-call").MiddlewareOptions>) => Promise<{
+  use: _$better_call0.Middleware<_$better_call0.MiddlewareOptions, (inputContext: _$better_call0.MiddlewareInputContext<_$better_call0.MiddlewareOptions>) => Promise<{
     session: {
       session: Record<string, any> & {
         id: string;
@@ -230,9 +231,9 @@ declare const setPassword: import("better-call").StrictEndpoint<string, {
 }, {
   status: boolean;
 }>;
-declare const deleteUser: import("better-call").StrictEndpoint<"/delete-user", {
+declare const deleteUser: _$better_call0.StrictEndpoint<"/delete-user", {
   method: "POST";
-  use: import("better-call").Middleware<import("better-call").MiddlewareOptions, (inputContext: import("better-call").MiddlewareInputContext<import("better-call").MiddlewareOptions>) => Promise<{
+  use: _$better_call0.Middleware<_$better_call0.MiddlewareOptions, (inputContext: _$better_call0.MiddlewareInputContext<_$better_call0.MiddlewareOptions>) => Promise<{
     session: {
       session: Record<string, any> & {
         id: string;
@@ -317,13 +318,13 @@ declare const deleteUser: import("better-call").StrictEndpoint<"/delete-user", {
   success: boolean;
   message: string;
 }>;
-declare const deleteUserCallback: import("better-call").StrictEndpoint<"/delete-user/callback", {
+declare const deleteUserCallback: _$better_call0.StrictEndpoint<"/delete-user/callback", {
   method: "GET";
   query: z.ZodObject<{
     token: z.ZodString;
     callbackURL: z.ZodOptional<z.ZodString>;
   }, z.core.$strip>;
-  use: import("better-call").Middleware<import("better-call").MiddlewareOptions, (inputContext: import("better-call").MiddlewareInputContext<import("better-call").MiddlewareOptions>) => Promise<void>>[];
+  use: _$better_call0.Middleware<_$better_call0.MiddlewareOptions, (inputContext: _$better_call0.MiddlewareInputContext<_$better_call0.MiddlewareOptions>) => Promise<void>>[];
   metadata: {
     openapi: {
       description: string;
@@ -357,13 +358,13 @@ declare const deleteUserCallback: import("better-call").StrictEndpoint<"/delete-
   success: boolean;
   message: string;
 }>;
-declare const changeEmail: import("better-call").StrictEndpoint<"/change-email", {
+declare const changeEmail: _$better_call0.StrictEndpoint<"/change-email", {
   method: "POST";
   body: z.ZodObject<{
     newEmail: z.ZodEmail;
     callbackURL: z.ZodOptional<z.ZodString>;
   }, z.core.$strip>;
-  use: import("better-call").Middleware<import("better-call").MiddlewareOptions, (inputContext: import("better-call").MiddlewareInputContext<import("better-call").MiddlewareOptions>) => Promise<{
+  use: _$better_call0.Middleware<_$better_call0.MiddlewareOptions, (inputContext: _$better_call0.MiddlewareInputContext<_$better_call0.MiddlewareOptions>) => Promise<{
     session: {
       session: Record<string, any> & {
         id: string;

package/dist/auth/full.d.mts

@@ -1,6 +1,6 @@
 import { Auth } from "../types/auth.mjs";
-import "../types/index.mjs";
 import { BetterAuthOptions } from "@better-auth/core";
+
 //#region src/auth/full.d.ts
 /**
  * Better Auth initializer for full mode (with Kysely)

package/dist/auth/minimal.d.mts

@@ -1,6 +1,6 @@
 import { Auth } from "../types/auth.mjs";
-import "../types/index.mjs";
 import { BetterAuthOptions } from "@better-auth/core";
+
 //#region src/auth/minimal.d.ts
 /**
  * Better Auth initializer for minimal mode (without Kysely)

package/dist/client/config.d.mts

@@ -1,5 +1,7 @@
 import { BetterAuthClientOptions, ClientAtomListener } from "@better-auth/core";
 import { WritableAtom } from "nanostores";
+import * as _$_better_fetch_fetch0 from "@better-fetch/fetch";
+
 //#region src/client/config.d.ts
 declare const getClientConfig: (options?: BetterAuthClientOptions | undefined, loadEnv?: boolean | undefined) => {
   readonly baseURL: string;
@@ -7,21 +9,21 @@ declare const getClientConfig: (options?: BetterAuthClientOptions | undefined, l
   pluginsAtoms: Record<string, WritableAtom<any>>;
   pluginPathMethods: Record<string, "GET" | "POST">;
   atomListeners: ClientAtomListener[];
-  $fetch: import("@better-fetch/fetch").BetterFetch<{
-    plugins: (import("@better-fetch/fetch").BetterFetchPlugin<Record<string, any>> | {
+  $fetch: _$_better_fetch_fetch0.BetterFetch<{
+    plugins: (_$_better_fetch_fetch0.BetterFetchPlugin<Record<string, any>> | {
       id: string;
       name: string;
       hooks: {
-        onSuccess(context: import("@better-fetch/fetch").SuccessContext<any>): void;
+        onSuccess(context: _$_better_fetch_fetch0.SuccessContext<any>): void;
       };
     } | {
       id: string;
       name: string;
       hooks: {
-        onSuccess: ((context: import("@better-fetch/fetch").SuccessContext<any>) => Promise<void> | void) | undefined;
-        onError: ((context: import("@better-fetch/fetch").ErrorContext) => Promise<void> | void) | undefined;
-        onRequest: (<T extends Record<string, any>>(context: import("@better-fetch/fetch").RequestContext<T>) => Promise<import("@better-fetch/fetch").RequestContext | void> | import("@better-fetch/fetch").RequestContext | void) | undefined;
-        onResponse: ((context: import("@better-fetch/fetch").ResponseContext) => Promise<Response | void | import("@better-fetch/fetch").ResponseContext> | Response | import("@better-fetch/fetch").ResponseContext | void) | undefined;
+        onSuccess: ((context: _$_better_fetch_fetch0.SuccessContext<any>) => Promise<void> | void) | undefined;
+        onError: ((context: _$_better_fetch_fetch0.ErrorContext) => Promise<void> | void) | undefined;
+        onRequest: (<T extends Record<string, any>>(context: _$_better_fetch_fetch0.RequestContext<T>) => Promise<_$_better_fetch_fetch0.RequestContext | void> | _$_better_fetch_fetch0.RequestContext | void) | undefined;
+        onResponse: ((context: _$_better_fetch_fetch0.ResponseContext) => Promise<Response | void | _$_better_fetch_fetch0.ResponseContext> | Response | _$_better_fetch_fetch0.ResponseContext | void) | undefined;
       };
     })[];
     priority?: RequestPriority | undefined;
@@ -36,12 +38,12 @@ declare const getClientConfig: (options?: BetterAuthClientOptions | undefined, l
     referrerPolicy?: ReferrerPolicy | undefined;
     signal?: (AbortSignal | null) | undefined;
     window?: null | undefined;
-    onRetry?: ((response: import("@better-fetch/fetch").ResponseContext) => Promise<void> | void) | undefined;
+    onRetry?: ((response: _$_better_fetch_fetch0.ResponseContext) => Promise<void> | void) | undefined;
     hookOptions?: {
       cloneResponse?: boolean;
     } | undefined;
     timeout?: number | undefined;
-    customFetchImpl: import("@better-fetch/fetch").FetchEsque;
+    customFetchImpl: _$_better_fetch_fetch0.FetchEsque;
     baseURL: string;
     throw?: boolean | undefined;
     auth?: ({
@@ -67,10 +69,10 @@ declare const getClientConfig: (options?: BetterAuthClientOptions | undefined, l
     params?: any;
     duplex?: "full" | "half" | undefined;
     jsonParser: (text: string) => Promise<any> | any;
-    retry?: import("@better-fetch/fetch").RetryOptions | undefined;
+    retry?: _$_better_fetch_fetch0.RetryOptions | undefined;
     retryAttempt?: number | undefined;
-    output?: (import("@better-fetch/fetch").StandardSchemaV1 | typeof Blob | typeof File) | undefined;
-    errorSchema?: import("@better-fetch/fetch").StandardSchemaV1 | undefined;
+    output?: (_$_better_fetch_fetch0.StandardSchemaV1 | typeof Blob | typeof File) | undefined;
+    errorSchema?: _$_better_fetch_fetch0.StandardSchemaV1 | undefined;
     disableValidation?: boolean | undefined;
     disableSignal?: boolean | undefined;
   }, unknown, unknown, {}>;

package/dist/client/config.mjs

@@ -2,7 +2,7 @@ import { getBaseURL } from "../utils/url.mjs";
 import { parseJSON } from "./parser.mjs";
 import { redirectPlugin } from "./fetch-plugins.mjs";
 import { getSessionAtom } from "./session-atom.mjs";
-import { defu as defu$1 } from "defu";
+import { defu } from "defu";
 import { createFetch } from "@better-fetch/fetch";
 //#region src/client/config.ts
 const resolvePublicAuthUrl = (basePath) => {
@@ -88,7 +88,7 @@ const getClientConfig = (options, loadEnv) => {
 		},
 		atoms: pluginsAtoms
 	};
-	for (const plugin of plugins) if (plugin.getActions) pluginsActions = defu$1(plugin.getActions?.($fetch, $store, options) ?? {}, pluginsActions);
+	for (const plugin of plugins) if (plugin.getActions) pluginsActions = defu(plugin.getActions?.($fetch, $store, options) ?? {}, pluginsActions);
 	return {
 		get baseURL() {
 			return baseURL;

package/dist/client/equality.d.mts

@@ -1,4 +1,5 @@
 import { Store, StoreValue } from "nanostores";
+
 //#region src/client/equality.d.ts
 /**
  * Deep structural equality for JSON-serializable values.

package/dist/client/index.d.mts

@@ -11,18 +11,17 @@ import { SessionRefreshOptions, createSessionRefreshManager } from "./session-re
 import { AuthClient, createAuthClient } from "./vanilla.mjs";
 import { AccessControl, ArrayElement, ExactRoleStatements, Role, RoleAuthorizeRequest, RoleInput, RoleStatements, Statements, SubArray, Subset } from "../plugins/access/types.mjs";
 import { AuthorizeResponse, createAccessControl, role } from "../plugins/access/access.mjs";
-import "../plugins/access/index.mjs";
 import { OrganizationOptions } from "../plugins/organization/types.mjs";
 import { InferInvitation, InferMember, InferOrganization, InferOrganizationRolesFromOption, InferOrganizationZodRolesFromOption, InferTeam, Invitation, InvitationInput, InvitationStatus, Member, MemberInput, Organization, OrganizationInput, OrganizationRole, OrganizationSchema, Team, TeamInput, TeamMember, TeamMemberInput, defaultRolesSchema, invitationSchema, invitationStatus, memberSchema, organizationRoleSchema, organizationSchema, roleSchema, teamMemberSchema, teamSchema } from "../plugins/organization/schema.mjs";
 import { getOrgAdapter } from "../plugins/organization/adapter.mjs";
 import { hasPermission } from "../plugins/organization/has-permission.mjs";
 import { DefaultOrganizationPlugin, DynamicAccessControlEndpoints, OrganizationCreator, OrganizationEndpoints, OrganizationPlugin, TeamEndpoints, organization, parseRoles } from "../plugins/organization/organization.mjs";
-import "../plugins/organization/index.mjs";
 import { BetterAuthOptions, BetterAuthPlugin } from "@better-auth/core";
 import { DBPrimitive } from "@better-auth/core/db";
-export type * from "@better-auth/core/db";
-export type * from "nanostores";
-export type * from "@better-fetch/fetch";
+export * from "@better-auth/core/db";
+export * from "nanostores";
+export * from "@better-fetch/fetch";
+
 //#region src/client/index.d.ts
 declare const InferPlugin: <T extends BetterAuthPlugin>() => {
   id: "infer-server-plugin";
@@ -33,4 +32,4 @@ declare function InferAuth<O extends {
   options: BetterAuthOptions;
 }>(): O["options"];
 //#endregion
-export { type AccessControl, type ArrayElement, AuthClient, AuthQueryAtom, AuthQueryState, type AuthorizeResponse, type BetterAuthClientOptions, type BetterAuthClientPlugin, BroadcastChannel, BroadcastListener, BroadcastMessage, type CamelCase, type ClientAtomListener, type ClientStore, type DBPrimitive, type DefaultOrganizationPlugin, type DynamicAccessControlEndpoints, type ExactRoleStatements, type ExtractPluginField, type FocusListener, type FocusManager, type HasRequiredKeys, InferActions, InferAdditionalFromClient, InferAuth, InferClientAPI, type InferCtx, InferErrorCodes, type InferInvitation, type InferMember, type InferOrganization, type InferOrganizationRolesFromOption, type InferOrganizationZodRolesFromOption, InferPlugin, type InferPluginFieldFromTuple, type InferRoute, type InferRoutes, InferSessionFromClient, type InferSessionUpdateCtx, type InferSignUpEmailCtx, type InferTeam, InferUserFromClient, type InferUserUpdateCtx, type Invitation, type InvitationInput, type InvitationStatus, type IsAny, IsSignal, type Member, type MemberInput, type MergeRoutes, type OnlineListener, type OnlineManager, type Organization, type OrganizationCreator, type OrganizationEndpoints, type OrganizationInput, type OrganizationOptions, type OrganizationPlugin, type OrganizationRole, type OrganizationSchema, type OverrideMerge, type PathToObject, type Prettify, type PrettifyDeep, type ProxyRequest, type RequiredKeysOf, type Role, type RoleAuthorizeRequest, type RoleInput, type RoleStatements, SessionQueryParams, SessionRefreshOptions, type Statements, type StripEmptyObjects, type SubArray, type Subset, type Team, type TeamEndpoints, type TeamInput, type TeamMember, type TeamMemberInput, type UnionToIntersection, type createAccessControl, createAuthClient, createSessionRefreshManager, type defaultRolesSchema, getGlobalBroadcastChannel, type getOrgAdapter, type hasPermission, type invitationSchema, type invitationStatus, isJsonEqual, kBroadcastChannel, kFocusManager, kOnlineManager, type memberSchema, type organization, type organizationRoleSchema, type organizationSchema, parseJSON, type parseRoles, type role, type roleSchema, type teamMemberSchema, type teamSchema, useAuthQuery, withEquality };
+export { AccessControl, ArrayElement, AuthClient, AuthQueryAtom, AuthQueryState, AuthorizeResponse, BetterAuthClientOptions, BetterAuthClientPlugin, BroadcastChannel, BroadcastListener, BroadcastMessage, CamelCase, ClientAtomListener, ClientStore, type DBPrimitive, DefaultOrganizationPlugin, DynamicAccessControlEndpoints, ExactRoleStatements, ExtractPluginField, type FocusListener, type FocusManager, HasRequiredKeys, InferActions, InferAdditionalFromClient, InferAuth, InferClientAPI, InferCtx, InferErrorCodes, InferInvitation, InferMember, InferOrganization, InferOrganizationRolesFromOption, InferOrganizationZodRolesFromOption, InferPlugin, InferPluginFieldFromTuple, InferRoute, InferRoutes, InferSessionFromClient, InferSessionUpdateCtx, InferSignUpEmailCtx, InferTeam, InferUserFromClient, InferUserUpdateCtx, Invitation, InvitationInput, InvitationStatus, IsAny, IsSignal, Member, MemberInput, MergeRoutes, type OnlineListener, type OnlineManager, Organization, OrganizationCreator, OrganizationEndpoints, OrganizationInput, OrganizationOptions, OrganizationPlugin, OrganizationRole, OrganizationSchema, OverrideMerge, PathToObject, Prettify, PrettifyDeep, ProxyRequest, RequiredKeysOf, Role, RoleAuthorizeRequest, RoleInput, RoleStatements, SessionQueryParams, SessionRefreshOptions, Statements, StripEmptyObjects, SubArray, Subset, Team, TeamEndpoints, TeamInput, TeamMember, TeamMemberInput, type UnionToIntersection, createAccessControl, createAuthClient, createSessionRefreshManager, defaultRolesSchema, getGlobalBroadcastChannel, getOrgAdapter, hasPermission, invitationSchema, invitationStatus, isJsonEqual, kBroadcastChannel, kFocusManager, kOnlineManager, memberSchema, organization, organizationRoleSchema, organizationSchema, parseJSON, parseRoles, role, roleSchema, teamMemberSchema, teamSchema, useAuthQuery, withEquality };

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

@@ -5,14 +5,15 @@ import { useStore } from "./lynx-store.mjs";
 import { BetterAuthClientOptions } from "@better-auth/core";
 import { BASE_ERROR_CODES } from "@better-auth/core/error";
 import { BetterFetchError, BetterFetchResponse } from "@better-fetch/fetch";
-export type * from "nanostores";
-export type * from "@better-fetch/fetch";
+export * from "nanostores";
+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 {
   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"]>; } : {} : {} : {}> : {};
+} ? 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"]> } : {} : {} : {}> : {};
 type ClientConfig = ReturnType<typeof getClientConfig>;
 type ClientSession<Option extends BetterAuthClientOptions> = InferClientAPI<Option> extends {
   getSession: () => Promise<infer Res>;
@@ -38,4 +39,4 @@ type LynxAuthClient<Option extends BetterAuthClientOptions> = UnionToIntersectio
 };
 declare function createAuthClient<Option extends BetterAuthClientOptions>(options?: Option | undefined): LynxAuthClient<Option>;
 //#endregion
-export { type ExtractPluginField, type HasRequiredKeys, type InferPluginFieldFromTuple, type IsAny, LynxAuthClient, type OverrideMerge, type Prettify, type PrettifyDeep, type RequiredKeysOf, type StripEmptyObjects, type UnionToIntersection, createAuthClient, useStore };
+export { ExtractPluginField, HasRequiredKeys, InferPluginFieldFromTuple, IsAny, LynxAuthClient, OverrideMerge, Prettify, PrettifyDeep, RequiredKeysOf, StripEmptyObjects, type UnionToIntersection, createAuthClient, useStore };

package/dist/client/lynx/lynx-store.d.mts

@@ -1,5 +1,6 @@
 import { Store, StoreValue } from "nanostores";
 import { DependencyList } from "@lynx-js/react";
+
 //#region src/client/lynx/lynx-store.d.ts
 type StoreKeys<T> = T extends {
   setKey: (k: infer K, v: any) => unknown;
@@ -42,4 +43,4 @@ interface UseStoreOptions<SomeStore> {
  */
 declare function useStore<SomeStore extends Store>(store: SomeStore, options?: UseStoreOptions<SomeStore>): StoreValue<SomeStore>;
 //#endregion
-export { UseStoreOptions, useStore };
+export { useStore };

package/dist/client/parser.d.mts

@@ -1,12 +1,8 @@
 //#region src/client/parser.d.ts
 type ParseOptions = {
-  /** Throw errors instead of returning the original value */
-  strict?: boolean | undefined;
-  /** Log warnings when suspicious patterns are detected */
-  warnings?: boolean | undefined;
-  /** Custom reviver function */
-  reviver?: ((key: string, value: any) => any) | undefined;
-  /** Automatically convert ISO date strings to Date objects */
+  /** Throw errors instead of returning the original value */strict?: boolean | undefined; /** Log warnings when suspicious patterns are detected */
+  warnings?: boolean | undefined; /** Custom reviver function */
+  reviver?: ((key: string, value: any) => any) | undefined; /** Automatically convert ISO date strings to Date objects */
   parseDates?: boolean | undefined;
 };
 declare function parseJSON<T = unknown>(value: unknown, options?: ParseOptions): T;

package/dist/client/path-to-object.d.mts

@@ -3,11 +3,12 @@ import { InferAdditionalFromClient, InferSessionFromClient, InferUserFromClient
 import { BetterAuthClientOptions, ClientFetchOption } from "@better-auth/core";
 import { Endpoint, InputContext, StandardSchemaV1 } from "better-call";
 import { BetterFetchResponse } from "@better-fetch/fetch";
+
 //#region src/client/path-to-object.d.ts
 type KeepNullishFromOriginal<Original, Replaced> = Replaced | (undefined extends Original ? undefined : never) | (null extends Original ? null : never);
-type ReplaceTopLevelField<Data, Field extends "user" | "session", Replaced> = Data extends object ? Field extends keyof Data ? Omit<Data, Field> & { [K in Field]: KeepNullishFromOriginal<Data[K], Replaced>; } : Data : Data;
+type ReplaceTopLevelField<Data, Field extends "user" | "session", Replaced> = Data extends object ? Field extends keyof Data ? Omit<Data, Field> & { [K in Field]: KeepNullishFromOriginal<Data[K], Replaced> } : Data : Data;
 type ReplaceAuthUserAndSession<Data, ClientOpts extends BetterAuthClientOptions> = ReplaceTopLevelField<ReplaceTopLevelField<Data, "user", InferUserFromClient<ClientOpts>>, "session", InferSessionFromClient<ClientOpts>>;
-type MergeCustomSessionField<R extends object, Field extends "user" | "session", InferType> = Field extends keyof R ? { [K in Field]: KeepNullishFromOriginal<R[K], NonNullable<R[K]> & InferType>; } : {};
+type MergeCustomSessionField<R extends object, Field extends "user" | "session", InferType> = Field extends keyof R ? { [K in Field]: KeepNullishFromOriginal<R[K], NonNullable<R[K]> & InferType> } : {};
 type MergeCustomSessionWithInferred<R, ClientOpts extends BetterAuthClientOptions> = R extends object ? Omit<R, "user" | "session"> & MergeCustomSessionField<R, "user", InferUserFromClient<ClientOpts>> & MergeCustomSessionField<R, "session", InferSessionFromClient<ClientOpts>> : never;
 type RefineAuthResponse<Data, ClientOpts extends BetterAuthClientOptions> = Data extends {
   token: unknown;
@@ -15,7 +16,7 @@ type RefineAuthResponse<Data, ClientOpts extends BetterAuthClientOptions> = Data
   redirect: unknown;
 } ? ReplaceAuthUserAndSession<Data, ClientOpts> : Data;
 type CamelCase<S extends string> = S extends `${infer P1}-${infer P2}${infer P3}` ? `${Lowercase<P1>}${Uppercase<P2>}${CamelCase<P3>}` : Lowercase<S>;
-type PathToObject<T extends string, Fn extends (...args: any[]) => any> = T extends `/${infer Segment}/${infer Rest}` ? { [K in CamelCase<Segment>]: PathToObject<`/${Rest}`, Fn>; } : T extends `/${infer Segment}` ? { [K in CamelCase<Segment>]: Fn; } : never;
+type PathToObject<T extends string, Fn extends (...args: any[]) => any> = T extends `/${infer Segment}/${infer Rest}` ? { [K in CamelCase<Segment>]: PathToObject<`/${Rest}`, Fn> } : T extends `/${infer Segment}` ? { [K in CamelCase<Segment>]: Fn } : never;
 type InferSignUpEmailCtx<ClientOpts extends BetterAuthClientOptions, FetchOptions extends ClientFetchOption> = {
   email: string;
   name: string;

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

@@ -57,4 +57,4 @@ import { phoneNumberClient } from "../../plugins/phone-number/client.mjs";
 import { siweClient } from "../../plugins/siwe/client.mjs";
 import { usernameClient } from "../../plugins/username/client.mjs";
 import { InferServerPlugin } from "./infer-plugin.mjs";
-export { ADMIN_ERROR_CODES, ANONYMOUS_ERROR_CODES, AdminClientOptions, type AdminOptions, type AnonymousOptions, type AnonymousSession, type Auth0Options, type AuthorizationQuery, type BackupCodeOptions, type BaseOAuthProviderOptions, type Client, type CodeVerificationValue, EMAIL_OTP_ERROR_CODES, type ExtractPluginField, type FieldAttributeToObject, GENERIC_OAUTH_ERROR_CODES, type GenericOAuthConfig, type GenericOAuthOptions, GoogleOneTapActionOptions, GoogleOneTapOptions, GsiButtonConfiguration, type GumroadOptions, type HasRequiredKeys, type HubSpotOptions, type InferAdminRolesFromOption, type InferInvitation, type InferMember, type InferOrganization, type InferOrganizationRolesFromOption, type InferOrganizationZodRolesFromOption, type InferPluginFieldFromTuple, InferServerPlugin, type InferTeam, type Invitation, type InvitationInput, type InvitationStatus, type IsAny, type JWKOptions, type JWSAlgorithms, type Jwk, type JwtOptions, type KeycloakOptions, LastLoginMethodClientConfig, type LineOptions, MULTI_SESSION_ERROR_CODES, type Member, type MemberInput, type MicrosoftEntraIdOptions, type MultiSessionConfig, OAUTH_POPUP_ERROR_CODES, type OAuthAccessToken, type OIDCMetadata, type OIDCOptions, ORGANIZATION_ERROR_CODES, type OTPOptions, OidcClientPlugin, type OktaOptions, type OneTimeTokenOptions, type Organization, OrganizationClientOptions, type OrganizationInput, type OrganizationRole, type OrganizationSchema, type OverrideMerge, PHONE_NUMBER_ERROR_CODES, POPUP_TOKEN_STORAGE_KEY, type PatreonOptions, type PhoneNumberOptions, type Prettify, type PrettifyDeep, type RemoveFieldsWithReturnedFalse, type RequiredKeysOf, type SessionWithImpersonatedBy, SignInPopupOptions, SignInPopupResult, type SlackOptions, type StripEmptyObjects, type TOTPOptions, TWO_FACTOR_ERROR_CODES, type Team, type TeamInput, type TeamMember, type TeamMemberInput, type TokenBody, type TwoFactorOptions, type TwoFactorProvider, type TwoFactorTable, USERNAME_ERROR_CODES, type UnionToIntersection, type UserWithAnonymous, type UserWithPhoneNumber, type UserWithRole, type UserWithTwoFactor, type YandexOptions, adminClient, anonymousClient, type auth0, type backupCode2fa, clientSideHasPermission, createSignInPopup, customSessionClient, type defaultRolesSchema, deviceAuthorizationClient, emailOTPClient, type encodeBackupCodes, type generateBackupCodes, genericOAuthClient, type getBackupCodes, getStoredPopupToken, type gumroad, type hubspot, inferAdditionalFields, inferOrgAdditionalFields, type invitationSchema, type invitationStatus, jwtClient, type keycloak, lastLoginMethodClient, type line, magicLinkClient, type memberSchema, type microsoftEntraId, multiSessionClient, oauthPopupClient, oidcClient, type okta, oneTapClient, oneTimeTokenClient, organizationClient, type organizationRoleSchema, type organizationSchema, type otp2fa, type patreon, phoneNumberClient, popupBearerFetchPlugin, type roleSchema, type schema, siweClient, type slack, type teamMemberSchema, type teamSchema, type totp2fa, twoFactorClient, usernameClient, type verifyBackupCode, type yandex };
+export { ADMIN_ERROR_CODES, ANONYMOUS_ERROR_CODES, AdminClientOptions, AdminOptions, AnonymousOptions, AnonymousSession, Auth0Options, AuthorizationQuery, BackupCodeOptions, BaseOAuthProviderOptions, Client, CodeVerificationValue, EMAIL_OTP_ERROR_CODES, ExtractPluginField, type FieldAttributeToObject, GENERIC_OAUTH_ERROR_CODES, GenericOAuthConfig, GenericOAuthOptions, GoogleOneTapActionOptions, GoogleOneTapOptions, GsiButtonConfiguration, GumroadOptions, HasRequiredKeys, HubSpotOptions, InferAdminRolesFromOption, InferInvitation, InferMember, InferOrganization, InferOrganizationRolesFromOption, InferOrganizationZodRolesFromOption, InferPluginFieldFromTuple, InferServerPlugin, InferTeam, Invitation, InvitationInput, InvitationStatus, IsAny, JWKOptions, JWSAlgorithms, Jwk, JwtOptions, KeycloakOptions, LastLoginMethodClientConfig, LineOptions, MULTI_SESSION_ERROR_CODES, Member, MemberInput, MicrosoftEntraIdOptions, MultiSessionConfig, OAUTH_POPUP_ERROR_CODES, OAuthAccessToken, OIDCMetadata, OIDCOptions, ORGANIZATION_ERROR_CODES, OTPOptions, OidcClientPlugin, OktaOptions, OneTimeTokenOptions, Organization, OrganizationClientOptions, OrganizationInput, OrganizationRole, OrganizationSchema, OverrideMerge, PHONE_NUMBER_ERROR_CODES, POPUP_TOKEN_STORAGE_KEY, PatreonOptions, PhoneNumberOptions, Prettify, PrettifyDeep, type RemoveFieldsWithReturnedFalse, RequiredKeysOf, SessionWithImpersonatedBy, SignInPopupOptions, SignInPopupResult, SlackOptions, StripEmptyObjects, TOTPOptions, TWO_FACTOR_ERROR_CODES, Team, TeamInput, TeamMember, TeamMemberInput, TokenBody, TwoFactorOptions, TwoFactorProvider, TwoFactorTable, USERNAME_ERROR_CODES, UnionToIntersection, UserWithAnonymous, UserWithPhoneNumber, UserWithRole, UserWithTwoFactor, YandexOptions, adminClient, anonymousClient, auth0, backupCode2fa, clientSideHasPermission, createSignInPopup, customSessionClient, defaultRolesSchema, deviceAuthorizationClient, emailOTPClient, encodeBackupCodes, generateBackupCodes, genericOAuthClient, getBackupCodes, getStoredPopupToken, gumroad, hubspot, inferAdditionalFields, inferOrgAdditionalFields, invitationSchema, invitationStatus, jwtClient, keycloak, lastLoginMethodClient, line, magicLinkClient, memberSchema, microsoftEntraId, multiSessionClient, oauthPopupClient, oidcClient, okta, oneTapClient, oneTimeTokenClient, organizationClient, organizationRoleSchema, organizationSchema, otp2fa, patreon, phoneNumberClient, popupBearerFetchPlugin, roleSchema, schema, siweClient, slack, teamMemberSchema, teamSchema, totp2fa, twoFactorClient, usernameClient, verifyBackupCode, yandex };

package/dist/client/plugins/infer-plugin.d.mts

@@ -1,4 +1,5 @@
 import { BetterAuthOptions } from "@better-auth/core";
+
 //#region src/client/plugins/infer-plugin.d.ts
 declare const InferServerPlugin: <AuthOrOption extends BetterAuthOptions | {
   options: BetterAuthOptions;

package/dist/client/query.d.mts

@@ -2,6 +2,7 @@ import { SessionQueryParams } from "./types.mjs";
 import { ClientFetchOption } from "@better-auth/core";
 import { PreinitializedWritableAtom } from "nanostores";
 import { BetterFetch, BetterFetchError } from "@better-fetch/fetch";
+
 //#region src/client/query.d.ts
 type AuthQueryState<T> = {
   data: null | T;

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

@@ -5,14 +5,15 @@ import { useStore } from "./react-store.mjs";
 import { BetterAuthClientOptions } from "@better-auth/core";
 import { BASE_ERROR_CODES } from "@better-auth/core/error";
 import { BetterFetchError, BetterFetchResponse } from "@better-fetch/fetch";
-export type * from "nanostores";
-export type * from "@better-fetch/fetch";
+export * from "nanostores";
+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 {
   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"]>; } : {} : {} : {}> : {};
+} ? 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"]> } : {} : {} : {}> : {};
 type ClientConfig = ReturnType<typeof getClientConfig>;
 type ClientSession<Option extends BetterAuthClientOptions> = InferClientAPI<Option> extends {
   getSession: () => Promise<infer Res>;
@@ -39,4 +40,4 @@ type ReactAuthClient<Option extends BetterAuthClientOptions> = UnionToIntersecti
 };
 declare function createAuthClient<Option extends BetterAuthClientOptions>(options?: Option | undefined): ReactAuthClient<Option>;
 //#endregion
-export { type ExtractPluginField, type HasRequiredKeys, type InferPluginFieldFromTuple, type IsAny, type OverrideMerge, type Prettify, type PrettifyDeep, ReactAuthClient, type RequiredKeysOf, type StripEmptyObjects, type UnionToIntersection, createAuthClient, useStore };
+export { ExtractPluginField, HasRequiredKeys, InferPluginFieldFromTuple, IsAny, OverrideMerge, Prettify, PrettifyDeep, ReactAuthClient, RequiredKeysOf, StripEmptyObjects, type UnionToIntersection, createAuthClient, useStore };

package/dist/client/react/react-store.d.mts

@@ -1,5 +1,6 @@
 import { Store, StoreValue } from "nanostores";
 import { DependencyList } from "react";
+
 //#region src/client/react/react-store.d.ts
 type StoreKeys<T> = T extends {
   setKey: (k: infer K, v: any) => unknown;
@@ -42,4 +43,4 @@ interface UseStoreOptions<SomeStore> {
  */
 declare function useStore<SomeStore extends Store>(store: SomeStore, options?: UseStoreOptions<SomeStore>): StoreValue<SomeStore>;
 //#endregion
-export { UseStoreOptions, useStore };
+export { useStore };

package/dist/client/session-atom.mjs

@@ -1,8 +1,9 @@
 import { isJsonEqual, withEquality } from "./equality.mjs";
 import { createSessionRefreshManager } from "./session-refresh.mjs";
-import { atom, onMount } from "nanostores";
+import { STORE_UNMOUNT_DELAY, atom, onMount } from "nanostores";
 //#region src/client/session-atom.ts
 const isServer = () => typeof window === "undefined";
+const SESSION_MOUNT_DEDUPE_INTERVAL = STORE_UNMOUNT_DELAY;
 /**
 * Normalize $fetch response: `throw: true` returns data directly,
 * otherwise `{ data, error }`.
@@ -24,7 +25,13 @@ function isSessionAtomEqual(a, b) {
 }
 function getSessionAtom($fetch, options) {
 	const $signal = atom(false);
-	let activeRequest;
+	let flight;
+	let freshUntil = 0;
+	let sessionRevision = 0;
+	$signal.listen(() => {
+		sessionRevision++;
+		freshUntil = 0;
+	});
 	const refetch = (queryParams) => fetchSession(queryParams);
 	const session = atom({
 		data: null,
@@ -43,24 +50,26 @@ function getSessionAtom($fetch, options) {
 			error: null,
 			refetch
 		});
-		if (signal.aborted) return;
+		if (signal.aborted) return "aborted";
 		try {
 			const res = await $fetch("/get-session", {
 				method: "GET",
 				query: queryParams?.query,
 				signal
 			});
-			if (signal.aborted) return;
+			if (signal.aborted) return "aborted";
 			let { data, error } = normalizeSessionResponse(res);
+			let outcome = "fresh";
 			if (data?.needsRefresh) try {
 				const refreshRes = await $fetch("/get-session", {
 					method: "POST",
 					signal
 				});
-				if (signal.aborted) return;
+				if (signal.aborted) return "aborted";
 				({data, error} = normalizeSessionResponse(refreshRes));
 			} catch {
-				if (signal.aborted) return;
+				if (signal.aborted) return "aborted";
+				outcome = "stale";
 			}
 			if (error) {
 				const latest = session.value;
@@ -72,7 +81,7 @@ function getSessionAtom($fetch, options) {
 					isRefetching: false,
 					refetch
 				});
-				return;
+				return "failed";
 			}
 			const sessionData = normalizeSessionData(data);
 			const current = session.value;
@@ -84,8 +93,9 @@ function getSessionAtom($fetch, options) {
 				isRefetching: false,
 				refetch
 			});
+			return outcome;
 		} catch (fetchError) {
-			if (signal.aborted) return;
+			if (signal.aborted) return "aborted";
 			const latest = session.value;
 			session.set({
 				data: latest.data,
@@ -94,26 +104,40 @@ function getSessionAtom($fetch, options) {
 				isRefetching: false,
 				refetch
 			});
+			return "failed";
 		}
 	};
+	const getFreshUntil = () => {
+		const expiresAt = session.value.data?.session?.expiresAt;
+		const sessionExpiresAt = expiresAt instanceof Date ? expiresAt.getTime() : Number.POSITIVE_INFINITY;
+		return Math.min(Date.now() + SESSION_MOUNT_DEDUPE_INTERVAL, sessionExpiresAt);
+	};
 	const fetchSession = (queryParams) => {
-		activeRequest?.cancel();
+		freshUntil = 0;
+		flight?.cancel();
 		const controller = new AbortController();
 		const request = {
 			cancel: () => controller.abort(),
 			promise: Promise.resolve().then(() => {
-				if (controller.signal.aborted) return;
+				if (controller.signal.aborted) return "aborted";
 				return executeSessionFetch(controller.signal, queryParams);
-			})
+			}),
+			revision: sessionRevision
 		};
-		activeRequest = request;
-		const clearActiveRequest = () => {
-			if (activeRequest === request) activeRequest = void 0;
+		flight = request;
+		const settleFlight = (outcome) => {
+			if (flight !== request) return;
+			flight = void 0;
+			if (outcome === "fresh" && request.revision === sessionRevision) freshUntil = getFreshUntil();
 		};
-		request.promise.then(clearActiveRequest, clearActiveRequest);
-		return request.promise;
+		request.promise.then(settleFlight, () => settleFlight("failed"));
+		return request.promise.then(() => void 0);
+	};
+	const fetchSessionOnMount = () => {
+		if (flight?.revision === sessionRevision) return flight.promise.then(() => void 0);
+		if (Date.now() < freshUntil) return Promise.resolve();
+		return fetchSession();
 	};
-	const fetchSessionOnMount = () => activeRequest?.promise ?? fetchSession();
 	let broadcastSessionUpdate = () => {};
 	onMount(session, () => {
 		let timeoutId;

package/dist/client/session-refresh.d.mts

@@ -1,5 +1,6 @@
 import { BetterAuthClientOptions } from "@better-auth/core";
 import { WritableAtom } from "nanostores";
+
 //#region src/client/session-refresh.d.ts
 interface SessionRefreshOptions {
   fetchSession: () => Promise<void>;

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

@@ -5,14 +5,15 @@ import { BetterAuthClientOptions } from "@better-auth/core";
 import { BASE_ERROR_CODES } from "@better-auth/core/error";
 import { BetterFetchError, BetterFetchResponse } from "@better-fetch/fetch";
 import { Accessor } from "solid-js";
-export type * from "nanostores";
-export type * from "@better-fetch/fetch";
+export * from "nanostores";
+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 {
   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"]>>; } : {} : {} : {}> : {};
+} ? 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"]>> } : {} : {} : {}> : {};
 type ClientConfig = ReturnType<typeof getClientConfig>;
 type ClientSession<Option extends BetterAuthClientOptions> = InferClientAPI<Option> extends {
   getSession: () => Promise<infer Res>;
@@ -39,4 +40,4 @@ type SolidAuthClient<Option extends BetterAuthClientOptions> = UnionToIntersecti
 };
 declare function createAuthClient<Option extends BetterAuthClientOptions>(options?: Option | undefined): SolidAuthClient<Option>;
 //#endregion
-export { type ExtractPluginField, type HasRequiredKeys, type InferPluginFieldFromTuple, type IsAny, type OverrideMerge, type Prettify, type PrettifyDeep, type RequiredKeysOf, SolidAuthClient, type StripEmptyObjects, type UnionToIntersection, createAuthClient };
+export { ExtractPluginField, HasRequiredKeys, InferPluginFieldFromTuple, IsAny, OverrideMerge, Prettify, PrettifyDeep, RequiredKeysOf, SolidAuthClient, StripEmptyObjects, type UnionToIntersection, createAuthClient };

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

@@ -5,14 +5,15 @@ import { BetterAuthClientOptions } from "@better-auth/core";
 import { BASE_ERROR_CODES } from "@better-auth/core/error";
 import { Atom } from "nanostores";
 import { BetterFetchError, BetterFetchResponse } from "@better-fetch/fetch";
-export type * from "nanostores";
-export type * from "@better-fetch/fetch";
+export * from "nanostores";
+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 {
   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]; } : {} : {} : {}> : {};
+} ? 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] } : {} : {} : {}> : {};
 type ClientConfig = ReturnType<typeof getClientConfig>;
 type ClientSession<Option extends BetterAuthClientOptions> = InferClientAPI<Option> extends {
   getSession: () => Promise<infer Res>;
@@ -39,4 +40,4 @@ type SvelteAuthClient<Option extends BetterAuthClientOptions> = UnionToIntersect
 };
 declare function createAuthClient<Option extends BetterAuthClientOptions>(options?: Option | undefined): SvelteAuthClient<Option>;
 //#endregion
-export { type ExtractPluginField, type HasRequiredKeys, type InferPluginFieldFromTuple, type IsAny, type OverrideMerge, type Prettify, type PrettifyDeep, type RequiredKeysOf, type StripEmptyObjects, SvelteAuthClient, type UnionToIntersection, createAuthClient };
+export { ExtractPluginField, HasRequiredKeys, InferPluginFieldFromTuple, IsAny, OverrideMerge, Prettify, PrettifyDeep, RequiredKeysOf, StripEmptyObjects, SvelteAuthClient, type UnionToIntersection, createAuthClient };

package/dist/client/types.d.mts

@@ -3,9 +3,9 @@ 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 "../types/index.mjs";
 import { BetterAuthClientOptions as BetterAuthClientOptions$1, BetterAuthClientPlugin, ClientAtomListener as ClientAtomListener$1, 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;
@@ -28,7 +28,7 @@ type InferErrorCodes<O extends BetterAuthClientOptions$1> = O["plugins"] extends
   $InferServerPlugin?: infer ServerPlugin;
 } ? ServerPlugin extends {
   $ERROR_CODES?: infer E;
-} ? { [K in keyof E & string]: E[K] extends ClientPluginError ? ClientPluginError<K> : never; } : {} : {}> : {};
+} ? { [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 "$"