@pirateandfox/pagestack 0.1.0-beta.5 → 0.1.0-beta.6

package/README.md

@@ -293,7 +293,8 @@ editor response is `noindex` and `no-store`.
 
 | option | default | |
 |---|---|---|
-| `renderer` | required | Astro component rendering `{ page, editing }` |
+| `renderer` | required, unless `pages: false` | Astro component rendering `{ page, editing }` |
+| `pages` | `true` | `false` for a site with no block pages: only collections, globals and media |
 | `sections` | required | module exporting `{ schemas, presets }` |
 | `pagesDir` | `src/content/pages` | |
 | `imagesDir` / `uploadsDir` / `publicDir` | `public/images` / `public/images/uploads` / `public` | |

package/index.mjs

@@ -18,7 +18,8 @@ const route = (file) => new URL(`./src/routes/${file}`, import.meta.url);
 
 /**
  * @typedef {object} SectionEditorOptions
- * @property {string} renderer   Astro component rendering a page: props { page, editing }.
+ * @property {string} [renderer] Astro component rendering a page: props { page, editing }. Required unless `pages: false`.
+ * @property {boolean} [pages]   false for a site with no block pages: only collections, globals and media.
  * @property {string} sections   Module exporting { schemas, presets } (see runtime.ts types).
  * @property {string} [pagesDir='src/content/pages']  Directory of <slug>.json pages.
  * @property {string} [imagesDir='public/images']     Browsable image library root.
@@ -58,7 +59,8 @@ function staticRoutes(srcDir) {
 
 /** @param {SectionEditorOptions} userOptions */
 export default function sectionEditor(userOptions) {
-  if (!userOptions?.renderer || !userOptions?.sections) throw new Error('pagestack: `renderer` and `sections` are required');
+  if (!userOptions?.sections) throw new Error('pagestack: `sections` is required');
+  if (!userOptions.renderer && userOptions.pages !== false) throw new Error('pagestack: `renderer` is required unless `pages: false`');
   // When the site has no adapter of its own we bring @astrojs/node along and forward every
   // integration hook to it (an integration added via updateConfig() doesn't get to call
   // setAdapter() in time, so we proxy its hooks instead).
@@ -99,7 +101,7 @@ export default function sectionEditor(userOptions) {
         const root = fileURLToPath(config.root);
         const abs = (p) => path.isAbsolute(p) ? p : path.resolve(root, p);
         const reservedSlugs = [...new Set([...(options.reservedSlugs ?? []), ...staticRoutes(fileURLToPath(config.srcDir))])];
-        const serial = { ...options, reservedSlugs, root, renderer: abs(options.renderer), sections: abs(options.sections), command };
+        const serial = { ...options, reservedSlugs, root, renderer: options.renderer ? abs(options.renderer) : null, sections: abs(options.sections), command };
 
         updateConfig({
           vite: {
@@ -109,7 +111,7 @@ export default function sectionEditor(userOptions) {
               load(id) {
                 // The renderer (and the site layout/CSS behind it) is only imported by the preview
                 // route, so the editor shell doesn't drag the whole site's CSS into its page.
-                if (id === '\0' + VIRTUAL_RENDERER) return `export { default as Renderer } from ${JSON.stringify(serial.renderer)};`;
+                if (id === '\0' + VIRTUAL_RENDERER) return serial.renderer ? `export { default as Renderer } from ${JSON.stringify(serial.renderer)};` : 'export const Renderer = null;';
                 if (id !== '\0' + VIRTUAL) return;
                 return [
                   `export * as site from ${JSON.stringify(serial.sections)};`,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pirateandfox/pagestack",
-  "version": "0.1.0-beta.5",
+  "version": "0.1.0-beta.6",
   "description": "PageStack: visual section editor for Astro sites. Git-only, static public site, passkey login, saves are commits.",
   "license": "MIT",
   "type": "module",

package/src/client/collection.ts

@@ -5,7 +5,7 @@ import { confirmDialog, promptDialog, toast } from './ui';
 const boot = (window as any).__ASE_COLLECTION__ as { id: string; singular: string; slugs: string[]; reserved: string[] };
 const api = `/api/editor/collection/${boot.id}`;
 
-document.getElementById('ase-add-item')!.addEventListener('click', async () => {
+document.getElementById('ase-add-item')?.addEventListener('click', async () => {
   const title = await promptDialog({ title: `Add ${boot.singular}`, label: 'Title', submit: `Add ${boot.singular}` });
   if (!title) return;
   const slug = uniqueSlug(slugify(title) || boot.singular, [...boot.slugs, ...boot.reserved]);

package/src/routes/Nav.astro

@@ -5,7 +5,7 @@ const { current } = Astro.props as { current: string };
 const user = editorOf(Astro.locals);
 const firstGlobal = Object.keys(globals)[0];
 const links = [
-  { id: 'pages', label: 'Pages', href: '/edit' },
+  ...(opts.pages === false ? [] : [{ id: 'pages', label: 'Pages', href: '/edit' }]),
   ...Object.entries(collections).map(([id, c]) => ({ id: `collection-${id}`, label: c.label, href: `/edit/collection/${id}` })),
   { id: 'media', label: 'Media', href: '/edit/media' },
   ...(firstGlobal ? [{ id: 'settings', label: Object.keys(globals).length > 1 ? 'Site settings' : globals[firstGlobal].label, href: `/edit/global/${firstGlobal}` }] : []),

package/src/routes/api/collection.ts

@@ -39,6 +39,7 @@ export const GET: APIRoute = async ({ params }) => {
 export const POST: APIRoute = async ({ params, request, locals }) => {
   const c = find(params.id);
   if (!c || params.slug) return bad('no such collection', 404);
+  if (c.create === false) return bad('Items here cannot be added from the editor.', 405);
   const body = await request.json().catch(() => null);
   const title = plainText(String(body?.title ?? '')).trim();
   const slug = String(body?.slug ?? '').trim();
@@ -47,7 +48,10 @@ export const POST: APIRoute = async ({ params, request, locals }) => {
   const problem = SLUG.test(slug) ? slugProblem(slug, { existing, reserved: reservedSlugs() }) : 'Use letters, numbers and dashes in the URL.';
   if (problem) return bad(problem, 409);
   const data: Record<string, unknown> = { title };
-  for (const [k, f] of Object.entries(c.fields)) if (f.type === 'date') data[k] = new Date().toISOString().slice(0, f.time === false ? 10 : 19);
+  for (const [k, f] of Object.entries(c.fields)) if (f.default !== undefined && k !== 'title') data[k] = f.default;
+  // Only the first date is "today": others (modified, reviewed on) mean something else happened.
+  const dated = Object.entries(c.fields).find(([, f]) => f.type === 'date');
+  if (dated && data[dated[0]] === undefined) data[dated[0]] = new Date().toISOString().slice(0, dated[1].time === false ? 10 : 19);
   if (c.fields.draft?.type === 'boolean') data.draft = true;
   try {
     const result = await storage().commit({ message: commitMessage(`Add ${name(c)} ${slug}`, locals), files: [{ path: file(c, slug), content: writeMarkdown(null, data, '\n') }] });

package/src/routes/api/pages.ts

@@ -1,7 +1,7 @@
 // GET  /api/editor/pages   -> { pages }
 // POST /api/editor/pages   { title, slug, copyOf?, template? } -> creates a draft page.
 import type { APIRoute } from 'astro';
-import { bad, clean, commitMessage, json, listPages, pagePath, readPage, reservedSlugs, serializePage, storage, templates, validate } from '../../server/context';
+import { opts, bad, clean, commitMessage, json, listPages, pagePath, readPage, reservedSlugs, serializePage, storage, templates, validate } from '../../server/context';
 import { copyPage, newPage, slugProblem } from '../../core/pages';
 import type { PageDoc } from '../../runtime';
 export const prerender = false;
@@ -9,6 +9,7 @@ export const prerender = false;
 export const GET: APIRoute = async () => json({ pages: await listPages() });
 
 export const POST: APIRoute = async ({ request, locals }) => {
+  if (opts.pages === false) return bad('This site has no block pages.', 404);
   let body: any;
   try { body = await request.json(); } catch { return bad('invalid JSON'); }
   const title = String(body?.title ?? '').trim();

package/src/routes/edit-collection.astro

@@ -24,7 +24,7 @@ const boot = { id, singular, slugs: items.map((i) => i.slug), reserved: reserved
     <main class="ase-index__main">
       <header class="ase-index__head">
         <div><h1>{c.label} <span class="ase-muted">{items.length}</span></h1></div>
-        <button type="button" id="ase-add-item" class="ase-btn ase-btn--primary">Add {singular}</button>
+        {c.create !== false && <button type="button" id="ase-add-item" class="ase-btn ase-btn--primary">Add {singular}</button>}
       </header>
       <div class="ase-index__tools"><input type="search" id="ase-page-search" placeholder={`Search ${c.label.toLowerCase()}`} aria-label="Search" /></div>
       <ul class="ase-pagelist" id="ase-pagelist">

package/src/routes/edit-index.astro

@@ -1,9 +1,13 @@
 ---
 // /edit — the Pages screen: every page, with add, duplicate, delete and search.
-import { globals, listPages, opts, publicPath, reservedSlugs, templates } from '../server/context';
+import { collections, globals, listPages, opts, publicPath, reservedSlugs, templates } from '../server/context';
 import Nav from './Nav.astro';
 import '../client/shell.css';
 export const prerender = false;
+if (opts.pages === false) {
+  const first = Object.keys(collections)[0];
+  return Astro.redirect(first ? `/edit/collection/${first}` : '/edit/media');
+}
 const pages = await listPages();
 const boot = {
   pages: pages.map((p) => ({ slug: p.slug, title: p.title })),

package/src/routes/preview.astro

@@ -5,6 +5,7 @@
 // Preview button) renders the draft without edit mode, for a look at the finished page in a tab.
 import { Renderer } from 'virtual:pagestack/renderer';
 import { clean, readPage, validate } from '../server/context';
+if (!Renderer) return new Response('Not found', { status: 404 });
 const locals = Astro.locals;
 export const prerender = false;
 const slug = Astro.params.slug || 'index';

package/src/runtime.ts

@@ -101,6 +101,8 @@ export interface CollectionDoc {
   fields: Record<string, Field>;
   /** Site URL of an item, for "View" links. */
   url?: (slug: string) => string;
+  /** false hides Add, for a fixed set of items. Otherwise new items start from each field's `default`. */
+  create?: boolean;
 }
 
 /** A starting point offered by "Add page". */

package/src/server/context.ts

@@ -17,7 +17,7 @@ import type { SavedPattern } from '../core/insert';
 export { options, site };
 
 export interface EditorOptions {
-  root: string; renderer: string; sections: string; pagesDir: string; imagesDir: string; uploadsDir: string; publicDir: string; usersFile: string;
+  root: string; renderer: string | null; pages?: boolean; sections: string; pagesDir: string; imagesDir: string; uploadsDir: string; publicDir: string; usersFile: string;
   auth: 'none' | 'passkey' | 'none-behind-proxy'; storage: 'local' | 'github'; github: { repo: string; branch?: string; pullRequest?: boolean } | null;
   siteName: string; secretEnv: string; command: string; interactiveSelector: string;
   reservedSlugs: string[]; redirectsFile: string; patternsFile: string;

package/src/server/middleware.ts

@@ -47,6 +47,7 @@ function harden(res: Response, url: URL, sandbox: boolean): Response {
 let warned = false;
 
 export const onRequest = defineMiddleware(async (ctx, next) => {
+  if (ctx.isPrerendered) return next(); // public pages, which never carry a session
   const { pathname } = ctx.url;
   const { request } = ctx;
   const isEditor = pathname === '/edit' || pathname.startsWith('/edit/') || pathname.startsWith('/api/editor/');