@bettercms-ai/convert 0.8.0 → 0.10.0

package/dist/cli.js

@@ -5,7 +5,7 @@ import { readdir, readFile, writeFile, mkdir, stat } from "fs/promises";
 import { dirname, join as join2, relative, resolve, sep } from "path";
 
 // src/index.ts
-import MagicString5 from "magic-string";
+import MagicString6 from "magic-string";
 
 // src/brief.ts
 import { createHash } from "crypto";
@@ -2562,8 +2562,18 @@ 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", "data-bcms-kind", "data-bcms-props", "data-bcms-layout-field"];
+var BCMS_ATTRS = [
+  "data-bcms-field",
+  "data-bcms-kind",
+  "data-bcms-props",
+  "data-bcms-layout-field",
+  // The forms lane's two. Listed here so `collectSites` never matches a brief literal against a
+  // marker this package itself wrote — a form id or a field key is not the page's copy.
+  "data-bcms-form",
+  "data-bcms-form-field"
+];
 var attrInsertAfter = (attrs, start, tag) => attrs.length > 0 ? Math.max(...attrs.map((a) => a.range.end)) : start + 1 + tag.length;
 function openTagEnd(content, start) {
   let quote = null;
@@ -2585,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;
@@ -2592,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;
@@ -2628,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));
@@ -2657,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
       });
@@ -2682,6 +2701,7 @@ function collectSites(roots, literals) {
           textRange: own.range,
           literal,
           partial: false,
+          ...nonHtmlSubtree(node) ? { nonHtml: true } : {},
           ancestors: walk.ancestors,
           siblingIndex: walk.siblingIndex
         });
