Do not remove extension js or jsx from the subModuleName if the subModule doesnt have js or jsx extension

sheetalkamat · sheetalkamat · commit 22d5b0e19f6d · 2018-05-14T14:21:08.000-07:00
diff --git a/src/compiler/moduleNameResolver.ts b/src/compiler/moduleNameResolver.ts
@@ -1012,8 +1012,10 @@ namespace ts {
                 }
                 else {
                     const jsPath = tryReadPackageJsonFields(/*readTypes*/ false, packageJsonContent, nodeModuleDirectory, state);
-                    if (typeof jsPath === "string") {
-                        subModuleName = removeExtension(removeExtension(jsPath.substring(nodeModuleDirectory.length + 1), Extension.Js), Extension.Jsx) + Extension.Dts;
+                    if (typeof jsPath === "string" && jsPath.length > nodeModuleDirectory.length) {
+                        const potentialSubModule = jsPath.substring(nodeModuleDirectory.length + 1);
+                        subModuleName = (forEach(supportedJavascriptExtensions, extension =>
+                            tryRemoveExtension(potentialSubModule, extension)) || potentialSubModule) + Extension.Dts;
                     }
                     else {
                         subModuleName = "index.d.ts";
diff --git a/tests/baselines/reference/moduleResolution_packageJson_yesAtPackageRoot_mainFieldInSubDirectory.trace.json b/tests/baselines/reference/moduleResolution_packageJson_yesAtPackageRoot_mainFieldInSubDirectory.trace.json
@@ -5,7 +5,7 @@
     "'package.json' does not have a 'typings' field.",
     "'package.json' does not have a 'types' field.",
     "'package.json' has 'main' field 'src/index.js' that references '/node_modules/foo/src/index.js'.",
-    "Found 'package.json' at '/node_modules/foo/package.json'. Package ID is 'foo/src/i.d.ts@1.2.3'.",
+    "Found 'package.json' at '/node_modules/foo/package.json'. Package ID is 'foo/src/index.d.ts@1.2.3'.",
     "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.",
@@ -19,7 +19,7 @@
     "'package.json' does not have a 'typings' field.",
     "'package.json' does not have a 'types' field.",
     "'package.json' has 'main' field 'src/index.js' that references '/node_modules/foo/src/index.js'.",
-    "Found 'package.json' at '/node_modules/foo/package.json'. Package ID is 'foo/src/i.d.ts@1.2.3'.",
+    "Found 'package.json' at '/node_modules/foo/package.json'. Package ID is 'foo/src/index.d.ts@1.2.3'.",
     "File '/node_modules/foo.js' does not exist.",
     "File '/node_modules/foo.jsx' does not exist.",
     "'package.json' has 'main' field 'src/index.js' that references '/node_modules/foo/src/index.js'.",

Original file line number	Diff line number	Diff line change
`@@ -1012,8 +1012,10 @@ namespace ts {`
`1012`	`1012`	`}`
`1013`	`1013`	`else {`
`1014`	`1014`	`const jsPath = tryReadPackageJsonFields(/readTypes/ false, packageJsonContent, nodeModuleDirectory, state);`
`1015`		`- if (typeof jsPath === "string") {`
`1016`		`- subModuleName = removeExtension(removeExtension(jsPath.substring(nodeModuleDirectory.length + 1), Extension.Js), Extension.Jsx) + Extension.Dts;`
	`1015`	`+ if (typeof jsPath === "string" && jsPath.length > nodeModuleDirectory.length) {`
	`1016`	`+ const potentialSubModule = jsPath.substring(nodeModuleDirectory.length + 1);`
	`1017`	`+ subModuleName = (forEach(supportedJavascriptExtensions, extension =>`
	`1018`	`+ tryRemoveExtension(potentialSubModule, extension)) \|\| potentialSubModule) + Extension.Dts;`
`1017`	`1019`	`}`
`1018`	`1020`	`else {`
`1019`	`1021`	`subModuleName = "index.d.ts";`