tsdown 0.4.2 → 0.4.4

package/dist/features/output.d.ts

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

package/dist/features/shims.d.ts

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

package/dist/index.d.ts

@@ -4,15 +4,13 @@ import { logger } from "./utils/logger.js";
 * Build with tsdown.
 */
 export declare function build(userOptions?: Omit<Options, "silent">): Promise<void>;
+export declare const pkgRoot: string;
 /**
 * Build a single configuration, without watch and shortcuts features.
 *
 * @param resolved Resolved options
 */
-export declare function buildSingle(resolved: ResolvedOptions): Promise<{
-	rebuild: () => Promise<void>;
-	close: () => Promise<void>;
-} | undefined>;
+export declare function buildSingle(resolved: ResolvedOptions): Promise<(() => Promise<void>) | undefined>;
 /**
 * Defines the configuration for tsdown.
 */

package/dist/index.js

@@ -1,12 +1,13 @@
 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 process, { default as process$1, default as process$2, default as process$3 } from "node:process";
-import { rolldown } from "rolldown";
+import { fileURLToPath } from "node:url";
+import { build as rolldownBuild } 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 path, { default as path$1, default as path$2 } from "node:path";
 import { glob, glob as glob$1 } from "tinyglobby";
 import { readPackageJSON } from "pkg-types";
 import readline from "node:readline";
@@ -14,15 +15,33 @@ import pc, { default as pc$1, default as pc$2 } from "picocolors";
 import { loadConfig } from "unconfig";
 
 //#region src/utils/fs.ts
