@supabase/storage-js 1.3.0 → 1.5.1

package/src/lib/StorageBucketApi.ts

@@ -1,13 +1,16 @@
-import { get, post, put, remove } from './fetch'
+import { Fetch, get, post, put, remove } from './fetch'
 import { Bucket } from './types'
+import { DEFAULT_HEADERS } from './constants'
 
 export class StorageBucketApi {
   protected url: string
   protected headers: { [key: string]: string }
+  protected fetch?: Fetch
 
-  constructor(url: string, headers: { [key: string]: string } = {}) {
+  constructor(url: string, headers: { [key: string]: string } = {}, fetch?: Fetch) {
     this.url = url
-    this.headers = headers
+    this.headers = { ...DEFAULT_HEADERS, ...headers }
+    this.fetch = fetch
   }
 
   /**
@@ -15,7 +18,7 @@ export class StorageBucketApi {
    */
   async listBuckets(): Promise<{ data: Bucket[] | null; error: Error | null }> {
     try {
-      const data = await get(`${this.url}/bucket`, { headers: this.headers })
+      const data = await get(this.fetch, `${this.url}/bucket`, { headers: this.headers })
       return { data, error: null }
     } catch (error) {
       return { data: null, error }
@@ -29,7 +32,7 @@ export class StorageBucketApi {
    */
   async getBucket(id: string): Promise<{ data: Bucket | null; error: Error | null }> {
     try {
-      const data = await get(`${this.url}/bucket/${id}`, { headers: this.headers })
+      const data = await get(this.fetch, `${this.url}/bucket/${id}`, { headers: this.headers })
       return { data, error: null }
     } catch (error) {
       return { data: null, error }
@@ -48,6 +51,7 @@ export class StorageBucketApi {
   ): Promise<{ data: string | null; error: Error | null }> {
     try {
       const data = await post(
+        this.fetch,
         `${this.url}/bucket`,
         { id, name: id, public: options.public },
         { headers: this.headers }
@@ -69,6 +73,7 @@ export class StorageBucketApi {
   ): Promise<{ data: { message: string } | null; error: Error | null }> {
     try {
       const data = await put(
+        this.fetch,
         `${this.url}/bucket/${id}`,
         { id, name: id, public: options.public },
         { headers: this.headers }
@@ -88,7 +93,12 @@ export class StorageBucketApi {
     id: string
   ): Promise<{ data: { message: string } | null; error: Error | null }> {
     try {
-      const data = await post(`${this.url}/bucket/${id}/empty`, {}, { headers: this.headers })
+      const data = await post(
+        this.fetch,
+        `${this.url}/bucket/${id}/empty`,
+        {},
+        { headers: this.headers }
+      )
       return { data, error: null }
     } catch (error) {
       return { data: null, error }
@@ -105,7 +115,12 @@ export class StorageBucketApi {
     id: string
   ): Promise<{ data: { message: string } | null; error: Error | null }> {
     try {
-      const data = await remove(`${this.url}/bucket/${id}`, {}, { headers: this.headers })
+      const data = await remove(
+        this.fetch,
+        `${this.url}/bucket/${id}`,
+        {},
+        { headers: this.headers }
+      )
       return { data, error: null }
     } catch (error) {
       return { data: null, error }

package/src/lib/StorageFileApi.ts

@@ -1,4 +1,4 @@
-import { FetchParameters, get, post, remove } from './fetch'
+import { Fetch, FetchParameters, get, post, remove } from './fetch'
 import { isBrowser } from './helpers'
 import { FileObject, FileOptions, SearchOptions } from './types'
 import fetch from 'cross-fetch'
@@ -22,11 +22,18 @@ export class StorageFileApi {
   protected url: string
   protected headers: { [key: string]: string }
   protected bucketId?: string
+  protected fetch?: Fetch
 
-  constructor(url: string, headers: { [key: string]: string } = {}, bucketId?: string) {
+  constructor(
+    url: string,
+    headers: { [key: string]: string } = {},
+    bucketId?: string,
+    fetch?: Fetch
+  ) {
     this.url = url
     this.headers = headers
     this.bucketId = bucketId
+    this.fetch = fetch
   }
 
   /**
@@ -47,8 +54,10 @@ export class StorageFileApi {
       | ArrayBuffer
       | ArrayBufferView
       | Blob
+      | Buffer
       | File
       | FormData
+      | NodeJS.ReadableStream
       | ReadableStream<Uint8Array>
       | URLSearchParams
       | string,
@@ -75,10 +84,11 @@ export class StorageFileApi {
         headers['content-type'] = options.contentType as string
       }
 
-      const _path = this._getFinalPath(path)
+      const cleanPath = this._removeEmptyFolders(path)
+      const _path = this._getFinalPath(cleanPath)
       const res = await fetch(`${this.url}/object/${_path}`, {
         method,
-        body,
+        body: body as BodyInit,
         headers,
       })
 
@@ -111,8 +121,10 @@ export class StorageFileApi {
       | ArrayBuffer
       | ArrayBufferView
       | Blob
+      | Buffer
       | File
       | FormData
+      | NodeJS.ReadableStream
       | ReadableStream<Uint8Array>
       | URLSearchParams
       | string,
@@ -137,8 +149,10 @@ export class StorageFileApi {
       | ArrayBuffer
       | ArrayBufferView
       | Blob
+      | Buffer
       | File
       | FormData
+      | NodeJS.ReadableStream
       | ReadableStream<Uint8Array>
       | URLSearchParams
       | string,
@@ -159,6 +173,7 @@ export class StorageFileApi {
   ): Promise<{ data: { message: string } | null; error: Error | null }> {
     try {
       const data = await post(
+        this.fetch,
         `${this.url}/object/move`,
         { bucketId: this.bucketId, sourceKey: fromPath, destinationKey: toPath },
         { headers: this.headers }
@@ -186,6 +201,7 @@ export class StorageFileApi {
     try {
       const _path = this._getFinalPath(path)
       let data = await post(
+        this.fetch,
         `${this.url}/object/sign/${_path}`,
         { expiresIn },
         { headers: this.headers }
@@ -206,7 +222,7 @@ export class StorageFileApi {
   async download(path: string): Promise<{ data: Blob | null; error: Error | null }> {
     try {
       const _path = this._getFinalPath(path)
-      const res = await get(`${this.url}/object/${_path}`, {
+      const res = await get(this.fetch, `${this.url}/object/${_path}`, {
         headers: this.headers,
         noResolveJson: true,
       })
@@ -242,11 +258,12 @@ export class StorageFileApi {
   /**
    * Deletes files within the same bucket
    *
-   * @param paths An array of files to be deletes, including the path and file name. For example [`folder/image.png`].
+   * @param paths An array of files to be deleted, including the path and file name. For example [`folder/image.png`].
    */
   async remove(paths: string[]): Promise<{ data: FileObject[] | null; error: Error | null }> {
     try {
       const data = await remove(
+        this.fetch,
         `${this.url}/object/${this.bucketId}`,
         { prefixes: paths },
         { headers: this.headers }
@@ -301,6 +318,7 @@ export class StorageFileApi {
     try {
       const body = { ...DEFAULT_SEARCH_OPTIONS, ...options, prefix: path || '' }
       const data = await post(
+        this.fetch,
         `${this.url}/object/list/${this.bucketId}`,
         body,
         { headers: this.headers },
@@ -315,4 +333,8 @@ export class StorageFileApi {
   _getFinalPath(path: string) {
     return `${this.bucketId}/${path}`
   }
+
+  _removeEmptyFolders(path: string) {
+    return path.replace(/^\/|\/$/g, '').replace(/\/+/g, '/')
+  }
 }

package/src/lib/constants.ts

@@ -0,0 +1,2 @@
+import { version } from './version'
+export const DEFAULT_HEADERS = { 'X-Client-Info': `storage-js/${version}` }

package/src/lib/fetch.ts

@@ -1,4 +1,6 @@
-import fetch from 'cross-fetch'
+import crossFetch from 'cross-fetch'
+
+export type Fetch = typeof fetch
 
 export interface FetchOptions {
   headers?: {
@@ -46,6 +48,7 @@ const _getRequestParams = (
 }
 
 async function _handleRequest(
+  fetcher: Fetch = crossFetch,
   method: RequestMethodType,
   url: string,
   options?: FetchOptions,
@@ -53,7 +56,7 @@ async function _handleRequest(
   body?: object
 ): Promise<any> {
   return new Promise((resolve, reject) => {
-    fetch(url, _getRequestParams(method, options, parameters, body))
+    fetcher(url, _getRequestParams(method, options, parameters, body))
       .then((result) => {
         if (!result.ok) throw result
         if (options?.noResolveJson) return resolve(result)
@@ -65,36 +68,40 @@ async function _handleRequest(
 }
 
 export async function get(
+  fetcher: Fetch | undefined,
   url: string,
   options?: FetchOptions,
   parameters?: FetchParameters
 ): Promise<any> {
-  return _handleRequest('GET', url, options, parameters)
+  return _handleRequest(fetcher, 'GET', url, options, parameters)
 }
 
 export async function post(
+  fetcher: Fetch | undefined,
   url: string,
   body: object,
   options?: FetchOptions,
   parameters?: FetchParameters
 ): Promise<any> {
-  return _handleRequest('POST', url, options, parameters, body)
+  return _handleRequest(fetcher, 'POST', url, options, parameters, body)
 }
 
 export async function put(
+  fetcher: Fetch | undefined,
   url: string,
   body: object,
   options?: FetchOptions,
   parameters?: FetchParameters
 ): Promise<any> {
-  return _handleRequest('PUT', url, options, parameters, body)
+  return _handleRequest(fetcher, 'PUT', url, options, parameters, body)
 }
 
 export async function remove(
+  fetcher: Fetch | undefined,
   url: string,
   body: object,
   options?: FetchOptions,
   parameters?: FetchParameters
 ): Promise<any> {
-  return _handleRequest('DELETE', url, options, parameters, body)
+  return _handleRequest(fetcher, 'DELETE', url, options, parameters, body)
 }

package/src/lib/index.ts

@@ -1,3 +1,4 @@
 export * from './StorageBucketApi'
 export * from './StorageFileApi'
 export * from './types'
+export * from './constants'

package/src/lib/version.ts

@@ -0,0 +1,2 @@
+// generated by genversion
+export const version = '0.0.0'