Fix package id string to contain sub module

internal/module/types.go

@@ -49,7 +49,7 @@ type PackageId struct {
 }
 
 func (p *PackageId) String() string {
-	return fmt.Sprintf("%s@%s%s", p.Name, p.Version, p.PeerDependencies)
+	return fmt.Sprintf("%s@%s%s", p.PackageName(), p.Version, p.PeerDependencies)
 }
 
 func (p *PackageId) PackageName() string {

testdata/baselines/reference/submodule/compiler/allowJsCrossMonorepoPackage.trace.json

@@ -46,7 +46,7 @@ File '/node_modules/shared.ts' does not exist according to earlier cached lookup
 File '/node_modules/shared.tsx' does not exist according to earlier cached lookups.
 File '/node_modules/shared.d.ts' does not exist according to earlier cached lookups.
 Directory '/node_modules/@types' does not exist, skipping all lookups in it.
-======== Module name 'shared' was successfully resolved to '/packages/shared/index.js' with Package ID '[email protected]'. ========
+======== Module name 'shared' was successfully resolved to '/packages/shared/index.js' with Package ID 'shared/index.js@1.0.0'. ========
 ======== Resolving module './utils.js' from '/packages/shared/index.js'. ========
 Explicitly specified module resolution kind: 'Bundler'.
 Resolving in CJS mode with conditions 'import', 'types'.

testdata/baselines/reference/submodule/compiler/duplicatePackage_relativeImportWithinPackage.trace.json

@@ -36,7 +36,7 @@ File '/node_modules/foo/index.tsx' does not exist.
 File '/node_modules/foo/index.d.ts' exists - use it as a name resolution result.
 File '/node_modules/foo/package.json' exists according to earlier cached lookups.
 'package.json' does not have a 'peerDependencies' field.
-======== Module name './index' was successfully resolved to '/node_modules/foo/index.d.ts' with Package ID '[email protected]'. ========
+======== Module name './index' was successfully resolved to '/node_modules/foo/index.d.ts' with Package ID 'foo/index.d.ts@1.2.3'. ========
 ======== Resolving module 'foo' from '/node_modules/a/index.d.ts'. ========
 Module resolution kind is not specified, using 'Bundler'.
 Resolving in CJS mode with conditions 'require', 'types'.

testdata/baselines/reference/submodule/compiler/duplicatePackage_relativeImportWithinPackage_scoped.trace.json

@@ -36,7 +36,7 @@ File '/node_modules/@foo/bar/index.tsx' does not exist.
 File '/node_modules/@foo/bar/index.d.ts' exists - use it as a name resolution result.
 File '/node_modules/@foo/bar/package.json' exists according to earlier cached lookups.
 'package.json' does not have a 'peerDependencies' field.
-======== Module name './index' was successfully resolved to '/node_modules/@foo/bar/index.d.ts' with Package ID '@foo/[email protected]'. ========
+======== Module name './index' was successfully resolved to '/node_modules/@foo/bar/index.d.ts' with Package ID '@foo/bar/index.d.ts@1.2.3'. ========
 ======== Resolving module '@foo/bar' from '/node_modules/a/index.d.ts'. ========
 Module resolution kind is not specified, using 'Bundler'.
 Resolving in CJS mode with conditions 'require', 'types'.

testdata/baselines/reference/submodule/compiler/moduleResolutionPackageIdWithRelativeAndAbsolutePath.trace.json

@@ -58,7 +58,7 @@ File '/project/node_modules/troublesome-lib/lib/Option.tsx' does not exist.
 File '/project/node_modules/troublesome-lib/lib/Option.d.ts' exists - use it as a name resolution result.
 File '/project/node_modules/troublesome-lib/package.json' exists according to earlier cached lookups.
 'package.json' does not have a 'peerDependencies' field.
-======== Module name './Option' was successfully resolved to '/project/node_modules/troublesome-lib/lib/Option.d.ts' with Package ID '[email protected]'. ========
+======== Module name './Option' was successfully resolved to '/project/node_modules/troublesome-lib/lib/Option.d.ts' with Package ID 'troublesome-lib/lib/Option.d.ts@1.17.1'. ========
 ======== Resolving module 'troublesome-lib/lib/Option' from '/shared/lib/app.d.ts'. ========
 Module resolution kind is not specified, using 'Bundler'.
 Resolving in CJS mode with conditions 'require', 'types'.

testdata/baselines/reference/submodule/compiler/reactJsxReactResolvedNodeNextEsm.trace.json

@@ -10,7 +10,7 @@ File name '/.src/node_modules/@types/react/jsx-runtime.js' has a '.js' extension
 File '/.src/node_modules/@types/react/jsx-runtime.d.ts' exists - use it as a name resolution result.
 'package.json' does not have a 'peerDependencies' field.
 Resolving real path for '/.src/node_modules/@types/react/jsx-runtime.d.ts', result '/.src/node_modules/@types/react/jsx-runtime.d.ts'.
-======== Module name 'react/jsx-runtime' was successfully resolved to '/.src/node_modules/@types/react/jsx-runtime.d.ts' with Package ID '@types/[email protected]'. ========
+======== Module name 'react/jsx-runtime' was successfully resolved to '/.src/node_modules/@types/react/jsx-runtime.d.ts' with Package ID '@types/react/jsx-runtime.d.ts@0.0.1'. ========
 ======== Resolving module './' from '/.src/node_modules/@types/react/jsx-runtime.d.ts'. ========
 Module resolution kind is not specified, using 'NodeNext'.
 Resolving in CJS mode with conditions 'require', 'types', 'node'.

testdata/baselines/reference/submodule/conformance/bundlerConditionsExcludesNode(module=esnext).trace.json

@@ -17,4 +17,4 @@ File '/node_modules/conditions/index.web.d.ts' exists - use it as a name resolut
 Resolved under condition 'default'.
 Exiting conditional exports.
 Resolving real path for '/node_modules/conditions/index.web.d.ts', result '/node_modules/conditions/index.web.d.ts'.
-======== Module name 'conditions' was successfully resolved to '/node_modules/conditions/index.web.d.ts' with Package ID '[email protected]'. ========
+======== Module name 'conditions' was successfully resolved to '/node_modules/conditions/index.web.d.ts' with Package ID 'conditions/index.web.d.ts@1.0.0'. ========

testdata/baselines/reference/submodule/conformance/bundlerConditionsExcludesNode(module=preserve).trace.json

@@ -17,4 +17,4 @@ File '/node_modules/conditions/index.web.d.ts' exists - use it as a name resolut
 Resolved under condition 'default'.
 Exiting conditional exports.
 Resolving real path for '/node_modules/conditions/index.web.d.ts', result '/node_modules/conditions/index.web.d.ts'.
-======== Module name 'conditions' was successfully resolved to '/node_modules/conditions/index.web.d.ts' with Package ID '[email protected]'. ========
+======== Module name 'conditions' was successfully resolved to '/node_modules/conditions/index.web.d.ts' with Package ID 'conditions/index.web.d.ts@1.0.0'. ========

testdata/baselines/reference/submodule/conformance/bundlerNodeModules1(module=esnext).trace.json

@@ -16,7 +16,7 @@ File '/node_modules/dual/index.d.ts' exists - use it as a name resolution result
 Resolved under condition 'import'.
 Exiting conditional exports.
 Resolving real path for '/node_modules/dual/index.d.ts', result '/node_modules/dual/index.d.ts'.
-======== Module name 'dual' was successfully resolved to '/node_modules/dual/index.d.ts' with Package ID '[email protected]'. ========
+======== Module name 'dual' was successfully resolved to '/node_modules/dual/index.d.ts' with Package ID 'dual/index.d.ts@1.0.0'. ========
 ======== Resolving module 'dual' from '/main.mts'. ========
 Explicitly specified module resolution kind: 'Bundler'.
 Resolving in CJS mode with conditions 'import', 'types'.
@@ -35,7 +35,7 @@ File '/node_modules/dual/index.d.ts' exists - use it as a name resolution result
 Resolved under condition 'import'.
 Exiting conditional exports.
 Resolving real path for '/node_modules/dual/index.d.ts', result '/node_modules/dual/index.d.ts'.
-======== Module name 'dual' was successfully resolved to '/node_modules/dual/index.d.ts' with Package ID '[email protected]'. ========
+======== Module name 'dual' was successfully resolved to '/node_modules/dual/index.d.ts' with Package ID 'dual/index.d.ts@1.0.0'. ========
 ======== Resolving module 'dual' from '/main.cts'. ========
 Explicitly specified module resolution kind: 'Bundler'.
 Resolving in CJS mode with conditions 'require', 'types'.
@@ -54,4 +54,4 @@ File '/node_modules/dual/index.d.cts' exists - use it as a name resolution resul
 Resolved under condition 'require'.
 Exiting conditional exports.
 Resolving real path for '/node_modules/dual/index.d.cts', result '/node_modules/dual/index.d.cts'.
-======== Module name 'dual' was successfully resolved to '/node_modules/dual/index.d.cts' with Package ID '[email protected]'. ========
+======== Module name 'dual' was successfully resolved to '/node_modules/dual/index.d.cts' with Package ID 'dual/index.d.cts@1.0.0'. ========

testdata/baselines/reference/submodule/conformance/bundlerNodeModules1(module=preserve).trace.json

@@ -16,7 +16,7 @@ File '/node_modules/dual/index.d.ts' exists - use it as a name resolution result
 Resolved under condition 'import'.
 Exiting conditional exports.
 Resolving real path for '/node_modules/dual/index.d.ts', result '/node_modules/dual/index.d.ts'.
-======== Module name 'dual' was successfully resolved to '/node_modules/dual/index.d.ts' with Package ID '[email protected]'. ========
+======== Module name 'dual' was successfully resolved to '/node_modules/dual/index.d.ts' with Package ID 'dual/index.d.ts@1.0.0'. ========
 ======== Resolving module 'dual' from '/main.mts'. ========
 Explicitly specified module resolution kind: 'Bundler'.
 Resolving in CJS mode with conditions 'import', 'types'.
@@ -35,7 +35,7 @@ File '/node_modules/dual/index.d.ts' exists - use it as a name resolution result
 Resolved under condition 'import'.
 Exiting conditional exports.
 Resolving real path for '/node_modules/dual/index.d.ts', result '/node_modules/dual/index.d.ts'.
-======== Module name 'dual' was successfully resolved to '/node_modules/dual/index.d.ts' with Package ID '[email protected]'. ========
+======== Module name 'dual' was successfully resolved to '/node_modules/dual/index.d.ts' with Package ID 'dual/index.d.ts@1.0.0'. ========
 ======== Resolving module 'dual' from '/main.cts'. ========
 Explicitly specified module resolution kind: 'Bundler'.
 Resolving in CJS mode with conditions 'require', 'types'.
@@ -54,4 +54,4 @@ File '/node_modules/dual/index.d.cts' exists - use it as a name resolution resul
 Resolved under condition 'require'.
 Exiting conditional exports.
 Resolving real path for '/node_modules/dual/index.d.cts', result '/node_modules/dual/index.d.cts'.
-======== Module name 'dual' was successfully resolved to '/node_modules/dual/index.d.cts' with Package ID '[email protected]'. ========
+======== Module name 'dual' was successfully resolved to '/node_modules/dual/index.d.cts' with Package ID 'dual/index.d.cts@1.0.0'. ========

testdata/baselines/reference/submodule/conformance/conditionalExportsResolutionFallback(moduleresolution=bundler).trace.json

@@ -20,4 +20,4 @@ File '/node_modules/dep/dist/index.d.ts' exists - use it as a name resolution re
 Resolved under condition 'types'.
 Exiting conditional exports.
 Resolving real path for '/node_modules/dep/dist/index.d.ts', result '/node_modules/dep/dist/index.d.ts'.
-======== Module name 'dep' was successfully resolved to '/node_modules/dep/dist/index.d.ts' with Package ID '[email protected]'. ========
+======== Module name 'dep' was successfully resolved to '/node_modules/dep/dist/index.d.ts' with Package ID 'dep/dist/index.d.ts@1.0.0'. ========

testdata/baselines/reference/submodule/conformance/conditionalExportsResolutionFallback(moduleresolution=node16).trace.json

@@ -20,4 +20,4 @@ File '/node_modules/dep/dist/index.d.ts' exists - use it as a name resolution re
 Resolved under condition 'types'.
 Exiting conditional exports.
 Resolving real path for '/node_modules/dep/dist/index.d.ts', result '/node_modules/dep/dist/index.d.ts'.
-======== Module name 'dep' was successfully resolved to '/node_modules/dep/dist/index.d.ts' with Package ID '[email protected]'. ========
+======== Module name 'dep' was successfully resolved to '/node_modules/dep/dist/index.d.ts' with Package ID 'dep/dist/index.d.ts@1.0.0'. ========

testdata/baselines/reference/submodule/conformance/conditionalExportsResolutionFallback(moduleresolution=nodenext).trace.json

@@ -20,4 +20,4 @@ File '/node_modules/dep/dist/index.d.ts' exists - use it as a name resolution re
 Resolved under condition 'types'.
 Exiting conditional exports.
 Resolving real path for '/node_modules/dep/dist/index.d.ts', result '/node_modules/dep/dist/index.d.ts'.
-======== Module name 'dep' was successfully resolved to '/node_modules/dep/dist/index.d.ts' with Package ID '[email protected]'. ========
+======== Module name 'dep' was successfully resolved to '/node_modules/dep/dist/index.d.ts' with Package ID 'dep/dist/index.d.ts@1.0.0'. ========

testdata/baselines/reference/submodule/conformance/customConditions(resolvepackagejsonexports=true).trace.json

@@ -17,4 +17,4 @@ File '/node_modules/lodash/webpack.d.ts' exists - use it as a name resolution re
 Resolved under condition 'webpack'.
 Exiting conditional exports.
 Resolving real path for '/node_modules/lodash/webpack.d.ts', result '/node_modules/lodash/webpack.d.ts'.
-======== Module name 'lodash' was successfully resolved to '/node_modules/lodash/webpack.d.ts' with Package ID '[email protected]'. ========
+======== Module name 'lodash' was successfully resolved to '/node_modules/lodash/webpack.d.ts' with Package ID 'lodash/webpack.d.ts@1.0.0'. ========

testdata/baselines/reference/submodule/conformance/node10AlternateResult_noResolution.trace.json

@@ -12,4 +12,4 @@ File '/node_modules/pkg/definitely-not-index.tsx' does not exist.
 File '/node_modules/pkg/definitely-not-index.d.ts' exists - use it as a name resolution result.
 'package.json' does not have a 'peerDependencies' field.
 Resolving real path for '/node_modules/pkg/definitely-not-index.d.ts', result '/node_modules/pkg/definitely-not-index.d.ts'.
-======== Module name 'pkg' was successfully resolved to '/node_modules/pkg/definitely-not-index.d.ts' with Package ID '[email protected]'. ========
+======== Module name 'pkg' was successfully resolved to '/node_modules/pkg/definitely-not-index.d.ts' with Package ID 'pkg/definitely-not-index.d.ts@1.0.0'. ========

testdata/baselines/reference/submodule/conformance/node10Alternateresult_noTypes.trace.json

@@ -12,4 +12,4 @@ File '/node_modules/pkg/definitely-not-index.tsx' does not exist.
 File '/node_modules/pkg/definitely-not-index.d.ts' exists - use it as a name resolution result.
 'package.json' does not have a 'peerDependencies' field.
 Resolving real path for '/node_modules/pkg/definitely-not-index.d.ts', result '/node_modules/pkg/definitely-not-index.d.ts'.
-======== Module name 'pkg' was successfully resolved to '/node_modules/pkg/definitely-not-index.d.ts' with Package ID '[email protected]'. ========
+======== Module name 'pkg' was successfully resolved to '/node_modules/pkg/definitely-not-index.d.ts' with Package ID 'pkg/definitely-not-index.d.ts@1.0.0'. ========

testdata/baselines/reference/submodule/conformance/node10IsNode_node.trace.json

@@ -12,4 +12,4 @@ File '/node_modules/fancy-lib/definitely-not-index.tsx' does not exist.
 File '/node_modules/fancy-lib/definitely-not-index.d.ts' exists - use it as a name resolution result.
 'package.json' does not have a 'peerDependencies' field.
 Resolving real path for '/node_modules/fancy-lib/definitely-not-index.d.ts', result '/node_modules/fancy-lib/definitely-not-index.d.ts'.
-======== Module name 'fancy-lib' was successfully resolved to '/node_modules/fancy-lib/definitely-not-index.d.ts' with Package ID '[email protected]'. ========
+======== Module name 'fancy-lib' was successfully resolved to '/node_modules/fancy-lib/definitely-not-index.d.ts' with Package ID 'fancy-lib/definitely-not-index.d.ts@1.0.0'. ========

testdata/baselines/reference/submodule/conformance/node10IsNode_node10.trace.json

@@ -12,4 +12,4 @@ File '/node_modules/fancy-lib/definitely-not-index.tsx' does not exist.
 File '/node_modules/fancy-lib/definitely-not-index.d.ts' exists - use it as a name resolution result.
 'package.json' does not have a 'peerDependencies' field.
 Resolving real path for '/node_modules/fancy-lib/definitely-not-index.d.ts', result '/node_modules/fancy-lib/definitely-not-index.d.ts'.
-======== Module name 'fancy-lib' was successfully resolved to '/node_modules/fancy-lib/definitely-not-index.d.ts' with Package ID '[email protected]'. ========
+======== Module name 'fancy-lib' was successfully resolved to '/node_modules/fancy-lib/definitely-not-index.d.ts' with Package ID 'fancy-lib/definitely-not-index.d.ts@1.0.0'. ========