From f53a0c52a0e8a5f25dee2e3de4932ba25969a0a9 Mon Sep 17 00:00:00 2001
From: mrjvs <jellevs@gmail.com>
Date: Wed, 27 Sep 2023 19:50:55 +0200
Subject: [PATCH] fix compile errors for fetch-likes

---
 src/dev-cli.ts                | 2 +-
 src/fetchers/fetch.ts         | 4 ++--
 src/fetchers/simpleProxy.ts   | 4 ++--
 src/fetchers/standardFetch.ts | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/dev-cli.ts b/src/dev-cli.ts
index 2e691da..596034f 100644
--- a/src/dev-cli.ts
+++ b/src/dev-cli.ts
@@ -278,7 +278,7 @@ async function processOptions(options: CommandLineArguments) {
   let fetcher;
 
   if (options.fetcher === 'native') {
-    fetcher = makeStandardFetcher(fetch as any);
+    fetcher = makeStandardFetcher(fetch);
   } else {
     fetcher = makeStandardFetcher(nodeFetch);
   }
diff --git a/src/fetchers/fetch.ts b/src/fetchers/fetch.ts
index d797c4f..1d419f0 100644
--- a/src/fetchers/fetch.ts
+++ b/src/fetchers/fetch.ts
@@ -10,7 +10,7 @@ export type FetchOps = {
 };
 
 export type FetchHeaders = {
-  get(key: string): string | undefined;
+  get(key: string): string | null;
 };
 
 export type FetchReply = {
@@ -19,4 +19,4 @@ export type FetchReply = {
   headers: FetchHeaders;
 };
 
-export type FetchType = (url: string, ops?: FetchOps) => Promise<FetchReply>;
+export type FetchLike = (url: string, ops?: FetchOps | undefined) => Promise<FetchReply>;
diff --git a/src/fetchers/simpleProxy.ts b/src/fetchers/simpleProxy.ts
index 70b8602..07b048e 100644
--- a/src/fetchers/simpleProxy.ts
+++ b/src/fetchers/simpleProxy.ts
@@ -1,5 +1,5 @@
 import { makeFullUrl } from '@/fetchers/common';
-import { FetchType } from '@/fetchers/fetch';
+import { FetchLike } from '@/fetchers/fetch';
 import { makeStandardFetcher } from '@/fetchers/standardFetch';
 import { Fetcher } from '@/fetchers/types';
 
@@ -9,7 +9,7 @@ const headerMap: Record<string, string> = {
   origin: 'X-Origin',
 };
 
-export function makeSimpleProxyFetcher(proxyUrl: string, f: FetchType): Fetcher {
+export function makeSimpleProxyFetcher(proxyUrl: string, f: FetchLike): Fetcher {
   const fetcher = makeStandardFetcher(f);
   const proxiedFetch: Fetcher = async (url, ops) => {
     const fullUrl = makeFullUrl(url, ops);
diff --git a/src/fetchers/standardFetch.ts b/src/fetchers/standardFetch.ts
index 1f0d105..dd84893 100644
--- a/src/fetchers/standardFetch.ts
+++ b/src/fetchers/standardFetch.ts
@@ -1,9 +1,9 @@
 import { serializeBody } from '@/fetchers/body';
 import { makeFullUrl } from '@/fetchers/common';
-import { FetchType } from '@/fetchers/fetch';
+import { FetchLike } from '@/fetchers/fetch';
 import { Fetcher } from '@/fetchers/types';
 
-export function makeStandardFetcher(f: FetchType): Fetcher {
+export function makeStandardFetcher(f: FetchLike): Fetcher {
   const normalFetch: Fetcher = async (url, ops) => {
     const fullUrl = makeFullUrl(url, ops);
     const seralizedBody = serializeBody(ops.body);