Cherry-pick PR #49035 into release-4.7 (#49036)

Component commits: e8df495 Fix module specifier generation crash from typesVersions Co-authored-by: Andrew Branch <[email protected]>
microsoft · May 9, 2022 · dbee2ab · dbee2ab
1 parent a5ec725
commit dbee2ab
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 0 deletions.
diff --git a/src/compiler/moduleSpecifiers.ts b/src/compiler/moduleSpecifiers.ts
@@ -810,6 +810,7 @@ namespace ts.moduleSpecifiers {
     function removeExtensionAndIndexPostFix(fileName: string, ending: Ending, options: CompilerOptions, host?: ModuleSpecifierResolutionHost): string {
         if (fileExtensionIsOneOf(fileName, [Extension.Json, Extension.Mjs, Extension.Cjs])) return fileName;
         const noExtension = removeFileExtension(fileName);
+        if (fileName === noExtension) return fileName;
         if (fileExtensionIsOneOf(fileName, [Extension.Dmts, Extension.Mts, Extension.Dcts, Extension.Cts])) return noExtension + getJSExtensionForFile(fileName, options);
         switch (ending) {
             case Ending.Minimal:

diff --git a/tests/cases/fourslash/importNameCodeFix_typesVersions.ts b/tests/cases/fourslash/importNameCodeFix_typesVersions.ts
@@ -0,0 +1,34 @@
+/// <reference path="fourslash.ts" />
+
+// @module: commonjs
+// @checkJs: true
+
+// @Filename: /node_modules/unified/package.json
+//// {
+////   "name": "unified",
+////   "types": "types/ts3.4/index.d.ts",
+////   "typesVersions": {
+////     ">=4.0": {
+////       "types/ts3.4/*": [
+////         "types/ts4.0/*"
+////       ]
+////     }
+////   }
+//// }
+
+// @Filename: /node_modules/unified/types/ts3.4/index.d.ts
+//// export declare const x: number;
+
+// @Filename: /node_modules/unified/types/ts4.0/index.d.ts
+//// export declare const x: number;
+
+// @Filename: /foo.js
+//// import {} from "unified";
+
+// @Filename: /index.js
+//// x/**/
+
+verify.importFixModuleSpecifiers("", [
+  "unified",
+  "unified/types/ts3.4/", // TODO: this is wrong #49034
+], { importModuleSpecifierEnding: "js" });