🤖 Pick PR #61261 (Fixed accidentally reused comments ...) into release-5.8 (#61290)

typescript-bot · Andarist · MichaelMitchell-at · web-flow · commit 88a002a1eade · 2025-03-19T14:54:01.000-07:00
Co-authored-by: Mateusz Burzyński &lt;mateuszburzynski@gmail.com&gt;
Co-authored-by: michaelm &lt;michael.mitchell@airtable.com&gt;
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
@@ -6209,6 +6209,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
                 const context = syntacticContext as NodeBuilderContext;
                 if (context.bundled || context.enclosingFile !== getSourceFileOfNode(lit)) {
                     let name = lit.text;
+                    const originalName = name;
                     const nodeSymbol = getNodeLinks(parent).resolvedSymbol;
                     const meaning = parent.isTypeOf ? SymbolFlags.Value : SymbolFlags.Type;
                     const parentSymbol = nodeSymbol
@@ -6229,7 +6230,9 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
                             context.tracker.reportLikelyUnsafeImportRequiredError(name);
                         }
                     }
-                    return name;
+                    if (name !== originalName) {
+                        return name;
+                    }
                 }
             },
             canReuseTypeNode(context, typeNode) {
@@ -8834,10 +8837,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
                     return setTextRange(context, setEmitFlags(name, EmitFlags.NoAsciiEscaping), node);
                 }
                 const updated = visitEachChildWorker(node, c => attachSymbolToLeftmostIdentifier(c), /*context*/ undefined);
-                if (updated !== node) {
-                    setTextRange(context, updated, node);
-                }
-                return updated;
+                return setTextRange(context, updated, node);
             }
         }
 
