fumadocs-mdx 11.6.7 → 11.6.9

package/dist/loader-mdx.cjs

@@ -5,9 +5,6 @@ var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __esm = (fn, res) => function __init() {
-  return fn && (res = (0, fn[__getOwnPropNames(fn)[0]])(fn = 0)), res;
-};
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
@@ -30,133 +27,6 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
-// src/mdx-plugins/remark-exports.ts
-function remarkMdxExport({ values }) {
-  return (tree, vfile) => {
-    for (const name of values) {
-      if (!(name in vfile.data)) return;
-      tree.children.unshift(getMdastExport(name, vfile.data[name]));
-    }
-  };
-}
-function getMdastExport(name, value) {
-  return {
-    type: "mdxjsEsm",
-    value: "",
-    data: {
-      estree: {
-        type: "Program",
-        sourceType: "module",
-        body: [
-          {
-            type: "ExportNamedDeclaration",
-            specifiers: [],
-            source: null,
-            declaration: {
-              type: "VariableDeclaration",
-              kind: "let",
-              declarations: [
-                {
-                  type: "VariableDeclarator",
-                  id: {
-                    type: "Identifier",
-                    name
-                  },
-                  init: (0, import_estree_util_value_to_estree.valueToEstree)(value)
-                }
-              ]
-            }
-          }
-        ]
-      }
-    }
-  };
-}
-var import_estree_util_value_to_estree;
-var init_remark_exports = __esm({
-  "src/mdx-plugins/remark-exports.ts"() {
-    "use strict";
-    import_estree_util_value_to_estree = require("estree-util-value-to-estree");
-  }
-});
-
-// src/utils/mdx-options.ts
-var mdx_options_exports = {};
-__export(mdx_options_exports, {
-  getDefaultMDXOptions: () => getDefaultMDXOptions
-});
-function pluginOption(def, options = []) {
-  const list = def(Array.isArray(options) ? options : []).filter(
-    Boolean
-  );
-  if (typeof options === "function") {
-    return options(list);
-  }
-  return list;
-}
-function getDefaultMDXOptions({
-  valueToExport = [],
-  rehypeCodeOptions,
-  remarkImageOptions,
-  remarkHeadingOptions,
-  remarkStructureOptions,
-  remarkCodeTabOptions,
-  ...mdxOptions
-}) {
-  const mdxExports = [
-    "structuredData",
-    "frontmatter",
-    "lastModified",
-    ...valueToExport
-  ];
-  const remarkPlugins = pluginOption(
-    (v) => [
-      plugins.remarkGfm,
-      [
-        plugins.remarkHeading,
-        {
-          generateToc: false,
-          ...remarkHeadingOptions
-        }
-      ],
-      remarkImageOptions !== false && [plugins.remarkImage, remarkImageOptions],
-      // Fumadocs 14 compatibility
-      "remarkCodeTab" in plugins && remarkCodeTabOptions !== false && [
-        plugins.remarkCodeTab,
-        remarkCodeTabOptions
-      ],
-      ...v,
-      remarkStructureOptions !== false && [
-        plugins.remarkStructure,
-        remarkStructureOptions
-      ],
-      [remarkMdxExport, { values: mdxExports }]
-    ],
-    mdxOptions.remarkPlugins
-  );
-  const rehypePlugins = pluginOption(
-    (v) => [
-      rehypeCodeOptions !== false && [plugins.rehypeCode, rehypeCodeOptions],
-      ...v,
-      plugins.rehypeToc
-    ],
-    mdxOptions.rehypePlugins
-  );
-  return {
-    ...mdxOptions,
-    remarkPlugins,
-    rehypePlugins
-  };
-}
-var plugins;
-var init_mdx_options = __esm({
-  "src/utils/mdx-options.ts"() {
-    "use strict";
-    plugins = __toESM(require("fumadocs-core/mdx-plugins"), 1);
-    init_remark_exports();
-  }
-});
-
 // src/loader-mdx.ts
 var loader_mdx_exports = {};
 __export(loader_mdx_exports, {
@@ -165,7 +35,6 @@ __export(loader_mdx_exports, {
 module.exports = __toCommonJS(loader_mdx_exports);
 var path4 = __toESM(require("path"), 1);
 var import_node_querystring = require("querystring");
-var import_gray_matter2 = __toESM(require("gray-matter"), 1);
 
 // src/utils/config.ts
 var fs = __toESM(require("fs/promises"), 1);
@@ -262,7 +131,24 @@ var import_mdx = require("@mdx-js/mdx");
 var import_unist_util_visit = require("unist-util-visit");
 var path2 = __toESM(require("path"), 1);
 var fs2 = __toESM(require("fs/promises"), 1);
-var import_gray_matter = __toESM(require("gray-matter"), 1);
+
+// src/utils/fuma-matter.ts
+var import_js_yaml = require("js-yaml");
+var regex = /^---\r?\n(.+?)\r?\n---\r?\n/s;
+function fumaMatter(input) {
+  const output = { matter: "", data: {}, content: input };
+  const match = regex.exec(input);
+  if (!match) {
+    return output;
+  }
+  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;
+}
+
+// src/mdx-plugins/remark-include.ts
 function flattenNode(node) {
   if ("children" in node)
     return node.children.map((child) => flattenNode(child)).join("");
@@ -297,7 +183,7 @@ function remarkInclude() {
         );
         const asCode = params.lang || !specifier.endsWith(".md") && !specifier.endsWith(".mdx");
         queue.push(
-          fs2.readFile(targetPath).then(async (content) => {
+          fs2.readFile(targetPath).then((buffer) => buffer.toString()).then(async (content) => {
             compiler?.addDependency(targetPath);
             if (asCode) {
               const lang = params.lang ?? path2.extname(specifier).slice(1);
@@ -310,7 +196,7 @@ function remarkInclude() {
               });
               return;
             }
-            const parsed = processor.parse((0, import_gray_matter.default)(content).content);
+            const parsed = processor.parse(fumaMatter(content).content);
             await update(parsed, targetPath, processor, compiler);
             Object.assign(
               parent && parent.type === "paragraph" ? parent : node,
@@ -344,10 +230,9 @@ async function buildMDX(cacheKey, source, options) {
   format ??= "mdx";
   const key = `${cacheKey}:${format}`;
   let cached = cache2.get(key);
-  if (cached === void 0) {
+  if (!cached) {
     cached = (0, import_mdx.createProcessor)({
       outputFormat: "program",
-      development: process.env.NODE_ENV === "development",
       ...rest,
       remarkPlugins: [remarkInclude, ...rest.remarkPlugins ?? []],
       format
@@ -443,13 +328,143 @@ async function validate(schema, data, context, errorMessage) {
   return data;
 }
 
+// src/utils/count-lines.ts
+function countLines(s) {
+  let num = 0;
+  for (const c of s) {
+    if (c === "\n") num++;
+  }
+  return num;
+}
+
+// src/utils/mdx-options.ts
+var plugins = __toESM(require("fumadocs-core/mdx-plugins"), 1);
+
+// src/mdx-plugins/remark-exports.ts
+var import_estree_util_value_to_estree = require("estree-util-value-to-estree");
+function remarkMdxExport({ values }) {
+  return (tree, vfile) => {
+    for (const name of values) {
+      if (!(name in vfile.data)) return;
+      tree.children.unshift(getMdastExport(name, vfile.data[name]));
+    }
+  };
+}
+function getMdastExport(name, value) {
+  return {
+    type: "mdxjsEsm",
+    value: "",
+    data: {
+      estree: {
+        type: "Program",
+        sourceType: "module",
+        body: [
+          {
+            type: "ExportNamedDeclaration",
+            specifiers: [],
+            source: null,
+            declaration: {
+              type: "VariableDeclaration",
+              kind: "let",
+              declarations: [
+                {
+                  type: "VariableDeclarator",
+                  id: {
+                    type: "Identifier",
+                    name
+                  },
+                  init: (0, import_estree_util_value_to_estree.valueToEstree)(value)
+                }
+              ]
+            }
+          }
+        ]
+      }
+    }
+  };
+}
+
+// src/utils/mdx-options.ts
+function pluginOption(def, options = []) {
+  const list = def(Array.isArray(options) ? options : []).filter(
+    Boolean
+  );
+  if (typeof options === "function") {
+    return options(list);
+  }
+  return list;
+}
+function getDefaultMDXOptions({
+  valueToExport = [],
+  rehypeCodeOptions,
+  remarkImageOptions,
+  remarkHeadingOptions,
+  remarkStructureOptions,
+  remarkCodeTabOptions,
+  ...mdxOptions
+}) {
+  const mdxExports = [
+    "structuredData",
+    "frontmatter",
+    "lastModified",
+    ...valueToExport
+  ];
+  const remarkPlugins = pluginOption(
+    (v) => [
+      plugins.remarkGfm,
+      [
+        plugins.remarkHeading,
+        {
+          generateToc: false,
+          ...remarkHeadingOptions
+        }
+      ],
+      remarkImageOptions !== false && [plugins.remarkImage, remarkImageOptions],
+      // Fumadocs 14 compatibility
+      "remarkCodeTab" in plugins && remarkCodeTabOptions !== false && [
+        plugins.remarkCodeTab,
+        remarkCodeTabOptions
+      ],
+      ...v,
+      remarkStructureOptions !== false && [
+        plugins.remarkStructure,
+        remarkStructureOptions
+      ],
+      [remarkMdxExport, { values: mdxExports }]
+    ],
+    mdxOptions.remarkPlugins
+  );
+  const rehypePlugins = pluginOption(
+    (v) => [
+      rehypeCodeOptions !== false && [plugins.rehypeCode, rehypeCodeOptions],
+      ...v,
+      plugins.rehypeToc
+    ],
+    mdxOptions.rehypePlugins
+  );
+  return {
+    ...mdxOptions,
+    remarkPlugins,
+    rehypePlugins
+  };
+}
+async function loadDefaultOptions(config) {
+  const input = config.global?.mdxOptions;
+  config._mdx_loader ??= {};
+  const mdxLoader = config._mdx_loader;
+  if (!mdxLoader.cachedOptions) {
+    mdxLoader.cachedOptions = typeof input === "function" ? getDefaultMDXOptions(await input()) : getDefaultMDXOptions(input ?? {});
+  }
+  return mdxLoader.cachedOptions;
+}
+
 // src/loader-mdx.ts
 async function loader(source, callback) {
   this.cacheable(true);
   const context = this.context;
   const filePath = this.resourcePath;
   const { configPath, outDir } = this.getOptions();
-  const matter2 = (0, import_gray_matter2.default)(source);
+  const matter = fumaMatter(source);
   const {
     hash: configHash = await getConfigHash(configPath),
     collection: collectionId
@@ -460,12 +475,13 @@ async function loader(source, callback) {
   if (collection && collection.type !== "doc") {
     collection = void 0;
   }
+  let data = matter.data;
   const mdxOptions = collection?.mdxOptions ?? await loadDefaultOptions(config);
   if (collection?.schema) {
     try {
-      matter2.data = await validate(
+      data = await validate(
         collection.schema,
-        matter2.data,
+        matter.data,
         {
           source,
           path: filePath
@@ -485,16 +501,16 @@ async function loader(source, callback) {
   }
   try {
     const lineOffset = "\n".repeat(
-      this.mode === "development" ? lines(matter2.matter) : 0
+      this.mode === "development" ? countLines(matter.matter) : 0
     );
     const file = await buildMDX(
       `${configHash}:${collectionId ?? "global"}`,
-      lineOffset + matter2.content,
+      lineOffset + matter.content,
       {
         development: this.mode === "development",
         ...mdxOptions,
         filePath,
-        frontmatter: matter2.data,
+        frontmatter: data,
         data: {
           lastModified: timestamp
         },
@@ -509,20 +525,3 @@ 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: getDefaultMDXOptions2 } = await Promise.resolve().then(() => (init_mdx_options(), mdx_options_exports));
-    mdxLoader.cachedOptions = typeof input === "function" ? getDefaultMDXOptions2(await input()) : getDefaultMDXOptions2(input ?? {});
-  }
-  return mdxLoader.cachedOptions;
-}
-function lines(s) {
-  let num = 0;
-  for (const c of s) {
-    if (c === "\n") num++;
-  }
-  return num;
-}

package/dist/loader-mdx.js

@@ -8,55 +8,27 @@ import {
   validate
 } from "./chunk-OTM6WYMS.js";
 import {
-  remarkInclude
-} from "./chunk-2Z6EJ3GA.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-KVWX6THC.js";
 
 // src/loader-mdx.ts
 import * as path from "path";
 import { parse } from "querystring";
-import grayMatter from "gray-matter";
-
-// 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;
   const filePath = this.resourcePath;
   const { configPath, outDir } = this.getOptions();
-  const matter = grayMatter(source);
+  const matter = fumaMatter(source);
   const {
     hash: configHash = await getConfigHash(configPath),
     collection: collectionId
@@ -67,10 +39,11 @@ async function loader(source, callback) {
   if (collection && collection.type !== "doc") {
     collection = void 0;
   }
+  let data = matter.data;
   const mdxOptions = collection?.mdxOptions ?? await loadDefaultOptions(config);
   if (collection?.schema) {
     try {
-      matter.data = await validate(
+      data = await validate(
         collection.schema,
         matter.data,
         {
@@ -92,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"}`,
@@ -101,7 +74,7 @@ async function loader(source, callback) {
         development: this.mode === "development",
         ...mdxOptions,
         filePath,
-        frontmatter: matter.data,
+        frontmatter: data,
         data: {
           lastModified: timestamp
         },
@@ -116,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

@@ -255,8 +255,7 @@ var fileCache = {
 };
 
 // src/map/generate.ts
-var import_gray_matter = __toESM(require("gray-matter"), 1);
-var import_js_yaml = require("js-yaml");
+var import_js_yaml2 = require("js-yaml");
 
 // src/utils/git-timestamp.ts
 var import_node_path2 = __toESM(require("path"), 1);
@@ -281,14 +280,29 @@ async function getGitTimestamp(file) {
   }
 }
 
+// src/utils/fuma-matter.ts
+var import_js_yaml = require("js-yaml");
+var regex = /^---\r?\n(.+?)\r?\n---\r?\n/s;
+function fumaMatter(input) {
+  const output = { matter: "", data: {}, content: input };
+  const match = regex.exec(input);
+  if (!match) {
+    return output;
+  }
+  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;
+}
+
 // src/map/generate.ts
 async function readFileWithCache(file) {
   const cached = fileCache.read("read-file", 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({
@@ -298,7 +312,7 @@ async function generateJS(configPath, config, outputPath, configHash) {
     }),
     getImportCode({
       type: "namespace",
-      specifier: toImportPath(configPath, outDir),
+      specifier: toImportPath(configPath, importPath),
       name: "_source"
     })
   ];
@@ -306,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} }`;
@@ -353,11 +371,12 @@ async function generateJS(configPath, config, outputPath, configHash) {
       asyncInit = true;
     }
     const entries2 = files.map(async (file) => {
-      const parsed = (0, import_gray_matter.default)(
+      const parsed = fumaMatter(
         await readFileWithCache(file.absolutePath).catch(() => "")
       );
+      let data = parsed.data;
       if (collection.schema) {
-        parsed.data = await validate(
+        data = await validate(
           collection.schema,
           parsed.data,
           { path: file.absolutePath, source: parsed.content },
@@ -371,7 +390,7 @@ async function generateJS(configPath, config, outputPath, configHash) {
       return JSON.stringify({
         info: file,
         lastModified,
-        data: parsed.data,
+        data,
         content: parsed.content
       });
     });
@@ -439,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, "/");
 }
@@ -454,7 +476,7 @@ function parseMetaEntry(file, content) {
   const extname3 = path3.extname(file);
   try {
     if (extname3 === ".json") return JSON.parse(content);
-    if (extname3 === ".yaml") return (0, import_js_yaml.load)(content);
+    if (extname3 === ".yaml") return (0, import_js_yaml2.load)(content);
   } catch (e) {
     throw new Error(`Failed to parse meta file: ${file}.`, {
       cause: e
@@ -473,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) {
@@ -578,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: