@doswiftly/cli 0.2.5 → 1.0.0

package/templates/storefront-nextjs-shadcn/hooks/use-cart-sync.ts

@@ -9,7 +9,7 @@ import type { CartLineFields } from "@/lib/graphql/fragments";
 /**
  * Per-line attribute selection surfaced to cart UI (configurator choices).
  * Mirroruje CartLine.attributeSelections z GraphQL, ale ograniczony do pól
- * potrzebnych do wyświetlania — surchargeAmount kumulowany w cost.totalAmount
+ * potrzebnych do wyświetlania — surchargeAmount kumulowany w cost.total
  * (BUNDLED) lub emitowany jako child OrderItem po checkout (SEPARATE_LINE).
  */
 export interface CartItemAttributeSelection {
@@ -74,7 +74,7 @@ export function useCartSync() {
 
   // Map GraphQL lines to display-friendly items
   const items: CartItemData[] = (cart?.lines ?? []).map((line: CartLineFields) => {
-    const merchandiseTitle = line.merchandise.title ?? "";
+    const merchandiseTitle = line.variant.title ?? "";
     // Hide generic variant names like "Default" or "Default Title"
     const isDefaultVariant = /^default(\s+title)?$/i.test(merchandiseTitle);
     const productTitle = line.productTitle || merchandiseTitle;
@@ -82,19 +82,19 @@ export function useCartSync() {
 
     return {
       lineId: line.id,
-      variantId: line.merchandise.id,
-      productId: line.productId || line.merchandise.id,
+      variantId: line.variant.id,
+      productId: line.productId || line.variant.id,
       productHandle: line.productHandle ?? undefined,
       productTitle,
       variantTitle,
       productType: line.productType ?? undefined,
       quantity: line.quantity,
       price: {
-        amount: line.merchandise.price.amount,
-        currencyCode: line.merchandise.price.currencyCode,
+        amount: line.variant.price.amount,
+        currencyCode: line.variant.price.currencyCode,
       },
-      image: line.merchandise.image || null,
-      available: line.merchandise.available,
+      image: line.variant.image || null,
+      available: line.variant.isAvailable,
       // Faza 1 — configurator selections (backend snapshot).
       attributeSelections: (line.attributeSelections ?? []).map((sel) => ({
         attributeDefinitionId: sel.attributeDefinitionId,
@@ -108,17 +108,17 @@ export function useCartSync() {
   });
 
   const totalQuantity = cart?.totalQuantity ?? 0;
-  const subtotal = cart?.cost?.subtotalAmount
-    ? parseFloat(cart.cost.subtotalAmount.amount)
+  const subtotal = cart?.cost?.subtotal
+    ? parseFloat(cart.cost.subtotal.amount)
     : 0;
-  const total = cart?.cost?.totalAmount
-    ? parseFloat(cart.cost.totalAmount.amount)
+  const total = cart?.cost?.total
+    ? parseFloat(cart.cost.total.amount)
     : subtotal;
-  const currency = cart?.cost?.subtotalAmount?.currencyCode ?? "PLN";
+  const currency = cart?.cost?.subtotal?.currencyCode ?? "PLN";
 
   // Discount data from server
   const discountCodes: string[] = (cart?.discountCodes ?? [])
-    .filter((dc) => dc.applicable)
+    .filter((dc) => dc.isApplicable)
     .map((dc) => dc.code);
   const totalDiscount = subtotal - total;
 

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

@@ -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/server.ts

@@ -203,11 +203,28 @@ export const fetchAvailableFilters = cache(async (
 });
 
 /**
- * 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/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": {

package/templates/storefront-nextjs-shadcn/stores/checkout-store.ts

@@ -8,11 +8,11 @@ import { createStoreContext } from '@doswiftly/storefront-sdk/react';
 export interface AddressForm {
   firstName: string;
   lastName: string;
-  address1: string;
-  address2: string;
+  streetLine1: string;
+  streetLine2: string;
   city: string;
-  province: string;
-  zip: string;
+  state: string;
+  postalCode: string;
   country: string;
   phone: string;
   company: string;
@@ -68,11 +68,11 @@ export interface CheckoutState {
 const emptyAddress: AddressForm = {
   firstName: '',
   lastName: '',
-  address1: '',
-  address2: '',
+  streetLine1: '',
+  streetLine2: '',
   city: '',
-  province: '',
-  zip: '',
+  state: '',
+  postalCode: '',
   country: 'PL',
   phone: '',
   company: '',