@doswiftly/cli 0.2.6 → 1.0.1

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

@@ -16,7 +16,7 @@ import {
   CollectionsDocument,
   CategoriesDocument,
   CategoryDocument,
-  AvailableFiltersDocument,
+  ProductFiltersDocument,
   CartDocument,
   CartCreateDocument,
   CartLinesAddDocument,
@@ -25,16 +25,16 @@ import {
   CartDiscountCodesUpdateDocument,
   CheckoutDocument,
   CheckoutCreateDocument,
-  CheckoutShippingAddressUpdateDocument,
-  CheckoutBillingAddressUpdateDocument,
-  CheckoutEmailUpdateDocument,
-  CheckoutShippingLineUpdateDocument,
-  CheckoutDiscountCodeApplyDocument,
-  CheckoutDiscountCodeRemoveDocument,
+  CheckoutUpdateShippingAddressDocument,
+  CheckoutUpdateBillingAddressDocument,
+  CheckoutUpdateEmailDocument,
+  CheckoutSelectShippingRateDocument,
+  CheckoutApplyDiscountCodeDocument,
+  CheckoutRemoveDiscountCodeDocument,
   CheckoutCompleteDocument,
-  CheckoutGiftCardApplyDocument,
-  CheckoutGiftCardRemoveDocument,
-  CheckoutGiftCardRecipientUpdateDocument,
+  CheckoutApplyGiftCardDocument,
+  CheckoutRemoveGiftCardDocument,
+  CheckoutUpdateGiftCardRecipientDocument,
   CustomerDocument,
   CustomerProfileDocument,
   CustomerOrderDocument,
@@ -70,8 +70,8 @@ import type {
   CategoryQueryVariables,
   Category,
   ProductFilterInput,
-  AvailableFiltersQuery,
-  AvailableFiltersQueryVariables,
+  ProductFiltersQuery,
+  ProductFiltersQueryVariables,
   AvailableFiltersInput,
   CartQuery,
   CartQueryVariables,
@@ -89,26 +89,26 @@ import type {
   CheckoutQueryVariables,
   CheckoutCreateMutation,
   CheckoutCreateMutationVariables,
-  CheckoutShippingAddressUpdateMutation,
-  CheckoutShippingAddressUpdateMutationVariables,
-  CheckoutBillingAddressUpdateMutation,
-  CheckoutBillingAddressUpdateMutationVariables,
-  CheckoutEmailUpdateMutation,
-  CheckoutEmailUpdateMutationVariables,
-  CheckoutShippingLineUpdateMutation,
-  CheckoutShippingLineUpdateMutationVariables,
-  CheckoutDiscountCodeApplyMutation,
-  CheckoutDiscountCodeApplyMutationVariables,
-  CheckoutDiscountCodeRemoveMutation,
-  CheckoutDiscountCodeRemoveMutationVariables,
+  CheckoutUpdateShippingAddressMutation,
+  CheckoutUpdateShippingAddressMutationVariables,
+  CheckoutUpdateBillingAddressMutation,
+  CheckoutUpdateBillingAddressMutationVariables,
+  CheckoutUpdateEmailMutation,
+  CheckoutUpdateEmailMutationVariables,
+  CheckoutSelectShippingRateMutation,
+  CheckoutSelectShippingRateMutationVariables,
+  CheckoutApplyDiscountCodeMutation,
+  CheckoutApplyDiscountCodeMutationVariables,
+  CheckoutRemoveDiscountCodeMutation,
+  CheckoutRemoveDiscountCodeMutationVariables,
   CheckoutCompleteMutation,
   CheckoutCompleteMutationVariables,
-  CheckoutGiftCardApplyMutation,
-  CheckoutGiftCardApplyMutationVariables,
-  CheckoutGiftCardRemoveMutation,
-  CheckoutGiftCardRemoveMutationVariables,
-  CheckoutGiftCardRecipientUpdateMutation,
-  CheckoutGiftCardRecipientUpdateMutationVariables,
+  CheckoutApplyGiftCardMutation,
+  CheckoutApplyGiftCardMutationVariables,
+  CheckoutRemoveGiftCardMutation,
+  CheckoutRemoveGiftCardMutationVariables,
+  CheckoutUpdateGiftCardRecipientMutation,
+  CheckoutUpdateGiftCardRecipientMutationVariables,
   CustomerQuery,
   CustomerQueryVariables,
   CustomerProfileQuery,
@@ -454,11 +454,11 @@ export function useCategories(
         ]);
       };
 
-      const allCategories = flattenCategories(data.categories.roots as Category[]);
+      const allCategories = flattenCategories(data.categories.nodes as Category[]);
 
       return {
         categories: allCategories,
-        roots: data.categories.roots,
+        nodes: data.categories.nodes,
         totalCount: data.categories.totalCount,
       };
     },
@@ -471,20 +471,20 @@ export function useCategories(
 // ============================================================================
 
 /**
- * Fetch available filters for product listing (dynamic attributes, price range, categories).
+ * Fetch product filters for product listing (dynamic attributes, price range, categories).
  * Context-aware: pass categoryId, collectionId, or searchQuery to scope filters.
  *
  * @example
  * ```typescript
- * const { data } = useAvailableFilters({ categoryId: 'some-id' });
- * data?.availableFilters.attributes // dynamic attribute filters with counts
- * data?.availableFilters.priceRange // { min, max } in context
- * data?.availableFilters.categories // category filters with counts
+ * const { data } = useProductFilters({ categoryId: 'some-id' });
+ * data?.productFilters.attributes // dynamic attribute filters with counts
+ * data?.productFilters.priceRange // { min, max } in context
+ * data?.productFilters.categories // category filters with counts
  * ```
  */
-export function useAvailableFilters(
+export function useProductFilters(
   input?: AvailableFiltersInput,
-  options?: Omit<UseQueryOptions<AvailableFiltersQuery>, 'queryKey' | 'queryFn'>
+  options?: Omit<UseQueryOptions<ProductFiltersQuery>, 'queryKey' | 'queryFn'>
 ) {
   const execute = useExecute();
   const currency = useCurrencyStore((s) => s.currency);
@@ -493,8 +493,8 @@ export function useAvailableFilters(
   return useQuery({
     queryKey: queryKeys.filters.forContext(input as Record<string, unknown>, currency, language),
     queryFn: () => {
-      const variables: AvailableFiltersQueryVariables = { input: input || null };
-      return execute<AvailableFiltersQuery>(AvailableFiltersDocument.toString(), variables);
+      const variables: ProductFiltersQueryVariables = { input: input || null };
+      return execute<ProductFiltersQuery>(ProductFiltersDocument.toString(), variables);
     },
     staleTime: 60_000, // Filters change infrequently, cache for 1 min
     ...options,
@@ -694,15 +694,15 @@ export function useCheckoutCreate(
 /**
  * Update checkout shipping address
  */
-export function useCheckoutShippingAddressUpdate(
-  options?: UseMutationOptions<CheckoutShippingAddressUpdateMutation, Error, CheckoutShippingAddressUpdateMutationVariables>
+export function useCheckoutUpdateShippingAddress(
+  options?: UseMutationOptions<CheckoutUpdateShippingAddressMutation, Error, CheckoutUpdateShippingAddressMutationVariables>
 ) {
   const execute = useExecute();
   const queryClient = useQueryClient();
 
   return useMutation({
-    mutationFn: (variables: CheckoutShippingAddressUpdateMutationVariables) =>
-      execute<CheckoutShippingAddressUpdateMutation>(CheckoutShippingAddressUpdateDocument.toString(), variables),
+    mutationFn: (variables: CheckoutUpdateShippingAddressMutationVariables) =>
+      execute<CheckoutUpdateShippingAddressMutation>(CheckoutUpdateShippingAddressDocument.toString(), variables),
     onMutate: async () => {
       await queryClient.cancelQueries({ queryKey: queryKeys.checkout.all() });
     },
@@ -716,15 +716,15 @@ export function useCheckoutShippingAddressUpdate(
 /**
  * Update checkout billing address
  */
-export function useCheckoutBillingAddressUpdate(
-  options?: UseMutationOptions<CheckoutBillingAddressUpdateMutation, Error, CheckoutBillingAddressUpdateMutationVariables>
+export function useCheckoutUpdateBillingAddress(
+  options?: UseMutationOptions<CheckoutUpdateBillingAddressMutation, Error, CheckoutUpdateBillingAddressMutationVariables>
 ) {
   const execute = useExecute();
   const queryClient = useQueryClient();
 
   return useMutation({
-    mutationFn: (variables: CheckoutBillingAddressUpdateMutationVariables) =>
-      execute<CheckoutBillingAddressUpdateMutation>(CheckoutBillingAddressUpdateDocument.toString(), variables),
+    mutationFn: (variables: CheckoutUpdateBillingAddressMutationVariables) =>
+      execute<CheckoutUpdateBillingAddressMutation>(CheckoutUpdateBillingAddressDocument.toString(), variables),
     onMutate: async () => {
       await queryClient.cancelQueries({ queryKey: queryKeys.checkout.all() });
     },
@@ -738,15 +738,15 @@ export function useCheckoutBillingAddressUpdate(
 /**
  * Update checkout email
  */
-export function useCheckoutEmailUpdate(
-  options?: UseMutationOptions<CheckoutEmailUpdateMutation, Error, CheckoutEmailUpdateMutationVariables>
+export function useCheckoutUpdateEmail(
+  options?: UseMutationOptions<CheckoutUpdateEmailMutation, Error, CheckoutUpdateEmailMutationVariables>
 ) {
   const execute = useExecute();
   const queryClient = useQueryClient();
 
   return useMutation({
-    mutationFn: (variables: CheckoutEmailUpdateMutationVariables) =>
-      execute<CheckoutEmailUpdateMutation>(CheckoutEmailUpdateDocument.toString(), variables),
+    mutationFn: (variables: CheckoutUpdateEmailMutationVariables) =>
+      execute<CheckoutUpdateEmailMutation>(CheckoutUpdateEmailDocument.toString(), variables),
     onMutate: async () => {
       await queryClient.cancelQueries({ queryKey: queryKeys.checkout.all() });
     },
@@ -760,15 +760,15 @@ export function useCheckoutEmailUpdate(
 /**
  * Update checkout shipping line (select shipping method)
  */
-export function useCheckoutShippingLineUpdate(
-  options?: UseMutationOptions<CheckoutShippingLineUpdateMutation, Error, CheckoutShippingLineUpdateMutationVariables>
+export function useCheckoutSelectShippingRate(
+  options?: UseMutationOptions<CheckoutSelectShippingRateMutation, Error, CheckoutSelectShippingRateMutationVariables>
 ) {
   const execute = useExecute();
   const queryClient = useQueryClient();
 
   return useMutation({
-    mutationFn: (variables: CheckoutShippingLineUpdateMutationVariables) =>
-      execute<CheckoutShippingLineUpdateMutation>(CheckoutShippingLineUpdateDocument.toString(), variables),
+    mutationFn: (variables: CheckoutSelectShippingRateMutationVariables) =>
+      execute<CheckoutSelectShippingRateMutation>(CheckoutSelectShippingRateDocument.toString(), variables),
     onMutate: async () => {
       await queryClient.cancelQueries({ queryKey: queryKeys.checkout.all() });
     },
@@ -782,15 +782,15 @@ export function useCheckoutShippingLineUpdate(
 /**
  * Apply discount code to checkout
  */
-export function useCheckoutDiscountCodeApply(
-  options?: UseMutationOptions<CheckoutDiscountCodeApplyMutation, Error, CheckoutDiscountCodeApplyMutationVariables>
+export function useCheckoutApplyDiscountCode(
+  options?: UseMutationOptions<CheckoutApplyDiscountCodeMutation, Error, CheckoutApplyDiscountCodeMutationVariables>
 ) {
   const execute = useExecute();
   const queryClient = useQueryClient();
 
   return useMutation({
-    mutationFn: (variables: CheckoutDiscountCodeApplyMutationVariables) =>
-      execute<CheckoutDiscountCodeApplyMutation>(CheckoutDiscountCodeApplyDocument.toString(), variables),
+    mutationFn: (variables: CheckoutApplyDiscountCodeMutationVariables) =>
+      execute<CheckoutApplyDiscountCodeMutation>(CheckoutApplyDiscountCodeDocument.toString(), variables),
     onMutate: async () => {
       await queryClient.cancelQueries({ queryKey: queryKeys.checkout.all() });
     },
@@ -804,15 +804,15 @@ export function useCheckoutDiscountCodeApply(
 /**
  * Remove discount code from checkout
  */
-export function useCheckoutDiscountCodeRemove(
-  options?: UseMutationOptions<CheckoutDiscountCodeRemoveMutation, Error, CheckoutDiscountCodeRemoveMutationVariables>
+export function useCheckoutRemoveDiscountCode(
+  options?: UseMutationOptions<CheckoutRemoveDiscountCodeMutation, Error, CheckoutRemoveDiscountCodeMutationVariables>
 ) {
   const execute = useExecute();
   const queryClient = useQueryClient();
 
   return useMutation({
-    mutationFn: (variables: CheckoutDiscountCodeRemoveMutationVariables) =>
-      execute<CheckoutDiscountCodeRemoveMutation>(CheckoutDiscountCodeRemoveDocument.toString(), variables),
+    mutationFn: (variables: CheckoutRemoveDiscountCodeMutationVariables) =>
+      execute<CheckoutRemoveDiscountCodeMutation>(CheckoutRemoveDiscountCodeDocument.toString(), variables),
     onMutate: async () => {
       await queryClient.cancelQueries({ queryKey: queryKeys.checkout.all() });
     },
@@ -849,15 +849,15 @@ export function useCheckoutComplete(
 /**
  * Apply gift card code to checkout
  */
-export function useCheckoutGiftCardApply(
-  options?: UseMutationOptions<CheckoutGiftCardApplyMutation, Error, CheckoutGiftCardApplyMutationVariables>
+export function useCheckoutApplyGiftCard(
+  options?: UseMutationOptions<CheckoutApplyGiftCardMutation, Error, CheckoutApplyGiftCardMutationVariables>
 ) {
   const execute = useExecute();
   const queryClient = useQueryClient();
 
   return useMutation({
-    mutationFn: (variables: CheckoutGiftCardApplyMutationVariables) =>
-      execute<CheckoutGiftCardApplyMutation>(CheckoutGiftCardApplyDocument.toString(), variables),
+    mutationFn: (variables: CheckoutApplyGiftCardMutationVariables) =>
+      execute<CheckoutApplyGiftCardMutation>(CheckoutApplyGiftCardDocument.toString(), variables),
     onMutate: async () => {
       await queryClient.cancelQueries({ queryKey: queryKeys.checkout.all() });
     },
@@ -871,15 +871,15 @@ export function useCheckoutGiftCardApply(
 /**
  * Remove gift card from checkout
  */
-export function useCheckoutGiftCardRemove(
-  options?: UseMutationOptions<CheckoutGiftCardRemoveMutation, Error, CheckoutGiftCardRemoveMutationVariables>
+export function useCheckoutRemoveGiftCard(
+  options?: UseMutationOptions<CheckoutRemoveGiftCardMutation, Error, CheckoutRemoveGiftCardMutationVariables>
 ) {
   const execute = useExecute();
   const queryClient = useQueryClient();
 
   return useMutation({
-    mutationFn: (variables: CheckoutGiftCardRemoveMutationVariables) =>
-      execute<CheckoutGiftCardRemoveMutation>(CheckoutGiftCardRemoveDocument.toString(), variables),
+    mutationFn: (variables: CheckoutRemoveGiftCardMutationVariables) =>
+      execute<CheckoutRemoveGiftCardMutation>(CheckoutRemoveGiftCardDocument.toString(), variables),
     onMutate: async () => {
       await queryClient.cancelQueries({ queryKey: queryKeys.checkout.all() });
     },
@@ -893,15 +893,15 @@ export function useCheckoutGiftCardRemove(
 /**
  * Update gift card recipient data on checkout line item
  */
-export function useCheckoutGiftCardRecipientUpdate(
-  options?: UseMutationOptions<CheckoutGiftCardRecipientUpdateMutation, Error, CheckoutGiftCardRecipientUpdateMutationVariables>
+export function useCheckoutUpdateGiftCardRecipient(
+  options?: UseMutationOptions<CheckoutUpdateGiftCardRecipientMutation, Error, CheckoutUpdateGiftCardRecipientMutationVariables>
 ) {
   const execute = useExecute();
   const queryClient = useQueryClient();
 
   return useMutation({
-    mutationFn: (variables: CheckoutGiftCardRecipientUpdateMutationVariables) =>
-      execute<CheckoutGiftCardRecipientUpdateMutation>(CheckoutGiftCardRecipientUpdateDocument.toString(), variables),
+    mutationFn: (variables: CheckoutUpdateGiftCardRecipientMutationVariables) =>
+      execute<CheckoutUpdateGiftCardRecipientMutation>(CheckoutUpdateGiftCardRecipientDocument.toString(), variables),
     onMutate: async () => {
       await queryClient.cancelQueries({ queryKey: queryKeys.checkout.all() });
     },
@@ -925,15 +925,14 @@ export function useCustomer(
   options?: Omit<UseQueryOptions<CustomerQuery>, 'queryKey' | 'queryFn' | 'enabled'>
 ) {
   const execute = useExecute();
-  const accessToken = useAuthStore((s) => s.accessToken);
+  // Token nie jest argumentem mutacji (auth context via httpOnly cookie / Bearer header).
+  // `isAuthenticated` flag (persisted) używamy do gate query — uniknąć round-trip dla guesta.
+  const isAuthenticated = useAuthStore((s) => s.isAuthenticated);
 
   return useQuery({
-    queryKey: queryKeys.customer.detail(accessToken || ''),
-    queryFn: () =>
-      execute<CustomerQuery>(CustomerDocument.toString(), {
-        customerAccessToken: accessToken!,
-      } as CustomerQueryVariables),
-    enabled: !!accessToken,
+    queryKey: queryKeys.customer.detail(isAuthenticated ? 'me' : 'guest'),
+    queryFn: () => execute<CustomerQuery>(CustomerDocument.toString()),
+    enabled: isAuthenticated,
     ...options,
   });
 }
@@ -946,15 +945,12 @@ export function useCustomerProfile(
   options?: Omit<UseQueryOptions<CustomerProfileQuery>, 'queryKey' | 'queryFn' | 'enabled'>
 ) {
   const execute = useExecute();
-  const accessToken = useAuthStore((s) => s.accessToken);
+  const isAuthenticated = useAuthStore((s) => s.isAuthenticated);
 
   return useQuery({
-    queryKey: queryKeys.customer.detail(accessToken || ''),
-    queryFn: () =>
-      execute<CustomerProfileQuery>(CustomerProfileDocument.toString(), {
-        customerAccessToken: accessToken!,
-      } as CustomerProfileQueryVariables),
-    enabled: !!accessToken,
+    queryKey: queryKeys.customer.detail(isAuthenticated ? 'me' : 'guest'),
+    queryFn: () => execute<CustomerProfileQuery>(CustomerProfileDocument.toString()),
+    enabled: isAuthenticated,
     ...options,
   });
 }
@@ -968,7 +964,7 @@ export function useCustomerOrder(
   options?: Omit<UseQueryOptions<CustomerOrderQuery>, 'queryKey' | 'queryFn' | 'enabled'>
 ) {
   const execute = useExecute();
-  const accessToken = useAuthStore((s) => s.accessToken);
+  const isAuthenticated = useAuthStore((s) => s.isAuthenticated);
   const currency = useCurrencyStore((s) => s.currency);
 
   return useQuery({
@@ -976,9 +972,8 @@ export function useCustomerOrder(
     queryFn: () =>
       execute<CustomerOrderQuery>(CustomerOrderDocument.toString(), {
         orderId,
-        customerAccessToken: accessToken!,
       } as CustomerOrderQueryVariables),
-    enabled: !!accessToken && !!orderId,
+    enabled: isAuthenticated && !!orderId,
     ...options,
   });
 }
@@ -991,14 +986,12 @@ export function useCustomerUpdate(
   options?: UseMutationOptions<CustomerUpdateMutation, Error, CustomerUpdateInput>
 ) {
   const execute = useExecute();
-  const { accessToken } = useAuthStore();
   const queryClient = useQueryClient();
 
   return useMutation({
     mutationFn: (customer: CustomerUpdateInput) =>
       execute<CustomerUpdateMutation>(CustomerUpdateDocument.toString(), {
         customer,
-        customerAccessToken: accessToken!,
       } as CustomerUpdateMutationVariables),
     onSettled: () => {
       queryClient.invalidateQueries({ queryKey: queryKeys.customer.all() });
@@ -1014,14 +1007,13 @@ export function useCustomerAddressCreate(
   options?: UseMutationOptions<CustomerAddressCreateMutation, Error, { address: Record<string, unknown> }>
 ) {
   const execute = useExecute();
-  const { accessToken } = useAuthStore();
   const queryClient = useQueryClient();
 
   return useMutation({
     mutationFn: ({ address }: { address: Record<string, unknown> }) =>
       execute<CustomerAddressCreateMutation>(
         CustomerAddressCreateDocument.toString(),
-        { address, customerAccessToken: accessToken! } as CustomerAddressCreateMutationVariables,
+        { address } as CustomerAddressCreateMutationVariables,
       ),
     onSettled: () => {
       queryClient.invalidateQueries({ queryKey: queryKeys.customer.all() });
@@ -1037,14 +1029,13 @@ export function useCustomerAddressUpdate(
   options?: UseMutationOptions<CustomerAddressUpdateMutation, Error, { id: string; address: Record<string, unknown> }>
 ) {
   const execute = useExecute();
-  const { accessToken } = useAuthStore();
   const queryClient = useQueryClient();
 
   return useMutation({
     mutationFn: ({ id, address }: { id: string; address: Record<string, unknown> }) =>
       execute<CustomerAddressUpdateMutation>(
         CustomerAddressUpdateDocument.toString(),
-        { id, address, customerAccessToken: accessToken! } as CustomerAddressUpdateMutationVariables,
+        { id, address } as CustomerAddressUpdateMutationVariables,
       ),
     onSettled: () => {
       queryClient.invalidateQueries({ queryKey: queryKeys.customer.all() });
@@ -1060,14 +1051,13 @@ export function useCustomerAddressDelete(
   options?: UseMutationOptions<CustomerAddressDeleteMutation, Error, string>
 ) {
   const execute = useExecute();
-  const { accessToken } = useAuthStore();
   const queryClient = useQueryClient();
 
   return useMutation({
     mutationFn: (id: string) =>
       execute<CustomerAddressDeleteMutation>(
         CustomerAddressDeleteDocument.toString(),
-        { id, customerAccessToken: accessToken! } as CustomerAddressDeleteMutationVariables,
+        { id } as CustomerAddressDeleteMutationVariables,
       ),
     onSettled: () => {
       queryClient.invalidateQueries({ queryKey: queryKeys.customer.all() });
@@ -1083,14 +1073,13 @@ export function useCustomerDefaultAddressUpdate(
   options?: UseMutationOptions<CustomerDefaultAddressUpdateMutation, Error, string>
 ) {
   const execute = useExecute();
-  const { accessToken } = useAuthStore();
   const queryClient = useQueryClient();
 
   return useMutation({
     mutationFn: (addressId: string) =>
       execute<CustomerDefaultAddressUpdateMutation>(
         CustomerDefaultAddressUpdateDocument.toString(),
-        { addressId, customerAccessToken: accessToken! } as CustomerDefaultAddressUpdateMutationVariables,
+        { addressId } as CustomerDefaultAddressUpdateMutationVariables,
       ),
     onSettled: () => {
       queryClient.invalidateQueries({ queryKey: queryKeys.customer.all() });
@@ -1144,13 +1133,13 @@ export function useLoyaltyMember(
   options?: Omit<UseQueryOptions<LoyaltyMemberQuery>, 'queryKey' | 'queryFn' | 'enabled'>
 ) {
   const execute = useExecute();
-  const accessToken = useAuthStore((s) => s.accessToken);
+  const isAuthenticated = useAuthStore((s) => s.isAuthenticated);
   const currency = useCurrencyStore((s) => s.currency);
 
   return useQuery({
     queryKey: queryKeys.loyalty.member(currency),
     queryFn: () => execute<LoyaltyMemberQuery>(LoyaltyMemberDocument.toString()),
-    enabled: !!accessToken,
+    enabled: isAuthenticated,
     ...options,
   });
 }
@@ -1162,13 +1151,13 @@ export function useLoyaltyRewards(
   options?: Omit<UseQueryOptions<LoyaltyRewardsQuery>, 'queryKey' | 'queryFn' | 'enabled'>
 ) {
   const execute = useExecute();
-  const accessToken = useAuthStore((s) => s.accessToken);
+  const isAuthenticated = useAuthStore((s) => s.isAuthenticated);
   const currency = useCurrencyStore((s) => s.currency);
 
   return useQuery({
     queryKey: queryKeys.loyalty.rewards(currency),
     queryFn: () => execute<LoyaltyRewardsQuery>(LoyaltyRewardsDocument.toString()),
-    enabled: !!accessToken,
+    enabled: isAuthenticated,
     ...options,
   });
 }
@@ -1181,7 +1170,7 @@ export function useLoyaltyTransactions(
   options?: Omit<UseQueryOptions<LoyaltyTransactionsQuery>, 'queryKey' | 'queryFn' | 'enabled'>
 ) {
   const execute = useExecute();
-  const accessToken = useAuthStore((s) => s.accessToken);
+  const isAuthenticated = useAuthStore((s) => s.isAuthenticated);
   const currency = useCurrencyStore((s) => s.currency);
 
   return useQuery({
@@ -1193,7 +1182,7 @@ export function useLoyaltyTransactions(
       };
       return execute<LoyaltyTransactionsQuery>(LoyaltyTransactionsDocument.toString(), graphqlVariables);
     },
-    enabled: !!accessToken,
+    enabled: isAuthenticated,
     ...options,
   });
 }
@@ -1220,12 +1209,12 @@ export function useReferralStats(
   options?: Omit<UseQueryOptions<ReferralStatsQuery>, 'queryKey' | 'queryFn' | 'enabled'>
 ) {
   const execute = useExecute();
-  const accessToken = useAuthStore((s) => s.accessToken);
+  const isAuthenticated = useAuthStore((s) => s.isAuthenticated);
 
   return useQuery({
     queryKey: queryKeys.loyalty.referralStats(),
     queryFn: () => execute<ReferralStatsQuery>(ReferralStatsDocument.toString()),
-    enabled: !!accessToken,
+    enabled: isAuthenticated,
     ...options,
   });
 }

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

@@ -54,9 +54,9 @@ export const queryKeys = {
   },
 
   filters: {
-    all: () => ['AvailableFilters'] as const,
+    all: () => ['ProductFilters'] as const,
     forContext: (input?: Record<string, unknown> | null, currency?: Currency, language?: Language) =>
-      ['AvailableFilters', input, currency, language] as const,
+      ['ProductFilters', input, currency, language] as const,
   },
 
   cart: {

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

@@ -15,7 +15,7 @@ import {
   CollectionDocument,
   CategoriesDocument,
   CategoryDocument,
-  AvailableFiltersDocument,
+  ProductFiltersDocument,
   CustomerDocument,
 } from '@/generated/graphql';
 
@@ -35,8 +35,8 @@ import type {
   CategoriesQuery,
   CategoryQuery,
   CategoryQueryVariables,
-  AvailableFiltersQuery,
-  AvailableFiltersQueryVariables,
+  ProductFiltersQuery,
+  ProductFiltersQueryVariables,
   AvailableFiltersInput,
   CustomerQuery,
   CustomerQueryVariables,
@@ -193,21 +193,38 @@ export const fetchCategory = cache(async (slugOrId: string): Promise<CategoryQue
 });
 
 /**
- * Fetch available filters for product listing (SSR)
+ * Fetch product filters for product listing (SSR)
  */
-export const fetchAvailableFilters = cache(async (
+export const fetchProductFilters = cache(async (
   input?: AvailableFiltersInput,
-): Promise<AvailableFiltersQuery> => {
-  const variables: AvailableFiltersQueryVariables = { input: input || null };
-  return request(AvailableFiltersDocument, variables);
+): Promise<ProductFiltersQuery> => {
+  const variables: ProductFiltersQueryVariables = { input: input || null };
+  return request(ProductFiltersDocument, variables);
 });
 
 /**
- * Fetch customer data (requires access token)
+ * Fetch customer data (requires authenticated session — httpOnly cookie OR explicit Bearer token).
+ *
+ * Server Components: czytaj `customerAccessToken` cookie via Next.js `cookies()` API,
+ * forward jako `Authorization: Bearer` do backend. Klient nie ma JS-access do cookie
+ * (XSS-safe), ale Next.js server może go odczytać via `cookies().get()`.
+ *
+ * @param accessToken Optional — gdy SSR helper ma już token (np. po login redirect SSR);
+ *                    domyślnie czyta z `cookies()` (App Router).
  */
-export const fetchCustomer = cache(async (accessToken: string): Promise<CustomerQuery> => {
-  const variables: CustomerQueryVariables = { customerAccessToken: accessToken };
-  return request(CustomerDocument, variables);
+export const fetchCustomer = cache(async (accessToken?: string): Promise<CustomerQuery> => {
+  let token = accessToken;
+  if (!token) {
+    const { cookies } = await import('next/headers');
+    const cookieStore = await cookies();
+    token = cookieStore.get('customerAccessToken')?.value;
+  }
+
+  return request(
+    CustomerDocument,
+    {} as CustomerQueryVariables,
+    token ? { Authorization: `Bearer ${token}` } : undefined,
+  );
 });
 
 // ============================================================================

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

@@ -57,6 +57,6 @@ export interface NormalizedCollectionsResult {
 
 export interface NormalizedCategoriesResult {
   categories: Category[];
-  roots: CategoriesQuery['categories']['roots'];
+  nodes: CategoriesQuery['categories']['nodes'];
   totalCount: number;
 }

package/templates/storefront-nextjs-shadcn/messages/en.json

@@ -241,15 +241,15 @@
       "firstName": "First Name",
       "lastName": "Last Name",
       "company": "Company",
-      "address1": "Address",
-      "address1Placeholder": "Street and number",
-      "address2": "Apartment, floor",
-      "zip": "Postal Code",
-      "zipPlaceholder": "00000",
+      "streetLine1": "Address",
+      "streetLine1Placeholder": "Street and number",
+      "streetLine2": "Apartment, floor",
+      "postalCode": "Postal Code",
+      "postalCodePlaceholder": "00000",
       "city": "City",
       "country": "Country",
       "countryPlaceholder": "Select country",
-      "province": "State/Province",
+      "state": "State/Province",
       "phone": "Phone"
     },
     "validation": {

package/templates/storefront-nextjs-shadcn/messages/pl.json

@@ -241,15 +241,15 @@
       "firstName": "Imię",
       "lastName": "Nazwisko",
       "company": "Firma",
-      "address1": "Adres",
-      "address1Placeholder": "Ulica i numer",
-      "address2": "Mieszkanie, piętro",
-      "zip": "Kod pocztowy",
-      "zipPlaceholder": "00-000",
+      "streetLine1": "Adres",
+      "streetLine1Placeholder": "Ulica i numer",
+      "streetLine2": "Mieszkanie, piętro",
+      "postalCode": "Kod pocztowy",
+      "postalCodePlaceholder": "00-000",
       "city": "Miasto",
       "country": "Kraj",
       "countryPlaceholder": "Wybierz kraj",
-      "province": "Województwo",
+      "state": "Województwo",
       "phone": "Telefon"
     },
     "validation": {