@cogenta/render 0.1.4 → 0.2.2

package/dist/docs/markdown.d.ts

@@ -0,0 +1,71 @@
+/**
+ * Markdown → HTML for Cogenta's own documentation (L22 task 7).
+ *
+ * `packages/admin/src/rich-text/markdown.ts` already converts Markdown to a
+ * Slate document, but that grammar is shaped by the rich-text *editor* (marks
+ * round-trip through a specific `CustomElement` union, an internal link has
+ * no `href` at all, media is a void with a private `cogenta-media:` scheme).
+ * Documentation pages are plain files under `docs-site/content/`, never
+ * touched by that editor, and need things the editor grammar doesn't have —
+ * tables, ordered/unordered list nesting driven by indentation, fenced code
+ * blocks with a language tag, heading anchors for a table of contents. A
+ * second small hand-written scanner, in the same spirit as the first
+ * (R9 — no Markdown dependency for either), is a better fit than bending one
+ * grammar to two unrelated jobs.
+ *
+ * This module is pure and has no Node built-in or DOM dependency, which is
+ * what lets it run in two different places from one source: a Node build
+ * script (`docs-site/build/generate.mjs`, for the statically published site)
+ * and `@cogenta/admin`'s browser bundle (`/admin/documentation`, already a
+ * devDependency of that package). Same function, same output, both times —
+ * the property the task explicitly asks for ("jamais deux copies qui
+ * divergent").
+ */
+export interface MarkdownHeading {
+    readonly level: number;
+    readonly text: string;
+    readonly id: string;
+}
+export interface MarkdownDocument {
+    readonly meta: Readonly<Record<string, string>>;
+    readonly html: string;
+    readonly headings: readonly MarkdownHeading[];
+}
+/** A minimal `key: value` block between two `---` lines. No nesting, no lists, no quoting — the only shapes `docs-site/content/**` actually uses (title, tree, order). A real YAML parser would be a bigger dependency than every page's frontmatter combined (R9). */
+export declare function parseFrontmatter(source: string): {
+    readonly meta: Readonly<Record<string, string>>;
+    readonly body: string;
+};
+export declare function renderMarkdownToHtml(markdown: string): {
+    readonly html: string;
+    readonly headings: readonly MarkdownHeading[];
+};
+/** Frontmatter + rendering, in one call — what every real caller wants. */
+export declare function renderMarkdownDocument(source: string): MarkdownDocument;
+export type DocTree = 'functional' | 'technical';
+/**
+ * The one place the two publications of this documentation *legitimately*
+ * differ: the statically generated site is a set of `.html` files on disk,
+ * `/admin/documentation` is one single-page app screen. The Markdown source
+ * and `renderMarkdownToHtml`'s output are identical either way — this
+ * function only retargets the `href`s a static site needs and a SPA can't
+ * use as written, run as a second pass over that same, unmodified HTML.
+ *
+ * Three shapes appear in `docs-site/content/**`, and only these three:
+ *   - `../downloads/<file>.zip`               → a starter template
+ *   - `(../)?(functional|technical)/<slug>.html(#hash)?` → a cross-tree page
+ *   - `<slug>.html(#hash)?`                    → a same-tree page
+ *
+ * A link this function doesn't recognise (an external `https://…` URL, an
+ * in-page `#hash`) is left untouched — this is a narrow, closed rewrite over
+ * a grammar this same project authors, not a general HTML link resolver.
+ *
+ * `basePath` defaults to `/admin` — where `cogenta serve` actually mounts
+ * the admin SPA — but is a parameter rather than a literal because the
+ * admin's own local dev server (`pnpm dev` inside `packages/admin`, no
+ * `cogenta serve` in front of it) serves the same screen at the root instead
+ * (`vite.config.ts`'s own `base: command === 'build' ? '/admin/' : '/'`). The
+ * caller passes `import.meta.env.BASE_URL` so a rewritten link works in both.
+ */
+export declare function adaptDocHtmlForAdmin(html: string, currentTree: DocTree, basePath?: string): string;
+//# sourceMappingURL=markdown.d.ts.map

package/dist/docs/markdown.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"markdown.d.ts","sourceRoot":"","sources":["../../src/docs/markdown.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;GAsBG;AAEH,MAAM,WAAW,eAAe;IAC9B,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;IACtB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;IACrB,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAA;CACpB;AAED,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAA;IAC/C,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;IACrB,QAAQ,CAAC,QAAQ,EAAE,SAAS,eAAe,EAAE,CAAA;CAC9C;AAUD,uQAAuQ;AACvQ,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,MAAM,GAAG;IAChD,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAA;IAC/C,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;CACtB,CAiBA;AA0JD,wBAAgB,oBAAoB,CAAC,QAAQ,EAAE,MAAM,GAAG;IACtD,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;IACrB,QAAQ,CAAC,QAAQ,EAAE,SAAS,eAAe,EAAE,CAAA;CAC9C,CAkHA;AAED,2EAA2E;AAC3E,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,MAAM,GAAG,gBAAgB,CAIvE;AAMD,MAAM,MAAM,OAAO,GAAG,YAAY,GAAG,WAAW,CAAA;AAUhD;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,wBAAgB,oBAAoB,CAClC,IAAI,EAAE,MAAM,EACZ,WAAW,EAAE,OAAO,EACpB,QAAQ,SAAW,GAClB,MAAM,CAmBR"}

package/dist/docs/markdown.js

