Adds the symbol name to the error message for TS2742

src/compiler/checker.ts

@@ -6434,8 +6434,8 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
                     }
                     if (name.includes("/node_modules/")) {
                         context.encounteredError = true;
-                        if (context.tracker.reportLikelyUnsafeImportRequiredError) {
-                            context.tracker.reportLikelyUnsafeImportRequiredError(name);
+                        if (context.tracker.reportLikelyUnsafeImportRequiredError && nodeSymbol) {
+                            context.tracker.reportLikelyUnsafeImportRequiredError(name, unescapeLeadingUnderscores(nodeSymbol.escapedName));
                         }
                     }
                     if (name !== originalName) {
@@ -8090,8 +8090,8 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
                 reportInaccessibleUniqueSymbolError() {
                     markError(() => oldTracker.reportInaccessibleUniqueSymbolError());
                 },
-                reportLikelyUnsafeImportRequiredError(specifier) {
-                    markError(() => oldTracker.reportLikelyUnsafeImportRequiredError(specifier));
+                reportLikelyUnsafeImportRequiredError(specifier, symbolName) {
+                    markError(() => oldTracker.reportLikelyUnsafeImportRequiredError(specifier, symbolName));
                 },
                 reportNonSerializableProperty(name) {
                     markError(() => oldTracker.reportNonSerializableProperty(name));
@@ -8717,7 +8717,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
                         // since declaration files with these kinds of references are liable to fail when published :(
                         context.encounteredError = true;
                         if (context.tracker.reportLikelyUnsafeImportRequiredError) {
-                            context.tracker.reportLikelyUnsafeImportRequiredError(oldSpecifier);
+                            context.tracker.reportLikelyUnsafeImportRequiredError(oldSpecifier, unescapeLeadingUnderscores(symbol.escapedName));
                         }
                     }
                 }
@@ -54370,10 +54370,10 @@ class SymbolTrackerImpl implements SymbolTracker {
         }
     }
 
-    reportLikelyUnsafeImportRequiredError(specifier: string): void {
+    reportLikelyUnsafeImportRequiredError(specifier: string, symbolName: string): void {
         if (this.inner?.reportLikelyUnsafeImportRequiredError) {
             this.onDiagnosticReported();
-            this.inner.reportLikelyUnsafeImportRequiredError(specifier);
+            this.inner.reportLikelyUnsafeImportRequiredError(specifier, symbolName);
         }
     }
 

src/compiler/diagnosticMessages.json

@@ -3506,7 +3506,7 @@
         "category": "Error",
         "code": 2741
     },
-    "The inferred type of '{0}' cannot be named without a reference to '{1}'. This is likely not portable. A type annotation is necessary.": {
+    "The inferred type of '{0}' cannot be named without a reference to '{2}' from '{1}'. This is likely not portable. A type annotation is necessary.": {
         "category": "Error",
         "code": 2742
     },

src/compiler/transformers/declarations.ts

@@ -408,9 +408,9 @@ export function transformDeclarations(context: TransformationContext): Transform
         }
     }
 
