@koda-sl/baker-cli 0.419.0 → 0.420.0

package/dist/{chunk-IS5ERYGR.js → chunk-M2E2OYY6.js}

@@ -14634,6 +14634,7 @@ var ROLE_WORDS = {
   discount: "the discount",
   cta: "the button",
   button: "the button",
+  call_to_action: "the button",
   caption: "a caption",
   fine_print: "the fine print",
   legal: "the fine print",
@@ -14674,7 +14675,8 @@ function textNotes(copy, profile) {
     notes.push(`Keep every accent and mark exactly: ${marks.join(" ")}.`);
   return notes;
 }
-var isButton = (l) => l.role?.toLowerCase() === "cta" || /button/i.test(l.look ?? "");
+var BUTTON_ROLES = /* @__PURE__ */ new Set(["cta", "button", "call_to_action"]);
+var isButton = (l) => BUTTON_ROLES.has(roleKey(l.role)) || /button/i.test(l.look ?? "");
 var FIGURE_ROLES = /* @__PURE__ */ new Set(["price", "stat", "figure", "number", "discount"]);
 var HEADLINE_ROLES = /* @__PURE__ */ new Set(["headline", "title"]);
 var FINE_PRINT_ROLES = /* @__PURE__ */ new Set(["fine_print", "legal", "disclaimer", "footnote"]);
@@ -14781,10 +14783,10 @@ function variantDirection(c) {
 }
 var DEPARTS = "It leads where it differs from the scene and line notes above.";
 var DEPARTS_SHORT = "It leads over the notes above.";
-var SUPPORT_ROLE = /\b(?:cta|fine[_ ]?print|legal|footnote|attribution|disclaimer)\b/i;
+var isSupport = (l) => isButton(l) || FINE_PRINT_ROLES.has(roleKey(l.role)) || roleKey(l.role) === "attribution";
 function hookDirection(c) {
   const hooks = c.spec.copy.flatMap(
-    (l, i) => l.lettering === "designed" && !isButton(l) && !SUPPORT_ROLE.test(l.role ?? "") ? [{ n: i + 1, text: l.text }] : []
+    (l, i) => l.lettering === "designed" && !isSupport(l) ? [{ n: i + 1, text: l.text }] : []
   );
   const [first, ...rest] = hooks;
   const lead = rest.find((l) => /\d/.test(l.text)) ?? rest[0];
@@ -15351,24 +15353,26 @@ function logoSlot(frame, safe, opts = {}) {
 var STATIC_ADAPT_FORMAT_ROLE = "static_adapt_format";
 function adaptPlan(model, format, placements) {
   const renderRatio = nearestSupportedAspectRatio("image_generate", model, format);
+  return {
+    format,
+    ...placements && placements.length > 0 ? { placements: [...placements] } : {},
+    renderRatio,
+    size: deliveredSize(format),
+    safe: safeAreaOnFrame(renderRatio, format, placements)
+  };
+}
+function safeAreaOnFrame(frame, format, placements) {
   const own = staticSafeArea(format, placements);
-  const rendered = ratioValue2(renderRatio);
+  const rendered = ratioValue2(frame);
   const delivered = ratioValue2(format);
   const keepH = rendered < delivered ? rendered / delivered : 1;
   const keepW = rendered > delivered ? delivered / rendered : 1;
-  const safe = {
+  return {
     top: (1 - keepH) / 2 + own.top * keepH,
     bottom: (1 - keepH) / 2 + own.bottom * keepH,
     left: (1 - keepW) / 2 + own.left * keepW,
     right: (1 - keepW) / 2 + own.right * keepW
   };
-  return {
-    format,
-    ...placements && placements.length > 0 ? { placements: [...placements] } : {},
-    renderRatio,
-    size: deliveredSize(format),
-    safe
-  };
 }
 function trimmedRenderBand(plan) {
   const own = staticSafeArea(plan.format, plan.placements);
@@ -15498,6 +15502,9 @@ function adaptBrief(spec, profile, opts) {
         scaleText(plan, spec, flowing, zoned, short)
       ];
       paragraphs.splice(textAt + 1, 0, ...added);
+    } else if (zoned) {
+      const layoutAt = paragraphs.findIndex((p) => p.startsWith("Layout:"));
+      paragraphs.splice(layoutAt > 0 ? layoutAt : 1, 0, zonesText(plan, flowing, ground, short));
     }
     return paragraphs.join("\n\n");
   };
@@ -15565,9 +15572,17 @@ function formatOfSize(size) {
   const g = gcd(size.width, size.height);
   return `${size.width / g}:${size.height / g}`;
 }
-function safeAreaOf(format) {
-  const { top, bottom, left, right } = staticSafeArea(format);
-  return { top, bottom, left, right };
+function safeAreaOf(adaptFormat, delivered) {
+  const { top, bottom, left, right } = staticSafeArea(adaptFormat);
+  return delivered.map((f) => safeAreaOnFrame(adaptFormat, f)).reduce(
+    (a, b) => ({
+      top: Math.max(a.top, b.top),
+      bottom: Math.max(a.bottom, b.bottom),
+      left: Math.max(a.left, b.left),
+      right: Math.max(a.right, b.right)
+    }),
+    { top, bottom, left, right }
+  );
 }
 function magick(id, role, image, args, extra = {}) {
   return {
@@ -15636,7 +15651,15 @@ function staticRenderNodes(g) {
         model: g.adaptModel,
         formats: adaptFormats,
         image_size: ADAPT_IMAGE_SIZE,
-        safe_areas: Object.fromEntries(adaptFormats.map((f) => [f, safeAreaOf(f)]))
+        safe_areas: Object.fromEntries(
+          adaptFormats.map((f) => [
+            f,
+            safeAreaOf(
+              f,
+              adapted.filter((s) => (s.adaptFormat ?? s.format) === f).map((s) => s.format)
+            )
+          ])
+        )
       },
       tags: { role: STATIC_ADAPT_ROLE }
     });
@@ -21188,11 +21211,25 @@ function assign(targets, words, claimed, threshold) {
   }
   return matches;
 }
-function joinHyphenBreaks(texts) {
+function hyphenatedCompounds(texts) {
+  const out = /* @__PURE__ */ new Set();
+  for (const text of texts) {
+    for (const [compound] of text.normalize("NFKC").toLowerCase().matchAll(new RegExp("\\p{L}+(?:[-\u2010\u2011]\\p{L}+)+", "gu"))) {
+      const words = compound.split(/[-‐‑]/u);
+      for (let i = 1; i < words.length; i++) out.add(`${words[i - 1]}-${words[i]}`);
+    }
+  }
+  return out;
+}
+function joinHyphenBreaks(texts, compounds) {
   const out = [];
   let carry = "";
   for (const text of texts) {
-    const line = carry + text.trim();
+    const next = text.trim();
+    const before = carry.match(new RegExp("\\p{L}+$", "u"))?.[0] ?? "";
+    const after = next.match(new RegExp("^\\p{L}+", "u"))?.[0] ?? "";
+    const own = carry !== "" && compounds.has(`${before}-${after}`.normalize("NFKC").toLowerCase());
+    const line = carry + (own ? "-" : "") + next;
     const broken = line.match(new RegExp("^(.*\\p{L})[-\u2010\u2011]$", "u"));
     if (broken) carry = broken[1] ?? "";
     else {
@@ -21208,7 +21245,9 @@ function lineParts(text) {
   return parts.length > 0 ? parts : [text];
 }
 function textMismatch(expected, boxes, opts = {}) {
-  const words = joinHyphenBreaks(boxes.filter((b) => b.kind === "text").map((b) => b.text)).flatMap(
+  const compounds = hyphenatedCompounds(expected.map((line) => line.text));
+  const texts = boxes.filter((b) => b.kind === "text").map((b) => b.text);
+  const words = joinHyphenBreaks(texts, compounds).flatMap(
     (text, box) => normalizeCopy(text).split(" ").filter((word) => word.length > 0).map((word) => ({ word, box }))
   );
   const claimed = /* @__PURE__ */ new Set();
@@ -21223,7 +21262,10 @@ function textMismatch(expected, boxes, opts = {}) {
   );
   assign((opts.allowed ?? []).map(normalizeCopy), words, claimed, ALLOWED_MATCH);
   const lines = expected.flatMap((line, index) => {
-    const lineMatches = parts.flatMap((part, partIndex) => part.lineIndex === index ? [matches.get(partIndex)] : []);
+    const lineMatches = parts.flatMap(
+      (part, partIndex) => part.lineIndex === index && part.text.length > 0 ? [matches.get(partIndex)] : []
+    );
+    if (lineMatches.length === 0) return [];
     const score = Math.min(...lineMatches.map((match) => match?.similarity ?? 0));
     if (score >= 1 - MAX_LINE_DISTANCE) return [];
     const read = lineMatches.flatMap((match) => match ? [match.span.text] : []).join(" ");
@@ -22268,7 +22310,7 @@ function rankOf(boxes, blocking, want) {
   const logoFound = boxes.some((b) => b.kind === "logo" || brand !== null && normalizeCopy(b.text) === brand);
   const noLogo = want.logo && !logoFound ? 1 : 0;
   const noButton = off.some((l) => want.buttons.has(l.text)) ? 1 : 0;
-  const outOfBand = bandViolations(boxes, want.format, { band: want.band }).length;
+  const outOfBand = bandViolations(boxes, want.format, want.grade).length;
   return {
     rank: [blocking.length, off.length, noLogo, noButton, outOfBand],
     shortfalls: noLogo ? [NO_LOGO] : []
@@ -22303,6 +22345,7 @@ async function prefilterVariants(variants, spec, formats, opts = {}) {
     ...opts.placements ? { placements: opts.placements } : {}
   });
   const format = plan.master.format;
+  const grade = plan.masterShape === "relayout" ? plan.placements ? { placements: plan.placements } : {} : { band: plan.band };
   const checked = await Promise.all(
     variants.map(async (variant) => {
       const source = variant.path ?? variant.url;
@@ -22314,7 +22357,7 @@ async function prefilterVariants(variants, spec, formats, opts = {}) {
           format,
           lines,
           allowed: brand ? [brand] : [],
-          band: plan.band,
+          ...grade,
           toFrame: (boxes) => coverFitBoxes(boxes, { width, height }, plan.master.size),
           ...opts.read ? { read: opts.read } : {},
           ...opts.onSpend ? { onSpend: opts.onSpend } : {}
@@ -22322,7 +22365,7 @@ async function prefilterVariants(variants, spec, formats, opts = {}) {
         if (check.status === "not_checked") return { index: variant.index, blocking: null };
         const prefix = `${format}: `;
         const blocking = check.findings.filter((f) => f.severity === "blocking").map((f) => f.what.startsWith(prefix) ? f.what.slice(prefix.length) : f.what);
-        const want = { lines, buttons, ...brand ? { brand } : {}, logo, format, band: plan.band };
+        const want = { lines, buttons, ...brand ? { brand } : {}, logo, format, grade };
         return { index: variant.index, blocking, ...rankOf(check.boxes, blocking, want) };
       } catch {
         return { index: variant.index, blocking: null };
@@ -24386,4 +24429,4 @@ export {
   defaultRegistry,
   createEngineFromEnv
 };
-//# sourceMappingURL=chunk-IS5ERYGR.js.map
+//# sourceMappingURL=chunk-M2E2OYY6.js.map