From 873d5e4c0c506184f781d04038136c1e9cd2bae4 Mon Sep 17 00:00:00 2001
From: Joonas <joonas.mertanen@gmail.com>
Date: Tue, 8 Aug 2023 14:12:14 +0300
Subject: [PATCH 1/3] add xOrThrow methods

---
 src/PostgrestBuilder.ts | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/src/PostgrestBuilder.ts b/src/PostgrestBuilder.ts
index e48d69f0..66c229a1 100644
--- a/src/PostgrestBuilder.ts
+++ b/src/PostgrestBuilder.ts
@@ -186,4 +186,18 @@ export default abstract class PostgrestBuilder<Result>
 
     return res.then(onfulfilled, onrejected)
   }
+
+  /**
+   * Return data from query or throw if there were any errors.
+   */
+  dataOrThrow() {
+    return this.throwOnError().then((r) => r.data!)
+  }
+
+  /**
+   * Return count from query or throw if there were any errors.
+   */
+  countOrThrow() {
+    return this.throwOnError().then((r) => r.count!)
+  }
 }

From c1641bed9ff3901a53788430ee115d4f7a0c8e5d Mon Sep 17 00:00:00 2001
From: Joonas <joonas.mertanen@gmail.com>
Date: Tue, 8 Aug 2023 14:22:39 +0300
Subject: [PATCH 2/3] specify return types

---
 src/PostgrestBuilder.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/PostgrestBuilder.ts b/src/PostgrestBuilder.ts
index 66c229a1..6fc5bd64 100644
--- a/src/PostgrestBuilder.ts
+++ b/src/PostgrestBuilder.ts
@@ -190,14 +190,14 @@ export default abstract class PostgrestBuilder<Result>
   /**
    * Return data from query or throw if there were any errors.
    */
-  dataOrThrow() {
+  dataOrThrow(): PromiseLike<Result> {
     return this.throwOnError().then((r) => r.data!)
   }
 
   /**
    * Return count from query or throw if there were any errors.
    */
-  countOrThrow() {
+  countOrThrow(): PromiseLike<number> {
     return this.throwOnError().then((r) => r.count!)
   }
 }

From 692e08487abcf72bb6474e961ee84122af1f1791 Mon Sep 17 00:00:00 2001
From: Joonas <joonas.mertanen@gmail.com>
Date: Tue, 8 Aug 2023 14:25:05 +0300
Subject: [PATCH 3/3] add generic to dataOrThrow

---
 src/PostgrestBuilder.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/PostgrestBuilder.ts b/src/PostgrestBuilder.ts
index 6fc5bd64..f2717b78 100644
--- a/src/PostgrestBuilder.ts
+++ b/src/PostgrestBuilder.ts
@@ -190,8 +190,8 @@ export default abstract class PostgrestBuilder<Result>
   /**
    * Return data from query or throw if there were any errors.
    */
-  dataOrThrow(): PromiseLike<Result> {
-    return this.throwOnError().then((r) => r.data!)
+  dataOrThrow<T extends Result = Result>(): PromiseLike<T> {
+    return this.throwOnError().then((r) => r.data!) as PromiseLike<T>
   }
 
   /**