@bettercms-ai/convert 0.25.1 → 0.26.0

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @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

package/dist/cli.js

@@ -4203,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])
@@ -4277,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 {
@@ -4289,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 };
@@ -4305,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.
   }
@@ -4323,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;
 }
 
@@ -4337,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;
 }
 
 /**
@@ -4414,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;
 }
 
 /**
@@ -4753,7 +4784,8 @@ var HISTORICAL = {
     9: "d6441db2ff4578c3c5d4b7d461f3374b89247ef6ba9e0d535791e840d803e4f3",
     10: "ffcb59862972b15a67c5951e9f3b94ce5b8b50345e6aac2bfa5789cfc3136910",
     11: "ceb2a932d4c2761a5045ff35032e0b45130a0b5034547ff37579c72c9ce3594e",
-    12: "10f71724484c84af12aa3eb90db44bf6acbf71fcf8ddff5b6361c1190ba16528"
+    12: "10f71724484c84af12aa3eb90db44bf6acbf71fcf8ddff5b6361c1190ba16528",
+    13: "cd8bdd74dbc944f2331503bdf8e995cb7f74f0d5b307d08aee4690e1695ae798"
   },
   "src/lib/bcms-content.ts": {
     1: "ae72ae14d706943d481c880d70da5789b4816ba1ba319a10fbc63ded4d0b42f2",
@@ -4767,7 +4799,8 @@ var HISTORICAL = {
     9: "eee9fb1635ae7d6f8f33676a1f390600ca24a62ee992775252273c73a011c494",
     10: "35bb7c0e30f5c41fe68e52259ec4764de6de2734064fa0e1521f3338eef0a09e",
     11: "818784f2088150d64d91b42eac944dc9503f104d32a0e7a18c753d2982a5adc0",
-    12: "79dafc525a541feae55ada5dbe2ea966cac82acd741a4b41d61fe9e0cdfaa208"
+    12: "79dafc525a541feae55ada5dbe2ea966cac82acd741a4b41d61fe9e0cdfaa208",
+    13: "06ee70c9f0bb25e03f3930d2250da8dae172ade457f27ebba20382b6482ad3f4"
   },
   "composables/bcms-content.ts": {
     1: "c272412532efed7db64b6cf313b2bed4291f9951430412289c8a588b7f565407",
@@ -4781,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");
@@ -10863,7 +10897,7 @@ function styleEdits(before, after) {
 // package.json
 var package_default = {
   name: "@bettercms-ai/convert",
-  version: "0.25.1",
+  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: {