Fix Bun type conflicts: use FetchFn with explicit FetchResponse interface

Author: ndbroadbent

src/scraper/types.ts

@@ -4,10 +4,24 @@
  * Types for URL metadata scraping.
  */
 
+/**
+ * Minimal response interface that both standard Response and Bun's Response satisfy.
+ * Avoids Bun's BunResponseOverride type conflicts.
+ */
+interface FetchResponse {
+  readonly ok: boolean
+  readonly status: number
+  readonly headers: { get(name: string): string | null }
+  text(): Promise<string>
+  json(): Promise<unknown>
+  arrayBuffer(): Promise<ArrayBuffer>
+}
+
 /**
  * Fetch function type for dependency injection.
+ * Uses explicit interface to avoid Bun type conflicts.
  */
-export type FetchFn = typeof fetch
+export type FetchFn = (url: string, init?: RequestInit) => Promise<FetchResponse>
 
 /**
  * Configuration for the scraper.

src/search/openlibrary.ts

@@ -7,17 +7,13 @@
 
 import { generateCacheKey } from '../caching/key'
 import type { ResponseCache } from '../caching/types'
-import { type HttpResponse, httpFetch } from '../http'
+import { httpFetch } from '../http'
+import type { FetchFn } from '../scraper/types'
 import type { OpenLibraryResult } from './types'
 import { DEFAULT_TIMEOUT, DEFAULT_USER_AGENT } from './types'
 
 const SEARCH_API = 'https://openlibrary.org/search.json'
 
-/**
- * Fetch function type - returns HttpResponse which standard Response satisfies.
- */
-type FetchFn = (url: string, init?: RequestInit) => Promise<HttpResponse>
-
 /**
  * Configuration for Open Library search.
  */

src/search/types.ts

@@ -6,6 +6,7 @@
  */
 
 import type { ResponseCache } from '../caching/types'
+import type { FetchFn } from '../scraper/types'
 
 /**
  * Entity type categories for resolution.
@@ -182,7 +183,7 @@ export interface ResolverConfig {
   /** Request timeout in milliseconds (default: 30000) */
   timeout?: number | undefined
   /** Custom fetch function (for testing) */
-  customFetch?: ((url: string, init?: RequestInit) => Promise<Response>) | undefined
+  customFetch?: FetchFn | undefined
 }
 
 /**

src/search/wikidata.ts

@@ -7,7 +7,8 @@
 
 import { generateCacheKey } from '../caching/key'
 import type { ResponseCache } from '../caching/types'
-import { type HttpResponse, httpFetch } from '../http'
+import { httpFetch } from '../http'
+import type { FetchFn } from '../scraper/types'
 import type { EntityType, ExternalIdType, WikidataResult } from './types'
 import {
   DEFAULT_TIMEOUT,
@@ -19,11 +20,6 @@ import {
 
 const SPARQL_ENDPOINT = 'https://query.wikidata.org/sparql'
 
-/**
- * Fetch function type - returns HttpResponse which standard Response satisfies.
- */
-type FetchFn = (url: string, init?: RequestInit) => Promise<HttpResponse>
-
 /**
  * Configuration for Wikidata search.
  */

src/types/place-lookup.ts

@@ -4,6 +4,7 @@
  * Types for looking up places and getting coordinates.
  */
 
+import type { FetchFn } from '../scraper/types'
 import type { ClassifiedActivity } from './classifier'
 
 export type PlaceLookupSource = 'google_maps_url' | 'places_api' | 'geocoding_api'
@@ -50,7 +51,7 @@ export interface PlaceLookupConfig {
   readonly regionBias?: string | undefined
   readonly defaultCountry?: string | undefined
   /** Custom fetch function for testing */
-  readonly fetch?: typeof fetch | undefined
+  readonly fetch?: FetchFn | undefined
 }
 
 export interface PlaceLookupResult {