@mohasinac/appkit 2.4.11 → 2.5.1

package/dist/features/pre-orders/components/PreOrderDetailPageView.js

@@ -14,8 +14,10 @@ import { CustomSectionTabContent } from "../../products/components/CustomSection
 import { PreOrderActionsClient } from "./PreOrderActionsClient";
 import { ProductGalleryClient } from "../../products/components/ProductGalleryClient";
 import { ProductFeatureBadges } from "../../products/components/ProductFeatureBadges";
+import { FeatureBadgeList } from "../../products/components/FeatureBadge";
 import { ShareButton } from "../../products/components/ShareButton";
 import { SublistingCarouselSection } from "../../products/components/SublistingCarouselSection";
+import { HistoryTracker } from "../../history/components/HistoryTracker";
 import { ShowGroupSection } from "../../products/components/ShowGroupSection";
 function toDescriptionHtml(raw) {
     if (!raw)
@@ -28,8 +30,10 @@ const PRODUCTION_STATUS_LABELS = {
     in_production: "In Production",
     ready_to_ship: "Ready to Ship",
 };
-export async function PreOrderDetailPageView({ id, onReserveNow }) {
-    const product = await productRepository.findByIdOrSlug(id).catch(() => undefined);
+export async function PreOrderDetailPageView({ id, initialPreOrder, onReserveNow, productFeatures }) {
+    const product = initialPreOrder !== undefined
+        ? (initialPreOrder ?? undefined)
+        : await productRepository.findByIdOrSlug(id).catch(() => undefined);
     if (!product) {
         return (_jsx(Main, { children: _jsx(Section, { className: "py-20", children: _jsx(Container, { size: "md", children: _jsxs(Stack, { align: "center", gap: "md", className: "text-center", children: [_jsx(Heading, { level: 1, className: "text-2xl font-semibold text-zinc-900 dark:text-zinc-50", children: "Pre-Order Not Found" }), _jsx(Text, { className: "text-zinc-500", children: "The pre-order item you are looking for may have been removed." }), _jsx(Link, { href: String(ROUTES.PUBLIC.PRE_ORDERS), className: "text-sm font-medium text-primary-600 hover:underline", children: "Browse Pre-Orders" })] }) }) }) }));
     }
@@ -75,15 +79,11 @@ export async function PreOrderDetailPageView({ id, onReserveNow }) {
     const shippingPaidBy = p.shippingPaidBy;
     const freeShipping = shippingPaidBy === "seller";
     const storeName = typeof p.storeName === "string" ? p.storeName : null;
-    const sellerName = typeof p.sellerName === "string" ? p.sellerName : null;
-    const safeSeller = (storeName || sellerName) ? safeDisplayName((storeName || sellerName) ?? "", "") : null;
+    const safeSeller = storeName ? safeDisplayName(storeName, "") : null;
     const storeSlug = (typeof p.storeSlug === "string" ? p.storeSlug : null) || (typeof p.storeId === "string" ? p.storeId : null);
-    const preOrderSellerId = typeof p.sellerId === "string" ? p.sellerId : null;
     const storeHref = storeSlug
         ? String(ROUTES.PUBLIC.STORE_DETAIL(storeSlug))
-        : preOrderSellerId
-            ? String(ROUTES.PUBLIC.SELLER_DETAIL(preOrderSellerId))
-            : null;
+        : null;
     const category = typeof p.category === "string" ? p.category : null;
     const categoryName = typeof p.categoryName === "string" ? p.categoryName : null;
     const brand = typeof p.brand === "string" ? p.brand : null;
@@ -101,31 +101,41 @@ export async function PreOrderDetailPageView({ id, onReserveNow }) {
     const groupId = typeof p.groupId === "string" ? p.groupId : null;
     const isGroupParent = p.isGroupParent === true;
     const groupTitle = typeof p.groupTitle === "string" ? p.groupTitle : undefined;
-    return (_jsx(Main, { children: _jsxs(Container, { size: "xl", className: "px-4 py-6", children: [_jsxs("div", { className: "mb-4 flex items-center justify-between flex-wrap gap-2", children: [_jsxs("nav", { "aria-label": "Breadcrumb", className: "flex items-center gap-1.5 text-xs text-zinc-500 dark:text-zinc-400 flex-wrap", children: [_jsx(Link, { href: String(ROUTES.HOME), className: "hover:text-primary-600 transition-colors", children: "Home" }), _jsx(Span, { "aria-hidden": true, children: "/" }), _jsx(Link, { href: String(ROUTES.PUBLIC.PRE_ORDERS), className: "hover:text-primary-600 transition-colors", children: "Pre-Orders" }), category && (_jsxs(_Fragment, { children: [_jsx(Span, { "aria-hidden": true, children: "/" }), _jsx(Link, { href: String(ROUTES.PUBLIC.CATEGORY_DETAIL(category)), className: "hover:text-primary-600 transition-colors", children: categoryName || category })] })), _jsx(Span, { "aria-hidden": true, children: "/" }), _jsx(Span, { className: "text-zinc-700 dark:text-zinc-300 truncate max-w-[200px]", children: title })] }), _jsx(ShareButton, { title: title })] }), _jsx(PreOrderDetailView, { renderGallery: () => (_jsx(ProductGalleryClient, { images: images, productName: title })), renderInfo: () => (_jsxs(Stack, { gap: "sm", children: [_jsxs(Div, { children: [_jsxs(Row, { gap: "xs", className: "mb-1.5 flex-wrap", children: [_jsx(Span, { className: "inline-block rounded-full bg-indigo-100 dark:bg-indigo-900/30 px-2.5 py-0.5 text-xs font-semibold text-indigo-700 dark:text-indigo-300", children: "Pre-Order" }), productionStatus && (_jsx(Span, { className: "inline-block rounded-full bg-zinc-100 dark:bg-zinc-800 px-2.5 py-0.5 text-xs font-medium text-zinc-600 dark:text-zinc-300", children: PRODUCTION_STATUS_LABELS[productionStatus] ?? productionStatus }))] }), _jsx(Heading, { level: 1, className: "text-xl font-bold leading-snug text-zinc-900 dark:text-zinc-50 sm:text-2xl", children: title })] }), price !== null && (_jsx(Span, { className: "text-2xl font-bold text-zinc-900 dark:text-zinc-50", children: formatCurrency(price, currency) })), deliveryDate && (_jsxs(Row, { align: "center", gap: "xs", className: "text-sm text-zinc-600 dark:text-zinc-400", children: [_jsx(Span, { children: "\uD83D\uDCC5" }), _jsx(Span, { children: "Estimated delivery:" }), _jsx(Span, { className: "font-medium", children: deliveryDate.toLocaleDateString(undefined, { year: "numeric", month: "long" }) })] })), _jsx(ProductFeatureBadges, { featured: featured, freeShipping: freeShipping, condition: condition ?? undefined, returnable: isCancellable, labels: {
-                                    featured: "Featured",
-                                    fasterDelivery: "Faster Delivery",
-                                    ratedSeller: "Rated Seller",
-                                    condition: "Condition",
-                                    conditionNew: "New",
-                                    conditionUsed: "Used",
-                                    conditionBroken: "For Parts",
-                                    conditionRefurbished: "Refurbished",
-                                    returnable: "Cancellable",
-                                    freeShipping: "Free Shipping",
-                                    codAvailable: "Cash on Delivery",
-                                    wishlistCount: (n) => `${n} wishlisted`,
-                                    categoryProductCount: (n, cat) => `${n} in ${cat}`,
-                                } }), (categoryName || category || brand) && (_jsxs(Row, { align: "center", gap: "xs", className: "text-xs text-zinc-400 dark:text-zinc-500 flex-wrap", children: [category ? (_jsx(Link, { href: String(ROUTES.PUBLIC.CATEGORY_DETAIL(category)), className: "hover:text-primary-600 dark:hover:text-primary-400 transition-colors", children: categoryName || category })) : (categoryName ? _jsx(Span, { children: categoryName }) : null), brand && (categoryName || category) && (_jsx(Span, { className: "text-zinc-300 dark:text-zinc-600", children: "\u00B7" })), brand && (brandSlug ? (_jsx(Link, { href: String(ROUTES.PUBLIC.BRAND_DETAIL(brandSlug)), className: "hover:text-primary-600 dark:hover:text-primary-400 transition-colors", children: brand })) : (_jsx(Span, { children: brand })))] })), features.length > 0 && (_jsxs(Div, { className: "rounded-xl border border-zinc-100 dark:border-zinc-800 bg-zinc-50 dark:bg-zinc-900/60 px-4 py-3", children: [_jsx(Text, { className: "mb-2 text-xs font-semibold uppercase tracking-wide text-zinc-500 dark:text-zinc-400", children: "About this product" }), _jsx("ul", { className: "space-y-1.5", children: features.map((f, i) => (_jsxs("li", { className: "flex items-start gap-2 text-sm text-zinc-700 dark:text-zinc-300", children: [_jsx(Span, { className: "mt-0.5 flex-shrink-0 text-primary-500", children: "\u2022" }), f] }, i))) })] })), descriptionHtml && (_jsx(RichText, { html: descriptionHtml, proseClass: "prose prose-sm max-w-none dark:prose-invert prose-p:my-0", className: "text-sm leading-relaxed text-zinc-600 dark:text-zinc-400 line-clamp-4" })), safeSeller && (_jsx(Div, { className: "rounded-xl border border-zinc-100 dark:border-zinc-800 bg-zinc-50 dark:bg-zinc-900/60 p-3", children: _jsxs(Row, { justify: "between", align: "center", children: [_jsxs(Div, { children: [_jsx(Text, { className: "text-[10px] uppercase tracking-wide text-zinc-400 dark:text-zinc-500 mb-0.5", children: "Sold by" }), _jsx(Text, { className: "text-sm font-semibold text-zinc-800 dark:text-zinc-200", children: safeSeller })] }), storeHref && (_jsx(Link, { href: storeHref, className: "shrink-0 rounded-lg bg-primary/10 dark:bg-primary/20 px-3 py-1.5 text-xs font-semibold text-primary-700 dark:text-primary-300 hover:bg-primary/20 dark:hover:bg-primary/30 transition-colors", children: "Visit Store \u2192" }))] }) }))] })), renderSublistingSection: sublistingCategoryId
-                        ? () => (_jsx(SublistingCarouselSection, { sublistingCategoryId: sublistingCategoryId, currentListingId: String(product.id) }))
-                        : undefined, renderGroupSection: groupId
-                        ? () => (_jsx(ShowGroupSection, { groupId: groupId, currentSlug: String(p.slug ?? product.id), isParent: isGroupParent, groupTitle: groupTitle }))
-                        : undefined, renderTabs: () => (_jsx(ProductTabsShell, { descriptionContent: descriptionHtml ? (_jsx(RichText, { html: descriptionHtml, proseClass: "prose prose-sm sm:prose max-w-none dark:prose-invert", className: "text-zinc-700 dark:text-zinc-300" })) : undefined, specsContent: specs.length > 0 ? (_jsx("dl", { className: "divide-y divide-zinc-100 dark:divide-zinc-800 rounded-xl border border-zinc-100 dark:border-zinc-800 overflow-hidden text-sm", children: specs.map((s, i) => (_jsxs("div", { className: "flex gap-4 px-4 py-3 bg-white dark:bg-zinc-900 even:bg-zinc-50 dark:even:bg-zinc-800/50", children: [_jsx("dt", { className: "w-36 flex-shrink-0 font-medium text-zinc-700 dark:text-zinc-300", children: s.name }), _jsxs("dd", { className: "flex-1 text-zinc-600 dark:text-zinc-400", children: [s.value, s.unit ? ` ${s.unit}` : ""] })] }, i))) })) : undefined, customTabs: customSections.map((s) => ({
-                            id: s.id,
-                            label: s.title,
-                            content: _jsx(CustomSectionTabContent, { section: s }),
-                        })) })), renderBuyBar: () => (_jsxs(Div, { id: "pre-order-buy-bar", className: "rounded-xl border border-zinc-100 dark:border-zinc-800 bg-zinc-50 dark:bg-zinc-900/60 p-5 space-y-4", children: [reserveTarget > 0 && (_jsxs(Div, { className: "space-y-2", children: [_jsxs(Row, { justify: "between", align: "center", children: [_jsxs(Text, { className: "text-xs text-zinc-500", children: [reservedCount, " of ", reserveTarget, " reserved"] }), _jsxs(Span, { className: "text-xs font-semibold text-primary-600 dark:text-primary-400", children: [progressPct, "%"] })] }), _jsx(Div, { className: "h-2 w-full overflow-hidden rounded-full bg-zinc-200 dark:bg-zinc-700", children: _jsx(Div, { className: "h-full rounded-full bg-primary transition-all", style: { width: `${progressPct}%` } }) })] })), onReserveNow ? (_jsx(PreOrderActionsClient, { productId: String(product.id), price: price, currency: currency, depositAmount: depositAmount, depositPercent: depositPercent, isCancellable: isCancellable, tags: tags, onReserveNow: onReserveNow })) : (_jsxs(_Fragment, { children: [price !== null && (_jsxs(Div, { children: [_jsx(Text, { className: "text-2xl font-bold text-zinc-900 dark:text-zinc-50", children: formatCurrency(price, currency) }), depositAmount !== null && (_jsxs(Text, { className: "mt-0.5 text-xs text-zinc-500", children: ["Reserve with ", formatCurrency(depositAmount, currency), depositPercent !== null ? ` (${depositPercent}% deposit)` : ""] }))] })), _jsxs(Stack, { gap: "sm", children: [_jsx(Button, { variant: "primary", size: "md", className: "w-full", children: "Reserve Now" }), isCancellable && (_jsx(Text, { className: "text-center text-xs text-zinc-500 dark:text-zinc-400", children: "\u2713 Free cancellation before production" }))] }), tags.length > 0 && (_jsx(Div, { className: "border-t border-zinc-200 dark:border-zinc-700 pt-4", children: _jsx(Row, { wrap: true, gap: "xs", children: tags.map((tag) => (_jsx(Span, { className: "rounded-full bg-zinc-100 dark:bg-zinc-800 px-2.5 py-1 text-xs text-zinc-600 dark:text-zinc-300", children: tag }, tag))) }) })), _jsx(Div, { className: "border-t border-zinc-200 dark:border-zinc-700 pt-4", children: _jsx(Row, { wrap: true, gap: "sm", className: "justify-center text-center", children: [
-                                                { icon: "🔒", label: "Secure\nPayment" },
-                                                { icon: "📅", label: "Guaranteed\nDelivery" },
-                                                { icon: "↩", label: "Free\nCancellation" },
-                                            ].map(({ icon, label }) => (_jsxs(Div, { className: "flex flex-col items-center gap-1 text-xs text-zinc-500 dark:text-zinc-400 min-w-[60px]", children: [_jsx(Span, { className: "text-base", children: icon }), _jsx(Span, { className: "whitespace-pre-line leading-tight", children: label })] }, label))) }) })] }))] })) }), _jsxs(BuyBar, { children: [price !== null && (_jsx(Span, { className: "mr-auto text-sm font-bold text-zinc-900 dark:text-zinc-50", children: formatCurrency(price, currency) })), _jsx("a", { href: "#pre-order-buy-bar", className: "appkit-button appkit-button--primary appkit-button--sm flex-1", children: _jsx("span", { className: "appkit-button__content", children: "Reserve Now" }) })] })] }) }));
+    return (_jsxs(Main, { children: [_jsx(HistoryTracker, { productId: String(p.id ?? p.slug ?? ""), productType: "preorder", snapshot: {
+                    title: typeof p.title === "string" ? p.title : undefined,
+                    thumb: typeof p.mainImage === "string"
+                        ? p.mainImage
+                        : Array.isArray(p.images) && typeof p.images[0] === "string"
+                            ? p.images[0]
+                            : undefined,
+                    price: typeof p.price === "number" ? p.price : undefined,
+                    storeId: typeof p.storeId === "string" ? p.storeId : undefined,
+                    storeName: typeof p.storeName === "string" ? p.storeName : undefined,
+                } }), _jsxs(Container, { size: "xl", className: "px-4 py-6", children: [_jsxs("div", { className: "mb-4 flex items-center justify-between flex-wrap gap-2", children: [_jsxs("nav", { "aria-label": "Breadcrumb", className: "flex items-center gap-1.5 text-xs text-zinc-500 dark:text-zinc-400 flex-wrap", children: [_jsx(Link, { href: String(ROUTES.HOME), className: "hover:text-primary-600 transition-colors", children: "Home" }), _jsx(Span, { "aria-hidden": true, children: "/" }), _jsx(Link, { href: String(ROUTES.PUBLIC.PRE_ORDERS), className: "hover:text-primary-600 transition-colors", children: "Pre-Orders" }), category && (_jsxs(_Fragment, { children: [_jsx(Span, { "aria-hidden": true, children: "/" }), _jsx(Link, { href: String(ROUTES.PUBLIC.CATEGORY_DETAIL(category)), className: "hover:text-primary-600 transition-colors", children: categoryName || category })] })), _jsx(Span, { "aria-hidden": true, children: "/" }), _jsx(Span, { className: "text-zinc-700 dark:text-zinc-300 truncate max-w-[200px]", children: title })] }), _jsx(ShareButton, { title: title })] }), _jsx(PreOrderDetailView, { renderGallery: () => (_jsx(ProductGalleryClient, { images: images, productName: title })), renderInfo: () => (_jsxs(Stack, { gap: "md", children: [_jsxs(Div, { children: [_jsxs(Row, { gap: "xs", className: "mb-2 flex-wrap", children: [_jsx(Span, { className: "inline-block rounded-full bg-indigo-100 dark:bg-indigo-900/30 px-2.5 py-0.5 text-xs font-semibold text-indigo-700 dark:text-indigo-300", children: "Pre-Order" }), productionStatus && (_jsx(Span, { className: "inline-block rounded-full bg-zinc-100 dark:bg-zinc-800 px-2.5 py-0.5 text-xs font-medium text-zinc-600 dark:text-zinc-300", children: PRODUCTION_STATUS_LABELS[productionStatus] ?? productionStatus }))] }), _jsx(Heading, { level: 1, className: "text-xl font-bold leading-snug text-zinc-900 dark:text-zinc-50 sm:text-2xl", children: title })] }), deliveryDate && (_jsxs(Row, { align: "center", gap: "xs", className: "text-sm text-zinc-600 dark:text-zinc-400", children: [_jsx(Span, { children: "\uD83D\uDCC5" }), _jsx(Span, { children: "Estimated delivery:" }), _jsx(Span, { className: "font-medium", children: deliveryDate.toLocaleDateString(undefined, { year: "numeric", month: "long" }) })] })), _jsx(ProductFeatureBadges, { featured: featured, freeShipping: freeShipping, condition: condition ?? undefined, returnable: isCancellable, labels: {
+                                        featured: "Featured",
+                                        fasterDelivery: "Faster Delivery",
+                                        ratedSeller: "Rated Seller",
+                                        condition: "Condition",
+                                        conditionNew: "New",
+                                        conditionUsed: "Used",
+                                        conditionBroken: "For Parts",
+                                        conditionRefurbished: "Refurbished",
+                                        returnable: "Cancellable",
+                                        freeShipping: "Free Shipping",
+                                        codAvailable: "Cash on Delivery",
+                                        wishlistCount: (n) => `${n} wishlisted`,
+                                        categoryProductCount: (n, cat) => `${n} in ${cat}`,
+                                    } }), (categoryName || category || brand) && (_jsxs(Row, { gap: "sm", wrap: true, children: [category && (_jsx(Link, { href: String(ROUTES.PUBLIC.CATEGORY_DETAIL(category)), className: "inline-flex items-center rounded-full border border-zinc-200 dark:border-zinc-700 bg-zinc-50 dark:bg-zinc-800/50 px-2.5 py-1 text-xs font-medium text-zinc-600 dark:text-zinc-300 transition-colors hover:border-primary-300 hover:bg-primary-50 hover:text-primary-700 dark:hover:border-primary-700/60 dark:hover:bg-primary-900/20 dark:hover:text-primary-400", children: categoryName || category })), !category && categoryName && (_jsx(Span, { className: "inline-flex items-center rounded-full border border-zinc-100 dark:border-zinc-800 bg-zinc-50 dark:bg-zinc-800/50 px-2.5 py-1 text-xs font-medium text-zinc-500 dark:text-zinc-400", children: categoryName })), brand && brandSlug && (_jsx(Link, { href: String(ROUTES.PUBLIC.BRAND_DETAIL(brandSlug)), className: "inline-flex items-center rounded-full border border-zinc-200 dark:border-zinc-700 bg-zinc-50 dark:bg-zinc-800/50 px-2.5 py-1 text-xs font-medium text-zinc-600 dark:text-zinc-300 transition-colors hover:border-primary-300 hover:bg-primary-50 hover:text-primary-700 dark:hover:border-primary-700/60 dark:hover:bg-primary-900/20 dark:hover:text-primary-400", children: brand })), brand && !brandSlug && (_jsx(Span, { className: "inline-flex items-center rounded-full border border-zinc-100 dark:border-zinc-800 bg-zinc-50 dark:bg-zinc-800/50 px-2.5 py-1 text-xs font-medium text-zinc-500 dark:text-zinc-400", children: brand }))] })), productFeatures && features.length > 0 && (_jsx(FeatureBadgeList, { productFeatureIds: features, features: productFeatures })), !productFeatures && features.length > 0 && (_jsxs(Div, { className: "rounded-xl border border-zinc-100 dark:border-zinc-800 bg-zinc-50 dark:bg-zinc-900/60 px-4 py-3", children: [_jsx(Text, { className: "mb-2 text-xs font-semibold uppercase tracking-wide text-zinc-500 dark:text-zinc-400", children: "About this product" }), _jsx("ul", { className: "space-y-1.5", children: features.map((f, i) => (_jsxs("li", { className: "flex items-start gap-2 text-sm text-zinc-700 dark:text-zinc-300", children: [_jsx(Span, { className: "mt-0.5 flex-shrink-0 text-primary-500", children: "\u2022" }), f] }, i))) })] })), descriptionHtml && (_jsx(RichText, { html: descriptionHtml, proseClass: "prose prose-sm max-w-none dark:prose-invert prose-p:my-0", className: "text-sm leading-relaxed text-zinc-600 dark:text-zinc-400 line-clamp-4" })), safeSeller && (_jsx(Div, { className: "rounded-xl border border-zinc-100 dark:border-zinc-800 bg-zinc-50 dark:bg-zinc-900/60 p-3", children: _jsxs(Row, { justify: "between", align: "center", children: [_jsxs(Div, { children: [_jsx(Text, { className: "text-[10px] uppercase tracking-wide text-zinc-400 dark:text-zinc-500 mb-0.5", children: "Sold by" }), _jsx(Text, { className: "text-sm font-semibold text-zinc-800 dark:text-zinc-200", children: safeSeller })] }), storeHref && (_jsx(Link, { href: storeHref, className: "shrink-0 rounded-lg bg-primary/10 dark:bg-primary/20 px-3 py-1.5 text-xs font-semibold text-primary-700 dark:text-primary-300 hover:bg-primary/20 dark:hover:bg-primary/30 transition-colors", children: "Visit Store \u2192" }))] }) }))] })), renderSublistingSection: sublistingCategoryId
+                            ? () => (_jsx(SublistingCarouselSection, { sublistingCategoryId: sublistingCategoryId, currentListingId: String(product.id) }))
+                            : undefined, renderGroupSection: groupId
+                            ? () => (_jsx(ShowGroupSection, { groupId: groupId, currentSlug: String(p.slug ?? product.id), isParent: isGroupParent, groupTitle: groupTitle }))
+                            : undefined, renderTabs: () => (_jsx(ProductTabsShell, { descriptionContent: descriptionHtml ? (_jsx(RichText, { html: descriptionHtml, proseClass: "prose prose-sm sm:prose max-w-none dark:prose-invert", className: "text-zinc-700 dark:text-zinc-300" })) : undefined, specsContent: specs.length > 0 ? (_jsx("dl", { className: "divide-y divide-zinc-100 dark:divide-zinc-800 rounded-xl border border-zinc-100 dark:border-zinc-800 overflow-hidden text-sm", children: specs.map((s, i) => (_jsxs("div", { className: "flex gap-4 px-4 py-3 bg-white dark:bg-zinc-900 even:bg-zinc-50 dark:even:bg-zinc-800/50", children: [_jsx("dt", { className: "w-36 flex-shrink-0 font-medium text-zinc-700 dark:text-zinc-300", children: s.name }), _jsxs("dd", { className: "flex-1 text-zinc-600 dark:text-zinc-400", children: [s.value, s.unit ? ` ${s.unit}` : ""] })] }, i))) })) : undefined, customTabs: customSections.map((s) => ({
+                                id: s.id,
+                                label: s.title,
+                                content: _jsx(CustomSectionTabContent, { section: s }),
+                            })) })), renderBuyBar: () => (_jsxs(Div, { id: "pre-order-buy-bar", className: "rounded-xl border border-zinc-100 dark:border-zinc-800 bg-zinc-50 dark:bg-zinc-900/60 p-5 space-y-4", children: [reserveTarget > 0 && (_jsxs(Div, { className: "space-y-2", children: [_jsxs(Row, { justify: "between", align: "center", children: [_jsxs(Text, { className: "text-xs text-zinc-500", children: [reservedCount, " of ", reserveTarget, " reserved"] }), _jsxs(Span, { className: "text-xs font-semibold text-primary-600 dark:text-primary-400", children: [progressPct, "%"] })] }), _jsx(Div, { className: "h-2 w-full overflow-hidden rounded-full bg-zinc-200 dark:bg-zinc-700", children: _jsx(Div, { className: "h-full rounded-full bg-primary transition-all", style: { width: `${progressPct}%` } }) })] })), onReserveNow ? (_jsx(PreOrderActionsClient, { productId: String(product.id), price: price, currency: currency, depositAmount: depositAmount, depositPercent: depositPercent, isCancellable: isCancellable, tags: tags, onReserveNow: onReserveNow })) : (_jsxs(_Fragment, { children: [price !== null && (_jsxs(Div, { children: [_jsx(Text, { className: "text-2xl font-bold text-zinc-900 dark:text-zinc-50", children: formatCurrency(price, currency) }), depositAmount !== null && (_jsxs(Text, { className: "mt-0.5 text-xs text-zinc-500", children: ["Reserve with ", formatCurrency(depositAmount, currency), depositPercent !== null ? ` (${depositPercent}% deposit)` : ""] }))] })), _jsxs(Stack, { gap: "sm", children: [_jsx(Button, { variant: "primary", size: "md", className: "w-full", children: "Reserve Now" }), isCancellable && (_jsx(Text, { className: "text-center text-xs text-zinc-500 dark:text-zinc-400", children: "\u2713 Free cancellation before production" }))] }), tags.length > 0 && (_jsx(Div, { className: "border-t border-zinc-200 dark:border-zinc-700 pt-4", children: _jsx(Row, { wrap: true, gap: "xs", children: tags.map((tag) => (_jsx(Span, { className: "rounded-full bg-zinc-100 dark:bg-zinc-800 px-2.5 py-1 text-xs text-zinc-600 dark:text-zinc-300", children: tag }, tag))) }) })), _jsx(Div, { className: "border-t border-zinc-200 dark:border-zinc-700 pt-4", children: _jsx(Row, { wrap: true, gap: "sm", className: "justify-center text-center", children: [
+                                                    { icon: "🔒", label: "Secure\nPayment" },
+                                                    { icon: "📅", label: "Guaranteed\nDelivery" },
+                                                    { icon: "↩", label: "Free\nCancellation" },
+                                                ].map(({ icon, label }) => (_jsxs(Div, { className: "flex flex-col items-center gap-1 text-xs text-zinc-500 dark:text-zinc-400 min-w-[60px]", children: [_jsx(Span, { className: "text-base", children: icon }), _jsx(Span, { className: "whitespace-pre-line leading-tight", children: label })] }, label))) }) })] }))] })) }), _jsxs(BuyBar, { children: [price !== null && (_jsx(Span, { className: "mr-auto text-sm font-bold text-zinc-900 dark:text-zinc-50", children: formatCurrency(price, currency) })), _jsx("a", { href: "#pre-order-buy-bar", className: "appkit-button appkit-button--primary appkit-button--sm flex-1", children: _jsx("span", { className: "appkit-button__content", children: "Reserve Now" }) })] })] })] }));
 }

package/dist/features/pre-orders/components/PreOrdersIndexListing.js

@@ -1,10 +1,12 @@
 "use client";
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 import { useState, useCallback, useMemo } from "react";
-import { Heart, ShoppingCart, SlidersHorizontal, X } from "lucide-react";
+import { Columns, Heart, ShoppingCart, SlidersHorizontal, X } from "lucide-react";
 import { useUrlTable } from "../../../react/hooks/useUrlTable";
 import { useProducts } from "../../products/hooks/useProducts";
 import { Pagination, useToast, BulkActionsBar, ListingToolbar } from "../../../ui";
+import { ACTION_ID, ACTION_META, COMPARE_MAX_ITEMS } from "../../products/constants/action-defs";
+import { CompareOverlay } from "../../products/components/CompareOverlay";
 import { ROUTES } from "../../../next";
 import { MarketplacePreorderCard } from "./MarketplacePreorderCard";
 import { PreOrderFilters } from "./PreOrderFilters";
@@ -28,6 +30,7 @@ export function PreOrdersIndexListing({ initialData, categorySlug, brandName })
     const { showToast } = useToast();
     const [searchInput, setSearchInput] = useState(table.get("q") || "");
     const [filterOpen, setFilterOpen] = useState(false);
+    const [compareIds, setCompareIds] = useState([]);
     const showClosed = table.get("showClosed") === "true";
     const [view, setView] = useState(table.get("view") || "grid");
     const localCart = useGuestCart();
@@ -103,7 +106,7 @@ export function PreOrdersIndexListing({ initialData, categorySlug, brandName })
         sort: table.get("sort") || "-createdAt",
         page: table.getNumber("page", 1),
         perPage: table.getNumber("pageSize", 24),
-        isPreOrder: true,
+        listingType: "pre-order",
         status: showClosed ? undefined : "published",
     };
     const { products: preOrders, totalPages, page, isLoading } = useProducts(params, { initialData });
@@ -147,8 +150,8 @@ export function PreOrdersIndexListing({ initialData, categorySlug, brandName })
     const gridClass = "grid grid-cols-2 sm:grid-cols-3 lg:grid-cols-4 gap-4";
     return (_jsxs("div", { className: "min-h-screen", children: [_jsx(ListingToolbar, { filterCount: activeFilterCount, onFiltersClick: openFilters, searchValue: searchInput, searchPlaceholder: "Search pre-orders...", onSearchChange: setSearchInput, onSearchCommit: commitSearch, onSearchKeyDown: handleSearchKeyDown, sortValue: table.get("sort") || "-createdAt", sortOptions: PREORDER_SORT_OPTIONS, onSortChange: (v) => { table.set("sort", v); table.setPage(1); }, view: view, onViewChange: handleViewToggle, onResetAll: resetAll, hasActiveState: hasActiveState, bulkMode: selection.isSelecting, bulkSelectedCount: selection.selectedCount, bulkTotalCount: preOrders.length, onBulkSelectAll: selection.toggleAll, onBulkClear: selection.clearSelection, extra: _jsxs("label", { className: "flex items-center gap-1.5 cursor-pointer select-none shrink-0", children: [_jsx("span", { className: "hidden sm:inline text-xs text-zinc-600 dark:text-zinc-300 whitespace-nowrap", children: "Show closed" }), _jsx("button", { type: "button", role: "switch", "aria-checked": showClosed, onClick: () => table.set("showClosed", showClosed ? "" : "true"), className: `relative inline-flex h-5 w-9 flex-shrink-0 items-center rounded-full transition-colors duration-200 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-primary focus-visible:ring-offset-1 ${showClosed ? "bg-primary" : "bg-zinc-300 dark:bg-slate-600"}`, children: _jsx("span", { className: `inline-block h-3.5 w-3.5 transform rounded-full bg-white shadow-sm transition-transform duration-200 ${showClosed ? "translate-x-[19px]" : "translate-x-[3px]"}` }) })] }) }), totalPages > 1 && (_jsx("div", { className: "sticky top-[calc(var(--header-height,0px)+44px)] z-10 flex justify-center bg-white/95 dark:bg-slate-900/95 backdrop-blur-sm border-b border-zinc-200 dark:border-slate-700 px-3 py-1.5", children: _jsx(Pagination, { currentPage: page, totalPages: totalPages, onPageChange: (p) => table.setPage(p) }) })), _jsx("div", { className: "py-6", children: isLoading ? (_jsx("div", { className: gridClass, children: Array.from({ length: 10 }).map((_, i) => (_jsxs("div", { className: "rounded-xl border border-zinc-100 dark:border-slate-700 overflow-hidden animate-pulse", children: [_jsx("div", { className: "aspect-square bg-zinc-200 dark:bg-slate-700" }), _jsxs("div", { className: "p-3 space-y-2", children: [_jsx("div", { className: "h-3 bg-zinc-200 dark:bg-slate-700 rounded w-3/4" }), _jsx("div", { className: "h-3 bg-zinc-200 dark:bg-slate-700 rounded w-1/2" }), _jsx("div", { className: "h-4 bg-zinc-200 dark:bg-slate-700 rounded w-1/3" }), _jsx("div", { className: "h-8 bg-zinc-200 dark:bg-slate-700 rounded" })] })] }, i))) })) : preOrders.length === 0 ? (_jsx("p", { className: "py-12 text-center text-sm text-zinc-500 dark:text-zinc-400", children: "No pre-orders found." })) : view === "list" ? (_jsx("div", { className: "flex flex-col divide-y divide-zinc-100 dark:divide-zinc-800 rounded-xl border border-zinc-100 dark:border-zinc-800", children: preOrders.map((product) => (_jsx(MarketplacePreorderCard, { product: product, variant: "list", hrefBuilder: (p) => String(ROUTES.PUBLIC.PRE_ORDER_DETAIL(p.id)), onAddToCart: handleAddToCart, wishlistActions: wishlistActions, selectable: selection.isSelecting, isSelected: selection.isSelected(product.id), onSelect: (id) => selection.toggle(id) }, product.id))) })) : (_jsx("div", { className: gridClass, children: preOrders.map((product) => (_jsx(MarketplacePreorderCard, { product: product, variant: "grid", hrefBuilder: (p) => String(ROUTES.PUBLIC.PRE_ORDER_DETAIL(p.id)), onAddToCart: handleAddToCart, wishlistActions: wishlistActions, selectable: selection.isSelecting, isSelected: selection.isSelected(product.id), onSelect: (id) => selection.toggle(id) }, product.id))) })) }), _jsx(BulkActionsBar, { selectedCount: selection.selectedCount, onClearSelection: selection.clearSelection, actions: [
                     {
-                        key: "cart",
-                        label: "Add to Cart",
+                        key: ACTION_ID.ADD_TO_CART,
+                        label: ACTION_META[ACTION_ID.ADD_TO_CART].label,
                         icon: _jsx(ShoppingCart, { className: "h-3.5 w-3.5" }),
                         variant: "primary",
                         onClick: () => {
@@ -162,8 +165,8 @@ export function PreOrdersIndexListing({ initialData, categorySlug, brandName })
                         },
                     },
                     {
-                        key: "wishlist",
-                        label: "Wishlist",
+                        key: ACTION_ID.ADD_TO_WISHLIST,
+                        label: ACTION_META[ACTION_ID.ADD_TO_WISHLIST].label,
                         icon: _jsx(Heart, { className: "h-3.5 w-3.5" }),
                         variant: "secondary",
                         onClick: () => {
@@ -176,5 +179,19 @@ export function PreOrdersIndexListing({ initialData, categorySlug, brandName })
                             selection.clearSelection();
                         },
                     },
-                ] }), filterOpen && (_jsxs(_Fragment, { children: [_jsx("div", { className: "fixed inset-0 z-40 bg-black/40", "aria-hidden": "true", onClick: () => setFilterOpen(false) }), _jsxs("div", { className: "fixed inset-y-0 left-0 z-50 flex w-80 flex-col bg-white dark:bg-slate-900 shadow-2xl", children: [_jsxs("div", { className: "flex items-center justify-between border-b border-zinc-200 dark:border-slate-700 px-4 py-3.5", children: [_jsxs("span", { className: "flex items-center gap-2 text-base font-semibold text-zinc-900 dark:text-zinc-100", children: [_jsx(SlidersHorizontal, { className: "h-4 w-4" }), "Filters"] }), _jsxs("div", { className: "flex items-center gap-2", children: [activeFilterCount > 0 && (_jsx("button", { type: "button", onClick: clearFilters, className: "text-xs text-zinc-500 hover:text-rose-500 dark:text-zinc-400 transition-colors", children: "Clear all" })), _jsx("button", { type: "button", onClick: () => setFilterOpen(false), "aria-label": "Close filters", className: "rounded-lg p-1.5 text-zinc-500 hover:bg-zinc-100 dark:hover:bg-slate-800 transition-colors", children: _jsx(X, { className: "h-5 w-5" }) })] })] }), _jsx("div", { className: "flex-1 overflow-y-auto px-4 py-4", children: _jsx(PreOrderFilters, { table: pendingTable, currencyPrefix: "\u20B9", categoryOptions: categoryOptions, brandOptions: brandOptions }) }), _jsx("div", { className: "border-t border-zinc-200 dark:border-slate-700 px-4 py-3.5", children: _jsxs("button", { type: "button", onClick: applyFilters, className: "w-full rounded-lg bg-primary py-2.5 text-sm font-semibold text-white hover:bg-primary-600 transition-colors active:scale-[0.98]", children: ["Apply Filters", activeFilterCount > 0 ? ` (${activeFilterCount})` : ""] }) })] })] }))] }));
+                    {
+                        key: ACTION_ID.COMPARE,
+                        label: ACTION_META[ACTION_ID.COMPARE].label,
+                        icon: _jsx(Columns, { className: "h-3.5 w-3.5" }),
+                        variant: "secondary",
+                        disabled: selection.selectedCount < 2 || selection.selectedCount > COMPARE_MAX_ITEMS,
+                        onClick: () => {
+                            const ids = Array.from(selection.selectedIdSet).slice(0, COMPARE_MAX_ITEMS);
+                            setCompareIds(ids);
+                        },
+                    },
+                ] }), _jsx(CompareOverlay, { isOpen: compareIds.length > 0, productIds: compareIds, productType: "preorder", onClose: () => {
+                    setCompareIds([]);
+                    selection.clearSelection();
+                }, onRemove: (id) => setCompareIds((ids) => ids.filter((i) => i !== id)) }), filterOpen && (_jsxs(_Fragment, { children: [_jsx("div", { className: "fixed inset-0 z-40 bg-black/40", "aria-hidden": "true", onClick: () => setFilterOpen(false) }), _jsxs("div", { className: "fixed inset-y-0 left-0 z-50 flex w-80 flex-col bg-white dark:bg-slate-900 shadow-2xl", children: [_jsxs("div", { className: "flex items-center justify-between border-b border-zinc-200 dark:border-slate-700 px-4 py-3.5", children: [_jsxs("span", { className: "flex items-center gap-2 text-base font-semibold text-zinc-900 dark:text-zinc-100", children: [_jsx(SlidersHorizontal, { className: "h-4 w-4" }), "Filters"] }), _jsxs("div", { className: "flex items-center gap-2", children: [activeFilterCount > 0 && (_jsx("button", { type: "button", onClick: clearFilters, className: "text-xs text-zinc-500 hover:text-rose-500 dark:text-zinc-400 transition-colors", children: "Clear all" })), _jsx("button", { type: "button", onClick: () => setFilterOpen(false), "aria-label": "Close filters", className: "rounded-lg p-1.5 text-zinc-500 hover:bg-zinc-100 dark:hover:bg-slate-800 transition-colors", children: _jsx(X, { className: "h-5 w-5" }) })] })] }), _jsx("div", { className: "flex-1 overflow-y-auto px-4 py-4", children: _jsx(PreOrderFilters, { table: pendingTable, currencyPrefix: "\u20B9", categoryOptions: categoryOptions, brandOptions: brandOptions }) }), _jsx("div", { className: "border-t border-zinc-200 dark:border-slate-700 px-4 py-3.5", children: _jsxs("button", { type: "button", onClick: applyFilters, className: "w-full rounded-lg bg-primary py-2.5 text-sm font-semibold text-white hover:bg-primary-600 transition-colors active:scale-[0.98]", children: ["Apply Filters", activeFilterCount > 0 ? ` (${activeFilterCount})` : ""] }) })] })] }))] }));
 }

