Improve getPublicUrl

src/lib/StorageBucketApi.ts

@@ -108,7 +108,7 @@ export class StorageBucketApi {
   /**
    * Updates a new Storage bucket
    *
-   * @param id A unique identifier for the bucket you are creating.
+   * @param id A unique identifier for the bucket you are updating.
    */
   async updateBucket(
     id: string,

src/lib/StorageFileApi.ts

@@ -388,37 +388,13 @@ export class StorageFileApi {
   }
 
   /**
-   * Retrieve URLs for assets in public buckets
+   * Retrieve URLs for assets in public buckets and encapsulates it in a return object
    *
    * @param path The file path to be downloaded, including the path and file name. For example `folder/image.png`.
    */
-  getPublicUrl(
-    path: string
-  ):
-    | {
-        data: {
-          publicURL: string
-        }
-        error: null
-        publicURL: string
-      }
-    | {
-        data: null
-        error: StorageError
-        publicURL: null
-      } {
-    try {
-      const _path = this._getFinalPath(path)
-      const publicURL = `${this.url}/object/public/${_path}`
-      const data = { publicURL }
-      return { data, error: null, publicURL }
-    } catch (error) {
-      if (isStorageError(error)) {
-        return { data: null, error, publicURL: null }
-      }
-
-      throw error
-    }
+  getPublicUrl(path: string): string {
+    const _path = this._getFinalPath(path)
+    return `${this.url}/object/public/${_path}`
   }
 
   /**

src/lib/helpers.ts

@@ -7,7 +7,7 @@ export const resolveFetch = (customFetch?: Fetch): Fetch => {
   if (customFetch) {
     _fetch = customFetch
   } else if (typeof fetch === 'undefined') {
-    _fetch = (crossFetch as unknown) as Fetch
+    _fetch = async (...args) => await (await import('cross-fetch')).fetch(...args)
   } else {
     _fetch = fetch
   }

test/__snapshots__/storageFileApi.test.ts.snap

@@ -1,9 +1,3 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`get public URL 1`] = `
-Object {
-  "publicURL": "http://localhost:8000/storage/v1/object/public/my-new-public-bucket/profiles/myUniqueUserId/profile.png",
-}
-`;
-
-exports[`get public URL 2`] = `"http://localhost:8000/storage/v1/object/public/my-new-public-bucket/profiles/myUniqueUserId/profile.png"`;
+exports[`get public URL 1`] = `"http://localhost:8000/storage/v1/object/public/my-new-public-bucket/profiles/myUniqueUserId/profile.png"`;

test/storageFileApi.test.ts

@@ -8,9 +8,7 @@ const KEY =
 const storage = new StorageClient(URL, { Authorization: `Bearer ${KEY}` })
 const newBucketName = 'my-new-public-bucket'
 
-test('get public URL', async () => {
+test('get public URL', () => {
   const res = storage.from(newBucketName).getPublicUrl('profiles/myUniqueUserId/profile.png')
-  expect(res.error).toBeNull()
-  expect(res.data).toMatchSnapshot()
-  expect(res.publicURL).toMatchSnapshot()
+  expect(res).toMatchSnapshot()
 })

tsconfig.module.json

@@ -1,7 +1,7 @@
 {
   "extends": "./tsconfig",
   "compilerOptions": {
-    "module": "ES2015",
+    "module": "ES2020",
     "outDir": "dist/module"
   }
 }