fumadocs-mdx 12.0.3 → 13.0.1

package/dist/{loader-mdx.cjs → webpack/index.cjs}

@@ -175,7 +175,6 @@ var init_build = __esm({
 // src/loaders/config/load.ts
 var load_exports = {};
 __export(load_exports, {
-  getConfigHash: () => getConfigHash,
   loadConfig: () => loadConfig
 });
 async function compileConfig(configPath, outDir) {
@@ -198,46 +197,31 @@ async function compileConfig(configPath, outDir) {
     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;
-  }
+async function loadConfig(configPath, outDir, build = false) {
   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 };
+  url.searchParams.set("hash", Date.now().toString());
+  const config = import(url.href).then(
+    (loaded) => buildConfig(loaded)
+  );
   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 path4, import_node_url;
 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, {
+// src/webpack/index.ts
+var webpack_exports = {};
+__export(webpack_exports, {
   default: () => loader
 });
-module.exports = __toCommonJS(loader_mdx_exports);
+module.exports = __toCommonJS(webpack_exports);
 
 // src/utils/fuma-matter.ts
 var import_js_yaml = require("js-yaml");
@@ -321,12 +305,56 @@ var import_mdx = require("@mdx-js/mdx");
 
 // src/loaders/mdx/remark-include.ts
 var import_unified = require("unified");
-var import_unist_util_visit = require("unist-util-visit");
+var import_unist_util_visit2 = require("unist-util-visit");
 var path2 = __toESM(require("path"), 1);
 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");
+
+// src/loaders/mdx/remark-unravel.ts
+var import_unist_util_visit = require("unist-util-visit");
+function remarkMarkAndUnravel() {
+  return (tree) => {
+    (0, import_unist_util_visit.visit)(tree, function(node, index, parent) {
+      let offset = -1;
+      let all = true;
+      let oneOrMore = false;
+      if (parent && typeof index === "number" && node.type === "paragraph") {
+        const children = node.children;
+        while (++offset < children.length) {
+          const child = children[offset];
+          if (child.type === "mdxJsxTextElement" || child.type === "mdxTextExpression") {
+            oneOrMore = true;
+          } else if (child.type === "text" && child.value.trim().length === 0) {
+          } else {
+            all = false;
+            break;
+          }
+        }
+        if (all && oneOrMore) {
+          offset = -1;
+          const newChildren = [];
+          while (++offset < children.length) {
+            const child = children[offset];
+            if (child.type === "mdxJsxTextElement") {
+              child.type = "mdxJsxFlowElement";
+            }
+            if (child.type === "mdxTextExpression") {
+              child.type = "mdxFlowExpression";
+            }
+            if (child.type === "text" && /^[\t\r\n ]+$/.test(String(child.value))) {
+            } else {
+              newChildren.push(child);
+            }
+          }
+          parent.children.splice(index, 1, ...newChildren);
+          return index;
+        }
+      }
+    });
+  };
+}
+
+// src/loaders/mdx/remark-include.ts
 var ElementLikeTypes = [
   "mdxJsxFlowElement",
   "mdxJsxTextElement",
@@ -366,7 +394,7 @@ function parseSpecifier(specifier) {
 function extractSection(root, section) {
   let nodes;
   let capturingHeadingContent = false;
-  (0, import_unist_util_visit.visit)(root, (node) => {
+  (0, import_unist_util_visit2.visit)(root, (node) => {
     if (node.type === "heading") {
       if (capturingHeadingContent) {
         return false;
@@ -398,7 +426,7 @@ function extractSection(root, section) {
 }
 function remarkInclude() {
   const TagName = "include";
-  async function embedContent(file, heading, params, data) {
+  const embedContent = async (file, heading, params, data) => {
     let content;
     try {
       content = (await fs.readFile(file)).toString();
@@ -421,18 +449,17 @@ ${e instanceof Error ? e.message : String(e)}`,
         data: {}
       };
     }
-    const parser = (data._getProcessor ?? getDefaultProcessor)(
-      ext === ".mdx" ? "mdx" : "md"
-    );
+    const parser = data._getProcessor ? data._getProcessor(ext === ".mdx" ? "mdx" : "md") : this;
     const parsed = fumaMatter(content);
     let mdast = parser.parse({
       path: file,
       value: parsed.content,
       data: { frontmatter: parsed.data }
     });
+    const baseProcessor = (0, import_unified.unified)().use(remarkMarkAndUnravel);
     if (heading) {
       const extracted = extractSection(
-        await (0, import_unified.unified)().use(import_mdx_plugins.remarkHeading).run(mdast),
+        await baseProcessor.use(import_mdx_plugins.remarkHeading).run(mdast),
         heading
       );
       if (!extracted)
@@ -440,13 +467,15 @@ ${e instanceof Error ? e.message : String(e)}`,
           `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.`
         );
       mdast = extracted;
+    } else {
+      mdast = await baseProcessor.run(mdast);
     }
     await update(mdast, path2.dirname(file), data);
     return mdast;
-  }
+  };
   async function update(tree, directory, data) {
     const queue = [];
-    (0, import_unist_util_visit.visit)(tree, ElementLikeTypes, (_node, _, parent) => {
+    (0, import_unist_util_visit2.visit)(tree, ElementLikeTypes, (_node, _, parent) => {
       const node = _node;
       if (node.name !== TagName) return;
       const specifier = flattenNode(node);
@@ -473,24 +502,28 @@ ${e instanceof Error ? e.message : String(e)}`,
     await update(tree, path2.dirname(file.path), file.data);
   };
 }
-function getDefaultProcessor(format) {
-  const mdProcessor = (0, import_unified.unified)().use(import_remark_parse.default);
-  if (format === "md") return mdProcessor;
-  return mdProcessor.use(import_remark_mdx.default);
-}
 
 // src/loaders/mdx/remark-postprocess.ts
-var import_unist_util_visit2 = require("unist-util-visit");
+var import_unist_util_visit3 = 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");
+var import_unist_util_remove_position = require("unist-util-remove-position");
+var import_remark_mdx = __toESM(require("remark-mdx"), 1);
 function remarkPostprocess({
+  _format,
   includeProcessedMarkdown = false,
+  includeMDAST = false,
   valueToExport = []
-} = {}) {
+}) {
+  let _stringifyProcessor;
+  const getStringifyProcessor = () => {
+    if (_format === "mdx") return this;
+    return _stringifyProcessor ??= this().use(import_remark_mdx.default).freeze();
+  };
   return (tree, file) => {
     let title;
     const urls = [];
-    (0, import_unist_util_visit2.visit)(tree, ["heading", "link"], (node) => {
+    (0, import_unist_util_visit3.visit)(tree, ["heading", "link"], (node) => {
       if (node.type === "heading" && node.depth === 1) {
         title = flattenNode2(node);
       }
@@ -506,12 +539,19 @@ function remarkPostprocess({
     }
     file.data.extractedReferences = urls;
     if (includeProcessedMarkdown) {
+      const processor = getStringifyProcessor();
       file.data._markdown = (0, import_mdast_util_to_markdown.toMarkdown)(tree, {
-        ...this.data("settings"),
+        ...processor.data("settings"),
         // from https://github.com/remarkjs/remark/blob/main/packages/remark-stringify/lib/index.js
-        extensions: this.data("toMarkdownExtensions") || []
+        extensions: processor.data("toMarkdownExtensions") || []
       });
     }
+    if (includeMDAST) {
+      const options = includeMDAST === true ? {} : includeMDAST;
+      file.data._mdast = JSON.stringify(
+        options.removePosition ? (0, import_unist_util_remove_position.removePosition)(structuredClone(tree)) : tree
+      );
+    }
     for (const { name, value } of file.data["mdx-export"] ?? []) {
       tree.children.unshift(getMdastExport(name, value));
     }
@@ -579,6 +619,7 @@ async function buildMDX(cacheKey, source, options) {
           [
             remarkPostprocess,
             {
+              _format: format,
               ...options.postprocess,
               valueToExport: [
                 ...options.postprocess?.valueToExport ?? [],
@@ -586,7 +627,8 @@ async function buildMDX(cacheKey, source, options) {
                 "extractedReferences",
                 "frontmatter",
                 "lastModified",
-                "_markdown"
+                "_markdown",
+                "_mdast"
               ]
             }
           ]
@@ -618,10 +660,7 @@ var import_node_path2 = __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"),
-  collection: import_zod.z.string().optional(),
-  hash: import_zod.z.string().describe(
-    "the hash of config, used for revalidation on Turbopack/Webpack."
-  ).optional()
+  collection: import_zod.z.string().optional()
 }).loose();
 var cacheEntry = import_zod.z.object({
   code: import_zod.z.string(),
@@ -638,14 +677,25 @@ function createMdxLoader(configLoader) {
   }) => {
     const matter = fumaMatter(value);
     const parsed = querySchema.parse(query);
-    const loaded = await configLoader.getConfig(parsed.hash);
-    const cacheDir = isDevelopment ? void 0 : loaded.global.experimentalBuildCache;
-    const cacheKey = `${parsed.hash}_${parsed.collection ?? "global"}_${generateCacheHash(filePath)}`;
-    if (cacheDir) {
+    const config = await configLoader.getConfig();
+    let after;
+    if (!isDevelopment && config.global.experimentalBuildCache) {
+      const cacheDir = config.global.experimentalBuildCache;
+      const cacheKey = `${parsed.hash}_${parsed.collection ?? "global"}_${generateCacheHash(filePath)}`;
       const cached = await import_promises.default.readFile(import_node_path2.default.join(cacheDir, cacheKey)).then((content) => cacheEntry.parse(JSON.parse(content.toString()))).catch(() => null);
       if (cached && cached.hash === generateCacheHash(value)) return cached;
+      after = async () => {
+        await import_promises.default.mkdir(cacheDir, { recursive: true });
+        await import_promises.default.writeFile(
+          import_node_path2.default.join(cacheDir, cacheKey),
+          JSON.stringify({
+            ...out,
+            hash: generateCacheHash(value)
+          })
+        );
+      };
     }
-    const collection = parsed.collection ? loaded.collections.get(parsed.collection) : void 0;
+    const collection = parsed.collection ? config.collections.get(parsed.collection) : void 0;
     let docCollection;
     switch (collection?.type) {
       case "doc":
@@ -673,16 +723,16 @@ function createMdxLoader(configLoader) {
       };
     }
     const data = {};
-    if (loaded.global.lastModifiedTime === "git") {
+    if (config.global.lastModifiedTime === "git") {
       data.lastModified = (await getGitTimestamp(filePath))?.getTime();
     }
     const lineOffset = isDevelopment ? countLines(matter.matter) : 0;
     const compiled = await buildMDX(
-      `${parsed.hash ?? ""}:${parsed.collection ?? "global"}`,
+      `${getConfigHash(config)}:${parsed.collection ?? "global"}`,
       "\n".repeat(lineOffset) + matter.content,
       {
         development: isDevelopment,
-        ...docCollection?.mdxOptions ?? await loaded.getDefaultMDXOptions(),
+        ...docCollection?.mdxOptions ?? await config.getDefaultMDXOptions(),
         postprocess: docCollection?.postprocess,
         data,
         filePath,
@@ -694,19 +744,18 @@ function createMdxLoader(configLoader) {
       code: String(compiled.value),
       map: compiled.map
     };
-    if (cacheDir) {
-      await import_promises.default.mkdir(cacheDir, { recursive: true });
-      await import_promises.default.writeFile(
-        import_node_path2.default.join(cacheDir, cacheKey),
-        JSON.stringify({
-          ...out,
-          hash: generateCacheHash(value)
-        })
-      );
-    }
+    await after?.();
     return out;
   };
 }
+var hashes = /* @__PURE__ */ new WeakMap();
+function getConfigHash(config) {
+  let hash = hashes.get(config);
+  if (hash) return hash;
+  hash = Date.now().toString();
+  hashes.set(config, hash);
+  return hash;
+}
 function generateCacheHash(input) {
   return (0, import_node_crypto.createHash)("md5").update(input).digest("hex");
 }
@@ -720,22 +769,68 @@ function countLines(s) {
 
 // src/loaders/config/index.ts
 var import_node_path3 = __toESM(require("path"), 1);
-function dynamicConfig(configPath, outDir) {
+var import_promises2 = __toESM(require("fs/promises"), 1);
+function staticConfig({
+  core,
+  buildConfig: buildConfig2
+}) {
+  let cached;
+  async function newConfig() {
+    const { loadConfig: loadConfig2 } = await Promise.resolve().then(() => (init_load(), load_exports));
+    await core.init({
+      config: loadConfig2(
+        core._options.configPath,
+        core._options.outDir,
+        buildConfig2
+      )
+    });
+    return core.getConfig();
+  }
   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)
-      );
+    async getConfig() {
+      return cached ??= newConfig();
+    }
+  };
+}
+function dynamicConfig({
+  core,
+  buildConfig: buildConfig2
+}) {
+  let loaded;
+  async function getConfigHash2() {
+    const stats = await import_promises2.default.stat(core._options.configPath).catch(() => void 0);
+    if (stats) {
+      return stats.mtime.getTime().toString();
+    }
+    throw new Error("Cannot find config file");
+  }
+  async function newConfig() {
+    const { loadConfig: loadConfig2 } = await Promise.resolve().then(() => (init_load(), load_exports));
+    await core.init({
+      config: loadConfig2(
+        core._options.configPath,
+        core._options.outDir,
+        buildConfig2
+      )
+    });
+    return core.getConfig();
+  }
+  return {
+    async getConfig() {
+      const hash = await getConfigHash2();
+      if (loaded && loaded.hash === hash) return loaded.config;
+      loaded = {
+        hash,
+        config: newConfig()
+      };
+      return loaded.config;
     }
   };
 }
 
 // src/loaders/adapter.ts
 var import_node_url2 = require("url");
-var import_promises2 = __toESM(require("fs/promises"), 1);
+var import_promises3 = __toESM(require("fs/promises"), 1);
 var import_node_querystring = require("querystring");
 var import_node_path4 = __toESM(require("path"), 1);
 function toWebpack(loader2) {
@@ -761,11 +856,102 @@ function toWebpack(loader2) {
   };
 }
 
-// src/loader-mdx.ts
+// src/core.ts
+var import_node_path5 = __toESM(require("path"), 1);
+var import_promises4 = __toESM(require("fs/promises"), 1);
+function createCore(options, defaultPlugins = []) {
+  let config;
+  let plugins2;
+  return {
+    _options: options,
+    getPluginContext() {
+      return {
+        core: this,
+        ...options
+      };
+    },
+    /**
+     * Convenient cache store, reset when config changes
+     */
+    cache: /* @__PURE__ */ new Map(),
+    async init({ config: newConfig }) {
+      config = await newConfig;
+      this.cache.clear();
+      plugins2 = [];
+      for await (const option of [
+        ...defaultPlugins,
+        ...config.global.plugins ?? []
+      ]) {
+        if (!option) continue;
+        if (Array.isArray(option)) plugins2.push(...option);
+        else plugins2.push(option);
+      }
+      for (const plugin of plugins2) {
+        const out = await plugin.config?.call(this.getPluginContext(), config);
+        if (out) config = out;
+      }
+      return this;
+    },
+    getConfig() {
+      return config;
+    },
+    creatConfigLoader() {
+      return {
+        getConfig() {
+          return config;
+        }
+      };
+    },
+    async initServer(server) {
+      for (const plugin of plugins2) {
+        await plugin.configureServer?.call(this.getPluginContext(), server);
+      }
+    },
+    async emitAndWrite({
+      filterPlugin = () => true
+    } = {}) {
+      const start = performance.now();
+      const out = await Promise.all(
+        plugins2.map((plugin) => {
+          if (!filterPlugin(plugin) || !plugin.emit) return [];
+          return plugin.emit.call(this.getPluginContext());
+        })
+      );
+      await Promise.all(
+        out.flat().map(async (entry) => {
+          const file = import_node_path5.default.join(options.outDir, entry.path);
+          await import_promises4.default.mkdir(import_node_path5.default.dirname(file), { recursive: true });
+          await import_promises4.default.writeFile(file, entry.content);
+        })
+      );
+      console.log(`[MDX] generated files in ${performance.now() - start}ms`);
+    }
+  };
+}
+
+// src/webpack/index.ts
 var instance;
 async function loader(source, callback) {
+  const { isDev, outDir, configPath } = this.getOptions();
   this.cacheable(true);
-  const { configPath, outDir } = this.getOptions();
-  instance ??= toWebpack(createMdxLoader(dynamicConfig(configPath, outDir)));
+  this.addDependency(configPath);
+  if (!instance) {
+    const core = createCore({
+      environment: "webpack",
+      outDir,
+      configPath
+    });
+    instance = toWebpack(
+      createMdxLoader(
+        isDev ? dynamicConfig({
+          core,
+          buildConfig: false
+        }) : staticConfig({
+          core,
+          buildConfig: false
+        })
+      )
+    );
+  }
   await instance.call(this, source, callback);
 }

package/dist/{loader-mdx.d.ts → webpack/index.d.cts}

@@ -3,6 +3,7 @@ import { LoaderContext } from 'webpack';
 interface Options {
     configPath: string;
     outDir: string;
+    isDev: boolean;
 }
 /**
  * Load MDX/markdown files

package/dist/{loader-mdx.d.cts → webpack/index.d.ts}

@@ -3,6 +3,7 @@ import { LoaderContext } from 'webpack';
 interface Options {
     configPath: string;
     outDir: string;
+    isDev: boolean;
 }
 /**
  * Load MDX/markdown files

package/dist/webpack/index.js

@@ -0,0 +1,44 @@
+import {
+  toWebpack
+} from "../chunk-YVCR6FUH.js";
+import {
+  createMdxLoader
+} from "../chunk-XQ5O7IPO.js";
+import "../chunk-3J3WL7WN.js";
+import "../chunk-K5ZLPEIQ.js";
+import {
+  createCore,
+  dynamicConfig,
+  staticConfig
+} from "../chunk-EELYB2XC.js";
+import "../chunk-VWJKRQZR.js";
+
+// src/webpack/index.ts
+var instance;
+async function loader(source, callback) {
+  const { isDev, outDir, configPath } = this.getOptions();
+  this.cacheable(true);
+  this.addDependency(configPath);
+  if (!instance) {
+    const core = createCore({
+      environment: "webpack",
+      outDir,
+      configPath
+    });
+    instance = toWebpack(
+      createMdxLoader(
+        isDev ? dynamicConfig({
+          core,
+          buildConfig: false
+        }) : staticConfig({
+          core,
+          buildConfig: false
+        })
+      )
+    );
+  }
+  await instance.call(this, source, callback);
+}
+export {
+  loader as default
+};

package/loader-mdx.cjs

@@ -1,7 +1,7 @@
 module.exports = function loader(code) {
   const callback = this.async();
 
-  import('./dist/loader-mdx.js').then((mod) =>
+  import('./dist/webpack/index.js').then((mod) =>
     mod.default.call(this, code, callback),
   );
 };