tryGetModuleNameAsNodeModule: Ignore file extension (microsoft#24774)

Andy · web-flow · commit 3822e3e4ed0e · 2018-06-07T15:45:03.000-07:00
diff --git a/src/compiler/moduleSpecifiers.ts b/src/compiler/moduleSpecifiers.ts
@@ -248,7 +248,7 @@ namespace ts.moduleSpecifiers {
                     const mainFileRelative = packageJsonContent.typings || packageJsonContent.types || packageJsonContent.main;
                     if (mainFileRelative) {
                         const mainExportFile = toPath(mainFileRelative, packageRootPath, getCanonicalFileName);
-                        if (mainExportFile === getCanonicalFileName(path)) {
+                        if (removeFileExtension(mainExportFile) === removeFileExtension(getCanonicalFileName(path))) {
                             return packageRootPath;
                         }
                     }
diff --git a/tests/cases/fourslash/importNameCodeFixNewImportNodeModules7.ts b/tests/cases/fourslash/importNameCodeFixNewImportNodeModules7.ts
@@ -15,15 +15,8 @@
 // @Filename: node_modules/package-name/package.json
 //// { "main": "bin/lib/libfile.js" }
 
-
-// In this case, importing the module by its package name:
-// import { f1 } from 'package-name'
-// could in theory work, however the resulting code compiles with a module resolution error
-// since bin/lib/libfile.d.ts isn't declared under "typings" in package.json
-// Therefore just import the module by its qualified path
-
 verify.importFixAtPosition([
-`import { f1 } from "package-name/bin/lib/libfile";
+`import { f1 } from "package-name";
 
 f1('');`
 ]);

Original file line number	Diff line number	Diff line change
`@@ -248,7 +248,7 @@ namespace ts.moduleSpecifiers {`
`248`	`248`	`const mainFileRelative = packageJsonContent.typings \|\| packageJsonContent.types \|\| packageJsonContent.main;`
`249`	`249`	`if (mainFileRelative) {`
`250`	`250`	`const mainExportFile = toPath(mainFileRelative, packageRootPath, getCanonicalFileName);`
`251`		`- if (mainExportFile === getCanonicalFileName(path)) {`
	`251`	`+ if (removeFileExtension(mainExportFile) === removeFileExtension(getCanonicalFileName(path))) {`
`252`	`252`	`return packageRootPath;`
`253`	`253`	`}`
`254`	`254`	`}`