@@ -2732,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));
@@ -4375,14 +4397,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 = [];
@@ -4394,7 +4425,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;
@@ -5093,7 +5126,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);
@@ -5162,6 +5195,22 @@ function importLines(imports) {
 
 // src/receipt.ts
 var CANVAS_REASONS = /* @__PURE__ */ new Set(["CANVAS_BRIDGE_MANUAL", "SSR_DRAFT_ROUTE"]);
+var FormInvariantError = class extends Error {
+  code = "FORM_INVARIANT";
+  constructor(message) {
+    super(message);
+    this.name = "FormInvariantError";
+  }
+};
+function assertForms(total, forms) {
+  const sum = forms.wired + forms.alreadyWired + forms.pending.length;
+  if (sum !== total) {
+    throw new FormInvariantError(
+      `The receipt does not account for every form: ${total} listed but ${forms.wired} wired + ${forms.alreadyWired} already wired + ${forms.pending.length} pending = ${sum}.`
+    );
+  }
+  return forms;
+}
 var ReceiptInvariantError = class extends Error {
   code = "RECEIPT_INVARIANT";
   constructor(message) {
@@ -6001,6 +6050,17 @@ function readBrief(value) {
       }
     }
   }
+  for (const [at, entry] of check.array(brief.forms ?? [], `the brief's "forms"`).entries()) {
+    const where = `brief.forms[${at}]`;
+    const form = check.record(entry, where);
+    check.segment(form.id, `${where}.id`);
+    check.string(form.name, `${where}.name`);
+    check.string(form.submitUrl, `${where}.submitUrl`);
+    check.optionalString(form.successMessage, `${where}.successMessage`);
+    for (const [n, held] of check.array(form.fields, `${where}.fields`).entries()) {
+      check.segment(check.record(held, `${where}.fields[${n}]`).key, `${where}.fields[${n}].key`);
+    }
+  }
   return brief;
 }
 function readPlan(value) {
@@ -6047,6 +6107,236 @@ function readPlan(value) {
   return plan2;
 }
 
+// src/forms.ts
+import MagicString4 from "magic-string";
+var WIRABLE = ["html", "astro", "jsx"];
+var CONTROLS = /* @__PURE__ */ new Set(["input", "select", "textarea"]);
+var FORM_SCRIPT = `<script>
+document.querySelectorAll('form[data-bcms-form]').forEach(function(f){
+  f.addEventListener('submit',function(e){
+    e.preventDefault();
+    var msg=f.querySelector('.bcms-form-msg');
+    var data={};
+    // A checkboxes group posts one entry per checked box under the SAME name; the old
+    // one-at-a-time assignment kept only the last, so "pick many" delivered one answer.
+    // One checked box still arrives as a scalar \u2014 FormData cannot tell a group from a
+    // lone field \u2014 which is exactly why lib/forms/validate.ts's chosenValues() accepts
+    // both an array and a comma string.
+    new FormData(f).forEach(function(v,k){
+      if(k==='cf-turnstile-response')return;
+      if(Object.prototype.hasOwnProperty.call(data,k))data[k]=(Array.isArray(data[k])?data[k]:[data[k]]).concat(v);
+      else data[k]=v;
+    });
+    var body={data:data};
+    var tok=f.querySelector('[name="cf-turnstile-response"]');
+    if(tok&&tok.value)body['cf-turnstile-response']=tok.value;
+    fetch(f.action,{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify(body)})
+      .then(function(r){return r.ok;})
+      .then(function(ok){if(msg){msg.hidden=false;msg.textContent=ok?(f.getAttribute('data-bcms-form-success')||'Thanks! Your submission was received.'):'Sorry, something went wrong.';}if(ok)f.reset();})
+      .catch(function(){if(msg){msg.hidden=false;msg.textContent='Sorry, something went wrong.';}});
+  });
+});
+</script>`;
+var SCRIPT_BODY = FORM_SCRIPT.slice("<script>".length, -"</script>".length);
+function scriptFor(dialect) {
+  if (dialect === "jsx") return `<script dangerouslySetInnerHTML={{ __html: \`${SCRIPT_BODY}\` }} />`;
+  if (dialect === "astro") return `<script is:inline>${SCRIPT_BODY}</script>`;
+  return FORM_SCRIPT;
+}
+var messageFor = (dialect) => dialect === "jsx" ? `<p className="bcms-form-msg" hidden></p>` : `<p class="bcms-form-msg" hidden></p>`;
+var escapeAttr = (value) => value.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/"/g, "&quot;");
+var attrOf = (el, name) => el.attrs.find((a) => a.name.toLowerCase() === name);
+function* elementsIn(nodes) {
+  for (const node of nodes) {
+    if (node.type === "expr") {
+      yield* elementsIn(node.children);
+      continue;
+    }
+    if (node.type !== "element") continue;
+    yield node;
+    yield* elementsIn(node.children);
+  }
+}
+var childElements = (node) => node.children.flatMap(
+  (child) => child.type === "element" ? [child] : child.type === "expr" ? childElements(child) : []
+);
+function candidateOf(file, dialect, form) {
+  const controls = /* @__PURE__ */ new Map();
+  const wrapper = /* @__PURE__ */ new Map();
+  const all = [];
+  const walk = (parent) => {
+    const own = [];
+    for (const child of childElements(parent)) {
+      if (CONTROLS.has(child.tag.toLowerCase())) {
+        own.push(child);
+        all.push(child);
+      }
+      walk(child);
+    }
+    if (own.length === 1 && parent !== form) wrapper.set(own[0], parent);
+  };
+  walk(form);
+  for (const control of all) {
+    const name = attrOf(control, "name")?.value;
+    if (name && !controls.has(name)) controls.set(name, control);
+  }
+  for (const control of all) {
+    const id = attrOf(control, "id")?.value;
+    if (id && !controls.has(id)) controls.set(id, control);
+  }
+  return { file, dialect, el: form, controls, wrapper };
+}
+var hasMessage = (form) => [...elementsIn([form])].some((el) => (attrOf(el, "class") ?? attrOf(el, "classname"))?.value.includes("bcms-form-msg") ?? false);
+function wire(source, candidate, form) {
+  const { el, dialect } = candidate;
+  const inserts = [];
+  const set = (name, value) => {
+    const attr = attrOf(el, name);
+    if (!attr) inserts.push(`${name}="${escapeAttr(value)}"`);
+    else if (attr.valueRange) source.overwrite(attr.valueRange.start, attr.valueRange.end, escapeAttr(value));
+    else source.overwrite(attr.range.start, attr.range.end, `${name}="${escapeAttr(value)}"`);
+  };
+  set("action", form.submitUrl);
+  set("method", "post");
+  inserts.push(`data-bcms-form="${escapeAttr(form.id)}"`);
+  if (form.successMessage) inserts.push(`data-bcms-form-success="${escapeAttr(form.successMessage)}"`);
+  source.appendLeft(el.attrInsertAt, ` ${inserts.join(" ")}`);
+  for (const field of form.fields) {
+    const control = candidate.controls.get(field.key);
+    const host = candidate.wrapper.get(control) ?? control;
+    source.appendLeft(host.attrInsertAt, ` data-bcms-form-field="${escapeAttr(field.key)}"`);
+    const name = attrOf(control, "name");
+    if (!name) source.appendLeft(control.attrInsertAt, ` name="${escapeAttr(field.key)}"`);
+    else if (!name.expression && name.value !== field.key && name.valueRange) {
+      source.overwrite(name.valueRange.start, name.valueRange.end, escapeAttr(field.key));
+    }
+  }
+  if (el.inner && !hasMessage(el)) {
+    const tail = /\s*$/.exec(source.original.slice(el.inner.start, el.inner.end))[0];
+    source.appendLeft(el.inner.end - tail.length, `${tail || "\n"}${messageFor(dialect)}`);
+  }
+}
+async function wireForms(briefIn, sources) {
+  const brief = readBrief(briefIn);
+  const forms = brief.forms ?? [];
+  const candidates = [];
+  const unreadable = [];
+  for (const source of sources) {
+    if (!/<form[\s/>]/i.test(source.content)) continue;
+    const dialect = dialectOf(source.path, source.content);
+    if (!dialect || !WIRABLE.includes(dialect)) {
+      unreadable.push({
+        file: source.path,
+        reason: "DIALECT_UNSUPPORTED",
+        message: `${source.path} is ${dialect ?? "not a template"}.`
+      });
+      continue;
+    }
+    const parsed = await parseFile4(dialect, source.content);
+    if (parsed.error) {
+      unreadable.push({
+        file: source.path,
+        reason: parsed.error.code === "DIALECT_UNSUPPORTED" ? "DIALECT_UNSUPPORTED" : "PARSE_ERROR",
+        message: parsed.error.message
+      });
+      continue;
+    }
+    for (const el of elementsIn(parsed.roots)) {
+      if (el.tag.toLowerCase() === "form") candidates.push(candidateOf(source.path, dialect, el));
+    }
+  }
+  const holds = (c, f) => f.fields.filter((field) => c.controls.has(field.key)).length;
+  const covers2 = (c, f) => f.fields.length > 0 && holds(c, f) === f.fields.length;
+  const options = new Map(forms.map((f) => [f.id, candidates.filter((c) => covers2(c, f))]));
+  const wanted = /* @__PURE__ */ new Map();
+  for (const list of options.values()) for (const c of list) wanted.set(c, (wanted.get(c) ?? 0) + 1);
+  const matched = [];
+  const pending = [];
+  const onSite = [];
+  let alreadyWired = 0;
+  const pend2 = (f, reason, file, message) => void pending.push({ id: f.id, name: f.name, reason, ...file ? { file } : {}, ...message ? { message } : {} });
+  for (const form of forms) {
+    const list = options.get(form.id) ?? [];
+    if (list.length > 1) {
+      pend2(form, "FORM_AMBIGUOUS", void 0, `${list.length} forms post every field of "${form.name}": ${list.map((c) => c.file).join(", ")}.`);
+      continue;
+    }
+    if (list.length === 1 && (wanted.get(list[0]) ?? 0) > 1) {
+      pend2(form, "FORM_AMBIGUOUS", list[0].file, "more than one CMS form's fields are posted by this <form>.");
+      continue;
+    }
+    if (list.length === 0) {
+      const [best] = candidates.map((c) => ({ c, n: holds(c, form) })).filter((x) => x.n > 0).sort((a, b) => b.n - a.n);
+      if (best) {
+        const missing = form.fields.filter((f) => !best.c.controls.has(f.key)).map((f) => f.key);
+        pend2(form, "FIELD_UNMATCHED", best.c.file, `no control posts ${missing.join(", ")} in the <form> that posts its other fields.`);
+      } else if (unreadable[0]) {
+        pend2(form, unreadable[0].reason, unreadable[0].file, unreadable[0].message);
+      } else {
+        pend2(form, "FORM_NOT_IN_SOURCE", void 0, `no <form> posts ${form.fields.map((f) => f.key).join(", ") || "any field of this form"}.`);
+      }
+      continue;
+    }
+    const candidate = list[0];
+    if (attrOf(candidate.el, "action")?.expression) {
+      pend2(form, "ACTION_IS_EXPRESSION", candidate.file, "its action is an expression, so this run will not replace it.");
+      continue;
+    }
+    const misnamed = form.fields.find((field) => {
+      const attr = attrOf(candidate.controls.get(field.key), "name");
+      return !!attr && attr.value !== field.key && (attr.expression || !attr.valueRange);
+    });
+    if (misnamed) {
+      pend2(form, "FIELD_UNMATCHED", candidate.file, `the control for ${misnamed.key} posts under an expression, so its name cannot be set to the CMS key.`);
+      continue;
+    }
+    if (attrOf(candidate.el, "data-bcms-form")) {
+      alreadyWired++;
+      onSite.push(form);
+      continue;
+    }
+    matched.push({ form, candidate });
+    onSite.push(form);
+  }
+  const contents = new Map(sources.map((s) => [s.path, s.content]));
+  const byFile = /* @__PURE__ */ new Map();
+  for (const m of matched) byFile.set(m.candidate.file, [...byFile.get(m.candidate.file) ?? [], m]);
+  const files = [];
+  for (const [path, list] of [...byFile].sort(([a], [b]) => a.localeCompare(b))) {
+    const content = contents.get(path);
+    const source = new MagicString4(content);
+    for (const { form, candidate } of list) wire(source, candidate, form);
+    if (!content.includes("form[data-bcms-form]")) {
+      const last = list.reduce((a, b) => b.candidate.el.end > a.candidate.el.end ? b : a);
+      const indent = /[^\S\n]*$/.exec(content.slice(0, last.candidate.el.start))[0];
+      source.appendRight(last.candidate.el.end, `
+${indent}${scriptFor(last.candidate.dialect)}`);
+    }
+    files.push({ path, operation: "modify", content: source.toString() });
+  }
+  const notes = onSite.filter((f) => f.status === "draft").map((f) => `publish form ${f.name} in the Forms tab \u2014 a draft form rejects every submission with 403.`);
+  return {
+    files,
+    receipt: {
+      briefDigest: briefDigest(brief),
+      // This lane binds no brief PATH, and says so rather than leaving the arithmetic to a reader:
+      // a receipt claiming zero of zero paths is exactly what a forms-only run did.
+      paths: { declared: 0, rewritten: 0, alreadyDeclared: 0, pending: [] },
+      occurrences: { located: 0, rewritten: 0 },
+      files: [],
+      helpers: [],
+      helperUpgraded: false,
+      dynamicBindings: [],
+      forms: assertForms(forms.length, {
+        wired: matched.length,
+        alreadyWired,
+        pending,
+        ...notes.length > 0 ? { notes } : {}
+      })
+    }
+  };
+}
+
 // src/scan.ts
 var SKIP_DIRS = [
   "node_modules/",
@@ -6110,6 +6400,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",
@@ -6407,7 +6757,7 @@ function moduleScope(parsed, content) {
 }
 
 // src/componentize.ts
-import MagicString4 from "magic-string";
+import MagicString5 from "magic-string";
 var SectionInvariantError = class extends Error {
   code = "SECTION_INVARIANT";
   constructor(message) {
@@ -7333,7 +7683,7 @@ export default function ${resolved.name}({ blockId, bind, overrides, page }: Bcm
 ` };
 }
 function sectionMarkup(content, root, fieldName) {
-  const slice = new MagicString4(content.slice(root.start, root.end));
+  const slice = new MagicString5(content.slice(root.start, root.end));
   const at = (offset) => offset - root.start;
   const stamps = root.attrs.filter((attr) => attr.name === "data-bcms-block");
   if (stamps.length === 0) slice.appendLeft(at(root.attrInsertAt), " data-bcms-block={blockId}");
@@ -7532,7 +7882,7 @@ async function migrateSections(plan2, contents, written, fileSet, aliases) {
         );
         continue;
       }
-      const source = new MagicString4(content);
+      const source = new MagicString5(content);
       const { bound, duplicates } = wrapFieldAttrs(source, content, elements, (at) => at, "bcmsField");
       if (duplicates.length > 0) {
         refused.set(refusalKey(dialect, slug), `${entry.path} has ${duplicates.join(", ")} carrying more than one data-bcms-field, so there is no single address to rewrite.`);
@@ -7809,7 +8159,7 @@ export default function Sections({ page }: { page: string }) {
 function splicePageRun(file, content, dialect, parsed, placeable, pageSlug) {
   const names = allocateNames(topLevelBindings(dialect, parsed, content), [{ key: "Sections", name: "Sections" }]);
   const local = names.get("Sections");
-  const source = new MagicString4(content);
+  const source = new MagicString5(content);
   const first = placeable[0].root;
   const last = placeable[placeable.length - 1].root;
   source.overwrite(first.start, last.end, `<${local} page="${pageSlug}" />`);
@@ -7829,7 +8179,7 @@ function splicePageInline(file, content, dialect, parsed, placeable, pageSlug, w
     { key: "pageSnapshot", name: "pageSnapshot" }
   ]);
   const snapshot = names.get("pageSnapshot");
-  const source = new MagicString4(content);
+  const source = new MagicString5(content);
   for (const resolved of placeable) {
     const component = written.get(resolved.slug);
     const tag = component.member ? `${names.get(resolved.slug)}.${component.member}` : names.get(resolved.slug);
@@ -7990,7 +8340,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 } : {}
       });
     }
   }
@@ -8215,8 +8566,18 @@ 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 MagicString5(contents.get(file));
+    const source = new MagicString6(contents.get(file));
     const seen = /* @__PURE__ */ new Set();
     for (const splice of splices) {
       const id = `${splice.start}:${splice.end}:${splice.text}`;
@@ -8527,6 +8888,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) {
@@ -8561,7 +8926,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,
@@ -8919,8 +9285,62 @@ function emitStubs2(dialects, slugs, contents, out) {
   }
 }
 
+// package.json
+var package_default = {
+  name: "@bettercms-ai/convert",
+  version: "0.10.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: {
+    "bettercms-convert": "dist/cli.js"
+  },
+  main: "./dist/index.js",
+  module: "./dist/index.js",
+  types: "./dist/index.d.ts",
+  sideEffects: false,
+  exports: {
+    ".": {
+      types: "./dist/index.d.ts",
+      import: "./dist/index.js",
+      default: "./dist/index.js"
+    }
+  },
+  files: [
+    "dist",
+    "README.md",
+    "CHANGELOG.md"
+  ],
+  scripts: {
+    typecheck: "tsc --noEmit",
+    build: "tsup",
+    test: "vitest run",
+    "test:watch": "vitest",
+    briefs: "bun --conditions=development scripts/build-briefs.ts"
+  },
+  dependencies: {
+    "@astrojs/compiler": "^2.13.1",
+    "@babel/parser": "^7.29.2",
+    "@bettercms-ai/types": "^1.12.0",
+    "@vue/compiler-sfc": "^3.5.0",
+    "magic-string": "^0.30.21",
+    parse5: "^7.3.0",
+    svelte: "^5.0.0"
+  },
+  devDependencies: {
+    "@types/node": "^20",
+    esbuild: "^0.27.7",
+    tsup: "^8.5.1",
+    typescript: "^5",
+    vitest: "^4.1.4"
+  },
+  publishConfig: {
+    access: "public",
+    registry: "https://registry.npmjs.org/"
+  }
+};
+
 // src/cli.ts
-var VERSION = "0.4.0";
+var { version: VERSION } = package_default;
 var MAX_FILE_BYTES = 512 * 1024;
 var CliError = class extends Error {
 };
@@ -8928,6 +9348,8 @@ function parseArgs(argv) {
   const args = {
     brief: void 0,
     componentize: false,
+    forms: false,
+    xray: void 0,
     plan: void 0,
     copy: "bind",
     root: ".",
@@ -8942,6 +9364,8 @@ function parseArgs(argv) {
     const arg = argv[i];
     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];
@@ -8968,9 +9392,20 @@ 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.
+  --forms              Point each <form> in the repository at the CMS form behind it \u2014 the
+                       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
@@ -9053,6 +9488,26 @@ ${rewritten} of ${declared} paths bound (${alreadyDeclared} already declared, ${
 `);
   }
 }
+function reportForms(files, receipt, dryRun) {
+  const { wired, alreadyWired, pending, notes } = receipt.forms;
+  for (const file of files) {
+    process.stdout.write(`${dryRun ? "would " : ""}${file.operation} ${file.path}
+`);
+  }
+  process.stdout.write(
+    `
+${wired} forms wired (${alreadyWired} already wired, ${pending.length} pending)
+`
+  );
+  for (const form of pending) {
+    process.stdout.write(
+      `  pending ${form.name} \u2014 ${form.reason}${form.message ? ` (${form.message})` : ""}${form.file ? ` [${form.file}]` : ""}
+`
+    );
+  }
+  for (const note of notes ?? []) process.stdout.write(`  todo ${note}
+`);
+}
 function reportSections(files, receipt, dryRun) {
   const { extracted, inlineOnly, alreadyExtracted, registered, pending } = receipt.sections;
   for (const file of files) {
@@ -9071,12 +9526,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.");
@@ -9084,6 +9580,9 @@ async function main() {
   if (args.copy === "instance" && !args.componentize) {
     throw new CliError("--copy is only read with --componentize. See --help.");
   }
+  if (args.forms && args.componentize) {
+    throw new CliError("--forms and --componentize are separate runs. Do one, then the other. See --help.");
+  }
   const root = resolve(args.root);
   const brief = JSON.parse(await readFile(resolve(args.brief), "utf-8"));
   if (!Array.isArray(brief.pages)) {
@@ -9124,6 +9623,13 @@ async function main() {
     reportSections(files2, receipt2, args.dryRun);
     return args.strict && receipt2.sections.pending.length > 0 ? 2 : 0;
   }
+  if (args.forms) {
+    const { files: files2, receipt: receipt2 } = await wireForms(brief, sources);
+    await written(files2);
+    await saveReceipt(receipt2);
+    reportForms(files2, receipt2, args.dryRun);
+    return args.strict && receipt2.forms.pending.length > 0 ? 2 : 0;
+  }
   const { files, receipt } = await convertSources(brief, sources, {
     overwriteHelper: args.overwriteHelper
   });