fix: prepend BLUE_SDK_QUERY_KEY_PREFIX to all query keys

0xbulma · claude · 0xbulma · commit 51fd0d5ff68e · 2026-03-26T10:23:21.000+01:00
Wire the shared prefix into every query key so that
invalidateAllBlueSdkQueries can use a single prefix-based
invalidation call instead of looping through individual names.

Also migrate fetchMarketParams and fetchVaultConfig to the
closure-based queryFn pattern for consistency.

Co-Authored-By: Claude Opus 4.6 (1M context) &lt;noreply@anthropic.com&gt;
diff --git a/packages/blue-sdk-wagmi/src/queries/fetchHolding.ts b/packages/blue-sdk-wagmi/src/queries/fetchHolding.ts
@@ -7,6 +7,7 @@ import type { QueryOptions } from "@tanstack/query-core";
 import type { ReadContractErrorType } from "viem";
 import type { Config } from "wagmi";
 import { hashFn } from "wagmi/query";
+import { BLUE_SDK_QUERY_KEY_PREFIX } from "../query-key-prefix.js";
 import type { TokenParameters } from "./fetchToken.js";
 import type { UserParameters } from "./fetchUser.js";
 
@@ -63,6 +64,7 @@ export function fetchHoldingQueryKey({
   stateOverride,
 }: FetchHoldingParameters) {
   return [
+    BLUE_SDK_QUERY_KEY_PREFIX,
     "fetchHolding",
     // Ignore all other irrelevant parameters.
     {
diff --git a/packages/blue-sdk-wagmi/src/queries/fetchMarket.ts b/packages/blue-sdk-wagmi/src/queries/fetchMarket.ts
@@ -7,6 +7,7 @@ import type { QueryOptions } from "@tanstack/query-core";
 import type { ReadContractErrorType } from "viem";
 import type { Config } from "wagmi";
 import { hashFn } from "wagmi/query";
+import { BLUE_SDK_QUERY_KEY_PREFIX } from "../query-key-prefix.js";
 
 export type MarketParameters = {
   marketId: MarketId;
@@ -56,6 +57,7 @@ export function fetchMarketQueryKey({
   stateOverride,
 }: FetchMarketParameters) {
   return [
+    BLUE_SDK_QUERY_KEY_PREFIX,
     "fetchMarket",
     // Ignore all other irrelevant parameters.
     {
diff --git a/packages/blue-sdk-wagmi/src/queries/fetchMarketParams.ts b/packages/blue-sdk-wagmi/src/queries/fetchMarketParams.ts
@@ -7,6 +7,7 @@ import type { QueryOptions } from "@tanstack/query-core";
 import type { ReadContractErrorType } from "viem";
 import type { Config } from "wagmi";
 import { hashFn } from "wagmi/query";
+import { BLUE_SDK_QUERY_KEY_PREFIX } from "../query-key-prefix.js";
 import type { MarketParameters } from "./fetchMarket.js";
 
 export type MarketParamsParameters = MarketParameters;
@@ -21,8 +22,8 @@ export function fetchMarketParamsQueryOptions<config extends Config>(
   return {
     // TODO: Support `signal` once Viem actions allow passthrough
     // https://tkdodo.eu/blog/why-you-want-react-query#bonus-cancellation
-    async queryFn({ queryKey }) {
-      const { marketId, chainId } = queryKey[1];
+    async queryFn() {
+      const { marketId, chainId } = parameters;
       if (!marketId) throw Error("marketId is required");
 
       return fetchMarketParams(marketId, config.getClient({ chainId }), {
@@ -44,6 +45,7 @@ export function fetchMarketParamsQueryKey({
   chainId,
 }: FetchMarketParamsParameters) {
   return [
+    BLUE_SDK_QUERY_KEY_PREFIX,
     "fetchMarketParams",
     // Ignore all other irrelevant parameters.
     {
diff --git a/packages/blue-sdk-wagmi/src/queries/fetchPosition.ts b/packages/blue-sdk-wagmi/src/queries/fetchPosition.ts
@@ -4,6 +4,7 @@ import type { QueryOptions } from "@tanstack/query-core";
 import type { ReadContractErrorType } from "viem";
 import type { Config } from "wagmi";
 import { hashFn } from "wagmi/query";
+import { BLUE_SDK_QUERY_KEY_PREFIX } from "../query-key-prefix.js";
 import type { MarketParameters } from "./fetchMarket.js";
 import type { UserParameters } from "./fetchUser.js";
 
@@ -59,6 +60,7 @@ export function fetchPositionQueryKey({
   stateOverride,
 }: FetchPositionParameters) {
   return [
+    BLUE_SDK_QUERY_KEY_PREFIX,
     "fetchPosition",
     // Ignore all other irrelevant parameters.
     {
diff --git a/packages/blue-sdk-wagmi/src/queries/fetchToken.ts b/packages/blue-sdk-wagmi/src/queries/fetchToken.ts
@@ -7,6 +7,7 @@ import type { QueryOptions } from "@tanstack/query-core";
 import type { Address, ReadContractErrorType } from "viem";
 import type { Config } from "wagmi";
 import { hashFn } from "wagmi/query";
+import { BLUE_SDK_QUERY_KEY_PREFIX } from "../query-key-prefix.js";
 
 export type TokenParameters = {
   token: Address;
@@ -56,6 +57,7 @@ export function fetchTokenQueryKey({
   stateOverride,
 }: FetchTokenParameters) {
   return [
+    BLUE_SDK_QUERY_KEY_PREFIX,
     "fetchToken",
     // Ignore all other irrelevant parameters.
     {
diff --git a/packages/blue-sdk-wagmi/src/queries/fetchUser.ts b/packages/blue-sdk-wagmi/src/queries/fetchUser.ts
@@ -4,6 +4,7 @@ import type { QueryOptions } from "@tanstack/query-core";
 import type { Address, ReadContractErrorType } from "viem";
 import type { Config } from "wagmi";
 import { hashFn } from "wagmi/query";
+import { BLUE_SDK_QUERY_KEY_PREFIX } from "../query-key-prefix.js";
 
 export type UserParameters = {
   user: Address;
@@ -51,6 +52,7 @@ export function fetchUserQueryKey({
   stateOverride,
 }: FetchUserParameters) {
   return [
+    BLUE_SDK_QUERY_KEY_PREFIX,
     "fetchUser",
     // Ignore all other irrelevant parameters.
     {
diff --git a/packages/blue-sdk-wagmi/src/queries/fetchVault.ts b/packages/blue-sdk-wagmi/src/queries/fetchVault.ts
@@ -7,6 +7,7 @@ import type { QueryOptions } from "@tanstack/query-core";
 import type { Address, ReadContractErrorType } from "viem";
 import type { Config } from "wagmi";
 import { hashFn } from "wagmi/query";
+import { BLUE_SDK_QUERY_KEY_PREFIX } from "../query-key-prefix.js";
 
 export type VaultParameters = {
   vault: Address;
@@ -56,6 +57,7 @@ export function fetchVaultQueryKey({
   stateOverride,
 }: FetchVaultParameters) {
   return [
+    BLUE_SDK_QUERY_KEY_PREFIX,
     "fetchVault",
     {
       vault,
diff --git a/packages/blue-sdk-wagmi/src/queries/fetchVaultConfig.ts b/packages/blue-sdk-wagmi/src/queries/fetchVaultConfig.ts
@@ -7,6 +7,7 @@ import type { QueryOptions } from "@tanstack/query-core";
 import type { ReadContractErrorType } from "viem";
 import type { Config } from "wagmi";
 import { hashFn } from "wagmi/query";
+import { BLUE_SDK_QUERY_KEY_PREFIX } from "../query-key-prefix.js";
 import type { VaultParameters } from "./fetchVault.js";
 
 export type VaultConfigParameters = VaultParameters;
@@ -21,13 +22,12 @@ export function fetchVaultConfigQueryOptions<config extends Config>(
   return {
     // TODO: Support `signal` once Viem actions allow passthrough
     // https://tkdodo.eu/blog/why-you-want-react-query#bonus-cancellation
-    async queryFn({ queryKey }) {
-      const { vault, chainId, ...parameters } = queryKey[1];
+    async queryFn() {
+      const { vault, chainId } = parameters;
       if (!vault) throw Error("vault is required");
 
       return fetchVaultConfig(vault, config.getClient({ chainId }), {
         chainId,
-        ...parameters,
       });
     },
     queryKey: fetchVaultConfigQueryKey(parameters),
@@ -45,6 +45,7 @@ export function fetchVaultConfigQueryKey({
   chainId,
 }: FetchVaultConfigParameters) {
   return [
+    BLUE_SDK_QUERY_KEY_PREFIX,
     "fetchVaultConfig",
     // Ignore all other irrelevant parameters.
     {
diff --git a/packages/blue-sdk-wagmi/src/queries/fetchVaultMarketConfig.ts b/packages/blue-sdk-wagmi/src/queries/fetchVaultMarketConfig.ts
@@ -7,6 +7,7 @@ import type { QueryOptions } from "@tanstack/query-core";
 import type { ReadContractErrorType } from "viem";
 import type { Config } from "wagmi";
 import { hashFn } from "wagmi/query";
+import { BLUE_SDK_QUERY_KEY_PREFIX } from "../query-key-prefix.js";
 import type { MarketParameters } from "./fetchMarket.js";
 import type { VaultParameters } from "./fetchVault.js";
 
@@ -62,6 +63,7 @@ export function fetchVaultMarketConfigQueryKey({
   stateOverride,
 }: FetchVaultMarketConfigParameters) {
   return [
+    BLUE_SDK_QUERY_KEY_PREFIX,
     "fetchVaultMarketConfig",
     // Ignore all other irrelevant parameters.
     {
diff --git a/packages/blue-sdk-wagmi/src/queries/fetchVaultUser.ts b/packages/blue-sdk-wagmi/src/queries/fetchVaultUser.ts
@@ -7,6 +7,7 @@ import type { QueryOptions } from "@tanstack/query-core";
 import type { ReadContractErrorType } from "viem";
 import type { Config } from "wagmi";
 import { hashFn } from "wagmi/query";
+import { BLUE_SDK_QUERY_KEY_PREFIX } from "../query-key-prefix.js";
 import type { UserParameters } from "./fetchUser.js";
 import type { VaultParameters } from "./fetchVault.js";
 
@@ -63,6 +64,7 @@ export function fetchVaultUserQueryKey({
   stateOverride,
 }: FetchVaultUserParameters) {
   return [
+    BLUE_SDK_QUERY_KEY_PREFIX,
     "fetchVaultUser",
     {
       vault,
diff --git a/packages/blue-sdk-wagmi/src/queries/fetchVaultV2.ts b/packages/blue-sdk-wagmi/src/queries/fetchVaultV2.ts
@@ -7,6 +7,7 @@ import type { QueryOptions } from "@tanstack/query-core";
 import type { Address, ReadContractErrorType } from "viem";
 import type { Config } from "wagmi";
 import { hashFn } from "wagmi/query";
+import { BLUE_SDK_QUERY_KEY_PREFIX } from "../query-key-prefix.js";
 
 export type VaultV2Parameters = {
   vaultV2: Address;
@@ -56,6 +57,7 @@ export function fetchVaultV2QueryKey({
   stateOverride,
 }: FetchVaultV2Parameters) {
   return [
+    BLUE_SDK_QUERY_KEY_PREFIX,
     "fetchVaultV2",
     {
       vaultV2,
diff --git a/packages/blue-sdk-wagmi/src/queries/fetchVaultV2Adapter.ts b/packages/blue-sdk-wagmi/src/queries/fetchVaultV2Adapter.ts
@@ -7,6 +7,7 @@ import type { QueryOptions } from "@tanstack/query-core";
 import type { Address, ReadContractErrorType } from "viem";
 import type { Config } from "wagmi";
 import { hashFn } from "wagmi/query";
+import { BLUE_SDK_QUERY_KEY_PREFIX } from "../query-key-prefix.js";
 
 export type VaultV2AdapterParameters = {
   vaultV2Adapter: Address;
@@ -60,6 +61,7 @@ export function fetchVaultV2AdapterQueryKey({
   stateOverride,
 }: FetchVaultV2AdapterParameters) {
   return [
+    BLUE_SDK_QUERY_KEY_PREFIX,
     "fetchVaultV2Adapter",
     {
       vaultV2Adapter,
diff --git a/packages/blue-sdk-wagmi/src/query-key-prefix.ts b/packages/blue-sdk-wagmi/src/query-key-prefix.ts
@@ -1,29 +1,15 @@
 /**
  * Shared prefix for all `@morpho-org/blue-sdk-wagmi` query keys.
  *
- * Can be used with `queryClient.invalidateQueries({ queryKey: [BLUE_SDK_QUERY_KEY_PREFIX] })`
- * to invalidate every SDK query at once (e.g. on a new block).
+ * Every SDK query key starts with this prefix, so you can use it to
+ * invalidate or filter all SDK queries at once:
+ *
+ * ```ts
+ * queryClient.invalidateQueries({ queryKey: [BLUE_SDK_QUERY_KEY_PREFIX] })
+ * ```
  */
 export const BLUE_SDK_QUERY_KEY_PREFIX = "@morpho-org/blue-sdk" as const;
 
-/** All fetch-* query key names exported by the SDK. */
-export const BLUE_SDK_QUERY_NAMES = [
-  "fetchMarket",
-  "fetchMarketParams",
-  "fetchToken",
-  "fetchUser",
-  "fetchVault",
-  "fetchVaultConfig",
-  "fetchVaultUser",
-  "fetchPosition",
-  "fetchHolding",
-  "fetchVaultMarketConfig",
-  "fetchVaultV2",
-  "fetchVaultV2Adapter",
-] as const;
-
-export type BlueSdkQueryName = (typeof BLUE_SDK_QUERY_NAMES)[number];
-
 /** Minimal interface for a TanStack QueryClient (avoids version coupling). */
 interface InvalidatableQueryClient {
   invalidateQueries(options: {
@@ -52,10 +38,8 @@ export function invalidateAllBlueSdkQueries(
 ) {
   const cancelRefetch = options?.cancelRefetch ?? true;
 
-  for (const name of BLUE_SDK_QUERY_NAMES) {
-    queryClient.invalidateQueries({
-      queryKey: [name],
-      cancelRefetch,
-    });
-  }
+  queryClient.invalidateQueries({
+    queryKey: [BLUE_SDK_QUERY_KEY_PREFIX],
+    cancelRefetch,
+  });
 }
