From 31eb0ff14877b877ee5955007691ed2f854d895c Mon Sep 17 00:00:00 2001
From: thorwebdev <thor@supabase.io>
Date: Thu, 23 Nov 2023 13:10:07 +0800
Subject: [PATCH 1/2] feat: add query result type helpers.

---
 src/index.ts     | 7 ++++++-
 src/lib/types.ts | 8 ++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/index.ts b/src/index.ts
index c0bba47e..d622e7b0 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -17,7 +17,12 @@ export {
 } from '@supabase/functions-js'
 export * from '@supabase/realtime-js'
 export { default as SupabaseClient } from './SupabaseClient'
-export type { SupabaseClientOptions } from './lib/types'
+export type {
+  SupabaseClientOptions,
+  QueryResult,
+  QueryResultData,
+  QueryResultError,
+} from './lib/types'
 
 /**
  * Creates a new Supabase Client.
diff --git a/src/lib/types.ts b/src/lib/types.ts
index 94f7e833..43530c39 100644
--- a/src/lib/types.ts
+++ b/src/lib/types.ts
@@ -1,5 +1,6 @@
 import { GoTrueClient } from '@supabase/gotrue-js'
 import { RealtimeClientOptions } from '@supabase/realtime-js'
+import { PostgrestError } from '@supabase/postgrest-js'
 
 type GoTrueClientOptions = ConstructorParameters<typeof GoTrueClient>[0]
 
@@ -95,3 +96,10 @@ export type GenericSchema = {
   Views: Record<string, GenericView>
   Functions: Record<string, GenericFunction>
 }
+
+/**
+ * Helper types for query results.
+ */
+export type QueryResult<T> = T extends PromiseLike<infer U> ? U : never
+export type QueryResultData<T> = T extends PromiseLike<{ data: infer U }> ? Exclude<U, null> : never
+export type QueryResultError = PostgrestError

From 84c3503f0202385b7f8303e4c2d0a23896adb457 Mon Sep 17 00:00:00 2001
From: thorwebdev <thor@supabase.io>
Date: Tue, 28 Nov 2023 10:15:31 +0800
Subject: [PATCH 2/2] chore: update naming for consiceseness.

---
 src/index.ts     | 7 +------
 src/lib/types.ts | 4 ++--
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/src/index.ts b/src/index.ts
index d622e7b0..54370f7a 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -17,12 +17,7 @@ export {
 } from '@supabase/functions-js'
 export * from '@supabase/realtime-js'
 export { default as SupabaseClient } from './SupabaseClient'
-export type {
-  SupabaseClientOptions,
-  QueryResult,
-  QueryResultData,
-  QueryResultError,
-} from './lib/types'
+export type { SupabaseClientOptions, QueryResult, QueryData, QueryError } from './lib/types'
 
 /**
  * Creates a new Supabase Client.
diff --git a/src/lib/types.ts b/src/lib/types.ts
index 43530c39..487133ad 100644
--- a/src/lib/types.ts
+++ b/src/lib/types.ts
@@ -101,5 +101,5 @@ export type GenericSchema = {
  * Helper types for query results.
  */
 export type QueryResult<T> = T extends PromiseLike<infer U> ? U : never
-export type QueryResultData<T> = T extends PromiseLike<{ data: infer U }> ? Exclude<U, null> : never
-export type QueryResultError = PostgrestError
+export type QueryData<T> = T extends PromiseLike<{ data: infer U }> ? Exclude<U, null> : never
+export type QueryError = PostgrestError