@better-auth-ui/core 1.6.8 → 1.6.9

package/dist/plugins/username/username-mutation-keys.js

@@ -0,0 +1,17 @@
+/**
+ * Mutation keys contributed by the username plugin.
+ *
+ * `signIn` is kept under the shared `["auth", "signIn", ...]` namespace so
+ * consumers can match the whole sign-in surface with
+ * `useIsMutating({ mutationKey: ["auth", "signIn"] })`.
+ */
+export const usernameMutationKeys = {
+    /** Key for `signIn.username`. */
+    signIn: ["auth", "signIn", "username"],
+    /**
+     * Key for `isUsernameAvailable`. This is technically a read, but it's
+     * exposed via better-auth's mutation surface and lives under the mutation
+     * factories for parity with other username flows.
+     */
+    isUsernameAvailable: ["auth", "isUsernameAvailable"]
+};

package/dist/plugins/username/username-plugin.d.ts

@@ -1,4 +1,4 @@
-import { UsernameLocalization } from './username-localization';
+import { type UsernameLocalization } from "./username-localization";
 export type UsernamePluginOptions = {
     /**
      * Whether to use displayUsername for the visible username field in the profile.
@@ -24,7 +24,7 @@ export type UsernamePluginOptions = {
      */
     localization?: Partial<UsernameLocalization>;
 };
