@bettercms-ai/convert 0.25.0 → 0.26.0

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @bettercms-ai/convert
 
+## 0.26.0
+
+### Minor Changes
+
+- 69dfcfa: A server app hosted on BetterCMS shows a publish on its very next request: the converted-site helper (v14) and `readPublishedContent` ask the content file's time on every read instead of once a second. Helper v14 also renders an image an editor replaced on a page the app renders per request: `bcmsImage` returns the local copy BetterCMS puts beside the app, in the shape of an import, where it used to keep the build's picture. A site built with an older helper gets v14 on its next BetterCMS build, with no commit.
+
+## 0.25.1
+
+### Patch Changes
+
+- b1e5eb0: Prices and other numbers are now editable: a value written as `49` or `price={49}` in a data object, a `const`, or a component prop is bound like any other copy, and still renders the same text. `--brief` no longer writes a second `data-bcms-field` on an element, and two paths that want the same element, or a rewrite inside text another rewrite replaces, are reported as ambiguous instead of corrupting the file; a second run over converted source changes nothing.
+- Updated dependencies [56335ff]
+  - @bettercms-ai/types@1.32.0
+
 ## 0.25.0
 
 ### Minor Changes

package/dist/cli.js

@@ -2715,8 +2715,9 @@ function collectSites(roots, literals) {
     }
     const bindingsAttr = node.attrs.find((a) => a.name === "bcmsBindings")?.range;
     for (const attr of node.attrs) {
-      if (attr.expression || !attr.valueRange || BCMS_ATTRS.includes(attr.name)) continue;
-      const value = norm(attr.value);
+      const digits = attr.expression && attr.expressionRange ? attr.number : void 0;
+      if (attr.expression && digits === void 0 || !digits && !attr.valueRange || BCMS_ATTRS.includes(attr.name)) continue;
+      const value = norm(digits ?? attr.value);
       for (const literal of wanted) {
         if (value !== literal) continue;
         matched.add(literal);
@@ -2724,7 +2725,7 @@ function collectSites(roots, literals) {
           file: "",
           tag: node.tag,
           attrInsertAt: node.attrInsertAt,
-          range: attr.valueRange,
+          range: digits === void 0 ? attr.valueRange : attr.expressionRange,
           inner: node.inner,
           // 🔴 A COMPONENT'S ATTRIBUTE IS A PROP, and a prop is a different conversion: the value
           // is rendered in another file, by an element only that file knows. @see props.ts
@@ -2832,6 +2833,8 @@ function attrsOf2(open, content) {
     const value = attr.value;
     const range = { start: attr.start ?? 0, end: attr.end ?? 0 };
     const literal = value?.type === "StringLiteral";
+    const inside = value?.type === "JSXExpressionContainer" ? value.expression : null;
+    const numeric = inside?.type === "NumericLiteral" ? String(inside.extra.raw) : "";
     return [
       {
         name: nameOf(attr.name),
@@ -2840,7 +2843,8 @@ function attrsOf2(open, content) {
         valueRange: literal ? { start: (value.start ?? 0) + 1, end: (value.end ?? 0) - 1 } : null,
         expression: !literal,
         range,
-        expressionRange: value?.type === "JSXExpressionContainer" ? { start: value.start ?? 0, end: value.end ?? 0 } : null
+        expressionRange: value?.type === "JSXExpressionContainer" ? { start: value.start ?? 0, end: value.end ?? 0 } : null,
+        ...numeric ? { number: numeric } : {}
       }
     ];
   });
@@ -3316,14 +3320,21 @@ function exportedNames(ast) {
   });
   return out;
 }
+function printed(node) {
+  if (node?.type === "StringLiteral") return [String(node.value)];
+  if (node?.type === "NumericLiteral") return [String(node.value), String(node.extra?.raw ?? "")];
+  const quasis = node?.type === "TemplateLiteral" ? node.quasis ?? [] : [];
+  const expressions = node?.expressions ?? [];
+  return quasis.length === 1 && expressions.length === 0 ? [String(quasis[0].value.cooked ?? "")] : [];
+}
 function propertyFor(row, literal) {
   if (row?.type !== "ObjectExpression") return null;
   for (const property of row.properties ?? []) {
     if (property.type !== "ObjectProperty" && property.type !== "Property") continue;
     const key = property.key;
     const value = property.value;
-    if (value?.type !== "StringLiteral" || key?.type !== "Identifier") continue;
-    if (norm(String(value.value)) === literal) return String(key.name);
+    if (key?.type !== "Identifier") continue;
+    if (printed(value).some((text) => norm(text) === literal)) return String(key.name);
   }
   return null;
 }
@@ -3397,7 +3408,7 @@ function stringLiterals(ast) {
     if (node.type !== "VariableDeclarator") return;
     const id = node.id;
     const init = node.init;
-    if (id?.type !== "Identifier" || init?.type !== "StringLiteral") return;
+    if (id?.type !== "Identifier" || !init || printed(init).length === 0) return;
     out.set(String(id.name), init);
   });
   return out;
