@life-and-dev/mdsite 0.0.8 → 0.0.15

package/mdsite-nuxt/package.json

@@ -23,28 +23,28 @@
     "test": "vitest"
   },
   "dependencies": {
-    "@nuxt/content": "^3.8.0",
-    "@types/node": "^24.10.0",
-    "better-sqlite3": "^12.4.1",
-    "fs-extra": "^11.3.2",
+    "@nuxt/content": "^3.14.0",
+    "@types/node": "^26.0.1",
+    "better-sqlite3": "^12.11.1",
+    "fs-extra": "^11.3.5",
     "gray-matter": "^4.0.3",
-    "mermaid": "^11.12.2",
-    "nuxt": "^4.2.1",
-    "typescript": "^5.9.3",
-    "vue": "^3.5.24",
-    "vue-router": "^4.6.3",
-    "vue-tsc": "^3.1.3",
-    "vuetify-nuxt-module": "^0.19.2",
-    "yaml": "^2.8.1"
+    "mermaid": "^11.16.0",
+    "nuxt": "^4.4.8",
+    "typescript": "^6.0.3",
+    "vue": "^3.5.39",
+    "vue-router": "^5.1.0",
+    "vue-tsc": "^3.3.5",
+    "vuetify-nuxt-module": "^1.0.0-rc.1",
+    "yaml": "^2.9.0"
   },
   "devDependencies": {
-    "@playwright/test": "^1.56.1",
+    "@playwright/test": "^1.61.1",
     "@types/fs-extra": "^11.0.4",
-    "@vitest/ui": "^4.0.8",
-    "playwright": "^1.56.1",
-    "remark-github-blockquote-alert": "^2.0.1",
-    "sharp": "^0.34.5",
-    "tsx": "^4.20.6",
-    "vitest": "^4.0.8"
+    "@vitest/ui": "^4.1.9",
+    "playwright": "^1.61.1",
+    "remark-github-blockquote-alert": "^2.1.0",
+    "sharp": "^0.35.2",
+    "tsx": "^4.22.4",
+    "vitest": "^4.1.9"
   }
 }

package/mdsite-nuxt/scripts/base-url.test.ts

@@ -0,0 +1,22 @@
+import { describe, expect, it } from 'vitest'
+import { withBasePath } from '../utils/base-url'
+
+describe('withBasePath', () => {
+  it('keeps root base URLs unchanged', () => {
+    expect(withBasePath('/_navigation.json', '/')).toBe('/_navigation.json')
+  })
+
+  it('prefixes internal URLs with configured app base URL', () => {
+    expect(withBasePath('/_search-index.json', '/mdsite/')).toBe('/mdsite/_search-index.json')
+    expect(withBasePath('/about', '/mdsite')).toBe('/mdsite/about')
+  })
+
+  it('does not prefix URLs that already include the base URL', () => {
+    expect(withBasePath('/mdsite/about', '/mdsite/')).toBe('/mdsite/about')
+  })
+
+  it('leaves external and hash URLs unchanged', () => {
+    expect(withBasePath('https://example.com/icon.png', '/mdsite/')).toBe('https://example.com/icon.png')
+    expect(withBasePath('#section', '/mdsite/')).toBe('#section')
+  })
+})

package/mdsite-nuxt/scripts/generate-favicons.ts

