tsdown 0.21.4 → 0.21.6

package/dist/build-C1dAKhHj.mjs

@@ -0,0 +1,2 @@
+import { t as build } from "./build-MDnn2xGL.mjs";
+export { build };

package/dist/{build-CoLhkNXE.mjs → build-MDnn2xGL.mjs}

@@ -1,12 +1,12 @@
 import { createRequire as __cjs_createRequire } from "node:module";
 const __cjs_require = __cjs_createRequire(import.meta.url);
 import { a as pkgExists, l as slash, n as importWithError, o as promiseWithResolvers, t as debounce } from "./general-CRszZCrY.mjs";
-import { a as getPackageType, c as isGlobEntry, d as cleanOutDir, i as loadConfigFile, l as toObjectEntry, n as mergeUserOptions, o as writeExports, r as resolveUserConfig, s as buildExe, u as cleanChunks } from "./options-DoRzOC0d.mjs";
+import { a as getPackageType, c as isGlobEntry, d as cleanOutDir, i as loadConfigFile, l as toObjectEntry, n as mergeUserOptions, o as writeExports, r as resolveUserConfig, s as buildExe, t as mergeConfig, u as cleanChunks } from "./options-B1Ye5hV8.mjs";
 import { r as fsRemove } from "./fs-Dd6Htx2P.mjs";
 import { a as globalLogger, t as LogLevels } from "./logger-BU0v7CAk.mjs";
-import { a as getShimsInject, r as DepPlugin } from "./format-DPVBd8E4.mjs";
-import { a as ReportPlugin, i as ShebangPlugin, n as endsWithConfig, o as NodeProtocolPlugin, r as addOutDirToChunks, s as copy, t as WatchPlugin } from "./watch-CS1xCZMR.mjs";
-import { t as version } from "./package-BV2VRL7Z.mjs";
+import { a as getShimsInject, r as DepsPlugin } from "./format-DXnmiQIy.mjs";
+import { a as ReportPlugin, i as ShebangPlugin, n as endsWithConfig, o as NodeProtocolPlugin, r as addOutDirToChunks, s as copy, t as WatchPlugin } from "./watch-BHPVmWIr.mjs";
+import { t as version } from "./package-lMx2nkh2.mjs";
 import { mkdtemp, readFile, readdir, writeFile } from "node:fs/promises";
 import path from "node:path";
 import process from "node:process";
@@ -14,7 +14,7 @@ import { bold, dim, green } from "ansis";
 import { createDebug } from "obug";
 import { glob } from "tinyglobby";
 import readline from "node:readline";
-import { RE_CSS, RE_DTS, RE_JS } from "rolldown-plugin-dts/filename";
+import { RE_CSS, RE_DTS, RE_JS, filename_js_to_dts } from "rolldown-plugin-dts/internal";
 import { tmpdir } from "node:os";
 const satisfies = __cjs_require("semver/functions/satisfies.js");
 import { exec, x } from "tinyexec";
@@ -34,10 +34,7 @@ const DEFAULT_EXCLUDE_WORKSPACE = [
 	"**/t?(e)mp/**"
 ];
 async function resolveWorkspace(config, inlineConfig) {
-	const normalized = {
-		...config,
-		...inlineConfig
-	};
+	const normalized = mergeConfig(config, inlineConfig);
 	const rootCwd = normalized.cwd || process.cwd();
 	let { workspace } = normalized;
 	if (!workspace) return {
@@ -68,15 +65,12 @@ async function resolveWorkspace(config, inlineConfig) {
 				...inlineConfig,
 				config: workspaceConfig,
 				cwd
-			}, cwd);
+			}, cwd, normalized);
 			if (file) {
 				debug$4("loaded workspace config file %s", file);
 				files.push(file);
 			} else debug$4("no workspace config file found in %s", cwd);
-			return configs.map((config) => ({
-				...normalized,
-				...config
-			}));
+			return configs.map((config) => mergeConfig(normalized, config));
 		}))).flat(),
 		files
 	};
