fumadocs-core 11.1.2 → 11.1.3

package/dist/middleware.d.ts

@@ -5,6 +5,11 @@ interface MiddlewareOptions {
     defaultLanguage: string;
     format?: (locale: string, path: string) => string;
 }
+/**
+ * @param languages - Supported locale codes
+ * @param defaultLanguage - Default local if not specified
+ * @param format - A function that returns the redirected url with locale code
+ */
 declare function createI18nMiddleware({ languages, defaultLanguage, format, }: MiddlewareOptions): NextMiddleware;
 
 export { createI18nMiddleware };

package/dist/middleware.js

@@ -3,7 +3,7 @@ import "./chunk-WEAGW6MQ.js";
 // src/middleware.ts
 import { match as matchLocale } from "@formatjs/intl-localematcher";
 import Negotiator from "negotiator";
-import nextLib from "next/server";
+import { NextResponse } from "next/server";
 function getLocale(request, locales, defaultLanguage) {
   const negotiatorHeaders = {};
   request.headers.forEach((value, key) => negotiatorHeaders[key] = value);
@@ -31,11 +31,9 @@ function createI18nMiddleware({
       while (path.startsWith("/")) {
         path = path.slice(1);
       }
-      return nextLib.NextResponse.redirect(
-        new URL(format(locale, path), request.url)
-      );
+      return NextResponse.redirect(new URL(format(locale, path), request.url));
     }
-    return nextLib.NextResponse.next();
+    return NextResponse.next();
   };
 }
 export {

package/dist/search/server.d.ts

@@ -26,10 +26,13 @@ interface AdvancedOptions {
 type ToI18n<T extends {
     indexes: unknown;
 }> = Omit<T, 'indexes' | 'language'> & {
-    indexes: [language: string, indexes: T['indexes']][];
+    indexes: ([language: string, indexes: T['indexes']] | {
+        language: string;
+        indexes: T['indexes'];
+    })[];
 };
 declare function createSearchAPI<T extends 'simple' | 'advanced'>(type: T, options: T extends 'simple' ? SimpleOptions : AdvancedOptions): SearchAPI;
-declare function createI18nSearchAPI<T extends 'simple' | 'advanced'>(type: T, options: ToI18n<T extends 'simple' ? SimpleOptions : AdvancedOptions>): SearchAPI;
+declare function createI18nSearchAPI<T extends 'simple' | 'advanced'>(type: T, options: T extends 'simple' ? ToI18n<SimpleOptions> : ToI18n<AdvancedOptions>): SearchAPI;
 interface Index {
     title: string;
     content: string;
@@ -52,4 +55,4 @@ interface AdvancedIndex {
 }
 declare function initSearchAPIAdvanced({ indexes, language, tag, }: AdvancedOptions): SearchAPI;
 
-export { createI18nSearchAPI, createSearchAPI, initSearchAPI, initSearchAPIAdvanced };
+export { type AdvancedIndex, type Index, createI18nSearchAPI, createSearchAPI, initSearchAPI, initSearchAPIAdvanced };

package/dist/search/server.js

@@ -31,13 +31,14 @@ function createSearchAPI(type, options) {
 }
 function createI18nSearchAPI(type, options) {
   const map = /* @__PURE__ */ new Map();
-  for (const [k, v] of options.indexes) {
+  for (const entry of options.indexes) {
+    const v = Array.isArray(entry) ? { language: entry[0], indexes: entry[1] } : entry;
     map.set(
-      k,
+      v.language,
       createSearchAPI(type, __spreadProps(__spreadValues({}, options), {
-        language: k,
+        language: v.language,
         // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/no-unsafe-assignment -- Avoid complicated types
-        indexes: v
+        indexes: v.indexes
       }))
     );
   }

package/dist/source/index.d.ts

@@ -41,6 +41,7 @@ declare class Storage {
     constructor();
     /**
      * @param path - flattened path
+     * @param format - file format
      */
     read(path: string, format: string): File | undefined;
     readDir(path: string): Folder | undefined;
@@ -58,27 +59,10 @@ declare namespace fileSystem {
   export { type fileSystem_File as File, type fileSystem_Folder as Folder, fileSystem_Storage as Storage };
 }
 
-interface BuildPageTreeOptionsWithI18n {
-    languages: string[];
-}
-interface PageTreeBuilder {
-    build: () => Root;
-    /**
-     * Build page tree and fallback to the default language if the localized page doesn't exist
-     */
-    buildI18n: (options?: Partial<BuildPageTreeOptionsWithI18n>) => Record<string, Root>;
-}
-interface CreatePageTreeBuilderOptions {
-    storage: Storage;
-    resolveIcon?: (icon: string) => ReactElement | undefined;
-}
-declare function createPageTreeBuilder({ storage, resolveIcon, }: CreatePageTreeBuilderOptions): PageTreeBuilder;
-
 interface LoadOptions {
     transformers?: Transformer[];
     rootDir?: string;
     getSlugs: (info: FileInfo) => string[];
-    getUrl: (slugs: string[], locale?: string) => string;
 }
 interface VirtualFile {
     /**
@@ -95,33 +79,6 @@ type Transformer = (context: {
     options: LoadOptions;
 }) => void;
 
-interface MetaData {
-    icon?: string;
-    title?: string;
-    root?: boolean;
-    pages?: string[];
-    defaultOpen?: boolean;
-}
-interface PageData {
-    icon?: string;
-    title: string;
-}
-type InferPageType<Utils extends LoaderOutput<any>> = Utils extends LoaderOutput<infer Config> ? Page<Config['source']['pageData']> : never;
-type InferMetaType<Utils extends LoaderOutput<any>> = Utils extends LoaderOutput<infer Config> ? Meta<Config['source']['metaData']> : never;
-/**
- * @internal
- */
-interface FileData {
-    meta: {
-        data: MetaData;
-    };
-    file: {
-        url: string;
-        slugs: string[];
-        data: PageData;
-    };
-}
-
 interface LoaderConfig {
     source: SourceConfig;
     i18n: boolean;
@@ -142,7 +99,7 @@ interface LoaderOptions {
     languages?: string[];
     icon?: NonNullable<CreatePageTreeBuilderOptions['resolveIcon']>;
     slugs?: LoadOptions['getSlugs'];
-    url?: LoadOptions['getUrl'];
+    url?: UrlFn;
     source: Source<any>;
     transformers?: Transformer[];
 }
@@ -163,6 +120,10 @@ interface Meta<Data = MetaData> {
     file: FileInfo;
     data: Data;
 }
+interface LanguageEntry<Data = PageData> {
+    language: string;
+    pages: Page<Data>[];
+}
 interface LoaderOutput<Config extends LoaderConfig> {
     pageTree: Config['i18n'] extends true ? Record<string, Root> : Root;
     files: File[];
@@ -172,12 +133,13 @@ interface LoaderOutput<Config extends LoaderConfig> {
      * @param language - If empty, the default language will be used
      */
     getPages: (language?: string) => Page<Config['source']['pageData']>[];
+    getLanguages: () => LanguageEntry<Config['source']['pageData']>[];
     /**
      * @param language - If empty, the default language will be used
      */
     getPage: (slugs: string[] | undefined, language?: string) => Page<Config['source']['pageData']> | undefined;
 }
-declare function createGetUrl(baseUrl: string): (slugs: string[], locale?: string) => string;
+declare function createGetUrl(baseUrl: string): UrlFn;
 declare function getSlugs(info: FileInfo): string[];
 type InferSourceConfig<T> = T extends Source<infer Config> ? Config : never;
 declare function loader<Options extends LoaderOptions>(options: Options): LoaderOutput<{
@@ -185,4 +147,51 @@ declare function loader<Options extends LoaderOptions>(options: Options): Loader
     i18n: Options['languages'] extends string[] ? true : false;
 }>;
 
-export { type BuildPageTreeOptionsWithI18n, type CreatePageTreeBuilderOptions, type FileData, type FileInfo, fileSystem as FileSystem, type InferMetaType, type InferPageType, 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 VirtualFile, createGetUrl, createPageTreeBuilder, getSlugs, loader, parseFilePath, parseFolderPath };
+interface MetaData {
+    icon?: string;
+    title?: string;
+    root?: boolean;
+    pages?: string[];
+    defaultOpen?: boolean;
+}
+interface PageData {
+    icon?: string;
+    title: string;
+}
+type InferPageType<Utils extends LoaderOutput<any>> = Utils extends LoaderOutput<infer Config> ? Page<Config['source']['pageData']> : never;
+type InferMetaType<Utils extends LoaderOutput<any>> = Utils extends LoaderOutput<infer Config> ? Meta<Config['source']['metaData']> : never;
+/**
+ * @internal
+ */
+type UrlFn = (slugs: string[], locale?: string) => string;
+/**
+ * @internal
+ */
+interface FileData {
+    meta: {
+        data: MetaData;
+    };
+    file: {
+        slugs: string[];
+        data: PageData;
+    };
+}
+
+interface BuildPageTreeOptionsWithI18n {
+    languages: string[];
+}
+interface PageTreeBuilder {
+    build: () => Root;
+    /**
+     * Build page tree and fallback to the default language if the localized page doesn't exist
+     */
+    buildI18n: (options?: Partial<BuildPageTreeOptionsWithI18n>) => Record<string, Root>;
+}
+interface CreatePageTreeBuilderOptions {
+    storage: Storage;
+    getUrl: UrlFn;
+    resolveIcon?: (icon: string | undefined) => ReactElement | undefined;
+}
+declare function createPageTreeBuilder(options: CreatePageTreeBuilderOptions): PageTreeBuilder;
+
+export { type BuildPageTreeOptionsWithI18n, type CreatePageTreeBuilderOptions, type FileData, 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, loader, parseFilePath, parseFolderPath };

package/dist/source/index.js

@@ -2,7 +2,9 @@ import {
   slash
 } from "../chunk-UWEEHUJV.js";
 import {
-  __export
+  __export,
+  __spreadProps,
+  __spreadValues
 } from "../chunk-WEAGW6MQ.js";
 
 // src/source/path.ts
@@ -41,7 +43,7 @@ function normalizePath(path) {
 function splitPath(path) {
   return path.split("/").filter((p) => p.length > 0);
 }
-function resolvePath(from, join, slashMode = "none") {
+function resolvePath(from, join) {
   const v1 = splitPath(from), v2 = splitPath(join);
   while (v2.length > 0) {
     switch (v2[0]) {
@@ -55,15 +57,7 @@ function resolvePath(from, join, slashMode = "none") {
     }
     v2.shift();
   }
-  const joined = v1.join("/");
-  switch (slashMode) {
-    case "leading":
-      return `/${joined}`;
-    case "trailing":
-      return `${joined}/`;
-    default:
-      return joined;
-  }
+  return v1.join("/");
 }
 
 // src/source/page-tree-builder.ts
@@ -133,7 +127,7 @@ function resolveFolderItem(folder, item, ctx, addedNodePaths) {
   return [buildFileNode(itemNode, ctx)];
 }
 function buildFolderNode(folder, defaultIsRoot, ctx) {
-  var _a, _b, _c, _d, _e;
+  var _a, _b, _c, _d, _e, _f;
   const metaPath = resolvePath(folder.file.path, "meta");
   let meta = ctx.storage.read(metaPath, "meta");
   meta = (_a = findLocalizedFile(metaPath, "meta", ctx)) != null ? _a : meta;
@@ -168,7 +162,7 @@ function buildFolderNode(folder, defaultIsRoot, ctx) {
   return removeUndefined({
     type: "folder",
     name: (_e = (_d = metadata == null ? void 0 : metadata.title) != null ? _d : index == null ? void 0 : index.name) != null ? _e : pathToName(folder.file.name),
-    icon: ctx.resolveIcon(metadata == null ? void 0 : metadata.icon),
+    icon: (_f = ctx.resolveIcon) == null ? void 0 : _f.call(ctx, metadata == null ? void 0 : metadata.icon),
     root: metadata == null ? void 0 : metadata.root,
     defaultOpen: metadata == null ? void 0 : metadata.defaultOpen,
     index,
@@ -176,14 +170,14 @@ function buildFolderNode(folder, defaultIsRoot, ctx) {
   });
 }
 function buildFileNode(file, ctx) {
-  var _a;
+  var _a, _b;
   const localized = (_a = findLocalizedFile(file.file.flattenedPath, "page", ctx)) != null ? _a : file;
   const data = localized.data;
   return removeUndefined({
     type: "page",
     name: data.data.title,
-    icon: ctx.resolveIcon(data.data.icon),
-    url: data.url
+    icon: (_b = ctx.resolveIcon) == null ? void 0 : _b.call(ctx, data.data.icon),
+    url: ctx.getUrl(data.slugs, ctx.lang)
   });
 }
 function build(ctx) {
@@ -194,21 +188,12 @@ function build(ctx) {
     children: folder.children
   };
 }
-function createPageTreeBuilder({
-  storage,
-  resolveIcon = () => void 0
-}) {
+function createPageTreeBuilder(options) {
   function getContext(builder, locale) {
-    return {
-      storage,
+    return __spreadProps(__spreadValues({}, options), {
       lang: locale,
-      resolveIcon(icon) {
-        if (!icon)
-          return;
-        return resolveIcon(icon);
-      },
       builder
-    };
+    });
   }
   return {
     build() {
@@ -257,6 +242,7 @@ var Storage = class {
   }
   /**
    * @param path - flattened path
+   * @param format - file format
    */
   read(path, format) {
     return this.files.get(`${path}.${format}`);
@@ -314,7 +300,6 @@ function loadFiles(files, options) {
       const slugs = options.getSlugs(parsedPath);
       storage.write(relativePath, file.type, {
         slugs,
-        url: options.getUrl(slugs, parsedPath.locale),
         data: file.data
       });
     }
@@ -334,7 +319,7 @@ function loadFiles(files, options) {
 }
 
 // src/source/loader.ts
-function buildPageMap(storage, languages) {
+function buildPageMap(storage, languages, getUrl) {
   var _a;
   const map = /* @__PURE__ */ new Map();
   const defaultMap = /* @__PURE__ */ new Map();
@@ -342,7 +327,7 @@ function buildPageMap(storage, languages) {
   for (const file of storage.list()) {
     if (file.format !== "page" || file.file.locale)
       continue;
-    const page = fileToPage(file);
+    const page = fileToPage(file, getUrl);
     defaultMap.set(page.slugs.join("/"), page);
     for (const lang of languages) {
       const langMap = (_a = map.get(lang)) != null ? _a : /* @__PURE__ */ new Map();
@@ -350,7 +335,7 @@ function buildPageMap(storage, languages) {
         `${file.file.flattenedPath}.${lang}`,
         "page"
       );
-      const localizedPage = localized ? fileToPage(localized) : page;
+      const localizedPage = fileToPage(localized != null ? localized : file, getUrl, lang);
       langMap.set(localizedPage.slugs.join("/"), localizedPage);
       map.set(lang, langMap);
     }
@@ -378,21 +363,21 @@ function createOutput({
   transformers,
   baseUrl = "/",
   slugs: slugsFn = getSlugs,
-  url: urlFn = createGetUrl(baseUrl)
+  url: getUrl = createGetUrl(baseUrl)
 }) {
   const storage = loadFiles(
     typeof source.files === "function" ? source.files(rootDir) : source.files,
     {
       transformers,
       rootDir,
-      getSlugs: slugsFn,
-      getUrl: urlFn
+      getSlugs: slugsFn
     }
   );
-  const i18nMap = buildPageMap(storage, languages != null ? languages : []);
+  const i18nMap = buildPageMap(storage, languages != null ? languages : [], getUrl);
   const builder = createPageTreeBuilder({
     storage,
-    resolveIcon: icon
+    resolveIcon: icon,
+    getUrl
   });
   const pageTree = languages === void 0 ? builder.build() : builder.buildI18n({ languages });
   return {
@@ -402,17 +387,27 @@ function createOutput({
       var _a, _b;
       return Array.from((_b = (_a = i18nMap.get(language)) == null ? void 0 : _a.values()) != null ? _b : []);
     },
+    getLanguages() {
+      const list = [];
+      for (const [language, pages] of i18nMap) {
+        list.push({
+          language,
+          pages: Array.from(pages.values())
+        });
+      }
+      return list;
+    },
     getPage(slugs = [], language = "") {
       var _a;
       return (_a = i18nMap.get(language)) == null ? void 0 : _a.get(slugs.join("/"));
     }
   };
 }
-function fileToPage(file) {
+function fileToPage(file, getUrl, locale) {
   const data = file.data;
   return {
     file: file.file,
-    url: data.url,
+    url: getUrl(data.slugs, locale),
     slugs: data.slugs,
     data: data.data
   };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fumadocs-core",
-  "version": "11.1.2",
+  "version": "11.1.3",
   "description": "The library for building a documentation website in Next.js",
   "keywords": [
     "NextJs",