From 9ede26e3695a610877cf77ad364861f0473cf325 Mon Sep 17 00:00:00 2001
From: Vladimir Sheremet <sheremet.va@icloud.com>
Date: Wed, 22 Jun 2022 13:45:43 +0300
Subject: [PATCH 1/3] feat: rename mock types to match jest's

---
 packages/vitest/src/integrations/spy.ts | 22 +++++++++++-----------
 packages/vitest/src/types/index.ts      |  4 ++--
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/packages/vitest/src/integrations/spy.ts b/packages/vitest/src/integrations/spy.ts
index 99191f66c230..63a3ea6dab78 100644
--- a/packages/vitest/src/integrations/spy.ts
+++ b/packages/vitest/src/integrations/spy.ts
@@ -16,7 +16,7 @@ interface MockResultThrow {
 
 type MockResult<T> = MockResultReturn<T> | MockResultThrow | MockResultIncomplete
 
-export interface SpyContext<TArgs, TReturns> {
+export interface MockContext<TArgs, TReturns> {
   calls: TArgs[]
   instances: TReturns[]
   invocationCallOrder: number[]
@@ -41,7 +41,7 @@ export interface SpyInstance<TArgs extends any[] = any[], TReturns = any> {
 
   getMockName(): string
   mockName(n: string): this
-  mock: SpyContext<TArgs, TReturns>
+  mock: MockContext<TArgs, TReturns>
   mockClear(): this
   mockReset(): this
   mockRestore(): void
@@ -57,20 +57,20 @@ export interface SpyInstance<TArgs extends any[] = any[], TReturns = any> {
   mockRejectedValueOnce(obj: any): this
 }
 
-export interface SpyInstanceFn<TArgs extends any[] = any, TReturns = any> extends SpyInstance<TArgs, TReturns> {
-  (...args: TArgs): TReturns
+export interface Mock<TArgs extends any[] = any, TReturns = any> extends SpyInstance<TArgs, TReturns> {
   new (...args: TArgs): TReturns
+  (...args: TArgs): TReturns
 }
 
 export type MaybeMockedConstructor<T> = T extends new (
   ...args: Array<any>
 ) => infer R
-  ? SpyInstanceFn<ConstructorParameters<T>, R>
+  ? Mock<ConstructorParameters<T>, R>
   : T
-export type MockedFunction<T extends Procedure> = SpyInstanceFn<Parameters<T>, ReturnType<T>> & {
+export type MockedFunction<T extends Procedure> = Mock<Parameters<T>, ReturnType<T>> & {
   [K in keyof T]: T[K];
 }
-export type MockedFunctionDeep<T extends Procedure> = SpyInstanceFn<Parameters<T>, ReturnType<T>> & MockedObjectDeep<T>
+export type MockedFunctionDeep<T extends Procedure> = Mock<Parameters<T>, ReturnType<T>> & MockedObjectDeep<T>
 export type MockedObject<T> = MaybeMockedConstructor<T> & {
   [K in Methods<T>]: T[K] extends Procedure
     ? MockedFunction<T[K]>
@@ -244,12 +244,12 @@ function enhanceSpy<TArgs extends any[], TReturns>(
   return stub as any
 }
 
-export function fn<TArgs extends any[] = any[], R = any>(): SpyInstanceFn<TArgs, R>
+export function fn<TArgs extends any[] = any[], R = any>(): Mock<TArgs, R>
 export function fn<TArgs extends any[] = any[], R = any>(
   implementation: (...args: TArgs) => R
-): SpyInstanceFn<TArgs, R>
+): Mock<TArgs, R>
 export function fn<TArgs extends any[] = any[], R = any>(
   implementation?: (...args: TArgs) => R,
-): SpyInstanceFn<TArgs, R> {
-  return enhanceSpy(tinyspy.spyOn({ fn: implementation || (() => {}) }, 'fn')) as unknown as SpyInstanceFn
+): Mock<TArgs, R> {
+  return enhanceSpy(tinyspy.spyOn({ fn: implementation || (() => {}) }, 'fn')) as unknown as Mock
 }
diff --git a/packages/vitest/src/types/index.ts b/packages/vitest/src/types/index.ts
index fc9c8bb812f8..49c012f44c3c 100644
--- a/packages/vitest/src/types/index.ts
+++ b/packages/vitest/src/types/index.ts
@@ -14,6 +14,6 @@ export type {
   MockedFunction,
   MockedObject,
   SpyInstance,
-  SpyInstanceFn,
-  SpyContext,
+  Mock,
+  MockContext,
 } from '../integrations/spy'

From 15ebb2961fc5314f2696c4603bc80e51229d8a5a Mon Sep 17 00:00:00 2001
From: Vladimir Sheremet <sheremet.va@icloud.com>
Date: Thu, 23 Jun 2022 09:29:27 +0300
Subject: [PATCH 2/3] chore: cleaup

---
 packages/vitest/src/integrations/spy.ts | 24 ++++++++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/packages/vitest/src/integrations/spy.ts b/packages/vitest/src/integrations/spy.ts
index 63a3ea6dab78..88fc4a24aa3b 100644
--- a/packages/vitest/src/integrations/spy.ts
+++ b/packages/vitest/src/integrations/spy.ts
@@ -37,8 +37,6 @@ type Classes<T> = {
 }[keyof T] & (string | symbol)
 
 export interface SpyInstance<TArgs extends any[] = any[], TReturns = any> {
-  (...args: TArgs): TReturns
-
   getMockName(): string
   mockName(n: string): this
   mock: MockContext<TArgs, TReturns>
@@ -57,6 +55,8 @@ export interface SpyInstance<TArgs extends any[] = any[], TReturns = any> {
   mockRejectedValueOnce(obj: any): this
 }
 
+export interface MockInstance<A extends any[] = any[], R = any> extends SpyInstance<A, R> {}
+
 export interface Mock<TArgs extends any[] = any, TReturns = any> extends SpyInstance<TArgs, TReturns> {
   new (...args: TArgs): TReturns
   (...args: TArgs): TReturns
@@ -94,6 +94,26 @@ export type MaybeMocked<T> = T extends Procedure
     ? MockedObject<T>
     : T
 
+interface Constructable {
+  new (...args: any[]): any
+}
+
+export type MockedClass<T extends Constructable> = MockInstance<
+    InstanceType<T>,
+    T extends new (...args: infer P) => any ? P : never
+> & {
+  prototype: T extends { prototype: any } ? Mocked<T['prototype']> : never
+} & T
+
+export type Mocked<T> = {
+  [P in keyof T]: T[P] extends (...args: infer Args) => infer Returns
+    ? MockInstance<Args, Returns>
+    : T[P] extends Constructable
+      ? MockedClass<T[P]>
+      : T[P]
+} &
+T
+
 export type EnhancedSpy<TArgs extends any[] = any[], TReturns = any> = SpyInstance<TArgs, TReturns> & SpyImpl<TArgs, TReturns>
 
 export const spies = new Set<SpyInstance>()

From 9feccf089bb7e61b4e496e5fcd13b8c375f8f4a0 Mon Sep 17 00:00:00 2001
From: Vladimir Sheremet <sheremet.va@icloud.com>
Date: Thu, 23 Jun 2022 09:32:30 +0300
Subject: [PATCH 3/3] chore: expose types

---
 packages/vitest/src/types/index.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/vitest/src/types/index.ts b/packages/vitest/src/types/index.ts
index 49c012f44c3c..6635ce313c97 100644
--- a/packages/vitest/src/types/index.ts
+++ b/packages/vitest/src/types/index.ts
@@ -14,6 +14,9 @@ export type {
   MockedFunction,
   MockedObject,
   SpyInstance,
+  MockInstance,
   Mock,
   MockContext,
+  Mocked,
+  MockedClass,
 } from '../integrations/spy'