fumadocs-core 15.7.0 → 15.7.1

package/dist/i18n/index.d.ts

@@ -26,7 +26,13 @@ interface I18nConfig<Languages extends string = string> {
      *
      * @defaultValue 'dot'
      */
-    parser?: 'dot' | 'dir';
+    parser?: 'dot' | 'dir' | 'none';
+    /**
+     * the fallback language when the page has no translations available for a given locale.
+     *
+     * Default to ``defaultLanguage`, no fallback when set to `null`.
+     */
+    fallbackLanguage?: Languages | null;
 }
 declare function defineI18n<Languages extends string>(config: I18nConfig<Languages>): I18nConfig<Languages>;
 

package/dist/source/index.d.ts

@@ -43,21 +43,12 @@ type Transformer = (context: {
     storage: ContentStorage;
     options: LoadOptions;
 }) => void;
-declare const parsers: {
-    dir(path: string): [string, string?];
-    dot(path: string): [string, string?];
-    none(path: string): [string, string?];
-};
 /**
  * @returns a map of locale and its content storage.
  *
  * in the storage, locale codes are removed from file paths, hence the same file will have same file paths in every storage.
  */
-declare function loadFiles(files: VirtualFile[], options: LoadOptions, i18n: {
-    parser: keyof typeof parsers;
-    languages: string[];
-    defaultLanguage: string;
-}): Record<string, ContentStorage>;
+declare function loadFiles(files: VirtualFile[], options: LoadOptions, i18n: I18nConfig): Record<string, ContentStorage>;
 
 interface FileInfo {
     /**
@@ -112,7 +103,7 @@ interface LoaderOptions<T extends SourceConfig = SourceConfig, I18n extends I18n
     icon?: NonNullable<BaseOptions['resolveIcon']>;
     slugs?: (info: FileInfo) => string[];
     url?: UrlFn;
-    source: Source<T>;
+    source: Source<T> | Source<T>[];
     transformers?: Transformer[];
     /**
      * Additional options for page tree builder
@@ -265,7 +256,7 @@ interface LegacyTransformerOptions<Page extends PageData, Meta extends MetaData>
 
 interface PageTreeBuilderContext<Page extends PageData = PageData, Meta extends MetaData = MetaData> {
     /**
-     * @internal
+     * @internal resolve paths without extensions
      */
     resolveName: (name: string, format: 'meta' | 'page') => string;
     options: BaseOptions<Page, Meta>;
@@ -292,17 +283,17 @@ interface BaseOptions<Page extends PageData = PageData, Meta extends MetaData =
     noRef?: boolean;
     transformers?: PageTreeTransformer<Page, Meta>[];
     resolveIcon?: (icon: string | undefined) => ReactNode | undefined;
+    /**
+     * generate fallback page tree
+     *
+     * @defaultValue true
+     */
+    generateFallback?: boolean;
 }
 interface PageTreeBuilder<Page extends PageData = PageData, Meta extends MetaData = MetaData> {
     build: (options: BaseOptions<Page, Meta> & {
         id?: string;
         storage: ContentStorage<Page, Meta>;
-        /**
-         * generate fallback page tree
-         *
-         * @defaultValue true
-         */
-        generateFallback?: boolean;
     }) => Root;
     /**
      * Build page tree and fallback to the default language if the localized page doesn't exist

package/dist/source/index.js

@@ -252,7 +252,7 @@ function build(id, ctx) {
   return root;
 }
 function createPageTreeBuilder(getUrl) {
-  function getTransformers(options, generateFallback = true) {
+  function getTransformers(options, generateFallback) {
     const transformers = [legacyTransformer(options)];
     if (options.transformers) {
       transformers.push(...options.transformers);
@@ -275,25 +275,21 @@ function createPageTreeBuilder(getUrl) {
     };
   }
   return {
-    build({ storage, id, generateFallback, ...options }) {
-      const resolve = createFlattenPathResolver(storage);
-      return build(id ?? "root", {
-        transformers: getTransformers(options, generateFallback),
-        options,
-        builder: this,
-        storage,
-        getUrl,
-        resolveName(name, format) {
-          return resolve(name, format) ?? name;
-        }
-      });
+    build({ storage, id, ...options }) {
+      const key = "";
+      return this.buildI18n({
+        id,
+        storages: { [key]: storage },
+        ...options
+      })[key];
     },
-    buildI18n({ id, storages, ...options }) {
-      const transformers = getTransformers(options);
+    buildI18n({ id, storages, generateFallback = true, ...options }) {
+      const transformers = getTransformers(options, generateFallback);
       const out = {};
       for (const [locale, storage] of Object.entries(storages)) {
         const resolve = createFlattenPathResolver(storage);
-        out[locale] = build(id ?? (locale.length === 0 ? "root" : locale), {
+        const branch = locale.length === 0 ? "root" : locale;
+        out[locale] = build(id ? `${id}-${branch}` : branch, {
           transformers,
           builder: this,
           options,
@@ -401,7 +397,7 @@ var parsers = {
 };
 function loadFiles(files, options, i18n) {
   const { buildFile, transformers = [] } = options;
-  const parser = parsers[i18n.parser];
+  const parser = parsers[i18n.parser ?? "dot"];
   const storages = {};
   const normalized = files.map(
     (file) => buildFile({
@@ -409,8 +405,16 @@ function loadFiles(files, options, i18n) {
       path: normalizePath(file.path)
     })
   );
-  function scan(lang, fallback) {
-    const storage = new FileSystem(fallback);
+  const fallbackLang = i18n.fallbackLanguage !== null ? i18n.fallbackLanguage ?? i18n.defaultLanguage : null;
+  function scan(lang) {
+    if (storages[lang]) return;
+    let storage;
+    if (fallbackLang && fallbackLang !== lang) {
+      scan(fallbackLang);
+      storage = new FileSystem(storages[fallbackLang]);
+    } else {
+      storage = new FileSystem();
+    }
     for (const item of normalized) {
       const [path, locale = i18n.defaultLanguage] = parser(item.path);
       if (locale === lang) storage.write(path, item);
@@ -421,12 +425,9 @@ function loadFiles(files, options, i18n) {
         options
       });
     }
-    return storage;
-  }
-  storages[i18n.defaultLanguage] = scan(i18n.defaultLanguage);
-  for (const lang of i18n.languages) {
-    storages[lang] ??= scan(lang, storages[i18n.defaultLanguage]);
+    storages[lang] = storage;
   }
+  for (const lang of i18n.languages) scan(lang);
   return storages;
 }
 function normalizePath(path) {
@@ -479,6 +480,17 @@ function createGetUrl(baseUrl, i18n) {
 function loader(options) {
   return createOutput(options);
 }
+function loadSource(source) {
+  const out = [];
+  for (const item of Array.isArray(source) ? source : [source]) {
+    if (typeof item.files === "function") {
+      out.push(...item.files());
+    } else {
+      out.push(...item.files);
+    }
+  }
+  return out;
+}
 function createOutput(options) {
   if (!options.url && !options.baseUrl) {
     console.warn("`loader()` now requires a `baseUrl` option to be defined.");
@@ -492,14 +504,15 @@ function createOutput(options) {
     transformers = []
   } = options;
   const defaultLanguage = i18n?.defaultLanguage ?? "";
-  const files = typeof source.files === "function" ? source.files() : source.files;
+  const files = loadSource(source);
   const transformerSlugs = ({ storage }) => {
     const indexFiles = /* @__PURE__ */ new Set();
     const taken = /* @__PURE__ */ new Set();
+    const autoIndex = slugsFn === void 0;
     for (const path of storage.getFiles()) {
       const file = storage.read(path);
       if (!file || file.format !== "page" || file.slugs) continue;
-      if (isIndex(path) && !slugsFn) {
+      if (isIndex(path) && autoIndex) {
         indexFiles.add(path);
         continue;
       }
@@ -537,10 +550,7 @@ function createOutput(options) {
       },
       transformers: [transformerSlugs, ...transformers]
     },
-    i18n ? {
-      ...i18n,
-      parser: i18n.parser ?? "dot"
-    } : {
+    i18n ?? {
       defaultLanguage,
       parser: "none",
       languages: [defaultLanguage]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fumadocs-core",
-  "version": "15.7.0",
+  "version": "15.7.1",
   "description": "The library for building a documentation website in Next.js",
   "keywords": [
     "NextJs",
@@ -110,7 +110,7 @@
   },
   "devDependencies": {
     "@mdx-js/mdx": "^3.1.0",
-    "@mixedbread/sdk": "^0.25.0",
+    "@mixedbread/sdk": "^0.26.0",
     "@oramacloud/client": "^2.1.4",
     "@tanstack/react-router": "^1.131.27",
     "@types/estree-jsx": "^1.0.5",