refactor: adopt spread syntax

Author: [email protected]

src/SupabaseClient.ts

@@ -14,21 +14,24 @@ import { SupabaseAuthClient } from './lib/SupabaseAuthClient'
 import { SupabaseRealtimeChannel } from './lib/SupabaseRealtimeChannel'
 import { Fetch, GenericSchema, SupabaseClientOptions, SupabaseAuthClientOptions } from './lib/types'
 
-const DEFAULT_OPTIONS = {
-  auth: {
-    autoRefreshToken: true,
-    persistSession: true,
-    detectSessionInUrl: true,
-  },
-  global: {
-    headers: DEFAULT_HEADERS,
-  },
+const DEFAULT_GLOBAL_OPTIONS = {
+  headers: DEFAULT_HEADERS,
+}
+
+const DEFAULT_DB_OPTIONS = {
   db: {
     schema: 'public',
-    shouldThrowOnError: false,
   },
 }
 
+const DEFAULT_AUTH_OPTIONS: SupabaseAuthClientOptions = {
+  autoRefreshToken: true,
+  persistSession: true,
+  detectSessionInUrl: true,
+}
+
+const DEFAULT_REALTIME_OPTIONS: RealtimeClientOptions = {}
+
 /**
  * Supabase Client.
  *
@@ -99,22 +102,43 @@ export default class SupabaseClient<
     const defaultStorageKey = `sb-${new URL(this.authUrl).hostname.split('.')[0]}-auth-token`
     this.storageKey = options?.auth?.storageKey ?? defaultStorageKey
 
-    const settings = Object.assign(DEFAULT_OPTIONS, options)
-
-    const authSettings = settings.auth
-    const dbSettings = settings.db
+    const {
+      db: dbOptions,
+      auth: authOptions,
+      realtime: realtimeOptions,
+      global: globalOptions,
+    } = options || {}
+
+    const settings = {
+      db: {
+        ...DEFAULT_DB_OPTIONS,
+        ...dbOptions,
+      },
+      auth: {
+        ...DEFAULT_AUTH_OPTIONS,
+        storageKey: defaultStorageKey,
+        ...authOptions,
+      },
+      realtime: {
+        ...DEFAULT_REALTIME_OPTIONS,
+        ...realtimeOptions,
+      },
+      global: {
+        ...DEFAULT_GLOBAL_OPTIONS,
+        ...globalOptions,
+      },
+    }
 
-    this.headers = settings.global.headers
+    this.headers = { ...DEFAULT_HEADERS, ...globalOptions?.headers }
 
-    this.auth = this._initSupabaseAuthClient(authSettings, this.headers, settings.global.fetch)
+    this.auth = this._initSupabaseAuthClient(settings.auth, this.headers, settings.global.fetch)
     this.fetch = fetchWithAuth(supabaseKey, this._getAccessToken.bind(this), settings.global.fetch)
 
     this.realtime = this._initRealtimeClient({ headers: this.headers, ...settings.realtime })
     this.rest = new PostgrestClient(`${_supabaseUrl}/rest/v1`, {
       headers: this.headers,
-      schema: dbSettings.schema,
+      schema: settings?.db?.schema,
       fetch: this.fetch,
-      throwOnError: dbSettings.shouldThrowOnError,
     })
 
     this._listenForAuthEvents()

test/SupabaseAuthClient.test.ts

@@ -1,15 +1,25 @@
 import { SupabaseAuthClient } from '../src/lib/SupabaseAuthClient'
+import { SupabaseClientOptions } from '../src/lib/types'
+import { DEFAULT_HEADERS } from '../src/lib/constants'
 
 const DEFAULT_OPTIONS = {
-  schema: 'public',
-  autoRefreshToken: true,
-  persistSession: true,
-  detectSessionInUrl: true,
-  headers: {},
+  auth: {
+    autoRefreshToken: true,
+    persistSession: true,
+    detectSessionInUrl: true,
+  },
+  global: {
+    headers: DEFAULT_HEADERS,
+  },
+  db: {
+    schema: 'public',
+  },
 }
 const settings = { ...DEFAULT_OPTIONS }
 
+const authSettings = { ...settings.global, ...settings.auth }
+
 test('it should create a new instance of the class', () => {
-  const authClient = new SupabaseAuthClient(settings)
+  const authClient = new SupabaseAuthClient(authSettings)
   expect(authClient).toBeInstanceOf(SupabaseAuthClient)
 })