Fix lazy ts type in modular selects

Author: G4brym

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "workers-qb",
-  "version": "1.10.1",
+  "version": "1.10.2",
   "description": "Zero dependencies Query Builder for Cloudflare Workers",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",

package.json

@@ -131,15 +131,19 @@ export class QueryBuilder<GenericResultWrapper, IsAsync extends boolean = true>
     )
   }
 
-  fetchAll<GenericResult = DefaultReturnObject, IsLazy extends true | undefined = undefined>(
-    params: SelectAll<IsLazy>
-  ): QueryWithExtra<GenericResultWrapper, ArrayResult<GenericResultWrapper, GenericResult, IsAsync, IsLazy>, IsAsync> {
+  fetchAll<GenericResult = DefaultReturnObject, P extends SelectAll = SelectAll>(
+    params: P
+  ): QueryWithExtra<
+    GenericResultWrapper,
+    ArrayResult<GenericResultWrapper, GenericResult, IsAsync, P extends { lazy: true } ? true : false>,
+    IsAsync
+  > {
     return new QueryWithExtra(
       (q) => {
         return params.lazy
           ? (this.lazyExecute(q) as unknown as MaybeAsync<
               IsAsync,
-              ArrayResult<GenericResultWrapper, GenericResult, IsAsync, IsLazy>
+              ArrayResult<GenericResultWrapper, GenericResult, IsAsync, P extends { lazy: true } ? true : false>
             >)
           : this.execute(q)
       },

src/builder.ts

@@ -58,9 +58,9 @@ export type RawQueryFetchAll = Omit<RawQuery, 'fetchType'> & {
 
 export type RawQueryWithoutFetching = Omit<RawQuery, 'fetchType'>
 
-export type SelectAll<IsLazy extends true | undefined = undefined> = SelectOne & {
+export type SelectAll = SelectOne & {
   limit?: number
-  lazy?: IsLazy
+  lazy?: boolean
 }
 
 export type ConflictUpsert = {
@@ -145,31 +145,22 @@ export type PGResult = {
   rowCount: number
 }
 
-export type IterableResult<
-  ResultWrapper,
-  Result,
-  IsAsync extends boolean,
-  IsLazy extends true | undefined = undefined,
-> = IsLazy extends true
-  ? IsAsync extends true
-    ? Promise<Merge<ResultWrapper, { results?: AsyncIterable<Result> }>>
-    : Merge<ResultWrapper, { results?: Iterable<Result> }>
-  : never
+export type IterableResult<ResultWrapper, Result, IsAsync extends boolean> = IsAsync extends true
+  ? Promise<Merge<ResultWrapper, { results?: AsyncIterable<Result> }>>
+  : Merge<ResultWrapper, { results?: Iterable<Result> }>
+
+export type FullArrayResult<ResultWrapper, Result, IsAsync extends boolean> = IsAsync extends true
+  ? Promise<Merge<ResultWrapper, { results?: Array<Result> }>>
+  : Merge<ResultWrapper, { results?: Array<Result> }>
 
-export type FullArrayResult<
+export type ArrayResult<
   ResultWrapper,
   Result,
   IsAsync extends boolean,
-  IsLazy extends true | undefined = undefined,
-> = IsLazy extends undefined
-  ? IsAsync extends true
-    ? Promise<Merge<ResultWrapper, { results?: Array<Result> }>>
-    : Merge<ResultWrapper, { results?: Array<Result> }>
-  : never
-
-export type ArrayResult<ResultWrapper, Result, IsAsync extends boolean, IsLazy extends true | undefined = undefined> =
-  | IterableResult<ResultWrapper, Result, IsAsync, IsLazy>
-  | FullArrayResult<ResultWrapper, Result, IsAsync, IsLazy>
+  IsLazy extends boolean = false,
+> = IsLazy extends true
+  ? IterableResult<ResultWrapper, Result, IsAsync>
+  : FullArrayResult<ResultWrapper, Result, IsAsync>
 
 export type OneResult<ResultWrapper, Result> = Merge<ResultWrapper, { results?: Result }>
 

src/interfaces.ts

@@ -10,8 +10,8 @@ import {
 } from './interfaces'
 import { Query, QueryWithExtra } from './tools'
 
-export interface SelectExecuteOptions<IsLazy extends true | undefined> {
-  lazy?: IsLazy
+export interface SelectExecuteOptions {
+  lazy?: boolean
 }
 
 export class SelectBuilder<GenericResultWrapper, GenericResult = DefaultReturnObject, IsAsync extends boolean = true> {
@@ -207,26 +207,38 @@ export class SelectBuilder<GenericResultWrapper, GenericResult = DefaultReturnOb
     )
   }
 
-  getQueryAll<IsLazy extends true | undefined = undefined>(
-    options?: SelectExecuteOptions<IsLazy>
-  ): Query<ArrayResult<GenericResultWrapper, GenericResult, IsAsync, IsLazy>, IsAsync> {
-    return this._fetchAll(this._options as SelectAll)
+  getQueryAll<P extends SelectExecuteOptions = SelectExecuteOptions>(
+    options?: P
+  ): Query<
+    ArrayResult<GenericResultWrapper, GenericResult, IsAsync, P extends { lazy: true } ? true : false>,
+    IsAsync
+  > {
+    return this._fetchAll({
+      ...this._options,
+      ...options,
+    } as SelectAll)
   }
 
   getQueryOne(): Query<OneResult<GenericResultWrapper, GenericResult>, IsAsync> {
     return this._fetchOne(this._options as SelectAll)
   }
 
-  execute<IsLazy extends true | undefined = undefined>(
-    options?: SelectExecuteOptions<IsLazy>
-  ): ArrayResult<GenericResultWrapper, GenericResult, IsAsync, IsLazy> {
-    return this._fetchAll(this._options as SelectAll).execute()
+  execute<P extends SelectExecuteOptions = SelectExecuteOptions>(
+    options?: P
+  ): ArrayResult<GenericResultWrapper, GenericResult, IsAsync, P extends { lazy: true } ? true : false> {
+    return this._fetchAll({
+      ...this._options,
+      ...options,
+    } as SelectAll).execute()
   }
 
-  all<IsLazy extends true | undefined = undefined>(
-    options?: SelectExecuteOptions<IsLazy>
-  ): ArrayResult<GenericResultWrapper, GenericResult, IsAsync, IsLazy> {
-    return this._fetchAll(this._options as SelectAll).execute()
+  all<P extends SelectExecuteOptions = SelectExecuteOptions>(
+    options?: P
+  ): ArrayResult<GenericResultWrapper, GenericResult, IsAsync, P extends { lazy: true } ? true : false> {
+    return this._fetchAll({
+      ...this._options,
+      ...options,
+    } as SelectAll).execute()
   }
 
   one(): MaybeAsync<IsAsync, OneResult<GenericResultWrapper, GenericResult>> {