@m2k-5f/pgtx 1.3.11 → 1.4.0

package/README.md

@@ -5,17 +5,6 @@ Experience ORM-like convenience (auto-inserts, updates, recursive fragments) wit
 
 ---
 
-## 🔥 Why Pgtx?
-
-*   **Zero-Cost Abstraction**: Only ~2% - 0% overhead compared to raw `pg.query`.
-*   **Structural Caching**: Uses `WeakMap` to cache SQL templates. Static parts are parsed only once.
-*   **Explicit Prepared Statements**: Create and reuse prepared statements with type safety
-*   **True Recursion**: Nest `sql.fragment` anywhere. Argument numbering ($1, $2) is managed automatically across all nesting levels.
-*   **No Magic**: You write SQL, `Pgtx` handles the tedious parts (placeholders, identifiers, bulk inserts).
-*   **ACID Transactions**: Reliable transaction management with automatic rollback on errors.
-
----
-
 ## 📦 Installation
 
 ```bash
@@ -24,7 +13,19 @@ npm install @m2k-5f/pgtx
 yarn add @m2k-5f/pgtx
 # or
 pnpm add @m2k-5f/pgtx
+# or 
+bun add @m2k-5f/pgtx
 ```
+## 🔥 Why Pgtx?
+
+---
+
+*   **Zero-Cost Abstraction**: Only ~2% - 0% overhead compared to raw `pg.query`.
+*   **Structural Caching**: Uses `WeakMap` to cache SQL templates. Static parts are parsed only once.
+*   **Explicit Prepared Statements**: Create and reuse prepared statements with type safety
+*   **True Recursion**: Nest `sql.fragment` anywhere. Argument numbering ($1, $2) is managed automatically across all nesting levels.
+*   **No Magic**: You write SQL, `Pgtx` handles the tedious parts (placeholders, identifiers, bulk inserts).
+*   **ACID Transactions**: Reliable transaction management with automatic rollback on errors.
 
 ---
 
@@ -39,15 +40,19 @@ const pool = new Pool({ /* pg.PoolConfig */ })
 const [user] = await pool.query<User>`SELECT * FROM users WHERE id = ${1}`
 ```
 
+---
+
+
+
 ## ⚡ Performance Benchmark
 
-The following results were measured during sequential execution of 10,000 complex `UPSERT` queries.
+The following results were measured during sequential execution of 2000 complex `UPSERT` queries.
 
 
 | Tool | RPS | Avg. Query Time | Performance Overhead |
 | :--- | :---: | :---: | :---: |
-| **Native `pg.query`** | **~176** | **5.696 ms** | **0% (Baseline)** |
-| **Pgtx** | **~177** | **5.664 ms** | **-0.56%(zero-cost)** |
+| **Native `pg.query`** | **~209** | **4.791ms** | **0% (Baseline)** |
+| **Pgtx** | **~207** | **4.827ms** | **0.76%(zero-cost)** |
 | Typical Node.js ORM | **~58** | 12.5+ ms | > 150% |
 
 
@@ -100,12 +105,23 @@ const users = [
 await pool.query`INSERT INTO users ${sql.insert(users)}`
 // SQL: INSERT INTO users (name, email) VALUES ($1, $2), ($3, $4)
 ```
+#### 3.1 UPSERT Helper (sql.excluded)
+Perfect for ON CONFLICT clauses to avoid re-typing column names.
+
+```typescript
+await pool.query`
+  INSERT INTO users ${sql.insert(data)}
+  ON CONFLICT (id) DO UPDATE 
+  SET ${sql.excluded(['name', 'email', 'updated_at'])}
+`
+// SQL: ... SET name = EXCLUDED.name, email = EXCLUDED.email, updated_at = EXCLUDED.updated_at
+```
 
 ### 4. Prepared Statements
 Pre-parse SQL on the database server for maximum performance in hot loops.
 
 ```typescript
-const stmt = await pool.prepare<User>("get_user_by_email", 'SELECT * FROM users WHERE email = ?')
+const stmt = await pool.prepare<User, [string]>("get_user_by_email", 'SELECT * FROM users WHERE email = ?')
 // `Pgtx` automatically maps standard `?` placeholders to native `$1, $2` indexes.
 
 const users = await stmt.execute('test@example.com')
@@ -143,6 +159,28 @@ await pool.query`UPDATE users SET ${sql.update(data)} WHERE id = ${1}`
 // SQL: UPDATE users SET status = $1, last_login = $2 WHERE id = $3
 ```
 
