Auto-imports of declaration files cannot use .ts extension

andrewbranch · andrewbranch · Oct 20, 2022 · Oct 21, 2022 · Oct 24, 2022 · Oct 24, 2022
commit f04f1b5ce2eae4355f4a775de4e6899de910c153
diff --git a/src/compiler/moduleSpecifiers.ts b/src/compiler/moduleSpecifiers.ts
@@ -16,7 +16,7 @@ import {
     ModuleSpecifierResolutionHost, NodeFlags, NodeModulePathParts, normalizePath, Path, pathContainsNodeModules,
     pathIsBareSpecifier, pathIsRelative, PropertyAccessExpression, removeFileExtension, removeSuffix, resolvePath,
     ScriptKind, some, SourceFile, startsWith, startsWithDirectory, stringContains, StringLiteral, Symbol, SymbolFlags,
-    toPath, tryGetExtensionFromPath, tryParsePatterns, TypeChecker, UserPreferences, shouldAllowImportingTsExtension, ResolutionMode, ModuleSpecifierEnding, getModuleSpecifierEndingPreference,
+    toPath, tryGetExtensionFromPath, tryParsePatterns, TypeChecker, UserPreferences, shouldAllowImportingTsExtension, ResolutionMode, ModuleSpecifierEnding, getModuleSpecifierEndingPreference, isDeclarationFileName,
 } from "./_namespaces/ts";
 
 // Used by importFixes, getEditsForFileRename, and declaration emit to synthesize import module specifiers.
@@ -74,10 +74,10 @@ function getPreferences(
             if (endsWith(oldImportSpecifier, "/index")) return ModuleSpecifierEnding.Index;
         }
         return getModuleSpecifierEndingPreference(
-          importModuleSpecifierEnding,
-          importingSourceFile.impliedNodeFormat,
-          compilerOptions,
-          importingSourceFile);
+            importModuleSpecifierEnding,
+            importingSourceFile.impliedNodeFormat,
+            compilerOptions,
+            importingSourceFile);
     }
 }
 
@@ -937,10 +937,19 @@ function getPathsRelativeToRootDirs(path: string, rootDirs: readonly string[], g
 }
 
 function processEnding(fileName: string, ending: ModuleSpecifierEnding, options: CompilerOptions, host?: ModuleSpecifierResolutionHost): string {
-    if (fileExtensionIsOneOf(fileName, [Extension.Json, Extension.Mjs, Extension.Cjs])) return fileName;
+    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);
+    if (fileName === noExtension) {
+        return fileName;
+    }
+
+    if (fileExtensionIsOneOf(fileName, [Extension.Dmts, Extension.Mts, Extension.Dcts, Extension.Cts])) {
+        return noExtension + getJSExtensionForFile(fileName, options);
+    }
+
     switch (ending) {
         case ModuleSpecifierEnding.Minimal:
             const withoutIndex = removeSuffix(noExtension, "/index");
@@ -955,7 +964,9 @@ function processEnding(fileName: string, ending: ModuleSpecifierEnding, options:
         case ModuleSpecifierEnding.JsExtension:
             return noExtension + getJSExtensionForFile(fileName, options);
         case ModuleSpecifierEnding.TsExtension:
-            return fileName;
+            // For now, we don't know if this import is going to be type-only, which means we don't
+            // know if a .d.ts extension is valid, so use the .js extension.
+            return isDeclarationFileName(fileName) ? noExtension + getJSExtensionForFile(fileName, options) : fileName;
         default:
             return Debug.assertNever(ending);
     }

diff --git a/tests/baselines/reference/autoImportAllowTsExtensions3.baseline.md b/tests/baselines/reference/autoImportAllowTsExtensions3.baseline.md
@@ -6,8 +6,15 @@ import { Component } from "./Component.tsx";
 
 ## From completions
 
+- `fromDecl` from `"./decl.js"`
 - `fromLocal` from `"./local.ts"`
 
+```ts
+import { Component } from "./Component.tsx";
+import { fromDecl } from "./decl.js";
+fromDecl
+```
+
 ```ts
 import { Component } from "./Component.tsx";
 import { fromLocal } from "./local.ts";

diff --git a/tests/baselines/reference/autoImportAllowTsExtensions4.baseline.md b/tests/baselines/reference/autoImportAllowTsExtensions4.baseline.md
@@ -0,0 +1,22 @@
+```ts
+// @Filename: /main.ts
+import { Component } from "./local.js";
+/*|*/
+```
+
+## From completions
+
+- `fromDecl` from `"./decl.js"`
+- `fromLocal` from `"./local.js"`
+
+```ts
+import { fromDecl } from "./decl.js";
+import { Component } from "./local.js";
+fromDecl
+```
+
+```ts
+import { Component, fromLocal } from "./local.js";
+fromLocal
+```
+
diff --git a/tests/cases/fourslash/autoImportAllowTsExtensions3.ts b/tests/cases/fourslash/autoImportAllowTsExtensions3.ts
@@ -7,6 +7,9 @@
 // @Filename: /local.ts
 //// export const fromLocal: number;
 
+// @Filename: /decl.d.ts
+//// export const fromDecl: number;
+
 // @Filename: /Component.tsx
 //// export function Component() { return null; }
 

diff --git a/tests/cases/fourslash/autoImportAllowTsExtensions4.ts b/tests/cases/fourslash/autoImportAllowTsExtensions4.ts
@@ -0,0 +1,20 @@
+/// <reference path="fourslash.ts" />
+
+// @moduleResolution: hybrid
+// @allowImportingTsExtensions: true
+// @noEmit: true
+
+// @Filename: /local.ts
+//// export const fromLocal: number;
+
+// @Filename: /decl.d.ts
+//// export const fromDecl: number;
+
+// @Filename: /Component.tsx
+//// export function Component() { return null; }
+
+// @Filename: /main.ts
+//// import { Component } from "./local.js";
+//// /**/
+
+verify.baselineAutoImports("");