@blamejs/blamejs-shop 0.3.45 → 0.3.47

package/lib/product-qa.js

@@ -652,6 +652,45 @@ function create(opts) {
     return rows;
   }
 
+  // Batched answersForQuestion — every approved answer under EACH of
+  // `questionIds`, grouped into a map keyed by question_id. One `IN`
+  // query replaces the per-question `answersForQuestion` loop the PDP
+  // ran (one D1-bridge hop per question). The approved-only filter and
+  // the (pinned DESC, vote_count DESC, occurred_at ASC, id ASC) order
+  // are byte-for-byte the single-question method's, so the stitched
+  // thread renders identically. `opts.limit` caps the answers PER
+  // question (validated like the single method) — applied
+  // application-side after the grouped read so a high-fan-out question
+  // can't starve another. Each id is validated at entry (a malformed
+  // id throws TypeError, which the route catches). An empty input or a
+  // question with no approved answers maps to an empty array.
+  async function answersForQuestions(questionIds, listOpts) {
+    if (!Array.isArray(questionIds) || questionIds.length === 0) return {};
+    listOpts = listOpts || {};
+    var limit = _limit(listOpts.limit);
+    var ids = [];
+    var byId = {};
+    for (var qi = 0; qi < questionIds.length; qi += 1) {
+      var id = _uuid(questionIds[qi], "question_id");
+      if (byId[id]) continue;
+      byId[id] = [];
+      ids.push(id);
+    }
+    var placeholders = ids.map(function (_v, n) { return "?" + (n + 1); }).join(", ");
+    var r = await query(
+      "SELECT * FROM product_qa_answers " +
+      "WHERE question_id IN (" + placeholders + ") AND status = 'approved' " +
+      "ORDER BY pinned DESC, vote_count DESC, occurred_at ASC, id ASC",
+      ids,
+    );
+    for (var i = 0; i < r.rows.length; i += 1) {
+      var ans = _decodeAnswer(r.rows[i]);
+      var bucket = byId[ans.question_id];
+      if (bucket && bucket.length < limit) bucket.push(ans);
+    }
+    return byId;
+  }
+
   // Every answer under a question regardless of status — the operator
   // moderation detail needs the pending / rejected answers too, which
   // answersForQuestion (approved-only, storefront-facing) hides. Pinned
