fumadocs-mdx 13.0.3 → 13.0.5

package/dist/next/index.js

@@ -1,24 +1,26 @@
 import {
   loadConfig
-} from "../chunk-JVZFH6ND.js";
+} from "../chunk-QXHN25N3.js";
 import {
   getImportCode,
   toImportPath
 } from "../chunk-CXA4JO4Z.js";
-import "../chunk-U4MQ44TS.js";
+import "../chunk-2HXTGJBI.js";
+import {
+  mdxLoaderGlob
+} from "../chunk-4JSFLXXT.js";
+import {
+  getGitTimestamp
+} from "../chunk-VUEZTR2H.js";
 import {
   ValidationError,
   createCore,
   findConfigFile,
-  getGitTimestamp,
   validate
-} from "../chunk-EELYB2XC.js";
+} from "../chunk-TZ5EQBFW.js";
 import {
   fumaMatter
 } from "../chunk-VWJKRQZR.js";
-import {
-  getCollectionFiles
-} from "../chunk-XZY2AWJI.js";
 
 // src/next/index.ts
 import * as path3 from "path";
@@ -59,11 +61,9 @@ function next() {
     name: "next",
     config(v) {
       config = v;
-      shouldEmitOnChange = Array.from(config.collections.values()).some(
-        (collection) => {
-          return collection.type === "doc" && collection.async || collection.type === "docs" && collection.docs.async;
-        }
-      );
+      shouldEmitOnChange = config.collectionList.some((collection) => {
+        return collection.type === "doc" && collection.async || collection.type === "docs" || collection.type === "meta";
+      });
     },
     configureServer(server) {
       if (!server.watcher) return;
@@ -86,7 +86,7 @@ function next() {
     }
   };
 }
