fumadocs-core 15.0.5 → 15.0.6

package/dist/{chunk-4MNUWZIW.js → chunk-IYQ35KI2.js}

@@ -21,35 +21,31 @@ function remarkHeading({
   return (root, file) => {
     const toc = [];
     slugger.reset();
-    if (file.data.frontmatter) {
-      const frontmatter = file.data.frontmatter;
-      if (frontmatter._openapi?.toc) {
-        toc.push(...frontmatter._openapi.toc);
-      }
-    }
     visit(root, "heading", (heading) => {
       heading.data ||= {};
       heading.data.hProperties ||= {};
+      let id = heading.data.hProperties.id;
       const lastNode = heading.children.at(-1);
-      if (!heading.data.hProperties.id && lastNode?.type === "text" && customId) {
+      if (!id && lastNode?.type === "text" && customId) {
         const match = regex.exec(lastNode.value);
         if (match?.[1]) {
-          heading.data.hProperties.id = match[1];
+          id = match[1];
           lastNode.value = lastNode.value.slice(0, match.index);
         }
       }
-      const value = flattenNode(heading);
-      let id = heading.data.hProperties.id;
+      let flattened;
       if (!id) {
-        id = defaultSlug ? defaultSlug(root, heading, value) : slugger.slug(value);
+        flattened ??= flattenNode(heading);
+        id = defaultSlug ? defaultSlug(root, heading, flattened) : slugger.slug(flattened);
       }
       heading.data.hProperties.id = id;
-      if (generateToc)
+      if (generateToc) {
         toc.push({
-          title: value,
+          title: flattened ?? flattenNode(heading),
           url: `#${id}`,
           depth: heading.depth
         });
+      }
       return "skip";
     });
     if (generateToc) file.data.toc = toc;

package/dist/mdx-plugins/index.js

@@ -1,11 +1,11 @@
+import {
+  flattenNode,
+  remarkHeading
+} from "../chunk-IYQ35KI2.js";
 import {
   resolvePath,
   slash
 } from "../chunk-SHGL6VBO.js";
-import {
-  flattenNode,
-  remarkHeading
-} from "../chunk-4MNUWZIW.js";
 import {
   createStyleTransformer,
   defaultThemes
@@ -290,7 +290,7 @@ function transformerTab() {
 }
 
 // src/mdx-plugins/remark-image.ts
-import path from "node:path";
+import * as path from "node:path";
 import { visit } from "unist-util-visit";
 import sizeOf from "image-size";
 var VALID_BLUR_EXT = [".jpeg", ".png", ".webp", ".avif", ".jpg"];
@@ -308,8 +308,8 @@ function remarkImage({
       if (!src.startsWith("/")) return src;
       const to = path.join(publicDir, src);
       if (file.dirname) {
-        const relative = slash(path.relative(file.dirname, to));
-        return relative.startsWith("./") ? relative : `./${relative}`;
+        const relative2 = slash(path.relative(file.dirname, to));
+        return relative2.startsWith("./") ? relative2 : `./${relative2}`;
       }
       return slash(to);
     }
@@ -396,30 +396,29 @@ function remarkImage({
       }
     });
     await Promise.all(promises);
-    if (importsToInject.length > 0) {
-      const imports = importsToInject.map(
-        ({ variableName, importPath }) => ({
-          type: "mdxjsEsm",
-          data: {
-            estree: {
-              body: [
-                {
-                  type: "ImportDeclaration",
-                  source: { type: "Literal", value: importPath },
-                  specifiers: [
-                    {
-                      type: "ImportDefaultSpecifier",
-                      local: { type: "Identifier", name: variableName }
-                    }
-                  ]
-                }
-              ]
-            }
+    if (importsToInject.length === 0) return;
+    const imports = importsToInject.map(
+      ({ variableName, importPath }) => ({
+        type: "mdxjsEsm",
+        data: {
+          estree: {
+            body: [
+              {
+                type: "ImportDeclaration",
+                source: { type: "Literal", value: importPath },
+                specifiers: [
+                  {
+                    type: "ImportDefaultSpecifier",
+                    local: { type: "Identifier", name: variableName }
+                  }
+                ]
+              }
+            ]
           }
-        })
-      );
-      tree.children.unshift(...imports);
-    }
+        }
+      })
+    );
+    tree.children.unshift(...imports);
   };
 }
 async function getImageSize(src, dir) {
@@ -571,12 +570,23 @@ function visit4(node, tagNames, handler) {
 }
 
 // src/mdx-plugins/rehype-toc.ts
+var TocOnlyTag = "[toc]";
+var NoTocTag = "[!toc]";
 function rehypeToc({ exportToc = true } = {}) {
   return (tree) => {
     const output = [];
     visit4(tree, ["h1", "h2", "h3", "h4", "h5", "h6"], (element) => {
       const id = element.properties.id;
       if (!id) return "skip";
+      let isTocOnly = false;
+      const last = element.children.at(-1);
+      if (last?.type === "text" && last.value.endsWith(TocOnlyTag)) {
+        isTocOnly = true;
+        last.value = last.value.substring(0, last.value.length - TocOnlyTag.length).trimEnd();
+      } else if (last?.type === "text" && last.value.endsWith(NoTocTag)) {
+        last.value = last.value.substring(0, last.value.length - NoTocTag.length).trimEnd();
+        return "skip";
+      }
       const estree = toEstree(element, {
         elementAttributeNameCase: "react",
         stylePropertyNameCase: "dom"
@@ -587,6 +597,12 @@ function rehypeToc({ exportToc = true } = {}) {
           depth: Number(element.tagName.slice(1)),
           url: `#${id}`
         });
+      if (isTocOnly) {
+        Object.assign(element, {
+          type: "comment",
+          value: ""
+        });
+      }
       return "skip";
     });
     const declaration = {

package/dist/search/server.js

@@ -143,12 +143,13 @@ function pageToIndex(page) {
       "Cannot find structured data from page, please define the page to index function."
     );
   }
+  const structuredData = page.data.structuredData;
   return {
-    title: page.data.title,
+    title: page.data.title ?? page.file.name,
     description: "description" in page.data ? page.data.description : void 0,
     url: page.url,
     id: page.url,
-    structuredData: page.data.structuredData
+    structuredData
   };
 }
 function createFromSource(source, pageToIndexFn = pageToIndex, options = {}) {

package/dist/server/index.js

@@ -1,6 +1,6 @@
 import {
   remarkHeading
-} from "../chunk-4MNUWZIW.js";
+} from "../chunk-IYQ35KI2.js";
 import {
   createStyleTransformer,
   highlight

package/dist/source/index.d.ts

@@ -140,7 +140,7 @@ interface MetaData {
 }
 interface PageData {
     icon?: string | undefined;
-    title: 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;

package/dist/source/index.js

@@ -123,7 +123,8 @@ function buildFolderNode(folder, isGlobalRoot, ctx) {
   }
   const node = {
     type: "folder",
-    name: metadata?.title ?? index?.name ?? pathToName(folder.file.name, true),
+    name: metadata?.title ?? index?.name ?? // resolve folder groups like (group_name)
+    pathToName(group.exec(folder.file.name)?.[1] ?? folder.file.name),
     icon: ctx.options.resolveIcon?.(metadata?.icon) ?? index?.icon,
     root: metadata?.root,
     defaultOpen: metadata?.defaultOpen,
@@ -142,7 +143,7 @@ function buildFileNode(file, ctx) {
   const localized = findLocalizedFile(file.file.flattenedPath, "page", ctx) ?? file;
   const item = {
     type: "page",
-    name: localized.data.data.title,
+    name: localized.data.data.title ?? pathToName(localized.file.name),
     icon: ctx.options.resolveIcon?.(localized.data.data.icon),
     url: ctx.options.getUrl(localized.data.slugs, ctx.lang),
     $ref: !ctx.options.noRef ? {
@@ -187,10 +188,9 @@ function findLocalizedFile(path, format, ctx) {
   if (!ctx.lang) return;
   return ctx.storage.read(`${path}.${ctx.lang}`, format);
 }
-function pathToName(name, resolveGroup = false) {
-  const resolved = resolveGroup ? group.exec(name)?.[1] ?? name : name;
+function pathToName(name) {
   const result = [];
-  for (const c of resolved) {
+  for (const c of name) {
     if (result.length === 0) result.push(c.toLocaleUpperCase());
     else if (c === "-") result.push(" ");
     else result.push(c);
@@ -328,33 +328,31 @@ function loadFiles(files, options) {
 }
 
 // src/source/loader.ts
-function indexPages(storage, getUrl, languages = []) {
-  const i18n = /* @__PURE__ */ new Map();
+function indexPages(storage, getUrl, i18n) {
+  const defaultLanguage = i18n?.defaultLanguage ?? "";
+  const map = /* @__PURE__ */ new Map();
   const pages = /* @__PURE__ */ new Map();
   const metas = /* @__PURE__ */ new Map();
-  const defaultMap = /* @__PURE__ */ new Map();
-  i18n.set("", defaultMap);
-  for (const file of storage.list()) {
-    if (file.format === "meta") metas.set(file.file.path, fileToMeta(file));
-    if (file.format === "page") {
-      const page = fileToPage(file, getUrl, file.file.locale);
-      pages.set(file.file.path, page);
-      if (file.file.locale) continue;
-      defaultMap.set(page.slugs.join("/"), page);
-      for (const lang of languages) {
-        const langMap = i18n.get(lang) ?? /* @__PURE__ */ new Map();
+  for (const item of storage.list()) {
+    if (item.format === "meta") metas.set(item.file.path, fileToMeta(item));
+    if (item.format === "page") {
+      const page = fileToPage(item, getUrl, item.file.locale);
+      pages.set(item.file.path, page);
+      if (item.file.locale) continue;
+      map.set(`${defaultLanguage}.${page.slugs.join("/")}`, page);
+      if (!i18n) continue;
+      for (const lang of i18n.languages) {
         const localized = storage.read(
-          `${file.file.flattenedPath}.${lang}`,
+          `${item.file.flattenedPath}.${lang}`,
           "page"
         );
-        const localizedPage = fileToPage(localized ?? file, getUrl, lang);
-        langMap.set(localizedPage.slugs.join("/"), localizedPage);
-        i18n.set(lang, langMap);
+        const localizedPage = fileToPage(localized ?? item, getUrl, lang);
+        map.set(`${lang}.${localizedPage.slugs.join("/")}`, localizedPage);
       }
     }
   }
   return {
-    i18n,
+    pages: map,
     pathToPage: pages,
     pathToMeta: metas
   };
@@ -398,7 +396,7 @@ function createOutput(options) {
       getSlugs: slugsFn
     }
   );
-  const walker = indexPages(storage, getUrl, options.i18n?.languages);
+  const walker = indexPages(storage, getUrl, options.i18n);
   const builder = createPageTreeBuilder();
   const pageTree = options.i18n === void 0 ? builder.build({
     storage,
@@ -416,21 +414,25 @@ function createOutput(options) {
     _i18n: options.i18n,
     pageTree,
     getPages(language = options.i18n?.defaultLanguage ?? "") {
-      return Array.from(walker.i18n.get(language)?.values() ?? []);
+      const pages = [];
+      for (const key of walker.pages.keys()) {
+        if (key.startsWith(`${language}.`)) pages.push(walker.pages.get(key));
+      }
+      return pages;
     },
     getLanguages() {
       const list = [];
-      for (const [language, pages] of walker.i18n) {
-        if (language === "") continue;
+      if (!options.i18n) return list;
+      for (const language of options.i18n.languages) {
         list.push({
           language,
-          pages: Array.from(pages.values())
+          pages: this.getPages(language)
         });
       }
       return list;
     },
     getPage(slugs = [], language = options.i18n?.defaultLanguage ?? "") {
-      return walker.i18n.get(language)?.get(slugs.join("/"));
+      return walker.pages.get(`${language}.${slugs.join("/")}`);
     },
     getNodeMeta(node) {
       if (!node.$ref?.metaFile) return;
@@ -456,7 +458,7 @@ function createOutput(options) {
           }))
         );
       }
-      return Array.from(walker.i18n.get("")?.values() ?? []).map((page) => ({
+      return this.getPages().map((page) => ({
         [slug ?? "slug"]: page.slugs
       }));
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fumadocs-core",
-  "version": "15.0.5",
+  "version": "15.0.6",
   "description": "The library for building a documentation website in Next.js",
   "keywords": [
     "NextJs",
@@ -77,10 +77,10 @@
     "dist/*"
   ],
   "dependencies": {
-    "@formatjs/intl-localematcher": "^0.5.10",
+    "@formatjs/intl-localematcher": "^0.6.0",
     "@orama/orama": "^2.1.1",
-    "@shikijs/rehype": "^2.3.1",
-    "@shikijs/transformers": "^2.3.1",
+    "@shikijs/rehype": "^2.3.2",
+    "@shikijs/transformers": "^2.3.2",
     "github-slugger": "^2.0.0",
     "hast-util-to-estree": "^3.1.1",
     "hast-util-to-jsx-runtime": "^2.3.2",
@@ -90,7 +90,7 @@
     "remark": "^15.0.0",
     "remark-gfm": "^4.0.0",
     "scroll-into-view-if-needed": "^3.1.0",
-    "shiki": "^2.3.1",
+    "shiki": "^2.3.2",
     "unist-util-visit": "^5.0.0"
   },
   "devDependencies": {