-    function reportLikelyUnsafeImportRequiredError(specifier: string) {
+    function reportLikelyUnsafeImportRequiredError(specifier: string, symbolName: string) {
         if (errorNameNode || errorFallbackNode) {
-            context.addDiagnostic(createDiagnosticForNode((errorNameNode || errorFallbackNode)!, Diagnostics.The_inferred_type_of_0_cannot_be_named_without_a_reference_to_1_This_is_likely_not_portable_A_type_annotation_is_necessary, errorDeclarationNameWithFallback(), specifier));
+            context.addDiagnostic(createDiagnosticForNode((errorNameNode || errorFallbackNode)!, Diagnostics.The_inferred_type_of_0_cannot_be_named_without_a_reference_to_2_from_1_This_is_likely_not_portable_A_type_annotation_is_necessary, errorDeclarationNameWithFallback(), specifier, symbolName));
         }
     }
 

src/compiler/types.ts

@@ -10050,7 +10050,7 @@ export interface SymbolTracker {
     reportPrivateInBaseOfClassExpression?(propertyName: string): void;
     reportInaccessibleUniqueSymbolError?(): void;
     reportCyclicStructureError?(): void;
-    reportLikelyUnsafeImportRequiredError?(specifier: string): void;
+    reportLikelyUnsafeImportRequiredError?(specifier: string, symbolName: string): void;
     reportTruncationError?(): void;
     moduleResolverHost?: ModuleSpecifierResolutionHost & { getCommonSourceDirectory(): string; };
     reportNonlocalAugmentation?(containingFile: SourceFile, parentSymbol: Symbol, augmentingSymbol: Symbol): void;

tests/baselines/reference/declarationEmitCommonJsModuleReferencedType.errors.txt

@@ -1,4 +1,4 @@
-r/entry.ts(3,14): error TS2742: The inferred type of 'x' cannot be named without a reference to 'foo/node_modules/nested'. This is likely not portable. A type annotation is necessary.
+r/entry.ts(3,14): error TS2742: The inferred type of 'x' cannot be named without a reference to 'NestedProps' from 'foo/node_modules/nested'. This is likely not portable. A type annotation is necessary.
 
 
 ==== r/node_modules/foo/node_modules/nested/index.d.ts (0 errors) ====
@@ -23,6 +23,6 @@ r/entry.ts(3,14): error TS2742: The inferred type of 'x' cannot be named without
     import { bar } from "root";
     export const x = foo();
                  ~
-!!! error TS2742: The inferred type of 'x' cannot be named without a reference to 'foo/node_modules/nested'. This is likely not portable. A type annotation is necessary.
+!!! error TS2742: The inferred type of 'x' cannot be named without a reference to 'NestedProps' from 'foo/node_modules/nested'. This is likely not portable. A type annotation is necessary.
     export const y = bar();
 

tests/baselines/reference/declarationEmitObjectAssignedDefaultExport.errors.txt

@@ -1,4 +1,4 @@
-index.ts(7,1): error TS2742: The inferred type of 'default' cannot be named without a reference to 'styled-components/node_modules/hoist-non-react-statics'. This is likely not portable. A type annotation is necessary.
+index.ts(7,1): error TS2742: The inferred type of 'default' cannot be named without a reference to 'NonReactStatics' from 'styled-components/node_modules/hoist-non-react-statics'. This is likely not portable. A type annotation is necessary.
 
 
 ==== node_modules/styled-components/node_modules/hoist-non-react-statics/index.d.ts (0 errors) ====
@@ -43,5 +43,5 @@ index.ts(7,1): error TS2742: The inferred type of 'default' cannot be named with
     ~~~~~
     });
     ~~~
-!!! error TS2742: The inferred type of 'default' cannot be named without a reference to 'styled-components/node_modules/hoist-non-react-statics'. This is likely not portable. A type annotation is necessary.
+!!! error TS2742: The inferred type of 'default' cannot be named without a reference to 'NonReactStatics' from 'styled-components/node_modules/hoist-non-react-statics'. This is likely not portable. A type annotation is necessary.
 

tests/baselines/reference/declarationEmitReexportedSymlinkReference3.errors.txt

@@ -1,4 +1,4 @@
-monorepo/pkg3/src/keys.ts(3,14): error TS2742: The inferred type of 'ADMIN' cannot be named without a reference to '../../pkg2/node_modules/@raymondfeng/pkg1/dist'. This is likely not portable. A type annotation is necessary.
+monorepo/pkg3/src/keys.ts(3,14): error TS2742: The inferred type of 'ADMIN' cannot be named without a reference to 'IdType' from '../../pkg2/node_modules/@raymondfeng/pkg1/dist'. This is likely not portable. A type annotation is necessary.
 
 
 ==== monorepo/pkg3/tsconfig.json (0 errors) ====
@@ -21,7 +21,7 @@ monorepo/pkg3/src/keys.ts(3,14): error TS2742: The inferred type of 'ADMIN' cann
 
     export const ADMIN = MetadataAccessor.create<boolean>('1');
                  ~~~~~
-!!! error TS2742: The inferred type of 'ADMIN' cannot be named without a reference to '../../pkg2/node_modules/@raymondfeng/pkg1/dist'. This is likely not portable. A type annotation is necessary.
+!!! error TS2742: The inferred type of 'ADMIN' cannot be named without a reference to 'IdType' from '../../pkg2/node_modules/@raymondfeng/pkg1/dist'. This is likely not portable. A type annotation is necessary.
 ==== monorepo/pkg1/dist/index.d.ts (0 errors) ====
     export * from './types';
 ==== monorepo/pkg1/dist/types.d.ts (0 errors) ====

