fumadocs-core 15.1.1 → 15.1.2

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

@@ -2,21 +2,22 @@
 function splitPath(path) {
   return path.split("/").filter((p) => p.length > 0);
 }
-function joinPath(from, join) {
-  const v1 = splitPath(from), v2 = splitPath(join);
-  while (v2.length > 0) {
-    switch (v2[0]) {
+function joinPath(...paths) {
+  const out = [];
+  const parsed = paths.flatMap(splitPath);
+  while (parsed.length > 0) {
+    switch (parsed[0]) {
       case "..":
-        v1.pop();
+        out.pop();
         break;
       case ".":
         break;
       default:
-        v1.push(v2[0]);
+        out.push(parsed[0]);
     }
-    v2.shift();
+    parsed.shift();
   }
-  return v1.join("/");
+  return out.join("/");
 }
 function slash(path) {
   const isExtendedLengthPath = path.startsWith("\\\\?\\");

package/dist/mdx-plugins/index.js

@@ -5,7 +5,7 @@ import {
 import {
   joinPath,
   slash
-} from "../chunk-QTVCCXFT.js";
+} from "../chunk-XMCPKVJQ.js";
 import {
   createStyleTransformer,
   defaultThemes,

package/dist/source/index.d.ts

@@ -3,12 +3,6 @@ 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';
 
 interface FileInfo {
-    /**
-     * locale extension from the last second `.`, like `.en`
-     *
-     * empty string if no locale
-     */
-    locale: string;
     /**
      * File path without extension
      *
@@ -47,9 +41,15 @@ declare function parseFolderPath(path: string): FolderInfo;
 
 interface LoadOptions {
     transformers?: Transformer[];
-    rootDir?: string;
     getSlugs: (info: FileInfo) => string[];
 }
+interface I18nLoadOptions extends LoadOptions {
+    i18n: {
+        parser: 'dot' | 'dir';
+        languages: string[];
+        defaultLanguage: string;
+    };
+}
 interface VirtualFile {
     /**
      * Relative path
@@ -68,7 +68,7 @@ type Transformer = (context: {
     storage: Storage;
     options: LoadOptions;
 }) => void;
-declare function loadFiles(files: VirtualFile[], options: LoadOptions): Storage;
+declare function loadFiles<O extends LoadOptions>(files: VirtualFile[], options: O): Storage;
 
 interface LoaderConfig {
     source: SourceConfig;
@@ -79,11 +79,6 @@ interface SourceConfig {
     metaData: MetaData;
 }
 interface LoaderOptions {
-    /**
-     * @deprecated It is now recommended to filter files on `source` level
-     * @defaultValue `''`
-     */
-    rootDir?: string;
     baseUrl: string;
     icon?: NonNullable<BuildPageTreeOptions['resolveIcon']>;
     slugs?: LoadOptions['getSlugs'];
@@ -97,14 +92,16 @@ interface LoaderOptions {
     /**
      * Configure i18n
      */
-    i18n?: I18nConfig;
+    i18n?: I18nConfig & {
+        parser?: I18nLoadOptions['i18n']['parser'];
+    };
 }
 interface Source<Config extends SourceConfig> {
     /**
      * @internal
      */
     _config?: Config;
-    files: VirtualFile[] | ((rootDir: string) => VirtualFile[]);
+    files: VirtualFile[] | (() => VirtualFile[]);
 }
 interface Page<Data = PageData> {
     file: FileInfo;
@@ -234,7 +231,7 @@ declare namespace fileSystem {
   export { type fileSystem_File as File, type fileSystem_Folder as Folder, type fileSystem_MetaFile as MetaFile, type fileSystem_PageFile as PageFile, fileSystem_Storage as Storage };
 }
 
-interface BuildPageTreeOptions {
+interface Options {
     /**
      * Remove references to the file path of original nodes (`$ref`)
      *
@@ -244,11 +241,14 @@ interface BuildPageTreeOptions {
     attachFile?: (node: Item, file?: PageFile) => Item;
     attachFolder?: (node: Folder$1, folder: Folder, meta?: MetaFile) => Folder$1;
     attachSeparator?: (node: Separator) => Separator;
-    storage: Storage;
     getUrl: UrlFn;
     resolveIcon?: (icon: string | undefined) => ReactElement | undefined;
 }
-interface BuildPageTreeOptionsWithI18n extends BuildPageTreeOptions {
+interface BuildPageTreeOptions extends Options {
+    storage: Storage;
+}
+interface BuildPageTreeOptionsWithI18n extends Options {
+    storages: Record<string, Storage>;
     i18n: I18nConfig;
 }
 interface PageTreeBuilder {

package/dist/source/index.js

@@ -2,7 +2,7 @@ import {
   joinPath,
   slash,
   splitPath
-} from "../chunk-QTVCCXFT.js";
+} from "../chunk-XMCPKVJQ.js";
 import {
   __export
 } from "../chunk-MLKGABMK.js";
@@ -25,10 +25,8 @@ function buildAll(nodes, ctx, skipIndex) {
     (a, b) => a.file.name.localeCompare(b.file.name)
   )) {
     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}`),
+      const localized = ctx.localeStorage?.read(
+        joinPath(node.file.dirname, node.file.name),
         "page"
       );
       const treeNode = buildFileNode(localized ?? node, ctx);
@@ -83,10 +81,7 @@ function resolveFolderItem(folder, item, ctx, idx, addedNodePaths) {
     filename = item.slice(extractPrefix.length);
   }
   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");
-  }
+  const itemNode = ctx.storage.readDir(path) ?? ctx.localeStorage?.read(path, "page") ?? ctx.storage.read(path, "page");
   if (!itemNode) return [];
   addedNodePaths.add(itemNode.file.path);
   if (isExcept) return [];
@@ -98,7 +93,7 @@ function resolveFolderItem(folder, item, ctx, idx, addedNodePaths) {
 }
 function buildFolderNode(folder, isGlobalRoot, ctx) {
   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 meta = ctx.localeStorage?.read(metaPath, "meta") ?? ctx.storage.read(metaPath, "meta");
   const indexFile = ctx.storage.read(
     joinPath(folder.file.path, "index"),
     "page"
@@ -153,7 +148,7 @@ function buildFileNode(file, ctx) {
     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),
+    url: ctx.options.getUrl(file.data.slugs, ctx.locale),
     $ref: !ctx.options.noRef ? {
       file: file.file.path
     } : void 0
@@ -180,11 +175,11 @@ function createPageTreeBuilder() {
     buildI18n({ i18n, ...options }) {
       const entries = i18n.languages.map((lang) => {
         const tree = build({
-          lang,
           options,
           builder: this,
-          storage: options.storage,
-          defaultLanguage: i18n.defaultLanguage
+          locale: lang,
+          storage: options.storages[i18n.defaultLanguage],
+          localeStorage: options.storages[lang]
         });
         return [lang, tree];
       });
@@ -208,29 +203,19 @@ function parseFilePath(path) {
   const dirname = segments.slice(0, -1).join("/");
   let name = segments.at(-1) ?? "";
   let ext = "";
-  let locale = "";
-  let dotIdx = name.lastIndexOf(".");
+  const 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,
-    locale,
     path: segments.join("/"),
     ext,
-    flattenedPath: [dirname, `${name}${locale}`].filter((p) => p.length > 0).join("/")
+    flattenedPath: [dirname, name].filter((p) => p.length > 0).join("/")
   };
 }
-function isLocale(code) {
-  return code.length > 0 && !/\d+/.test(code);
-}
 function parseFolderPath(path) {
   const segments = splitPath(slash(path));
   const base = segments.at(-1) ?? "";
@@ -284,10 +269,7 @@ var Storage = class {
     this.makeDir(node.file.dirname);
     this.readDir(node.file.dirname)?.children.push(node);
     this.files.set(
-      joinPath(
-        node.file.dirname,
-        `${node.file.name}${node.file.locale}.${node.format}`
-      ),
+      joinPath(node.file.dirname, `${node.file.name}.${node.format}`),
       node
     );
   }
@@ -313,20 +295,17 @@ var Storage = class {
 function loadFiles(files, options) {
   const { transformers = [] } = options;
   const storage = new Storage();
-  const rootDir = normalizePath(options.rootDir ?? "");
   for (const file of files) {
-    const normalizedPath = normalizePath(file.path);
-    if (!normalizedPath.startsWith(rootDir)) continue;
-    const relativePath = normalizedPath.slice(rootDir.length);
+    const parsedPath = normalizePath(file.path);
     if (file.type === "page") {
-      const slugs = file.slugs ?? options.getSlugs(parseFilePath(relativePath));
-      storage.write(relativePath, file.type, {
+      const slugs = file.slugs ?? options.getSlugs(parseFilePath(parsedPath));
+      storage.write(parsedPath, file.type, {
         slugs,
         data: file.data
       });
     }
     if (file.type === "meta") {
-      storage.write(relativePath, file.type, file.data);
+      storage.write(parsedPath, file.type, file.data);
     }
   }
   for (const transformer of transformers) {
@@ -337,27 +316,63 @@ function loadFiles(files, options) {
   }
   return storage;
 }
+function loadFilesI18n(files, options) {
+  const parser = options.i18n.parser === "dir" ? dirParser : dotParser;
+  const storages = {};
+  for (const lang of options.i18n.languages) {
+    storages[lang] = loadFiles(
+      files.flatMap((file) => {
+        const [path, locale] = parser(normalizePath(file.path));
+        if ((locale ?? options.i18n.defaultLanguage) === lang) {
+          return {
+            ...file,
+            path
+          };
+        }
+        return [];
+      }),
+      options
+    );
+  }
+  return storages;
+}
+function dirParser(path) {
+  const parsed = path.split("/");
+  if (parsed.length >= 2) return [parsed.slice(1).join("/"), parsed[0]];
+  return [path];
+}
+function dotParser(path) {
+  const segs = path.split("/");
+  if (segs.length === 0) return [path];
+  const name = segs[segs.length - 1].split(".");
+  if (name.length >= 3) {
+    const locale = name.splice(name.length - 2, 1)[0];
+    if (locale.length > 0 && !/\d+/.test(locale)) {
+      segs[segs.length - 1] = name.join(".");
+      return [segs.join("/"), locale];
+    }
+  }
+  return [path];
+}
 
 // src/source/loader.ts
-function indexPages(storage, getUrl, i18n) {
+function indexPages(storages, getUrl, i18n) {
   const defaultLanguage = i18n?.defaultLanguage ?? "";
   const map = /* @__PURE__ */ new Map();
   const pathToFile = /* @__PURE__ */ new Map();
-  for (const item of storage.list()) {
+  for (const item of storages[defaultLanguage].list()) {
     if (item.format === "meta")
       pathToFile.set(item.file.path, fileToMeta(item));
     if (item.format === "page") {
-      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);
       map.set(`${defaultLanguage}.${page.slugs.join("/")}`, page);
       if (!i18n) continue;
-      const basePath = joinPath(item.file.dirname, item.file.name);
+      const path = joinPath(item.file.dirname, item.file.name);
       for (const lang of i18n.languages) {
         if (lang === defaultLanguage) continue;
         const localizedPage = fileToPage(
-          storage.read(`${basePath}.${lang}`, "page") ?? item,
+          storages[lang].read(path, "page") ?? item,
           getUrl,
           lang
         );
@@ -401,17 +416,23 @@ function createOutput(options) {
   if (!options.url && !options.baseUrl) {
     console.warn("`loader()` now requires a `baseUrl` option to be defined.");
   }
-  const { source, rootDir = "", slugs: slugsFn = getSlugs } = options;
+  const { source, slugs: slugsFn = getSlugs } = options;
   const getUrl = options.url ?? createGetUrl(options.baseUrl ?? "/", options.i18n);
-  const storage = loadFiles(
-    typeof source.files === "function" ? source.files(rootDir) : source.files,
-    {
+  const files = typeof source.files === "function" ? source.files() : source.files;
+  const storages = options.i18n ? loadFilesI18n(files, {
+    i18n: {
+      ...options.i18n,
+      parser: options.i18n.parser ?? "dot"
+    },
+    transformers: options.transformers,
+    getSlugs: slugsFn
+  }) : {
+    "": loadFiles(files, {
       transformers: options.transformers,
-      rootDir,
       getSlugs: slugsFn
-    }
-  );
-  const walker = indexPages(storage, getUrl, options.i18n);
+    })
+  };
+  const walker = indexPages(storages, getUrl, options.i18n);
   const builder = createPageTreeBuilder();
   let pageTree;
   return {
@@ -419,7 +440,7 @@ function createOutput(options) {
     get pageTree() {
       if (options.i18n) {
         pageTree ??= builder.buildI18n({
-          storage,
+          storages,
           resolveIcon: options.icon,
           getUrl,
           i18n: options.i18n,
@@ -427,7 +448,7 @@ function createOutput(options) {
         });
       } else {
         pageTree ??= builder.build({
-          storage,
+          storage: storages[""],
           resolveIcon: options.icon,
           getUrl,
           ...options.pageTree

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fumadocs-core",
-  "version": "15.1.1",
+  "version": "15.1.2",
   "description": "The library for building a documentation website in Next.js",
   "keywords": [
     "NextJs",
@@ -113,8 +113,8 @@
     "@types/hast": "^3.0.4",
     "@types/mdast": "^4.0.3",
     "@types/negotiator": "^0.6.3",
-    "@types/node": "22.13.10",
-    "@types/react": "^19.0.11",
+    "@types/node": "22.13.11",
+    "@types/react": "^19.0.12",
     "@types/react-dom": "^19.0.4",
     "algoliasearch": "4.24.0",
     "mdast-util-mdx-jsx": "^3.2.0",