workers-qb 1.10.2 → 1.11.0

package/README.md

@@ -54,6 +54,7 @@ workers-qb is a lightweight query builder designed specifically for Cloudflare W
 - CRUD operations (insert/update/select/delete)
 - Bulk inserts
 - JOIN queries
+- Subqueries
 - Modular SELECT queries
 - ON CONFLICT handling
 - UPSERT support

package/dist/index.d.mts

@@ -40,6 +40,42 @@ declare class QueryWithExtra<GenericResultWrapper, Result = any, IsAsync extends
 }
 declare function trimQuery(query: string): string;
 
+interface SelectExecuteOptions {
+    lazy?: boolean;
+}
+declare class SelectBuilder<GenericResultWrapper, GenericResult = DefaultReturnObject, IsAsync extends boolean = true> {
+    _debugger: boolean;
+    _options: Partial<SelectAll>;
+    _fetchAll: (params: SelectAll) => QueryWithExtra<GenericResultWrapper, any, IsAsync>;
+    _fetchOne: (params: SelectOne) => QueryWithExtra<GenericResultWrapper, any, IsAsync>;
+    constructor(options: Partial<SelectAll>, fetchAll: (params: SelectAll) => QueryWithExtra<GenericResultWrapper, any, IsAsync>, fetchOne: (params: SelectOne) => QueryWithExtra<GenericResultWrapper, any, IsAsync>);
+    setDebugger(state: boolean): void;
+    tableName(tableName: SelectAll['tableName']): SelectBuilder<GenericResultWrapper, GenericResult, IsAsync>;
+    fields(fields: SelectAll['fields']): SelectBuilder<GenericResultWrapper, GenericResult, IsAsync>;
+    where(conditions: string | Array<string>, params?: Primitive | Primitive[]): SelectBuilder<GenericResultWrapper, GenericResult, IsAsync>;
+    whereIn<T extends string | Array<string>, P extends T extends Array<string> ? Primitive[][] : Primitive[]>(fields: T, values: P): SelectBuilder<GenericResultWrapper, GenericResult, IsAsync>;
+    join(join: SelectAll['join']): SelectBuilder<GenericResultWrapper, GenericResult, IsAsync>;
+    groupBy(groupBy: SelectAll['groupBy']): SelectBuilder<GenericResultWrapper, GenericResult, IsAsync>;
+    having(conditions: string | Array<string>, params?: Primitive | Primitive[]): SelectBuilder<GenericResultWrapper, GenericResult, IsAsync>;
+    orderBy(orderBy: SelectAll['orderBy']): SelectBuilder<GenericResultWrapper, GenericResult, IsAsync>;
+    offset(offset: SelectAll['offset']): SelectBuilder<GenericResultWrapper, GenericResult, IsAsync>;
+    limit(limit: SelectAll['limit']): SelectBuilder<GenericResultWrapper, GenericResult, IsAsync>;
+    _parseArray(fieldName: string, option: any, value: any): SelectBuilder<GenericResultWrapper, GenericResult, IsAsync>;
+    getQueryAll<P extends SelectExecuteOptions = SelectExecuteOptions>(options?: P): Query<ArrayResult<GenericResultWrapper, GenericResult, IsAsync, P extends {
+        lazy: true;
+    } ? true : false>, IsAsync>;
+    getQueryOne(): Query<OneResult<GenericResultWrapper, GenericResult>, IsAsync>;
+    execute<P extends SelectExecuteOptions = SelectExecuteOptions>(options?: P): ArrayResult<GenericResultWrapper, GenericResult, IsAsync, P extends {
+        lazy: true;
+    } ? true : false>;
+    all<P extends SelectExecuteOptions = SelectExecuteOptions>(options?: P): ArrayResult<GenericResultWrapper, GenericResult, IsAsync, P extends {
+        lazy: true;
+    } ? true : false>;
+    one(): MaybeAsync<IsAsync, OneResult<GenericResultWrapper, GenericResult>>;
+    count(): MaybeAsync<IsAsync, CountResult<GenericResultWrapper>>;
+    getOptions(): SelectAll;
+}
+
 type OmitIndexSignature<ObjectType> = {
     [KeyType in keyof ObjectType as {} extends Record<KeyType, unknown> ? never : KeyType]: ObjectType[KeyType];
 };
@@ -54,7 +90,7 @@ type SimpleMerge<Destination, Source> = {
 } & Source;
 type Merge<Destination, Source> = Simplify<SimpleMerge<PickIndexSignature<Destination>, PickIndexSignature<Source>> & SimpleMerge<OmitIndexSignature<Destination>, OmitIndexSignature<Source>>>;
 
-type Primitive = null | string | number | boolean | bigint | Raw;
+type Primitive = null | string | number | boolean | bigint | Raw | SelectAll | SelectBuilder<any, any, any>;
 type QueryLoggerMeta = {
     duration?: number;
 };
@@ -69,7 +105,7 @@ type Where = {
 } | string | Array<string>;
 type Join = {
     type?: string | JoinTypes;
-    table: string | SelectAll;
+    table: string | SelectAll | SelectBuilder<any, any, any>;
     on: string;
     alias?: string;
 };
