rolldown-plugin-dts 0.27.7 → 0.27.9

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

@@ -1,3 +1,4 @@
+import { t as __require } from "./rolldown-runtime-CMgrfpPY.mjs";
 import { a as RE_JSON, c as RE_TS, d as filename_js_to_dts, f as filename_to_dts, i as RE_JS, l as RE_VUE, m as resolveTemplateFn, n as RE_DTS, o as RE_NODE_MODULES, p as replaceTemplateName, r as RE_DTS_MAP, s as RE_ROLLDOWN_RUNTIME, t as RE_CSS, u as filename_dts_to } from "./filename-BR9JpwkC.mjs";
 import { createContext, globalContext, invalidateContextFile } from "./tsc-context.mjs";
 import { createRequire } from "node:module";
@@ -14,6 +15,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";
@@ -764,40 +766,38 @@ function getIdentifierIndex(identifierMap, name) {
 }
 //#endregion
 //#region src/tsgo.ts
-const require = createRequire(import.meta.url);
+const require$1 = createRequire(import.meta.url);
 const debug$4 = createDebug("rolldown-plugin-dts:tsgo");
-function getTypeScriptMajor() {
+function isTS70Installed() {
 	try {
-		const { version } = require("typescript/package.json");
-		const major = +version.split(".", 1)[0];
-		return Number.isNaN(major) ? void 0 : major;
-	} catch {
-		return;
-	}
-}
-function isTS7Installed() {
-	const major = getTypeScriptMajor();
-	return major != null && major >= 7;
+		const { versionMajorMinor } = require$1("typescript");
+		return versionMajorMinor === "7.0";
+	} catch {}
+	return false;
 }
 const spawnAsync = (...args) => new Promise((resolve, reject) => {
 	const child = spawn(...args);
 	child.on("close", () => resolve());
 	child.on("error", (error) => reject(error));
 });
-async function getTsgoPathFromNodeModules() {
-	const pkgName = isTS7Installed() ? "typescript" : "@typescript/native-preview";
+let tsgoPathCache;
+async function getTsgoPathFromNodeModules(logger) {
+	if (tsgoPathCache) return tsgoPathCache;
+	const pkgName = isTS70Installed() ? "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-"));
@@ -807,7 +807,8 @@ async function runTsgo(rootDir, tsconfig, sourcemap, tsgoPath) {
 		"false",
 		"--declaration",
 		"--emitDeclarationOnly",
-		...tsconfig ? ["-p", tsconfig] : [],
+		"-p",
+		tsconfig,
 		"--outDir",
 		tsgoDist,
 		"--rootDir",
@@ -835,7 +836,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 +859,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 +1109,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) || {};
@@ -1130,11 +1131,27 @@ function resolveOptions({ generator, entry, cwd = process.cwd(), dtsInput = fals
 		...overriddenTsconfigRaw,
 		compilerOptions
 	};
-	if (!generator) if (vue || tsMacro) generator = "tsc";
-	else if (tsgo) generator = "tsgo";
+	if (vue || tsMacro) {
+		if (isTS70Installed()) throw new Error("TypeScript 7.0 does not yet have a stable API and is experimental. The `vue` and `tsMacro` options are not yet supported with TypeScript 7.0.");
+		if (generator && generator !== "tsc") logger.warn("The `vue` and `tsMacro` options are enabled, which requires the `tsc` generator. The `generator` option is ignored.");
+		generator = "tsc";
+	}
+	if (!generator) if (tsgo) generator = "tsgo";
 	else if (oxc || compilerOptions?.isolatedDeclarations) generator = "oxc";
-	else if (isTS7Installed()) generator = "tsgo";
+	else if (isTS70Installed()) generator = "tsgo";
 	else generator = "tsc";
+	if (generator === "tsc") try {
+		__require.resolve("typescript");
+	} catch {
+		throw new Error("TypeScript is not installed. You can install `typescript` package, or enable `isolatedDeclarations` in your `tsconfig.json` to use Oxc instead.");
+	}
+	else if (generator === "tsgo") {
+		if (!tsconfig) throw new Error("tsgo generator requires a tsconfig file to be specified.");
+		if (!warnedTsgo) {
+			warnedTsgo = true;
+			logger.warn("TypeScript 7.0 does not yet have a stable API and is experimental. Some options will be unavailable.");
+		}
+	}
 	if (oxc === true || !oxc) oxc = {};
 	if (oxc) {
 		oxc.stripInternal ??= !!compilerOptions?.stripInternal;
@@ -1142,10 +1159,6 @@ 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.");
-		warnedTsgo = true;
-	}
 	const resolved = {
 		generator,
 		entry: entry ? Array.isArray(entry) ? entry : [entry] : void 0,
@@ -1167,7 +1180,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/dist/rolldown-runtime-CMgrfpPY.mjs

@@ -0,0 +1,5 @@
+import { createRequire } from "node:module";
+//#region \0rolldown/runtime.js
+var __require = /* #__PURE__ */ (() => createRequire(import.meta.url))();
+//#endregion
+export { __require as t };

package/dist/{tsc-C-tN4xGx.mjs → tsc-BVghLPtc.mjs}

@@ -1,15 +1,12 @@
 import { createRequire as __cjs_createRequire } from "node:module";
 const __cjs_require = __cjs_createRequire(import.meta.url);
+import { t as __require } from "./rolldown-runtime-CMgrfpPY.mjs";
 import { n as RE_DTS, r as RE_DTS_MAP } from "./filename-BR9JpwkC.mjs";
 import { globalContext } from "./tsc-context.mjs";
-import { createRequire } from "node:module";
 import { createDebug } from "obug";
 import path from "node:path";
 const ts = __cjs_require("typescript");
 import { pathToFileURL } from "node:url";
-//#region \0rolldown/runtime.js
-var __require = /* #__PURE__ */ (() => createRequire(import.meta.url))();
-//#endregion
 //#region src/tsc/system.ts
 const debug$4 = createDebug("rolldown-plugin-dts:tsc-system");
 /**

package/dist/tsc-worker.mjs

@@ -1,4 +1,4 @@
-import { t as tscEmit } from "./tsc-C-tN4xGx.mjs";
+import { t as tscEmit } from "./tsc-BVghLPtc.mjs";
 import process from "node:process";
 //#region src/tsc/worker.ts
 process.on("message", (request) => {

package/dist/tsc.mjs

@@ -1,2 +1,2 @@
-import { t as tscEmit } from "./tsc-C-tN4xGx.mjs";
+import { t as tscEmit } from "./tsc-BVghLPtc.mjs";
 export { tscEmit };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "rolldown-plugin-dts",
   "type": "module",
-  "version": "0.27.7",
+  "version": "0.27.9",
   "description": "A Rolldown plugin to generate and bundle dts files.",
   "author": "Kevin Deng <sxzz@sxzz.moe>",
   "license": "MIT",
@@ -42,9 +42,9 @@
   },
   "peerDependencies": {
     "@ts-macro/tsc": "^0.3.6",
-    "@typescript/native-preview": ">=7.0.0-dev.20260325.1",
+    "@typescript/native-preview": "*",
     "rolldown": "^1.0.0",
-    "typescript": "^5.0.0 || ^6.0.0 || ^7.0.0",
+    "typescript": "^5.0.0 || ^6.0.0 || ~7.0.0",
     "vue-tsc": "~3.2.0 || ~3.3.0"
   },
   "peerDependenciesMeta": {