fix: display both ts and runtime tests in the terminal

vitest-dev · Aug 13, 2024 · ed33074 · ed33074
1 parent 6aa70d6
commit ed33074
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 9 deletions.
diff --git a/packages/vitest/src/node/pools/typecheck.ts b/packages/vitest/src/node/pools/typecheck.ts
@@ -10,7 +10,7 @@ import type { WorkspaceProject } from '../workspace'
 
 export function createTypecheckPool(ctx: Vitest): ProcessPool {
   const promisesMap = new WeakMap<WorkspaceProject, DeferPromise<void>>()
-  const rerunTriggered = new WeakMap<WorkspaceProject, boolean>()
+  const rerunTriggered = new WeakSet<WorkspaceProject>()
 
   async function onParseEnd(
     project: WorkspaceProject,
@@ -36,7 +36,7 @@ export function createTypecheckPool(ctx: Vitest): ProcessPool {
 
     promisesMap.get(project)?.resolve()
 
-    rerunTriggered.set(project, false)
+    rerunTriggered.delete(project)
 
     // triggered by TSC watcher, not Vitest watcher, so we need to emulate what Vitest does in this case
     if (ctx.config.watch && !ctx.runningPromise) {
@@ -68,7 +68,7 @@ export function createTypecheckPool(ctx: Vitest): ProcessPool {
     checker.onParseEnd(result => onParseEnd(project, result))
 
     checker.onWatcherRerun(async () => {
-      rerunTriggered.set(project, true)
+      rerunTriggered.add(project)
 
       if (!ctx.runningPromise) {
         ctx.state.clearErrors()
@@ -123,7 +123,7 @@ export function createTypecheckPool(ctx: Vitest): ProcessPool {
       // check that watcher actually triggered rerun
       const _p = new Promise<boolean>((resolve) => {
         const _i = setInterval(() => {
-          if (!project.typechecker || rerunTriggered.get(project)) {
+          if (!project.typechecker || rerunTriggered.has(project)) {
             resolve(true)
             clearInterval(_i)
           }

diff --git a/packages/vitest/src/node/state.ts b/packages/vitest/src/node/state.ts
@@ -109,8 +109,8 @@ export class StateManager {
   collectFiles(project: WorkspaceProject, files: File[] = []) {
     files.forEach((file) => {
       const existing = this.filesMap.get(file.filepath) || []
-      const otherProject = existing.filter(
-        i => i.projectName !== file.projectName,
+      const otherFiles = existing.filter(
+        i => i.projectName !== file.projectName || i.meta.typecheck !== file.meta.typecheck,
       )
       const currentFile = existing.find(
         i => i.projectName === file.projectName,
@@ -120,8 +120,8 @@ export class StateManager {
       if (currentFile) {
         file.logs = currentFile.logs
       }
-      otherProject.push(file)
-      this.filesMap.set(file.filepath, otherProject)
+      otherFiles.push(file)
+      this.filesMap.set(file.filepath, otherFiles)
       this.updateId(file, project)
     })
   }

diff --git a/packages/vitest/src/typecheck/collect.ts b/packages/vitest/src/typecheck/collect.ts
@@ -127,6 +127,12 @@ export async function collectTests(
       const {
         arguments: [messageNode],
       } = node
+
+      if (!messageNode) {
+        // called as "test()"
+        return
+      }
+
       const message = getNodeAsString(messageNode, request.code)
 
       definitions.push({

diff --git a/packages/ws-client/src/state.ts b/packages/ws-client/src/state.ts
@@ -48,7 +48,7 @@ export class StateManager {
     files.forEach((file) => {
       const existing = this.filesMap.get(file.filepath) || []
       const otherProject = existing.filter(
-        i => i.projectName !== file.projectName,
+        i => i.projectName !== file.projectName || i.meta.typecheck !== file.meta.typecheck,
       )
       const currentFile = existing.find(
         i => i.projectName === file.projectName,