tsdown 0.4.4 → 0.5.0

package/dist/index.d.ts

@@ -1,19 +1,95 @@
-import { type Config, type Options, type ResolvedOptions } from "./options.js";
-import { logger } from "./utils/logger.js";
+import { E as External } from './plugins.d-CKHmQhmh.js';
+import { InputOptions, ModuleFormat, OutputOptions, InternalModuleFormat } from 'rolldown';
+import { Options as Options$1 } from 'unplugin-isolated-decl';
+import { Options as Options$2 } from 'unplugin-unused';
+import { ConsolaInstance } from 'consola';
+import 'pkg-types';
+
+type Overwrite<
+	T,
+	U
+> = Omit<T, keyof U> & U;
+type MaybePromise<T> = T | Promise<T>;
+type MarkPartial<
+	T,
+	K extends keyof T
+> = Omit<Required<T>, K> & Partial<Pick<T, K>>;
+type Arrayable<T> = T | T[];
+
+type Sourcemap = boolean | "inline" | "hidden";
+/**
+* Options for tsdown.
+*/
+interface Options {
+	entry?: InputOptions["input"];
+	format?: ModuleFormat | ModuleFormat[];
+	globalName?: string;
+	plugins?: InputOptions["plugins"];
+	external?: External;
+	outDir?: string;
+	clean?: boolean | string[];
+	silent?: boolean;
+	config?: boolean | string;
+	sourcemap?: Sourcemap;
+	alias?: Record<string, string>;
+	/** @default true */
+	treeshake?: boolean;
+	/** @default false */
+	minify?: boolean;
+	target?: string | string[];
+	define?: Record<string, string>;
+	/** @default 'node' */
+	platform?: "node" | "neutral" | "browser";
+	shims?: boolean;
+	/**
+	* Enable dts generation with `isolatedDeclarations` (experimental)
+	*/
+	dts?: boolean | Options$1;
+	/** @default true */
+	bundleDts?: boolean;
+	/**
+	* Enable unused dependencies check with `unplugin-unused` (experimental)
+	*/
+	unused?: boolean | Options$2;
+	watch?: boolean | string | string[];
+	inputOptions?: InputOptions;
+	outputOptions?: OutputOptions | ((options: OutputOptions, format: ModuleFormat) => MaybePromise<OutputOptions | void | null>);
+	onSuccess?: () => void | Promise<void>;
+	/**
+	* Skip bundling node_modules.
+	*/
+	skipNodeModulesBundle?: boolean;
+}
+/**
+* Options without specifying config file path.
+*/
+type Config = Arrayable<Omit<Options, "config">>;
+type NormalizedFormat = Exclude<InternalModuleFormat, "app"> | "experimental-app";
+type ResolvedOptions = Omit<Overwrite<MarkPartial<Options, "globalName" | "inputOptions" | "outputOptions" | "minify" | "target" | "define" | "alias" | "external" | "onSuccess" | "dts">, {
+	format: NormalizedFormat[];
+	clean: string[] | false;
+	dts: false | Options$1;
+}>, "config">;
+
+/**
+* Logger instance
+*/
+declare const logger: ConsolaInstance;
+
 /**
 * Build with tsdown.
 */
-export declare function build(userOptions?: Omit<Options, "silent">): Promise<void>;
-export declare const pkgRoot: string;
+declare function build(userOptions?: Omit<Options, "silent">): Promise<void>;
+declare const pkgRoot: string;
 /**
 * Build a single configuration, without watch and shortcuts features.
 *
 * @param resolved Resolved options
 */
-export declare function buildSingle(resolved: ResolvedOptions): Promise<(() => Promise<void>) | undefined>;
+declare function buildSingle(resolved: ResolvedOptions): Promise<(() => Promise<void>) | undefined>;
 /**
 * Defines the configuration for tsdown.
 */
