fumadocs-core 15.2.5 → 15.2.6

package/dist/breadcrumb.d.ts

@@ -1,5 +1,5 @@
 import { ReactNode } from 'react';
-import { R as Root, N as Node } from './page-tree-9q98UqWL.js';
+import { R as Root, N as Node } from './page-tree-BG3wP0gU.js';
 
 interface BreadcrumbItem {
     name: ReactNode;

package/dist/{page-tree-9q98UqWL.d.ts → page-tree-BG3wP0gU.d.ts}

@@ -8,6 +8,9 @@ interface Root {
 type Node = Item | Separator | Folder;
 interface Item {
     $id?: string;
+    /**
+     * @internal
+     */
     $ref?: {
         file: string;
     };
@@ -26,6 +29,9 @@ interface Separator {
 }
 interface Folder {
     $id?: string;
+    /**
+     * @internal
+     */
     $ref?: {
         metaFile?: string;
     };

package/dist/search/server.d.ts

@@ -6,7 +6,7 @@ import { LoaderOutput, LoaderConfig, InferPageType } from '../source/index.js';
 import 'mdast';
 import 'unified';
 import 'react';
-import '../page-tree-9q98UqWL.js';
+import '../page-tree-BG3wP0gU.js';
 
 type AdvancedDocument = TypedDocument<Orama<typeof advancedSchema>>;
 declare const advancedSchema: {

package/dist/server/index.d.ts

@@ -1,6 +1,6 @@
 export { a as TOCItemType, T as TableOfContents, g as getTableOfContents } from '../get-toc-Cr2URuiP.js';
-import { N as Node, I as Item, R as Root, F as Folder } from '../page-tree-9q98UqWL.js';
-export { p as PageTree } from '../page-tree-9q98UqWL.js';
+import { N as Node, I as Item, R as Root, F as Folder } from '../page-tree-BG3wP0gU.js';
+export { p as PageTree } from '../page-tree-BG3wP0gU.js';
 export { S as SortedResult } from '../types-Ch8gnVgO.js';
 import { Metadata } from 'next';
 import { NextRequest } from 'next/server';

package/dist/source/index.d.ts

@@ -1,6 +1,6 @@
 import { ReactElement } from 'react';
 import { I as I18nConfig } from '../config-inq6kP6y.js';
-import { R as Root, I as Item, F as Folder$1, S as Separator } from '../page-tree-9q98UqWL.js';
+import { R as Root, I as Item, F as Folder$1, S as Separator } from '../page-tree-BG3wP0gU.js';
 
 interface FileInfo {
     /**
@@ -142,8 +142,8 @@ interface LoaderOutput<Config extends LoaderConfig> {
      * @param language - If empty, the default language will be used
      */
     getPage: (slugs: string[] | undefined, language?: string) => Page<Config['source']['pageData']> | undefined;
-    getNodePage: (node: Item) => Page<Config['source']['pageData']> | undefined;
-    getNodeMeta: (node: Folder$1) => Meta<Config['source']['metaData']> | undefined;
+    getNodePage: (node: Item, language?: string) => Page<Config['source']['pageData']> | undefined;
+    getNodeMeta: (node: Folder$1, language?: string) => Meta<Config['source']['metaData']> | undefined;
     /**
      * generate static params for Next.js SSG
      */

package/dist/source/index.js

@@ -32,17 +32,12 @@ function buildAll(nodes, ctx, skipIndex) {
       const treeNode = buildFileNode(localized ?? node, ctx);
       if (node.file.name === "index") {
         if (!skipIndex) output.unshift(treeNode);
-        continue;
+      } else {
+        output.push(treeNode);
       }
-      output.push(treeNode);
     }
     if ("children" in node) {
-      const folder = buildFolderNode(node, false, ctx);
-      if (folder.children.length === 0 && folder.index) {
-        output.push(folder.index);
-      } else {
-        folders.push(folder);
-      }
+      folders.push(buildFolderNode(node, false, ctx));
     }
   }
   output.push(...folders);
@@ -94,19 +89,16 @@ function resolveFolderItem(folder, item, ctx, idx, addedNodePaths) {
 function buildFolderNode(folder, isGlobalRoot, ctx) {
   const metaPath = joinPath(folder.file.path, "meta");
   const meta = ctx.localeStorage?.read(metaPath, "meta") ?? ctx.storage.read(metaPath, "meta");
-  const indexFile = ctx.storage.read(
-    joinPath(folder.file.path, "index"),
-    "page"
-  );
-  const metadata = meta?.data;
-  const isRoot = metadata?.root ?? isGlobalRoot;
+  const indexPath = joinPath(folder.file.path, "index");
+  const indexFile = ctx.localeStorage?.read(indexPath, "page") ?? ctx.storage.read(indexPath, "page");
+  const isRoot = meta?.data.root ?? isGlobalRoot;
   const index = indexFile ? buildFileNode(indexFile, ctx) : void 0;
+  const addedNodePaths = /* @__PURE__ */ new Set();
   let children;
-  if (!metadata?.pages) {
+  if (!meta?.data.pages) {
     children = buildAll(folder.children, ctx, !isRoot);
   } else {
-    const addedNodePaths = /* @__PURE__ */ new Set();
-    const resolved = metadata?.pages?.flatMap((item, i) => {
+    const resolved = meta.data.pages.flatMap((item, i) => {
       return resolveFolderItem(folder, item, ctx, i, addedNodePaths);
     });
     const restNodes = buildAll(
@@ -126,13 +118,13 @@ function buildFolderNode(folder, isGlobalRoot, ctx) {
   }
   const node = {
     type: "folder",
-    name: metadata?.title ?? index?.name ?? // resolve folder groups like (group_name)
+    name: meta?.data.title ?? index?.name ?? // resolve folder groups like (group_name)
     pathToName(group.exec(folder.file.name)?.[1] ?? folder.file.name),
-    icon: ctx.options.resolveIcon?.(metadata?.icon) ?? index?.icon,
-    root: metadata?.root,
-    defaultOpen: metadata?.defaultOpen,
-    description: metadata?.description,
-    index,
+    icon: ctx.options.resolveIcon?.(meta?.data.icon) ?? index?.icon,
+    root: meta?.data.root,
+    defaultOpen: meta?.data.defaultOpen,
+    description: meta?.data.description,
+    index: isRoot || indexFile && !addedNodePaths.has(indexFile.file.path) ? index : void 0,
     children,
     $id: folder.file.path,
     $ref: !ctx.options.noRef ? {
@@ -360,30 +352,33 @@ function dotParser(path) {
 function indexPages(storages, getUrl, i18n) {
   const defaultLanguage = i18n?.defaultLanguage ?? "";
   const map = /* @__PURE__ */ new Map();
-  const pathToFile = /* @__PURE__ */ new Map();
+  const fileMapped = /* @__PURE__ */ new WeakMap();
   for (const item of storages[defaultLanguage].list()) {
-    if (item.format === "meta")
-      pathToFile.set(item.file.path, fileToMeta(item));
+    if (item.format === "meta") {
+      fileMapped.set(item, fileToMeta(item));
+    }
     if (item.format === "page") {
       const page = fileToPage(item, getUrl, defaultLanguage);
-      pathToFile.set(item.file.path, page);
+      fileMapped.set(item, page);
       map.set(`${defaultLanguage}.${page.slugs.join("/")}`, page);
       if (!i18n) continue;
       const path = joinPath(item.file.dirname, item.file.name);
       for (const lang of i18n.languages) {
         if (lang === defaultLanguage) continue;
-        const localizedPage = fileToPage(
-          storages[lang].read(path, "page") ?? item,
-          getUrl,
-          lang
-        );
+        const localizedItem = storages[lang].read(path, "page");
+        const localizedPage = fileToPage(localizedItem ?? item, getUrl, lang);
+        if (localizedItem) {
+          fileMapped.set(localizedItem, localizedPage);
+        }
         map.set(`${lang}.${localizedPage.slugs.join("/")}`, localizedPage);
       }
     }
   }
   return {
     pages: map,
-    pathToFile
+    getResultFromFile(file) {
+      return fileMapped.get(file);
+    }
   };
 }
 function createGetUrl(baseUrl, i18n) {
@@ -500,9 +495,17 @@ function createOutput(options) {
     getPage(slugs = [], language = options.i18n?.defaultLanguage ?? "") {
       return walker.pages.get(`${language}.${slugs.join("/")}`);
     },
-    getNodeMeta(node) {
-      if (!node.$ref?.metaFile) return;
-      return walker.pathToFile.get(node.$ref.metaFile);
+    getNodeMeta(node, language = options.i18n?.defaultLanguage ?? "") {
+      const ref = node.$ref?.metaFile;
+      if (!ref) return;
+      const file = storages[language].list().find((v) => v.format === "meta" && v.file.path === ref);
+      if (file) return walker.getResultFromFile(file);
+    },
+    getNodePage(node, language = options.i18n?.defaultLanguage ?? "") {
+      const ref = node.$ref?.file;
+      if (!ref) return;
+      const file = storages[language].list().find((v) => v.format === "page" && v.file.path === ref);
+      if (file) return walker.getResultFromFile(file);
     },
     getPageTree(locale) {
       if (options.i18n) {
@@ -510,11 +513,6 @@ function createOutput(options) {
       }
       return this.pageTree;
     },
-    getNodePage(node) {
-      const ref = node.$ref?.file ?? node.$id;
-      if (!ref) return;
-      return walker.pathToFile.get(ref);
-    },
     // @ts-expect-error -- ignore this
     generateParams(slug, lang) {
       if (options.i18n) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fumadocs-core",
-  "version": "15.2.5",
+  "version": "15.2.6",
   "description": "The library for building a documentation website in Next.js",
   "keywords": [
     "NextJs",
@@ -97,7 +97,7 @@
     "@algolia/client-search": "4.24.0",
     "@mdx-js/mdx": "^3.1.0",
     "@oramacloud/client": "^2.1.4",
-    "@tanstack/react-router": "^1.114.34",
+    "@tanstack/react-router": "^1.115.2",
     "@types/estree-jsx": "^1.0.5",
     "@types/hast": "^3.0.4",
     "@types/mdast": "^4.0.3",