fumadocs-core 11.1.0 → 11.1.2

package/dist/mdx-plugins/index.d.ts

@@ -4,7 +4,7 @@ import { RehypeShikiOptions } from '@shikijs/rehype';
 import { Processor, Transformer } from 'unified';
 import { ShikiTransformer } from 'shiki';
 import { Root as Root$1, Heading } from 'mdast';
-export { S as StructuredData, r as remarkStructure, s as structure } from '../remark-structure-RwYPDA6M.js';
+export { a as StructureOptions, S as StructuredData, r as remarkStructure, s as structure } from '../remark-structure-Os9Vuaua.js';
 
 interface CodeBlockIcon {
     viewBox: string;

package/dist/{remark-structure-RwYPDA6M.d.ts → remark-structure-Os9Vuaua.d.ts}

@@ -12,11 +12,11 @@ interface Content {
 interface StructuredData {
     headings: Heading[];
     /**
-     * Refer to paragraphs, a heading may contains multiple contents as well
+     * Refer to paragraphs, a heading may contain multiple contents as well
      */
     contents: Content[];
 }
-interface Options {
+interface StructureOptions {
     /**
      * Types to be scanned, default: `["heading", "blockquote", "paragraph"]`
      */
@@ -25,10 +25,10 @@ interface Options {
 /**
  * Attach structured data to VFile, you can access via `vfile.data.structuredData`.
  */
-declare function remarkStructure({ types, }?: Options): Transformer<Root, Root>;
+declare function remarkStructure({ types, }?: StructureOptions): Transformer<Root, Root>;
 /**
  * Extract data from markdown/mdx content
  */
-declare function structure(content: string, remarkPlugins?: PluggableList, options?: Options): StructuredData;
+declare function structure(content: string, remarkPlugins?: PluggableList, options?: StructureOptions): StructuredData;
 
-export { type StructuredData as S, remarkStructure as r, structure as s };
+export { type StructuredData as S, type StructureOptions as a, remarkStructure as r, structure as s };

package/dist/search/server.d.ts

@@ -1,5 +1,5 @@
 import { NextRequest, NextResponse } from 'next/server';
-import { S as StructuredData } from '../remark-structure-RwYPDA6M.js';
+import { S as StructuredData } from '../remark-structure-Os9Vuaua.js';
 import { SortedResult } from './shared.js';
 import 'mdast';
 import 'unified';

package/dist/search-algolia/client.d.ts

@@ -4,7 +4,7 @@ import { SWRResponse } from 'swr';
 import { SortedResult } from '../search/shared.js';
 import { BaseIndex } from './server.js';
 import 'algoliasearch';
-import '../remark-structure-RwYPDA6M.js';
+import '../remark-structure-Os9Vuaua.js';
 import 'mdast';
 import 'unified';
 

package/dist/search-algolia/server.d.ts

@@ -1,5 +1,5 @@
 import { SearchClient, SearchIndex } from 'algoliasearch';
-import { S as StructuredData } from '../remark-structure-RwYPDA6M.js';
+import { S as StructuredData } from '../remark-structure-Os9Vuaua.js';
 import 'mdast';
 import 'unified';
 

package/dist/source/index.d.ts

@@ -64,7 +64,7 @@ interface BuildPageTreeOptionsWithI18n {
 interface PageTreeBuilder {
     build: () => Root;
     /**
-     * Build page tree and fallback to the default language if the page doesn't exist
+     * Build page tree and fallback to the default language if the localized page doesn't exist
      */
     buildI18n: (options?: Partial<BuildPageTreeOptionsWithI18n>) => Record<string, Root>;
 }

package/dist/source/index.js

@@ -10,7 +10,7 @@ import { parse } from "path";
 function parseFilePath(path) {
   const normalized = normalizePath(path);
   const parsed = parse(normalized);
-  const flattenedPath = joinPaths([parsed.dir, parsed.name]);
+  const flattenedPath = [parsed.dir, parsed.name].filter((p) => p.length > 0).join("/");
   const [name, locale] = parsed.name.split(".");
   return {
     dirname: parsed.dir,
@@ -36,13 +36,26 @@ function normalizePath(path) {
   const segments = splitPath(slash(path));
   if (segments[0] === "." || segments[0] === "..")
     throw new Error("It must not start with './' or '../'");
-  return joinPaths(segments);
+  return segments.join("/");
 }
 function splitPath(path) {
   return path.split("/").filter((p) => p.length > 0);
 }
-function joinPaths(paths, slashMode = "none") {
-  const joined = paths.flatMap((path) => splitPath(path)).join("/");
+function resolvePath(from, join, slashMode = "none") {
+  const v1 = splitPath(from), v2 = splitPath(join);
+  while (v2.length > 0) {
+    switch (v2[0]) {
+      case "..":
+        v1.pop();
+        break;
+      case ".":
+        break;
+      default:
+        v1.push(v2[0]);
+    }
+    v2.shift();
+  }
+  const joined = v1.join("/");
   switch (slashMode) {
     case "leading":
       return `/${joined}`;
@@ -54,10 +67,10 @@ function joinPaths(paths, slashMode = "none") {
 }
 
 // src/source/page-tree-builder.ts
-var external = new RegExp("\\[(?<text>.+)\\]\\((?<url>.+)\\)");
-var separator = new RegExp("---(?<name>.*?)---");
+var link = new RegExp("^\\[(?<text>.+)]\\((?<url>.+)\\)$");
+var separator = new RegExp("^---(?<name>.*?)---$");
 var rest = "...";
-var extractor = new RegExp("\\.\\.\\.(?<name>.+)");
+var extractor = new RegExp("^\\.\\.\\.(?<name>.+)$");
 function buildAll(nodes, ctx, skipIndex) {
   const output = [];
   for (const node of [...nodes].sort(
@@ -91,22 +104,24 @@ function resolveFolderItem(folder, item, ctx, addedNodePaths) {
       }
     ];
   }
-  const externalResult = external.exec(item);
-  if (externalResult == null ? void 0 : externalResult.groups) {
+  const linkResult = link.exec(item);
+  if (linkResult == null ? void 0 : linkResult.groups) {
+    const { url, text } = linkResult.groups;
+    const isRelative = url.startsWith("/") || url.startsWith("#") || url.startsWith(".");
     return [
       {
         type: "page",
-        name: externalResult.groups.text,
-        url: externalResult.groups.url,
-        external: true
+        name: text,
+        url,
+        external: !isRelative
       }
     ];
   }
   const extractResult = extractor.exec(item);
-  const path = joinPaths([
+  const path = resolvePath(
     folder.file.path,
     (_b = (_a = extractResult == null ? void 0 : extractResult.groups) == null ? void 0 : _a.name) != null ? _b : item
-  ]);
+  );
   const itemNode = (_c = ctx.storage.readDir(path)) != null ? _c : ctx.storage.read(path, "page");
   if (!itemNode)
     return [];
@@ -119,11 +134,11 @@ function resolveFolderItem(folder, item, ctx, addedNodePaths) {
 }
 function buildFolderNode(folder, defaultIsRoot, ctx) {
   var _a, _b, _c, _d, _e;
-  const metaPath = joinPaths([folder.file.path, "meta"]);
+  const metaPath = resolvePath(folder.file.path, "meta");
   let meta = ctx.storage.read(metaPath, "meta");
   meta = (_a = findLocalizedFile(metaPath, "meta", ctx)) != null ? _a : meta;
   const indexFile = ctx.storage.read(
-    joinPaths([folder.file.flattenedPath, "index"]),
+    resolvePath(folder.file.flattenedPath, "index"),
     "page"
   );
   const metadata = meta == null ? void 0 : meta.data.data;
@@ -344,10 +359,8 @@ function buildPageMap(storage, languages) {
 }
 function createGetUrl(baseUrl) {
   return (slugs, locale) => {
-    let paths = [baseUrl, ...slugs];
-    if (locale)
-      paths = [baseUrl, locale, ...slugs];
-    return joinPaths(paths, "leading");
+    const paths = locale ? [...splitPath(baseUrl), locale, ...slugs] : [...splitPath(baseUrl), ...slugs];
+    return `/${paths.join("/")}`;
   };
 }
 function getSlugs(info) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fumadocs-core",
-  "version": "11.1.0",
+  "version": "11.1.2",
   "description": "The library for building a documentation website in Next.js",
   "keywords": [
     "NextJs",
@@ -113,19 +113,19 @@
   ],
   "dependencies": {
     "@formatjs/intl-localematcher": "^0.5.4",
-    "@shikijs/rehype": "^1.3.0",
-    "@shikijs/transformers": "^1.3.0",
+    "@shikijs/rehype": "^1.6.0",
+    "@shikijs/transformers": "^1.6.0",
     "flexsearch": "0.7.21",
     "github-slugger": "^2.0.0",
     "hast-util-to-estree": "^3.1.0",
     "negotiator": "^0.6.3",
     "npm-to-yarn": "^2.2.1",
-    "react-remove-scroll": "^2.5.9",
+    "react-remove-scroll": "^2.5.10",
     "remark": "^15.0.0",
     "remark-gfm": "^4.0.0",
     "remark-mdx": "^3.0.1",
     "scroll-into-view-if-needed": "^3.1.0",
-    "shiki": "^1.3.0",
+    "shiki": "^1.6.0",
     "swr": "^2.2.5",
     "unist-util-visit": "^5.0.0"
   },
@@ -138,7 +138,7 @@
     "@types/mdast": "^4.0.3",
     "@types/negotiator": "^0.6.3",
     "@types/node": "18.17.5",
-    "@types/react": "^18.3.1",
+    "@types/react": "^18.3.2",
     "@types/react-dom": "^18.3.0",
     "algoliasearch": "^4.23.3",
     "next": "^14.2.3",