-export declare function defineConfig(options: Config): Config;
-export { logger };
-export type { Config, Options };
+declare function defineConfig(options: Config): Config;
+
+export { type Config, type Options, build, buildSingle, defineConfig, logger, pkgRoot };

package/dist/index.js

@@ -1,26 +1,28 @@
 import { debug, logger } from "./logger-Pk57TMWT.js";
 import { ExternalPlugin } from "./external-9r3oq3tH.js";
-import path, { dirname as dirname$1, normalize, sep, default as path$1, default as path$2, default as path$3, default as path$4, default as path$5 } from "node:path";
+import path, { dirname, normalize, sep, default as path$1, default as path$2, default as path$3, default as path$4, default as path$5, default as path$6 } from "node:path";
 import process, { default as process$1, default as process$2, default as process$3 } from "node:process";
 import { fileURLToPath } from "node:url";
-import { build as rolldownBuild } from "rolldown";
+import { build as build$1 } from "rolldown";
 import { transformPlugin } from "rolldown/experimental";
 import { IsolatedDecl } from "unplugin-isolated-decl";
 import { Unused } from "unplugin-unused";
 import { access, readdir, rm, stat } from "node:fs/promises";
-import { glob, glob as glob$1 } from "tinyglobby";
+import { glob } from "tinyglobby";
+import { rollup } from "rollup";
+import DtsPlugin from "rollup-plugin-dts";
 import { readPackageJSON } from "pkg-types";
 import readline from "node:readline";
 import pc, { default as pc$1, default as pc$2 } from "picocolors";
 import { loadConfig } from "unconfig";
 
 //#region src/utils/fs.ts
