@tokenoftrust/storefront-runner 2.4.86 → 2.4.87

package/apps/storefront/src/lib/newsletter/send.ts

@@ -18,7 +18,7 @@
  * per-subscriber diff. "New since last send" is computed once from the previous
  * ledger row's `sent_at`, not per-subscriber.
  */
-import type { Queryable } from "../d1/catalog.js";
+import type { Queryable } from "../catalog/d1/catalog.js";
 import type { BlogPostSummary } from "../blog/types.js";
 import {
   sendBatch as realSendBatch,

package/apps/storefront/src/lib/newsletter/subscribers.ts

@@ -9,7 +9,7 @@
  * caller is responsible for resolving `tenantId` from the request host/session
  * (NEVER a client body) — that is the multi-tenant isolation boundary.
  */
-import type { Queryable } from "../d1/catalog.js";
+import type { Queryable } from "../catalog/d1/catalog.js";
 
 export type SubscriberStatus = "pending" | "confirmed" | "unsubscribed" | "bounced";
 

package/apps/storefront/src/lib/{apps/orders → orders/data}/orderForwardReceiver.ts

@@ -35,7 +35,7 @@
 import { OrdersStore, ScrappyOrderLedger, type OrderLineItem, type OrderStatus, type Order } from "./ordersStore.js";
 import { emitWebhookEvent } from "../../integrations/webhooks/emit.js";
 import type { WebhookTopic } from "../../integrations/webhooks/deliveryStore.js";
-import type { Queryable } from "../../d1/catalog.js";
+import type { Queryable } from "../../catalog/d1/catalog.js";
 import {
   createLocalJWKSet,
   decodeJwt,

package/apps/storefront/src/lib/{apps/orders → orders/data}/orderMapper.ts

@@ -9,7 +9,7 @@
  * customer identity is always the per-(tenant, install) `customerHash`.
  */
 import { customerHash } from "../../integrations/apps/orders/customerHash.js";
-import type { FoxyOrder, FoxyOrderLineItem } from "./foxyOrderClient.js";
+import type { FoxyOrder, FoxyOrderLineItem } from "../providers/foxyOrderClient.js";
 import {
   COMPLIANCE_STATES,
   FULFILLMENT_STATES,

package/apps/storefront/src/lib/{apps/orders → orders/data}/ordersStore.ts

@@ -10,7 +10,7 @@
  * `AppRegistryService` uses, so this runs unchanged against real D1 in the
  * Worker and an in-memory `node:sqlite` in tests.
  */
-import type { Queryable, QueryStatement } from "../../d1/catalog.js";
+import type { Queryable, QueryStatement } from "../../catalog/d1/catalog.js";
 import {
   canonicalJson,
   idempotencyKey,

package/apps/storefront/src/lib/{admin/services/mock → orders/fixtures}/orders.ts

@@ -1,5 +1,5 @@
-import type { AdminTenantEnvelope } from "../../envelope";
-import { MOCK_ANCHOR_ISO, offsetIso, pick, randomBool, randomInt, seededRandom } from "../../seed";
+import type { AdminTenantEnvelope } from "../../admin/envelope";
+import { MOCK_ANCHOR_ISO, offsetIso, pick, randomBool, randomInt, seededRandom } from "../../admin/seed";
 import type {
   OrderDetail,
   OrderEvidenceEvent,
@@ -7,9 +7,9 @@ import type {
   OrderQueueSummary,
   OrderRow,
   OrdersViewModel,
-} from "../../viewmodels/orders";
-import { tenantProfile } from "./tenants";
-import { memoizeByEnvelope } from "../../memoizeByEnvelope";
+} from "../admin/viewmodels/orders";
+import { tenantProfile } from "../../admin/services/mock/tenants";
+import { memoizeByEnvelope } from "../../admin/memoizeByEnvelope";
 
 // Must stay index-aligned with customers.ts's NAMES: an order's customerId is
 // derived from the picked name's position here, and customers.ts assigns each

package/apps/storefront/src/lib/rawChrome.ts

@@ -431,7 +431,7 @@ function renderHeader(header: ChromeHeader, variant: HeaderVariant, currentPath?
 /**
  * Age-gate config, embedded as JSON. The CHROME_BEHAVIOR_JS mechanism
  * reads this and builds the dialog itself inside a closed shadow root — the same
- * tamper-resistance pattern components/islands/IsolatedAgeGate.tsx uses for
+ * tamper-resistance pattern components/compliance/storefront/islands/IsolatedAgeGate.tsx uses for
  * component pages (see its header comment). `<` is escaped so an authored value
  * can't close the tag early.
  */
@@ -683,7 +683,7 @@ export const CHROME_BEHAVIOR_JS = `(function () {
   }
 
   // 21+ age gate — shadow-isolated. Only the host <div> lives in light
-  // DOM (data-tot-compliance, the same marker components/islands/IsolatedAgeGate.tsx
+  // DOM (data-tot-compliance, the same marker components/compliance/storefront/islands/IsolatedAgeGate.tsx
   // uses); its contents sit behind a closed shadow root, so tenant CSS/JS can't
   // select, restyle, or hide the dialog. A MutationObserver re-asserts the host the
   // same way that component does. Config comes from the validated ChromeAgeGate

package/apps/storefront/src/lib/sections.ts

@@ -16,8 +16,8 @@ import {
   type CatalogProduct,
   type ProductSectionSource,
 } from "@tot/public-runtime";
-import type { ToTClient } from "@/lib/tot/ToTClient";
-import { isOnSale } from "@/lib/tot/query";
+import type { ToTClient } from "@/lib/catalog/tot/ToTClient";
+import { isOnSale } from "@/lib/catalog/tot/query";
 
 /**
  * Where a merchandising section gets its products. Exactly one shape per source.

package/apps/storefront/src/lib/social/tokenStore.ts

@@ -18,7 +18,7 @@
  * root that wires the real bindings (mirrors `getDispatcher()`); it returns
  * `null` when either binding is absent so callers degrade rather than throw.
  */
-import type { Queryable } from "../d1/catalog.js";
+import type { Queryable } from "../catalog/d1/catalog.js";
 import { readD1, readEnv } from "../env.js";
 
 /** The decrypted token material we persist as one JSON blob under AES-GCM. */
@@ -162,7 +162,7 @@ export async function rotateSocialToken(
  */
 export async function resolveSocialTokenStore(): Promise<SocialTokenStoreDeps | null> {
   const [{ fromD1 }, d1, rawKek] = await Promise.all([
-    import("../d1/catalog.js"),
+    import("../catalog/d1/catalog.js"),
     readD1("STOREFRONT_APPS_DB"),
     readEnv("SOCIAL_TOKEN_KEK"),
   ]);

package/apps/storefront/src/lib/{admin/services/mock → subscriptions/fixtures}/subscriptions.ts

@@ -7,16 +7,16 @@ import {
   isSubscriptionFrequency,
   purchaseOptionPrice,
 } from "@tot/public-runtime";
-import type { AdminTenantEnvelope } from "../../envelope";
-import { memoizeByEnvelope } from "../../memoizeByEnvelope";
+import type { AdminTenantEnvelope } from "../../admin/envelope";
+import { memoizeByEnvelope } from "../../admin/memoizeByEnvelope";
 import {
   MOCK_ANCHOR_ISO,
   offsetIso,
   randomInt,
   seededRandom,
-} from "../../seed";
-import type { CustomerRow } from "../../../customers/admin/viewmodels/customers";
-import type { ProductDetail, ProductRow } from "../../viewmodels/products";
+} from "../../admin/seed";
+import type { CustomerRow } from "../../customers/admin/viewmodels/customers";
+import type { ProductDetail, ProductRow } from "../../catalog/admin/viewmodels/products";
 import type {
   SubscriptionAttentionRow,
   SubscriptionCheckoutField,
@@ -27,9 +27,9 @@ import type {
   SubscriptionRenewalEvent,
   SubscriptionSubscriberRow,
   SubscriptionsViewModel,
-} from "../../viewmodels/subscriptions";
-import { getCustomersViewModel } from "../../../customers/fixtures/customers";
-import { getProductsViewModel } from "./products";
+} from "../admin/viewmodels/subscriptions";
+import { getCustomersViewModel } from "../../customers/fixtures/customers";
+import { getProductsViewModel } from "../../catalog/fixtures/products";
 
 export interface SubscriptionProductSource {
   productId: string;

package/apps/storefront/src/lib/tracking/d1Control.ts

@@ -22,7 +22,7 @@
  * transport-agnostic and unit-testable against an in-memory sqlite.
  */
 import { readEnv } from "../env.js";
-import type { Queryable, QueryStatement } from "../d1/catalog.js";
+import type { Queryable, QueryStatement } from "../catalog/d1/catalog.js";
 
 const CF_API_BASE = "https://api.cloudflare.com/client/v4";
 

package/apps/storefront/src/lib/tracking/pruneRollup.ts

@@ -44,7 +44,7 @@
  * transient D1 fault) is caught, logged, and recorded in that tenant's
  * outcome — it never aborts the rest of the batch.
  */
-import type { Queryable } from "../d1/catalog.js";
+import type { Queryable } from "../catalog/d1/catalog.js";
 import type { AnalyticsEngineLike } from "../activity/store.js";
 import { fromD1Rest, type D1ControlConfig } from "./d1Control.js";
 import { aggregateInteractions, writeInteractionAnalytics } from "./interactionStore.js";

package/apps/storefront/src/lib/tracking/tenantD1Registry.ts

@@ -32,7 +32,7 @@
  */
 import { sha256Hex } from "@tot/public-runtime";
 import { readEnv } from "../env.js";
-import type { Queryable } from "../d1/catalog.js";
+import type { Queryable } from "../catalog/d1/catalog.js";
 import {
   ensureDatabase,
   fromD1Rest,

package/apps/storefront/src/lib/url.ts

@@ -8,7 +8,7 @@
  *   &opt.Size=M&tag=sale&priceMin=50&priceMax=200&q=wool
  */
 import type { ListProductsQuery } from "@tot/public-runtime";
-import type { PriceBucket } from "./priceBuckets.js";
+import type { PriceBucket } from "./catalog/shared/priceBuckets.js";
 
 export function parseQuery(url: URL): ListProductsQuery {
   const sp = url.searchParams;

package/apps/storefront/src/middleware/controlPlane.ts

@@ -8,7 +8,7 @@
  */
 import type { APIContext, MiddlewareNext } from "astro";
 import { readEnv, readD1, readKv } from "@/lib/env";
-import { fromD1, type D1Like } from "@/lib/d1/catalog";
+import { fromD1, type D1Like } from "@/lib/catalog/d1/catalog";
 import { readCurrentTenantConsentConfig } from "@/lib/apps/consentConfigRead";
 import { loadActiveManagedInstallDeclarations } from "@/lib/integrations/integration/managedInstallDeclarations";
 import { buildTenantConsentBroker, verifyPreviewToken } from "@tot/public-runtime";

package/apps/storefront/src/middleware/index.ts

@@ -29,7 +29,7 @@ import { compileRouteTierIndexV1, resolvePublicationRoutePlanV1, type RouteTierI
 import type { PublicationArtifactBucketV1, TenantConfig } from "@tot/public-runtime";
 import { DEV_DRAFT_COOKIE } from "@/lib/dev/devDraft";
 import { applySecurityHeaders } from "@/lib/securityHeaders";
-import { visitorRegionFor, withVisitorRegionCookie } from "@/lib/visitorRegionCookie";
+import { visitorRegionFor, withVisitorRegionCookie } from "@/lib/compliance/shared/visitorRegionCookie";
 import { tryServeStaticBundle } from "./staticBundle.js";
 import { resolveCandidateContentPin } from "./candidatePin.js";
 import { parseGateMode } from "@/lib/auth/loginGate";
@@ -69,7 +69,7 @@ function routeTierIndexFor(tenant: TenantConfig): RouteTierIndexV1 {
 }
 
 /**
- * Every HTML document leaves with the visitor's region class (lib/visitorRegionCookie),
+ * Every HTML document leaves with the visitor's region class (lib/compliance/shared/visitorRegionCookie),
  * appended after the branch has read or written any edge cache.
  */
 export const onRequest = defineMiddleware(async (context, next) => {

package/apps/storefront/src/middleware/renderChain.ts

@@ -11,7 +11,7 @@
 import type { APIContext, MiddlewareNext } from "astro";
 import { referenceTheme } from "@/themes/reference";
 import { mergeTheme, themeToCssVars } from "@/themes/schema";
-import { createToTClient } from "@/lib/tot/ToTClient";
+import { createToTClient } from "@/lib/catalog/tot/ToTClient";
 import { readEnv, readR2 } from "@/lib/runtimeEnv";
 import { tryServeStaticBundle } from "./staticBundle.js";
 import { isPlatformPublicDiscoveryPath } from "./routeBranch.js";
@@ -85,7 +85,7 @@ import {
 } from "@tot/public-runtime";
 import { publicationContentRedirectLocationV1 } from "@tot/public-runtime/publication-content-redirects";
 import { loadTenantIntegrationDeclarations } from "@/lib/integrations/integration/tenantDeclarations";
-import { resolveTenantCommerce } from "@/lib/checkoutCommerce";
+import { resolveTenantCommerce } from "@/lib/checkout/shared/checkoutCommerce";
 import {
   requestBrowserEnvironment,
   previewBrowserEnvironment,

package/apps/storefront/src/pages/404.astro

@@ -12,7 +12,7 @@
 export const prerender = false;
 
 import Layout from "@/layouts/Layout.astro";
-import CollectionCard from "@/components/CollectionCard.astro";
+import CollectionCard from "@/components/catalog/storefront/CollectionCard.astro";
 import { withBase } from "@/lib/basePath";
 
 const { tenant, tot, basePath, features } = Astro.locals;

package/apps/storefront/src/pages/api/activity.ts

@@ -29,7 +29,7 @@
  */
 import type { APIContext } from "astro";
 import { readD1, readEnv, readAnalytics, runAfterResponse, type CfExecutionContextLike } from "@/lib/env";
-import { fromD1 } from "@/lib/d1/catalog";
+import { fromD1 } from "@/lib/catalog/d1/catalog";
 import { verifyIngestAuth } from "@/lib/activity/ingestAuth";
 import { ingestEvents, type IngestRejection } from "@/lib/activity/ingest";
 import { fanOutActivity, type AnalyticsEngineLike, type ActivitySinks } from "@/lib/activity/store";

package/apps/storefront/src/pages/api/admin/activity-alerts.ts

@@ -27,7 +27,7 @@
 import type { APIContext } from "astro";
 import { requireAdminApiEntry } from "@/lib/auth/adminApiGuard";
 import { readD1 } from "@/lib/env";
-import { fromD1 } from "@/lib/d1/catalog";
+import { fromD1 } from "@/lib/catalog/d1/catalog";
 import { checkActivityAlerts } from "@/lib/activity/alerts";
 
 export const prerender = false;

package/apps/storefront/src/pages/api/admin/interaction-insights.ts

@@ -30,7 +30,7 @@
 import type { APIContext } from "astro";
 import { requireAdminApiEntry } from "@/lib/auth/adminApiGuard";
 import { readD1 } from "@/lib/env";
-import { fromD1 } from "@/lib/d1/catalog";
+import { fromD1 } from "@/lib/catalog/d1/catalog";
 import { resolveTenantStore, trackingNamePrefix } from "@/lib/tracking/tenantD1Registry";
 import { readD1Control } from "@/lib/tracking/d1Control";
 import { readTenantInteractionInsights } from "@/lib/tracking/tenantReadAccess";

package/apps/storefront/src/pages/api/admin/orders/[id].ts

@@ -15,8 +15,8 @@ import {
   orderApiBaseUrl,
   OrderApiError,
   projectCheckoutOrder,
-} from "@/lib/admin/orderClient";
-import { assessCheckoutOrder } from "@/lib/admin/services/orders";
+} from "@/lib/orders/admin/orderClient";
+import { assessCheckoutOrder } from "@/lib/orders/admin/services/orders";
 import { commerceStageForEnv } from "@/lib/fulfillment/fulfillmentService";
 
 export const prerender = false;

package/apps/storefront/src/pages/api/admin/orders.ts

@@ -16,9 +16,9 @@ import {
   createCheckoutOrderClient,
   orderApiBaseUrl,
   OrderApiError,
-} from "@/lib/admin/orderClient";
+} from "@/lib/orders/admin/orderClient";
 import { commerceStageForEnv } from "@/lib/fulfillment/fulfillmentService";
-import { assessCheckoutOrder, parseOrderFilters } from "@/lib/admin/services/orders";
+import { assessCheckoutOrder, parseOrderFilters } from "@/lib/orders/admin/services/orders";
 
 export const prerender = false;
 

package/apps/storefront/src/pages/api/commerce/checkout-handoff.ts

@@ -25,8 +25,8 @@ import {
   defaultConsentSnapshot,
   type CartDenialCode,
 } from "@tot/public-runtime";
-import { resolveCheckoutHandoffCorrelation } from "@/lib/commerce/checkoutHandoffCorrelation";
-import { resolveCartSigning, shopperCartDenialMessage } from "@/lib/checkoutCommerce";
+import { resolveCheckoutHandoffCorrelation } from "@/lib/checkout/commerce/checkoutHandoffCorrelation";
+import { resolveCartSigning, shopperCartDenialMessage } from "@/lib/checkout/shared/checkoutCommerce";
 
 export const prerender = false;
 

package/apps/storefront/src/pages/api/commerce/final-cart-authorization.ts

@@ -17,9 +17,9 @@ import {
   type PaymentState,
   type StockState,
 } from "@tot/public-runtime";
-import { fromD1, listAllActiveProducts } from "@/lib/d1/catalog.js";
+import { fromD1, listAllActiveProducts } from "@/lib/catalog/d1/catalog.js";
 import { readD1, readEnv } from "@/lib/env";
-import { evaluateFinalCart, type SeamView } from "@/lib/commerce/finalCartAuthorization.js";
+import { evaluateFinalCart, type SeamView } from "@/lib/checkout/commerce/finalCartAuthorization.js";
 import { d1CommerceRunner, mirrorOnHand, reserveAllocation } from "@/lib/inventory/allocations.js";
 import { POST as compliancePreflight } from "../compliance/preflight.js";
 

package/apps/storefront/src/pages/api/compliance/preflight.ts

@@ -33,7 +33,7 @@ import {
   createTotVerificationClient,
   type TotVerificationClient,
   type TotVerificationStatus,
-} from "@/lib/verification/totVerificationClient";
+} from "@/lib/compliance/verification/totVerificationClient";
 
 export const prerender = false;
 

package/apps/storefront/src/pages/api/newsletter/[collection]/subscribe.ts

@@ -16,7 +16,7 @@
  */
 import type { APIRoute } from "astro";
 import { readD1, readKv, readEnv } from "@/lib/env";
-import { fromD1 } from "@/lib/d1/catalog";
+import { fromD1 } from "@/lib/catalog/d1/catalog";
 import { checkRateLimit } from "@/lib/rate/kvWindow";
 import { NewsletterSubscribersStore } from "@/lib/newsletter/subscribers";
 import { randomToken, hashConsentIp } from "@/lib/newsletter/consent";

package/apps/storefront/src/pages/api/newsletter/confirm.ts

@@ -11,7 +11,7 @@
  */
 import type { APIRoute } from "astro";
 import { readD1 } from "@/lib/env";
-import { fromD1 } from "@/lib/d1/catalog";
+import { fromD1 } from "@/lib/catalog/d1/catalog";
 import { NewsletterSubscribersStore } from "@/lib/newsletter/subscribers";
 
 export const prerender = false;

package/apps/storefront/src/pages/api/newsletter/unsubscribe.ts

@@ -20,7 +20,7 @@
  */
 import type { APIContext } from "astro";
 import { readD1 } from "@/lib/env";
-import { fromD1 } from "@/lib/d1/catalog";
+import { fromD1 } from "@/lib/catalog/d1/catalog";
 import { unsubscribeByToken } from "@/lib/newsletter/subscribers";
 
 export const prerender = false;

package/apps/storefront/src/pages/api/tracking/interaction.ts

@@ -38,7 +38,7 @@
  */
 import type { APIContext } from "astro";
 import { readD1, readAnalytics, runAfterResponse, type CfExecutionContextLike } from "@/lib/env";
-import { fromD1 } from "@/lib/d1/catalog";
+import { fromD1 } from "@/lib/catalog/d1/catalog";
 import { ingestInteractions, type StampedInteractionEvent } from "@/lib/tracking/collectorIngest";
 import { readD1Control } from "@/lib/tracking/d1Control";
 import { resolveTenantStore, trackingNamePrefix } from "@/lib/tracking/tenantD1Registry";

package/apps/storefront/src/pages/collections/[handle].astro

@@ -8,12 +8,12 @@
 import Layout from "@/layouts/Layout.astro";
 import Breadcrumbs from "@/components/Breadcrumbs.astro";
 import { homeCrumbLabel, siteTrail } from "@/lib/breadcrumbs";
-import ProductCard from "@/components/ProductCard.astro";
+import ProductCard from "@/components/catalog/storefront/ProductCard.astro";
 import EmptyState from "@/components/EmptyState.astro";
-import FacetSidebar from "@/components/plp/FacetSidebar.astro";
-import ActiveFilters from "@/components/plp/ActiveFilters.astro";
-import SortSelect from "@/components/plp/SortSelect.astro";
-import Pagination from "@/components/plp/Pagination.astro";
+import FacetSidebar from "@/components/catalog/storefront/plp/FacetSidebar.astro";
+import ActiveFilters from "@/components/catalog/storefront/plp/ActiveFilters.astro";
+import SortSelect from "@/components/catalog/storefront/plp/SortSelect.astro";
+import Pagination from "@/components/catalog/storefront/plp/Pagination.astro";
 import Img from "@/components/assets/storefront/Img.astro";
 import { parseQuery, buildQueryString } from "@/lib/url";
 import { breadcrumbLd, itemListLd } from "@/lib/jsonld";

package/apps/storefront/src/pages/collections/index.astro

@@ -6,10 +6,10 @@
 import Layout from "@/layouts/Layout.astro";
 import Breadcrumbs from "@/components/Breadcrumbs.astro";
 import { homeCrumbLabel, siteTrail } from "@/lib/breadcrumbs";
-import CollectionCard from "@/components/CollectionCard.astro";
+import CollectionCard from "@/components/catalog/storefront/CollectionCard.astro";
 import EmptyState from "@/components/EmptyState.astro";
 import { breadcrumbLd } from "@/lib/jsonld";
-import { activeMemberCount, nonEmptyCollections } from "@/lib/tot/query";
+import { activeMemberCount, nonEmptyCollections } from "@/lib/catalog/tot/query";
 
 const { tenant, tot, canonicalBase } = Astro.locals;
 // Commerce-only route: marketing tenants have no catalog surface.

package/apps/storefront/src/pages/index.astro

@@ -9,9 +9,9 @@
 import Layout from "@/layouts/Layout.astro";
 import Section from "@/components/Section.astro";
 import Hero from "@/components/home/Hero.astro";
-import ProductCarousel from "@/components/commerce/ProductCarousel.astro";
-import ProductGrid from "@/components/commerce/ProductGrid.astro";
-import CollectionCard from "@/components/CollectionCard.astro";
+import ProductCarousel from "@/components/catalog/storefront/commerce/ProductCarousel.astro";
+import ProductGrid from "@/components/catalog/storefront/commerce/ProductGrid.astro";
+import CollectionCard from "@/components/catalog/storefront/CollectionCard.astro";
 import Img from "@/components/assets/storefront/Img.astro";
 import PromoTiles from "@/components/content/PromoTiles.astro";
 import TrustStrip from "@/components/content/TrustStrip.astro";
@@ -36,7 +36,7 @@ import {
   normalizeProductSectionSource,
 } from "@tot/public-runtime";
 import { resolveSectionSource } from "@/lib/sections";
-import { featuredProductsPresentationView } from "@/lib/featuredProductsPresentation";
+import { featuredProductsPresentationView } from "@/lib/catalog/shared/featuredProductsPresentation";
 import {
   editorialMediaView,
   resolveCommerceStaticBlock,

package/apps/storefront/src/pages/llms.txt.ts

@@ -10,7 +10,7 @@
  * SEO text; compliance facts come from tenant.compliance.
  */
 import type { APIContext } from "astro";
-import { nonEmptyCollections } from "@/lib/tot/query.js";
+import { nonEmptyCollections } from "@/lib/catalog/tot/query.js";
 import { getBlogSettings, listBlogPosts } from "@/lib/blog/provider.js";
 import { compileRouteTierIndexV1 } from "@tot/public-runtime";
 import { readKv } from "@/lib/runtimeEnv.js";

package/apps/storefront/src/pages/products/[handle].astro

@@ -9,17 +9,17 @@ import Layout from "@/layouts/Layout.astro";
 import Breadcrumbs from "@/components/Breadcrumbs.astro";
 import { homeCrumbLabel, siteTrail } from "@/lib/breadcrumbs";
 import Badge from "@/components/Badge.astro";
-import ProductCard from "@/components/ProductCard.astro";
+import ProductCard from "@/components/catalog/storefront/ProductCard.astro";
 import Section from "@/components/Section.astro";
-import ImageGallery from "@/components/islands/ImageGallery.tsx";
-import VariantSelector, { publicSelectorVariants } from "@/components/islands/VariantSelector.tsx";
-import CheckoutComplianceGate from "@/components/islands/CheckoutComplianceGate.tsx";
-import RecentlyViewed from "@/components/islands/RecentlyViewed.tsx";
-import NicotineWarning from "@/components/compliance/NicotineWarning.astro";
-import Prop65Warning from "@/components/compliance/Prop65Warning.astro";
-import ReviewSummary from "@/components/commerce/ReviewSummary.astro";
-import ReviewList from "@/components/commerce/ReviewList.astro";
-import { isOnSale, isNew, isAvailable, fromPrice } from "@/lib/tot/query";
+import ImageGallery from "@/components/catalog/storefront/islands/ImageGallery.tsx";
+import VariantSelector, { publicSelectorVariants } from "@/components/catalog/storefront/islands/VariantSelector.tsx";
+import CheckoutComplianceGate from "@/components/compliance/storefront/islands/CheckoutComplianceGate.tsx";
+import RecentlyViewed from "@/components/catalog/storefront/islands/RecentlyViewed.tsx";
+import NicotineWarning from "@/components/compliance/storefront/compliance/NicotineWarning.astro";
+import Prop65Warning from "@/components/compliance/storefront/compliance/Prop65Warning.astro";
+import ReviewSummary from "@/components/catalog/storefront/commerce/ReviewSummary.astro";
+import ReviewList from "@/components/catalog/storefront/commerce/ReviewList.astro";
+import { isOnSale, isNew, isAvailable, fromPrice } from "@/lib/catalog/tot/query";
 import {
   buildMemberSignedCartPayload,
   workerCartApiPath,
@@ -38,7 +38,7 @@ import type {
   MembershipStackingPolicy,
   PurchaseOptionPricingContext,
 } from "@tot/public-runtime";
-import { resolveCartSigning, shopperCheckoutUnavailableHtml } from "@/lib/checkoutCommerce";
+import { resolveCartSigning, shopperCheckoutUnavailableHtml } from "@/lib/checkout/shared/checkoutCommerce";
 import { isRegulatedTenant } from "@/lib/compliance/enforcement";
 import { resolveMemberContext } from "@/lib/membership/eligibility";
 import { truncate } from "@/lib/format";

package/apps/storefront/src/pages/search.astro

@@ -12,10 +12,10 @@
 import Layout from "@/layouts/Layout.astro";
 import Breadcrumbs from "@/components/Breadcrumbs.astro";
 import { homeCrumbLabel, siteTrail } from "@/lib/breadcrumbs";
-import ProductCard from "@/components/ProductCard.astro";
+import ProductCard from "@/components/catalog/storefront/ProductCard.astro";
 import EmptyState from "@/components/EmptyState.astro";
 import Section from "@/components/Section.astro";
-import { toTypeaheadDoc } from "@/lib/search";
+import { toTypeaheadDoc } from "@/lib/catalog/search/index";
 import { breadcrumbLd } from "@/lib/jsonld";
 import { withBase } from "@/lib/basePath";
 

package/apps/storefront/src/pages/sitemap.xml.ts

@@ -9,7 +9,7 @@
  * loc is prefix-correct without special-casing here.
  */
 import type { APIContext } from "astro";
-import { nonEmptyCollections } from "@/lib/tot/query.js";
+import { nonEmptyCollections } from "@/lib/catalog/tot/query.js";
 import { getBlogSettings, listBlogPosts } from "@/lib/blog/provider.js";
 import { authorSlug, categorySlug } from "@/lib/blog/collection.js";
 import { resolveBlogIndexCopy } from "@/lib/blog/pagination.js";