create-brainerce-store 1.0.0 → 1.1.0

package/templates/nextjs/base/src/providers/store-provider.tsx.ejs

@@ -1,7 +1,7 @@
 'use client';
 
 import React, { createContext, useContext, useEffect, useState, useCallback } from 'react';
-import type { StoreInfo, Cart, LocalCart } from 'brainerce';
+import type { StoreInfo, Cart } from 'brainerce';
 import { getCartTotals } from 'brainerce';
 import { getClient, initClient, getStoredToken, setStoredToken, setStoredCartId } from '@/lib/brainerce';
 
@@ -41,12 +41,11 @@ export function useAuth() {
 
 // ---- Cart Context ----
 interface CartContextValue {
-  cart: Cart | LocalCart | null;
+  cart: Cart | null;
   cartLoading: boolean;
   refreshCart: () => Promise<void>;
   itemCount: number;
   totals: { subtotal: number; discount: number; shipping: number; total: number };
-  isServerCart: (c: Cart | LocalCart | null) => c is Cart;
 }
 
 const CartContext = createContext<CartContextValue>({
@@ -55,7 +54,6 @@ const CartContext = createContext<CartContextValue>({
   refreshCart: async () => {},
   itemCount: 0,
   totals: { subtotal: 0, discount: 0, shipping: 0, total: 0 },
-  isServerCart: (_c): _c is Cart => false,
 });
 
 export function useCart() {
@@ -67,7 +65,7 @@ export function StoreProvider({ children }: { children: React.ReactNode }) {
   const [storeInfo, setStoreInfo] = useState<StoreInfo | null>(null);
   const [storeLoading, setStoreLoading] = useState(true);
   const [token, setToken] = useState<string | null>(null);
-  const [cart, setCart] = useState<Cart | LocalCart | null>(null);
+  const [cart, setCart] = useState<Cart | null>(null);
   const [cartLoading, setCartLoading] = useState(true);
 
   // Initialize client and auth
@@ -94,7 +92,7 @@ export function StoreProvider({ children }: { children: React.ReactNode }) {
       setCart(c);
 
       // Persist server cart ID
-      if (c && 'id' in c) {
+      if (c && c.id) {
         setStoredCartId(c.id);
       }
     } catch (err) {
@@ -114,51 +112,31 @@ export function StoreProvider({ children }: { children: React.ReactNode }) {
     setStoredToken(newToken);
     setToken(newToken);
 
-    // Sync local cart to server
+    // Merge guest session cart into customer cart
     client.syncCartOnLogin().catch(console.error);
   }, []);
 
   const logout = useCallback(() => {
     const client = getClient();
     client.clearCustomerToken();
+    client.onLogout();
     setStoredToken(null);
     setToken(null);
     setCart(null);
     refreshCart();
   }, [refreshCart]);
 
-  const isServerCart = (c: Cart | LocalCart | null): c is Cart => {
-    return c !== null && 'id' in c;
-  };
-
   const itemCount = cart
     ? cart.items.reduce((sum, item) => sum + item.quantity, 0)
     : 0;
 
-  const totals = isServerCart(cart)
-    ? getCartTotals(cart)
-    : {
-        subtotal: cart
-          ? cart.items.reduce(
-              (sum, item) => sum + parseFloat(String(item.price || '0')) * item.quantity,
-              0
-            )
-          : 0,
-        discount: 0,
-        shipping: 0,
-        total: cart
-          ? cart.items.reduce(
-              (sum, item) => sum + parseFloat(String(item.price || '0')) * item.quantity,
-              0
-            )
-          : 0,
-      };
+  const totals = cart ? getCartTotals(cart) : { subtotal: 0, discount: 0, shipping: 0, total: 0 };
 
   return (
     <StoreInfoContext.Provider value={{ storeInfo, loading: storeLoading }}>
       <AuthContext.Provider value={{ isLoggedIn: !!token, token, login, logout }}>
         <CartContext.Provider
-          value={{ cart, cartLoading, refreshCart, itemCount, totals, isServerCart }}
+          value={{ cart, cartLoading, refreshCart, itemCount, totals }}
         >
           {children}
         </CartContext.Provider>