moduleSpecifiers changes

Author: weswigham

src/compiler/moduleSpecifiers.ts

@@ -1041,6 +1041,11 @@ function removeExtensionAndIndexPostFix(fileName: string, ending: Ending, option
     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);
+    else if (!fileExtensionIsOneOf(fileName, [Extension.Dts]) && fileExtensionIsOneOf(fileName, [Extension.Ts]) && stringContains(fileName, ".d.")) {
+        // `foo.d.json.ts` and the like - remap back to `foo.json`
+        const ext = noExtension.substring(noExtension.lastIndexOf("."));
+        return noExtension.substring(0, noExtension.indexOf(".d.")) + ext;
+    }
     switch (ending) {
         case Ending.Minimal:
             const withoutIndex = removeSuffix(noExtension, "/index");

tests/baselines/reference/declarationEmitTransitiveImportOfHtmlDeclarationItem.js

@@ -0,0 +1,39 @@
+//// [tests/cases/compiler/declarationEmitTransitiveImportOfHtmlDeclarationItem.ts] ////
+
+//// [foo.d.html.ts]
+export declare class CustomHtmlRepresentationThing {}
+
+//// [reexporter.ts]
+import { CustomHtmlRepresentationThing } from "./foo.html";
+
+export function func() {
+    return new CustomHtmlRepresentationThing();
+}
+
+//// [index.ts]
+import { func } from "./reexporter";
+export const c = func();
+
+
+//// [reexporter.js]
+"use strict";
+exports.__esModule = true;
+exports.func = void 0;
+var foo_html_1 = require("./foo.html");
+function func() {
+    return new foo_html_1.CustomHtmlRepresentationThing();
+}
+exports.func = func;
+//// [index.js]
+"use strict";
+exports.__esModule = true;
+exports.c = void 0;
+var reexporter_1 = require("./reexporter");
+exports.c = (0, reexporter_1.func)();
+
+
+//// [reexporter.d.ts]
+import { CustomHtmlRepresentationThing } from "./foo.html";
+export declare function func(): CustomHtmlRepresentationThing;
+//// [index.d.ts]
+export declare const c: import("./foo.html").CustomHtmlRepresentationThing;

tests/baselines/reference/declarationEmitTransitiveImportOfHtmlDeclarationItem.symbols

@@ -0,0 +1,23 @@
+=== tests/cases/compiler/foo.d.html.ts ===
+export declare class CustomHtmlRepresentationThing {}
+>CustomHtmlRepresentationThing : Symbol(CustomHtmlRepresentationThing, Decl(foo.d.html.ts, 0, 0))
+
+=== tests/cases/compiler/reexporter.ts ===
+import { CustomHtmlRepresentationThing } from "./foo.html";
+>CustomHtmlRepresentationThing : Symbol(CustomHtmlRepresentationThing, Decl(reexporter.ts, 0, 8))
+
+export function func() {
+>func : Symbol(func, Decl(reexporter.ts, 0, 59))
+
+    return new CustomHtmlRepresentationThing();
+>CustomHtmlRepresentationThing : Symbol(CustomHtmlRepresentationThing, Decl(reexporter.ts, 0, 8))
+}
+
+=== tests/cases/compiler/index.ts ===
+import { func } from "./reexporter";
+>func : Symbol(func, Decl(index.ts, 0, 8))
+
+export const c = func();
+>c : Symbol(c, Decl(index.ts, 1, 12))
+>func : Symbol(func, Decl(index.ts, 0, 8))
+

tests/baselines/reference/declarationEmitTransitiveImportOfHtmlDeclarationItem.types

@@ -0,0 +1,25 @@
+=== tests/cases/compiler/foo.d.html.ts ===
+export declare class CustomHtmlRepresentationThing {}
+>CustomHtmlRepresentationThing : CustomHtmlRepresentationThing
+
+=== tests/cases/compiler/reexporter.ts ===
+import { CustomHtmlRepresentationThing } from "./foo.html";
+>CustomHtmlRepresentationThing : typeof CustomHtmlRepresentationThing
+
+export function func() {
+>func : () => CustomHtmlRepresentationThing
+
+    return new CustomHtmlRepresentationThing();
+>new CustomHtmlRepresentationThing() : CustomHtmlRepresentationThing
+>CustomHtmlRepresentationThing : typeof CustomHtmlRepresentationThing
+}
+
+=== tests/cases/compiler/index.ts ===
+import { func } from "./reexporter";
+>func : () => import("tests/cases/compiler/foo.d.html").CustomHtmlRepresentationThing
+
+export const c = func();
+>c : import("tests/cases/compiler/foo.d.html").CustomHtmlRepresentationThing
+>func() : import("tests/cases/compiler/foo.d.html").CustomHtmlRepresentationThing
+>func : () => import("tests/cases/compiler/foo.d.html").CustomHtmlRepresentationThing
+

tests/cases/compiler/declarationEmitTransitiveImportOfHtmlDeclarationItem.ts

@@ -0,0 +1,15 @@
+// @declaration: true
+// @allowNonJsExtensions: true
+// @filename: foo.d.html.ts
+export declare class CustomHtmlRepresentationThing {}
+
+// @filename: reexporter.ts
+import { CustomHtmlRepresentationThing } from "./foo.html";
+
+export function func() {
+    return new CustomHtmlRepresentationThing();
+}
+
+// @filename: index.ts
+import { func } from "./reexporter";
+export const c = func();