fumapress 0.2.5 → 0.3.1

package/dist/router.d.ts

@@ -1,11 +1,12 @@
-import { Config, ConfigContext, Layouts } from "./config.js";
+import { AppContext } from "./lib/shared.js";
+import { Config, ConfigContext } from "./config.js";
+import { Awaitable, RouteFns } from "./lib/types.js";
 import * as waku from "waku";
 
 //#region src/router.d.ts
-type RouterOptions<C extends ConfigContext = ConfigContext> = Partial<Layouts<C>>;
-declare function createRouter<C extends ConfigContext>(userConfig: Config<C>, routerOptions?: RouterOptions<NoInfer<C>>): {
-  extend: typeof waku.createPages;
-  createPages: () => ReturnType<typeof waku.createPages>;
+type Options = Parameters<typeof waku.createPages>[1];
+declare function createRouter<C extends ConfigContext>(userConfig: Config<C>): {
+  createPages: (fn?: (this: AppContext<C>, fns: RouteFns) => Awaitable<void>, options?: Options) => ReturnType<typeof waku.createPages>;
 };
 //#endregion
-export { RouterOptions, createRouter };
+export { createRouter };

package/dist/router.js

@@ -1,21 +1,18 @@
 import { parseConfig } from "./lib/shared.js";
 import * as waku from "waku";
-import { createElement } from "react";
-import { unstable_redirect } from "waku/router/server";
-//#region src/router.ts
-function createRouter(userConfig, routerOptions) {
+import { Fragment } from "react";
+import { jsx } from "react/jsx-runtime";
+import { unstable_notFound, unstable_redirect } from "waku/router/server";
+//#region src/router.tsx
+function createRouter(userConfig) {
 	async function init() {
 		const context = parseConfig(userConfig);
-		for (const plugin of context.plugins) plugin.init?.call(context);
-		const layouts = {
-			...userConfig.layouts,
-			...routerOptions
-		};
+		for (const plugin of context.plugins) await plugin.init?.call(context);
 		return {
 			context,
-			root: layouts?.root ?? (await import("./layouts/root.js")).createRootLayout(),
-			page: layouts.page ?? (await import("./layouts/docs.js")).createDocsLayout(),
-			notFound: layouts.notFound ?? (await import("fumadocs-ui/layouts/home/not-found")).DefaultNotFound
+			root: context.layouts.root ?? (await import("./layouts/root.js")).createRootLayout(),
+			page: context.layouts.page ?? (await import("./layouts/docs.js")).createDocsLayoutPage(),
+			notFound: context.layouts.notFound ?? (await import("fumadocs-ui/layouts/home/not-found")).DefaultNotFound
 		};
 	}
 	const createPages = (base, createPagesOptions) => {
@@ -38,36 +35,50 @@ function createRouter(userConfig, routerOptions) {
 					});
 				}
 			};
-			await base(fns);
-			for (const plugin of context.plugins) await plugin.createPages?.call(context, fns);
+			await base?.call(context, fns);
+			const resolved = /* @__PURE__ */ new Set();
+			const createPagesCtx = {
+				...context,
+				markResolved(page) {
+					resolved.add(page);
+				}
+			};
+			for (const plugin of context.plugins) await plugin.createPages?.call(createPagesCtx, fns);
+			const source = await context.getLoader();
+			const staticPaths = [];
+			for (const page of source.getPages()) {
+				if (resolved.has(page)) continue;
+				staticPaths.push(page.locale ? [page.locale, ...page.slugs] : page.slugs);
+			}
 			const defaultRenderMode = context.mode === "dynamic" ? "dynamic" : "static";
 			if (context.i18nConfig) {
 				fns.createRoot({
 					render: defaultRenderMode,
-					component({ children }) {
-						return children;
-					}
+					component: Fragment
 				});
 				fns.createLayout({
 					render: defaultRenderMode,
 					path: "/[lang]",
 					component({ children, lang }) {
-						return createElement(layouts.root, {
+						return /* @__PURE__ */ jsx(layouts.root, {
 							lang,
-							children,
-							...context
+							ctx: context,
+							children
 						});
 					}
 				});
 				fns.createPage({
 					render: defaultRenderMode,
 					path: "/[lang]/[...slugs]",
-					staticPaths: (await context.getLoader()).getPages().map((page) => [page.locale, ...page.slugs]),
-					component({ slugs, lang }) {
-						return createElement(layouts.page, {
+					staticPaths,
+					async component({ slugs, lang }) {
+						const page = (await context.getLoader()).getPage(slugs, lang);
+						if (!page || resolved.has(page)) unstable_notFound();
+						return /* @__PURE__ */ jsx(layouts.page, {
 							lang,
 							slugs,
-							...context
+							page,
+							ctx: context
 						});
 					}
 				});
@@ -76,9 +87,9 @@ function createRouter(userConfig, routerOptions) {
 					path: "/[lang]/404",
 					staticPaths: Object.keys(context.i18nConfig.languages),
 					component({ lang }) {
-						return createElement(layouts.notFound, {
+						return /* @__PURE__ */ jsx(layouts.notFound, {
 							lang,
-							...context
+							ctx: context
 						});
 					}
 				});
@@ -93,20 +104,23 @@ function createRouter(userConfig, routerOptions) {
 				fns.createRoot({
 					render: defaultRenderMode,
 					component({ children }) {
-						return createElement(layouts.root, {
-							children,
-							...context
+						return /* @__PURE__ */ jsx(layouts.root, {
+							ctx: context,
+							children
 						});
 					}
 				});
 				fns.createPage({
 					render: defaultRenderMode,
 					path: "/[...slugs]",
-					staticPaths: (await context.getLoader()).getPages().map((page) => page.slugs),
-					component({ slugs }) {
-						return createElement(layouts.page, {
+					staticPaths,
+					async component({ slugs }) {
+						const page = (await context.getLoader()).getPage(slugs);
+						if (!page || resolved.has(page)) unstable_notFound();
+						return /* @__PURE__ */ jsx(layouts.page, {
 							slugs,
-							...context
+							page,
+							ctx: context
 						});
 					}
 				});
@@ -115,19 +129,14 @@ function createRouter(userConfig, routerOptions) {
 					staticPaths: [],
 					path: "/404",
 					component() {
-						return createElement(layouts.notFound, context);
+						return /* @__PURE__ */ jsx(layouts.notFound, { ctx: context });
 					}
 				});
 			}
 			return null;
 		}, createPagesOptions);
 	};
-	return {
-		extend: createPages,
-		createPages() {
-			return createPages(() => null);
-		}
-	};
+	return { createPages };
 }
 //#endregion
 export { createRouter };

package/dist/vite.d.ts

@@ -1,6 +1,14 @@
-import { PluginOption } from "vite";
+import { Plugin } from "vite";
 
 //#region src/vite.d.ts
-declare function press(): PluginOption;
+interface PluginOptions {
+  /**
+   * Auto-generate Vite config to handle CJS bundling.
+   *
+   * @default true
+   */
+  generateViteConfig?: boolean;
+}
+declare function press(options?: PluginOptions): Plugin;
 //#endregion
-export { press as default };
+export { PluginOptions, press as default };

package/dist/vite.js

@@ -1,12 +1,11 @@
 import { crawlFrameworkPkgs } from "./lib/vitefu.js";
 //#region src/vite.ts
-function press() {
-	return pressCore();
-}
-function pressCore() {
+function press(options = {}) {
+	const { generateViteConfig = true } = options;
 	return {
 		name: "fumapress:core",
 		async config(_, { command }) {
+			if (!generateViteConfig) return;
 			const out = await crawlFrameworkPkgs({
 				root: process.cwd(),
 				isBuild: command === "build",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fumapress",
-  "version": "0.2.5",
+  "version": "0.3.1",
   "description": "An opinionated docs framework powered by Fumadocs",
   "keywords": [
     "Docs",
@@ -20,12 +20,20 @@
   "exports": {
     ".": "./dist/index.js",
     "./adapters/mdx": "./dist/adapters/mdx.js",
+    "./adapters/mdx/schema": "./dist/adapters/mdx/schema.js",
+    "./adapters/openapi": "./dist/adapters/openapi.js",
+    "./layouts/blog": "./dist/layouts/blog.js",
+    "./layouts/blog.index": "./dist/layouts/blog.index.js",
+    "./layouts/blog.tags": "./dist/layouts/blog.tags.js",
     "./layouts/docs": "./dist/layouts/docs.js",
     "./layouts/home": "./dist/layouts/home.js",
     "./layouts/notebook": "./dist/layouts/notebook.js",
     "./layouts/root": "./dist/layouts/root.js",
+    "./layouts/switch": "./dist/layouts/switch.js",
+    "./plugins/blog": "./dist/plugins/blog.js",
     "./plugins/flexsearch": "./dist/plugins/flexsearch.js",
     "./plugins/llms.txt": "./dist/plugins/llms.txt.js",
+    "./plugins/openapi": "./dist/plugins/openapi.js",
     "./plugins/orama-search": "./dist/plugins/orama-search.js",
     "./plugins/takumi": "./dist/plugins/takumi.js",
     "./router": "./dist/router.js",
@@ -40,32 +48,42 @@
   "dependencies": {
     "@orama/orama": "^3.1.18",
     "@takumi-rs/image-response": "^1.1.2",
+    "class-variance-authority": "^0.7.1",
     "flexsearch": "^0.8.212",
-    "fumadocs-core": "^16.8.10",
-    "fumadocs-ui": "^16.8.10",
-    "tailwind-merge": "^3.5.0",
-    "vite": "^8.0.11",
-    "waku": "1.0.0-alpha.10"
+    "fumadocs-core": "^16.8.11",
+    "fumadocs-ui": "^16.8.11",
+    "lucide-react": "^1.16.0",
+    "tailwind-merge": "^3.6.0",
+    "vite": "^8.0.13",
+    "zod": "^4.4.3"
   },
   "devDependencies": {
+    "@fastify/deepmerge": "^3.2.1",
     "@tailwindcss/oxide": "^4.3.0",
     "@types/mdx": "^2.0.13",
-    "@types/node": "^25.7.0",
+    "@types/node": "^25.8.0",
     "@types/react": "^19.2.14",
-    "fumadocs-mdx": "^15.0.4",
+    "fumadocs-mdx": "^15.0.6",
+    "fumadocs-openapi": "^10.8.5",
     "react": "^19.2.6",
     "react-dom": "^19.2.6",
     "tsdown": "0.22.0",
-    "typescript": "^6.0.3"
+    "typescript": "^6.0.3",
+    "waku": "1.0.0-beta.0"
   },
   "peerDependencies": {
     "@types/mdx": "*",
     "@types/react": "*",
     "fumadocs-mdx": "^15.0.0",
+    "fumadocs-openapi": "^10.8.0",
     "react": "^19.2.0",
-    "react-dom": "^19.2.0"
+    "react-dom": "^19.2.0",
+    "waku": "1.0.0-beta.0"
   },
   "peerDependenciesMeta": {
+    "fumadocs-openapi": {
+      "optional": true
+    },
     "@types/mdx": {
       "optional": true
     },
@@ -76,8 +94,11 @@
       "optional": true
     }
   },
+  "inlinedDependencies": {
+    "@fastify/deepmerge": "3.2.1"
+  },
   "scripts": {
-    "dev": "tsdown --watch",
+    "dev": "tsdown --watch --clean false",
     "build": "tsdown",
     "types:check": "tsc --noEmit"
   }