-function fsExists(path$6) {
-	return access(path$6).then(() => true, () => false);
+function fsExists(path$7) {
+	return access(path$7).then(() => true, () => false);
 }
 function lowestCommonAncestor(...filepaths) {
 	if (filepaths.length === 0) return "";
-	if (filepaths.length === 1) return dirname$1(filepaths[0]);
+	if (filepaths.length === 1) return dirname(filepaths[0]);
 	filepaths = filepaths.map(normalize);
 	const [first, ...rest] = filepaths;
 	let ancestor = first.split(sep);
@@ -41,8 +43,8 @@ else {
 //#region src/features/clean.ts
 async function cleanOutDir(cwd, patterns) {
 	const files = [];
-	if (await fsExists(cwd)) files.push(...(await readdir(cwd)).map((file) => path$5.resolve(cwd, file)));
-	if (patterns.length) files.push(...await glob$1(patterns, {
+	if (await fsExists(cwd)) files.push(...(await readdir(cwd)).map((file) => path$6.resolve(cwd, file)));
+	if (patterns.length) files.push(...await glob(patterns, {
 		cwd,
 		absolute: true
 	}));
@@ -56,6 +58,31 @@ async function cleanOutDir(cwd, patterns) {
 	}
 }
 
+//#endregion
+//#region src/features/dts.ts
+const TEMP_DTS_DIR = ".tsdown-types";
+async function bundleDts(options, jsExtension) {
+	const ext = jsExtension.replace("j", "t");
+	const dtsOutDir = path$5.resolve(options.outDir, TEMP_DTS_DIR);
+	const dtsEntry = Object.fromEntries(Object.keys(options.entry).map((key) => [key, path$5.resolve(dtsOutDir, `${key}.d.${ext}`)]));
+	const build$2 = await rollup({
+		input: dtsEntry,
+		onLog(level, log, defaultHandler) {
+			if (log.code !== "EMPTY_BUNDLE") defaultHandler(level, log);
+		},
+		plugins: [DtsPlugin()]
+	});
+	let outDir = options.outDir;
+	const extraOutdir = options.dts.extraOutdir;
+	if (extraOutdir) outDir = path$5.resolve(outDir, extraOutdir);
+	await build$2.write({
+		dir: outDir,
+		format: "es",
+		entryFileNames: `[name].d.${ext}`
+	});
+	await rm(dtsOutDir, { recursive: true });
+}
+
 //#endregion
 //#region src/utils/package.ts
 async function readPackageJson(dir) {
@@ -193,25 +220,21 @@ async function watchBuild(options, rebuild) {
 //#region src/features/entry.ts
 async function resolveEntry(entry) {
 	if (!entry || Object.keys(entry).length === 0) throw new Error(`No input files, try "tsdown <your-file>" instead`);
+	const objectEntry = await toObjectEntry(entry);
+	const entries = Object.values(objectEntry);
+	if (entries.length === 0) throw new Error(`Cannot find entry: ${JSON.stringify(entry)}`);
+	logger.info(`entry: ${pc$1.blue(entries.join(", "))}`);
+	return objectEntry;
+}
+async function toObjectEntry(entry) {
 	if (typeof entry === "string") entry = [entry];
-	if (Array.isArray(entry)) {
-		const resolvedEntry = await glob(entry);
-		const base = lowestCommonAncestor(...resolvedEntry);
-		if (resolvedEntry.length > 0) {
-			logger.info(`entry: ${pc$1.blue(resolvedEntry.join(", "))}`);
-			entry = Object.fromEntries(resolvedEntry.map((file) => {
-				const relative = path$2.relative(base, file);
-				return [relative.slice(0, relative.length - path$2.extname(relative).length), file];
-			}));
-		} else throw new Error(`Cannot find entry: ${entry}`);
-	} else {
-		const files = Object.values(entry);
-		files.forEach((filename) => {
-			if (!fsExists(filename)) throw new Error(`Cannot find entry: ${filename}`);
-		});
-		logger.info(`entry: ${pc$1.blue(files.join(", "))}`);
-	}
-	return entry;
+	if (!Array.isArray(entry)) return entry;
+	const resolvedEntry = await glob(entry);
+	const base = lowestCommonAncestor(...resolvedEntry);
+	return Object.fromEntries(resolvedEntry.map((file) => {
+		const relative = path$2.relative(base, file);
+		return [relative.slice(0, relative.length - path$2.extname(relative).length), file];
+	}));
 }
 
 //#endregion
@@ -224,7 +247,7 @@ async function resolveOptions(options) {
 			...subConfig,
 			...options
 		};
-		let { entry, format = ["es"], plugins = [], clean = false, silent = false, treeshake = true, platform = "node", outDir = "dist", sourcemap = false, dts = false, unused = false, watch = false, shims = false, skipNodeModulesBundle = false } = subOptions;
+		let { entry, format = ["es"], plugins = [], clean = false, silent = false, treeshake = true, platform = "node", outDir = "dist", sourcemap = false, dts = false, bundleDts: bundleDts$1 = true, unused = false, watch = false, shims = false, skipNodeModulesBundle = false } = subOptions;
 		entry = await resolveEntry(entry);
 		if (clean === true) clean = [];
 		return {
@@ -238,7 +261,8 @@ async function resolveOptions(options) {
 			treeshake,
 			platform,
 			sourcemap,
-			dts,
+			dts: dts === true ? {} : dts,
+			bundleDts: bundleDts$1,
 			unused,
 			watch,
 			shims,
@@ -294,7 +318,8 @@ async function loadConfigFile(options) {
 			rewrite: (config$1) => config$1?.tsdown
 		}],
 		cwd,
-		defaults: {}
+		defaults: {},
+		importx: { loader: "bundle-require" }
 	});
 	if (sources.length > 0) logger.info(`Using tsdown config: ${pc.underline(sources.join(", "))}`);
 	const file = sources[0];
@@ -321,8 +346,8 @@ else debug("No config file found");
 		build(userOptions);
 	});
 }
-const dirname = path.dirname(fileURLToPath(import.meta.url));
-const pkgRoot = path.resolve(dirname, "..");
+const dirname$1 = path.dirname(fileURLToPath(import.meta.url));
+const pkgRoot = path.resolve(dirname$1, "..");
 async function buildSingle(resolved) {
 	const { entry, external, plugins: userPlugins, outDir, format, clean, platform, alias, treeshake, sourcemap, dts, minify, watch, unused, target, define, shims, onSuccess } = resolved;
 	if (clean) await cleanOutDir(outDir, clean);
@@ -334,7 +359,10 @@ async function buildSingle(resolved) {
 		const plugins = [
 			pkg && ExternalPlugin(pkg, resolved.skipNodeModulesBundle),
 			unused && Unused.rolldown(unused === true ? {} : unused),
-			dts && IsolatedDecl.rolldown(dts === true ? {} : dts),
+			dts && IsolatedDecl.rolldown({
+				...dts,
+				extraOutdir: resolved.bundleDts ? TEMP_DTS_DIR : dts.extraOutdir
+			}),
 			target && transformPlugin({ target: target && (typeof target === "string" ? target : target.join(",")) }),
 			userPlugins
 		].filter((plugin) => !!plugin);
@@ -368,10 +396,11 @@ async function buildSingle(resolved) {
 				...outputOptions,
 				...userOutputOptions
 			};
-			await rolldownBuild({
+			await build$1({
 				...inputOptions,
 				output: outputOptions
 			});
+			if (resolved.dts && resolved.bundleDts) await bundleDts(resolved, extension);
 		}));
 		logger.success(`${first ? "Build" : "Rebuild"} complete in ${Math.round(performance.now() - startTime)}ms`);
 		await onSuccess?.();

package/dist/plugins.d-CKHmQhmh.d.ts

@@ -0,0 +1,7 @@
+import { PackageJson } from 'pkg-types';
+import { Plugin, InputOptions } from 'rolldown';
+
+type External = InputOptions["external"];
+declare function ExternalPlugin(pkg: PackageJson, skipNodeModulesBundle?: boolean): Plugin;
+
+export { type External as E, ExternalPlugin as a };

package/dist/plugins.d.ts

@@ -1 +1,3 @@
-export { ExternalPlugin } from "./features/external.js";
+export { a as ExternalPlugin } from './plugins.d-CKHmQhmh.js';
+import 'pkg-types';
+import 'rolldown';

package/dist/run.d.ts

@@ -1 +1,2 @@
-export {};
+
+export {  }

package/dist/run.js

@@ -1,11 +1,11 @@
 import { logger } from "./logger-Pk57TMWT.js";
 import process from "node:process";
-import { VERSION as rolldownVersion } from "rolldown";
+import { VERSION } from "rolldown";
 import pc from "picocolors";
 import { cac } from "cac";
 
 //#region package.json
-var version = "0.4.4";
+var version = "0.5.0";
 
 //#endregion
 //#region src/cli.ts
@@ -13,10 +13,10 @@ async function runCLI() {
 	const cli = cac("tsdown");
 	cli.command("[...files]", "Bundle files", { ignoreOptionDefaultValue: true }).option("-c, --config <filename>", "Use a custom config file").option("--no-config", "Disable config file").option("--format <format>", "Bundle format: esm, cjs, iife", { default: "esm" }).option("--clean", "Clean output directory").option("--minify", "Minify output").option("--target <target>", "Bundle target, e.g \"es2015\", \"esnext\"").option("--silent", "Suppress non-error logs").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("-w, --watch [path]", "Watch mode").action(async (input, flags) => {
 		if (!("CONSOLA_LEVEL" in process.env)) logger.level = flags.silent ? 0 : 3;
-		logger.info(`tsdown ${pc.dim(`v${version}`)} powered by rolldown ${pc.dim(`v${rolldownVersion}`)}`);
-		const { build } = await import("./index.js");
+		logger.info(`tsdown ${pc.dim(`v${version}`)} powered by rolldown ${pc.dim(`v${VERSION}`)}`);
+		const { build: build$1 } = await import("./index.js");
 		if (input.length > 0) flags.entry = input;
-		await build(flags);
+		await build$1(flags);
 	});
 	cli.help();
 	cli.version(version);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tsdown",
-  "version": "0.4.4",
+  "version": "0.5.0",
   "description": "An even faster bundler powered by Rolldown.",
   "type": "module",
   "license": "MIT",
@@ -43,23 +43,25 @@
     "cac": "^6.7.14",
     "chokidar": "^4.0.1",
     "consola": "^3.2.3",
-    "debug": "^4.3.7",
+    "debug": "^4.4.0",
     "picocolors": "^1.1.1",
     "pkg-types": "^1.2.1",
-    "rolldown": "0.15.0-snapshot-64a831c-20241207003504",
+    "rolldown": "nightly",
+    "rollup": "^4.28.1",
+    "rollup-plugin-dts": "^6.1.1",
     "tinyglobby": "^0.2.10",
     "unconfig": "^0.6.0",
-    "unplugin-isolated-decl": "^0.9.3",
+    "unplugin-isolated-decl": "^0.10.0",
     "unplugin-unused": "^0.2.3"
   },
   "devDependencies": {
     "@sxzz/eslint-config": "^4.5.1",
     "@sxzz/prettier-config": "^2.0.2",
+    "@sxzz/test-utils": "^0.3.11",
     "@types/debug": "^4.1.12",
     "@types/node": "^22.10.1",
-    "bumpp": "^9.8.1",
+    "bumpp": "^9.9.0",
     "eslint": "^9.16.0",
-    "fdir": "^6.4.2",
     "oxc-transform": "^0.39.0",
     "prettier": "^3.4.2",
     "tinyexec": "^0.3.1",

package/dist/cli.d.ts

@@ -1 +0,0 @@
-export declare function runCLI(): Promise<void>;

package/dist/features/clean.d.ts

@@ -1 +0,0 @@
-export declare function cleanOutDir(cwd: string, patterns: string[]): Promise<void>;

package/dist/features/entry.d.ts

@@ -1,2 +0,0 @@
-import type { Options } from "../options.js";
-export declare function resolveEntry(entry: Options["entry"]): Promise<string[] | Record<string, string>>;

package/dist/features/external.d.ts

@@ -1,5 +0,0 @@
-import type { PackageJson } from "pkg-types";
-import type { InputOptions, Plugin } from "rolldown";
-export type External = InputOptions["external"];
-export declare function ExternalPlugin(pkg: PackageJson, skipNodeModulesBundle?: boolean): Plugin;
-export declare function getProductionDeps(pkg: PackageJson): Set<string>;

package/dist/features/output.d.ts

@@ -1,2 +0,0 @@
-import type { NormalizedFormat } from "../options.js";
-export declare function resolveOutputExtension(pkg: any, format: NormalizedFormat): "mjs" | "cjs" | "js";

package/dist/features/shims.d.ts

@@ -1,2 +0,0 @@
-import type { NormalizedFormat, ResolvedOptions } from "../options.js";
-export declare function getShimsInject(format: NormalizedFormat, platform: ResolvedOptions["platform"]): Record<string, [string, string]> | undefined;

package/dist/features/shortcuts.d.ts

@@ -1,6 +0,0 @@
-export interface Shortcut {
-	key: string;
-	description: string;
-	action: () => void | Promise<void>;
-}
-export declare function shortcuts(restart: () => void): void;

package/dist/features/watch.d.ts

@@ -1,3 +0,0 @@
-import type { ResolvedOptions } from "../options.js";
-import type { FSWatcher } from "chokidar";
-export declare function watchBuild(options: ResolvedOptions, rebuild: () => void): Promise<FSWatcher>;

package/dist/options.d.ts

@@ -1,59 +0,0 @@
-import type { External } from "./features/external.js";
-import type { Arrayable, MarkPartial, MaybePromise, Overwrite } from "./utils/types.js";
-import type { InputOptions, InternalModuleFormat, ModuleFormat, OutputOptions } from "rolldown";
-import type { Options as IsolatedDeclOptions } from "unplugin-isolated-decl";
-import type { Options as UnusedOptions } from "unplugin-unused";
-export type Sourcemap = boolean | "inline" | "hidden";
-/**
-* Options for tsdown.
-*/
-export interface Options {
-	entry?: InputOptions["input"];
-	format?: ModuleFormat | ModuleFormat[];
-	globalName?: string;
-	plugins?: InputOptions["plugins"];
-	external?: External;
-	outDir?: string;
-	clean?: boolean | string[];
-	silent?: boolean;
-	config?: boolean | string;
-	sourcemap?: Sourcemap;
-	alias?: Record<string, string>;
-	/** @default true */
-	treeshake?: boolean;
-	/** @default false */
-	minify?: boolean;
-	target?: string | string[];
-	define?: Record<string, string>;
-	/** @default 'node' */
-	platform?: "node" | "neutral" | "browser";
-	shims?: boolean;
-	/**
-	* Enable dts generation with `isolatedDeclarations` (experimental)
-	*/
-	dts?: boolean | IsolatedDeclOptions;
-	/**
-	* Enable unused dependencies check with `unplugin-unused` (experimental)
-	*/
-	unused?: boolean | UnusedOptions;
-	watch?: boolean | string | string[];
-	inputOptions?: InputOptions;
-	outputOptions?: OutputOptions | ((options: OutputOptions, format: ModuleFormat) => MaybePromise<OutputOptions | void | null>);
-	onSuccess?: () => void | Promise<void>;
-	/**
-	* Skip bundling node_modules.
-	*/
-	skipNodeModulesBundle?: boolean;
-}
-/**
-* Options without specifying config file path.
-*/
-export type Config = Arrayable<Omit<Options, "config">>;
-export type ResolvedConfig = Extract<Config, any[]>;
-export type NormalizedFormat = Exclude<InternalModuleFormat, "app"> | "experimental-app";
-export type ResolvedOptions = Omit<Overwrite<MarkPartial<Options, "globalName" | "inputOptions" | "outputOptions" | "minify" | "target" | "define" | "alias" | "external" | "onSuccess">, {
-	format: NormalizedFormat[];
-	clean: string[] | false;
-}>, "config">;
-export declare function resolveOptions(options: Options): Promise<[configs: ResolvedOptions[], configFile?: string]>;
-export declare function normalizeFormat(format: ModuleFormat | ModuleFormat[]): NormalizedFormat[];

package/dist/utils/fs.d.ts

@@ -1,2 +0,0 @@
-export declare function fsExists(path: string): Promise<boolean>;
-export declare function lowestCommonAncestor(...filepaths: string[]): string;

package/dist/utils/general.d.ts

@@ -1,2 +0,0 @@
-export declare function toArray<T>(val: T | T[] | null | undefined, defaultValue?: T): T[];
-export declare function debounce<T extends (...args: any[]) => any>(fn: T, wait: number): T;

package/dist/utils/logger.d.ts

@@ -1,7 +0,0 @@
-import { type ConsolaInstance } from "consola";
-import Debug from "debug";
-/**
-* Logger instance
-*/
-export declare const logger: ConsolaInstance;
-export declare const debug: Debug.Debugger;

package/dist/utils/package.d.ts

@@ -1,3 +0,0 @@
-import { type PackageJson } from "pkg-types";
-export declare function readPackageJson(dir: string): Promise<PackageJson | undefined>;
-export declare function getPackageType(pkg: PackageJson | undefined): "module" | "commonjs";

package/dist/utils/types.d.ts

@@ -1,10 +0,0 @@
-export type Overwrite<
-	T,
-	U
-> = Omit<T, keyof U> & U;
-export type MaybePromise<T> = T | Promise<T>;
-export type MarkPartial<
-	T,
-	K extends keyof T
-> = Omit<Required<T>, K> & Partial<Pick<T, K>>;
-export type Arrayable<T> = T | T[];