@doswiftly/cli 0.1.19 → 0.1.20

package/templates/storefront-nextjs-shadcn/lib/graphql/query-keys.ts

@@ -5,56 +5,58 @@
  * - Consistent cache invalidation across hooks
  * - No key collisions or typos
  * - Easy discovery of all cached data
- * - Currency-aware keys for automatic refetch on currency change
+ * - Currency-aware and language-aware keys for automatic refetch on change
  *
  * Convention:
  * - `all()` — matches ALL queries in this domain (for broad invalidation)
  * - `list(...)` — paginated/filtered lists
  * - `detail(...)` — single entity by ID/handle
- * - Currency is included in keys for price-sensitive queries
+ * - Currency and language are included as flat strings for stable reference
  *
  * @example
  * ```typescript
  * // In a hook:
  * const currency = useCurrencyStore((s) => s.currency);
- * useQuery({ queryKey: queryKeys.products.detail(slug, currency), ... });
+ * const language = useLanguageStore((s) => s.language);
+ * useQuery({ queryKey: queryKeys.products.detail(slug, currency, language), ... });
  *
  * // Invalidation:
  * queryClient.invalidateQueries({ queryKey: queryKeys.cart.all() });
  * ```
  */
-/** Currency type from useCurrencyStore — can be null before initialization */
+/** Currency/Language type — can be null before initialization */
 type Currency = string | null;
+type Language = string | null;
 
 export const queryKeys = {
   products: {
     all: () => ['Product'] as const,
-    list: (vars?: Record<string, unknown>, currency?: Currency) =>
-      ['Products', vars, currency] as const,
-    detail: (handleOrId: string, currency: Currency) =>
-      ['Product', handleOrId, currency] as const,
-    search: (query: string, currency: Currency) =>
-      ['ProductSearch', query, currency] as const,
+    list: (vars?: Record<string, unknown>, currency?: Currency, language?: Language) =>
+      ['Products', vars, currency, language] as const,
+    detail: (handleOrId: string, currency: Currency, language?: Language) =>
+      ['Product', handleOrId, currency, language] as const,
+    search: (query: string, currency: Currency, language?: Language) =>
+      ['ProductSearch', query, currency, language] as const,
   },
 
   collections: {
     all: () => ['Collection'] as const,
-    list: (vars?: Record<string, unknown>, currency?: Currency) =>
-      ['Collections', vars, currency] as const,
-    detail: (handleOrId: string, currency: Currency) =>
-      ['Collection', handleOrId, currency] as const,
+    list: (vars?: Record<string, unknown>, currency?: Currency, language?: Language) =>
+      ['Collections', vars, currency, language] as const,
+    detail: (handleOrId: string, currency: Currency, language?: Language) =>
+      ['Collection', handleOrId, currency, language] as const,
   },
 
   categories: {
     all: () => ['Category'] as const,
-    list: (currency: Currency) => ['Categories', currency] as const,
-    detail: (slugOrId: string) => ['Category', slugOrId] as const,
+    list: (currency: Currency, language?: Language) => ['Categories', currency, language] as const,
+    detail: (slugOrId: string, language?: Language) => ['Category', slugOrId, language] as const,
   },
 
   filters: {
     all: () => ['AvailableFilters'] as const,
-    forContext: (input?: Record<string, unknown> | null, currency?: Currency) =>
-      ['AvailableFilters', input, currency] as const,
+    forContext: (input?: Record<string, unknown> | null, currency?: Currency, language?: Language) =>
+      ['AvailableFilters', input, currency, language] as const,
   },
 
   cart: {

package/templates/storefront-nextjs-shadcn/lib/graphql/server.ts

@@ -1,6 +1,7 @@
 import { cache } from 'react';
 import { getStorefrontClient } from '@doswiftly/storefront-sdk/react/server';
 import { getCurrencyFromCookieAsync } from '@doswiftly/storefront-sdk/react';
+import { CURRENCY_HEADER_NAME } from '@doswiftly/storefront-sdk';
 import type { NormalizedProductsResult, NormalizedCollectionsResult } from './types';
 import type { TypedDocumentString } from '@/generated/graphql';
 import { graphqlConfig } from './config';
@@ -65,7 +66,7 @@ export const request = cache(async <TResult, TVariables>(
   }
 
   const headers: Record<string, string> = {
-    ...(currency && { 'X-Preferred-Currency': currency }),
+    ...(currency && { [CURRENCY_HEADER_NAME]: currency }),
     ...extraHeaders,
   };