diff --git a/src/compiler/expressionToTypeNode.ts b/src/compiler/expressionToTypeNode.ts
@@ -435,9 +435,11 @@ export function createSyntacticTypeNodeBuilder(
                 if (!resolver.canReuseTypeNode(context, node)) {
                     return resolver.serializeExistingTypeNode(context, node);
                 }
+                const specifier = rewriteModuleSpecifier(node, node.argument.literal);
+                const literal = specifier === node.argument.literal ? reuseNode(context, node.argument.literal) : specifier;
                 return factory.updateImportTypeNode(
                     node,
-                    factory.updateLiteralTypeNode(node.argument, rewriteModuleSpecifier(node, node.argument.literal)),
+                    literal === node.argument.literal ? reuseNode(context, node.argument) : factory.createLiteralTypeNode(literal),
                     visitNode(node.attributes, visitExistingNodeTreeSymbols, isImportAttributes),
                     visitNode(node.qualifier, visitExistingNodeTreeSymbols, isEntityName),
                     visitNodes(node.typeArguments, visitExistingNodeTreeSymbols, isTypeNode),
@@ -612,10 +614,7 @@ export function createSyntacticTypeNodeBuilder(
 
             function rewriteModuleSpecifier(parent: ImportTypeNode, lit: StringLiteral) {
                 const newName = resolver.getModuleSpecifierOverride(context, parent, lit);
-                if (newName) {
-                    return setOriginalNode(factory.createStringLiteral(newName), lit);
-                }
-                return visitNode(lit, visitExistingNodeTreeSymbols, isStringLiteral)!;
+                return newName ? setOriginalNode(factory.createStringLiteral(newName), lit) : lit;
             }
         }
     }
diff --git a/tests/baselines/reference/declarationEmitNoInvalidCommentReuse1.js b/tests/baselines/reference/declarationEmitNoInvalidCommentReuse1.js
@@ -0,0 +1,29 @@
+//// [tests/cases/compiler/declarationEmitNoInvalidCommentReuse1.ts] ////
+
+//// [a.ts]
+import { object } from "./obj";
+
+export const _ = object;
+
+///////////
+/**
+ * huh
+ */
+//// [obj.d.ts]
+export declare const object: import("./id").Id<{
+    foo: import("./id" ).Id<{}>;
+}>;
+
+//// [id.d.ts]
+export type Id<T> = T;
+
+
+
+
+//// [a.d.ts]
+export declare const _: {
+    foo: import("./id").Id<{}>;
+};
+/**
+ * huh
+ */ 
diff --git a/tests/baselines/reference/declarationEmitNoInvalidCommentReuse1.symbols b/tests/baselines/reference/declarationEmitNoInvalidCommentReuse1.symbols
@@ -0,0 +1,31 @@
+//// [tests/cases/compiler/declarationEmitNoInvalidCommentReuse1.ts] ////
+
+=== a.ts ===
+import { object } from "./obj";
+>object : Symbol(object, Decl(a.ts, 0, 8))
+
+export const _ = object;
+>_ : Symbol(_, Decl(a.ts, 2, 12))
+>object : Symbol(object, Decl(a.ts, 0, 8))
+
+///////////
+/**
+ * huh
+ */
+=== obj.d.ts ===
+export declare const object: import("./id").Id<{
+>object : Symbol(object, Decl(obj.d.ts, 0, 20))
+>Id : Symbol(Id, Decl(id.d.ts, 0, 0))
+
+    foo: import("./id" ).Id<{}>;
+>foo : Symbol(foo, Decl(obj.d.ts, 0, 48))
+>Id : Symbol(Id, Decl(id.d.ts, 0, 0))
+
+}>;
+
+=== id.d.ts ===
+export type Id<T> = T;
+>Id : Symbol(Id, Decl(id.d.ts, 0, 0))
+>T : Symbol(T, Decl(id.d.ts, 0, 15))
+>T : Symbol(T, Decl(id.d.ts, 0, 15))
+
diff --git a/tests/baselines/reference/declarationEmitNoInvalidCommentReuse1.types b/tests/baselines/reference/declarationEmitNoInvalidCommentReuse1.types
@@ -0,0 +1,33 @@
+//// [tests/cases/compiler/declarationEmitNoInvalidCommentReuse1.ts] ////
+
+=== a.ts ===
+import { object } from "./obj";
+>object : { foo: import("id").Id<{}>; }
+>       : ^^^^^^^                         ^^^
+
+export const _ = object;
+>_ : { foo: import("id").Id<{}>; }
+>  : ^^^^^^^                         ^^^
+>object : { foo: import("id").Id<{}>; }
+>       : ^^^^^^^                         ^^^
+
+///////////
+/**
+ * huh
+ */
+=== obj.d.ts ===
+export declare const object: import("./id").Id<{
+>object : { foo: import("./id").Id<{}>; }
+>       : ^^^^^^^                     ^^^
+
+    foo: import("./id" ).Id<{}>;
+>foo : {}
+>    : ^^
+
+}>;
+
+=== id.d.ts ===
+export type Id<T> = T;
+>Id : T
+>   : ^
+
diff --git a/tests/baselines/reference/declarationEmitNoInvalidCommentReuse2.js b/tests/baselines/reference/declarationEmitNoInvalidCommentReuse2.js
@@ -0,0 +1,29 @@
+//// [tests/cases/compiler/declarationEmitNoInvalidCommentReuse2.ts] ////
+
+//// [a.ts]
+import { object } from "./obj.ts";
+
+export const _ = object;
+
+///////////
+/**
+ * huh
+ */
+//// [obj.d.ts]
+export declare const object: import("./id.ts").Id<{
+    foo: import("./id.ts" ).Id<{}>;
+}>;
+
+//// [id.d.ts]
+export type Id<T> = T;
+
+
+
+
+//// [a.d.ts]
+export declare const _: {
+    foo: import("./id").Id<{}>;
+};
+/**
+ * huh
+ */ 
diff --git a/tests/baselines/reference/declarationEmitNoInvalidCommentReuse2.symbols b/tests/baselines/reference/declarationEmitNoInvalidCommentReuse2.symbols
@@ -0,0 +1,31 @@
+//// [tests/cases/compiler/declarationEmitNoInvalidCommentReuse2.ts] ////
+
+=== a.ts ===
+import { object } from "./obj.ts";
+>object : Symbol(object, Decl(a.ts, 0, 8))
+
+export const _ = object;
+>_ : Symbol(_, Decl(a.ts, 2, 12))
+>object : Symbol(object, Decl(a.ts, 0, 8))
+
+///////////
+/**
+ * huh
+ */
+=== obj.d.ts ===
+export declare const object: import("./id.ts").Id<{
+>object : Symbol(object, Decl(obj.d.ts, 0, 20))
+>Id : Symbol(Id, Decl(id.d.ts, 0, 0))
+
+    foo: import("./id.ts" ).Id<{}>;
+>foo : Symbol(foo, Decl(obj.d.ts, 0, 51))
+>Id : Symbol(Id, Decl(id.d.ts, 0, 0))
+
+}>;
+
+=== id.d.ts ===
+export type Id<T> = T;
+>Id : Symbol(Id, Decl(id.d.ts, 0, 0))
+>T : Symbol(T, Decl(id.d.ts, 0, 15))
+>T : Symbol(T, Decl(id.d.ts, 0, 15))
+
diff --git a/tests/baselines/reference/declarationEmitNoInvalidCommentReuse2.types b/tests/baselines/reference/declarationEmitNoInvalidCommentReuse2.types
@@ -0,0 +1,33 @@
+//// [tests/cases/compiler/declarationEmitNoInvalidCommentReuse2.ts] ////
+
+=== a.ts ===
+import { object } from "./obj.ts";
+>object : { foo: import("id").Id<{}>; }
+>       : ^^^^^^^                         ^^^
+
+export const _ = object;
+>_ : { foo: import("id").Id<{}>; }
+>  : ^^^^^^^                         ^^^
+>object : { foo: import("id").Id<{}>; }
+>       : ^^^^^^^                         ^^^
+
+///////////
+/**
+ * huh
+ */
+=== obj.d.ts ===
+export declare const object: import("./id.ts").Id<{
+>object : { foo: import("./id.ts").Id<{}>; }
+>       : ^^^^^^^                        ^^^
+
+    foo: import("./id.ts" ).Id<{}>;
+>foo : {}
+>    : ^^
+
+}>;
+
+=== id.d.ts ===
+export type Id<T> = T;
+>Id : T
+>   : ^
+
diff --git a/tests/baselines/reference/declarationEmitNoInvalidCommentReuse3.js b/tests/baselines/reference/declarationEmitNoInvalidCommentReuse3.js
@@ -0,0 +1,29 @@
+//// [tests/cases/compiler/declarationEmitNoInvalidCommentReuse3.ts] ////
+
+//// [a.ts]
+import { object } from "./obj";
+import { id } from "./id";
+export const _ = object;
+/**
+*/
+//// [obj.d.ts]
+import { id } from "./id";
+// ----
+export declare const object: id.A<{
+    foo: id.A<1>
+}>;
+
+//// [id.d.ts]
+export declare namespace id {
+    type A<T> = T;
+}
+
+
+
+//// [a.d.ts]
+import { id } from "./id";
+export declare const _: {
+    foo: id.A<1>;
+};
+/**
+*/ 
diff --git a/tests/baselines/reference/declarationEmitNoInvalidCommentReuse3.symbols b/tests/baselines/reference/declarationEmitNoInvalidCommentReuse3.symbols
@@ -0,0 +1,41 @@
+//// [tests/cases/compiler/declarationEmitNoInvalidCommentReuse3.ts] ////
+
+=== a.ts ===
+import { object } from "./obj";
+>object : Symbol(object, Decl(a.ts, 0, 8))
+
+import { id } from "./id";
+>id : Symbol(id, Decl(a.ts, 1, 8))
+
+export const _ = object;
+>_ : Symbol(_, Decl(a.ts, 2, 12))
+>object : Symbol(object, Decl(a.ts, 0, 8))
+
+/**
+*/
+=== obj.d.ts ===
+import { id } from "./id";
+>id : Symbol(id, Decl(obj.d.ts, 0, 8))
+
+// ----
+export declare const object: id.A<{
+>object : Symbol(object, Decl(obj.d.ts, 2, 20))
+>id : Symbol(id, Decl(obj.d.ts, 0, 8))
+>A : Symbol(id.A, Decl(id.d.ts, 0, 29))
+
+    foo: id.A<1>
+>foo : Symbol(foo, Decl(obj.d.ts, 2, 35))
+>id : Symbol(id, Decl(obj.d.ts, 0, 8))
+>A : Symbol(id.A, Decl(id.d.ts, 0, 29))
+
+}>;
+
+=== id.d.ts ===
+export declare namespace id {
+>id : Symbol(id, Decl(id.d.ts, 0, 0))
+
+    type A<T> = T;
+>A : Symbol(A, Decl(id.d.ts, 0, 29))
+>T : Symbol(T, Decl(id.d.ts, 1, 11))
+>T : Symbol(T, Decl(id.d.ts, 1, 11))
+}
diff --git a/tests/baselines/reference/declarationEmitNoInvalidCommentReuse3.types b/tests/baselines/reference/declarationEmitNoInvalidCommentReuse3.types
@@ -0,0 +1,45 @@
+//// [tests/cases/compiler/declarationEmitNoInvalidCommentReuse3.ts] ////
+
+=== a.ts ===
+import { object } from "./obj";
+>object : { foo: id.A<1>; }
+>       : ^^^^^^^       ^^^
+
+import { id } from "./id";
+>id : any
+>   : ^^^
+
+export const _ = object;
+>_ : { foo: id.A<1>; }
+>  : ^^^^^^^       ^^^
+>object : { foo: id.A<1>; }
+>       : ^^^^^^^       ^^^
+
+/**
+*/
+=== obj.d.ts ===
+import { id } from "./id";
+>id : any
+>   : ^^^
+
+// ----
+export declare const object: id.A<{
+>object : { foo: id.A<1>; }
+>       : ^^^^^^^       ^^^
+>id : any
+>   : ^^^
+
+    foo: id.A<1>
+>foo : 1
+>    : ^
+>id : any
+>   : ^^^
+
+}>;
+
+=== id.d.ts ===
+export declare namespace id {
+    type A<T> = T;
+>A : T
+>  : ^
+}
diff --git a/tests/cases/compiler/declarationEmitNoInvalidCommentReuse1.ts b/tests/cases/compiler/declarationEmitNoInvalidCommentReuse1.ts
@@ -0,0 +1,22 @@
+// @strict: true
+// @declaration: true
+// @emitDeclarationOnly: true
+
+// https://github.com/microsoft/TypeScript/issues/61239
+
+// @filename: a.ts
+import { object } from "./obj";
+
+export const _ = object;
+
+///////////
+/**
+ * huh
+ */
+// @filename: obj.d.ts
+export declare const object: import("./id").Id<{
+    foo: import("./id" ).Id<{}>;
+}>;
+
+// @filename: id.d.ts
+export type Id<T> = T;
diff --git a/tests/cases/compiler/declarationEmitNoInvalidCommentReuse2.ts b/tests/cases/compiler/declarationEmitNoInvalidCommentReuse2.ts
diff --git a/tests/cases/compiler/declarationEmitNoInvalidCommentReuse3.ts b/tests/cases/compiler/declarationEmitNoInvalidCommentReuse3.ts

Original file line number	Diff line number	Diff line change
`@@ -6209,6 +6209,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {`
`6209`	`6209`	`const context = syntacticContext as NodeBuilderContext;`
`6210`	`6210`	`if (context.bundled \|\| context.enclosingFile !== getSourceFileOfNode(lit)) {`
`6211`	`6211`	`let name = lit.text;`
	`6212`	`+ const originalName = name;`
`6212`	`6213`	`const nodeSymbol = getNodeLinks(parent).resolvedSymbol;`
`6213`	`6214`	`const meaning = parent.isTypeOf ? SymbolFlags.Value : SymbolFlags.Type;`
`6214`	`6215`	`const parentSymbol = nodeSymbol`
`@@ -6229,7 +6230,9 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {`
`6229`	`6230`	`context.tracker.reportLikelyUnsafeImportRequiredError(name);`
`6230`	`6231`	`}`
`6231`	`6232`	`}`
`6232`		`- return name;`
	`6233`	`+ if (name !== originalName) {`
	`6234`	`+ return name;`
	`6235`	`+ }`
`6233`	`6236`	`}`
`6234`	`6237`	`},`
`6235`	`6238`	`canReuseTypeNode(context, typeNode) {`
`@@ -8834,10 +8837,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {`
`8834`	`8837`	`return setTextRange(context, setEmitFlags(name, EmitFlags.NoAsciiEscaping), node);`
`8835`	`8838`	`}`
`8836`	`8839`	`const updated = visitEachChildWorker(node, c => attachSymbolToLeftmostIdentifier(c), /context/ undefined);`
`8837`		`- if (updated !== node) {`
`8838`		`- setTextRange(context, updated, node);`
`8839`		`- }`
`8840`		`- return updated;`
	`8840`	`+ return setTextRange(context, updated, node);`
`8841`	`8841`	`}`
`8842`	`8842`	`}`
`8843`	`8843`
Original file line number	Diff line number	Diff line change
`@@ -435,9 +435,11 @@ export function createSyntacticTypeNodeBuilder(`
`435`	`435`	`if (!resolver.canReuseTypeNode(context, node)) {`
`436`	`436`	`return resolver.serializeExistingTypeNode(context, node);`
`437`	`437`	`}`
	`438`	`+ const specifier = rewriteModuleSpecifier(node, node.argument.literal);`
	`439`	`+ const literal = specifier === node.argument.literal ? reuseNode(context, node.argument.literal) : specifier;`
`438`	`440`	`return factory.updateImportTypeNode(`
`439`	`441`	`node,`
`440`		`- factory.updateLiteralTypeNode(node.argument, rewriteModuleSpecifier(node, node.argument.literal)),`
	`442`	`+ literal === node.argument.literal ? reuseNode(context, node.argument) : factory.createLiteralTypeNode(literal),`
`441`	`443`	`visitNode(node.attributes, visitExistingNodeTreeSymbols, isImportAttributes),`
`442`	`444`	`visitNode(node.qualifier, visitExistingNodeTreeSymbols, isEntityName),`
`443`	`445`	`visitNodes(node.typeArguments, visitExistingNodeTreeSymbols, isTypeNode),`
`@@ -612,10 +614,7 @@ export function createSyntacticTypeNodeBuilder(`
`612`	`614`
`613`	`615`	`function rewriteModuleSpecifier(parent: ImportTypeNode, lit: StringLiteral) {`
`614`	`616`	`const newName = resolver.getModuleSpecifierOverride(context, parent, lit);`
`615`		`- if (newName) {`
`616`		`- return setOriginalNode(factory.createStringLiteral(newName), lit);`
`617`		`- }`
`618`		`- return visitNode(lit, visitExistingNodeTreeSymbols, isStringLiteral)!;`
	`617`	`+ return newName ? setOriginalNode(factory.createStringLiteral(newName), lit) : lit;`
`619`	`618`	`}`
`620`	`619`	`}`
`621`	`620`	`}`