fix regression in takeFirst.

Author: igalklebanov

src/query-builder/delete-query-builder.ts

@@ -32,6 +32,7 @@ import {
   Nullable,
   ShallowRecord,
   SimplifyResult,
+  SimplifySingleResult,
   SqlBool,
 } from '../util/type-utils.js'
 import { Compilable } from '../util/compilable.js'
@@ -1075,7 +1076,7 @@ export class DeleteQueryBuilder<DB, TB extends keyof DB, O>
 
   async executeTakeFirst(
     options?: ExecuteOptions,
-  ): Promise<SimplifyResult<O> | undefined> {
+  ): Promise<SimplifySingleResult<O>> {
     const [result] = await this.execute(options)
 
     return result
@@ -1105,7 +1106,7 @@ export class DeleteQueryBuilder<DB, TB extends keyof DB, O>
       throw error
     }
 
-    return result
+    return result as never
   }
 
   async *stream(chunkSize: number = 100): AsyncIterableIterator<O> {

src/query-builder/insert-query-builder.ts

@@ -13,7 +13,11 @@ import {
 } from '../parser/insert-values-parser.js'
 import { InsertQueryNode } from '../operation-node/insert-query-node.js'
 import { QueryNode } from '../operation-node/query-node.js'
-import { NarrowPartial, SimplifyResult } from '../util/type-utils.js'
+import {
+  NarrowPartial,
+  SimplifyResult,
+  SimplifySingleResult,
+} from '../util/type-utils.js'
 import {
   UpdateObjectExpression,
   parseUpdateObjectExpression,
@@ -1310,7 +1314,7 @@ export class InsertQueryBuilder<DB, TB extends keyof DB, O>
 
   async executeTakeFirst(
     options?: ExecuteOptions,
-  ): Promise<SimplifyResult<O> | undefined> {
+  ): Promise<SimplifySingleResult<O>> {
     const [result] = await this.execute(options)
 
     return result
@@ -1340,7 +1344,7 @@ export class InsertQueryBuilder<DB, TB extends keyof DB, O>
       throw error
     }
 
-    return result as SimplifyResult<O>
+    return result as never
   }
 
   async *stream(chunkSize: number = 100): AsyncIterableIterator<O> {

src/query-builder/merge-query-builder.ts

@@ -52,7 +52,12 @@ import {
 } from '../util/executable.js'
 import { freeze } from '../util/object-utils.js'
 import { QueryId } from '../util/query-id.js'
-import { ShallowRecord, SimplifyResult, SqlBool } from '../util/type-utils.js'
+import {
+  ShallowRecord,
+  SimplifyResult,
+  SimplifySingleResult,
+  SqlBool,
+} from '../util/type-utils.js'
 import { MergeResult } from './merge-result.js'
 import { NoResultError, isNoResultErrorConstructor } from './no-result-error.js'
 import {
@@ -895,7 +900,7 @@ export class WheneableMergeQueryBuilder<
 
   async executeTakeFirst(
     options?: ExecuteOptions,
-  ): Promise<SimplifyResult<O> | undefined> {
+  ): Promise<SimplifySingleResult<O>> {
     const [result] = await this.execute(options)
 
     return result
@@ -925,7 +930,7 @@ export class WheneableMergeQueryBuilder<
       throw error
     }
 
-    return result
+    return result as never
   }
 }
 

src/query-builder/select-query-builder.ts

@@ -31,6 +31,7 @@ import {
   ShallowRecord,
   Simplify,
   SimplifyResult,
+  SimplifySingleResult,
   SqlBool,
 } from '../util/type-utils.js'
 import {
@@ -2121,9 +2122,7 @@ export interface SelectQueryBuilder<DB, TB extends keyof DB, O>
 
   execute(options?: ExecuteOptions): Promise<NonNullable<SimplifyResult<O>>[]>
 
-  executeTakeFirst(
-    options?: ExecuteOptions,
-  ): Promise<SimplifyResult<O> | undefined>
+  executeTakeFirst(options?: ExecuteOptions): Promise<SimplifySingleResult<O>>
 
   executeTakeFirstOrThrow(
     options?: ExecuteOrThrowOptions | ExecuteOrThrowOptions['errorConstructor'],
@@ -2647,7 +2646,7 @@ class SelectQueryBuilderImpl<DB, TB extends keyof DB, O>
 
   async executeTakeFirst(
     options?: ExecuteOptions,
-  ): Promise<SimplifyResult<O> | undefined> {
+  ): Promise<SimplifySingleResult<O>> {
     const [result] = await this.execute(options)
 
     return result
@@ -2677,7 +2676,7 @@ class SelectQueryBuilderImpl<DB, TB extends keyof DB, O>
       throw error
     }
 
-    return result
+    return result as never
   }
 
   async *stream(chunkSize: number = 100): AsyncIterableIterator<O> {

src/query-builder/update-query-builder.ts

@@ -32,6 +32,7 @@ import {
   Nullable,
   ShallowRecord,
   SimplifyResult,
+  SimplifySingleResult,
   SqlBool,
 } from '../util/type-utils.js'
 import { UpdateQueryNode } from '../operation-node/update-query-node.js'
@@ -1169,7 +1170,7 @@ export class UpdateQueryBuilder<DB, UT extends keyof DB, TB extends keyof DB, O>
 
   async executeTakeFirst(
     options?: ExecuteOptions,
-  ): Promise<SimplifyResult<O> | undefined> {
+  ): Promise<SimplifySingleResult<O>> {
     const [result] = await this.execute(options)
 
     return result
@@ -1199,7 +1200,7 @@ export class UpdateQueryBuilder<DB, UT extends keyof DB, TB extends keyof DB, O>
       throw error
     }
 
-    return result
+    return result as never
   }
 
   async *stream(chunkSize: number = 100): AsyncIterableIterator<O> {

src/query-executor/query-executor.ts

@@ -61,6 +61,7 @@ export interface QueryExecutor extends ConnectionProvider {
      * only by the postgres driver.
      */
     chunkSize: number,
+    options?: ExecuteQueryOptions,
   ): AsyncIterableIterator<QueryResult<R>>
 
   /**

src/util/executable.ts

@@ -1,7 +1,7 @@
 import { QueryNode } from '../operation-node/query-node.js'
 import { NoResultErrorConstructor } from '../query-builder/no-result-error.js'
 import { ExecuteQueryOptions } from '../query-executor/query-executor.js'
-import { SimplifyResult } from './type-utils.js'
+import { SimplifyResult, SimplifySingleResult } from './type-utils.js'
 
 export interface Executable<O> {
   /**
@@ -15,9 +15,7 @@ export interface Executable<O> {
    * Executes the query and returns the first result or undefined if
    * the query returned no result.
    */
-  executeTakeFirst(
-    options?: ExecuteOptions,
-  ): Promise<SimplifyResult<O> | undefined>
+  executeTakeFirst(options?: ExecuteOptions): Promise<SimplifySingleResult<O>>
 
   /**
    * Executes the query and returns the first result or throws if

src/util/type-utils.ts

@@ -111,6 +111,14 @@ export type SimplifyResult<O> = O extends
   ? O
   : Simplify<O>
 
+export type SimplifySingleResult<O> = O extends
+  | InsertResult
+  | UpdateResult
+  | DeleteResult
+  | MergeResult
+  ? O
+  : Simplify<O> | undefined
+
 export type Simplify<T> = DrainOuterGeneric<{ [K in keyof T]: T[K] } & {}>
 
 /**