tests/baselines/reference/declarationEmitUnsafeImportSymbolName.errors.txt

@@ -0,0 +1,16 @@
+r/entry.ts(2,14): error TS2742: The inferred type of 'special' cannot be named without a reference to 'MySpecialType' from 'foo/node_modules/nested'. This is likely not portable. A type annotation is necessary.
+
+
+==== r/node_modules/foo/node_modules/nested/index.d.ts (0 errors) ====
+    export interface MySpecialType {
+        val: string;
+    }
+==== r/node_modules/foo/index.d.ts (0 errors) ====
+    import { MySpecialType } from "nested";
+    export function getSpecial(): MySpecialType;
+==== r/entry.ts (1 errors) ====
+    import { getSpecial } from "foo";
+    export const special = getSpecial();
+                 ~~~~~~~
+!!! error TS2742: The inferred type of 'special' cannot be named without a reference to 'MySpecialType' from 'foo/node_modules/nested'. This is likely not portable. A type annotation is necessary.
+

tests/baselines/reference/declarationEmitUnsafeImportSymbolName.js

@@ -0,0 +1,20 @@
+//// [tests/cases/compiler/declarationEmitUnsafeImportSymbolName.ts] ////
+
+//// [index.d.ts]
+export interface MySpecialType {
+    val: string;
+}
+//// [index.d.ts]
+import { MySpecialType } from "nested";
+export function getSpecial(): MySpecialType;
+//// [entry.ts]
+import { getSpecial } from "foo";
+export const special = getSpecial();
+
+
+//// [entry.js]
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.special = void 0;
+const foo_1 = require("foo");
+exports.special = (0, foo_1.getSpecial)();

tests/baselines/reference/declarationEmitUnsafeImportSymbolName.symbols

@@ -0,0 +1,25 @@
+//// [tests/cases/compiler/declarationEmitUnsafeImportSymbolName.ts] ////
+
+=== r/node_modules/foo/node_modules/nested/index.d.ts ===
+export interface MySpecialType {
+>MySpecialType : Symbol(MySpecialType, Decl(index.d.ts, 0, 0))
+
+    val: string;
+>val : Symbol(MySpecialType.val, Decl(index.d.ts, 0, 32))
+}
+=== r/node_modules/foo/index.d.ts ===
+import { MySpecialType } from "nested";
+>MySpecialType : Symbol(MySpecialType, Decl(index.d.ts, 0, 8))
+
+export function getSpecial(): MySpecialType;
+>getSpecial : Symbol(getSpecial, Decl(index.d.ts, 0, 39))
+>MySpecialType : Symbol(MySpecialType, Decl(index.d.ts, 0, 8))
+
+=== r/entry.ts ===
+import { getSpecial } from "foo";
+>getSpecial : Symbol(getSpecial, Decl(entry.ts, 0, 8))
+
+export const special = getSpecial();
+>special : Symbol(special, Decl(entry.ts, 1, 12))
+>getSpecial : Symbol(getSpecial, Decl(entry.ts, 0, 8))
+

tests/baselines/reference/declarationEmitUnsafeImportSymbolName.types

@@ -0,0 +1,30 @@
+//// [tests/cases/compiler/declarationEmitUnsafeImportSymbolName.ts] ////
+
+=== r/node_modules/foo/node_modules/nested/index.d.ts ===
+export interface MySpecialType {
+    val: string;
+>val : string
+>    : ^^^^^^
+}
+=== r/node_modules/foo/index.d.ts ===
+import { MySpecialType } from "nested";
+>MySpecialType : any
+>              : ^^^
+
+export function getSpecial(): MySpecialType;
+>getSpecial : () => MySpecialType
+>           : ^^^^^^             
+
+=== r/entry.ts ===
+import { getSpecial } from "foo";
+>getSpecial : () => import("foo/node_modules/nested").MySpecialType
+>           : ^^^^^^       ^^^^^^^^^^^^^^^^^^^^^^^^^  ^^^^^^^^^^^^^
+
+export const special = getSpecial();
+>special : import("foo/node_modules/nested").MySpecialType
+>        : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>getSpecial() : import("foo/node_modules/nested").MySpecialType
+>             : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>getSpecial : () => import("foo/node_modules/nested").MySpecialType
+>           : ^^^^^^       ^^^^^^^^^^^^^^^^^^^^^^^^^  ^^^^^^^^^^^^^
+

