fix: patch types

supabase · Aug 13, 2022 · 72b7ff3 · 72b7ff3
1 parent f0da868
commit 72b7ff3
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/src/lib/helpers.ts b/src/lib/helpers.ts
@@ -1,4 +1,5 @@
 // helpers.ts
+import { SupabaseClientOptions } from './types'
 
 export function uuid() {
   return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
@@ -14,7 +15,12 @@ export function stripTrailingSlash(url: string): string {
 
 export const isBrowser = () => typeof window !== 'undefined'
 
-export function applySettingDefaults(
+export function applySettingDefaults<
+  Database = any,
+  SchemaName extends string & keyof Database = 'public' extends keyof Database
+    ? 'public'
+    : string & keyof Database
+>(
   options: SupabaseClientOptions<SchemaName>,
   defaults: SupabaseClientOptions<any>
 ): SupabaseClientOptions<SchemaName> {

diff --git a/test/helpers.test.ts b/test/helpers.test.ts
@@ -33,7 +33,10 @@ test('override setting defaults', async () => {
     },
   }
   let settings = helpers.applySettingDefaults(options, defaults)
-  expect(settings.auth.autoRefreshToken).toBe(autoRefreshOption)
-  expect(settings.auth.persistSession).not.toBeNull()
-  expect(settings.db.schema).toBe(defaults.db.schema)
+  expect(settings?.auth?.autoRefreshToken).toBe(autoRefreshOption)
+  // Existing default properties should not be overwritten
+  expect(settings?.auth?.persistSession).not.toBeNull()
+  expect(settings?.global?.headers).toBe(DEFAULT_HEADERS)
+  // Existing property values should remain constant
+  expect(settings?.db?.schema).toBe(defaults.db.schema)
 })