pg-query-sdk 1.0.1 → 1.0.3

package/README.md

@@ -35,7 +35,7 @@ npm install pg-query-sdk
 The `Database` class serves as the primary interface for all database interactions. Instantiate it with your PostgreSQL connection string.
 
 ```typescript
-import Database from 'pg-query-sdk';
+import {Database} from 'pg-query-sdk';
 
 const db = new Database({
   connectionString: 'postgres://user:pass@localhost:5432/your_database',
@@ -51,7 +51,7 @@ const db = new Database({
 The `QueryBuilder` enables the programmatic construction of SQL `SELECT` statements, accessible via the `db.table()` method.
 
 ```typescript
-import Database from 'pg-query-sdk';
+import {Database} from 'pg-query-sdk';
 
 const db = new Database({
   connectionString: 'postgres://user:pass@localhost:5432/your_database',
@@ -76,7 +76,7 @@ selectExample();
 The `ConditionBuilder` facilitates the creation of complex conditional logic within `WHERE` and `HAVING` clauses, typically used in conjunction with the `QueryBuilder`.
 
 ```typescript
-import Database from 'pg-query-sdk';
+import {Database} from 'pg-query-sdk';
 
 const db = new Database({
   connectionString: 'postgres://user:pass@localhost:5432/your_database',
@@ -129,7 +129,7 @@ directExecuteExample();
 The SDK provides robust support for managing ACID-compliant transactions, ensuring data integrity.
 
 ```typescript
-import Database from 'pg-query-sdk';
+import {Database} from 'pg-query-sdk';
 
 const db = new Database({
   connectionString: 'postgres://user:pass@localhost:5432/your_database',
@@ -164,7 +164,7 @@ transactionExample();
 The abstract `Repository<T>` class offers a foundational ORM layer, providing methods like `findById` and a pre-configured `QueryBuilder` (`qb()`). Custom DML operations (`insert`, `update`, `delete`) should be implemented in concrete repository classes.
 
 ```typescript
-import Database, { Repository } from 'pg-query-sdk';
+import {Database, Repository } from 'pg-query-sdk';
 import { QueryExecutor, Dialect } from 'pg-query-sdk';
 
 interface User {
@@ -221,7 +221,7 @@ const db = new Database({ /* ... */ });
 ### ESM
 
 ```typescript
-import Database from 'pg-query-sdk';
+import {Database} from 'pg-query-sdk';
 const db = new Database({ /* ... */ });
 ```
 

package/dist/cjs/builders/QueryBuilder.d.ts

@@ -131,7 +131,7 @@ export default class QueryBuilder<T = any> {
      */
     build(): {
         query: string;
-        params: any[];
+        params: readonly (string | number | boolean | any[] | Date | Buffer<ArrayBufferLike> | null)[];
     };
     /**
      * Executes the built SQL query and returns the results.

package/dist/cjs/core/ParamContext.d.ts

@@ -1,4 +1,5 @@
 import { Dialect } from "../dialects/Dialect";
+type SQLParam = string | number | boolean | Date | null | Buffer | any[];
 /**
  * Manages parameters for SQL queries, ensuring proper dialect-specific placeholders.
  */
@@ -20,5 +21,7 @@ export default class ParamContext {
      * Retrieves the list of accumulated parameters.
      * @returns An array of parameters.
      */
-    getParams(): any[];
+    getParams(): readonly SQLParam[];
+    clone(): ParamContext;
 }
+export {};

package/dist/cjs/core/ParamContext.js

@@ -26,7 +26,12 @@ class ParamContext {
      * @returns An array of parameters.
      */
     getParams() {
-        return this.params;
+        return Object.freeze([...this.params]);
+    }
+    clone() {
+        const ctx = new ParamContext(this.dialect);
+        ctx.params = [...this.params];
+        return ctx;
     }
 }
 exports.default = ParamContext;

package/dist/cjs/core/QueryExecutor.d.ts

@@ -21,7 +21,7 @@ export default class QueryExecutor {
      * @param cacheTTL - Time-to-live for caching (not currently used in this implementation).
      * @returns A Promise that resolves to the QueryResult.
      */
-    execute(query: string, params: any[] | undefined, cacheTTL: number | undefined): Promise<QueryResult>;
+    execute(query: string, params?: readonly any[], cacheTTL?: number): Promise<QueryResult>;
     /**
      * Returns the underlying PostgreSQL Pool instance.
      * @returns The Pool instance or undefined if not initialized with a connection string.

package/dist/cjs/core/QueryExecutor.js

@@ -31,11 +31,12 @@ class QueryExecutor {
      * @returns A Promise that resolves to the QueryResult.
      */
     async execute(query, params = [], cacheTTL) {
+        const normalized = [...params];
         if (this.client) {
-            return this.client.query(query, params);
+            return this.client.query(query, normalized);
         }
         if (this.pool) {
-            return this.pool.query(query, params);
+            return this.pool.query(query, normalized);
         }
         throw new Error('Executor not initialized');
     }

package/dist/cjs/query/ConditionBuilder.d.ts

@@ -1,44 +1,23 @@
 import ParamContext from '../core/ParamContext';
+type Operator = '=' | '>' | '<' | '>=' | '<=' | '!=' | '<>' | 'LIKE' | 'ILIKE' | 'IN' | 'NOT IN' | 'BETWEEN' | 'EXISTS';
+type ConditionValue = any | {
+    op: Operator;
+    value: any;
+};
 /**
  * A builder for constructing SQL WHERE and HAVING clauses.
  */
 export default class ConditionBuilder {
     private ctx;
     private parts;
-    /**
-     * Creates an instance of ConditionBuilder.
-     * @param ctx - The ParamContext to manage query parameters.
-     */
     constructor(ctx: ParamContext);
-    /**
-     * Adds one or more WHERE conditions based on an object.
-     * Supports direct equality, `null` checks, and custom operators.
-     * @param obj - An object where keys are column names and values are the desired values or an object with `op` and `value`.
-     * @returns The current ConditionBuilder instance.
-     */
-    where(obj: Record<string, any>): this;
-    /**
-     * Adds a raw SQL expression to the conditions.
-     * @param expression - The raw SQL expression.
-     * @returns The current ConditionBuilder instance.
-     */
+    where(obj: Record<string, ConditionValue>): this;
+    private handleOperator;
+    private add;
     raw(expression: string): this;
-    /**
-     * Adds a group of conditions connected by AND.
-     * @param cb - A callback function that receives a nested ConditionBuilder to define conditions within the group.
-     * @returns The current ConditionBuilder instance.
-     */
     andGroup(cb: (qb: ConditionBuilder) => void): this;
-    /**
-     * Adds a group of conditions connected by OR.
-     * @param cb - A callback function that receives a nested ConditionBuilder to define conditions within the group.
-     * @returns The current ConditionBuilder instance.
-     */
     orGroup(cb: (qb: ConditionBuilder) => void): this;
-    /**
-     * Builds the SQL condition string.
-     * @param prefix - The prefix for the condition (e.g., 'WHERE', 'HAVING'). Defaults to 'WHERE'.
-     * @returns The built SQL condition string, or an empty string if no conditions were added.
-     */
+    clone(): ConditionBuilder;
     build(prefix?: string): string;
 }
+export {};

package/dist/cjs/query/ConditionBuilder.js

@@ -1,100 +1,124 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
+const QueryBuilder_1 = __importDefault(require("../builders/QueryBuilder"));
 /**
  * A builder for constructing SQL WHERE and HAVING clauses.
  */
 class ConditionBuilder {
-    /**
-     * Creates an instance of ConditionBuilder.
-     * @param ctx - The ParamContext to manage query parameters.
-     */
     constructor(ctx) {
         this.ctx = ctx;
         this.parts = [];
     }
-    /**
-     * Adds one or more WHERE conditions based on an object.
-     * Supports direct equality, `null` checks, and custom operators.
-     * @param obj - An object where keys are column names and values are the desired values or an object with `op` and `value`.
-     * @returns The current ConditionBuilder instance.
-     */
     where(obj) {
-        Object.entries(obj).forEach(([key, value]) => {
-            if (value === null) {
-                this.parts.push(`${key} IS NULL`);
+        Object.entries(obj).forEach(([key, condition]) => {
+            if (condition === null) {
+                this.add(`${key} IS NULL`);
                 return;
             }
-            if (typeof value === 'object' && value !== null && 'op' in value) {
-                const { op, value: v } = value;
-                const placeholder = this.ctx.add(v);
-                this.parts.push(`${key} ${op} ${placeholder}`);
+            if (typeof condition === 'object'
+                && condition !== null
+                && 'op' in condition) {
+                const { op, value } = condition;
+                this.handleOperator(key, op, value);
                 return;
             }
-            const placeholder = this.ctx.add(value);
-            this.parts.push(`${key} = ${placeholder}`);
+            const placeholder = this.ctx.add(condition);
+            this.add(`${key} = ${placeholder}`);
         });
         return this;
     }
-    /**
-     * Adds a raw SQL expression to the conditions.
-     * @param expression - The raw SQL expression.
-     * @returns The current ConditionBuilder instance.
-     */
+    handleOperator(key, op, value) {
+        const allowed = [
+            '=', '>', '<', '>=', '<=', '!=', '<>',
+            'LIKE', 'ILIKE',
+            'IN', 'NOT IN',
+            'BETWEEN', 'EXISTS'
+        ];
+        if (!allowed.includes(op)) {
+            throw new Error(`Invalid operator ${op}`);
+        }
+        switch (op) {
+            case 'IN':
+            case 'NOT IN': {
+                if (!Array.isArray(value)) {
+                    throw new Error(`${op} expects array`);
+                }
+                const placeholders = value.map(v => this.ctx.add(v)).join(', ');
+                this.add(`${key} ${op} (${placeholders})`);
+                break;
+            }
+            case 'BETWEEN': {
+                if (!Array.isArray(value) || value.length !== 2) {
+                    throw new Error('BETWEEN expects [min,max]');
+                }
+                const p1 = this.ctx.add(value[0]);
+                const p2 = this.ctx.add(value[1]);
+                this.add(`${key} BETWEEN ${p1} AND ${p2}`);
+                break;
+            }
+            case 'EXISTS': {
+                if (!(value instanceof QueryBuilder_1.default)) {
+                    throw new Error('EXISTS expects QueryBuilder');
+                }
+                const { query, params } = value.build();
+                params.forEach(p => this.ctx.add(p));
+                this.add(`EXISTS (${query})`);
+                break;
+            }
+            default: {
+                const placeholder = this.ctx.add(value);
+                this.add(`${key} ${op} ${placeholder}`);
+            }
+        }
+    }
+    add(expression, type = 'AND') {
+        this.parts.push({ type, expression });
+    }
     raw(expression) {
-        this.parts.push(expression);
+        this.add(expression);
         return this;
     }
-    /**
-     * Adds a group of conditions connected by AND.
-     * @param cb - A callback function that receives a nested ConditionBuilder to define conditions within the group.
-     * @returns The current ConditionBuilder instance.
-     */
     andGroup(cb) {
         const nested = new ConditionBuilder(this.ctx);
         cb(nested);
         const built = nested.build();
-        if (built) {
-            this.parts.push(`(${built.replace(/^WHERE\s/, '')})`);
-        }
+        if (!built)
+            return this;
+        this.add(`(${built.replace(/^WHERE\s/, '')})`, 'AND');
         return this;
     }
-    /**
-     * Adds a group of conditions connected by OR.
-     * @param cb - A callback function that receives a nested ConditionBuilder to define conditions within the group.
-     * @returns The current ConditionBuilder instance.
-     */
     orGroup(cb) {
         const nested = new ConditionBuilder(this.ctx);
         cb(nested);
         const built = nested.build();
-        if (built) {
-            const clean = built.replace(/^WHERE\s/, '');
-            this.parts.push(`OR (${clean})`);
-        }
+        if (!built)
+            return this;
+        this.add(`(${built.replace(/^WHERE\s/, '')})`, 'OR');
         return this;
     }
-    /**
-     * Builds the SQL condition string.
-     * @param prefix - The prefix for the condition (e.g., 'WHERE', 'HAVING'). Defaults to 'WHERE'.
-     * @returns The built SQL condition string, or an empty string if no conditions were added.
-     */
+    clone() {
+        const cloned = new ConditionBuilder(this.ctx);
+        cloned.parts = this.parts.map(p => ({
+            ...p
+        }));
+        return cloned;
+    }
     build(prefix = 'WHERE') {
         if (!this.parts.length)
             return '';
-        const normalized = [];
+        let sql = '';
         this.parts.forEach((part, index) => {
             if (index === 0) {
-                normalized.push(part);
-                return;
-            }
-            if (part.startsWith('OR ')) {
-                normalized.push(part);
+                sql += part.expression;
             }
             else {
-                normalized.push(`AND ${part}`);
+                sql += ` ${part.type} ${part.expression}`;
             }
         });
-        return `${prefix} ${normalized.join(' ')}`;
+        return `${prefix} ${sql}`;
     }
 }
 exports.default = ConditionBuilder;

package/dist/cjs/query/QueryBuilder.d.ts

@@ -1,6 +1,7 @@
 import ConditionBuilder from './ConditionBuilder';
 import QueryExecutor from '../core/QueryExecutor';
 import { Dialect } from '../dialects/Dialect';
+type WhereInput<T> = Partial<T> | Record<string, any> | Array<Record<string, any>>;
 /**
  * A fluent SQL query builder for constructing and executing database queries.
  * @template T The expected type of the results.
@@ -66,7 +67,7 @@ export default class QueryBuilder<T = any> {
      * @param fields - An array of field names or keys of T.
      * @returns The current QueryBuilder instance.
      */
-    select(fields: (keyof T | string)[]): this;
+    select(fields: (keyof T | string)[] | keyof T | string): this;
     /**
      * Adds a join clause to the query.
      * @param type - The type of join (INNER, LEFT, RIGHT).
@@ -105,7 +106,7 @@ export default class QueryBuilder<T = any> {
      * @param obj - An object where keys are column names and values are the desired values.
      * @returns The current QueryBuilder instance.
      */
-    where(obj: Partial<T>): this;
+    where(obj: WhereInput<T>): this;
     /**
      * Adds a raw WHERE expression.
      * @param expression - The raw SQL expression for the WHERE clause.
@@ -187,7 +188,7 @@ export default class QueryBuilder<T = any> {
      */
     build(): {
         query: string;
-        params: any[];
+        params: readonly (string | number | boolean | any[] | Date | Buffer<ArrayBufferLike> | null)[];
     };
     /**
      * Executes the built SQL query and returns the results.
@@ -195,3 +196,4 @@ export default class QueryBuilder<T = any> {
      */
     execute(): Promise<T[]>;
 }
+export {};

package/dist/cjs/query/QueryBuilder.js

@@ -52,7 +52,8 @@ class QueryBuilder {
      * @returns The current QueryBuilder instance.
      */
     select(fields) {
-        this.fields = fields.map(String);
+        const normalized = Array.isArray(fields) ? fields : [fields];
+        this.fields = normalized.map(String);
         return this;
     }
     /**
@@ -229,6 +230,9 @@ class QueryBuilder {
         qb.limitCount = this.limitCount;
         qb.offsetCount = this.offsetCount;
         qb.ctes = [...this.ctes];
+        qb.condition = this.condition.clone();
+        qb.havingCondition = this.havingCondition.clone();
+        qb.ctx = this.ctx.clone();
         return qb;
     }
     /**

package/dist/esm/builders/QueryBuilder.d.ts

@@ -131,7 +131,7 @@ export default class QueryBuilder<T = any> {
      */
     build(): {
         query: string;
-        params: any[];
+        params: readonly (string | number | boolean | any[] | Date | Buffer<ArrayBufferLike> | null)[];
     };
     /**
      * Executes the built SQL query and returns the results.

package/dist/esm/core/ParamContext.d.ts

@@ -1,4 +1,5 @@
 import { Dialect } from "../dialects/Dialect";
+type SQLParam = string | number | boolean | Date | null | Buffer | any[];
 /**
  * Manages parameters for SQL queries, ensuring proper dialect-specific placeholders.
  */
@@ -20,5 +21,7 @@ export default class ParamContext {
      * Retrieves the list of accumulated parameters.
      * @returns An array of parameters.
      */
-    getParams(): any[];
+    getParams(): readonly SQLParam[];
+    clone(): ParamContext;
 }
+export {};

package/dist/esm/core/ParamContext.js

@@ -24,6 +24,11 @@ export default class ParamContext {
      * @returns An array of parameters.
      */
     getParams() {
-        return this.params;
+        return Object.freeze([...this.params]);
+    }
+    clone() {
+        const ctx = new ParamContext(this.dialect);
+        ctx.params = [...this.params];
+        return ctx;
     }
 }

package/dist/esm/core/QueryExecutor.d.ts

@@ -21,7 +21,7 @@ export default class QueryExecutor {
      * @param cacheTTL - Time-to-live for caching (not currently used in this implementation).
      * @returns A Promise that resolves to the QueryResult.
      */
-    execute(query: string, params: any[] | undefined, cacheTTL: number | undefined): Promise<QueryResult>;
+    execute(query: string, params?: readonly any[], cacheTTL?: number): Promise<QueryResult>;
     /**
      * Returns the underlying PostgreSQL Pool instance.
      * @returns The Pool instance or undefined if not initialized with a connection string.

package/dist/esm/core/QueryExecutor.js

@@ -29,11 +29,12 @@ export default class QueryExecutor {
      * @returns A Promise that resolves to the QueryResult.
      */
     async execute(query, params = [], cacheTTL) {
+        const normalized = [...params];
         if (this.client) {
-            return this.client.query(query, params);
+            return this.client.query(query, normalized);
         }
         if (this.pool) {
-            return this.pool.query(query, params);
+            return this.pool.query(query, normalized);
         }
         throw new Error('Executor not initialized');
     }

package/dist/esm/query/ConditionBuilder.d.ts

@@ -1,44 +1,23 @@
 import ParamContext from '../core/ParamContext';
+type Operator = '=' | '>' | '<' | '>=' | '<=' | '!=' | '<>' | 'LIKE' | 'ILIKE' | 'IN' | 'NOT IN' | 'BETWEEN' | 'EXISTS';
+type ConditionValue = any | {
+    op: Operator;
+    value: any;
+};
 /**
  * A builder for constructing SQL WHERE and HAVING clauses.
  */
 export default class ConditionBuilder {
     private ctx;
     private parts;
-    /**
-     * Creates an instance of ConditionBuilder.
-     * @param ctx - The ParamContext to manage query parameters.
-     */
     constructor(ctx: ParamContext);
-    /**
-     * Adds one or more WHERE conditions based on an object.
-     * Supports direct equality, `null` checks, and custom operators.
-     * @param obj - An object where keys are column names and values are the desired values or an object with `op` and `value`.
-     * @returns The current ConditionBuilder instance.
-     */
-    where(obj: Record<string, any>): this;
-    /**
-     * Adds a raw SQL expression to the conditions.
-     * @param expression - The raw SQL expression.
-     * @returns The current ConditionBuilder instance.
-     */
+    where(obj: Record<string, ConditionValue>): this;
+    private handleOperator;
+    private add;
     raw(expression: string): this;
-    /**
-     * Adds a group of conditions connected by AND.
-     * @param cb - A callback function that receives a nested ConditionBuilder to define conditions within the group.
-     * @returns The current ConditionBuilder instance.
-     */
     andGroup(cb: (qb: ConditionBuilder) => void): this;
-    /**
-     * Adds a group of conditions connected by OR.
-     * @param cb - A callback function that receives a nested ConditionBuilder to define conditions within the group.
-     * @returns The current ConditionBuilder instance.
-     */
     orGroup(cb: (qb: ConditionBuilder) => void): this;
-    /**
-     * Builds the SQL condition string.
-     * @param prefix - The prefix for the condition (e.g., 'WHERE', 'HAVING'). Defaults to 'WHERE'.
-     * @returns The built SQL condition string, or an empty string if no conditions were added.
-     */
+    clone(): ConditionBuilder;
     build(prefix?: string): string;
 }
+export {};

package/dist/esm/query/ConditionBuilder.js

@@ -1,97 +1,118 @@
+import QueryBuilder from "../builders/QueryBuilder";
 /**
  * A builder for constructing SQL WHERE and HAVING clauses.
  */
 export default class ConditionBuilder {
-    /**
-     * Creates an instance of ConditionBuilder.
-     * @param ctx - The ParamContext to manage query parameters.
-     */
     constructor(ctx) {
         this.ctx = ctx;
         this.parts = [];
     }
-    /**
-     * Adds one or more WHERE conditions based on an object.
-     * Supports direct equality, `null` checks, and custom operators.
-     * @param obj - An object where keys are column names and values are the desired values or an object with `op` and `value`.
-     * @returns The current ConditionBuilder instance.
-     */
     where(obj) {
-        Object.entries(obj).forEach(([key, value]) => {
-            if (value === null) {
-                this.parts.push(`${key} IS NULL`);
+        Object.entries(obj).forEach(([key, condition]) => {
+            if (condition === null) {
+                this.add(`${key} IS NULL`);
                 return;
             }
-            if (typeof value === 'object' && value !== null && 'op' in value) {
-                const { op, value: v } = value;
-                const placeholder = this.ctx.add(v);
-                this.parts.push(`${key} ${op} ${placeholder}`);
+            if (typeof condition === 'object'
+                && condition !== null
+                && 'op' in condition) {
+                const { op, value } = condition;
+                this.handleOperator(key, op, value);
                 return;
             }
-            const placeholder = this.ctx.add(value);
-            this.parts.push(`${key} = ${placeholder}`);
+            const placeholder = this.ctx.add(condition);
+            this.add(`${key} = ${placeholder}`);
         });
         return this;
     }
-    /**
-     * Adds a raw SQL expression to the conditions.
-     * @param expression - The raw SQL expression.
-     * @returns The current ConditionBuilder instance.
-     */
+    handleOperator(key, op, value) {
+        const allowed = [
+            '=', '>', '<', '>=', '<=', '!=', '<>',
+            'LIKE', 'ILIKE',
+            'IN', 'NOT IN',
+            'BETWEEN', 'EXISTS'
+        ];
+        if (!allowed.includes(op)) {
+            throw new Error(`Invalid operator ${op}`);
+        }
+        switch (op) {
+            case 'IN':
+            case 'NOT IN': {
+                if (!Array.isArray(value)) {
+                    throw new Error(`${op} expects array`);
+                }
+                const placeholders = value.map(v => this.ctx.add(v)).join(', ');
+                this.add(`${key} ${op} (${placeholders})`);
+                break;
+            }
+            case 'BETWEEN': {
+                if (!Array.isArray(value) || value.length !== 2) {
+                    throw new Error('BETWEEN expects [min,max]');
+                }
+                const p1 = this.ctx.add(value[0]);
+                const p2 = this.ctx.add(value[1]);
+                this.add(`${key} BETWEEN ${p1} AND ${p2}`);
+                break;
+            }
+            case 'EXISTS': {
+                if (!(value instanceof QueryBuilder)) {
+                    throw new Error('EXISTS expects QueryBuilder');
+                }
+                const { query, params } = value.build();
+                params.forEach(p => this.ctx.add(p));
+                this.add(`EXISTS (${query})`);
+                break;
+            }
+            default: {
+                const placeholder = this.ctx.add(value);
+                this.add(`${key} ${op} ${placeholder}`);
+            }
+        }
+    }
+    add(expression, type = 'AND') {
+        this.parts.push({ type, expression });
+    }
     raw(expression) {
-        this.parts.push(expression);
+        this.add(expression);
         return this;
     }
-    /**
-     * Adds a group of conditions connected by AND.
-     * @param cb - A callback function that receives a nested ConditionBuilder to define conditions within the group.
-     * @returns The current ConditionBuilder instance.
-     */
     andGroup(cb) {
         const nested = new ConditionBuilder(this.ctx);
         cb(nested);
         const built = nested.build();
-        if (built) {
-            this.parts.push(`(${built.replace(/^WHERE\s/, '')})`);
-        }
+        if (!built)
+            return this;
+        this.add(`(${built.replace(/^WHERE\s/, '')})`, 'AND');
         return this;
     }
-    /**
-     * Adds a group of conditions connected by OR.
-     * @param cb - A callback function that receives a nested ConditionBuilder to define conditions within the group.
-     * @returns The current ConditionBuilder instance.
-     */
     orGroup(cb) {
         const nested = new ConditionBuilder(this.ctx);
         cb(nested);
         const built = nested.build();
-        if (built) {
-            const clean = built.replace(/^WHERE\s/, '');
-            this.parts.push(`OR (${clean})`);
-        }
+        if (!built)
+            return this;
+        this.add(`(${built.replace(/^WHERE\s/, '')})`, 'OR');
         return this;
     }
-    /**
-     * Builds the SQL condition string.
-     * @param prefix - The prefix for the condition (e.g., 'WHERE', 'HAVING'). Defaults to 'WHERE'.
-     * @returns The built SQL condition string, or an empty string if no conditions were added.
-     */
+    clone() {
+        const cloned = new ConditionBuilder(this.ctx);
+        cloned.parts = this.parts.map(p => ({
+            ...p
+        }));
+        return cloned;
+    }
     build(prefix = 'WHERE') {
         if (!this.parts.length)
             return '';
-        const normalized = [];
+        let sql = '';
         this.parts.forEach((part, index) => {
             if (index === 0) {
-                normalized.push(part);
-                return;
-            }
-            if (part.startsWith('OR ')) {
-                normalized.push(part);
+                sql += part.expression;
             }
             else {
-                normalized.push(`AND ${part}`);
+                sql += ` ${part.type} ${part.expression}`;
             }
         });
-        return `${prefix} ${normalized.join(' ')}`;
+        return `${prefix} ${sql}`;
     }
 }

package/dist/esm/query/QueryBuilder.d.ts

@@ -1,6 +1,7 @@
 import ConditionBuilder from './ConditionBuilder';
 import QueryExecutor from '../core/QueryExecutor';
 import { Dialect } from '../dialects/Dialect';
+type WhereInput<T> = Partial<T> | Record<string, any> | Array<Record<string, any>>;
 /**
  * A fluent SQL query builder for constructing and executing database queries.
  * @template T The expected type of the results.
@@ -66,7 +67,7 @@ export default class QueryBuilder<T = any> {
      * @param fields - An array of field names or keys of T.
      * @returns The current QueryBuilder instance.
      */
-    select(fields: (keyof T | string)[]): this;
+    select(fields: (keyof T | string)[] | keyof T | string): this;
     /**
      * Adds a join clause to the query.
      * @param type - The type of join (INNER, LEFT, RIGHT).
@@ -105,7 +106,7 @@ export default class QueryBuilder<T = any> {
      * @param obj - An object where keys are column names and values are the desired values.
      * @returns The current QueryBuilder instance.
      */
-    where(obj: Partial<T>): this;
+    where(obj: WhereInput<T>): this;
     /**
      * Adds a raw WHERE expression.
      * @param expression - The raw SQL expression for the WHERE clause.
@@ -187,7 +188,7 @@ export default class QueryBuilder<T = any> {
      */
     build(): {
         query: string;
-        params: any[];
+        params: readonly (string | number | boolean | any[] | Date | Buffer<ArrayBufferLike> | null)[];
     };
     /**
      * Executes the built SQL query and returns the results.
@@ -195,3 +196,4 @@ export default class QueryBuilder<T = any> {
      */
     execute(): Promise<T[]>;
 }
+export {};

package/dist/esm/query/QueryBuilder.js

@@ -47,7 +47,8 @@ export default class QueryBuilder {
      * @returns The current QueryBuilder instance.
      */
     select(fields) {
-        this.fields = fields.map(String);
+        const normalized = Array.isArray(fields) ? fields : [fields];
+        this.fields = normalized.map(String);
         return this;
     }
     /**
@@ -224,6 +225,9 @@ export default class QueryBuilder {
         qb.limitCount = this.limitCount;
         qb.offsetCount = this.offsetCount;
         qb.ctes = [...this.ctes];
+        qb.condition = this.condition.clone();
+        qb.havingCondition = this.havingCondition.clone();
+        qb.ctx = this.ctx.clone();
         return qb;
     }
     /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pg-query-sdk",
-  "version": "1.0.1",
+  "version": "1.0.3",
   "description": "PostgreSQL SDK with Query Builder and Executor",
   "main": "dist/cjs/index.js",
   "types": "dist/esm/index.d.ts",