create-brainerce-store 1.50.5 → 1.52.0

package/templates/nextjs/base/src/core/lib/product-options.ts

@@ -0,0 +1,121 @@
+/**
+ * Pure product-option logic (zero markup) shared by `core/hooks/use-product-page`
+ * and the `ui/product` option components. Moved verbatim from
+ * `customization-fields.tsx` / `modifier-group-selector.tsx` so that core
+ * never depends on `ui/` — the UI components re-export these for
+ * backward compatibility.
+ */
+
+import type { ModifierGroup, ModifierSelection, ProductCustomizationField } from 'brainerce';
+
+export type CustomizationValues = Record<string, unknown>;
+
+export function validateCustomization(
+  fields: ProductCustomizationField[],
+  values: CustomizationValues
+): Record<string, string> {
+  const errors: Record<string, string> = {};
+  for (const field of fields) {
+    const value = values[field.key];
+    const empty =
+      value === undefined ||
+      value === null ||
+      value === '' ||
+      (Array.isArray(value) && value.length === 0);
+
+    if (field.required && empty) {
+      errors[field.key] = 'required';
+      continue;
+    }
+    if (empty) continue;
+
+    if (field.type === 'SELECT') {
+      const allowed = (field.enumValues ?? []).map((o) => o.value);
+      if (typeof value !== 'string' || !allowed.includes(value)) {
+        errors[field.key] = 'invalidOption';
+      }
+    }
+    if (field.type === 'MULTI_SELECT') {
+      const allowed = (field.enumValues ?? []).map((o) => o.value);
+      if (
+        !Array.isArray(value) ||
+        !(value as unknown[]).every((v) => typeof v === 'string' && allowed.includes(v as string))
+      ) {
+        errors[field.key] = 'invalidOption';
+      }
+    }
+  }
+  return errors;
+}
+
+/**
+ * Lightweight client-side validation that mirrors the server's checks. Use
+ * this to gate the add-to-cart button — but always treat the server's 400
+ * (`MODIFIER_VALIDATION_FAILED`) as the authoritative answer.
+ */
+export function validateSelections(
+  groups: ModifierGroup[],
+  selections: Record<string, string[]>
+): string | null {
+  for (const group of groups) {
+    if (group.max === 0) continue; // disabled-for-variant — skip
+    const picks = selections[group.id] ?? [];
+    if (group.required && picks.length === 0) {
+      return `${group.name} is required`;
+    }
+    if (picks.length < group.min) {
+      return `Pick at least ${group.min} from ${group.name}`;
+    }
+    if (group.max != null && picks.length > group.max) {
+      return `Pick at most ${group.max} from ${group.name}`;
+    }
+    if (group.selectionType === 'SINGLE' && picks.length > 1) {
+      return `Only one option allowed in ${group.name}`;
+    }
+  }
+  return null;
+}
+
+/**
+ * Adapter: convert the local Record<groupId, modifierIds> shape used by the
+ * selector component into the wire-format `ModifierSelection[]` array the SDK
+ * expects on `addToCart` / `updateCartItem`.
+ */
+export function toModifierSelections(
+  groups: ModifierGroup[],
+  selections: Record<string, string[]>
+): ModifierSelection[] {
+  const out: ModifierSelection[] = [];
+  for (const group of groups) {
+    if (group.max === 0) continue;
+    const picks = selections[group.id] ?? [];
+    if (picks.length === 0) continue;
+    out.push({ modifierGroupId: group.id, modifierIds: picks });
+  }
+  return out;
+}
+
+/**
+ * Build the initial selection map from the group's defaults — call once on
+ * first render for each group. Honors `defaultModifierIds` first (per-attach
+ * defaults), falling back to per-modifier `isDefault` flags. Sold-out
+ * modifiers are filtered out so the user doesn't start with an invalid pick.
+ */
+export function buildInitialSelections(groups: ModifierGroup[]): Record<string, string[]> {
+  const out: Record<string, string[]> = {};
+  for (const group of groups) {
+    if (group.max === 0) continue;
+    const fromDefaults = group.defaultModifierIds ?? [];
+    const fromIsDefault = group.modifiers
+      .filter((m) => m.isDefault && m.available)
+      .map((m) => m.id);
+    const merged =
+      fromDefaults.length > 0
+        ? fromDefaults.filter((id) => group.modifiers.some((m) => m.id === id && m.available))
+        : fromIsDefault;
+    // Cap by max for SINGLE groups — defaults can't violate selection rules.
+    const capped = group.selectionType === 'SINGLE' ? merged.slice(0, 1) : merged;
+    if (capped.length > 0) out[group.id] = capped;
+  }
+  return out;
+}

