@glw907/cairn-cms 0.7.0 → 0.9.0

package/src/lib/index.ts

@@ -23,6 +23,7 @@ export type {
   AssetConfig,
   RoutingRule,
   ConceptDescriptor,
+  ConceptUrlPolicy,
   CairnExtension,
   CairnRuntime,
   AdminPanel,
@@ -37,7 +38,15 @@ export {
   parseMarkdown,
 } from './content/frontmatter.js';
 export { validateFields } from './content/validate.js';
-export { isValidId, idFromFilename, filenameFromId, slugify } from './content/ids.js';
+export {
+  isValidId,
+  idFromFilename,
+  filenameFromId,
+  slugify,
+  slugFromId,
+  composeDatedId,
+} from './content/ids.js';
+export type { DatePrefix } from './content/ids.js';
 // Render engine (Plan 04): generic directive pipeline; sites own the component registry.
 export { defineRegistry } from './render/registry.js';
 export type { ComponentDef, ComponentRegistry } from './render/registry.js';
@@ -76,6 +85,7 @@ export type { GithubKeyEnv } from './github/credentials.js';
 // Nav tree and site-config helpers (Plan 06).
 export {
   parseSiteConfig,
+  urlPolicyFrom,
   extractMenu,
   setMenu,
   validateNavTree,
@@ -96,6 +106,8 @@ export type {
   ContentEntry,
   ContentIndex,
 } from './delivery/content-index.js';
+export { createSiteIndex } from './delivery/site-index.js';
+export type { SiteIndex, ConceptIndex } from './delivery/site-index.js';
 export { deriveExcerpt, wordCount } from './delivery/excerpt.js';
 export { buildRssFeed, buildJsonFeed } from './delivery/feeds.js';
 export type { FeedChannel, FeedItem } from './delivery/feeds.js';

package/src/lib/nav/site-config.ts

@@ -3,6 +3,7 @@
 // commits the file back through the GitHub-App pipeline. This module is pure: parse, validate, and
 // rewrite only. The engine returns data; each site renders the tree with its own markup.
 import { parse as parseYaml, parseDocument } from 'yaml';
+import type { ConceptUrlPolicy } from '../content/types.js';
 
 /** One navigation node. An omitted or empty `url` is a label-only grouping header; no `children` is a leaf. */
 export interface NavNode {
@@ -78,6 +79,8 @@ export interface SiteConfig {
   locale?: string;
   /** Named navigation menus, each a NavNode[] (normalized by extractMenu). */
   menus?: Record<string, unknown>;
+  /** Per-concept URL policy: the permalink pattern and date-prefix granularity, keyed by concept id. */
+  content?: Record<string, ConceptUrlPolicy>;
   [key: string]: unknown;
 }
 
@@ -108,6 +111,11 @@ export function extractMenu(config: SiteConfig, name: string, maxDepth: number):
   return validateNavTree(menu, maxDepth);
 }
 
+/** The per-concept URL policy from a parsed config, or an empty policy when the `content` key is absent. */
+export function urlPolicyFrom(config: SiteConfig): Record<string, ConceptUrlPolicy> {
+  return config.content ?? {};
+}
+
 /**
  * Replace one named menu in the YAML site-config text and reserialize, preserving every other
  * top-level key (siteName, other menus, settings). Parses into a Document so the rest of the file

package/src/lib/render/pipeline.ts

@@ -19,7 +19,7 @@ export interface RendererOptions {
 
 /** Compose a site's render pipeline from its component registry: directive syntax to
  *  stamped markers to registry-built hast. Returns `renderMarkdown` plus the remark/
- *  rehype plugin arrays (so the Carta editor preview can reuse the exact same set). */
+ *  rehype plugin arrays (so the admin editor preview can reuse the exact same set). */
 export function createRenderer(registry: ComponentRegistry, options: RendererOptions = {}) {
   const remarkPlugins: PluggableList = [remarkDirective, [remarkDirectiveStamp, registry]];
   const rehypePlugins: PluggableList = [rehypeRaw, [rehypeDispatch, registry, options.stagger], rehypeSlug];

package/src/lib/render/sanitize.ts

@@ -1,5 +1,5 @@
-// The live preview's sanitize floor. Carta runs with `sanitizer: false` behind the MarkdownEditor
-// seam, so the admin preview pane is the one barrier between editor-authored markdown and the DOM.
+// The live preview's sanitize floor. The MarkdownEditor edits raw markdown and never sanitizes,
+// so the admin preview pane is the one barrier between editor-authored markdown and the DOM.
 // DOMPurify needs a DOM, and the preview renders only in the browser after mount, so DOMPurify
 // loads through a dynamic import: the module never evaluates a DOM library on the Worker, and a
 // server import of this file pulls in nothing.

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

@@ -5,7 +5,7 @@
 import { redirect, error } from '@sveltejs/kit';
 import { findConcept } from '../content/concepts.js';
 import { frontmatterFromForm, parseMarkdown, dateInputValue, serializeMarkdown } from '../content/frontmatter.js';
-import { isValidId, slugify, filenameFromId } from '../content/ids.js';
+import { isValidId, slugify, filenameFromId, composeDatedId } from '../content/ids.js';
 import { appCredentials, type GithubKeyEnv } from '../github/credentials.js';
 import { listMarkdown, readRaw, commitFile } from '../github/repo.js';
 import { installationToken } from '../github/signing.js';
@@ -153,22 +153,32 @@ export function createContentRoutes(runtime: CairnRuntime, deps: ContentRoutesDe
     }
   }
 
-  /** Create a new entry: validate the slug, refuse to clobber, and redirect to the editor. */
+  /** Create a new entry: validate the slug, compose a dated id when the concept is dated, refuse to clobber. */
   async function createAction(event: ContentEvent): Promise<never> {
     sessionOf(event);
     const concept = conceptOf(runtime, event.params);
     const form = await event.request.formData();
-    const raw = String(form.get('slug') ?? '').trim() || slugify(String(form.get('title') ?? ''));
+    const slug = String(form.get('slug') ?? '').trim() || slugify(String(form.get('title') ?? ''));
+    const date = String(form.get('date') ?? '').trim();
     const bounce = (msg: string): never => {
       throw redirect(303, `/admin/${concept.id}?error=${encodeURIComponent(msg)}`);
     };
-    if (!isValidId(raw)) bounce('Enter a valid slug: lowercase letters, numbers, and hyphens.');
+    if (!isValidId(slug)) return bounce('Enter a valid slug: lowercase letters, numbers, and hyphens.');
+
+    let id = slug;
+    if (concept.routing.dated) {
+      if (!/^\d{4}-\d{2}-\d{2}$/.test(date)) return bounce('Pick a date for this entry.');
+      if (/^\d{4}-/.test(slug)) {
+        return bounce('Leave the date out of the slug; set it in the date field.');
+      }
+      id = composeDatedId(date, slug, concept.datePrefix);
+    }
 
     const token = await mintToken(event.platform?.env ?? {});
-    const existing = await readRaw(runtime.backend, `${concept.dir}/${filenameFromId(raw)}`, token);
-    if (existing !== null) bounce('An entry with that slug already exists.');
+    const existing = await readRaw(runtime.backend, `${concept.dir}/${filenameFromId(id)}`, token);
+    if (existing !== null) return bounce('An entry with that slug already exists.');
 
-    throw redirect(303, `/admin/${concept.id}/${raw}?new=1`);
+    throw redirect(303, `/admin/${concept.id}/${id}?new=1`);
   }
 
   /** Coerce parsed frontmatter to the form-ready values the editor inputs expect. */

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

@@ -1,13 +1,15 @@
-// cairn-cms: public route loaders (public-delivery design, decision 6). A factory closes over
-// a concept's index, the runtime render, and the origin, and returns thin load functions plus
-// entries() for prerender. A site route file stays a one-line shim. The index is built in site
-// code from a glob, so it stays in the prerender graph and out of the runtime Worker.
+// cairn-cms: public route loaders (dated-slug design). The factory closes over the site-level
+// index, the runtime render, and the origin. entryLoad and entries are site-wide: one catch-all
+// `[...path]` route resolves any concept by request path through `byPermalink`. The archive, tag,
+// and tag-index loaders stay concept-scoped, keyed by concept id. The index is built in site code
+// from globs, so it stays in the prerender graph and out of the runtime Worker.
 import { error } from '@sveltejs/kit';
-import type { ContentIndex, ContentSummary, ContentEntry } from '../delivery/content-index.js';
+import type { ContentSummary, ContentEntry } from '../delivery/content-index.js';
+import type { SiteIndex } from '../delivery/site-index.js';
 
 /** Injected dependencies for the public loaders. */
 export interface PublicRoutesDeps {
-  index: ContentIndex;
+  site: SiteIndex;
   render: (md: string, opts?: { stagger?: boolean }) => string | Promise<string>;
   origin: string;
 }
@@ -36,46 +38,46 @@ export interface EntryData {
   older?: ContentSummary;
 }
 
-/** Build the public loaders for one concept's index. */
+/** Build the public loaders for a site's unified index. */
 export function createPublicRoutes(deps: PublicRoutesDeps) {
-  const { index, render, origin } = deps;
+  const { site, render, origin } = deps;
 
-  /** The chronological archive: every non-draft summary, newest-first. */
-  function archiveLoad(): ListData {
-    return { entries: index.all() };
+  /** Resolve one concept's index by id, or a 404 (the route names an unconfigured concept). */
+  function indexOf(conceptId: string) {
+    const index = site.concept(conceptId);
+    if (!index) throw error(404, `Unknown content type: ${conceptId}`);
+    return index;
   }
 
-  /** All tags with counts, for a tag index page. */
-  function tagIndexLoad(): TagIndexData {
-    return { tags: index.allTags() };
+  /** One entry by request path, rendered through the site renderer, or a 404. */
+  async function entryLoad(event: { url: URL }): Promise<EntryData> {
+    const entry = site.byPermalink(event.url.pathname);
+    if (!entry) throw error(404, `Not found: ${event.url.pathname}`);
+    const { newer, older } = site.adjacent(entry);
+    return { entry, html: await render(entry.body, { stagger: true }), canonicalUrl: origin + entry.permalink, newer, older };
   }
 
-  /** One tag's entries, or a 404 when the tag has none. */
-  function tagLoad(event: { params: { tag: string } }): TagData {
-    const tag = event.params.tag;
-    const entries = index.byTag(tag);
-    if (entries.length === 0) throw error(404, `No entries tagged "${tag}"`);
-    return { tag, entries };
+  /** The chronological archive for one concept: every non-draft summary, newest-first. */
+  function archiveLoad(conceptId: string): ListData {
+    return { entries: indexOf(conceptId).all() };
   }
 
-  /** One entry by slug, rendered through the site renderer, or a 404. */
-  async function entryLoad(event: { params: { slug: string } }): Promise<EntryData> {
-    const entry = index.byId(event.params.slug);
-    if (!entry) throw error(404, `Not found: ${event.params.slug}`);
-    const { newer, older } = index.adjacent(entry.id);
-    return {
-      entry,
-      html: await render(entry.body, { stagger: true }),
-      canonicalUrl: origin + entry.permalink,
-      newer,
-      older,
-    };
+  /** All tags with counts for one concept, for a tag index page. */
+  function tagIndexLoad(conceptId: string): TagIndexData {
+    return { tags: indexOf(conceptId).allTags() };
   }
 
-  /** Prerender enumeration: one `{ slug }` per non-draft entry. */
-  function entries(): { slug: string }[] {
-    return index.all().map((entry) => ({ slug: entry.id }));
+  /** One tag's entries for one concept, or a 404 when the tag has none. */
+  function tagLoad(conceptId: string, event: { params: { tag: string } }): TagData {
+    const entries = indexOf(conceptId).byTag(event.params.tag);
+    if (entries.length === 0) throw error(404, `No entries tagged "${event.params.tag}"`);
+    return { tag: event.params.tag, entries };
   }
 
-  return { archiveLoad, tagIndexLoad, tagLoad, entryLoad, entries };
+  /** Prerender enumeration: one `{ path }` per entry across every concept. */
+  function entries(): { path: string }[] {
+    return site.entries();
+  }
+
+  return { entryLoad, archiveLoad, tagIndexLoad, tagLoad, entries };
 }