Skip to content

fix: remove usage of internal type params #123

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Aug 22, 2025
Merged

fix: remove usage of internal type params #123

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ebad476
fix: remove usage of internal type params
soedirgo Aug 19, 2025
540fd2b
feat: exclude __InternalSupabase from SchemaName
avallete Aug 21, 2025
f6864e2
chore: fix prettier
avallete Aug 21, 2025
75003a0
chore: test retro-compatibility with older supabase-js
avallete Aug 21, 2025
e4b58bb
chore: Delete src/.DS_Store
soedirgo Aug 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
83 changes: 48 additions & 35 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file added src/.DS_Store
View file
Open in desktop
Binary file not shown.
90 changes: 45 additions & 45 deletions src/createBrowserClient.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { createClient, SupabaseClient } from "@supabase/supabase-js";
import type {
GenericSchema,
import {
createClient,
SupabaseClient,
SupabaseClientOptions,
} from "@supabase/supabase-js/dist/module/lib/types";
} from "@supabase/supabase-js";

import { VERSION } from "./version";
import { isBrowser } from "./utils";
Expand Down Expand Up @@ -36,12 +36,13 @@ let cachedBrowserClient: SupabaseClient<any, any, any> | undefined;
*/
export function createBrowserClient<
Database = any,
SchemaName extends string & keyof Database = "public" extends keyof Database
SchemaName extends string &
keyof Omit<Database, "__InternalSupabase"> = "public" extends keyof Omit<
Database,
"__InternalSupabase"
>
? "public"
: string & keyof Database,
Schema extends GenericSchema = Database[SchemaName] extends GenericSchema
? Database[SchemaName]
: any,
: string & keyof Omit<Database, "__InternalSupabase">,
>(
supabaseUrl: string,
supabaseKey: string,
Expand All @@ -51,7 +52,7 @@ export function createBrowserClient<
cookieEncoding?: "raw" | "base64url";
isSingleton?: boolean;
},
): SupabaseClient<Database, SchemaName, Schema>;
): SupabaseClient<Database, SchemaName>;

/**
* @deprecated Please specify `getAll` and `setAll` cookie methods instead of
Expand All @@ -60,12 +61,13 @@ export function createBrowserClient<
*/
export function createBrowserClient<
Database = any,
SchemaName extends string & keyof Database = "public" extends keyof Database
SchemaName extends string &
keyof Omit<Database, "__InternalSupabase"> = "public" extends keyof Omit<
Database,
"__InternalSupabase"
>
? "public"
: string & keyof Database,
Schema extends GenericSchema = Database[SchemaName] extends GenericSchema
? Database[SchemaName]
: any,
: string & keyof Omit<Database, "__InternalSupabase">,
>(
supabaseUrl: string,
supabaseKey: string,
Expand All @@ -75,16 +77,17 @@ export function createBrowserClient<
cookieEncoding?: "raw" | "base64url";
isSingleton?: boolean;
},
): SupabaseClient<Database, SchemaName, Schema>;
): SupabaseClient<Database, SchemaName>;

export function createBrowserClient<
Database = any,
SchemaName extends string & keyof Database = "public" extends keyof Database
SchemaName extends string &
keyof Omit<Database, "__InternalSupabase"> = "public" extends keyof Omit<
Database,
"__InternalSupabase"
>
? "public"
: string & keyof Database,
Schema extends GenericSchema = Database[SchemaName] extends GenericSchema
? Database[SchemaName]
: any,
: string & keyof Omit<Database, "__InternalSupabase">,
>(
supabaseUrl: string,
supabaseKey: string,
Expand All @@ -94,7 +97,7 @@ export function createBrowserClient<
cookieEncoding?: "raw" | "base64url";
isSingleton?: boolean;
},
): SupabaseClient<Database, SchemaName, Schema> {
): SupabaseClient<Database, SchemaName> {
// singleton client is created only if isSingleton is set to true, or if isSingleton is not defined and we detect a browser
const shouldUseSingleton =
options?.isSingleton === true ||
Expand All @@ -118,31 +121,28 @@ export function createBrowserClient<
false,
);

const client = createClient<Database, SchemaName, Schema>(
supabaseUrl,
supabaseKey,
{
...options,
global: {
...options?.global,
headers: {
...options?.global?.headers,
"X-Client-Info": `supabase-ssr/${VERSION} createBrowserClient`,
},
},
auth: {
...options?.auth,
...(options?.cookieOptions?.name
? { storageKey: options.cookieOptions.name }
: null),
flowType: "pkce",
autoRefreshToken: isBrowser(),
detectSessionInUrl: isBrowser(),
persistSession: true,
storage,
const client = createClient<Database, SchemaName>(supabaseUrl, supabaseKey, {
// TODO: resolve type error
...(options as any),
global: {
...options?.global,
headers: {
...options?.global?.headers,
"X-Client-Info": `supabase-ssr/${VERSION} createBrowserClient`,
},
},
);
auth: {
...options?.auth,
...(options?.cookieOptions?.name
? { storageKey: options.cookieOptions.name }
: null),
flowType: "pkce",
autoRefreshToken: isBrowser(),
detectSessionInUrl: isBrowser(),
persistSession: true,
storage,
},
});

if (shouldUseSingleton) {
cachedBrowserClient = client;
Expand Down
Loading