-async function indexFile(configPath, config, importPath, configHash = false) {
+async function indexFile(configPath, config, importPath) {
   let asyncInit = false;
   const lines = [
     getImportCode({
@@ -100,14 +100,10 @@ async function indexFile(configPath, config, importPath, configHash = false) {
       name: "_source"
     })
   ];
-  const entries = Array.from(config.collections.entries());
-  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}`);
-      }
+  function getDocEntries(collection, files) {
+    return files.map((file, i) => {
+      const importId = `d_${collection.name}_${i}`;
+      const params = [`collection=${collection.name}`];
       lines.unshift(
         getImportCode({
           type: "namespace",
@@ -117,7 +113,6 @@ async function indexFile(configPath, config, importPath, configHash = false) {
       );
       return `{ info: ${JSON.stringify(file)}, data: ${importId} }`;
     });
-    return Promise.all(items);
   }
   async function getMetaEntries(collection, files) {
     const items = files.map(async (file) => {
@@ -158,7 +153,7 @@ async function indexFile(configPath, config, importPath, configHash = false) {
       );
       asyncInit = true;
     }
-    const entries2 = files.map(async (file) => {
+    const entries = files.map(async (file) => {
       const content = await readFileWithCache(file.fullPath).catch(() => "");
       const parsed = fumaMatter(content);
       let data = parsed.data;
@@ -184,12 +179,13 @@ async function indexFile(configPath, config, importPath, configHash = false) {
       );
       return `{ info: { ${infoStr.join(", ")} }, lastModified: ${JSON.stringify(lastModified)}, data: ${JSON.stringify(data)} }`;
     });
-    return Promise.all(entries2);
+    return Promise.all(entries);
   }
-  const declares = entries.map(async ([k, collection]) => {
+  const declares = config.collectionList.map(async (collection) => {
+    const k = collection.name;
     if (collection.type === "docs") {
-      const docs = await getCollectionFiles(collection.docs);
-      const metas = await getCollectionFiles(collection.meta);
+      const docs = await globCollectionFiles(collection.docs);
+      const metas = await globCollectionFiles(collection.meta);
       const metaEntries = (await getMetaEntries(collection.meta, metas)).join(
         ", "
       );
@@ -199,14 +195,17 @@ async function indexFile(configPath, config, importPath, configHash = false) {
         );
         return `export const ${k} = _runtimeAsync.docs<typeof _source.${k}>([${docsEntries2}], [${metaEntries}], "${k}", _sourceConfig)`;
       }
-      const docsEntries = (await getDocEntries(k, docs)).join(", ");
+      const docsEntries = getDocEntries(collection.docs, docs).join(", ");
       return `export const ${k} = _runtime.docs<typeof _source.${k}>([${docsEntries}], [${metaEntries}])`;
     }
-    const files = await getCollectionFiles(collection);
-    if (collection.type === "doc" && collection.async) {
+    const files = await globCollectionFiles(collection);
+    if (collection.type === "meta") {
+      return `export const ${k} = _runtime.meta<typeof _source.${k}>([${(await getMetaEntries(collection, files)).join(", ")}]);`;
+    }
+    if (collection.async) {
       return `export const ${k} = _runtimeAsync.doc<typeof _source.${k}>([${(await getAsyncEntries(collection, files)).join(", ")}], "${k}", _sourceConfig)`;
     }
-    return `export const ${k} = _runtime.${collection.type}<typeof _source.${k}>([${(await getDocEntries(k, files)).join(", ")}]);`;
+    return `export const ${k} = _runtime.doc<typeof _source.${k}>([${getDocEntries(collection, files).join(", ")}]);`;
   });
   const resolvedDeclares = await Promise.all(declares);
   return [
@@ -227,6 +226,27 @@ function parseMetaEntry(file, content) {
   }
   throw new Error(`Unknown meta file format: ${extname2}, in ${file}.`);
 }
+async function globCollectionFiles(collection) {
+  const { glob } = await import("tinyglobby");
+  const files = /* @__PURE__ */ new Map();
+  const dirs = Array.isArray(collection.dir) ? collection.dir : [collection.dir];
+  await Promise.all(
+    dirs.map(async (dir) => {
+      const result = await glob(collection.patterns, {
+        cwd: path2.resolve(dir)
+      });
+      for (const item of result) {
+        if (!collection.isFileSupported(item)) continue;
+        const fullPath = path2.join(dir, item);
+        files.set(fullPath, {
+          path: item,
+          fullPath
+        });
+      }
+    })
+  );
+  return Array.from(files.values());
+}
 
 // src/next/index.ts
 var defaultPageExtensions = ["mdx", "md", "jsx", "js", "tsx", "ts"];
@@ -238,7 +258,7 @@ function createMDX(createOptions = {}) {
     void init(isDev, options);
   }
   return (nextConfig = {}) => {
-    const mdxLoaderOptions = {
+    const loaderOptions = {
       ...options,
       isDev
     };
@@ -250,7 +270,7 @@ function createMDX(createOptions = {}) {
           loaders: [
             {
               loader: "fumadocs-mdx/loader-mdx",
-              options: mdxLoaderOptions
+              options: loaderOptions
             }
           ],
           as: "*.js"
@@ -266,12 +286,12 @@ function createMDX(createOptions = {}) {
         config.module ||= {};
         config.module.rules ||= [];
         config.module.rules.push({
-          test: /\.mdx?$/,
+          test: mdxLoaderGlob,
           use: [
             options2.defaultLoaders.babel,
             {
               loader: "fumadocs-mdx/loader-mdx",
-              options: mdxLoaderOptions
+              options: loaderOptions
             }
           ]
         });
@@ -297,7 +317,7 @@ async function init(dev, options) {
       ignored: [options.outDir]
     });
     watcher.add(options.configPath);
-    for (const collection of core.getConfig().collections.values()) {
+    for (const collection of core.getConfig().collectionList) {
       if (collection.type === "docs") {
         watcher.add(collection.docs.dir);
         watcher.add(collection.meta.dir);