@wix/himalaya-cli 0.1497.0 → 0.1499.0

package/templates/branded-lite/tier5-src/_shared/business-chat-presenter.ts

@@ -160,6 +160,13 @@ function safeAvatar(value: unknown): string {
   return match && !/[@%]/.test(match[1]!) ? value : "";
 }
 
+/** A card's picture, only a plain https URL. Wix sends a 200-point thumbnail; a card shows it about 270 wide on a
+ *  dense screen, so a Wix media URL asks its image service for a larger copy instead of being blown up. */
+function cardImage(value: unknown): string {
+  const url = safeAvatar(value);
+  return /^https:\/\/static\.wixstatic\.com\/media\//i.test(url) ? url.replace(/\/v1\/fit\/w_\d+,h_\d+,/i, "/v1/fit/w_800,h_800,") : url;
+}
+
 function initials(value: string): string {
   const words = value.trim().split(/\s+/).filter(Boolean);
   return words.length > 1 ? `${words[0]![0]}${words[words.length - 1]![0]}`.toUpperCase() : (words[0]?.slice(0, 2) ?? "").toUpperCase();
@@ -316,8 +323,10 @@ const isSafeLink = (url: string): boolean => SAFE_LINK.test(url) && !/[\u0000-\u
 
 /** Owner tools (a product, a coupon, a scheduling link) reach a member as plain text: a title, detail
  *  lines and `Label: https://…` lines. On a phone that is a wall of text with a URL nobody can tap, so a
- *  link line becomes a button and a coupon code its own block. Only plain https links are lifted. */
-export function extractBusinessMessageExtras(markdown: string): { text: string; links: { label: string; url: string }[]; couponCode: string } {
+ *  link line becomes a button and a coupon code its own block. Only plain https links are lifted. A message shown
+ *  without a card (an AI answer) has no coupon block, so `liftCoupon: false` leaves its code in the text. */
+export function extractBusinessMessageExtras(markdown: string, options: { liftCoupon?: boolean } = {}): { text: string; links: { label: string; url: string }[]; couponCode: string } {
+  const liftCoupon = options.liftCoupon ?? true;
   const kept: string[] = [];
   const links: { label: string; url: string }[] = [];
   let couponCode = "";
@@ -343,7 +352,7 @@ export function extractBusinessMessageExtras(markdown: string): { text: string;
       }
     }
     const code = /^(.*?)[,;]?\s*\b[Cc]ode:\s*([A-Z0-9_-]{3,32})$/.exec(trimmed);
-    if (code && !couponCode) {
+    if (code && liftCoupon && !couponCode) {
       couponCode = code[2]!;
       if (code[1]!.trim()) kept.push(code[1]!.trim());
       continue;
@@ -383,6 +392,14 @@ export function presentBusinessMessages<T extends Pick<BusinessMessage, "id" | "
   noCoupon: boolean;
   productSlug: string;
   productName: string;
+  isCard: boolean;
+  notCard: boolean;
+  noSuggestions: boolean;
+  noActions: boolean;
+  cardTitle: string;
+  cardDetail: string;
+  /** A card with neither title nor detail (a file, a coupon with no line): its text block is hidden, not an empty gap. */
+  noCardText: boolean;
 })[] {
   const metadata = new Map<string, RecordValue>();
   for (const value of raw) {
@@ -410,14 +427,15 @@ export function presentBusinessMessages<T extends Pick<BusinessMessage, "id" | "
       : "";
     if (key) previousDay = key;
 
-    const imageUrl = imagePart?.url || "";
     const template = object(message.templateData);
+    // A product the owner sends from the Inbox carries its picture on the card itself (`templateData.image`).
+    const imageUrl = imagePart?.url || cardImage(template.image);
     const standardEventText = message.messageType === "template/standard-event"
       ? [template.title, ...(Array.isArray(template.lines) ? template.lines : [])]
         .filter((value): value is string => typeof value === "string" && !!value.trim())
         .join("\n")
       : "";
-    const bodyText = imageUrl
+    const bodyText = imagePart?.url
       ? row.parts.filter((part) => part.kind === "text").map((part) => [part.text, ...(part.fields ?? []).map((field) => `${field.name}: ${field.value}`)].filter(Boolean).join("\n")).filter(Boolean).join("\n")
       : standardEventText || row.plainText;
     const senderAvatar = safeAvatar(image.url);
@@ -434,7 +452,8 @@ export function presentBusinessMessages<T extends Pick<BusinessMessage, "id" | "
     const bodyRuns = htmlMessageRuns(message) ?? plainTextRuns;
     const bodyMarkdown = markdownFromRuns(bodyRuns);
     const buttons = messageButtons(message, row.id);
-    const extras = mine ? { text: bodyMarkdown, links: [], couponCode: "" } : extractBusinessMessageExtras(bodyMarkdown);
+    // An AI answer is never a card, and only a card shows the coupon block, so its code stays in its text.
+    const extras = mine ? { text: bodyMarkdown, links: [], couponCode: "" } : extractBusinessMessageExtras(bodyMarkdown, { liftCoupon: !isAiGenerated });
     // A card is a title and detail lines: Wix sends events as one, and an owner's product, coupon or scheduling link
     // arrives as plain text of the same shape. Its title leads in bold, and a coupon's title is its code, which
     // the coupon block already shows.
@@ -447,10 +466,21 @@ export function presentBusinessMessages<T extends Pick<BusinessMessage, "id" | "
     const titled = cardLike && extras.couponCode && first === extras.couponCode ? lines.slice(1).join("\n")
       : cardLike && lines.length > 1 && !first.startsWith("**") ? `**${first}**\n${lines.slice(1).join("\n")}` : extras.text;
     // A product card links to its store page; the slug lets the worker find the product and show its picture.
-    const productPage = cardLike ? extras.links.map((link) => /^https:\/\/[^/?#]+(?:\/[^/?#]+)*?\/product-page\/([^/?#]+)/i.exec(link.url)?.[1]).find(Boolean) : undefined;
+    // The link is a line of the text or, from the Inbox's product tool, a template button.
+    // Only a card shows the picture, so an AI answer (never a card) does not look one up.
+    const productPage = cardLike && !isAiGenerated ? [...extras.links, ...articleActions(message, row.id)].map((link) => /^https:\/\/[^/?#]+(?:\/[^/?#]+)*?\/product-page\/([^/?#]+)/i.exec(link.url)?.[1]).find(Boolean) : undefined;
     // A file, recording or video has no inline player here: it gets a button that opens it.
     const attachmentLinks = row.parts.filter((part) => (part.kind === "file" || part.kind === "audio" || part.kind === "video") && !!part.url)
       .map((part, at) => ({ id: `${row.id}:attachment-${at}`, label: (part.fileName || part.caption || `Open ${part.kind}`).slice(0, 40), url: part.url as string, style: "secondary" as const }));
+    // The card look (a framed box with a centred title) is for what an owner tool sends: a product, coupon, scheduling
+    // or pay link, an event, or a file. A coupon's title is its code, which the coupon block already shows.
+    // An AI answer is text with link pills, as on the site's Smart Chat, even when it is shaped like a card.
+    const isCard = !mine && !isAiGenerated && (cardLike || !!extras.couponCode || (attachmentLinks.length > 0 && !imageUrl));
+    const cardTitle = cardLike && !(extras.couponCode && first === extras.couponCode) ? first.replace(/^\*\*(.+)\*\*$/, "$1") : "";
+    // A product card shows its name and price, as on the site's Smart Chat; the "4 variants | In stock" summary the
+    // Inbox adds to the text is left out of it.
+    const cardLines = cardTitle ? lines.slice(1) : titled.split("\n");
+    const cardDetail = (productPage ? cardLines.filter((line) => !/^\s*\d+\s+variants?\b|\|\s*(?:in|out of)\s+stock\s*$/i.test(line)) : cardLines).join("\n");
     const articles = [...articleActions(message, row.id), ...attachmentLinks, ...extras.links.map((link, at) => ({ id: `${row.id}:link-${at}`, label: link.label, url: link.url, style: /\b(view|buy|shop|book|pay|order|checkout|reserve|schedule)\b/i.test(link.label) ? "primary" as const : "secondary" as const }))]
       .filter((action, at, all) => all.findIndex((other) => other.url === action.url) === at);
 
@@ -463,7 +493,8 @@ export function presentBusinessMessages<T extends Pick<BusinessMessage, "id" | "
       senderInitials: typeof display.initials === "string" && display.initials.trim() ? display.initials.trim() : initials(senderName),
       senderBadge: participantId && !mine ? isAiGenerated ? "AI assistant" : "Staff Response" : "",
       imageUrl,
-      imageDescription: imagePart?.caption || "Image attachment",
+      // A card's own picture is named by the card (a product's name), not as an anonymous attachment.
+      imageDescription: imagePart?.caption || (imageUrl && !imagePart?.url && first ? first.replace(/\*/g, "") : "Image attachment"),
       noImage: !imageUrl,
       bodyText,
       bodyRuns,
@@ -472,6 +503,13 @@ export function presentBusinessMessages<T extends Pick<BusinessMessage, "id" | "
       noCoupon: !extras.couponCode,
       productSlug: productPage ?? "",
       productName: productPage ? first : "",
+      isCard,
+      notCard: !isCard,
+      noSuggestions: buttons.length === 0,
+      noActions: articles.length === 0,
+      cardTitle,
+      noCardText: !cardTitle && !cardDetail.trim(),
+      cardDetail,
       isAiGenerated,
       suggestions: buttons,
       articleActions: articles,

package/templates/branded-lite/tier5-src/_shared/himi-store-categories.ts

@@ -0,0 +1,102 @@
+// Store categories for the Branded Lite Shop chip row and the Home "Shop by category"
+// rail — one reader, so both list the same categories in the same order.
+//
+// Catalog V3 Categories first, V1 collections only when V3 THROWS (a legacy V1 site):
+// a V3 success with zero rows is an empty catalogue, and V1 on a V3 site answers 428.
+// Same rule as wix-spaces-collections; see the reasoning there.
+import { categoryImage, queryCollections, queryStoreCategories, type StoreCategoriesResponse, type StoreCategory, type WixCollection } from "@himalaya/wix-stores-collections";
+import { wixMediaUrl } from "@himalaya/wix-media";
+
+export interface StoreCategoryCard {
+  id: string;
+  name: string;
+  image: string;
+  hasImage: boolean;
+  noImage: boolean;
+}
+
+/** "All Products" is a Wix system collection — every product is in it, so it is
+ *  the Shop's own "All" chip, not a category a shopper picks. */
+const SYSTEM_NAMES = ["all products"];
+const SYSTEM_COLLECTION_IDS = ["00000000-000000-000000-000000000001"];
+
+function card(id: string, name: string, image: string): StoreCategoryCard {
+  return { id, name, image, hasImage: !!image, noImage: !image };
+}
+
+function fromCategory(c: StoreCategory): StoreCategoryCard {
+  return card(c.id ?? "", (c.name ?? "").trim(), categoryImage(c));
+}
+
+function fromCollection(c: WixCollection): StoreCategoryCard {
+  const raw = c as unknown as { id?: string; name?: string; media?: { mainMedia?: { image?: { url?: string }; thumbnail?: { url?: string } } } };
+  const media = raw.media?.mainMedia;
+  return card(raw.id ?? "", (raw.name ?? "").trim(), wixMediaUrl(media?.image?.url ?? media?.thumbnail?.url ?? ""));
+}
+
+function visible(rows: StoreCategoryCard[]): StoreCategoryCard[] {
+  const seen = new Set<string>();
+  return rows.filter((r) => {
+    if (!r.id || !r.name || SYSTEM_COLLECTION_IDS.includes(r.id) || SYSTEM_NAMES.includes(r.name.toLowerCase()) || seen.has(r.id)) return false;
+    seen.add(r.id);
+    return true;
+  });
+}
+
+const PAGE_SIZE = 50;
+const MAX_PAGES = 100;
+
+async function loadLegacyCategories(): Promise<StoreCategoryCard[]> {
+  const cards: StoreCategoryCard[] = [];
+  const seen = new Set<string>();
+  let offset = 0;
+  let total: number | undefined;
+  for (let page = 0; page < MAX_PAGES; page++) {
+    const r = await queryCollections({ query: { paging: { limit: PAGE_SIZE, offset } } });
+    const rows = r.collections ?? [];
+    const reportedTotal = r.totalResults ?? r.metadata?.total;
+    if (reportedTotal != null) total = Math.max(total ?? 0, reportedTotal);
+    if (!rows.length) {
+      if (total != null && seen.size < total) throw new Error("Category pagination is incomplete");
+      return visible(cards);
+    }
+    const priorCount = seen.size;
+    rows.forEach(row => { if (row.id) seen.add(row.id); });
+    if (page > 0 && seen.size === priorCount) throw new Error("Category pagination made no progress");
+    cards.push(...rows.filter(c => c.visible !== false).map(fromCollection));
+    offset += rows.length;
+    if (total != null ? offset >= total : rows.length < PAGE_SIZE) {
+      if (total != null && seen.size < total) throw new Error("Category pagination is incomplete");
+      return visible(cards);
+    }
+  }
+  throw new Error("Category pagination exceeded the page limit");
+}
+
+/** The store's browsable categories in site order. Rejects incomplete reads so callers
+ *  can retain their last good catalog instead of invalidating a later category. */
+export async function loadStoreCategories(): Promise<StoreCategoryCard[]> {
+  let r: StoreCategoriesResponse;
+  try {
+    r = await queryStoreCategories(PAGE_SIZE);
+  } catch { return loadLegacyCategories(); /* Only the initial failure can identify a legacy V1 site. */ }
+  const cards: StoreCategoryCard[] = [];
+  const cursors = new Set<string>();
+  const seen = new Set<string>();
+  let total = 0;
+  for (let page = 0; page < MAX_PAGES; page++) {
+    const categories = r.categories ?? [];
+    categories.forEach(c => { if (c.id) seen.add(c.id); });
+    total = Math.max(total, r.pagingMetadata?.total ?? 0);
+    cards.push(...categories.filter(c => c.visible !== false).map(fromCategory));
+    const next = r.pagingMetadata?.cursors?.next;
+    if (!next) {
+      if (seen.size < total) throw new Error("Category pagination is incomplete");
+      return visible(cards);
+    }
+    if (cursors.has(next)) throw new Error("Category pagination repeated a cursor");
+    cursors.add(next);
+    if (page + 1 < MAX_PAGES) r = await queryStoreCategories(PAGE_SIZE, next);
+  }
+  throw new Error("Category pagination exceeded the page limit");
+}