openmanual 0.15.2 → 0.16.0

package/dist/bin.js

@@ -15,6 +15,18 @@ const LogoSchema = z.union([z.string(), z.object({
 	light: z.string(),
 	dark: z.string()
 })]);
+/** Logo 显示位置 */
+const LogoPositionSchema = z.enum(["sidebar", "header"]);
+/**
+* 顶级 Logo 配置（支持字符串简写和对象形式）
+* - 字符串简写: "/logo.svg" → { light, dark: 同值, position: 'sidebar' }
+* - 对象形式: { light, dark, position? }
+*/
+const TopLevelLogoSchema = z.union([z.string(), z.object({
+	light: z.string(),
+	dark: z.string(),
+	position: LogoPositionSchema.optional()
+})]);
 const FaviconSchema = z.string();
 const NavbarSchema = z.object({
 	logo: LogoSchema.optional(),
@@ -96,6 +108,7 @@ const OpenManualConfigSchema = z.object({
 	locale: z.string().optional(),
 	contentPolicy: z.enum(["strict", "all"]).optional(),
 	favicon: FaviconSchema.optional(),
+	logo: TopLevelLogoSchema.optional(),
 	navbar: NavbarSchema.optional(),
 	header: TopBarSchema.optional(),
 	footer: FooterSchema.optional(),
@@ -145,6 +158,51 @@ function isSeparateTabMode(config) {
 function isHeaderEnabled(config) {
 	return config.header !== void 0;
 }
+/**
+* 将顶级 logo 配置标准化为 { light, dark } 形式
+*/
+function normalizeTopLevelLogo(logo) {
+	if (typeof logo === "string") return {
+		light: logo,
+		dark: logo,
+		position: "sidebar"
+	};
+	return {
+		light: logo.light,
+		dark: logo.dark,
+		position: logo.position ?? "sidebar"
+	};
+}
+/**
+* 解析有效的 Logo 配置（统一优先级链）
+*
+* 优先级：
+* 1. config.logo（新顶级配置）
+* 2. config.navbar.logo（旧 sidebar logo）
+* 3. config.header.logo（旧 header logo）
+* 4. undefined（调用方回退到 config.name）
+*/
+function resolveEffectiveLogo(config) {
+	if (config.logo) {
+		const { position, ...source } = normalizeTopLevelLogo(config.logo);
+		return {
+			source,
+			position
+		};
+	}
+	if (config.navbar?.logo) return {
+		source: config.navbar.logo,
+		position: "sidebar"
+	};
+	if (config.header?.logo) return {
+		source: config.header.logo,
+		position: "header"
+	};
+	return {
+		source: void 0,
+		position: "sidebar"
+	};
+}
 
 //#endregion
 //#region src/core/config/loader.ts
@@ -183,17 +241,31 @@ async function loadConfig(cwd = process.cwd()) {
 	return mergeDefaults(result.data);
 }
 function mergeDefaults(config) {
+	const topLevelLogo = config.logo ? normalizeTopLevelLogo(config.logo) : null;
+	const topLevelLogoSource = topLevelLogo ? topLevelLogo.light === topLevelLogo.dark ? topLevelLogo.light : {
+		light: topLevelLogo.light,
+		dark: topLevelLogo.dark
+	} : null;
 	return {
 		...config,
 		contentPolicy: config.contentPolicy ?? "strict",
 		contentDir: config.contentDir ?? DEFAULT_CONFIG.contentDir ?? "content",
 		outputDir: config.outputDir ?? DEFAULT_CONFIG.outputDir ?? "dist",
 		locale: config.locale ?? DEFAULT_CONFIG.locale ?? "zh",
+		logo: topLevelLogo ? typeof config.logo === "string" ? config.logo : {
+			light: topLevelLogo.light,
+			dark: topLevelLogo.dark,
+			position: topLevelLogo.position
+		} : void 0,
 		navbar: {
 			...DEFAULT_CONFIG.navbar,
 			...config.navbar,
-			logo: config.navbar?.logo ?? config.name
+			logo: config.navbar?.logo ?? (topLevelLogo && topLevelLogo.position === "sidebar" ? topLevelLogoSource ?? config.name : config.name)
 		},
+		header: config.header ? {
+			...config.header,
+			logo: config.header.logo ?? (topLevelLogo && topLevelLogo.position === "header" ? topLevelLogoSource ?? void 0 : void 0)
+		} : void 0,
 		footer: {
 			...DEFAULT_CONFIG.footer,
 			...config.footer,
@@ -486,11 +558,6 @@ ${config.search?.position === "header" ? `
   display: none;
 }
 ` : ""}
-
-/* 隐藏侧边栏顶部导航区域（logo/标题 + 折叠按钮容器） */
-#nd-sidebar > div:first-child {
-  display: none;
-}
 `;
 }
 
@@ -604,7 +671,7 @@ function generateLibSource(ctx) {
 	if (isOpenApiEnabled(ctx.config)) {
 		const separateTab = isSeparateTabMode(ctx.config);
 		const groupBy = ctx.config.openapi?.groupBy ?? "tag";
-		if (isI18n) return `import { docs } from 'collections/server';
+		if (isI18n) return `import { docs } from '@/.source/server';
 import { loader, multiple } from 'fumadocs-core/source';
 import { openapiPlugin, openapiSource } from 'fumadocs-openapi/server';
 import { openapi } from '@/lib/openapi';
@@ -631,7 +698,7 @@ export const source = loader(
   },
 );
 `;
-		return `import { docs } from 'collections/server';
+		return `import { docs } from '@/.source/server';
 import { loader, multiple } from 'fumadocs-core/source';
 import { openapiPlugin, openapiSource } from 'fumadocs-openapi/server';
 import { openapi } from '@/lib/openapi';
@@ -651,7 +718,7 @@ ${!separateTab ? `      meta: true,\n      groupBy: '${groupBy}',` : ""}
 );
 `;
 	}
-	if (isI18n) return `import { docs } from 'collections/server';
+	if (isI18n) return `import { docs } from '@/.source/server';
 import { loader } from 'fumadocs-core/source';
 import { i18n } from '@/lib/i18n';
 
@@ -661,7 +728,7 @@ export const source = loader({
   i18n,
 });
 `;
-	return `import { docs } from 'collections/server';
+	return `import { docs } from '@/.source/server';
 import { loader } from 'fumadocs-core/source';
 
 export const source = loader({
@@ -733,11 +800,6 @@ const config = {
   images: {
     unoptimized: true,
   },${rewritesBlock}
-  turbopack: {
-    resolveAlias: {
-      'collections/*': './.source/*',
-    },
-  },
 };
 
 export default withMDX(config);
@@ -794,7 +856,7 @@ export const APIPage = createAPIPage(openapi, {
 //#endregion
 //#region src/core/generator/package-json.ts
 function getOpenManualVersion() {
-	return "0.15.2";
+	return "0.16.0";
 }
 function generatePackageJson(ctx) {
 	const openmanualVersion = getOpenManualVersion();
@@ -874,7 +936,13 @@ import { Callout, CalloutTitle, CalloutDescription } from '@/components/callout'
 ${allowedSlugsSnippet}
 export default async function Page({ params }: { params: Promise<{ slug?: string[] }> }) {
   const { slug } = await params;
-  const page = source.getPage(slug);
+  let page = source.getPage(slug);
+  // Fallback: when slug is empty (root path /) and getPage returns undefined,
+  // try ['index'] — fumadocs-core's slugsPlugin may assign ["index"] to index.mdx
+  // due to slug de-duplication conflict, causing getPage([]) to miss it.
+  if (!page && (!slug || slug.length === 0)) {
+    page = source.getPage(['index']);
+  }
 ${isStrict ? `
   if (!isAllowed(slug)) {
     notFound();
@@ -922,14 +990,16 @@ export function generateStaticParams() {
   let params = source.generateParams();
   params = params.filter((p: { slug: string[] }) => isAllowed(p.slug));
   if (!params.some((p: { slug: string[] }) => p.slug.length === 0)) {
-    params.unshift({ ...params[0], slug: [] });
+    const homepage = params.find((p: { slug: string[] }) => p.slug.length === 1 && p.slug[0] === 'index');
+    params.unshift({ ...(homepage ?? params[0]), slug: [] });
   }
   return params;
 }` : `
 export function generateStaticParams() {
   const params = source.generateParams();
   if (!params.some((p: { slug: string[] }) => p.slug.length === 0)) {
-    params.unshift({ ...params[0], slug: [] });
+    const homepage = params.find((p: { slug: string[] }) => p.slug.length === 1 && p.slug[0] === 'index');
+    params.unshift({ ...(homepage ?? params[0]), slug: [] });
   }
   return params;
 }`}
@@ -960,7 +1030,13 @@ import { Callout, CalloutTitle, CalloutDescription } from '@/components/callout'
 ${allowedSlugsSnippet}
 export default async function Page({ params }: { params: Promise<{ slug?: string[]; lang: string }> }) {
   const { slug, lang } = await params;
-  const page = source.getPage(slug, lang);
+  let page = source.getPage(slug, lang);
+  // Fallback: when slug is empty (root path /) and getPage returns undefined,
+  // try ['index'] — fumadocs-core's slugsPlugin may assign ["index"] to index.mdx
+  // due to slug de-duplication conflict, causing getPage([], lang) to miss it.
+  if (!page && (!slug || slug.length === 0)) {
+    page = source.getPage(['index'], lang);
+  }
 ${isStrict ? `
   if (!isAllowed(slug, lang)) {
     notFound();
@@ -1011,9 +1087,10 @@ export function generateStaticParams() {
   const languages = [...new Set(params.map((p: { lang: string }) => p.lang))];
   for (const lang of languages) {
     if (!params.some((p: { slug: string[]; lang: string }) => p.slug.length === 0 && p.lang === lang)) {
-      const firstForLang = params.find((p: { slug: string[]; lang: string }) => p.lang === lang);
-      if (firstForLang) {
-        params.unshift({ ...firstForLang, slug: [] });
+      const homepage = params.find((p: { slug: string[]; lang: string }) => p.slug.length === 1 && p.slug[0] === 'index' && p.lang === lang);
+      const fallback = params.find((p: { slug: string[]; lang: string }) => p.lang === lang);
+      if (homepage || fallback) {
+        params.unshift({ ...(homepage ?? fallback!), slug: [], lang });
       }
     }
   }
@@ -1025,9 +1102,10 @@ export function generateStaticParams() {
   const languages = [...new Set(params.map((p: { lang: string }) => p.lang))];
   for (const lang of languages) {
     if (!params.some((p: { slug: string[]; lang: string }) => p.slug.length === 0 && p.lang === lang)) {
-      const firstForLang = params.find((p: { slug: string[]; lang: string }) => p.lang === lang);
-      if (firstForLang) {
-        params.unshift({ ...firstForLang, slug: [] });
+      const homepage = params.find((p: { slug: string[]; lang: string }) => p.slug.length === 1 && p.slug[0] === 'index' && p.lang === lang);
+      const fallback = params.find((p: { slug: string[]; lang: string }) => p.lang === lang);
+      if (homepage || fallback) {
+        params.unshift({ ...(homepage ?? fallback!), slug: [], lang });
       }
     }
   }
@@ -1769,10 +1847,13 @@ async function generateAll(ctx) {
 		await mkdir(join(fullPath, ".."), { recursive: true });
 		await writeFile(fullPath, file.content, "utf-8");
 	}
-	const logo = ctx.config.navbar?.logo;
-	if (logo && typeof logo === "string" && isImagePath(logo)) await ensureLogoFile(ctx, logo, "light");
-	else if (logo && typeof logo === "object") {
-		const { light, dark } = resolveLogoPaths(logo);
+	const rawLogo = ctx.config.logo != null ? typeof ctx.config.logo === "string" ? ctx.config.logo : {
+		light: ctx.config.logo.light,
+		dark: ctx.config.logo.dark
+	} : ctx.config.navbar?.logo;
+	if (rawLogo && typeof rawLogo === "string" && isImagePath(rawLogo)) await ensureLogoFile(ctx, rawLogo, "light");
+	else if (rawLogo && typeof rawLogo === "object") {
+		const { light, dark } = resolveLogoPaths(rawLogo);
 		if (isImagePath(light)) await ensureLogoFile(ctx, light, "light");
 		if (isImagePath(dark) && dark !== light) await ensureLogoFile(ctx, dark, "dark");
 	}
@@ -1855,6 +1936,11 @@ function generateDocsLayout(ctx) {
 	const isOApi = isOpenApiEnabled(config);
 	const rootGroups = ctx.rootGroups;
 	const isHeaderSearch = config.search?.position === "header";
+	const { source: logoSource, position: logoPosition } = resolveEffectiveLogo(config);
+	const hasSidebarLogo = logoSource !== void 0 && logoPosition === "sidebar";
+	const sidebarLogoImport = hasSidebarLogo ? "\nimport { NavLogo } from 'openmanual/components/nav-layout';" : "";
+	const sidebarLogoProps = hasSidebarLogo ? resolveNavLogoProps(logoSource, config.name) : null;
+	const sidebarBannerLine = hasSidebarLogo && sidebarLogoProps && !sidebarLogoProps.includes("type=\"text\"") ? `\n    banner: <NavLogo ${sidebarLogoProps} />,` : "";
 	const linksArray = navLinks.map((l) => ({
 		text: l.label,
 		url: l.href,
@@ -1876,7 +1962,7 @@ function generateDocsLayout(ctx) {
 	if (isI18n) return `import { DocsLayout } from 'fumadocs-ui/layouts/docs';
 import { baseOptions } from '@/lib/layout';
 import { source } from '@/lib/source';
-import type { ReactNode } from 'react';${configDesc ? `\nconst configDescription = '${configDesc.replace(/'/g, "\\'")}' as const;\n` : ""}
+import type { ReactNode } from 'react';${sidebarLogoImport}${configDesc ? `\nconst configDescription = '${configDesc.replace(/'/g, "\\'")}' as const;\n` : ""}
 export default async function DocsLayoutWrapper({
   params,
   children,
@@ -1894,7 +1980,8 @@ ${isOApi && separateTab ? `  const _omFirstApi = source.getPages(lang)?.find((p:
   const docsOptions = {
     ...baseOptions(lang),
     ${treeLine}${sidebarTabsLine}${githubLine}${linksLine}${footerLine}${configDesc ? "\n    description: siteDescription," : ""}${isHeaderSearch ? "\n    searchToggle: { enabled: false }," : ""}
-    sidebar: { collapsible: false },
+    sidebar: { collapsible: false,${sidebarBannerLine}
+    },
   };
 
   return (
@@ -1907,14 +1994,15 @@ ${isOApi && separateTab ? `  const _omFirstApi = source.getPages(lang)?.find((p:
 	return `import { DocsLayout } from 'fumadocs-ui/layouts/docs';
 import { baseOptions } from '@/lib/layout';
 import { source } from '@/lib/source';
-import type { ReactNode } from 'react';${isOApi && separateTab ? `
+import type { ReactNode } from 'react';${sidebarLogoImport}${isOApi && separateTab ? `
 const _omFirstApi = source.getPages()?.find((p: any) => p.data?.type === 'openapi');
 const _omApiUrl = _omFirstApi?.url ?? '/openapi';
 ` : ""}
 const docsOptions = {
   ...baseOptions(),
   ${treeLine}${sidebarTabsLine}${githubLine}${linksLine}${footerLine}${descLine}${isHeaderSearch ? "\n  searchToggle: { enabled: false }," : ""}
-  sidebar: { collapsible: false },
+  sidebar: { collapsible: false,${sidebarBannerLine}
+  },
 };
 
 export default function DocsLayoutWrapper({ children }: { children: ReactNode }) {
@@ -2544,7 +2632,7 @@ const regenerateCommand = new Command("_regenerate").description("内部命令
 //#endregion
 //#region src/cli/bin.ts
 function getVersion() {
-	return "0.15.2";
+	return "0.16.0";
 }
 const program = new Command();
 const commandName = basename(process.argv[1] ?? "openmanual");