bunup 0.8.47 → 0.8.48

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

@@ -315,9 +315,11 @@ async function build(partialOptions, rootDir = process.cwd()) {
         dts: false,
         format: fmt,
         kind: file.kind,
-        entrypoint: entrypoints[entrypointIndex]
+        entrypoint: file.kind === "entry-point" ? cleanPath(entrypoints[entrypointIndex]) : undefined
       });
-      entrypointIndex++;
+      if (file.kind === "entry-point") {
+        entrypointIndex++;
+      }
     }
   });
   await Promise.all(buildPromises);
@@ -353,7 +355,7 @@ async function build(partialOptions, rootDir = process.cwd()) {
           dts: true,
           format: fmt,
           kind: file.kind,
-          entrypoint: file.entrypoint
+          entrypoint: file.entrypoint ? cleanPath(file.entrypoint) : undefined
         });
       }
     }

package/dist/cli/index.js

@@ -3,7 +3,7 @@
 import {
   build,
   createBuildOptions
-} from "../chunk-ffytsq4c.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.47";
+var version = "0.8.48";
 
 // src/watch.ts
 import path from "path";

package/dist/index.js

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

package/dist/plugins.d.ts

@@ -14,18 +14,6 @@ interface ExportsPluginOptions {
 	* Additional export fields to preserve alongside automatically generated exports
 	*
 	* @see https://bunup.dev/docs/plugins/exports#customexports
-	*
-	* @example
-	* ```ts
-	* {
-	* 	customExports: (ctx) => {
-	* 		const { output, options, meta } = ctx
-	* 		return {
-	* 			'./package.json': "package.json",
-	* 		}
-	* 	},
-	* }
-	* ```
 	*/
 	customExports?: (ctx: BuildContext) => CustomExports | undefined;
 	/**

package/dist/plugins.js

@@ -70,23 +70,116 @@ async function processPackageJsonExports(ctx, options) {
   }
 }
 function generateExportsFields(files, exclude, ctx) {
-  const exportsField = {};
-  const entryPoints = {};
   const filteredFiles = filterFiles(files, exclude, ctx);
-  for (const file of filteredFiles) {
-    const exportType = formatToExportField(file.format, file.dts);
-    const relativePath = `./${cleanPath(file.relativePathToRootDir)}`;
+  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));
-    exportsField[exportKey] = {
-      ...exportsField[exportKey],
-      [exportType]: relativePath
-    };
+    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 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 createUpdatedFilesArray(packageJsonData, outDir) {
   const existingFiles = Array.isArray(packageJsonData.files) ? packageJsonData.files : [];
@@ -97,17 +190,17 @@ function mergeCustomExportsWithGenerated(baseExports, customExportsProvider, ctx
   if (!customExportsProvider) {
     return mergedExports;
   }
-  const customExports = customExportsProvider(ctx) ?? {};
+  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
-        };
+        mergedExports[key] = { ...existingExport, ...value };
       } else {
         mergedExports[key] = value;
       }
@@ -135,22 +228,13 @@ function createUpdatedPackageJson(originalData, entryPoints, exports2, files) {
   return newPackageJson;
 }
 function filterFiles(files, exclude, ctx) {
-  return files.filter((file) => JS_DTS_RE.test(file.fullPath) && file.kind === "entry-point" && file.entrypoint && !isExcluded(file.entrypoint, 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) {
+  if (!exclude)
     return false;
-  }
-  if (typeof exclude === "function") {
-    const excluded = exclude(ctx);
-    if (excluded) {
-      return excluded.some((pattern) => new Bun.Glob(pattern).match(entrypoint));
-    }
-  }
-  if (Array.isArray(exclude)) {
-    return exclude.some((pattern) => new Bun.Glob(pattern).match(entrypoint));
-  }
-  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("/");
@@ -170,10 +254,14 @@ function removeExtension(filePath) {
   return directory === "." ? nameWithoutExtensions : path.join(directory, nameWithoutExtensions);
 }
 function exportFieldToEntryPoint(exportField) {
-  return exportField === "types" ? "types" : exportField === "require" ? "main" : "module";
-}
-function formatToExportField(format, dts) {
-  return dts ? "types" : format === "esm" ? "import" : "require";
+  switch (exportField) {
+    case "types":
+      return "types";
+    case "require":
+      return "main";
+    default:
+      return "module";
+  }
 }
 // src/plugins/built-in/inject-styles.ts
 import path2 from "path";

package/package.json

@@ -1,12 +1,27 @@
 {
   "name": "bunup",
   "description": "⚡ A blazing-fast build tool for your libraries built with Bun.",
-  "version": "0.8.47",
+  "version": "0.8.48",
   "type": "module",
   "files": [
     "dist"
   ],
-  "exports": {},
+  "module": "./dist/index.js",
+  "types": "./dist/index.d.ts",
+  "exports": {
+    ".": {
+      "import": {
+        "types": "./dist/index.d.ts",
+        "default": "./dist/index.js"
+      }
+    },
+    "./plugins": {
+      "import": {
+        "types": "./dist/plugins.d.ts",
+        "default": "./dist/plugins.js"
+      }
+    }
+  },
   "license": "MIT",
   "author": "Arshad Yaseen <m@arshadyaseen.com> (https://arshadyaseen.com)",
   "maintainers": [