+### 7. Clean Filtering (sql.where)
+Generates AND-separated conditions from an object. Skips undefined values for easy dynamic filtering.
+
+```typescript
+const filters = { role: 'admin', age: undefined, active: true };
+await pool.query`SELECT * FROM users WHERE ${sql.where(filters)}`
+// SQL: SELECT * FROM users WHERE role = $1 AND active = $2
+```
+
+### 8. Conditional Logic (sql.empty)
+A safe "no-op" fragment for cleaner ternary operations in templates.
+
+```typescript
+const search = "";
+await pool.query`
+  SELECT * FROM posts 
+  ${search ? sql.fragment`WHERE title ILIKE ${search}` : sql.empty}
+`
+// Result if empty: SELECT * FROM posts
+```
+---
+
 ## 🔄 Null & Undefined Handling
 
 Pgtx treats `null` and `undefined` differently to match SQL semantics and JavaScript expectations:
@@ -184,5 +222,5 @@ sql.array([]) // ❌ Error: Array clause is empty. Use sql.array([null])...
 
 ## 🛡️ Security
 *    **SQL Injection**: Automatically uses native placeholders ($1, $2) for all values.
-*    **Identifiers**: `sql.ident` safely escapes table and column names using double quotes.
-*    **Connection Leaks**: `pool.query` uses try...finally internally to ensure connections are always returned to the pool.
+*    **Identifiers**: `sql.ident` escapes names (e.g., user -> "user") to prevent conflicts with SQL keywords and identifier injection.
+*    **Connection Leaks**: `pool.begin` and `pool.query` use `try...finally` internally. Prepared statements created via Pool also automatically release connections.

package/dist/clauses/abstract.clause.d.ts

@@ -0,0 +1,5 @@
+import { ClauseStrategyParams } from "../types";
+export declare abstract class Clause {
+    abstract mapIntoQuery(params: ClauseStrategyParams): void;
+}
+//# sourceMappingURL=abstract.clause.d.ts.map

package/dist/clauses/abstract.clause.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"abstract.clause.d.ts","sourceRoot":"","sources":["../../src/clauses/abstract.clause.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAsC,MAAM,UAAU,CAAC;AAEpF,8BAAsB,MAAM;IACxB,QAAQ,CAAC,YAAY,CAAC,MAAM,EAAE,oBAAoB,GAAG,IAAI;CAC5D"}

package/dist/clauses/abstract.clause.js

@@ -0,0 +1,6 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Clause = void 0;
+class Clause {
+}
+exports.Clause = Clause;

package/dist/clauses/array.clause.d.ts

@@ -1,10 +1,10 @@
-import { Clause } from "../clauses/base.clause";
-import { CompiledSqlQuery } from "../utils";
+import { ClauseStrategyParams } from "../types";
+import { Clause } from "./abstract.clause";
 export declare class ArrayClause extends Clause {
     private readonly array;
     private readonly separator;
-    constructor(array: any[], separator?: string);
-    map(argCounter: number): CompiledSqlQuery;
+    private constructor();
+    static create(array: any[], separator?: string): ArrayClause;
+    mapIntoQuery(params: ClauseStrategyParams): void;
 }
-export declare function arrayClause(array: any[], separator?: string): ArrayClause;
 //# sourceMappingURL=array.clause.d.ts.map