@@ -808,6 +847,7 @@ function create(opts) {
     getQuestion:          getQuestion,
     topAnswerForQuestion: topAnswerForQuestion,
     answersForQuestion:   answersForQuestion,
+    answersForQuestions:  answersForQuestions,
     listAnswersForQuestion: listAnswersForQuestion,
     listQuestionsByStatus: listQuestionsByStatus,
     listAnswersByStatus:  listAnswersByStatus,

package/lib/storefront.js

@@ -8555,23 +8555,33 @@ function mount(router, deps) {
       currency_redirect_to: path,
     };
     var chosen = _readCurrencyCookie(req);
-    try {
-      var presenter = await currencyDisplayModule.loadPresenter({
-        fx:              deps.currencyDisplay,
-        rounding:        deps.currencyRounding || null,
-        baseCurrency:    base,
-        displayCurrency: chosen,
-      });
-      // The presenter only activates when the chosen currency is in the
-      // live allow-list AND has a usable rate. A cookie naming a currency
-      // the operator since removed from the list resolves to base.
-      if (presenter && presenter.active && options.indexOf(presenter.displayCurrency) !== -1) {
-        bundle.format_price      = presenter.format;
-        bundle.currency_selected = presenter.displayCurrency;
-        if (presenter.note) bundle.currency_note = presenter.note;
+    // Short-circuit the FX presenter hop for visitors who never picked a
+    // currency, or chose the live base: `loadPresenter` returns an
+    // INACTIVE base presenter in exactly those cases (currency-display:
+    // requested unset / === baseCurrency → base presenter), so the bundle
+    // is the base bundle above unchanged. Skipping the FX rate read +
+    // presenter build on every base-currency render is the common-case
+    // win — only resolve the presenter when the visitor chose a non-base
+    // currency that could actually convert.
+    if (chosen != null && chosen !== base) {
+      try {
+        var presenter = await currencyDisplayModule.loadPresenter({
+          fx:              deps.currencyDisplay,
+          rounding:        deps.currencyRounding || null,
+          baseCurrency:    base,
+          displayCurrency: chosen,
+        });
+        // The presenter only activates when the chosen currency is in the
+        // live allow-list AND has a usable rate. A cookie naming a currency
+        // the operator since removed from the list resolves to base.
+        if (presenter && presenter.active && options.indexOf(presenter.displayCurrency) !== -1) {
+          bundle.format_price      = presenter.format;
+          bundle.currency_selected = presenter.displayCurrency;
+          if (presenter.note) bundle.currency_note = presenter.note;
+        }
+      } catch (_e) {
+        // FX / rounding backend unavailable — fall back to base display.
       }
-    } catch (_e) {
-      // FX / rounding backend unavailable — fall back to base display.
     }
     return bundle;
   }
@@ -9229,37 +9239,16 @@ function mount(router, deps) {
         [productId],
       )).rows[0];
       if (!primary) return [];
-      var siblingRows = (await query(
-        "SELECT cm.product_id AS pid FROM collection_members cm " +
-        "JOIN products p ON p.id = cm.product_id " +
-        "WHERE cm.collection_slug = ?1 AND cm.product_id != ?2 AND p.status = 'active' " +
-        "ORDER BY cm.position ASC, cm.product_id ASC LIMIT ?3",
-        [primary.collection_slug, productId, limit],
-      )).rows;
-      var out = [];
-      for (var i = 0; i < siblingRows.length; i += 1) {
-        var pid = siblingRows[i].pid;
-        var prod = await deps.catalog.products.get(pid);
-        if (!prod || prod.status !== "active") continue;
-        var priceMinor = null;
-        var priceCurrency = "USD";
-        var variants = await deps.catalog.variants.listForProduct(pid);
-        if (variants.length) {
-          var pr = await deps.catalog.prices.current(variants[0].id, "USD");
-          if (pr) { priceMinor = pr.amount_minor; priceCurrency = pr.currency; }
-        }
-        var media = await deps.catalog.media.listForProduct(pid);
-        var hero = media.length ? media[0] : null;
-        out.push({
-          slug:          prod.slug,
-          title:         prod.title,
-          hero_r2_key:   hero ? hero.r2_key : null,
-          hero_alt_text: hero ? (hero.alt_text || prod.title) : null,
-          price_minor:   priceMinor,
-          price_currency: priceCurrency,
-        });
-      }
-      return out;
+      // The sibling decoration (price + hero media per pick) now lands
+      // in one batched query instead of per-sibling `products.get` +
+      // `variants.listForProduct` + `prices.current` +
+      // `media.listForProduct`. The helper returns the exact
+      // { slug, title, hero_r2_key, hero_alt_text, price_minor,
+      // price_currency } card shape the rail renderer consumes, in the
+      // same (membership position ASC, product_id ASC) order, self +
+      // inactive excluded, capped at limit — mirroring the edge
+      // listRelatedProducts.
+      return await deps.catalog.batch.relatedSiblings(primary.collection_slug, productId, "USD", limit);
     } catch (_e) {
       return [];
     }