@@ -79,9 +115,11 @@ type SelectOne = {
     where?: Where;
     join?: Join | Array<Join>;
     groupBy?: string | Array<string>;
-    having?: string | Array<string>;
+    having?: Where;
     orderBy?: string | Array<string> | Record<string, string | OrderTypes>;
     offset?: number;
+    subQueryPlaceholders?: Record<string, SelectAll>;
+    subQueryTokenNextId?: number;
 };
 type RawQuery = {
     query: string;
@@ -191,41 +229,6 @@ declare function defaultLogger(query: RawQuery, meta: QueryLoggerMeta): any;
 declare function asyncLoggerWrapper<Async extends boolean = true>(query: Query<any, Async> | Query<any, Async>[], loggerFunction: CallableFunction | undefined, innerFunction: () => any): Promise<any>;
 declare function syncLoggerWrapper<Async extends boolean = false>(query: Query<any, Async> | Query<any, Async>[], loggerFunction: CallableFunction | undefined, innerFunction: () => any): any;
 
-interface SelectExecuteOptions {
-    lazy?: boolean;
-}
-declare class SelectBuilder<GenericResultWrapper, GenericResult = DefaultReturnObject, IsAsync extends boolean = true> {
-    _debugger: boolean;
-    _options: Partial<SelectAll>;
-    _fetchAll: (params: SelectAll) => QueryWithExtra<GenericResultWrapper, any, IsAsync>;
-    _fetchOne: (params: SelectOne) => QueryWithExtra<GenericResultWrapper, any, IsAsync>;
-    constructor(options: Partial<SelectAll>, fetchAll: (params: SelectAll) => QueryWithExtra<GenericResultWrapper, any, IsAsync>, fetchOne: (params: SelectOne) => QueryWithExtra<GenericResultWrapper, any, IsAsync>);
-    setDebugger(state: boolean): void;
-    tableName(tableName: SelectAll['tableName']): SelectBuilder<GenericResultWrapper, GenericResult, IsAsync>;
-    fields(fields: SelectAll['fields']): SelectBuilder<GenericResultWrapper, GenericResult, IsAsync>;
-    where(conditions: string | Array<string>, params?: Primitive | Primitive[]): SelectBuilder<GenericResultWrapper, GenericResult, IsAsync>;
-    whereIn<T extends string | Array<string>, P extends T extends Array<string> ? Primitive[][] : Primitive[]>(fields: T, values: P): SelectBuilder<GenericResultWrapper, GenericResult, IsAsync>;
-    join(join: SelectAll['join']): SelectBuilder<GenericResultWrapper, GenericResult, IsAsync>;
-    groupBy(groupBy: SelectAll['groupBy']): SelectBuilder<GenericResultWrapper, GenericResult, IsAsync>;
-    having(having: SelectAll['having']): SelectBuilder<GenericResultWrapper, GenericResult, IsAsync>;
-    orderBy(orderBy: SelectAll['orderBy']): SelectBuilder<GenericResultWrapper, GenericResult, IsAsync>;
-    offset(offset: SelectAll['offset']): SelectBuilder<GenericResultWrapper, GenericResult, IsAsync>;
-    limit(limit: SelectAll['limit']): SelectBuilder<GenericResultWrapper, GenericResult, IsAsync>;
-    _parseArray(fieldName: string, option: any, value: any): SelectBuilder<GenericResultWrapper, GenericResult, IsAsync>;
-    getQueryAll<P extends SelectExecuteOptions = SelectExecuteOptions>(options?: P): Query<ArrayResult<GenericResultWrapper, GenericResult, IsAsync, P extends {
-        lazy: true;
-    } ? true : false>, IsAsync>;
-    getQueryOne(): Query<OneResult<GenericResultWrapper, GenericResult>, IsAsync>;
-    execute<P extends SelectExecuteOptions = SelectExecuteOptions>(options?: P): ArrayResult<GenericResultWrapper, GenericResult, IsAsync, P extends {
-        lazy: true;
-    } ? true : false>;
-    all<P extends SelectExecuteOptions = SelectExecuteOptions>(options?: P): ArrayResult<GenericResultWrapper, GenericResult, IsAsync, P extends {
-        lazy: true;
-    } ? true : false>;
-    one(): MaybeAsync<IsAsync, OneResult<GenericResultWrapper, GenericResult>>;
-    count(): MaybeAsync<IsAsync, CountResult<GenericResultWrapper>>;
-}
-
 declare class QueryBuilder<GenericResultWrapper, IsAsync extends boolean = true> {
     protected options: QueryBuilderOptions<IsAsync>;
     loggerWrapper: typeof asyncLoggerWrapper;
@@ -263,12 +266,25 @@ declare class QueryBuilder<GenericResultWrapper, IsAsync extends boolean = true>
     protected _insert(params: Insert): string;
     protected _update(params: Update): string;
     protected _delete(params: Delete): string;
-    protected _select(params: SelectAll): string;
+    protected _select(params: SelectAll, queryArgs?: any[]): string;
     protected _fields(value?: string | Array<string>): string;
-    protected _where(value?: Where): string;
-    protected _join(value?: Join | Array<Join>): string;
+    protected _where(value: Where | undefined, context?: {
+        subQueryPlaceholders?: Record<string, SelectAll>;
+        queryArgs: any[];
+        toSQLCompiler?: (params: SelectAll, queryArgs: any[]) => string;
+    }): string;
+    protected _join(value: Join | Array<Join> | undefined, context: {
+        subQueryPlaceholders?: Record<string, SelectAll>;
+        queryArgs: any[];
+        toSQLCompiler: (params: SelectAll, queryArgs: any[]) => string;
+    }): string;
     protected _groupBy(value?: string | Array<string>): string;
-    protected _having(value?: string | Array<string>): string;
+    protected _having(value: Where | undefined, // Using Where type as Having structure is similar for conditions/params
+    context: {
+        subQueryPlaceholders?: Record<string, SelectAll>;
+        queryArgs: any[];
+        toSQLCompiler?: (params: SelectAll, queryArgs: any[]) => string;
+    }): string;
     protected _orderBy(value?: string | Array<string> | Record<string, string | OrderTypes>): string;
     protected _limit(value?: number): string;
     protected _offset(value?: number): string;

package/dist/index.d.ts

@@ -40,6 +40,42 @@ declare class QueryWithExtra<GenericResultWrapper, Result = any, IsAsync extends
 }
 declare function trimQuery(query: string): string;
 
+interface SelectExecuteOptions {
+    lazy?: boolean;
+}
+declare class SelectBuilder<GenericResultWrapper, GenericResult = DefaultReturnObject, IsAsync extends boolean = true> {
+    _debugger: boolean;
+    _options: Partial<SelectAll>;
+    _fetchAll: (params: SelectAll) => QueryWithExtra<GenericResultWrapper, any, IsAsync>;
+    _fetchOne: (params: SelectOne) => QueryWithExtra<GenericResultWrapper, any, IsAsync>;
+    constructor(options: Partial<SelectAll>, fetchAll: (params: SelectAll) => QueryWithExtra<GenericResultWrapper, any, IsAsync>, fetchOne: (params: SelectOne) => QueryWithExtra<GenericResultWrapper, any, IsAsync>);
+    setDebugger(state: boolean): void;
+    tableName(tableName: SelectAll['tableName']): SelectBuilder<GenericResultWrapper, GenericResult, IsAsync>;
+    fields(fields: SelectAll['fields']): SelectBuilder<GenericResultWrapper, GenericResult, IsAsync>;
+    where(conditions: string | Array<string>, params?: Primitive | Primitive[]): SelectBuilder<GenericResultWrapper, GenericResult, IsAsync>;
+    whereIn<T extends string | Array<string>, P extends T extends Array<string> ? Primitive[][] : Primitive[]>(fields: T, values: P): SelectBuilder<GenericResultWrapper, GenericResult, IsAsync>;
+    join(join: SelectAll['join']): SelectBuilder<GenericResultWrapper, GenericResult, IsAsync>;
+    groupBy(groupBy: SelectAll['groupBy']): SelectBuilder<GenericResultWrapper, GenericResult, IsAsync>;
+    having(conditions: string | Array<string>, params?: Primitive | Primitive[]): SelectBuilder<GenericResultWrapper, GenericResult, IsAsync>;
+    orderBy(orderBy: SelectAll['orderBy']): SelectBuilder<GenericResultWrapper, GenericResult, IsAsync>;
+    offset(offset: SelectAll['offset']): SelectBuilder<GenericResultWrapper, GenericResult, IsAsync>;
+    limit(limit: SelectAll['limit']): SelectBuilder<GenericResultWrapper, GenericResult, IsAsync>;
+    _parseArray(fieldName: string, option: any, value: any): SelectBuilder<GenericResultWrapper, GenericResult, IsAsync>;
+    getQueryAll<P extends SelectExecuteOptions = SelectExecuteOptions>(options?: P): Query<ArrayResult<GenericResultWrapper, GenericResult, IsAsync, P extends {
+        lazy: true;
+    } ? true : false>, IsAsync>;
+    getQueryOne(): Query<OneResult<GenericResultWrapper, GenericResult>, IsAsync>;
+    execute<P extends SelectExecuteOptions = SelectExecuteOptions>(options?: P): ArrayResult<GenericResultWrapper, GenericResult, IsAsync, P extends {
+        lazy: true;
+    } ? true : false>;
+    all<P extends SelectExecuteOptions = SelectExecuteOptions>(options?: P): ArrayResult<GenericResultWrapper, GenericResult, IsAsync, P extends {
+        lazy: true;
+    } ? true : false>;
+    one(): MaybeAsync<IsAsync, OneResult<GenericResultWrapper, GenericResult>>;
+    count(): MaybeAsync<IsAsync, CountResult<GenericResultWrapper>>;
+    getOptions(): SelectAll;
+}
+
 type OmitIndexSignature<ObjectType> = {
     [KeyType in keyof ObjectType as {} extends Record<KeyType, unknown> ? never : KeyType]: ObjectType[KeyType];
 };
@@ -54,7 +90,7 @@ type SimpleMerge<Destination, Source> = {
 } & Source;
 type Merge<Destination, Source> = Simplify<SimpleMerge<PickIndexSignature<Destination>, PickIndexSignature<Source>> & SimpleMerge<OmitIndexSignature<Destination>, OmitIndexSignature<Source>>>;
 
-type Primitive = null | string | number | boolean | bigint | Raw;
+type Primitive = null | string | number | boolean | bigint | Raw | SelectAll | SelectBuilder<any, any, any>;
 type QueryLoggerMeta = {
     duration?: number;
 };
@@ -69,7 +105,7 @@ type Where = {
 } | string | Array<string>;
 type Join = {
     type?: string | JoinTypes;
-    table: string | SelectAll;
+    table: string | SelectAll | SelectBuilder<any, any, any>;
     on: string;
     alias?: string;
 };
@@ -79,9 +115,11 @@ type SelectOne = {
     where?: Where;
     join?: Join | Array<Join>;
     groupBy?: string | Array<string>;
-    having?: string | Array<string>;
+    having?: Where;
     orderBy?: string | Array<string> | Record<string, string | OrderTypes>;
     offset?: number;
+    subQueryPlaceholders?: Record<string, SelectAll>;
+    subQueryTokenNextId?: number;
 };
 type RawQuery = {
     query: string;
@@ -191,41 +229,6 @@ declare function defaultLogger(query: RawQuery, meta: QueryLoggerMeta): any;
 declare function asyncLoggerWrapper<Async extends boolean = true>(query: Query<any, Async> | Query<any, Async>[], loggerFunction: CallableFunction | undefined, innerFunction: () => any): Promise<any>;
 declare function syncLoggerWrapper<Async extends boolean = false>(query: Query<any, Async> | Query<any, Async>[], loggerFunction: CallableFunction | undefined, innerFunction: () => any): any;
 
-interface SelectExecuteOptions {
-    lazy?: boolean;
-}
-declare class SelectBuilder<GenericResultWrapper, GenericResult = DefaultReturnObject, IsAsync extends boolean = true> {
-    _debugger: boolean;
-    _options: Partial<SelectAll>;
-    _fetchAll: (params: SelectAll) => QueryWithExtra<GenericResultWrapper, any, IsAsync>;
-    _fetchOne: (params: SelectOne) => QueryWithExtra<GenericResultWrapper, any, IsAsync>;
-    constructor(options: Partial<SelectAll>, fetchAll: (params: SelectAll) => QueryWithExtra<GenericResultWrapper, any, IsAsync>, fetchOne: (params: SelectOne) => QueryWithExtra<GenericResultWrapper, any, IsAsync>);
-    setDebugger(state: boolean): void;
-    tableName(tableName: SelectAll['tableName']): SelectBuilder<GenericResultWrapper, GenericResult, IsAsync>;
-    fields(fields: SelectAll['fields']): SelectBuilder<GenericResultWrapper, GenericResult, IsAsync>;
-    where(conditions: string | Array<string>, params?: Primitive | Primitive[]): SelectBuilder<GenericResultWrapper, GenericResult, IsAsync>;
-    whereIn<T extends string | Array<string>, P extends T extends Array<string> ? Primitive[][] : Primitive[]>(fields: T, values: P): SelectBuilder<GenericResultWrapper, GenericResult, IsAsync>;
-    join(join: SelectAll['join']): SelectBuilder<GenericResultWrapper, GenericResult, IsAsync>;
-    groupBy(groupBy: SelectAll['groupBy']): SelectBuilder<GenericResultWrapper, GenericResult, IsAsync>;
-    having(having: SelectAll['having']): SelectBuilder<GenericResultWrapper, GenericResult, IsAsync>;
-    orderBy(orderBy: SelectAll['orderBy']): SelectBuilder<GenericResultWrapper, GenericResult, IsAsync>;
-    offset(offset: SelectAll['offset']): SelectBuilder<GenericResultWrapper, GenericResult, IsAsync>;
-    limit(limit: SelectAll['limit']): SelectBuilder<GenericResultWrapper, GenericResult, IsAsync>;
-    _parseArray(fieldName: string, option: any, value: any): SelectBuilder<GenericResultWrapper, GenericResult, IsAsync>;
-    getQueryAll<P extends SelectExecuteOptions = SelectExecuteOptions>(options?: P): Query<ArrayResult<GenericResultWrapper, GenericResult, IsAsync, P extends {
-        lazy: true;
-    } ? true : false>, IsAsync>;
-    getQueryOne(): Query<OneResult<GenericResultWrapper, GenericResult>, IsAsync>;
-    execute<P extends SelectExecuteOptions = SelectExecuteOptions>(options?: P): ArrayResult<GenericResultWrapper, GenericResult, IsAsync, P extends {
-        lazy: true;
-    } ? true : false>;
-    all<P extends SelectExecuteOptions = SelectExecuteOptions>(options?: P): ArrayResult<GenericResultWrapper, GenericResult, IsAsync, P extends {
-        lazy: true;
-    } ? true : false>;
-    one(): MaybeAsync<IsAsync, OneResult<GenericResultWrapper, GenericResult>>;
-    count(): MaybeAsync<IsAsync, CountResult<GenericResultWrapper>>;
-}
-
 declare class QueryBuilder<GenericResultWrapper, IsAsync extends boolean = true> {
     protected options: QueryBuilderOptions<IsAsync>;
     loggerWrapper: typeof asyncLoggerWrapper;
@@ -263,12 +266,25 @@ declare class QueryBuilder<GenericResultWrapper, IsAsync extends boolean = true>
     protected _insert(params: Insert): string;
     protected _update(params: Update): string;
     protected _delete(params: Delete): string;
-    protected _select(params: SelectAll): string;
+    protected _select(params: SelectAll, queryArgs?: any[]): string;
     protected _fields(value?: string | Array<string>): string;
-    protected _where(value?: Where): string;
-    protected _join(value?: Join | Array<Join>): string;
+    protected _where(value: Where | undefined, context?: {
+        subQueryPlaceholders?: Record<string, SelectAll>;
+        queryArgs: any[];
+        toSQLCompiler?: (params: SelectAll, queryArgs: any[]) => string;
+    }): string;
+    protected _join(value: Join | Array<Join> | undefined, context: {
+        subQueryPlaceholders?: Record<string, SelectAll>;
+        queryArgs: any[];
+        toSQLCompiler: (params: SelectAll, queryArgs: any[]) => string;
+    }): string;
     protected _groupBy(value?: string | Array<string>): string;
-    protected _having(value?: string | Array<string>): string;
+    protected _having(value: Where | undefined, // Using Where type as Having structure is similar for conditions/params
+    context: {
+        subQueryPlaceholders?: Record<string, SelectAll>;
+        queryArgs: any[];
+        toSQLCompiler?: (params: SelectAll, queryArgs: any[]) => string;
+    }): string;
     protected _orderBy(value?: string | Array<string> | Record<string, string | OrderTypes>): string;
     protected _limit(value?: number): string;
     protected _offset(value?: number): string;

package/dist/index.js

@@ -18,8 +18,8 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // src/index.ts
-var src_exports = {};
-__export(src_exports, {
+var index_exports = {};
+__export(index_exports, {
   ConflictTypes: () => ConflictTypes,
   D1QB: () => D1QB,
   DOQB: () => DOQB,
@@ -38,7 +38,7 @@ __export(src_exports, {
   syncMigrationsBuilder: () => syncMigrationsBuilder,
   trimQuery: () => trimQuery
 });
-module.exports = __toCommonJS(src_exports);
+module.exports = __toCommonJS(index_exports);
 
 // src/enums.ts
 var OrderTypes = /* @__PURE__ */ ((OrderTypes3) => {
@@ -135,25 +135,53 @@ var SelectBuilder = class _SelectBuilder {
     return this._parseArray("fields", this._options.fields, fields);
   }
   where(conditions, params) {
-    if (!Array.isArray(conditions)) {
-      conditions = [conditions];
-    }
-    if (params === void 0) params = [];
-    if (!Array.isArray(params)) {
-      params = [params];
-    }
-    if (this._options.where?.conditions) {
-      conditions = this._options.where.conditions.concat(conditions);
+    const subQueryPlaceholders = this._options.subQueryPlaceholders ?? {};
+    let subQueryTokenNextId = this._options.subQueryTokenNextId ?? 0;
+    const existingConditions = this._options.where && typeof this._options.where === "object" && "conditions" in this._options.where ? this._options.where.conditions : [];
+    const existingParams = this._options.where && typeof this._options.where === "object" && "params" in this._options.where && this._options.where.params ? this._options.where.params : [];
+    const currentInputConditions = Array.isArray(conditions) ? conditions : [conditions];
+    const currentInputParams = params === void 0 ? [] : Array.isArray(params) ? params : [params];
+    const processedNewConditions = [];
+    const collectedPrimitiveParams = [];
+    let paramIndex = 0;
+    for (const conditionStr of currentInputConditions) {
+      if (!conditionStr.includes("?")) {
+        processedNewConditions.push(conditionStr);
+        continue;
+      }
+      const conditionParts = conditionStr.split("?");
+      let builtCondition = conditionParts[0] ?? "";
+      for (let j = 0; j < conditionParts.length - 1; j++) {
+        if (paramIndex >= currentInputParams.length) {
+          throw new Error('Mismatch between "?" placeholders and parameters in where clause.');
+        }
+        const currentParam = currentInputParams[paramIndex++];
+        const isSubQuery = typeof currentParam === "object" && currentParam !== null && ("tableName" in currentParam || "getOptions" in currentParam) && !currentParam.hasOwnProperty("_raw") || currentParam instanceof _SelectBuilder;
+        if (isSubQuery) {
+          const token = `__SUBQUERY_TOKEN_${subQueryTokenNextId++}__`;
+          subQueryPlaceholders[token] = currentParam instanceof _SelectBuilder ? currentParam.getOptions() : "getOptions" in currentParam && typeof currentParam.getOptions === "function" ? currentParam.getOptions() : currentParam;
+          builtCondition += token;
+        } else {
+          builtCondition += "?";
+          if (currentParam !== void 0) {
+            collectedPrimitiveParams.push(currentParam);
+          }
+        }
+        builtCondition += conditionParts[j + 1] ?? "";
+      }
+      processedNewConditions.push(builtCondition);
     }
-    if (this._options.where?.params) {
-      params = this._options.where.params.concat(params);
+    if (paramIndex < currentInputParams.length) {
+      throw new Error('Too many parameters provided for the given "?" placeholders in where clause.');
     }
     return new _SelectBuilder(
       {
         ...this._options,
+        subQueryPlaceholders,
+        subQueryTokenNextId,
         where: {
-          conditions,
-          params
+          conditions: existingConditions.concat(processedNewConditions),
+          params: existingParams.concat(collectedPrimitiveParams)
         }
       },
       this._fetchAll,
@@ -182,39 +210,81 @@ var SelectBuilder = class _SelectBuilder {
       const fieldLength = fields.length;
       whereInCondition = `(${fields.map((val) => val).reduce(seperateWithComma)}) IN (VALUES `;
       const valuesString = `(${[...new Array(fieldLength).keys()].map(() => "?").reduce(seperateWithComma)})`;
-      whereInCondition += [...new Array(fieldLength).keys()].map(() => valuesString).reduce(seperateWithComma);
+      whereInCondition += [...new Array(values.length).keys()].map(() => valuesString).reduce(seperateWithComma);
       whereInCondition += ")";
       whereInParams = values.flat();
     }
-    let conditions = [whereInCondition];
-    let params = whereInParams;
-    if (this._options.where?.conditions) {
-      conditions = this._options.where?.conditions.concat(conditions);
+    return this.where(whereInCondition, whereInParams);
+  }
+  join(join) {
+    const joins = Array.isArray(join) ? join : [join];
+    const processedJoins = joins.map((j) => {
+      if (j && typeof j.table === "object") {
+        if (j.table instanceof _SelectBuilder) {
+          return { ...j, table: j.table.getOptions() };
+        }
+      }
+      return j;
+    });
+    return this._parseArray("join", this._options.join, processedJoins);
+  }
+  groupBy(groupBy) {
+    return this._parseArray("groupBy", this._options.groupBy, groupBy);
+  }
+  having(conditions, params) {
+    const subQueryPlaceholders = this._options.subQueryPlaceholders ?? {};
+    let subQueryTokenNextId = this._options.subQueryTokenNextId ?? 0;
+    const existingConditions = this._options.having && typeof this._options.having === "object" && "conditions" in this._options.having ? this._options.having.conditions : [];
+    const existingParams = this._options.having && typeof this._options.having === "object" && "params" in this._options.having && this._options.having.params ? this._options.having.params : [];
+    const currentInputConditions = Array.isArray(conditions) ? conditions : [conditions];
+    const currentInputParams = params === void 0 ? [] : Array.isArray(params) ? params : [params];
+    const processedNewConditions = [];
+    const collectedPrimitiveParams = [];
+    let paramIndex = 0;
+    for (const conditionStr of currentInputConditions) {
+      if (!conditionStr.includes("?")) {
+        processedNewConditions.push(conditionStr);
+        continue;
+      }
+      const conditionParts = conditionStr.split("?");
+      let builtCondition = conditionParts[0] ?? "";
+      for (let j = 0; j < conditionParts.length - 1; j++) {
+        if (paramIndex >= currentInputParams.length) {
+          throw new Error('Mismatch between "?" placeholders and parameters in having clause.');
+        }
+        const currentParam = currentInputParams[paramIndex++];
+        const isSubQuery = typeof currentParam === "object" && currentParam !== null && ("tableName" in currentParam || "getOptions" in currentParam) && !currentParam.hasOwnProperty("_raw") || currentParam instanceof _SelectBuilder;
+        if (isSubQuery) {
+          const token = `__SUBQUERY_TOKEN_${subQueryTokenNextId++}__`;
+          subQueryPlaceholders[token] = currentParam instanceof _SelectBuilder ? currentParam.getOptions() : "getOptions" in currentParam && typeof currentParam.getOptions === "function" ? currentParam.getOptions() : currentParam;
+          builtCondition += token;
+        } else {
+          builtCondition += "?";
+          if (currentParam !== void 0) {
+            collectedPrimitiveParams.push(currentParam);
+          }
+        }
+        builtCondition += conditionParts[j + 1] ?? "";
+      }
+      processedNewConditions.push(builtCondition);
     }
-    if (this._options.where?.params) {
-      params = this._options.where?.params.concat(params);
+    if (paramIndex < currentInputParams.length) {
+      throw new Error('Too many parameters provided for the given "?" placeholders in having clause.');
     }
     return new _SelectBuilder(
       {
         ...this._options,
-        where: {
-          conditions,
-          params
+        subQueryPlaceholders,
+        subQueryTokenNextId,
+        having: {
+          conditions: existingConditions.concat(processedNewConditions),
+          params: existingParams.concat(collectedPrimitiveParams)
         }
       },
       this._fetchAll,
       this._fetchOne
     );
   }
-  join(join) {
-    return this._parseArray("join", this._options.join, join);
-  }
-  groupBy(groupBy) {
-    return this._parseArray("groupBy", this._options.groupBy, groupBy);
-  }
-  having(having) {
-    return this._parseArray("having", this._options.having, having);
-  }
   orderBy(orderBy) {
     return this._parseArray("orderBy", this._options.orderBy, orderBy);
   }
@@ -284,6 +354,9 @@ var SelectBuilder = class _SelectBuilder {
   count() {
     return this._fetchOne(this._options).count();
   }
+  getOptions() {
+    return this._options;
+  }
 };
 
 // src/tools.ts
@@ -389,37 +462,56 @@ var QueryBuilder = class {
     );
   }
   fetchOne(params) {
+    const queryArgs = [];
+    const countQueryArgs = [];
+    const selectParamsForCount = {
+      ...params,
+      fields: "count(*) as total",
+      offset: void 0,
+      groupBy: void 0,
+      limit: 1
+    };
+    if (params.subQueryPlaceholders) {
+      selectParamsForCount.subQueryPlaceholders = params.subQueryPlaceholders;
+    }
+    const mainSql = this._select({ ...params, limit: 1 }, queryArgs);
+    const countSql = this._select(selectParamsForCount, countQueryArgs);
     return new QueryWithExtra(
       (q) => {
         return this.execute(q);
       },
-      this._select({ ...params, limit: 1 }),
-      this._select({
-        ...params,
-        fields: "count(*) as total",
-        offset: void 0,
-        groupBy: void 0,
-        limit: 1
-      }),
-      typeof params.where === "object" && !Array.isArray(params.where) && params.where?.params ? Array.isArray(params.where?.params) ? params.where?.params : [params.where?.params] : void 0,
+      mainSql,
+      countSql,
+      queryArgs,
+      // Use the populated queryArgs from the main _select call
       "ONE" /* ONE */
     );
   }
   fetchAll(params) {
+    const queryArgs = [];
+    const countQueryArgs = [];
+    const mainQueryParams = { ...params, lazy: void 0 };
+    const countQueryParams = {
+      ...params,
+      fields: "count(*) as total",
+      offset: void 0,
+      groupBy: void 0,
+      limit: 1,
+      lazy: void 0
+    };
+    if (params.subQueryPlaceholders) {
+      countQueryParams.subQueryPlaceholders = params.subQueryPlaceholders;
+    }
+    const mainSql = this._select(mainQueryParams, queryArgs);
+    const countSql = this._select(countQueryParams, countQueryArgs);
     return new QueryWithExtra(
       (q) => {
         return params.lazy ? this.lazyExecute(q) : this.execute(q);
       },
-      this._select({ ...params, lazy: void 0 }),
-      this._select({
-        ...params,
-        fields: "count(*) as total",
-        offset: void 0,
-        groupBy: void 0,
-        limit: 1,
-        lazy: void 0
-      }),
-      typeof params.where === "object" && !Array.isArray(params.where) && params.where?.params ? Array.isArray(params.where?.params) ? params.where?.params : [params.where?.params] : void 0,
+      mainSql,
+      countSql,
+      queryArgs,
+      // Use the populated queryArgs from the main _select call
       "ALL" /* ALL */
     );
   }
@@ -577,39 +669,102 @@ var QueryBuilder = class {
     return `DELETE
             FROM ${params.tableName}` + this._where(params.where) + this._returning(params.returning) + this._orderBy(params.orderBy) + this._limit(params.limit) + this._offset(params.offset);
   }
-  _select(params) {
+  _select(params, queryArgs) {
+    const isTopLevelCall = queryArgs === void 0;
+    if (isTopLevelCall) {
+      queryArgs = [];
+    }
+    const currentQueryArgs = queryArgs;
+    const context = {
+      subQueryPlaceholders: params.subQueryPlaceholders,
+      queryArgs: currentQueryArgs,
+      toSQLCompiler: this._select.bind(this)
+    };
     return `SELECT ${this._fields(params.fields)}
-       FROM ${params.tableName}` + this._join(params.join) + this._where(params.where) + this._groupBy(params.groupBy) + this._having(params.having) + this._orderBy(params.orderBy) + this._limit(params.limit) + this._offset(params.offset);
+       FROM ${params.tableName}` + this._join(params.join, context) + this._where(params.where, context) + this._groupBy(params.groupBy) + this._having(params.having, context) + this._orderBy(params.orderBy) + this._limit(params.limit) + this._offset(params.offset);
   }
   _fields(value) {
     if (!value) return "*";
     if (typeof value === "string") return value;
     return value.join(", ");
   }
-  _where(value) {
+  _where(value, context) {
     if (!value) return "";
-    let conditions = value;
+    const currentContext = context ?? { queryArgs: [] };
+    let conditionStrings;
+    let primitiveParams = [];
     if (typeof value === "object" && !Array.isArray(value)) {
-      conditions = value.conditions;
+      conditionStrings = Array.isArray(value.conditions) ? value.conditions : [value.conditions];
+      if (value.params) {
+        primitiveParams = Array.isArray(value.params) ? value.params : [value.params];
+      }
+    } else if (Array.isArray(value)) {
+      conditionStrings = value;
+    } else {
+      conditionStrings = [value];
     }
-    if (typeof conditions === "string") return ` WHERE ${conditions.toString()}`;
-    if (conditions.length === 1) return ` WHERE ${conditions[0].toString()}`;
-    if (conditions.length > 1) {
-      return ` WHERE (${conditions.join(") AND (")})`;
+    if (conditionStrings.length === 0) return "";
+    let primitiveParamIndex = 0;
+    const processedConditions = [];
+    for (const conditionStr of conditionStrings) {
+      const parts = conditionStr.split(/(__SUBQUERY_TOKEN_\d+__|\?)/g).filter(Boolean);
+      let builtCondition = "";
+      for (const part of parts) {
+        if (part === "?") {
+          if (primitiveParamIndex >= primitiveParams.length) {
+            throw new Error(
+              'SQL generation error: Not enough primitive parameters for "?" placeholders in WHERE clause.'
+            );
+          }
+          currentContext.queryArgs.push(primitiveParams[primitiveParamIndex++]);
+          builtCondition += "?";
+        } else if (part.startsWith("__SUBQUERY_TOKEN_") && part.endsWith("__")) {
+          if (!currentContext.subQueryPlaceholders || !currentContext.toSQLCompiler) {
+            throw new Error("SQL generation error: Subquery context not provided for token processing.");
+          }
+          const subQueryParams = currentContext.subQueryPlaceholders[part];
+          if (!subQueryParams) {
+            throw new Error(`SQL generation error: Subquery token ${part} not found in placeholders.`);
+          }
+          const subQuerySql = currentContext.toSQLCompiler(subQueryParams, currentContext.queryArgs);
+          builtCondition += `(${subQuerySql})`;
+        } else {
+          builtCondition += part;
+        }
+      }
+      processedConditions.push(builtCondition);
     }
-    return "";
+    if (primitiveParamIndex < primitiveParams.length && primitiveParams.length > 0) {
+      throw new Error(
+        'SQL generation error: Too many primitive parameters provided for "?" placeholders in WHERE clause.'
+      );
+    }
+    if (processedConditions.length === 0) return "";
+    if (processedConditions.length === 1) {
+      return ` WHERE ${processedConditions[0]}`;
+    }
+    return ` WHERE (${processedConditions.join(") AND (")})`;
   }
-  _join(value) {
+  _join(value, context) {
     if (!value) return "";
+    let joinArray;
     if (!Array.isArray(value)) {
-      value = [value];
+      joinArray = [value];
+    } else {
+      joinArray = value;
     }
     const joinQuery = [];
-    value.forEach((item) => {
+    joinArray.forEach((item) => {
       const type = item.type ? `${item.type} ` : "";
-      joinQuery.push(
-        `${type}JOIN ${typeof item.table === "string" ? item.table : `(${this._select(item.table)})`}${item.alias ? ` AS ${item.alias}` : ""} ON ${item.on}`
-      );
+      let tableSql;
+      if (typeof item.table === "string") {
+        tableSql = item.table;
+      } else if (item.table instanceof SelectBuilder) {
+        tableSql = `(${context.toSQLCompiler(item.table.getOptions(), context.queryArgs)})`;
+      } else {
+        tableSql = `(${context.toSQLCompiler(item.table, context.queryArgs)})`;
+      }
+      joinQuery.push(`${type}JOIN ${tableSql}${item.alias ? ` AS ${item.alias}` : ""} ON ${item.on}`);
     });
     return " " + joinQuery.join(" ");
   }
@@ -618,10 +773,62 @@ var QueryBuilder = class {
     if (typeof value === "string") return ` GROUP BY ${value}`;
     return ` GROUP BY ${value.join(", ")}`;
   }
-  _having(value) {
+  _having(value, context) {
     if (!value) return "";
-    if (typeof value === "string") return ` HAVING ${value}`;
-    return ` HAVING ${value.join(" AND ")}`;
+    const currentContext = context ?? { queryArgs: [] };
+    let conditionStrings;
+    let primitiveParams = [];
+    if (typeof value === "object" && !Array.isArray(value)) {
+      conditionStrings = Array.isArray(value.conditions) ? value.conditions : [value.conditions];
+      if (value.params) {
+        primitiveParams = Array.isArray(value.params) ? value.params : [value.params];
+      }
+    } else if (Array.isArray(value)) {
+      conditionStrings = value;
+    } else {
+      conditionStrings = [value];
+    }
+    if (conditionStrings.length === 0) return "";
+    let primitiveParamIndex = 0;
+    const processedConditions = [];
+    for (const conditionStr of conditionStrings) {
+      const parts = conditionStr.split(/(__SUBQUERY_TOKEN_\d+__|\?)/g).filter(Boolean);
+      let builtCondition = "";
+      for (const part of parts) {
+        if (part === "?") {
+          if (primitiveParamIndex >= primitiveParams.length) {
+            throw new Error(
+              'SQL generation error: Not enough primitive parameters for "?" placeholders in HAVING clause.'
+            );
+          }
+          currentContext.queryArgs.push(primitiveParams[primitiveParamIndex++]);
+          builtCondition += "?";
+        } else if (part.startsWith("__SUBQUERY_TOKEN_") && part.endsWith("__")) {
+          if (!currentContext.subQueryPlaceholders || !currentContext.toSQLCompiler) {
+            throw new Error("SQL generation error: Subquery context not provided for token processing.");
+          }
+          const subQueryParams = currentContext.subQueryPlaceholders[part];
+          if (!subQueryParams) {
+            throw new Error(`SQL generation error: Subquery token ${part} not found in placeholders.`);
+          }
+          const subQuerySql = currentContext.toSQLCompiler(subQueryParams, currentContext.queryArgs);
+          builtCondition += `(${subQuerySql})`;
+        } else {
+          builtCondition += part;
+        }
+      }
+      processedConditions.push(builtCondition);
+    }
+    if (primitiveParamIndex < primitiveParams.length && primitiveParams.length > 0) {
+      throw new Error(
+        'SQL generation error: Too many primitive parameters provided for "?" placeholders in HAVING clause.'
+      );
+    }
+    if (processedConditions.length === 0) return "";
+    if (processedConditions.length === 1) {
+      return ` HAVING ${processedConditions[0]}`;
+    }
+    return ` HAVING (${processedConditions.join(") AND (")})`;
   }
   _orderBy(value) {
     if (!value) return "";

package/dist/index.mjs

@@ -93,25 +93,53 @@ var SelectBuilder = class _SelectBuilder {
     return this._parseArray("fields", this._options.fields, fields);
   }
   where(conditions, params) {
-    if (!Array.isArray(conditions)) {
-      conditions = [conditions];
-    }
-    if (params === void 0) params = [];
-    if (!Array.isArray(params)) {
-      params = [params];
-    }
-    if (this._options.where?.conditions) {
-      conditions = this._options.where.conditions.concat(conditions);
+    const subQueryPlaceholders = this._options.subQueryPlaceholders ?? {};
+    let subQueryTokenNextId = this._options.subQueryTokenNextId ?? 0;
+    const existingConditions = this._options.where && typeof this._options.where === "object" && "conditions" in this._options.where ? this._options.where.conditions : [];
+    const existingParams = this._options.where && typeof this._options.where === "object" && "params" in this._options.where && this._options.where.params ? this._options.where.params : [];
+    const currentInputConditions = Array.isArray(conditions) ? conditions : [conditions];
+    const currentInputParams = params === void 0 ? [] : Array.isArray(params) ? params : [params];
+    const processedNewConditions = [];
+    const collectedPrimitiveParams = [];
+    let paramIndex = 0;
+    for (const conditionStr of currentInputConditions) {
+      if (!conditionStr.includes("?")) {
+        processedNewConditions.push(conditionStr);
+        continue;
+      }
+      const conditionParts = conditionStr.split("?");
+      let builtCondition = conditionParts[0] ?? "";
+      for (let j = 0; j < conditionParts.length - 1; j++) {
+        if (paramIndex >= currentInputParams.length) {
+          throw new Error('Mismatch between "?" placeholders and parameters in where clause.');
+        }
+        const currentParam = currentInputParams[paramIndex++];
+        const isSubQuery = typeof currentParam === "object" && currentParam !== null && ("tableName" in currentParam || "getOptions" in currentParam) && !currentParam.hasOwnProperty("_raw") || currentParam instanceof _SelectBuilder;
+        if (isSubQuery) {
+          const token = `__SUBQUERY_TOKEN_${subQueryTokenNextId++}__`;
+          subQueryPlaceholders[token] = currentParam instanceof _SelectBuilder ? currentParam.getOptions() : "getOptions" in currentParam && typeof currentParam.getOptions === "function" ? currentParam.getOptions() : currentParam;
+          builtCondition += token;
+        } else {
+          builtCondition += "?";
+          if (currentParam !== void 0) {
+            collectedPrimitiveParams.push(currentParam);
+          }
+        }
+        builtCondition += conditionParts[j + 1] ?? "";
+      }
+      processedNewConditions.push(builtCondition);
     }
-    if (this._options.where?.params) {
-      params = this._options.where.params.concat(params);
+    if (paramIndex < currentInputParams.length) {
+      throw new Error('Too many parameters provided for the given "?" placeholders in where clause.');
     }
     return new _SelectBuilder(
       {
         ...this._options,
+        subQueryPlaceholders,
+        subQueryTokenNextId,
         where: {
-          conditions,
-          params
+          conditions: existingConditions.concat(processedNewConditions),
+          params: existingParams.concat(collectedPrimitiveParams)
         }
       },
       this._fetchAll,
@@ -140,39 +168,81 @@ var SelectBuilder = class _SelectBuilder {
       const fieldLength = fields.length;
       whereInCondition = `(${fields.map((val) => val).reduce(seperateWithComma)}) IN (VALUES `;
       const valuesString = `(${[...new Array(fieldLength).keys()].map(() => "?").reduce(seperateWithComma)})`;
-      whereInCondition += [...new Array(fieldLength).keys()].map(() => valuesString).reduce(seperateWithComma);
+      whereInCondition += [...new Array(values.length).keys()].map(() => valuesString).reduce(seperateWithComma);
       whereInCondition += ")";
       whereInParams = values.flat();
     }
-    let conditions = [whereInCondition];
-    let params = whereInParams;
-    if (this._options.where?.conditions) {
-      conditions = this._options.where?.conditions.concat(conditions);
+    return this.where(whereInCondition, whereInParams);
+  }
+  join(join) {
+    const joins = Array.isArray(join) ? join : [join];
+    const processedJoins = joins.map((j) => {
+      if (j && typeof j.table === "object") {
+        if (j.table instanceof _SelectBuilder) {
+          return { ...j, table: j.table.getOptions() };
+        }
+      }
+      return j;
+    });
+    return this._parseArray("join", this._options.join, processedJoins);
+  }
+  groupBy(groupBy) {
+    return this._parseArray("groupBy", this._options.groupBy, groupBy);
+  }
+  having(conditions, params) {
+    const subQueryPlaceholders = this._options.subQueryPlaceholders ?? {};
+    let subQueryTokenNextId = this._options.subQueryTokenNextId ?? 0;
+    const existingConditions = this._options.having && typeof this._options.having === "object" && "conditions" in this._options.having ? this._options.having.conditions : [];
+    const existingParams = this._options.having && typeof this._options.having === "object" && "params" in this._options.having && this._options.having.params ? this._options.having.params : [];
+    const currentInputConditions = Array.isArray(conditions) ? conditions : [conditions];
+    const currentInputParams = params === void 0 ? [] : Array.isArray(params) ? params : [params];
+    const processedNewConditions = [];
+    const collectedPrimitiveParams = [];
+    let paramIndex = 0;
+    for (const conditionStr of currentInputConditions) {
+      if (!conditionStr.includes("?")) {
+        processedNewConditions.push(conditionStr);
+        continue;
+      }
+      const conditionParts = conditionStr.split("?");
+      let builtCondition = conditionParts[0] ?? "";
+      for (let j = 0; j < conditionParts.length - 1; j++) {
+        if (paramIndex >= currentInputParams.length) {
+          throw new Error('Mismatch between "?" placeholders and parameters in having clause.');
+        }
+        const currentParam = currentInputParams[paramIndex++];
+        const isSubQuery = typeof currentParam === "object" && currentParam !== null && ("tableName" in currentParam || "getOptions" in currentParam) && !currentParam.hasOwnProperty("_raw") || currentParam instanceof _SelectBuilder;
+        if (isSubQuery) {
+          const token = `__SUBQUERY_TOKEN_${subQueryTokenNextId++}__`;
+          subQueryPlaceholders[token] = currentParam instanceof _SelectBuilder ? currentParam.getOptions() : "getOptions" in currentParam && typeof currentParam.getOptions === "function" ? currentParam.getOptions() : currentParam;
+          builtCondition += token;
+        } else {
+          builtCondition += "?";
+          if (currentParam !== void 0) {
+            collectedPrimitiveParams.push(currentParam);
+          }
+        }
+        builtCondition += conditionParts[j + 1] ?? "";
+      }
+      processedNewConditions.push(builtCondition);
     }
-    if (this._options.where?.params) {
-      params = this._options.where?.params.concat(params);
+    if (paramIndex < currentInputParams.length) {
+      throw new Error('Too many parameters provided for the given "?" placeholders in having clause.');
     }
     return new _SelectBuilder(
       {
         ...this._options,
-        where: {
-          conditions,
-          params
+        subQueryPlaceholders,
+        subQueryTokenNextId,
+        having: {
+          conditions: existingConditions.concat(processedNewConditions),
+          params: existingParams.concat(collectedPrimitiveParams)
         }
       },
       this._fetchAll,
       this._fetchOne
     );
   }
-  join(join) {
-    return this._parseArray("join", this._options.join, join);
-  }
-  groupBy(groupBy) {
-    return this._parseArray("groupBy", this._options.groupBy, groupBy);
-  }
-  having(having) {
-    return this._parseArray("having", this._options.having, having);
-  }
   orderBy(orderBy) {
     return this._parseArray("orderBy", this._options.orderBy, orderBy);
   }
@@ -242,6 +312,9 @@ var SelectBuilder = class _SelectBuilder {
   count() {
     return this._fetchOne(this._options).count();
   }
+  getOptions() {
+    return this._options;
+  }
 };
 
 // src/tools.ts
@@ -347,37 +420,56 @@ var QueryBuilder = class {
     );
   }
   fetchOne(params) {
+    const queryArgs = [];
+    const countQueryArgs = [];
+    const selectParamsForCount = {
+      ...params,
+      fields: "count(*) as total",
+      offset: void 0,
+      groupBy: void 0,
+      limit: 1
+    };
+    if (params.subQueryPlaceholders) {
+      selectParamsForCount.subQueryPlaceholders = params.subQueryPlaceholders;
+    }
+    const mainSql = this._select({ ...params, limit: 1 }, queryArgs);
+    const countSql = this._select(selectParamsForCount, countQueryArgs);
     return new QueryWithExtra(
       (q) => {
         return this.execute(q);
       },
-      this._select({ ...params, limit: 1 }),
-      this._select({
-        ...params,
-        fields: "count(*) as total",
-        offset: void 0,
-        groupBy: void 0,
-        limit: 1
-      }),
-      typeof params.where === "object" && !Array.isArray(params.where) && params.where?.params ? Array.isArray(params.where?.params) ? params.where?.params : [params.where?.params] : void 0,
+      mainSql,
+      countSql,
+      queryArgs,
+      // Use the populated queryArgs from the main _select call
       "ONE" /* ONE */
     );
   }
   fetchAll(params) {
+    const queryArgs = [];
+    const countQueryArgs = [];
+    const mainQueryParams = { ...params, lazy: void 0 };
+    const countQueryParams = {
+      ...params,
+      fields: "count(*) as total",
+      offset: void 0,
+      groupBy: void 0,
+      limit: 1,
+      lazy: void 0
+    };
+    if (params.subQueryPlaceholders) {
+      countQueryParams.subQueryPlaceholders = params.subQueryPlaceholders;
+    }
+    const mainSql = this._select(mainQueryParams, queryArgs);
+    const countSql = this._select(countQueryParams, countQueryArgs);
     return new QueryWithExtra(
       (q) => {
         return params.lazy ? this.lazyExecute(q) : this.execute(q);
       },
-      this._select({ ...params, lazy: void 0 }),
-      this._select({
-        ...params,
-        fields: "count(*) as total",
-        offset: void 0,
-        groupBy: void 0,
-        limit: 1,
-        lazy: void 0
-      }),
-      typeof params.where === "object" && !Array.isArray(params.where) && params.where?.params ? Array.isArray(params.where?.params) ? params.where?.params : [params.where?.params] : void 0,
+      mainSql,
+      countSql,
+      queryArgs,
+      // Use the populated queryArgs from the main _select call
       "ALL" /* ALL */
     );
   }
@@ -535,39 +627,102 @@ var QueryBuilder = class {
     return `DELETE
             FROM ${params.tableName}` + this._where(params.where) + this._returning(params.returning) + this._orderBy(params.orderBy) + this._limit(params.limit) + this._offset(params.offset);
   }
-  _select(params) {
+  _select(params, queryArgs) {
+    const isTopLevelCall = queryArgs === void 0;
+    if (isTopLevelCall) {
+      queryArgs = [];
+    }
+    const currentQueryArgs = queryArgs;
+    const context = {
+      subQueryPlaceholders: params.subQueryPlaceholders,
+      queryArgs: currentQueryArgs,
+      toSQLCompiler: this._select.bind(this)
+    };
     return `SELECT ${this._fields(params.fields)}
-       FROM ${params.tableName}` + this._join(params.join) + this._where(params.where) + this._groupBy(params.groupBy) + this._having(params.having) + this._orderBy(params.orderBy) + this._limit(params.limit) + this._offset(params.offset);
+       FROM ${params.tableName}` + this._join(params.join, context) + this._where(params.where, context) + this._groupBy(params.groupBy) + this._having(params.having, context) + this._orderBy(params.orderBy) + this._limit(params.limit) + this._offset(params.offset);
   }
   _fields(value) {
     if (!value) return "*";
     if (typeof value === "string") return value;
     return value.join(", ");
   }
-  _where(value) {
+  _where(value, context) {
     if (!value) return "";
-    let conditions = value;
+    const currentContext = context ?? { queryArgs: [] };
+    let conditionStrings;
+    let primitiveParams = [];
     if (typeof value === "object" && !Array.isArray(value)) {
-      conditions = value.conditions;
+      conditionStrings = Array.isArray(value.conditions) ? value.conditions : [value.conditions];
+      if (value.params) {
+        primitiveParams = Array.isArray(value.params) ? value.params : [value.params];
+      }
+    } else if (Array.isArray(value)) {
+      conditionStrings = value;
+    } else {
+      conditionStrings = [value];
     }
-    if (typeof conditions === "string") return ` WHERE ${conditions.toString()}`;
-    if (conditions.length === 1) return ` WHERE ${conditions[0].toString()}`;
-    if (conditions.length > 1) {
-      return ` WHERE (${conditions.join(") AND (")})`;
+    if (conditionStrings.length === 0) return "";
+    let primitiveParamIndex = 0;
+    const processedConditions = [];
+    for (const conditionStr of conditionStrings) {
+      const parts = conditionStr.split(/(__SUBQUERY_TOKEN_\d+__|\?)/g).filter(Boolean);
+      let builtCondition = "";
+      for (const part of parts) {
+        if (part === "?") {
+          if (primitiveParamIndex >= primitiveParams.length) {
+            throw new Error(
+              'SQL generation error: Not enough primitive parameters for "?" placeholders in WHERE clause.'
+            );
+          }
+          currentContext.queryArgs.push(primitiveParams[primitiveParamIndex++]);
+          builtCondition += "?";
+        } else if (part.startsWith("__SUBQUERY_TOKEN_") && part.endsWith("__")) {
+          if (!currentContext.subQueryPlaceholders || !currentContext.toSQLCompiler) {
+            throw new Error("SQL generation error: Subquery context not provided for token processing.");
+          }
+          const subQueryParams = currentContext.subQueryPlaceholders[part];
+          if (!subQueryParams) {
+            throw new Error(`SQL generation error: Subquery token ${part} not found in placeholders.`);
+          }
+          const subQuerySql = currentContext.toSQLCompiler(subQueryParams, currentContext.queryArgs);
+          builtCondition += `(${subQuerySql})`;
+        } else {
+          builtCondition += part;
+        }
+      }
+      processedConditions.push(builtCondition);
     }
-    return "";
+    if (primitiveParamIndex < primitiveParams.length && primitiveParams.length > 0) {
+      throw new Error(
+        'SQL generation error: Too many primitive parameters provided for "?" placeholders in WHERE clause.'
+      );
+    }
+    if (processedConditions.length === 0) return "";
+    if (processedConditions.length === 1) {
+      return ` WHERE ${processedConditions[0]}`;
+    }
+    return ` WHERE (${processedConditions.join(") AND (")})`;
   }
-  _join(value) {
+  _join(value, context) {
     if (!value) return "";
+    let joinArray;
     if (!Array.isArray(value)) {
-      value = [value];
+      joinArray = [value];
+    } else {
+      joinArray = value;
     }
     const joinQuery = [];
-    value.forEach((item) => {
+    joinArray.forEach((item) => {
       const type = item.type ? `${item.type} ` : "";
-      joinQuery.push(
-        `${type}JOIN ${typeof item.table === "string" ? item.table : `(${this._select(item.table)})`}${item.alias ? ` AS ${item.alias}` : ""} ON ${item.on}`
-      );
+      let tableSql;
+      if (typeof item.table === "string") {
+        tableSql = item.table;
+      } else if (item.table instanceof SelectBuilder) {
+        tableSql = `(${context.toSQLCompiler(item.table.getOptions(), context.queryArgs)})`;
+      } else {
+        tableSql = `(${context.toSQLCompiler(item.table, context.queryArgs)})`;
+      }
+      joinQuery.push(`${type}JOIN ${tableSql}${item.alias ? ` AS ${item.alias}` : ""} ON ${item.on}`);
     });
     return " " + joinQuery.join(" ");
   }
@@ -576,10 +731,62 @@ var QueryBuilder = class {
     if (typeof value === "string") return ` GROUP BY ${value}`;
     return ` GROUP BY ${value.join(", ")}`;
   }
-  _having(value) {
+  _having(value, context) {
     if (!value) return "";
-    if (typeof value === "string") return ` HAVING ${value}`;
-    return ` HAVING ${value.join(" AND ")}`;
+    const currentContext = context ?? { queryArgs: [] };
+    let conditionStrings;
+    let primitiveParams = [];
+    if (typeof value === "object" && !Array.isArray(value)) {
+      conditionStrings = Array.isArray(value.conditions) ? value.conditions : [value.conditions];
+      if (value.params) {
+        primitiveParams = Array.isArray(value.params) ? value.params : [value.params];
+      }
+    } else if (Array.isArray(value)) {
+      conditionStrings = value;
+    } else {
+      conditionStrings = [value];
+    }
+    if (conditionStrings.length === 0) return "";
+    let primitiveParamIndex = 0;
+    const processedConditions = [];
+    for (const conditionStr of conditionStrings) {
+      const parts = conditionStr.split(/(__SUBQUERY_TOKEN_\d+__|\?)/g).filter(Boolean);
+      let builtCondition = "";
+      for (const part of parts) {
+        if (part === "?") {
+          if (primitiveParamIndex >= primitiveParams.length) {
+            throw new Error(
+              'SQL generation error: Not enough primitive parameters for "?" placeholders in HAVING clause.'
+            );
+          }
+          currentContext.queryArgs.push(primitiveParams[primitiveParamIndex++]);
+          builtCondition += "?";
+        } else if (part.startsWith("__SUBQUERY_TOKEN_") && part.endsWith("__")) {
+          if (!currentContext.subQueryPlaceholders || !currentContext.toSQLCompiler) {
+            throw new Error("SQL generation error: Subquery context not provided for token processing.");
+          }
+          const subQueryParams = currentContext.subQueryPlaceholders[part];
+          if (!subQueryParams) {
+            throw new Error(`SQL generation error: Subquery token ${part} not found in placeholders.`);
+          }
+          const subQuerySql = currentContext.toSQLCompiler(subQueryParams, currentContext.queryArgs);
+          builtCondition += `(${subQuerySql})`;
+        } else {
+          builtCondition += part;
+        }
+      }
+      processedConditions.push(builtCondition);
+    }
+    if (primitiveParamIndex < primitiveParams.length && primitiveParams.length > 0) {
+      throw new Error(
+        'SQL generation error: Too many primitive parameters provided for "?" placeholders in HAVING clause.'
+      );
+    }
+    if (processedConditions.length === 0) return "";
+    if (processedConditions.length === 1) {
+      return ` HAVING ${processedConditions[0]}`;
+    }
+    return ` HAVING (${processedConditions.join(") AND (")})`;
   }
   _orderBy(value) {
     if (!value) return "";

package/package.json

@@ -1,20 +1,15 @@
 {
   "name": "workers-qb",
-  "version": "1.10.2",
+  "version": "1.11.0",
   "description": "Zero dependencies Query Builder for Cloudflare Workers",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",
   "types": "./dist/index.d.ts",
-  "files": [
-    "dist",
-    "LICENSE",
-    "README.md"
-  ],
+  "files": ["dist", "LICENSE", "README.md"],
   "scripts": {
     "build": "tsup src/index.ts --format cjs,esm --dts",
     "lint": "npx @biomejs/biome check src/ tests/ || (npx @biomejs/biome check --write src/ tests/; exit 1)",
     "test": "vitest run --root tests",
-    "prepare": "husky",
     "build-docs": "npm run docs:build && cp docs/_redirects docs/.vitepress/dist/_redirects",
     "docs:dev": "vitepress dev docs",
     "docs:build": "vitepress build docs",
@@ -61,13 +56,11 @@
   },
   "devDependencies": {
     "@biomejs/biome": "1.9.4",
-    "@cloudflare/vitest-pool-workers": "^0.6.0",
-    "@cloudflare/workers-types": "^4.20241106.0",
-    "husky": "^9.1.6",
-    "tsup": "^8.3.5",
-    "typescript": "^5.6.3",
+    "@cloudflare/vitest-pool-workers": "^0.8.38",
+    "@cloudflare/workers-types": "^4.20250614.0",
+    "tsup": "^8.5.0",
+    "typescript": "^5.8.3",
     "vitepress": "^1.6.3",
-    "vitest": "2.1.8",
-    "wrangler": "^3.86.0"
+    "wrangler": "^4.20.0"
   }
 }