fumadocs-mdx 12.0.0 → 12.0.2

package/dist/node/loader.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,24 +111,12 @@ 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/node/loader.ts
-var loader_exports = {};
-__export(loader_exports, {
-  load: () => load2
-});
-module.exports = __toCommonJS(loader_exports);
-
-// src/utils/config.ts
-var fs = __toESM(require("fs/promises"), 1);
-var path = __toESM(require("path"), 1);
-var import_node_url = require("url");
-
 // src/config/build.ts
 function buildConfig(config) {
   const collections = /* @__PURE__ */ new Map();
@@ -178,12 +166,18 @@ function buildConfig(config) {
     }
   };
 }
+var init_build = __esm({
+  "src/config/build.ts"() {
+    "use strict";
+  }
+});
 
-// src/utils/config.ts
-function findConfigFile() {
-  return path.resolve("source.config.ts");
-}
-var cache = null;
+// 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({
@@ -226,6 +220,42 @@ async function getConfigHash(configPath) {
   }
   throw new Error("Cannot find config file");
 }
+var fs, path, import_node_url, cache;
+var init_load = __esm({
+  "src/loaders/config/load.ts"() {
+    "use strict";
+    fs = __toESM(require("fs/promises"), 1);
+    path = __toESM(require("path"), 1);
+    import_node_url = require("url");
+    init_build();
+    cache = null;
+  }
+});
+
+// src/node/loader.ts
+var loader_exports = {};
+__export(loader_exports, {
+  load: () => load2
+});
+module.exports = __toCommonJS(loader_exports);
+
+// src/loaders/config/index.ts
+var import_node_path = __toESM(require("path"), 1);
+function findConfigFile() {
+  return import_node_path.default.resolve("source.config.ts");
+}
+function dynamicConfig(configPath, outDir) {
+  return {
+    async getConfig(hash) {
+      const { loadConfig: loadConfig2, getConfigHash: getConfigHash2 } = await Promise.resolve().then(() => (init_load(), load_exports));
+      return loadConfig2(
+        configPath,
+        outDir,
+        hash ?? await getConfigHash2(configPath)
+      );
+    }
+  };
+}
 
 // src/utils/fuma-matter.ts
 var import_js_yaml = require("js-yaml");
@@ -282,7 +312,7 @@ async function validate(schema, data, context, errorMessage) {
 }
 
 // src/utils/git-timestamp.ts
