refactor: resolveFetch

src/lib/StorageBucketApi.ts

@@ -1,8 +1,7 @@
 import { DEFAULT_HEADERS } from './constants'
 import { Fetch, get, post, put, remove } from './fetch'
-import { getGlobalFetch } from './helpers'
+import { resolveFetch } from './helpers'
 import { Bucket } from './types'
-import crossFetch from 'cross-fetch'
 
 export class StorageBucketApi {
   protected url: string
@@ -12,11 +11,7 @@ export class StorageBucketApi {
   constructor(url: string, headers: { [key: string]: string } = {}, fetch?: Fetch) {
     this.url = url
     this.headers = { ...DEFAULT_HEADERS, ...headers }
-    if (fetch) {
-      this.fetch = fetch
-    } else {
-      this.fetch = getGlobalFetch() ?? ((crossFetch as unknown) as Fetch)
-    }
+    this.fetch = resolveFetch(fetch)
   }
 
   /**

src/lib/StorageFileApi.ts

@@ -1,7 +1,6 @@
 import { Fetch, FetchParameters, get, post, remove } from './fetch'
-import { getGlobalFetch } from './helpers'
+import { resolveFetch } from './helpers'
 import { FileObject, FileOptions, SearchOptions } from './types'
-import crossFetch from 'cross-fetch'
 
 const DEFAULT_SEARCH_OPTIONS = {
   limit: 100,
@@ -33,11 +32,7 @@ export class StorageFileApi {
     this.url = url
     this.headers = headers
     this.bucketId = bucketId
-    if (fetch) {
-      this.fetch = fetch
-    } else {
-      this.fetch = getGlobalFetch() ?? ((crossFetch as unknown) as Fetch)
-    }
+    this.fetch = resolveFetch(fetch)
   }
 
   /**

src/lib/helpers.ts

@@ -1,6 +1,12 @@
-export const getGlobalFetch = (): typeof fetch | undefined => {
-  if (typeof fetch === 'undefined') {
-    return undefined
+import crossFetch from 'cross-fetch'
+
+type Fetch = typeof fetch
+
+export const resolveFetch = (customFetch?: Fetch): Fetch => {
+  if (customFetch) {
+    return customFetch
+  } else if (typeof fetch === 'undefined') {
+    return (crossFetch as unknown) as Fetch
   } else {
     return fetch
   }