pg-query-sdk 1.0.3 → 1.0.4

package/README.md

@@ -42,8 +42,6 @@ const db = new Database({
 });
 ```
 
----
-
 ## 🛠 Core Functionalities
 
 ### 1️⃣ QueryBuilder: Fluent SQL `SELECT` Query Construction
@@ -79,27 +77,27 @@ The `ConditionBuilder` facilitates the creation of complex conditional logic wit
 import {Database} from 'pg-query-sdk';
 
 const db = new Database({
-  connectionString: 'postgres://user:pass@localhost:5432/your_database',
+    connectionString: 'postgres://user:pass@localhost:5432/your_database',
 });
 
 async function complexWhereExample() {
-  const products = await db.table('products')
-    .select(['name', 'price'])
-    .where(conditions => {
-      conditions
-        .where({ category: 'electronics' })
-        .orGroup(group => {
-          group
-            .where({ price: { op: '<', value: 100 } })
-            .where({ stock: { op: '>', value: 0 } });
-        });
-    })
-    .execute();
 
-  console.log('Complex WHERE Products:', products);
+    const products = await db
+        .table('products')
+        .select(['name', 'price'])
+        .where(conditions => {
+            conditions
+                .where({category: 'electronics'})
+                .orGroup(group => {
+                    group.where({price: {op: '<', value: 100}})
+                        .where({stock: {op: '>', value: 0}})
+                })
+        }).execute()
+
+    console.log('Complex WHERE Products:', products)
 }
 
-complexWhereExample();
+complexWhereExample()
 ```
 
 ### 3️⃣ QueryExecutor: Direct Query Execution

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

@@ -1,9 +1,4 @@
 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.
  */
@@ -11,7 +6,7 @@ export default class ConditionBuilder {
     private ctx;
     private parts;
     constructor(ctx: ParamContext);
-    where(obj: Record<string, ConditionValue>): this;
+    where(obj: Record<string, any> | ((qb: ConditionBuilder) => void)): this;
     private handleOperator;
     private add;
     raw(expression: string): this;
@@ -20,4 +15,3 @@ export default class ConditionBuilder {
     clone(): ConditionBuilder;
     build(prefix?: string): string;
 }
-export {};

package/dist/cjs/query/ConditionBuilder.js

@@ -13,6 +13,15 @@ class ConditionBuilder {
         this.parts = [];
     }
     where(obj) {
+        if (typeof obj === 'function') {
+            const nested = new ConditionBuilder(this.ctx);
+            obj(nested);
+            const built = nested.build();
+            if (built) {
+                this.add(`(${built.replace(/^WHERE\s/, '')})`);
+            }
+            return this;
+        }
         Object.entries(obj).forEach(([key, condition]) => {
             if (condition === null) {
                 this.add(`${key} IS NULL`);

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

@@ -1,9 +1,4 @@
 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.
  */
@@ -11,7 +6,7 @@ export default class ConditionBuilder {
     private ctx;
     private parts;
     constructor(ctx: ParamContext);
-    where(obj: Record<string, ConditionValue>): this;
+    where(obj: Record<string, any> | ((qb: ConditionBuilder) => void)): this;
     private handleOperator;
     private add;
     raw(expression: string): this;
@@ -20,4 +15,3 @@ export default class ConditionBuilder {
     clone(): ConditionBuilder;
     build(prefix?: string): string;
 }
-export {};

package/dist/esm/query/ConditionBuilder.js

@@ -8,6 +8,15 @@ export default class ConditionBuilder {
         this.parts = [];
     }
     where(obj) {
+        if (typeof obj === 'function') {
+            const nested = new ConditionBuilder(this.ctx);
+            obj(nested);
+            const built = nested.build();
+            if (built) {
+                this.add(`(${built.replace(/^WHERE\s/, '')})`);
+            }
+            return this;
+        }
         Object.entries(obj).forEach(([key, condition]) => {
             if (condition === null) {
                 this.add(`${key} IS NULL`);

package/package.json

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