-var import_node_path = __toESM(require("path"), 1);
+var import_node_path2 = __toESM(require("path"), 1);
 var import_tinyexec = require("tinyexec");
 var cache2 = /* @__PURE__ */ new Map();
 async function getGitTimestamp(file) {
@@ -291,7 +321,7 @@ async function getGitTimestamp(file) {
   try {
     const out = await (0, import_tinyexec.x)(
       "git",
-      ["log", "-1", '--pretty="%ai"', import_node_path.default.relative(process.cwd(), file)],
+      ["log", "-1", '--pretty="%ai"', import_node_path2.default.relative(process.cwd(), file)],
       {
         throwOnError: true
       }
@@ -304,27 +334,39 @@ 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 path3 = __toESM(require("path"), 1);
+var path4 = __toESM(require("path"), 1);
 var fs2 = __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("");
@@ -341,21 +383,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",
@@ -375,7 +427,7 @@ ${e instanceof Error ? e.message : String(e)}`,
         { cause: e }
       );
     }
-    const ext = path3.extname(file);
+    const ext = path4.extname(file);
     data._compiler?.addDependency(file);
     if (params.lang || ext !== ".md" && ext !== ".mdx") {
       const lang = params.lang ?? ext.slice(1);
@@ -387,59 +439,56 @@ ${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, path3.dirname(file), data);
-    return parsed;
+    await update(mdast, path4.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 = path3.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 = path4.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) => {
-    await update(tree, path3.dirname(file.path), file.data);
+    await update(tree, path4.dirname(file.path), file.data);
   };
 }
 function getDefaultProcessor(format) {
@@ -448,7 +497,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");
@@ -477,7 +526,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") || []
       });
     }
@@ -531,7 +580,7 @@ function flattenNode2(node) {
   return "";
 }
 
-// src/mdx/build-mdx.ts
+// src/loaders/mdx/build-mdx.ts
 var cache3 = /* @__PURE__ */ new Map();
 async function buildMDX(cacheKey, source, options) {
   const { filePath, frontmatter, data, _compiler, ...rest } = options;
@@ -567,7 +616,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,
@@ -580,10 +629,10 @@ 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);
+var import_node_path3 = __toESM(require("path"), 1);
 var import_node_crypto = require("crypto");
 var querySchema = import_zod.z.object({
   only: import_zod.z.literal(["frontmatter", "all"]).default("all"),
@@ -611,7 +660,7 @@ function createMdxLoader(configLoader) {
     const cacheDir = isDevelopment ? void 0 : loaded.global.experimentalBuildCache;
     const cacheKey = `${parsed.hash}_${parsed.collection ?? "global"}_${generateCacheHash(filePath)}`;
     if (cacheDir) {
-      const cached = await import_promises.default.readFile(import_node_path2.default.join(cacheDir, cacheKey)).then((content) => cacheEntry.parse(JSON.parse(content.toString()))).catch(() => null);
+      const cached = await import_promises.default.readFile(import_node_path3.default.join(cacheDir, cacheKey)).then((content) => cacheEntry.parse(JSON.parse(content.toString()))).catch(() => null);
       if (cached && cached.hash === generateCacheHash(value)) return cached;
     }
     const collection = parsed.collection ? loaded.collections.get(parsed.collection) : void 0;
@@ -666,7 +715,7 @@ function createMdxLoader(configLoader) {
     if (cacheDir) {
       await import_promises.default.mkdir(cacheDir, { recursive: true });
       await import_promises.default.writeFile(
-        import_node_path2.default.join(cacheDir, cacheKey),
+        import_node_path3.default.join(cacheDir, cacheKey),
         JSON.stringify({
           ...out,
           hash: generateCacheHash(value)
@@ -679,25 +728,19 @@ function createMdxLoader(configLoader) {
 function generateCacheHash(input) {
   return (0, import_node_crypto.createHash)("md5").update(input).digest("hex");
 }
-
-// src/loaders/config-loader.ts
-function dynamicConfig(configPath, outDir) {
-  return {
-    async getConfig(hash) {
-      return loadConfig(
-        configPath,
-        outDir,
-        hash ?? await getConfigHash(configPath)
-      );
-    }
-  };
+function countLines(s) {
+  let num = 0;
+  for (const c of s) {
+    if (c === "\n") num++;
+  }
+  return num;
 }
 
 // src/loaders/adapter.ts
 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 toNode(loader, filterByPath) {
   return async (url, _context, nextLoad) => {
     if (!url.startsWith("file:///")) return nextLoad(url);

package/dist/node/loader.js

@@ -2,16 +2,15 @@ import {
   toNode
 } from "../chunk-VXEBLM4X.js";
 import {
-  createMdxLoader,
-  dynamicConfig
-} from "../chunk-KGUBBRL6.js";
+  createMdxLoader
+} from "../chunk-RMDXSZYE.js";
+import "../chunk-QAUWMR5D.js";
+import "../chunk-LMG6UWCL.js";
 import "../chunk-IQAEAI4P.js";
 import {
+  dynamicConfig,
   findConfigFile
-} from "../chunk-POXTQZ4D.js";
-import "../chunk-SWNOXPYJ.js";
-import "../chunk-KTDVTBMH.js";
-import "../chunk-YC25YEBF.js";
+} from "../chunk-XMFLD5J6.js";
 import "../chunk-VWJKRQZR.js";
 
 // src/node/loader.ts

package/dist/postinstall-SCSXM4IM.js

@@ -0,0 +1,10 @@
+import {
+  postInstall
+} from "./chunk-ZX7TM4AR.js";
+import "./chunk-6Y5JDZHD.js";
+import "./chunk-LGYVNESJ.js";
+import "./chunk-U4MQ44TS.js";
+import "./chunk-XMFLD5J6.js";
+export {
+  postInstall
+};

package/dist/{preset-WFEORCAB.js → preset-ZMP6U62C.js}

@@ -1,6 +1,6 @@
 import {
   getDefaultMDXOptions
-} from "./chunk-3M4SHY6K.js";
+} from "./chunk-FSZMKRVH.js";
 export {
   getDefaultMDXOptions
 };