fix: fix re-mocking virtual module

Author: hi-ogawa

packages/vitest/src/runtime/moduleRunner/bareModuleMocker.ts

@@ -234,6 +234,10 @@ export class BareModuleMocker implements TestModuleMocker {
     factory: MockFactory | undefined,
   ): void {
     const registry = this.getMockerRegistry()
+    // if (id.includes('virtual-module-direct')) {
+    //   console.log('[mockPath]', { id, url, external, mockType })
+    //   console.log(registry)
+    // }
 
     if (mockType === 'manual') {
       registry.register('manual', originalId, id, url, factory!)

packages/vitest/src/runtime/moduleRunner/moduleMocker.ts

@@ -67,6 +67,12 @@ export class VitestMocker extends BareModuleMocker {
   protected invalidateModuleById(id: string): void {
     const mockId = this.getMockPath(id)
     const node = this.evaluatedModules.getModuleById(mockId)
+    // console.log("[invalidateModuleById]", { id, mockId, node })
+    // console.log({
+    //   "virtual-module-direct": this.evaluatedModules.idToModuleMap.get("virtual-module-direct"),
+    //   "/@id/virtual-module-direct": this.evaluatedModules.idToModuleMap.get("/@id/virtual-module-direct"),
+    //   "mock:/@id/virtual-module-direct": this.evaluatedModules.idToModuleMap.get("mock:/@id/virtual-module-direct"),
+    // })
     if (node) {
       this.evaluatedModules.invalidateModule(node)
       node.mockedExports = undefined

packages/vitest/src/runtime/moduleRunner/startVitestModuleRunner.ts

@@ -108,8 +108,8 @@ export function startVitestModuleRunner(options: ContextModuleRunnerOptions): Vi
             return {
               code: '',
               file: null,
-              id,
-              url: id,
+              id: resolvedMock.id,
+              url: resolvedMock.url,
               invalidate: false,
               mockedModule: resolvedMock,
             }
@@ -137,6 +137,9 @@ export function startVitestModuleRunner(options: ContextModuleRunnerOptions): Vi
             options,
             otelCarrier,
           )
+          // if (id.includes('virtual-module-direct')) {
+          //   console.log("[fetchModule]", result)
+          // }
           if ('cached' in result) {
             const code = readFileSync(result.tmp, 'utf-8')
             return { code, ...result }

test/core/test/do-mock-reset-modules.test.ts

@@ -61,13 +61,11 @@ test('resetModules works with doMock for direct virtual module', async () => {
   vi.doMock('virtual-module-direct', () => ({
     value: 'direct-1',
   }))
-  vi.resetModules()
 
   // @ts-expect-error virtual module
   const { value: mockedValue1 } = await import('virtual-module-direct')
   expect(mockedValue1).toBe('direct-1')
 
-  vi.resetModules()
   vi.doMock('virtual-module-direct', () => ({
     value: 'direct-2',
   }))