@bettercms-ai/convert 0.2.0 → 0.3.0

package/dist/cli.js

@@ -2628,6 +2628,71 @@ function locate(brief, sources, options) {
 // src/loops.ts
 import MagicString from "magic-string";
 
+// src/declarations.ts
+var BINDING_ATTR = /data-bcms-(?:layout-)?field\s*=\s*["']([^"']+)["']/g;
+var PROPS_ATTR = /data-bcms-props\s*=\s*["']([^"']+)["']/g;
+var TEMPLATE_SCAN = /:?data-bcms-(?:layout-)?field\s*=\s*(?:\{\s*`([^`]+)`\s*\}|"\s*`([^`]+)`\s*")/g;
+var BINDINGS_SCAN = /bcmsBindings\s*=\s*\{\{[^}]*\}\}/g;
+var propsDeclarations = (value, at) => value.split(";").flatMap((entry) => {
+  const [address, kind] = entry.split("|");
+  if (!address) return [];
+  const scope = address.startsWith("layout:") ? "layout" : "page";
+  return [{ scope, path: stripLayoutPrefix(address), kind: kind ?? "", at, via: "props" }];
+});
+var propsPaths = (value) => propsDeclarations(value, 0).map((d) => ({ scope: d.scope, path: d.path }));
+var TEMPLATE_BINDING = /^:?data-bcms-(?:layout-)?field\s*=\s*(?:\{\s*`([^`]+)`\s*\}|"\s*`([^`]+)`\s*")$/;
+var shapeOfPath = (path) => path.replace(/\[(?:\d+|\$\{[^}]*\})\]/g, "[*]");
+function declarationsIn(roots, content) {
+  const out = [];
+  const visit = (node) => {
+    if (node.type === "expr") {
+      for (const child of node.children) visit(child);
+      return;
+    }
+    if (node.type !== "element") return;
+    const kind = node.attrs.find((a) => a.name === "data-bcms-kind")?.value ?? "";
+    const at = node.attrInsertAt;
+    for (const attr of node.attrs) {
+      const name = attr.name.replace(/^:/, "");
+      if (name === "data-bcms-field" || name === "data-bcms-layout-field") {
+        const scope = name === "data-bcms-layout-field" ? "layout" : "page";
+        const template = content.slice(attr.range.start, attr.range.end).match(TEMPLATE_BINDING);
+        const templated = template?.[1] ?? template?.[2];
+        if (templated) out.push({ scope, path: shapeOfPath(stripLayoutPrefix(templated)), kind, at, via: "field" });
+        else if (attr.value) out.push({ scope, path: stripLayoutPrefix(attr.value), kind, at, via: "field" });
+      } else if (attr.name === "data-bcms-props") {
+        out.push(...propsDeclarations(attr.value, at));
+      } else if (attr.name === "bcmsBindings") {
+        for (const path of bindingsPaths(content.slice(attr.range.start, attr.range.end))) {
+          out.push({ scope: "page", path, kind: "", at, via: "prop" });
+        }
+      }
+    }
+    for (const child of node.children) visit(child);
+  };
+  for (const root of roots) visit(root);
+  return out;
+}
+var bindingsPaths = (text) => [...text.matchAll(/["']([^"']+)["']/g)].map((match) => match[1]);
+var scopedPath = (scope, path) => `${scope}::${path}`;
+var covers = (declared, target) => declared !== void 0 && (declared.has(scopedPath(target.scope, target.path)) || declared.has(scopedPath(target.scope, shapeOfPath(target.path))));
+var declaredInTree = (roots, content) => new Set(declarationsIn(roots, content).map((d) => scopedPath(d.scope, d.path)));
+function declaredByScan(content) {
+  const out = /* @__PURE__ */ new Set();
+  const add = (scope, path) => void out.add(scopedPath(scope, path));
+  for (const match of content.matchAll(BINDING_ATTR)) {
+    add(match[0].includes("layout-field") ? "layout" : "page", stripLayoutPrefix(match[1]));
+  }
+  for (const match of content.matchAll(TEMPLATE_SCAN)) {
+    add(match[0].includes("layout-field") ? "layout" : "page", shapeOfPath(stripLayoutPrefix(match[1] ?? match[2])));
+  }
+  for (const match of content.matchAll(BINDINGS_SCAN)) for (const path of bindingsPaths(match[0])) add("page", path);
+  for (const match of content.matchAll(PROPS_ATTR))
+    for (const entry of propsPaths(match[1])) add(entry.scope, entry.path);
+  return out;
+}
+var stripLayoutPrefix = (value) => value.startsWith("layout:") ? value.slice("layout:".length) : value;
+
 // src/scope.ts
 function patternNames(node, out) {
   if (!node || typeof node !== "object") return;
@@ -2914,7 +2979,10 @@ function wordBounded(haystack, needle) {
 }
 
 // src/loops.ts
-var shapeOf = (arrayPath, leaf) => `${arrayPath}[*].${leaf}`;
+function splitNested(leaf) {
+  const match = leaf.match(/^([^[\]]+)\[(\d+)\]\.(.+)$/);
+  return match ? { array: match[1], index: Number(match[2]), leaf: match[3] } : null;
+}
 var elementEnd = (node) => node.inner ? node.inner.end + node.tag.length + 3 : null;
 function findRows(roots, members) {
   const wanted = new Set(members.map((m) => m.index));
@@ -2986,6 +3054,69 @@ function indentOf(content, at) {
   const prefix = content.slice(lineStart, at);
   return prefix.trim() === "" ? prefix : "";
 }
+function writeLeaf(source, shift, member, rule, read, row, literal) {
+  const site = member.site;
+  const expression = `${read}(${row}, ${JSON.stringify(member.leaf)}, "")`;
+  if (member.kind === "richtext" && rule.richtext) {
+    source.remove(site.inner.start + shift, site.inner.end + shift);
+    source.appendLeft(site.attrInsertAt + shift, ` ${rule.richtext(expression)}`);
+  } else {
+    source.overwrite(site.inner.start + shift, site.inner.end + shift, rule.text(expression));
+  }
+  const kind = member.kind ? ` data-bcms-kind="${member.kind}"` : "";
+  source.appendLeft(site.attrInsertAt + shift, ` ${rule.attr("data-bcms-field", `\`${literal}\``)}${kind}`);
+}
+function emitNested(rule, array, members, prefix, outer, parent, ctx) {
+  if (!rule.loop || !rule.text) return null;
+  const inner = [];
+  for (const member of members) {
+    const split = splitNested(member.leaf);
+    if (!split || splitNested(split.leaf) !== null) return null;
+    inner.push({ ...member, index: split.index, leaf: split.leaf });
+  }
+  const rows = findRows([parent.node], inner);
+  if (!rows || rows.length === 0) return null;
+  if (!consecutive(rows, ctx.content)) return null;
+  if (!sameShape(rows, ctx.content)) return null;
+  const template = rows[0];
+  const used = /* @__PURE__ */ new Set([
+    ...ctx.content.slice(template.range.start, template.range.end).match(/[A-Za-z_$][\w$]*/g) ?? [],
+    outer.row,
+    outer.index
+  ]);
+  const allocated = allocateNames(used, [
+    { key: "row", name: "item" },
+    { key: "index", name: "j" }
+  ]);
+  const names = { row: allocated.get("row"), index: allocated.get("index") };
+  const fallback = [];
+  const writable = inner.every((member) => setLeaf(fallback[member.index] ??= emptyRow(), member.leaf, member.fallback));
+  if (!writable) return null;
+  const source = new MagicString(ctx.content.slice(template.range.start, template.range.end));
+  const shift = -template.range.start;
+  const declarations = [];
+  for (const member of template.members) {
+    const literal = `${prefix}.${array}[\${${names.index}}].${member.leaf}`;
+    writeLeaf(source, shift, member, rule, ctx.read, names.row, literal);
+    declarations.push({ path: shapeOfPath(literal), literal });
+  }
+  const rowsExpr = `${ctx.rows}(${outer.row}, ${JSON.stringify(array)}, ${JSON.stringify(fallback.filter(Boolean))})`;
+  if (rule.loop.kind === "attr") {
+    source.appendRight(template.attrInsertAt + shift, ` ${rule.loop.attr(rowsExpr, names.row, names.index)}`);
+  }
+  if (rule.loopKey) {
+    const key = rule.loopKey(names.index);
+    if (!template.keyAttr) source.appendRight(template.attrInsertAt + shift, ` ${key}`);
+    else if (template.keyAttr.end > template.keyAttr.start)
+      source.overwrite(template.keyAttr.start + shift, template.keyAttr.end + shift, key);
+    else return null;
+  }
+  const indent = indentOf(ctx.content, template.range.start);
+  const text = rule.loop.kind === "wrap" ? `${rule.loop.open(rowsExpr, names.row, names.index)}
+${indented(source.toString(), indent)}
+${indent}${rule.loop.close}` : source.toString();
+  return { range: { start: template.range.start, end: rows[rows.length - 1].range.end }, text, declarations };
+}
 function emitRepeater(dialect, group, arrayPath, fallbackRows, ctx) {
   const rule = DIALECT_RULES[dialect];
   if (!rule.loop || !rule.text || group.length === 0) return null;
@@ -3003,20 +3134,25 @@ function emitRepeater(dialect, group, arrayPath, fallbackRows, ctx) {
   const names = { row: allocated.get("row"), index: allocated.get("index") };
   const source = new MagicString(ctx.content.slice(template.range.start, template.range.end));
   const shift = -template.range.start;
-  const bindings = [];
+  const declarations = [];
+  const nested = /* @__PURE__ */ new Map();
+  const direct = [];
   for (const member of template.members) {
-    const site = member.site;
-    const expression = `${ctx.read}(${names.row}, ${JSON.stringify(member.leaf)}, "")`;
-    if (member.kind === "richtext" && rule.richtext) {
-      source.remove(site.inner.start + shift, site.inner.end + shift);
-      source.appendLeft(site.attrInsertAt + shift, ` ${rule.richtext(expression)}`);
-    } else {
-      source.overwrite(site.inner.start + shift, site.inner.end + shift, rule.text(expression));
-    }
-    const kind = member.kind ? ` data-bcms-kind="${member.kind}"` : "";
-    const path = `\`${arrayPath}[\${${names.index}}].${member.leaf}\``;
-    source.appendLeft(site.attrInsertAt + shift, ` ${rule.attr("data-bcms-field", path)}${kind}`);
-    bindings.push(shapeOf(arrayPath, member.leaf));
+    const inner = splitNested(member.leaf);
+    if (inner === null) direct.push(member);
+    else nested.set(inner.array, [...nested.get(inner.array) ?? [], member]);
+  }
+  for (const [array, members] of nested) {
+    const plan2 = emitNested(rule, array, members, `${arrayPath}[\${${names.index}}]`, names, template, ctx);
+    if (!plan2) return null;
+    if (direct.some((m) => m.site.range.start >= plan2.range.start && m.site.range.end <= plan2.range.end)) return null;
+    source.overwrite(plan2.range.start + shift, plan2.range.end + shift, plan2.text);
+    declarations.push(...plan2.declarations);
+  }
+  for (const member of direct) {
+    const literal = `${arrayPath}[\${${names.index}}].${member.leaf}`;
+    writeLeaf(source, shift, member, rule, ctx.read, names.row, literal);
+    declarations.push({ path: shapeOfPath(literal), literal });
   }
   const args = [ctx.snapshot, JSON.stringify(arrayPath), JSON.stringify(fallbackRows), ...ctx.slug ? [ctx.slug] : []];
   const rowsExpr = `${ctx.rows}(${args.join(", ")})`;
@@ -3037,7 +3173,8 @@ ${indent}${rule.loop.close}` : source.toString();
   return {
     range: { start: template.range.start, end: rows[rows.length - 1].range.end },
     text,
-    bindings: [...new Set(bindings)],
+    declarations,
+    bindings: [...new Set(declarations.map((d) => d.path))],
     names
   };
 }
@@ -3067,9 +3204,9 @@ function setLeaf(row, leaf, value) {
 var FORBIDDEN = /* @__PURE__ */ new Set(["__proto__", "constructor", "prototype"]);
 var emptyRow = () => /* @__PURE__ */ Object.create(null);
 function splitIndexed(arrayPath, path) {
-  const match = path.match(/^(.*)\[(\d+)\]\.(.+)$/);
-  if (!match || match[1] !== arrayPath) return null;
-  return { index: Number(match[2]), leaf: match[3] };
+  if (!path.startsWith(`${arrayPath}[`)) return null;
+  const match = path.slice(arrayPath.length).match(/^\[(\d+)\]\.(.+)$/);
+  return match ? { index: Number(match[1]), leaf: match[2] } : null;
 }
 
 // src/sites/jsx.ts
@@ -3562,22 +3699,68 @@ var firstPresent = (base, files) => [base, ...EXTENSIONS.map((ext) => `${base}${
 function aliasesFrom(sources) {
   const out = /* @__PURE__ */ new Map();
   for (const source of sources) {
-    if (!source.path.endsWith("tsconfig.json") && !source.path.endsWith("jsconfig.json")) continue;
-    try {
-      const parsed = JSON.parse(source.content.replace(/^\s*\/\/.*$/gm, ""));
-      const base = parsed.compilerOptions?.baseUrl?.replace(/^\.\/?/, "").replace(/\/$/, "") ?? "";
-      const root = source.path.split("/").slice(0, -1).join("/");
-      for (const [pattern, targets] of Object.entries(parsed.compilerOptions?.paths ?? {})) {
-        out.set(
-          pattern,
-          targets.map((target) => [root, base, target.replace(/^\.\/?/, "")].filter(Boolean).join("/"))
-        );
-      }
-    } catch {
+    if (!isProjectConfig(source.path)) continue;
+    const parsed = readJsonc(source.content);
+    if (parsed === null) continue;
+    const base = parsed.compilerOptions?.baseUrl?.replace(/^\.\/?/, "").replace(/\/$/, "") ?? "";
+    const root = source.path.split("/").slice(0, -1).join("/");
+    for (const [pattern, targets] of Object.entries(parsed.compilerOptions?.paths ?? {})) {
+      out.set(
+        pattern,
+        targets.map((target) => [root, base, target.replace(/^\.\/?/, "")].filter(Boolean).join("/"))
+      );
     }
   }
   return out;
 }
+var isProjectConfig = (path) => path.endsWith("tsconfig.json") || path.endsWith("jsconfig.json");
+function readJsonc(content) {
+  let out = "";
+  let at = 0;
+  while (at < content.length) {
+    const char = content[at];
+    if (char === '"') {
+      const start = at++;
+      while (at < content.length && content[at] !== '"') at += content[at] === "\\" ? 2 : 1;
+      out += content.slice(start, Math.min(at + 1, content.length));
+      at++;
+      continue;
+    }
+    if (char === "/" && content[at + 1] === "/") {
+      while (at < content.length && content[at] !== "\n") at++;
+      continue;
+    }
+    if (char === "/" && content[at + 1] === "*") {
+      const close = content.indexOf("*/", at + 2);
+      at = close < 0 ? content.length : close + 2;
+      continue;
+    }
+    out += char;
+    at++;
+  }
+  try {
+    const parsed = JSON.parse(out.replace(/,(?=\s*[}\]])/g, ""));
+    return isAliasShaped(parsed) ? parsed : null;
+  } catch {
+    return null;
+  }
+}
+var isRecord = (value) => typeof value === "object" && value !== null && !Array.isArray(value);
+function isAliasShaped(value) {
+  if (!isRecord(value)) return false;
+  const options = value.compilerOptions;
+  if (options === void 0) return true;
+  if (!isRecord(options)) return false;
+  if (options.baseUrl !== void 0 && typeof options.baseUrl !== "string") return false;
+  if (options.paths === void 0) return true;
+  if (!isRecord(options.paths)) return false;
+  return Object.values(options.paths).every(
+    (targets) => Array.isArray(targets) && targets.every((target) => typeof target === "string")
+  );
+}
+function unreadableConfigs(sources) {
+  return sources.filter((source) => isProjectConfig(source.path) && readJsonc(source.content) === null).map((source) => source.path);
+}
 function expand(specifier, aliases) {
   const out = [];
   for (const [pattern, targets] of aliases) {
@@ -3746,70 +3929,6 @@ function typeMember(content, literal) {
   return { start: at, end: at, text: `${terminated ? "" : ";"} ${text}` };
 }
 
-// src/declarations.ts
-var BINDING_ATTR = /data-bcms-(?:layout-)?field\s*=\s*["']([^"']+)["']/g;
-var PROPS_ATTR = /data-bcms-props\s*=\s*["']([^"']+)["']/g;
-var TEMPLATE_SCAN = /:?data-bcms-(?:layout-)?field\s*=\s*(?:\{\s*`([^`]+)`\s*\}|"\s*`([^`]+)`\s*")/g;
-var BINDINGS_SCAN = /bcmsBindings\s*=\s*\{\{[^}]*\}\}/g;
-var propsDeclarations = (value, at) => value.split(";").flatMap((entry) => {
-  const [address, kind] = entry.split("|");
-  if (!address) return [];
-  const scope = address.startsWith("layout:") ? "layout" : "page";
-  return [{ scope, path: stripLayoutPrefix(address), kind: kind ?? "", at, via: "props" }];
-});
-var propsPaths = (value) => propsDeclarations(value, 0).map((d) => ({ scope: d.scope, path: d.path }));
-var TEMPLATE_BINDING = /^:?data-bcms-(?:layout-)?field\s*=\s*(?:\{\s*`([^`]+)`\s*\}|"\s*`([^`]+)`\s*")$/;
-var shapeOfPath = (path) => path.replace(/\[(?:\d+|\$\{[^}]*\})\]/g, "[*]");
-function declarationsIn(roots, content) {
-  const out = [];
-  const visit = (node) => {
-    if (node.type === "expr") {
-      for (const child of node.children) visit(child);
-      return;
-    }
-    if (node.type !== "element") return;
-    const kind = node.attrs.find((a) => a.name === "data-bcms-kind")?.value ?? "";
-    const at = node.attrInsertAt;
-    for (const attr of node.attrs) {
-      const name = attr.name.replace(/^:/, "");
-      if (name === "data-bcms-field" || name === "data-bcms-layout-field") {
-        const scope = name === "data-bcms-layout-field" ? "layout" : "page";
-        const template = content.slice(attr.range.start, attr.range.end).match(TEMPLATE_BINDING);
-        const templated = template?.[1] ?? template?.[2];
-        if (templated) out.push({ scope, path: shapeOfPath(stripLayoutPrefix(templated)), kind, at, via: "field" });
-        else if (attr.value) out.push({ scope, path: stripLayoutPrefix(attr.value), kind, at, via: "field" });
-      } else if (attr.name === "data-bcms-props") {
-        out.push(...propsDeclarations(attr.value, at));
-      } else if (attr.name === "bcmsBindings") {
-        for (const path of bindingsPaths(content.slice(attr.range.start, attr.range.end))) {
-          out.push({ scope: "page", path, kind: "", at, via: "prop" });
-        }
-      }
-    }
-    for (const child of node.children) visit(child);
-  };
-  for (const root of roots) visit(root);
-  return out;
-}
-var bindingsPaths = (text) => [...text.matchAll(/["']([^"']+)["']/g)].map((match) => match[1]);
-var scopedPath = (scope, path) => `${scope}::${path}`;
-var declaredInTree = (roots, content) => new Set(declarationsIn(roots, content).map((d) => scopedPath(d.scope, d.path)));
-function declaredByScan(content) {
-  const out = /* @__PURE__ */ new Set();
-  const add = (scope, path) => void out.add(scopedPath(scope, path));
-  for (const match of content.matchAll(BINDING_ATTR)) {
-    add(match[0].includes("layout-field") ? "layout" : "page", stripLayoutPrefix(match[1]));
-  }
-  for (const match of content.matchAll(TEMPLATE_SCAN)) {
-    add(match[0].includes("layout-field") ? "layout" : "page", shapeOfPath(stripLayoutPrefix(match[1] ?? match[2])));
-  }
-  for (const match of content.matchAll(BINDINGS_SCAN)) for (const path of bindingsPaths(match[0])) add("page", path);
-  for (const match of content.matchAll(PROPS_ATTR))
-    for (const entry of propsPaths(match[1])) add(entry.scope, entry.path);
-  return out;
-}
-var stripLayoutPrefix = (value) => value.startsWith("layout:") ? value.slice("layout:".length) : value;
-
 // src/converted.ts
 var escapeRegExp = (value) => value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
 function splitArrayPath(path) {
@@ -4643,7 +4762,7 @@ var ValidationError = class extends Error {
   }
   code;
 };
-var isRecord = (value) => typeof value === "object" && value !== null && !Array.isArray(value);
+var isRecord2 = (value) => typeof value === "object" && value !== null && !Array.isArray(value);
 var Check = class {
   constructor(code) {
     this.code = code;
@@ -4653,7 +4772,7 @@ var Check = class {
     throw new ValidationError(this.code, `${where} ${why}.`);
   }
   record(value, where) {
-    if (!isRecord(value)) this.fail(where, "is not an object");
+    if (!isRecord2(value)) this.fail(where, "is not an object");
     return value;
   }
   array(value, where) {
@@ -5101,10 +5220,10 @@ var SectionInvariantError = class extends Error {
   }
 };
 function assertSections(total, sections) {
-  const sum = sections.extracted + sections.inlineOnly + sections.alreadyExtracted + sections.pending.length;
+  const sum = sections.extracted + sections.inlineOnly + sections.alreadyExtracted + sections.registered + sections.pending.length;
   if (sum !== total) {
     throw new SectionInvariantError(
-      `The receipt does not account for every section: ${total} planned but ${sections.extracted} extracted + ${sections.inlineOnly} inline-only + ${sections.alreadyExtracted} already extracted + ${sections.pending.length} pending = ${sum}.`
+      `The receipt does not account for every section: ${total} planned but ${sections.extracted} extracted + ${sections.inlineOnly} inline-only + ${sections.alreadyExtracted} already extracted + ${sections.registered} registered + ${sections.pending.length} pending = ${sum}.`
     );
   }
   return sections;
@@ -5114,16 +5233,28 @@ var REGISTRY_MARKER = "// @bettercms-ai/convert sections v1";
 var COMPONENT_DIR = "src/components/bcms";
 var SECTIONS_LIB = "src/lib/bcms-sections.ts";
 var EXTRACTABLE = ["astro", "jsx"];
+var registryValue = (entry) => entry.member ? `${entry.name}.${entry.member}` : entry.name;
+function importLine(name, specifier, entry) {
+  if (entry.kind === "namespace") return `import * as ${name} from "${specifier}";`;
+  if (entry.kind === "named") {
+    const exported = entry.imported ?? name;
+    return `import { ${exported === name ? name : `${exported} as ${name}`} } from "${specifier}";`;
+  }
+  return `import ${name} from "${specifier}";`;
+}
 async function componentizeSources(briefIn, planIn, sources, options) {
   const pending = [];
   let extracted = 0;
   let inlineOnly = 0;
   let alreadyExtracted = 0;
+  let registered = 0;
   let planPending = 0;
   let total = 0;
   const brief = readBrief(briefIn);
   const plan2 = readPlan(planIn);
   const contents = new Map(sources.map((s) => [s.path, s.content]));
+  const fileSet = new Set(contents.keys());
+  const aliases = aliasesFrom(sources);
   const pend = (route, groupKey, reason, message) => void pending.push({ route, groupKey, reason, ...message ? { message } : {} });
   const trees = /* @__PURE__ */ new Map();
   const treeOf = async (file) => {
@@ -5149,6 +5280,7 @@ async function componentizeSources(briefIn, planIn, sources, options) {
   };
   const fresh = /* @__PURE__ */ new Set();
   const registryConflicts = [];
+  const registryUnreadable = [];
   for (const dialect of EXTRACTABLE) {
     const path = `${COMPONENT_DIR}/Sections.${dialect === "astro" ? "astro" : "tsx"}`;
     const existing = contents.get(path);
@@ -5157,7 +5289,11 @@ async function componentizeSources(briefIn, planIn, sources, options) {
       registryConflicts.push(path);
       continue;
     }
-    const held = readRegistry(existing, dialect);
+    const held = await readRegistry(existing, dialect, path, fileSet, aliases);
+    if (held === null) {
+      registryUnreadable.push(path);
+      continue;
+    }
     componentsOf(dialect);
     for (const [slug, component] of held.components) written.get(dialect).set(slug, component);
     const order = shipped.get(dialect) ?? /* @__PURE__ */ new Map();
@@ -5167,6 +5303,7 @@ async function componentizeSources(briefIn, planIn, sources, options) {
   const lib = contents.get(SECTIONS_LIB);
   if (lib !== void 0 && !isGenerated(lib)) registryConflicts.push(SECTIONS_LIB);
   const registryBlocked = registryConflicts.length > 0 && options?.overwriteHelper !== true;
+  const registryUnread = registryUnreadable.length > 0;
   for (const page of plan2.pages ?? []) {
     const sections2 = (page.sections ?? []).filter((section) => {
       if (section.pending) {
@@ -5177,6 +5314,7 @@ async function componentizeSources(briefIn, planIn, sources, options) {
     });
     total += sections2.length;
     if (sections2.length === 0) continue;
+    const pendingBefore = pending.length;
     const briefPage = brief.pages.find((p) => p.route === page.route);
     const pageSlug = briefPage?.slug ?? slugify(page.route === "/" ? "home" : page.route);
     if (helperBlocked) {
@@ -5191,6 +5329,17 @@ async function componentizeSources(briefIn, planIn, sources, options) {
       }
       continue;
     }
+    if (registryUnread) {
+      for (const section of sections2) {
+        pend(
+          page.route,
+          section.groupKey,
+          "REGISTRY_UNREADABLE",
+          `${registryUnreadable.join(", ")} carries our marker but its REGISTRY/SHIPPED tables cannot be read back \u2014 rebuilding it would drop the components it names.`
+        );
+      }
+      continue;
+    }
     const snapshotPath = `${CONTENT_DIR}/${pageSlug}.json`;
     if (!snapshotUsable(contents.get(snapshotPath))) {
       for (const section of sections2) {
@@ -5226,37 +5375,115 @@ async function componentizeSources(briefIn, planIn, sources, options) {
     }
     const live = found.placed;
     if (live.length === 0) continue;
+    const content = contents.get(file);
+    const dialect = dialectOf(file, content);
+    if (!dialect || !EXTRACTABLE.includes(dialect)) {
+      for (const placed of live) {
+        pend(page.route, placed.section.groupKey, "DIALECT_UNSUPPORTED", `${file} is ${dialect ?? "not a template"}.`);
+      }
+      continue;
+    }
+    const tree = await treeOf(file);
+    if (!tree) {
+      for (const placed of live) {
+        pend(page.route, placed.section.groupKey, "NOT_IN_SOURCE", `${file} did not parse.`);
+      }
+      continue;
+    }
+    const parsed = tree.parsed;
+    const importedFiles = /* @__PURE__ */ new Map();
+    for (const [local, from] of importsIn(parsed, dialect)) {
+      const resolved = resolveSpecifier(file, from.specifier, fileSet, aliases);
+      if (resolved === null) continue;
+      importedFiles.set(resolved, [
+        ...importedFiles.get(resolved) ?? [],
+        { local, kind: from.kind, imported: from.imported }
+      ]);
+    }
+    const bindingOf = (held) => {
+      const bindings = importedFiles.get(held) ?? [];
+      return bindings.find((binding) => calledIn(tree, binding)) ?? bindings[0];
+    };
     const placedHere = [];
+    const importedSections = [];
     for (const placed of live) {
       const elements = placed.byFile.get(file);
+      const alsoRendered = [...placed.byFile.keys()].filter((held2) => held2 !== file && importedFiles.has(held2));
       if (elements && elements.length > 0) {
+        if (alsoRendered.length > 0) {
+          pend(
+            page.route,
+            placed.section.groupKey,
+            "SECTION_ROOT_AMBIGUOUS",
+            `rendered inline by ${file} AND by ${alsoRendered.join(", ")}, which it imports.`
+          );
+          continue;
+        }
         placedHere.push({ section: placed.section, elements });
         continue;
       }
+      if (alsoRendered.length > 1) {
+        pend(
+          page.route,
+          placed.section.groupKey,
+          "SECTION_ROOT_AMBIGUOUS",
+          `rendered by ${alsoRendered.join(" and ")}, both imported by ${file}.`
+        );
+        continue;
+      }
+      const only = alsoRendered[0] ?? [...placed.byFile.keys()][0];
+      const held = bindingOf(only);
+      if (held !== void 0 && dialectOf(only, contents.get(only) ?? "") === dialect) {
+        importedSections.push({ section: placed.section, path: only, call: held.local });
+        continue;
+      }
       pend(
         page.route,
         placed.section.groupKey,
         "SECTION_ROOT_AMBIGUOUS",
-        `rendered by ${[...placed.byFile.keys()].join(", ")}, not ${file}.`
+        held === void 0 ? `rendered by ${[...placed.byFile.keys()].join(", ")}, which ${file} does not import.` : `rendered by ${only}, which is ${dialectOf(only, contents.get(only) ?? "") ?? "not a template"}, not ${dialect} like ${file}.`
       );
     }
-    if (placedHere.length === 0) continue;
-    const content = contents.get(file);
-    const dialect = dialectOf(file, content);
-    if (!dialect || !EXTRACTABLE.includes(dialect)) {
-      for (const placed of placedHere) {
-        pend(page.route, placed.section.groupKey, "DIALECT_UNSUPPORTED", `${file} is ${dialect ?? "not a template"}.`);
+    if (placedHere.length === 0 && importedSections.length === 0) continue;
+    const extractable = componentsOf(dialect);
+    const registeredHere = [];
+    for (const held of importedSections) {
+      const component = resolveComponent(plan2, held.section);
+      const already = extractable.get(component.slug);
+      if (already !== void 0 && already.path !== held.path) {
+        pend(
+          page.route,
+          held.section.groupKey,
+          "COMPONENT_CONFLICT",
+          `the slug "${component.slug}" already names ${already.path}, not ${held.path}.`
+        );
+        continue;
       }
-      continue;
-    }
-    const tree = await treeOf(file);
-    if (!tree) {
-      for (const placed of placedHere) {
-        pend(page.route, placed.section.groupKey, "NOT_IN_SOURCE", `${file} did not parse.`);
+      const binding = bindingOf(held.path);
+      const member = binding.kind === "namespace" ? namespaceMember(tree, binding.local) : void 0;
+      if (binding.kind === "namespace" && member === void 0) {
+        pend(
+          page.route,
+          held.section.groupKey,
+          "SECTION_ROOT_AMBIGUOUS",
+          `${held.path} is imported as a namespace and ${file} never calls one of its components, so nothing names the export that renders it.`
+        );
+        continue;
       }
-      continue;
+      extractable.set(component.slug, {
+        name: component.name,
+        path: held.path,
+        kind: binding.kind,
+        imported: binding.imported,
+        ...member ? { member } : {}
+      });
+      registered++;
+      registeredHere.push({
+        slug: component.slug,
+        bind: held.section.groupKey,
+        call: callSiteOf(tree, member ? `${binding.local}.${member}` : held.call)
+      });
     }
-    const parsed = tree.parsed;
     const roots = [];
     for (const placed of placedHere) {
       const root = lowestCommonAncestor(placed.elements);
@@ -5280,8 +5507,6 @@ async function componentizeSources(briefIn, planIn, sources, options) {
       pend(page.route, resolved.section.groupKey, "SECTION_ROOT_AMBIGUOUS", "its root contains another section's.");
     }
     const candidates = roots.filter((r) => !nested.has(r)).sort((a, b) => a.root.start - b.root.start);
-    if (candidates.length === 0) continue;
-    const extractable = componentsOf(dialect);
     const placeable = [];
     for (const resolved of candidates) {
       const path = `${COMPONENT_DIR}/${resolved.name}.${dialect === "astro" ? "astro" : "tsx"}`;
@@ -5304,7 +5529,7 @@ async function componentizeSources(briefIn, planIn, sources, options) {
         );
         continue;
       }
-      extractable.set(resolved.slug, { name: resolved.name, path });
+      extractable.set(resolved.slug, { name: resolved.name, path, kind: "default", imported: null });
       fresh.add(resolved.slug);
       addFile(outFiles, contents, {
         path,
@@ -5313,24 +5538,42 @@ async function componentizeSources(briefIn, planIn, sources, options) {
       });
       placeable.push(resolved);
     }
-    if (placeable.length === 0) continue;
-    const layout = runOf(placeable, parsed.roots);
+    if (placeable.length === 0 && registeredHere.length === 0) continue;
+    const spans = [
+      ...placeable.map((r) => ({ slug: r.slug, bind: r.section.groupKey, root: r.root })),
+      ...registeredHere.map((r) => ({ slug: r.slug, bind: r.bind, root: r.call }))
+    ].sort((a, b) => (a.root?.start ?? Number.MAX_SAFE_INTEGER) - (b.root?.start ?? Number.MAX_SAFE_INTEGER));
+    const known = spans.filter((s) => s.root !== null);
+    const layout = runOf(known, parsed.roots, content);
     if (layout === null) {
       for (const resolved of placeable) {
         pend(page.route, resolved.section.groupKey, "SECTION_NOT_CONTIGUOUS", "its roots share no container.");
       }
       continue;
     }
+    const wholePage = registeredHere.length === 0 || known.length === spans.length && pending.length === pendingBefore;
+    const useRun = layout.contiguous && wholePage;
     const order = shipped.get(dialect) ?? /* @__PURE__ */ new Map();
     shipped.set(dialect, order);
     order.set(
       pageSlug,
-      placeable.map((r) => ({ slug: r.slug, bind: r.section.groupKey }))
+      spans.map((s) => ({ slug: s.slug, bind: s.bind }))
     );
-    const rewritten = layout.contiguous ? splicePageRun(file, content, dialect, parsed, placeable, pageSlug) : splicePageInline(file, content, dialect, parsed, placeable, pageSlug, extractable);
-    addFile(outFiles, contents, { path: file, operation: "modify", content: rewritten });
-    if (layout.contiguous) extracted += placeable.length;
-    else inlineOnly += placeable.length;
+    if (useRun) {
+      addFile(outFiles, contents, {
+        path: file,
+        operation: "modify",
+        content: splicePageRun(file, content, dialect, parsed, known, pageSlug)
+      });
+      extracted += placeable.length;
+    } else if (placeable.length > 0) {
+      addFile(outFiles, contents, {
+        path: file,
+        operation: "modify",
+        content: splicePageInline(file, content, dialect, parsed, placeable, pageSlug, extractable)
+      });
+      inlineOnly += placeable.length;
+    }
   }
   const componentSlugs = [...written.values()].flatMap((held) => [...held.keys()]);
   if (componentSlugs.length > 0) {
@@ -5352,7 +5595,7 @@ async function componentizeSources(briefIn, planIn, sources, options) {
     emitHelper(outFiles, contents, helperVersion, options?.overwriteHelper);
     emitStubs(outFiles, contents, pageSlugs);
   }
-  const sections = assertSections(total, { extracted, inlineOnly, alreadyExtracted, pending });
+  const sections = assertSections(total, { extracted, inlineOnly, alreadyExtracted, registered, pending });
   return {
     files: [...outFiles.values()].sort((a, b) => a.path.localeCompare(b.path)),
     receipt: {
@@ -5360,7 +5603,14 @@ 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(),
-      planPending
+      planPending,
+      notes: unreadableConfigs(sources).map(
+        (path) => ({
+          code: "TSCONFIG_UNREADABLE",
+          file: path,
+          message: `${path} is not JSON this package can read, so its \`paths\` aliases resolved to nothing.`
+        })
+      )
     }
   };
 }
@@ -5373,29 +5623,138 @@ function alreadyOn(content, pageSlug, sections) {
   }
   return sections.map((section) => section.groupKey).filter((groupKey) => new RegExp(`bind=\\s*["']${groupKey.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")}["']`).test(content));
 }
-function readRegistry(content, dialect) {
+async function readRegistry(content, dialect, path, files, aliases) {
   const components = /* @__PURE__ */ new Map();
   const shipped = /* @__PURE__ */ new Map();
-  const paths = /* @__PURE__ */ new Map();
-  for (const match of content.matchAll(/^import\s+(\w+)\s+from\s+"\.\/([^"]+)";$/gm)) {
-    const [, name, file] = match;
-    paths.set(name, `${COMPONENT_DIR}/${file}${dialect === "astro" ? "" : ".tsx"}`);
-  }
-  const registry = content.match(/const REGISTRY[^=]*=\s*\{([\s\S]*?)\n\};/);
-  for (const match of (registry?.[1] ?? "").matchAll(/^\s*"([^"]+)":\s*(\w+),$/gm)) {
-    const [, slug, name] = match;
-    const path = paths.get(name);
-    if (path) components.set(slug, { name, path });
-  }
-  const table = content.match(/const SHIPPED[^=]*=\s*\{([\s\S]*?)\n\};/);
-  for (const match of (table?.[1] ?? "").matchAll(/^\s*"([^"]+)":\s*(\[.*\]),$/gm)) {
+  const parsed = await parseFile4(dialect, content);
+  if (parsed.error) return null;
+  const imports = /* @__PURE__ */ new Map();
+  for (const [local, from] of importsIn(parsed, dialect)) {
+    if (!from.specifier.startsWith(".")) continue;
+    const resolved = resolveSpecifier(path, from.specifier, files, aliases);
+    if (resolved !== null) {
+      imports.set(local, { name: local, path: resolved, kind: from.kind, imported: from.imported });
+    }
+  }
+  const registry = blockOf(content, "REGISTRY");
+  const table = blockOf(content, "SHIPPED");
+  if (registry === null || table === null) return null;
+  const registryRows = propertiesOf(registry);
+  const shippedRows = propertiesOf(table);
+  if (registryRows === null || shippedRows === null) return null;
+  for (const row of registryRows) {
+    const named = row.value.match(/^([A-Za-z_$][\w$]*)(?:\.([A-Za-z_$][\w$]*))?$/);
+    const entry = named ? imports.get(named[1]) : void 0;
+    if (!named || !entry) return null;
+    components.set(row.key, named[2] === void 0 ? entry : { ...entry, member: named[2] });
+  }
+  for (const row of shippedRows) {
     try {
-      shipped.set(match[1], JSON.parse(match[2]));
+      const placements = JSON.parse(row.value);
+      if (!Array.isArray(placements)) return null;
+      shipped.set(row.key, placements);
     } catch {
+      return null;
     }
   }
   return { components, shipped };
 }
+function blockOf(content, name) {
+  const declaration2 = content.indexOf(`const ${name}`);
+  if (declaration2 < 0) return null;
+  const open = content.indexOf("{", declaration2);
+  if (open < 0) return null;
+  let depth = 0;
+  let at = open;
+  while (at < content.length) {
+    const skip = skipTrivia(content, at);
+    if (skip >= 0) {
+      at = skip;
+      continue;
+    }
+    if (content[at] === "{") depth++;
+    else if (content[at] === "}" && --depth === 0) return content.slice(open + 1, at);
+    at++;
+  }
+  return null;
+}
+function skipTrivia(source, at) {
+  const char = source[at];
+  if (char === '"' || char === "'" || char === "`") {
+    let cursor = at + 1;
+    while (cursor < source.length && source[cursor] !== char) cursor += source[cursor] === "\\" ? 2 : 1;
+    return Math.min(cursor + 1, source.length);
+  }
+  if (char === "/" && source[at + 1] === "/") {
+    const line = source.indexOf("\n", at);
+    return line < 0 ? source.length : line;
+  }
+  if (char === "/" && source[at + 1] === "*") {
+    const close = source.indexOf("*/", at + 2);
+    return close < 0 ? source.length : close + 2;
+  }
+  return -1;
+}
+function withoutComments(text) {
+  let out = "";
+  let at = 0;
+  while (at < text.length) {
+    const skip = skipTrivia(text, at);
+    if (skip < 0) {
+      out += text[at];
+      at++;
+      continue;
+    }
+    out += text[at] === '"' || text[at] === "'" || text[at] === "`" ? text.slice(at, skip) : "";
+    at = skip;
+  }
+  return out;
+}
+function propertiesOf(block) {
+  const out = [];
+  const push = (text) => {
+    const held = text.trim();
+    if (held === "") return true;
+    let depth2 = 0;
+    for (let at = 0; at < held.length; ) {
+      const skip = skipTrivia(held, at);
+      if (skip >= 0) {
+        at = skip;
+        continue;
+      }
+      const char = held[at];
+      if ("{[(".includes(char)) depth2++;
+      else if ("}])".includes(char)) depth2--;
+      else if (char === ":" && depth2 === 0) {
+        const key = withoutComments(held.slice(0, at)).trim().replace(/^["'`]|["'`]$/g, "");
+        const value = withoutComments(held.slice(at + 1)).trim();
+        if (key === "" || value === "") return false;
+        out.push({ key, value });
+        return true;
+      }
+      at++;
+    }
+    return false;
+  };
+  let depth = 0;
+  let start = 0;
+  for (let at = 0; at < block.length; ) {
+    const skip = skipTrivia(block, at);
+    if (skip >= 0) {
+      at = skip;
+      continue;
+    }
+    const char = block[at];
+    if ("{[(".includes(char)) depth++;
+    else if ("}])".includes(char)) depth--;
+    else if (char === "," && depth === 0) {
+      if (!push(block.slice(start, at))) return null;
+      start = at + 1;
+    }
+    at++;
+  }
+  return push(block.slice(start)) ? out : null;
+}
 function snapshotUsable(existing) {
   if (existing === void 0) return true;
   try {
@@ -5480,7 +5839,22 @@ function lowestCommonAncestor(elements) {
   }
   return common[common.length - 1] ?? null;
 }
-function runOf(placeable, roots) {
+var calledIn = (tree, binding) => [...tree.elements.values()].some(
+  (placed) => binding.kind === "namespace" ? placed.node.tag.startsWith(`${binding.local}.`) : placed.node.tag === binding.local
+);
+function namespaceMember(tree, local) {
+  const members = new Set(
+    [...tree.elements.values()].map((placed) => placed.node.tag).filter((tag) => tag.startsWith(`${local}.`)).map((tag) => tag.slice(local.length + 1))
+  );
+  return members.size === 1 ? [...members][0] : void 0;
+}
+function callSiteOf(tree, local) {
+  const calls = [...tree.elements.values()].map((placed) => placed.node).filter((node) => node.tag === local);
+  const only = calls.length === 1 ? calls[0] : null;
+  return only !== null && only.attrs.length === 0 ? only : null;
+}
+function runOf(placeable, roots, content) {
+  if (placeable.length === 0) return null;
   const parents = placeable.map((r) => parentOf(r.root, roots));
   if (parents.some((p) => p === void 0)) return null;
   const [first, ...rest] = parents;
@@ -5490,9 +5864,14 @@ function runOf(placeable, roots) {
   );
   const indices = placeable.map((r) => siblings.indexOf(r.root)).sort((a, b) => a - b);
   if (indices.some((at) => at < 0)) return null;
-  const contiguous = indices.every((at, i) => i === 0 || at === indices[i - 1] + 1);
-  return { contiguous };
+  const consecutive2 = indices.every((at, i) => i === 0 || at === indices[i - 1] + 1);
+  const ordered = [...placeable].sort((a, b) => a.root.start - b.root.start);
+  const clean = ordered.every(
+    (span, at) => at === 0 || isTrivia(content.slice(ordered[at - 1].root.end, span.root.start))
+  );
+  return { contiguous: consecutive2 && clean };
 }
+var isTrivia = (between) => between.replace(/<!--[\s\S]*?-->/g, "").replace(/\{\s*\/\*[\s\S]*?\*\/\s*\}/g, "").trim() === "";
 function parentOf(target, roots) {
   if (roots.some((node) => node === target)) return null;
   const search = (nodes, parent) => {
@@ -5712,9 +6091,9 @@ function registryFile(dialect, path, written, shipped) {
   const entries = [...written].sort(([a], [b]) => a.localeCompare(b));
   const imports = entries.map(([, component]) => {
     const specifier = relativeImport(path, component.path);
-    return `import ${component.name} from "${dialect === "astro" ? specifier : specifier.replace(/\.tsx?$/, "")}";`;
+    return importLine(component.name, dialect === "astro" ? specifier : specifier.replace(/\.tsx?$/, ""), component);
   }).join("\n");
-  const registry = entries.map(([slug, component]) => `  ${JSON.stringify(slug)}: ${component.name},`).join("\n");
+  const registry = entries.map(([slug, component]) => `  ${JSON.stringify(slug)}: ${registryValue(component)},`).join("\n");
   const shippedTable = [...shipped].sort(([a], [b]) => a.localeCompare(b)).map(([page, list]) => `  ${JSON.stringify(page)}: ${JSON.stringify(list)},`).join("\n");
   const lib = relativeImport(path, SECTIONS_LIB).replace(/\.tsx?$/, "");
   const registryType = dialect === "astro" ? "Record<string, unknown>" : "Record<string, (props: BcmsSectionProps) => JSX.Element | null>";
@@ -5822,17 +6201,24 @@ function splicePageInline(file, content, dialect, parsed, placeable, pageSlug, w
   const snapshot = names.get("pageSnapshot");
   const source = new MagicString3(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);
     source.overwrite(
       resolved.root.start,
       resolved.root.end,
-      `<${names.get(resolved.slug)} bind=${JSON.stringify(resolved.section.groupKey)} page={${snapshot}(${JSON.stringify(pageSlug)})} />`
+      `<${tag} bind=${JSON.stringify(resolved.section.groupKey)} page={${snapshot}(${JSON.stringify(pageSlug)})} />`
     );
   }
   const lib = relativeImport(file, SECTIONS_LIB).replace(/\.tsx?$/, "");
   const imports = [
     ...wanted.map(({ key }) => {
-      const specifier = relativeImport(file, written.get(key).path);
-      return `import ${names.get(key)} from "${dialect === "astro" ? specifier : specifier.replace(/\.tsx?$/, "")}";`;
+      const component = written.get(key);
+      const specifier = relativeImport(file, component.path);
+      return importLine(
+        names.get(key),
+        dialect === "astro" ? specifier : specifier.replace(/\.tsx?$/, ""),
+        component
+      );
     }),
     `import { pageSnapshot${snapshot === "pageSnapshot" ? "" : ` as ${snapshot}`} } from "${lib}";`
   ];
@@ -6005,28 +6391,78 @@ async function convertSources(briefIn, sources, options) {
     );
   }
   let declaredOnly = 0;
+  const declaredRows = [];
+  const briefRoutes = new Set(brief.pages.map((page) => page.route));
+  const declaredRow = (target, readsFromCms, file) => {
+    declaredRows.push({
+      route: target.route,
+      scope: target.scope,
+      path: target.path,
+      kind: target.kind,
+      ...file ? { file } : {},
+      readsFromCms
+    });
+  };
   const witnessed = async (target) => {
     for (const source of sources) {
       const parsed = await parseOf(source.path);
       const dialect = dialectOf(source.path, source.content);
       if (!parsed || !dialect) continue;
-      if (convertedHere(source.content, parsed, dialect, target, source.path)) return true;
+      if (convertedHere(source.content, parsed, dialect, target, source.path) && attributable(target, source.path)) {
+        return source.path;
+      }
     }
-    return false;
+    return null;
   };
   const locatedByKey = /* @__PURE__ */ new Map();
   for (const hit of located) {
     const key = keyOf(hit.route, hit.scope ?? "page", hit.path);
     if (!locatedByKey.has(key)) locatedByKey.set(key, hit);
   }
+  const sharingPath = /* @__PURE__ */ new Map();
+  for (const [key, hit] of locatedByKey) {
+    const held = targets.get(key);
+    if (!held) continue;
+    const id = scopedPath(held.scope, held.path);
+    sharingPath.set(id, [...sharingPath.get(id) ?? [], { key, files: hit.files }]);
+  }
+  const claimedByAnother = (target, file) => (sharingPath.get(scopedPath(target.scope, target.path)) ?? []).some(
+    (other) => other.key !== target.key && other.files.includes(file)
+  );
+  const attributable = (target, file, claimed) => {
+    if (target.scope === "layout") return true;
+    const serves = routeOfFile(file);
+    if (serves !== null && serves !== target.route && briefRoutes.has(serves)) return false;
+    if (serves === target.route && pageFilesFor(target.route, contents.keys()).length !== 1) return false;
+    return claimed !== true;
+  };
+  const declaredByHand = (target, within) => {
+    const candidates = within ?? (target.scope === "layout" ? sources.map((s) => s.path) : pageFilesFor(target.route, contents.keys()));
+    for (const file of candidates) {
+      if (!covers(declarations.get(file), target)) continue;
+      if (attributable(target, file, within !== void 0 && claimedByAnother(target, file))) return file;
+    }
+    return null;
+  };
   const missed = /* @__PURE__ */ new Set();
   for (const miss of unlocated) {
     const key = keyOf(miss.route, miss.scope ?? "page", miss.path);
     const target = targets.get(key);
     if (!target || locatedByKey.has(key) || missed.has(key)) continue;
     missed.add(key);
-    if (await witnessed(target)) declaredOnly++;
-    else pend(target, miss.reason === "no-original" ? "NO_ORIGINAL" : "NOT_IN_SOURCE");
+    const witness = await witnessed(target);
+    if (witness !== null) {
+      declaredOnly++;
+      declaredRow(target, true, witness);
+      continue;
+    }
+    const byHand = declaredByHand(target);
+    if (byHand !== null) {
+      declaredOnly++;
+      declaredRow(target, false, byHand);
+      continue;
+    }
+    pend(target, miss.reason === "no-original" ? "NO_ORIGINAL" : "NOT_IN_SOURCE");
   }
   const byFile = /* @__PURE__ */ new Map();
   for (const [key, hit] of locatedByKey) {
@@ -6084,8 +6520,21 @@ async function convertSources(briefIn, sources, options) {
     if (worst) {
       const file = hit.files[outcomes.indexOf(worst)];
       pend(target, worst, file);
-    } else if (outcomes.every((o) => o === "declared")) alreadyDeclared++;
-    else rewritten++;
+    } else if (outcomes.every((o) => o === "declared")) {
+      const witness = await witnessed(target);
+      const byHand = witness === null ? declaredByHand(target, hit.files) : null;
+      if (witness === null && byHand === null) {
+        pend(
+          target,
+          "AMBIGUOUS_LITERAL",
+          hit.files[0],
+          `${hit.files.join(", ")} already declares ${target.path}, and nothing there says it is ${target.route}'s.`
+        );
+        continue;
+      }
+      alreadyDeclared++;
+      declaredRow(target, witness !== null, witness ?? byHand);
+    } else rewritten++;
   }
   for (const [file, splices] of [...componentEdits].sort(([a], [b]) => a.localeCompare(b))) {
     const source = new MagicString4(contents.get(file));
@@ -6111,12 +6560,27 @@ async function convertSources(briefIn, sources, options) {
   emitStubs2(dialects, snapshotSlugs, contents, outFiles);
   const receipt = assertReceipt({
     briefDigest: digest,
-    paths: { declared: targets.size, rewritten, alreadyDeclared, pending },
+    paths: {
+      declared: targets.size,
+      rewritten,
+      alreadyDeclared,
+      declarations: declaredRows.sort(
+        (a, b) => a.route.localeCompare(b.route) || a.scope.localeCompare(b.scope) || a.path.localeCompare(b.path)
+      ),
+      pending
+    },
     occurrences: { located: occurrencesLocated, rewritten: occurrencesRewritten },
     files: receiptFiles,
     helpers,
     helperUpgraded,
-    dynamicBindings
+    dynamicBindings,
+    notes: unreadableConfigs(sources).map(
+      (file) => ({
+        code: "TSCONFIG_UNREADABLE",
+        file,
+        message: `${file} is not JSON this package can read, so its \`paths\` aliases resolved to nothing.`
+      })
+    )
   });
   return { files: outFiles.sort((a, b) => a.path.localeCompare(b.path)), receipt };
 }
@@ -6384,14 +6848,12 @@ async function plan(file, content, dialect, targets, sites, importAt, outcomes,
       looped.add(member.key);
       outcomes.set(member.key, "rewritten");
     }
-    for (const leaf of [...new Set(members.map((m) => m.leaf))]) {
+    for (const declaration2 of plan2.declarations) {
       dynamic.push({
         file,
         prop: null,
-        path: shapeOf(arrayPath, leaf),
-        // The loop's OWN index name — `i_1` when the row already bound `i`. Hardcoding `i` here
-        // described a binding the file does not contain, which is what the proposer looks for.
-        callSites: [{ file, literal: `${arrayPath}[\${${plan2.names.index}}].${leaf}` }]
+        path: declaration2.path,
+        callSites: [{ file, literal: declaration2.literal }]
       });
     }
     rewrites.push({
@@ -6748,14 +7210,14 @@ ${rewritten} of ${declared} paths bound (${alreadyDeclared} already declared, ${
   }
 }
 function reportSections(files, receipt, dryRun) {
-  const { extracted, inlineOnly, alreadyExtracted, pending } = receipt.sections;
+  const { extracted, inlineOnly, alreadyExtracted, registered, pending } = receipt.sections;
   for (const file of files) {
     process.stdout.write(`${dryRun ? "would " : ""}${file.operation} ${file.path}
 `);
   }
   process.stdout.write(
     `
-${extracted} sections extracted (${inlineOnly} inline-only, ${alreadyExtracted} already extracted, ${pending.length} pending)
+${extracted} sections extracted (${registered} registered, ${inlineOnly} inline-only, ${alreadyExtracted} already extracted, ${pending.length} pending)
 `
   );
   for (const section of pending) {