@@ -466,12 +460,13 @@ async function resolveInputOptions(config, format, configFiles, bundle, cjsDts,
 	const { alias, checks: { legacyCjs, ...checks } = {}, cjsDefault, cwd, deps: { neverBundle }, devtools, dts, entry, env, globImport, loader, logger, nameLabel, nodeProtocol, platform, plugins: userPlugins, report, shims, target, treeshake, tsconfig, unused, watch } = config;
 	const plugins = [];
 	if (nodeProtocol) plugins.push(NodeProtocolPlugin(nodeProtocol));
-	if (config.pkg || config.deps.skipNodeModulesBundle) plugins.push(DepPlugin(config, bundle));
+	if (config.pkg || config.deps.skipNodeModulesBundle) plugins.push(DepsPlugin(config, bundle));
 	if (dts) {
 		const { dts: dtsPlugin } = await import("rolldown-plugin-dts");
+		const { cjsReexport: _, ...dtsPluginOptions } = dts;
 		const options = {
 			tsconfig,
-			...dts
+			...dtsPluginOptions
 		};
 		if (format === "es") plugins.push(dtsPlugin(options));
 		else if (cjsDts) plugins.push(dtsPlugin({
@@ -479,7 +474,9 @@ async function resolveInputOptions(config, format, configFiles, bundle, cjsDts,
 			emitDtsOnly: true,
 			cjsDefault
 		}));
+		else if (dts.cjsReexport && isDualFormat) plugins.push(CjsDtsReexportPlugin());
 	}
+	let cssPostPlugins;
 	if (!cjsDts) {
 		if (unused) {
 			const { Unused } = await importWithError("unplugin-unused");
@@ -490,7 +487,9 @@ async function resolveInputOptions(config, format, configFiles, bundle, cjsDts,
 		}
 		if (pkgExists("@tsdown/css")) {
 			const { CssPlugin } = await import("@tsdown/css");
-			plugins.push(CssPlugin(config, { logger }));
+			const cssPlugins = CssPlugin(config, { logger });
+			plugins.push(...cssPlugins.pre);
+			cssPostPlugins = cssPlugins.post;
 		} else plugins.push(CssGuardPlugin());
 		plugins.push(ShebangPlugin(logger, cwd, nameLabel, isDualFormat));
 		if (globImport) plugins.push(importGlobPlugin({ root: cwd }));
@@ -498,6 +497,7 @@ async function resolveInputOptions(config, format, configFiles, bundle, cjsDts,
 	if (report && LogLevels[logger.level] >= 3) plugins.push(ReportPlugin(config, cjsDts, isDualFormat));
 	if (watch) plugins.push(WatchPlugin(configFiles, bundle));
 	if (!cjsDts) plugins.push(userPlugins);
+	if (cssPostPlugins) plugins.push(...cssPostPlugins);
 	const define = {
 		...config.define,
 		...Object.keys(env).reduce((acc, key) => {
@@ -587,6 +587,23 @@ function handlePluginInspect(plugins) {
 		else return `"rolldown plugin: ${plugins.name}"`;
 	};
 }
+function CjsDtsReexportPlugin() {
+	return {
+		name: "tsdown:cjs-dts-reexport",
+		generateBundle(_options, bundle) {
+			for (const chunk of Object.values(bundle)) {
+				if (chunk.type !== "chunk") continue;
+				if (!chunk.fileName.endsWith(".cjs") && !chunk.fileName.endsWith(".js")) continue;
+				const content = `export * from './${path.basename(chunk.fileName.replace(RE_JS, ".d.mts"))}'\n`;
+				this.emitFile({
+					type: "prebuilt-chunk",
+					fileName: filename_js_to_dts(chunk.fileName),
+					code: content
+				});
+			}
+		}
+	};
+}
 function CssGuardPlugin() {
 	return {
 		name: "tsdown:css-guard",
@@ -798,7 +815,7 @@ async function buildSingle(config, configFiles, isDualFormat, clean, restart, do
 		});
 		if (debugRolldownConfigDir) await debugBuildOptions(debugRolldownConfigDir, config.name, format, buildOptions);
 		const configs = [buildOptions];
-		if (format === "cjs" && dts) configs.push(await getBuildOptions(config, format, configFiles, bundle, true, isDualFormat));
+		if (format === "cjs" && dts && (!isDualFormat || !dts.cjsReexport)) configs.push(await getBuildOptions(config, format, configFiles, bundle, true, isDualFormat));
 		return configs;
 	}
 	async function postBuild() {

package/dist/{config-D9p_BCF3.d.mts → config-CgCV7Kdu.d.mts}

@@ -1,4 +1,4 @@
-import { d as UserConfig, f as UserConfigExport, i as InlineConfig, o as ResolvedConfig, p as UserConfigFn } from "./types-D2Jnze_i.mjs";
+import { d as UserConfig, f as UserConfigExport, i as InlineConfig, o as ResolvedConfig, p as UserConfigFn } from "./types-qUp2BCEq.mjs";
 
 //#region src/config/options.d.ts
 /**
@@ -8,8 +8,8 @@ import { d as UserConfig, f as UserConfigExport, i as InlineConfig, o as Resolve
 * @private
 */
 declare function resolveUserConfig(userConfig: UserConfig, inlineConfig: InlineConfig): Promise<ResolvedConfig[]>;
-declare function mergeConfig(defaults: UserConfig, overrides: UserConfig): UserConfig;
-declare function mergeConfig(defaults: InlineConfig, overrides: InlineConfig): InlineConfig;
+declare function mergeConfig(defaults: UserConfig, ...overrides: UserConfig[]): UserConfig;
+declare function mergeConfig(defaults: InlineConfig, ...overrides: InlineConfig[]): InlineConfig;
 //#endregion
 //#region src/config.d.ts
 /**

package/dist/config.d.mts

@@ -1,3 +1,3 @@
-import { d as UserConfig, f as UserConfigExport, p as UserConfigFn } from "./types-D2Jnze_i.mjs";
-import { n as mergeConfig, t as defineConfig } from "./config-D9p_BCF3.mjs";
+import { d as UserConfig, f as UserConfigExport, p as UserConfigFn } from "./types-qUp2BCEq.mjs";
+import { n as mergeConfig, t as defineConfig } from "./config-CgCV7Kdu.mjs";
 export { UserConfig, UserConfigExport, UserConfigFn, defineConfig, mergeConfig };

package/dist/config.mjs

@@ -1,4 +1,4 @@
-import { t as mergeConfig } from "./options-DoRzOC0d.mjs";
+import { t as mergeConfig } from "./options-B1Ye5hV8.mjs";
 //#region src/config.ts
 function defineConfig(options) {
 	return options;

package/dist/{format-DPVBd8E4.mjs → format-DXnmiQIy.mjs}

@@ -4,7 +4,7 @@ import { readFile } from "node:fs/promises";
 import path from "node:path";
 import { blue, underline, yellow } from "ansis";
 import { createDebug } from "obug";
-import { RE_DTS, RE_NODE_MODULES } from "rolldown-plugin-dts/filename";
+import { RE_DTS, RE_NODE_MODULES } from "rolldown-plugin-dts/internal";
 import { and, id, importerId, include } from "rolldown/filter";
 //#region src/features/shims.ts
 const shimFile = path.resolve(import.meta.dirname, "..", "esm-shims.js");
@@ -16,7 +16,7 @@ function getShimsInject(format, platform) {
 }
 //#endregion
 //#region src/features/deps.ts
-const debug = createDebug("tsdown:dep");
+const debug = createDebug("tsdown:deps");
 function resolveDepsConfig(config, logger) {
 	let { neverBundle, alwaysBundle, onlyBundle, skipNodeModulesBundle = false } = config.deps || {};
 	if (config.external != null) {
@@ -59,39 +59,34 @@ function resolveDepsConfig(config, logger) {
 		skipNodeModulesBundle
 	};
 }
-async function parseBundledDep(moduleId) {
-	const slashed = slash(moduleId);
-	const lastNmIdx = slashed.lastIndexOf("/node_modules/");
-	if (lastNmIdx === -1) return;
-	const parts = slashed.slice(lastNmIdx + 14).split("/");
-	let name;
-	if (parts[0][0] === "@") name = `${parts[0]}/${parts[1]}`;
-	else name = parts[0];
-	const root = slashed.slice(0, lastNmIdx + 14 + name.length);
-	try {
-		const json = JSON.parse(await readFile(path.join(root, "package.json"), "utf8"));
-		return {
-			name,
-			pkgName: json.name,
-			version: json.version
-		};
-	} catch {}
-}
-function DepPlugin({ pkg, deps: { alwaysBundle, onlyBundle, skipNodeModulesBundle }, logger, nameLabel }, tsdownBundle) {
+function DepsPlugin({ pkg, deps: { alwaysBundle, onlyBundle, skipNodeModulesBundle }, logger, nameLabel }, tsdownBundle) {
 	const deps = pkg && Array.from(getProductionDeps(pkg));
 	return {
-		name: "tsdown:external",
+		name: "tsdown:deps",
 		resolveId: {
 			filter: [include(and(id(/^[^.]/), importerId(/./)))],
 			async handler(id, importer, extraOptions) {
 				if (extraOptions.isEntry) return;
-				const shouldExternal = await externalStrategy(this, id, importer, extraOptions);
-				const nodeBuiltinModule = isBuiltin(id);
+				const resolved = await this.resolve(id, importer, {
+					...extraOptions,
+					skipSelf: true
+				});
+				let shouldExternal = await externalStrategy(id, importer, resolved);
+				if (Array.isArray(shouldExternal)) {
+					debug("custom resolved id for %o -> %o", id, shouldExternal[1]);
+					id = shouldExternal[1];
+					shouldExternal = shouldExternal[0];
+				}
+				const moduleSideEffects = isBuiltin(id) ? false : void 0;
 				debug("shouldExternal: %o = %o", id, shouldExternal);
 				if (shouldExternal === true || shouldExternal === "absolute") return {
 					id,
 					external: shouldExternal,
-					moduleSideEffects: nodeBuiltinModule ? false : void 0
+					moduleSideEffects
+				};
+				if (resolved) return {
+					...resolved,
+					moduleSideEffects
 				};
 			}
 		},
@@ -103,7 +98,7 @@ function DepPlugin({ pkg, deps: { alwaysBundle, onlyBundle, skipNodeModulesBundl
 				for (const chunk of Object.values(bundle)) {
 					if (chunk.type === "asset") continue;
 					for (const id of chunk.moduleIds) {
-						const parsed = await parseBundledDep(id);
+						const parsed = await readBundledDepInfo(id);
 						if (!parsed) continue;
 						deps.add(parsed.name);
 						if (!tsdownBundle.inlinedDeps.has(parsed.pkgName)) tsdownBundle.inlinedDeps.set(parsed.pkgName, /* @__PURE__ */ new Set());
@@ -124,29 +119,87 @@ function DepPlugin({ pkg, deps: { alwaysBundle, onlyBundle, skipNodeModulesBundl
 	};
 	/**
 	* - `true`: always external
+	* - `[true, resolvedId]`: external with custom resolved ID
 	* - `false`: skip, let other plugins handle it
 	* - `'absolute'`: external as absolute path
 	* - `'no-external'`: skip, but mark as non-external for inlineOnly check
 	*/
-	async function externalStrategy(context, id, importer, extraOptions) {
+	async function externalStrategy(id, importer, resolved) {
 		if (id === shimFile) return false;
 		if (alwaysBundle?.(id, importer)) return "no-external";
-		if (skipNodeModulesBundle) {
-			const resolved = await context.resolve(id, importer, extraOptions);
-			if (resolved && (resolved.external || RE_NODE_MODULES.test(resolved.id))) return true;
-		}
+		if (skipNodeModulesBundle && resolved && (resolved.external || RE_NODE_MODULES.test(resolved.id))) return true;
 		if (deps) {
-			if (deps.includes(id) || deps.some((dep) => id.startsWith(`${dep}/`))) return true;
+			if (deps.includes(id) || deps.some((dep) => id.startsWith(`${dep}/`))) {
+				const resolvedDep = await resolveDepSubpath(id, resolved);
+				return resolvedDep ? [true, resolvedDep] : true;
+			}
 			if (importer && RE_DTS.test(importer) && !id.startsWith("@types/")) {
-				const typesName = `@types/${id.replace(/^@/, "").replaceAll("/", "__")}`;
-				if (deps.includes(typesName)) return true;
+				const typesName = getTypesPackageName(id);
+				if (typesName && deps.includes(typesName)) return true;
 			}
 		}
 		return false;
 	}
 }
+function parsePackageSpecifier(id) {
+	const [first, second] = id.split("/", 3);
+	const name = first[0] === "@" && second ? `${first}/${second}` : first;
+	return [name, id.slice(name.length)];
+}
+const NODE_MODULES = "/node_modules/";
+function parseNodeModulesPath(id) {
+	const slashed = slash(id);
+	const lastNmIdx = slashed.lastIndexOf(NODE_MODULES);
+	if (lastNmIdx === -1) return;
+	const [name, subpath] = parsePackageSpecifier(slashed.slice(lastNmIdx + 14));
+	return [
+		name,
+		subpath,
+		slashed.slice(0, lastNmIdx + 14 + name.length)
+	];
+}
+async function readBundledDepInfo(moduleId) {
+	const parsed = parseNodeModulesPath(moduleId);
+	if (!parsed) return;
+	const [name, , root] = parsed;
+	try {
+		const json = JSON.parse(await readFile(path.join(root, "package.json"), "utf8"));
+		return {
+			name,
+			pkgName: json.name,
+			version: json.version
+		};
+	} catch {}
+}
+function getTypesPackageName(id) {
+	const name = parsePackageSpecifier(id)[0];
+	if (!name) return;
+	return `@types/${name.replace(/^@/, "").replace("/", "__")}`;
+}
+async function resolveDepSubpath(id, resolved) {
+	if (!resolved?.packageJsonPath) return;
+	const parts = id.split("/");
+	if (parts[0][0] === "@") parts.shift();
+	if (parts.length === 1 || parts.at(-1).includes(".")) return;
+	let pkgJson;
+	try {
+		pkgJson = JSON.parse(await readFile(resolved.packageJsonPath, "utf8"));
+	} catch {
+		return;
+	}
+	if (pkgJson.exports) return;
+	const parsed = parseNodeModulesPath(resolved.id);
+	if (!parsed) return;
+	const result = parsed[0] + parsed[1];
+	if (result === id) return;
+	return result;
+}
 function getProductionDeps(pkg) {
-	return new Set([...Object.keys(pkg.dependencies || {}), ...Object.keys(pkg.peerDependencies || {})]);
+	return new Set([
+		...Object.keys(pkg.dependencies || {}),
+		...Object.keys(pkg.peerDependencies || {}),
+		...Object.keys(pkg.optionalDependencies || {})
+	]);
 }
 //#endregion
 //#region src/utils/format.ts
@@ -166,4 +219,4 @@ function detectIndentation(jsonText) {
 	return 2;
 }
 //#endregion
-export { getShimsInject as a, resolveDepsConfig as i, formatBytes as n, DepPlugin as r, detectIndentation as t };
+export { getShimsInject as a, resolveDepsConfig as i, formatBytes as n, DepsPlugin as r, detectIndentation as t };

package/dist/index.d.mts

@@ -1,6 +1,6 @@
 import { i as Arrayable, n as Logger, r as globalLogger } from "./logger-DtCm1ySP.mjs";
-import { A as RolldownContext, B as TsdownBundle, C as ChunkAddonObject, D as PackageJsonWithPath, E as OutExtensionObject, H as CopyOptions, I as DepsConfig, L as NoExternalFn, M as ExeOptions, N as SeaConfig, O as PackageType, P as DevtoolsOptions, R as ResolvedDepsConfig, S as ChunkAddonFunction, T as OutExtensionFactory, U as CopyOptionsFn, V as CopyEntry, a as NormalizedFormat, b as AttwOptions, c as TreeshakingOptions, d as UserConfig, f as UserConfigExport, g as ReportOptions, h as Workspace, i as InlineConfig, j as TsdownHooks, k as BuildContext, l as TsdownInputOption, m as WithEnabled, n as DtsOptions, o as ResolvedConfig, p as UserConfigFn, r as Format, s as Sourcemap, t as CIOption, u as UnusedOptions, v as PublintOptions, w as OutExtensionContext, x as ChunkAddon, y as ExportsOptions, z as RolldownChunk } from "./types-D2Jnze_i.mjs";
-import { n as mergeConfig, r as resolveUserConfig, t as defineConfig } from "./config-D9p_BCF3.mjs";
+import { A as RolldownContext, B as TsdownBundle, C as ChunkAddonObject, D as PackageJsonWithPath, E as OutExtensionObject, F as DepsConfig, H as CopyOptions, L as NoExternalFn, M as ExeOptions, N as SeaConfig, O as PackageType, P as DevtoolsOptions, R as ResolvedDepsConfig, S as ChunkAddonFunction, T as OutExtensionFactory, U as CopyOptionsFn, V as CopyEntry, a as NormalizedFormat, b as AttwOptions, c as TreeshakingOptions, d as UserConfig, f as UserConfigExport, g as ReportOptions, h as Workspace, i as InlineConfig, j as TsdownHooks, k as BuildContext, l as TsdownInputOption, m as WithEnabled, n as DtsOptions, o as ResolvedConfig, p as UserConfigFn, r as Format, s as Sourcemap, t as CIOption, u as UnusedOptions, v as PublintOptions, w as OutExtensionContext, x as ChunkAddon, y as ExportsOptions, z as RolldownChunk } from "./types-qUp2BCEq.mjs";
+import { n as mergeConfig, r as resolveUserConfig, t as defineConfig } from "./config-CgCV7Kdu.mjs";
 import * as Rolldown from "rolldown";
 
 //#region src/build.d.ts

package/dist/index.mjs

@@ -1,7 +1,7 @@
-import { r as resolveUserConfig, t as mergeConfig } from "./options-DoRzOC0d.mjs";
+import { r as resolveUserConfig, t as mergeConfig } from "./options-B1Ye5hV8.mjs";
 import { a as globalLogger } from "./logger-BU0v7CAk.mjs";
 import { defineConfig } from "./config.mjs";
-import { n as buildWithConfigs, t as build } from "./build-CoLhkNXE.mjs";
+import { n as buildWithConfigs, t as build } from "./build-MDnn2xGL.mjs";
 import { t as enableDebug } from "./debug-C4FmgzkJ.mjs";
 import * as Rolldown from "rolldown";
 export { Rolldown, build, buildWithConfigs, defineConfig, enableDebug, globalLogger, mergeConfig, resolveUserConfig };

package/dist/{options-DoRzOC0d.mjs → options-B1Ye5hV8.mjs}

@@ -3,7 +3,7 @@ const __cjs_require = __cjs_createRequire(import.meta.url);
 import { a as pkgExists, c as resolveRegex, l as slash, n as importWithError, r as matchPattern, s as resolveComma, u as toArray } from "./general-CRszZCrY.mjs";
 import { a as lowestCommonAncestor, i as fsStat, n as fsExists, o as stripExtname, r as fsRemove } from "./fs-Dd6Htx2P.mjs";
 import { a as globalLogger, i as getNameLabel, n as createLogger, r as generateColor } from "./logger-BU0v7CAk.mjs";
-import { i as resolveDepsConfig, n as formatBytes, t as detectIndentation } from "./format-DPVBd8E4.mjs";
+import { i as resolveDepsConfig, n as formatBytes, t as detectIndentation } from "./format-DXnmiQIy.mjs";
 import { mkdir, mkdtemp, readFile, writeFile } from "node:fs/promises";
 import path from "node:path";
 import process, { env } from "node:process";
@@ -13,7 +13,7 @@ import { createDebug } from "obug";
 import { glob, isDynamicPattern } from "tinyglobby";
 import { pathToFileURL } from "node:url";
 const picomatch = __cjs_require("picomatch");
-import { RE_CSS, RE_DTS, RE_NODE_MODULES } from "rolldown-plugin-dts/filename";
+import { RE_CSS, RE_DTS, RE_NODE_MODULES } from "rolldown-plugin-dts/internal";
 import { tmpdir } from "node:os";
 const satisfies = __cjs_require("semver/functions/satisfies.js");
 import { x } from "tinyexec";
@@ -80,7 +80,7 @@ async function resolveEntry(logger, entry, cwd, color, nameLabel, root) {
 	const [entryMap, computedRoot] = await toObjectEntry(entry, cwd, root);
 	const entries = Object.values(entryMap);
 	if (entries.length === 0) throw new Error(`${nameLabel} Cannot find entry: ${JSON.stringify(entry)}`);
-	logger.info(nameLabel, `entry: ${color(entries.map((entry) => path.relative(cwd, entry)).join(", "))}`);
+	logger.info(nameLabel, `entry: ${color(entries.map((entry) => path.isAbsolute(entry) ? path.relative(cwd, entry) : entry).join(", "))}`);
 	return [entryMap, computedRoot];
 }
 function toObjectEntry(entry, cwd, root) {
@@ -234,10 +234,11 @@ async function buildSingleExe(config, bundledFile, outputFile, executable, targe
 //#region src/features/pkg/exports.ts
 async function writeExports(options, chunks, inlinedDeps) {
 	const { pkg } = options;
-	const { publishExports, ...generated } = await generateExports(pkg, chunks, options, inlinedDeps);
+	const { publishExports, bin, ...generated } = await generateExports(pkg, chunks, options, inlinedDeps);
 	const updatedPkg = {
 		...pkg,
 		...generated,
+		...bin === void 0 ? {} : { bin },
 		packageJsonPath: void 0
 	};
 	if (publishExports) {
@@ -255,7 +256,7 @@ function shouldExclude(fileName, exclude) {
 	return matchPattern(fileName, exclude);
 }
 async function generateExports(pkg, chunks, options, inlinedDeps) {
-	let { exports: { devExports, all, packageJson = true, exclude, customExports, legacy, inlinedDependencies: emitInlinedDeps = true }, css, logger } = options;
+	let { exports: { devExports, all, packageJson = true, exclude, customExports, legacy, inlinedDependencies: emitInlinedDeps = true, bin }, css, logger, cwd } = options;
 	const pkgRoot = path.dirname(pkg.packageJsonPath);
 	let main, module, cjsTypes, esmTypes;
 	const exportsMap = /* @__PURE__ */ new Map();
@@ -334,6 +335,7 @@ async function generateExports(pkg, chunks, options, inlinedDeps) {
 		module: legacy ? module || pkg.module : void 0,
 		types: legacy ? cjsTypes || esmTypes || pkg.types : pkg.types,
 		exports,
+		bin: generateBin(bin, pkg, chunks, pkgRoot, logger, cwd),
 		inlinedDependencies: emitInlinedDeps ? inlinedDeps : void 0,
 		publishExports
 	};
@@ -375,6 +377,60 @@ function hasExportsTypes(pkg) {
 	}
 	return false;
 }
+const RE_SHEBANG = /^#!.*/;
+function generateBin(bin, pkg, chunks, pkgRoot, logger, cwd) {
+	if (!bin) return;
+	if (bin === true || typeof bin === "string") {
+		if (!pkg.name) throw new Error("Package name is required when using string form for `bin`");
+		const binName = pkg.name[0] === "@" ? pkg.name.split("/", 2)[1] : pkg.name;
+		if (bin === true) {
+			let detected;
+			const seen = /* @__PURE__ */ new Set();
+			for (const format of ["es", "cjs"]) {
+				const formatChunks = chunks[format];
+				if (!formatChunks) continue;
+				for (const chunk of formatChunks) {
+					if (chunk.type !== "chunk" || !chunk.isEntry || !chunk.facadeModuleId) continue;
+					if (!RE_SHEBANG.test(chunk.code)) continue;
+					if (seen.has(chunk.facadeModuleId)) continue;
+					seen.add(chunk.facadeModuleId);
+					if (detected) throw new Error("Multiple entry chunks with shebangs found. Use `exports.bin: { name: \"./src/file.ts\" }` to specify which one to use.");
+					detected = join(pkgRoot, chunk.outDir, slash(chunk.fileName));
+				}
+			}
+			if (detected == null) {
+				logger.warn("`exports.bin` is true but no entry chunks with shebangs were found");
+				return;
+			}
+			return { [binName]: detected };
+		}
+		if (typeof bin === "string") {
+			const match = findChunkBySource(bin);
+			if (!match) throw new Error(`Could not find output chunk for bin entry "${bin}"`);
+			return { [binName]: match };
+		}
+	}
+	const result = {};
+	for (const [cmdName, sourcePath] of Object.entries(bin)) {
+		const match = findChunkBySource(sourcePath);
+		if (!match) throw new Error(`Could not find output chunk for bin entry "${cmdName}": "${sourcePath}"`);
+		result[cmdName] = match;
+	}
+	return result;
+	function findChunkBySource(sourcePath) {
+		const resolved = path.resolve(cwd, sourcePath);
+		for (const format of ["es", "cjs"]) {
+			const formatChunks = chunks[format];
+			if (!formatChunks) continue;
+			for (const chunk of formatChunks) {
+				if (chunk.type !== "chunk" || !chunk.isEntry) continue;
+				if (chunk.facadeModuleId !== resolved) continue;
+				if (!RE_SHEBANG.test(chunk.code)) logger.warn(`Bin entry "${sourcePath}" does not contain a shebang line`);
+				return join(pkgRoot, chunk.outDir, slash(chunk.fileName));
+			}
+		}
+	}
+}
 function getExportName(chunk) {
 	const normalizedName = slash(chunk.fileName);
 	let name = stripExtname(normalizedName);
@@ -501,7 +557,7 @@ async function loadViteConfig(prefix, cwd, configLoader) {
 	return resolved;
 }
 const configPrefix = "tsdown.config";
-async function loadConfigFile(inlineConfig, workspace) {
+async function loadConfigFile(inlineConfig, workspace, rootConfig) {
 	let cwd = inlineConfig.cwd || process.cwd();
 	let overrideConfig = false;
 	let { config: filePath } = inlineConfig;
@@ -550,7 +606,10 @@ async function loadConfigFile(inlineConfig, workspace) {
 		({config: exported, source: file} = result);
 		globalLogger.info(`config file: ${underline(file)}`, loader === "native" ? "" : `(${loader})`);
 		exported = await exported;
-		if (typeof exported === "function") exported = await exported(inlineConfig, { ci: isInCi });
+		if (typeof exported === "function") exported = await exported(inlineConfig, {
+			ci: isInCi,
+			rootConfig
+		});
 	}
 	exported = toArray(exported);
 	if (exported.length === 0) exported.push({});
@@ -769,8 +828,8 @@ const defu = createDefu((obj, key, value) => {
 		return true;
 	}
 });
-function mergeConfig(defaults, overrides) {
-	return defu(overrides, defaults);
+function mergeConfig(defaults, ...overrides) {
+	return defu(...overrides.toReversed(), defaults);
 }
 async function mergeUserOptions(defaults, user, args) {
 	const userOutputOptions = typeof user === "function" ? await user(defaults, ...args) : user;

package/dist/{package-BV2VRL7Z.mjs → package-lMx2nkh2.mjs}

@@ -1,4 +1,4 @@
 //#region package.json
-var version = "0.21.4";
+var version = "0.21.6";
 //#endregion
 export { version as t };

package/dist/plugins.d.mts

@@ -1,5 +1,5 @@
 import { n as Logger } from "./logger-DtCm1ySP.mjs";
-import { B as TsdownBundle, F as DepPlugin, _ as ReportPlugin } from "./types-D2Jnze_i.mjs";
+import { B as TsdownBundle, I as DepsPlugin, _ as ReportPlugin } from "./types-qUp2BCEq.mjs";
 import { Plugin } from "rolldown";
 
 //#region src/features/node-protocol.d.ts
@@ -18,4 +18,4 @@ declare function WatchPlugin(configFiles: string[], {
   chunks
 }: TsdownBundle): Plugin;
 //#endregion
-export { DepPlugin, NodeProtocolPlugin, ReportPlugin, ShebangPlugin, WatchPlugin };
+export { DepsPlugin, NodeProtocolPlugin, ReportPlugin, ShebangPlugin, WatchPlugin };

package/dist/plugins.mjs

@@ -1,3 +1,3 @@
-import { r as DepPlugin } from "./format-DPVBd8E4.mjs";
-import { a as ReportPlugin, i as ShebangPlugin, o as NodeProtocolPlugin, t as WatchPlugin } from "./watch-CS1xCZMR.mjs";
-export { DepPlugin, NodeProtocolPlugin, ReportPlugin, ShebangPlugin, WatchPlugin };
+import { r as DepsPlugin } from "./format-DXnmiQIy.mjs";
+import { a as ReportPlugin, i as ShebangPlugin, o as NodeProtocolPlugin, t as WatchPlugin } from "./watch-BHPVmWIr.mjs";
+export { DepsPlugin, NodeProtocolPlugin, ReportPlugin, ShebangPlugin, WatchPlugin };

package/dist/run.mjs

@@ -2,11 +2,11 @@
 import { createRequire as __cjs_createRequire } from "node:module";
 const __cjs_require = __cjs_createRequire(import.meta.url);
 import { a as globalLogger } from "./logger-BU0v7CAk.mjs";
-import { t as version } from "./package-BV2VRL7Z.mjs";
+import { t as version } from "./package-lMx2nkh2.mjs";
 import { t as enableDebug } from "./debug-C4FmgzkJ.mjs";
 import module from "node:module";
 import process from "node:process";
-import { dim, yellow } from "ansis";
+import { blue, hex, yellow } from "ansis";
 import { x } from "tinyexec";
 import { VERSION } from "rolldown";
 const lt = __cjs_require("semver/functions/lt.js");
@@ -19,8 +19,8 @@ cli.command("[...files]", "Bundle files", {
 	allowUnknownOptions: true
 }).option("-c, --config <filename>", "Use a custom config file").option("--config-loader <loader>", "Config loader to use: auto, native, unrun", { default: "auto" }).option("--no-config", "Disable config file").option("-f, --format <format>", "Bundle format: esm, cjs, iife, umd", { default: "esm" }).option("--clean", "Clean output directory, --no-clean to disable").option("--deps.never-bundle <module>", "Mark dependencies as external").option("--minify", "Minify output").option("--devtools", "Enable devtools integration").option("--debug [feat]", "Show debug logs").option("--target <target>", "Bundle target, e.g \"es2015\", \"esnext\"").option("-l, --logLevel <level>", "Set log level: info, warn, error, silent").option("--fail-on-warn", "Fail on warnings", { default: true }).option("--no-write", "Disable writing files to disk, incompatible with watch mode").option("-d, --out-dir <dir>", "Output directory", { default: "dist" }).option("--treeshake", "Tree-shake bundle", { default: true }).option("--sourcemap", "Generate source map", { default: false }).option("--shims", "Enable cjs and esm shims ", { default: false }).option("--platform <platform>", "Target platform", { default: "node" }).option("--dts", "Generate dts files").option("--publint", "Enable publint", { default: false }).option("--attw", "Enable Are the types wrong integration", { default: false }).option("--unused", "Enable unused dependencies check", { default: false }).option("-w, --watch [path]", "Watch mode").option("--ignore-watch <path>", "Ignore custom paths in watch mode").option("--from-vite [vitest]", "Reuse config from Vite or Vitest").option("--report", "Size report", { default: true }).option("--env.* <value>", "Define compile-time env variables").option("--env-file <file>", "Load environment variables from a file, when used together with --env, variables in --env take precedence").option("--env-prefix <prefix>", "Prefix for env variables to inject into the bundle", { default: "TSDOWN_" }).option("--on-success <command>", "Command to run on success").option("--copy <dir>", "Copy files to output dir").option("--public-dir <dir>", "Alias for --copy, deprecated").option("--tsconfig <tsconfig>", "Set tsconfig path").option("--unbundle", "Unbundle mode").option("--root <dir>", "Root directory of input files").option("--exe", "Bundle as executable").option("-W, --workspace [dir]", "Enable workspace mode").option("-F, --filter <pattern>", "Filter configs (cwd or name), e.g. /pkg-name$/ or pkg-name").option("--exports", "Generate export-related metadata for package.json (experimental)").action(async (input, flags) => {
 	globalLogger.level = flags.logLevel || "info";
-	globalLogger.info(`tsdown ${dim`v${version}`} powered by rolldown ${dim`v${VERSION}`}`);
-	const { build } = await import("./build-dhDyu66J.mjs");
+	globalLogger.info(`${blue`tsdown v${version}`} powered by ${hex("#ff7e17")`rolldown v${VERSION}`}`);
+	const { build } = await import("./build-C1dAKhHj.mjs");
 	if (input.length > 0) flags.entry = input;
 	await build(flags);
 });

package/dist/{types-D2Jnze_i.d.mts → types-qUp2BCEq.d.mts}

@@ -3,11 +3,11 @@ import { BuildOptions, ChecksOptions, ExternalOption, InputOptions, InternalModu
 import { Hookable } from "hookable";
 import { Buffer } from "node:buffer";
 import * as _tsdown_css0 from "@tsdown/css";
-import { Options as DtsOptions } from "rolldown-plugin-dts";
 import { StartOptions } from "@vitejs/devtools/cli-commands";
 import { ExeExtensionOptions } from "@tsdown/exe";
 import { CheckPackageOptions } from "@arethetypeswrong/core";
 import { Options } from "publint";
+import { Options as Options$1 } from "rolldown-plugin-dts";
 import { Options as UnusedOptions } from "unplugin-unused";
 
 //#region src/features/copy.d.ts
@@ -60,7 +60,7 @@ interface DepsConfig {
   */
   neverBundle?: ExternalOption;
   /**
-  * Force dependencies to be bundled, even if they are in `dependencies` or `peerDependencies`.
+  * Force dependencies to be bundled, even if they are in `dependencies`, `peerDependencies`, or `optionalDependencies`.
   */
   alwaysBundle?: Arrayable<string | RegExp> | NoExternalFn;
   /**
@@ -92,7 +92,7 @@ interface ResolvedDepsConfig {
   onlyBundle?: Array<string | RegExp> | false;
   skipNodeModulesBundle: boolean;
 }
-declare function DepPlugin({
+declare function DepsPlugin({
   pkg,
   deps: {
     alwaysBundle,
@@ -638,6 +638,22 @@ interface ExportsOptions {
   * @see {@link https://github.com/e18e/ecosystem-issues/issues/237}
   */
   inlinedDependencies?: boolean;
+  /**
+  * Auto-generate the `bin` field in package.json.
+  *
+  * - `true`: Auto-detect entry chunks with shebangs. Uses package name (without scope) as bin name.
+  *   Errors if multiple shebang entries are found.
+  * - `string`: Source file path to use as the bin entry. Bin name defaults to package name (without scope).
+  * - `Record<string, string>`: Map of bin command names to source file paths.
+  *
+  * @example
+  * bin: true
+  * @example
+  * bin: './src/cli.ts'
+  * @example
+  * bin: { tool: './src/cli-tool.ts' }
+  */
+  bin?: boolean | string | Record<string, string>;
 }
 //#endregion
 //#region src/features/pkg/publint.d.ts
@@ -668,6 +684,23 @@ interface ReportOptions {
 declare function ReportPlugin(config: ResolvedConfig, cjsDts?: boolean, isDualFormat?: boolean): Plugin;
 //#endregion
 //#region src/config/types.d.ts
+interface DtsOptions extends Options$1 {
+  /**
+  * When building dual ESM+CJS formats, generate a `.d.cts` re-export stub
+  * instead of running a full second TypeScript compilation pass.
+  *
+  * The stub re-exports everything from the corresponding `.d.mts` file,
+  * ensuring CJS and ESM consumers share the same type declarations. This
+  * eliminates the TypeScript "dual module hazard" where separate `.d.cts`
+  * and `.d.mts` declarations cause `TS2352` ("neither type sufficiently
+  * overlaps") errors when casting between types derived from the same class.
+  *
+  * Only applies when building both `esm` and `cjs` formats simultaneously.
+  *
+  * @default false
+  */
+  cjsReexport?: boolean;
+}
 type Sourcemap = boolean | "inline" | "hidden";
 type Format = ModuleFormat;
 type NormalizedFormat = InternalModuleFormat;
@@ -1128,6 +1161,7 @@ interface InlineConfig extends UserConfig {
 }
 type UserConfigFn = (inlineConfig: InlineConfig, context: {
   ci: boolean;
+  rootConfig?: UserConfig;
 }) => Awaitable<Arrayable<UserConfig>>;
 type UserConfigExport = Awaitable<Arrayable<UserConfig> | UserConfigFn>;
 type ResolvedConfig = Overwrite<MarkPartial<Omit<UserConfig, "workspace" | "fromVite" | "publicDir" | "bundle" | "injectStyle" | "removeNodeProtocol" | "external" | "noExternal" | "inlineOnly" | "skipNodeModulesBundle" | "logLevel" | "failOnWarn" | "customLogger" | "envFile" | "envPrefix">, "globalName" | "inputOptions" | "outputOptions" | "minify" | "define" | "alias" | "onSuccess" | "outExtensions" | "hooks" | "copy" | "loader" | "name" | "banner" | "footer" | "checks" | "css">, {
@@ -1154,4 +1188,4 @@ type ResolvedConfig = Overwrite<MarkPartial<Omit<UserConfig, "workspace" | "from
   exe: false | ExeOptions;
 }>;
 //#endregion
-export { RolldownContext as A, TsdownBundle as B, ChunkAddonObject as C, PackageJsonWithPath as D, OutExtensionObject as E, DepPlugin as F, CopyOptions as H, DepsConfig as I, NoExternalFn as L, ExeOptions as M, SeaConfig as N, PackageType as O, DevtoolsOptions as P, ResolvedDepsConfig as R, ChunkAddonFunction as S, OutExtensionFactory as T, CopyOptionsFn as U, CopyEntry as V, ReportPlugin as _, NormalizedFormat as a, AttwOptions as b, TreeshakingOptions as c, UserConfig as d, UserConfigExport as f, ReportOptions as g, Workspace as h, InlineConfig as i, TsdownHooks as j, BuildContext as k, TsdownInputOption as l, WithEnabled as m, DtsOptions as n, ResolvedConfig as o, UserConfigFn as p, Format as r, Sourcemap as s, CIOption as t, UnusedOptions as u, PublintOptions as v, OutExtensionContext as w, ChunkAddon as x, ExportsOptions as y, RolldownChunk as z };
+export { RolldownContext as A, TsdownBundle as B, ChunkAddonObject as C, PackageJsonWithPath as D, OutExtensionObject as E, DepsConfig as F, CopyOptions as H, DepsPlugin as I, NoExternalFn as L, ExeOptions as M, SeaConfig as N, PackageType as O, DevtoolsOptions as P, ResolvedDepsConfig as R, ChunkAddonFunction as S, OutExtensionFactory as T, CopyOptionsFn as U, CopyEntry as V, ReportPlugin as _, NormalizedFormat as a, AttwOptions as b, TreeshakingOptions as c, UserConfig as d, UserConfigExport as f, ReportOptions as g, Workspace as h, InlineConfig as i, TsdownHooks as j, BuildContext as k, TsdownInputOption as l, WithEnabled as m, DtsOptions as n, ResolvedConfig as o, UserConfigFn as p, Format as r, Sourcemap as s, CIOption as t, UnusedOptions as u, PublintOptions as v, OutExtensionContext as w, ChunkAddon as x, ExportsOptions as y, RolldownChunk as z };

package/dist/{watch-CS1xCZMR.mjs → watch-BHPVmWIr.mjs}

@@ -1,14 +1,14 @@
 import { i as noop, s as resolveComma, u as toArray } from "./general-CRszZCrY.mjs";
 import { n as fsExists, t as fsCopy } from "./fs-Dd6Htx2P.mjs";
 import { o as prettyFormat } from "./logger-BU0v7CAk.mjs";
-import { n as formatBytes } from "./format-DPVBd8E4.mjs";
+import { n as formatBytes } from "./format-DXnmiQIy.mjs";
 import { builtinModules } from "node:module";
 import { chmod } from "node:fs/promises";
 import path from "node:path";
 import { bold, dim, green, underline } from "ansis";
 import { createDebug } from "obug";
 import { glob, isDynamicPattern } from "tinyglobby";
-import { RE_DTS } from "rolldown-plugin-dts/filename";
+import { RE_DTS } from "rolldown-plugin-dts/internal";
 import { promisify } from "node:util";
 import { Buffer } from "node:buffer";
 import { brotliCompress, gzip } from "node:zlib";

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "tsdown",
   "type": "module",
-  "version": "0.21.4",
+  "version": "0.21.6",
   "description": "The Elegant Bundler for Libraries",
   "author": "Kevin Deng <sxzz@sxzz.moe>",
   "license": "MIT",
@@ -50,10 +50,10 @@
     "@arethetypeswrong/core": "^0.18.1",
     "@vitejs/devtools": "*",
     "publint": "^0.3.0",
-    "typescript": "^5.0.0",
+    "typescript": "^5.0.0 || ^6.0.0",
     "unplugin-unused": "^0.5.0",
-    "@tsdown/css": "0.21.4",
-    "@tsdown/exe": "0.21.4"
+    "@tsdown/css": "0.21.6",
+    "@tsdown/exe": "0.21.6"
   },
   "peerDependenciesMeta": {
     "@arethetypeswrong/core": {
@@ -86,15 +86,15 @@
     "hookable": "^6.1.0",
     "import-without-cache": "^0.2.5",
     "obug": "^2.1.1",
-    "picomatch": "^4.0.3",
-    "rolldown": "1.0.0-rc.9",
-    "rolldown-plugin-dts": "^0.22.5",
+    "picomatch": "^4.0.4",
+    "rolldown": "1.0.0-rc.12",
+    "rolldown-plugin-dts": "^0.23.0",
     "semver": "^7.7.4",
     "tinyexec": "^1.0.4",
     "tinyglobby": "^0.2.15",
     "tree-kill": "^1.2.2",
     "unconfig-core": "^7.5.0",
-    "unrun": "^0.2.32"
+    "unrun": "^0.2.34"
   },
   "inlinedDependencies": {
     "is-in-ci": "2.0.0",
@@ -103,24 +103,23 @@
   },
   "devDependencies": {
     "@arethetypeswrong/core": "^0.18.2",
-    "@publint/pack": "^0.1.4",
     "@sxzz/eslint-config": "^7.8.3",
     "@sxzz/prettier-config": "^2.3.1",
     "@sxzz/test-utils": "^0.5.15",
     "@types/node": "^25.5.0",
     "@types/picomatch": "^4.0.2",
     "@types/semver": "^7.7.1",
-    "@typescript/native-preview": "7.0.0-dev.20260316.1",
-    "@unocss/eslint-plugin": "^66.6.6",
-    "@vitejs/devtools": "^0.1.0",
-    "@vitest/coverage-v8": "^4.1.0",
-    "@vitest/ui": "^4.1.0",
+    "@typescript/native-preview": "7.0.0-dev.20260326.1",
+    "@unocss/eslint-plugin": "^66.6.7",
+    "@vitejs/devtools": "^0.1.11",
+    "@vitest/coverage-v8": "^4.1.2",
+    "@vitest/ui": "^4.1.2",
     "@vueuse/core": "^14.2.1",
     "bumpp": "^11.0.1",
     "dedent": "^1.7.2",
-    "eslint": "^10.0.3",
+    "eslint": "^10.1.0",
     "is-in-ci": "^2.0.0",
-    "memfs": "^4.56.11",
+    "memfs": "^4.57.1",
     "package-manager-detector": "^1.6.0",
     "pkg-types": "^2.3.0",
     "postcss": "^8.5.8",
@@ -130,17 +129,17 @@
     "rolldown-plugin-dts-snapshot": "^0.4.0",
     "rolldown-plugin-require-cjs": "^0.4.0",
     "sass": "^1.98.0",
-    "typescript": "~5.9.3",
-    "unocss": "^66.6.6",
+    "typescript": "~6.0.2",
+    "unocss": "^66.6.7",
     "unplugin-ast": "^0.16.0",
     "unplugin-raw": "^0.6.4",
     "unplugin-unused": "^0.5.7",
     "unplugin-vue": "^7.1.1",
-    "vite": "^8.0.0",
-    "vitest": "^4.1.0",
-    "vue": "^3.5.30",
-    "@tsdown/css": "0.21.4",
-    "@tsdown/exe": "0.21.4"
+    "vite": "^8.0.3",
+    "vitest": "^4.1.2",
+    "vue": "^3.5.31",
+    "@tsdown/css": "0.21.6",
+    "@tsdown/exe": "0.21.6"
   },
   "prettier": "@sxzz/prettier-config",
   "scripts": {

package/dist/build-dhDyu66J.mjs

@@ -1,2 +0,0 @@
-import { t as build } from "./build-CoLhkNXE.mjs";
-export { build };