Fix trace loading

Author: andrewbranch

package-lock.json

@@ -21,7 +21,7 @@
     "@changesets/cli": "^2.26.1",
     "@types/node": "^18.11.18",
     "prettier": "^2.8.3",
-    "typescript": "^5.0.0-dev.20230207"
+    "typescript": "^5.1.3"
   },
   "volta": {
     "node": "19.8.1"

package.json

@@ -52,12 +52,12 @@
     "@andrewbranch/untar.js": "^1.0.0",
     "fetch-ponyfill": "^7.1.0",
     "fflate": "^0.7.4",
-    "typescript": "^5.0.0-dev.20230207",
+    "typescript": "^5.1.3",
     "validate-npm-package-name": "^5.0.0"
   },
   "devDependencies": {
     "@types/node": "^18.15.11",
-    "@types/ts-expose-internals": "npm:ts-expose-internals@4.9.4",
+    "@types/ts-expose-internals": "npm:ts-expose-internals@5.1.3",
     "@types/validate-npm-package-name": "^4.0.0"
   },
   "volta": {

packages/core/package.json

@@ -59,7 +59,6 @@ export function createMultiCompilerHost(fs: FS): MultiCompilerHost {
       traceResolution: true,
     },
     bundler: {
-      // @ts-expect-error
       moduleResolution: ts.ModuleResolutionKind.Bundler,
       module: ts.ModuleKind.ESNext,
       target: ts.ScriptTarget.Latest,
@@ -182,15 +181,22 @@ export function createMultiCompilerHost(fs: FS): MultiCompilerHost {
     );
     const trace = traceCollector.read();
     const moduleKey = `${resolutionMode ?? 1}:${moduleName}`;
-    (traceCache[moduleResolution][containingFile] ??= {})[moduleKey] = trace;
+    if (!traceCache[moduleResolution][containingFile]?.[moduleKey]) {
+      (traceCache[moduleResolution][containingFile] ??= {})[moduleKey] = trace;
+    }
     return {
       resolution,
       trace,
     };
   }
 
-  function getTrace(moduleResolution: ResolutionOption, fromFileName: string, key: string): string[] | undefined {
-    return traceCache[moduleResolution][fromFileName]?.[key];
+  function getTrace(
+    moduleResolution: ResolutionOption,
+    fromFileName: string,
+    moduleSpecifier: string,
+    resolutionMode: ts.ModuleKind.ESNext | ts.ModuleKind.CommonJS
+  ): string[] | undefined {
+    return traceCache[moduleResolution][fromFileName]?.[`${resolutionMode ?? 1}:${moduleSpecifier}`];
   }
 
   function createProgram(moduleResolution: ResolutionOption, rootNames: string[]): ts.Program {
@@ -231,6 +237,18 @@ export function createMultiCompilerHost(fs: FS): MultiCompilerHost {
       useCaseSensitiveFileNames,
       getNewLine,
       trace: traceCollector.trace,
+      resolveModuleNameLiterals(moduleLiterals, containingFile, _redirectedReference, options, containingSourceFile) {
+        return moduleLiterals.map(
+          (literal) =>
+            resolveModuleName(
+              literal.text,
+              containingFile,
+              moduleResolution,
+              ts.getModeForUsageLocation(containingSourceFile, literal),
+              options.noDtsResolution
+            ).resolution
+        );
+      },
     };
   }