bunup 0.8.46 → 0.8.48

package/dist/{chunk-0f0jc2gd.d.ts → chunk-djb64jje.d.ts}

@@ -27,6 +27,12 @@ type BuildMeta = {
 	rootDir: string
 };
 type BuildOutputFile = {
+	/**
+	* The entry point for which this file was generated
+	*
+	* Undefined for non-entry point files (e.g., assets, sourcemaps, chunks)
+	*/
+	entrypoint: string | undefined
 	/** The kind of the file */
 	kind: "entry-point" | "chunk" | "asset" | "sourcemap" | "bytecode"
 	/** Path to the generated file */

package/dist/{chunk-ycxcdce7.js → chunk-kpthwads.js}

@@ -299,6 +299,7 @@ async function build(partialOptions, rootDir = process.cwd()) {
       else if (log.level === "info")
         logger.info(log.message);
     }
+    let entrypointIndex = 0;
     for (const file of result.outputs) {
       const relativePathToRootDir = getRelativePathToRootDir(file.path, rootDir);
       const relativePathToOutputDir = getRelativePathToOutputDir(relativePathToRootDir, options.outDir);
@@ -313,8 +314,12 @@ async function build(partialOptions, rootDir = process.cwd()) {
         relativePathToOutputDir,
         dts: false,
         format: fmt,
-        kind: file.kind
+        kind: file.kind,
+        entrypoint: file.kind === "entry-point" ? cleanPath(entrypoints[entrypointIndex]) : undefined
       });
+      if (file.kind === "entry-point") {
+        entrypointIndex++;
+      }
     }
   });
   await Promise.all(buildPromises);
@@ -349,7 +354,8 @@ async function build(partialOptions, rootDir = process.cwd()) {
           relativePathToOutputDir,
           dts: true,
           format: fmt,
-          kind: file.kind
+          kind: file.kind,
+          entrypoint: file.entrypoint ? cleanPath(file.entrypoint) : undefined
         });
       }
     }

package/dist/cli/index.js

@@ -3,7 +3,7 @@
 import {
   build,
   createBuildOptions
-} from "../chunk-ycxcdce7.js";
+} from "../chunk-kpthwads.js";
 import"../chunk-snvybwa2.js";
 import {
   processLoadedConfigs
@@ -28,7 +28,7 @@ import { loadConfig } from "coffi";
 import pc3 from "picocolors";
 import { exec } from "tinyexec";
 // package.json
-var version = "0.8.46";
+var version = "0.8.48";
 
 // src/watch.ts
 import path from "path";

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { Arrayable, BuildOptions, DefineConfigItem, DefineWorkspaceItem, Plugin } from "./chunk-0f0jc2gd";
+import { Arrayable, BuildOptions, DefineConfigItem, DefineWorkspaceItem, Plugin } from "./chunk-djb64jje";
 declare function build(partialOptions: Partial<BuildOptions>, rootDir?: string): Promise<void>;
 declare function defineConfig(options: Arrayable<DefineConfigItem>): Arrayable<DefineConfigItem>;
 declare function defineWorkspace(options: DefineWorkspaceItem[]): DefineWorkspaceItem[];

package/dist/index.js

@@ -1,7 +1,7 @@
 // @bun
 import {
   build
-} from "./chunk-ycxcdce7.js";
+} from "./chunk-kpthwads.js";
 import"./chunk-snvybwa2.js";
 import"./chunk-gh7z7s46.js";
 import"./chunk-a76fsvj7.js";

package/dist/plugins.d.ts

@@ -1,4 +1,4 @@
-import { BuildContext, BunupPlugin, MaybePromise, Plugin } from "./chunk-0f0jc2gd";
+import { BuildContext, BunupPlugin, MaybePromise, Plugin } from "./chunk-djb64jje";
 /**
 * A plugin that copies files and directories to the output directory.
 *
@@ -8,23 +8,20 @@ import { BuildContext, BunupPlugin, MaybePromise, Plugin } from "./chunk-0f0jc2g
 */
 declare function copy(patterns: string[], outPath?: string): BunupPlugin;
 type CustomExports = Record<string, string | Record<string, string | Record<string, string>>>;
