fumadocs-mdx 11.6.8 → 11.6.9

package/dist/loader-mdx.js

@@ -8,51 +8,21 @@ import {
   validate
 } from "./chunk-OTM6WYMS.js";
 import {
-  remarkInclude
-} from "./chunk-KTLWF7GN.js";
+  buildMDX,
+  countLines
+} from "./chunk-6PDS7MUA.js";
+import {
+  loadDefaultOptions
+} from "./chunk-YRT4TZBA.js";
+import "./chunk-AVMO2SRO.js";
 import "./chunk-DRVUBK5B.js";
 import {
   fumaMatter
-} from "./chunk-MXACIHNJ.js";
+} from "./chunk-KVWX6THC.js";
 
 // src/loader-mdx.ts
 import * as path from "path";
 import { parse } from "querystring";
-
-// src/utils/build-mdx.ts
-import { createProcessor } from "@mdx-js/mdx";
-var cache = /* @__PURE__ */ new Map();
-async function buildMDX(cacheKey, source, options) {
-  const { filePath, frontmatter, data, ...rest } = options;
-  let format = options.format;
-  if (!format && filePath) {
-    format = filePath.endsWith(".mdx") ? "mdx" : "md";
-  }
-  format ??= "mdx";
-  const key = `${cacheKey}:${format}`;
-  let cached = cache.get(key);
-  if (cached === void 0) {
-    cached = createProcessor({
-      outputFormat: "program",
-      development: process.env.NODE_ENV === "development",
-      ...rest,
-      remarkPlugins: [remarkInclude, ...rest.remarkPlugins ?? []],
-      format
-    });
-    cache.set(key, cached);
-  }
-  return cached.process({
-    value: source,
-    path: filePath,
-    data: {
-      ...data,
-      frontmatter,
-      _compiler: options._compiler
-    }
-  });
-}
-
-// src/loader-mdx.ts
 async function loader(source, callback) {
   this.cacheable(true);
   const context = this.context;
@@ -95,7 +65,7 @@ async function loader(source, callback) {
   }
   try {
     const lineOffset = "\n".repeat(
-      this.mode === "development" ? lines(matter.matter) : 0
+      this.mode === "development" ? countLines(matter.matter) : 0
     );
     const file = await buildMDX(
       `${configHash}:${collectionId ?? "global"}`,
@@ -119,23 +89,6 @@ async function loader(source, callback) {
     callback(error);
   }
 }
-async function loadDefaultOptions(config) {
-  const input = config.global?.mdxOptions;
-  config._mdx_loader ??= {};
-  const mdxLoader = config._mdx_loader;
-  if (!mdxLoader.cachedOptions) {
-    const { getDefaultMDXOptions } = await import("./mdx-options-YGL3EP3M.js");
-    mdxLoader.cachedOptions = typeof input === "function" ? getDefaultMDXOptions(await input()) : getDefaultMDXOptions(input ?? {});
-  }
-  return mdxLoader.cachedOptions;
-}
-function lines(s) {
-  let num = 0;
-  for (const c of s) {
-    if (c === "\n") num++;
-  }
-  return num;
-}
 export {
   loader as default
 };

package/dist/next/index.cjs

@@ -281,37 +281,16 @@ async function getGitTimestamp(file) {
 }
 
 // src/utils/fuma-matter.ts
-var import_lru_cache2 = require("lru-cache");
 var import_js_yaml = require("js-yaml");
-var cache3 = new import_lru_cache2.LRUCache({
-  max: 200
-});
+var regex = /^---\r?\n(.+?)\r?\n---\r?\n/s;
 function fumaMatter(input) {
-  if (input === "") {
-    return { data: {}, content: input, matter: "" };
-  }
-  const cached = cache3.get(input);
-  if (cached) return cached;
-  const result = parseMatter(input);
-  cache3.set(input, result);
-  return structuredClone(result);
-}
-var delimiter = "---";
-function parseMatter(str) {
-  const output = { matter: "", data: {}, content: str };
-  const open = delimiter + "\n";
-  const close = "\n" + delimiter;
-  if (!str.startsWith(open)) {
+  const output = { matter: "", data: {}, content: input };
+  const match = regex.exec(input);
+  if (!match) {
     return output;
   }
-  str = str.slice(open.length);
-  const len = str.length;
-  let closeIdx = str.indexOf(close);
-  if (closeIdx === -1) {
-    closeIdx = len;
-  }
-  output.matter = str.slice(0, closeIdx);
-  output.content = str.slice(closeIdx + close.length);
+  output.matter = match[1];
+  output.content = input.slice(match[0].length);
   const loaded = (0, import_js_yaml.load)(output.matter);
   output.data = loaded ?? {};
   return output;
@@ -323,8 +302,7 @@ async function readFileWithCache(file) {
   if (cached) return cached;
   return (await fs2.readFile(file)).toString();
 }
-async function generateJS(configPath, config, outputPath, configHash) {
-  const outDir = path3.dirname(outputPath);
+async function generateJS(configPath, config, importPath, configHash = false) {
   let asyncInit = false;
   const lines = [
     getImportCode({
@@ -334,7 +312,7 @@ async function generateJS(configPath, config, outputPath, configHash) {
     }),
     getImportCode({
       type: "namespace",
-      specifier: toImportPath(configPath, outDir),
+      specifier: toImportPath(configPath, importPath),
       name: "_source"
     })
   ];
@@ -342,11 +320,15 @@ async function generateJS(configPath, config, outputPath, configHash) {
   async function getDocEntries(collectionName, files) {
     const items = files.map(async (file, i) => {
       const importId = `${collectionName}_${i}`;
+      const params = [`collection=${collectionName}`];
+      if (configHash) {
+        params.push(`hash=${configHash}`);
+      }
       lines.unshift(
         getImportCode({
           type: "namespace",
           name: importId,
-          specifier: `${toImportPath(file.absolutePath, outDir)}?collection=${collectionName}&hash=${configHash}`
+          specifier: `${toImportPath(file.absolutePath, importPath)}?${params.join("&")}`
         })
       );
       return `{ info: ${JSON.stringify(file)}, data: ${importId} }`;
@@ -476,14 +458,17 @@ function getImportCode(info) {
   }
   return `import ${specifier}`;
 }
-function toImportPath(file, dir) {
+function toImportPath(file, config) {
   const ext = path3.extname(file);
-  let importPath = path3.relative(
-    dir,
-    ext === ".ts" ? file.substring(0, file.length - ext.length) : file
-  );
-  if (!path3.isAbsolute(importPath) && !importPath.startsWith(".")) {
-    importPath = `./${importPath}`;
+  const filename = ext === ".ts" ? file.substring(0, file.length - ext.length) : file;
+  let importPath;
+  if ("relativeTo" in config) {
+    importPath = path3.relative(config.relativeTo, filename);
+    if (!path3.isAbsolute(importPath) && !importPath.startsWith(".")) {
+      importPath = `./${importPath}`;
+    }
+  } else {
+    importPath = path3.resolve(filename);
   }
   return importPath.replaceAll(path3.sep, "/");
 }
@@ -510,7 +495,12 @@ async function start(dev, configPath, outDir) {
     try {
       await fs3.writeFile(
         outPath,
-        await generateJS(configPath, config, outPath, configHash)
+        await generateJS(
+          configPath,
+          config,
+          { relativeTo: outDir },
+          configHash
+        )
       );
     } catch (err) {
       if (err instanceof ValidationError) {
@@ -615,7 +605,10 @@ async function postInstall(configPath = findConfigFile(), outDir = ".source") {
   const config = await loadConfig(configPath, outDir, hash, true);
   await fs4.rm(path5.dirname(jsOut), { recursive: true });
   await fs4.mkdir(path5.dirname(jsOut), { recursive: true });
-  await fs4.writeFile(jsOut, await generateJS(configPath, config, jsOut, hash));
+  await fs4.writeFile(
+    jsOut,
+    await generateJS(configPath, config, { relativeTo: outDir }, hash)
+  );
   console.log("[MDX] types generated");
 }
 // Annotate the CommonJS export names for ESM import in node:

package/dist/next/index.js

@@ -11,7 +11,7 @@ import {
 import "../chunk-DRVUBK5B.js";
 import {
   fumaMatter
-} from "../chunk-MXACIHNJ.js";
+} from "../chunk-KVWX6THC.js";
 
 // src/map/index.ts
 import * as path2 from "path";
@@ -59,8 +59,7 @@ async function readFileWithCache(file) {
   if (cached) return cached;
   return (await fs.readFile(file)).toString();
 }
-async function generateJS(configPath, config, outputPath, configHash) {
-  const outDir = path.dirname(outputPath);
+async function generateJS(configPath, config, importPath, configHash = false) {
   let asyncInit = false;
   const lines = [
     getImportCode({
@@ -70,7 +69,7 @@ async function generateJS(configPath, config, outputPath, configHash) {
     }),
     getImportCode({
       type: "namespace",
-      specifier: toImportPath(configPath, outDir),
+      specifier: toImportPath(configPath, importPath),
       name: "_source"
     })
   ];
@@ -78,11 +77,15 @@ async function generateJS(configPath, config, outputPath, configHash) {
   async function getDocEntries(collectionName, files) {
     const items = files.map(async (file, i) => {
       const importId = `${collectionName}_${i}`;
+      const params = [`collection=${collectionName}`];
+      if (configHash) {
+        params.push(`hash=${configHash}`);
+      }
       lines.unshift(
         getImportCode({
           type: "namespace",
           name: importId,
-          specifier: `${toImportPath(file.absolutePath, outDir)}?collection=${collectionName}&hash=${configHash}`
+          specifier: `${toImportPath(file.absolutePath, importPath)}?${params.join("&")}`
         })
       );
       return `{ info: ${JSON.stringify(file)}, data: ${importId} }`;
@@ -212,14 +215,17 @@ function getImportCode(info) {
   }
   return `import ${specifier}`;
 }
-function toImportPath(file, dir) {
+function toImportPath(file, config) {
   const ext = path.extname(file);
-  let importPath = path.relative(
-    dir,
-    ext === ".ts" ? file.substring(0, file.length - ext.length) : file
-  );
-  if (!path.isAbsolute(importPath) && !importPath.startsWith(".")) {
-    importPath = `./${importPath}`;
+  const filename = ext === ".ts" ? file.substring(0, file.length - ext.length) : file;
+  let importPath;
+  if ("relativeTo" in config) {
+    importPath = path.relative(config.relativeTo, filename);
+    if (!path.isAbsolute(importPath) && !importPath.startsWith(".")) {
+      importPath = `./${importPath}`;
+    }
+  } else {
+    importPath = path.resolve(filename);
   }
   return importPath.replaceAll(path.sep, "/");
 }
@@ -246,7 +252,12 @@ async function start(dev, configPath, outDir) {
     try {
       await fs2.writeFile(
         outPath,
-        await generateJS(configPath, config, outPath, configHash)
+        await generateJS(
+          configPath,
+          config,
+          { relativeTo: outDir },
+          configHash
+        )
       );
     } catch (err) {
       if (err instanceof ValidationError) {
@@ -351,7 +362,10 @@ async function postInstall(configPath = findConfigFile(), outDir = ".source") {
   const config = await loadConfig(configPath, outDir, hash, true);
   await fs3.rm(path3.dirname(jsOut), { recursive: true });
   await fs3.mkdir(path3.dirname(jsOut), { recursive: true });
-  await fs3.writeFile(jsOut, await generateJS(configPath, config, jsOut, hash));
+  await fs3.writeFile(
+    jsOut,
+    await generateJS(configPath, config, { relativeTo: outDir }, hash)
+  );
   console.log("[MDX] types generated");
 }
 export {

package/dist/runtime/async.cjs

@@ -42,37 +42,16 @@ var path = __toESM(require("path"), 1);
 var fs = __toESM(require("fs/promises"), 1);
 
 // src/utils/fuma-matter.ts
-var import_lru_cache = require("lru-cache");
 var import_js_yaml = require("js-yaml");
-var cache = new import_lru_cache.LRUCache({
-  max: 200
-});
+var regex = /^---\r?\n(.+?)\r?\n---\r?\n/s;
 function fumaMatter(input) {
-  if (input === "") {
-    return { data: {}, content: input, matter: "" };
-  }
-  const cached = cache.get(input);
-  if (cached) return cached;
-  const result = parseMatter(input);
-  cache.set(input, result);
-  return structuredClone(result);
-}
-var delimiter = "---";
-function parseMatter(str) {
-  const output = { matter: "", data: {}, content: str };
-  const open = delimiter + "\n";
-  const close = "\n" + delimiter;
-  if (!str.startsWith(open)) {
+  const output = { matter: "", data: {}, content: input };
+  const match = regex.exec(input);
+  if (!match) {
     return output;
   }
-  str = str.slice(open.length);
-  const len = str.length;
-  let closeIdx = str.indexOf(close);
-  if (closeIdx === -1) {
-    closeIdx = len;
-  }
-  output.matter = str.slice(0, closeIdx);
-  output.content = str.slice(closeIdx + close.length);
+  output.matter = match[1];
+  output.content = input.slice(match[0].length);
   const loaded = (0, import_js_yaml.load)(output.matter);
   output.data = loaded ?? {};
   return output;
@@ -154,7 +133,7 @@ var import_mdx_plugins = require("fumadocs-core/mdx-plugins");
 
 // src/runtime/index.ts
 var import_node_fs = __toESM(require("fs"), 1);
-var cache2 = /* @__PURE__ */ new Map();
+var cache = /* @__PURE__ */ new Map();
 var _runtime = {
   doc(files) {
     return files.map((file) => {
@@ -167,10 +146,10 @@ var _runtime = {
         _exports: file.data,
         get content() {
           const path2 = this._file.absolutePath;
-          const cached = cache2.get(path2);
+          const cached = cache.get(path2);
           if (cached) return cached;
           const content = import_node_fs.default.readFileSync(path2).toString();
-          cache2.set(path2, content);
+          cache.set(path2, content);
           return content;
         }
       };

package/dist/runtime/async.d.cts

@@ -1,14 +1,14 @@
-import { L as LoadedConfig, a as RuntimeAsync } from '../types-BsJd_P5O.cjs';
-import '../define-uoePrCQ_.cjs';
-import '@mdx-js/mdx';
+import { a as RuntimeAsync } from '../types-DZW0R4_d.cjs';
+import { L as LoadedConfig } from '../types-CDl6YYjj.cjs';
+import '@standard-schema/spec';
+import 'fumadocs-core/source';
 import 'mdx/types';
 import 'fumadocs-core/mdx-plugins';
 import 'fumadocs-core/server';
+import '@mdx-js/mdx';
 import 'unified';
 import 'react';
 import 'zod';
-import '@standard-schema/spec';
-import 'fumadocs-core/source';
 import '@fumadocs/mdx-remote';
 
 declare function buildConfig(config: Record<string, unknown>): [err: string, value: null] | [err: null, value: LoadedConfig];

package/dist/runtime/async.d.ts

@@ -1,14 +1,14 @@
-import { L as LoadedConfig, a as RuntimeAsync } from '../types-BYJBKH4G.js';
-import '../define-uoePrCQ_.js';
-import '@mdx-js/mdx';
+import { a as RuntimeAsync } from '../types-DVyGNyFh.js';
+import { L as LoadedConfig } from '../types-CDl6YYjj.js';
+import '@standard-schema/spec';
+import 'fumadocs-core/source';
 import 'mdx/types';
 import 'fumadocs-core/mdx-plugins';
 import 'fumadocs-core/server';
+import '@mdx-js/mdx';
 import 'unified';
 import 'react';
 import 'zod';
-import '@standard-schema/spec';
-import 'fumadocs-core/source';
 import '@fumadocs/mdx-remote';
 
 declare function buildConfig(config: Record<string, unknown>): [err: string, value: null] | [err: null, value: LoadedConfig];

package/dist/runtime/async.js

@@ -4,11 +4,11 @@ import {
 } from "../chunk-NUDEC6C5.js";
 import {
   remarkInclude
-} from "../chunk-KTLWF7GN.js";
+} from "../chunk-AVMO2SRO.js";
 import {
   buildConfig
 } from "../chunk-DRVUBK5B.js";
-import "../chunk-MXACIHNJ.js";
+import "../chunk-KVWX6THC.js";
 
 // src/runtime/async.ts
 import { createCompiler } from "@fumadocs/mdx-remote";

package/dist/{define-uoePrCQ_.d.ts → types-CDl6YYjj.d.cts}

@@ -1,60 +1,13 @@
-import { ProcessorOptions } from '@mdx-js/mdx';
 import { MDXProps } from 'mdx/types';
 import * as plugins from 'fumadocs-core/mdx-plugins';
 import { StructuredData } from 'fumadocs-core/mdx-plugins';
 import { TableOfContents } from 'fumadocs-core/server';
+import { ProcessorOptions } from '@mdx-js/mdx';
 import { Pluggable } from 'unified';
 import { FC } from 'react';
 import { z } from 'zod';
 import { StandardSchemaV1 } from '@standard-schema/spec';
-
-type ResolvePlugins = Pluggable[] | ((v: Pluggable[]) => Pluggable[]);
-type DefaultMDXOptions = Omit<NonNullable<ProcessorOptions>, 'rehypePlugins' | 'remarkPlugins' | '_ctx'> & {
-    rehypePlugins?: ResolvePlugins;
-    remarkPlugins?: ResolvePlugins;
-    /**
-     * Properties to export from `vfile.data`
-     */
-    valueToExport?: string[];
-    remarkStructureOptions?: plugins.StructureOptions | false;
-    remarkHeadingOptions?: plugins.RemarkHeadingOptions;
-    remarkImageOptions?: plugins.RemarkImageOptions | false;
-    remarkCodeTabOptions?: plugins.RemarkCodeTabOptions | false;
-    rehypeCodeOptions?: plugins.RehypeCodeOptions | false;
-};
-declare function getDefaultMDXOptions({ valueToExport, rehypeCodeOptions, remarkImageOptions, remarkHeadingOptions, remarkStructureOptions, remarkCodeTabOptions, ...mdxOptions }: DefaultMDXOptions): ProcessorOptions;
-
-interface GlobalConfig {
-    /**
-     * Configure global MDX options
-     */
-    mdxOptions?: DefaultMDXOptions | (() => DefaultMDXOptions | Promise<DefaultMDXOptions>);
-    /**
-     * Fetch last modified time with specified version control
-     * @defaultValue 'none'
-     */
-    lastModifiedTime?: 'git' | 'none';
-}
-interface FileInfo {
-    path: string;
-    absolutePath: string;
-}
-interface MarkdownProps {
-    body: FC<MDXProps>;
-    structuredData: StructuredData;
-    toc: TableOfContents;
-    _exports: Record<string, unknown>;
-    /**
-     * Only available when `lastModifiedTime` is enabled on MDX loader
-     */
-    lastModified?: Date;
-}
-interface BaseCollectionEntry {
-    /**
-     * Raw file path of collection entry, including absolute path (not normalized).
-     */
-    _file: FileInfo;
-}
+import { MDXOptions as MDXOptions$1 } from '@fumadocs/mdx-remote';
 
 interface MDXOptions extends ProcessorOptions {
     /**
@@ -94,17 +47,17 @@ declare const metaSchema: z.ZodObject<{
 }, "strip", z.ZodTypeAny, {
     root?: boolean | undefined;
     title?: string | undefined;
-    icon?: string | undefined;
     pages?: string[] | undefined;
     description?: string | undefined;
     defaultOpen?: boolean | undefined;
+    icon?: string | undefined;
 }, {
     root?: boolean | undefined;
     title?: string | undefined;
-    icon?: string | undefined;
     pages?: string[] | undefined;
     description?: string | undefined;
     defaultOpen?: boolean | undefined;
+    icon?: string | undefined;
 }>;
 declare const frontmatterSchema: z.ZodObject<{
     title: z.ZodString;
@@ -114,14 +67,14 @@ declare const frontmatterSchema: z.ZodObject<{
     _openapi: z.ZodOptional<z.ZodObject<{}, "passthrough", z.ZodTypeAny, z.objectOutputType<{}, z.ZodTypeAny, "passthrough">, z.objectInputType<{}, z.ZodTypeAny, "passthrough">>>;
 }, "strip", z.ZodTypeAny, {
     title: string;
-    icon?: string | undefined;
     description?: string | undefined;
+    icon?: string | undefined;
     full?: boolean | undefined;
     _openapi?: z.objectOutputType<{}, z.ZodTypeAny, "passthrough"> | undefined;
 }, {
     title: string;
-    icon?: string | undefined;
     description?: string | undefined;
+    icon?: string | undefined;
     full?: boolean | undefined;
     _openapi?: z.objectInputType<{}, z.ZodTypeAny, "passthrough"> | undefined;
 }>;
@@ -201,4 +154,63 @@ declare function defineDocs<DocSchema extends StandardSchemaV1 = typeof frontmat
 };
 declare function defineConfig(config?: GlobalConfig): GlobalConfig;
 
-export { type BaseCollectionEntry as B, type CollectionSchema as C, type DocCollection as D, type FileInfo as F, type GlobalConfig as G, type MarkdownProps as M, type BaseCollection as a, type MetaCollection as b, type DocsCollection as c, defineCollections as d, defineDocs as e, frontmatterSchema as f, defineConfig as g, type DefaultMDXOptions as h, getDefaultMDXOptions as i, metaSchema as m };
+interface LoadedConfig {
+    collections: Map<string, DocCollection | MetaCollection | DocsCollection>;
+    global?: GlobalConfig;
+    _mdx_loader?: {
+        cachedOptions?: ProcessorOptions;
+    };
+    _mdx_async?: {
+        cachedMdxOptions?: MDXOptions$1;
+    };
+}
+
+type ResolvePlugins = Pluggable[] | ((v: Pluggable[]) => Pluggable[]);
+type DefaultMDXOptions = Omit<NonNullable<ProcessorOptions>, 'rehypePlugins' | 'remarkPlugins' | '_ctx'> & {
+    rehypePlugins?: ResolvePlugins;
+    remarkPlugins?: ResolvePlugins;
+    /**
+     * Properties to export from `vfile.data`
+     */
+    valueToExport?: string[];
+    remarkStructureOptions?: plugins.StructureOptions | false;
+    remarkHeadingOptions?: plugins.RemarkHeadingOptions;
+    remarkImageOptions?: plugins.RemarkImageOptions | false;
+    remarkCodeTabOptions?: plugins.RemarkCodeTabOptions | false;
+    rehypeCodeOptions?: plugins.RehypeCodeOptions | false;
+};
+declare function loadDefaultOptions(config: LoadedConfig): Promise<ProcessorOptions>;
+
+interface GlobalConfig {
+    /**
+     * Configure global MDX options
+     */
+    mdxOptions?: DefaultMDXOptions | (() => DefaultMDXOptions | Promise<DefaultMDXOptions>);
+    /**
+     * Fetch last modified time with specified version control
+     * @defaultValue 'none'
+     */
+    lastModifiedTime?: 'git' | 'none';
+}
+interface FileInfo {
+    path: string;
+    absolutePath: string;
+}
+interface MarkdownProps {
+    body: FC<MDXProps>;
+    structuredData: StructuredData;
+    toc: TableOfContents;
+    _exports: Record<string, unknown>;
+    /**
+     * Only available when `lastModifiedTime` is enabled on MDX loader
+     */
+    lastModified?: Date;
+}
+interface BaseCollectionEntry {
+    /**
+     * Raw file path of collection entry, including absolute path (not normalized).
+     */
+    _file: FileInfo;
+}
+
+export { type BaseCollectionEntry as B, type CollectionSchema as C, type DefaultMDXOptions as D, type FileInfo as F, type GlobalConfig as G, type LoadedConfig as L, type MarkdownProps as M, type BaseCollection as a, type MetaCollection as b, type DocCollection as c, type DocsCollection as d, defineCollections as e, frontmatterSchema as f, defineDocs as g, defineConfig as h, loadDefaultOptions as l, metaSchema as m };