package/dist/clauses/array.clause.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"array.clause.d.ts","sourceRoot":"","sources":["../../src/clauses/array.clause.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAChD,OAAO,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAE5C,qBAAa,WAAY,SAAQ,MAAM;IAE/B,OAAO,CAAC,QAAQ,CAAC,KAAK;IACtB,OAAO,CAAC,QAAQ,CAAC,SAAS;gBADT,KAAK,EAAE,GAAG,EAAE,EACZ,SAAS,GAAE,MAAa;IAGpC,GAAG,CAAC,UAAU,EAAE,MAAM,GAAG,gBAAgB;CAyBrD;AAED,wBAAgB,WAAW,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE,SAAS,GAAE,MAAa,GAAG,WAAW,CAE/E"}
+{"version":3,"file":"array.clause.d.ts","sourceRoot":"","sources":["../../src/clauses/array.clause.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,UAAU,CAAC;AAChD,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAE3C,qBAAa,WAAY,SAAQ,MAAM;IAE/B,OAAO,CAAC,QAAQ,CAAC,KAAK;IACtB,OAAO,CAAC,QAAQ,CAAC,SAAS;IAF9B,OAAO;IAKP,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE,SAAS,GAAE,MAAa,GAAG,WAAW;IAQzD,YAAY,CAAC,MAAM,EAAE,oBAAoB;CAiBrD"}

package/dist/clauses/array.clause.js

@@ -1,37 +1,33 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ArrayClause = void 0;
-exports.arrayClause = arrayClause;
-const base_clause_1 = require("../clauses/base.clause");
-class ArrayClause extends base_clause_1.Clause {
+const abstract_clause_1 = require("./abstract.clause");
+class ArrayClause extends abstract_clause_1.Clause {
     constructor(array, separator = ", ") {
         super();
         this.array = array;
         this.separator = separator;
     }
-    map(argCounter) {
-        if (this.array.length === 0)
+    static create(array, separator = ", ") {
+        if (array.length === 0)
             throw new Error('Array clause is empty.\n Use sql.array([null]) if you want no results, or check your data.');
-        const args = [];
-        const text = `${this.array.map((value, index) => {
+        return new ArrayClause(array, separator);
+    }
+    mapIntoQuery(params) {
+        this.array.forEach((value, index) => {
             if (value === undefined) {
                 throw new TypeError(`Array item at index ${index} is undefined`);
             }
-            if (value instanceof base_clause_1.Clause) {
-                const result = value.map(argCounter);
-                args.push(...result.args);
-                argCounter = result.argCounter;
-                return result.text;
+            if (index)
+                params.text.push(this.separator);
+            if (value instanceof abstract_clause_1.Clause) {
+                value.mapIntoQuery(params);
             }
             else {
-                args.push(value);
-                return `$${argCounter++}`;
+                params.args.push(value);
+                params.text.push(`$${params.counter++}`);
             }
-        }).join(this.separator)}`;
-        return { text, args, argCounter };
+        });
     }
 }
 exports.ArrayClause = ArrayClause;
-function arrayClause(array, separator = ", ") {
-    return new ArrayClause(array, separator);
-}

package/dist/clauses/empty.clause.d.ts

@@ -1,8 +1,8 @@
-import { CompiledSqlQuery } from "../utils";
-import { Clause } from "./base.clause";
+import { ClauseStrategyParams } from "../types";
+import { Clause } from "./abstract.clause";
 export declare class EmptyClause extends Clause {
     static new(): EmptyClause;
-    map(argCounter: number): CompiledSqlQuery;
+    mapIntoQuery(params: ClauseStrategyParams): void;
 }
 export declare const emptyClause: EmptyClause;
 //# sourceMappingURL=empty.clause.d.ts.map

package/dist/clauses/empty.clause.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"empty.clause.d.ts","sourceRoot":"","sources":["../../src/clauses/empty.clause.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAC5C,OAAO,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AAGvC,qBAAa,WAAY,SAAQ,MAAM;IACnC,MAAM,CAAC,GAAG;IAIV,GAAG,CAAC,UAAU,EAAE,MAAM,GAAG,gBAAgB;CAG5C;AAED,eAAO,MAAM,WAAW,aAAoB,CAAA"}
+{"version":3,"file":"empty.clause.d.ts","sourceRoot":"","sources":["../../src/clauses/empty.clause.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,UAAU,CAAC;AAChD,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAG3C,qBAAa,WAAY,SAAQ,MAAM;IACnC,MAAM,CAAC,GAAG;IAIV,YAAY,CAAC,MAAM,EAAE,oBAAoB;CAC5C;AAED,eAAO,MAAM,WAAW,aAAoB,CAAA"}

package/dist/clauses/empty.clause.js

@@ -1,14 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.emptyClause = exports.EmptyClause = void 0;
-const base_clause_1 = require("./base.clause");
-class EmptyClause extends base_clause_1.Clause {
+const abstract_clause_1 = require("./abstract.clause");
+class EmptyClause extends abstract_clause_1.Clause {
     static new() {
-        return new this();
-    }
-    map(argCounter) {
-        return { argCounter, args: [], text: "" };
+        return new EmptyClause();
     }
+    mapIntoQuery(params) { }
 }
 exports.EmptyClause = EmptyClause;
 exports.emptyClause = EmptyClause.new();

package/dist/clauses/exclude.clause.d.ts

@@ -1,9 +1,9 @@
-import { CompiledSqlQuery } from "../utils";
-import { Clause } from "./base.clause";
+import { ClauseStrategyParams } from "../types";
+import { Clause } from "./abstract.clause";
 export declare class ExcludeUpdateClause extends Clause {
     readonly fields: string[];
-    constructor(fields: string[]);
-    map(argCounter: number): CompiledSqlQuery;
+    private constructor();
+    static create(fields: string[]): ExcludeUpdateClause;
+    mapIntoQuery(params: ClauseStrategyParams): void;
 }
-export declare function excludeClause(fields: string[]): ExcludeUpdateClause;
 //# sourceMappingURL=exclude.clause.d.ts.map

package/dist/clauses/exclude.clause.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"exclude.clause.d.ts","sourceRoot":"","sources":["../../src/clauses/exclude.clause.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAC5C,OAAO,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AAEvC,qBAAa,mBAAoB,SAAQ,MAAM;IAEvC,QAAQ,CAAC,MAAM,EAAE,MAAM,EAAE;gBAAhB,MAAM,EAAE,MAAM,EAAE;IAGtB,GAAG,CAAC,UAAU,EAAE,MAAM,GAAG,gBAAgB;CAInD;AAED,wBAAgB,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,mBAAmB,CAEnE"}
+{"version":3,"file":"exclude.clause.d.ts","sourceRoot":"","sources":["../../src/clauses/exclude.clause.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,UAAU,CAAC;AAChD,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAE3C,qBAAa,mBAAoB,SAAQ,MAAM;IAEvC,QAAQ,CAAC,MAAM,EAAE,MAAM,EAAE;IAD7B,OAAO;IAIP,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,mBAAmB;IAI7C,YAAY,CAAC,MAAM,EAAE,oBAAoB;CAMnD"}

package/dist/clauses/exclude.clause.js

@@ -1,19 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ExcludeUpdateClause = void 0;
-exports.excludeClause = excludeClause;
-const base_clause_1 = require("./base.clause");
-class ExcludeUpdateClause extends base_clause_1.Clause {
+const abstract_clause_1 = require("./abstract.clause");
+class ExcludeUpdateClause extends abstract_clause_1.Clause {
     constructor(fields) {
         super();
         this.fields = fields;
     }
-    map(argCounter) {
-        const text = this.fields.map(f => `${f} = EXCLUDED.${f}`).join(', ');
-        return { argCounter, args: [], text };
+    static create(fields) {
+        return new ExcludeUpdateClause(fields);
+    }
+    mapIntoQuery(params) {
+        params.text.push(this.fields.map(f => `${f} = EXCLUDED.${f}`)
+            .join(', '));
     }
 }
 exports.ExcludeUpdateClause = ExcludeUpdateClause;
-function excludeClause(fields) {
-    return new ExcludeUpdateClause(fields);
-}

package/dist/clauses/fragment.clause.d.ts

@@ -1,10 +1,10 @@
-import { Clause } from "./base.clause";
-import { CompiledSqlQuery } from "../utils";
+import { Clause } from "./abstract.clause";
+import { ClauseStrategyParams } from "../types";
 export declare class FragmentClause extends Clause {
-    readonly strings: TemplateStringsArray;
-    readonly values: any[];
-    constructor(strings: TemplateStringsArray, values: any[]);
-    map(currentArgCounter: number): CompiledSqlQuery;
+    readonly templates: TemplateStringsArray;
+    readonly args: any[];
+    constructor(templates: TemplateStringsArray, args: any[]);
+    static create(strings: TemplateStringsArray, ...values: any[]): FragmentClause;
+    mapIntoQuery(params: ClauseStrategyParams): void;
 }
-export declare function fragmentClause(strings: TemplateStringsArray, ...values: any[]): FragmentClause;
 //# sourceMappingURL=fragment.clause.d.ts.map

package/dist/clauses/fragment.clause.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fragment.clause.d.ts","sourceRoot":"","sources":["../../src/clauses/fragment.clause.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAI,MAAM,eAAe,CAAC;AACzC,OAAO,EAAE,gBAAgB,EAAsB,MAAM,UAAU,CAAC;AAEhE,qBAAa,cAAe,SAAQ,MAAM;IAElC,QAAQ,CAAC,OAAO,EAAE,oBAAoB;IACtC,QAAQ,CAAC,MAAM,EAAE,GAAG,EAAE;gBADb,OAAO,EAAE,oBAAoB,EAC7B,MAAM,EAAE,GAAG,EAAE;IAGjB,GAAG,CAAC,iBAAiB,EAAE,MAAM,GAAG,gBAAgB;CAG5D;AAED,wBAAgB,cAAc,CAAC,OAAO,EAAE,oBAAoB,EAAE,GAAG,MAAM,EAAE,GAAG,EAAE,kBAE7E"}
+{"version":3,"file":"fragment.clause.d.ts","sourceRoot":"","sources":["../../src/clauses/fragment.clause.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAI,MAAM,mBAAmB,CAAC;AAE7C,OAAO,EAAE,oBAAoB,EAAoB,MAAM,UAAU,CAAC;AAElE,qBAAa,cAAe,SAAQ,MAAM;IAElC,QAAQ,CAAC,SAAS,EAAE,oBAAoB;IACxC,QAAQ,CAAC,IAAI,EAAE,GAAG,EAAE;gBADX,SAAS,EAAE,oBAAoB,EAC/B,IAAI,EAAE,GAAG,EAAE;IAGxB,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,oBAAoB,EAAE,GAAG,MAAM,EAAE,GAAG,EAAE;IAIpD,YAAY,CAAC,MAAM,EAAE,oBAAoB;CAWrD"}

package/dist/clauses/fragment.clause.js

@@ -1,20 +1,26 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FragmentClause = void 0;
-exports.fragmentClause = fragmentClause;
-const base_clause_1 = require("./base.clause");
+const abstract_clause_1 = require("./abstract.clause");
 const utils_1 = require("../utils");
-class FragmentClause extends base_clause_1.Clause {
-    constructor(strings, values) {
+class FragmentClause extends abstract_clause_1.Clause {
+    constructor(templates, args) {
         super();
-        this.strings = strings;
-        this.values = values;
+        this.templates = templates;
+        this.args = args;
     }
-    map(currentArgCounter) {
-        return (0, utils_1.compileSqlTemplate)(this.strings, this.values, currentArgCounter);
+    static create(strings, ...values) {
+        return new FragmentClause(strings, values);
+    }
+    mapIntoQuery(params) {
+        const compiled = (0, utils_1.compileSqlTemplate)({
+            args: this.args,
+            counter: params.counter,
+            templates: this.templates
+        });
+        params.counter = compiled.counter;
+        params.args.push(...compiled.args);
+        params.text.push(compiled.text);
     }
 }
 exports.FragmentClause = FragmentClause;
-function fragmentClause(strings, ...values) {
-    return new FragmentClause(strings, values);
-}

package/dist/clauses/iden.caluse.d.ts

@@ -1,9 +1,9 @@
-import { Clause } from "./base.clause";
-import { CompiledSqlQuery } from "../utils";
+import { ClauseStrategyParams } from "../types";
+import { Clause } from "./abstract.clause";
 export declare class IdentifierClause<T extends string> extends Clause {
     readonly value: T;
     constructor(value: T);
-    map(argCounter: number): CompiledSqlQuery;
+    static create<T extends string>(identificator: T): IdentifierClause<T>;
+    mapIntoQuery(params: ClauseStrategyParams): void;
 }
-export declare function identClause<T extends string>(identificator: T): IdentifierClause<T>;
 //# sourceMappingURL=iden.caluse.d.ts.map

package/dist/clauses/iden.caluse.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"iden.caluse.d.ts","sourceRoot":"","sources":["../../src/clauses/iden.caluse.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AACvC,OAAO,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAE5C,qBAAa,gBAAgB,CAAC,CAAC,SAAS,MAAM,CAAE,SAAQ,MAAM;IAEtD,QAAQ,CAAC,KAAK,EAAE,CAAC;gBAAR,KAAK,EAAE,CAAC;IAGZ,GAAG,CAAC,UAAU,EAAE,MAAM,GAAG,gBAAgB;CASrD;AAED,wBAAgB,WAAW,CAAC,CAAC,SAAS,MAAM,EAAE,aAAa,EAAE,CAAC,uBAE7D"}
+{"version":3,"file":"iden.caluse.d.ts","sourceRoot":"","sources":["../../src/clauses/iden.caluse.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,UAAU,CAAA;AAC/C,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAA;AAE1C,qBAAa,gBAAgB,CAAC,CAAC,SAAS,MAAM,CAAE,SAAQ,MAAM;IAEtD,QAAQ,CAAC,KAAK,EAAE,CAAC;gBAAR,KAAK,EAAE,CAAC;IAGrB,MAAM,CAAC,MAAM,CAAC,CAAC,SAAS,MAAM,EAAE,aAAa,EAAE,CAAC;IAMvC,YAAY,CAAC,MAAM,EAAE,oBAAoB;CAGrD"}

package/dist/clauses/iden.caluse.js

@@ -1,23 +1,19 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.IdentifierClause = void 0;
-exports.identClause = identClause;
-const base_clause_1 = require("./base.clause");
-class IdentifierClause extends base_clause_1.Clause {
+const abstract_clause_1 = require("./abstract.clause");
+class IdentifierClause extends abstract_clause_1.Clause {
     constructor(value) {
         super();
         this.value = value;
     }
-    map(argCounter) {
-        if (this.value === undefined) {
-            throw new TypeError(`Query parameter undefined at position ${argCounter}`);
-        }
-        const text = `"${this.value}"`;
-        const args = [];
-        return { text, args, argCounter };
+    static create(identificator) {
+        if (identificator === undefined)
+            throw new TypeError("Identificator undefined");
+        return new IdentifierClause(identificator);
+    }
+    mapIntoQuery(params) {
+        params.text.push(`"${this.value}"`);
     }
 }
 exports.IdentifierClause = IdentifierClause;
-function identClause(identificator) {
-    return new IdentifierClause(identificator);
-}

package/dist/clauses/insert.clause.d.ts

@@ -1,9 +1,9 @@
-import { Clause } from "./base.clause";
-import { CompiledSqlQuery } from "../utils";
+import { Clause } from "./abstract.clause";
+import { ClauseStrategyParams } from "../types";
 export declare class InsertClause<T extends Record<string, any>> extends Clause {
     readonly inserts: T[];
     constructor(inserts: T[]);
-    map(argCounter: number): CompiledSqlQuery;
+    static create<T extends Record<string, any>>(...objects: NoInfer<T>[]): InsertClause<T>;
+    mapIntoQuery(params: ClauseStrategyParams): void;
 }
-export declare function insertClause<T extends Record<string, any>>(...objects: NoInfer<T>[]): InsertClause<T>;
 //# sourceMappingURL=insert.clause.d.ts.map

package/dist/clauses/insert.clause.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"insert.clause.d.ts","sourceRoot":"","sources":["../../src/clauses/insert.clause.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AACvC,OAAO,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAE5C,qBAAa,YAAY,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAE,SAAQ,MAAM;IAE/D,QAAQ,CAAC,OAAO,EAAE,CAAC,EAAE;gBAAZ,OAAO,EAAE,CAAC,EAAE;IAGhB,GAAG,CAAC,UAAU,EAAE,MAAM,GAAG,gBAAgB;CAgCrD;AAED,wBAAgB,YAAY,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,GAAG,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC,EAAE,mBAEnF"}
+{"version":3,"file":"insert.clause.d.ts","sourceRoot":"","sources":["../../src/clauses/insert.clause.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAC3C,OAAO,EAAE,oBAAoB,EAAE,MAAM,UAAU,CAAC;AAEhD,qBAAa,YAAY,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAE,SAAQ,MAAM;IAE/D,QAAQ,CAAC,OAAO,EAAE,CAAC,EAAE;gBAAZ,OAAO,EAAE,CAAC,EAAE;IAGzB,MAAM,CAAC,MAAM,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,GAAG,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC,EAAE;IAO5D,YAAY,CAAC,MAAM,EAAE,oBAAoB;CAyBrD"}

package/dist/clauses/insert.clause.js

@@ -1,39 +1,36 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.InsertClause = void 0;
-exports.insertClause = insertClause;
-const base_clause_1 = require("./base.clause");
-class InsertClause extends base_clause_1.Clause {
+const abstract_clause_1 = require("./abstract.clause");
+class InsertClause extends abstract_clause_1.Clause {
     constructor(inserts) {
         super();
         this.inserts = inserts;
     }
-    map(argCounter) {
-        if (this.inserts.length === 0) {
-            throw new Error('Insert clause has no rows to insert.\n' +
-                'Provide at least one object with data.');
+    static create(...objects) {
+        if (objects.length === 0) {
+            throw new Error('Insert clause has no rows to insert.\n Provide at least one object with data.');
         }
+        return new InsertClause(objects);
+    }
+    mapIntoQuery(params) {
         const columns = Object.keys(this.inserts[0]);
         const columnsCount = columns.length;
-        let text = `(${columns.join(', ')}) VALUES `;
-        let args = [];
-        const valuesText = this.inserts.map(values => {
-            if (Object.keys(values).length !== columnsCount)
-                throw new Error(`
-                all rows must have the same columns
-            `);
-            return `(${Object.values(values).map(value => {
+        params.text.push(`(${columns.join(', ')}) VALUES `);
+        this.inserts.forEach((object, index) => {
+            if (Object.keys(object).length !== columnsCount) {
+                throw new Error(`all rows must have the same columns`);
+            }
+            if (index)
+                params.text.push(', ');
+            params.text.push(`(${Object.values(object).map(value => {
                 if (value === undefined)
                     return "DEFAULT";
-                args.push(value);
-                return `$${argCounter++}`;
-            }).join(", ")})`;
-        }).join(", ");
-        text += valuesText;
-        return { text, args, argCounter };
+                params.args.push(value);
+                return `$${params.counter++}`;
+            })
+                .join(", ")})`);
+        });
     }
 }
 exports.InsertClause = InsertClause;
-function insertClause(...objects) {
-    return new InsertClause(objects);
-}

package/dist/clauses/literal.clause.d.ts

@@ -1,9 +1,9 @@
-import { Clause } from "./base.clause";
-import { CompiledSqlQuery } from "../utils";
+import { ClauseStrategyParams } from "../types";
+import { Clause } from "./abstract.clause";
 export declare class LiteralClause<T extends string> extends Clause {
     readonly value: T;
     constructor(value: T);
-    map(argCounter: number): CompiledSqlQuery;
+    static create<T extends string>(value: T): LiteralClause<T>;
+    mapIntoQuery(params: ClauseStrategyParams): void;
 }
-export declare function literalClause<T extends string>(value: T): LiteralClause<T>;
 //# sourceMappingURL=literal.clause.d.ts.map

package/dist/clauses/literal.clause.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"literal.clause.d.ts","sourceRoot":"","sources":["../../src/clauses/literal.clause.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAC,MAAM,eAAe,CAAC;AACtC,OAAO,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAE5C,qBAAa,aAAa,CAAC,CAAC,SAAS,MAAM,CAAE,SAAQ,MAAM;IAEnD,QAAQ,CAAC,KAAK,EAAE,CAAC;gBAAR,KAAK,EAAE,CAAC;IAKZ,GAAG,CAAC,UAAU,EAAE,MAAM,GAAG,gBAAgB;CAMrD;AAGD,wBAAgB,aAAa,CAAC,CAAC,SAAS,MAAM,EAAE,KAAK,EAAE,CAAC,GAAG,aAAa,CAAC,CAAC,CAAC,CAE1E"}
+{"version":3,"file":"literal.clause.d.ts","sourceRoot":"","sources":["../../src/clauses/literal.clause.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,UAAU,CAAC;AAChD,OAAO,EAAE,MAAM,EAAC,MAAM,mBAAmB,CAAC;AAE1C,qBAAa,aAAa,CAAC,CAAC,SAAS,MAAM,CAAE,SAAQ,MAAM;IAEnD,QAAQ,CAAC,KAAK,EAAE,CAAC;gBAAR,KAAK,EAAE,CAAC;IAKrB,MAAM,CAAC,MAAM,CAAC,CAAC,SAAS,MAAM,EAAE,KAAK,EAAE,CAAC,GAAG,aAAa,CAAC,CAAC,CAAC;IAQlD,YAAY,CAAC,MAAM,EAAE,oBAAoB;CAGrD"}

package/dist/clauses/literal.clause.js

@@ -1,21 +1,20 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.LiteralClause = void 0;
-exports.literalClause = literalClause;
-const base_clause_1 = require("./base.clause");
-class LiteralClause extends base_clause_1.Clause {
+const abstract_clause_1 = require("./abstract.clause");
+class LiteralClause extends abstract_clause_1.Clause {
     constructor(value) {
         super();
         this.value = value;
     }
-    map(argCounter) {
-        if (this.value === undefined) {
-            throw new TypeError(`Query parameter undefined at position ${argCounter}`);
+    static create(value) {
+        if (value === undefined) {
+            throw new TypeError(`Literal undefined`);
         }
-        return { text: this.value, args: [], argCounter };
+        return new LiteralClause(value);
+    }
+    mapIntoQuery(params) {
+        params.text.push(this.value);
     }
 }
 exports.LiteralClause = LiteralClause;
-function literalClause(value) {
-    return new LiteralClause(value);
-}

package/dist/clauses/update.clause.d.ts

@@ -1,9 +1,9 @@
-import { Clause } from "./base.clause";
-import { CompiledSqlQuery } from "../utils";
+import { ClauseStrategyParams } from "../types";
+import { Clause } from "./abstract.clause";
 export declare class UpdateClause<T extends Record<string, any>> extends Clause {
     readonly updateMap: T;
     constructor(updateMap: T);
-    map(argCounter: number): CompiledSqlQuery;
+    static create<T extends Record<string, any>>(object: T): UpdateClause<T>;
+    mapIntoQuery(params: ClauseStrategyParams): void;
 }
-export declare function updateClause<T extends Record<string, any>>(object: T): UpdateClause<T>;
 //# sourceMappingURL=update.clause.d.ts.map

package/dist/clauses/update.clause.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"update.clause.d.ts","sourceRoot":"","sources":["../../src/clauses/update.clause.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AACvC,OAAO,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAE5C,qBAAa,YAAY,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAE,SAAQ,MAAM;IAE/D,QAAQ,CAAC,SAAS,EAAE,CAAC;gBAAZ,SAAS,EAAE,CAAC;IAGhB,GAAG,CAAC,UAAU,EAAE,MAAM,GAAG,gBAAgB;CAcrD;AAED,wBAAgB,YAAY,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,EAAE,CAAC,mBAEpE"}
+{"version":3,"file":"update.clause.d.ts","sourceRoot":"","sources":["../../src/clauses/update.clause.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,UAAU,CAAC;AAChD,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAE3C,qBAAa,YAAY,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAE,SAAQ,MAAM;IAE/D,QAAQ,CAAC,SAAS,EAAE,CAAC;gBAAZ,SAAS,EAAE,CAAC;IAGzB,MAAM,CAAC,MAAM,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,EAAE,CAAC;IAI7C,YAAY,CAAC,MAAM,EAAE,oBAAoB;CAarD"}

package/dist/clauses/update.clause.js

@@ -1,26 +1,25 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.UpdateClause = void 0;
-exports.updateClause = updateClause;
-const base_clause_1 = require("./base.clause");
-class UpdateClause extends base_clause_1.Clause {
+const abstract_clause_1 = require("./abstract.clause");
+class UpdateClause extends abstract_clause_1.Clause {
     constructor(updateMap) {
         super();
         this.updateMap = updateMap;
     }
-    map(argCounter) {
-        const args = [];
+    static create(object) {
+        return new UpdateClause(object);
+    }
+    mapIntoQuery(params) {
         const entries = Object.entries(this.updateMap).filter(([_, value]) => value !== undefined);
         if (entries.length === 0)
             throw new Error('Update clause has no data to update. All values are `undefined`');
-        const text = entries.map(([key, value]) => {
-            args.push(value);
-            return `${key} = $${argCounter++}`;
-        }).join(', ');
-        return { text, args, argCounter };
+        entries.forEach(([key, value], index) => {
+            if (index)
+                params.text.push(', ');
+            params.args.push(value);
+            params.text.push(`${key} = $${params.counter++}`);
+        });
     }
 }
 exports.UpdateClause = UpdateClause;
-function updateClause(object) {
-    return new UpdateClause(object);
-}