@rebuy/rebuy 3.10.0 → 3.11.0

package/dist/server/composeOffer.d.ts

@@ -3,8 +3,8 @@ import { type AdsEngineOffer } from '../server/adsEngine';
 import { type MonetizeInput } from '../server/shared';
 /**
  * Compose one ads-engine offer into a renderable CAB card: a bordered `layout` whose `viewUrl` is the
- * impression pixel, holding the header chrome, the copy (headline + HTML body, coerced to Tiptap by
- * the text-content schema on parse) beside the optional image (75%/fill — the React desktop split),
+ * impression pixel, holding the header chrome, the copy (headline + HTML body, pre-converted to a
+ * small-sized Tiptap doc by {@link smallText}) beside the optional image (75%/fill — the React desktop split),
  * the two CTAs in a 50/50 row, and the right-aligned Privacy Policy footer. `acceptOffer` links out
  * to the advertiser (`destinationUrl` = `click_url`, which self-tracks); `declineOffer` fires the
  * decline pixel (`trackingUrl`) and advances. Parsing through the schema fills defaults and validates

package/dist/server/index.cjs

@@ -2386,12 +2386,21 @@ var NAMED_ENTITIES = {
   rsquo: "\u2019",
   trade: "\u2122"
 };
-var decodeEntities = (input = "") => input.replace(/&(#x[\da-f]+|#\d+|[a-z][a-z\d]*);/gi, (match, code) => {
-  if (code[0] !== "#") return NAMED_ENTITIES[code.toLowerCase()] ?? match;
-  const isHex = /^#x/i.test(code);
-  const cp = parseInt(code.slice(isHex ? 2 : 1), isHex ? 16 : 10);
-  return Number.isInteger(cp) && cp >= 0 && cp <= 1114111 ? String.fromCodePoint(cp) : match;
+var decodeEntities = (input = "", { keepAngles = false } = {}) => input.replace(/&(#x[\da-f]+|#\d+|[a-z][a-z\d]*);/gi, (match, code) => {
+  let decoded;
+  if (code[0] !== "#") {
+    decoded = NAMED_ENTITIES[code.toLowerCase()] ?? match;
+  } else {
+    const isHex = /^#x/i.test(code);
+    const cp = parseInt(code.slice(isHex ? 2 : 1), isHex ? 16 : 10);
+    decoded = Number.isInteger(cp) && cp >= 0 && cp <= 1114111 ? String.fromCodePoint(cp) : match;
+  }
+  return keepAngles && (decoded === "<" || decoded === ">") ? match : decoded;
 });
+var decodeTextEntities = (input = "") => {
+  const decoded = decodeEntities(input);
+  return isHTML(decoded) ? decodeEntities(input, { keepAngles: true }) : decoded;
+};
 
 // src/transforms/htmlToTiptap/parseAttribs.ts
 var ATTRIB_RE = /([a-zA-Z_:][\w:.-]*)(?:\s*=\s*(?:"([^"]*)"|'([^']*)'|([^\s"'`=<>]+)))?/g;
@@ -2446,7 +2455,7 @@ var openTag = (stack, name, attrs) => {
 // src/transforms/htmlToTiptap/pushText.ts
 var pushText = (state, rawText) => {
   if (!rawText || isSkipping(state.stack)) return;
-  decodeEntities(rawText).split("\n").forEach((segment, index) => {
+  decodeTextEntities(rawText).split("\n").forEach((segment, index) => {
     if (index > 0) flushParagraph(state);
     if (!segment) return;
     const marks = state.stack.flatMap((entry) => entry.marks);
@@ -2718,11 +2727,11 @@ var isMonetizeV1 = isWidgetV1(WidgetType.ui_extension_ad);
 var HTML_TAG_RE2 = /<[a-zA-Z]/;
 var containsHtml = (text2) => HTML_TAG_RE2.test(text2);
 var isObject = (x) => x !== null && typeof x === "object" && !Array.isArray(x);
-var normalizeLangValue = (value) => {
-  if (typeof value !== "string") return value;
+var normalizeTextValue = (value, options = {}) => {
   const tokenized = normalizeTokens(value);
-  return containsHtml(tokenized) ? htmlToTiptap(tokenized) : tokenized;
+  return containsHtml(tokenized) || options.defaultTextStyle ? htmlToTiptap(tokenized, options) : decodeTextEntities(tokenized);
 };
+var normalizeLangValue = (value) => typeof value === "string" ? normalizeTextValue(value) : value;
 var normalizeTextContent = (node) => {
   if (Array.isArray(node)) return node.map(normalizeTextContent);
   if (!isObject(node)) return node;
@@ -3990,6 +3999,10 @@ var label = (text2) => ({
   sectionType: SectionType.text
 });
 var text = (content) => ({ content: { en: content }, sectionType: SectionType.text });
+var smallText = (raw) => ({
+  content: { en: normalizeTextValue(raw, { defaultTextStyle: { fontSize: "small" } }) },
+  sectionType: SectionType.text
+});
 var styled = (value, { align, bold, color, fontSize, href }) => ({
   content: {
     en: {
@@ -4019,8 +4032,8 @@ var shopName = (shop) => shop.replace(/\.myshopify\.com$/, "") || "store";
 var headerSections = (input) => [
   {
     sections: [
-      styled("Congratulations!", { bold: true, fontSize: "large" }),
-      styled(`Your ${shopName(input.shop)} purchase unlocked a bonus:`, { bold: true, fontSize: "large" })
+      styled("Congratulations!", { bold: true, fontSize: "heading" }),
+      styled(`Your ${shopName(input.shop)} purchase unlocked a bonus:`, { bold: true, fontSize: "heading" })
     ],
     sectionType: SectionType.layout,
     spacing: Spacing.none
@@ -4029,7 +4042,7 @@ var headerSections = (input) => [
 ];
 var composeOfferCard = (offer, input) => {
   const copy = {
-    sections: [text(offer.headline), text(offer.description)],
+    sections: [text(offer.headline), smallText(offer.description)],
     sectionType: SectionType.layout,
     spacing: Spacing.tight
   };

package/dist/server/index.mjs

@@ -2338,12 +2338,21 @@ var NAMED_ENTITIES = {
   rsquo: "\u2019",
   trade: "\u2122"
 };
-var decodeEntities = (input = "") => input.replace(/&(#x[\da-f]+|#\d+|[a-z][a-z\d]*);/gi, (match, code) => {
-  if (code[0] !== "#") return NAMED_ENTITIES[code.toLowerCase()] ?? match;
-  const isHex = /^#x/i.test(code);
-  const cp = parseInt(code.slice(isHex ? 2 : 1), isHex ? 16 : 10);
-  return Number.isInteger(cp) && cp >= 0 && cp <= 1114111 ? String.fromCodePoint(cp) : match;
+var decodeEntities = (input = "", { keepAngles = false } = {}) => input.replace(/&(#x[\da-f]+|#\d+|[a-z][a-z\d]*);/gi, (match, code) => {
+  let decoded;
+  if (code[0] !== "#") {
+    decoded = NAMED_ENTITIES[code.toLowerCase()] ?? match;
+  } else {
+    const isHex = /^#x/i.test(code);
+    const cp = parseInt(code.slice(isHex ? 2 : 1), isHex ? 16 : 10);
+    decoded = Number.isInteger(cp) && cp >= 0 && cp <= 1114111 ? String.fromCodePoint(cp) : match;
+  }
+  return keepAngles && (decoded === "<" || decoded === ">") ? match : decoded;
 });
+var decodeTextEntities = (input = "") => {
+  const decoded = decodeEntities(input);
+  return isHTML(decoded) ? decodeEntities(input, { keepAngles: true }) : decoded;
+};
 
 // src/transforms/htmlToTiptap/parseAttribs.ts
 var ATTRIB_RE = /([a-zA-Z_:][\w:.-]*)(?:\s*=\s*(?:"([^"]*)"|'([^']*)'|([^\s"'`=<>]+)))?/g;
@@ -2398,7 +2407,7 @@ var openTag = (stack, name, attrs) => {
 // src/transforms/htmlToTiptap/pushText.ts
 var pushText = (state, rawText) => {
   if (!rawText || isSkipping(state.stack)) return;
-  decodeEntities(rawText).split("\n").forEach((segment, index) => {
+  decodeTextEntities(rawText).split("\n").forEach((segment, index) => {
     if (index > 0) flushParagraph(state);
     if (!segment) return;
     const marks = state.stack.flatMap((entry) => entry.marks);
@@ -2670,11 +2679,11 @@ var isMonetizeV1 = isWidgetV1(WidgetType.ui_extension_ad);
 var HTML_TAG_RE2 = /<[a-zA-Z]/;
 var containsHtml = (text2) => HTML_TAG_RE2.test(text2);
 var isObject = (x) => x !== null && typeof x === "object" && !Array.isArray(x);
-var normalizeLangValue = (value) => {
-  if (typeof value !== "string") return value;
+var normalizeTextValue = (value, options = {}) => {
   const tokenized = normalizeTokens(value);
-  return containsHtml(tokenized) ? htmlToTiptap(tokenized) : tokenized;
+  return containsHtml(tokenized) || options.defaultTextStyle ? htmlToTiptap(tokenized, options) : decodeTextEntities(tokenized);
 };
+var normalizeLangValue = (value) => typeof value === "string" ? normalizeTextValue(value) : value;
 var normalizeTextContent = (node) => {
   if (Array.isArray(node)) return node.map(normalizeTextContent);
   if (!isObject(node)) return node;
@@ -3942,6 +3951,10 @@ var label = (text2) => ({
   sectionType: SectionType.text
 });
 var text = (content) => ({ content: { en: content }, sectionType: SectionType.text });
+var smallText = (raw) => ({
+  content: { en: normalizeTextValue(raw, { defaultTextStyle: { fontSize: "small" } }) },
+  sectionType: SectionType.text
+});
 var styled = (value, { align, bold, color, fontSize, href }) => ({
   content: {
     en: {
@@ -3971,8 +3984,8 @@ var shopName = (shop) => shop.replace(/\.myshopify\.com$/, "") || "store";
 var headerSections = (input) => [
   {
     sections: [
-      styled("Congratulations!", { bold: true, fontSize: "large" }),
-      styled(`Your ${shopName(input.shop)} purchase unlocked a bonus:`, { bold: true, fontSize: "large" })
+      styled("Congratulations!", { bold: true, fontSize: "heading" }),
+      styled(`Your ${shopName(input.shop)} purchase unlocked a bonus:`, { bold: true, fontSize: "heading" })
     ],
     sectionType: SectionType.layout,
     spacing: Spacing.none
@@ -3981,7 +3994,7 @@ var headerSections = (input) => [
 ];
 var composeOfferCard = (offer, input) => {
   const copy = {
-    sections: [text(offer.headline), text(offer.description)],
+    sections: [text(offer.headline), smallText(offer.description)],
     sectionType: SectionType.layout,
     spacing: Spacing.tight
   };

package/dist/transforms/htmlToTiptap/decodeEntities.d.ts

@@ -1 +1,19 @@
-export declare const decodeEntities: (input?: string) => string;
+export type DecodeEntitiesOptions = {
+    /**
+     * Leave every entity that would decode to `<` or `>` (named, decimal or hex, any case) as its
+     * literal source text. Decided on the DECODED character, not the spelling, so `&lt;`, `&#60;`
+     * and `&#x3C;` are one rule — there is no second list of angle spellings to keep in sync.
+     */
+    keepAngles?: boolean;
+};
+export declare const decodeEntities: (input?: string, { keepAngles }?: DecodeEntitiesOptions) => string;
+/**
+ * The entity decode for DISPLAY text — every text run and plain-string content value the CAB
+ * pipeline produces. Fully decodes ordinary entities (`&amp;` → `&`, `5 &lt; 10` → `5 < 10`), but
+ * when the fully-decoded result is tag-shaped (`&lt;b&gt;` → `<b>`) it re-decodes holding the
+ * angle entities, because `CABTextSection.content` carries a `NO_HTML` refine that rejects
+ * tag-shaped text and would otherwise drop the whole section — silent content loss, which is worse
+ * than showing the escaped literal. Uses the refine's own `isHTML` predicate so guard and gate can't
+ * drift. Single-pass by construction: a double-escaped `&amp;lt;` resolves to literal `&lt;` and stops.
+ */
+export declare const decodeTextEntities: (input?: string) => string;

