rolldown-plugin-dts 0.9.5 → 0.9.7

package/dist/index.js

@@ -310,13 +310,13 @@ function createFakeJsPlugin({ dtsInput, sourcemap }) {
 				const appendStmts = [];
 				const prepend = (stmt) => prependStmts.push(stmt);
 				for (const [i, stmt] of program.body.entries()) {
-					const setStmt = (node) => program.body[i] = inheritNode(stmt, node);
+					const setStmt = (node) => program.body[i] = node;
 					if (rewriteImportExport(stmt, setStmt)) continue;
 					const sideEffect = stmt.type === "TSModuleDeclaration" && stmt.kind !== "namespace";
 					const isDefaultExport = stmt.type === "ExportDefaultDeclaration";
 					const isDecl = isTypeOf(stmt, ["ExportNamedDeclaration", "ExportDefaultDeclaration"]) && stmt.declaration;
 					const decl = isDecl ? stmt.declaration : stmt;
-					const setDecl = isDecl ? (node) => stmt.declaration = inheritNode(stmt.declaration, node) : setStmt;
+					const setDecl = isDecl ? (node) => stmt.declaration = node : setStmt;
 					if (decl.type === "VariableDeclaration" && decl.declarations.length !== 1) throw new Error("Only one declaration is supported");
 					if (decl.type !== "TSDeclareFunction" && !isDeclarationType(decl)) continue;
 					if (isTypeOf(decl, [
@@ -340,6 +340,11 @@ function createFakeJsPlugin({ dtsInput, sourcemap }) {
 						...sideEffect ? [t.callExpression(t.identifier("sideEffect"), [])] : []
 					];
 					const runtime = t.arrayExpression(elements);
+					if (decl !== stmt) {
+						decl.innerComments = stmt.innerComments;
+						decl.leadingComments = stmt.leadingComments;
+						decl.trailingComments = stmt.trailingComments;
+					}
 					const symbolId = registerSymbol({
 						decl,
 						deps,
@@ -380,26 +385,6 @@ function createFakeJsPlugin({ dtsInput, sourcemap }) {
 			if (!RE_DTS.test(chunk.fileName)) return;
 			const file = parse(code, { sourceType: "module" });
 			const { program } = file;
-			if (program.body.length) {
-				const comments = new Set();
-				const commentsValue = new Set();
-				for (const id of chunk.moduleIds) {
-					const preserveComments = commentsMap.get(id);
-					if (preserveComments) {
-						preserveComments.forEach((c) => {
-							const id$1 = c.type + c.value;
-							if (commentsValue.has(id$1)) return;
-							commentsValue.add(id$1);
-							comments.add(c);
-						});
-						commentsMap.delete(id);
-					}
-				}
-				if (comments.size) {
-					program.body[0].leadingComments ||= [];
-					program.body[0].leadingComments.push(...comments);
-				}
-			}
 			program.body = patchTsNamespace(program.body);
 			program.body = program.body.map((node) => {
 				if (patchImportSource(node)) return node;
@@ -421,9 +406,27 @@ function createFakeJsPlugin({ dtsInput, sourcemap }) {
 					if (originalDep.replace) originalDep.replace(transformedDeps[i]);
 					else Object.assign(originalDep, transformedDeps[i]);
 				}
-				return inheritNode(node, original.decl);
+				return inheritNodeComments(node, original.decl);
 			}).filter((node) => !!node);
 			if (program.body.length === 0) return "export { };";
+			const comments = new Set();
+			const commentsValue = new Set();
+			for (const id of chunk.moduleIds) {
+				const preserveComments = commentsMap.get(id);
+				if (preserveComments) {
+					preserveComments.forEach((c) => {
+						const id$1 = c.type + c.value;
+						if (commentsValue.has(id$1)) return;
+						commentsValue.add(id$1);
+						comments.add(c);
+					});
+					commentsMap.delete(id);
+				}
+			}
+			if (comments.size) {
+				program.body[0].leadingComments ||= [];
+				program.body[0].leadingComments.unshift(...comments);
+			}
 			const result = generate(file, {
 				comments: true,
 				sourceMaps: sourcemap,
@@ -442,8 +445,8 @@ function createFakeJsPlugin({ dtsInput, sourcemap }) {
 	};
 }
 const REFERENCE_RE = /\/\s*<reference\s+(?:path|types)=/;
-function collectReferenceDirectives(comment) {
-	return comment.filter((c) => REFERENCE_RE.test(c.value));
+function collectReferenceDirectives(comment, negative = false) {
+	return comment.filter((c) => REFERENCE_RE.test(c.value) !== negative);
 }
 function collectDependencies(node, getIdentifierIndex, prepend) {
 	const deps = new Set();
@@ -587,7 +590,8 @@ function rewriteImportExport(node, set) {
 	return false;
 }
 function importNamespace(node, imported, source, getIdentifierIndex, prepend) {
-	let local = t.identifier(`_${getIdentifierIndex()}`);
+	const sourceText = source.value.replaceAll(/\W/g, "_");
+	let local = t.identifier(`${sourceText}${getIdentifierIndex()}`);
 	prepend(t.importDeclaration([t.importNamespaceSpecifier(local)], source));
 	if (imported) {
 		const importedLeft = getIdFromTSEntityName(imported);
@@ -607,27 +611,25 @@ function importNamespace(node, imported, source, getIdentifierIndex, prepend) {
 	};
 	return dep;
 }
-function inheritNode(oldValue, newValue) {
-	return {
-		...newValue,
-		leadingComments: oldValue.leadingComments,
-		innerComments: oldValue.innerComments,
-		trailingComments: oldValue.trailingComments
-	};
-}
 function overwriteNode(node, newNode) {
-	const preserve = [
-		"leadingComments",
-		"innerComments",
-		"trailingComments"
-	];
-	for (const key of Object.keys(node)) {
-		if (preserve.includes(key)) continue;
-		delete node[key];
-	}
-	Object.assign(node, newNode, { ...node });
+	for (const key of Object.keys(node)) delete node[key];
+	Object.assign(node, newNode);
 	return node;
 }
+function inheritNodeComments(oldNode, newNode) {
+	newNode.leadingComments ||= [];
+	newNode.trailingComments ||= [];
+	const leadingComments = filterHashtag(oldNode.leadingComments);
+	if (leadingComments) newNode.leadingComments.unshift(...leadingComments);
+	const trailingComments = filterHashtag(oldNode.trailingComments);
+	if (trailingComments) newNode.trailingComments.unshift(...trailingComments);
+	newNode.leadingComments = collectReferenceDirectives(newNode.leadingComments, true);
+	newNode.trailingComments = collectReferenceDirectives(newNode.trailingComments || [], true);
+	return newNode;
+	function filterHashtag(comments) {
+		return comments?.filter((comment) => comment.value.startsWith("#"));
+	}
+}
 
 //#endregion
 //#region src/utils/tsc.ts
@@ -891,7 +893,7 @@ function createDtsResolvePlugin({ tsconfig, resolve, resolvePaths }) {
 					...resolution,
 					meta
 				};
-				if (resolvePaths && (RE_NODE_MODULES.test(resolution?.id || id) || !isRelative(resolution?.id || id))) return resolveDependency(resolution?.id || id, importer);
+				if (resolvePaths && (RE_NODE_MODULES.test(resolution?.id || id) || !isRelative(resolution?.id || id))) return resolveDependency(id, importer);
 				if (!resolution || resolution.external) return resolution;
 				if (RE_JS.test(resolution.id)) {
 					resolution = await this.resolve(filename_js_to_dts(resolution.id), importer, options);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rolldown-plugin-dts",
-  "version": "0.9.5",
+  "version": "0.9.7",
   "description": "A Rolldown plugin to bundle dts files",
   "type": "module",
   "license": "MIT",