Allow export map entries to remap back to input files for a program

weswigham · weswigham · commit 855803399cbc · 2022-02-16T15:47:08.000-08:00
diff --git a/src/compiler/moduleNameResolver.ts b/src/compiler/moduleNameResolver.ts
diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts
@@ -4355,6 +4355,16 @@ namespace ts {
             Extension.Dts;
     }
 
+    /**
+     * This function is an inverse of `getDeclarationEmitExtensionForPath`.
+     */
+    export function getPossibleOriginalInputExtensionForExtension(path: string) {
+        return fileExtensionIsOneOf(path, [Extension.Dmts, Extension.Mjs, Extension.Mts]) ? [Extension.Mts, Extension.Mjs] :
+            fileExtensionIsOneOf(path, [Extension.Dcts, Extension.Cjs, Extension.Cts]) ? [Extension.Cts, Extension.Cjs]:
+            fileExtensionIsOneOf(path, [`.json.d.ts`]) ? [Extension.Json] :
+            [Extension.Tsx, Extension.Ts, Extension.Jsx, Extension.Js];
+    }
+
     export function outFile(options: CompilerOptions) {
         return options.outFile || options.out;
     }
diff --git a/tests/baselines/reference/nodeNextPackageSelfNameWithOutDir.js b/tests/baselines/reference/nodeNextPackageSelfNameWithOutDir.js
@@ -0,0 +1,22 @@
+//// [tests/cases/compiler/nodeNextPackageSelfNameWithOutDir.ts] ////
+
+//// [package.json]
+{
+  "name": "@this/package",
+  "type": "module",
+  "exports": {
+    ".": "./dist/index.js"
+  }
+}
+//// [index.ts]
+import * as me from "@this/package";
+
+me.thing();
+
+export function thing(): void {}
+
+
+//// [index.js]
+import * as me from "@this/package";
+me.thing();
+export function thing() { }
diff --git a/tests/baselines/reference/nodeNextPackageSelfNameWithOutDir.symbols b/tests/baselines/reference/nodeNextPackageSelfNameWithOutDir.symbols
@@ -0,0 +1,12 @@
+=== tests/cases/compiler/index.ts ===
+import * as me from "@this/package";
+>me : Symbol(me, Decl(index.ts, 0, 6))
+
+me.thing();
+>me.thing : Symbol(thing, Decl(index.ts, 2, 11))
+>me : Symbol(me, Decl(index.ts, 0, 6))
+>thing : Symbol(thing, Decl(index.ts, 2, 11))
+
+export function thing(): void {}
+>thing : Symbol(thing, Decl(index.ts, 2, 11))
+
diff --git a/tests/baselines/reference/nodeNextPackageSelfNameWithOutDir.types b/tests/baselines/reference/nodeNextPackageSelfNameWithOutDir.types
@@ -0,0 +1,13 @@
+=== tests/cases/compiler/index.ts ===
+import * as me from "@this/package";
+>me : typeof me
+
+me.thing();
+>me.thing() : void
+>me.thing : () => void
+>me : typeof me
+>thing : () => void
+
+export function thing(): void {}
+>thing : () => void
+
diff --git a/tests/baselines/reference/nodeNextPackageSelfNameWithOutDirDeclDir.js b/tests/baselines/reference/nodeNextPackageSelfNameWithOutDirDeclDir.js
@@ -0,0 +1,29 @@
+//// [tests/cases/compiler/nodeNextPackageSelfNameWithOutDirDeclDir.ts] ////
+
+//// [package.json]
+{
+  "name": "@this/package",
+  "type": "module",
+  "exports": {
+    ".": {
+      "default": "./dist/index.js",
+      "types": "./types/index.d.ts"
+    }
+  }
+}
+//// [index.ts]
+import * as me from "@this/package";
+
+me.thing();
+
+export function thing(): void {}
+
+
+//// [index.js]
+import * as me from "@this/package";
+me.thing();
+export function thing() { }
+
+
+//// [index.d.ts]
+export declare function thing(): void;
diff --git a/tests/baselines/reference/nodeNextPackageSelfNameWithOutDirDeclDir.symbols b/tests/baselines/reference/nodeNextPackageSelfNameWithOutDirDeclDir.symbols
@@ -0,0 +1,12 @@
+=== tests/cases/compiler/index.ts ===
+import * as me from "@this/package";
+>me : Symbol(me, Decl(index.ts, 0, 6))
+
+me.thing();
+>me.thing : Symbol(thing, Decl(index.ts, 2, 11))
+>me : Symbol(me, Decl(index.ts, 0, 6))
+>thing : Symbol(thing, Decl(index.ts, 2, 11))
+
+export function thing(): void {}
+>thing : Symbol(thing, Decl(index.ts, 2, 11))
+
diff --git a/tests/baselines/reference/nodeNextPackageSelfNameWithOutDirDeclDir.types b/tests/baselines/reference/nodeNextPackageSelfNameWithOutDirDeclDir.types
@@ -0,0 +1,13 @@
+=== tests/cases/compiler/index.ts ===
+import * as me from "@this/package";
+>me : typeof me
+
+me.thing();
+>me.thing() : void
+>me.thing : () => void
+>me : typeof me
+>thing : () => void
+
+export function thing(): void {}
+>thing : () => void
+
diff --git a/tests/baselines/reference/nodeNextPackageSelfNameWithOutDirDeclDirComposite.js b/tests/baselines/reference/nodeNextPackageSelfNameWithOutDirDeclDirComposite.js
@@ -0,0 +1,29 @@
+//// [tests/cases/compiler/nodeNextPackageSelfNameWithOutDirDeclDirComposite.ts] ////
+
+//// [package.json]
+{
+  "name": "@this/package",
+  "type": "module",
+  "exports": {
+    ".": {
+      "default": "./dist/index.js",
+      "types": "./types/index.d.ts"
+    }
+  }
+}
+//// [index.ts]
+import * as me from "@this/package";
+
+me.thing();
+
+export function thing(): void {}
+
+
+//// [index.js]
+import * as me from "@this/package";
+me.thing();
+export function thing() { }
+
+
+//// [index.d.ts]
+export declare function thing(): void;
diff --git a/tests/baselines/reference/nodeNextPackageSelfNameWithOutDirDeclDirComposite.symbols b/tests/baselines/reference/nodeNextPackageSelfNameWithOutDirDeclDirComposite.symbols
@@ -0,0 +1,12 @@
+=== tests/cases/compiler/index.ts ===
+import * as me from "@this/package";
+>me : Symbol(me, Decl(index.ts, 0, 6))
+
+me.thing();
+>me.thing : Symbol(thing, Decl(index.ts, 2, 11))
+>me : Symbol(me, Decl(index.ts, 0, 6))
+>thing : Symbol(thing, Decl(index.ts, 2, 11))
+
+export function thing(): void {}
+>thing : Symbol(thing, Decl(index.ts, 2, 11))
+
diff --git a/tests/baselines/reference/nodeNextPackageSelfNameWithOutDirDeclDirComposite.types b/tests/baselines/reference/nodeNextPackageSelfNameWithOutDirDeclDirComposite.types
@@ -0,0 +1,13 @@
+=== tests/cases/compiler/index.ts ===
+import * as me from "@this/package";
+>me : typeof me
+
+me.thing();
+>me.thing() : void
+>me.thing : () => void
+>me : typeof me
+>thing : () => void
+
+export function thing(): void {}
+>thing : () => void
+
diff --git a/tests/baselines/reference/nodeNextPackageSelfNameWithOutDirDeclDirCompositeNestedDirs.js b/tests/baselines/reference/nodeNextPackageSelfNameWithOutDirDeclDirCompositeNestedDirs.js
@@ -0,0 +1,46 @@
+//// [tests/cases/compiler/nodeNextPackageSelfNameWithOutDirDeclDirCompositeNestedDirs.ts] ////
+
+//// [package.json]
+{
+  "name": "@this/package",
+  "type": "module",
+  "exports": {
+    ".": {
+      "default": "./dist/index.js",
+      "types": "./types/index.d.ts"
+    }
+  }
+}
+//// [index.ts]
+export {srcthing as thing} from "./src/thing.js";
+//// [thing.ts]
+// The following import should cause `index.ts`
+// to be included in the build, which will,
+// in turn, cause the common src directory to not be `src`
+// (the harness is wierd here in that noImplicitReferences makes only
+// this file get loaded as an entrypoint and emitted, while on the
+// real command-line we'll crawl the imports for that set - a limitation
+// of the harness, I suppose)
+import * as me from "@this/package";
+
+me.thing();
+
+export function srcthing(): void {}
+
+
+
+//// [thing.js]
+// The following import should cause `index.ts`
+// to be included in the build, which will,
+// in turn, cause the common src directory to not be `src`
+// (the harness is wierd here in that noImplicitReferences makes only
+// this file get loaded as an entrypoint and emitted, while on the
+// real command-line we'll crawl the imports for that set - a limitation
+// of the harness, I suppose)
+import * as me from "@this/package";
+me.thing();
+export function srcthing() { }
+
+
+//// [thing.d.ts]
+export declare function srcthing(): void;
diff --git a/tests/baselines/reference/nodeNextPackageSelfNameWithOutDirDeclDirCompositeNestedDirs.symbols b/tests/baselines/reference/nodeNextPackageSelfNameWithOutDirDeclDirCompositeNestedDirs.symbols
@@ -0,0 +1,25 @@
+=== tests/cases/compiler/src/thing.ts ===
+// The following import should cause `index.ts`
+// to be included in the build, which will,
+// in turn, cause the common src directory to not be `src`
+// (the harness is wierd here in that noImplicitReferences makes only
+// this file get loaded as an entrypoint and emitted, while on the
+// real command-line we'll crawl the imports for that set - a limitation
+// of the harness, I suppose)
+import * as me from "@this/package";
+>me : Symbol(me, Decl(thing.ts, 7, 6))
+
+me.thing();
+>me.thing : Symbol(me.thing, Decl(index.ts, 0, 8))
+>me : Symbol(me, Decl(thing.ts, 7, 6))
+>thing : Symbol(me.thing, Decl(index.ts, 0, 8))
+
+export function srcthing(): void {}
+>srcthing : Symbol(srcthing, Decl(thing.ts, 9, 11))
+
+
+=== tests/cases/compiler/index.ts ===
+export {srcthing as thing} from "./src/thing.js";
+>srcthing : Symbol(srcthing, Decl(thing.ts, 9, 11))
+>thing : Symbol(thing, Decl(index.ts, 0, 8))
+
diff --git a/tests/baselines/reference/nodeNextPackageSelfNameWithOutDirDeclDirCompositeNestedDirs.types b/tests/baselines/reference/nodeNextPackageSelfNameWithOutDirDeclDirCompositeNestedDirs.types
@@ -0,0 +1,26 @@
+=== tests/cases/compiler/src/thing.ts ===
+// The following import should cause `index.ts`
+// to be included in the build, which will,
+// in turn, cause the common src directory to not be `src`
+// (the harness is wierd here in that noImplicitReferences makes only
+// this file get loaded as an entrypoint and emitted, while on the
+// real command-line we'll crawl the imports for that set - a limitation
+// of the harness, I suppose)
+import * as me from "@this/package";
+>me : typeof me
+
+me.thing();
+>me.thing() : void
+>me.thing : () => void
+>me : typeof me
+>thing : () => void
+
+export function srcthing(): void {}
+>srcthing : () => void
+
+
+=== tests/cases/compiler/index.ts ===
+export {srcthing as thing} from "./src/thing.js";
+>srcthing : () => void
+>thing : () => void
+
diff --git a/tests/baselines/reference/nodeNextPackageSelfNameWithOutDirDeclDirRootDir.js b/tests/baselines/reference/nodeNextPackageSelfNameWithOutDirDeclDirRootDir.js
@@ -0,0 +1,29 @@
+//// [tests/cases/compiler/nodeNextPackageSelfNameWithOutDirDeclDirRootDir.ts] ////
+
+//// [package.json]
+{
+  "name": "@this/package",
+  "type": "module",
+  "exports": {
+    ".": {
+      "default": "./dist/index.js",
+      "types": "./types/index.d.ts"
+    }
+  }
+}
+//// [index.ts]
+import * as me from "@this/package";
+
+me.thing();
+
+export function thing(): void {}
+
+
+//// [index.js]
+import * as me from "@this/package";
+me.thing();
+export function thing() { }
+
+
+//// [index.d.ts]
+export declare function thing(): void;
diff --git a/tests/baselines/reference/nodeNextPackageSelfNameWithOutDirDeclDirRootDir.symbols b/tests/baselines/reference/nodeNextPackageSelfNameWithOutDirDeclDirRootDir.symbols
@@ -0,0 +1,12 @@
+=== /pkg/src/index.ts ===
+import * as me from "@this/package";
+>me : Symbol(me, Decl(index.ts, 0, 6))
+
+me.thing();
+>me.thing : Symbol(thing, Decl(index.ts, 2, 11))
+>me : Symbol(me, Decl(index.ts, 0, 6))
+>thing : Symbol(thing, Decl(index.ts, 2, 11))
+
+export function thing(): void {}
+>thing : Symbol(thing, Decl(index.ts, 2, 11))
+
diff --git a/tests/baselines/reference/nodeNextPackageSelfNameWithOutDirDeclDirRootDir.types b/tests/baselines/reference/nodeNextPackageSelfNameWithOutDirDeclDirRootDir.types
@@ -0,0 +1,13 @@
+=== /pkg/src/index.ts ===
+import * as me from "@this/package";
+>me : typeof me
+
+me.thing();
+>me.thing() : void
+>me.thing : () => void
+>me : typeof me
+>thing : () => void
+
+export function thing(): void {}
+>thing : () => void
+
diff --git a/tests/cases/compiler/nodeNextPackageSelfNameWithOutDir.ts b/tests/cases/compiler/nodeNextPackageSelfNameWithOutDir.ts
@@ -0,0 +1,16 @@
+// @module: nodenext
+// @outDir: ./dist
+// @filename: package.json
+{
+  "name": "@this/package",
+  "type": "module",
+  "exports": {
+    ".": "./dist/index.js"
+  }
+}
+// @filename: index.ts
+import * as me from "@this/package";
+
+me.thing();
+
+export function thing(): void {}
diff --git a/tests/cases/compiler/nodeNextPackageSelfNameWithOutDirDeclDir.ts b/tests/cases/compiler/nodeNextPackageSelfNameWithOutDirDeclDir.ts
@@ -0,0 +1,21 @@
+// @module: nodenext
+// @outDir: ./dist
+// @declarationDir: ./types
+// @declaration: true
+// @filename: package.json
+{
+  "name": "@this/package",
+  "type": "module",
+  "exports": {
+    ".": {
+      "default": "./dist/index.js",
+      "types": "./types/index.d.ts"
+    }
+  }
+}
+// @filename: index.ts
+import * as me from "@this/package";
+
+me.thing();
+
+export function thing(): void {}
diff --git a/tests/cases/compiler/nodeNextPackageSelfNameWithOutDirDeclDirComposite.ts b/tests/cases/compiler/nodeNextPackageSelfNameWithOutDirDeclDirComposite.ts
diff --git a/tests/cases/compiler/nodeNextPackageSelfNameWithOutDirDeclDirCompositeNestedDirs.ts b/tests/cases/compiler/nodeNextPackageSelfNameWithOutDirDeclDirCompositeNestedDirs.ts
diff --git a/tests/cases/compiler/nodeNextPackageSelfNameWithOutDirDeclDirRootDir.ts b/tests/cases/compiler/nodeNextPackageSelfNameWithOutDirDeclDirRootDir.ts
