@glw907/cairn-cms 0.54.0 → 0.56.0

package/src/lib/sveltekit/content-routes.ts

@@ -6,6 +6,8 @@ import { redirect, error, fail } from '@sveltejs/kit';
 import { findConcept } from '../content/concepts.js';
 import { extractCairnLinks, formatCairnToken, rewriteCairnLink } from '../content/links.js';
 import { frontmatterFromForm, parseMarkdown, dateInputValue, serializeMarkdown } from '../content/frontmatter.js';
+import { deriveExcerpt } from '../content/excerpt.js';
+import { asString } from '../content/identity.js';
 import { isValidId, slugify, filenameFromId, composeDatedId, slugFromId, renameId } from '../content/ids.js';
 import { appCredentials, type GithubKeyEnv } from '../github/credentials.js';
 import { listMarkdown, readRaw, commitFiles, type FileChange } from '../github/repo.js';
@@ -56,12 +58,18 @@ export interface EntrySummary {
   draft: boolean;
   /** Publish state derived from the ref set: live as-is, live with pending edits, or branch-only. */
   status: 'published' | 'edited' | 'new';
+  /** The row's one-line summary: the manifest's indexed excerpt for a published row, the branch
+   *  frontmatter/body excerpt for a pending one, and null when neither yields text. */
+  summary: string | null;
 }
 
 /** The concept list view's data. */
 export interface ListData {
   conceptId: string;
   label: string;
+  /** The singular noun for the create affordances ("New post"); from the descriptor, which defaults
+   *  it to `label`. */
+  singular: string;
   /** Posts carry a date in the new-entry form; pages do not (concept routing, spec §7.2). */
   dated: boolean;
   entries: EntrySummary[];
@@ -251,13 +259,16 @@ export function createContentRoutes(runtime: CairnRuntime, deps: ContentRoutesDe
   ): Promise<EntrySummary> {
     try {
       const raw = await readRaw(repo, file.path, token);
-      if (raw === null) return { id: file.id, title: file.id, date: null, draft: false, status };
-      const { frontmatter } = parseMarkdown(raw);
+      if (raw === null) return { id: file.id, title: file.id, date: null, draft: false, status, summary: null };
+      const { frontmatter, body } = parseMarkdown(raw);
       const title = typeof frontmatter.title === 'string' && frontmatter.title.trim() ? frontmatter.title : file.id;
       const date = dateInputValue(frontmatter.date) || null;
-      return { id: file.id, title, date, draft: frontmatter.draft === true, status };
+      // Normalize an empty excerpt to null, so a pending row matches EntrySummary's `string | null`
+      // contract (the published builder already coalesces with `?? null`).
+      const summary = deriveExcerpt(body, { description: asString(frontmatter.description) }) || null;
+      return { id: file.id, title, date, draft: frontmatter.draft === true, status, summary };
     } catch {
-      return { id: file.id, title: file.id, date: null, draft: false, status };
+      return { id: file.id, title: file.id, date: null, draft: false, status, summary: null };
     }
   }
 
@@ -298,7 +309,7 @@ export function createContentRoutes(runtime: CairnRuntime, deps: ContentRoutesDe
     const formError = event.url.searchParams.get('error');
     const publishedAllRaw = event.url.searchParams.get('publishedAll');
     const publishedAll = publishedAllRaw !== null && /^\d+$/.test(publishedAllRaw) ? Number(publishedAllRaw) : null;
-    const base = { conceptId: concept.id, label: concept.label, dated: concept.routing.dated, formError, publishedAll };
+    const base = { conceptId: concept.id, label: concept.label, singular: concept.singular, dated: concept.routing.dated, formError, publishedAll };
     let token: string;
     try {
       token = await mintToken(event.platform?.env ?? {});
@@ -329,7 +340,7 @@ export function createContentRoutes(runtime: CairnRuntime, deps: ContentRoutesDe
         rows.map((e) =>
           pendingIds.has(e.id)
             ? pendingRow(concept, e.id, 'edited', token)
-            : { id: e.id, title: e.title, date: e.date ?? null, draft: e.draft, status: 'published' as const },
+            : { id: e.id, title: e.title, date: e.date ?? null, draft: e.draft, status: 'published' as const, summary: e.summary ?? null },
         ),
       );
       const listed = new Set(rows.map((e) => e.id));

package/src/lib/sveltekit/index.ts

@@ -25,3 +25,5 @@ export { healthLoad, type HealthData } from './health.js';
 export type { RequestContext, CookieJar, HandleInput } from './types.js';
 // Re-exported here, not from root, so the public ContentRoutesDeps consumer can name it.
 export type { GithubKeyEnv } from '../github/credentials.js';
+// Re-exported here, not just from root, so the app.d.ts Platform block can name it.
+export type { AuthEnv } from '../auth/types.js';

package/src/lib/vite/index.ts

@@ -8,6 +8,7 @@
 import type { Plugin, PluginOption } from 'vite';
 import { writeFile, mkdir } from 'node:fs/promises';
 import { dirname, join } from 'node:path';
+import { resolveViteRoot } from './resolve-root.js';
 
 /** The key the cairnManifest plugin stashes its options under, so the write path can read them off the
  *  plugin instance in the consumer's loaded config without re-parsing the config file. */
@@ -152,10 +153,12 @@ export function cairnManifest(opts: CairnManifestOptions): Plugin {
 }
 
 /** Regenerate the committed manifest from the consumer's corpus and write it to the configured
- *  manifestPath. It loads the consumer's Vite config from `cwd`, reads the cairnManifest plugin's
- *  options off the instance, evaluates the write-mode virtual module through the build's own
- *  resolution, and writes the serialized manifest. The cairn-manifest bin calls this; it is exported
- *  so the write logic is testable apart from the CLI shell. */
+ *  manifestPath. It searches for the consumer's Vite config from `cwd`, derives the authoritative
+ *  Vite root from the loaded config (so a configured `root` or a non-root cwd resolves correctly),
+ *  reads the cairnManifest plugin's options off the instance, evaluates the write-mode virtual
+ *  module through the build's own resolution, and writes the serialized manifest under the Vite
+ *  root. The cairn-manifest bin calls this; it is exported so the write logic is testable apart
+ *  from the CLI shell. */
 export async function writeManifest(cwd: string = process.cwd()): Promise<void> {
   const { loadConfigFromFile } = await import('vite');
   const loaded = await loadConfigFromFile({ command: 'build', mode: 'production' }, undefined, cwd);
@@ -168,11 +171,12 @@ export async function writeManifest(cwd: string = process.cwd()): Promise<void>
       'cairn-manifest: the Vite config has no cairnManifest() plugin. Add it so the bin shares the build options.',
     );
   }
-  const serialized = await buildManifestFromVite(opts, cwd);
+  const root = resolveViteRoot(loaded, cwd);
+  const serialized = await buildManifestFromVite(opts, root);
   const manifestPath = opts.manifestPath ?? DEFAULT_MANIFEST_PATH;
   // The manifest path is app-root-absolute (a leading slash relative to the project), so resolve it
-  // against cwd, not the filesystem root.
-  const outPath = join(cwd, manifestPath.replace(/^\//, ''));
+  // against the Vite root, not the filesystem root or the config-search cwd.
+  const outPath = join(root, manifestPath.replace(/^\//, ''));
   await mkdir(dirname(outPath), { recursive: true });
   await writeFile(outPath, serialized);
 }

package/src/lib/vite/resolve-root.ts

@@ -0,0 +1,24 @@
+// The manifest bin's root derivation, split out so it is unit-testable without widening the public
+// /vite surface (only src/lib/vite/index.ts is the package subpath; this sibling is internal).
+import { dirname, isAbsolute, resolve } from 'node:path';
+
+/** The shape of `loadConfigFromFile`'s result that the root derivation reads: the config file's own
+ *  path and its `root` field. Typed structurally so the helper is testable without a real load. */
+export interface LoadedViteConfig {
+  /** The resolved path of the config file Vite loaded. */
+  path: string;
+  /** The user config, of which only `root` is read here. */
+  config: { root?: string };
+}
+
+/** The authoritative Vite root for the manifest bin, derived from the loaded config the way Vite
+ *  resolves a relative `root`: against the config file's own directory, not cwd. An absolute `root`
+ *  stands as given, and no `root` falls back to `cwd` (the directory the bin was run from). This
+ *  separates the config-search dir (cwd) from the Vite root, so a non-root cwd or a config that
+ *  sets `root` reads and writes the manifest under the real app root. */
+export function resolveViteRoot(loaded: LoadedViteConfig, cwd: string): string {
+  const root = loaded.config.root;
+  if (!root) return cwd;
+  if (isAbsolute(root)) return root;
+  return resolve(dirname(loaded.path), root);
+}