@glw907/cairn-cms 0.26.0 → 0.29.0

package/CHANGELOG.md

@@ -2,6 +2,55 @@
 
 All notable changes to this project are recorded here, most recent first.
 
+## 0.29.0
+
+Consolidated the URL-identity model. A content entry's id, slug, date, and permalink are now derived in
+one place (`entryIdentity`), so the content index and the manifest cannot drift on an entry's URL, and a
+site's concept descriptors are resolved through one path shared by the admin runtime and the delivery
+layer. No public surface changed.
+
+The YAML URL policy is now validated at build. A permalink pattern must be root-relative and use only the
+tokens `:slug`, `:year`, `:month`, and `:day`, a date token is valid only on a dated concept, a
+`datePrefix` must be `year`, `month`, or `day`, and a policy keyed to an undeclared concept fails the
+build.
+
+Behavior note: a site whose `content:` URL policy was malformed and silently defaulted will now fail the
+build with a named error. A valid policy is unaffected.
+
+## 0.28.0
+
+### Security
+Closed the render attribute-sink residual by construction. A new post-dispatch guard runs last in
+`createRenderer` and neutralizes the sinks a component `build()` could route a raw author attribute
+value into, including the unsafe URL schemes `javascript:`, `data:`, and `vbscript:` in `href`,
+`src`, `srcset`, `xlink:href`, `poster`, `formaction`, `action`, `object`'s `data`, and
+`background`, the inline `on*` event handlers, and inline `style`, which is stripped wholesale. Safe
+schemes, relative URLs, anchors, and the `cairn:` token are preserved. The guard is gated by the
+existing `unsafeDisableSanitize` switch.
+
+Behavior note: a site whose component `build()` emits a non-standard URL scheme, an `on*` handler,
+or inline `style` will see that output neutralized. Route dynamic styling through a class or an
+inert `data-*` attribute instead.
+
+## 0.27.0
+
+### Changed (breaking)
+Narrowed the public export surface so each symbol has one canonical home. The `.` root and
+`/sveltekit` no longer re-export another subpath's symbols, and the internal GitHub, signing, and
+hast helpers left the public API. No symbol changed behavior; only where it exports from.
+
+- Consumers must: import the delivery read helpers (`createContentIndex`, `createSiteIndexes`, the
+  feed, sitemap, robots, SEO, and pagination builders, `permalink`) from `@glw907/cairn-cms/delivery/data`
+  instead of the `.` root.
+- Consumers must: import the public route loaders and the `*Response` helpers (`createPublicRoutes`,
+  `rssResponse`, `jsonFeedResponse`, `sitemapResponse`, `robotsResponse`) and the public route types
+  (`PublicRoutesDeps`, the public `ListData`, `TagData`, `TagIndexData`, `EntryData`) from
+  `@glw907/cairn-cms/delivery` instead of the `.` root or `/sveltekit`.
+- Consumers must: stop importing the internal helpers that left the public API (`appJwt`,
+  `installationToken`, `signingSelfTest`, `appCredentials`, `treeUrl`, `contentsUrl`, `readRaw`,
+  `fileSha`, `listMarkdown`, `markdownFilesIn`, `commitFile`, `isElement`, `strProp`, `markFirstList`);
+  the engine wires GitHub token minting and the render pipeline internally, so no consumer needs them.
+
 ## 0.26.0
 
 ### Added

package/dist/auth/crypto.d.ts

@@ -16,4 +16,3 @@ export declare function generateToken(): string;
 export declare function generateSessionId(): string;
 /** The lowercase hex SHA-256 of a token, for storage and lookup. */
 export declare function hashToken(token: string): Promise<string>;
-//# sourceMappingURL=crypto.d.ts.map

package/dist/auth/store.d.ts

@@ -40,4 +40,3 @@ export declare function setEditorRole(db: D1Database, email: string, role: Role)
  * `removeOwnerIfNotLast`). Returns false (and writes nothing) when this is the last owner.
  */
 export declare function demoteOwnerIfNotLast(db: D1Database, email: string): Promise<boolean>;
-//# sourceMappingURL=store.d.ts.map

package/dist/auth/types.d.ts

@@ -22,4 +22,3 @@ export interface AuthEnv {
         }): Promise<void>;
     };
 }
-//# sourceMappingURL=types.d.ts.map

package/dist/components/AdminLayout.svelte.d.ts

