rolldown-plugin-dts 0.27.6 → 0.27.8

package/dist/index.d.mts

@@ -2,6 +2,11 @@ import { Plugin } from "rolldown";
 import { IsolatedDeclarationsOptions } from "rolldown/experimental";
 import { TsconfigJson } from "get-tsconfig";
 //#region src/options.d.ts
+interface Logger {
+  info: (...args: any[]) => void;
+  warn: (...args: any[]) => void;
+  error: (...args: any[]) => void;
+}
 interface GeneralOptions {
   /**
    * The generator used to produce `.d.ts` files.
@@ -107,6 +112,7 @@ interface GeneralOptions {
    * @default false
    */
   sideEffects?: boolean;
+  logger?: Logger;
 }
 interface TscOptions {
   /**
@@ -234,15 +240,15 @@ type OptionsResolved = Overwrite<Required<Omit<Options, "compilerOptions">>, {
   tsconfigRaw: TsconfigJson;
   tsgo: TsgoOptions;
 }>;
-declare function resolveOptions({ generator, entry, cwd, dtsInput, emitDtsOnly, tsconfig, tsconfigRaw: overriddenTsconfigRaw, compilerOptions, sourcemap, resolver, cjsDefault, sideEffects, build, incremental, vue, tsMacro, parallel, eager, newContext, emitJs, oxc, tsgo }: Options): OptionsResolved;
+declare function resolveOptions({ generator, entry, cwd, dtsInput, emitDtsOnly, tsconfig, tsconfigRaw: overriddenTsconfigRaw, compilerOptions, sourcemap, resolver, cjsDefault, sideEffects, logger, build, incremental, vue, tsMacro, parallel, eager, newContext, emitJs, oxc, tsgo }: Options): OptionsResolved;
 //#endregion
 //#region src/fake-js.d.ts
 declare function createFakeJsPlugin({ sourcemap, cjsDefault, sideEffects }: Pick<OptionsResolved, "sourcemap" | "cjsDefault" | "sideEffects">): Plugin;
 //#endregion
 //#region src/generate.d.ts
-declare function createGeneratePlugin({ generator, entry, tsconfig, tsconfigRaw, build, incremental, cwd, oxc, emitDtsOnly, vue, tsMacro, parallel, eager, tsgo, newContext, emitJs, sourcemap }: Pick<OptionsResolved, "generator" | "entry" | "cwd" | "tsconfig" | "tsconfigRaw" | "build" | "incremental" | "oxc" | "emitDtsOnly" | "vue" | "tsMacro" | "parallel" | "eager" | "tsgo" | "newContext" | "emitJs" | "sourcemap">): Plugin;
+declare function createGeneratePlugin({ generator, entry, tsconfig, tsconfigRaw, build, incremental, cwd, oxc, emitDtsOnly, vue, tsMacro, parallel, eager, tsgo, newContext, emitJs, sourcemap, logger }: Pick<OptionsResolved, "generator" | "entry" | "cwd" | "tsconfig" | "tsconfigRaw" | "build" | "incremental" | "oxc" | "emitDtsOnly" | "vue" | "tsMacro" | "parallel" | "eager" | "tsgo" | "newContext" | "emitJs" | "sourcemap" | "logger">): Plugin;
 //#endregion
 //#region src/index.d.ts
 declare function dts(options?: Options): Plugin[];
 //#endregion
-export { type Options, createFakeJsPlugin, createGeneratePlugin, dts, resolveOptions };
+export { type Logger, type Options, createFakeJsPlugin, createGeneratePlugin, dts, resolveOptions };

package/dist/index.mjs

@@ -14,6 +14,7 @@ import { access, mkdtemp, readFile, rm } from "node:fs/promises";
 import path from "node:path";
 import { ResolverFactory, isolatedDeclarationSync } from "rolldown/experimental";
 import { tmpdir } from "node:os";
+import { styleText } from "node:util";
 import process from "node:process";
 import { getTsconfig, readTsconfig } from "get-tsconfig";
 import { createResolver } from "dts-resolver";
@@ -784,20 +785,24 @@ const spawnAsync = (...args) => new Promise((resolve, reject) => {
 	child.on("close", () => resolve());
 	child.on("error", (error) => reject(error));
 });
-async function getTsgoPathFromNodeModules() {
+let tsgoPathCache;
+async function getTsgoPathFromNodeModules(logger) {
+	if (tsgoPathCache) return tsgoPathCache;
 	const pkgName = isTS7Installed() ? "typescript" : "@typescript/native-preview";
 	const tsgoPkg = import.meta.resolve(`${pkgName}/package.json`);
+	const { default: { version } } = await import(tsgoPkg, { with: { type: "json" } });
+	logger.info(`Emit types with ${styleText("underline", `${pkgName}@${version}`)}`);
 	const { default: getExePath } = await import(new URL("lib/getExePath.js", tsgoPkg).href);
-	return getExePath();
+	return tsgoPathCache = getExePath();
 }
-async function runTsgo(rootDir, tsconfig, sourcemap, tsgoPath) {
+async function runTsgo(logger, rootDir, tsconfig, sourcemap, tsgoPath) {
 	debug$4("[tsgo] rootDir", rootDir);
 	let tsgo;
 	if (tsgoPath) {
 		tsgo = tsgoPath;
 		debug$4("[tsgo] using custom path", tsgo);
 	} else {
-		tsgo = await getTsgoPathFromNodeModules();
+		tsgo = await getTsgoPathFromNodeModules(logger);
 		debug$4("[tsgo] using tsgo from node_modules", tsgo);
 	}
 	const tsgoDist = await mkdtemp(path.join(tmpdir(), "rolldown-plugin-dts-"));
@@ -835,7 +840,7 @@ async function runTsgo(rootDir, tsconfig, sourcemap, tsgoPath) {
 //#region src/generate.ts
 const debug$3 = createDebug("rolldown-plugin-dts:generate");
 const WORKER_URL = "./tsc-worker.mjs";
-function createGeneratePlugin({ generator, entry, tsconfig, tsconfigRaw, build, incremental, cwd, oxc, emitDtsOnly, vue, tsMacro, parallel, eager, tsgo, newContext, emitJs, sourcemap }) {
+function createGeneratePlugin({ generator, entry, tsconfig, tsconfigRaw, build, incremental, cwd, oxc, emitDtsOnly, vue, tsMacro, parallel, eager, tsgo, newContext, emitJs, sourcemap, logger }) {
 	const entryIncludes = entry?.filter((p) => p[0] !== "!");
 	const entryIgnores = entry?.filter((p) => p[0] === "!").map((p) => p.slice(1));
 	const entryMatcher = entry ? (file) => entryIncludes.some((p) => path.matchesGlob(file, p)) && !entryIgnores.some((p) => path.matchesGlob(file, p)) : void 0;
@@ -858,7 +863,7 @@ function createGeneratePlugin({ generator, entry, tsconfig, tsconfigRaw, build,
 	return {
 		name: "rolldown-plugin-dts:generate",
 		async buildStart(options) {
-			if (generator === "tsgo") tsgoContext = await runTsgo(rootDir, tsconfig, sourcemap, tsgo.path);
+			if (generator === "tsgo") tsgoContext = await runTsgo(logger, rootDir, tsconfig, sourcemap, tsgo.path);
 			else if (generator === "tsc") if (parallel) tscWorker = createTscWorker();
 			else {
 				tscModule = await import("./tsc.mjs");
@@ -1108,7 +1113,7 @@ function collectJsonExports(code) {
 //#region src/options.ts
 const debug$2 = createDebug("rolldown-plugin-dts:options");
 let warnedTsgo = false;
-function resolveOptions({ generator, entry, cwd = process.cwd(), dtsInput = false, emitDtsOnly = false, tsconfig, tsconfigRaw: overriddenTsconfigRaw = {}, compilerOptions = {}, sourcemap, resolver = "oxc", cjsDefault = false, sideEffects = false, build = false, incremental = false, vue = false, tsMacro = false, parallel = false, eager = false, newContext = false, emitJs, oxc, tsgo }) {
+function resolveOptions({ generator, entry, cwd = process.cwd(), dtsInput = false, emitDtsOnly = false, tsconfig, tsconfigRaw: overriddenTsconfigRaw = {}, compilerOptions = {}, sourcemap, resolver = "oxc", cjsDefault = false, sideEffects = false, logger = console, build = false, incremental = false, vue = false, tsMacro = false, parallel = false, eager = false, newContext = false, emitJs, oxc, tsgo }) {
 	let resolvedTsconfig;
 	if (tsconfig === true || tsconfig == null) {
 		const { config, path } = getTsconfig(cwd) || {};
@@ -1143,7 +1148,7 @@ function resolveOptions({ generator, entry, cwd = process.cwd(), dtsInput = fals
 	if (tsgo === true || !tsgo) tsgo = {};
 	emitJs ??= !!(compilerOptions.checkJs || compilerOptions.allowJs);
 	if (generator === "tsgo" && !warnedTsgo) {
-		console.warn("TypeScript 7.0 does not yet have a stable API and is experimental. Some options will be unavailable.");
+		logger.warn("TypeScript 7.0 does not yet have a stable API and is experimental. Some options will be unavailable.");
 		warnedTsgo = true;
 	}
 	const resolved = {
@@ -1167,7 +1172,8 @@ function resolveOptions({ generator, entry, cwd = process.cwd(), dtsInput = fals
 		newContext,
 		emitJs,
 		oxc,
-		tsgo
+		tsgo,
+		logger
 	};
 	debug$2("Resolved Options: %O", resolved);
 	return resolved;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "rolldown-plugin-dts",
   "type": "module",
-  "version": "0.27.6",
+  "version": "0.27.8",
   "description": "A Rolldown plugin to generate and bundle dts files.",
   "author": "Kevin Deng <sxzz@sxzz.moe>",
   "license": "MIT",
@@ -66,8 +66,8 @@
     "get-tsconfig": "5.0.0-beta.5",
     "obug": "^2.1.3",
     "yuku-ast": "^0.1.7",
-    "yuku-codegen": "^0.5.46",
-    "yuku-parser": "^0.5.46"
+    "yuku-codegen": "^0.6.1",
+    "yuku-parser": "^0.6.1"
   },
   "devDependencies": {
     "@jridgewell/source-map": "^0.3.11",
@@ -81,12 +81,12 @@
     "arktype": "^2.2.3",
     "bumpp": "^11.1.0",
     "diff": "^9.0.0",
-    "eslint": "^10.6.0",
+    "eslint": "^10.7.0",
     "prettier": "^3.9.5",
     "rolldown": "^1.1.5",
     "rolldown-plugin-require-cjs": "^0.4.1",
     "rollup-plugin-dts": "^6.4.1",
-    "tsdown": "^0.22.4",
+    "tsdown": "^0.22.5",
     "tsnapi": "^1.0.0",
     "typescript": "^6.0.3",
     "vitest": "^4.1.10",