@@ -143,12 +143,12 @@ export async function generateWebManifest(name: string) {
     short_name: name,
     icons: [
       {
-        src: '/icon-192.png',
+        src: 'icon-192.png',
         sizes: '192x192',
         type: 'image/png'
       },
       {
-        src: '/icon-512.png',
+        src: 'icon-512.png',
         sizes: '512x512',
         type: 'image/png'
       }

package/mdsite-nuxt/scripts/generate-indices.test.ts

@@ -0,0 +1,57 @@
+import fs from 'node:fs/promises'
+import os from 'node:os'
+import path from 'node:path'
+
+import { afterEach, beforeEach, describe, expect, it } from 'vitest'
+
+import { generateNavigationJson, generateSearchIndexJson } from './generate-indices.js'
+
+describe('generated content indices', () => {
+  const originalEnv = { ...process.env }
+  let tempDir: string
+  let contentDir: string
+  let publicDir: string
+
+  beforeEach(async () => {
+    process.env = { ...originalEnv }
+    tempDir = await fs.mkdtemp(path.join(os.tmpdir(), 'mdsite-indices-'))
+    contentDir = path.join(tempDir, 'content')
+    publicDir = path.join(tempDir, 'public')
+    await fs.mkdir(contentDir, { recursive: true })
+    process.env.CONTENT_DIR = contentDir
+    process.env.MDSITE_PUBLIC_DIR = publicDir
+  })
+
+  afterEach(async () => {
+    process.env = { ...originalEnv }
+    await fs.rm(tempDir, { force: true, recursive: true })
+  })
+
+  it('falls back to markdown files when no menu exists', async () => {
+    await fs.writeFile(path.join(contentDir, 'index.md'), '# Home\n\nWelcome home.', 'utf8')
+    await fs.writeFile(path.join(contentDir, 'guide.md'), '# Guide\n\nUseful guide.', 'utf8')
+
+    await generateNavigationJson()
+
+    const navigation = JSON.parse(await fs.readFile(path.join(publicDir, '_navigation.json'), 'utf8'))
+    expect(navigation).toEqual(expect.arrayContaining([
+      expect.objectContaining({ path: '/', title: 'Home' }),
+      expect.objectContaining({ path: '/guide', title: 'Guide' }),
+    ]))
+  })
+
+  it('writes searchable markdown pages with excerpts', async () => {
+    await fs.writeFile(path.join(contentDir, 'guide.md'), '# Guide\n\nUseful guide content for search.', 'utf8')
+
+    await generateSearchIndexJson()
+
+    const searchIndex = JSON.parse(await fs.readFile(path.join(publicDir, '_search-index.json'), 'utf8'))
+    expect(searchIndex).toEqual([
+      expect.objectContaining({
+        excerpt: 'Useful guide content for search.',
+        path: '/guide',
+        title: 'Guide',
+      }),
+    ])
+  })
+})

package/mdsite-nuxt/scripts/generate-indices.ts

@@ -31,6 +31,7 @@ function getSourceDir(): string {
  * Get target public directory
  */
 function getTargetDir(): string {
+    if (process.env.MDSITE_PUBLIC_DIR) return process.env.MDSITE_PUBLIC_DIR
     return path.resolve(__dirname, '..', 'public')
 }
 
@@ -325,6 +326,29 @@ function countNodes(nodes: MinimalTreeNode[]): number {
     return count
 }
 
+async function buildFallbackNavigationTree(sourceDir: string): Promise<MinimalTreeNode[]> {
+    const markdownFiles = await getAllMarkdownFiles(sourceDir)
+    const nodes: MinimalTreeNode[] = []
+
+    for (const [order, filePath] of markdownFiles.sort().entries()) {
+        const content = await fs.readFile(filePath, 'utf-8')
+        const metadata = extractMarkdownMetadata(content)
+        const urlPath = filePathToUrlPath(filePath, sourceDir)
+        const title = metadata.title ?? path.basename(filePath, '.md')
+
+        nodes.push({
+            id: `${urlPath.split('/').filter(Boolean).pop() || 'home'}-${order}`,
+            title,
+            path: urlPath,
+            type: 'link',
+            description: metadata.description,
+            isPrimary: true
+        })
+    }
+
+    return nodes
+}
+
 /**
  * Generate navigation JSON file
  */
@@ -343,9 +367,11 @@ export async function generateNavigationJson() {
     try {
         if (await fs.pathExists(menuPath)) {
             const menuContent = await fs.readFile(menuPath, 'utf-8')
-            const menuItems = parseYaml(menuContent) as MenuItemType[]
-            const result = await processMenuItems(menuItems, '/')
-            tree = result.nodes
+            const menuItems = parseYaml(menuContent) as MenuItemType[] | null
+            if (Array.isArray(menuItems) && menuItems.length > 0) {
+                const result = await processMenuItems(menuItems, '/')
+                tree = result.nodes
+            }
         } else {
             console.warn('⚠️ No _menu.yml or _menu.yaml found at:', menuPath)
         }
@@ -353,6 +379,10 @@ export async function generateNavigationJson() {
         console.error('Error building navigation tree:', error)
     }
 
+    if (tree.length === 0) {
+        tree = await buildFallbackNavigationTree(sourceDir)
+    }
+
     const targetDir = getTargetDir()
     const outputPath = path.join(targetDir, '_navigation.json')
 

package/mdsite-nuxt/scripts/renderer-hooks.test.ts

@@ -161,6 +161,40 @@ describe('renderer hooks orchestration', () => {
     expect(process.env.NUXT_CONTENT_PATH).toBe(path.join('/renderer', 'legacy-docs'))
   })
 
+  it('supports the checked-in legacy renderer config keys', () => {
+    resolveMdsiteConfigPathMock.mockReturnValue(undefined)
+    existsSyncMock.mockImplementation((target: string) => (
+      target === '/renderer/content.config.yml' || target === '/content/docs'
+    ))
+    parseYamlMock.mockReturnValue({
+      contentPath: '/content/docs',
+      contentGitRepo: 'https://example.test/docs.git',
+      siteCanonical: 'https://example.test',
+      siteName: 'Legacy Site',
+    })
+    loadMdsiteConfigSyncMock.mockReturnValue({
+      config: { site: { name: 'Legacy Site' } },
+      configPath: '/renderer/.mdsite-compat.yml',
+      contentDir: '/content/docs',
+    })
+
+    prepareRendererRuntime('/renderer')
+
+    expect(stringifyYamlMock).toHaveBeenCalledWith(expect.objectContaining({
+      server: expect.objectContaining({
+        repo: 'https://example.test/docs.git',
+      }),
+      site: expect.objectContaining({
+        canonical: 'https://example.test',
+        name: 'Legacy Site',
+      }),
+    }))
+    expect(loadMdsiteConfigSyncMock).toHaveBeenCalledWith({
+      configPath: '/renderer/.mdsite-compat.yml',
+      contentPath: '/content/docs',
+    })
+  })
+
   it('exits when no renderer config can be resolved', () => {
     const consoleErrorSpy = vi.spyOn(console, 'error').mockImplementation(() => {})
     const processExitSpy = vi.spyOn(process, 'exit').mockImplementation((code?: number) => {

package/mdsite-nuxt/scripts/renderer-hooks.ts

@@ -109,7 +109,8 @@ function ensureLegacyCompatibilityConfig(rootDir: string): string | undefined {
   }
 
   const legacyConfig = YAML.parse(fs.readFileSync(legacyConfigPath, 'utf8')) ?? {}
-  const contentDir = path.resolve(rootDir, legacyConfig.content?.path || legacyConfig.content?.git?.path || 'docs')
+  const legacyContentPath = legacyConfig.content?.path || legacyConfig.content?.git?.path || legacyConfig.contentPath || 'docs'
+  const contentDir = path.resolve(rootDir, legacyContentPath)
   const compatibilityConfigPath = path.join(rootDir, '.mdsite-compat.yml')
   const compatibilityConfig = {
     favicon: '',
@@ -121,11 +122,11 @@ function ensureLegacyCompatibilityConfig(rootDir: string): string | undefined {
     server: {
       output: '.output',
       path: '.mdsite',
-      repo: legacyConfig.content?.git?.repo || ''
+      repo: legacyConfig.content?.git?.repo || legacyConfig.contentGitRepo || ''
     },
     site: {
-      canonical: legacyConfig.site?.canonical || '',
-      name: legacyConfig.site?.name || path.basename(contentDir) || 'Site'
+      canonical: legacyConfig.site?.canonical || legacyConfig.siteCanonical || '',
+      name: legacyConfig.site?.name || legacyConfig.siteName || path.basename(contentDir) || 'Site'
     },
     themes: legacyConfig.themes || {}
   }

package/mdsite-nuxt/utils/base-url.ts

@@ -0,0 +1,25 @@
+export function withBasePath(pathname: string, baseURL = '/'): string {
+  if (isExternalOrHash(pathname)) return pathname
+
+  const normalizedBase = normalizeBaseURL(baseURL)
+  const normalizedPath = pathname.startsWith('/') ? pathname : `/${pathname}`
+
+  if (normalizedBase === '/') return normalizedPath
+  if (normalizedPath === normalizedBase.slice(0, -1) || normalizedPath.startsWith(normalizedBase)) return normalizedPath
+
+  return `${normalizedBase.slice(0, -1)}${normalizedPath}`
+}
+
+function normalizeBaseURL(baseURL: string): string {
+  if (!baseURL || baseURL === '/') return '/'
+
+  const withLeadingSlash = baseURL.startsWith('/') ? baseURL : `/${baseURL}`
+  return withLeadingSlash.endsWith('/') ? withLeadingSlash : `${withLeadingSlash}/`
+}
+
+function isExternalOrHash(pathname: string): boolean {
+  return pathname.startsWith('http://') ||
+    pathname.startsWith('https://') ||
+    pathname.startsWith('//') ||
+    pathname.startsWith('#')
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@life-and-dev/mdsite",
-  "version": "0.0.8",
+  "version": "0.0.15",
   "type": "module",
   "private": false,
   "description": "Local-first CLI that orchestrates mdsite-nuxt",
@@ -32,11 +32,11 @@
     "prepublishOnly": "npm test && npm run typecheck && npm run build && npm run verify:package"
   },
   "dependencies": {
-    "yaml": "^2.8.1"
+    "yaml": "^2.9.0"
   },
   "devDependencies": {
-    "@types/node": "^24.10.0",
-    "typescript": "^5.9.3",
-    "vitest": "^4.0.8"
+    "@types/node": "^26.0.1",
+    "typescript": "^6.0.3",
+    "vitest": "^4.1.9"
   }
 }