fumadocs-mdx 12.0.0 → 12.0.1

package/dist/loader-mdx.cjs

@@ -30,7 +30,7 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
-// src/mdx/preset.ts
+// src/loaders/mdx/preset.ts
 var preset_exports = {};
 __export(preset_exports, {
   getDefaultMDXOptions: () => getDefaultMDXOptions
@@ -111,12 +111,127 @@ function getDefaultMDXOptions({
 }
 var plugins;
 var init_preset = __esm({
-  "src/mdx/preset.ts"() {
+  "src/loaders/mdx/preset.ts"() {
     "use strict";
     plugins = __toESM(require("fumadocs-core/mdx-plugins"), 1);
   }
 });
 
+// src/config/build.ts
+function buildConfig(config) {
+  const collections = /* @__PURE__ */ new Map();
+  let globalConfig = {};
+  for (const [k, v] of Object.entries(config)) {
+    if (!v) {
+      continue;
+    }
+    if (typeof v === "object" && "type" in v) {
+      if (v.type === "docs") {
+        collections.set(k, v);
+        continue;
+      }
+      if (v.type === "doc" || v.type === "meta") {
+        collections.set(k, v);
+        continue;
+      }
+    }
+    if (k === "default" && v) {
+      globalConfig = v;
+      continue;
+    }
+    throw new Error(
+      `Unknown export "${k}", you can only export collections from source configuration file.`
+    );
+  }
+  const mdxOptionsCache = /* @__PURE__ */ new Map();
+  return {
+    global: globalConfig,
+    collections,
+    async getDefaultMDXOptions(mode = "default") {
+      const cached = mdxOptionsCache.get(mode);
+      if (cached) return cached;
+      const input = this.global.mdxOptions;
+      async function uncached() {
+        const options = typeof input === "function" ? await input() : input;
+        const { getDefaultMDXOptions: getDefaultMDXOptions2 } = await Promise.resolve().then(() => (init_preset(), preset_exports));
+        if (options?.preset === "minimal") return options;
+        return getDefaultMDXOptions2({
+          ...options,
+          _withoutBundler: mode === "remote"
+        });
+      }
+      const result = uncached();
+      mdxOptionsCache.set(mode, result);
+      return result;
+    }
+  };
+}
+var init_build = __esm({
+  "src/config/build.ts"() {
+    "use strict";
+  }
+});
+
+// src/loaders/config/load.ts
+var load_exports = {};
+__export(load_exports, {
+  getConfigHash: () => getConfigHash,
+  loadConfig: () => loadConfig
+});
+async function compileConfig(configPath, outDir) {
+  const { build } = await import("esbuild");
+  const transformed = await build({
+    entryPoints: [{ in: configPath, out: "source.config" }],
+    bundle: true,
+    outdir: outDir,
+    target: "node20",
+    write: true,
+    platform: "node",
+    format: "esm",
+    packages: "external",
+    outExtension: {
+      ".js": ".mjs"
+    },
+    allowOverwrite: true
+  });
+  if (transformed.errors.length > 0) {
+    throw new Error("failed to compile configuration file");
+  }
+}
+async function loadConfig(configPath, outDir, hash, build = false) {
+  if (cache3 && cache3.hash === hash) {
+    return await cache3.config;
+  }
+  if (build) await compileConfig(configPath, outDir);
+  const url = (0, import_node_url.pathToFileURL)(path4.resolve(outDir, "source.config.mjs"));
+  const config = import(`${url.href}?hash=${hash}`).then((loaded) => {
+    return buildConfig(
+      // every call to `loadConfig` will cause the previous cache to be ignored
+      loaded
+    );
+  });
+  if (hash) cache3 = { config, hash };
+  return await config;
+}
+async function getConfigHash(configPath) {
+  const stats = await fs3.stat(configPath).catch(() => void 0);
+  if (stats) {
+    return stats.mtime.getTime().toString();
+  }
+  throw new Error("Cannot find config file");
+}
+var fs3, path4, import_node_url, cache3;
+var init_load = __esm({
+  "src/loaders/config/load.ts"() {
+    "use strict";
+    fs3 = __toESM(require("fs/promises"), 1);
+    path4 = __toESM(require("path"), 1);
+    import_node_url = require("url");
+    init_build();
+    cache3 = null;
+  }
+});
+
 // src/loader-mdx.ts
 var loader_mdx_exports = {};
 __export(loader_mdx_exports, {
@@ -201,19 +316,10 @@ async function getGitTimestamp(file) {
   }
 }
 
-// src/utils/count-lines.ts
-function countLines(s) {
-  let num = 0;
-  for (const c of s) {
-    if (c === "\n") num++;
-  }
-  return num;
-}
-
-// src/mdx/build-mdx.ts
+// src/loaders/mdx/build-mdx.ts
 var import_mdx = require("@mdx-js/mdx");
 
-// src/mdx/remark-include.ts
+// src/loaders/mdx/remark-include.ts
 var import_unified = require("unified");
 var import_unist_util_visit = require("unist-util-visit");
 var path2 = __toESM(require("path"), 1);
@@ -221,7 +327,28 @@ var fs = __toESM(require("fs/promises"), 1);
 var import_remark_parse = __toESM(require("remark-parse"), 1);
 var import_remark_mdx = __toESM(require("remark-mdx"), 1);
 var import_mdx_plugins = require("fumadocs-core/mdx-plugins");
-var baseProcessor = (0, import_unified.unified)().use(import_mdx_plugins.remarkHeading);
+var ElementLikeTypes = [
+  "mdxJsxFlowElement",
+  "mdxJsxTextElement",
+  "containerDirective",
+  "textDirective",
+  "leafDirective"
+];
+function isElementLike(node) {
+  return ElementLikeTypes.includes(node.type);
+}
+function parseElementAttributes(element) {
+  if (Array.isArray(element.attributes)) {
+    const attributes = {};
+    for (const attr of element.attributes) {
+      if (attr.type === "mdxJsxAttribute" && (typeof attr.value === "string" || attr.value === null)) {
+        attributes[attr.name] = attr.value;
+      }
+    }
+    return attributes;
+  }
+  return element.attributes ?? {};
+}
 function flattenNode(node) {
   if ("children" in node)
     return node.children.map((child) => flattenNode(child)).join("");
@@ -238,21 +365,31 @@ function parseSpecifier(specifier) {
 }
 function extractSection(root, section) {
   let nodes;
-  for (const node of root.children) {
-    if (node.type === "mdxJsxFlowElement" && node.name === "section" && node.attributes.some(
-      (attr) => attr.type === "mdxJsxAttribute" && attr.name === "id" && attr.value === section
-    )) {
-      nodes = node.children;
-      break;
+  let capturingHeadingContent = false;
+  (0, import_unist_util_visit.visit)(root, (node) => {
+    if (node.type === "heading") {
+      if (capturingHeadingContent) {
+        return false;
+      }
+      if (node.data?.hProperties?.id === section) {
+        capturingHeadingContent = true;
+        nodes = [node];
+        return "skip";
+      }
+      return;
     }
-    if (node.type === "heading" && node.data?.hProperties?.id === section) {
-      nodes = [node];
-      continue;
+    if (capturingHeadingContent) {
+      nodes?.push(node);
+      return "skip";
     }
-    if (!nodes) continue;
-    if (node.type === "heading") break;
-    nodes.push(node);
-  }
+    if (isElementLike(node) && node.name === "section") {
+      const attributes = parseElementAttributes(node);
+      if (attributes.id === section) {
+        nodes = node.children;
+        return false;
+      }
+    }
+  });
   if (nodes)
     return {
       type: "root",
@@ -284,55 +421,52 @@ ${e instanceof Error ? e.message : String(e)}`,
         data: {}
       };
     }
-    const processor = (data._getProcessor ?? getDefaultProcessor)(
+    const parser = (data._getProcessor ?? getDefaultProcessor)(
       ext === ".mdx" ? "mdx" : "md"
     );
-    let parsed = await baseProcessor.run(
-      processor.parse(fumaMatter(content).content)
-    );
+    const parsed = fumaMatter(content);
+    let mdast = parser.parse({
+      path: file,
+      value: parsed.content,
+      data: { frontmatter: parsed.data }
+    });
     if (heading) {
-      const extracted = extractSection(parsed, heading);
+      const extracted = extractSection(
+        await (0, import_unified.unified)().use(import_mdx_plugins.remarkHeading).run(mdast),
+        heading
+      );
       if (!extracted)
         throw new Error(
-          `Cannot find section ${heading} in ${file}, make sure you have encapsulated the section in a <section id="${heading}"> tag.`
+          `Cannot find section ${heading} in ${file}, make sure you have encapsulated the section in a <section id="${heading}"> tag, or a :::section directive with remark-directive configured.`
         );
-      parsed = extracted;
+      mdast = extracted;
     }
-    await update(parsed, path2.dirname(file), data);
-    return parsed;
+    await update(mdast, path2.dirname(file), data);
+    return mdast;
   }
   async function update(tree, directory, data) {
     const queue = [];
-    (0, import_unist_util_visit.visit)(
-      tree,
-      ["mdxJsxFlowElement", "mdxJsxTextElement"],
-      (_node, _, parent) => {
-        const node = _node;
-        if (node.name !== TagName) return;
-        const params = {};
-        const specifier = flattenNode(node);
-        if (specifier.length === 0) return "skip";
-        for (const attr of node.attributes) {
-          if (attr.type === "mdxJsxAttribute" && (typeof attr.value === "string" || attr.value === null)) {
-            params[attr.name] = attr.value;
-          }
-        }
-        const { file: relativePath, section } = parseSpecifier(specifier);
-        const file = path2.resolve(
-          "cwd" in params ? process.cwd() : directory,
-          relativePath
-        );
-        queue.push(
-          embedContent(file, section, params, data).then((replace) => {
-            Object.assign(
-              parent && parent.type === "paragraph" ? parent : node,
-              replace
-            );
-          })
-        );
-        return "skip";
-      }
-    );
+    (0, import_unist_util_visit.visit)(tree, ElementLikeTypes, (_node, _, parent) => {
+      const node = _node;
+      if (node.name !== TagName) return;
+      const specifier = flattenNode(node);
+      if (specifier.length === 0) return "skip";
+      const attributes = parseElementAttributes(node);
+      const { file: relativePath, section } = parseSpecifier(specifier);
+      const file = path2.resolve(
+        "cwd" in attributes ? process.cwd() : directory,
+        relativePath
+      );
+      queue.push(
+        embedContent(file, section, attributes, data).then((replace) => {
+          Object.assign(
+            parent && parent.type === "paragraph" ? parent : node,
+            replace
+          );
+        })
+      );
+      return "skip";
+    });
     await Promise.all(queue);
   }
   return async (tree, file) => {
@@ -345,7 +479,7 @@ function getDefaultProcessor(format) {
   return mdProcessor.use(import_remark_mdx.default);
 }
 
-// src/mdx/remark-postprocess.ts
+// src/loaders/mdx/remark-postprocess.ts
 var import_unist_util_visit2 = require("unist-util-visit");
 var import_mdast_util_to_markdown = require("mdast-util-to-markdown");
 var import_estree_util_value_to_estree = require("estree-util-value-to-estree");
@@ -374,7 +508,7 @@ function remarkPostprocess({
     if (includeProcessedMarkdown) {
       file.data._markdown = (0, import_mdast_util_to_markdown.toMarkdown)(tree, {
         ...this.data("settings"),
-        // @ts-expect-error - from https://github.com/remarkjs/remark/blob/main/packages/remark-stringify/lib/index.js
+        // from https://github.com/remarkjs/remark/blob/main/packages/remark-stringify/lib/index.js
         extensions: this.data("toMarkdownExtensions") || []
       });
     }
@@ -428,7 +562,7 @@ function flattenNode2(node) {
   return "";
 }
 
-// src/mdx/build-mdx.ts
+// src/loaders/mdx/build-mdx.ts
 var cache2 = /* @__PURE__ */ new Map();
 async function buildMDX(cacheKey, source, options) {
   const { filePath, frontmatter, data, _compiler, ...rest } = options;
@@ -464,7 +598,7 @@ async function buildMDX(cacheKey, source, options) {
     return processor;
   }
   return getProcessor(
-    options.format ?? filePath.endsWith(".mdx") ? "mdx" : "md"
+    options.format ?? (filePath.endsWith(".mdx") ? "mdx" : "md")
   ).process({
     value: source,
     path: filePath,
@@ -477,7 +611,7 @@ async function buildMDX(cacheKey, source, options) {
   });
 }
 
-// src/loaders/mdx.ts
+// src/loaders/mdx/index.ts
 var import_zod = require("zod");
 var import_promises = __toESM(require("fs/promises"), 1);
 var import_node_path2 = __toESM(require("path"), 1);
@@ -576,115 +710,24 @@ function createMdxLoader(configLoader) {
 function generateCacheHash(input) {
   return (0, import_node_crypto.createHash)("md5").update(input).digest("hex");
 }
-
-// src/utils/config.ts
-var fs3 = __toESM(require("fs/promises"), 1);
-var path4 = __toESM(require("path"), 1);
-var import_node_url = require("url");
-
-// src/config/build.ts
-function buildConfig(config) {
-  const collections = /* @__PURE__ */ new Map();
-  let globalConfig = {};
-  for (const [k, v] of Object.entries(config)) {
-    if (!v) {
-      continue;
-    }
-    if (typeof v === "object" && "type" in v) {
-      if (v.type === "docs") {
-        collections.set(k, v);
-        continue;
-      }
-      if (v.type === "doc" || v.type === "meta") {
-        collections.set(k, v);
-        continue;
-      }
-    }
-    if (k === "default" && v) {
-      globalConfig = v;
-      continue;
-    }
-    throw new Error(
-      `Unknown export "${k}", you can only export collections from source configuration file.`
-    );
-  }
-  const mdxOptionsCache = /* @__PURE__ */ new Map();
-  return {
-    global: globalConfig,
-    collections,
-    async getDefaultMDXOptions(mode = "default") {
-      const cached = mdxOptionsCache.get(mode);
-      if (cached) return cached;
-      const input = this.global.mdxOptions;
-      async function uncached() {
-        const options = typeof input === "function" ? await input() : input;
-        const { getDefaultMDXOptions: getDefaultMDXOptions2 } = await Promise.resolve().then(() => (init_preset(), preset_exports));
-        if (options?.preset === "minimal") return options;
-        return getDefaultMDXOptions2({
-          ...options,
-          _withoutBundler: mode === "remote"
-        });
-      }
-      const result = uncached();
-      mdxOptionsCache.set(mode, result);
-      return result;
-    }
-  };
-}
-
-// src/utils/config.ts
-var cache3 = null;
-async function compileConfig(configPath, outDir) {
-  const { build } = await import("esbuild");
-  const transformed = await build({
-    entryPoints: [{ in: configPath, out: "source.config" }],
-    bundle: true,
-    outdir: outDir,
-    target: "node20",
-    write: true,
-    platform: "node",
-    format: "esm",
-    packages: "external",
-    outExtension: {
-      ".js": ".mjs"
-    },
-    allowOverwrite: true
-  });
-  if (transformed.errors.length > 0) {
-    throw new Error("failed to compile configuration file");
-  }
-}
-async function loadConfig(configPath, outDir, hash, build = false) {
-  if (cache3 && cache3.hash === hash) {
-    return await cache3.config;
-  }
-  if (build) await compileConfig(configPath, outDir);
-  const url = (0, import_node_url.pathToFileURL)(path4.resolve(outDir, "source.config.mjs"));
-  const config = import(`${url.href}?hash=${hash}`).then((loaded) => {
-    return buildConfig(
-      // every call to `loadConfig` will cause the previous cache to be ignored
-      loaded
-    );
-  });
-  if (hash) cache3 = { config, hash };
-  return await config;
-}
-async function getConfigHash(configPath) {
-  const stats = await fs3.stat(configPath).catch(() => void 0);
-  if (stats) {
-    return stats.mtime.getTime().toString();
+function countLines(s) {
+  let num = 0;
+  for (const c of s) {
+    if (c === "\n") num++;
   }
-  throw new Error("Cannot find config file");
+  return num;
 }
 
-// src/loaders/config-loader.ts
+// src/loaders/config/index.ts
+var import_node_path3 = __toESM(require("path"), 1);
 function dynamicConfig(configPath, outDir) {
   return {
     async getConfig(hash) {
-      return loadConfig(
+      const { loadConfig: loadConfig2, getConfigHash: getConfigHash2 } = await Promise.resolve().then(() => (init_load(), load_exports));
+      return loadConfig2(
         configPath,
         outDir,
-        hash ?? await getConfigHash(configPath)
+        hash ?? await getConfigHash2(configPath)
       );
     }
   };
@@ -694,7 +737,7 @@ function dynamicConfig(configPath, outDir) {
 var import_node_url2 = require("url");
 var import_promises2 = __toESM(require("fs/promises"), 1);
 var import_node_querystring = require("querystring");
-var import_node_path3 = __toESM(require("path"), 1);
+var import_node_path4 = __toESM(require("path"), 1);
 function toWebpack(loader2) {
   return async function(source, callback) {
     try {
@@ -711,7 +754,7 @@ function toWebpack(loader2) {
         return callback(new Error(error.toStringFormatted()));
       }
       if (!(error instanceof Error)) throw error;
-      const fpath = import_node_path3.default.relative(this.context, this.resourcePath);
+      const fpath = import_node_path4.default.relative(this.context, this.resourcePath);
       error.message = `${fpath}:${error.name}: ${error.message}`;
       callback(error);
     }

package/dist/loader-mdx.js

@@ -2,14 +2,14 @@ import {
   toWebpack
 } from "./chunk-VXEBLM4X.js";
 import {
-  createMdxLoader,
-  dynamicConfig
-} from "./chunk-KGUBBRL6.js";
+  createMdxLoader
+} from "./chunk-SP7CHRTS.js";
 import "./chunk-IQAEAI4P.js";
-import "./chunk-POXTQZ4D.js";
-import "./chunk-SWNOXPYJ.js";
-import "./chunk-KTDVTBMH.js";
-import "./chunk-YC25YEBF.js";
+import {
+  dynamicConfig
+} from "./chunk-XMFLD5J6.js";
+import "./chunk-QAUWMR5D.js";
+import "./chunk-LMG6UWCL.js";
 import "./chunk-VWJKRQZR.js";
 
 // src/loader-mdx.ts