@bettercms-ai/convert 0.18.1 → 0.19.0

package/dist/index.d.ts

@@ -951,7 +951,7 @@ declare function attrsFor(path: string, kind: string, props?: AttrBinding[], sco
 declare function propsAttribute(props: AttrBinding[]): string;
 
 /** Bumped whenever the emitted source changes. `isKnownHelper` upgrades anything older. */
-declare const HELPER_VERSION = 8;
+declare const HELPER_VERSION = 9;
 /** Where each dialect's helper lives. Null = this dialect reads nothing at build time. */
 declare const HELPER_PATH: Record<Dialect, string | null>;
 /** The directory the snapshots live in, at the repository root. */

package/dist/index.js

@@ -4187,7 +4187,7 @@ async function bindImages(ctx, targets) {
 
 // src/helper.ts
 import { createHash as createHash2 } from "crypto";
-var HELPER_VERSION = 8;
+var HELPER_VERSION = 9;
 var HEADER = "// @bettercms-ai/convert helper v";
 var HELPER_PATH = Object.fromEntries(
   Object.keys(DIALECT_RULES).map((d) => [d, DIALECT_RULES[d].helper])
@@ -4352,9 +4352,19 @@ export function bcmsImage<T>(page: unknown, path: string, fallback: T, slug?: st
  * the fallback the template shipped with \u2014 which is why a section renders correctly against the
  * committed \`{}\` stub.
  */
-export function bcmsSection(page: unknown, bind?: string, overrides?: unknown): Record<string, unknown> {
+export function bcmsSection(
+  page: unknown,
+  bind?: string,
+  overrides?: unknown,
+  bindPaths?: Record<string, string>,
+): Record<string, unknown> {
   const group = bind ? readPath(page, bind) : undefined;
   const base: Record<string, unknown> = isRecord(group) ? { ...group } : {};
+  // A locale copy on its twin's component spells its fields its own way: each prop's copy is
+  // read from the path the placement names for it.
+  if (bind && isRecord(bindPaths)) {
+    for (const [key, path] of Object.entries(bindPaths)) base[key] = readPath(page, path);
+  }
   if (!isRecord(overrides)) return base;
   for (const key of Object.keys(overrides)) {
     const value = overrides[key];
@@ -4417,21 +4427,25 @@ export function bcmsSectionPaths(
   overrides: unknown,
   prefix: string,
   map: BcmsPathMap,
+  bindPaths?: Record<string, string>,
 ): Record<string, unknown> {
   const out: Record<string, unknown> = isRecord(page) ? { ...page } : {};
   const own = isRecord(overrides) ? overrides : {};
   const separator = prefix.slice(-1);
-  const fromPage = (path: string): unknown =>
-    bind ? readPath(page, bind + separator + path.slice(prefix.length)) : undefined;
+  // A re-keyed locale copy names each prop's path on its own page; any other placement re-bases.
+  const fromPage = (path: string, key: string): unknown =>
+    !bind ? undefined
+    : isRecord(bindPaths) && typeof bindPaths[key] === "string" ? readPath(page, bindPaths[key])
+    : readPath(page, bind + separator + path.slice(prefix.length));
   for (const [path, key] of Object.entries(map.scalars ?? {})) {
     const value = own[key];
-    out[path] = value !== undefined && value !== null ? value : fromPage(path);
+    out[path] = value !== undefined && value !== null ? value : fromPage(path, key);
   }
   for (const [path, table] of Object.entries(map.tables ?? {})) {
     const held = own[table.key];
     const rows = isRecord(held) && Array.isArray(held.rows) ? held.rows : held;
     if (!Array.isArray(rows)) {
-      out[path] = fromPage(path);
+      out[path] = fromPage(path, table.key);
       continue;
     }
     const pageColumn = new Map(Object.entries(table.columns).map(([column, key]) => [key, column]));
@@ -4446,12 +4460,17 @@ export function bcmsSectionPaths(
 }
 
 export function bcmsFields(
-  placement: { blockId?: string; bind?: string; overrides?: unknown },
+  placement: { blockId?: string; bind?: string; overrides?: unknown; bindPaths?: Record<string, string> },
   pathPrefix: string,
   map?: BcmsPathMap,
 ): (path: string) => string {
   const id = placement.blockId;
   const own = typeof id === "string" && id !== "" && !placement.bind && isRecord(placement.overrides);
+  /** A re-keyed locale copy's own path for a prop, with whatever follows the prop kept. */
+  const moved = (key: string | undefined, rest: string): string | undefined => {
+    const paths = placement.bind && isRecord(placement.bindPaths) ? placement.bindPaths : undefined;
+    return key !== undefined && paths && typeof paths[key] === "string" ? paths[key] + rest : undefined;
+  };
   /**
    * What replaces the prefix the markup was cut with, or null for "leave every path alone".
    *
@@ -4470,11 +4489,14 @@ export function bcmsFields(
     const separator = pathPrefix.slice(-1);
     return (path: string): string => {
       if (!path.startsWith(pathPrefix) || !(own || placement.bind)) return path;
-      if (!own) return placement.bind + separator + path.slice(pathPrefix.length);
       const scalar = map.scalars?.[path];
-      if (scalar !== undefined) return id + "__overrides." + scalar;
       const row = /^([^[]+)\\[(\\d+)\\]\\.(.+)$/.exec(path);
       const table = row ? map.tables?.[row[1]] : undefined;
+      if (!own) {
+        return moved(scalar, "") ?? moved(table?.key, row ? "[" + row[2] + "]." + row[3] : "")
+          ?? placement.bind + separator + path.slice(pathPrefix.length);
+      }
+      if (scalar !== undefined) return id + "__overrides." + scalar;
       const column = row && table ? table.columns[row[3]] : undefined;
       return table && column !== undefined ? id + "__overrides." + table.key + "[" + row![2] + "]." + column : path;
     };
@@ -4484,7 +4506,9 @@ export function bcmsFields(
     // it names a key the instance does not hold and a group this placement is not bound to.
     // (An EMPTY prefix is a plan saying the prop key IS the page path, and matches everything.)
     if (lane === null || !path.startsWith(pathPrefix)) return path;
-    return lane + path.slice(pathPrefix.length);
+    const rest = path.slice(pathPrefix.length);
+    const key = /^[^.[]+/.exec(rest)?.[0];
+    return (own ? undefined : moved(key, rest.slice(key?.length ?? 0))) ?? lane + rest;
   };
 }
 `;
@@ -4497,7 +4521,8 @@ var HISTORICAL = {
     4: "a5742f64dacb1b26ee6dd5e1469a54871487934c71bc8267df19e3a80e417595",
     5: "0472fe3ffdcfa49e719c7b9da9cb63b6eba637cc22783bb00c3c2cadd3d800da",
     6: "c907e7245578d947c6541b1ab2c5c6659ea7789a1519e895b4a4aed122c6f649",
-    7: "f22514ef48c50230985e605bea6cf9bf41756384a7dc80603e347baba9b65d93"
+    7: "f22514ef48c50230985e605bea6cf9bf41756384a7dc80603e347baba9b65d93",
+    8: "484e72852d2b496e016a1f2a2b1a77bb993f8a163b290781522d6114b6519bb9"
   },
   "src/lib/bcms-content.ts": {
     1: "ae72ae14d706943d481c880d70da5789b4816ba1ba319a10fbc63ded4d0b42f2",
@@ -4506,7 +4531,8 @@ var HISTORICAL = {
     4: "0146d027a727ecd3c9e3fc336fcf1299b59ddf75b04091c05703f3f983ec28af",
     5: "c8c93655320fa65664611ba84541f3fa7bfa292cc9a2fd655373440b99049fba",
     6: "63f1fa29e47e70c5193b81ee24addb238ba100247124d55bc17713102d587df5",
-    7: "ed92fb88de953d9951abbe6a1edae1d048f4050eaf6fb607ac08167f94d8bcc7"
+    7: "ed92fb88de953d9951abbe6a1edae1d048f4050eaf6fb607ac08167f94d8bcc7",
+    8: "1a6f669d76d42effe77f082436e9d21c0efa6fc499e919e3d116bc3a27a7f3d5"
   },
   "composables/bcms-content.ts": {
     1: "c272412532efed7db64b6cf313b2bed4291f9951430412289c8a588b7f565407",
@@ -4515,7 +4541,8 @@ var HISTORICAL = {
     4: "a5742f64dacb1b26ee6dd5e1469a54871487934c71bc8267df19e3a80e417595",
     5: "0472fe3ffdcfa49e719c7b9da9cb63b6eba637cc22783bb00c3c2cadd3d800da",
     6: "c907e7245578d947c6541b1ab2c5c6659ea7789a1519e895b4a4aed122c6f649",
-    7: "f22514ef48c50230985e605bea6cf9bf41756384a7dc80603e347baba9b65d93"
+    7: "f22514ef48c50230985e605bea6cf9bf41756384a7dc80603e347baba9b65d93",
+    8: "484e72852d2b496e016a1f2a2b1a77bb993f8a163b290781522d6114b6519bb9"
   }
 };
 var sha256 = (value) => createHash2("sha256").update(value, "utf8").digest("hex");
@@ -6498,7 +6525,7 @@ function* formsIn(nodes, chain = []) {
   }
 }
 var isComponentTag = (dialect, tag) => dialect !== "html" && /^[A-Z]/.test(tag);
-function candidateOf(file, dialect, form, imported, landmark) {
+function candidateOf(file, dialect, form, imported, landmark, content) {
   const controls = /* @__PURE__ */ new Map();
   const wrapper = /* @__PURE__ */ new Map();
   const foreign = /* @__PURE__ */ new Set();
@@ -6535,7 +6562,11 @@ function candidateOf(file, dialect, form, imported, landmark) {
     const id = attrOf(control, "id")?.value;
     if (id && !controls.has(id)) controls.set(id, control);
   }
-  return { file, dialect, el: form, controls, wrapper, foreign, landmark };
+  const computed = (attr) => !!attr?.expression && !!attr.expressionRange && /[A-Za-z_$]/.test(
+    content.slice(attr.expressionRange.start, attr.expressionRange.end).replace(/\/\*[\s\S]*?\*\/|\/\/[^\n]*|"(?:[^"\\\n]|\\.)*"|'(?:[^'\\\n]|\\.)*'|`(?:[^`\\$]|\\.|\$(?!\{))*`/g, "")
+  );
+  const dynamic = all.some((control) => !foreign.has(control) && computed(attrOf(control, "name")));
+  return { file, dialect, el: form, controls, wrapper, foreign, landmark, dynamic };
 }
 async function importedControls(source, parsed, dialect, project, cache) {
   const out = /* @__PURE__ */ new Map();
@@ -6629,11 +6660,12 @@ async function wireForms(briefIn, sources, options_ = {}) {
     }
     const imported = dialect === "html" ? /* @__PURE__ */ new Map() : await importedControls(source, parsed, dialect, project, componentFiles);
     for (const { el, landmark } of formsIn(parsed.roots)) {
-      candidates.push(candidateOf(source.path, dialect, el, imported, landmark));
+      candidates.push(candidateOf(source.path, dialect, el, imported, landmark, source.content));
     }
   }
   const holds = (c, f) => f.fields.filter((field) => c.controls.has(field.key)).length;
-  const covers2 = (c, f) => f.fields.length > 0 && holds(c, f) === f.fields.length;
+  const wiredTo = (c, f) => attrOf(c.el, "data-bcms-form")?.value === f.id;
+  const covers2 = (c, f) => c.dynamic && wiredTo(c, f) || f.fields.length > 0 && holds(c, f) === f.fields.length;
   const samePath = (a, b) => a.replace(/\\/g, "/").replace(/^\.\//, "") === b.replace(/\\/g, "/").replace(/^\.\//, "");
   const options = new Map(forms.map((f) => [f.id, candidates.filter((c) => covers2(c, f))]));
   const pinned = /* @__PURE__ */ new Map();
@@ -6716,6 +6748,11 @@ async function wireForms(briefIn, sources, options_ = {}) {
       continue;
     }
     const candidate = list[0];
+    if (wiredTo(candidate, form)) {
+      alreadyWired++;
+      onSite.push({ form, file: candidate.file });
+      continue;
+    }
     if (attrOf(candidate.el, "action")?.expression) {
       pend2(form, "ACTION_IS_EXPRESSION", candidate.file, "its action is an expression, so this run will not replace it.");
       continue;
@@ -6728,11 +6765,6 @@ async function wireForms(briefIn, sources, options_ = {}) {
       pend2(form, "FIELD_UNMATCHED", candidate.file, `the control for ${misnamed.key} posts under an expression, so its name cannot be set to the CMS key.`);
       continue;
     }
-    if (attrOf(candidate.el, "data-bcms-form")?.value === form.id) {
-      alreadyWired++;
-      onSite.push({ form, file: candidate.file });
-      continue;
-    }
     matched.push({ form, candidate });
     onSite.push({ form, file: candidate.file });
   }
@@ -6853,7 +6885,8 @@ var TEMPLATE_DIRS = /* @__PURE__ */ new Set([
   "_includes",
   "_layouts"
 ]);
-var isAboutTheSite = (lower) => /\.(test|spec)\.[^./]+$/.test(lower) || /^[^/]*\.config\.[^./]+$/.test(lower);
+var READ_CONFIG = /^astro\.config\.[^./]+$/;
+var isAboutTheSite = (lower) => /\.(test|spec)\.[^./]+$/.test(lower) || /^[^/]*\.config\.[^./]+$/.test(lower) && !READ_CONFIG.test(lower);
 function isSourceCandidate(path) {
   const lower = path.toLowerCase();
   if (SKIP_DIRS.some((dir) => lower === dir.slice(0, -1) || lower.startsWith(dir) || lower.includes(`/${dir}`)))
@@ -6900,7 +6933,7 @@ function measureUnaddressable(html) {
   let visible = 0;
   let unaddressable = 0;
   const buckets = /* @__PURE__ */ new Map();
-  const visit = (node, tag, context, bound) => {
+  const visit = (node, tag, context, bound, inForm = false) => {
     if (node.type === "text") {
       const text = flat2(node.value);
       if (isDecorativeGlyph(text) || PLATFORM_BADGE.test(text)) return;
@@ -6920,9 +6953,10 @@ function measureUnaddressable(html) {
     if (attrs.has("hidden") || attrs.get("aria-hidden") === "true" || /display\s*:\s*none/i.test(attrs.get("style") ?? "") || isSkipLink(node, attrs)) {
       return;
     }
-    const owned = bound || BOUND_ATTRS.some((name) => attrs.has(name));
+    const form = inForm || attrs.has("data-bcms-form");
+    const owned = bound || BOUND_ATTRS.some((name) => attrs.has(name)) || form && attrs.has("data-bcms-form-part");
     const chain = CONTEXT_TAGS.has(node.tag) ? context === "body" ? node.tag : `${context}>${node.tag}` : context;
-    for (const child of node.children) visit(child, node.tag, chain, owned);
+    for (const child of node.children) visit(child, node.tag, chain, owned, form);
   };
   for (const root of parsed.roots) visit(root, "body", "body", false);
   return {
@@ -8124,6 +8158,7 @@ function componentFile(dialect, path, fromFile, content, parsed, resolved, pathP
     provided: [
       "blockId",
       "bind",
+      "bindPaths",
       "overrides",
       "page",
       fieldName,
@@ -8138,8 +8173,8 @@ function componentFile(dialect, path, fromFile, content, parsed, resolved, pathP
   const key = /^[A-Za-z_$][\w$]*$/.test(groupKey) ? groupKey : JSON.stringify(groupKey);
   const carriedDeclarations = carry.declarations.length > 0 ? `${carry.declarations.join("\n")}
 ` : "";
-  const copy = !snapshot ? "" : flat3 ? `const ${snapshot} = bcmsSectionPaths(page, bind, overrides, ${JSON.stringify(pathPrefix)}, ${JSON.stringify(pathMap)});` : `const ${snapshot} = { ${key}: bcmsSection(page, bind, overrides) };`;
-  const field = bound > 0 ? `const ${fieldName} = ${fieldsName}({ blockId, bind, overrides }, ${JSON.stringify(pathPrefix)}${flat3 ? `, ${JSON.stringify(pathMap)}` : ""});` : "";
+  const 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 styles = dialect === "astro" ? carriedStyles(content) : "";
   if (dialect === "astro") {
@@ -8152,12 +8187,14 @@ interface Props {
   blockId?: string;
   /** The page field group this placement renders \u2014 Phase A keeps the copy where P2 put it. */
   bind?: string;
+  /** A locale copy's own field path for each prop, when its keys differ from this component's. */
+  bindPaths?: Record<string, string>;
   /** The instance's own copy, when an editor gave it any. Wins over the bound group. */
   overrides?: Record<string, unknown>;
   /** The page snapshot, so one component can serve every page whose group has this shape. */
   page?: unknown;
 }
-const { blockId, bind, overrides, page } = Astro.props;
+const { blockId, bind, bindPaths, overrides, page } = Astro.props;
 ${carriedDeclarations}${declared}
 ---
 ${markup}
@@ -8169,7 +8206,7 @@ ${styles}
 ${[...carried, `import { ${helpers.join(", ")} } from "${helperSpecifier}";`, `import type { BcmsSectionProps } from "${relativeImport(path, SECTIONS_LIB).replace(/\.tsx?$/, "")}";`].join("\n")}
 ${carriedDeclarations === "" ? "" : `
 ${carriedDeclarations}`}
-export default function ${resolved.name}({ blockId, bind, overrides, page }: BcmsSectionProps) {
+export default function ${resolved.name}({ blockId, bind, bindPaths, overrides, page }: BcmsSectionProps) {
   ${declared.split("\n").join("\n  ")}
   return (
     ${markup}
@@ -8531,6 +8568,7 @@ const isRecord = (v: unknown): v is Record<string, unknown> =>
 export interface BcmsSectionProps {
   blockId?: string;
   bind?: string;
+  bindPaths?: Record<string, string>;
   overrides?: Record<string, unknown>;
   page?: unknown;
 }
@@ -8540,6 +8578,8 @@ export interface BcmsPlacement {
   blockId?: string;
   slug: string;
   bind?: string;
+  /** A locale copy's own field path for each prop, when its keys differ from the component's. */
+  bindPaths?: Record<string, string>;
   overrides?: Record<string, unknown>;
 }
 
@@ -8600,6 +8640,7 @@ export function pageSections(pageSlug: string): BcmsPlacement[] {
       blockId: typeof block.id === "string" ? block.id : undefined,
       slug,
       bind: typeof props.bind === "string" ? props.bind : undefined,
+      bindPaths: isRecord(props.bindPaths) ? (props.bindPaths as Record<string, string>) : undefined,
       overrides: isRecord(props.overrides) ? props.overrides : undefined,
     });
   }
@@ -8665,6 +8706,7 @@ const snapshot = pageSnapshot(page);
     <Component
       blockId={placement.blockId}
       bind={placement.bind}
+      bindPaths={placement.bindPaths}
       overrides={placement.overrides}
       page={snapshot}
     />
@@ -8687,6 +8729,7 @@ export default function Sections({ page }: { page: string }) {
             key={placement.blockId ?? \`\${placement.slug}-\${i}\`}
             blockId={placement.blockId}
             bind={placement.bind}
+            bindPaths={placement.bindPaths}
             overrides={placement.overrides}
             page={snapshot}
           />
@@ -9420,7 +9463,23 @@ async function plan(file, content, dialect, targets, sites, importAt, outcomes,
       continue;
     }
     const resolved = sharing.length === 1 ? { assigned: /* @__PURE__ */ new Map([[sharing[0].key, forLiteral]]), ambiguous: /* @__PURE__ */ new Set() } : resolvePositionally(sharing, forLiteral);
+    const exactly = new Map(
+      sharing.length > 1 ? sharing.flatMap((target) => {
+        const own = forLiteral.filter(
+          (site) => site.where === "text" && !site.partial && !site.mixed && isIntrinsic(site.tag) && declarations.some((d) => d.scope === target.scope && d.path === target.path && d.at === site.attrInsertAt)
+        );
+        return own.length > 0 ? [[target.key, own]] : [];
+      }) : []
+    );
+    const unmarked = forLiteral.filter((site) => ![...exactly.values()].some((own) => own.includes(site)));
+    const settled = unmarked.length <= sharing.length - exactly.size ? exactly : /* @__PURE__ */ new Map();
     for (const target of sharing) {
+      const own = settled.get(target.key);
+      if (own) {
+        outcomes.set(target.key, "declared");
+        located += own.length;
+        continue;
+      }
       if (resolved.ambiguous.has(target.key)) {
         outcomes.set(target.key, "AMBIGUOUS_LITERAL");
         continue;