chore: vitest v4 fixes

Author: harlan-zw

test/e2e/extend-registry.test.ts

@@ -9,7 +9,7 @@ describe('basic', async () => {
   await setup({
     rootDir: resolve('../fixtures/extend-registry'),
   })
-  it('extended registry script loads and executes function', async () => {
+  it('extended registry script loads and executes function', { timeout: 30000 }, async () => {
     const page = await createPage()
     const logs: { text: string, location: string }[] = []
     // visit and collect all logs, we need to do a snapshot on them
@@ -37,7 +37,5 @@ describe('basic', async () => {
         },
       ]
     `)
-  }, {
-    timeout: 30000,
   })
 })

test/unit/__mocks__/google-maps-api.ts

@@ -33,28 +33,44 @@ export const createMockMarkerClusterer = () => ({
   render: vi.fn(),
 })
 
+// Class-based mocks for Vitest 4 constructor support - returns shared instance
+const createMockClass = <T>(instance: T) => {
+  const MockClass = vi.fn(function () {
+    return instance
+  }) as unknown as (new (...args: any[]) => T) & ReturnType<typeof vi.fn>
+  return MockClass
+}
+
 export const createMockGoogleMapsAPI = () => {
   const mockMarker = createMockMarker()
   const mockAdvancedMarkerElement = createMockAdvancedMarkerElement()
   const mockInfoWindow = createMockInfoWindow()
   const mockPinElement = createMockPinElement()
   const mockMarkerClusterer = createMockMarkerClusterer()
 
+  const MockMarker = createMockClass(mockMarker)
+  const MockAdvancedMarkerElement = createMockClass(mockAdvancedMarkerElement)
+  const MockPinElement = createMockClass(mockPinElement)
+  const MockInfoWindow = createMockClass(mockInfoWindow)
+  const MockLatLng = vi.fn(function (this: any, lat: number, lng: number) {
+    return { lat, lng }
+  }) as unknown as (new (lat: number, lng: number) => { lat: number, lng: number }) & ReturnType<typeof vi.fn>
+
   const mockMapsApi = {
-    Marker: vi.fn(() => mockMarker),
+    Marker: MockMarker,
     marker: {
-      AdvancedMarkerElement: vi.fn(() => mockAdvancedMarkerElement),
-      PinElement: vi.fn(() => mockPinElement),
+      AdvancedMarkerElement: MockAdvancedMarkerElement,
+      PinElement: MockPinElement,
     },
-    InfoWindow: vi.fn(() => mockInfoWindow),
+    InfoWindow: MockInfoWindow,
     event: {
       clearInstanceListeners: vi.fn(),
     },
     importLibrary: vi.fn().mockResolvedValue({
-      AdvancedMarkerElement: vi.fn(() => mockAdvancedMarkerElement),
-      PinElement: vi.fn(() => mockPinElement),
+      AdvancedMarkerElement: MockAdvancedMarkerElement,
+      PinElement: MockPinElement,
     }),
-    LatLng: vi.fn((lat: number, lng: number) => ({ lat, lng })),
+    LatLng: MockLatLng,
   }
 
   return {

test/unit/__mocks__/markerclusterer.ts

@@ -1,13 +1,14 @@
 import { vi } from 'vitest'
 
-export const MarkerClusterer = vi.fn().mockImplementation(options => ({
-  addMarker: vi.fn(),
-  removeMarker: vi.fn(),
-  setMap: vi.fn(),
-  addListener: vi.fn(),
-  render: vi.fn(),
-  ...options,
-}))
+export const MarkerClusterer = vi.fn(function (this: any, options: any) {
+  this.addMarker = vi.fn()
+  this.removeMarker = vi.fn()
+  this.setMap = vi.fn()
+  this.addListener = vi.fn()
+  this.render = vi.fn()
+  Object.assign(this, options)
+  return this
+}) as unknown as (new (options: any) => any) & ReturnType<typeof vi.fn>
 
 // Mock the entire module
 const mockMarkerClusterer = { MarkerClusterer }