rolldown-plugin-dts 0.16.3 → 0.16.4

package/dist/{index-Cbz-60ZO.d.ts → index-CxJisQQS.d.ts}

@@ -18,6 +18,7 @@ interface TscOptions {
   id: string;
   sourcemap: boolean;
   vue?: boolean;
+  tsMacro?: boolean;
   context?: TscContext;
 }
 interface TscResult {

package/dist/index.d.ts

@@ -110,6 +110,10 @@ interface TscOptions {
   */
   vue?: boolean;
   /**
+  * If `true`, the plugin will generate `.d.ts` files using `@ts-macro/tsc`.
+  */
+  tsMacro?: boolean;
+  /**
   * If `true`, the plugin will launch a separate process for `tsc` or `vue-tsc`.
   * This enables processing multiple projects in parallel.
   */
@@ -178,6 +182,7 @@ declare function resolveOptions({
   build,
   incremental,
   vue,
+  tsMacro,
   parallel,
   eager,
   newContext,
@@ -202,13 +207,14 @@ declare function createGeneratePlugin({
   oxc,
   emitDtsOnly,
   vue,
+  tsMacro,
   parallel,
   eager,
   tsgo,
   newContext,
   emitJs,
   sourcemap
-}: Pick<OptionsResolved, "cwd" | "tsconfig" | "tsconfigRaw" | "build" | "incremental" | "oxc" | "emitDtsOnly" | "vue" | "parallel" | "eager" | "tsgo" | "newContext" | "emitJs" | "sourcemap">): Plugin;
+}: Pick<OptionsResolved, "cwd" | "tsconfig" | "tsconfigRaw" | "build" | "incremental" | "oxc" | "emitDtsOnly" | "vue" | "tsMacro" | "parallel" | "eager" | "tsgo" | "newContext" | "emitJs" | "sourcemap">): Plugin;
 //#endregion
 //#region src/index.d.ts
 declare function dts(options?: Options): Plugin[];

package/dist/index.js

@@ -325,11 +325,7 @@ function createFakeJsPlugin({ sourcemap, cjsDefault }) {
 				...sideEffect ? [t.callExpression(t.identifier("sideEffect"), [bindings[0]])] : []
 			];
 			const runtime = t.arrayExpression(elements);
-			if (decl !== stmt) {
-				decl.innerComments = stmt.innerComments;
-				decl.leadingComments = stmt.leadingComments;
-				decl.trailingComments = stmt.trailingComments;
-			}
+			if (decl !== stmt) decl.leadingComments = stmt.leadingComments;
 			const symbolId = registerSymbol({
 				decl,
 				deps,
@@ -662,7 +658,6 @@ function inheritNodeComments(oldNode, newNode) {
 	const leadingComments = oldNode.leadingComments?.filter((comment) => comment.value.startsWith("#"));
 	if (leadingComments) newNode.leadingComments.unshift(...leadingComments);
 	newNode.leadingComments = collectReferenceDirectives(newNode.leadingComments, true);
-	newNode.trailingComments = newNode.trailingComments?.filter((comment) => !comment.value.startsWith("# sourceMappingURL"));
 	return newNode;
 }
 
@@ -675,7 +670,7 @@ const spawnAsync = (...args) => new Promise((resolve, reject) => {
 	child.on("close", () => resolve());
 	child.on("error", (error) => reject(error));
 });
-function createGeneratePlugin({ tsconfig, tsconfigRaw, build, incremental, cwd, oxc, emitDtsOnly, vue, parallel, eager, tsgo, newContext, emitJs, sourcemap }) {
+function createGeneratePlugin({ tsconfig, tsconfigRaw, build, incremental, cwd, oxc, emitDtsOnly, vue, tsMacro, parallel, eager, tsgo, newContext, emitJs, sourcemap }) {
 	const dtsMap = /* @__PURE__ */ new Map();
 	/**
 	* A map of input id to output file name
@@ -812,6 +807,7 @@ function createGeneratePlugin({ tsconfig, tsconfigRaw, build, incremental, cwd,
 						id,
 						sourcemap,
 						vue,
+						tsMacro,
 						context: tscContext
 					};
 					let result;
@@ -869,7 +865,7 @@ async function runTsgo(root, tsconfig) {
 //#endregion
 //#region src/options.ts
 let warnedTsgo = false;
-function resolveOptions({ cwd = process.cwd(), dtsInput = false, emitDtsOnly = false, tsconfig, tsconfigRaw: overriddenTsconfigRaw = {}, compilerOptions = {}, sourcemap, resolve = false, cjsDefault = false, build = false, incremental = false, vue = false, parallel = false, eager = false, newContext = false, emitJs, oxc, tsgo = false }) {
+function resolveOptions({ cwd = process.cwd(), dtsInput = false, emitDtsOnly = false, tsconfig, tsconfigRaw: overriddenTsconfigRaw = {}, compilerOptions = {}, sourcemap, resolve = false, cjsDefault = false, build = false, incremental = false, vue = false, tsMacro = false, parallel = false, eager = false, newContext = false, emitJs, oxc, tsgo = false }) {
 	let resolvedTsconfig;
 	if (tsconfig === true || tsconfig == null) {
 		const { config, path: path$1 } = getTsconfig(cwd) || {};
@@ -891,7 +887,7 @@ function resolveOptions({ cwd = process.cwd(), dtsInput = false, emitDtsOnly = f
 		...overriddenTsconfigRaw,
 		compilerOptions
 	};
-	oxc ??= !!(compilerOptions?.isolatedDeclarations && !vue && !tsgo);
+	oxc ??= !!(compilerOptions?.isolatedDeclarations && !vue && !tsgo && !tsMacro);
 	if (oxc === true) oxc = {};
 	if (oxc) {
 		oxc.stripInternal ??= !!compilerOptions?.stripInternal;
@@ -900,9 +896,11 @@ function resolveOptions({ cwd = process.cwd(), dtsInput = false, emitDtsOnly = f
 	emitJs ??= !!(compilerOptions.checkJs || compilerOptions.allowJs);
 	if (tsgo) {
 		if (vue) throw new Error("[rolldown-plugin-dts] The `tsgo` option is not compatible with the `vue` option. Please disable one of them.");
+		if (tsMacro) throw new Error("[rolldown-plugin-dts] The `tsgo` option is not compatible with the `tsMacro` option. Please disable one of them.");
 		if (oxc) throw new Error("[rolldown-plugin-dts] The `tsgo` option is not compatible with the `oxc` option. Please disable one of them.");
 	}
 	if (oxc && vue) throw new Error("[rolldown-plugin-dts] The `oxc` option is not compatible with the `vue` option. Please disable one of them.");
+	if (oxc && tsMacro) throw new Error("[rolldown-plugin-dts] The `oxc` option is not compatible with the `tsMacro` option. Please disable one of them.");
 	if (tsgo && !warnedTsgo) {
 		console.warn("The `tsgo` option is experimental and may change in the future.");
 		warnedTsgo = true;
@@ -919,6 +917,7 @@ function resolveOptions({ cwd = process.cwd(), dtsInput = false, emitDtsOnly = f
 		build,
 		incremental,
 		vue,
+		tsMacro,
 		parallel,
 		eager,
 		newContext,

package/dist/{tsc-q7n7-QbP.js → tsc-DLbQk3B6.js}

@@ -6,7 +6,7 @@ import ts from "typescript";
 import { pathToFileURL } from "node:url";
 
 //#region src/tsc/system.ts
-const debug$4 = Debug("rolldown-plugin-dts:tsc-system");
+const debug$3 = Debug("rolldown-plugin-dts:tsc-system");
 /**
 * A system that writes files to both memory and disk. It will try read files
 * from memory firstly and fallback to disk if not found.
@@ -15,7 +15,7 @@ function createFsSystem(files) {
 	return {
 		...ts.sys,
 		write(message) {
-			debug$4(message);
+			debug$3(message);
 		},
 		resolvePath(path$1) {
 			if (files.has(path$1)) return path$1;
@@ -80,20 +80,20 @@ function setSourceMapRoot(map, originalFilePath, finalFilePath) {
 
 //#endregion
 //#region src/tsc/emit-build.ts
-const debug$3 = Debug("rolldown-plugin-dts:tsc-build");
+const debug$2 = Debug("rolldown-plugin-dts:tsc-build");
 function tscEmitBuild(tscOptions) {
 	const { id, tsconfig, incremental, context = globalContext, sourcemap } = tscOptions;
-	debug$3(`running tscEmitBuild id: ${id}, tsconfig: ${tsconfig}, incremental: ${incremental}`);
+	debug$2(`running tscEmitBuild id: ${id}, tsconfig: ${tsconfig}, incremental: ${incremental}`);
 	if (!tsconfig) return { error: "[rolldown-plugin-dts] build mode requires a tsconfig path" };
 	const fsSystem = (incremental ? createFsSystem : createMemorySystem)(context.files);
 	const resolvedId = fsSystem.resolvePath(id);
-	if (resolvedId !== id) debug$3(`resolved id from ${id} to ${resolvedId}`);
+	if (resolvedId !== id) debug$2(`resolved id from ${id} to ${resolvedId}`);
 	const project = getOrBuildProjects(context, fsSystem, tsconfig, !incremental, sourcemap).get(resolvedId);
 	if (!project) {
-		debug$3(`unable to locate a project containing ${resolvedId}`);
+		debug$2(`unable to locate a project containing ${resolvedId}`);
 		return { error: `Unable to locate ${id} from the given tsconfig file ${tsconfig}` };
 	}
-	debug$3(`loaded project ${project.tsconfigPath} for ${id}`);
+	debug$2(`loaded project ${project.tsconfigPath} for ${id}`);
 	const ignoreCase = !fsSystem.useCaseSensitiveFileNames;
 	const outputFiles = ts.getOutputFileNames(project.parsedConfig, resolvedId, ignoreCase);
 	let code;
@@ -123,20 +123,20 @@ function tscEmitBuild(tscOptions) {
 		map
 	};
 	if (incremental) {
-		debug$3(`incremental build failed`);
+		debug$2(`incremental build failed`);
 		return tscEmitBuild({
 			...tscOptions,
 			incremental: false
 		});
 	}
-	debug$3(`unable to build .d.ts file for ${id}`);
+	debug$2(`unable to build .d.ts file for ${id}`);
 	if (project.parsedConfig.options.declaration !== true) return { error: `Unable to build .d.ts file for ${id}; Make sure the "declaration" option is set to true in ${project.tsconfigPath}` };
 	return { error: `Unable to build .d.ts file for ${id}; This seems like a bug of rolldown-plugin-dts. Please report this issue to https://github.com/sxzz/rolldown-plugin-dts/issues` };
 }
 function getOrBuildProjects(context, fsSystem, tsconfig, force, sourcemap) {
 	let projectMap = context.projects.get(tsconfig);
 	if (projectMap) {
-		debug$3(`skip building projects for ${tsconfig}`);
+		debug$2(`skip building projects for ${tsconfig}`);
 		return projectMap;
 	}
 	projectMap = buildProjects(fsSystem, tsconfig, force, sourcemap);
@@ -147,18 +147,18 @@ function getOrBuildProjects(context, fsSystem, tsconfig, force, sourcemap) {
 * Use TypeScript compiler to build all projects referenced
 */
 function buildProjects(fsSystem, tsconfig, force, sourcemap) {
-	debug$3(`start building projects for ${tsconfig}`);
+	debug$2(`start building projects for ${tsconfig}`);
 	const projects = collectProjectGraph(tsconfig, fsSystem, force, sourcemap);
-	debug$3("collected %d projects: %j", projects.length, projects.map((project) => project.tsconfigPath));
+	debug$2("collected %d projects: %j", projects.length, projects.map((project) => project.tsconfigPath));
 	const host = ts.createSolutionBuilderHost(fsSystem, createProgramWithPatchedCompilerOptions);
 	const exitStatus = ts.createSolutionBuilder(host, [tsconfig], {
 		force,
 		verbose: true
 	}).build(void 0, void 0, void 0, (project) => {
-		debug$3(`transforming project ${project}`);
+		debug$2(`transforming project ${project}`);
 		return customTransformers;
 	});
-	debug$3(`built solution for ${tsconfig} with exit status ${exitStatus}`);
+	debug$2(`built solution for ${tsconfig} with exit status ${exitStatus}`);
 	const sourceFileToProjectMap = /* @__PURE__ */ new Map();
 	for (const project of projects) for (const fileName of project.parsedConfig.fileNames) sourceFileToProjectMap.set(fsSystem.resolvePath(fileName), project);
 	return sourceFileToProjectMap;
@@ -234,36 +234,64 @@ const createProgramWithPatchedCompilerOptions = (rootNames, options, ...args) =>
 };
 
 //#endregion
-//#region src/tsc/vue.ts
-const debug$2 = Debug("rolldown-plugin-dts:vue");
-let createVueProgram;
+//#region src/tsc/volar.ts
 const require = createRequire(import.meta.url);
 function loadVueLanguageTools() {
+	const debug$4 = Debug("rolldown-plugin-dts:vue");
+	debug$4("loading vue language tools");
 	try {
 		const vueTscPath = require.resolve("vue-tsc");
 		const { proxyCreateProgram } = require(require.resolve("@volar/typescript", { paths: [vueTscPath] }));
 		const vue = require(require.resolve("@vue/language-core", { paths: [vueTscPath] }));
+		const getLanguagePlugin = (ts$1, options) => {
+			const $rootDir = options.options.$rootDir;
+			const $configRaw = options.options.$configRaw;
+			const resolver = new vue.CompilerOptionsResolver(ts$1.sys.fileExists);
+			resolver.addConfig($configRaw?.vueCompilerOptions ?? {}, $rootDir);
+			const vueOptions = resolver.build();
+			vue.writeGlobalTypes(vueOptions, ts$1.sys.writeFile);
+			return vue.createVueLanguagePlugin(ts$1, options.options, vueOptions, (id) => id);
+		};
 		return {
 			proxyCreateProgram,
-			vue
+			getLanguagePlugin
 		};
 	} catch (error) {
-		debug$2("vue language tools not found", error);
+		debug$4("vue language tools not found", error);
 		throw new Error("Failed to load vue language tools. Please manually install vue-tsc.");
 	}
 }
-function createVueProgramFactory(ts$1) {
-	if (createVueProgram) return createVueProgram;
-	debug$2("loading vue language tools");
-	const { proxyCreateProgram, vue } = loadVueLanguageTools();
-	return createVueProgram = proxyCreateProgram(ts$1, ts$1.createProgram, (ts$2, options) => {
-		const $rootDir = options.options.$rootDir;
-		const $configRaw = options.options.$configRaw;
-		const resolver = new vue.CompilerOptionsResolver(ts$2.sys.fileExists);
-		resolver.addConfig($configRaw?.vueCompilerOptions ?? {}, $rootDir);
-		const vueOptions = resolver.build();
-		vue.writeGlobalTypes(vueOptions, ts$2.sys.writeFile);
-		return { languagePlugins: [vue.createVueLanguagePlugin(ts$2, options.options, vueOptions, (id) => id)] };
+function loadTsMacro() {
+	const debug$4 = Debug("rolldown-plugin-dts:ts-macro");
+	debug$4("loading ts-macro language tools");
+	try {
+		const tsMacroPath = require.resolve("@ts-macro/tsc");
+		const { proxyCreateProgram } = require(require.resolve("@volar/typescript", { paths: [tsMacroPath] }));
+		const tsMacro = require(require.resolve("@ts-macro/language-plugin", { paths: [tsMacroPath] }));
+		const { getOptions } = require(require.resolve("@ts-macro/language-plugin/options", { paths: [tsMacroPath] }));
+		const getLanguagePlugin = (ts$1, options) => {
+			const $rootDir = options.options.$rootDir;
+			return tsMacro.getLanguagePlugins(ts$1, options.options, getOptions(ts$1, $rootDir))[0];
+		};
+		return {
+			proxyCreateProgram,
+			getLanguagePlugin
+		};
+	} catch (error) {
+		debug$4("ts-macro language tools not found", error);
+		throw new Error("Failed to load ts-macro language tools. Please manually install @ts-macro/tsc.");
+	}
+}
+function createProgramFactory(ts$1, options) {
+	const vueLanguageTools = options.vue ? loadVueLanguageTools() : void 0;
+	const tsMacroLanguageTools = options.tsMacro ? loadTsMacro() : void 0;
+	const proxyCreateProgram = vueLanguageTools?.proxyCreateProgram || tsMacroLanguageTools?.proxyCreateProgram;
+	if (!proxyCreateProgram) return ts$1.createProgram;
+	return proxyCreateProgram(ts$1, ts$1.createProgram, (ts$2, options$1) => {
+		const languagePlugins = [];
+		if (vueLanguageTools) languagePlugins.push(vueLanguageTools.getLanguagePlugin(ts$2, options$1));
+		if (tsMacroLanguageTools) languagePlugins.push(tsMacroLanguageTools.getLanguagePlugin(ts$2, options$1));
+		return { languagePlugins };
 	});
 }
 
@@ -302,7 +330,7 @@ function createOrGetTsModule(options) {
 	context.programs.push(module.program);
 	return module;
 }
-function createTsProgram({ entries, id, tsconfig, tsconfigRaw, vue, cwd, context = globalContext }) {
+function createTsProgram({ entries, id, tsconfig, tsconfigRaw, vue, tsMacro, cwd, context = globalContext }) {
 	const fsSystem = createFsSystem(context.files);
 	const baseDir = tsconfig ? path.dirname(tsconfig) : cwd;
 	const parsedConfig = ts.parseJsonConfigFileContent(tsconfigRaw, fsSystem, baseDir);
@@ -313,10 +341,11 @@ function createTsProgram({ entries, id, tsconfig, tsconfigRaw, vue, cwd, context
 		baseDir,
 		id,
 		entries,
-		vue
+		vue,
+		tsMacro
 	});
 }
-function createTsProgramFromParsedConfig({ parsedConfig, fsSystem, baseDir, id, entries, vue }) {
+function createTsProgramFromParsedConfig({ parsedConfig, fsSystem, baseDir, id, entries, vue, tsMacro }) {
 	const compilerOptions = {
 		...defaultCompilerOptions,
 		...parsedConfig.options,
@@ -325,7 +354,10 @@ function createTsProgramFromParsedConfig({ parsedConfig, fsSystem, baseDir, id,
 	};
 	const rootNames = [...new Set([id, ...entries || parsedConfig.fileNames].map((f) => fsSystem.resolvePath(f)))];
 	const host = ts.createCompilerHost(compilerOptions, true);
-	const program = (vue ? createVueProgramFactory(ts) : ts.createProgram)({
+	const program = createProgramFactory(ts, {
+		vue,
+		tsMacro
+	})({
 		rootNames,
 		options: compilerOptions,
 		host,

package/dist/tsc-worker.d.ts

@@ -1,5 +1,5 @@
 import "./context-DXNtAHtR.js";
-import { tscEmit } from "./index-Cbz-60ZO.js";
+import { tscEmit } from "./index-CxJisQQS.js";
 
 //#region src/tsc/worker.d.ts
 declare const functions: {

package/dist/tsc-worker.js

@@ -1,5 +1,5 @@
 import "./context-Digr9tkU.js";
-import { tscEmit } from "./tsc-q7n7-QbP.js";
+import { tscEmit } from "./tsc-DLbQk3B6.js";
 import process from "node:process";
 import { createBirpc } from "birpc";
 

package/dist/tsc.d.ts

@@ -1,3 +1,3 @@
 import "./context-DXNtAHtR.js";
-import { TscModule, TscOptions, TscResult, tscEmit } from "./index-Cbz-60ZO.js";
+import { TscModule, TscOptions, TscResult, tscEmit } from "./index-CxJisQQS.js";
 export { TscModule, TscOptions, TscResult, tscEmit };

package/dist/tsc.js

@@ -1,4 +1,4 @@
 import "./context-Digr9tkU.js";
-import { tscEmit } from "./tsc-q7n7-QbP.js";
+import { tscEmit } from "./tsc-DLbQk3B6.js";
 
 export { tscEmit };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rolldown-plugin-dts",
-  "version": "0.16.3",
+  "version": "0.16.4",
   "description": "A Rolldown plugin to generate and bundle dts files.",
   "type": "module",
   "keywords": [
@@ -40,12 +40,16 @@
     "access": "public"
   },
   "peerDependencies": {
+    "@ts-macro/tsc": "^0.3.6",
     "@typescript/native-preview": ">=7.0.0-dev.20250601.1",
     "rolldown": "^1.0.0-beta.9",
     "typescript": "^5.0.0",
     "vue-tsc": "~3.0.3"
   },
   "peerDependenciesMeta": {
+    "@ts-macro/tsc": {
+      "optional": true
+    },
     "@typescript/native-preview": {
       "optional": true
     },