chore: rename typecheck

vitest-dev · Oct 26, 2022 · 2b5d9cc · 2b5d9cc
1 parent 9ea09f1
commit 2b5d9cc
Show file tree

Hide file tree

Showing 10 changed files with 298 additions and 412 deletions.
diff --git a/packages/vitest/src/runtime/collect.ts b/packages/vitest/src/runtime/collect.ts
@@ -102,7 +102,7 @@ export async function collectTests(paths: string[], config: ResolvedConfig): Pro
 /**
  * If any tasks been marked as `only`, mark all other tasks as `skip`.
  */
-function interpretTaskModes(suite: Suite, namePattern?: string | RegExp, onlyMode?: boolean, parentIsOnly?: boolean, allowOnly?: boolean) {
+export function interpretTaskModes(suite: Suite, namePattern?: string | RegExp, onlyMode?: boolean, parentIsOnly?: boolean, allowOnly?: boolean) {
   const suiteIsOnly = parentIsOnly || suite.mode === 'only'
 
   suite.tasks.forEach((t) => {
@@ -145,7 +145,7 @@ function getTaskFullName(task: TaskBase): string {
   return `${task.suite ? `${getTaskFullName(task.suite)} ` : ''}${task.name}`
 }
 
-function someTasksAreOnly(suite: Suite): boolean {
+export function someTasksAreOnly(suite: Suite): boolean {
   return suite.tasks.some(t => t.mode === 'only' || (t.type === 'suite' && someTasksAreOnly(t)))
 }
 

diff --git a/packages/vitest/src/typescript/assertType.ts → packages/vitest/src/typecheck/assertType.ts b/packages/vitest/src/typescript/assertType.ts → packages/vitest/src/typecheck/assertType.ts
diff --git a/packages/vitest/src/typescript/collect.ts → packages/vitest/src/typecheck/collect.ts b/packages/vitest/src/typescript/collect.ts → packages/vitest/src/typecheck/collect.ts
@@ -4,6 +4,7 @@ import { ancestor as walkAst } from 'acorn-walk'
 import type { RawSourceMap } from 'vite-node'
 
 import type { File, Suite, Vitest } from '../types'
+import { interpretTaskModes, someTasksAreOnly } from '../runtime/collect'
 import { TYPECHECK_SUITE } from './constants'
 
 interface ParsedFile extends File {
@@ -129,20 +130,8 @@ export async function collectTests(ctx: Vitest, filepath: string): Promise<null
       // to show correct amount of "tests" in summary, we mark this with a special symbol
       Object.defineProperty(task, TYPECHECK_SUITE, { value: true })
   })
-  const markSkippedTests = (suite: Suite) => {
-    const hasOnly = suite.tasks.some(task => task.mode === 'only')
-    suite.tasks.forEach((task) => {
-      if ((hasOnly && task.mode !== 'only') || suite.mode === 'skip') {
-        task.mode = 'skip'
-        task.result = {
-          state: 'skip',
-        }
-      }
-      if (task.type === 'suite')
-        markSkippedTests(task)
-    })
-  }
-  markSkippedTests(file)
+  const hasOnly = someTasksAreOnly(file)
+  interpretTaskModes(file, ctx.config.testNamePattern, hasOnly, false, ctx.config.allowOnly)
   return {
     file,
     parsed: request.code,

diff --git a/packages/vitest/src/typescript/constants.ts → packages/vitest/src/typecheck/constants.ts b/packages/vitest/src/typescript/constants.ts → packages/vitest/src/typecheck/constants.ts
diff --git a/...ges/vitest/src/typescript/expectTypeOf.ts → ...ages/vitest/src/typecheck/expectTypeOf.ts b/...ges/vitest/src/typescript/expectTypeOf.ts → ...ages/vitest/src/typecheck/expectTypeOf.ts
diff --git a/packages/vitest/src/typescript/parse.ts → packages/vitest/src/typecheck/parse.ts b/packages/vitest/src/typescript/parse.ts → packages/vitest/src/typecheck/parse.ts
diff --git a/...ages/vitest/src/typescript/typechecker.ts → packages/vitest/src/typecheck/typechecker.ts b/...ages/vitest/src/typescript/typechecker.ts → packages/vitest/src/typecheck/typechecker.ts
diff --git a/packages/vitest/src/typescript/types.ts → packages/vitest/src/typecheck/types.ts b/packages/vitest/src/typescript/types.ts → packages/vitest/src/typecheck/types.ts
diff --git a/packages/vitest/src/typescript/utils.ts → packages/vitest/src/typecheck/utils.ts b/packages/vitest/src/typescript/utils.ts → packages/vitest/src/typecheck/utils.ts