create-astroid 0.11.0 → 0.12.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-astroid",
-  "version": "0.11.0",
+  "version": "0.12.0",
   "description": "Scaffold a new Astroid site — an editable, multi-editor Astro app on Cloudflare Workers — in one command.",
   "keywords": [
     "astro",
@@ -34,7 +34,7 @@
   "dependencies": {
     "@better-auth/passkey": "^1.7.2",
     "@louise-toolkit/astro": "^0.6.0",
-    "astroidjs": "0.20.0",
+    "astroidjs": "0.21.0",
     "better-auth": "^1.7.2",
     "louise-toolkit": "^0.37.0"
   },

package/template/src/lib/pages.ts

@@ -2,7 +2,12 @@
 // both call this, so every page renders the same way: a visitor sees the live
 // row, and an editor in edit mode sees the latest pending draft laid over it, so
 // in-progress edits resume across reloads.
+import { astroidPageDraft } from "astroidjs/pages";
 import { isPageLive } from "louise-toolkit/content";
+import astroidConfig from "../../astroid.config.js";
+
+/** The bindings a page read uses: the database, and the draft buffer. */
+type PageEnv = Pick<CloudflareEnv, "DB" | "DRAFTS">;
 
 /** The columns a page render reads. */
 export interface PageRow {
@@ -58,13 +63,13 @@ function parseSections(raw: unknown): unknown[] {
  * `redirectFor` then answers a renamed page's old URL with a redirect.
  */
 export async function readPage(
-  db: D1Database,
+  env: PageEnv,
   slug: string,
   { editMode, requireLive = true }: ReadPageOptions,
 ): Promise<RenderedPage | null> {
   let row: PageRow | null = null;
   try {
-    row = await db
+    row = await env.DB
       .prepare(
         "SELECT id, slug, title, body, sections, status, seo_title, seo_description, og_image, noindex FROM pages WHERE slug = ?",
       )
@@ -86,30 +91,19 @@ export async function readPage(
   };
   if (!editMode) return page;
 
-  // The latest PENDING draft: newer than every version ever published. An
-  // older draft is superseded, since a publish already moved past it, so it
-  // must not come back just because it's the newest row marked `draft`.
+  // The editor's work-in-progress: the DRAFTS buffer first, since every save
+  // writes through it and reaches D1 only when it flushes, then the newest
+  // pending draft in D1. Reading D1 alone showed an editor who reloaded before
+  // the flush an older page than the one they had just saved.
   try {
-    const draft = await db
-      .prepare(
-        "SELECT version_data FROM pages_versions WHERE parent_id = ?1 AND status = 'draft'" +
-          " AND id > COALESCE((SELECT MAX(id) FROM pages_versions WHERE parent_id = ?1 AND status = 'published'), 0)" +
-          " ORDER BY id DESC LIMIT 1",
-      )
-      .bind(row.id)
-      .first<{ version_data: string }>();
-    if (draft?.version_data) {
-      const d = JSON.parse(draft.version_data) as {
-        title?: unknown;
-        body?: unknown;
-        sections?: unknown;
-      };
-      if (typeof d.title === "string") page.title = d.title;
-      if (typeof d.body === "string") page.body = d.body;
+    const draft = await astroidPageDraft(astroidConfig, env, row.id);
+    if (draft) {
+      if (typeof draft.title === "string") page.title = draft.title;
+      if (typeof draft.body === "string") page.body = draft.body;
       // Sections stage as drafts like any other field, so edit mode renders the
       // draft's array; otherwise section edits would vanish on reload while
       // title edits survive.
-      if (d.sections !== undefined) page.sections = parseSections(d.sections);
+      if (draft.sections !== undefined) page.sections = parseSections(draft.sections);
     }
   } catch {
     // Non-fatal: fall back to the live row.

package/template/src/pages/[...slug].astro

@@ -25,7 +25,7 @@ const slug = Astro.params.slug ?? "";
 // `home` is served at "/", never at "/home".
 if (slug === "home") return Astro.redirect("/", 301);
 
-const page = slug ? await readPage(env.DB, slug, { editMode }) : null;
+const page = slug ? await readPage(env, slug, { editMode }) : null;
 
 // Edge caching (ADR 0004), gated exactly as on the home page: never in edit
 // mode, only when ASTROID_EDGE_CACHE is "true", and never for a 404, so a page

package/template/src/pages/index.astro

@@ -42,7 +42,7 @@ if (editMode || env.ASTROID_EDGE_CACHE !== "true") {
 // `requireLive: false`: an unpublished home keeps rendering rather than turning
 // the site's front door into a 404. Every other page is visitor-visible only
 // while it's live (src/pages/[...slug].astro).
-const page = await readPage(env.DB, "home", { editMode, requireLive: false });
+const page = await readPage(env, "home", { editMode, requireLive: false });
 const title = page?.title ?? "__BRAND_NAME__";
 const sections = page?.sections ?? [];
 ---