@bettercms-ai/convert 0.9.0 → 0.11.0

package/dist/cli.js

@@ -2562,6 +2562,7 @@ var IMAGE_SOURCES = {
   video: ["poster"]
 };
 var isImageSource = (site) => site.where === "attr" && (IMAGE_SOURCES[site.tag.toLowerCase()] ?? []).includes(site.attr ?? "");
+var ownsSubtree = (kind, site, inline) => kind === "richtext" && (inline === true ? !site.nonHtml : !(site.mixed && site.textRange !== null));
 var norm = (value) => decodeEntities(value.normalize("NFC")).replace(/\s+/g, " ").trim();
 var BCMS_ATTRS = [
   "data-bcms-field",
@@ -2594,6 +2595,7 @@ function openTagEnd(content, start) {
   }
   return content.length;
 }
+var OPAQUE_TAGS = /* @__PURE__ */ new Set(["pre"]);
 var isBlank = (value) => value.trim() === "";
 function renderedText(node) {
   if (node.type === "text") return node.value;
@@ -2601,6 +2603,11 @@ function renderedText(node) {
   return "";
 }
 var attrsOf = (node) => Object.fromEntries(node.attrs.map((a) => [a.name, a.value]));
+function nonHtmlSubtree(node) {
+  return node.children.some(
+    (c) => c.type === "expr" || c.type === "element" && (!isIntrinsic(c.tag) || c.tag === "slot" || nonHtmlSubtree(c))
+  );
+}
 function soleTextChild(node) {
   const texts = node.children.filter((c) => c.type === "text" && !isBlank(c.value));
   return texts.length === 1 ? texts[0] : null;
@@ -2637,10 +2644,12 @@ function collectSites(roots, literals) {
     if (node.type !== "element") return matched;
     const attrs = attrsOf(node);
     let index = 0;
-    for (const child of node.children) {
-      const childWalk = { ancestors: [...walk.ancestors, node.tag], siblingIndex: index };
-      if (child.type === "element") index++;
-      for (const hit of visit(child, childWalk)) matched.add(hit);
+    if (!OPAQUE_TAGS.has(node.tag)) {
+      for (const child of node.children) {
+        const childWalk = { ancestors: [...walk.ancestors, node.tag], siblingIndex: index };
+        if (child.type === "element") index++;
+        for (const hit of visit(child, childWalk)) matched.add(hit);
+      }
     }
     if (node.raw) {
       const text2 = norm(renderedTextRaw(node));
@@ -2666,6 +2675,7 @@ function collectSites(roots, literals) {
         textRange: soleTextChild(node)?.range ?? null,
         literal,
         partial: false,
+        ...nonHtmlSubtree(node) ? { nonHtml: true } : {},
         ancestors: walk.ancestors,
         siblingIndex: walk.siblingIndex
       });
@@ -2691,6 +2701,7 @@ function collectSites(roots, literals) {
           textRange: own.range,
           literal,
           partial: false,
+          ...nonHtmlSubtree(node) ? { nonHtml: true } : {},
           ancestors: walk.ancestors,
           siblingIndex: walk.siblingIndex
         });
@@ -2741,10 +2752,12 @@ function partials(node, literals, walk, out) {
   if (node.type !== "element" || node.raw) return false;
   let deeper = false;
   let index = 0;
-  for (const child of node.children) {
-    const childWalk = { ancestors: [...walk.ancestors, node.tag], siblingIndex: index };
-    if (child.type === "element") index++;
-    if (partials(child, literals, childWalk, out)) deeper = true;
+  if (!OPAQUE_TAGS.has(node.tag)) {
+    for (const child of node.children) {
+      const childWalk = { ancestors: [...walk.ancestors, node.tag], siblingIndex: index };
+      if (child.type === "element") index++;
+      if (partials(child, literals, childWalk, out)) deeper = true;
+    }
   }
   if (deeper) return true;
   const text = norm(renderedText(node));
@@ -4129,7 +4142,7 @@ function bindImages(ctx, targets) {
 
 // src/helper.ts
 import { createHash as createHash2 } from "crypto";
-var HELPER_VERSION = 6;
+var HELPER_VERSION = 7;
 var HEADER = "// @bettercms-ai/convert helper v";
 var HELPER_PATH = Object.fromEntries(
   Object.keys(DIALECT_RULES).map((d) => [d, DIALECT_RULES[d].helper])
@@ -4322,9 +4335,65 @@ export function bcmsSection(page: unknown, bind?: string, overrides?: unknown):
  * how the codemod ran: one component renders a Phase A placement on one page and a Phase B
  * instance on the next, and a repository does not have to be re-cut when its copy moves.
  */
+/** How a flat field family maps page paths to an instance's override keys. @see bcmsSectionPaths */
+export type BcmsPathMap = {
+  scalars?: Record<string, string>;
+  tables?: Record<string, { key: string; columns: Record<string, string> }>;
+};
+
+/**
+ * The snapshot for a section whose page fields are a FLAT family (\`wrap-h2-latest\`, not \`wrap.h2_latest\`).
+ *
+ * \`bcmsSection\` returns a group object read through a dotted path, which a flat family does not have: its
+ * copy lives in top-level keys of the page snapshot. So this answers in the page's own spelling \u2014 the
+ * markup reads \`bcms(snapshot, "wrap-h2-latest", \u2026)\` verbatim \u2014 with every mapped path set explicitly:
+ *
+ * - the instance's override for that key when it holds one (a table's rows re-spelled with the page's
+ *   column names, \`{ rows }\` unwrapped as in \`bcmsSection\`);
+ * - else, for a placement bound to a group, the page value at the path re-based onto that group;
+ * - else NOTHING \u2014 a placement that owns its copy never falls back to the page's stale copy, exactly as
+ *   \`bcmsSection\` synthesizes no group for it.
+ *
+ * Every other page key passes through, so reads outside the family (a shared link) keep working.
+ */
+export function bcmsSectionPaths(
+  page: unknown,
+  bind: string | undefined,
+  overrides: unknown,
+  prefix: string,
+  map: BcmsPathMap,
+): Record<string, unknown> {
+  const out: Record<string, unknown> = isRecord(page) ? { ...page } : {};
+  const own = isRecord(overrides) ? overrides : {};
+  const separator = prefix.slice(-1);
+  const fromPage = (path: string): unknown =>
+    bind ? readPath(page, bind + separator + path.slice(prefix.length)) : undefined;
+  for (const [path, key] of Object.entries(map.scalars ?? {})) {
+    const value = own[key];
+    out[path] = value !== undefined && value !== null ? value : fromPage(path);
+  }
+  for (const [path, table] of Object.entries(map.tables ?? {})) {
+    const held = own[table.key];
+    const rows = isRecord(held) && Array.isArray(held.rows) ? held.rows : held;
+    if (!Array.isArray(rows)) {
+      out[path] = fromPage(path);
+      continue;
+    }
+    const pageColumn = new Map(Object.entries(table.columns).map(([column, key]) => [key, column]));
+    out[path] = rows.map((row) => {
+      if (!isRecord(row)) return row;
+      const spelled: Record<string, unknown> = {};
+      for (const [key, value] of Object.entries(row)) spelled[pageColumn.get(key) ?? key] = value;
+      return spelled;
+    });
+  }
+  return out;
+}
+
 export function bcmsFields(
   placement: { blockId?: string; bind?: string; overrides?: unknown },
   pathPrefix: string,
+  map?: BcmsPathMap,
 ): (path: string) => string {
   const id = placement.blockId;
   const own = typeof id === "string" && id !== "" && !placement.bind && isRecord(placement.overrides);
@@ -4337,6 +4406,24 @@ export function bcmsFields(
    * so prepending one would invent an address rather than correct it.
    */
   const lane = own ? \`\${id}__overrides.\` : placement.bind && pathPrefix ? \`\${placement.bind}.\` : null;
+  if (map) {
+    /**
+     * A FLAT family: the address is not "prefix swapped". The instance lane names the override key the
+     * plan allocated (\`h2_latest\`, \`group_webgl[0].a_webgl\`); the bind lane keeps the page's own
+     * separator (\`landing-h2-latest\`, never \`landing.h2-latest\`).
+     */
+    const separator = pathPrefix.slice(-1);
+    return (path: string): string => {
+      if (!path.startsWith(pathPrefix) || !(own || placement.bind)) return path;
+      if (!own) return placement.bind + separator + path.slice(pathPrefix.length);
+      const scalar = map.scalars?.[path];
+      if (scalar !== undefined) return id + "__overrides." + scalar;
+      const row = /^([^[]+)\\[(\\d+)\\]\\.(.+)$/.exec(path);
+      const table = row ? map.tables?.[row[1]] : undefined;
+      const column = row && table ? table.columns[row[3]] : undefined;
+      return table && column !== undefined ? id + "__overrides." + table.key + "[" + row![2] + "]." + column : path;
+    };
+  }
   return (path: string): string => {
     // A path outside the group this section was cut from is not one this placement re-addresses:
     // it names a key the instance does not hold and a group this placement is not bound to.
@@ -4353,21 +4440,24 @@ var HISTORICAL = {
     2: "51e2ae65ddd86bf43d14e29b3865e3f16e45f72069692d1fea57e1f986a894f0",
     3: "d4305b2983adcb456ef782d35ea9d083a04465c2b68baa0d44a084dfa01a9227",
     4: "a5742f64dacb1b26ee6dd5e1469a54871487934c71bc8267df19e3a80e417595",
-    5: "0472fe3ffdcfa49e719c7b9da9cb63b6eba637cc22783bb00c3c2cadd3d800da"
+    5: "0472fe3ffdcfa49e719c7b9da9cb63b6eba637cc22783bb00c3c2cadd3d800da",
+    6: "c907e7245578d947c6541b1ab2c5c6659ea7789a1519e895b4a4aed122c6f649"
   },
   "src/lib/bcms-content.ts": {
     1: "ae72ae14d706943d481c880d70da5789b4816ba1ba319a10fbc63ded4d0b42f2",
     2: "a18731eb42f7db55dac0591c45f873758cde8e103fefcd6e5caf67936ae6a002",
     3: "0be9c73160361882a038552bc02673c14ed532287823dabaafe36179bc55ed7e",
     4: "0146d027a727ecd3c9e3fc336fcf1299b59ddf75b04091c05703f3f983ec28af",
-    5: "c8c93655320fa65664611ba84541f3fa7bfa292cc9a2fd655373440b99049fba"
+    5: "c8c93655320fa65664611ba84541f3fa7bfa292cc9a2fd655373440b99049fba",
+    6: "63f1fa29e47e70c5193b81ee24addb238ba100247124d55bc17713102d587df5"
   },
   "composables/bcms-content.ts": {
     1: "c272412532efed7db64b6cf313b2bed4291f9951430412289c8a588b7f565407",
     2: "51e2ae65ddd86bf43d14e29b3865e3f16e45f72069692d1fea57e1f986a894f0",
     3: "d4305b2983adcb456ef782d35ea9d083a04465c2b68baa0d44a084dfa01a9227",
     4: "a5742f64dacb1b26ee6dd5e1469a54871487934c71bc8267df19e3a80e417595",
-    5: "0472fe3ffdcfa49e719c7b9da9cb63b6eba637cc22783bb00c3c2cadd3d800da"
+    5: "0472fe3ffdcfa49e719c7b9da9cb63b6eba637cc22783bb00c3c2cadd3d800da",
+    6: "c907e7245578d947c6541b1ab2c5c6659ea7789a1519e895b4a4aed122c6f649"
   }
 };
 var sha256 = (value) => createHash2("sha256").update(value, "utf8").digest("hex");
@@ -4384,14 +4474,23 @@ function isKnownHelper(content, dialect) {
 
 // src/locate.ts
 var flat = (value) => value.replace(/\s+/g, " ").trim();
-var stripTags = (value) => value.replace(/<br\s*\/?>/gi, " ").replace(/<[^>]*>/g, "");
+var stripTags = (value, br = " ") => value.replace(/<br\s*\/?>/gi, br).replace(/<[^>]*>/g, "");
 function locate(brief, sources, options) {
   const flattened = sources.map((s) => {
     const readable = unwrapJsxStrings(decodeEntities(s.content));
     return {
       path: s.path,
       content: flat(readable),
-      text: options?.stripTags ? flat(stripTags(readable)) : null
+      text: options?.stripTags ? flat(stripTags(readable)) : null,
+      /**
+       * 🔴 A `<br>` IS A SPACE TO A READER AND NOTHING TO `textContent`, and the derive lane reads
+       * the DOM. `<h1>Launch your site<br /><span>fast.</span></h1>` is one INLINE richtext field
+       * whose value is `Launch your sitefast.` — no space, because no text node holds one — while
+       * this prefilter's only reading inserted one, so the file was never opened and every split
+       * heading on every imported site came back NOT_IN_SOURCE. Both readings are searched: this
+       * decides which FILES to open, and `collectSites` still has to match an element exactly.
+       */
+      tight: options?.stripTags ? flat(stripTags(readable, "")) : null
     };
   });
   const located = [];
@@ -4403,7 +4502,9 @@ function locate(brief, sources, options) {
         unlocated.push({ route: page.route, scope: p.scope, path: p.path, reason: "no-original" });
         continue;
       }
-      const files = flattened.filter((f) => f.content.includes(original) || f.text !== null && f.text.includes(original)).map((f) => f.path);
+      const files = flattened.filter(
+        (f) => f.content.includes(original) || f.text !== null && f.text.includes(original) || f.tight !== null && f.tight.includes(original)
+      ).map((f) => f.path);
       if (files.length === 0) {
         unlocated.push({ route: page.route, scope: p.scope, path: p.path, reason: "not-in-source" });
         continue;
@@ -5102,7 +5203,7 @@ function rewriteFile(content, dialect, rewrites, imports, extra = []) {
       addDeclaration(site.attrInsertAt, declaration(rewrite));
       continue;
     }
-    if (kind === "richtext" && !(site.mixed && site.textRange)) {
+    if (ownsSubtree(kind, site, rewrite.inline)) {
       if (!isIntrinsic(site.tag)) continue;
       if (rule.richtext && site.inner) {
         source.remove(site.inner.start, site.inner.end);
@@ -6376,6 +6477,66 @@ function isSourceCandidate(path) {
   return lower.split("/").slice(0, -1).some((segment) => TEMPLATE_DIRS.has(segment));
 }
 
+// src/xray.ts
+var SKIP_TAGS = /* @__PURE__ */ new Set(["svg", "iframe", "head", "title"]);
+var CONTEXT_TAGS = /* @__PURE__ */ new Set([
+  "nav",
+  "header",
+  "footer",
+  "main",
+  "aside",
+  "form",
+  "button",
+  "a",
+  "ul",
+  "ol",
+  "table",
+  "dialog",
+  "details",
+  "figure",
+  "blockquote"
+]);
+var BOUND_ATTRS = ["data-bcms-field", "data-bcms-layout-field", "data-bcms-path", "data-bcms-block"];
+var isDecorativeGlyph = (text) => text.length <= 2 || /^\d{1,2}\s*[/.)\-–]?$/.test(text) || !new RegExp("\\p{L}", "u").test(text) || /^made with\b/i.test(text) || /^skip to\b/i.test(text);
+var MAX_BUCKETS = 12;
+var flat2 = (value) => value.replace(/\s+/g, " ").trim();
+function measureUnaddressable(html) {
+  const parsed = parse2(html);
+  let visible = 0;
+  let unaddressable = 0;
+  const buckets = /* @__PURE__ */ new Map();
+  const visit = (node, tag, context, bound) => {
+    if (node.type === "text") {
+      const text = flat2(node.value);
+      if (!text || isDecorativeGlyph(text)) return;
+      visible += text.length;
+      if (bound) return;
+      unaddressable += text.length;
+      const key = `${tag} @ ${context}`;
+      const held = buckets.get(key) ?? { tag, context, chars: 0, nodes: 0, samples: [] };
+      held.chars += text.length;
+      held.nodes += 1;
+      if (held.samples.length < 2) held.samples.push(text.slice(0, 50));
+      buckets.set(key, held);
+      return;
+    }
+    if (node.type !== "element" || node.raw || SKIP_TAGS.has(node.tag)) return;
+    const attrs = new Map(node.attrs.map((a) => [a.name, a.value]));
+    if (attrs.has("hidden") || attrs.get("aria-hidden") === "true" || /display\s*:\s*none/.test(attrs.get("style") ?? "")) {
+      return;
+    }
+    const owned = bound || BOUND_ATTRS.some((name) => attrs.has(name));
+    const chain = CONTEXT_TAGS.has(node.tag) ? context === "body" ? node.tag : `${context}>${node.tag}` : context;
+    for (const child of node.children) visit(child, node.tag, chain, owned);
+  };
+  for (const root of parsed.roots) visit(root, "body", "body", false);
+  return {
+    visible,
+    unaddressable,
+    buckets: [...buckets.values()].sort((a, b) => b.chars - a.chars).slice(0, MAX_BUCKETS)
+  };
+}
+
 // src/carry.ts
 var GLOBALS = /* @__PURE__ */ new Set([
   "Astro",
@@ -6785,6 +6946,7 @@ async function componentizeSources(briefIn, planIn, sources, options) {
     return held;
   };
   const fresh = /* @__PURE__ */ new Set();
+  const freshFiles = /* @__PURE__ */ new Map();
   const bindOf = (section) => instanceOwned(section) ? void 0 : section.groupKey;
   const placementOf = (slug, section) => {
     const bind = bindOf(section);
@@ -7112,6 +7274,7 @@ async function componentizeSources(briefIn, planIn, sources, options) {
       }
       extractable.set(resolved.slug, { name: resolved.name, path, kind: "default", imported: null });
       fresh.add(resolved.slug);
+      freshFiles.set(resolved.slug, path);
       addFile(outFiles, contents, {
         path,
         operation: existing === void 0 ? "add" : "modify",
@@ -7197,6 +7360,7 @@ async function componentizeSources(briefIn, planIn, sources, options) {
       sections,
       // What THIS run wrote a file for. A component an earlier run left is reused, not re-reported.
       components: [...fresh].sort(),
+      componentFiles: [...freshFiles].sort(([a], [b]) => a.localeCompare(b)).map(([slug, path]) => ({ slug, path, export: "default" })),
       planPending,
       notes
     }
@@ -7376,7 +7540,7 @@ async function locateSections(sections, briefPaths, sources, treeOf) {
   for (const section of sections) {
     const paths = fieldPaths(section);
     const literals = new Set(
-      briefPaths.filter((p) => (p.scope ?? "page") === "page" && groupOf(p.path) === section.groupKey && p.original).map((p) => flat(stripTags(p.original))).filter(Boolean)
+      briefPaths.filter((p) => (p.scope ?? "page") === "page" && inSection(section, p.path) && p.original).map((p) => flat(stripTags(p.original))).filter(Boolean)
     );
     const hits = /* @__PURE__ */ new Map();
     for (const source of sources) {
@@ -7387,7 +7551,7 @@ async function locateSections(sections, briefPaths, sources, treeOf) {
       const found = /* @__PURE__ */ new Map();
       for (const declaration2 of declarationsIn(parsed.roots, source.content)) {
         if (declaration2.scope !== "page") continue;
-        if (groupOf(declaration2.path) !== section.groupKey) continue;
+        if (!inSection(section, declaration2.path)) continue;
         const placed2 = elements.get(declaration2.at);
         if (placed2) found.set(declaration2.at, placed2);
       }
@@ -7412,6 +7576,12 @@ async function locateSections(sections, briefPaths, sources, treeOf) {
   return { placed, misses };
 }
 var groupOf = (path) => path.split(/[.[]/)[0] ?? "";
+var inSection = (section, path) => {
+  if (groupOf(path) === section.groupKey) return true;
+  const rowless = (value) => value.replace(/\[\d+\]/g, "[]");
+  const target = rowless(path);
+  return fieldPaths(section).some((fieldPath) => rowless(fieldPath) === target);
+};
 var fieldPaths = (section) => (section.fields ?? []).map((field) => field.path ?? `${section.groupKey}.${field.key ?? ""}`);
 function elementIndex(roots) {
   const out = /* @__PURE__ */ new Map();
@@ -7514,6 +7684,9 @@ function componentFile(dialect, path, fromFile, content, parsed, resolved, pathP
     ...addresses.opaque
   ];
   if (unconvertible.length > 0) return { content: "", free: [], duplicates: [], unconvertible };
+  const flat3 = pathPrefix !== "" && !pathPrefix.endsWith(".");
+  const pathMap = flat3 ? flatPathMap(resolved.section, pathPrefix) : null;
+  if (flat3 && !pathMap) return { content: "", free: [], duplicates: [], unconvertible: [`${pathPrefix}* (a repeater leaf without an override address)`] };
   const cut = content.slice(resolved.root.start, resolved.root.end);
   const reserved = /* @__PURE__ */ new Set([...topLevelBindings(dialect, parsed, content), ...referencedNames2(cut)]);
   const introduced = allocateNames(reserved, [
@@ -7532,7 +7705,7 @@ function componentFile(dialect, path, fromFile, content, parsed, resolved, pathP
   const helpers = [
     .../* @__PURE__ */ new Set([
       ...helperNames.map((h) => alias(h.name, h.local)),
-      "bcmsSection",
+      flat3 ? "bcmsSectionPaths" : "bcmsSection",
       ...bound > 0 ? [alias("bcmsFields", fieldsName)] : []
     ])
   ].sort();
@@ -7562,9 +7735,10 @@ function componentFile(dialect, path, fromFile, content, parsed, resolved, pathP
   const key = /^[A-Za-z_$][\w$]*$/.test(groupKey) ? groupKey : JSON.stringify(groupKey);
   const carriedDeclarations = carry.declarations.length > 0 ? `${carry.declarations.join("\n")}
 ` : "";
-  const copy = snapshot ? `const ${snapshot} = { ${key}: bcmsSection(page, bind, overrides) };` : "";
-  const field = bound > 0 ? `const ${fieldName} = ${fieldsName}({ blockId, bind, overrides }, ${JSON.stringify(pathPrefix)});` : "";
+  const copy = !snapshot ? "" : flat3 ? `const ${snapshot} = bcmsSectionPaths(page, bind, overrides, ${JSON.stringify(pathPrefix)}, ${JSON.stringify(pathMap)});` : `const ${snapshot} = { ${key}: bcmsSection(page, bind, overrides) };`;
+  const field = bound > 0 ? `const ${fieldName} = ${fieldsName}({ blockId, bind, overrides }, ${JSON.stringify(pathPrefix)}${flat3 ? `, ${JSON.stringify(pathMap)}` : ""});` : "";
   const declared = [copy, field].filter(Boolean).join("\n");
+  const styles = dialect === "astro" ? carriedStyles(content) : "";
   if (dialect === "astro") {
     return { free: [], duplicates: [], unconvertible: [], content: `---
 ${SECTION_MARKER}
@@ -7584,7 +7758,9 @@ const { blockId, bind, overrides, page } = Astro.props;
 ${carriedDeclarations}${declared}
 ---
 ${markup}
-` };
+${styles ? `
+${styles}
+` : ""}` };
   }
   return { free: [], duplicates: [], unconvertible: [], content: `${SECTION_MARKER}
 ${[...carried, `import { ${helpers.join(", ")} } from "${helperSpecifier}";`, `import type { BcmsSectionProps } from "${relativeImport(path, SECTIONS_LIB).replace(/\.tsx?$/, "")}";`].join("\n")}
@@ -7858,6 +8034,9 @@ import { bcmsFields } from "${helper}";`);
   return { files, refused };
 }
 function propPrefix(section) {
+  return exactPrefix(section) ?? flatPrefix(section);
+}
+function exactPrefix(section) {
   const prefixes = /* @__PURE__ */ new Set();
   for (const field of section.fields ?? []) {
     const { path, key } = field;
@@ -7868,6 +8047,49 @@ function propPrefix(section) {
   if (prefixes.size > 1) return null;
   return prefixes.size === 1 ? [...prefixes][0] : `${section.groupKey}.`;
 }
+var foldKey = (remainder) => remainder.replace(/\[(\d+)\]/g, "_$1").replace(/[^a-zA-Z0-9]+/g, "_").replace(/^_+|_+$/g, "") || "value";
+function flatPrefix(section) {
+  const prefixes = /* @__PURE__ */ new Set();
+  let informative = false;
+  for (const field of section.fields ?? []) {
+    const { path, key } = field;
+    if (typeof path !== "string" || typeof key !== "string") continue;
+    informative = true;
+    const prefix = ["-", "_"].map((sep2) => `${section.groupKey}${sep2}`).find((candidate) => path.startsWith(candidate) && (typeof field.overrideKey === "string" || foldKey(path.slice(candidate.length)) === key));
+    if (!prefix) return null;
+    prefixes.add(prefix);
+  }
+  return informative && prefixes.size === 1 ? [...prefixes][0] : null;
+}
+function flatPathMap(section, prefix) {
+  const scalars = {};
+  const tables = {};
+  for (const field of section.fields ?? []) {
+    const { path, key } = field;
+    if (typeof path !== "string" || typeof key !== "string" || !path.startsWith(prefix)) continue;
+    const row = /^([^[]+)\[\d+\]\.(.+)$/.exec(path);
+    if (!row) {
+      scalars[path] = field.overrideKey ?? key;
+      continue;
+    }
+    const address = typeof field.overrideKey === "string" ? /^([^[]+)\[\d+\]\.(.+)$/.exec(field.overrideKey) : null;
+    if (!address) return null;
+    const table = tables[row[1]] ??= { key: address[1], columns: {} };
+    if (table.key !== address[1]) return null;
+    table.columns[row[2]] = address[2];
+  }
+  return { scalars, tables };
+}
+function carriedStyles(content) {
+  const blocks = [];
+  for (const match of content.matchAll(/<style\b([^>]*)>([\s\S]*?)<\/style>/g)) {
+    const attributes = match[1] ?? "";
+    if (/\bis:global\b|\bdefine:vars\b/.test(attributes)) continue;
+    if (/\blang\s*=/.test(attributes) || /@(import|use|forward)\b/.test(match[2] ?? "")) continue;
+    blocks.push(match[0]);
+  }
+  return blocks.join("\n");
+}
 function referencedNames2(markup) {
   const out = /* @__PURE__ */ new Set();
   for (const [name] of markup.matchAll(/[A-Za-z_$][\w$]*/g)) out.add(name);
@@ -8256,7 +8478,8 @@ async function convertSources(briefIn, sources, options) {
         kind: p.kind,
         fallback: p.original ?? "",
         literal: norm(p.original ?? ""),
-        locator: p.locator
+        locator: p.locator,
+        ...p.inline ? { inline: true } : {}
       });
     }
   }
@@ -8481,6 +8704,16 @@ async function convertSources(briefIn, sources, options) {
       declaredRow(target, witness !== null, witness ?? byHand);
     } else rewritten++;
   }
+  const templated = dynamicBindings.filter((d) => d.prop === null);
+  for (let i = pending.length - 1; i >= 0; i--) {
+    const row = pending[i];
+    const target = targets.get(keyOf(row.route, row.scope, row.path));
+    if (row.reason !== "NO_ORIGINAL" || !target || target.fallback !== "") continue;
+    const shape = shapeOfPath(target.path);
+    if (!templated.some((d) => d.path === shape && attributable(target, d.file))) continue;
+    pending.splice(i, 1);
+    rewritten++;
+  }
   for (const [file, splices] of [...componentEdits].sort(([a], [b]) => a.localeCompare(b))) {
     const source = new MagicString6(contents.get(file));
     const seen = /* @__PURE__ */ new Set();
@@ -8793,6 +9026,10 @@ async function plan(file, content, dialect, targets, sites, importAt, outcomes,
       }
       let refusal = null;
       for (const site of fresh) {
+        if (target.inline && site.where === "text" && !ownsSubtree(target.kind, site, true)) {
+          refusal = "SUBTREE_NOT_HTML";
+          continue;
+        }
         let bindings;
         let bindingsMerge;
         if (site.where === "prop" && site.attr) {
@@ -8827,7 +9064,8 @@ async function plan(file, content, dialect, targets, sites, importAt, outcomes,
           // 🔴 AND ONLY WHEN THE ELEMENT'S SUBTREE IS THE VALUE. A value that is one TEXT NODE of
           // a mixed element gets a wrapper of its own, so taking the element's inner range as its
           // fallback swallowed the `<em>` beside it — the wrapper then rendered the sibling twice.
-          fallback: target.kind === "richtext" && site.inner && !(site.mixed && site.textRange) ? content.slice(site.inner.start, site.inner.end).trim() : target.fallback,
+          ...target.inline ? { inline: true } : {},
+          fallback: site.inner && ownsSubtree(target.kind, site, target.inline) ? content.slice(site.inner.start, site.inner.end).trim() : target.fallback,
           snapshot: snapshotName(target.slug),
           slug: target.slug,
           scope: target.scope,
@@ -9188,7 +9426,7 @@ function emitStubs2(dialects, slugs, contents, out) {
 // package.json
 var package_default = {
   name: "@bettercms-ai/convert",
-  version: "0.9.0",
+  version: "0.11.0",
   type: "module",
   description: "Deterministic codemod that turns an imported site's text-matched bindings into declared ones \u2014 parser offsets in, one magic-string pass out, plus a receipt of everything it could not do.",
   bin: {
@@ -9249,6 +9487,7 @@ function parseArgs(argv) {
     brief: void 0,
     componentize: false,
     forms: false,
+    xray: void 0,
     plan: void 0,
     copy: "bind",
     root: ".",
@@ -9264,6 +9503,7 @@ function parseArgs(argv) {
     if (arg === "--brief") args.brief = argv[++i];
     else if (arg === "--componentize") args.componentize = true;
     else if (arg === "--forms") args.forms = true;
+    else if (arg === "--xray") args.xray = argv[++i];
     else if (arg === "--plan") args.plan = argv[++i];
     else if (arg === "--copy") {
       const mode = argv[++i];
@@ -9291,6 +9531,7 @@ var HELP = `bettercms-convert ${VERSION}
   bettercms-convert --brief <json> --root . [options]
   bettercms-convert --componentize --brief <json> --plan <json> --root . [options]
   bettercms-convert --forms --brief <json> --root . [options]
+  bettercms-convert --xray <dist-dir>
 
   --brief <file>       The conversion brief, as get_conversion_brief returns it. Required.
   --componentize       Lift each planned SECTION into a component the CMS can reorder.
@@ -9298,6 +9539,11 @@ var HELP = `bettercms-convert ${VERSION}
                        endpoint, the id, a marker per field and the submit script. A form
                        the brief lists as a DRAFT is wired and receipted: publish it in the
                        Forms tab, or it rejects every submission with a 403.
+  --xray <dist-dir>    Measure a LOCAL build instead of converting: how much of each page's
+                       visible copy no binding owns, and the biggest buckets of it. Run it
+                       after a build to see what the next conversion still has to reach,
+                       without deploying. Takes no --brief. Exit 2 with --strict when any
+                       page is above 2 %.
   --plan <file>        The componentize plan, as get_componentize_plan returns it.
                        Required with --componentize.
   --copy bind|instance Which copy model the plan is expected to describe. Default: bind
@@ -9418,12 +9664,53 @@ ${extracted} sections extracted (${registered} registered, ${inlineOnly} inline-
     );
   }
 }
+async function xray(dir, strict) {
+  const pages = [];
+  const walk = async (at) => {
+    for (const entry of (await readdir(at, { withFileTypes: true })).sort((a, b) => a.name.localeCompare(b.name))) {
+      const full = join2(at, entry.name);
+      if (entry.isDirectory()) await walk(full);
+      else if (/\.html?$/i.test(entry.name)) pages.push(full);
+    }
+  };
+  try {
+    await walk(dir);
+  } catch (error) {
+    throw new CliError(`${dir} could not be read (${error.message}). Build the site first.`);
+  }
+  if (pages.length === 0) throw new CliError(`No .html files under ${dir}. Is that the build output?`);
+  let over = 0;
+  for (const page of pages) {
+    const { visible, unaddressable, buckets } = measureUnaddressable(await readFile(page, "utf-8"));
+    const share = visible === 0 ? 0 : 100 * unaddressable / visible;
+    if (share > 2) over++;
+    process.stdout.write(
+      `${relative(dir, page) || page}  visible=${visible} unaddressable=${unaddressable} (${share.toFixed(1)}%)
+`
+    );
+    for (const bucket of buckets) {
+      const samples = bucket.samples.map((s) => JSON.stringify(s)).join(" | ");
+      process.stdout.write(
+        `  ${String(bucket.chars).padStart(6)}ch ${String(bucket.nodes).padStart(4)}n  ${bucket.tag} @ ${bucket.context}  e.g. ${samples}
+`
+      );
+    }
+  }
+  process.stdout.write(`
+${pages.length - over} of ${pages.length} pages at or under 2% unaddressable
+`);
+  return strict && over > 0 ? 2 : 0;
+}
 async function main() {
   const args = parseArgs(process.argv.slice(2));
   if (args.help) {
     process.stdout.write(HELP);
     return 0;
   }
+  if (args.xray) {
+    if (args.brief) throw new CliError("--xray measures a build; it reads no brief. See --help.");
+    return await xray(resolve(args.xray), args.strict);
+  }
   if (!args.brief) throw new CliError("--brief <file> is required. See --help.");
   if (args.plan && !args.componentize) {
     throw new CliError("--plan is only read with --componentize. See --help.");