@karaoke-cms/theme-default 0.9.8 → 0.11.3

package/README.md

@@ -78,6 +78,11 @@ layout: {
 
 Available: `'header'`, `'main-menu'`, `'search'`, `'recent-posts'`, `'footer'`.
 
+## What's new in 0.10.2
+
+- **Section-aware tags and RSS** — `/tags`, `/tags/[tag]`, and `/rss.xml` now aggregate entries across all active docs sections, not just the default `/docs` section.
+- No other user-facing visual changes in this release.
+
 ## What's new in 0.9.5
 
 - **`themeDefault()` function API** replaces the old string `theme: '@karaoke-cms/theme-default'`

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@karaoke-cms/theme-default",
   "type": "module",
-  "version": "0.9.8",
+  "version": "0.11.3",
   "description": "Default theme for karaoke-cms — two-column knowledge base with blog and docs",
   "main": "./src/index.ts",
   "exports": {
@@ -17,17 +17,18 @@
     "karaoke-cms"
   ],
   "dependencies": {
-    "@karaoke-cms/module-blog": "^0.9.8"
+    "@karaoke-cms/module-blog": "0.11.3"
   },
   "peerDependencies": {
     "astro": ">=6.0.0",
-    "@karaoke-cms/astro": "^0.9.8"
+    "@karaoke-cms/contracts": "^0.11.0"
   },
   "devDependencies": {
-    "@karaoke-cms/astro": "workspace:*",
-    "astro": "^6.0.8"
+    "astro": "^6.0.8",
+    "@karaoke-cms/astro": "0.11.3",
+    "@karaoke-cms/contracts": "0.11.3"
   },
   "scripts": {
     "test": "echo \"Stub — no tests\""
   }
-}
+}

package/src/index.ts

@@ -1,5 +1,5 @@
 import type { AstroIntegration } from 'astro';
-import type { ModuleInstance } from '@karaoke-cms/astro';
+import type { ModuleInstance, ThemeInstance } from '@karaoke-cms/contracts';
 import { fileURLToPath } from 'url';
 import { existsSync } from 'fs';
 
@@ -9,20 +9,31 @@ const __dirname = fileURLToPath(new URL('.', import.meta.url));
 // Exported separately so it can be called by both the new factory (themeDefault)
 // and the legacy default export without triggering a @karaoke-cms/astro import.
 //
