@rebuy/rebuy 3.60.3 → 3.60.5

package/dist/server/index.cjs

@@ -775,7 +775,7 @@ var isHTML = (html = "") => {
   }
   return html.search(HTML_TAGS_REGEX) !== -1;
 };
-var hasHTMLInDoc = (doc) => doc.content.some(({ content = [] }) => content.some(({ text: text2 }) => isHTML(text2)));
+var hasHTMLInDoc = (doc) => doc.content.some(({ content = [] }) => content.some(({ text }) => isHTML(text)));
 var checkForHTML = (input) => !((0, import_compat2.isString)(input) && isHTML(input) || (0, import_es_toolkit2.isPlainObject)(input) && hasHTMLInDoc(input));
 var NO_HTML = { message: "HTML is not supported" };
 var isSectionType = (sectionType) => (section) => (0, import_compat2.get)(section, "sectionType") === sectionType;
@@ -2829,17 +2829,17 @@ var CABImageSection = CABImageSectionFields.superRefine(({ category, source: sou
 var HTML_COMMENT_RE = /<!--[\s\S]*?-->/g;
 var STRIPPED_ELEMENT_RE = /<(script|style|iframe|object|embed|noscript|template)\b[^>]*>[\s\S]*?(?:<\/\1\s*>|$)/gi;
 var HTML_TAG_RE = /<\/?[a-zA-Z][^>]*>/g;
-var stripContentBlockHtml = (text2) => text2.replace(HTML_COMMENT_RE, "").replace(STRIPPED_ELEMENT_RE, "").replace(HTML_TAG_RE, "");
+var stripContentBlockHtml = (text) => text.replace(HTML_COMMENT_RE, "").replace(STRIPPED_ELEMENT_RE, "").replace(HTML_TAG_RE, "");
 
 // src/transforms/contentBlockV1/convertTextToTiptapParagraph.ts
 var convertTextToTiptapParagraph = ({
   color,
   fontSize,
   marks: marks2 = [],
-  text: text2,
+  text,
   textAlign
 }) => {
-  const sanitizedText = stripContentBlockHtml(text2);
+  const sanitizedText = stripContentBlockHtml(text);
   return TiptapParagraph.parse({
     attrs: { textAlign },
     content: sanitizedText ? [
@@ -2913,13 +2913,13 @@ var convertContentBlockImageToV2 = (block) => {
 // src/transforms/normalizeTokens.ts
 var import_es_toolkit4 = require("es-toolkit");
 var DEFAULT_KNOWN_TOKENS = ["firstName", "lastName", "email"];
-var normalizeTokens = (text2, knownTokens = DEFAULT_KNOWN_TOKENS) => {
-  if (typeof text2 !== "string") return text2;
+var normalizeTokens = (text, knownTokens = DEFAULT_KNOWN_TOKENS) => {
+  if (typeof text !== "string") return text;
   return knownTokens.reduce((acc, token) => {
     const snakeTolerant = (0, import_es_toolkit4.escapeRegExp)(token).replace(/([A-Z])/g, "_?$1");
     const pattern = new RegExp(`\\{{1,2}\\s*${snakeTolerant}\\s*\\}{1,2}`, "gi");
     return acc.replace(pattern, `{{${token}}}`);
-  }, text2);
+  }, text);
 };
 
 // src/transforms/contentBlockV1/convertContentBlockTextToV2.ts
@@ -2929,7 +2929,7 @@ var HEADER_PARAGRAPH_STYLES = {
   superTitle: { color: "base", fontSize: "extraLarge", marks: [{ type: "bold" }] },
   title: { color: "base", fontSize: "medium", marks: [{ type: "bold" }] }
 };
-var convertContentBlockTextToV2 = (language3, text2 = literalText, textAlign = "center") => {
+var convertContentBlockTextToV2 = (language3, text = literalText, textAlign = "center") => {
   const description = language3?.description;
   const superTitle = language3?.superTitle;
   const title = language3?.title;
@@ -2938,17 +2938,17 @@ var convertContentBlockTextToV2 = (language3, text2 = literalText, textAlign = "
     content: [
       superTitle ? convertTextToTiptapParagraph({
         ...HEADER_PARAGRAPH_STYLES.superTitle,
-        text: text2("superTitle", superTitle),
+        text: text("superTitle", superTitle),
         textAlign
       }) : null,
       title ? convertTextToTiptapParagraph({
         ...HEADER_PARAGRAPH_STYLES.title,
-        text: text2("title", title),
+        text: text("title", title),
         textAlign
       }) : null,
       description ? convertTextToTiptapParagraph({
         ...HEADER_PARAGRAPH_STYLES.description,
-        text: text2("description", description),
+        text: text("description", description),
         textAlign
       }) : null
     ].filter((p) => p !== null),
@@ -3596,11 +3596,11 @@ var isMonetizeV1 = isWidgetV1(WidgetType.ui_extension_ad);
 
 // src/transforms/normalizeTextContent.ts
 var HTML_TAG_RE2 = /<[a-zA-Z]/;
-var containsHtml = (text2) => HTML_TAG_RE2.test(text2);
+var containsHtml = (text) => HTML_TAG_RE2.test(text);
 var isObject = (x) => x !== null && typeof x === "object" && !Array.isArray(x);
 var normalizeTextValue = (value, options2 = {}) => {
   const tokenized = normalizeTokens(value);
-  return containsHtml(tokenized) || options2.defaultTextStyle ? htmlToTiptap(tokenized, options2) : decodeTextEntities(tokenized);
+  return containsHtml(tokenized) || options2.defaultTextStyle || options2.blockSpacing ? htmlToTiptap(tokenized, options2) : decodeTextEntities(tokenized);
 };
 var normalizeLangValue = (value) => typeof value === "string" ? normalizeTextValue(value) : value;
 var normalizeTextContent = (node) => {
@@ -4544,12 +4544,12 @@ var sizes = {
   xlarge: "extraLarge",
   xsmall: "extraSmall"
 };
-var styledTextRun = (text2, emphasized, size) => ({
+var styledTextRun = (text, emphasized, size) => ({
   marks: [
     ...emphasized ? [{ type: "bold" }] : [],
     { attrs: { color: "base", fontSize: sizes[size] }, type: "textStyle" }
   ],
-  text: text2,
+  text,
   type: "text"
 });
 
@@ -4574,16 +4574,16 @@ var convertCalloutBlock = (raw, report) => {
   const horizontal = styled2 ? { center: "center", leading: "start", trailing: "end" }[styles2.textAlignment] : "center";
   const sections = values2.flatMap(({ field, result }) => {
     if (!result.success) return omit(`Unreadable post-purchase callout field: ${field}`);
-    const text2 = result.data;
-    if (text2 === "") return [];
-    const content = styled2 && typeof text2 === "string" ? {
+    const text = result.data;
+    if (text === "") return [];
+    const content = styled2 && typeof text === "string" ? {
       content: [
         {
           attrs: { textAlign: horizontal },
-          content: [styledTextRun(text2, styles2[`${field}Emphasized`], styles2[`${field}Size`])]
+          content: [styledTextRun(text, styles2[`${field}Emphasized`], styles2[`${field}Size`])]
         }
       ]
-    } : text2;
+    } : text;
     const section = CABTextSection.safeParse({ content: { en: content } });
     return section.success ? [section.data] : omit(`Unreadable post-purchase callout field: ${field}`);
   });
@@ -4662,16 +4662,16 @@ var convertImageContentText = (settings, report) => {
     };
     const value = ImageContentBlock.shape.settings.shape[field].safeParse(settings[field]);
     if (!value.success) return omit();
-    const text2 = value.data;
-    if (text2 === null || text2 === "") return [];
-    const content = typeof text2 === "string" ? {
+    const text = value.data;
+    if (text === null || text === "") return [];
+    const content = typeof text === "string" ? {
       content: [
         {
           attrs: { textAlign: horizontal },
-          content: [styledTextRun(text2, field !== "description", settings[`${field}Size`])]
+          content: [styledTextRun(text, field !== "description", settings[`${field}Size`])]
         }
       ]
-    } : text2;
+    } : text;
     const section = CABTextSection.safeParse({ content: { en: content } });
     return section.success ? [section.data] : omit();
   });
@@ -4712,8 +4712,8 @@ var convertImageContentBlock = (raw, report) => {
   }
   const image = convertImageFrame({ alt, image: settings.image, imageSize: settings.imageSize });
   if (!image) report?.({ detail: "Unreadable post-purchase image-content image", kind: "section" });
-  const text2 = convertImageContentText(settings, report);
-  const textFrame = CABLayoutSection.parse({ direction: "grid", grid: { columns: ["100%"] }, sections: [text2] });
+  const text = convertImageContentText(settings, report);
+  const textFrame = CABLayoutSection.parse({ direction: "grid", grid: { columns: ["100%"] }, sections: [text] });
   const placement = settings.imagePlacement ?? (settings.swapContent ? "right" : "left");
   const imageFirst = placement === "left" || placement === "top";
   const sections = imageFirst ? [image, textFrame] : [textFrame, image];
@@ -4788,8 +4788,8 @@ var convertPayButtonBlock = (raw, report, widgetSettings) => {
   if (!parsed.success) return omit();
   const { settings, styles: styles2 } = parsed.data;
   const label2 = settings.label ? `${settings.label} \xB7 {{total}}` : "{{total}}";
-  const text2 = CABTextSection.safeParse({ content: { en: label2 } });
-  if (!text2.success) return omit();
+  const text = CABTextSection.safeParse({ content: { en: label2 } });
+  if (!text.success) return omit();
   return [
     CABLayoutSection.parse({
       alignment: { horizontal: "center" },
@@ -4798,7 +4798,7 @@ var convertPayButtonBlock = (raw, report, widgetSettings) => {
       sections: [
         CABButtonSection.parse({
           action: "addToOrder",
-          sections: [text2.data, soldOutSlot(ProductCardSettings.parse(widgetSettings ?? {}))]
+          sections: [text.data, soldOutSlot(ProductCardSettings.parse(widgetSettings ?? {}))]
         })
       ],
       width: styles2.buttonWidth
@@ -4838,8 +4838,8 @@ var productCardControls = (settings) => [
 ];
 
 // src/transforms/postPurchase/productCardRows.ts
-var styledCopy = (text2, look) => ({
-  content: [{ content: [{ marks: [{ attrs: look, type: "textStyle" }], text: text2, type: "text" }], type: "paragraph" }],
+var styledCopy = (text, look) => ({
+  content: [{ content: [{ marks: [{ attrs: look, type: "textStyle" }], text, type: "text" }], type: "paragraph" }],
   type: "doc"
 });
 var merchantLabel = (value, fallback) => localizedContent({ en: fallback }, value);
@@ -4849,7 +4849,7 @@ var boundText = (variable, content) => ({
   visibility: shownWhile(variable)
 });
 var earnedRow = ({ after, columns, label: label2, look, spacing, token, variable }) => {
-  const styled2 = (text2) => look ? styledCopy(text2, look) : text2;
+  const styled2 = (text) => look ? styledCopy(text, look) : text;
   const value = earnedText(variable, styled2(token));
   return {
     direction: "grid",
@@ -4926,8 +4926,8 @@ var recurringSummary = (settings) => {
             variable: HAS_RECURRING_SHIPPING
           })
         ] : [],
-        ...FOOTNOTES.map((text2) => ({
-          content: { en: styledCopy(text2, small) },
+        ...FOOTNOTES.map((text) => ({
+          content: { en: styledCopy(text, small) },
           sectionType: "text",
           visibility: shownWhile(HAS_RECURRING_TOTAL)
         }))
@@ -5085,9 +5085,9 @@ var convertTextBlock = (raw, report) => {
   };
   const sections = values2.flatMap(({ field, result }) => {
     if (!result.success) return omit(field);
-    const text2 = result.data;
-    if (text2 === null || text2 === "") return [];
-    const content = styled2 ? { content: [{ attrs: { textAlign: horizontal }, content: [{ marks: styles[field], text: text2 }] }] } : text2;
+    const text = result.data;
+    if (text === null || text === "") return [];
+    const content = styled2 ? { content: [{ attrs: { textAlign: horizontal }, content: [{ marks: styles[field], text }] }] } : text;
     const section = CABTextSection.safeParse({ content: { en: content } });
     return section.success ? [section.data] : omit(field);
   });
@@ -5122,13 +5122,13 @@ var convertTimerBlock = (raw, report) => {
       }
     ]
   } : withCountdown(title, countdown, horizontal);
-  const text2 = CABTextSection.safeParse({ content: { en: content } });
-  if (!text2.success) return omit();
+  const text = CABTextSection.safeParse({ content: { en: content } });
+  if (!text.success) return omit();
   return [
     CABBannerSection.parse({
       color: styles2.timerBackgroundColor,
       dismissible: false,
-      sections: [text2.data],
+      sections: [text.data],
       width: styles2.timerWidth
     })
   ];
@@ -5831,7 +5831,7 @@ var fetchAdsEngineOffers = async (input, ctx, prefetched) => {
 // src/transforms/htmlToPlainText.ts
 var paragraphText = (paragraph) => paragraph.content.map((run) => run.text).join("");
 var FORCE_PARSER = { defaultTextStyle: {} };
-var withoutTagShapes = (text2) => isHTML(text2) ? text2.replace(/[<>]/g, "") : text2;
+var withoutTagShapes = (text) => isHTML(text) ? text.replace(/[<>]/g, "") : text;
 var htmlToPlainText = (html) => withoutTagShapes(
   normalizeTextValue(html, FORCE_PARSER).content.map((paragraph) => paragraphText(paragraph).trim()).filter((line) => line !== "").join("\n")
 );
@@ -5839,13 +5839,12 @@ var htmlToPlainText = (html) => withoutTagShapes(
 // src/server/composeOffer.ts
 var ACCEPT_FALLBACK = "Accept";
 var DECLINE_FALLBACK = "No Thanks";
-var label = (text2) => ({
+var label = (text) => ({
   buttonField: ButtonField.buttonLabel,
-  content: { en: text2 },
+  content: { en: text },
   sectionType: SectionType.text
 });
-var text = (content) => ({ content: { en: content }, sectionType: SectionType.text });
-var AS_DOC = { defaultTextStyle: {} };
+var AS_DOC = { blockSpacing: Spacing.none, defaultTextStyle: {} };
 var safeTextValue = (raw, options2) => {
   const converted = normalizeTextValue(raw, options2);
   return checkForHTML(converted) ? converted : normalizeTextValue(htmlToPlainText(raw), options2);
@@ -5873,7 +5872,7 @@ var dspLabel = (raw, fallback) => ({
   sectionType: SectionType.text
 });
 var smallText = (raw) => ({
-  content: { en: safeTextValue(raw, { defaultTextStyle: { fontSize: "small" } }) },
+  content: { en: safeTextValue(raw, { blockSpacing: Spacing.none, defaultTextStyle: { fontSize: "small" } }) },
   sectionType: SectionType.text
 });
 var styled = (value, { align, bold, color, fontSize, href }) => ({
@@ -5902,20 +5901,17 @@ var styled = (value, { align, bold, color, fontSize, href }) => ({
   sectionType: SectionType.text
 });
 var shopName = (shop, storeName) => storeName?.replace(/<[^>]*>/g, "").trim() || shop.replace(/\.myshopify\.com$/, "") || "store";
-var headerSections = (input, storeName) => [
-  {
-    sections: [
-      styled("Congratulations!", { bold: true, fontSize: "heading" }),
-      styled(`Your ${shopName(input.shop, storeName)} purchase unlocked a bonus:`, {
-        bold: true,
-        fontSize: "heading"
-      })
-    ],
-    sectionType: SectionType.layout,
-    spacing: Spacing.none
-  },
-  text(input.orderName ? `Order ${input.orderName} Confirmed` : "Order Confirmed")
-];
+var headerSection = (input, storeName) => ({
+  sections: [
+    styled("Congratulations!", { bold: true, fontSize: "heading" }),
+    styled(`Your ${shopName(input.shop, storeName)} purchase unlocked a bonus:`, {
+      bold: true,
+      fontSize: "heading"
+    })
+  ],
+  sectionType: SectionType.layout,
+  spacing: Spacing.none
+});
 var privacyHref = (offer, input) => {
   const href = [offer.privacy_url, input.privacyPolicyUrl].find((url) => url && isValidHref(url));
   return href ? { href } : {};
@@ -5927,9 +5923,9 @@ var legalCopy = (raw, visibleWhen) => ({
   sectionType: SectionType.text,
   ...visibleWhen !== void 0 && { visibility: { variable: SHOW_EXTENDED, visibleWhen } }
 });
-var disclosureToggle = (text2, visibleWhen) => ({
+var disclosureToggle = (text, visibleWhen) => ({
   buttonStyle: ButtonStyle.plain,
-  sections: [label(text2)],
+  sections: [label(text)],
   sectionType: SectionType.button,
   variableEffects: [{ effect: "toggle", variable: SHOW_EXTENDED }],
   visibility: { variable: SHOW_EXTENDED, visibleWhen }
@@ -5984,7 +5980,7 @@ var composeOfferCard = (offer, input, storeName) => {
       border: { style: BorderStyle.base },
       padding: Spacing.tight,
       sections: [
-        ...headerSections(input, storeName),
+        headerSection(input, storeName),
         offer.image_url ? {
           alignment: { horizontal: HorizontalAlignment.start, vertical: VerticalAlignment.middle },
           direction: Direction.grid,

package/dist/server/index.mjs

@@ -702,7 +702,7 @@ var isHTML = (html = "") => {
   }
   return html.search(HTML_TAGS_REGEX) !== -1;
 };
-var hasHTMLInDoc = (doc) => doc.content.some(({ content = [] }) => content.some(({ text: text2 }) => isHTML(text2)));
+var hasHTMLInDoc = (doc) => doc.content.some(({ content = [] }) => content.some(({ text }) => isHTML(text)));
 var checkForHTML = (input) => !(isString(input) && isHTML(input) || isPlainObject2(input) && hasHTMLInDoc(input));
 var NO_HTML = { message: "HTML is not supported" };
 var isSectionType = (sectionType) => (section) => get(section, "sectionType") === sectionType;
@@ -2756,17 +2756,17 @@ var CABImageSection = CABImageSectionFields.superRefine(({ category, source: sou
 var HTML_COMMENT_RE = /<!--[\s\S]*?-->/g;
 var STRIPPED_ELEMENT_RE = /<(script|style|iframe|object|embed|noscript|template)\b[^>]*>[\s\S]*?(?:<\/\1\s*>|$)/gi;
 var HTML_TAG_RE = /<\/?[a-zA-Z][^>]*>/g;
-var stripContentBlockHtml = (text2) => text2.replace(HTML_COMMENT_RE, "").replace(STRIPPED_ELEMENT_RE, "").replace(HTML_TAG_RE, "");
+var stripContentBlockHtml = (text) => text.replace(HTML_COMMENT_RE, "").replace(STRIPPED_ELEMENT_RE, "").replace(HTML_TAG_RE, "");
 
 // src/transforms/contentBlockV1/convertTextToTiptapParagraph.ts
 var convertTextToTiptapParagraph = ({
   color,
   fontSize,
   marks: marks2 = [],
-  text: text2,
+  text,
   textAlign
 }) => {
-  const sanitizedText = stripContentBlockHtml(text2);
+  const sanitizedText = stripContentBlockHtml(text);
   return TiptapParagraph.parse({
     attrs: { textAlign },
     content: sanitizedText ? [
@@ -2840,13 +2840,13 @@ var convertContentBlockImageToV2 = (block) => {
 // src/transforms/normalizeTokens.ts
 import { escapeRegExp } from "es-toolkit";
 var DEFAULT_KNOWN_TOKENS = ["firstName", "lastName", "email"];
-var normalizeTokens = (text2, knownTokens = DEFAULT_KNOWN_TOKENS) => {
-  if (typeof text2 !== "string") return text2;
+var normalizeTokens = (text, knownTokens = DEFAULT_KNOWN_TOKENS) => {
+  if (typeof text !== "string") return text;
   return knownTokens.reduce((acc, token) => {
     const snakeTolerant = escapeRegExp(token).replace(/([A-Z])/g, "_?$1");
     const pattern = new RegExp(`\\{{1,2}\\s*${snakeTolerant}\\s*\\}{1,2}`, "gi");
     return acc.replace(pattern, `{{${token}}}`);
-  }, text2);
+  }, text);
 };
 
 // src/transforms/contentBlockV1/convertContentBlockTextToV2.ts
@@ -2856,7 +2856,7 @@ var HEADER_PARAGRAPH_STYLES = {
   superTitle: { color: "base", fontSize: "extraLarge", marks: [{ type: "bold" }] },
   title: { color: "base", fontSize: "medium", marks: [{ type: "bold" }] }
 };
-var convertContentBlockTextToV2 = (language3, text2 = literalText, textAlign = "center") => {
+var convertContentBlockTextToV2 = (language3, text = literalText, textAlign = "center") => {
   const description = language3?.description;
   const superTitle = language3?.superTitle;
   const title = language3?.title;
@@ -2865,17 +2865,17 @@ var convertContentBlockTextToV2 = (language3, text2 = literalText, textAlign = "
     content: [
       superTitle ? convertTextToTiptapParagraph({
         ...HEADER_PARAGRAPH_STYLES.superTitle,
-        text: text2("superTitle", superTitle),
+        text: text("superTitle", superTitle),
         textAlign
       }) : null,
       title ? convertTextToTiptapParagraph({
         ...HEADER_PARAGRAPH_STYLES.title,
-        text: text2("title", title),
+        text: text("title", title),
         textAlign
       }) : null,
       description ? convertTextToTiptapParagraph({
         ...HEADER_PARAGRAPH_STYLES.description,
-        text: text2("description", description),
+        text: text("description", description),
         textAlign
       }) : null
     ].filter((p) => p !== null),
@@ -3523,11 +3523,11 @@ var isMonetizeV1 = isWidgetV1(WidgetType.ui_extension_ad);
 
 // src/transforms/normalizeTextContent.ts
 var HTML_TAG_RE2 = /<[a-zA-Z]/;
-var containsHtml = (text2) => HTML_TAG_RE2.test(text2);
+var containsHtml = (text) => HTML_TAG_RE2.test(text);
 var isObject = (x) => x !== null && typeof x === "object" && !Array.isArray(x);
 var normalizeTextValue = (value, options2 = {}) => {
   const tokenized = normalizeTokens(value);
-  return containsHtml(tokenized) || options2.defaultTextStyle ? htmlToTiptap(tokenized, options2) : decodeTextEntities(tokenized);
+  return containsHtml(tokenized) || options2.defaultTextStyle || options2.blockSpacing ? htmlToTiptap(tokenized, options2) : decodeTextEntities(tokenized);
 };
 var normalizeLangValue = (value) => typeof value === "string" ? normalizeTextValue(value) : value;
 var normalizeTextContent = (node) => {
@@ -4471,12 +4471,12 @@ var sizes = {
   xlarge: "extraLarge",
   xsmall: "extraSmall"
 };
-var styledTextRun = (text2, emphasized, size) => ({
+var styledTextRun = (text, emphasized, size) => ({
   marks: [
     ...emphasized ? [{ type: "bold" }] : [],
     { attrs: { color: "base", fontSize: sizes[size] }, type: "textStyle" }
   ],
-  text: text2,
+  text,
   type: "text"
 });
 
@@ -4501,16 +4501,16 @@ var convertCalloutBlock = (raw, report) => {
   const horizontal = styled2 ? { center: "center", leading: "start", trailing: "end" }[styles2.textAlignment] : "center";
   const sections = values2.flatMap(({ field, result }) => {
     if (!result.success) return omit(`Unreadable post-purchase callout field: ${field}`);
-    const text2 = result.data;
-    if (text2 === "") return [];
-    const content = styled2 && typeof text2 === "string" ? {
+    const text = result.data;
+    if (text === "") return [];
+    const content = styled2 && typeof text === "string" ? {
       content: [
         {
           attrs: { textAlign: horizontal },
-          content: [styledTextRun(text2, styles2[`${field}Emphasized`], styles2[`${field}Size`])]
+          content: [styledTextRun(text, styles2[`${field}Emphasized`], styles2[`${field}Size`])]
         }
       ]
-    } : text2;
+    } : text;
     const section = CABTextSection.safeParse({ content: { en: content } });
     return section.success ? [section.data] : omit(`Unreadable post-purchase callout field: ${field}`);
   });
@@ -4589,16 +4589,16 @@ var convertImageContentText = (settings, report) => {
     };
     const value = ImageContentBlock.shape.settings.shape[field].safeParse(settings[field]);
     if (!value.success) return omit();
-    const text2 = value.data;
-    if (text2 === null || text2 === "") return [];
-    const content = typeof text2 === "string" ? {
+    const text = value.data;
+    if (text === null || text === "") return [];
+    const content = typeof text === "string" ? {
       content: [
         {
           attrs: { textAlign: horizontal },
-          content: [styledTextRun(text2, field !== "description", settings[`${field}Size`])]
+          content: [styledTextRun(text, field !== "description", settings[`${field}Size`])]
         }
       ]
-    } : text2;
+    } : text;
     const section = CABTextSection.safeParse({ content: { en: content } });
     return section.success ? [section.data] : omit();
   });
@@ -4639,8 +4639,8 @@ var convertImageContentBlock = (raw, report) => {
   }
   const image = convertImageFrame({ alt, image: settings.image, imageSize: settings.imageSize });
   if (!image) report?.({ detail: "Unreadable post-purchase image-content image", kind: "section" });
-  const text2 = convertImageContentText(settings, report);
-  const textFrame = CABLayoutSection.parse({ direction: "grid", grid: { columns: ["100%"] }, sections: [text2] });
+  const text = convertImageContentText(settings, report);
+  const textFrame = CABLayoutSection.parse({ direction: "grid", grid: { columns: ["100%"] }, sections: [text] });
   const placement = settings.imagePlacement ?? (settings.swapContent ? "right" : "left");
   const imageFirst = placement === "left" || placement === "top";
   const sections = imageFirst ? [image, textFrame] : [textFrame, image];
@@ -4715,8 +4715,8 @@ var convertPayButtonBlock = (raw, report, widgetSettings) => {
   if (!parsed.success) return omit();
   const { settings, styles: styles2 } = parsed.data;
   const label2 = settings.label ? `${settings.label} \xB7 {{total}}` : "{{total}}";
-  const text2 = CABTextSection.safeParse({ content: { en: label2 } });
-  if (!text2.success) return omit();
+  const text = CABTextSection.safeParse({ content: { en: label2 } });
+  if (!text.success) return omit();
   return [
     CABLayoutSection.parse({
       alignment: { horizontal: "center" },
@@ -4725,7 +4725,7 @@ var convertPayButtonBlock = (raw, report, widgetSettings) => {
       sections: [
         CABButtonSection.parse({
           action: "addToOrder",
-          sections: [text2.data, soldOutSlot(ProductCardSettings.parse(widgetSettings ?? {}))]
+          sections: [text.data, soldOutSlot(ProductCardSettings.parse(widgetSettings ?? {}))]
         })
       ],
       width: styles2.buttonWidth
@@ -4765,8 +4765,8 @@ var productCardControls = (settings) => [
 ];
 
 // src/transforms/postPurchase/productCardRows.ts
-var styledCopy = (text2, look) => ({
-  content: [{ content: [{ marks: [{ attrs: look, type: "textStyle" }], text: text2, type: "text" }], type: "paragraph" }],
+var styledCopy = (text, look) => ({
+  content: [{ content: [{ marks: [{ attrs: look, type: "textStyle" }], text, type: "text" }], type: "paragraph" }],
   type: "doc"
 });
 var merchantLabel = (value, fallback) => localizedContent({ en: fallback }, value);
@@ -4776,7 +4776,7 @@ var boundText = (variable, content) => ({
   visibility: shownWhile(variable)
 });
 var earnedRow = ({ after, columns, label: label2, look, spacing, token, variable }) => {
-  const styled2 = (text2) => look ? styledCopy(text2, look) : text2;
+  const styled2 = (text) => look ? styledCopy(text, look) : text;
   const value = earnedText(variable, styled2(token));
   return {
     direction: "grid",
@@ -4853,8 +4853,8 @@ var recurringSummary = (settings) => {
             variable: HAS_RECURRING_SHIPPING
           })
         ] : [],
-        ...FOOTNOTES.map((text2) => ({
-          content: { en: styledCopy(text2, small) },
+        ...FOOTNOTES.map((text) => ({
+          content: { en: styledCopy(text, small) },
           sectionType: "text",
           visibility: shownWhile(HAS_RECURRING_TOTAL)
         }))
@@ -5012,9 +5012,9 @@ var convertTextBlock = (raw, report) => {
   };
   const sections = values2.flatMap(({ field, result }) => {
     if (!result.success) return omit(field);
-    const text2 = result.data;
-    if (text2 === null || text2 === "") return [];
-    const content = styled2 ? { content: [{ attrs: { textAlign: horizontal }, content: [{ marks: styles[field], text: text2 }] }] } : text2;
+    const text = result.data;
+    if (text === null || text === "") return [];
+    const content = styled2 ? { content: [{ attrs: { textAlign: horizontal }, content: [{ marks: styles[field], text }] }] } : text;
     const section = CABTextSection.safeParse({ content: { en: content } });
     return section.success ? [section.data] : omit(field);
   });
@@ -5049,13 +5049,13 @@ var convertTimerBlock = (raw, report) => {
       }
     ]
   } : withCountdown(title, countdown, horizontal);
-  const text2 = CABTextSection.safeParse({ content: { en: content } });
-  if (!text2.success) return omit();
+  const text = CABTextSection.safeParse({ content: { en: content } });
+  if (!text.success) return omit();
   return [
     CABBannerSection.parse({
       color: styles2.timerBackgroundColor,
       dismissible: false,
-      sections: [text2.data],
+      sections: [text.data],
       width: styles2.timerWidth
     })
   ];
@@ -5758,7 +5758,7 @@ var fetchAdsEngineOffers = async (input, ctx, prefetched) => {
 // src/transforms/htmlToPlainText.ts
 var paragraphText = (paragraph) => paragraph.content.map((run) => run.text).join("");
 var FORCE_PARSER = { defaultTextStyle: {} };
-var withoutTagShapes = (text2) => isHTML(text2) ? text2.replace(/[<>]/g, "") : text2;
+var withoutTagShapes = (text) => isHTML(text) ? text.replace(/[<>]/g, "") : text;
 var htmlToPlainText = (html) => withoutTagShapes(
   normalizeTextValue(html, FORCE_PARSER).content.map((paragraph) => paragraphText(paragraph).trim()).filter((line) => line !== "").join("\n")
 );
@@ -5766,13 +5766,12 @@ var htmlToPlainText = (html) => withoutTagShapes(
 // src/server/composeOffer.ts
 var ACCEPT_FALLBACK = "Accept";
 var DECLINE_FALLBACK = "No Thanks";
-var label = (text2) => ({
+var label = (text) => ({
   buttonField: ButtonField.buttonLabel,
-  content: { en: text2 },
+  content: { en: text },
   sectionType: SectionType.text
 });
-var text = (content) => ({ content: { en: content }, sectionType: SectionType.text });
-var AS_DOC = { defaultTextStyle: {} };
+var AS_DOC = { blockSpacing: Spacing.none, defaultTextStyle: {} };
 var safeTextValue = (raw, options2) => {
   const converted = normalizeTextValue(raw, options2);
   return checkForHTML(converted) ? converted : normalizeTextValue(htmlToPlainText(raw), options2);
@@ -5800,7 +5799,7 @@ var dspLabel = (raw, fallback) => ({
   sectionType: SectionType.text
 });
 var smallText = (raw) => ({
-  content: { en: safeTextValue(raw, { defaultTextStyle: { fontSize: "small" } }) },
+  content: { en: safeTextValue(raw, { blockSpacing: Spacing.none, defaultTextStyle: { fontSize: "small" } }) },
   sectionType: SectionType.text
 });
 var styled = (value, { align, bold, color, fontSize, href }) => ({
@@ -5829,20 +5828,17 @@ var styled = (value, { align, bold, color, fontSize, href }) => ({
   sectionType: SectionType.text
 });
 var shopName = (shop, storeName) => storeName?.replace(/<[^>]*>/g, "").trim() || shop.replace(/\.myshopify\.com$/, "") || "store";
-var headerSections = (input, storeName) => [
-  {
-    sections: [
-      styled("Congratulations!", { bold: true, fontSize: "heading" }),
-      styled(`Your ${shopName(input.shop, storeName)} purchase unlocked a bonus:`, {
-        bold: true,
-        fontSize: "heading"
-      })
-    ],
-    sectionType: SectionType.layout,
-    spacing: Spacing.none
-  },
-  text(input.orderName ? `Order ${input.orderName} Confirmed` : "Order Confirmed")
-];
+var headerSection = (input, storeName) => ({
+  sections: [
+    styled("Congratulations!", { bold: true, fontSize: "heading" }),
+    styled(`Your ${shopName(input.shop, storeName)} purchase unlocked a bonus:`, {
+      bold: true,
+      fontSize: "heading"
+    })
+  ],
+  sectionType: SectionType.layout,
+  spacing: Spacing.none
+});
 var privacyHref = (offer, input) => {
   const href = [offer.privacy_url, input.privacyPolicyUrl].find((url) => url && isValidHref(url));
   return href ? { href } : {};
@@ -5854,9 +5850,9 @@ var legalCopy = (raw, visibleWhen) => ({
   sectionType: SectionType.text,
   ...visibleWhen !== void 0 && { visibility: { variable: SHOW_EXTENDED, visibleWhen } }
 });
-var disclosureToggle = (text2, visibleWhen) => ({
+var disclosureToggle = (text, visibleWhen) => ({
   buttonStyle: ButtonStyle.plain,
-  sections: [label(text2)],
+  sections: [label(text)],
   sectionType: SectionType.button,
   variableEffects: [{ effect: "toggle", variable: SHOW_EXTENDED }],
   visibility: { variable: SHOW_EXTENDED, visibleWhen }
@@ -5911,7 +5907,7 @@ var composeOfferCard = (offer, input, storeName) => {
       border: { style: BorderStyle.base },
       padding: Spacing.tight,
       sections: [
-        ...headerSections(input, storeName),
+        headerSection(input, storeName),
         offer.image_url ? {
           alignment: { horizontal: HorizontalAlignment.start, vertical: VerticalAlignment.middle },
           direction: Direction.grid,

package/dist/transforms/index.cjs

@@ -2358,7 +2358,7 @@ var containsHtml = (text) => HTML_TAG_RE2.test(text);
 var isObject = (x) => x !== null && typeof x === "object" && !Array.isArray(x);
 var normalizeTextValue = (value, options = {}) => {
   const tokenized = normalizeTokens(value);
-  return containsHtml(tokenized) || options.defaultTextStyle ? htmlToTiptap(tokenized, options) : decodeTextEntities(tokenized);
+  return containsHtml(tokenized) || options.defaultTextStyle || options.blockSpacing ? htmlToTiptap(tokenized, options) : decodeTextEntities(tokenized);
 };
 var normalizeLangValue = (value) => typeof value === "string" ? normalizeTextValue(value) : value;
 var normalizeTextContent = (node) => {

package/dist/transforms/index.mjs

@@ -2297,7 +2297,7 @@ var containsHtml = (text) => HTML_TAG_RE2.test(text);
 var isObject = (x) => x !== null && typeof x === "object" && !Array.isArray(x);
 var normalizeTextValue = (value, options = {}) => {
   const tokenized = normalizeTokens(value);
-  return containsHtml(tokenized) || options.defaultTextStyle ? htmlToTiptap(tokenized, options) : decodeTextEntities(tokenized);
+  return containsHtml(tokenized) || options.defaultTextStyle || options.blockSpacing ? htmlToTiptap(tokenized, options) : decodeTextEntities(tokenized);
 };
 var normalizeLangValue = (value) => typeof value === "string" ? normalizeTextValue(value) : value;
 var normalizeTextContent = (node) => {

package/dist/transforms/normalizeTextContent.d.ts

@@ -1,6 +1,6 @@
 import { type TiptapDocument } from '../schema/widgets/checkout-and-beyond/text';
 import { type HtmlToTiptapOptions } from '../transforms/htmlToTiptap/htmlToTiptap';
-export type NormalizeTextOptions = Pick<HtmlToTiptapOptions, 'defaultTextStyle'>;
+export type NormalizeTextOptions = Pick<HtmlToTiptapOptions, 'blockSpacing' | 'defaultTextStyle'>;
 /**
  * THE text pipeline for one content value — the single path every text a CAB tree renders takes,
  * whether it is merchant-authored, converted from a legacy widget, or third-party ad creative:
@@ -16,7 +16,8 @@ export type NormalizeTextOptions = Pick<HtmlToTiptapOptions, 'defaultTextStyle'>
  *
  * `defaultTextStyle` is the server-side analogue of React's `defaultTextStyle` prop: the doc's runs
  * carry that `textStyle` unless the markup set their own. A default forces plain text through the
- * converter too, since only a doc can carry a mark.
+ * converter too, since only a doc can carry a mark. `blockSpacing` does the same, since only a doc
+ * carries it (REB-25181).
  *
  * NOT idempotent for entity-bearing strings (`&amp;amp;` → `&amp;` → `&`), by nature of decoding.
  * That is safe because this runs at SERVE time on the stored original and its output is returned,

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@rebuy/rebuy",
-    "version": "3.60.3",
+    "version": "3.60.5",
     "description": "Shared zod schemas, legacy-to-CAB widget transforms, and server orchestrators for Rebuy's Shopify consumers (rebuy-api, admin-nextjs, rebuy-shopify-extensions)",
     "license": "MIT",
     "author": "Rebuy, Inc.",