package/templates/nextjs/base/src/{lib → core/lib}/resolve-currency.ts

@@ -1,4 +1,4 @@
-import type { PublicStoreInfo } from '@/lib/store-info';
+import type { PublicStoreInfo } from '@/core/lib/store-info';
 
 /**
  * Server-side twin of `useCurrency()` — call from Server Components,

package/templates/nextjs/base/src/{lib → core/lib}/safe-redirect.ts

@@ -1,7 +1,7 @@
 // Re-export the platform-maintained payment URL allowlist from the SDK.
 //
 // Why a re-export and not a direct import everywhere: keeping a stable
-// `@/lib/safe-redirect` import path means future SDK API changes (e.g. an
+// `@/core/lib/safe-redirect` import path means future SDK API changes (e.g. an
 // `extraHosts` rename) only need editing here, and merchants don't have to
 // touch every component that does payment redirects. It also leaves a clear
 // place to plug in store-specific extras (custom self-hosted PSP) without

package/templates/nextjs/base/src/{lib → core/lib}/sanitize.ts.ejs

@@ -14,7 +14,7 @@
  */
 import DOMPurify from 'isomorphic-dompurify';
 
-const DEFAULT_CONFIG: DOMPurify.Config = {
+const DEFAULT_CONFIG = {
   // Allow iframes for embedded videos/maps the merchant may include.
   ADD_TAGS: ['iframe'],
   ADD_ATTR: ['allow', 'allowfullscreen', 'frameborder', 'scrolling', 'target', 'rel'],

package/templates/nextjs/base/src/{lib → core/lib}/use-currency.ts

@@ -1,6 +1,6 @@
 'use client';
 
-import { useStoreInfo } from '@/providers/store-provider';
+import { useStoreInfo } from '@/core/providers/store-provider';
 
 /**
  * Single source of truth for "which currency code do I format prices with?"

package/templates/nextjs/base/src/{providers → core/providers}/store-provider.tsx.ejs

@@ -3,11 +3,11 @@
 import React, { createContext, useContext, useEffect, useState, useCallback } from 'react';
 import type { Cart, CustomerProfile } from 'brainerce';
 import { getCartTotals } from 'brainerce';
-import { getClient, initClient, setStoredCartId } from '@/lib/brainerce';
-import { pickPublicStoreInfo, type PublicStoreInfo } from '@/lib/store-info';
-import { checkAuthStatus, proxyLogout } from '@/lib/auth';
+import { getClient, initClient, setStoredCartId } from '@/core/lib/brainerce';
+import { pickPublicStoreInfo, type PublicStoreInfo } from '@/core/lib/store-info';
+import { checkAuthStatus, proxyLogout } from '@/core/lib/auth';
 <% if (i18nEnabled) { %>
-import { MessagesContext } from '@/lib/translations';
+import { MessagesContext } from '@/core/lib/translations';
 import { getMessages, defaultLocale } from '@/i18n';
 <% } %>
 

package/templates/nextjs/base/src/{components → ui}/cart/cart-bundle-offer.tsx

@@ -1,12 +1,16 @@
 'use client';
 
 import { useState } from 'react';
-import { CdnImage as Image } from '@/components/shared/cdn-image';
+import { CdnImage as Image } from '@/ui/shared/cdn-image';
 import type { CartBundleOffer as CartBundleOfferType } from 'brainerce';
 import { formatPrice } from 'brainerce';
-import { useCurrency } from '@/lib/use-currency';
-import { useTranslations } from '@/lib/translations';
-import { cn } from '@/lib/utils';
+import { useCurrency } from '@/core/lib/use-currency';
+import { useTranslations } from '@/core/lib/translations';
+import { Badge } from '@/components/ui/badge';
+import { Button } from '@/components/ui/button';
+import { Card } from '@/components/ui/card';
+import { Separator } from '@/components/ui/separator';
+import { cn } from '@/core/lib/utils';
 
 interface CartBundleOfferCardProps {
   offer: CartBundleOfferType;
@@ -33,7 +37,7 @@ export function CartBundleOfferCard({ offer, cartId, onAdd, className }: CartBun
     if (adding) return;
     try {
       setAdding(true);
-      const { getClient } = await import('@/lib/brainerce');
+      const { getClient } = await import('@/core/lib/brainerce');
       const client = getClient();
       // No variant selections in the default template — products with
       // variants are best handled with a dedicated picker per offered item.
@@ -47,7 +51,7 @@ export function CartBundleOfferCard({ offer, cartId, onAdd, className }: CartBun
   }
 
   return (
-    <div className={cn('bg-background border-border rounded-lg border p-4', className)}>
+    <Card className={cn('p-4 shadow-none', className)}>
       <div className="mb-3">
         <p className="text-foreground text-sm font-medium">{offer.name}</p>
         {offer.description && (
@@ -82,7 +86,8 @@ export function CartBundleOfferCard({ offer, cartId, onAdd, className }: CartBun
         })}
       </ul>
 
-      <div className="border-border mt-3 flex items-center justify-between border-t pt-3">
+      <Separator className="mt-3" />
+      <div className="flex items-center justify-between pt-3">
         <div className="flex items-center gap-2">
           <span className="text-muted-foreground text-sm line-through">
             {formatPrice(totalOriginal, { currency }) as string}
@@ -90,22 +95,23 @@ export function CartBundleOfferCard({ offer, cartId, onAdd, className }: CartBun
           <span className="text-foreground text-sm font-semibold">
             {formatPrice(totalDiscounted, { currency }) as string}
           </span>
-          <span className="bg-destructive/10 text-destructive rounded px-1.5 py-0.5 text-xs font-medium">
+          <Badge
+            variant="outline"
+            className="bg-destructive/10 text-destructive rounded border-transparent px-1.5 py-0.5 font-medium"
+          >
             -{discountLabel}
-          </span>
+          </Badge>
         </div>
-        <button
+        <Button
           type="button"
+          size="sm"
           onClick={handleAdd}
           disabled={adding}
-          className={cn(
-            'bg-primary text-primary-foreground flex-shrink-0 rounded px-4 py-2 text-xs font-medium transition-opacity hover:opacity-90',
-            'disabled:cursor-not-allowed disabled:opacity-50'
-          )}
+          className="h-auto flex-shrink-0 rounded px-4 py-2 text-xs"
         >
           {adding ? t('addingBundle') : t('addBundleItem')}
-        </button>
+        </Button>
       </div>
-    </div>
+    </Card>
   );
 }

package/templates/nextjs/base/src/{components → ui}/cart/cart-item.tsx

@@ -1,14 +1,15 @@
 'use client';
 
 import { useState } from 'react';
-import { CdnImage as Image } from '@/components/shared/cdn-image';
+import { Image as ImageIcon } from 'lucide-react';
+import { CdnImage as Image } from '@/ui/shared/cdn-image';
 import type { CartItem as CartItemType } from 'brainerce';
 import { getCartItemImage, formatPrice } from 'brainerce';
-import { getClient } from '@/lib/brainerce';
-import { useTranslations } from '@/lib/translations';
-import { useCurrency } from '@/lib/use-currency';
-import { LoadingSpinner } from '@/components/shared/loading-spinner';
-import { cn } from '@/lib/utils';
+import { getClient } from '@/core/lib/brainerce';
+import { useTranslations } from '@/core/lib/translations';
+import { useCurrency } from '@/core/lib/use-currency';
+import { LoadingSpinner } from '@/ui/shared/loading-spinner';
+import { cn } from '@/core/lib/utils';
 
 interface CartItemProps {
   item: CartItemType;
@@ -73,14 +74,7 @@ export function CartItem({ item, onUpdate, className }: CartItemProps) {
           <Image src={imageUrl} alt={productName} fill sizes="80px" className="object-cover" />
         ) : (
           <div className="text-muted-foreground absolute inset-0 flex items-center justify-center">
-            <svg className="h-8 w-8" fill="none" viewBox="0 0 24 24" stroke="currentColor">
-              <path
-                strokeLinecap="round"
-                strokeLinejoin="round"
-                strokeWidth={1.5}
-                d="M4 16l4.586-4.586a2 2 0 012.828 0L16 16m-2-2l1.586-1.586a2 2 0 012.828 0L20 14m-6-6h.01M6 20h12a2 2 0 002-2V6a2 2 0 00-2-2H6a2 2 0 00-2 2v12a2 2 0 002 2z"
-              />
-            </svg>
+            <ImageIcon className="h-8 w-8" strokeWidth={1.5} aria-hidden="true" />
           </div>
         )}
       </div>

package/templates/nextjs/base/src/{components → ui}/cart/cart-nudges.tsx

@@ -1,39 +1,28 @@
-'use client';
-
-import type { CartNudge } from 'brainerce';
-import { cn } from '@/lib/utils';
-
-interface CartNudgesProps {
-  nudges: CartNudge[];
-  className?: string;
-}
-
-export function CartNudges({ nudges, className }: CartNudgesProps) {
-  if (nudges.length === 0) return null;
-
-  return (
-    <div className={cn('space-y-2', className)}>
-      {nudges.map((nudge) => (
-        <div
-          key={nudge.ruleId}
-          className="bg-primary/5 border-primary/20 flex items-start gap-3 rounded-lg border px-4 py-3"
-        >
-          <svg
-            className="text-primary mt-0.5 h-5 w-5 flex-shrink-0"
-            fill="none"
-            viewBox="0 0 24 24"
-            stroke="currentColor"
-          >
-            <path
-              strokeLinecap="round"
-              strokeLinejoin="round"
-              strokeWidth={2}
-              d="M13 16h-1v-4h-1m1-4h.01M21 12a9 9 0 11-18 0 9 9 0 0118 0z"
-            />
-          </svg>
-          <p className="text-foreground flex-1 text-sm">{nudge.text}</p>
-        </div>
-      ))}
-    </div>
-  );
-}
+'use client';
+
+import { Info } from 'lucide-react';
+import type { CartNudge } from 'brainerce';
+import { cn } from '@/core/lib/utils';
+
+interface CartNudgesProps {
+  nudges: CartNudge[];
+  className?: string;
+}
+
+export function CartNudges({ nudges, className }: CartNudgesProps) {
+  if (nudges.length === 0) return null;
+
+  return (
+    <div className={cn('space-y-2', className)}>
+      {nudges.map((nudge) => (
+        <div
+          key={nudge.ruleId}
+          className="bg-primary/5 border-primary/20 flex items-start gap-3 rounded-lg border px-4 py-3"
+        >
+          <Info className="text-primary mt-0.5 h-5 w-5 flex-shrink-0" aria-hidden="true" />
+          <p className="text-foreground flex-1 text-sm">{nudge.text}</p>
+        </div>
+      ))}
+    </div>
+  );
+}

package/templates/nextjs/base/src/{components → ui}/cart/cart-summary.tsx

@@ -1,10 +1,11 @@
 'use client';
 
 import { formatPrice } from 'brainerce';
-import { useTranslations } from '@/lib/translations';
-import { useCart } from '@/providers/store-provider';
-import { useCurrency } from '@/lib/use-currency';
-import { cn } from '@/lib/utils';
+import { useTranslations } from '@/core/lib/translations';
+import { useCart } from '@/core/providers/store-provider';
+import { useCurrency } from '@/core/lib/use-currency';
+import { Separator } from '@/components/ui/separator';
+import { cn } from '@/core/lib/utils';
 
 interface CartSummaryProps {
   className?: string;
@@ -94,7 +95,8 @@ export function CartSummary({ className }: CartSummaryProps) {
         </div>
 
         {/* Divider */}
-        <div className="border-border mt-2 border-t pt-2">
+        <Separator className="mt-2" />
+        <div className="pt-1">
           <div className="flex items-center justify-between">
             <span className="text-foreground font-semibold">{tc('total')}</span>
             <span className="text-foreground text-base font-semibold">

package/templates/nextjs/base/src/{components → ui}/cart/cart-upgrade-banner.tsx

@@ -1,13 +1,15 @@
 'use client';
 
 import { useState, useEffect } from 'react';
-import { CdnImage as Image } from '@/components/shared/cdn-image';
+import { Image as ImageIcon, X } from 'lucide-react';
+import { CdnImage as Image } from '@/ui/shared/cdn-image';
 import type { CartUpgradeSuggestion, CartItem as CartItemType } from 'brainerce';
 import { formatPrice } from 'brainerce';
-import { getClient } from '@/lib/brainerce';
-import { useCurrency } from '@/lib/use-currency';
-import { useTranslations } from '@/lib/translations';
-import { cn } from '@/lib/utils';
+import { getClient } from '@/core/lib/brainerce';
+import { useCurrency } from '@/core/lib/use-currency';
+import { useTranslations } from '@/core/lib/translations';
+import { Button } from '@/components/ui/button';
+import { cn } from '@/core/lib/utils';
 
 interface CartUpgradeBannerProps {
   suggestion: CartUpgradeSuggestion;
@@ -88,15 +90,7 @@ export function CartUpgradeBanner({
         className="text-muted-foreground hover:text-foreground absolute end-2 top-2 text-xs"
         aria-label={t('dismissUpgrade')}
       >
-        <svg
-          className="h-4 w-4"
-          fill="none"
-          viewBox="0 0 24 24"
-          stroke="currentColor"
-          strokeWidth={2}
-        >
-          <path strokeLinecap="round" strokeLinejoin="round" d="M6 18L18 6M6 6l12 12" />
-        </svg>
+        <X className="h-4 w-4" aria-hidden="true" />
       </button>
 
       {/* Product image */}
@@ -105,14 +99,7 @@ export function CartUpgradeBanner({
           <Image src={imageUrl} alt={target.name} fill sizes="48px" className="object-cover" />
         ) : (
           <div className="text-muted-foreground flex h-full w-full items-center justify-center">
-            <svg className="h-5 w-5" fill="none" viewBox="0 0 24 24" stroke="currentColor">
-              <path
-                strokeLinecap="round"
-                strokeLinejoin="round"
-                strokeWidth={1.5}
-                d="M4 16l4.586-4.586a2 2 0 012.828 0L16 16m-2-2l1.586-1.586a2 2 0 012.828 0L20 14m-6-6h.01M6 20h12a2 2 0 002-2V6a2 2 0 00-2-2H6a2 2 0 00-2 2v12a2 2 0 002 2z"
-              />
-            </svg>
+            <ImageIcon className="h-5 w-5" strokeWidth={1.5} aria-hidden="true" />
           </div>
         )}
       </div>
@@ -125,17 +112,15 @@ export function CartUpgradeBanner({
       </div>
 
       {/* Upgrade button */}
-      <button
+      <Button
         type="button"
+        size="sm"
         onClick={handleUpgrade}
         disabled={upgrading}
-        className={cn(
-          'bg-primary text-primary-foreground flex-shrink-0 rounded px-3 py-1.5 text-xs font-medium transition-opacity hover:opacity-90',
-          'disabled:cursor-not-allowed disabled:opacity-50'
-        )}
+        className="h-auto flex-shrink-0 rounded px-3 py-1.5 text-xs"
       >
         {upgrading ? t('upgrading') : t('upgrade')}
-      </button>
+      </Button>
     </div>
   );
 }

package/templates/nextjs/base/src/ui/cart/cart-view.tsx

@@ -0,0 +1,140 @@
+'use client';
+
+import { ShoppingBag } from 'lucide-react';
+import { Link } from '@/core/lib/navigation';
+import { useCartPage } from '@/core/hooks/use-cart-page';
+import { CartItem } from '@/ui/cart/cart-item';
+import { CartUpgradeBanner } from '@/ui/cart/cart-upgrade-banner';
+import { CartBundleOfferCard } from '@/ui/cart/cart-bundle-offer';
+import { CartSummary } from '@/ui/cart/cart-summary';
+import { CouponInput } from '@/ui/cart/coupon-input';
+import { CartNudges } from '@/ui/cart/cart-nudges';
+import { FreeShippingBar } from '@/ui/cart/free-shipping-bar';
+import { ReservationCountdown } from '@/ui/cart/reservation-countdown';
+import { CartRecommendationSection } from '@/ui/product/recommendation-section';
+import { LoadingSpinner } from '@/ui/shared/loading-spinner';
+import { Button } from '@/components/ui/button';
+import { Card } from '@/components/ui/card';
+import { Separator } from '@/components/ui/separator';
+import { useTranslations } from '@/core/lib/translations';
+
+export function CartView() {
+  const t = useTranslations('cart');
+  const tc = useTranslations('common');
+  const { cart, cartLoading, refreshCart, itemCount, cartRecs, upgrades, bundles } = useCartPage();
+
+  if (cartLoading) {
+    return (
+      <div className="flex min-h-[60vh] items-center justify-center">
+        <LoadingSpinner size="lg" />
+      </div>
+    );
+  }
+
+  // Empty cart state
+  if (!cart || cart.items.length === 0) {
+    return (
+      <div className="mx-auto max-w-7xl px-4 py-16 text-center sm:px-6 lg:px-8">
+        <ShoppingBag
+          className="text-muted-foreground mx-auto mb-4 h-16 w-16"
+          strokeWidth={1.5}
+          aria-hidden="true"
+        />
+        <h1 className="text-foreground text-2xl font-bold">{t('emptyTitle')}</h1>
+        <p className="text-muted-foreground mt-2">{t('emptySubtitle')}</p>
+        <Button asChild size="lg" className="mt-6 rounded px-6 text-base">
+          <Link href="/products">{tc('continueShopping')}</Link>
+        </Button>
+      </div>
+    );
+  }
+
+  return (
+    <div className="mx-auto max-w-7xl px-4 py-8 sm:px-6 lg:px-8">
+      <h1 className="text-foreground mb-6 text-2xl font-bold">
+        {t('title')} ({itemCount} {itemCount === 1 ? tc('item') : tc('items')})
+      </h1>
+
+      {/* Reservation countdown */}
+      {cart.reservation?.hasReservation && (
+        <ReservationCountdown reservation={cart.reservation} className="mb-6" />
+      )}
+
+      <div className="grid grid-cols-1 gap-8 lg:grid-cols-3">
+        {/* Cart Items */}
+        <div className="lg:col-span-2">
+          {/* Nudges */}
+          {cart.nudges && cart.nudges.length > 0 && (
+            <CartNudges nudges={cart.nudges} className="mb-4" />
+          )}
+
+          {/* Cart items */}
+          <div>
+            {cart.items.map((item) => (
+              <div key={item.id}>
+                <CartItem item={item} onUpdate={refreshCart} />
+                {upgrades?.upgrades?.[item.productId] && (
+                  <CartUpgradeBanner
+                    suggestion={upgrades.upgrades[item.productId]}
+                    cartItem={item}
+                    onUpgrade={refreshCart}
+                    className="mb-2 ms-24"
+                  />
+                )}
+              </div>
+            ))}
+          </div>
+
+          {/* Bundle offers */}
+          {bundles?.bundles && bundles.bundles.length > 0 && (
+            <div className="mt-6 space-y-3">
+              <h3 className="text-foreground text-sm font-semibold">{t('bundleOffers')}</h3>
+              {bundles.bundles.map((offer) => (
+                <CartBundleOfferCard
+                  key={offer.id}
+                  offer={offer}
+                  cartId={cart.id}
+                  onAdd={refreshCart}
+                />
+              ))}
+            </div>
+          )}
+
+          {/* Coupon input */}
+          <Separator className="mt-6" />
+          <div className="pt-4">
+            <CouponInput cart={cart} onUpdate={refreshCart} />
+          </div>
+        </div>
+
+        {/* Summary sidebar */}
+        <div className="lg:col-span-1">
+          <Card className="bg-muted/50 sticky top-24 p-6 shadow-none">
+            <FreeShippingBar className="mb-4" />
+            <CartSummary />
+
+            <Button asChild size="lg" className="mt-6 w-full rounded px-6 text-sm">
+              <Link href="/checkout">{t('proceedToCheckout')}</Link>
+            </Button>
+
+            <Link
+              href="/products"
+              className="text-muted-foreground hover:text-foreground mt-3 inline-flex w-full items-center justify-center px-6 py-2 text-sm transition-colors"
+            >
+              {tc('continueShopping')}
+            </Link>
+          </Card>
+        </div>
+      </div>
+
+      {/* Cross-sell recommendations */}
+      {cartRecs?.recommendations && cartRecs.recommendations.length > 0 && (
+        <CartRecommendationSection
+          title={t('youMightAlsoNeed')}
+          items={cartRecs.recommendations}
+          className="mt-10"
+        />
+      )}
+    </div>
+  );
+}