fumadocs-core 13.0.1 → 13.0.3

package/dist/dynamic-link.js

@@ -12,7 +12,7 @@ var DynamicLink = forwardRef(
   ({ href, ...props }, ref) => {
     const params = useParams();
     const url = useMemo(() => {
-      return href?.replace(/\[.*\]/, (key) => {
+      return href?.replace(/\[.*]/, (key) => {
         const mappedKey = key.slice(1, -1);
         const value = mappedKey in params ? params[mappedKey] : "undefined";
         return typeof value === "string" ? value : value.join("/");

package/dist/source/index.d.ts

@@ -20,45 +20,6 @@ interface FileInfo {
 declare function parseFilePath(path: string): FileInfo;
 declare function parseFolderPath(path: string): FileInfo;
 
-interface File {
-    file: FileInfo;
-    format: 'meta' | 'page';
-    data: Record<string, unknown>;
-}
-interface Folder {
-    file: FileInfo;
-    children: (File | Folder)[];
-}
-/**
- * A virtual file system that solves inconsistent behaviours
- *
- * Some source providers may not provide the full file structure, this will cause inconsistent outputs for page builder and other transformers
- */
-declare class Storage {
-    files: Map<string, File>;
-    folders: Map<string, Folder>;
-    private rootFolder;
-    constructor();
-    /**
-     * @param path - flattened path
-     * @param format - file format
-     */
-    read(path: string, format: string): File | undefined;
-    readDir(path: string): Folder | undefined;
-    root(): Folder;
-    write(path: string, format: 'meta' | 'page', data: Record<string, unknown>): void;
-    list(): File[];
-    makeDir(path: string): void;
-}
-
-type fileSystem_File = File;
-type fileSystem_Folder = Folder;
-type fileSystem_Storage = Storage;
-declare const fileSystem_Storage: typeof Storage;
-declare namespace fileSystem {
-  export { type fileSystem_File as File, type fileSystem_Folder as Folder, fileSystem_Storage as Storage };
-}
-
 interface LoadOptions {
     transformers?: Transformer[];
     rootDir?: string;
@@ -168,18 +129,62 @@ type InferMetaType<Utils extends LoaderOutput<any>> = Utils extends LoaderOutput
  * @internal
  */
 type UrlFn = (slugs: string[], locale?: string) => string;
-/**
- * @internal
- */
-interface FileData {
-    meta: {
+
+interface MetaFile {
+    file: FileInfo;
+    format: 'meta';
+    data: {
         data: MetaData;
     };
-    file: {
+}
+interface PageFile {
+    file: FileInfo;
+    format: 'page';
+    data: {
         slugs: string[];
         data: PageData;
     };
 }
+type File = MetaFile | PageFile;
+interface Folder {
+    file: FileInfo;
+    children: (File | Folder)[];
+}
+/**
+ * A virtual file system that solves inconsistent behaviours
+ *
+ * Some source providers may not provide the full file structure, this will cause inconsistent outputs for page builder and other transformers
+ */
+declare class Storage {
+    files: Map<string, File>;
+    folders: Map<string, Folder>;
+    private rootFolder;
+    constructor();
+    /**
+     * @param path - flattened path
+     * @param format - file format
+     */
+    read<F extends File['format']>(path: string, format: F): Extract<File, {
+        format: F;
+    }> | undefined;
+    readDir(path: string): Folder | undefined;
+    root(): Folder;
+    write<F extends File['format']>(path: string, format: F, data: Extract<File, {
+        format: F;
+    }>['data']): void;
+    list(): File[];
+    makeDir(path: string): void;
+}
+
+type fileSystem_File = File;
+type fileSystem_Folder = Folder;
+type fileSystem_MetaFile = MetaFile;
+type fileSystem_PageFile = PageFile;
+type fileSystem_Storage = Storage;
+declare const fileSystem_Storage: typeof Storage;
+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 {
     /**
@@ -188,8 +193,8 @@ interface BuildPageTreeOptions {
      * @defaultValue false
      */
     attachFolderIds?: boolean;
-    attachFile?: (node: Item, file?: File) => Item;
-    attachFolder?: (node: Folder$1, folder: Folder, meta?: File) => Folder$1;
+    attachFile?: (node: Item, file?: PageFile) => Item;
+    attachFolder?: (node: Folder$1, folder: Folder, meta?: MetaFile) => Folder$1;
     attachSeparator?: (node: Separator) => Separator;
     storage: Storage;
     getUrl: UrlFn;
@@ -214,4 +219,4 @@ interface PageTreeBuilder {
 }
 declare function createPageTreeBuilder(): PageTreeBuilder;
 
-export { type BuildPageTreeOptions, type BuildPageTreeOptionsWithI18n, 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, loadFiles, loader, parseFilePath, parseFolderPath };
+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 };

package/dist/source/index.js

@@ -104,13 +104,11 @@ function resolveFolderItem(folder, item, ctx, addedNodePaths) {
     };
     return [ctx.options.attachFile?.(node) ?? node];
   }
+  const isExcept = item.startsWith("!"), isExtract = item.startsWith("...");
   let filename = item;
-  const isExcept = item.startsWith("!");
   if (isExcept) {
     filename = item.slice(1);
-  }
-  const isExtract = item.startsWith("...");
-  if (isExtract) {
+  } else if (isExtract) {
     filename = item.slice(3);
   }
   const path = resolvePath(folder.file.path, filename);
@@ -124,7 +122,7 @@ function resolveFolderItem(folder, item, ctx, addedNodePaths) {
   }
   return [buildFileNode(itemNode, ctx)];
 }
-function buildFolderNode(folder, defaultIsRoot, ctx) {
+function buildFolderNode(folder, isGlobalRoot, ctx) {
   const metaPath = resolvePath(folder.file.path, "meta");
   let meta = ctx.storage.read(metaPath, "meta");
   meta = findLocalizedFile(metaPath, "meta", ctx) ?? meta;
@@ -136,9 +134,9 @@ function buildFolderNode(folder, defaultIsRoot, ctx) {
   const index = indexFile ? buildFileNode(indexFile, ctx) : void 0;
   let children;
   if (!meta) {
-    children = buildAll(folder.children, ctx, !defaultIsRoot);
+    children = buildAll(folder.children, ctx, !isGlobalRoot);
   } else {
-    const isRoot = metadata?.root ?? defaultIsRoot;
+    const isRoot = metadata?.root ?? isGlobalRoot;
     const addedNodePaths = /* @__PURE__ */ new Set();
     const resolved = metadata?.pages?.flatMap((item) => {
       return resolveFolderItem(folder, item, ctx, addedNodePaths);
@@ -159,7 +157,7 @@ function buildFolderNode(folder, defaultIsRoot, ctx) {
   const node = {
     type: "folder",
     name: metadata?.title ?? index?.name ?? pathToName(folder.file.name, true),
-    icon: ctx.options.resolveIcon?.(metadata?.icon),
+    icon: ctx.options.resolveIcon?.(metadata?.icon) ?? index?.icon,
     root: metadata?.root,
     defaultOpen: metadata?.defaultOpen,
     index,
@@ -174,12 +172,11 @@ function buildFolderNode(folder, defaultIsRoot, ctx) {
 }
 function buildFileNode(file, ctx) {
   const localized = findLocalizedFile(file.file.flattenedPath, "page", ctx) ?? file;
-  const data = localized.data;
   const item = {
     type: "page",
-    name: data.data.title,
-    icon: ctx.options.resolveIcon?.(data.data.icon),
-    url: ctx.options.getUrl(data.slugs, ctx.lang)
+    name: localized.data.data.title,
+    icon: ctx.options.resolveIcon?.(localized.data.data.icon),
+    url: ctx.options.getUrl(localized.data.slugs, ctx.lang)
   };
   return removeUndefined(ctx.options.attachFile?.(item, file) ?? item);
 }
@@ -420,12 +417,11 @@ function createOutput({
   };
 }
 function fileToPage(file, getUrl, locale) {
-  const data = file.data;
   return {
     file: file.file,
-    url: getUrl(data.slugs, locale),
-    slugs: data.slugs,
-    data: data.data
+    url: getUrl(file.data.slugs, locale),
+    slugs: file.data.slugs,
+    data: file.data.data
   };
 }
 export {

package/package.json

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