@@ -0,0 +1,325 @@
+/**
+ * Markdown → HTML for Cogenta's own documentation (L22 task 7).
+ *
+ * `packages/admin/src/rich-text/markdown.ts` already converts Markdown to a
+ * Slate document, but that grammar is shaped by the rich-text *editor* (marks
+ * round-trip through a specific `CustomElement` union, an internal link has
+ * no `href` at all, media is a void with a private `cogenta-media:` scheme).
+ * Documentation pages are plain files under `docs-site/content/`, never
+ * touched by that editor, and need things the editor grammar doesn't have —
+ * tables, ordered/unordered list nesting driven by indentation, fenced code
+ * blocks with a language tag, heading anchors for a table of contents. A
+ * second small hand-written scanner, in the same spirit as the first
+ * (R9 — no Markdown dependency for either), is a better fit than bending one
+ * grammar to two unrelated jobs.
+ *
+ * This module is pure and has no Node built-in or DOM dependency, which is
+ * what lets it run in two different places from one source: a Node build
+ * script (`docs-site/build/generate.mjs`, for the statically published site)
+ * and `@cogenta/admin`'s browser bundle (`/admin/documentation`, already a
+ * devDependency of that package). Same function, same output, both times —
+ * the property the task explicitly asks for ("jamais deux copies qui
+ * divergent").
+ */
+function escapeHtml(text) {
+    return text.replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;');
+}
+function escapeAttr(text) {
+    return escapeHtml(text).replace(/"/g, '&quot;');
+}
+/** A minimal `key: value` block between two `---` lines. No nesting, no lists, no quoting — the only shapes `docs-site/content/**` actually uses (title, tree, order). A real YAML parser would be a bigger dependency than every page's frontmatter combined (R9). */
+export function parseFrontmatter(source) {
+    const normalized = source.replace(/\r\n/g, '\n');
+    if (!normalized.startsWith('---\n'))
+        return { meta: {}, body: normalized };
+    const end = normalized.indexOf('\n---\n', 4);
+    if (end === -1)
+        return { meta: {}, body: normalized };
+    const meta = {};
+    for (const line of normalized.slice(4, end).split('\n')) {
+        const colon = line.indexOf(':');
+        if (colon === -1)
+            continue;
+        const key = line.slice(0, colon).trim();
+        const value = line.slice(colon + 1).trim();
+        if (key !== '')
+            meta[key] = value;
+    }
+    return { meta, body: normalized.slice(end + 5) };
+}
+function slugify(text, seen) {
+    const base = text
+        .normalize('NFD')
+        .replace(/\p{Diacritic}/gu, '') // strip combining accents left by NFD
+        .toLowerCase()
+        .replace(/[^a-z0-9]+/g, '-')
+        .replace(/^-+|-+$/g, '') || 'section';
+    const count = seen.get(base) ?? 0;
+    seen.set(base, count + 1);
+    return count === 0 ? base : `${base}-${count}`;
+}
+// ---------------------------------------------------------------------------
+// Inline grammar: escapes, `code`, **strong**, _em_/*em*, [text](url), images.
+// ---------------------------------------------------------------------------
+function renderInline(text) {
+    let out = '';
+    let i = 0;
+    while (i < text.length) {
+        const ch = text[i];
+        if (ch === '\\' && i + 1 < text.length) {
+            out += escapeHtml(text[i + 1] ?? '');
+            i += 2;
+            continue;
+        }
+        if (ch === '`') {
+            const end = text.indexOf('`', i + 1);
+            if (end !== -1) {
+                out += `<code>${escapeHtml(text.slice(i + 1, end))}</code>`;
+                i = end + 1;
+                continue;
+            }
+        }
+        if (text.startsWith('**', i)) {
+            const end = text.indexOf('**', i + 2);
+            if (end !== -1) {
+                out += `<strong>${renderInline(text.slice(i + 2, end))}</strong>`;
+                i = end + 2;
+                continue;
+            }
+        }
+        if ((ch === '_' || ch === '*') && text[i + 1] !== ' ') {
+            const marker = ch;
+            const end = text.indexOf(marker, i + 1);
+            if (end !== -1 && end > i + 1) {
+                out += `<em>${renderInline(text.slice(i + 1, end))}</em>`;
+                i = end + 1;
+                continue;
+            }
+        }
+        if (ch === '!' && text[i + 1] === '[') {
+            const image = matchLinkLike(text, i + 1);
+            if (image !== null) {
+                out += `<img src="${escapeAttr(image.href)}" alt="${escapeAttr(image.label)}" loading="lazy">`;
+                i = image.end;
+                continue;
+            }
+        }
+        if (ch === '[') {
+            const link = matchLinkLike(text, i);
+            if (link !== null) {
+                const external = /^[a-z][a-z0-9+.-]*:/i.test(link.href) || link.href.startsWith('//');
+                const rel = external ? ' rel="noopener noreferrer"' : '';
+                out += `<a href="${escapeAttr(link.href)}"${rel}>${renderInline(link.label)}</a>`;
+                i = link.end;
+                continue;
+            }
+        }
+        out += escapeHtml(ch ?? '');
+        i += 1;
+    }
+    return out;
+}
+function matchLinkLike(text, start) {
+    if (text[start] !== '[')
+        return null;
+    const closeBracket = text.indexOf(']', start + 1);
+    if (closeBracket === -1 || text[closeBracket + 1] !== '(')
+        return null;
+    const closeParen = text.indexOf(')', closeBracket + 2);
+    if (closeParen === -1)
+        return null;
+    return {
+        label: text.slice(start + 1, closeBracket),
+        href: text.slice(closeBracket + 2, closeParen),
+        end: closeParen + 1,
+    };
+}
+const HEADING_LINE = /^(#{1,6})\s+(.*)$/;
+const FENCE_LINE = /^```\s*([\w-]*)\s*$/;
+const QUOTE_LINE = /^>\s?(.*)$/;
+const UL_LINE = /^( *)[-*+]\s+(.*)$/;
+const OL_LINE = /^( *)\d+\.\s+(.*)$/;
+const HR_LINE = /^(-{3,}|\*{3,}|_{3,})$/;
+const TABLE_SEP_LINE = /^\|?\s*:?-{2,}:?\s*(\|\s*:?-{2,}:?\s*)*\|?$/;
+function splitTableRow(line) {
+    let trimmed = line.trim();
+    if (trimmed.startsWith('|'))
+        trimmed = trimmed.slice(1);
+    if (trimmed.endsWith('|'))
+        trimmed = trimmed.slice(0, -1);
+    return trimmed.split('|').map((cell) => cell.trim());
+}
+function renderList(lines) {
+    const tag = (lines[0]?.ordered ?? false) ? 'ol' : 'ul';
+    const items = [];
+    let i = 0;
+    while (i < lines.length) {
+        const item = lines[i];
+        if (item === undefined)
+            break;
+        const level = item.indent;
+        let html = renderInline(item.text);
+        i += 1;
+        const nestedStart = i;
+        while (i < lines.length && (lines[i]?.indent ?? 0) > level)
+            i += 1;
+        if (i > nestedStart)
+            html += renderList(lines.slice(nestedStart, i));
+        items.push(`<li>${html}</li>`);
+    }
+    return `<${tag}>${items.join('')}</${tag}>`;
+}
+export function renderMarkdownToHtml(markdown) {
+    const lines = markdown.replace(/\r\n/g, '\n').split('\n');
+    const blocks = [];
+    const headings = [];
+    const seenIds = new Map();
+    let i = 0;
+    while (i < lines.length) {
+        const line = lines[i] ?? '';
+        if (line.trim() === '') {
+            i += 1;
+            continue;
+        }
+        const fence = FENCE_LINE.exec(line);
+        if (fence !== null) {
+            const lang = fence[1] ?? '';
+            const codeLines = [];
+            i += 1;
+            while (i < lines.length && !FENCE_LINE.test(lines[i] ?? '') && (lines[i] ?? '') !== '```') {
+                codeLines.push(lines[i] ?? '');
+                i += 1;
+            }
+            if (i < lines.length)
+                i += 1; // closing fence
+            const langAttr = lang === '' ? '' : ` class="language-${escapeAttr(lang)}"`;
+            blocks.push(`<pre><code${langAttr}>${escapeHtml(codeLines.join('\n'))}</code></pre>`);
+            continue;
+        }
+        const heading = HEADING_LINE.exec(line);
+        if (heading !== null) {
+            const level = (heading[1] ?? '').length;
+            const text = (heading[2] ?? '').trim();
+            const id = slugify(text, seenIds);
+            blocks.push(`<h${level} id="${id}">${renderInline(text)}</h${level}>`);
+            headings.push({ level, text, id });
+            i += 1;
+            continue;
+        }
+        if (HR_LINE.test(line.trim())) {
+            blocks.push('<hr>');
+            i += 1;
+            continue;
+        }
+        // Table: a row followed by a separator row of the same column count.
+        if (line.includes('|') && TABLE_SEP_LINE.test(lines[i + 1] ?? '')) {
+            const headCells = splitTableRow(line);
+            i += 2;
+            const bodyRows = [];
+            while (i < lines.length && (lines[i] ?? '').includes('|') && (lines[i] ?? '').trim() !== '') {
+                bodyRows.push(splitTableRow(lines[i] ?? ''));
+                i += 1;
+            }
+            const thead = `<thead><tr>${headCells.map((cell) => `<th>${renderInline(cell)}</th>`).join('')}</tr></thead>`;
+            const tbody = `<tbody>${bodyRows
+                .map((row) => `<tr>${row.map((cell) => `<td>${renderInline(cell)}</td>`).join('')}</tr>`)
+                .join('')}</tbody>`;
+            blocks.push(`<table>${thead}${tbody}</table>`);
+            continue;
+        }
+        const quoteLines = [];
+        if (QUOTE_LINE.test(line)) {
+            while (i < lines.length && QUOTE_LINE.test(lines[i] ?? '')) {
+                quoteLines.push(QUOTE_LINE.exec(lines[i] ?? '')?.[1] ?? '');
+                i += 1;
+            }
+            blocks.push(`<blockquote><p>${renderInline(quoteLines.join(' '))}</p></blockquote>`);
+            continue;
+        }
+        if (UL_LINE.test(line) || OL_LINE.test(line)) {
+            const listLines = [];
+            while (i < lines.length) {
+                const ulMatch = UL_LINE.exec(lines[i] ?? '');
+                const olMatch = OL_LINE.exec(lines[i] ?? '');
+                const match = ulMatch ?? olMatch;
+                if (match === null)
+                    break;
+                listLines.push({
+                    indent: Math.floor((match[1] ?? '').length / 2),
+                    ordered: olMatch !== null,
+                    text: match[2] ?? '',
+                });
+                i += 1;
+            }
+            blocks.push(renderList(listLines));
+            continue;
+        }
+        const paragraphLines = [line];
+        i += 1;
+        while (i < lines.length) {
+            const next = lines[i] ?? '';
+            if (next.trim() === '' ||
+                HEADING_LINE.test(next) ||
+                FENCE_LINE.test(next) ||
+                QUOTE_LINE.test(next) ||
+                UL_LINE.test(next) ||
+                OL_LINE.test(next) ||
+                HR_LINE.test(next.trim())) {
+                break;
+            }
+            paragraphLines.push(next);
+            i += 1;
+        }
+        blocks.push(`<p>${renderInline(paragraphLines.join(' ').trim())}</p>`);
+    }
+    return { html: blocks.join('\n'), headings };
+}
+/** Frontmatter + rendering, in one call — what every real caller wants. */
+export function renderMarkdownDocument(source) {
+    const { meta, body } = parseFrontmatter(source);
+    const { html, headings } = renderMarkdownToHtml(body);
+    return { meta, html, headings };
+}
+/** Where `docs-site/build/generate.mjs` puts a downloadable starter, keyed by the filename every content page links to. */
+const DOWNLOAD_REPO_PATHS = {
+    'theme-starter.zip': 'examples/theme-starter',
+    'plugin-starter.zip': 'examples/plugin-starter',
+};
+const REPO_TREE_URL = 'https://github.com/cogenta-cms/cogenta/tree/main/';
+/**
+ * The one place the two publications of this documentation *legitimately*
+ * differ: the statically generated site is a set of `.html` files on disk,
+ * `/admin/documentation` is one single-page app screen. The Markdown source
+ * and `renderMarkdownToHtml`'s output are identical either way — this
+ * function only retargets the `href`s a static site needs and a SPA can't
+ * use as written, run as a second pass over that same, unmodified HTML.
+ *
+ * Three shapes appear in `docs-site/content/**`, and only these three:
+ *   - `../downloads/<file>.zip`               → a starter template
+ *   - `(../)?(functional|technical)/<slug>.html(#hash)?` → a cross-tree page
+ *   - `<slug>.html(#hash)?`                    → a same-tree page
+ *
+ * A link this function doesn't recognise (an external `https://…` URL, an
+ * in-page `#hash`) is left untouched — this is a narrow, closed rewrite over
+ * a grammar this same project authors, not a general HTML link resolver.
+ *
+ * `basePath` defaults to `/admin` — where `cogenta serve` actually mounts
+ * the admin SPA — but is a parameter rather than a literal because the
+ * admin's own local dev server (`pnpm dev` inside `packages/admin`, no
+ * `cogenta serve` in front of it) serves the same screen at the root instead
+ * (`vite.config.ts`'s own `base: command === 'build' ? '/admin/' : '/'`). The
+ * caller passes `import.meta.env.BASE_URL` so a rewritten link works in both.
+ */
+export function adaptDocHtmlForAdmin(html, currentTree, basePath = '/admin') {
+    const base = basePath.replace(/\/$/, '');
+    return html
+        .replace(/href="\.\.\/downloads\/([\w.-]+)"/g, (full, file) => {
+        const repoPath = DOWNLOAD_REPO_PATHS[file];
+        return repoPath === undefined
+            ? full
+            : `href="${REPO_TREE_URL}${repoPath}" rel="noopener noreferrer" target="_blank"`;
+    })
+        .replace(/href="(?:\.\.\/)?(functional|technical)\/([\w-]+)\.html(#[\w-]+)?"/g, (_full, tree, slug, hash = '') => `href="${base}/documentation/docs/${tree}/${slug}${hash}"`)
+        .replace(/href="([\w-]+)\.html(#[\w-]+)?"/g, (_full, slug, hash = '') => `href="${base}/documentation/docs/${currentTree}/${slug}${hash}"`);
+}
+//# sourceMappingURL=markdown.js.map

