Make sure we catch sync errors when handling sync driver results asyn…

…chronously
benmerckx · Sep 11, 2024 · 6f0e8cc · 6f0e8cc
1 parent a1bcef3
commit 6f0e8cc
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/src/core/Query.ts b/src/core/Query.ts
@@ -44,7 +44,7 @@ class Executable<Result, Meta extends QueryMeta>
   }
 
   // biome-ignore lint/suspicious/noThenProperty:
-  then<TResult1 = Array<Result>, TResult2 = never>(
+  async then<TResult1 = Array<Result>, TResult2 = never>(
     onfulfilled?:
       | ((value: Array<Result>) => TResult1 | PromiseLike<TResult1>)
       | undefined
@@ -54,8 +54,12 @@ class Executable<Result, Meta extends QueryMeta>
       | undefined
       | null
   ): Promise<TResult1 | TResult2> {
-    const result = this.#execute()
-    return Promise.resolve(result).then(onfulfilled, onrejected)
+    try {
+      const result = await this.#execute()
+      return onfulfilled ? onfulfilled(result) : result
+    } catch (error) {
+      return onrejected ? onrejected(error) : Promise.reject(error)
+    }
   }
 
   catch<TResult = never>(