@bettercms-ai/convert 0.25.1 → 0.26.1

package/dist/index.d.ts

@@ -957,7 +957,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 = 13;
+declare const HELPER_VERSION = 14;
 /** 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. */
@@ -1203,6 +1203,8 @@ interface ImageTarget {
     /** The brief's `original` — the BUILT url. */
     original: string;
     slug: string;
+    /** The file already declares this path: only a missing READ is added, and nothing is refused. */
+    declared?: boolean;
 }
 interface ImageSplice {
     start: number;

package/dist/index.js

@@ -4086,6 +4086,13 @@ var IMAGE_EXTENSIONS = [".jpg", ".jpeg", ".png", ".webp", ".avif", ".gif", ".svg
 var ASSET_COMPONENTS = /* @__PURE__ */ new Set(["Image", "Picture"]);
 var ASSET_MODULE = "astro:assets";
 function baseName(url) {
+  const inner = /[?&](?:href|url)=([^&#]+)/.exec(url)?.[1];
+  if (inner) {
+    try {
+      url = decodeURIComponent(inner);
+    } catch {
+    }
+  }
   const file = url.split(/[?#]/)[0].split("/").pop() ?? "";
   const base = file.split(".")[0] ?? "";
   return base === "" ? null : base.toLowerCase();
@@ -4111,6 +4118,29 @@ function passedTo(content, parsed, binding) {
   for (const root of parsed.roots) visit(root);
   return out;
 }
+function declaredAt(content, parsed, binding, path) {
+  const out = [];
+  const names = [`"${path}"`, `'${path}'`];
+  const visit = (node) => {
+    if (node.type === "expr") {
+      for (const child of node.children) visit(child);
+      return;
+    }
+    if (node.type !== "element" || node.raw) return;
+    const bindings = node.attrs.find((a) => a.name === "bcmsBindings");
+    const declared = bindings?.expressionRange ? content.slice(bindings.expressionRange.start, bindings.expressionRange.end) : "";
+    if (/^[A-Z]/.test(node.tag) && !ASSET_COMPONENTS.has(node.tag) && names.some((name) => declared.includes(name))) {
+      for (const attr of node.attrs) {
+        if (!attr.expressionRange) continue;
+        const inner = content.slice(attr.expressionRange.start, attr.expressionRange.end).replace(/^\{|\}$/g, "").trim();
+        if (inner === binding) out.push({ node, prop: attr.name, attr });
+      }
+    }
+    for (const child of node.children) visit(child);
+  };
+  for (const root of parsed.roots) visit(root);
+  return out;
+}
 function assetCandidates(parsed, dialect, original) {
   const wanted = baseName(original);
   if (wanted === null || parsed.error) return [];
@@ -4158,6 +4188,18 @@ async function bindImages(ctx, targets) {
     const rendered = binding === null ? [] : renderedBy(ctx.content, ctx.parsed, ctx.dialect, binding);
     const free = rendered.filter((hit2) => !claimed.has(hit2.node.attrInsertAt));
     const args = (b) => [ctx.snapshotName(target.slug), JSON.stringify(target.path), b, ...ctx.slug ? [ctx.slug] : []];
+    if (free.length === 0 && binding !== null) {
+      const declared = declaredAt(ctx.content, ctx.parsed, binding, target.path).filter((c) => !claimed.has(c.attr.range.start));
+      if (declared.length === 1) {
+        const call = declared[0];
+        claimed.add(call.attr.range.start);
+        out.splices.push({ start: call.attr.range.start, end: call.attr.range.end, text: rule.attr(call.prop, `${ctx.image}(${args(binding).join(", ")})`) });
+        out.slugs.push(target.slug);
+        out.bound.push(target.key);
+        continue;
+      }
+    }
+    if (target.declared) continue;
     if (free.length === 0 && binding !== null && ctx.drill) {
       const calls = passedTo(ctx.content, ctx.parsed, binding).filter((c) => !claimed.has(c.node.attrInsertAt));
       const call = calls.length === 1 ? calls[0] : null;
@@ -4199,7 +4241,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])
@@ -4273,11 +4315,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 {
@@ -4285,9 +4327,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 };
@@ -4301,13 +4340,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.
   }
@@ -4319,7 +4375,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;
 }
 
@@ -4333,7 +4392,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;
 }
 
 /**
@@ -4410,13 +4472,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;
 }
 
 /**
@@ -4749,7 +4822,8 @@ var HISTORICAL = {
     9: "d6441db2ff4578c3c5d4b7d461f3374b89247ef6ba9e0d535791e840d803e4f3",
     10: "ffcb59862972b15a67c5951e9f3b94ce5b8b50345e6aac2bfa5789cfc3136910",
     11: "ceb2a932d4c2761a5045ff35032e0b45130a0b5034547ff37579c72c9ce3594e",
-    12: "10f71724484c84af12aa3eb90db44bf6acbf71fcf8ddff5b6361c1190ba16528"
+    12: "10f71724484c84af12aa3eb90db44bf6acbf71fcf8ddff5b6361c1190ba16528",
+    13: "cd8bdd74dbc944f2331503bdf8e995cb7f74f0d5b307d08aee4690e1695ae798"
   },
   "src/lib/bcms-content.ts": {
     1: "ae72ae14d706943d481c880d70da5789b4816ba1ba319a10fbc63ded4d0b42f2",
@@ -4763,7 +4837,8 @@ var HISTORICAL = {
     9: "eee9fb1635ae7d6f8f33676a1f390600ca24a62ee992775252273c73a011c494",
     10: "35bb7c0e30f5c41fe68e52259ec4764de6de2734064fa0e1521f3338eef0a09e",
     11: "818784f2088150d64d91b42eac944dc9503f104d32a0e7a18c753d2982a5adc0",
-    12: "79dafc525a541feae55ada5dbe2ea966cac82acd741a4b41d61fe9e0cdfaa208"
+    12: "79dafc525a541feae55ada5dbe2ea966cac82acd741a4b41d61fe9e0cdfaa208",
+    13: "06ee70c9f0bb25e03f3930d2250da8dae172ade457f27ebba20382b6482ad3f4"
   },
   "composables/bcms-content.ts": {
     1: "c272412532efed7db64b6cf313b2bed4291f9951430412289c8a588b7f565407",
@@ -4777,7 +4852,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");
@@ -10175,10 +10251,13 @@ async function convertSources(briefIn, sources, options) {
 async function convertFile(file, content, targets, parsed, declared, llmFallback, drill) {
   const outcomes = /* @__PURE__ */ new Map();
   const pendingTargets = [];
+  let unreadImages = false;
   const dialect = dialectOf(file, content);
   for (const target of targets) {
     if (parsed && dialect && convertedHere(content, parsed, dialect, target, file)) {
       outcomes.set(target.key, "declared");
+      if (target.kind === "image" && !content.includes("bcmsImage(")) unreadImages = true;
+      else if (target.kind === "image" && !new RegExp(`bcmsImage\\([^)]*["']${target.path.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")}["']`).test(content)) unreadImages = true;
     } else pendingTargets.push(target);
   }
   const empty = {
@@ -10193,7 +10272,7 @@ async function convertFile(file, content, targets, parsed, declared, llmFallback
     snapshots: [],
     notes: []
   };
-  if (pendingTargets.length === 0) return empty;
+  if (pendingTargets.length === 0 && !unreadImages) return empty;
   if (!dialect) {
     if (isTolerantDialect(file)) {
       const already = declaredByScan(content);
@@ -10394,15 +10473,15 @@ async function plan(file, content, dialect, targets, sites, importAt, outcomes,
         continue;
       }
       const declares = (d) => d.scope === target.scope && (d.path === target.path || d.path === shapeOfPath(target.path));
-      const declaredAt = new Set(declarations.filter(declares).map((d) => d.at));
+      const declaredAt2 = new Set(declarations.filter(declares).map((d) => d.at));
       const claimedAt = new Set(declarations.filter((d) => !declares(d) && d.via === "field").map((d) => d.at));
       const writesField = (site) => site.where !== "attr" || target.kind === "image";
       const fresh = eligible.filter(
-        (site) => !declaredAt.has(site.attrInsertAt) && !(writesField(site) && claimedAt.has(site.attrInsertAt))
+        (site) => !declaredAt2.has(site.attrInsertAt) && !(writesField(site) && claimedAt.has(site.attrInsertAt))
       );
       located += eligible.length;
       const blocked = eligible.filter(
-        (site) => !declaredAt.has(site.attrInsertAt) && writesField(site) && claimedAt.has(site.attrInsertAt)
+        (site) => !declaredAt2.has(site.attrInsertAt) && writesField(site) && claimedAt.has(site.attrInsertAt)
       );
       if (blocked.length > 0) {
         outcomes.set(target.key, "AMBIGUOUS_LITERAL");
@@ -10411,7 +10490,7 @@ async function plan(file, content, dialect, targets, sites, importAt, outcomes,
       if (fresh.length === 0) {
         outcomes.set(
           target.key,
-          eligible.some((site) => declaredAt.has(site.attrInsertAt)) ? "declared" : "AMBIGUOUS_LITERAL"
+          eligible.some((site) => declaredAt2.has(site.attrInsertAt)) ? "declared" : "AMBIGUOUS_LITERAL"
         );
         continue;
       }
@@ -10597,8 +10676,8 @@ async function plan(file, content, dialect, targets, sites, importAt, outcomes,
     },
     targets.filter((t) => {
       const outcome = outcomes.get(t.key);
-      return t.kind === "image" && t.scope === "page" && (outcome === void 0 || UNPLACED.has(outcome));
-    }).map((t) => ({ key: t.key, path: t.path, kind: t.kind, original: t.fallback, slug: t.slug }))
+      return t.kind === "image" && t.scope === "page" && (outcome === void 0 || outcome === "declared" || UNPLACED.has(outcome));
+    }).map((t) => ({ key: t.key, path: t.path, kind: t.kind, original: t.fallback, slug: t.slug, declared: outcomes.get(t.key) === "declared" }))
   );
   for (const key of images.bound) outcomes.set(key, "rewritten");
   for (const refusal of images.refused) outcomes.set(refusal.key, refusal.reason);