@bettercms-ai/convert 0.23.0 → 0.24.1

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @bettercms-ai/convert
 
+## 0.24.1
+
+### Patch Changes
+
+- 15e446a: Helper v13: a repository image path (`@/images/blog/post-1.avif`, `~/…`, `../…`, `/src/…`) is never rendered as a value; the template's own imported picture shows instead. Converted sites get it on their next BetterCMS build through the helper upgrade.
+
+## 0.24.0
+
+### Minor Changes
+
+- 86c0c9f: Helper v12: on a server BetterCMS hosts, each content snapshot resolves at request time to its published counterpart in the file the platform rewrites on every publish (`BCMS_CONTENT_FILE`), so a server-rendered page shows a publish in seconds without a rebuild. Builds, dev servers, browsers and edge runtimes are unchanged. New export `helperUpgrades()` lists the current helper per path with the digests of every older one it may replace.
+
 ## 0.23.0
 
 ### Minor Changes

package/dist/cli.js

@@ -4190,7 +4190,7 @@ async function bindImages(ctx, targets) {
 
 // src/helper.ts
 import { createHash as createHash2 } from "crypto";
-var HELPER_VERSION = 11;
+var HELPER_VERSION = 13;
 var HEADER = "// @bettercms-ai/convert helper v";
 var HELPER_PATH = Object.fromEntries(
   Object.keys(DIALECT_RULES).map((d) => [d, DIALECT_RULES[d].helper])
@@ -4236,9 +4236,16 @@ function readPath(root: unknown, path: string): unknown {
   return cursor;
 }
 
+/**
+ * A repository image path \u2014 \`@/images/x.avif\`, \`~/assets/x.png\`, \`../assets/x.jpg\`, \`/src/x.png\`.
+ * The bundler resolves one at build and nothing else can, so as a value it is never rendered: the
+ * template's own fallback (the picture the build already imported) shows instead of a broken image.
+ */
+const REPO_IMAGE_PATH = /^(?:@[\\w-]*|~|\\.{1,2}|\\/?src)\\/[^\\s?#"'<>]*\\.(?:avif|png|jpe?g|webp|gif|svg|bmp|ico|tiff?|jxl|heic)(?:[?#]\\S*)?$/i;
+
 /** A stored value as a template renders it: richtext is its html, an image is its url. */
 function render(value: unknown): string | undefined {
-  if (typeof value === "string") return value;
+  if (typeof value === "string") return REPO_IMAGE_PATH.test(value.trim()) ? undefined : value;
   if (typeof value === "number" || typeof value === "boolean") return String(value);
   if (isRecord(value)) {
     if (typeof value.html === "string") return value.html;
@@ -4247,8 +4254,69 @@ function render(value: unknown): string | undefined {
   return undefined;
 }
 
+/**
+ * The PUBLISHED copy, on a server BetterCMS hosts \u2014 read at request time, not at build time.
+ *
+ * BetterCMS keeps one file current for a running server app (\`BCMS_CONTENT_FILE\`, the same
+ * bcms-content.json the build was given) and rewrites it on every publish, so a server-rendered
+ * page shows a publish within seconds instead of after a rebuild. Each snapshot this module reads
+ * resolves to its live counterpart: the shared layout by identity, a page by its \`slug\`.
+ *
+ * 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.
+ */
+type BcmsLiveContent = { stamp: number; bySlug: Map<string, unknown>; layout: unknown };
+let bcmsLive: BcmsLiveContent | null = null;
+let bcmsLiveCheckedAt = 0;
+
+function liveContent(): BcmsLiveContent | null {
+  const proc = (globalThis as {
+    process?: { env?: Record<string, string | undefined>; getBuiltinModule?: (id: string) => unknown };
+  }).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 };
+      readFileSync(path: string, encoding: "utf8"): string;
+    };
+    const stamp = fs.statSync(file).mtimeMs;
+    if (bcmsLive && bcmsLive.stamp === stamp) return bcmsLive;
+    const snapshot: unknown = JSON.parse(fs.readFileSync(file, "utf8"));
+    const bySlug = new Map<string, unknown>();
+    const collections = isRecord(snapshot) && isRecord(snapshot.collections) ? snapshot.collections : {};
+    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);
+      }
+    }
+    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 };
+  } catch {
+    // Unreadable, or caught mid-write: keep serving the last good copy.
+  }
+  return bcmsLive;
+}
+
+/** The published counterpart of a snapshot this module was handed, or the snapshot itself. */
+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;
+  return page;
+}
+
 /** One field of one page. \`slug\` selects the entry on a dynamic route. */
 export function bcms(page: unknown, path: string, fallback: string, slug?: string): string {
+  page = live(page);
   const entries = isRecord(page) ? page.entries : undefined;
   const root = slug !== undefined && isRecord(entries) ? entries[slug] : page;
   return render(readPath(root, path)) ?? fallback;
@@ -4256,7 +4324,7 @@ 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(layoutSnapshot, path)) ?? fallback;
+  return render(readPath(live(layoutSnapshot), path)) ?? fallback;
 }
 
 /**
@@ -4264,6 +4332,7 @@ export function bcmsLayout(path: string, fallback: string): string {
  * an empty snapshot still renders the same number of cards it always did.
  */
 export function bcmsRows<T>(page: unknown, path: string, fallback: T[], slug?: string): T[] {
+  page = live(page);
   const entries = isRecord(page) ? page.entries : undefined;
   const root = slug !== undefined && isRecord(entries) ? entries[slug] : page;
   const value = readPath(root, path);
@@ -4309,6 +4378,7 @@ export function bcmsRowsAs<T>(
  * this out loud rather than leaving an editor to discover it.
  */
 export function bcmsList(page: unknown, paths: string[], fallback: string[], slug?: string): string[] {
+  page = live(page);
   const entries = isRecord(page) ? page.entries : undefined;
   const root = slug !== undefined && isRecord(entries) ? entries[slug] : page;
   return paths.map((path, index) => render(readPath(root, path)) ?? fallback[index] ?? "");
@@ -4333,6 +4403,7 @@ export function bcmsTuples(page: unknown, paths: string[][], fallback: string[][
  * no such rule and takes the CMS url directly.
  */
 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;
@@ -4361,6 +4432,7 @@ export function bcmsSection(
   overrides?: unknown,
   bindPaths?: Record<string, string>,
 ): Record<string, unknown> {
+  page = live(page);
   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
@@ -4432,6 +4504,7 @@ export function bcmsSectionPaths(
   map: BcmsPathMap,
   bindPaths?: Record<string, string>,
 ): Record<string, unknown> {
+  page = live(page);
   const out: Record<string, unknown> = isRecord(page) ? { ...page } : {};
   const own = isRecord(overrides) ? overrides : {};
   const separator = prefix.slice(-1);
@@ -4665,7 +4738,9 @@ var HISTORICAL = {
     7: "f22514ef48c50230985e605bea6cf9bf41756384a7dc80603e347baba9b65d93",
     8: "484e72852d2b496e016a1f2a2b1a77bb993f8a163b290781522d6114b6519bb9",
     9: "d6441db2ff4578c3c5d4b7d461f3374b89247ef6ba9e0d535791e840d803e4f3",
-    10: "ffcb59862972b15a67c5951e9f3b94ce5b8b50345e6aac2bfa5789cfc3136910"
+    10: "ffcb59862972b15a67c5951e9f3b94ce5b8b50345e6aac2bfa5789cfc3136910",
+    11: "ceb2a932d4c2761a5045ff35032e0b45130a0b5034547ff37579c72c9ce3594e",
+    12: "10f71724484c84af12aa3eb90db44bf6acbf71fcf8ddff5b6361c1190ba16528"
   },
   "src/lib/bcms-content.ts": {
     1: "ae72ae14d706943d481c880d70da5789b4816ba1ba319a10fbc63ded4d0b42f2",
@@ -4677,7 +4752,9 @@ var HISTORICAL = {
     7: "ed92fb88de953d9951abbe6a1edae1d048f4050eaf6fb607ac08167f94d8bcc7",
     8: "1a6f669d76d42effe77f082436e9d21c0efa6fc499e919e3d116bc3a27a7f3d5",
     9: "eee9fb1635ae7d6f8f33676a1f390600ca24a62ee992775252273c73a011c494",
-    10: "35bb7c0e30f5c41fe68e52259ec4764de6de2734064fa0e1521f3338eef0a09e"
+    10: "35bb7c0e30f5c41fe68e52259ec4764de6de2734064fa0e1521f3338eef0a09e",
+    11: "818784f2088150d64d91b42eac944dc9503f104d32a0e7a18c753d2982a5adc0",
+    12: "79dafc525a541feae55ada5dbe2ea966cac82acd741a4b41d61fe9e0cdfaa208"
   },
   "composables/bcms-content.ts": {
     1: "c272412532efed7db64b6cf313b2bed4291f9951430412289c8a588b7f565407",
@@ -4689,7 +4766,9 @@ var HISTORICAL = {
     7: "f22514ef48c50230985e605bea6cf9bf41756384a7dc80603e347baba9b65d93",
     8: "484e72852d2b496e016a1f2a2b1a77bb993f8a163b290781522d6114b6519bb9",
     9: "d6441db2ff4578c3c5d4b7d461f3374b89247ef6ba9e0d535791e840d803e4f3",
-    10: "ffcb59862972b15a67c5951e9f3b94ce5b8b50345e6aac2bfa5789cfc3136910"
+    10: "ffcb59862972b15a67c5951e9f3b94ce5b8b50345e6aac2bfa5789cfc3136910",
+    11: "ceb2a932d4c2761a5045ff35032e0b45130a0b5034547ff37579c72c9ce3594e",
+    12: "10f71724484c84af12aa3eb90db44bf6acbf71fcf8ddff5b6361c1190ba16528"
   }
 };
 var sha256 = (value) => createHash2("sha256").update(value, "utf8").digest("hex");
@@ -10705,7 +10784,7 @@ function styleEdits(before, after) {
 // package.json
 var package_default = {
   name: "@bettercms-ai/convert",
-  version: "0.23.0",
+  version: "0.24.1",
   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: {