Trace Package id at the module resolution site

Author: sheetalkamat

src/compiler/diagnosticMessages.json

@@ -3811,10 +3811,6 @@
         "category": "Error",
         "code": 6189
     },
-    "Found 'package.json' at '{0}'. Package ID is '{1}'.": {
-        "category": "Message",
-        "code": 6190
-    },
     "Whether to keep outdated console output in watch mode instead of clearing the screen.": {
         "category": "Message",
         "code": 6191
@@ -3923,6 +3919,14 @@
         "category": "Message",
         "code": 6217
     },
+    "======== Module name '{0}' was successfully resolved to '{1}' with Package ID '{2}'. ========": {
+        "category": "Message",
+        "code": 6218
+    },
+    "======== Type reference directive '{0}' was successfully resolved to '{1}' with Package ID '{2}', primary: {3}. ========": {
+        "category": "Message",
+        "code": 6219
+    },
 
     "Projects to reference": {
         "category": "Message",
@@ -4975,7 +4979,7 @@
         "code": 95079
     },
 
-    "No value exists in scope for the shorthand property '{0}'. Either declare one or provide an initializer." :{
+    "No value exists in scope for the shorthand property '{0}'. Either declare one or provide an initializer.": {
         "category": "Error",
         "code": 18004
     },

src/compiler/moduleNameResolver.ts

@@ -307,7 +307,12 @@ namespace ts {
             const { fileName, packageId } = resolved;
             const resolvedFileName = options.preserveSymlinks ? fileName : realPath(fileName, host, traceEnabled);
             if (traceEnabled) {
-                trace(host, Diagnostics.Type_reference_directive_0_was_successfully_resolved_to_1_primary_Colon_2, typeReferenceDirectiveName, resolvedFileName, primary);
+                if (packageId) {
+                    trace(host, Diagnostics.Type_reference_directive_0_was_successfully_resolved_to_1_with_Package_ID_2_primary_Colon_3, typeReferenceDirectiveName, resolvedFileName, packageIdToString(packageId), primary);
+                }
+                else {
+                    trace(host, Diagnostics.Type_reference_directive_0_was_successfully_resolved_to_1_primary_Colon_2, typeReferenceDirectiveName, resolvedFileName, primary);
+                }
             }
             resolvedTypeReferenceDirective = { primary, resolvedFileName, packageId, isExternalLibraryImport: pathContainsNodeModules(fileName) };
         }
@@ -663,7 +668,12 @@ namespace ts {
 
         if (traceEnabled) {
             if (result.resolvedModule) {
-                trace(host, Diagnostics.Module_name_0_was_successfully_resolved_to_1, moduleName, result.resolvedModule.resolvedFileName);
+                if (result.resolvedModule.packageId) {
+                    trace(host, Diagnostics.Module_name_0_was_successfully_resolved_to_1_with_Package_ID_2, moduleName, result.resolvedModule.resolvedFileName, packageIdToString(result.resolvedModule.packageId));
+                }
+                else {
+                    trace(host, Diagnostics.Module_name_0_was_successfully_resolved_to_1, moduleName, result.resolvedModule.resolvedFileName);
+                }
             }
             else {
                 trace(host, Diagnostics.Module_name_0_was_not_resolved, moduleName);
@@ -1165,12 +1175,7 @@ namespace ts {
                 ? { name: packageJsonContent.name, subModuleName, version: packageJsonContent.version }
                 : undefined;
             if (traceEnabled) {
-                if (packageId) {
-                    trace(host, Diagnostics.Found_package_json_at_0_Package_ID_is_1, packageJsonPath, packageIdToString(packageId));
-                }
-                else {
-                    trace(host, Diagnostics.Found_package_json_at_0, packageJsonPath);
-                }
+                trace(host, Diagnostics.Found_package_json_at_0, packageJsonPath);
             }
 
             return { packageJsonContent, packageId, versionPaths };

tests/baselines/reference/duplicatePackage_relativeImportWithinPackage.trace.json

@@ -3,12 +3,12 @@
     "Module resolution kind is not specified, using 'NodeJs'.",
     "Loading module 'foo/use' from 'node_modules' folder, target file type 'TypeScript'.",
     "'package.json' does not have a 'typesVersions' field.",
-    "Found 'package.json' at '/node_modules/foo/package.json'. Package ID is 'foo/use/[email protected]'.",
+    "Found 'package.json' at '/node_modules/foo/package.json'.",
     "File '/node_modules/foo/use.ts' does not exist.",
     "File '/node_modules/foo/use.tsx' does not exist.",
     "File '/node_modules/foo/use.d.ts' exist - use it as a name resolution result.",
     "Resolving real path for '/node_modules/foo/use.d.ts', result '/node_modules/foo/use.d.ts'.",
-    "======== Module name 'foo/use' was successfully resolved to '/node_modules/foo/use.d.ts'. ========",
+    "======== Module name 'foo/use' was successfully resolved to '/node_modules/foo/use.d.ts' with Package ID 'foo/use/[email protected]'. ========",
     "======== Resolving module 'a' from '/index.ts'. ========",
     "Module resolution kind is not specified, using 'NodeJs'.",
     "Loading module 'a' from 'node_modules' folder, target file type 'TypeScript'.",
@@ -28,16 +28,16 @@
     "File '/node_modules/foo/index.tsx' does not exist.",
     "File '/node_modules/foo/index.d.ts' exist - use it as a name resolution result.",
     "'package.json' does not have a 'typesVersions' field.",
-    "Found 'package.json' at '/node_modules/foo/package.json'. Package ID is 'foo/[email protected]'.",
-    "======== Module name './index' was successfully resolved to '/node_modules/foo/index.d.ts'. ========",
+    "Found 'package.json' at '/node_modules/foo/package.json'.",
+    "======== Module name './index' was successfully resolved to '/node_modules/foo/index.d.ts' with Package ID 'foo/[email protected]'. ========",
     "======== Resolving module 'foo' from '/node_modules/a/index.d.ts'. ========",
     "Module resolution kind is not specified, using 'NodeJs'.",
     "Loading module 'foo' from 'node_modules' folder, target file type 'TypeScript'.",
     "'package.json' does not have a 'typings' field.",
     "'package.json' does not have a 'types' field.",
     "'package.json' does not have a 'main' field.",
     "'package.json' does not have a 'typesVersions' field.",
-    "Found 'package.json' at '/node_modules/a/node_modules/foo/package.json'. Package ID is 'foo/[email protected]'.",
+    "Found 'package.json' at '/node_modules/a/node_modules/foo/package.json'.",
     "File '/node_modules/a/node_modules/foo.ts' does not exist.",
     "File '/node_modules/a/node_modules/foo.tsx' does not exist.",
     "File '/node_modules/a/node_modules/foo.d.ts' does not exist.",
@@ -48,5 +48,5 @@
     "File '/node_modules/a/node_modules/foo/index.tsx' does not exist.",
     "File '/node_modules/a/node_modules/foo/index.d.ts' exist - use it as a name resolution result.",
     "Resolving real path for '/node_modules/a/node_modules/foo/index.d.ts', result '/node_modules/a/node_modules/foo/index.d.ts'.",
-    "======== Module name 'foo' was successfully resolved to '/node_modules/a/node_modules/foo/index.d.ts'. ========"
+    "======== Module name 'foo' was successfully resolved to '/node_modules/a/node_modules/foo/index.d.ts' with Package ID 'foo/[email protected]'. ========"
 ]

tests/baselines/reference/duplicatePackage_relativeImportWithinPackage_scoped.trace.json

@@ -3,12 +3,12 @@
     "Module resolution kind is not specified, using 'NodeJs'.",
     "Loading module '@foo/bar/use' from 'node_modules' folder, target file type 'TypeScript'.",
     "'package.json' does not have a 'typesVersions' field.",
-    "Found 'package.json' at '/node_modules/@foo/bar/package.json'. Package ID is '@foo/bar/use/[email protected]'.",
+    "Found 'package.json' at '/node_modules/@foo/bar/package.json'.",
     "File '/node_modules/@foo/bar/use.ts' does not exist.",
     "File '/node_modules/@foo/bar/use.tsx' does not exist.",
     "File '/node_modules/@foo/bar/use.d.ts' exist - use it as a name resolution result.",
     "Resolving real path for '/node_modules/@foo/bar/use.d.ts', result '/node_modules/@foo/bar/use.d.ts'.",
-    "======== Module name '@foo/bar/use' was successfully resolved to '/node_modules/@foo/bar/use.d.ts'. ========",
+    "======== Module name '@foo/bar/use' was successfully resolved to '/node_modules/@foo/bar/use.d.ts' with Package ID '@foo/bar/use/[email protected]'. ========",
     "======== Resolving module 'a' from '/index.ts'. ========",
     "Module resolution kind is not specified, using 'NodeJs'.",
     "Loading module 'a' from 'node_modules' folder, target file type 'TypeScript'.",
@@ -28,16 +28,16 @@
     "File '/node_modules/@foo/bar/index.tsx' does not exist.",
     "File '/node_modules/@foo/bar/index.d.ts' exist - use it as a name resolution result.",
     "'package.json' does not have a 'typesVersions' field.",
-    "Found 'package.json' at '/node_modules/@foo/bar/package.json'. Package ID is '@foo/bar/[email protected]'.",
-    "======== Module name './index' was successfully resolved to '/node_modules/@foo/bar/index.d.ts'. ========",
+    "Found 'package.json' at '/node_modules/@foo/bar/package.json'.",
+    "======== Module name './index' was successfully resolved to '/node_modules/@foo/bar/index.d.ts' with Package ID '@foo/bar/[email protected]'. ========",
     "======== Resolving module '@foo/bar' from '/node_modules/a/index.d.ts'. ========",
     "Module resolution kind is not specified, using 'NodeJs'.",
     "Loading module '@foo/bar' from 'node_modules' folder, target file type 'TypeScript'.",
     "'package.json' does not have a 'typings' field.",
     "'package.json' does not have a 'types' field.",
     "'package.json' does not have a 'main' field.",
     "'package.json' does not have a 'typesVersions' field.",
-    "Found 'package.json' at '/node_modules/a/node_modules/@foo/bar/package.json'. Package ID is '@foo/bar/[email protected]'.",
+    "Found 'package.json' at '/node_modules/a/node_modules/@foo/bar/package.json'.",
     "File '/node_modules/a/node_modules/@foo/bar.ts' does not exist.",
     "File '/node_modules/a/node_modules/@foo/bar.tsx' does not exist.",
     "File '/node_modules/a/node_modules/@foo/bar.d.ts' does not exist.",
@@ -48,5 +48,5 @@
     "File '/node_modules/a/node_modules/@foo/bar/index.tsx' does not exist.",
     "File '/node_modules/a/node_modules/@foo/bar/index.d.ts' exist - use it as a name resolution result.",
     "Resolving real path for '/node_modules/a/node_modules/@foo/bar/index.d.ts', result '/node_modules/a/node_modules/@foo/bar/index.d.ts'.",
-    "======== Module name '@foo/bar' was successfully resolved to '/node_modules/a/node_modules/@foo/bar/index.d.ts'. ========"
+    "======== Module name '@foo/bar' was successfully resolved to '/node_modules/a/node_modules/@foo/bar/index.d.ts' with Package ID '@foo/bar/[email protected]'. ========"
 ]

tests/baselines/reference/moduleResolutionPackageIdWithRelativeAndAbsolutePath.trace.json

@@ -42,21 +42,21 @@
     "Loading module 'troublesome-lib/lib/Compactable' from 'node_modules' folder, target file type 'TypeScript'.",
     "Directory '/project/node_modules/anotherLib/node_modules' does not exist, skipping all lookups in it.",
     "'package.json' does not have a 'typesVersions' field.",
-    "Found 'package.json' at '/project/node_modules/troublesome-lib/package.json'. Package ID is 'troublesome-lib/lib/Compactable/[email protected]'.",
+    "Found 'package.json' at '/project/node_modules/troublesome-lib/package.json'.",
     "File '/project/node_modules/troublesome-lib/lib/Compactable.ts' does not exist.",
     "File '/project/node_modules/troublesome-lib/lib/Compactable.tsx' does not exist.",
     "File '/project/node_modules/troublesome-lib/lib/Compactable.d.ts' exist - use it as a name resolution result.",
     "Resolving real path for '/project/node_modules/troublesome-lib/lib/Compactable.d.ts', result '/project/node_modules/troublesome-lib/lib/Compactable.d.ts'.",
-    "======== Module name 'troublesome-lib/lib/Compactable' was successfully resolved to '/project/node_modules/troublesome-lib/lib/Compactable.d.ts'. ========",
+    "======== Module name 'troublesome-lib/lib/Compactable' was successfully resolved to '/project/node_modules/troublesome-lib/lib/Compactable.d.ts' with Package ID 'troublesome-lib/lib/Compactable/[email protected]'. ========",
     "======== Resolving module './Option' from '/project/node_modules/troublesome-lib/lib/Compactable.d.ts'. ========",
     "Module resolution kind is not specified, using 'NodeJs'.",
     "Loading module as file / folder, candidate module location '/project/node_modules/troublesome-lib/lib/Option', target file type 'TypeScript'.",
     "File '/project/node_modules/troublesome-lib/lib/Option.ts' does not exist.",
     "File '/project/node_modules/troublesome-lib/lib/Option.tsx' does not exist.",
     "File '/project/node_modules/troublesome-lib/lib/Option.d.ts' exist - use it as a name resolution result.",
     "'package.json' does not have a 'typesVersions' field.",
-    "Found 'package.json' at '/project/node_modules/troublesome-lib/package.json'. Package ID is 'troublesome-lib/lib/[email protected]'.",
-    "======== Module name './Option' was successfully resolved to '/project/node_modules/troublesome-lib/lib/Option.d.ts'. ========",
+    "Found 'package.json' at '/project/node_modules/troublesome-lib/package.json'.",
+    "======== Module name './Option' was successfully resolved to '/project/node_modules/troublesome-lib/lib/Option.d.ts' with Package ID 'troublesome-lib/lib/[email protected]'. ========",
     "======== Resolving module 'troublesome-lib/lib/Option' from '/shared/lib/app.d.ts'. ========",
     "Module resolution kind is not specified, using 'NodeJs'.",
     "'baseUrl' option is set to '/project', using this value to resolve non-relative module name 'troublesome-lib/lib/Option'.",
@@ -67,10 +67,10 @@
     "Loading module 'troublesome-lib/lib/Option' from 'node_modules' folder, target file type 'TypeScript'.",
     "Directory '/shared/lib/node_modules' does not exist, skipping all lookups in it.",
     "'package.json' does not have a 'typesVersions' field.",
-    "Found 'package.json' at '/shared/node_modules/troublesome-lib/package.json'. Package ID is 'troublesome-lib/lib/Option/[email protected]'.",
+    "Found 'package.json' at '/shared/node_modules/troublesome-lib/package.json'.",
     "File '/shared/node_modules/troublesome-lib/lib/Option.ts' does not exist.",
     "File '/shared/node_modules/troublesome-lib/lib/Option.tsx' does not exist.",
     "File '/shared/node_modules/troublesome-lib/lib/Option.d.ts' exist - use it as a name resolution result.",
     "Resolving real path for '/shared/node_modules/troublesome-lib/lib/Option.d.ts', result '/shared/node_modules/troublesome-lib/lib/Option.d.ts'.",
-    "======== Module name 'troublesome-lib/lib/Option' was successfully resolved to '/shared/node_modules/troublesome-lib/lib/Option.d.ts'. ========"
+    "======== Module name 'troublesome-lib/lib/Option' was successfully resolved to '/shared/node_modules/troublesome-lib/lib/Option.d.ts' with Package ID 'troublesome-lib/lib/Option/[email protected]'. ========"
 ]

tests/baselines/reference/moduleResolution_packageJson_yesAtPackageRoot.trace.json

@@ -4,7 +4,7 @@
     "Loading module 'foo/bar' from 'node_modules' folder, target file type 'TypeScript'.",
     "File '/node_modules/foo/bar/package.json' does not exist.",
     "'package.json' does not have a 'typesVersions' field.",
-    "Found 'package.json' at '/node_modules/foo/package.json'. Package ID is 'foo/bar/[email protected]'.",
+    "Found 'package.json' at '/node_modules/foo/package.json'.",
     "File '/node_modules/foo/bar.ts' does not exist.",
     "File '/node_modules/foo/bar.tsx' does not exist.",
     "File '/node_modules/foo/bar.d.ts' does not exist.",
@@ -15,10 +15,10 @@
     "Loading module 'foo/bar' from 'node_modules' folder, target file type 'JavaScript'.",
     "File '/node_modules/foo/bar/package.json' does not exist.",
     "'package.json' does not have a 'typesVersions' field.",
-    "Found 'package.json' at '/node_modules/foo/package.json'. Package ID is 'foo/bar/[email protected]'.",
+    "Found 'package.json' at '/node_modules/foo/package.json'.",
     "File '/node_modules/foo/bar.js' does not exist.",
     "File '/node_modules/foo/bar.jsx' does not exist.",
     "File '/node_modules/foo/bar/index.js' exist - use it as a name resolution result.",
     "Resolving real path for '/node_modules/foo/bar/index.js', result '/node_modules/foo/bar/index.js'.",
-    "======== Module name 'foo/bar' was successfully resolved to '/node_modules/foo/bar/index.js'. ========"
+    "======== Module name 'foo/bar' was successfully resolved to '/node_modules/foo/bar/index.js' with Package ID 'foo/bar/[email protected]'. ========"
 ]

tests/baselines/reference/moduleResolution_packageJson_yesAtPackageRoot_fakeScopedPackage.trace.json

@@ -4,7 +4,7 @@
     "Loading module 'foo/@bar' from 'node_modules' folder, target file type 'TypeScript'.",
     "File '/node_modules/foo/@bar/package.json' does not exist.",
     "'package.json' does not have a 'typesVersions' field.",
-    "Found 'package.json' at '/node_modules/foo/package.json'. Package ID is 'foo/@bar/[email protected]'.",
+    "Found 'package.json' at '/node_modules/foo/package.json'.",
     "File '/node_modules/foo/@bar.ts' does not exist.",
     "File '/node_modules/foo/@bar.tsx' does not exist.",
     "File '/node_modules/foo/@bar.d.ts' does not exist.",
@@ -15,10 +15,10 @@
     "Loading module 'foo/@bar' from 'node_modules' folder, target file type 'JavaScript'.",
     "File '/node_modules/foo/@bar/package.json' does not exist.",
     "'package.json' does not have a 'typesVersions' field.",
-    "Found 'package.json' at '/node_modules/foo/package.json'. Package ID is 'foo/@bar/[email protected]'.",
+    "Found 'package.json' at '/node_modules/foo/package.json'.",
     "File '/node_modules/foo/@bar.js' does not exist.",
     "File '/node_modules/foo/@bar.jsx' does not exist.",
     "File '/node_modules/foo/@bar/index.js' exist - use it as a name resolution result.",
     "Resolving real path for '/node_modules/foo/@bar/index.js', result '/node_modules/foo/@bar/index.js'.",
-    "======== Module name 'foo/@bar' was successfully resolved to '/node_modules/foo/@bar/index.js'. ========"
+    "======== Module name 'foo/@bar' was successfully resolved to '/node_modules/foo/@bar/index.js' with Package ID 'foo/@bar/[email protected]'. ========"
 ]