package/dist/features/pre-orders/components/PreOrdersListView.js

@@ -2,13 +2,17 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { productRepository } from "../../../repositories";
 import { Container, Main, Heading, Section } from "../../../ui";
 import { AdSlot } from "../../homepage/components/AdSlot";
+import { parseListingSearchParams } from "../../../utils/listing-params";
 import { PreOrdersIndexListing } from "./PreOrdersIndexListing";
+const DEFAULT_PAGE = 1;
+const DEFAULT_PAGE_SIZE = 24;
+const DEFAULT_SORT = "-createdAt";
 function sp(params, key) {
     const v = params[key];
     return Array.isArray(v) ? v[0] ?? "" : v ?? "";
 }
 function buildPreOrderFilters(params) {
-    const parts = ["status==published", "isPreOrder==true"];
+    const parts = ["status==published", "listingType==pre-order"];
     const minPrice = sp(params, "minPrice");
     const maxPrice = sp(params, "maxPrice");
     if (minPrice)
@@ -17,16 +21,17 @@ function buildPreOrderFilters(params) {
         parts.push(`price<=${maxPrice}`);
     const store = sp(params, "storeId");
     if (store)
-        parts.push(`sellerId==${store}`);
+        parts.push(`storeId==${store}`);
     const preOrderProductionStatus = sp(params, "preOrderProductionStatus");
     if (preOrderProductionStatus)
         parts.push(`preOrderProductionStatus==${preOrderProductionStatus}`);
     return parts.join(",");
 }
 export async function PreOrdersListView({ searchParams = {} }) {
-    const sort = sp(searchParams, "sort") || "-createdAt";
-    const page = Number(sp(searchParams, "page")) || 1;
-    const pageSize = Number(sp(searchParams, "pageSize")) || 24;
+    const std = parseListingSearchParams(searchParams);
+    const sort = std.sorts ?? DEFAULT_SORT;
+    const page = std.page ?? DEFAULT_PAGE;
+    const pageSize = std.pageSize ?? DEFAULT_PAGE_SIZE;
     const filters = buildPreOrderFilters(searchParams);
     const result = await productRepository
         .list({ filters, sorts: sort, page, pageSize })

package/dist/features/pre-orders/schemas/index.d.ts

@@ -22,15 +22,15 @@ export declare const preorderItemSchema: z.ZodObject<{
         source: z.ZodOptional<z.ZodEnum<["upload", "youtube", "external"]>>;
         youtubeId: z.ZodOptional<z.ZodString>;
     }, "strip", z.ZodTypeAny, {
-        url: string;
         type: "video" | "image" | "file";
+        url: string;
         source?: "external" | "upload" | "youtube" | undefined;
         alt?: string | undefined;
         thumbnailUrl?: string | undefined;
         youtubeId?: string | undefined;
     }, {
-        url: string;
         type: "video" | "image" | "file";
+        url: string;
         source?: "external" | "upload" | "youtube" | undefined;
         alt?: string | undefined;
         thumbnailUrl?: string | undefined;
@@ -52,15 +52,15 @@ export declare const preorderItemSchema: z.ZodObject<{
     isFeatured: boolean;
     salePrice: number;
     regularPrice: number;
+    createdAt?: string | undefined;
     media?: {
-        url: string;
         type: "video" | "image" | "file";
+        url: string;
         source?: "external" | "upload" | "youtube" | undefined;
         alt?: string | undefined;
         thumbnailUrl?: string | undefined;
         youtubeId?: string | undefined;
     }[] | undefined;
-    createdAt?: string | undefined;
     images?: string[] | undefined;
     brand?: string | undefined;
     franchise?: string | undefined;
@@ -71,15 +71,15 @@ export declare const preorderItemSchema: z.ZodObject<{
     slug: string;
     salePrice: number;
     regularPrice: number;
+    createdAt?: string | undefined;
     media?: {
-        url: string;
         type: "video" | "image" | "file";
+        url: string;
         source?: "external" | "upload" | "youtube" | undefined;
         alt?: string | undefined;
         thumbnailUrl?: string | undefined;
         youtubeId?: string | undefined;
     }[] | undefined;
-    createdAt?: string | undefined;
     active?: boolean | undefined;
     images?: string[] | undefined;
     brand?: string | undefined;

package/dist/features/products/actions/product-actions.d.ts

@@ -5,8 +5,8 @@ export interface ProductListActionParams {
     sorts?: string;
     page?: number;
     pageSize?: number;
-    isAuction?: boolean;
-    isPreOrder?: boolean;
+    /** Canonical listing-kind discriminator (SB1-G Phase 4). */
+    listingType?: "standard" | "auction" | "pre-order" | "prize-draw" | "bundle";
     featured?: boolean;
     storeId?: string;
     categoriesIn?: string[];

package/dist/features/products/actions/product-actions.js

@@ -1,12 +1,19 @@
 import { productRepository } from "../repository/products.repository";
 import { ProductStatusValues } from "../schemas";
+/**
+ * Reusable Sieve clauses. Single source of truth for the listing-type
+ * discriminator across every action helper in this file. SB1-G (S21 2026-05-12)
+ * routes everything through `listingType==X` — the legacy boolean flags are
+ * never emitted by code under our control any more.
+ */
+const PUBLISHED_CLAUSE = "status==published";
+const AUCTIONS_PUBLISHED = `listingType==auction,${PUBLISHED_CLAUSE}`;
+const PREORDERS_PUBLISHED = `listingType==pre-order,${PUBLISHED_CLAUSE}`;
 export async function listProducts(params = {}) {
-    const { filters, sorts = "-createdAt", page = 1, pageSize = 20, isAuction, isPreOrder, featured, storeId, categoriesIn, } = params;
+    const { filters, sorts = "-createdAt", page = 1, pageSize = 20, listingType, featured, storeId, categoriesIn, } = params;
     const compoundFilters = [];
-    if (isAuction !== undefined)
-        compoundFilters.push(`isAuction==${isAuction}`);
-    if (isPreOrder !== undefined)
-        compoundFilters.push(`isPreOrder==${isPreOrder}`);
+    if (listingType)
+        compoundFilters.push(`listingType==${listingType}`);
     if (featured === true)
         compoundFilters.push("featured==true");
     if (storeId)
@@ -27,7 +34,7 @@ export async function getProductById(id) {
 }
 export async function getFeaturedProducts(pageSize = 8) {
     return productRepository.list({
-        filters: "featured==true,status==published",
+        filters: `featured==true,${PUBLISHED_CLAUSE}`,
         sorts: "-createdAt",
         page: 1,
         pageSize,
@@ -35,7 +42,7 @@ export async function getFeaturedProducts(pageSize = 8) {
 }
 export async function getFeaturedAuctions(pageSize = 6) {
     return productRepository.list({
-        filters: "isAuction==true,status==published",
+        filters: AUCTIONS_PUBLISHED,
         sorts: "auctionEndDate",
         page: 1,
         pageSize,
@@ -43,7 +50,7 @@ export async function getFeaturedAuctions(pageSize = 6) {
 }
 export async function getLatestProducts(pageSize = 12) {
     return productRepository.list({
-        filters: "status==published",
+        filters: PUBLISHED_CLAUSE,
         sorts: "-createdAt",
         page: 1,
         pageSize,
@@ -51,7 +58,7 @@ export async function getLatestProducts(pageSize = 12) {
 }
 export async function getLatestAuctions(pageSize = 12) {
     return productRepository.list({
-        filters: "isAuction==true,status==published",
+        filters: AUCTIONS_PUBLISHED,
         sorts: "-createdAt",
         page: 1,
         pageSize,
@@ -59,9 +66,8 @@ export async function getLatestAuctions(pageSize = 12) {
 }
 export async function listAuctions(params = {}) {
     const { filters, sorts = "auctionEndDate", page = 1, pageSize = 20 } = params;
-    const base = "isAuction==true,status==published";
     return productRepository.list({
-        filters: filters ? `${base},${filters}` : base,
+        filters: filters ? `${AUCTIONS_PUBLISHED},${filters}` : AUCTIONS_PUBLISHED,
         sorts,
         page,
         pageSize,
@@ -69,7 +75,7 @@ export async function listAuctions(params = {}) {
 }
 export async function getFeaturedPreOrders(pageSize = 6) {
     return productRepository.list({
-        filters: "isPreOrder==true,status==published",
+        filters: PREORDERS_PUBLISHED,
         sorts: "preOrderDeliveryDate",
         page: 1,
         pageSize,
@@ -77,7 +83,7 @@ export async function getFeaturedPreOrders(pageSize = 6) {
 }
 export async function getLatestPreOrders(pageSize = 12) {
     return productRepository.list({
-        filters: "isPreOrder==true,status==published",
+        filters: PREORDERS_PUBLISHED,
         sorts: "-createdAt",
         page: 1,
         pageSize,
@@ -85,9 +91,8 @@ export async function getLatestPreOrders(pageSize = 12) {
 }
 export async function listPreOrders(params = {}) {
     const { filters, sorts = "preOrderDeliveryDate", page = 1, pageSize = 20, } = params;
-    const base = "isPreOrder==true,status==published";
     return productRepository.list({
-        filters: filters ? `${base},${filters}` : base,
+        filters: filters ? `${PREORDERS_PUBLISHED},${filters}` : PREORDERS_PUBLISHED,
         sorts,
         page,
         pageSize,
@@ -95,7 +100,7 @@ export async function listPreOrders(params = {}) {
 }
 export async function getRelatedProducts(categoryId, excludeId, limit = 6) {
     const result = await productRepository.list({
-        filters: `categoryId==${categoryId},status==published`,
+        filters: `categoryId==${categoryId},${PUBLISHED_CLAUSE}`,
         sorts: "-createdAt",
         page: 1,
         pageSize: limit + 1,

package/dist/features/products/api/[id]/route.js

@@ -15,6 +15,7 @@ import { getProviders } from "../../../../contracts";
 import { createRouteHandler } from "../../../../next";
 import { mediaFieldSchema } from "../../../media/types/index";
 import { storeRepository } from "../../../stores/repository/store.repository";
+import { sanitizeProductForPublic } from "../../utils/sanitize";
 function getRepo() {
     const { db } = getProviders();
     if (!db)
@@ -44,10 +45,8 @@ const productUpdateSchema = z
     tags: z.array(z.string()).optional(),
     featured: z.boolean().optional(),
     isPromoted: z.boolean().optional(),
-    isAuction: z.boolean().optional(),
-    isPreOrder: z.boolean().optional(),
     listingType: z
-        .enum(["fixed", "standard", "auction", "pre-order"])
+        .enum(["standard", "auction", "pre-order", "prize-draw", "bundle"])
         .optional(),
     media: z.array(mediaFieldSchema).optional(),
 })
@@ -73,7 +72,8 @@ export async function GET(_request, context) {
         if (!item) {
             return NextResponse.json({ success: false, error: "Product not found" }, { status: 404 });
         }
-        return NextResponse.json({ success: true, data: item });
+        const sanitized = sanitizeProductForPublic(item);
+        return NextResponse.json({ success: true, data: sanitized });
     }
     catch (error) {
         console.error("[feat-products] GET /api/products/[id] failed", error);

package/dist/features/products/api/route.js

@@ -17,6 +17,7 @@ import { z } from "zod";
 import { getProviders } from "../../../contracts";
 import { createRouteHandler } from "../../../next";
 import { mediaFieldSchema } from "../../media/types/index";
+import { sanitizeProductsForPublic } from "../utils/sanitize";
 // --- Mutation schemas ---------------------------------------------------------
 // Minimal schemas for secured mutations — consumer apps can extend as needed.
 const productMutateSchema = z
@@ -49,7 +50,7 @@ const productMutateSchema = z
     sellerEmail: z.string().email().optional(),
     slug: z.string().optional(),
     listingType: z
-        .enum(["fixed", "standard", "auction", "pre-order"])
+        .enum(["standard", "auction", "pre-order", "prize-draw", "bundle"])
         .optional(),
     media: z.array(mediaFieldSchema).optional(),
 })
@@ -72,6 +73,8 @@ const SAFE_PRODUCT_FILTER_FIELDS = new Set([
     "storeId",
     "title",
     "price",
+    // SB1-G — canonical discriminator first; legacy booleans retained transitional.
+    "listingType",
     "isAuction",
     "isPreOrder",
     "featured",
@@ -123,12 +126,24 @@ function buildFilters(url) {
     const inStock = param(url, "inStock");
     if (inStock === "true")
         parts.push("stockQuantity>0");
+    // SB1-G — public URL still accepts the legacy boolean params; map them to
+    // the canonical listingType clause. ?listingType=auction|pre-order|standard
+    // takes precedence when present.
+    const listingTypeParam = param(url, "listingType");
     const isAuction = param(url, "isAuction");
-    if (isAuction !== null)
-        parts.push(`isAuction==${isAuction}`);
     const isPreOrder = param(url, "isPreOrder");
-    if (isPreOrder !== null)
-        parts.push(`isPreOrder==${isPreOrder}`);
+    if (listingTypeParam) {
+        parts.push(`listingType==${listingTypeParam}`);
+    }
+    else if (isAuction === "true") {
+        parts.push("listingType==auction");
+    }
+    else if (isPreOrder === "true") {
+        parts.push("listingType==pre-order");
+    }
+    else if (isAuction === "false" && isPreOrder === "false") {
+        parts.push("listingType==standard");
+    }
     const featured = param(url, "featured");
     if (featured === "true")
         parts.push("featured==true");
@@ -162,7 +177,7 @@ export async function GET(request) {
         });
         const totalPages = Math.max(1, Math.ceil(result.total / pageSize));
         const body = {
-            items: result.data,
+            items: sanitizeProductsForPublic(result.data),
             total: result.total,
             page: result.page,
             pageSize,

package/dist/features/products/components/AuctionsIndexListing.js

@@ -102,7 +102,7 @@ export function AuctionsIndexListing({ initialData, categorySlug, brandName }) {
         sort: table.get("sort") || "auctionEndDate",
         page: table.getNumber("page", 1),
         perPage: table.getNumber("pageSize", 24),
-        isAuction: true,
+        listingType: "auction",
     };
     const { products: auctions, totalPages, page, isLoading } = useProducts(params, { initialData });
     const commitSearch = useCallback(() => {

package/dist/features/products/components/CompareOverlay.d.ts

@@ -0,0 +1,51 @@
+/** Subset of ProductDocument the overlay needs. Kept loose so it can be fed
+ * sanitized public payloads directly. */
+export interface CompareProductLike {
+    id: string;
+    title?: string;
+    slug?: string;
+    price?: number;
+    currency?: string;
+    mainImage?: string;
+    images?: string[];
+    condition?: string;
+    brand?: string;
+    category?: string;
+    categoryName?: string;
+    storeName?: string;
+    storeSlug?: string;
+    /** Canonical discriminator (SB1-G Phase 4). */
+    listingType?: "standard" | "auction" | "pre-order" | "prize-draw" | "bundle";
+    features?: string[];
+}
+interface CompareFieldLabels {
+    image: string;
+    price: string;
+    condition: string;
+    brand: string;
+    category: string;
+    store: string;
+}
+export interface CompareOverlayLabels {
+    title?: string;
+    empty?: string;
+    close?: string;
+    remove?: string;
+    view?: string;
+    field?: Partial<CompareFieldLabels>;
+}
+export interface CompareOverlayProps {
+    isOpen: boolean;
+    /** Pre-loaded items. Takes precedence over `productIds`. */
+    items?: CompareProductLike[];
+    /** When provided, the overlay fetches /api/products?ids=… on open. */
+    productIds?: string[];
+    /** Discriminates which detail-page ROUTE to link to. */
+    productType?: "product" | "auction" | "preorder";
+    onClose: () => void;
+    /** Called when a column's Remove button is clicked. */
+    onRemove?: (id: string) => void;
+    labels?: CompareOverlayLabels;
+}
+export declare function CompareOverlay({ isOpen, items: passedItems, productIds, productType, onClose, onRemove, labels: labelOverrides, }: CompareOverlayProps): import("react/jsx-runtime").JSX.Element | null;
+export {};