+type Exclude = ((ctx: BuildContext) => string[] | undefined) | string[];
 interface ExportsPluginOptions {
 	/**
 	* Additional export fields to preserve alongside automatically generated exports
 	*
-	* @example
-	* ```ts
-	* {
-	* 	customExports: (ctx) => {
-	* 		const { output, options, meta } = ctx
-	* 		return {
-	* 			'./package.json': "package.json",
-	* 		}
-	* 	},
-	* }
-	* ```
+	* @see https://bunup.dev/docs/plugins/exports#customexports
 	*/
 	customExports?: (ctx: BuildContext) => CustomExports | undefined;
+	/**
+	* Entry points to exclude from the exports field
+	*
+	* @see https://bunup.dev/docs/plugins/exports#exclude
+	*/
+	exclude?: Exclude;
 }
 /**
 * A plugin that generates the exports field in the package.json file automatically.

package/dist/plugins.js

@@ -49,94 +49,199 @@ function exports(options = {}) {
     name: "exports",
     hooks: {
       onBuildDone: async (ctx) => {
-        const { output, options: buildOptions, meta } = ctx;
-        if (!meta.packageJson.path || !meta.packageJson.data) {
-          return;
-        }
-        try {
-          const { exportsField, entryPoints } = generateExportsFields(output.files);
-          const files = Array.isArray(meta.packageJson.data.files) ? [
-            ...new Set([
-              ...meta.packageJson.data.files,
-              buildOptions.outDir
-            ])
-          ] : [buildOptions.outDir];
-          const mergedExports = { ...exportsField };
-          if (options.customExports) {
-            for (const [key, value] of Object.entries(options.customExports(ctx) ?? {})) {
-              if (typeof value === "string") {
-                mergedExports[key] = value;
-              } else {
-                const existingExport = mergedExports[key];
-                if (typeof existingExport === "object" && existingExport !== null) {
-                  mergedExports[key] = {
-                    ...existingExport,
-                    ...value
-                  };
-                } else {
-                  mergedExports[key] = value;
-                }
-              }
-            }
-          }
-          const { main, module, types, ...restPackageJson } = meta.packageJson.data;
-          const newPackageJson = {
-            name: meta.packageJson.data.name,
-            description: meta.packageJson.data.description,
-            version: meta.packageJson.data.version,
-            type: meta.packageJson.data.type,
-            private: meta.packageJson.data.private,
-            files,
-            ...entryPoints,
-            exports: mergedExports
-          };
-          for (const key in restPackageJson) {
-            if (Object.hasOwn(restPackageJson, key) && !Object.hasOwn(newPackageJson, key)) {
-              newPackageJson[key] = restPackageJson[key];
-            }
-          }
-          await Bun.write(meta.packageJson.path, JSON.stringify(newPackageJson, null, 2));
-        } catch {
-          logger.error("Failed to update package.json");
-        }
+        await processPackageJsonExports(ctx, options);
       }
     }
   };
 }
-function generateExportsFields(files) {
+async function processPackageJsonExports(ctx, options) {
+  const { output, options: buildOptions, meta } = ctx;
+  if (!meta.packageJson.path || !meta.packageJson.data) {
+    return;
+  }
+  try {
+    const { exportsField, entryPoints } = generateExportsFields(output.files, options.exclude, ctx);
+    const updatedFiles = createUpdatedFilesArray(meta.packageJson.data, buildOptions.outDir);
+    const mergedExports = mergeCustomExportsWithGenerated(exportsField, options.customExports, ctx);
+    const newPackageJson = createUpdatedPackageJson(meta.packageJson.data, entryPoints, mergedExports, updatedFiles);
+    await Bun.write(meta.packageJson.path, JSON.stringify(newPackageJson, null, 2));
+  } catch {
+    logger.error("Failed to update package.json");
+  }
+}
+function generateExportsFields(files, exclude, ctx) {
+  const filteredFiles = filterFiles(files, exclude, ctx);
+  const { filesByExportKey, allDtsFiles } = groupFilesByExportKey(filteredFiles);
+  const exportsField = createExportEntries(filesByExportKey);
+  const entryPoints = extractEntryPoints(exportsField, allDtsFiles);
+  return { exportsField, entryPoints };
+}
+function groupFilesByExportKey(files) {
+  const filesByExportKey = new Map;
+  const allDtsFiles = new Map;
+  for (const file of files) {
+    const exportKey = getExportKey(cleanPath(file.relativePathToOutputDir));
+    const format = file.format === "esm" ? "import" : "require";
+    if (!filesByExportKey.has(exportKey)) {
+      filesByExportKey.set(exportKey, new Map);
+      allDtsFiles.set(exportKey, []);
+    }
+    const formatMap = filesByExportKey.get(exportKey);
+    const dtsFiles = allDtsFiles.get(exportKey);
+    if (formatMap && dtsFiles) {
+      if (!formatMap.has(format)) {
+        formatMap.set(format, { dts: undefined, source: undefined });
+      }
+      const fileEntry = formatMap.get(format);
+      if (fileEntry) {
+        if (file.dts) {
+          fileEntry.dts = file;
+          dtsFiles.push(file);
+        } else {
+          fileEntry.source = file;
+        }
+      }
+    }
+  }
+  return { filesByExportKey, allDtsFiles };
+}
+function createExportEntries(filesByExportKey) {
   const exportsField = {};
+  for (const [exportKey, formatMap] of filesByExportKey.entries()) {
+    exportsField[exportKey] = {};
+    let hasFormatSpecificTypes = false;
+    let primaryTypesPath;
+    for (const [format, files] of formatMap.entries()) {
+      const formatKey = format;
+      if (files.dts && files.source) {
+        exportsField[exportKey][formatKey] = {
+          types: `./${cleanPath(files.dts.relativePathToRootDir)}`,
+          default: `./${cleanPath(files.source.relativePathToRootDir)}`
+        };
+        hasFormatSpecificTypes = true;
+        if (!primaryTypesPath) {
+          primaryTypesPath = `./${cleanPath(files.dts.relativePathToRootDir)}`;
+        }
+      } else if (files.source) {
+        exportsField[exportKey][formatKey] = `./${cleanPath(files.source.relativePathToRootDir)}`;
+        if (files.dts) {
+          primaryTypesPath = `./${cleanPath(files.dts.relativePathToRootDir)}`;
+        }
+      } else if (files.dts) {
+        primaryTypesPath = `./${cleanPath(files.dts.relativePathToRootDir)}`;
+      }
+    }
+    if (!hasFormatSpecificTypes && primaryTypesPath) {
+      exportsField[exportKey].types = primaryTypesPath;
+    }
+  }
+  return exportsField;
+}
+function extractEntryPoints(exportsField, allDtsFiles) {
   const entryPoints = {};
-  const filteredFiles = filterFiles(files);
-  for (const file of filteredFiles) {
-    const exportType = formatToExportField(file.format, file.dts);
-    const relativePath = `./${cleanPath(file.relativePathToRootDir)}`;
-    const exportKey = getExportKey(cleanPath(file.relativePathToOutputDir));
-    exportsField[exportKey] = {
-      ...exportsField[exportKey],
-      [exportType]: relativePath
-    };
+  const dotExport = exportsField["."];
+  if (!dotExport) {
+    return entryPoints;
   }
-  for (const field of Object.keys(exportsField["."] ?? {})) {
+  for (const [field, value] of Object.entries(dotExport)) {
+    if (field === "types")
+      continue;
     const entryPoint = exportFieldToEntryPoint(field);
-    entryPoints[entryPoint] = exportsField["."][field];
+    if (typeof value === "string") {
+      entryPoints[entryPoint] = value;
+    } else if (value && typeof value === "object" && "default" in value) {
+      entryPoints[entryPoint] = value.default;
+    }
   }
-  return { exportsField, entryPoints };
+  const dotEntryDtsFiles = allDtsFiles.get(".");
+  if (dotEntryDtsFiles?.length) {
+    const standardDts = findStandardDtsFile(dotEntryDtsFiles);
+    if (standardDts) {
+      entryPoints.types = `./${cleanPath(standardDts.relativePathToRootDir)}`;
+    } else {
+      entryPoints.types = extractTypesFromExport(dotExport);
+    }
+  }
+  return entryPoints;
+}
+function findStandardDtsFile(dtsFiles) {
+  return dtsFiles.find((file) => file.relativePathToRootDir.endsWith(".d.ts") && !file.relativePathToRootDir.endsWith(".d.mts") && !file.relativePathToRootDir.endsWith(".d.cts"));
+}
+function extractTypesFromExport(dotExport) {
+  const typesValue = dotExport.types;
+  if (typeof typesValue === "string") {
+    return typesValue;
+  }
+  if (typesValue && typeof typesValue === "object" && "types" in typesValue) {
+    return typesValue.types;
+  }
+  const importValue = dotExport.import;
+  if (importValue && typeof importValue === "object" && "types" in importValue) {
+    return importValue.types;
+  }
+  return;
 }
-function filterFiles(files) {
-  return files.filter((file) => JS_DTS_RE.test(file.fullPath) && file.kind === "entry-point");
+function createUpdatedFilesArray(packageJsonData, outDir) {
+  const existingFiles = Array.isArray(packageJsonData.files) ? packageJsonData.files : [];
+  return [...new Set([...existingFiles, outDir])];
+}
+function mergeCustomExportsWithGenerated(baseExports, customExportsProvider, ctx) {
+  const mergedExports = { ...baseExports };
+  if (!customExportsProvider) {
+    return mergedExports;
+  }
+  const customExports = customExportsProvider(ctx);
+  if (!customExports) {
+    return mergedExports;
+  }
+  for (const [key, value] of Object.entries(customExports)) {
+    if (typeof value === "string") {
+      mergedExports[key] = value;
+    } else {
+      const existingExport = mergedExports[key];
+      if (typeof existingExport === "object" && existingExport !== null) {
+        mergedExports[key] = { ...existingExport, ...value };
+      } else {
+        mergedExports[key] = value;
+      }
+    }
+  }
+  return mergedExports;
+}
+function createUpdatedPackageJson(originalData, entryPoints, exports2, files) {
+  const { main, module, types, ...restPackageJson } = originalData;
+  const newPackageJson = {
+    name: originalData.name,
+    description: originalData.description,
+    version: originalData.version,
+    type: originalData.type,
+    private: originalData.private,
+    files,
+    ...entryPoints,
+    exports: exports2
+  };
+  for (const key in restPackageJson) {
+    if (Object.hasOwn(restPackageJson, key) && !Object.hasOwn(newPackageJson, key)) {
+      newPackageJson[key] = restPackageJson[key];
+    }
+  }
+  return newPackageJson;
+}
+function filterFiles(files, exclude, ctx) {
+  return files.filter((file) => JS_DTS_RE.test(file.fullPath) && file.kind === "entry-point" && file.entrypoint && (file.format === "esm" || file.format === "cjs") && !isExcluded(file.entrypoint, exclude, ctx));
+}
+function isExcluded(entrypoint, exclude, ctx) {
+  if (!exclude)
+    return false;
+  const patterns = typeof exclude === "function" ? exclude(ctx) : exclude;
+  return patterns?.some((pattern) => new Bun.Glob(pattern).match(entrypoint)) ?? false;
 }
 function getExportKey(relativePathToOutputDir) {
   const pathSegments = cleanPath(removeExtension(relativePathToOutputDir)).split("/");
   if (pathSegments.length === 1 && pathSegments[0].startsWith("index")) {
     return ".";
   }
-  return `./${pathSegments.filter((p) => !p.startsWith("index")).join("/")}`;
-}
-function exportFieldToEntryPoint(exportField) {
-  return exportField === "types" ? "types" : exportField === "require" ? "main" : "module";
-}
-function formatToExportField(format, dts) {
-  return dts ? "types" : format === "esm" ? "import" : "require";
+  return `./${pathSegments.filter((segment) => !segment.startsWith("index")).join("/")}`;
 }
 function removeExtension(filePath) {
   const basename2 = path.basename(filePath);
@@ -148,6 +253,16 @@ function removeExtension(filePath) {
   const directory = path.dirname(filePath);
   return directory === "." ? nameWithoutExtensions : path.join(directory, nameWithoutExtensions);
 }
+function exportFieldToEntryPoint(exportField) {
+  switch (exportField) {
+    case "types":
+      return "types";
+    case "require":
+      return "main";
+    default:
+      return "module";
+  }
+}
 // src/plugins/built-in/inject-styles.ts
 import path2 from "path";
 function injectStyles(options) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "bunup",
   "description": "⚡ A blazing-fast build tool for your libraries built with Bun.",
-  "version": "0.8.46",
+  "version": "0.8.48",
   "type": "module",
   "files": [
     "dist"
@@ -10,15 +10,16 @@
   "types": "./dist/index.d.ts",
   "exports": {
     ".": {
-      "import": "./dist/index.js",
-      "types": "./dist/index.d.ts"
+      "import": {
+        "types": "./dist/index.d.ts",
+        "default": "./dist/index.js"
+      }
     },
     "./plugins": {
-      "import": "./dist/plugins.js",
-      "types": "./dist/plugins.d.ts"
-    },
-    "./cli": {
-      "import": "./dist/cli/index.js"
+      "import": {
+        "types": "./dist/plugins.d.ts",
+        "default": "./dist/plugins.js"
+      }
     }
   },
   "license": "MIT",