??

Author: igalklebanov

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

@@ -85,12 +85,12 @@ import { OrderByInterface } from './order-by-interface.js'
 import { Executable, ExecuteOptions } from '../util/executable.js'
 
 export interface SelectQueryBuilder<DB, TB extends keyof DB, O>
-  extends Executable<Simplify<O>>,
-    WhereInterface<DB, TB>,
+  extends WhereInterface<DB, TB>,
     HavingInterface<DB, TB>,
     OrderByInterface<DB, TB, O>,
     SelectQueryBuilderExpression<O>,
     Compilable<O>,
+    Executable<O>,
     Explainable,
     Streamable<O> {
   where<

src/util/executable.ts

@@ -1,20 +1,23 @@
 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 { Simplify, SimplifySingleResult } from './type-utils.js'
 
 export interface Executable<O> {
   /**
    * Executes the query and returns an array of rows.
    *
    * Also see the {@link executeTakeFirst} and {@link executeTakeFirstOrThrow} methods.
    */
-  execute(options?: ExecuteOptions): Promise<O[]>
+  execute(options?: ExecuteOptions): Promise<SimplifySingleResult<O>[]>
 
   /**
    * Executes the query and returns the first result or undefined if
    * the query returned no result.
    */
-  executeTakeFirst(options?: ExecuteOptions): Promise<O | undefined>
+  executeTakeFirst(
+    options?: ExecuteOptions,
+  ): Promise<SimplifySingleResult<O> | undefined>
 
   /**
    * Executes the query and returns the first result or throws if
@@ -26,13 +29,13 @@ export interface Executable<O> {
    */
   executeTakeFirstOrThrow(
     errorConstructor?: NoResultErrorConstructor | ((node: QueryNode) => Error),
-  ): Promise<O>
+  ): Promise<SimplifySingleResult<O>>
 
   executeTakeFirstOrThrow(
     options?: ExecuteOptions & {
       errorConstructor?: NoResultErrorConstructor | ((node: QueryNode) => Error)
     },
-  ): Promise<O>
+  ): Promise<SimplifySingleResult<O>>
 }
 
 export interface ExecuteOptions extends ExecuteQueryOptions {}