@bettercms-ai/convert 0.4.0 → 0.5.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 MagicString4 from "magic-string";
+import MagicString5 from "magic-string";
 
 // src/brief.ts
 import { createHash } from "crypto";
@@ -27,6 +27,21 @@ var BY_EXTENSION = {
   ".svelte": "svelte",
   ".vue": "vue"
 };
+var TOLERANT_EXTENSIONS = /* @__PURE__ */ new Set([
+  ".md",
+  ".mdx",
+  ".njk",
+  ".hbs",
+  ".ejs",
+  ".liquid",
+  ".erb",
+  ".twig"
+]);
+function isTolerantDialect(path) {
+  const lower = path.toLowerCase();
+  const at = lower.lastIndexOf(".");
+  return at >= 0 && TOLERANT_EXTENSIONS.has(lower.slice(at));
+}
 function dialectOf(path, _content) {
   const lower = path.toLowerCase();
   const at = lower.lastIndexOf(".");
@@ -4263,6 +4278,7 @@ function importLines(imports) {
 }
 
 // src/receipt.ts
+var CANVAS_REASONS = /* @__PURE__ */ new Set(["CANVAS_BRIDGE_MANUAL", "SSR_DRAFT_ROUTE"]);
 var ReceiptInvariantError = class extends Error {
   code = "RECEIPT_INVARIANT";
   constructor(message) {
@@ -4272,10 +4288,11 @@ var ReceiptInvariantError = class extends Error {
 };
 function assertReceipt(receipt) {
   const { declared, rewritten, alreadyDeclared, pending } = receipt.paths;
-  const sum = rewritten + alreadyDeclared + pending.length;
+  const paths = pending.filter((p) => !CANVAS_REASONS.has(p.reason));
+  const sum = rewritten + alreadyDeclared + paths.length;
   if (sum !== declared) {
     throw new ReceiptInvariantError(
-      `The receipt does not account for every path: ${declared} declared but ${rewritten} rewritten + ${alreadyDeclared} already declared + ${pending.length} pending = ${sum}.`
+      `The receipt does not account for every path: ${declared} declared but ${rewritten} rewritten + ${alreadyDeclared} already declared + ${paths.length} pending = ${sum}.`
     );
   }
   if (receipt.occurrences.rewritten > receipt.occurrences.located) {
@@ -4775,6 +4792,218 @@ function tryParse3(code) {
 var PARSE_FILE = { html: parse2, astro: parseFile, jsx: parse, svelte: parseFile2, vue: parseFile3 };
 var parseFile4 = (dialect, content) => Promise.resolve(PARSE_FILE[dialect](content));
 
+// src/canvas.ts
+import MagicString3 from "magic-string";
+var SSR_DRAFT_RECIPE = "Astro renders this site at build time, so there is no server to answer the editor's draft request. Either mount <BcmsLiveBlocks client:load> from @bettercms-ai/astro on the pages whose body is a block tree, or switch the preview routes to `output: 'server'` with the node adapter, mount @bettercms-ai/astro's draft routes, set BCMS_DRAFT_SECRET, redeploy, and switch the project to 'Run as a server app'.";
+var isNode = (value) => !!value && typeof value === "object" && typeof value.type === "string";
+var FUNCTIONS3 = /* @__PURE__ */ new Set([
+  "FunctionDeclaration",
+  "FunctionExpression",
+  "ArrowFunctionExpression",
+  "ObjectMethod",
+  "ClassMethod"
+]);
+function patternNames2(node, out) {
+  if (!isNode(node)) return;
+  switch (node.type) {
+    case "Identifier":
+      out.add(String(node.name));
+      return;
+    case "ObjectPattern":
+      for (const p of node.properties ?? [])
+        patternNames2(p.type === "RestElement" ? p.argument : p.value, out);
+      return;
+    case "ArrayPattern":
+      for (const el of node.elements ?? []) patternNames2(el, out);
+      return;
+    case "AssignmentPattern":
+      patternNames2(node.left, out);
+      return;
+    case "RestElement":
+      patternNames2(node.argument, out);
+      return;
+    default:
+      return;
+  }
+}
+function statementNames2(statements, out) {
+  for (const statement of statements ?? []) {
+    if (!isNode(statement)) continue;
+    const node = statement.type === "ExportNamedDeclaration" || statement.type === "ExportDefaultDeclaration" ? statement.declaration : statement;
+    if (!isNode(node)) continue;
+    if (node.type === "VariableDeclaration")
+      for (const d of node.declarations ?? []) patternNames2(d.id, out);
+    else if (node.type === "FunctionDeclaration" || node.type === "ClassDeclaration") patternNames2(node.id, out);
+    else if (node.type === "ImportDeclaration")
+      for (const specifier of node.specifiers ?? []) patternNames2(specifier.local, out);
+  }
+}
+function functionBindings(fn) {
+  const out = /* @__PURE__ */ new Set();
+  for (const param of fn.params ?? []) patternNames2(param, out);
+  const body = fn.body;
+  if (body?.type === "BlockStatement") statementNames2(body.body, out);
+  return out;
+}
+function stringLiterals(node, out) {
+  if (!isNode(node)) {
+    if (Array.isArray(node)) for (const child of node) stringLiterals(child, out);
+    return;
+  }
+  if (FUNCTIONS3.has(node.type)) return;
+  if (node.type === "StringLiteral" && typeof node.value === "string") out.add(node.value);
+  for (const key of Object.keys(node)) {
+    if (key === "loc" || key === "leadingComments" || key === "trailingComments") continue;
+    stringLiterals(node[key], out);
+  }
+}
+function usages(ast, local) {
+  const found = [];
+  const moduleScope2 = /* @__PURE__ */ new Set();
+  statementNames2(ast?.program?.body, moduleScope2);
+  const walk = (node, scope, literals) => {
+    if (!isNode(node)) {
+      if (Array.isArray(node)) for (const child of node) walk(child, scope, literals);
+      return;
+    }
+    let nextScope = scope;
+    let nextLiterals = literals;
+    if (FUNCTIONS3.has(node.type)) {
+      nextScope = /* @__PURE__ */ new Set([...scope, ...functionBindings(node)]);
+      nextLiterals = /* @__PURE__ */ new Set();
+      stringLiterals(node.body, nextLiterals);
+    }
+    if (node.type === "JSXElement") {
+      const name = node.openingElement?.name;
+      if (name?.type === "JSXIdentifier" && name.name === local)
+        found.push({ element: node, scope: nextScope, literals: nextLiterals });
+    }
+    for (const key of Object.keys(node)) {
+      if (key === "loc" || key === "leadingComments" || key === "trailingComments") continue;
+      walk(node[key], nextScope, nextLiterals);
+    }
+  };
+  walk(ast?.program ?? ast, moduleScope2, /* @__PURE__ */ new Set());
+  return found;
+}
+function bridgedAlready(ast) {
+  const body = ast?.program?.body ?? [];
+  return body.some(
+    (statement) => statement.type === "ImportDeclaration" && String(statement.source?.value ?? "") === "@bettercms-ai/next/draft-bridge" && (statement.specifiers ?? []).some(
+      (specifier) => specifier.imported?.name === "BcmsDraftBridge"
+    )
+  );
+}
+function blocksImport(ast) {
+  const body = ast?.program?.body ?? [];
+  for (const statement of body) {
+    if (statement.type !== "ImportDeclaration") continue;
+    const source = String(statement.source?.value ?? "");
+    if (source !== "@bettercms-ai/next" && source !== "@bettercms-ai/next/blocks") continue;
+    for (const specifier of statement.specifiers ?? []) {
+      const imported = specifier.imported;
+      if (specifier.type !== "ImportSpecifier" || imported?.name !== "BcmsBlocks") continue;
+      return { declaration: statement, specifier, local: String(specifier.local.name) };
+    }
+  }
+  return null;
+}
+function slugExpression(usage, routes) {
+  if (usage.scope.has("slug")) return "{slug}";
+  if (usage.scope.has("page")) return "{page.slug}";
+  const matched = [...new Set([...usage.literals].map((l) => routes.get(l)).filter((s) => !!s))];
+  return matched.length === 1 ? JSON.stringify(matched[0]) : null;
+}
+var lineOf = (content, offset) => content.slice(0, offset).split("\n").length;
+var pend = (reason, hint, file, line) => ({
+  route: "",
+  scope: "page",
+  path: reason === "SSR_DRAFT_ROUTE" ? "canvas.lane" : "canvas.bridge",
+  kind: "canvas",
+  ...file ? { file } : {},
+  ...line ? { line } : {},
+  reason,
+  hint
+});
+var ASTRO_LANE_PENDING = pend("SSR_DRAFT_ROUTE", SSR_DRAFT_RECIPE);
+function canvasBridge(sources, routes) {
+  if (sources.some((s) => s.path.toLowerCase().endsWith(".astro")))
+    return { lane: "pending", files: [], edits: /* @__PURE__ */ new Map(), pending: [ASTRO_LANE_PENDING] };
+  const files = [];
+  const edits = /* @__PURE__ */ new Map();
+  const pending = [];
+  for (const source of sources) {
+    if (!/\.[jt]sx$/i.test(source.path) || !source.ast) continue;
+    if (bridgedAlready(source.ast)) {
+      files.push(source.path);
+      continue;
+    }
+    const imported = blocksImport(source.ast);
+    if (!imported) continue;
+    const found = usages(source.ast, imported.local);
+    const slugs = found.map((usage) => slugExpression(usage, routes));
+    const unresolved = found.findIndex((_, i) => slugs[i] === null);
+    if (found.length === 0 || unresolved !== -1) {
+      const at = found[unresolved === -1 ? 0 : unresolved]?.element.start;
+      pending.push(
+        pend(
+          "CANVAS_BRIDGE_MANUAL",
+          "Wrap this page's <BcmsBlocks> in <BcmsDraftBridge slug={\u2026}> from @bettercms-ai/next/draft-bridge. No slug expression was derivable in the component's own scope, so the codemod will not guess one: a bridge on the wrong slug never updates in the editor.",
+          source.path,
+          at === void 0 ? void 0 : lineOf(source.content, at)
+        )
+      );
+      continue;
+    }
+    const out = new MagicString3(source.content);
+    rewriteImport(out, imported);
+    for (const [i, usage] of found.entries()) rewriteElement(out, usage, imported.local, slugs[i]);
+    edits.set(source.path, out.toString());
+    files.push(source.path);
+  }
+  return { lane: files.length > 0 ? "bridge" : "pending", files, edits, pending };
+}
+function rewriteImport(out, imported) {
+  const { declaration: declaration2, specifier, local } = imported;
+  const line = `import { BcmsDraftBridge${local === "BcmsBlocks" ? "" : ` as ${local}`} } from "@bettercms-ai/next/draft-bridge";`;
+  const specifiers = declaration2.specifiers ?? [];
+  const named = specifiers.filter((s) => s.type === "ImportSpecifier");
+  if (named.length === 1) {
+    if (specifiers.length === 1) {
+      out.overwrite(declaration2.start, declaration2.end, line);
+      return;
+    }
+    const other = specifiers.find((s) => s.type !== "ImportSpecifier");
+    const close = out.original.indexOf("}", named[0].end);
+    out.remove(other.end, close + 1);
+    out.appendRight(declaration2.end, `
+${line}`);
+    return;
+  }
+  const index = named.indexOf(specifier);
+  const previous = named[index - 1];
+  const from = previous ? previous.end : specifier.start;
+  const to = previous ? specifier.end : named[index + 1].start;
+  out.remove(from, to);
+  out.appendRight(declaration2.end, `
+${line}`);
+}
+function rewriteElement(out, usage, local, slug) {
+  const opening = usage.element.openingElement;
+  const name = opening.name;
+  if (local === "BcmsBlocks") {
+    out.overwrite(name.start, name.end, "BcmsDraftBridge");
+    const closing = usage.element.closingElement;
+    if (closing) {
+      const closingName = closing.name;
+      out.overwrite(closingName.start, closingName.end, "BcmsDraftBridge");
+    }
+  }
+  const attributes = opening.attributes ?? [];
+  const hasSlug = attributes.some((a) => a.name?.name === "slug");
+  if (!hasSlug) out.appendLeft(name.end, ` slug=${slug}`);
+}
+
 // src/tolerant.ts
 var escape = (value) => value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
 var flexible = (literal) => new RegExp(escape(literal).split(" ").map(escape).join("\\s+"), "gu");
@@ -5196,10 +5425,10 @@ function scanExpression(code) {
         for (const key of ["typeName", "left", "right", "id"]) nameOf2(node[key], skip);
         return;
       case "VariableDeclarator":
-        patternNames2(node.id, bound);
+        patternNames3(node.id, bound);
         return;
       case "CatchClause":
-        patternNames2(node.param, bound);
+        patternNames3(node.param, bound);
         return;
       default:
         return;
@@ -5207,8 +5436,8 @@ function scanExpression(code) {
   });
   walkAst(ast, (node) => {
     if (node.type === "ArrowFunctionExpression" || node.type === "FunctionExpression" || node.type === "FunctionDeclaration" || node.type === "ObjectMethod" || node.type === "ClassMethod") {
-      for (const param of node.params ?? []) patternNames2(param, bound);
-      if (node.id) patternNames2(node.id, bound);
+      for (const param of node.params ?? []) patternNames3(param, bound);
+      if (node.id) patternNames3(node.id, bound);
     }
   });
   const free = /* @__PURE__ */ new Set();
@@ -5223,7 +5452,7 @@ function nameOf2(node, out) {
     nameOf2(node.name, out);
   }
 }
-function patternNames2(node, out) {
+function patternNames3(node, out) {
   if (!node || typeof node !== "object") return;
   const typed = node;
   switch (typed.type) {
@@ -5232,17 +5461,17 @@ function patternNames2(node, out) {
       return;
     case "ObjectPattern":
       for (const property of typed.properties ?? []) {
-        patternNames2(property.type === "RestElement" ? property.argument : property.value, out);
+        patternNames3(property.type === "RestElement" ? property.argument : property.value, out);
       }
       return;
     case "ArrayPattern":
-      for (const element of typed.elements ?? []) patternNames2(element, out);
+      for (const element of typed.elements ?? []) patternNames3(element, out);
       return;
     case "AssignmentPattern":
-      patternNames2(typed.left, out);
+      patternNames3(typed.left, out);
       return;
     case "RestElement":
-      patternNames2(typed.argument, out);
+      patternNames3(typed.argument, out);
       return;
     default:
       return;
@@ -5264,9 +5493,9 @@ function moduleScope(parsed, content) {
     const text = source.slice(start, end);
     const names = /* @__PURE__ */ new Set();
     if (kind === "VariableDeclaration") {
-      for (const declarator of statement.declarations ?? []) patternNames2(declarator.id, names);
+      for (const declarator of statement.declarations ?? []) patternNames3(declarator.id, names);
     } else {
-      patternNames2(statement.id, names);
+      patternNames3(statement.id, names);
     }
     if (names.size === 0) continue;
     const scanned = scanExpression(text.replace(/^(?:export\s+)?/, ""));
@@ -5277,7 +5506,7 @@ function moduleScope(parsed, content) {
 }
 
 // src/componentize.ts
-import MagicString3 from "magic-string";
+import MagicString4 from "magic-string";
 var SectionInvariantError = class extends Error {
   code = "SECTION_INVARIANT";
   constructor(message) {
@@ -5317,7 +5546,7 @@ async function componentizeSources(briefIn, planIn, sources, options) {
   let registered = 0;
   let planPending = 0;
   let total = 0;
-  const pend = (route, groupKey, reason, message) => void pending.push({ route, groupKey, reason, ...message ? { message } : {} });
+  const pend2 = (route, groupKey, reason, message) => void pending.push({ route, groupKey, reason, ...message ? { message } : {} });
   const brief = readBrief(briefIn);
   const plan2 = readPlan(planIn);
   const copy = options?.copy ?? "bind";
@@ -5337,7 +5566,7 @@ async function componentizeSources(briefIn, planIn, sources, options) {
           continue;
         }
         total++;
-        pend(page.route, section.groupKey, reason, message);
+        pend2(page.route, section.groupKey, reason, message);
       }
     }
     return {
@@ -5456,7 +5685,7 @@ async function componentizeSources(briefIn, planIn, sources, options) {
     for (const section of sections2) {
       const prefix = propPrefix(section);
       if (prefix === null) {
-        pend(
+        pend2(
           page.route,
           section.groupKey,
           "PROP_MAP_INCONSISTENT",
@@ -5473,13 +5702,13 @@ async function componentizeSources(briefIn, planIn, sources, options) {
     const pageSlug = briefPage?.slug ?? slugify(page.route === "/" ? "home" : page.route);
     if (registryBlocked) {
       for (const section of usable) {
-        pend(page.route, section.groupKey, "REGISTRY_CONFLICT", `${registryConflicts.join(", ")} is not a file this package wrote.`);
+        pend2(page.route, section.groupKey, "REGISTRY_CONFLICT", `${registryConflicts.join(", ")} is not a file this package wrote.`);
       }
       continue;
     }
     if (registryUnread) {
       for (const section of usable) {
-        pend(
+        pend2(
           page.route,
           section.groupKey,
           "REGISTRY_UNREADABLE",
@@ -5491,21 +5720,21 @@ async function componentizeSources(briefIn, planIn, sources, options) {
     const snapshotPath = `${CONTENT_DIR}/${pageSlug}.json`;
     if (!snapshotUsable(contents.get(snapshotPath))) {
       for (const section of usable) {
-        pend(page.route, section.groupKey, "SNAPSHOT_INVALID", `${snapshotPath} is not a JSON object.`);
+        pend2(page.route, section.groupKey, "SNAPSHOT_INVALID", `${snapshotPath} is not a JSON object.`);
       }
       continue;
     }
     const pageFiles = pageFilesFor(page.route, contents.keys());
     if (pageFiles.length > 1) {
       for (const section of usable) {
-        pend(page.route, section.groupKey, "ROUTE_FILE_AMBIGUOUS", `${pageFiles.join(" and ")} both serve ${page.route}.`);
+        pend2(page.route, section.groupKey, "ROUTE_FILE_AMBIGUOUS", `${pageFiles.join(" and ")} both serve ${page.route}.`);
       }
       continue;
     }
     const file = pageFiles[0];
     if (file === void 0) {
       for (const section of usable) {
-        pend(page.route, section.groupKey, "NOT_IN_SOURCE", `no page file found for ${page.route}.`);
+        pend2(page.route, section.groupKey, "NOT_IN_SOURCE", `no page file found for ${page.route}.`);
       }
       continue;
     }
@@ -5518,7 +5747,7 @@ async function componentizeSources(briefIn, planIn, sources, options) {
       if (why === void 0) continue;
       done.delete(section.groupKey);
       stuck++;
-      pend(page.route, section.groupKey, "SECTION_UNMIGRATABLE", why);
+      pend2(page.route, section.groupKey, "SECTION_UNMIGRATABLE", why);
     }
     alreadyExtracted += done.size;
     if (done.size + stuck === usable.length) {
@@ -5532,7 +5761,7 @@ async function componentizeSources(briefIn, planIn, sources, options) {
       treeOf
     );
     for (const [groupKey, reason] of found.misses) {
-      pend(page.route, groupKey, reason.code, reason.message);
+      pend2(page.route, groupKey, reason.code, reason.message);
     }
     const live = found.placed;
     if (live.length === 0) continue;
@@ -5540,14 +5769,14 @@ async function componentizeSources(briefIn, planIn, sources, options) {
     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"}.`);
+        pend2(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.`);
+        pend2(page.route, placed.section.groupKey, "NOT_IN_SOURCE", `${file} did not parse.`);
       }
       continue;
     }
@@ -5572,7 +5801,7 @@ async function componentizeSources(briefIn, planIn, sources, options) {
       const alsoRendered = [...placed.byFile.keys()].filter((held2) => held2 !== file && importedFiles.has(held2));
       if (elements && elements.length > 0) {
         if (alsoRendered.length > 0) {
-          pend(
+          pend2(
             page.route,
             placed.section.groupKey,
             "SECTION_ROOT_AMBIGUOUS",
@@ -5584,7 +5813,7 @@ async function componentizeSources(briefIn, planIn, sources, options) {
         continue;
       }
       if (alsoRendered.length > 1) {
-        pend(
+        pend2(
           page.route,
           placed.section.groupKey,
           "SECTION_ROOT_AMBIGUOUS",
@@ -5598,7 +5827,7 @@ async function componentizeSources(briefIn, planIn, sources, options) {
         importedSections.push({ section: placed.section, path: only, call: held.local });
         continue;
       }
-      pend(
+      pend2(
         page.route,
         placed.section.groupKey,
         "SECTION_ROOT_AMBIGUOUS",
@@ -5612,7 +5841,7 @@ async function componentizeSources(briefIn, planIn, sources, options) {
       const component = resolveComponent(plan2, held.section);
       const already = extractable.get(component.slug);
       if (already !== void 0 && already.path !== held.path) {
-        pend(
+        pend2(
           page.route,
           held.section.groupKey,
           "COMPONENT_CONFLICT",
@@ -5623,7 +5852,7 @@ async function componentizeSources(briefIn, planIn, sources, options) {
       const binding = bindingOf(held.path);
       const member = binding.kind === "namespace" ? namespaceMember(tree, binding.local) : void 0;
       if (binding.kind === "namespace" && member === void 0) {
-        pend(
+        pend2(
           page.route,
           held.section.groupKey,
           "SECTION_ROOT_AMBIGUOUS",
@@ -5649,7 +5878,7 @@ async function componentizeSources(briefIn, planIn, sources, options) {
     for (const placed of placedHere) {
       const root = lowestCommonAncestor(placed.elements);
       if (!root) {
-        pend(page.route, placed.section.groupKey, "SECTION_ROOT_AMBIGUOUS", "its fields sit under no single element.");
+        pend2(page.route, placed.section.groupKey, "SECTION_ROOT_AMBIGUOUS", "its fields sit under no single element.");
         continue;
       }
       const component = resolveComponent(plan2, placed.section);
@@ -5671,7 +5900,7 @@ async function componentizeSources(briefIn, planIn, sources, options) {
       }
     }
     for (const resolved of nested) {
-      pend(page.route, resolved.section.groupKey, "SECTION_ROOT_AMBIGUOUS", "its root contains another section's.");
+      pend2(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);
     const placeable = [];
@@ -5679,7 +5908,7 @@ async function componentizeSources(briefIn, planIn, sources, options) {
       const path = `${COMPONENT_DIR}/${resolved.name}.${dialect === "astro" ? "astro" : "tsx"}`;
       const existing = contents.get(path);
       if (existing !== void 0 && !isGenerated(existing) && !extractable.has(resolved.slug)) {
-        pend(page.route, resolved.section.groupKey, "COMPONENT_CONFLICT", `${path} is not a file this package wrote.`);
+        pend2(page.route, resolved.section.groupKey, "COMPONENT_CONFLICT", `${path} is not a file this package wrote.`);
         continue;
       }
       if (extractable.has(resolved.slug)) {
@@ -5688,7 +5917,7 @@ async function componentizeSources(briefIn, planIn, sources, options) {
       }
       const built = componentFile(dialect, path, file, content, parsed, resolved, resolved.pathPrefix);
       if (built.unconvertible.length > 0) {
-        pend(
+        pend2(
           page.route,
           resolved.section.groupKey,
           "PROP_MAP_INCONSISTENT",
@@ -5697,7 +5926,7 @@ async function componentizeSources(briefIn, planIn, sources, options) {
         continue;
       }
       if (built.duplicates.length > 0) {
-        pend(
+        pend2(
           page.route,
           resolved.section.groupKey,
           "DUPLICATE_FIELD_BINDING",
@@ -5706,7 +5935,7 @@ async function componentizeSources(briefIn, planIn, sources, options) {
         continue;
       }
       if (built.free.length > 0) {
-        pend(
+        pend2(
           page.route,
           resolved.section.groupKey,
           "SECTION_FREE_IDENTIFIERS",
@@ -5732,7 +5961,7 @@ async function componentizeSources(briefIn, planIn, sources, options) {
     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.");
+        pend2(page.route, resolved.section.groupKey, "SECTION_NOT_CONTIGUOUS", "its roots share no container.");
       }
       continue;
     }
@@ -5755,7 +5984,7 @@ async function componentizeSources(briefIn, planIn, sources, options) {
       const inline = placeable.filter((resolved) => !instanceOwned(resolved.section));
       for (const resolved of placeable) {
         if (inline.includes(resolved)) continue;
-        pend(
+        pend2(
           page.route,
           resolved.section.groupKey,
           "INLINE_NEEDS_INSTANCE",
@@ -6203,7 +6432,7 @@ export default function ${resolved.name}({ blockId, bind, overrides, page }: Bcm
 ` };
 }
 function sectionMarkup(content, root, fieldName) {
-  const slice = new MagicString3(content.slice(root.start, root.end));
+  const slice = new MagicString4(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}");
@@ -6402,7 +6631,7 @@ async function migrateSections(plan2, contents, written, fileSet, aliases) {
         );
         continue;
       }
-      const source = new MagicString3(content);
+      const source = new MagicString4(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.`);
@@ -6679,7 +6908,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 MagicString3(content);
+  const source = new MagicString4(content);
   const first = placeable[0].root;
   const last = placeable[placeable.length - 1].root;
   source.overwrite(first.start, last.end, `<${local} page="${pageSlug}" />`);
@@ -6699,7 +6928,7 @@ function splicePageInline(file, content, dialect, parsed, placeable, pageSlug, w
     { key: "pageSnapshot", name: "pageSnapshot" }
   ]);
   const snapshot = names.get("pageSnapshot");
-  const source = new MagicString3(content);
+  const source = new MagicString4(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);
@@ -6780,6 +7009,10 @@ function readComponentizePlan(value) {
 }
 
 // src/index.ts
+var UNPARSEABLE_DIALECT = {
+  roots: [],
+  error: { code: "DIALECT_UNSUPPORTED", message: "no parser for this extension" }
+};
 var ConvertError = class extends Error {
   constructor(code, message) {
     super(message);
@@ -6861,7 +7094,7 @@ async function convertSources(briefIn, sources, options) {
   }
   const { located, unlocated } = locate(brief, sources, { stripTags: true });
   const pending = [];
-  const pend = (target, reason, file, message) => {
+  const pend2 = (target, reason, file, message) => {
     pending.push({
       route: target.route,
       scope: target.scope,
@@ -6962,7 +7195,7 @@ async function convertSources(briefIn, sources, options) {
       declaredRow(target, false, byHand);
       continue;
     }
-    pend(target, miss.reason === "no-original" ? "NO_ORIGINAL" : "NOT_IN_SOURCE");
+    pend2(target, miss.reason === "no-original" ? "NO_ORIGINAL" : "NOT_IN_SOURCE");
   }
   const byFile = /* @__PURE__ */ new Map();
   for (const [key, hit] of locatedByKey) {
@@ -7019,12 +7252,12 @@ async function convertSources(briefIn, sources, options) {
     const worst = outcomes.find((o) => o !== "rewritten" && o !== "declared");
     if (worst) {
       const file = hit.files[outcomes.indexOf(worst)];
-      pend(target, worst, file);
+      pend2(target, worst, file);
     } 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(
+        pend2(
           target,
           "AMBIGUOUS_LITERAL",
           hit.files[0],
@@ -7037,7 +7270,7 @@ async function convertSources(briefIn, sources, options) {
     } else rewritten++;
   }
   for (const [file, splices] of [...componentEdits].sort(([a], [b]) => a.localeCompare(b))) {
-    const source = new MagicString4(contents.get(file));
+    const source = new MagicString5(contents.get(file));
     const seen = /* @__PURE__ */ new Set();
     for (const splice of splices) {
       const id = `${splice.start}:${splice.end}:${splice.text}`;
@@ -7058,6 +7291,28 @@ async function convertSources(briefIn, sources, options) {
   }
   const { helpers, helperUpgraded } = emitHelpers(dialects, contents, outFiles, options?.overwriteHelper);
   emitStubs2(dialects, snapshotSlugs, contents, outFiles);
+  const latest = new Map(contents);
+  for (const file of outFiles) if (file.operation === "modify") latest.set(file.path, file.content);
+  const canvasSources = [];
+  for (const source of sources) {
+    const content = latest.get(source.path) ?? source.content;
+    if (!/\.[jt]sx$/i.test(source.path)) {
+      canvasSources.push({ path: source.path, content });
+      continue;
+    }
+    const parsed = content === source.content ? await parseOf(source.path) : await parseFile4("jsx", content);
+    canvasSources.push({ path: source.path, content, ...parsed && !parsed.error ? { ast: parsed.ast } : {} });
+  }
+  const canvas = canvasBridge(
+    canvasSources,
+    new Map(brief.pages.map((page) => [page.route, page.slug]))
+  );
+  for (const [path, content] of canvas.edits) {
+    const existing = outFiles.find((f) => f.path === path);
+    if (existing) existing.content = content;
+    else outFiles.push({ path, operation: "modify", content });
+  }
+  pending.push(...canvas.pending);
   const receipt = assertReceipt({
     briefDigest: digest,
     paths: {
@@ -7074,6 +7329,7 @@ async function convertSources(briefIn, sources, options) {
     helpers,
     helperUpgraded,
     dynamicBindings,
+    canvas: { lane: canvas.lane, ...canvas.files.length > 0 ? { files: canvas.files } : {} },
     notes: unreadableConfigs(sources).map(
       (file) => ({
         code: "TSCONFIG_UNREADABLE",
@@ -7106,6 +7362,30 @@ async function convertFile(file, content, targets, parsed, declared, llmFallback
   };
   if (pendingTargets.length === 0) return empty;
   if (!dialect) {
+    if (isTolerantDialect(file)) {
+      const tolerantLiterals = [...new Set(pendingTargets.map((t) => t.literal))];
+      const tolerantSites = findSitesTolerant(content, tolerantLiterals);
+      if (tolerantSites.length > 0) {
+        return plan(
+          file,
+          content,
+          // Never read: `plan` forces `writing = "html"` at tier 2, and every other use of this
+          // argument is behind `!parsed.error` or `tier !== 2`. Passing the writing dialect keeps
+          // the parameter honest rather than widening its type for one caller.
+          "html",
+          pendingTargets,
+          tolerantSites,
+          void 0,
+          // no parse, no import point: tier 2 declares, it does not read
+          outcomes,
+          2,
+          UNPARSEABLE_DIALECT,
+          drill,
+          []
+          // no parse, so nothing in this file is already declared
+        );
+      }
+    }
     for (const target of pendingTargets) outcomes.set(target.key, "DIALECT_UNSUPPORTED");
     return { ...empty, dialect: null, outcomes };
   }
@@ -7164,7 +7444,7 @@ async function convertFile(file, content, targets, parsed, declared, llmFallback
 }
 async function plan(file, content, dialect, targets, sites, importAt, outcomes, tier, parsed, drill, declarations) {
   const writing = tier === 2 ? "html" : dialect;
-  const missing = tier === 2 ? "PARSE_ERROR" : "NOT_IN_SOURCE";
+  const missing = tier !== 2 ? "NOT_IN_SOURCE" : parsed.error?.code === "DIALECT_UNSUPPORTED" ? "DIALECT_UNSUPPORTED" : "PARSE_ERROR";
   const taken = parsed.error ? /* @__PURE__ */ new Set() : topLevelBindings(dialect, parsed, content);
   const slugs = [...new Set(targets.map((t) => t.slug))].sort();
   const preset = /* @__PURE__ */ new Map();