From 884030b30026583059f087cb3ad846cb5e281678 Mon Sep 17 00:00:00 2001
From: Michael Cousins <michael@cousins.io>
Date: Fri, 1 Nov 2024 10:58:04 -0400
Subject: [PATCH 1/2] fix(types): accept `MockInstance` as stubbing target

---
 src/stubs.ts          | 12 ++++++------
 src/types.ts          | 17 +++++++++++++++++
 src/vitest-when.ts    |  4 ++--
 test/typing.test-d.ts | 10 ++++++++++
 4 files changed, 35 insertions(+), 8 deletions(-)

diff --git a/src/stubs.ts b/src/stubs.ts
index 759d7ee..004c755 100644
--- a/src/stubs.ts
+++ b/src/stubs.ts
@@ -1,11 +1,10 @@
-import type { Mock } from 'vitest'
 import {
   createBehaviorStack,
   type BehaviorStack,
   BehaviorType,
 } from './behaviors.ts'
 import { NotAMockFunctionError } from './errors.ts'
-import type { AnyFunction } from './types.ts'
+import type { AnyFunction, MockInstance } from './types.ts'
 
 const BEHAVIORS_KEY = Symbol('behaviors')
 
@@ -63,9 +62,10 @@ export const configureStub = <TFunc extends AnyFunction>(
   return behaviors
 }
 
-export const validateSpy = (maybeSpy: unknown): Mock => {
+export const validateSpy = (maybeSpy: unknown): MockInstance => {
   if (
-    typeof maybeSpy === 'function' &&
+    maybeSpy &&
+    (typeof maybeSpy === 'function' || typeof maybeSpy === 'object') &&
     'mockImplementation' in maybeSpy &&
     typeof maybeSpy.mockImplementation === 'function' &&
     'getMockImplementation' in maybeSpy &&
@@ -73,14 +73,14 @@ export const validateSpy = (maybeSpy: unknown): Mock => {
     'getMockName' in maybeSpy &&
     typeof maybeSpy.getMockName === 'function'
   ) {
-    return maybeSpy as Mock
+    return maybeSpy as MockInstance
   }
 
   throw new NotAMockFunctionError(maybeSpy)
 }
 
 export const getBehaviorStack = <TFunc extends AnyFunction>(
-  spy: Mock,
+  spy: MockInstance,
 ): BehaviorStack<TFunc> | undefined => {
   const existingImplementation = spy.getMockImplementation() as
     | WhenStubImplementation<TFunc>
diff --git a/src/types.ts b/src/types.ts
index 08b5f82..2791792 100644
--- a/src/types.ts
+++ b/src/types.ts
@@ -2,3 +2,20 @@
 
 /** Any function, for use in `extends` */
 export type AnyFunction = (...args: never[]) => unknown
+
+/**
+ * Minimally typed version of Vitest's `MockInstance`.
+ *
+ * Used to ensure backwards compatibility
+ * with older versions of Vitest.
+ */
+export interface MockInstance<TFunc extends AnyFunction = AnyFunction> {
+  getMockName(): string
+  getMockImplementation(): TFunc | undefined
+  mockImplementation: (impl: TFunc) => this
+  mock: MockContext<TFunc>
+}
+
+export interface MockContext<TFunc extends AnyFunction> {
+  calls: Parameters<TFunc>[]
+}
diff --git a/src/vitest-when.ts b/src/vitest-when.ts
index f582e7f..0577b08 100644
--- a/src/vitest-when.ts
+++ b/src/vitest-when.ts
@@ -1,6 +1,6 @@
 import { configureStub } from './stubs.ts'
 import type { WhenOptions } from './behaviors.ts'
-import type { AnyFunction } from './types.ts'
+import type { AnyFunction, MockInstance } from './types.ts'
 import { getDebug, type DebugResult } from './debug.ts'
 
 export { type WhenOptions, type Behavior, BehaviorType } from './behaviors.ts'
@@ -22,7 +22,7 @@ export interface Stub<TArgs extends unknown[], TReturn> {
 }
 
 export const when = <TFunc extends AnyFunction>(
-  spy: TFunc,
+  spy: TFunc | MockInstance<TFunc>,
   options: WhenOptions = {},
 ): StubWrapper<TFunc> => {
   const behaviorStack = configureStub(spy)
diff --git a/test/typing.test-d.ts b/test/typing.test-d.ts
index 98e8295..05d6efb 100644
--- a/test/typing.test-d.ts
+++ b/test/typing.test-d.ts
@@ -23,6 +23,16 @@ describe('vitest-when type signatures', () => {
     assertType<subject.Stub<[number], any>>(stub)
   })
 
+  it('should handle an spied function', () => {
+    const target = { simple }
+    const spy = vi.spyOn(target, 'simple')
+    const stub = subject.when(spy).calledWith(1)
+
+    stub.thenReturn('hello')
+
+    assertType<subject.Stub<[number], any>>(stub)
+  })
+
   it('should handle a simple function', () => {
     const stub = subject.when(simple).calledWith(1)
 

From 50f7f839544d6c901e4e1ed49aec30b8c9ab871f Mon Sep 17 00:00:00 2001
From: Michael Cousins <michael@cousins.io>
Date: Fri, 1 Nov 2024 11:27:37 -0400
Subject: [PATCH 2/2] fixup: avoid runtime change

---
 src/stubs.ts | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/stubs.ts b/src/stubs.ts
index 004c755..ea0186b 100644
--- a/src/stubs.ts
+++ b/src/stubs.ts
@@ -64,8 +64,7 @@ export const configureStub = <TFunc extends AnyFunction>(
 
 export const validateSpy = (maybeSpy: unknown): MockInstance => {
   if (
-    maybeSpy &&
-    (typeof maybeSpy === 'function' || typeof maybeSpy === 'object') &&
+    typeof maybeSpy === 'function' &&
     'mockImplementation' in maybeSpy &&
     typeof maybeSpy.mockImplementation === 'function' &&
     'getMockImplementation' in maybeSpy &&
@@ -73,7 +72,7 @@ export const validateSpy = (maybeSpy: unknown): MockInstance => {
     'getMockName' in maybeSpy &&
     typeof maybeSpy.getMockName === 'function'
   ) {
-    return maybeSpy as MockInstance
+    return maybeSpy as unknown as MockInstance
   }
 
   throw new NotAMockFunctionError(maybeSpy)