@@ -9341,58 +9330,102 @@ function mount(router, deps) {
     var seen = Object.create(null);
     var offers = [];
     try {
+      // First pass: collect every distinct bundle reachable from the
+      // product's variant SKUs (deduped), preserving discovery order.
+      var bundles = [];
       for (var s = 0; s < variantSkus.length; s += 1) {
         var bundleList = await deps.bundles.bundlesForComponent(variantSkus[s]);
         for (var i = 0; i < bundleList.length; i += 1) {
-          var bundle = bundleList[i];
-          if (seen[bundle.bundle_sku]) continue;
-          seen[bundle.bundle_sku] = true;
-
-          // Decorate each member with a display title; flag unbuyable.
-          var componentsOut = [];
-          var allBuyable = true;
-          for (var j = 0; j < bundle.components.length; j += 1) {
-            var comp = bundle.components[j];
-            var buyable = await _skuBuyable(comp.sku);
-            if (!buyable) allBuyable = false;
-            var memberVariant = buyable || (await deps.catalog.variants.bySku(comp.sku));
-            var memberTitle = comp.sku;
-            if (memberVariant) {
-              var memberProduct = await deps.catalog.products.get(memberVariant.product_id);
-              memberTitle = (memberProduct && memberProduct.title) || memberVariant.title || comp.sku;
-            }
-            componentsOut.push({ sku: comp.sku, quantity: comp.quantity, title: memberTitle });
-          }
-
-          var priced = null;
-          try {
-            priced = await deps.bundles.priceBundle({ bundle_sku: bundle.bundle_sku, pricing: _skuPricer(currency) });
-          } catch (_e) {
-            // A missing member price / mixed currency makes the bundle
-            // unpriceable — surface it as unavailable rather than 500.
-            priced = null;
+          if (seen[bundleList[i].bundle_sku]) continue;
+          seen[bundleList[i].bundle_sku] = true;
+          bundles.push(bundleList[i]);
+        }
+      }
+      if (!bundles.length) return [];
+
+      // Member-title batching: resolve every member SKU's variant + its
+      // owning product in two batched reads instead of a per-member
+      // `variants.bySku` + `products.get`. (The full single-query bundle
+      // resolver the edge has — getBundlesForProduct — is deferred;
+      // member-title batching is the cheap win without touching the
+      // server-authoritative pricing path.)
+      var memberSkus = [];
+      for (var bi = 0; bi < bundles.length; bi += 1) {
+        var comps = bundles[bi].components || [];
+        for (var ci = 0; ci < comps.length; ci += 1) memberSkus.push(comps[ci].sku);
+      }
+      var memberVariantBySku = {};
+      var memberProductById = {};
+      if (deps.catalog.batch && typeof deps.catalog.batch.variantsBySkus === "function") {
+        memberVariantBySku = await deps.catalog.batch.variantsBySkus(memberSkus);
+        var memberProductIds = [];
+        var pidSeen = Object.create(null);
+        for (var ms in memberVariantBySku) {
+          if (!Object.prototype.hasOwnProperty.call(memberVariantBySku, ms)) continue;
+          var pid = memberVariantBySku[ms].product_id;
+          if (pid && !pidSeen[pid]) { pidSeen[pid] = true; memberProductIds.push(pid); }
+        }
+        if (memberProductIds.length && typeof deps.catalog.batch.productsByIds === "function") {
+          memberProductById = await deps.catalog.batch.productsByIds(memberProductIds);
+        }
+      }
+
+      for (var b2 = 0; b2 < bundles.length; b2 += 1) {
+        var bundle = bundles[b2];
+        // Decorate each member with a display title; flag unbuyable.
+        var componentsOut = [];
+        var allBuyable = true;
+        for (var j = 0; j < bundle.components.length; j += 1) {
+          var comp = bundle.components[j];
+          var buyable = await _skuBuyable(comp.sku);
+          if (!buyable) allBuyable = false;
+          // The prior path always read the member variant via bySku
+          // (regardless of buyability) for the title; the batched map is
+          // that same variant. Falls back to a per-SKU bySku only if the
+          // batch surface is absent.
+          var memberVariant = Object.prototype.hasOwnProperty.call(memberVariantBySku, comp.sku)
+            ? memberVariantBySku[comp.sku]
+            : (buyable || (await deps.catalog.variants.bySku(comp.sku)));
+          var memberTitle = comp.sku;
+          if (memberVariant) {
+            var memberProduct = Object.prototype.hasOwnProperty.call(memberProductById, memberVariant.product_id)
+              ? memberProductById[memberVariant.product_id]
+              : (deps.catalog.batch && typeof deps.catalog.batch.variantsBySkus === "function"
+                  ? null
+                  : await deps.catalog.products.get(memberVariant.product_id));
+            memberTitle = (memberProduct && memberProduct.title) || memberVariant.title || comp.sku;
           }
-
-          var available = allBuyable && priced != null;
-          var listMinor = priced ? priced.list_total_minor : 0;
-          var amountMinor = priced ? priced.amount_minor : 0;
-          var discountMinor = priced ? priced.discount_minor : 0;
-          var cur = (priced && priced.currency) || currency;
-          offers.push({
-            bundle_sku:         bundle.bundle_sku,
-            title:              bundle.title,
-            components:         componentsOut,
-            list_total_str:     fmt(listMinor, cur),
-            amount_str:         fmt(amountMinor, cur),
-            discount_str:       discountMinor > 0 ? fmt(discountMinor, cur) : null,
-            available:          available,
-            unavailable_reason: available
-              ? null
-              : (priced == null
-                  ? "Pricing for this bundle isn't available right now."
-                  : "One or more items in this bundle are out of stock."),
-          });
+          componentsOut.push({ sku: comp.sku, quantity: comp.quantity, title: memberTitle });
         }
+
+        var priced = null;
+        try {
+          priced = await deps.bundles.priceBundle({ bundle_sku: bundle.bundle_sku, pricing: _skuPricer(currency) });
+        } catch (_e) {
+          // A missing member price / mixed currency makes the bundle
+          // unpriceable — surface it as unavailable rather than 500.
+          priced = null;
+        }
+
+        var available = allBuyable && priced != null;
+        var listMinor = priced ? priced.list_total_minor : 0;
+        var amountMinor = priced ? priced.amount_minor : 0;
+        var discountMinor = priced ? priced.discount_minor : 0;
+        var cur = (priced && priced.currency) || currency;
+        offers.push({
+          bundle_sku:         bundle.bundle_sku,
+          title:              bundle.title,
+          components:         componentsOut,
+          list_total_str:     fmt(listMinor, cur),
+          amount_str:         fmt(amountMinor, cur),
+          discount_str:       discountMinor > 0 ? fmt(discountMinor, cur) : null,
+          available:          available,
+          unavailable_reason: available
+            ? null
+            : (priced == null
+                ? "Pricing for this bundle isn't available right now."
+                : "One or more items in this bundle are out of stock."),
+        });
       }
     } catch (_e) {
       // Bundles table not migrated / read failure — degrade to no rail.
@@ -9457,12 +9490,27 @@ function mount(router, deps) {
   // the cart total.
   async function _repriceCartLines(lines) {
     if (!deps.quantityDiscounts) return lines;
+    // The owning product_id per line drives the quantity-discount
+    // product-scope match. Resolve every line's variant in one batched
+    // id lookup instead of a per-line `variants.get`, keyed by the same
+    // stable variant_id the line carries (so the resolved product_id is
+    // byte-identical to the per-line read). Best-effort — a read failure
+    // leaves the map empty and each line falls back to no product scope,
+    // exactly as a per-line failure did before.
+    var variantById = {};
+    if (deps.catalog.batch && typeof deps.catalog.batch.variantsByIds === "function") {
+      try {
+        variantById = await deps.catalog.batch.variantsByIds(
+          lines.map(function (l) { return l.variant_id; }),
+        );
+      } catch (_e) { variantById = {}; }
+    }
     var out = [];
     for (var i = 0; i < lines.length; i += 1) {
       var l = lines[i];
       var unit = l.unit_amount_minor;
       try {
-        var variant = await deps.catalog.variants.get(l.variant_id);
+        var variant = variantById[l.variant_id] || null;
         var applied = await deps.quantityDiscounts.applyToLine({
           line: {
             sku:              l.sku,
@@ -9625,7 +9673,7 @@ function mount(router, deps) {
   // applied to available-on-hand (stock_on_hand − stock_held).
   async function _cartLineStock(lines) {
     var out = {};
-    if (!deps.catalog || !deps.catalog.inventory || typeof deps.catalog.inventory.get !== "function") {
+    if (!deps.catalog || !deps.catalog.batch || typeof deps.catalog.batch.inventoryForSkus !== "function") {
       return out;
     }
     var threshold = 5;
@@ -9635,19 +9683,24 @@ function mount(router, deps) {
         if (Number.isInteger(t) && t >= 0) threshold = t;
       } catch (_e) { /* keep the default */ }
     }
+    // One batched inventory read keyed by SKU instead of a per-line
+    // `inventory.get`. Drop-silent on a read failure — the empty map
+    // means every line reads "ok", matching the prior per-line stance.
+    var invBySku = {};
+    try {
+      invBySku = await deps.catalog.batch.inventoryForSkus(
+        lines.map(function (l) { return l.sku; }).filter(function (s) { return !!s; }),
+      );
+    } catch (_e) { invBySku = {}; /* a read failure never blocks the cart */ }
     for (var i = 0; i < lines.length; i += 1) {
       var vId = lines[i].variant_id;
       if (Object.prototype.hasOwnProperty.call(out, vId)) continue;
       var sku = lines[i].sku;
       if (!sku) { out[vId] = "ok"; continue; }
-      try {
-        var inv = await deps.catalog.inventory.get(sku);
-        if (!inv) { out[vId] = "ok"; continue; }
-        var avail = Number(inv.stock_on_hand || 0) - Number(inv.stock_held || 0);
-        out[vId] = avail <= 0 ? "out" : (avail <= threshold ? "low" : "ok");
-      } catch (_e) {
-        out[vId] = "ok";   // drop-silent — a read failure never blocks the cart
-      }
+      var inv = Object.prototype.hasOwnProperty.call(invBySku, sku) ? invBySku[sku] : null;
+      if (!inv) { out[vId] = "ok"; continue; }
+      var avail = Number(inv.stock_on_hand || 0) - Number(inv.stock_held || 0);
+      out[vId] = avail <= 0 ? "out" : (avail <= threshold ? "low" : "ok");
     }
     return out;
   }
@@ -9681,95 +9734,37 @@ function mount(router, deps) {
   }
 
   router.get("/", async function (req, res) {
-    var page = await deps.catalog.products.list({ status: "active", limit: 24 });
-    // Best-effort "starting price" + "hero media" lookup. Each
-    // product on the home grid carries its first variant's USD
-    // price (when one exists) and its first attached media row
-    // (when one exists). Both are best-effort — products without
-    // a price render `—`; products without media render the
-    // text-only PRODUCT_CARD fallback.
-    var products = [];
-    for (var i = 0; i < page.rows.length; i += 1) {
-      var p = page.rows[i];
-      var variants = await deps.catalog.variants.listForProduct(p.id);
-      var startingPrice = null;
-      if (variants.length) {
-        var price = await deps.catalog.prices.current(variants[0].id, "USD");
-        if (price) startingPrice = price;
-      }
-      var media = await deps.catalog.media.listForProduct(p.id);
-      var heroMedia = media.length ? media[0] : null;
-      products.push(Object.assign({}, p, {
-        starting_price_minor:    startingPrice ? startingPrice.amount_minor : null,
-        starting_price_currency: startingPrice ? startingPrice.currency      : "USD",
-        hero_media:              heroMedia,
-      }));
-    }
+    // One decorated query for the whole home grid: each active product
+    // carries its first variant's USD price (when one exists) and its
+    // first attached media row (when one exists), pre-joined via window
+    // functions — the same shape `renderHome` consumes (products
+    // without a price render `—`; products without media render the
+    // text-only PRODUCT_CARD fallback). Replaces the prior 1 + 24×3
+    // per-product fan-out over the D1 bridge. Order (updated_at DESC,
+    // id DESC) matches the prior `products.list` order.
+    var decorated = await deps.catalog.batch.decoratedActive({ currency: "USD", limit: 24 });
+    var products = decorated.rows;
     var ccy = await _currencyForReq(req);
     var html = renderHome(Object.assign({ products: products, shop_name: shopName, theme: theme }, _requestUrls(req), ccy));
     _send(res, 200, html);
   });
 
-  // Decorate one product row with the display columns the search
-  // cards need (first variant's price, first media) AND the facet
-  // fields the searchFacets primitive computes against: `collection`
-  // (array of collection slugs the product belongs to), `price_minor`
-  // (the starting price), and `in_stock` (any variant with available
-  // stock). Composes the wired catalog / collections primitives; a
-  // collection facet only populates when `deps.collections` is present.
-  async function _decorateForSearch(p) {
-    var variants = await deps.catalog.variants.listForProduct(p.id);
-    var startingPrice = null;
-    var inStock = false;
-    for (var vi = 0; vi < variants.length; vi += 1) {
-      if (vi === 0) {
-        var price = await deps.catalog.prices.current(variants[0].id, "USD");
-        if (price) startingPrice = price;
-      }
-      var inv = await deps.catalog.inventory.get(variants[vi].sku);
-      if (inv && (Number(inv.stock_on_hand) - Number(inv.stock_held)) > 0) inStock = true;
-    }
-    var media = await deps.catalog.media.listForProduct(p.id);
-    var heroMedia = media.length ? media[0] : null;
-    var collectionSlugs = [];
-    if (deps.collections && typeof deps.collections.collectionsForProduct === "function") {
-      var cols = await deps.collections.collectionsForProduct(p.id);
-      for (var ci = 0; ci < cols.length; ci += 1) {
-        if (cols[ci] && cols[ci].slug) collectionSlugs.push(cols[ci].slug);
-      }
-    }
-    return Object.assign({}, p, {
-      starting_price_minor:    startingPrice ? startingPrice.amount_minor : null,
-      starting_price_currency: startingPrice ? startingPrice.currency      : "USD",
-      hero_media:              heroMedia,
-      collection:              collectionSlugs,
-      price_minor:             startingPrice ? startingPrice.amount_minor : null,
-      in_stock:                inStock,
-    });
-  }
-
   // Pull the facetable universe for a set of search terms: every
   // active product matching ANY term (canonical query + synonym
   // expansions) on title / description, decorated once. The
   // searchFacets primitive consumes this through a `catalog.list`
   // adapter and walks the rows in-memory for counts; the route reuses
   // the same rows for the narrowed result grid (one decoration pass,
-  // no double round trip).
+  // no double round trip). One batched query (an OR-of-LIKE term clause
+  // + a collection_members `IN` + a grouped-inventory `IN`) replaces
+  // the prior per-term search + per-row decoration fan-out, and aligns
+  // the `collection` facet field with the edge: MANUAL collection
+  // membership only (smart-collection rule matches no longer populate
+  // the search facet — the edge has always faceted manual-only, so this
+  // removes the cross-substrate drift). Order (updated_at DESC, id DESC)
+  // matches the edge `searchFacetableProducts`.
   async function _facetableUniverse(terms) {
-    var byId = {};
-    var rows = [];
-    for (var ti = 0; ti < terms.length; ti += 1) {
-      var term = typeof terms[ti] === "string" ? terms[ti].trim() : "";
-      if (!term.length) continue;
-      var page = await deps.catalog.products.search({ q: term, status: "active", limit: 100 });
-      for (var i = 0; i < page.rows.length; i += 1) {
-        var p = page.rows[i];
-        if (byId[p.id]) continue;
-        byId[p.id] = true;
-        rows.push(await _decorateForSearch(p));
-      }
-    }
-    return rows;
+    return (await deps.catalog.batch.searchDecorate({ terms: terms, currency: "USD" })).rows;
   }
 
   router.get("/search", async function (req, res) {
@@ -9872,77 +9867,88 @@ function mount(router, deps) {
     if (!slug) return _send(res, 400, renderNotFound({ shop_name: shopName, theme: theme }));
     var product = await deps.catalog.products.bySlug(slug);
     if (!product) return _send(res, 404, renderNotFound({ shop_name: shopName, theme: theme }));
-    var variants = await deps.catalog.variants.listForProduct(product.id);
-    var prices = {};
+    // Variants + their current USD price in one query (the LEFT JOIN
+    // collapses the prior per-variant `prices.current` loop). `vwp.rows`
+    // is byte-identical to `variants.listForProduct` (options parsed),
+    // `vwp.prices` is the { variantId: priceRow } map the renderer +
+    // first-variant pricing read.
+    var vwp = await deps.catalog.batch.variantsWithPrices(product.id, "USD");
+    var variants = vwp.rows;
+    var prices = vwp.prices;
     // Per-SKU inventory map driving the truthful availability badge +
-    // JSON-LD. Best-effort: a SKU with no inventory row (or a read
-    // failure) is omitted from the map, which the renderer treats as
-    // available — the never-block-on-missing-inventory stance the
-    // cart-hold path already takes. Only populated when the operator has
-    // wired the inventory primitive.
+    // JSON-LD. One batched read keyed by SKU, full row (the availability
+    // resolver reads `low_stock_threshold` for the "Only N left" nudge).
+    // Best-effort: a SKU with no inventory row (or a read failure) is
+    // omitted from the map, which the renderer treats as available — the
+    // never-block-on-missing-inventory stance the cart-hold path already
+    // takes. Only populated when the operator has wired the inventory
+    // batch surface.
     var inventory = {};
-    for (var i = 0; i < variants.length; i += 1) {
-      var p = await deps.catalog.prices.current(variants[i].id, "USD");
-      if (p) prices[variants[i].id] = p;
-      if (deps.catalog.inventory && typeof deps.catalog.inventory.get === "function") {
-        try {
-          var invRow = await deps.catalog.inventory.get(variants[i].sku);
-          if (invRow) inventory[variants[i].sku] = invRow;
-        } catch (_e) { /* drop-silent — missing inventory reads as available */ }
-      }
+    if (variants.length && deps.catalog.batch && typeof deps.catalog.batch.inventoryRowsForSkus === "function") {
+      try {
+        inventory = await deps.catalog.batch.inventoryRowsForSkus(variants.map(function (v) { return v.sku; }));
+      } catch (_e) { inventory = {}; /* drop-silent — missing inventory reads as available */ }
     }
-    // Media — first row drives the hero image, the next three feed
-    // the thumbnail strip. `listForProduct` is product-level only;
-    // variant-level media (`listForVariant`) would feed a swap-on-
-    // variant-select interaction we don't ship yet.
-    var media = await deps.catalog.media.listForProduct(product.id);
     // Render cart count from the current session's cart, if any.
     var cartCount = await _cartCountForReq(req);
-    // Published reviews aggregate + list. A failed read (e.g. the
-    // reviews table not yet migrated) degrades to the empty state
-    // rather than 500-ing the whole PDP — reviews are supplementary
-    // to the buy path. Mirrors the edge renderer's missing-table
-    // resilience.
+    // The remaining supplementary PDP reads are independent of each
+    // other, so they run concurrently (mirroring the edge's Promise.all
+    // at worker/index.js). Each preserves its own degrade-to-empty
+    // guard so a missing/unmigrated table never 500s the buy path.
     var reviewSummary, reviewRows, reviewCta;
-    if (deps.reviews) {
-      try {
-        reviewSummary = await deps.reviews.summaryForProduct(product.id);
-        reviewRows    = (await deps.reviews.listForProduct(product.id, { limit: 10 })).rows;
-      } catch (_e) { reviewSummary = undefined; reviewRows = []; }
-      // The form route enforces auth + the verified-purchase gate, so
-      // the CTA links there unconditionally; logged-out shoppers get
-      // redirected to login, non-purchasers get a clear "not eligible".
-      reviewCta = "<a class=\"btn-secondary reviews__cta\" href=\"/products/" +
-        b.template.escapeHtml(product.slug) + "/review\">Write a review</a>";
-    }
-    // Wishlist social-proof count — degrades to 0 on a read failure
-    // (e.g. table not yet migrated) rather than 500-ing the PDP.
     var wishlistCount = 0;
-    if (deps.wishlist) {
-      try { wishlistCount = await deps.wishlist.countForProduct(product.id); }
-      catch (_e) { wishlistCount = 0; }
-    }
-    // Published Q&A — approved questions + their approved answers. A
-    // failed read (e.g. the product_qa tables not yet migrated) degrades
-    // to the empty state rather than 500-ing the PDP — Q&A is
-    // supplementary to the buy path, like reviews. Mirrors the edge
-    // renderer's missing-table resilience.
     var qaQuestions, qaCta;
-    if (deps.productQa) {
-      qaQuestions = [];
-      try {
-        var qList = (await deps.productQa.questionsForProduct({ product_id: product.id, limit: 20 })).rows;
-        for (var qi = 0; qi < qList.length; qi += 1) {
-          var qrow = qList[qi];
-          qrow.answers = await deps.productQa.answersForQuestion(qrow.id, { limit: 20 });
-          qaQuestions.push(qrow);
-        }
-      } catch (_e) { qaQuestions = []; }
-      // The form route enforces auth, so the CTA links there
-      // unconditionally; logged-out shoppers get redirected to login.
-      qaCta = "<a class=\"btn-secondary reviews__cta\" href=\"/products/" +
-        b.template.escapeHtml(product.slug) + "/question\">Ask a question</a>";
-    }
+    var media;
+    await Promise.all([
+      // Media — first row drives the hero image, the next three feed the
+      // thumbnail strip. `listForProduct` is product-level only.
+      (async function () {
+        media = await deps.catalog.media.listForProduct(product.id);
+      })(),
+      // Published reviews aggregate + list.
+      (async function () {
+        if (!deps.reviews) return;
+        try {
+          reviewSummary = await deps.reviews.summaryForProduct(product.id);
+          reviewRows    = (await deps.reviews.listForProduct(product.id, { limit: 10 })).rows;
+        } catch (_e) { reviewSummary = undefined; reviewRows = []; }
+        // The form route enforces auth + the verified-purchase gate, so
+        // the CTA links there unconditionally; logged-out shoppers get
+        // redirected to login, non-purchasers get a clear "not eligible".
+        reviewCta = "<a class=\"btn-secondary reviews__cta\" href=\"/products/" +
+          b.template.escapeHtml(product.slug) + "/review\">Write a review</a>";
+      })(),
+      // Wishlist social-proof count — degrades to 0 on a read failure.
+      (async function () {
+        if (!deps.wishlist) return;
+        try { wishlistCount = await deps.wishlist.countForProduct(product.id); }
+        catch (_e) { wishlistCount = 0; }
+      })(),
+      // Published Q&A — approved questions + their approved answers. The
+      // answers for ALL questions land in one batched
+      // `answersForQuestions` read (one D1 hop) instead of a per-question
+      // loop, then are stitched back onto each question in order.
+      (async function () {
+        if (!deps.productQa) return;
+        qaQuestions = [];
+        try {
+          var qList = (await deps.productQa.questionsForProduct({ product_id: product.id, limit: 20 })).rows;
+          var answersByQ = await deps.productQa.answersForQuestions(
+            qList.map(function (q) { return q.id; }),
+            { limit: 20 },
+          );
+          for (var qi = 0; qi < qList.length; qi += 1) {
+            var qrow = qList[qi];
+            qrow.answers = answersByQ[qrow.id] || [];
+            qaQuestions.push(qrow);
+          }
+        } catch (_e) { qaQuestions = []; }
+        // The form route enforces auth, so the CTA links there
+        // unconditionally; logged-out shoppers get redirected to login.
+        qaCta = "<a class=\"btn-secondary reviews__cta\" href=\"/products/" +
+          b.template.escapeHtml(product.slug) + "/question\">Ask a question</a>";
+      })(),
+    ]);
     // Log the view for a signed-in customer so it surfaces on their
     // "Recently viewed" account page. Drop-silent — a recording failure
     // (table not migrated, write contention) must never break the PDP