@@ -3428,7 +3439,7 @@ function scalarUses(content, roots, id) {
 }
 function bindScalar(ctx, member, literals, offset) {
   const rule = DIALECT_RULES[ctx.dialect];
-  const named = [...literals].filter(([, init2]) => norm(String(init2.value)) === member.literal);
+  const named = [...literals].filter(([, init2]) => printed(init2).some((text) => norm(text) === member.literal));
   if (named.length !== 1) return { splices: [], refusal: null };
   const [id, init] = named[0];
   const uses = scalarUses(ctx.content, ctx.parsed.roots, id);
@@ -3643,16 +3654,17 @@ function literalTable(init) {
   const first = elements[0];
   if (!first || elements.length !== (init.elements ?? []).length) return null;
   if (elements.some((element) => element.type !== first.type)) return null;
-  if (first.type === "StringLiteral") {
-    return { tuple: false, rows: elements.map((element) => [norm(String(element.value))]) };
+  if (printed(first).length > 0) {
+    if (elements.some((element) => printed(element).length === 0)) return null;
+    return { tuple: false, rows: elements.map((element) => [norm(printed(element)[0])]) };
   }
   if (first.type !== "ArrayExpression") return null;
   const rows = [];
   for (const element of elements) {
     const inner = (element.elements ?? []).filter((x) => x !== null);
-    if (inner.length === 0 || inner.some((x) => x.type !== "StringLiteral")) return null;
+    if (inner.length === 0 || inner.some((x) => printed(x).length === 0)) return null;
     if (inner.length !== (element.elements ?? []).length) return null;
-    rows.push(inner.map((x) => norm(String(x.value))));
+    rows.push(inner.map((x) => norm(printed(x)[0])));
   }
   if (new Set(rows.map((row) => row.length)).size !== 1) return null;
   return { tuple: true, rows };
@@ -4191,7 +4203,7 @@ async function bindImages(ctx, targets) {
 
 // src/helper.ts
 import { createHash as createHash2 } from "crypto";
-var HELPER_VERSION = 13;
+var HELPER_VERSION = 14;
 var HEADER = "// @bettercms-ai/convert helper v";
 var HELPER_PATH = Object.fromEntries(
   Object.keys(DIALECT_RULES).map((d) => [d, DIALECT_RULES[d].helper])
@@ -4265,11 +4277,11 @@ function render(value: unknown): string | undefined {
  *
  * Nowhere else does anything change: with no variable (a build, \`astro dev\`, a browser, an edge
  * runtime) every snapshot is the one the bundle imported, exactly as before. A file that cannot be
- * read keeps the last good copy; it is checked at most once a second.
+ * read keeps the last good copy. Its modification time is asked on EVERY read (a stat, microseconds;
+ * the file is parsed again only when it changed), so a publish shows on the very next request.
  */
-type BcmsLiveContent = { stamp: number; bySlug: Map<string, unknown>; layout: unknown };
+type BcmsLiveContent = { helper: string; stamp: number; bySlug: Map<string, unknown>; entries: Record<string, unknown>; layout: unknown };
 let bcmsLive: BcmsLiveContent | null = null;
-let bcmsLiveCheckedAt = 0;
 
 function liveContent(): BcmsLiveContent | null {
   const proc = (globalThis as {
@@ -4277,9 +4289,6 @@ function liveContent(): BcmsLiveContent | null {
   }).process;
   const file = proc?.env?.BCMS_CONTENT_FILE;
   if (!file || typeof proc?.getBuiltinModule !== "function") return null;
-  const now = Date.now();
-  if (now - bcmsLiveCheckedAt < 1000) return bcmsLive;
-  bcmsLiveCheckedAt = now;
   try {
     const fs = proc.getBuiltinModule("node:fs") as {
       statSync(path: string): { mtimeMs: number };
@@ -4293,13 +4302,30 @@ function liveContent(): BcmsLiveContent | null {
     for (const rows of Object.values(collections)) {
       if (!Array.isArray(rows)) continue;
       for (const row of rows) {
-        if (isRecord(row) && typeof row.slug === "string" && !bySlug.has(row.slug)) bySlug.set(row.slug, row);
+        // A published row carries its values under \`data\` (the delivery API's shape); the snapshot a
+        // template reads is the values themselves. Read flat, as before, where a row has none.
+        if (isRecord(row) && typeof row.slug === "string" && !bySlug.has(row.slug)) {
+          bySlug.set(row.slug, isRecord(row.data) ? { ...row.data, slug: row.slug } : row);
+        }
       }
     }
+    // A dynamic route reads \`page.entries[slug]\`: every published row, by its slug.
+    const entries: Record<string, unknown> = Object.fromEntries(bySlug);
+    for (const row of bySlug.values()) if (isRecord(row) && !("entries" in row)) row.entries = entries;
     const pages = isRecord(snapshot) && Array.isArray(snapshot.pages) ? snapshot.pages : [];
     const withLayout = pages.find((page: unknown) => isRecord(page) && isRecord(page.layout));
-    const layout = isRecord(withLayout) ? withLayout.layout : isRecord(snapshot) ? snapshot.layout : undefined;
-    bcmsLive = { stamp, bySlug, layout };
+    // The site's Layout first; a page's own (its overrides resolved in) only where there is no other.
+    const delivered = isRecord(snapshot) && isRecord(snapshot.layout) ? snapshot.layout : isRecord(withLayout) ? withLayout.layout : undefined;
+    // A template addresses a Layout value as \`<section id>:<field id>\`; the published Layout holds
+    // each Section's values under \`sections.<slug>.fields\`. Both spellings are answered.
+    const layout: Record<string, unknown> | undefined = isRecord(delivered) ? { ...delivered } : undefined;
+    for (const section of layout && isRecord(delivered) && isRecord(delivered.sections) ? Object.values(delivered.sections) : []) {
+      if (!isRecord(section) || typeof section.id !== "string" || !isRecord(section.fields)) continue;
+      for (const [field, value] of Object.entries(section.fields)) layout![section.id + ":" + field] = value;
+    }
+    // \`helper\` names this reader in the built bundle: the platform reads it to know the app shows a
+    // publish on its next request, and an image BetterCMS copied beside it (@see bcmsImage).
+    bcmsLive = { helper: "bcms-helper@${HELPER_VERSION}", stamp, bySlug, entries, layout };
   } catch {
     // Unreadable, or caught mid-write: keep serving the last good copy.
   }
@@ -4311,7 +4337,10 @@ function live(page: unknown): unknown {
   const content = liveContent();
   if (!content) return page;
   if (page === layoutSnapshot) return isRecord(content.layout) ? content.layout : page;
-  if (isRecord(page) && typeof page.slug === "string") return content.bySlug.get(page.slug) ?? page;
+  if (isRecord(page) && typeof page.slug === "string") {
+    // A collection's page has no row of its own: its entries are the published ones all the same.
+    return content.bySlug.get(page.slug) ?? ("entries" in page ? page : { ...page, entries: content.entries });
+  }
   return page;
 }
 
@@ -4325,7 +4354,10 @@ export function bcms(page: unknown, path: string, fallback: string, slug?: strin
 
 /** One field of the shared layout \u2014 the header and footer every route renders. */
 export function bcmsLayout(path: string, fallback: string): string {
-  return render(readPath(live(layoutSnapshot), path)) ?? fallback;
+  const layout = live(layoutSnapshot);
+  // The whole address first: a field id may carry a dot of its own (\`derived.nav-cta\`).
+  const whole = isRecord(layout) ? layout[path] : undefined;
+  return render(whole !== undefined ? whole : readPath(layout, path)) ?? fallback;
 }
 
 /**
@@ -4402,13 +4434,24 @@ export function bcmsTuples(page: unknown, paths: string[][], fallback: string[][
  * release write (\`writeImage\`) puts the editor's image on the \`data-bcms-field\` element, which
  * is where every published value lands. A plain string fallback (\`<img src="/hero.png">\`) has
  * no such rule and takes the CMS url directly.
+ *
+ * \u{1F534} ON A HOSTED SERVER THE EDITOR'S IMAGE IS A LOCAL FILE. A page the app renders per request has no
+ * release write: what this returns is the page. BetterCMS copies a replaced image beside the app and
+ * names the copy on the published value (\`local\`, with its size), and it is returned in the shape
+ * of an import (\`{ src, width, height, format }\`), so \`<Image>\` optimises it like the site's own.
+ * Absent (a build, or the site's own picture) the import stands.
  */
 export function bcmsImage<T>(page: unknown, path: string, fallback: T, slug?: string): T | string {
   page = live(page);
-  if (fallback !== null && typeof fallback === "object") return fallback;
   const entries = isRecord(page) ? page.entries : undefined;
   const root = slug !== undefined && isRecord(entries) ? entries[slug] : page;
-  return render(readPath(root, path)) ?? fallback;
+  const value = readPath(root, path);
+  if (fallback !== null && typeof fallback === "object") {
+    if (!isRecord(value) || typeof value.local !== "string" || typeof value.width !== "number" || typeof value.height !== "number") return fallback;
+    const format = /\\.([a-z0-9]+)$/i.exec(value.local)?.[1]?.toLowerCase() ?? "";
+    return { src: value.local, width: value.width, height: value.height, format: format === "jpg" ? "jpeg" : format } as unknown as T;
+  }
+  return render(value) ?? fallback;
 }
 
 /**
@@ -4741,7 +4784,8 @@ var HISTORICAL = {
     9: "d6441db2ff4578c3c5d4b7d461f3374b89247ef6ba9e0d535791e840d803e4f3",
     10: "ffcb59862972b15a67c5951e9f3b94ce5b8b50345e6aac2bfa5789cfc3136910",
     11: "ceb2a932d4c2761a5045ff35032e0b45130a0b5034547ff37579c72c9ce3594e",
-    12: "10f71724484c84af12aa3eb90db44bf6acbf71fcf8ddff5b6361c1190ba16528"
+    12: "10f71724484c84af12aa3eb90db44bf6acbf71fcf8ddff5b6361c1190ba16528",
+    13: "cd8bdd74dbc944f2331503bdf8e995cb7f74f0d5b307d08aee4690e1695ae798"
   },
   "src/lib/bcms-content.ts": {
     1: "ae72ae14d706943d481c880d70da5789b4816ba1ba319a10fbc63ded4d0b42f2",
@@ -4755,7 +4799,8 @@ var HISTORICAL = {
     9: "eee9fb1635ae7d6f8f33676a1f390600ca24a62ee992775252273c73a011c494",
     10: "35bb7c0e30f5c41fe68e52259ec4764de6de2734064fa0e1521f3338eef0a09e",
     11: "818784f2088150d64d91b42eac944dc9503f104d32a0e7a18c753d2982a5adc0",
-    12: "79dafc525a541feae55ada5dbe2ea966cac82acd741a4b41d61fe9e0cdfaa208"
+    12: "79dafc525a541feae55ada5dbe2ea966cac82acd741a4b41d61fe9e0cdfaa208",
+    13: "06ee70c9f0bb25e03f3930d2250da8dae172ade457f27ebba20382b6482ad3f4"
   },
   "composables/bcms-content.ts": {
     1: "c272412532efed7db64b6cf313b2bed4291f9951430412289c8a588b7f565407",
@@ -4769,7 +4814,8 @@ var HISTORICAL = {
     9: "d6441db2ff4578c3c5d4b7d461f3374b89247ef6ba9e0d535791e840d803e4f3",
     10: "ffcb59862972b15a67c5951e9f3b94ce5b8b50345e6aac2bfa5789cfc3136910",
     11: "ceb2a932d4c2761a5045ff35032e0b45130a0b5034547ff37579c72c9ce3594e",
-    12: "10f71724484c84af12aa3eb90db44bf6acbf71fcf8ddff5b6361c1190ba16528"
+    12: "10f71724484c84af12aa3eb90db44bf6acbf71fcf8ddff5b6361c1190ba16528",
+    13: "cd8bdd74dbc944f2331503bdf8e995cb7f74f0d5b307d08aee4690e1695ae798"
   }
 };
 var sha256 = (value) => createHash2("sha256").update(value, "utf8").digest("hex");
@@ -5460,7 +5506,8 @@ function overlapping(rewrites) {
   for (const a of rewrites) {
     for (const b of rewrites) {
       if (a.raw !== void 0 || b.raw !== void 0) continue;
-      if (a !== b && a.key !== b.key && a.site.where === "text" && b.site.where === "text" && overlaps(a.site.range, b.site.range)) {
+      if (a === b || a.key === b.key) continue;
+      if (collide(a, b)) {
         out.add(a);
         out.add(b);
       }
@@ -5468,6 +5515,16 @@ function overlapping(rewrites) {
   }
   return [...out];
 }
+var writes = ({ site }) => [site.range, site.attrRange, site.where === "text" ? site.inner : null].filter((r) => r != null);
+function collide(a, b) {
+  const inside = (at, spans) => spans.some((r) => r.start < at && at < r.end);
+  const [wa, wb] = [writes(a), writes(b)];
+  if (wa.some((x) => wb.some((y) => overlaps(x, y)))) return true;
+  if (inside(a.site.attrInsertAt, wb) || inside(b.site.attrInsertAt, wa)) return true;
+  const [fa, fb] = [field(a), field(b)];
+  return a.site.attrInsertAt === b.site.attrInsertAt && !!fa && !!fb && fa !== fb;
+}
+var field = (r) => r.site.where === "prop" || r.site.where === "text" && !ownsSubtree(r.kind, r.site, r.inline) && r.site.mixed && r.site.textRange ? void 0 : declaration(r).plain[0];
 function declaration(rewrite) {
   const { site, path, kind, scope } = rewrite;
   if (site.where === "attr" && kind !== "image") {
@@ -5482,8 +5539,8 @@ function rewriteFile(content, dialect, rewrites, imports, extra = []) {
   const bindings = /* @__PURE__ */ new Map();
   const addDeclaration = (at, add) => {
     const held = attributes.get(at) ?? { plain: [], props: [] };
-    held.plain.push(...add.plain);
-    held.props.push(...add.props);
+    held.plain.push(...add.plain.filter((text) => !held.plain.includes(text)));
+    held.props.push(...add.props.filter((p) => !held.props.some((q) => JSON.stringify(q) === JSON.stringify(p))));
     attributes.set(at, held);
   };
   for (const rewrite of rewrites) {
@@ -5906,7 +5963,8 @@ function attrsOf4(node, content) {
         valueRange: quoted && rawStart >= 0 && attr.value !== "" ? { start: rawStart + (unquoted ? 0 : 1), end: rawStart + raw.length - (unquoted ? 0 : 1) } : null,
         expression: !quoted,
         range,
-        expressionRange: !quoted && open >= 0 && close > open ? { start: open, end: close + 1 } : null
+        expressionRange: !quoted && open >= 0 && close > open ? { start: open, end: close + 1 } : null,
+        ...attr.kind === "expression" && /^\d+(\.\d+)?$/.test(attr.value.trim()) ? { number: attr.value.trim() } : {}
       }
     ];
   });
@@ -6025,6 +6083,9 @@ function attrsOf5(node) {
       return [{ name: `\0${name}`, value: "", valueRange: null, expression: true, expressionRange: null, range }];
     }
     const literal = literalValue(attr);
+    const tag = attr.value;
+    const raw = tag?.type === "ExpressionTag" ? tag.expression : void 0;
+    const digits = typeof raw?.value === "number" ? String(raw.raw ?? "") : "";
     return [
       {
         name,
@@ -6032,7 +6093,8 @@ function attrsOf5(node) {
         valueRange: literal && literal.value !== "" ? literal.range : null,
         expression: literal === null,
         // Not read: svelte sections are DIALECT_UNSUPPORTED. @see componentize.ts
-        expressionRange: null,
+        expressionRange: digits ? { start: tag.start ?? 0, end: tag.end ?? 0 } : null,
+        ...digits ? { number: digits } : {},
         range
       }
     ];
@@ -6137,13 +6199,15 @@ var spanOf = (loc) => ({
 function attrsOf6(node) {
   return (node.props ?? []).flatMap((prop) => {
     if (prop.type === DIRECTIVE && prop.name === "bind" && prop.arg?.content) {
+      const digits = /^\d+(\.\d+)?$/.test(String(prop.exp?.content ?? "").trim()) ? String(prop.exp.content).trim() : "";
       return [
         {
           name: prop.arg.content,
           value: "",
           valueRange: null,
           expression: true,
-          expressionRange: null,
+          expressionRange: digits ? spanOf(prop.exp?.loc) : null,
+          ...digits ? { number: digits } : {},
           range: spanOf(prop.loc)
         }
       ];
@@ -6627,8 +6691,8 @@ function readPlan(value) {
       check.optionalString(section.sectionType, `${at2}.sectionType`);
       check.optionalString(section.copy, `${at2}.copy`);
       if (section.fields !== void 0) {
-        for (const [f, field] of check.array(section.fields, `${at2}.fields`).entries()) {
-          const shape = check.record(field, `${at2}.fields[${f}]`);
+        for (const [f, field2] of check.array(section.fields, `${at2}.fields`).entries()) {
+          const shape = check.record(field2, `${at2}.fields[${f}]`);
           check.optionalString(shape.key, `${at2}.fields[${f}].key`);
           check.optionalString(shape.path, `${at2}.fields[${f}].path`);
         }
@@ -6947,15 +7011,15 @@ function wire(source, candidate, form) {
       source.remove(start, attr.range.end);
     }
   }
-  for (const field of form.fields) {
-    const control = candidate.controls.get(field.key);
+  for (const field2 of form.fields) {
+    const control = candidate.controls.get(field2.key);
     if (candidate.foreign.has(control)) continue;
     const host = candidate.wrapper.get(control) ?? control;
-    if (!attrOf(host, "data-bcms-form-field")) source.appendLeft(host.attrInsertAt, ` data-bcms-form-field="${escapeAttr(field.key)}"`);
+    if (!attrOf(host, "data-bcms-form-field")) source.appendLeft(host.attrInsertAt, ` data-bcms-form-field="${escapeAttr(field2.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 (!name) source.appendLeft(control.attrInsertAt, ` name="${escapeAttr(field2.key)}"`);
+    else if (!name.expression && name.value !== field2.key && name.valueRange) {
+      source.overwrite(name.valueRange.start, name.valueRange.end, escapeAttr(field2.key));
     }
   }
   if (el.inner && !hasMessage(el)) {
@@ -6999,7 +7063,7 @@ async function wireForms(briefIn, sources, options_ = {}) {
       candidates.push(candidateOf(source.path, dialect, el, imported, landmark, source.content, parsed.importAt));
     }
   }
-  const holds = (c, f) => f.fields.filter((field) => c.controls.has(field.key)).length;
+  const holds = (c, f) => f.fields.filter((field2) => c.controls.has(field2.key)).length;
   const byId = (c, f) => !attrOf(c.el, "data-bcms-form")?.expression && attrOf(c.el, "data-bcms-form")?.value === f.id;
   const programAction = (c) => !!attrOf(c.el, "action")?.expression && calledName(exprOf(c, "action"), "bcmsFormAction") === null;
   const wiredTo = (c, f) => BY_NAME.includes(c.dialect) ? calledName(exprOf(c, "data-bcms-form"), "bcmsFormId") === f.name || byId(c, f) && programAction(c) : byId(c, f);
@@ -7121,9 +7185,9 @@ async function wireForms(briefIn, sources, options_ = {}) {
       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);
+    const misnamed = form.fields.find((field2) => {
+      const attr = attrOf(candidate.controls.get(field2.key), "name");
+      return !!attr && attr.value !== field2.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.`);
@@ -7203,7 +7267,7 @@ ${indent}${scriptFor(last.candidate.dialect)}`);
     );
   }
   for (const { form, candidate } of matched) {
-    const keys = form.fields.filter((field) => candidate.foreign.has(candidate.controls.get(field.key))).map((field) => field.key);
+    const keys = form.fields.filter((field2) => candidate.foreign.has(candidate.controls.get(field2.key))).map((field2) => field2.key);
     if (keys.length > 0) {
       notes.push(
         `form ${form.name}: ${keys.join(", ")} matched a control inside an imported component, so no data-bcms-form-field marker was written for ${keys.length === 1 ? "it" : "them"}.`
@@ -8462,7 +8526,7 @@ var inSection = (section, path) => {
   const target = rowless(path);
   return fieldPaths(section).some((fieldPath) => rowless(fieldPath) === target);
 };
-var fieldPaths = (section) => (section.fields ?? []).map((field) => field.path ?? `${section.groupKey}.${field.key ?? ""}`);
+var fieldPaths = (section) => (section.fields ?? []).map((field2) => field2.path ?? `${section.groupKey}.${field2.key ?? ""}`);
 function elementIndex(roots) {
   const out = /* @__PURE__ */ new Map();
   const visit = (node, chain) => {
@@ -8620,8 +8684,8 @@ function componentFile(dialect, path, fromFile, content, parsed, resolved, pathP
   const carriedDeclarations = carry.declarations.length > 0 ? `${carry.declarations.join("\n")}
 ` : "";
   const copy = !snapshot ? "" : flat3 ? `const ${snapshot} = bcmsSectionPaths(page, bind, overrides, ${JSON.stringify(pathPrefix)}, ${JSON.stringify(pathMap)}, bindPaths);` : `const ${snapshot} = { ${key}: bcmsSection(page, bind, overrides, bindPaths) };`;
-  const field = bound > 0 ? `const ${fieldName} = ${fieldsName}({ blockId, bind, bindPaths, overrides }, ${JSON.stringify(pathPrefix)}${flat3 ? `, ${JSON.stringify(pathMap)}` : ""});` : "";
-  const declared = [copy, field].filter(Boolean).join("\n");
+  const field2 = bound > 0 ? `const ${fieldName} = ${fieldsName}({ blockId, bind, bindPaths, overrides }, ${JSON.stringify(pathPrefix)}${flat3 ? `, ${JSON.stringify(pathMap)}` : ""});` : "";
+  const declared = [copy, field2].filter(Boolean).join("\n");
   const styles = dialect === "astro" ? carriedStyles(content) : "";
   if (dialect === "astro") {
     return { free: [], duplicates: [], unconvertible: [], content: `---
@@ -8934,8 +8998,8 @@ function propPrefix(section) {
 }
 function exactPrefix(section) {
   const prefixes = /* @__PURE__ */ new Set();
-  for (const field of section.fields ?? []) {
-    const { path, key } = field;
+  for (const field2 of section.fields ?? []) {
+    const { path, key } = field2;
     if (typeof path !== "string" || typeof key !== "string") continue;
     if (!path.endsWith(key)) return null;
     prefixes.add(path.slice(0, path.length - key.length));
@@ -8947,11 +9011,11 @@ var foldKey = (remainder) => remainder.replace(/\[(\d+)\]/g, "_$1").replace(/[^a
 function flatPrefix(section) {
   const prefixes = /* @__PURE__ */ new Set();
   let informative = false;
-  for (const field of section.fields ?? []) {
-    const { path, key } = field;
+  for (const field2 of section.fields ?? []) {
+    const { path, key } = field2;
     if (typeof path !== "string" || typeof key !== "string") continue;
     informative = true;
-    const prefix = ["-", "_"].map((sep2) => `${section.groupKey}${sep2}`).find((candidate) => path.startsWith(candidate) && (typeof field.overrideKey === "string" || foldKey(path.slice(candidate.length)) === key));
+    const prefix = ["-", "_"].map((sep2) => `${section.groupKey}${sep2}`).find((candidate) => path.startsWith(candidate) && (typeof field2.overrideKey === "string" || foldKey(path.slice(candidate.length)) === key));
     if (!prefix) return null;
     prefixes.add(prefix);
   }
@@ -8960,15 +9024,15 @@ function flatPrefix(section) {
 function flatPathMap(section, prefix) {
   const scalars = {};
   const tables = {};
-  for (const field of section.fields ?? []) {
-    const { path, key } = field;
+  for (const field2 of section.fields ?? []) {
+    const { path, key } = field2;
     if (typeof path !== "string" || typeof key !== "string" || !path.startsWith(prefix)) continue;
     const row = /^([^[]+)\[\d+\]\.(.+)$/.exec(path);
     if (!row) {
-      scalars[path] = field.overrideKey ?? key;
+      scalars[path] = field2.overrideKey ?? key;
       continue;
     }
-    const address = typeof field.overrideKey === "string" ? /^([^[]+)\[\d+\]\.(.+)$/.exec(field.overrideKey) : null;
+    const address = typeof field2.overrideKey === "string" ? /^([^[]+)\[\d+\]\.(.+)$/.exec(field2.overrideKey) : null;
     if (!address) return null;
     const table = tables[row[1]] ??= { key: address[1], columns: {} };
     if (table.key !== address[1]) return null;
@@ -10833,7 +10897,7 @@ function styleEdits(before, after) {
 // package.json
 var package_default = {
   name: "@bettercms-ai/convert",
-  version: "0.25.0",
+  version: "0.26.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: {
@@ -10866,7 +10930,7 @@ var package_default = {
   dependencies: {
     "@astrojs/compiler": "^2.13.1",
     "@babel/parser": "^7.29.2",
-    "@bettercms-ai/types": "^1.30.0",
+    "@bettercms-ai/types": "^1.32.0",
     "@vue/compiler-sfc": "^3.5.0",
     "magic-string": "^0.30.21",
     parse5: "^7.3.0",