tests/baselines/reference/declarationEmitUsingTypeAlias1.errors.txt

@@ -1,5 +1,5 @@
-src/index.ts(3,14): error TS2742: The inferred type of 'foo' cannot be named without a reference to '../node_modules/some-dep/dist/inner'. This is likely not portable. A type annotation is necessary.
-src/index.ts(7,14): error TS2742: The inferred type of 'bar' cannot be named without a reference to '../node_modules/some-dep/dist/inner'. This is likely not portable. A type annotation is necessary.
+src/index.ts(3,14): error TS2742: The inferred type of 'foo' cannot be named without a reference to 'SomeType' from '../node_modules/some-dep/dist/inner'. This is likely not portable. A type annotation is necessary.
+src/index.ts(7,14): error TS2742: The inferred type of 'bar' cannot be named without a reference to 'Other' from '../node_modules/some-dep/dist/inner'. This is likely not portable. A type annotation is necessary.
 
 
 ==== node_modules/some-dep/dist/inner.d.ts (0 errors) ====
@@ -23,12 +23,12 @@ src/index.ts(7,14): error TS2742: The inferred type of 'bar' cannot be named wit
 
     export const foo = (thing: SomeType) => {
                  ~~~
-!!! error TS2742: The inferred type of 'foo' cannot be named without a reference to '../node_modules/some-dep/dist/inner'. This is likely not portable. A type annotation is necessary.
+!!! error TS2742: The inferred type of 'foo' cannot be named without a reference to 'SomeType' from '../node_modules/some-dep/dist/inner'. This is likely not portable. A type annotation is necessary.
       return thing;
     };
 
     export const bar = (thing: SomeType) => {
                  ~~~
-!!! error TS2742: The inferred type of 'bar' cannot be named without a reference to '../node_modules/some-dep/dist/inner'. This is likely not portable. A type annotation is necessary.
+!!! error TS2742: The inferred type of 'bar' cannot be named without a reference to 'Other' from '../node_modules/some-dep/dist/inner'. This is likely not portable. A type annotation is necessary.
       return thing.arg;
     };

tests/baselines/reference/legacyNodeModulesExportsSpecifierGenerationConditions.errors.txt

@@ -1,10 +1,10 @@
-index.ts(1,14): error TS2742: The inferred type of 'a' cannot be named without a reference to './node_modules/inner/private'. This is likely not portable. A type annotation is necessary.
+index.ts(1,14): error TS2742: The inferred type of 'a' cannot be named without a reference to 'Thing' from './node_modules/inner/private'. This is likely not portable. A type annotation is necessary.
 
 
 ==== index.ts (1 errors) ====
     export const a = async () => (await import("inner")).x();
                  ~
-!!! error TS2742: The inferred type of 'a' cannot be named without a reference to './node_modules/inner/private'. This is likely not portable. A type annotation is necessary.
+!!! error TS2742: The inferred type of 'a' cannot be named without a reference to 'Thing' from './node_modules/inner/private'. This is likely not portable. A type annotation is necessary.
 ==== node_modules/inner/index.d.ts (0 errors) ====
     export { x } from "./other.js";
 ==== node_modules/inner/other.d.ts (0 errors) ====

tests/baselines/reference/nodeModulesExportsBlocksSpecifierResolution(module=node16).errors.txt

@@ -1,5 +1,5 @@
 index.ts(2,23): error TS2307: Cannot find module 'inner/other' or its corresponding type declarations.
-index.ts(3,14): error TS2742: The inferred type of 'a' cannot be named without a reference to './node_modules/inner/other.js'. This is likely not portable. A type annotation is necessary.
+index.ts(3,14): error TS2742: The inferred type of 'a' cannot be named without a reference to 'Thing' from './node_modules/inner/other.js'. This is likely not portable. A type annotation is necessary.
 
 
 ==== index.ts (2 errors) ====
@@ -9,7 +9,7 @@ index.ts(3,14): error TS2742: The inferred type of 'a' cannot be named without a
 !!! error TS2307: Cannot find module 'inner/other' or its corresponding type declarations.
     export const a = (await import("inner")).x();
                  ~
-!!! error TS2742: The inferred type of 'a' cannot be named without a reference to './node_modules/inner/other.js'. This is likely not portable. A type annotation is necessary.
+!!! error TS2742: The inferred type of 'a' cannot be named without a reference to 'Thing' from './node_modules/inner/other.js'. This is likely not portable. A type annotation is necessary.
 ==== node_modules/inner/index.d.ts (0 errors) ====
     // esm format file
     export { x } from "./other.js";