-// When `implementedModuleIds` is provided, routes for those modules are skipped —
-// the core integration injects them from the module package instead.
-function buildIntegration(implementedModuleIds: string[] = []): AstroIntegration {
+// When modules provide a docs collection, theme-default's hardcoded /docs fallback
+// routes are skipped — karaoke() generates per-instance pages via codegen instead.
+function buildIntegration(implementedModules: ModuleInstance[] = [], activeModules: ModuleInstance[] = []): AstroIntegration {
+  const allModules = [...implementedModules, ...activeModules];
+  const hasBlog = allModules.some(m => m.id === 'blog');
+  // Suppress the /docs fallback only when a docs() instance is mounted at /docs specifically.
+  // Checking allModules (both theme implements and config.modules) ensures:
+  //   - docs() in config.modules at /docs → suppresses fallback (codegen handles it)
+  //   - docs() at /api-docs only → keeps the /docs fallback intact
+  const hasDocsCollection = allModules.some(
+    m => m.collection != null && m.mount.replace(/\/$/, '') === '/docs'
+  );
+
   return {
     name: '@karaoke-cms/theme-default',
     hooks: {
       'astro:config:setup': ({ injectRoute, updateConfig, config: astroConfig }) => {
-        // Blog post route: fall back to module-blog post page when blog is not in implements[].
-        if (!implementedModuleIds.includes('blog')) {
+        // Blog post route: fall back to module-blog post page when no blog module is active.
+        if (!hasBlog) {
           injectRoute({ pattern: '/blog/[slug]',  entrypoint: '@karaoke-cms/module-blog/pages/post' });
         }
 
-        // Docs routes: fall back to built-in pages when docs is not in implements[].
-        if (!implementedModuleIds.includes('docs')) {
+        // Docs routes: skip when any module owns a docs collection.
+        // The karaoke() core generates per-instance pages via codegen.
+        if (!hasDocsCollection) {
           injectRoute({ pattern: '/docs',         entrypoint: `${__dirname}pages/docs/index.astro` });
           injectRoute({ pattern: '/docs/[slug]',  entrypoint: `${__dirname}pages/docs/[slug].astro` });
         }
@@ -58,16 +69,14 @@ function buildIntegration(implementedModuleIds: string[] = []): AstroIntegration
  *   theme: themeDefault({ implements: [blog({ mount: '/blog' })] }),
  * });
  */
-export function themeDefault(config: { implements?: ModuleInstance[] } = {}) {
+export function themeDefault(config: { implements?: ModuleInstance[] } = {}): ThemeInstance {
   const implementedModules = config.implements ?? [];
-  const implementedModuleIds = implementedModules.map(m => m.id);
   return {
-    _type: 'theme-instance' as const,
+    _type: 'theme-instance',
     id: 'theme-default',
-    implementedModuleIds,
     implementedModules,
     toAstroIntegration: (activeModules: ModuleInstance[] = []) =>
-      buildIntegration([...implementedModuleIds, ...activeModules.map(m => m.id)]),
+      buildIntegration(implementedModules, activeModules),
   };
 }
 
@@ -80,5 +89,5 @@ export function themeDefault(config: { implements?: ModuleInstance[] } = {}) {
  * Injects blog routes directly (legacy path — blog module not in modules[]).
  */
 export default function themeDefaultLegacy(_config: unknown): AstroIntegration {
-  return buildIntegration([]);
+  return buildIntegration();
 }

package/src/pages/tags/[tag].astro

@@ -2,16 +2,23 @@
 import { getCollection } from 'astro:content';
 import DefaultPage from '@karaoke-cms/astro/layouts/DefaultPage.astro';
 import { siteTitle } from 'virtual:karaoke-cms/config';
+import { docsSections } from 'virtual:karaoke-cms/docs-sections';
 
 export async function getStaticPaths() {
-  const [blog, docs] = await Promise.all([
-    getCollection('blog', ({ data }) => data.publish === true),
-    getCollection('docs', ({ data }) => data.publish === true),
-  ]);
+  const blogEntries = await getCollection('blog', ({ data }) => data.publish === true);
+
+  // Fetch from all active docs collections; allSettled so a missing collection
+  // doesn't abort the entire tags page (e.g., if content.config.ts wasn't updated yet).
+  const docsSettled = await Promise.allSettled(
+    docsSections.map(s => getCollection(s.collection as any, ({ data }) => data.publish === true))
+  );
+  const docsEntries = docsSettled.flatMap(r => r.status === 'fulfilled' ? r.value : []);
+
+  const allEntries = [...blogEntries, ...docsEntries];
 
   // Collect all unique tags
   const tags = new Set<string>();
-  for (const entry of [...blog, ...docs]) {
+  for (const entry of allEntries) {
     for (const tag of entry.data.tags ?? []) tags.add(tag);
   }
 
@@ -19,7 +26,7 @@ export async function getStaticPaths() {
     params: { tag },
     props: {
       tag,
-      entries: [...blog, ...docs]
+      entries: allEntries
         .filter(e => e.data.tags?.includes(tag))
         .sort((a, b) => (b.data.date?.valueOf() ?? 0) - (a.data.date?.valueOf() ?? 0)),
     },
@@ -28,9 +35,12 @@ export async function getStaticPaths() {
 
 const { tag, entries } = Astro.props;
 
-// Determine the URL prefix for each entry by its collection
+// Map collection name → mount path for correct href generation
+const mountByCollection = Object.fromEntries(docsSections.map(s => [s.collection, s.mount]));
+
 function href(entry: { collection: string; id: string }) {
-  return `/${entry.collection}/${entry.id}`;
+  const mount = mountByCollection[entry.collection];
+  return mount ? `${mount}/${entry.id}` : `/${entry.collection}/${entry.id}`;
 }
 ---
 

package/src/pages/tags/index.astro

@@ -2,15 +2,18 @@
 import { getCollection } from 'astro:content';
 import DefaultPage from '@karaoke-cms/astro/layouts/DefaultPage.astro';
 import { siteTitle } from 'virtual:karaoke-cms/config';
+import { docsSections } from 'virtual:karaoke-cms/docs-sections';
 
-const [blog, docs] = await Promise.all([
-  getCollection('blog', ({ data }) => data.publish === true),
-  getCollection('docs', ({ data }) => data.publish === true),
-]);
+const blog = await getCollection('blog', ({ data }) => data.publish === true);
 
-// Count occurrences of each tag across both collections
+const docsSettled = await Promise.allSettled(
+  docsSections.map(s => getCollection(s.collection as any, ({ data }) => data.publish === true))
+);
+const docsEntries = docsSettled.flatMap(r => r.status === 'fulfilled' ? r.value : []);
+
+// Count occurrences of each tag across all collections
 const counts = new Map<string, number>();
-for (const entry of [...blog, ...docs]) {
+for (const entry of [...blog, ...docsEntries]) {
   for (const tag of entry.data.tags ?? []) {
     counts.set(tag, (counts.get(tag) ?? 0) + 1);
   }