Fix generating module specifiers verbatim from exports (#1087)

Author: andrewbranch

internal/modulespecifiers/specifiers.go

@@ -688,7 +688,7 @@ func tryGetModuleNameAsNodeModule(
 				return "" // File is under this package.json, but is not publicly exported - there's no way to name it via `node_modules` resolution
 			}
 			if verbatimFromExports {
-				return moduleFileName
+				return moduleFileToTry
 			}
 			//}
 			if len(packageRootPath) > 0 {

testdata/baselines/reference/submodule/compiler/declarationEmitBundlerConditions.errors.txt

@@ -37,4 +37,4 @@ export const c = makeC();
 import { C } from "pkg";
 export declare function makeC(): C;
 //// [index.d.ts]
-export declare const c: any;
+export declare const c: import("pkg").C;

testdata/baselines/reference/submodule/compiler/declarationEmitBundlerConditions.errors.txt.diff

@@ -163,8 +163,8 @@ export declare const e: typeof import("inner/mjs");
 export declare const a: Promise<typeof import("./index.cts")>;
 export declare const b: Promise<typeof import("package/mjs", { with: { "resolution-mode": "import" } })>;
 export declare const c: Promise<typeof import("package", { with: { "resolution-mode": "import" } })>;
-export declare const f: Promise<typeof import("inner", { with: { "resolution-mode": "import" } })>;
+export declare const f: Promise<typeof import("inner")>;
 //// [other2.d.cts]
 // cjs format file, no TLA
-export declare const d: Promise<typeof import("inner/cjs", { with: { "resolution-mode": "import" } })>;
+export declare const d: Promise<typeof import("inner/cjs")>;
 export declare const e: Promise<typeof import("inner/mjs", { with: { "resolution-mode": "import" } })>;

testdata/baselines/reference/submodule/compiler/declarationEmitBundlerConditions.js

@@ -127,12 +127,12 @@
 -    cjsMain: true;
 -    default: typeof import("inner");
 -}>;
-+export declare const f: Promise<typeof import("inner", { with: { "resolution-mode": "import" } })>;
++export declare const f: Promise<typeof import("inner")>;
  //// [other2.d.cts]
 -export declare const d: Promise<{
 -    cjsNonmain: true;
 -    default: typeof import("inner/cjs");
 -}>;
 +// cjs format file, no TLA
-+export declare const d: Promise<typeof import("inner/cjs", { with: { "resolution-mode": "import" } })>;
++export declare const d: Promise<typeof import("inner/cjs")>;
  export declare const e: Promise<typeof import("inner/mjs", { with: { "resolution-mode": "import" } })>;

testdata/baselines/reference/submodule/compiler/declarationEmitBundlerConditions.js.diff

@@ -110,15 +110,15 @@ export const c = import("package");
 >"package" : "package"
 
 export const f = import("inner");
->f : Promise<typeof import("./node_modules/inner")>
->import("inner") : Promise<typeof import("./node_modules/inner")>
+>f : Promise<typeof import("inner")>
+>import("inner") : Promise<typeof import("inner")>
 >"inner" : "inner"
 
 === other2.cts ===
 // cjs format file, no TLA
 export const d = import("inner/cjs");
->d : Promise<typeof import("./node_modules/inner/index.d.cts")>
->import("inner/cjs") : Promise<typeof import("./node_modules/inner/index.d.cts")>
+>d : Promise<typeof import("inner/cjs")>
+>import("inner/cjs") : Promise<typeof import("inner/cjs")>
 >"inner/cjs" : "inner/cjs"
 
 export const e = import("inner/mjs");

testdata/baselines/reference/submodule/conformance/nodeModulesDeclarationEmitDynamicImportWithPackageExports(module=node18).js

@@ -143,17 +143,17 @@
  export const f = import("inner");
 ->f : Promise<{ cjsMain: true; default: typeof import("node_modules/inner/index"); }>
 ->import("inner") : Promise<{ cjsMain: true; default: typeof import("node_modules/inner/index"); }>
-+>f : Promise<typeof import("./node_modules/inner")>
-+>import("inner") : Promise<typeof import("./node_modules/inner")>
++>f : Promise<typeof import("inner")>
++>import("inner") : Promise<typeof import("inner")>
  >"inner" : "inner"
 
  === other2.cts ===
  // cjs format file, no TLA
  export const d = import("inner/cjs");
 ->d : Promise<{ cjsNonmain: true; default: typeof import("node_modules/inner/index"); }>
 ->import("inner/cjs") : Promise<{ cjsNonmain: true; default: typeof import("node_modules/inner/index"); }>
-+>d : Promise<typeof import("./node_modules/inner/index.d.cts")>
-+>import("inner/cjs") : Promise<typeof import("./node_modules/inner/index.d.cts")>
++>d : Promise<typeof import("inner/cjs")>
++>import("inner/cjs") : Promise<typeof import("inner/cjs")>
  >"inner/cjs" : "inner/cjs"
 
  export const e = import("inner/mjs");

testdata/baselines/reference/submodule/conformance/nodeModulesDeclarationEmitDynamicImportWithPackageExports(module=node18).js.diff

@@ -169,12 +169,12 @@ export declare const b: Promise<typeof import("package/mjs", { with: { "resoluti
 export declare const c: Promise<typeof import("package", { with: { "resolution-mode": "import" } })>;
 export declare const f: Promise<{
     cjsMain: true;
-    default: typeof import("inner", { with: { "resolution-mode": "import" } });
+    default: typeof import("inner");
 }>;
 //// [other2.d.cts]
 // cjs format file, no TLA
 export declare const d: Promise<{
     cjsNonmain: true;
-    default: typeof import("inner/cjs", { with: { "resolution-mode": "import" } });
+    default: typeof import("inner/cjs");
 }>;
 export declare const e: Promise<typeof import("inner/mjs", { with: { "resolution-mode": "import" } })>;