fix(vite-node): circular import stuck

examples/mocks/src/main.js

@@ -1,5 +1,10 @@
 import { funcA } from './A'
+import { funcB } from './B'
 
 export function main() {
   return funcA()
 }
+
+export function mainB() {
+  return funcB()
+}

examples/mocks/test/circular.spec.ts

@@ -1,18 +1,27 @@
 import { expect, test, vi } from 'vitest'
-import { main } from '../src/main.js'
+import { main, mainB } from '../src/main.js'
 import x from '../src/export-default-circle-index'
 
 vi.mock('../src/A', async () => ({
   ...(await vi.importActual<any>('../src/A')),
   funcA: () => 'mockedA',
 }))
 
+vi.mock('../src/B', async () => ({
+  ...(await vi.importActual<any>('../src/B')),
+  funcB: () => 'mockedB',
+}))
+
 vi.mock('../src/export-default-circle-b')
 
 test('can import actual inside mock factory', () => {
   expect(main()).toBe('mockedA')
 })
 
+test('can import in top level and inside mock factory', () => {
+  expect(mainB()).toBe('mockedB')
+})
+
 test('can mock a circular dependency', () => {
   expect(x()).toBe(undefined)
 })

packages/vite-node/src/client.ts

@@ -186,8 +186,7 @@ export class ViteNodeRunner {
 
     const mod = this.moduleCache.get(fsPath)
 
-    if (!mod.importers)
-      mod.importers = new Set()
+    mod.importers ??= new Set()
     if (importee)
       mod.importers.add(importee)
 
@@ -205,8 +204,11 @@ export class ViteNodeRunner {
 
     try {
       // cached module
-      if (mod.promise)
+      if (mod.promise) {
+        if (Array.from(mod.imports?.values() || []).some(i => mod.importers!.has(i)))
+          return mod.exports
         return await mod.promise
+      }
 
       const promise = this.directRequest(id, fsPath, callstack)
       Object.assign(mod, { promise, evaluated: false })
@@ -269,6 +271,10 @@ export class ViteNodeRunner {
 
     const request = async (dep: string) => {
       const [id, depFsPath] = await this.resolveUrl(`${dep}`, fsPath)
+      const depMod = this.moduleCache.getByModuleId(depFsPath)
+      ;(depMod.importers ??= new Set()).add(moduleId)
+      ;(mod.imports ??= new Set()).add(depFsPath)
+
       return this.dependencyRequest(id, depFsPath, callstack)
     }
 

packages/vite-node/src/types.ts

@@ -66,6 +66,7 @@ export interface ModuleCache {
    * Module ids that imports this module
    */
   importers?: Set<string>
+  imports?: Set<string>
 }
 
 export interface ViteNodeRunnerOptions {