-function fsExists(path$3) {
-	return access(path$3).then(() => true, () => false);
+function fsExists(path$6) {
+	return access(path$6).then(() => true, () => false);
+}
+function lowestCommonAncestor(...filepaths) {
+	if (filepaths.length === 0) return "";
+	if (filepaths.length === 1) return dirname$1(filepaths[0]);
+	filepaths = filepaths.map(normalize);
+	const [first, ...rest] = filepaths;
+	let ancestor = first.split(sep);
+	for (const filepath of rest) {
+		const directories = filepath.split(sep, ancestor.length);
+		let index = 0;
+		for (const directory of directories) if (directory === ancestor[index]) index += 1;
+else {
+			ancestor = ancestor.slice(0, index);
+			break;
+		}
+		ancestor = ancestor.slice(0, index);
+	}
+	return ancestor.length <= 1 && ancestor[0] === "" ? sep + ancestor[0] : ancestor.join(sep);
 }
 
 //#endregion
 //#region src/features/clean.ts
 async function cleanOutDir(cwd, patterns) {
 	const files = [];
-	if (await fsExists(cwd)) files.push(...(await readdir(cwd)).map((file) => path$2.resolve(cwd, file)));
+	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, {
 		cwd,
 		absolute: true
@@ -40,7 +59,7 @@ async function cleanOutDir(cwd, patterns) {
 //#endregion
 //#region src/utils/package.ts
 async function readPackageJson(dir) {
-	const packageJsonPath = path$1.join(dir, "package.json");
+	const packageJsonPath = path$4.join(dir, "package.json");
 	const exists = await fsExists(packageJsonPath);
 	if (!exists) return;
 	debug("Reading package.json:", packageJsonPath);
@@ -59,15 +78,24 @@ function getPackageType(pkg) {
 function resolveOutputExtension(pkg, format) {
 	const moduleType = getPackageType(pkg);
 	switch (format) {
-		case "es":
-		case "esm":
-		case "module": return moduleType === "module" ? "js" : "mjs";
-		case "cjs":
-		case "commonjs": return moduleType === "module" ? "cjs" : "js";
+		case "es": return moduleType === "module" ? "js" : "mjs";
+		case "cjs": return moduleType === "module" ? "cjs" : "js";
 		default: return "js";
 	}
 }
 
+//#endregion
+//#region src/features/shims.ts
+function getShimsInject(format, platform) {
+	if (format === "es" && platform === "node") {
+		const shimFile = path$3.resolve(pkgRoot, "esm-shims.js");
+		return {
+			__dirname: [shimFile, "__dirname"],
+			__filename: [shimFile, "__filename"]
+		};
+	}
+}
+
 //#endregion
 //#region src/features/shortcuts.ts
 function shortcuts(restart) {
@@ -168,9 +196,13 @@ async function resolveEntry(entry) {
 	if (typeof entry === "string") entry = [entry];
 	if (Array.isArray(entry)) {
 		const resolvedEntry = await glob(entry);
+		const base = lowestCommonAncestor(...resolvedEntry);
 		if (resolvedEntry.length > 0) {
-			entry = resolvedEntry;
-			logger.info(`entry: ${pc$1.blue(entry.join(", "))}`);
+			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);
@@ -192,16 +224,15 @@ 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, skipNodeModulesBundle = false } = subOptions;
+		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;
 		entry = await resolveEntry(entry);
-		format = toArray(format, "es");
 		if (clean === true) clean = [];
 		return {
 			...subOptions,
 			entry,
 			plugins,
-			format,
-			outDir: path.resolve(outDir),
+			format: normalizeFormat(format),
+			outDir: path$1.resolve(outDir),
 			clean,
 			silent,
 			treeshake,
@@ -210,10 +241,23 @@ async function resolveOptions(options) {
 			dts,
 			unused,
 			watch,
+			shims,
 			skipNodeModulesBundle
 		};
 	})), configFile];
 }
+function normalizeFormat(format) {
+	return toArray(format, "es").map((format$1) => {
+		switch (format$1) {
+			case "es":
+			case "esm":
+			case "module": return "es";
+			case "cjs":
+			case "commonjs": return "cjs";
+			default: return format$1;
+		}
+	});
+}
 async function loadConfigFile(options) {
 	let { config: filePath } = options;
 	if (filePath === false) return [[]];
@@ -221,11 +265,11 @@ async function loadConfigFile(options) {
 	let overrideConfig = false;
 	let stats;
 	if (typeof filePath === "string" && (stats = await stat(filePath).catch(() => null))) {
-		const resolved = path.resolve(filePath);
+		const resolved = path$1.resolve(filePath);
 		if (stats.isFile()) {
 			overrideConfig = true;
 			filePath = resolved;
-			cwd = path.dirname(filePath);
+			cwd = path$1.dirname(filePath);
 		} else cwd = resolved;
 	}
 	const { config, sources } = await loadConfig({
@@ -264,69 +308,71 @@ async function build(userOptions = {}) {
 	const [resolveds, configFile] = await resolveOptions(userOptions);
 	if (configFile) debug("Loaded config:", configFile);
 else debug("No config file found");
-	const contexts = await Promise.all(resolveds.map(buildSingle));
+	const rebuilds = await Promise.all(resolveds.map(buildSingle));
 	const cleanCbs = [];
 	for (const [i, resolved] of resolveds.entries()) {
-		const context = contexts[i];
-		if (!context) continue;
-		const watcher = await watchBuild(resolved, context.rebuild);
-		cleanCbs.push(async () => {
-			await watcher.close();
-			await contexts[i].close();
-		});
+		const rebuild = rebuilds[i];
+		if (!rebuild) continue;
+		const watcher = await watchBuild(resolved, rebuild);
+		cleanCbs.push(() => watcher.close());
 	}
 	if (cleanCbs.length) shortcuts(async () => {
 		for (const clean of cleanCbs) await clean();
 		build(userOptions);
 	});
 }
+const dirname = path.dirname(fileURLToPath(import.meta.url));
+const pkgRoot = path.resolve(dirname, "..");
 async function buildSingle(resolved) {
-	const { entry, external, plugins, outDir, format, clean, platform, alias, treeshake, sourcemap, dts, minify, watch, unused, target, onSuccess } = 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);
 	const pkg = await readPackageJson(process.cwd());
-	let startTime = performance.now();
-	const inputOptions = {
-		input: entry,
-		external,
-		resolve: { alias },
-		treeshake,
-		platform,
-		plugins: [
+	await rebuild(true);
+	if (watch) return () => rebuild();
+	async function rebuild(first) {
+		const startTime = performance.now();
+		const plugins = [
 			pkg && ExternalPlugin(pkg, resolved.skipNodeModulesBundle),
 			unused && Unused.rolldown(unused === true ? {} : unused),
 			dts && IsolatedDecl.rolldown(dts === true ? {} : dts),
-			target && transformPlugin({ target: typeof target === "string" ? target : target.join(",") }),
-			plugins
-		].filter((plugin) => !!plugin),
-		...resolved.inputOptions
-	};
-	const build$1 = await rolldown(inputOptions);
-	const outputOptions = await Promise.all(format.map(async (format$1) => {
-		const extension = resolveOutputExtension(pkg, format$1);
-		const outputOptions$1 = {
-			format: format$1,
-			name: resolved.globalName,
-			sourcemap,
-			dir: outDir,
-			minify,
-			entryFileNames: `[name].${extension}`,
-			chunkFileNames: `[name]-[hash].${extension}`
-		};
-		const userOutputOptions = typeof resolved.outputOptions === "function" ? await resolved.outputOptions(outputOptions$1, format$1) : resolved.outputOptions;
-		return {
-			...outputOptions$1,
-			...userOutputOptions
-		};
-	}));
-	await writeBundle(true);
-	if (watch) return {
-		rebuild: writeBundle,
-		close: () => build$1.close()
-	};
-else await build$1.close();
-	async function writeBundle(first) {
-		if (!first) startTime = performance.now();
-		await Promise.all(outputOptions.map((outputOptions$1) => build$1.write(outputOptions$1)));
+			target && transformPlugin({ target: target && (typeof target === "string" ? target : target.join(",")) }),
+			userPlugins
+		].filter((plugin) => !!plugin);
+		await Promise.all(format.map(async (format$1) => {
+			const inputOptions = {
+				input: entry,
+				external,
+				resolve: { alias },
+				treeshake,
+				platform,
+				define,
+				plugins,
+				...resolved.inputOptions,
+				inject: {
+					...shims && getShimsInject(format$1, platform),
+					...resolved.inputOptions?.inject
+				}
+			};
+			const extension = resolveOutputExtension(pkg, format$1);
+			let outputOptions = {
+				format: format$1,
+				name: resolved.globalName,
+				sourcemap,
+				dir: outDir,
+				minify,
+				entryFileNames: `[name].${extension}`,
+				chunkFileNames: `[name]-[hash].${extension}`
+			};
+			const userOutputOptions = typeof resolved.outputOptions === "function" ? await resolved.outputOptions(outputOptions, format$1) : resolved.outputOptions;
+			outputOptions = {
+				...outputOptions,
+				...userOutputOptions
+			};
+			await rolldownBuild({
+				...inputOptions,
+				output: outputOptions
+			});
+		}));
 		logger.success(`${first ? "Build" : "Rebuild"} complete in ${Math.round(performance.now() - startTime)}ms`);
 		await onSuccess?.();
 	}
@@ -336,4 +382,4 @@ function defineConfig(options) {
 }
 
 //#endregion
-export { build, buildSingle, defineConfig, logger };
+export { build, buildSingle, defineConfig, logger, pkgRoot };

package/dist/options.d.ts

@@ -1,6 +1,6 @@
 import type { External } from "./features/external.js";
 import type { Arrayable, MarkPartial, MaybePromise, Overwrite } from "./utils/types.js";
-import type { InputOptions, ModuleFormat, OutputOptions } from "rolldown";
+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";
@@ -24,8 +24,10 @@ export interface Options {
 	/** @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)
 	*/
@@ -48,8 +50,10 @@ export interface Options {
 */
 export type Config = Arrayable<Omit<Options, "config">>;
 export type ResolvedConfig = Extract<Config, any[]>;
-export type ResolvedOptions = Omit<Overwrite<MarkPartial<Options, "globalName" | "inputOptions" | "outputOptions" | "minify" | "target" | "alias" | "external" | "onSuccess">, {
-	format: ModuleFormat[];
+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/run.js

@@ -5,13 +5,13 @@ import pc from "picocolors";
 import { cac } from "cac";
 
 //#region package.json
-var version = "0.4.2";
+var version = "0.4.4";
 
 //#endregion
 //#region src/cli.ts
 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("--platform <platform>", "Target platform", { default: "node" }).option("-w, --watch [path]", "Watch mode").action(async (input, flags) => {
+	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");

package/dist/utils/fs.d.ts

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

package/esm-shims.js

@@ -0,0 +1,9 @@
+// Shim globals in esm bundle
+import path from 'node:path'
+import { fileURLToPath } from 'node:url'
+
+const getFilename = () => fileURLToPath(import.meta.url)
+const getDirname = () => path.dirname(getFilename())
+
+export const __dirname = /* @__PURE__ */ getDirname()
+export const __filename = /* @__PURE__ */ getFilename()

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tsdown",
-  "version": "0.4.2",
+  "version": "0.4.4",
   "description": "An even faster bundler powered by Rolldown.",
   "type": "module",
   "license": "MIT",
@@ -14,7 +14,8 @@
   },
   "author": "三咲智子 Kevin Deng <sxzz@sxzz.moe>",
   "files": [
-    "dist"
+    "dist",
+    "esm-shims.js"
   ],
   "main": "./dist/index.js",
   "module": "./dist/index.js",
@@ -45,7 +46,7 @@
     "debug": "^4.3.7",
     "picocolors": "^1.1.1",
     "pkg-types": "^1.2.1",
-    "rolldown": "0.15.0-snapshot-993c4a1-20241205003858",
+    "rolldown": "0.15.0-snapshot-64a831c-20241207003504",
     "tinyglobby": "^0.2.10",
     "unconfig": "^0.6.0",
     "unplugin-isolated-decl": "^0.9.3",
@@ -58,10 +59,10 @@
     "@types/node": "^22.10.1",
     "bumpp": "^9.8.1",
     "eslint": "^9.16.0",
-    "execa": "^9.5.1",
     "fdir": "^6.4.2",
     "oxc-transform": "^0.39.0",
     "prettier": "^3.4.2",
+    "tinyexec": "^0.3.1",
     "tsup": "^8.3.5",
     "tsx": "^4.19.2",
     "typescript": "~5.7.2",