-export declare const usernamePlugin: ((options?: UsernamePluginOptions | undefined) => Omit<{
+export declare const usernamePlugin: ((options?: UsernamePluginOptions | undefined) => {
     minUsernameLength: number;
     maxUsernameLength: number;
     localization: {
@@ -43,7 +43,7 @@ export declare const usernamePlugin: ((options?: UsernamePluginOptions | undefin
         placeholder: string;
         inputType: "input";
         signUp: "above";
-        required: boolean;
+        required: true;
     } | {
         name: string;
         type: "string";
@@ -61,7 +61,7 @@ export declare const usernamePlugin: ((options?: UsernamePluginOptions | undefin
      * Whether to check username availability on sign-up and user profile.
      */
     isUsernameAvailable?: boolean;
-}, "id"> & {
+} & {
     id: "username";
 }) & {
     id: "username";

package/dist/plugins/username/username-plugin.js

@@ -1,33 +1,36 @@
-import { createAuthPlugin as e } from "../../lib/create-auth-plugin.js";
-import { usernameLocalization as t } from "./username-localization.js";
-//#region src/plugins/username/username-plugin.ts
-var n = e("username", (e = {}) => {
-	let n = e.minUsernameLength ?? 3, r = e.maxUsernameLength ?? 30, i = {
-		...t,
-		...e.localization
-	};
-	return {
-		...e,
-		minUsernameLength: n,
-		maxUsernameLength: r,
-		localization: i,
-		additionalFields: [{
-			name: "username",
-			type: "string",
-			label: i.username,
-			placeholder: i.usernamePlaceholder,
-			inputType: "input",
-			signUp: "above",
-			required: !0
-		}, ...e.displayUsername ? [{
-			name: "displayUsername",
-			type: "string",
-			label: i.displayUsername,
-			placeholder: i.displayUsernamePlaceholder,
-			inputType: "input",
-			signUp: "above"
-		}] : []]
-	};
+import { createAuthPlugin } from "../../lib/create-auth-plugin";
+import { usernameLocalization } from "./username-localization";
+export const usernamePlugin = createAuthPlugin("username", (options = {}) => {
+    const minUsernameLength = options.minUsernameLength ?? 3;
+    const maxUsernameLength = options.maxUsernameLength ?? 30;
+    const localization = { ...usernameLocalization, ...options.localization };
+    return {
+        ...options,
+        minUsernameLength,
+        maxUsernameLength,
+        localization,
+        additionalFields: [
+            {
+                name: "username",
+                type: "string",
+                label: localization.username,
+                placeholder: localization.usernamePlaceholder,
+                inputType: "input",
+                signUp: "above",
+                required: true
+            },
+            ...(options.displayUsername
+                ? [
+                    {
+                        name: "displayUsername",
+                        type: "string",
+                        label: localization.displayUsername,
+                        placeholder: localization.displayUsernamePlaceholder,
+                        inputType: "input",
+                        signUp: "above"
+                    }
+                ]
+                : [])
+        ]
+    };
 });
-//#endregion
-export { n as usernamePlugin };

package/dist/plugins.d.ts

@@ -0,0 +1,28 @@
+export * from "./plugins/api-key/api-key-localization";
+export * from "./plugins/api-key/api-key-mutation-keys";
+export * from "./plugins/api-key/api-key-plugin";
+export * from "./plugins/api-key/api-key-query-keys";
+export * from "./plugins/delete-user/delete-user-localization";
+export * from "./plugins/delete-user/delete-user-mutation-keys";
+export * from "./plugins/delete-user/delete-user-plugin";
+export * from "./plugins/magic-link/magic-link-localization";
+export * from "./plugins/magic-link/magic-link-mutation-keys";
+export * from "./plugins/magic-link/magic-link-plugin";
+export * from "./plugins/multi-session/multi-session-localization";
+export * from "./plugins/multi-session/multi-session-mutation-keys";
+export * from "./plugins/multi-session/multi-session-plugin";
+export * from "./plugins/multi-session/multi-session-query-keys";
+export * from "./plugins/organization/organization-localization";
+export * from "./plugins/organization/organization-mutation-keys";
+export * from "./plugins/organization/organization-plugin";
+export * from "./plugins/organization/organization-query-keys";
+export * from "./plugins/organization/organization-view-paths";
+export * from "./plugins/passkey/passkey-localization";
+export * from "./plugins/passkey/passkey-mutation-keys";
+export * from "./plugins/passkey/passkey-plugin";
+export * from "./plugins/passkey/passkey-query-keys";
+export * from "./plugins/theme/theme-localization";
+export * from "./plugins/theme/theme-plugin";
+export * from "./plugins/username/username-localization";
+export * from "./plugins/username/username-mutation-keys";
+export * from "./plugins/username/username-plugin";

package/dist/plugins.js

@@ -1,18 +1,28 @@
-import { apiKeyLocalization as e } from "./plugins/api-key/api-key-localization.js";
-import { apiKeyMutationKeys as t } from "./plugins/api-key/api-key-mutation-keys.js";
-import { apiKeyPlugin as n } from "./plugins/api-key/api-key-plugin.js";
-import { deleteUserLocalization as r } from "./plugins/delete-user/delete-user-localization.js";
-import { deleteUserPlugin as i } from "./plugins/delete-user/delete-user-plugin.js";
-import { magicLinkLocalization as a } from "./plugins/magic-link/magic-link-localization.js";
-import { magicLinkMutationKeys as o } from "./plugins/magic-link/magic-link-mutation-keys.js";
-import { magicLinkPlugin as s } from "./plugins/magic-link/magic-link-plugin.js";
-import { multiSessionLocalization as c } from "./plugins/multi-session/multi-session-localization.js";
-import { multiSessionPlugin as l } from "./plugins/multi-session/multi-session-plugin.js";
-import { passkeyLocalization as u } from "./plugins/passkey/passkey-localization.js";
-import { passkeyMutationKeys as d } from "./plugins/passkey/passkey-mutation-keys.js";
-import { passkeyPlugin as f } from "./plugins/passkey/passkey-plugin.js";
-import { themeLocalization as p } from "./plugins/theme/theme-localization.js";
-import { themePlugin as m } from "./plugins/theme/theme-plugin.js";
-import { usernameLocalization as h } from "./plugins/username/username-localization.js";
-import { usernamePlugin as g } from "./plugins/username/username-plugin.js";
-export { e as apiKeyLocalization, t as apiKeyMutationKeys, n as apiKeyPlugin, r as deleteUserLocalization, i as deleteUserPlugin, a as magicLinkLocalization, o as magicLinkMutationKeys, s as magicLinkPlugin, c as multiSessionLocalization, l as multiSessionPlugin, u as passkeyLocalization, d as passkeyMutationKeys, f as passkeyPlugin, p as themeLocalization, m as themePlugin, h as usernameLocalization, g as usernamePlugin };
+export * from "./plugins/api-key/api-key-localization";
+export * from "./plugins/api-key/api-key-mutation-keys";
+export * from "./plugins/api-key/api-key-plugin";
+export * from "./plugins/api-key/api-key-query-keys";
+export * from "./plugins/delete-user/delete-user-localization";
+export * from "./plugins/delete-user/delete-user-mutation-keys";
+export * from "./plugins/delete-user/delete-user-plugin";
+export * from "./plugins/magic-link/magic-link-localization";
+export * from "./plugins/magic-link/magic-link-mutation-keys";
+export * from "./plugins/magic-link/magic-link-plugin";
+export * from "./plugins/multi-session/multi-session-localization";
+export * from "./plugins/multi-session/multi-session-mutation-keys";
+export * from "./plugins/multi-session/multi-session-plugin";
+export * from "./plugins/multi-session/multi-session-query-keys";
+export * from "./plugins/organization/organization-localization";
+export * from "./plugins/organization/organization-mutation-keys";
+export * from "./plugins/organization/organization-plugin";
+export * from "./plugins/organization/organization-query-keys";
+export * from "./plugins/organization/organization-view-paths";
+export * from "./plugins/passkey/passkey-localization";
+export * from "./plugins/passkey/passkey-mutation-keys";
+export * from "./plugins/passkey/passkey-plugin";
+export * from "./plugins/passkey/passkey-query-keys";
+export * from "./plugins/theme/theme-localization";
+export * from "./plugins/theme/theme-plugin";
+export * from "./plugins/username/username-localization";
+export * from "./plugins/username/username-mutation-keys";
+export * from "./plugins/username/username-plugin";

package/package.json

@@ -1,10 +1,9 @@
 {
   "name": "@better-auth-ui/core",
-  "version": "1.6.8",
+  "version": "1.6.9",
   "type": "module",
   "scripts": {
-    "build": "vite build",
-    "dev": "tsc --watch",
+    "build": "tsc",
     "test": "vitest"
   },
   "files": [
@@ -15,20 +14,22 @@
   "types": "./dist/index.d.ts",
   "exports": {
     ".": {
+      "development": "./src/index.ts",
       "types": "./dist/index.d.ts",
       "import": "./dist/index.js"
     },
     "./plugins": {
-      "types": "./dist/plugins/index.d.ts",
+      "development": "./src/plugins.ts",
+      "types": "./dist/plugins.d.ts",
       "import": "./dist/plugins.js"
     }
   },
   "devDependencies": {
-    "better-auth": "^1.6.10",
-    "vitest": "^4.1.5"
+    "better-auth": "^1.6.11",
+    "vitest": "^4.1.7"
   },
   "peerDependencies": {
-    "better-auth": ">=1.6.10"
+    "better-auth": ">=1.6.11"
   },
   "repository": {
     "type": "git",

package/src/config/auth-config.ts

@@ -82,7 +82,7 @@ export interface AuthConfig {
   navigate: (options: { to: string; replace?: boolean }) => void
 }
 
-export const defaultAuthConfig: AuthConfig = {
+export const defaultAuthConfig: Omit<AuthConfig, "authClient"> = {
   avatar: {
     enabled: true,
     resize: resizeAvatar,

package/src/lib/auth-mutation-keys.ts

@@ -18,6 +18,14 @@
  * etc.) — the mutation cache entries line up regardless of which framework
  * package the mutation options factory came from.
  *
+ * Plugin-specific mutation keys live alongside their plugin (e.g.
+ * `apiKeyMutationKeys`, `organizationMutationKeys`, `passkeyMutationKeys`,
+ * `magicLinkMutationKeys`, `multiSessionMutationKeys`, `usernameMutationKeys`,
+ * `deleteUserMutationKeys`). Plugin-contributed sign-in strategies stay
+ * under the shared `["auth", "signIn", ...]` namespace so
+ * `useIsMutating({ mutationKey: authMutationKeys.signIn.all })` still
+ * matches them.
+ *
  * For query keys, see `authQueryKeys` in `./auth-query-keys`.
  */
 export const authMutationKeys = {
@@ -26,14 +34,12 @@ export const authMutationKeys = {
 
   /** Sign-in mutations, grouped by strategy. */
   signIn: {
-    /** Prefix matching every sign-in mutation. */
+    /** Prefix matching every sign-in mutation (including plugin strategies). */
     all: ["auth", "signIn"] as const,
     /** Key for `signIn.email`. */
     email: ["auth", "signIn", "email"] as const,
     /** Key for `signIn.social`. */
-    social: ["auth", "signIn", "social"] as const,
-    /** Key for `signIn.username`. */
-    username: ["auth", "signIn", "username"] as const
+    social: ["auth", "signIn", "social"] as const
   },
 
   /** Sign-up mutations, grouped by strategy. */
@@ -54,22 +60,10 @@ export const authMutationKeys = {
   /** Key for `sendVerificationEmail`. */
   sendVerificationEmail: ["auth", "sendVerificationEmail"] as const,
 
-  /** Multi-session mutations. */
-  multiSession: {
-    /** Prefix matching every multi-session mutation. */
-    all: ["auth", "multiSession"] as const,
-    /** Key for `multiSession.revoke`. */
-    revoke: ["auth", "multiSession", "revoke"] as const,
-    /** Key for `multiSession.setActive`. */
-    setActive: ["auth", "multiSession", "setActive"] as const
-  },
-
   /** Key for `changeEmail`. */
   changeEmail: ["auth", "changeEmail"] as const,
   /** Key for `changePassword`. */
   changePassword: ["auth", "changePassword"] as const,
-  /** Key for `deleteUser`. */
-  deleteUser: ["auth", "deleteUser"] as const,
   /** Key for `linkSocial`. */
   linkSocial: ["auth", "linkSocial"] as const,
   /** Key for `revokeSession`. */
@@ -77,12 +71,5 @@ export const authMutationKeys = {
   /** Key for `unlinkAccount`. */
   unlinkAccount: ["auth", "unlinkAccount"] as const,
   /** Key for `updateUser`. */
-  updateUser: ["auth", "updateUser"] as const,
-
-  /**
-   * Key for `isUsernameAvailable`. This is technically a read, but it's
-   * exposed via better-auth's mutation surface and lives under the mutation
-   * factories for parity with other username flows.
-   */
-  isUsernameAvailable: ["auth", "isUsernameAvailable"] as const
+  updateUser: ["auth", "updateUser"] as const
 } as const

package/src/lib/auth-plugin.ts

@@ -6,8 +6,11 @@ import type { AdditionalFields } from "../config/additional-fields-config"
  * Plugins that add routable sub-pages (e.g. `magicLinkPlugin` adds
  * `/auth/magic-link`) declare the URL segment under the matching section.
  * Read at runtime via `useAuthPlugin(plugin).viewPaths.*`.
+ *
+ * Plugin-specific namespaces (e.g. organization route segments) are merged
+ * via module augmentation from that plugin’s module — not declared here.
  */
-export type AuthPluginViewPaths = {
+export interface AuthPluginViewPaths {
   auth?: Record<string, string>
   settings?: Record<string, string>
 }
@@ -34,10 +37,6 @@ export interface AuthPluginBase {
    * user-defined additionalFields in the auth config.
    */
   additionalFields?: AdditionalFields
-  /**
-   * Additional properties contributed by the plugin.
-   */
-  [key: string]: unknown
 }
 
 /**

package/src/lib/auth-query-keys.ts

@@ -16,6 +16,12 @@
  * etc.) and across client- and server-side query variants — the cache
  * entries line up regardless of which query options factory produced them.
  *
+ * Plugin-specific query keys live alongside their plugin (e.g.
+ * `apiKeyQueryKeys`, `organizationQueryKeys`, `passkeyQueryKeys`,
+ * `multiSessionQueryKeys`) and chain off `authQueryKeys.user(userId)` so
+ * everything still sits under the shared `["auth", "user", userId, ...]`
+ * subtree.
+ *
  * For mutation keys, see `authMutationKeys` in `./auth-mutation-keys`.
  */
 export const authQueryKeys = {
@@ -31,29 +37,6 @@ export const authQueryKeys = {
   user: (userId: string | undefined) =>
     [...authQueryKeys.users(), userId] as const,
 
-  /** Key for `multiSession.listDeviceSessions` for the given user. */
-  listDeviceSessions: <TQuery = undefined>(
-    userId: string | undefined,
-    query?: TQuery
-  ) =>
-    [
-      ...authQueryKeys.user(userId),
-      "listDeviceSessions",
-      query ?? null
-    ] as const,
-
-  /** Key for the user's passkey list. */
-  listPasskeys: <TQuery = undefined>(
-    userId: string | undefined,
-    query?: TQuery
-  ) => [...authQueryKeys.user(userId), "listPasskeys", query ?? null] as const,
-
-  /** Key for the user's API keys list (`apiKey.list`). */
-  listApiKeys: <TQuery = undefined>(
-    userId: string | undefined,
-    query?: TQuery
-  ) => [...authQueryKeys.user(userId), "listApiKeys", query ?? null] as const,
-
   /** Key for `accountInfo` for the given user. */
   accountInfo: <TQuery = undefined>(
     userId: string | undefined,

package/src/lib/create-auth-plugin.ts

@@ -1,47 +1,30 @@
+import type { AuthPlugin } from "./auth-plugin"
+
 /**
- * Creates a plugin factory and attaches its `id` as a static property.
- *
- * Lifts the plugin's `id` out of the factory's runtime output so consumers
- * (e.g. `useAuthPlugin`) can read it without invoking the factory. This lets
- * plugins keep required options (like `themePlugin`'s `setTheme`) without
- * forcing every factory to be callable with zero arguments.
- *
- * The returned factory:
- * - is callable with the original arguments and returns the factory's result
- *   merged with `{ id }`
- * - exposes `id` as a static property so it can be read at registration or
- *   lookup time without allocating a plugin instance
- *
- * Type safety for the plugin's shape is enforced at the registration site
- * (`<AuthProvider plugins={[…]} />`) where `plugins` is typed as `AuthPlugin[]`.
+ * Creates a plugin factory and attaches its `id` as a static property so
+ * consumers (e.g. `useAuthPlugin`) can look it up without invoking the
+ * factory.
  *
  * @example
  * ```ts
  * export const themePlugin = createAuthPlugin(
  *   "theme",
  *   (options: ThemePluginOptions) => ({
- *     localization: { ...themeLocalization, ...options.localization },
- *     theme: options.theme ?? "system",
  *     setTheme: options.setTheme,
  *     themes: options.themes ?? ["system", "light", "dark"]
  *   })
  * )
- *
- * themePlugin.id // "theme"
- * themePlugin({ setTheme }) // { id: "theme", localization, theme, setTheme, themes }
  * ```
  */
 export function createAuthPlugin<
   const TId extends string,
   TArgs extends unknown[],
-  TResult extends object
->(
-  id: TId,
-  factory: (...args: TArgs) => TResult
-): ((...args: TArgs) => Omit<TResult, "id"> & { id: TId }) & { id: TId } {
-  const wrapped = (...args: TArgs): Omit<TResult, "id"> & { id: TId } => ({
+  TResult extends Omit<AuthPlugin, "id"> & object
+>(id: TId, factory: (...args: TArgs) => TResult) {
+  const wrapped = (...args: TArgs) => ({
     ...factory(...args),
     id
   })
+
   return Object.assign(wrapped, { id })
 }

package/src/lib/localization.ts

@@ -172,9 +172,6 @@ export const localization = {
     /** @remarks `"Optional"` */
     optional: "Optional",
 
-    /** @remarks `"Profile"` */
-    profile: "Profile",
-
     /** @remarks `"Profile updated successfully"` */
     profileUpdatedSuccess: "Profile updated successfully",
 
@@ -216,7 +213,10 @@ export const localization = {
     updatePassword: "Update password",
 
     /** @remarks `"Upload avatar"` */
-    uploadAvatar: "Upload avatar"
+    uploadAvatar: "Upload avatar",
+
+    /** @remarks `"User profile"` */
+    userProfile: "User profile"
   }
 }
 

package/src/lib/view-paths.ts

@@ -1,9 +1,5 @@
 /**
  * View path segments for authentication routes.
- *
- * Contains the fixed built-ins every install ships with. Plugin-contributed
- * paths (e.g. `magicLinkPlugin`'s `magicLink`) live on the plugin object and
- * are read via `useAuthPlugin(plugin).viewPaths.auth.*`.
  */
 export interface AuthViewPaths {
   /**

package/src/plugins/api-key/api-key-mutation-keys.ts

@@ -2,8 +2,10 @@
  * Mutation keys contributed by the API key plugin.
  */
 export const apiKeyMutationKeys = {
+  /** Root key for every api key mutation. */
+  all: ["auth", "apiKey"] as const,
   /** Key for `apiKey.create`. */
-  createApiKey: ["auth", "apiKey", "create"] as const,
+  create: ["auth", "apiKey", "create"] as const,
   /** Key for `apiKey.delete`. */
-  deleteApiKey: ["auth", "apiKey", "delete"] as const
+  delete: ["auth", "apiKey", "delete"] as const
 } as const

package/src/plugins/api-key/api-key-plugin.ts

@@ -10,11 +10,32 @@ export type ApiKeyPluginOptions = {
    * @remarks `ApiKeyLocalization`
    */
   localization?: Partial<ApiKeyLocalization>
+  /**
+   * Enable organization-owned API keys.
+   *
+   * When `true`, the plugin contributes an organization-scoped API keys card
+   * to `<OrganizationSettings />`, and list/create/delete operations made on
+   * behalf of an organization send `configId: "organization"`.
+   *
+   * Requires a matching server-side `apiKey` config entry with
+   * `configId: "organization"` and `references: "organization"`:
+   *
+   * ```ts
+   * apiKey([
+   *   { configId: "default", references: "user" },
+   *   { configId: "organization", references: "organization" }
+   * ])
+   * ```
+   *
+   * @default false
+   */
+  organization?: boolean
 }
 
 export const apiKeyPlugin = createAuthPlugin(
   "apiKey",
   (options: ApiKeyPluginOptions = {}) => ({
-    localization: { ...apiKeyLocalization, ...options.localization }
+    localization: { ...apiKeyLocalization, ...options.localization },
+    organization: options.organization ?? false
   })
 )

package/src/plugins/api-key/api-key-query-keys.ts

@@ -0,0 +1,13 @@
+import { authQueryKeys } from "../../lib/auth-query-keys"
+
+/** Query key factory for API key queries, scoped per user. */
+export const apiKeyQueryKeys = {
+  all: (userId: string | undefined) =>
+    [...authQueryKeys.user(userId), "apiKey"] as const,
+
+  lists: (userId: string | undefined) =>
+    [...apiKeyQueryKeys.all(userId), "list"] as const,
+
+  list: <TQuery = undefined>(userId: string | undefined, query?: TQuery) =>
+    [...apiKeyQueryKeys.lists(userId), query ?? null] as const
+} as const

package/src/plugins/delete-user/delete-user-localization.ts

@@ -1,9 +1,9 @@
 export const deleteUserLocalization = {
-  /** @remarks `"Delete user"` */
-  deleteUser: "Delete user",
+  /** @remarks `"Delete account"` */
+  deleteAccount: "Delete account",
 
   /** @remarks `"Permanently remove your account and all associated data. This cannot be undone."` */
-  deleteUserDescription:
+  deleteAccountDescription:
     "Permanently remove your account and all associated data. This cannot be undone.",
 
   /** @remarks `"Check your email to confirm account deletion."` */

package/src/plugins/delete-user/delete-user-mutation-keys.ts

@@ -0,0 +1,7 @@
+/**
+ * Mutation keys contributed by the delete-user plugin.
+ */
+export const deleteUserMutationKeys = {
+  /** Key for `deleteUser`. */
+  deleteUser: ["auth", "deleteUser"] as const
+} as const

package/src/plugins/multi-session/multi-session-mutation-keys.ts

@@ -0,0 +1,11 @@
+/**
+ * Mutation keys contributed by the multi-session plugin.
+ */
+export const multiSessionMutationKeys = {
+  /** Root key for every multi-session mutation. */
+  all: ["auth", "multiSession"] as const,
+  /** Key for `multiSession.revoke`. */
+  revoke: ["auth", "multiSession", "revoke"] as const,
+  /** Key for `multiSession.setActive`. */
+  setActive: ["auth", "multiSession", "setActive"] as const
+} as const

package/src/plugins/multi-session/multi-session-query-keys.ts

@@ -0,0 +1,13 @@
+import { authQueryKeys } from "../../lib/auth-query-keys"
+
+/** Query key factory for multi-session queries, scoped per user. */
+export const multiSessionQueryKeys = {
+  all: (userId: string | undefined) =>
+    [...authQueryKeys.user(userId), "multiSession"] as const,
+
+  lists: (userId: string | undefined) =>
+    [...multiSessionQueryKeys.all(userId), "list"] as const,
+
+  list: <TQuery = undefined>(userId: string | undefined, query?: TQuery) =>
+    [...multiSessionQueryKeys.lists(userId), query ?? null] as const
+} as const