fumadocs-core 15.1.0 → 15.1.1

package/dist/{chunk-Q73QZKHO.js → chunk-62S4EN7J.js}

@@ -2,7 +2,7 @@ import {
   _highlight,
   _renderHighlight,
   highlight
-} from "./chunk-E7AASGCN.js";
+} from "./chunk-BUCUQ3WX.js";
 
 // src/highlight/client.tsx
 import {

package/dist/{chunk-E7AASGCN.js → chunk-BUCUQ3WX.js}

@@ -19,9 +19,8 @@ var defaultThemes = {
   light: "github-light",
   dark: "github-dark"
 };
-var defaultEngine;
+var highlighters = /* @__PURE__ */ new Map();
 async function _highlight(code, options) {
-  const { getSingletonHighlighter } = await import("shiki");
   const { lang, components: _, engine, ...rest } = options;
   let themes = { themes: defaultThemes };
   if ("theme" in options && options.theme) {
@@ -29,11 +28,9 @@ async function _highlight(code, options) {
   } else if ("themes" in options && options.themes) {
     themes = { themes: options.themes };
   }
-  const highlighter = await getSingletonHighlighter({
+  const highlighter = await getHighlighter("custom", {
+    engine,
     langs: [lang],
-    engine: engine ?? (defaultEngine ??= await import("shiki/engine/oniguruma").then(
-      (res) => res.createOnigurumaEngine(import("shiki/wasm"))
-    )),
     themes: "theme" in themes ? [themes.theme] : Object.values(themes.themes).filter((v) => v !== void 0)
   });
   return highlighter.codeToHast(code, {
@@ -53,6 +50,38 @@ function _renderHighlight(hast, options) {
     Fragment
   });
 }
+async function getHighlighter(engineType, options) {
+  const { createHighlighter } = await import("shiki");
+  let highlighter = highlighters.get(engineType);
+  if (!highlighter) {
+    let engine = options.engine;
+    if (engineType === "js") {
+      engine = import("shiki/engine/javascript").then(
+        (res) => res.createJavaScriptRegexEngine()
+      );
+    }
+    if (engineType === "oniguruma" || !engine) {
+      engine = import("shiki/engine/oniguruma").then(
+        (res) => res.createOnigurumaEngine(import("shiki/wasm"))
+      );
+    }
+    highlighter = createHighlighter({
+      ...options,
+      engine
+    });
+    highlighters.set(engineType, highlighter);
+    return highlighter;
+  }
+  return highlighter.then(async (instance) => {
+    await Promise.all([
+      // @ts-expect-error unknown
+      instance.loadLanguage(...options.langs),
+      // @ts-expect-error unknown
+      instance.loadTheme(...options.themes)
+    ]);
+    return instance;
+  });
+}
 async function highlight(code, options) {
   return _renderHighlight(await _highlight(code, options), options);
 }
@@ -62,5 +91,6 @@ export {
   defaultThemes,
   _highlight,
   _renderHighlight,
+  getHighlighter,
   highlight
 };

package/dist/{chunk-SHGL6VBO.js → chunk-QTVCCXFT.js}

@@ -2,7 +2,7 @@
 function splitPath(path) {
   return path.split("/").filter((p) => p.length > 0);
 }
-function resolvePath(from, join) {
+function joinPath(from, join) {
   const v1 = splitPath(from), v2 = splitPath(join);
   while (v2.length > 0) {
     switch (v2[0]) {
@@ -28,6 +28,6 @@ function slash(path) {
 
 export {
   splitPath,
-  resolvePath,
+  joinPath,
   slash
 };

package/dist/highlight/client.js

@@ -1,8 +1,8 @@
 "use client";
 import {
   useShiki
-} from "../chunk-Q73QZKHO.js";
-import "../chunk-E7AASGCN.js";
+} from "../chunk-62S4EN7J.js";
+import "../chunk-BUCUQ3WX.js";
 import "../chunk-MLKGABMK.js";
 export {
   useShiki

package/dist/highlight/index.js

@@ -2,7 +2,7 @@ import "../chunk-WQMD6AUR.js";
 import {
   createStyleTransformer,
   highlight
-} from "../chunk-E7AASGCN.js";
+} from "../chunk-BUCUQ3WX.js";
 import "../chunk-MLKGABMK.js";
 export {
   createStyleTransformer,

package/dist/mdx-plugins/index.js

@@ -3,13 +3,14 @@ import {
   remarkHeading
 } from "../chunk-IYQ35KI2.js";
 import {
-  resolvePath,
+  joinPath,
   slash
-} from "../chunk-SHGL6VBO.js";
+} from "../chunk-QTVCCXFT.js";
 import {
   createStyleTransformer,
-  defaultThemes
-} from "../chunk-E7AASGCN.js";
+  defaultThemes,
+  getHighlighter
+} from "../chunk-BUCUQ3WX.js";
 import "../chunk-MLKGABMK.js";
 
 // src/mdx-plugins/index.ts
@@ -25,11 +26,8 @@ import {
   transformerNotationWordHighlight
 } from "@shikijs/transformers";
 import {
-  getSingletonHighlighter,
   bundledLanguages
 } from "shiki";
-import { createOnigurumaEngine } from "shiki/engine/oniguruma";
-import { createJavaScriptRegexEngine } from "shiki/engine/javascript";
 
 // src/mdx-plugins/transformer-icon.ts
 var defaultShortcuts = {
@@ -248,13 +246,15 @@ function rehypeCode(_options = {}) {
   if (options.tab !== false) {
     transformers.push(transformerTab());
   }
-  const highlighter = getSingletonHighlighter({
-    engine: options.experimentalJSEngine ? createJavaScriptRegexEngine() : createOnigurumaEngine(() => import("shiki/wasm")),
-    themes: "themes" in options ? Object.values(options.themes).filter(Boolean) : [options.theme],
-    langs: options.langs ?? (options.lazy ? void 0 : Object.keys(bundledLanguages))
-  });
+  const highlighter = getHighlighter(
+    options.experimentalJSEngine ? "js" : "oniguruma",
+    {
+      themes: "themes" in options ? Object.values(options.themes).filter(Boolean) : [options.theme],
+      langs: options.langs ?? (options.lazy ? [] : Object.keys(bundledLanguages))
+    }
+  );
   const transformer = highlighter.then(
-    (instance) => rehypeShikiFromHighlighter(instance, {
+    (loaded) => rehypeShikiFromHighlighter(loaded, {
       ...options,
       transformers
     })
@@ -430,7 +430,7 @@ async function getImageSize(src, dir) {
     url = src;
   } else if (EXTERNAL_URL_REGEX.test(dir) && isRelative) {
     const base = new URL(dir);
-    base.pathname = resolvePath(base.pathname, src);
+    base.pathname = joinPath(base.pathname, src);
     url = base.toString();
   } else {
     return imageSizeFromFile(isRelative ? path.join(dir, src) : src);

package/dist/search/server.d.ts

@@ -1,5 +1,4 @@
 import { TypedDocument, Orama, Language, RawData, create, SearchParams } from '@orama/orama';
-import { NextRequest } from 'next/server';
 import { S as StructuredData } from '../remark-structure-1kvQbrfH.js';
 import { S as SortedResult } from '../types-Ch8gnVgO.js';
 import { I as I18nConfig } from '../config-inq6kP6y.js';
@@ -70,7 +69,7 @@ interface SearchServer {
     export: () => Promise<ExportedData>;
 }
 interface SearchAPI extends SearchServer {
-    GET: (request: NextRequest) => Promise<Response>;
+    GET: (request: Request) => Promise<Response>;
     /**
      * `GET` route handler that exports search indexes for static search.
      */

package/dist/search/server.js

@@ -19,12 +19,13 @@ function createEndpoint(server) {
       return Response.json(await server.export());
     },
     async GET(request) {
-      const query = request.nextUrl.searchParams.get("query");
+      const url = new URL(request.url);
+      const query = url.searchParams.get("query");
       if (!query) return Response.json([]);
       return Response.json(
         await search(query, {
-          tag: request.nextUrl.searchParams.get("tag") ?? void 0,
-          locale: request.nextUrl.searchParams.get("locale") ?? void 0
+          tag: url.searchParams.get("tag") ?? void 0,
+          locale: url.searchParams.get("locale") ?? void 0
         })
       );
     }

package/dist/server/index.js

@@ -5,7 +5,7 @@ import "../chunk-WQMD6AUR.js";
 import {
   createStyleTransformer,
   highlight
-} from "../chunk-E7AASGCN.js";
+} from "../chunk-BUCUQ3WX.js";
 import "../chunk-MLKGABMK.js";
 
 // src/server/get-toc.ts

package/dist/source/index.d.ts

@@ -4,25 +4,46 @@ import { R as Root, I as Item, F as Folder$1, S as Separator } from '../page-tre
 
 interface FileInfo {
     /**
-     * The locale extension of file
+     * locale extension from the last second `.`, like `.en`
+     *
+     * empty string if no locale
+     */
+    locale: string;
+    /**
+     * File path without extension
+     *
+     * @deprecated obtain it with `join(dirname, name)`
      */
-    locale?: string;
+    flattenedPath: string;
     /**
      * Original path of file
      */
     path: string;
     /**
-     * File path without extension
+     * File name without locale and extension
      */
-    flattenedPath: string;
+    name: string;
     /**
-     * File name without locale and extension
+     * file extension from the last `.`, like `.md`
+     *
+     * empty string if no file extension
+     */
+    ext: string;
+    dirname: string;
+}
+interface FolderInfo {
+    /**
+     * Original path of folder
+     */
+    path: string;
+    /**
+     * folder name
      */
     name: string;
     dirname: string;
 }
 declare function parseFilePath(path: string): FileInfo;
-declare function parseFolderPath(path: string): FileInfo;
+declare function parseFolderPath(path: string): FolderInfo;
 
 interface LoadOptions {
     transformers?: Transformer[];
@@ -105,7 +126,7 @@ interface LoaderOutput<Config extends LoaderConfig> {
     getPageTree: (locale?: string) => Root;
     getPageByHref: (href: string, options?: {
         /**
-         * resolve relative file paths in `href` from specified directory
+         * resolve relative file paths in `href` from specified dirname, must be a virtual path.
          */
         dir?: string;
     }) => {
@@ -174,7 +195,7 @@ interface PageFile {
 }
 type File = MetaFile | PageFile;
 interface Folder {
-    file: FileInfo;
+    file: FolderInfo;
     children: (File | Folder)[];
 }
 /**
@@ -239,4 +260,4 @@ interface PageTreeBuilder {
 }
 declare function createPageTreeBuilder(): PageTreeBuilder;
 
-export { type BuildPageTreeOptions, type BuildPageTreeOptionsWithI18n, type FileInfo, fileSystem as FileSystem, type InferMetaType, type InferPageType, type LanguageEntry, type LoadOptions, type LoaderConfig, type LoaderOptions, type LoaderOutput, type Meta, type MetaData, type Page, type PageData, type PageTreeBuilder, type Source, type SourceConfig, type Transformer, type UrlFn, type VirtualFile, createGetUrl, createPageTreeBuilder, getSlugs, loadFiles, loader, parseFilePath, parseFolderPath };
+export { type BuildPageTreeOptions, type BuildPageTreeOptionsWithI18n, type FileInfo, fileSystem as FileSystem, type FolderInfo, type InferMetaType, type InferPageType, type LanguageEntry, type LoadOptions, type LoaderConfig, type LoaderOptions, type LoaderOutput, type Meta, type MetaData, type Page, type PageData, type PageTreeBuilder, type Source, type SourceConfig, type Transformer, type UrlFn, type VirtualFile, createGetUrl, createPageTreeBuilder, getSlugs, loadFiles, loader, parseFilePath, parseFolderPath };

package/dist/source/index.js

@@ -1,8 +1,8 @@
 import {
-  resolvePath,
+  joinPath,
   slash,
   splitPath
-} from "../chunk-SHGL6VBO.js";
+} from "../chunk-QTVCCXFT.js";
 import {
   __export
 } from "../chunk-MLKGABMK.js";
@@ -24,8 +24,14 @@ function buildAll(nodes, ctx, skipIndex) {
   for (const node of [...nodes].sort(
     (a, b) => a.file.name.localeCompare(b.file.name)
   )) {
-    if (isPageFile(node) && !node.file.locale) {
-      const treeNode = buildFileNode(node, ctx);
+    if (isPageFile(node)) {
+      if (node.file.locale.length > 0 && node.file.locale.slice(1) !== ctx.defaultLanguage)
+        continue;
+      const localized = ctx.storage.read(
+        joinPath(node.file.dirname, `${node.file.name}.${ctx.lang}`),
+        "page"
+      );
+      const treeNode = buildFileNode(localized ?? node, ctx);
       if (node.file.name === "index") {
         if (!skipIndex) output.unshift(treeNode);
         continue;
@@ -33,10 +39,11 @@ function buildAll(nodes, ctx, skipIndex) {
       output.push(treeNode);
     }
     if ("children" in node) {
-      if (node.children.length === 1 && node.children[0].file.name === "index" && isPageFile(node.children[0])) {
-        output.push(buildFileNode(node.children[0], ctx));
+      const folder = buildFolderNode(node, false, ctx);
+      if (folder.children.length === 0 && folder.index) {
+        output.push(folder.index);
       } else {
-        folders.push(buildFolderNode(node, false, ctx));
+        folders.push(folder);
       }
     }
   }
@@ -75,8 +82,11 @@ function resolveFolderItem(folder, item, ctx, idx, addedNodePaths) {
   } else if (isExtract) {
     filename = item.slice(extractPrefix.length);
   }
-  const path2 = resolvePath(folder.file.path, filename);
-  const itemNode = ctx.storage.readDir(path2) ?? ctx.storage.read(path2, "page");
+  const path = joinPath(folder.file.path, filename);
+  let itemNode = ctx.storage.readDir(path);
+  if (!itemNode) {
+    itemNode = (ctx.lang ? ctx.storage.read(`${path}.${ctx.lang}`, "page") : null) ?? ctx.storage.read(`${path}.${ctx.defaultLanguage}`, "page") ?? ctx.storage.read(path, "page");
+  }
   if (!itemNode) return [];
   addedNodePaths.add(itemNode.file.path);
   if (isExcept) return [];
@@ -87,10 +97,10 @@ function resolveFolderItem(folder, item, ctx, idx, addedNodePaths) {
   return [buildFileNode(itemNode, ctx)];
 }
 function buildFolderNode(folder, isGlobalRoot, ctx) {
-  const metaPath = resolvePath(folder.file.path, "meta");
-  const meta = findLocalizedFile(metaPath, "meta", ctx) ?? ctx.storage.read(metaPath, "meta");
+  const metaPath = joinPath(folder.file.path, "meta");
+  const meta = ctx.storage.read(`${metaPath}.${ctx.lang}`, "meta") ?? ctx.storage.read(`${metaPath}.${ctx.defaultLanguage}`, "meta") ?? ctx.storage.read(metaPath, "meta");
   const indexFile = ctx.storage.read(
-    resolvePath(folder.file.flattenedPath, "index"),
+    joinPath(folder.file.path, "index"),
     "page"
   );
   const metadata = meta?.data;
@@ -137,16 +147,15 @@ function buildFolderNode(folder, isGlobalRoot, ctx) {
   return ctx.options.attachFolder?.(node, folder, meta) ?? node;
 }
 function buildFileNode(file, ctx) {
-  const localized = findLocalizedFile(file.file.flattenedPath, "page", ctx) ?? file;
   const item = {
-    $id: localized.file.path,
+    $id: file.file.path,
     type: "page",
-    name: localized.data.data.title ?? pathToName(localized.file.name),
-    description: localized.data.data.description,
-    icon: ctx.options.resolveIcon?.(localized.data.data.icon),
-    url: ctx.options.getUrl(localized.data.slugs, ctx.lang),
+    name: file.data.data.title ?? pathToName(file.file.name),
+    description: file.data.data.description,
+    icon: ctx.options.resolveIcon?.(file.data.data.icon),
+    url: ctx.options.getUrl(file.data.slugs, ctx.lang),
     $ref: !ctx.options.noRef ? {
-      file: localized.file.path
+      file: file.file.path
     } : void 0
   };
   return ctx.options.attachFile?.(item, file) ?? item;
@@ -175,7 +184,7 @@ function createPageTreeBuilder() {
           options,
           builder: this,
           storage: options.storage,
-          i18n
+          defaultLanguage: i18n.defaultLanguage
         });
         return [lang, tree];
       });
@@ -183,10 +192,6 @@ function createPageTreeBuilder() {
     }
   };
 }
-function findLocalizedFile(path2, format, ctx) {
-  if (!ctx.lang) return;
-  return ctx.storage.read(`${path2}.${ctx.lang}`, format);
-}
 function pathToName(name) {
   const result = [];
   for (const c of name) {
@@ -198,44 +203,45 @@ function pathToName(name) {
 }
 
 // src/source/path.ts
-function parseFilePath(path2) {
-  const segments = splitPath(slash(path2));
+function parseFilePath(path) {
+  const segments = splitPath(slash(path));
   const dirname = segments.slice(0, -1).join("/");
-  const base = segments.at(-1) ?? "";
-  const dotIdx = base.lastIndexOf(".");
-  const nameWithLocale = dotIdx !== -1 ? base.slice(0, dotIdx) : base;
-  const flattenedPath = [dirname, nameWithLocale].filter((p) => p.length > 0).join("/");
-  const [name, locale] = getLocale(nameWithLocale);
+  let name = segments.at(-1) ?? "";
+  let ext = "";
+  let locale = "";
+  let dotIdx = name.lastIndexOf(".");
+  if (dotIdx !== -1) {
+    ext = name.substring(dotIdx);
+    name = name.substring(0, dotIdx);
+  }
+  dotIdx = name.lastIndexOf(".");
+  if (dotIdx !== -1 && isLocale(name.substring(dotIdx))) {
+    locale = name.substring(dotIdx);
+    name = name.substring(0, dotIdx);
+  }
   return {
     dirname,
     name,
-    flattenedPath,
     locale,
-    path: segments.join("/")
+    path: segments.join("/"),
+    ext,
+    flattenedPath: [dirname, `${name}${locale}`].filter((p) => p.length > 0).join("/")
   };
 }
-function parseFolderPath(path2) {
-  const segments = splitPath(slash(path2));
+function isLocale(code) {
+  return code.length > 0 && !/\d+/.test(code);
+}
+function parseFolderPath(path) {
+  const segments = splitPath(slash(path));
   const base = segments.at(-1) ?? "";
-  const [name, locale] = getLocale(base);
-  const flattenedPath = segments.join("/");
   return {
     dirname: segments.slice(0, -1).join("/"),
-    name,
-    flattenedPath,
-    locale,
-    path: flattenedPath
+    name: base,
+    path: segments.join("/")
   };
 }
-function getLocale(name) {
-  const sep = name.lastIndexOf(".");
-  if (sep === -1) return [name];
-  const locale = name.slice(sep + 1);
-  if (/\d+/.exec(locale)) return [name];
-  return [name.slice(0, sep), locale];
-}
-function normalizePath(path2) {
-  const segments = splitPath(slash(path2));
+function normalizePath(path) {
+  const segments = splitPath(slash(path));
   if (segments[0] === "." || segments[0] === "..")
     throw new Error("It must not start with './' or '../'");
   return segments.join("/");
@@ -260,30 +266,36 @@ var Storage = class {
    * @param path - flattened path
    * @param format - file format
    */
-  read(path2, format) {
-    return this.files.get(`${path2}.${format}`);
+  read(path, format) {
+    return this.files.get(`${path}.${format}`);
   }
-  readDir(path2) {
-    return this.folders.get(path2);
+  readDir(path) {
+    return this.folders.get(path);
   }
   root() {
     return this.rootFolder;
   }
-  write(path2, format, data) {
+  write(path, format, data) {
     const node = {
       format,
-      file: parseFilePath(path2),
+      file: parseFilePath(path),
       data
     };
     this.makeDir(node.file.dirname);
     this.readDir(node.file.dirname)?.children.push(node);
-    this.files.set(`${node.file.flattenedPath}.${node.format}`, node);
+    this.files.set(
+      joinPath(
+        node.file.dirname,
+        `${node.file.name}${node.file.locale}.${node.format}`
+      ),
+      node
+    );
   }
   list() {
     return [...this.files.values()];
   }
-  makeDir(path2) {
-    const segments = splitPath(path2);
+  makeDir(path) {
+    const segments = splitPath(path);
     for (let i = 0; i < segments.length; i++) {
       const segment = segments.slice(0, i + 1).join("/");
       if (this.folders.has(segment)) continue;
@@ -327,7 +339,6 @@ function loadFiles(files, options) {
 }
 
 // src/source/loader.ts
-import * as path from "node:path";
 function indexPages(storage, getUrl, i18n) {
   const defaultLanguage = i18n?.defaultLanguage ?? "";
   const map = /* @__PURE__ */ new Map();
@@ -336,17 +347,20 @@ function indexPages(storage, getUrl, i18n) {
     if (item.format === "meta")
       pathToFile.set(item.file.path, fileToMeta(item));
     if (item.format === "page") {
-      const page = fileToPage(item, getUrl, item.file.locale);
+      if (item.file.locale.length > 0 && item.file.locale.slice(1) !== defaultLanguage)
+        continue;
+      const page = fileToPage(item, getUrl, defaultLanguage);
       pathToFile.set(item.file.path, page);
-      if (item.file.locale) continue;
       map.set(`${defaultLanguage}.${page.slugs.join("/")}`, page);
       if (!i18n) continue;
+      const basePath = joinPath(item.file.dirname, item.file.name);
       for (const lang of i18n.languages) {
-        const localized = storage.read(
-          `${item.file.flattenedPath}.${lang}`,
-          "page"
+        if (lang === defaultLanguage) continue;
+        const localizedPage = fileToPage(
+          storage.read(`${basePath}.${lang}`, "page") ?? item,
+          getUrl,
+          lang
         );
-        const localizedPage = fileToPage(localized ?? item, getUrl, lang);
         map.set(`${lang}.${localizedPage.slugs.join("/")}`, localizedPage);
       }
     }
@@ -428,7 +442,7 @@ function createOutput(options) {
       const pages = Array.from(walker.pages.values());
       const [value, hash] = href.split("#", 2);
       if (value.startsWith(".") && (value.endsWith(".md") || value.endsWith(".mdx"))) {
-        const hrefPath = path.join(dir, value);
+        const hrefPath = joinPath(dir, value);
         const target2 = pages.find((item) => item.file.path === hrefPath);
         if (target2)
           return {

package/dist/utils/use-shiki.js

@@ -1,7 +1,7 @@
 import {
   useShiki
-} from "../chunk-Q73QZKHO.js";
-import "../chunk-E7AASGCN.js";
+} from "../chunk-62S4EN7J.js";
+import "../chunk-BUCUQ3WX.js";
 import "../chunk-MLKGABMK.js";
 export {
   useShiki

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fumadocs-core",
-  "version": "15.1.0",
+  "version": "15.1.1",
   "description": "The library for building a documentation website in Next.js",
   "keywords": [
     "NextJs",
@@ -114,12 +114,12 @@
     "@types/mdast": "^4.0.3",
     "@types/negotiator": "^0.6.3",
     "@types/node": "22.13.10",
-    "@types/react": "^19.0.10",
+    "@types/react": "^19.0.11",
     "@types/react-dom": "^19.0.4",
     "algoliasearch": "4.24.0",
     "mdast-util-mdx-jsx": "^3.2.0",
     "mdast-util-mdxjs-esm": "^2.0.1",
-    "next": "^15.2.2",
+    "next": "^15.2.3",
     "remark-mdx": "^3.1.0",
     "remark-rehype": "^11.1.1",
     "typescript": "^5.8.2",