@@ -16,4 +16,3 @@ interface Props {
 declare const AdminLayout: import("svelte").Component<Props, {}, "">;
 type AdminLayout = ReturnType<typeof AdminLayout>;
 export default AdminLayout;
-//# sourceMappingURL=AdminLayout.svelte.d.ts.map

package/dist/components/ComponentForm.svelte.d.ts

@@ -17,4 +17,3 @@ interface Props {
 declare const ComponentForm: import("svelte").Component<Props, {}, "">;
 type ComponentForm = ReturnType<typeof ComponentForm>;
 export default ComponentForm;
-//# sourceMappingURL=ComponentForm.svelte.d.ts.map

package/dist/components/ComponentInsertDialog.svelte.d.ts

@@ -17,4 +17,3 @@ interface Props {
 declare const ComponentInsertDialog: import("svelte").Component<Props, {}, "">;
 type ComponentInsertDialog = ReturnType<typeof ComponentInsertDialog>;
 export default ComponentInsertDialog;
-//# sourceMappingURL=ComponentInsertDialog.svelte.d.ts.map

package/dist/components/ConceptList.svelte.d.ts

@@ -10,4 +10,3 @@ interface Props {
 declare const ConceptList: import("svelte").Component<Props, {}, "">;
 type ConceptList = ReturnType<typeof ConceptList>;
 export default ConceptList;
-//# sourceMappingURL=ConceptList.svelte.d.ts.map

package/dist/components/ConfirmPage.svelte.d.ts

@@ -14,4 +14,3 @@ interface Props {
 declare const ConfirmPage: import("svelte").Component<Props, {}, "">;
 type ConfirmPage = ReturnType<typeof ConfirmPage>;
 export default ConfirmPage;
-//# sourceMappingURL=ConfirmPage.svelte.d.ts.map

package/dist/components/DeleteDialog.svelte.d.ts

@@ -18,4 +18,3 @@ interface Props {
 declare const DeleteDialog: import("svelte").Component<Props, {}, "">;
 type DeleteDialog = ReturnType<typeof DeleteDialog>;
 export default DeleteDialog;
-//# sourceMappingURL=DeleteDialog.svelte.d.ts.map

package/dist/components/EditPage.svelte.d.ts

@@ -33,4 +33,3 @@ interface Props {
 declare const EditPage: import("svelte").Component<Props, {}, "">;
 type EditPage = ReturnType<typeof EditPage>;
 export default EditPage;
-//# sourceMappingURL=EditPage.svelte.d.ts.map

package/dist/components/EditorToolbar.svelte.d.ts

@@ -12,4 +12,3 @@ interface Props {
 declare const EditorToolbar: import("svelte").Component<Props, {}, "">;
 type EditorToolbar = ReturnType<typeof EditorToolbar>;
 export default EditorToolbar;
-//# sourceMappingURL=EditorToolbar.svelte.d.ts.map

package/dist/components/IconPicker.svelte.d.ts

@@ -21,4 +21,3 @@ interface Props {
 declare const IconPicker: import("svelte").Component<Props, {}, "">;
 type IconPicker = ReturnType<typeof IconPicker>;
 export default IconPicker;
-//# sourceMappingURL=IconPicker.svelte.d.ts.map

package/dist/components/LinkPicker.svelte.d.ts

@@ -15,4 +15,3 @@ interface Props {
 declare const LinkPicker: import("svelte").Component<Props, {}, "">;
 type LinkPicker = ReturnType<typeof LinkPicker>;
 export default LinkPicker;
-//# sourceMappingURL=LinkPicker.svelte.d.ts.map

package/dist/components/LoginPage.svelte.d.ts

@@ -18,4 +18,3 @@ interface Props {
 declare const LoginPage: import("svelte").Component<Props, {}, "">;
 type LoginPage = ReturnType<typeof LoginPage>;
 export default LoginPage;
-//# sourceMappingURL=LoginPage.svelte.d.ts.map

package/dist/components/ManageEditors.svelte.d.ts

@@ -20,4 +20,3 @@ interface Props {
 declare const ManageEditors: import("svelte").Component<Props, {}, "">;
 type ManageEditors = ReturnType<typeof ManageEditors>;
 export default ManageEditors;
-//# sourceMappingURL=ManageEditors.svelte.d.ts.map

package/dist/components/MarkdownEditor.svelte.d.ts

@@ -21,4 +21,3 @@ interface Props {
 declare const MarkdownEditor: import("svelte").Component<Props, {}, "value">;
 type MarkdownEditor = ReturnType<typeof MarkdownEditor>;
 export default MarkdownEditor;
-//# sourceMappingURL=MarkdownEditor.svelte.d.ts.map

package/dist/components/NavTree.svelte.d.ts

@@ -14,4 +14,3 @@ interface Props {
 declare const NavTree: import("svelte").Component<Props, {}, "">;
 type NavTree = ReturnType<typeof NavTree>;
 export default NavTree;
-//# sourceMappingURL=NavTree.svelte.d.ts.map

package/dist/components/RenameDialog.svelte.d.ts

@@ -17,4 +17,3 @@ interface Props {
 declare const RenameDialog: import("svelte").Component<Props, {}, "">;
 type RenameDialog = ReturnType<typeof RenameDialog>;
 export default RenameDialog;
-//# sourceMappingURL=RenameDialog.svelte.d.ts.map

package/dist/components/index.d.ts

@@ -12,4 +12,3 @@ export { default as NavTree } from './NavTree.svelte';
 export { default as LinkPicker } from './LinkPicker.svelte';
 export { default as DeleteDialog } from './DeleteDialog.svelte';
 export { default as RenameDialog } from './RenameDialog.svelte';
-//# sourceMappingURL=index.d.ts.map

package/dist/components/link-completion.d.ts

@@ -13,4 +13,3 @@ export declare function linkCompletions(targets: LinkTarget[], query: string): C
  *  whole `[[query` with the chosen link, and sets filter:false because linkCompletions already
  *  filtered by the query (CodeMirror would otherwise re-filter against the literal `[[query`). */
 export declare function cairnLinkCompletionSource(targets: LinkTarget[]): CompletionSource;
-//# sourceMappingURL=link-completion.d.ts.map

package/dist/components/markdown-format.d.ts

@@ -30,4 +30,3 @@ export declare function unwrapCairnLink(doc: string, href: string): string;
  * last to first, replacing only the `](oldHref` run so the label and title stay exact.
  */
 export declare function rewriteCairnLink(doc: string, oldHref: string, newHref: string): string;
-//# sourceMappingURL=markdown-format.d.ts.map

package/dist/content/adapter.d.ts

@@ -1,4 +1,3 @@
 import type { CairnAdapter } from './types.js';
 /** Declare a site's adapter while preserving each concept's concrete schema type for typed reads. */
 export declare function defineAdapter<const A extends CairnAdapter>(adapter: A): A;
-//# sourceMappingURL=adapter.d.ts.map

package/dist/content/compose.d.ts

@@ -1,5 +1,5 @@
 import type { CairnAdapter, CairnExtension, CairnRuntime } from './types.js';
-import { type SiteConfig } from '../nav/site-config.js';
+import type { SiteConfig } from '../nav/site-config.js';
 /** The input to {@link composeRuntime}. `siteConfig` is required so the per-concept URL policy is
  *  always derived from one source and can never be silently dropped. `extensions` fold in after the
  *  adapter's concepts. */
@@ -15,4 +15,3 @@ export interface ComposeInput {
  * (seam 4) passes through untouched.
  */
 export declare function composeRuntime({ adapter, siteConfig, extensions }: ComposeInput): CairnRuntime;
-//# sourceMappingURL=compose.d.ts.map

package/dist/content/compose.js

@@ -1,5 +1,4 @@
-import { normalizeConcepts } from './concepts.js';
-import { urlPolicyFrom } from '../nav/site-config.js';
+import { resolveConcepts } from './concepts.js';
 /**
  * Fold an adapter and any extensions into the composed runtime (seam 2). The per-concept URL policy
  * is derived from the site config, the same source the delivery path uses, so the runtime and
@@ -24,7 +23,7 @@ export function composeRuntime({ adapter, siteConfig, extensions = [] }) {
     }
     return {
         siteName: adapter.siteName,
-        concepts: normalizeConcepts(content, urlPolicyFrom(siteConfig)),
+        concepts: resolveConcepts(content, siteConfig),
         backend: adapter.backend,
         sender: adapter.sender,
         render: adapter.render,

package/dist/content/concepts.d.ts

@@ -1,4 +1,5 @@
 import type { ConceptConfig, ConceptDescriptor, ConceptUrlPolicy, RoutingRule } from './types.js';
+import { type SiteConfig } from '../nav/site-config.js';
 /**
  * Concept-fixed routing, keyed by concept id (spec §7.2). Posts are dated feed entries;
  * pages are plain navigable structure. Not in adapter config. A future Fragments adds one
@@ -13,6 +14,11 @@ export declare const CONCEPT_ROUTING: Readonly<Record<string, RoutingRule>>;
  * a new concept attaches additively; production passes the default `CONCEPT_ROUTING`.
  */
 export declare function normalizeConcepts(content: Record<string, ConceptConfig | undefined>, urlPolicy?: Record<string, ConceptUrlPolicy | undefined>, routing?: Readonly<Record<string, RoutingRule>>): ConceptDescriptor[];
+/**
+ * Resolve a site's concept descriptors from its content map and parsed site config. The admin runtime
+ * (composeRuntime) and the delivery layer (siteDescriptors) both call this, so the per-concept URL
+ * policy is derived once from the YAML and the runtime and delivery permalinks cannot diverge.
+ */
+export declare function resolveConcepts(content: Record<string, ConceptConfig | undefined>, siteConfig: SiteConfig): ConceptDescriptor[];
 /** Look up a normalized concept by id, or undefined when the site does not enable it. */
 export declare function findConcept(concepts: ConceptDescriptor[], id: string): ConceptDescriptor | undefined;
-//# sourceMappingURL=concepts.d.ts.map

package/dist/content/concepts.js

@@ -1,3 +1,4 @@
+import { urlPolicyFrom } from '../nav/site-config.js';
 /**
  * Concept-fixed routing, keyed by concept id (spec §7.2). Posts are dated feed entries;
  * pages are plain navigable structure. Not in adapter config. A future Fragments adds one
@@ -17,6 +18,37 @@ function defaultLabel(id) {
 function defaultPermalink(id) {
     return id === 'pages' ? '/:slug' : `/${id}/:slug`;
 }
+/** Permalink tokens the resolver understands. */
+const KNOWN_TOKENS = new Set(['slug', 'year', 'month', 'day']);
+/** The date-bearing tokens; valid only for a dated concept. */
+const DATE_TOKENS = new Set(['year', 'month', 'day']);
+/** The valid date-prefix granularities. A runtime check, since the YAML is untyped. */
+const DATE_PREFIXES = new Set(['year', 'month', 'day']);
+/**
+ * Validate one concept's URL policy at build, so a misconfigured permalink or datePrefix fails loudly
+ * here rather than emitting a wrong or defaulted URL at render. The permalink must be root-relative and
+ * use only known tokens, a date token requires a dated concept, and the datePrefix must be in range.
+ */
+function validateUrlPolicy(id, policy, dated) {
+    if (policy.permalink !== undefined) {
+        const pattern = policy.permalink;
+        if (!pattern.startsWith('/')) {
+            throw new Error(`cairn: concept "${id}" permalink "${pattern}" must start with "/"`);
+        }
+        for (const match of pattern.matchAll(/:(\w+)/g)) {
+            const token = match[1];
+            if (!KNOWN_TOKENS.has(token)) {
+                throw new Error(`cairn: concept "${id}" permalink "${pattern}" uses unknown token ":${token}"`);
+            }
+            if (DATE_TOKENS.has(token) && !dated) {
+                throw new Error(`cairn: concept "${id}" is not dated, so permalink "${pattern}" cannot use the date token ":${token}"`);
+            }
+        }
+    }
+    if (policy.datePrefix !== undefined && !DATE_PREFIXES.has(policy.datePrefix)) {
+        throw new Error(`cairn: concept "${id}" datePrefix "${policy.datePrefix}" must be one of year, month, day`);
+    }
+}
 /**
  * Normalize an adapter's declared concepts into uniform descriptors (seam 1). URL policy
  * (`permalink`, `datePrefix`) comes from the YAML site-config, passed here as `urlPolicy` keyed by
@@ -26,6 +58,12 @@ function defaultPermalink(id) {
  */
 export function normalizeConcepts(content, urlPolicy = {}, routing = CONCEPT_ROUTING) {
     const descriptors = [];
+    const declaredConcepts = new Set(Object.keys(content).filter((key) => content[key] !== undefined));
+    for (const key of Object.keys(urlPolicy)) {
+        if (!declaredConcepts.has(key)) {
+            throw new Error(`cairn: URL policy names concept "${key}", which is not declared under content`);
+        }
+    }
     for (const [id, config] of Object.entries(content)) {
         if (!config)
             continue;
@@ -35,12 +73,14 @@ export function normalizeConcepts(content, urlPolicy = {}, routing = CONCEPT_ROU
         if (undeclared !== undefined) {
             throw new Error(`cairn: concept "${id}" summaryFields key "${undeclared}" is not a declared field`);
         }
+        const conceptRouting = routing[id] ?? DEFAULT_ROUTING;
         const policy = urlPolicy[id] ?? {};
+        validateUrlPolicy(id, policy, conceptRouting.dated);
         descriptors.push({
             id,
             label: config.label ?? defaultLabel(id),
             dir: config.dir,
-            routing: routing[id] ?? DEFAULT_ROUTING,
+            routing: conceptRouting,
             permalink: policy.permalink ?? defaultPermalink(id),
             datePrefix: policy.datePrefix ?? 'day',
             fields: config.schema.fields,
@@ -50,6 +90,14 @@ export function normalizeConcepts(content, urlPolicy = {}, routing = CONCEPT_ROU
     }
     return descriptors;
 }
+/**
+ * Resolve a site's concept descriptors from its content map and parsed site config. The admin runtime
+ * (composeRuntime) and the delivery layer (siteDescriptors) both call this, so the per-concept URL
+ * policy is derived once from the YAML and the runtime and delivery permalinks cannot diverge.
+ */
+export function resolveConcepts(content, siteConfig) {
+    return normalizeConcepts(content, urlPolicyFrom(siteConfig));
+}
 /** Look up a normalized concept by id, or undefined when the site does not enable it. */
 export function findConcept(concepts, id) {
     return concepts.find((concept) => concept.id === id);

package/dist/content/frontmatter.d.ts

@@ -23,4 +23,3 @@ export declare function parseMarkdown(source: string): {
     frontmatter: Record<string, unknown>;
     body: string;
 };
-//# sourceMappingURL=frontmatter.d.ts.map

package/dist/content/identity.d.ts

@@ -0,0 +1,23 @@
+import type { ConceptDescriptor } from './types.js';
+/** A content entry's resolved URL identity. */
+export interface EntryIdentity {
+    id: string;
+    slug: string;
+    date?: string;
+    permalink: string;
+}
+/** A present, non-empty string, else undefined. The read-model string coercion. */
+export declare function asString(value: unknown): string | undefined;
+/** A YYYY-MM-DD date. An unquoted YAML date parses as a JS Date; a string is sliced to its date head. */
+export declare function asDate(value: unknown): string | undefined;
+/** Tags as an array, empty when the file declares none. */
+export declare function asTags(value: unknown): string[];
+/** A content entry's id: its filename stem (the date prefix is part of a dated id). */
+export declare function entryId(path: string): string;
+/**
+ * Resolve a content entry's URL identity from its concept descriptor, its file path, and its parsed
+ * frontmatter. The slug strips the leading date prefix for a dated concept and is the id verbatim for
+ * an undated one. The permalink is the one resolver every reader shares. The caller parses the markdown
+ * once and passes the frontmatter, so there is no second parse here.
+ */
+export declare function entryIdentity(descriptor: ConceptDescriptor, path: string, frontmatter: Record<string, unknown>): EntryIdentity;

package/dist/content/identity.js

@@ -0,0 +1,43 @@
+// cairn-cms: a content entry's URL identity in one place (engine-hardening pass 3). The id, the
+// slug, the date, and the permalink are computed here, so the content index and the manifest cannot
+// drift on what an entry's URL is. A cairn: link resolves through the manifest in the admin preview
+// and through the content index in the public build, so the two must agree by construction.
+import { idFromFilename, slugFromId } from './ids.js';
+import { permalink } from './permalink.js';
+/** The basename of a glob path: the segment after the last slash, or the whole path. */
+function basename(path) {
+    const slash = path.lastIndexOf('/');
+    return slash >= 0 ? path.slice(slash + 1) : path;
+}
+/** A present, non-empty string, else undefined. The read-model string coercion. */
+export function asString(value) {
+    return typeof value === 'string' && value.trim() ? value : undefined;
+}
+/** A YYYY-MM-DD date. An unquoted YAML date parses as a JS Date; a string is sliced to its date head. */
+export function asDate(value) {
+    if (value instanceof Date)
+        return Number.isNaN(value.getTime()) ? undefined : value.toISOString().slice(0, 10);
+    if (typeof value === 'string')
+        return value.match(/^\d{4}-\d{2}-\d{2}/)?.[0];
+    return undefined;
+}
+/** Tags as an array, empty when the file declares none. */
+export function asTags(value) {
+    return Array.isArray(value) ? value.map(String) : [];
+}
+/** A content entry's id: its filename stem (the date prefix is part of a dated id). */
+export function entryId(path) {
+    return idFromFilename(basename(path));
+}
+/**
+ * Resolve a content entry's URL identity from its concept descriptor, its file path, and its parsed
+ * frontmatter. The slug strips the leading date prefix for a dated concept and is the id verbatim for
+ * an undated one. The permalink is the one resolver every reader shares. The caller parses the markdown
+ * once and passes the frontmatter, so there is no second parse here.
+ */
+export function entryIdentity(descriptor, path, frontmatter) {
+    const id = entryId(path);
+    const slug = slugFromId(id, descriptor.routing.dated ? descriptor.datePrefix : null);
+    const date = asDate(frontmatter.date);
+    return { id, slug, date, permalink: permalink(descriptor, { id, slug, date }) };
+}

package/dist/content/ids.d.ts

@@ -35,4 +35,3 @@ export declare function composeDatedId(date: string, slug: string, datePrefix: D
  * newSlug. The caller validates newSlug with isValidId first.
  */
 export declare function renameId(oldId: string, newSlug: string, datePrefix: DatePrefix | null): string;
-//# sourceMappingURL=ids.d.ts.map

package/dist/content/links.d.ts

@@ -18,4 +18,3 @@ export declare function escapeLinkText(text: string): string;
 /** The cairn links a markdown body points at, in first-occurrence order, deduped by concept/id.
  *  Parses the body as mdast, so a token inside a code span or fence is never matched. */
 export declare function extractCairnLinks(body: string): CairnRef[];
-//# sourceMappingURL=links.d.ts.map

package/dist/content/manifest.d.ts

@@ -24,7 +24,9 @@ export interface LinkTarget {
     date?: string;
     draft: boolean;
 }
-/** Build one manifest entry from a content file. Drafts are included and flagged. */
+/** Build one manifest entry from a content file. Drafts are included and flagged. The id, date, and
+ *  permalink come from entryIdentity, the same source content-index uses, so a cairn: link resolves to
+ *  one URL whether the admin preview reads the manifest or the public build reads the content index. */
 export declare function manifestEntryFromFile(descriptor: ConceptDescriptor, file: {
     path: string;
     raw: string;
@@ -83,4 +85,3 @@ export declare function manifestLinkResolver(targets: {
     id: string;
     permalink: string;
 }[]): LinkResolve;
-//# sourceMappingURL=manifest.d.ts.map

package/dist/content/manifest.js

@@ -3,41 +3,21 @@
 // code reads the content graph without an N+1 GitHub crawl. The build regenerates and verifies
 // it; the save path patches one entry and commits it with the content in one commit. Each entry
 // carries its identity and its outbound cairn: edges, so the manifest is the link graph.
-import { idFromFilename, slugFromId } from './ids.js';
 import { parseMarkdown } from './frontmatter.js';
-import { permalink } from './permalink.js';
+import { entryIdentity, asString } from './identity.js';
 import { extractCairnLinks } from './links.js';
-function basename(path) {
-    const slash = path.lastIndexOf('/');
-    return slash >= 0 ? path.slice(slash + 1) : path;
-}
-/** Mirror content-index's frontmatter coercion: a present non-empty string, else undefined. */
-function asString(value) {
-    return typeof value === 'string' && value.trim() ? value : undefined;
-}
-/** Mirror content-index's date coercion: an unquoted YAML date is a JS Date, a string is sliced. */
-function asDate(value) {
-    if (value instanceof Date)
-        return Number.isNaN(value.getTime()) ? undefined : value.toISOString().slice(0, 10);
-    if (typeof value === 'string')
-        return value.match(/^\d{4}-\d{2}-\d{2}/)?.[0];
-    return undefined;
-}
-/** Build one manifest entry from a content file. Drafts are included and flagged. */
+/** Build one manifest entry from a content file. Drafts are included and flagged. The id, date, and
+ *  permalink come from entryIdentity, the same source content-index uses, so a cairn: link resolves to
+ *  one URL whether the admin preview reads the manifest or the public build reads the content index. */
 export function manifestEntryFromFile(descriptor, file) {
-    const id = idFromFilename(basename(file.path));
-    // Use the same slug rule content-index uses, so the manifest's permalink for an entry always
-    // equals content-index's permalink for it. A cairn link must resolve to one URL whether the
-    // admin preview reads the manifest or the public build reads the content index.
-    const slug = slugFromId(id, descriptor.routing.dated ? descriptor.datePrefix : null);
     const { frontmatter, body } = parseMarkdown(file.raw);
-    const date = asDate(frontmatter.date);
+    const { id, date, permalink } = entryIdentity(descriptor, file.path, frontmatter);
     return {
         id,
         concept: descriptor.id,
         title: asString(frontmatter.title) ?? id,
         date,
-        permalink: permalink(descriptor, { id, slug, date }),
+        permalink,
         draft: frontmatter.draft === true,
         links: extractCairnLinks(body),
     };

package/dist/content/permalink.d.ts

@@ -9,4 +9,3 @@ export declare function permalink(descriptor: ConceptDescriptor, entry: {
     slug: string;
     date?: string;
 }): string;
-//# sourceMappingURL=permalink.d.ts.map

package/dist/content/schema.d.ts

@@ -72,4 +72,3 @@ export interface DefineFieldsOptions<F extends readonly FrontmatterField[]> {
 /** Declare a concept's fields once. Returns the schema's faces derived from that one declaration. */
 export declare function defineFields<const F extends readonly FrontmatterField[]>(fields: F, options?: DefineFieldsOptions<F>): ConceptSchema<F>;
 export {};
-//# sourceMappingURL=schema.d.ts.map

package/dist/content/types.d.ts

@@ -270,4 +270,3 @@ export interface CairnRuntime {
     fieldTypes?: FieldTypeDef[];
 }
 export {};
-//# sourceMappingURL=types.d.ts.map

package/dist/content/validate.d.ts

@@ -15,4 +15,3 @@ import type { FrontmatterField, ValidationResult } from './types.js';
  * `Date` to `YYYY-MM-DD` so a valid parsed date is not mistaken for an empty one.
  */
 export declare function validateFields(fields: FrontmatterField[], frontmatter: Record<string, unknown>): ValidationResult;
-//# sourceMappingURL=validate.d.ts.map

package/dist/delivery/CairnHead.svelte.d.ts

@@ -12,4 +12,3 @@ type $$ComponentProps = {
 declare const CairnHead: import("svelte").Component<$$ComponentProps, {}, "">;
 type CairnHead = ReturnType<typeof CairnHead>;
 export default CairnHead;
-//# sourceMappingURL=CairnHead.svelte.d.ts.map

package/dist/delivery/content-index.d.ts

@@ -65,4 +65,3 @@ export interface ContentIndex<F = Record<string, unknown>> {
 export declare function fromGlob(record: Record<string, string>): RawFile[];
 /** Build a concept's index from its raw files and normalized descriptor. */
 export declare function createContentIndex<F = Record<string, unknown>>(files: RawFile[], descriptor: ConceptDescriptor): ContentIndex<F>;
-//# sourceMappingURL=content-index.d.ts.map

package/dist/delivery/content-index.js

@@ -3,47 +3,30 @@
 // returns cheap plain-data summaries plus an on-demand detail lookup. It is concept-generic:
 // every operation reads the descriptor and its routing rule, never a hardcoded concept id.
 import { parseMarkdown } from '../content/frontmatter.js';
-import { idFromFilename, slugFromId } from '../content/ids.js';
-import { permalink } from '../content/permalink.js';
+import { entryId, entryIdentity, asDate, asString, asTags } from '../content/identity.js';
 import { deriveExcerpt, wordCount } from './excerpt.js';
 /** Map a Vite eager `?raw` glob record (`{ path: raw }`) to `RawFile[]`. */
 export function fromGlob(record) {
     return Object.entries(record).map(([path, raw]) => ({ path, raw }));
 }
-function basename(path) {
-    const slash = path.lastIndexOf('/');
-    return slash >= 0 ? path.slice(slash + 1) : path;
-}
-function asString(value) {
-    return typeof value === 'string' && value.trim() ? value : undefined;
-}
-function asDate(value) {
-    if (value instanceof Date)
-        return Number.isNaN(value.getTime()) ? undefined : value.toISOString().slice(0, 10);
-    if (typeof value === 'string')
-        return value.match(/^\d{4}-\d{2}-\d{2}/)?.[0];
-    return undefined;
-}
-function asTags(value) {
-    return Array.isArray(value) ? value.map(String) : [];
-}
 /** Build a concept's index from its raw files and normalized descriptor. */
 export function createContentIndex(files, descriptor) {
     const problems = [];
     const entries = [];
     for (const file of files) {
-        const id = idFromFilename(basename(file.path));
-        const slug = slugFromId(id, descriptor.routing.dated ? descriptor.datePrefix : null);
         const { frontmatter: raw, body } = parseMarkdown(file.raw);
-        const date = asDate(raw.date);
+        const id = entryId(file.path);
         const draft = raw.draft === true;
-        // Validate once at build. A failure is recorded for the site gate and excluded from the typed
-        // read, so every readable entry's frontmatter is the validator's normalized output, never raw.
+        // Validate before resolving the permalink. A date-token permalink throws on an entry with no
+        // valid date; the validate gate records that as a content problem rather than aborting the whole
+        // index build, so one bad entry degrades to a skip, not a crash. A failure is also excluded from
+        // the typed read, so every readable entry's frontmatter is the validator's normalized output.
         const result = descriptor.validate(raw, body);
         if (!result.ok) {
             problems.push({ id, draft, errors: result.errors });
             continue;
         }
+        const { slug, date, permalink } = entryIdentity(descriptor, file.path, raw);
         const summaryFieldValues = {};
         for (const key of descriptor.summaryFields) {
             if (key in result.data)
@@ -53,7 +36,7 @@ export function createContentIndex(files, descriptor) {
             concept: descriptor.id,
             id,
             slug,
-            permalink: permalink(descriptor, { id, slug, date }),
+            permalink,
             title: asString(raw.title) ?? id,
             date,
             updated: asDate(raw.updated),

package/dist/delivery/data.d.ts

@@ -21,4 +21,3 @@ export { rssResponse, jsonFeedResponse, sitemapResponse, robotsResponse } from '
 export { jsonLdScript } from './json-ld.js';
 export { permalink } from '../content/permalink.js';
 export { buildSiteManifest, buildLinkResolver } from './manifest.js';
-//# sourceMappingURL=data.d.ts.map

package/dist/delivery/excerpt.d.ts

@@ -8,4 +8,3 @@ export declare function deriveExcerpt(body: string, opts?: {
 }): string;
 /** Count words in the stripped body. */
 export declare function wordCount(body: string): number;
-//# sourceMappingURL=excerpt.d.ts.map

package/dist/delivery/feeds.d.ts

@@ -24,4 +24,3 @@ export interface FeedItem {
 export declare function buildRssFeed(channel: FeedChannel, items: FeedItem[]): string;
 /** Build a JSON Feed 1.1 document. */
 export declare function buildJsonFeed(channel: FeedChannel, items: FeedItem[]): string;
-//# sourceMappingURL=feeds.d.ts.map

package/dist/delivery/head.d.ts

@@ -1,2 +1 @@
 export { default as CairnHead } from './CairnHead.svelte';
-//# sourceMappingURL=head.d.ts.map

package/dist/delivery/index.d.ts

@@ -1,4 +1,3 @@
 export * from './data.js';
 export { createPublicRoutes } from '../sveltekit/public-routes.js';
 export type { PublicRoutesDeps, ListData, TagData, TagIndexData, EntryData, } from '../sveltekit/public-routes.js';
-//# sourceMappingURL=index.d.ts.map

package/dist/delivery/json-ld.d.ts

@@ -1,2 +1 @@
 export declare function jsonLdScript(data: Record<string, unknown>): string;
-//# sourceMappingURL=json-ld.d.ts.map

package/dist/delivery/manifest.d.ts

@@ -10,4 +10,3 @@ export declare function buildSiteManifest<A extends CairnAdapter>(adapter: A, co
 /** A resolver backed by the site index, for the build. A miss throws, so a dangling cairn: token
  *  fails the prerender (the build backstop). The preview uses manifestLinkResolver, which marks. */
 export declare function buildLinkResolver(site: SiteIndex): LinkResolve;
-//# sourceMappingURL=manifest.d.ts.map