package/dist/docs/markdown.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"markdown.js","sourceRoot":"","sources":["../../src/docs/markdown.ts"],"names":[],"mappings":"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"}

package/dist/images/srcset.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"srcset.d.ts","sourceRoot":"","sources":["../../src/images/srcset.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,YAAY,CAAA;AAEvE;;;;;;;;;;;GAWG;AACH,eAAO,MAAM,aAAa,EAAE,SAAS,MAAM,EAAgC,CAAA;AAE3E,MAAM,WAAW,aAAa;IAC5B,4CAA4C;IAC5C,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;IACtC,0EAA0E;IAC1E,QAAQ,CAAC,aAAa,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;IAC3C,QAAQ,CAAC,MAAM,CAAC,EAAE,SAAS,MAAM,EAAE,GAAG,SAAS,CAAA;CAChD;AASD,wBAAgB,UAAU,CACxB,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE,UAAU,EACjB,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,YAAY,GACpB,MAAM,CAUR;AAED,wFAAwF;AACxF,wBAAgB,eAAe,CAC7B,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,MAAM,GAAG,SAAS,EAC7B,MAAM,GAAE,SAAS,MAAM,EAAkB,GACxC,SAAS,MAAM,EAAE,CAInB;AAED;;;;;;GAMG;AACH,wBAAgB,aAAa,CAC3B,KAAK,EAAE,UAAU,EACjB,OAAO,GAAE,YAAiB,EAC1B,MAAM,GAAE,aAAkB,GACzB,WAAW,CA8Bb"}
+{"version":3,"file":"srcset.d.ts","sourceRoot":"","sources":["../../src/images/srcset.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,YAAY,CAAA;AAEvE;;;;;;;;;;;GAWG;AACH,eAAO,MAAM,aAAa,EAAE,SAAS,MAAM,EAAgC,CAAA;AAE3E,MAAM,WAAW,aAAa;IAC5B,4CAA4C;IAC5C,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;IACtC,0EAA0E;IAC1E,QAAQ,CAAC,aAAa,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;IAC3C,QAAQ,CAAC,MAAM,CAAC,EAAE,SAAS,MAAM,EAAE,GAAG,SAAS,CAAA;CAChD;AASD,wBAAgB,UAAU,CACxB,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE,UAAU,EACjB,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,YAAY,GACpB,MAAM,CAiBR;AAED,wFAAwF;AACxF,wBAAgB,eAAe,CAC7B,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,MAAM,GAAG,SAAS,EAC7B,MAAM,GAAE,SAAS,MAAM,EAAkB,GACxC,SAAS,MAAM,EAAE,CAInB;AAED;;;;;;GAMG;AACH,wBAAgB,aAAa,CAC3B,KAAK,EAAE,UAAU,EACjB,OAAO,GAAE,YAAiB,EAC1B,MAAM,GAAE,aAAkB,GACzB,WAAW,CA8Bb"}

package/dist/images/srcset.js

@@ -25,6 +25,14 @@ export function variantUrl(endpoint, media, width, options) {
         parameters.set('f', options.format);
     if (options.fit !== undefined)
         parameters.set('fit', options.fit);
+    // Cache-busting (fiche 05 task 2): the field has existed on `MediaAsset`
+    // since `theme@1.2` but was never actually read here, so a replaced
+    // original kept serving under the year-long `immutable` cache the old
+    // query string had already earned. `contentHash` changes on every
+    // `MediaStore.replace()`, so folding it in changes the URL, not just the
+    // bytes behind it.
+    if (media.version !== undefined)
+        parameters.set('v', media.version);
     // The focal point is deliberately absent: the endpoint reads it from the media
     // entity. Putting it in the URL would let a visitor choose the crop, and would
     // multiply the cache keys of every image by the number of points someone

package/dist/images/srcset.js.map

@@ -1 +1 @@
-{"version":3,"file":"srcset.js","sourceRoot":"","sources":["../../src/images/srcset.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"srcset.js","sourceRoot":"","sources":["../../src/images/srcset.ts"],"names":[],"mappings":"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"}

package/dist/images/types.d.ts

@@ -72,6 +72,16 @@ export interface MediaAsset {
     readonly url?: string | undefined;
     /** Video only: the still shown before playback. */
     readonly poster?: string | undefined;
+    /**
+     * A short, stable digest of the current bytes (fiche 11 task 4). Folded
+     * into every `/_image` URL as `&v=` when present. `/_image?id=…` is
+     * otherwise a stable URL under a year-long `Cache-Control: immutable`
+     * (L10 task 5) — replacing the original in place (`MediaStore.replace`)
+     * changes nothing a visitor's browser already cached until the URL itself
+     * changes too. Absent is fully backward compatible: no `&v=` is added,
+     * exactly today's behaviour. Added in `theme@1.2`.
+     */
+    readonly version?: string | undefined;
 }
 export interface Size {
     readonly width: number;

package/dist/images/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/images/types.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/images/types.ts"],"names":[],"mappings":"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"}

package/dist/index.d.ts

@@ -17,6 +17,7 @@ export * from './content/client.js';
 export * from './content/types.js';
 export * from './context/render-context.js';
 export * from './context/types.js';
+export * from './docs/markdown.js';
 export * from './images/index.js';
 export * from './pwa/index.js';
 export * from './skin/index.js';

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,cAAc,wBAAwB,CAAA;AACtC,cAAc,kBAAkB,CAAA;AAChC,cAAc,kBAAkB,CAAA;AAChC,cAAc,aAAa,CAAA;AAC3B,cAAc,qBAAqB,CAAA;AACnC,cAAc,oBAAoB,CAAA;AAClC,cAAc,6BAA6B,CAAA;AAC3C,cAAc,oBAAoB,CAAA;AAClC,cAAc,mBAAmB,CAAA;AACjC,cAAc,gBAAgB,CAAA;AAC9B,cAAc,iBAAiB,CAAA;AAC/B,cAAc,uBAAuB,CAAA;AACrC,cAAc,qBAAqB,CAAA;AACnC,cAAc,6BAA6B,CAAA;AAC3C,cAAc,6BAA6B,CAAA;AAC3C,cAAc,2BAA2B,CAAA;AACzC,cAAc,gCAAgC,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,cAAc,wBAAwB,CAAA;AACtC,cAAc,kBAAkB,CAAA;AAChC,cAAc,kBAAkB,CAAA;AAChC,cAAc,aAAa,CAAA;AAC3B,cAAc,qBAAqB,CAAA;AACnC,cAAc,oBAAoB,CAAA;AAClC,cAAc,6BAA6B,CAAA;AAC3C,cAAc,oBAAoB,CAAA;AAClC,cAAc,oBAAoB,CAAA;AAClC,cAAc,mBAAmB,CAAA;AACjC,cAAc,gBAAgB,CAAA;AAC9B,cAAc,iBAAiB,CAAA;AAC/B,cAAc,uBAAuB,CAAA;AACrC,cAAc,qBAAqB,CAAA;AACnC,cAAc,6BAA6B,CAAA;AAC3C,cAAc,6BAA6B,CAAA;AAC3C,cAAc,2BAA2B,CAAA;AACzC,cAAc,gCAAgC,CAAA"}

package/dist/index.js

@@ -17,6 +17,7 @@ export * from './content/client.js';
 export * from './content/types.js';
 export * from './context/render-context.js';
 export * from './context/types.js';
+export * from './docs/markdown.js';
 export * from './images/index.js';
 export * from './pwa/index.js';
 export * from './skin/index.js';

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,cAAc,wBAAwB,CAAA;AACtC,cAAc,kBAAkB,CAAA;AAChC,cAAc,kBAAkB,CAAA;AAChC,cAAc,aAAa,CAAA;AAC3B,cAAc,qBAAqB,CAAA;AACnC,cAAc,oBAAoB,CAAA;AAClC,cAAc,6BAA6B,CAAA;AAC3C,cAAc,oBAAoB,CAAA;AAClC,cAAc,mBAAmB,CAAA;AACjC,cAAc,gBAAgB,CAAA;AAC9B,cAAc,iBAAiB,CAAA;AAC/B,cAAc,uBAAuB,CAAA;AACrC,cAAc,qBAAqB,CAAA;AACnC,cAAc,6BAA6B,CAAA;AAC3C,cAAc,6BAA6B,CAAA;AAC3C,cAAc,2BAA2B,CAAA;AACzC,cAAc,gCAAgC,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,cAAc,wBAAwB,CAAA;AACtC,cAAc,kBAAkB,CAAA;AAChC,cAAc,kBAAkB,CAAA;AAChC,cAAc,aAAa,CAAA;AAC3B,cAAc,qBAAqB,CAAA;AACnC,cAAc,oBAAoB,CAAA;AAClC,cAAc,6BAA6B,CAAA;AAC3C,cAAc,oBAAoB,CAAA;AAClC,cAAc,oBAAoB,CAAA;AAClC,cAAc,mBAAmB,CAAA;AACjC,cAAc,gBAAgB,CAAA;AAC9B,cAAc,iBAAiB,CAAA;AAC/B,cAAc,uBAAuB,CAAA;AACrC,cAAc,qBAAqB,CAAA;AACnC,cAAc,6BAA6B,CAAA;AAC3C,cAAc,6BAA6B,CAAA;AAC3C,cAAc,2BAA2B,CAAA;AACzC,cAAc,gCAAgC,CAAA"}

package/dist/skin/index.d.ts

@@ -7,6 +7,8 @@ export type { Rgb, Rgba, TextSize } from './color.js';
 export { AA_LARGE_TEXT, AA_NORMAL_TEXT, aaThreshold, compositeOver, contrastRatio, formatRatio, meetsContrastAa, parseColor, relativeLuminance, } from './color.js';
 export type { RenderSkinCssOptions } from './css.js';
 export { CSS_VARIABLE_PREFIX, cssVariableName, renderSkinCss } from './css.js';
+export type { SkinTokenOverrides } from './merge.js';
+export { mergeSkinTokens } from './merge.js';
 export type { SkinSheet, SkinStore, SkinStoreOptions } from './sheet.js';
 export { createSkinStore, renderSkin } from './sheet.js';
 export type { ColorTokens, ContrastPair, Density, FontTokens, MotionTokens, RadiusTokens, ShadowTokens, SkinTokens, SpaceTokens, TokenKind, TokenSpec, TypeScaleStep, } from './tokens.js';

package/dist/skin/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/skin/index.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,YAAY,EAAE,GAAG,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;AACrD,OAAO,EACL,aAAa,EACb,cAAc,EACd,WAAW,EACX,aAAa,EACb,aAAa,EACb,WAAW,EACX,eAAe,EACf,UAAU,EACV,iBAAiB,GAClB,MAAM,YAAY,CAAA;AACnB,YAAY,EAAE,oBAAoB,EAAE,MAAM,UAAU,CAAA;AACpD,OAAO,EAAE,mBAAmB,EAAE,eAAe,EAAE,aAAa,EAAE,MAAM,UAAU,CAAA;AAC9E,YAAY,EAAE,SAAS,EAAE,SAAS,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAA;AACxE,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,YAAY,CAAA;AACxD,YAAY,EACV,WAAW,EACX,YAAY,EACZ,OAAO,EACP,UAAU,EACV,YAAY,EACZ,YAAY,EACZ,YAAY,EACZ,UAAU,EACV,WAAW,EACX,SAAS,EACT,SAAS,EACT,aAAa,GACd,MAAM,aAAa,CAAA;AACpB,OAAO,EACL,cAAc,EACd,SAAS,EACT,YAAY,EACZ,WAAW,EACX,gBAAgB,GACjB,MAAM,aAAa,CAAA;AACpB,OAAO,EAAE,gBAAgB,EAAE,YAAY,EAAE,MAAM,eAAe,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/skin/index.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,YAAY,EAAE,GAAG,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;AACrD,OAAO,EACL,aAAa,EACb,cAAc,EACd,WAAW,EACX,aAAa,EACb,aAAa,EACb,WAAW,EACX,eAAe,EACf,UAAU,EACV,iBAAiB,GAClB,MAAM,YAAY,CAAA;AACnB,YAAY,EAAE,oBAAoB,EAAE,MAAM,UAAU,CAAA;AACpD,OAAO,EAAE,mBAAmB,EAAE,eAAe,EAAE,aAAa,EAAE,MAAM,UAAU,CAAA;AAC9E,YAAY,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAA;AACpD,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAA;AAC5C,YAAY,EAAE,SAAS,EAAE,SAAS,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAA;AACxE,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,YAAY,CAAA;AACxD,YAAY,EACV,WAAW,EACX,YAAY,EACZ,OAAO,EACP,UAAU,EACV,YAAY,EACZ,YAAY,EACZ,YAAY,EACZ,UAAU,EACV,WAAW,EACX,SAAS,EACT,SAAS,EACT,aAAa,GACd,MAAM,aAAa,CAAA;AACpB,OAAO,EACL,cAAc,EACd,SAAS,EACT,YAAY,EACZ,WAAW,EACX,gBAAgB,GACjB,MAAM,aAAa,CAAA;AACpB,OAAO,EAAE,gBAAgB,EAAE,YAAY,EAAE,MAAM,eAAe,CAAA"}

package/dist/skin/index.js

@@ -5,6 +5,7 @@
  */
 export { AA_LARGE_TEXT, AA_NORMAL_TEXT, aaThreshold, compositeOver, contrastRatio, formatRatio, meetsContrastAa, parseColor, relativeLuminance, } from './color.js';
 export { CSS_VARIABLE_PREFIX, cssVariableName, renderSkinCss } from './css.js';
+export { mergeSkinTokens } from './merge.js';
 export { createSkinStore, renderSkin } from './sheet.js';
 export { CONTRAST_PAIRS, DENSITIES, TOKEN_GROUPS, TOKEN_SPECS, TYPE_SCALE_STEPS, } from './tokens.js';
 export { computeTypeScale, validateSkin } from './validate.js';

package/dist/skin/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/skin/index.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,EACL,aAAa,EACb,cAAc,EACd,WAAW,EACX,aAAa,EACb,aAAa,EACb,WAAW,EACX,eAAe,EACf,UAAU,EACV,iBAAiB,GAClB,MAAM,YAAY,CAAA;AAEnB,OAAO,EAAE,mBAAmB,EAAE,eAAe,EAAE,aAAa,EAAE,MAAM,UAAU,CAAA;AAE9E,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,YAAY,CAAA;AAexD,OAAO,EACL,cAAc,EACd,SAAS,EACT,YAAY,EACZ,WAAW,EACX,gBAAgB,GACjB,MAAM,aAAa,CAAA;AACpB,OAAO,EAAE,gBAAgB,EAAE,YAAY,EAAE,MAAM,eAAe,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/skin/index.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,EACL,aAAa,EACb,cAAc,EACd,WAAW,EACX,aAAa,EACb,aAAa,EACb,WAAW,EACX,eAAe,EACf,UAAU,EACV,iBAAiB,GAClB,MAAM,YAAY,CAAA;AAEnB,OAAO,EAAE,mBAAmB,EAAE,eAAe,EAAE,aAAa,EAAE,MAAM,UAAU,CAAA;AAE9E,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAA;AAE5C,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,YAAY,CAAA;AAexD,OAAO,EACL,cAAc,EACd,SAAS,EACT,YAAY,EACZ,WAAW,EACX,gBAAgB,GACjB,MAAM,aAAa,CAAA;AACpB,OAAO,EAAE,gBAAgB,EAAE,YAAY,EAAE,MAAM,eAAe,CAAA"}

package/dist/skin/merge.d.ts

@@ -0,0 +1,26 @@
+import type { SkinTokens } from './tokens.js';
+/**
+ * A partial skin, as an admin's token override screen sends it (fiche 14
+ * task 2): any subset of any group's keys, never a whole new shape. The type
+ * is structural rather than `Partial<SkinTokens>` recursed, because the
+ * overlay travels as parsed JSON, one HTTP hop away from the object it will
+ * be merged onto.
+ */
+export type SkinTokenOverrides = {
+    readonly [Group in keyof SkinTokens]?: Partial<SkinTokens[Group]>;
+};
+/**
+ * Overlays a partial set of token overrides onto a complete base skin,
+ * group by group, key by key — never a shallow `{ ...base, ...overrides }`,
+ * which would replace an entire group (say, all seven `color.*` tokens) the
+ * moment an override touches a single key in it.
+ *
+ * The result is a plain object shaped like `SkinTokens`, not yet validated:
+ * callers run it back through `validateSkin` before trusting it, the same
+ * discipline `applyTokens` in `cogenta skin apply` already applies to a
+ * skin read straight off disk. Merging is deliberately naive about
+ * *values* — it does not know a colour from a duration — so it cannot mask
+ * a bad override; only `validateSkin` decides what a value means.
+ */
+export declare function mergeSkinTokens(base: SkinTokens, overrides: SkinTokenOverrides): SkinTokens;
+//# sourceMappingURL=merge.d.ts.map

package/dist/skin/merge.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"merge.d.ts","sourceRoot":"","sources":["../../src/skin/merge.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAA;AAG7C;;;;;;GAMG;AACH,MAAM,MAAM,kBAAkB,GAAG;IAC/B,QAAQ,EAAE,KAAK,IAAI,MAAM,UAAU,CAAC,CAAC,EAAE,OAAO,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;CAClE,CAAA;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,eAAe,CAAC,IAAI,EAAE,UAAU,EAAE,SAAS,EAAE,kBAAkB,GAAG,UAAU,CAQ3F"}

package/dist/skin/merge.js

@@ -0,0 +1,25 @@
+import { TOKEN_GROUPS } from './tokens.js';
+/**
+ * Overlays a partial set of token overrides onto a complete base skin,
+ * group by group, key by key — never a shallow `{ ...base, ...overrides }`,
+ * which would replace an entire group (say, all seven `color.*` tokens) the
+ * moment an override touches a single key in it.
+ *
+ * The result is a plain object shaped like `SkinTokens`, not yet validated:
+ * callers run it back through `validateSkin` before trusting it, the same
+ * discipline `applyTokens` in `cogenta skin apply` already applies to a
+ * skin read straight off disk. Merging is deliberately naive about
+ * *values* — it does not know a colour from a duration — so it cannot mask
+ * a bad override; only `validateSkin` decides what a value means.
+ */
+export function mergeSkinTokens(base, overrides) {
+    const merged = { ...base };
+    for (const group of TOKEN_GROUPS) {
+        const groupOverrides = overrides[group];
+        if (groupOverrides === undefined)
+            continue;
+        merged[group] = { ...base[group], ...groupOverrides };
+    }
+    return merged;
+}
+//# sourceMappingURL=merge.js.map

package/dist/skin/merge.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"merge.js","sourceRoot":"","sources":["../../src/skin/merge.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAa1C;;;;;;;;;;;;GAYG;AACH,MAAM,UAAU,eAAe,CAAC,IAAgB,EAAE,SAA6B;IAC7E,MAAM,MAAM,GAAG,EAAE,GAAG,IAAI,EAA6B,CAAA;IACrD,KAAK,MAAM,KAAK,IAAI,YAAY,EAAE,CAAC;QACjC,MAAM,cAAc,GAAG,SAAS,CAAC,KAAK,CAAC,CAAA;QACvC,IAAI,cAAc,KAAK,SAAS;YAAE,SAAQ;QAC1C,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE,GAAI,IAAI,CAAC,KAAK,CAA6B,EAAE,GAAG,cAAc,EAAE,CAAA;IACpF,CAAC;IACD,OAAO,MAA+B,CAAA;AACxC,CAAC"}

package/dist/theme/manifest.d.ts

@@ -22,6 +22,19 @@ export interface ThemeManifest {
     readonly a11y?: {
         readonly verified: string;
     } | undefined;
+    /**
+     * A short, human-readable summary of the theme — what the appearance
+     * gallery shows next to its name (fiche 48). Optional: a manifest written
+     * before `theme@1.2` still validates, and the gallery falls back to
+     * whatever label the theme registry has for it.
+     */
+    readonly description?: string | undefined;
+    /**
+     * Who publishes the theme, shown alongside `version` in the gallery.
+     * Optional for the same reason as `description` — a third-party theme
+     * that predates this field, or simply omits one, still installs.
+     */
+    readonly author?: string | undefined;
 }
 declare const manifestSchema: z.ZodObject<{
     name: z.ZodString;
@@ -39,6 +52,8 @@ declare const manifestSchema: z.ZodObject<{
     a11y: z.ZodOptional<z.ZodObject<{
         verified: z.ZodString;
     }, z.core.$strip>>;
+    description: z.ZodOptional<z.ZodString>;
+    author: z.ZodOptional<z.ZodString>;
 }, z.core.$strip>;
 export type ThemeManifestInput = z.input<typeof manifestSchema>;
 /** Declares a theme. The same validation runs on install, on a manifest that was never typed. */

package/dist/theme/manifest.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"manifest.d.ts","sourceRoot":"","sources":["../../src/theme/manifest.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AAEvB;;;;;GAKG;AAEH,MAAM,MAAM,YAAY,GAAG,QAAQ,GAAG,QAAQ,GAAG,MAAM,CAAA;AAEvD,MAAM,WAAW,aAAa;IAC5B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;IACrB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAA;IACxB,oEAAoE;IACpE,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;IACvB,2DAA2D;IAC3D,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;IACvB,QAAQ,CAAC,UAAU,EAAE,SAAS,MAAM,EAAE,CAAA;IACtC,2EAA2E;IAC3E,QAAQ,CAAC,WAAW,EAAE,SAAS,MAAM,EAAE,GAAG,GAAG,CAAA;IAC7C,QAAQ,CAAC,OAAO,EAAE,YAAY,CAAA;IAC9B,4DAA4D;IAC5D,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;IACvB,QAAQ,CAAC,IAAI,CAAC,EAAE;QAAE,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAA;KAAE,GAAG,SAAS,CAAA;CAC1D;AAKD,QAAA,MAAM,cAAc;;;;;;;;;;;;;;;;iBAUlB,CAAA;AAEF,MAAM,MAAM,kBAAkB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,cAAc,CAAC,CAAA;AAE/D,iGAAiG;AACjG,wBAAgB,WAAW,CAAC,KAAK,EAAE,kBAAkB,GAAG,aAAa,CAEpE;AAED,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,OAAO,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,aAAa,CAgBjF"}
+{"version":3,"file":"manifest.d.ts","sourceRoot":"","sources":["../../src/theme/manifest.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AAEvB;;;;;GAKG;AAEH,MAAM,MAAM,YAAY,GAAG,QAAQ,GAAG,QAAQ,GAAG,MAAM,CAAA;AAEvD,MAAM,WAAW,aAAa;IAC5B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;IACrB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAA;IACxB,oEAAoE;IACpE,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;IACvB,2DAA2D;IAC3D,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;IACvB,QAAQ,CAAC,UAAU,EAAE,SAAS,MAAM,EAAE,CAAA;IACtC,2EAA2E;IAC3E,QAAQ,CAAC,WAAW,EAAE,SAAS,MAAM,EAAE,GAAG,GAAG,CAAA;IAC7C,QAAQ,CAAC,OAAO,EAAE,YAAY,CAAA;IAC9B,4DAA4D;IAC5D,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;IACvB,QAAQ,CAAC,IAAI,CAAC,EAAE;QAAE,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAA;KAAE,GAAG,SAAS,CAAA;IACzD;;;;;OAKG;IACH,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;IACzC;;;;OAIG;IACH,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;CACrC;AAKD,QAAA,MAAM,cAAc;;;;;;;;;;;;;;;;;;iBAclB,CAAA;AAEF,MAAM,MAAM,kBAAkB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,cAAc,CAAC,CAAA;AAE/D,iGAAiG;AACjG,wBAAgB,WAAW,CAAC,KAAK,EAAE,kBAAkB,GAAG,aAAa,CAEpE;AAED,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,OAAO,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,aAAa,CAsBjF"}

package/dist/theme/manifest.js

@@ -12,6 +12,10 @@ const manifestSchema = z.object({
     runtime: z.enum(['static', 'server', 'edge']),
     tokens: z.string().min(1),
     a11y: z.object({ verified: z.string().min(1) }).optional(),
+    // theme@1.2 (fiche 48): both optional, so a manifest written before this
+    // field existed keeps validating unchanged.
+    description: z.string().min(1).optional(),
+    author: z.string().min(1).optional(),
 });
 /** Declares a theme. The same validation runs on install, on a manifest that was never typed. */
 export function defineTheme(input) {
@@ -28,9 +32,15 @@ export function parseThemeManifest(input, source) {
             details: source === undefined ? { problems } : { source, problems },
         });
     }
-    // `exactOptionalPropertyTypes` makes `a11y: undefined` and an absent `a11y`
-    // two different types, so the key is only set when there is something in it.
-    const { a11y, ...rest } = result.data;
-    return a11y === undefined ? rest : { ...rest, a11y };
+    // `exactOptionalPropertyTypes` makes `a11y: undefined` (or `description`/
+    // `author`: undefined) and the key being genuinely absent two different
+    // types, so each is only set on the result when there is something in it.
+    const { a11y, description, author, ...rest } = result.data;
+    return {
+        ...rest,
+        ...(a11y === undefined ? {} : { a11y }),
+        ...(description === undefined ? {} : { description }),
+        ...(author === undefined ? {} : { author }),
+    };
 }
 //# sourceMappingURL=manifest.js.map

package/dist/theme/manifest.js.map

@@ -1 +1 @@
-{"version":3,"file":"manifest.js","sourceRoot":"","sources":["../../src/theme/manifest.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAA;AAC5C,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AA2BvB,MAAM,YAAY,GAAG,6CAA6C,CAAA;AAClE,MAAM,MAAM,GAAG,oCAAoC,CAAA;AAEnD,MAAM,cAAc,GAAG,CAAC,CAAC,MAAM,CAAC;IAC9B,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;IACvB,OAAO,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC,MAAM,EAAE,gDAAgD,CAAC;IACnF,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC,YAAY,EAAE,wCAAwC,CAAC;IAChF,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC,YAAY,EAAE,wCAAwC,CAAC;IAChF,UAAU,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;IACtC,WAAW,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAClE,OAAO,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC;IAC7C,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;IACzB,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,QAAQ,EAAE;CAC3D,CAAC,CAAA;AAIF,iGAAiG;AACjG,MAAM,UAAU,WAAW,CAAC,KAAyB;IACnD,OAAO,kBAAkB,CAAC,KAAK,CAAC,CAAA;AAClC,CAAC;AAED,MAAM,UAAU,kBAAkB,CAAC,KAAc,EAAE,MAAe;IAChE,MAAM,MAAM,GAAG,cAAc,CAAC,SAAS,CAAC,KAAK,CAAC,CAAA;IAC9C,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;QACpB,MAAM,QAAQ,GAAG,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,KAAK,CAAC,OAAO,EAAE,CAAC,CAAA;QAChG,MAAM,IAAI,YAAY,CAAC;YACrB,IAAI,EAAE,eAAe;YACrB,OAAO,EAAE,GAAG,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,yBAAyB,MAAM,EAAE,kBAAkB,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG;YACpI,IAAI,EAAE,iHAAiH;YACvH,OAAO,EAAE,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,QAAQ,EAAE;SACpE,CAAC,CAAA;IACJ,CAAC;IAED,4EAA4E;IAC5E,6EAA6E;IAC7E,MAAM,EAAE,IAAI,EAAE,GAAG,IAAI,EAAE,GAAG,MAAM,CAAC,IAAI,CAAA;IACrC,OAAO,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,GAAG,IAAI,EAAE,IAAI,EAAE,CAAA;AACtD,CAAC"}
+{"version":3,"file":"manifest.js","sourceRoot":"","sources":["../../src/theme/manifest.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cogenta/render",
-  "version": "0.1.4",
+  "version": "0.2.2",
   "description": "Astro integration, render context and theme installation checks.",
   "license": "MPL-2.0",
   "type": "module",
@@ -29,8 +29,8 @@
   "dependencies": {
     "wasm-vips": "^0.0.18",
     "zod": "^4.4.3",
-    "@cogenta/core": "0.4.0",
-    "@cogenta/blocks": "0.1.4"
+    "@cogenta/core": "0.7.0",
+    "@cogenta/blocks": "1.0.2"
   },
   "peerDependencies": {
     "astro": "^7.2.1",