@bettercms-ai/convert 0.10.0 → 0.11.0

package/dist/index.d.ts

@@ -829,7 +829,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 = 6;
+declare const HELPER_VERSION = 7;
 /** 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. */
@@ -1416,6 +1416,11 @@ declare function carryFor(options: {
  * an unexpected extra key is simply carried past. The shape is frozen; the reader is not brittle.
  */
 interface ComponentizePlanField {
+    /**
+     * Where an instance holds this leaf's copy (`h2_latest`, `group_webgl[0].a_webgl`) — allocated by the
+     * server, which alone knows the dedupe suffixes and table keys. Absent from older plans.
+     */
+    overrideKey?: string;
     /** The leaf's key inside the group — `title`, `items[0].q`. */
     key?: string;
     /** The whole page path — `hero.title`. Derived from `groupKey` + `key` when absent. */
@@ -1559,6 +1564,15 @@ interface ComponentizeReceipt {
     sections: SectionsReceipt;
     /** The component slugs this run wrote a file for, sorted. */
     components: string[];
+    /**
+     * The file each of those components was written to — what lets the server record a component's source
+     * (kind `section`) without anyone claiming it by hand. Additive: readers of `components` are unchanged.
+     */
+    componentFiles?: {
+        slug: string;
+        path: string;
+        export: "default";
+    }[];
     /**
      * Sections the SERVER already marked pending (`NO_GROUP_ROOT`, `ALREADY_COMPONENTIZED`, …).
      *

package/dist/index.js

@@ -4140,7 +4140,7 @@ function bindImages(ctx, targets) {
 
 // src/helper.ts
 import { createHash as createHash2 } from "crypto";
-var HELPER_VERSION = 6;
+var HELPER_VERSION = 7;
 var HEADER = "// @bettercms-ai/convert helper v";
 var HELPER_PATH = Object.fromEntries(
   Object.keys(DIALECT_RULES).map((d) => [d, DIALECT_RULES[d].helper])
@@ -4333,9 +4333,65 @@ export function bcmsSection(page: unknown, bind?: string, overrides?: unknown):
  * how the codemod ran: one component renders a Phase A placement on one page and a Phase B
  * instance on the next, and a repository does not have to be re-cut when its copy moves.
  */
+/** How a flat field family maps page paths to an instance's override keys. @see bcmsSectionPaths */
+export type BcmsPathMap = {
+  scalars?: Record<string, string>;
+  tables?: Record<string, { key: string; columns: Record<string, string> }>;
+};
+
+/**
+ * The snapshot for a section whose page fields are a FLAT family (\`wrap-h2-latest\`, not \`wrap.h2_latest\`).
+ *
+ * \`bcmsSection\` returns a group object read through a dotted path, which a flat family does not have: its
+ * copy lives in top-level keys of the page snapshot. So this answers in the page's own spelling \u2014 the
+ * markup reads \`bcms(snapshot, "wrap-h2-latest", \u2026)\` verbatim \u2014 with every mapped path set explicitly:
+ *
+ * - the instance's override for that key when it holds one (a table's rows re-spelled with the page's
+ *   column names, \`{ rows }\` unwrapped as in \`bcmsSection\`);
+ * - else, for a placement bound to a group, the page value at the path re-based onto that group;
+ * - else NOTHING \u2014 a placement that owns its copy never falls back to the page's stale copy, exactly as
+ *   \`bcmsSection\` synthesizes no group for it.
+ *
+ * Every other page key passes through, so reads outside the family (a shared link) keep working.
+ */
+export function bcmsSectionPaths(
+  page: unknown,
+  bind: string | undefined,
+  overrides: unknown,
+  prefix: string,
+  map: BcmsPathMap,
+): 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;
+  for (const [path, key] of Object.entries(map.scalars ?? {})) {
+    const value = own[key];
+    out[path] = value !== undefined && value !== null ? value : fromPage(path);
+  }
+  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);
+      continue;
+    }
+    const pageColumn = new Map(Object.entries(table.columns).map(([column, key]) => [key, column]));
+    out[path] = rows.map((row) => {
+      if (!isRecord(row)) return row;
+      const spelled: Record<string, unknown> = {};
+      for (const [key, value] of Object.entries(row)) spelled[pageColumn.get(key) ?? key] = value;
+      return spelled;
+    });
+  }
+  return out;
+}
+
 export function bcmsFields(
   placement: { blockId?: string; bind?: string; overrides?: unknown },
   pathPrefix: string,
+  map?: BcmsPathMap,
 ): (path: string) => string {
   const id = placement.blockId;
   const own = typeof id === "string" && id !== "" && !placement.bind && isRecord(placement.overrides);
@@ -4348,6 +4404,24 @@ export function bcmsFields(
    * so prepending one would invent an address rather than correct it.
    */
   const lane = own ? \`\${id}__overrides.\` : placement.bind && pathPrefix ? \`\${placement.bind}.\` : null;
+  if (map) {
+    /**
+     * A FLAT family: the address is not "prefix swapped". The instance lane names the override key the
+     * plan allocated (\`h2_latest\`, \`group_webgl[0].a_webgl\`); the bind lane keeps the page's own
+     * separator (\`landing-h2-latest\`, never \`landing.h2-latest\`).
+     */
+    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;
+      const column = row && table ? table.columns[row[3]] : undefined;
+      return table && column !== undefined ? id + "__overrides." + table.key + "[" + row![2] + "]." + column : path;
+    };
+  }
   return (path: string): string => {
     // A path outside the group this section was cut from is not one this placement re-addresses:
     // it names a key the instance does not hold and a group this placement is not bound to.
@@ -4364,21 +4438,24 @@ var HISTORICAL = {
     2: "51e2ae65ddd86bf43d14e29b3865e3f16e45f72069692d1fea57e1f986a894f0",
     3: "d4305b2983adcb456ef782d35ea9d083a04465c2b68baa0d44a084dfa01a9227",
     4: "a5742f64dacb1b26ee6dd5e1469a54871487934c71bc8267df19e3a80e417595",
-    5: "0472fe3ffdcfa49e719c7b9da9cb63b6eba637cc22783bb00c3c2cadd3d800da"
+    5: "0472fe3ffdcfa49e719c7b9da9cb63b6eba637cc22783bb00c3c2cadd3d800da",
+    6: "c907e7245578d947c6541b1ab2c5c6659ea7789a1519e895b4a4aed122c6f649"
   },
   "src/lib/bcms-content.ts": {
     1: "ae72ae14d706943d481c880d70da5789b4816ba1ba319a10fbc63ded4d0b42f2",
     2: "a18731eb42f7db55dac0591c45f873758cde8e103fefcd6e5caf67936ae6a002",
     3: "0be9c73160361882a038552bc02673c14ed532287823dabaafe36179bc55ed7e",
     4: "0146d027a727ecd3c9e3fc336fcf1299b59ddf75b04091c05703f3f983ec28af",
-    5: "c8c93655320fa65664611ba84541f3fa7bfa292cc9a2fd655373440b99049fba"
+    5: "c8c93655320fa65664611ba84541f3fa7bfa292cc9a2fd655373440b99049fba",
+    6: "63f1fa29e47e70c5193b81ee24addb238ba100247124d55bc17713102d587df5"
   },
   "composables/bcms-content.ts": {
     1: "c272412532efed7db64b6cf313b2bed4291f9951430412289c8a588b7f565407",
     2: "51e2ae65ddd86bf43d14e29b3865e3f16e45f72069692d1fea57e1f986a894f0",
     3: "d4305b2983adcb456ef782d35ea9d083a04465c2b68baa0d44a084dfa01a9227",
     4: "a5742f64dacb1b26ee6dd5e1469a54871487934c71bc8267df19e3a80e417595",
-    5: "0472fe3ffdcfa49e719c7b9da9cb63b6eba637cc22783bb00c3c2cadd3d800da"
+    5: "0472fe3ffdcfa49e719c7b9da9cb63b6eba637cc22783bb00c3c2cadd3d800da",
+    6: "c907e7245578d947c6541b1ab2c5c6659ea7789a1519e895b4a4aed122c6f649"
   }
 };
 var sha256 = (value) => createHash2("sha256").update(value, "utf8").digest("hex");
@@ -6887,6 +6964,7 @@ async function componentizeSources(briefIn, planIn, sources, options) {
     return held;
   };
   const fresh = /* @__PURE__ */ new Set();
+  const freshFiles = /* @__PURE__ */ new Map();
   const bindOf = (section) => instanceOwned(section) ? void 0 : section.groupKey;
   const placementOf = (slug, section) => {
     const bind = bindOf(section);
@@ -7214,6 +7292,7 @@ async function componentizeSources(briefIn, planIn, sources, options) {
       }
       extractable.set(resolved.slug, { name: resolved.name, path, kind: "default", imported: null });
       fresh.add(resolved.slug);
+      freshFiles.set(resolved.slug, path);
       addFile(outFiles, contents, {
         path,
         operation: existing === void 0 ? "add" : "modify",
@@ -7299,6 +7378,7 @@ 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(),
+      componentFiles: [...freshFiles].sort(([a], [b]) => a.localeCompare(b)).map(([slug, path]) => ({ slug, path, export: "default" })),
       planPending,
       notes
     }
@@ -7478,7 +7558,7 @@ async function locateSections(sections, briefPaths, sources, treeOf) {
   for (const section of sections) {
     const paths = fieldPaths(section);
     const literals = new Set(
-      briefPaths.filter((p) => (p.scope ?? "page") === "page" && groupOf(p.path) === section.groupKey && p.original).map((p) => flat(stripTags(p.original))).filter(Boolean)
+      briefPaths.filter((p) => (p.scope ?? "page") === "page" && inSection(section, p.path) && p.original).map((p) => flat(stripTags(p.original))).filter(Boolean)
     );
     const hits = /* @__PURE__ */ new Map();
     for (const source of sources) {
@@ -7489,7 +7569,7 @@ async function locateSections(sections, briefPaths, sources, treeOf) {
       const found = /* @__PURE__ */ new Map();
       for (const declaration2 of declarationsIn(parsed.roots, source.content)) {
         if (declaration2.scope !== "page") continue;
-        if (groupOf(declaration2.path) !== section.groupKey) continue;
+        if (!inSection(section, declaration2.path)) continue;
         const placed2 = elements.get(declaration2.at);
         if (placed2) found.set(declaration2.at, placed2);
       }
@@ -7514,6 +7594,12 @@ async function locateSections(sections, briefPaths, sources, treeOf) {
   return { placed, misses };
 }
 var groupOf = (path) => path.split(/[.[]/)[0] ?? "";
+var inSection = (section, path) => {
+  if (groupOf(path) === section.groupKey) return true;
+  const rowless = (value) => value.replace(/\[\d+\]/g, "[]");
+  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 ?? ""}`);
 function elementIndex(roots) {
   const out = /* @__PURE__ */ new Map();
@@ -7616,6 +7702,9 @@ function componentFile(dialect, path, fromFile, content, parsed, resolved, pathP
     ...addresses.opaque
   ];
   if (unconvertible.length > 0) return { content: "", free: [], duplicates: [], unconvertible };
+  const flat3 = pathPrefix !== "" && !pathPrefix.endsWith(".");
+  const pathMap = flat3 ? flatPathMap(resolved.section, pathPrefix) : null;
+  if (flat3 && !pathMap) return { content: "", free: [], duplicates: [], unconvertible: [`${pathPrefix}* (a repeater leaf without an override address)`] };
   const cut = content.slice(resolved.root.start, resolved.root.end);
   const reserved = /* @__PURE__ */ new Set([...topLevelBindings(dialect, parsed, content), ...referencedNames2(cut)]);
   const introduced = allocateNames(reserved, [
@@ -7634,7 +7723,7 @@ function componentFile(dialect, path, fromFile, content, parsed, resolved, pathP
   const helpers = [
     .../* @__PURE__ */ new Set([
       ...helperNames.map((h) => alias(h.name, h.local)),
-      "bcmsSection",
+      flat3 ? "bcmsSectionPaths" : "bcmsSection",
       ...bound > 0 ? [alias("bcmsFields", fieldsName)] : []
     ])
   ].sort();
@@ -7664,9 +7753,10 @@ 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 ? `const ${snapshot} = { ${key}: bcmsSection(page, bind, overrides) };` : "";
-  const field = bound > 0 ? `const ${fieldName} = ${fieldsName}({ blockId, bind, overrides }, ${JSON.stringify(pathPrefix)});` : "";
+  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 declared = [copy, field].filter(Boolean).join("\n");
+  const styles = dialect === "astro" ? carriedStyles(content) : "";
   if (dialect === "astro") {
     return { free: [], duplicates: [], unconvertible: [], content: `---
 ${SECTION_MARKER}
@@ -7686,7 +7776,9 @@ const { blockId, bind, overrides, page } = Astro.props;
 ${carriedDeclarations}${declared}
 ---
 ${markup}
-` };
+${styles ? `
+${styles}
+` : ""}` };
   }
   return { free: [], duplicates: [], unconvertible: [], content: `${SECTION_MARKER}
 ${[...carried, `import { ${helpers.join(", ")} } from "${helperSpecifier}";`, `import type { BcmsSectionProps } from "${relativeImport(path, SECTIONS_LIB).replace(/\.tsx?$/, "")}";`].join("\n")}
@@ -7960,6 +8052,9 @@ import { bcmsFields } from "${helper}";`);
   return { files, refused };
 }
 function propPrefix(section) {
+  return exactPrefix(section) ?? flatPrefix(section);
+}
+function exactPrefix(section) {
   const prefixes = /* @__PURE__ */ new Set();
   for (const field of section.fields ?? []) {
     const { path, key } = field;
@@ -7970,6 +8065,49 @@ function propPrefix(section) {
   if (prefixes.size > 1) return null;
   return prefixes.size === 1 ? [...prefixes][0] : `${section.groupKey}.`;
 }
+var foldKey = (remainder) => remainder.replace(/\[(\d+)\]/g, "_$1").replace(/[^a-zA-Z0-9]+/g, "_").replace(/^_+|_+$/g, "") || "value";
+function flatPrefix(section) {
+  const prefixes = /* @__PURE__ */ new Set();
+  let informative = false;
+  for (const field of section.fields ?? []) {
+    const { path, key } = field;
+    if (typeof path !== "string" || typeof key !== "string") continue;
+    informative = true;
+    const prefix = ["-", "_"].map((sep) => `${section.groupKey}${sep}`).find((candidate) => path.startsWith(candidate) && (typeof field.overrideKey === "string" || foldKey(path.slice(candidate.length)) === key));
+    if (!prefix) return null;
+    prefixes.add(prefix);
+  }
+  return informative && prefixes.size === 1 ? [...prefixes][0] : null;
+}
+function flatPathMap(section, prefix) {
+  const scalars = {};
+  const tables = {};
+  for (const field of section.fields ?? []) {
+    const { path, key } = field;
+    if (typeof path !== "string" || typeof key !== "string" || !path.startsWith(prefix)) continue;
+    const row = /^([^[]+)\[\d+\]\.(.+)$/.exec(path);
+    if (!row) {
+      scalars[path] = field.overrideKey ?? key;
+      continue;
+    }
+    const address = typeof field.overrideKey === "string" ? /^([^[]+)\[\d+\]\.(.+)$/.exec(field.overrideKey) : null;
+    if (!address) return null;
+    const table = tables[row[1]] ??= { key: address[1], columns: {} };
+    if (table.key !== address[1]) return null;
+    table.columns[row[2]] = address[2];
+  }
+  return { scalars, tables };
+}
+function carriedStyles(content) {
+  const blocks = [];
+  for (const match of content.matchAll(/<style\b([^>]*)>([\s\S]*?)<\/style>/g)) {
+    const attributes = match[1] ?? "";
+    if (/\bis:global\b|\bdefine:vars\b/.test(attributes)) continue;
+    if (/\blang\s*=/.test(attributes) || /@(import|use|forward)\b/.test(match[2] ?? "")) continue;
+    blocks.push(match[0]);
+  }
+  return blocks.join("\n");
+}
 function referencedNames2(markup) {
   const out = /* @__PURE__ */ new Set();
   for (const [name] of markup.matchAll(/[A-Za-z_$][\w$]*/g)) out.add(name);