tests/baselines/reference/nodeModulesExportsBlocksSpecifierResolution(module=node18).errors.txt

@@ -1,5 +1,5 @@
 index.ts(2,23): error TS2307: Cannot find module 'inner/other' or its corresponding type declarations.
-index.ts(3,14): error TS2742: The inferred type of 'a' cannot be named without a reference to './node_modules/inner/other.js'. This is likely not portable. A type annotation is necessary.
+index.ts(3,14): error TS2742: The inferred type of 'a' cannot be named without a reference to 'Thing' from './node_modules/inner/other.js'. This is likely not portable. A type annotation is necessary.
 
 
 ==== index.ts (2 errors) ====
@@ -9,7 +9,7 @@ index.ts(3,14): error TS2742: The inferred type of 'a' cannot be named without a
 !!! error TS2307: Cannot find module 'inner/other' or its corresponding type declarations.
     export const a = (await import("inner")).x();
                  ~
-!!! error TS2742: The inferred type of 'a' cannot be named without a reference to './node_modules/inner/other.js'. This is likely not portable. A type annotation is necessary.
+!!! error TS2742: The inferred type of 'a' cannot be named without a reference to 'Thing' from './node_modules/inner/other.js'. This is likely not portable. A type annotation is necessary.
 ==== node_modules/inner/index.d.ts (0 errors) ====
     // esm format file
     export { x } from "./other.js";

tests/baselines/reference/nodeModulesExportsBlocksSpecifierResolution(module=node20).errors.txt

@@ -1,5 +1,5 @@
 index.ts(2,23): error TS2307: Cannot find module 'inner/other' or its corresponding type declarations.
-index.ts(3,14): error TS2742: The inferred type of 'a' cannot be named without a reference to './node_modules/inner/other.js'. This is likely not portable. A type annotation is necessary.
+index.ts(3,14): error TS2742: The inferred type of 'a' cannot be named without a reference to 'Thing' from './node_modules/inner/other.js'. This is likely not portable. A type annotation is necessary.
 
 
 ==== index.ts (2 errors) ====
@@ -9,7 +9,7 @@ index.ts(3,14): error TS2742: The inferred type of 'a' cannot be named without a
 !!! error TS2307: Cannot find module 'inner/other' or its corresponding type declarations.
     export const a = (await import("inner")).x();
                  ~
-!!! error TS2742: The inferred type of 'a' cannot be named without a reference to './node_modules/inner/other.js'. This is likely not portable. A type annotation is necessary.
+!!! error TS2742: The inferred type of 'a' cannot be named without a reference to 'Thing' from './node_modules/inner/other.js'. This is likely not portable. A type annotation is necessary.
 ==== node_modules/inner/index.d.ts (0 errors) ====
     // esm format file
     export { x } from "./other.js";

tests/baselines/reference/nodeModulesExportsBlocksSpecifierResolution(module=nodenext).errors.txt

@@ -1,5 +1,5 @@
 index.ts(2,23): error TS2307: Cannot find module 'inner/other' or its corresponding type declarations.
-index.ts(3,14): error TS2742: The inferred type of 'a' cannot be named without a reference to './node_modules/inner/other.js'. This is likely not portable. A type annotation is necessary.
+index.ts(3,14): error TS2742: The inferred type of 'a' cannot be named without a reference to 'Thing' from './node_modules/inner/other.js'. This is likely not portable. A type annotation is necessary.
 
 
 ==== index.ts (2 errors) ====
@@ -9,7 +9,7 @@ index.ts(3,14): error TS2742: The inferred type of 'a' cannot be named without a
 !!! error TS2307: Cannot find module 'inner/other' or its corresponding type declarations.
     export const a = (await import("inner")).x();
                  ~
-!!! error TS2742: The inferred type of 'a' cannot be named without a reference to './node_modules/inner/other.js'. This is likely not portable. A type annotation is necessary.
+!!! error TS2742: The inferred type of 'a' cannot be named without a reference to 'Thing' from './node_modules/inner/other.js'. This is likely not portable. A type annotation is necessary.
 ==== node_modules/inner/index.d.ts (0 errors) ====
     // esm format file
     export { x } from "./other.js";