tests/baselines/reference/moduleResolution_packageJson_yesAtPackageRoot_mainFieldInSubDirectory.trace.json

@@ -6,7 +6,7 @@
     "'package.json' does not have a 'types' field.",
     "'package.json' has 'main' field 'src/index.js' that references '/node_modules/foo/src/index.js'.",
     "'package.json' does not have a 'typesVersions' field.",
-    "Found 'package.json' at '/node_modules/foo/package.json'. Package ID is 'foo/src/[email protected]'.",
+    "Found 'package.json' at '/node_modules/foo/package.json'.",
     "File '/node_modules/foo.ts' does not exist.",
     "File '/node_modules/foo.tsx' does not exist.",
     "File '/node_modules/foo.d.ts' does not exist.",
@@ -23,5 +23,5 @@
     "File '/node_modules/foo/src/index.tsx' does not exist.",
     "File '/node_modules/foo/src/index.d.ts' exist - use it as a name resolution result.",
     "Resolving real path for '/node_modules/foo/src/index.d.ts', result '/node_modules/foo/src/index.d.ts'.",
-    "======== Module name 'foo' was successfully resolved to '/node_modules/foo/src/index.d.ts'. ========"
+    "======== Module name 'foo' was successfully resolved to '/node_modules/foo/src/index.d.ts' with Package ID 'foo/src/[email protected]'. ========"
 ]