package/dist/transforms/index.cjs

@@ -1837,12 +1837,21 @@ var NAMED_ENTITIES = {
   rsquo: "\u2019",
   trade: "\u2122"
 };
-var decodeEntities = (input = "") => input.replace(/&(#x[\da-f]+|#\d+|[a-z][a-z\d]*);/gi, (match, code) => {
-  if (code[0] !== "#") return NAMED_ENTITIES[code.toLowerCase()] ?? match;
-  const isHex = /^#x/i.test(code);
-  const cp = parseInt(code.slice(isHex ? 2 : 1), isHex ? 16 : 10);
-  return Number.isInteger(cp) && cp >= 0 && cp <= 1114111 ? String.fromCodePoint(cp) : match;
+var decodeEntities = (input = "", { keepAngles = false } = {}) => input.replace(/&(#x[\da-f]+|#\d+|[a-z][a-z\d]*);/gi, (match, code) => {
+  let decoded;
+  if (code[0] !== "#") {
+    decoded = NAMED_ENTITIES[code.toLowerCase()] ?? match;
+  } else {
+    const isHex = /^#x/i.test(code);
+    const cp = parseInt(code.slice(isHex ? 2 : 1), isHex ? 16 : 10);
+    decoded = Number.isInteger(cp) && cp >= 0 && cp <= 1114111 ? String.fromCodePoint(cp) : match;
+  }
+  return keepAngles && (decoded === "<" || decoded === ">") ? match : decoded;
 });
+var decodeTextEntities = (input = "") => {
+  const decoded = decodeEntities(input);
+  return isHTML(decoded) ? decodeEntities(input, { keepAngles: true }) : decoded;
+};
 
 // src/transforms/htmlToTiptap/parseAttribs.ts
 var ATTRIB_RE = /([a-zA-Z_:][\w:.-]*)(?:\s*=\s*(?:"([^"]*)"|'([^']*)'|([^\s"'`=<>]+)))?/g;
@@ -1897,7 +1906,7 @@ var openTag = (stack, name, attrs) => {
 // src/transforms/htmlToTiptap/pushText.ts
 var pushText = (state, rawText) => {
   if (!rawText || isSkipping(state.stack)) return;
-  decodeEntities(rawText).split("\n").forEach((segment, index) => {
+  decodeTextEntities(rawText).split("\n").forEach((segment, index) => {
     if (index > 0) flushParagraph(state);
     if (!segment) return;
     const marks = state.stack.flatMap((entry) => entry.marks);
@@ -2169,11 +2178,11 @@ var isMonetizeV1 = isWidgetV1(WidgetType.ui_extension_ad);
 var HTML_TAG_RE2 = /<[a-zA-Z]/;
 var containsHtml = (text) => HTML_TAG_RE2.test(text);
 var isObject = (x) => x !== null && typeof x === "object" && !Array.isArray(x);
-var normalizeLangValue = (value) => {
-  if (typeof value !== "string") return value;
+var normalizeTextValue = (value, options = {}) => {
   const tokenized = normalizeTokens(value);
-  return containsHtml(tokenized) ? htmlToTiptap(tokenized) : tokenized;
+  return containsHtml(tokenized) || options.defaultTextStyle ? htmlToTiptap(tokenized, options) : decodeTextEntities(tokenized);
 };
+var normalizeLangValue = (value) => typeof value === "string" ? normalizeTextValue(value) : value;
 var normalizeTextContent = (node) => {
   if (Array.isArray(node)) return node.map(normalizeTextContent);
   if (!isObject(node)) return node;

package/dist/transforms/index.mjs

@@ -1780,12 +1780,21 @@ var NAMED_ENTITIES = {
   rsquo: "\u2019",
   trade: "\u2122"
 };
-var decodeEntities = (input = "") => input.replace(/&(#x[\da-f]+|#\d+|[a-z][a-z\d]*);/gi, (match, code) => {
-  if (code[0] !== "#") return NAMED_ENTITIES[code.toLowerCase()] ?? match;
-  const isHex = /^#x/i.test(code);
-  const cp = parseInt(code.slice(isHex ? 2 : 1), isHex ? 16 : 10);
-  return Number.isInteger(cp) && cp >= 0 && cp <= 1114111 ? String.fromCodePoint(cp) : match;
+var decodeEntities = (input = "", { keepAngles = false } = {}) => input.replace(/&(#x[\da-f]+|#\d+|[a-z][a-z\d]*);/gi, (match, code) => {
+  let decoded;
+  if (code[0] !== "#") {
+    decoded = NAMED_ENTITIES[code.toLowerCase()] ?? match;
+  } else {
+    const isHex = /^#x/i.test(code);
+    const cp = parseInt(code.slice(isHex ? 2 : 1), isHex ? 16 : 10);
+    decoded = Number.isInteger(cp) && cp >= 0 && cp <= 1114111 ? String.fromCodePoint(cp) : match;
+  }
+  return keepAngles && (decoded === "<" || decoded === ">") ? match : decoded;
 });
+var decodeTextEntities = (input = "") => {
+  const decoded = decodeEntities(input);
+  return isHTML(decoded) ? decodeEntities(input, { keepAngles: true }) : decoded;
+};
 
 // src/transforms/htmlToTiptap/parseAttribs.ts
 var ATTRIB_RE = /([a-zA-Z_:][\w:.-]*)(?:\s*=\s*(?:"([^"]*)"|'([^']*)'|([^\s"'`=<>]+)))?/g;
@@ -1840,7 +1849,7 @@ var openTag = (stack, name, attrs) => {
 // src/transforms/htmlToTiptap/pushText.ts
 var pushText = (state, rawText) => {
   if (!rawText || isSkipping(state.stack)) return;
-  decodeEntities(rawText).split("\n").forEach((segment, index) => {
+  decodeTextEntities(rawText).split("\n").forEach((segment, index) => {
     if (index > 0) flushParagraph(state);
     if (!segment) return;
     const marks = state.stack.flatMap((entry) => entry.marks);
@@ -2112,11 +2121,11 @@ var isMonetizeV1 = isWidgetV1(WidgetType.ui_extension_ad);
 var HTML_TAG_RE2 = /<[a-zA-Z]/;
 var containsHtml = (text) => HTML_TAG_RE2.test(text);
 var isObject = (x) => x !== null && typeof x === "object" && !Array.isArray(x);
-var normalizeLangValue = (value) => {
-  if (typeof value !== "string") return value;
+var normalizeTextValue = (value, options = {}) => {
   const tokenized = normalizeTokens(value);
-  return containsHtml(tokenized) ? htmlToTiptap(tokenized) : tokenized;
+  return containsHtml(tokenized) || options.defaultTextStyle ? htmlToTiptap(tokenized, options) : decodeTextEntities(tokenized);
 };
+var normalizeLangValue = (value) => typeof value === "string" ? normalizeTextValue(value) : value;
 var normalizeTextContent = (node) => {
   if (Array.isArray(node)) return node.map(normalizeTextContent);
   if (!isObject(node)) return node;

package/dist/transforms/normalizeTextContent.d.ts

@@ -1,11 +1,38 @@
+import { type TiptapDocument } from '../schema/widgets/checkout-and-beyond/text';
+import { type HtmlToTiptapOptions } from '../transforms/htmlToTiptap/htmlToTiptap';
+export type NormalizeTextOptions = Pick<HtmlToTiptapOptions, 'defaultTextStyle'>;
 /**
- * Walks an untyped CABRootSection-shaped object (post deepCamelCase, pre schema
- * parse) and rewrites `text` sections' `content[lang]` strings so that:
+ * 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:
+ *
+ * 1. `{firstName}` (single brace) becomes `{{firstName}}` (canonical).
+ * 2. HTML becomes a fully-formed `TiptapDocument` (entities decoded per run by `htmlToTiptap`).
+ * 3. Plain text is entity-decoded in place and stays a string, so `Sale &amp; Save` never renders
+ * its `&amp;` literally and URL-bearing values (`buttonField: destinationUrl`) keep the string
+ * shape their validation expects.
+ *
+ * Both decodes run through `decodeTextEntities`, which holds tag-shaped angle entities escaped so a
+ * decode can never manufacture the text the section's `NO_HTML` refine rejects.
+ *
+ * `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.
  *
- * - `{firstName}` (single brace) becomes `{{firstName}}` (canonical), and
- * - HTML-laden strings become a fully-formed `TiptapDocument`.
+ * 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,
+ * never written back — rebuy-api's `/cab/*` routes are read-only and admin-nextjs never invokes the
+ * walk. Keep it that way: a save path that persisted this output would degrade one entity level per
+ * cycle. (Docs are immune — the walk leaves them untouched.)
+ */
+export declare const normalizeTextValue: (value: string, options?: NormalizeTextOptions) => string | TiptapDocument;
+/**
+ * Walks an untyped CABRootSection-shaped object (post deepCamelCase, pre schema
+ * parse) and runs every `text` section's `content[lang]` string through
+ * {@link normalizeTextValue}. Already-converted Tiptap docs pass through untouched,
+ * so a caller that needed {@link normalizeTextValue}'s options can convert first
+ * and hand the result to this walk without double-conversion.
  *
- * Plain strings pass through unchanged. Non-text sections only recurse into
- * their `sections` array; Tiptap docs and other nested objects are not walked.
+ * Non-text sections only recurse into their `sections` array; Tiptap docs and
+ * other nested objects are not walked.
  */
 export declare const normalizeTextContent: (node: unknown) => unknown;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@rebuy/rebuy",
-    "version": "3.10.0",
+    "version": "3.11.0",
     "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.",