@dwtechs/antity-pgsql 0.15.1 → 0.16.0

package/README.md

@@ -22,24 +22,14 @@
 - 🚚 Shipped as EcmaScrypt module
 - 📝 Written in Typescript
 
-
-## Support
-
-- node: 22
-
-This is the oldest targeted versions. The library should work properly on older versions of Node.js but we do not support it officially.  
-
-
 ## Installation
 
 ```bash
 $ npm i @dwtechs/antity-pgsql
 ```
 
-
 ## Usage
 
-
 ```javascript
 
 import { SQLEntity } from "@dwtechs/antity-pgsql";
@@ -140,6 +130,8 @@ router.get("/:id/history", ..., entity.getHistory);
 
 type Operation = "SELECT" | "INSERT" | "UPDATE";
 
+type Row = Record<string, string | number | boolean | Date | number[]>;
+
 type MatchMode =  
   "startsWith" | 
   "endsWith" |
@@ -149,6 +141,7 @@ type MatchMode =
   "notEquals" |
   "between" |
   "in" |
+  "notIn" |
   "lt" |
   "lte" |
   "gt" |
@@ -171,6 +164,21 @@ type Filter = {
   operator?: string; // 'and' | 'or' - Used when multiple filters apply to the same property
 }
 
+type PGClient = {
+  query(text: string, values?: unknown[]): Promise<PGResponse>;
+};
+
+type PGResponse = {
+  rows: Record<string, unknown>[];
+  rowCount: number | null;
+  total?: number;
+};
+
+type SelectResponse = {
+  rows: Record<string, unknown>[];
+  total?: number;
+};
+
 type ExpressMiddleware = (req: Request, res: Response, next: NextFunction) => void;
 type ExpressMiddlewareAsync = (req: Request, res: Response, next: NextFunction) => Promise<void>;
 type SubstackTuple = [ExpressMiddleware, ExpressMiddleware, ExpressMiddlewareAsync];
@@ -206,32 +214,28 @@ class SQLEntity {
         args: (Filter["value"])[];
       };
     update: (
-      rows: Record<string, unknown>[],
-      consumerId?: number | string,
-      consumerName?: string) => {
+      rows: Row[],
+      consumer?: { id?: number | string, nickname?: string }) => {
         query: string;
         args: unknown[];
     };
     archive: (
-      rows: Record<string, unknown>[],
-      consumerId?: number | string,
-      consumerName?: string) => {
+      rows: Row[],
+      consumer?: { id?: number | string, nickname?: string }) => {
         query: string;
         args: unknown[];
     };
     insert: (
-      rows: Record<string, unknown>[],
-      consumerId?: number | string,
-      consumerName?: string,
+      rows: Row[],
+      consumer?: { id?: number | string, nickname?: string },
       rtn?: string) => {
         query: string;
           args: unknown[];
       };
     upsert: (
-      rows: Record<string, unknown>[],
+      rows: Row[],
       conflictTarget: string | string[],
-      consumerId?: number | string,
-      consumerName?: string,
+      consumer?: { id?: number | string, nickname?: string },
       rtn?: string) => {
         query: string;
         args: unknown[];
@@ -266,7 +270,7 @@ function filter(
 function execute(
   query: string, 
   args: (string | number | boolean | Date | number[])[], 
-  client: any,
+  client: PGClient | null,
 ): Promise<PGResponse>;
 
 
@@ -307,10 +311,10 @@ Using substacks simplifies your route definitions and ensures consistent data pr
 ### Query Methods
 
 - **query.select()**: Generates a SELECT query. When the `rows` parameter is provided (not null), pagination is automatically enabled and the query includes `COUNT(*) OVER () AS total` to return the total number of rows. The total count is extracted from results and returned separately from the row data.
-- **query.insert()**: Generates an INSERT query. Accepts an array of objects with properties matching the entity definition. Optionally appends `consumerId` and `consumerName` for history tracking. Supports `RETURNING` clause via the `rtn` parameter.
-- **query.update()**: Generates an UPDATE query using CASE statements. Accepts an array of objects with `id` property. Optionally appends `consumerId` and `consumerName` for history tracking.
-- **query.upsert()**: Generates an INSERT ... ON CONFLICT ... DO UPDATE query. (See [Upsert](#upsert-insert-or-update) section below.) Accepts an array of objects and a `conflictTarget` (single column name or array of column names) that defines uniqueness. If a conflict occurs on the specified column(s), the row is updated; otherwise, it is inserted. Properties are automatically included if they have both INSERT and UPDATE operations. Optionally appends `consumerId` and `consumerName` for history tracking. Supports `RETURNING` clause via the `rtn` parameter.
-- **query.archive()**: Generates a simplified `UPDATE ... SET archived = true WHERE id IN (...)` query. Accepts an array of objects with `id` property. Optionally appends `consumerId` and `consumerName` for history tracking. Does not require an `archived` field in the rows — it is set directly in the SQL.
+- **query.insert()**: Generates an INSERT query. Accepts an array of `Row` objects with properties matching the entity definition. Consumer fields are appended directly to the query arguments — row objects are **not mutated**. Optionally appends `consumer.id` and `consumer.nickname` for history tracking. Supports `RETURNING` clause via the `rtn` parameter.
+- **query.update()**: Generates an UPDATE query using CASE statements. Accepts an array of `Row` objects with `id` property. Optionally appends `consumer.id` and `consumer.nickname` for history tracking.
+- **query.upsert()**: Generates an INSERT ... ON CONFLICT ... DO UPDATE query. (See [Upsert](#upsert-insert-or-update) section below.) Accepts an array of `Row` objects and a `conflictTarget` (single column name or array of column names) that defines uniqueness. If a conflict occurs on the specified column(s), the row is updated; otherwise, it is inserted. Properties are automatically included if they have both INSERT and UPDATE operations. Consumer fields are appended directly to the query arguments — row objects are **not mutated**. Optionally appends `consumer.id` and `consumer.nickname` for history tracking. Supports `RETURNING` clause via the `rtn` parameter.
+- **query.archive()**: Generates a simplified `UPDATE ... SET archived = true WHERE id IN (...)` query. Accepts an array of `Row` objects with `id` property. Optionally appends `consumer.id` and `consumer.nickname` for history tracking. Does not require an `archived` field in the rows — it is set directly in the SQL.
 - **sync()**: Atomically synchronises the table with the provided rows inside a single PostgreSQL transaction. Missing rows are inserted, existing rows are updated, and rows absent from the list are deleted. Accepts optional `idField` (default `'id'`) and `filters` to restrict the scope of managed rows. Stores the result in `res.locals.rows` and a summary `{ inserted, updated, deleted }` in `res.locals.sync`.
 - **delete()**: Deletes rows by their IDs. Expects `req.body.rows` to be an array of objects with `id` property: `[{id: 1}, {id: 2}]`
 - **deleteArchive()**: Deletes archived rows that were archived before a specific date using a PostgreSQL SECURITY DEFINER function. Expects `req.body.date` to be a Date object.
@@ -372,7 +376,7 @@ res.locals.sync  // { inserted: 1, updated: 1, deleted: 1 }
 - **Atomic**: All insert / update / delete operations are wrapped in a single transaction.
 - **Filter scope**: When `filters` are provided, only rows matching the filter are considered "managed". Rows outside the filter are never touched.
 - **Property selection**: Insert uses `INSERT` properties; update uses `UPDATE` properties — same as the standalone `add` and `update` middlewares.
-- **Consumer tracking**: `consumerId` and `consumerName` from `res.locals` are forwarded to inserts and updates for history tracking.
+- **Consumer tracking**: `consumer.id` and `consumer.nickname` from `res.locals.consumer` are forwarded to inserts and updates for history tracking.
 
 ### Upsert (Insert or Update)
 
@@ -432,8 +436,7 @@ router.post('/users/upsert', ...entity.upsertArraySubstack);
 const { query, args } = entity.query.upsert(
   [{ id: 1, name: 'John', email: 'john@example.com' }],
   'id',
-  1, // consumerId (optional)
-  'admin', // consumerName (optional)
+  { id: 1, nickname: 'admin' }, // consumer (optional)
   'RETURNING id' // return clause (optional)
 );
 // Generates:
@@ -538,7 +541,8 @@ List of possible match modes :
 | notContains |       | string                  | Whether the value does not contain filter value |
 | equals	  |       | string \| number        | Whether the value equals the filter value |
 | notEquals	  |       | string \| number        | Whether the value does not equal the filter value |
-| in	      |       | string[] \| number[]    | Whether the value contains the filter value |
+| in	      |       | string[] \| number[]    | Whether the value is included in the list |
+| notIn	      |       | string[] \| number[]    | Whether the value is not included in the list |
 | lt	      |       | string \| number        | Whether the value is less than the filter value |
 | lte	      |       | string \| number        | Whether the value is less than or equals to the filter value |
 | gt	      |       | string \| number        | Whether the value is greater than the filter value |
@@ -557,8 +561,8 @@ List of compatible match modes for each property types
 
 | Name        | Match modes             |
 | :---------- | :---------------------- | 
-| string      | startsWith,<br>contains,<br>endsWith,<br>notContains,<br>equals,<br>notEquals,<br>lt,<br>lte,<br>gt,<br>gte |
-| number      | equals,<br>notEquals,<br>lt,<br>lte,<br>gt,<br>gte |
+| string      | startsWith,<br>contains,<br>endsWith,<br>notContains,<br>equals,<br>notEquals,<br>in,<br>notIn,<br>lt,<br>lte,<br>gt,<br>gte |
+| number      | equals,<br>notEquals,<br>in,<br>notIn,<br>lt,<br>lte,<br>gt,<br>gte |
 | date        | is,<br>isNot,<br>before,<br>after |
 | boolean     | is,<br>isNot            |
 | string[]    | in                      |
@@ -612,21 +616,25 @@ Any of these can be passed into the options object for each function.
 | isTypeChecked   |  boolean                  | Type is checked during validation                 | false
 | isFilterable    |  boolean                  | property is filterable in a SELECT operation      | true
 | operations      |  Operation[]              | Property is used for the DML operations only      | ["SELECT", "INSERT", "UPDATE"]
-| sanitizer       |  ((v:any) => any) \| null | Custom sanitizer function if sanitize is true     | null
-| normalizer      |  ((v:any) => any) \| null | Custom Normalizer function if normalize is true   | null
-| validator       |  ((v:any, min:number, max:number, typeCheck:boolean) => any) \| null | validator function if validate is true | null
+| sanitizer       |  ((v: unknown) => unknown) \| null | Custom sanitizer function if sanitize is true     | null
+| normalizer      |  ((v: unknown) => unknown) \| null | Custom Normalizer function if normalize is true   | null
+| validator       |  ((v: unknown) => unknown) \| null | validator function if validate is true | null
 
 
 * *Min and max parameters are not used for boolean type*
 * *TypeCheck Parameter is not used for boolean, string and array types*
 
+## Support
+
+| Environment | Version |
+| :---------- | :-----: |
+| Node.js     |  >= 22  |
 
 ## Contributors
 
 Antity.js is still in development and we would be glad to get all the help you can provide.
 To contribute please read **[contributor.md](https://github.com/DWTechs/Antity.js/blob/main/contributor.md)** for detailed installation guide.
 
-
 ## Stack
 
 | Purpose         |                    Choice                    |                                                     Motivation |

package/dist/antity-pgsql.d.ts

@@ -27,7 +27,6 @@ https://github.com/DWTechs/Antity-pgsql.js
 import { Entity, Property as BaseProperty } from "@dwtechs/antity";
 import type { Type, Method } from "@dwtechs/antity";
 import type { Request, Response, NextFunction } from 'express';
-import type { Pool, PoolClient } from 'pg';
 
 export type Operation = "SELECT" | "INSERT" | "UPDATE";
 export type Sort = "ASC" | "DESC";
@@ -75,9 +74,20 @@ export type Geometry = {
     maxLat: number;
   };
 };
+export type Row = Record<string, Filter["value"]>;
+
+export type PGClient = {
+  query(text: string, values?: unknown[]): Promise<PGResponse>;
+};
+
+export type SelectResponse = {
+  rows: Record<string, unknown>[];
+  total?: number;
+};
+
 export type PGResponse = {
   rows: Record<string, unknown>[];
-  rowCount: number;
+  rowCount: number | null;
   total?: number;
   command?: string;
   oid?: number;
@@ -132,27 +142,24 @@ export declare class SQLEntity extends Entity {
     };
     
     update: (
-      rows: Record<string, unknown>[],
-      consumerId?: number | string,
-      consumerName?: string
+      rows: Row[],
+      consumer?: { id?: number | string, nickname?: string }
     ) => {
       query: string;
       args: unknown[];
     };
     
     archive: (
-      rows: Record<string, unknown>[],
-      consumerId?: number | string,
-      consumerName?: string
+      rows: Row[],
+      consumer?: { id?: number | string, nickname?: string }
     ) => {
       query: string;
       args: unknown[];
     };
     
     insert: (
-      rows: Record<string, unknown>[],
-      consumerId?: number | string,
-      consumerName?: string,
+      rows: Row[],
+      consumer?: { id?: number | string, nickname?: string },
       rtn?: string
     ) => {
       query: string;
@@ -160,10 +167,9 @@ export declare class SQLEntity extends Entity {
     };
     
     upsert: (
-      rows: Record<string, unknown>[],
+      rows: Row[],
       conflictTarget: string | string[],
-      consumerId?: number | string,
-      consumerName?: string,
+      consumer?: { id?: number | string, nickname?: string },
       rtn?: string
     ) => {
       query: string;
@@ -202,6 +208,6 @@ export declare function filter(
 export declare function execute(
   query: string, 
   args: (string | number | boolean | Date | number[])[], 
-  client: Pool | PoolClient | null
+  client: PGClient | null
 ): Promise<PGResponse>;
 

package/dist/antity-pgsql.js

@@ -43,15 +43,15 @@ var pool = new Pool({
 const LOGS_PREFIX = '[Antity-PGSQL] ';
 
 function start(query, args) {
-    const a = JSON.stringify(args);
-    const q = query.replace(/[\n\r]+/g, "").replace(/\s{2,}/g, " ");
-    log.debug(`${LOGS_PREFIX}Pgsql: { Query : '${q}', Args : '${a}' }`);
+    log.debug(() => {
+        const a = JSON.stringify(args);
+        const q = query.replace(/[\n\r]+/g, "").replace(/\s{2,}/g, " ");
+        return `${LOGS_PREFIX}Pgsql: { Query : '${q}', Args : '${a}' }`;
+    });
     return Date.now();
 }
 function end(res, time) {
-    const r = JSON.stringify(res);
-    const t = Date.now() - time;
-    log.debug(`Pgsql response in ${t}ms : ${r}`);
+    log.debug(() => `Pgsql response in ${Date.now() - time}ms : ${JSON.stringify(res)}`);
 }
 var perf = {
     start,
@@ -108,6 +108,7 @@ function index(index, matchMode) {
     const i = index.map((i) => `$${i}`);
     switch (matchMode) {
         case "in":
+        case "notIn":
             return `(${i})`;
         default:
             return `${i}`;
@@ -130,6 +131,8 @@ function comparator(matchMode) {
             return "<>";
         case "in":
             return "IN";
+        case "notIn":
+            return "NOT IN";
         case "lt":
             return "<";
         case "lte":
@@ -308,13 +311,14 @@ class Insert {
         const args = [];
         let i = 0;
         for (const row of rows) {
-            if (consumerId !== undefined && consumerName !== undefined) {
-                row.consumerId = consumerId;
-                row.consumerName = consumerName;
-            }
             query += `${$i(nbProps, i)}, `;
             for (const prop of propsToUse) {
-                args.push(row[prop]);
+                if (prop === "consumerId")
+                    args.push(consumerId);
+                else if (prop === "consumerName")
+                    args.push(consumerName);
+                else
+                    args.push(row[prop]);
             }
             i += nbProps;
         }
@@ -353,7 +357,7 @@ class Update {
         const propsToUse = [...this._props];
         if (consumerId !== undefined && consumerName !== undefined)
             propsToUse.push("consumerId", "consumerName");
-        log.debug(`${LOGS_PREFIX}Update query input rows: ${JSON.stringify(rows, null, 2)}`);
+        log.debug(() => `${LOGS_PREFIX}Update query input rows: ${JSON.stringify(rows, null, 2)}`);
         const l = rows.length;
         const args = rows.map(row => row.id);
         let query = `UPDATE ${quoteIfUppercase(schema)}.${quoteIfUppercase(table)} SET `;
@@ -419,14 +423,13 @@ class Upsert {
         const args = [];
         let i = 0;
         for (const row of rows) {
-            if (consumerId !== undefined && consumerName !== undefined) {
-                row.consumerId = consumerId;
-                row.consumerName = consumerName;
-            }
             query += `${$i(nbProps, i)}, `;
-            for (const prop of propsToUse) {
+            for (const prop of this._props) {
                 args.push(row[prop]);
             }
+            if (consumerId !== undefined && consumerName !== undefined) {
+                args.push(consumerId, consumerName);
+            }
             i += nbProps;
         }
         query = query.slice(0, -2);
@@ -463,7 +466,7 @@ var __awaiter$2 = (undefined && undefined.__awaiter) || function (thisArg, _argu
 };
 class Archive {
     query(schema, table, rows, consumerId, consumerName) {
-        log.debug(`${LOGS_PREFIX}Archive query input rows: ${JSON.stringify(rows, null, 2)}`);
+        log.debug(() => `${LOGS_PREFIX}Archive query input rows: ${JSON.stringify(rows, null, 2)}`);
         const l = rows.length;
         const args = rows.map(row => row.id);
         let query = `UPDATE ${quoteIfUppercase(schema)}.${quoteIfUppercase(table)} SET archived = true`;
@@ -571,8 +574,8 @@ function type(type) {
 }
 
 const matchModes = {
-    string: ["startsWith", "contains", "endsWith", "notContains", "equals", "notEquals", "lt", "lte", "gt", "gte"],
-    number: ["equals", "notEquals", "lt", "lte", "gt", "gte"],
+    string: ["startsWith", "contains", "endsWith", "notContains", "equals", "notEquals", "lt", "lte", "gt", "gte", "in", "notIn"],
+    number: ["equals", "notEquals", "lt", "lte", "gt", "gte", "in", "notIn"],
     date: ["is", "isNot", "dateAfter"],
 };
 function matchMode(type, matchMode) {
@@ -584,12 +587,12 @@ function cleanFilters(filters, properties) {
         if (filters.hasOwnProperty(k)) {
             const prop = properties.find(p => p.key === k);
             if (!prop) {
-                log.warn(`${LOGS_PREFIX}Filters: skipping unknown property: ${k}`);
+                log.warn(() => `${LOGS_PREFIX}Filters: skipping unknown property: ${k}`);
                 delete filters[k];
                 continue;
             }
             if (!prop.isFilterable) {
-                log.warn(`${LOGS_PREFIX}Filters: skipping unfilterable property: ${k}`);
+                log.warn(() => `${LOGS_PREFIX}Filters: skipping unfilterable property: ${k}`);
                 delete filters[k];
                 continue;
             }
@@ -599,7 +602,7 @@ function cleanFilters(filters, properties) {
             const validFilters = filterArray.filter((f) => {
                 const { matchMode: matchMode$1 } = f;
                 if (!matchMode$1 || !matchMode(type$1, matchMode$1)) {
-                    log.warn(`${LOGS_PREFIX}Filters: skipping invalid match mode: "${matchMode$1}" for type: "${type$1}" at property: "${k}"`);
+                    log.warn(() => `${LOGS_PREFIX}Filters: skipping invalid match mode: "${matchMode$1}" for type: "${type$1}" at property: "${k}"`);
                     return false;
                 }
                 return true;
@@ -614,9 +617,8 @@ function cleanFilters(filters, properties) {
 }
 
 function logSummary(name, table, properties) {
-    const summary = generateSummary(name, table, properties);
     log.info(`${LOGS_PREFIX}Entity "${name}" created successfully`);
-    log.info(`${LOGS_PREFIX}Entity Summary:\n${summary}`);
+    log.info(() => `${LOGS_PREFIX}Entity Summary:\n${generateSummary(name, table, properties)}`);
 }
 function generateSummary(name, table, properties) {
     const lines = [];
@@ -699,20 +701,20 @@ class SQLEntity extends Entity {
             select: (first = 0, rows = null, sortField = null, sortOrder = null, filters = null) => {
                 return this.sel.query(this.schema, this.table, first, rows, sortField, sortOrder, filters);
             },
-            update: (rows, consumerId, consumerName) => {
-                return this.upd.query(this.schema, this.table, rows, consumerId, consumerName);
+            update: (rows, consumer) => {
+                return this.upd.query(this.schema, this.table, rows, consumer === null || consumer === void 0 ? void 0 : consumer.id, consumer === null || consumer === void 0 ? void 0 : consumer.nickname);
             },
-            insert: (rows, consumerId, consumerName, rtn = "") => {
-                return this.ins.query(this.schema, this.table, rows, consumerId, consumerName, rtn);
+            insert: (rows, consumer, rtn = "") => {
+                return this.ins.query(this.schema, this.table, rows, consumer === null || consumer === void 0 ? void 0 : consumer.id, consumer === null || consumer === void 0 ? void 0 : consumer.nickname, rtn);
             },
-            upsert: (rows, conflictTarget, consumerId, consumerName, rtn = "") => {
-                return this.ups.query(this.schema, this.table, rows, conflictTarget, consumerId, consumerName, rtn);
+            upsert: (rows, conflictTarget, consumer, rtn = "") => {
+                return this.ups.query(this.schema, this.table, rows, conflictTarget, consumer === null || consumer === void 0 ? void 0 : consumer.id, consumer === null || consumer === void 0 ? void 0 : consumer.nickname, rtn);
             },
             delete: (ids) => {
                 return queryById(this.schema, this.table, ids);
             },
-            archive: (rows, consumerId, consumerName) => {
-                return this.arc.query(this.schema, this.table, rows, consumerId, consumerName);
+            archive: (rows, consumer) => {
+                return this.arc.query(this.schema, this.table, rows, consumer === null || consumer === void 0 ? void 0 : consumer.id, consumer === null || consumer === void 0 ? void 0 : consumer.nickname);
             },
             deleteArchive: () => {
                 return queryByDate();
@@ -732,9 +734,7 @@ class SQLEntity extends Entity {
             const filters = cleanFilters(b.filters, this.properties) || null;
             const pagination = b.pagination || false;
             const dbClient = l.dbClient || null;
-            log.debug(`get(first='${first}', rows='${rows}', 
-      sortOrder='${sortOrder}', sortField='${sortField}', 
-      pagination=${pagination}, filters=${JSON.stringify(filters)}`);
+            log.debug(() => `get(first='${first}', rows='${rows}', sortOrder='${sortOrder}', sortField='${sortField}', pagination=${pagination}, filters=${JSON.stringify(filters)}`);
             const { query, args } = this.sel.query(this._schema, this._table, first, rows, sortField, sortOrder, filters);
             this.sel.execute(query, args, dbClient)
                 .then((r) => {
@@ -745,12 +745,13 @@ class SQLEntity extends Entity {
                 .catch((err) => next(err));
         };
         this.add = (req, res, next) => __awaiter(this, void 0, void 0, function* () {
+            var _a, _b;
             const l = res.locals;
             const rows = req.body.rows;
             const dbClient = l.dbClient || null;
-            const cId = l.consumerId;
-            const cName = l.consumerName;
-            log.debug(`${LOGS_PREFIX}addMany(rows=${rows.length}, consumerId=${cId})`);
+            const cId = (_a = l.consumer) === null || _a === void 0 ? void 0 : _a.id;
+            const cName = (_b = l.consumer) === null || _b === void 0 ? void 0 : _b.nickname;
+            log.debug(() => `${LOGS_PREFIX}addMany(rows=${rows.length}, consumerId=${cId})`);
             const rtn = this.ins.rtn("id");
             const chunks = chunk(rows);
             for (const c of chunks) {
@@ -771,12 +772,13 @@ class SQLEntity extends Entity {
             next();
         });
         this.update = (req, res, next) => __awaiter(this, void 0, void 0, function* () {
+            var _a, _b;
             const l = res.locals;
             const r = req.body.rows;
             const dbClient = l.dbClient || null;
-            const cId = l.consumerId;
-            const cName = l.consumerName;
-            log.debug(`${LOGS_PREFIX}update(rows=${r.length}, consumerId=${cId})`);
+            const cId = (_a = l.consumer) === null || _a === void 0 ? void 0 : _a.id;
+            const cName = (_b = l.consumer) === null || _b === void 0 ? void 0 : _b.nickname;
+            log.debug(() => `${LOGS_PREFIX}update(rows=${r.length}, consumerId=${cId})`);
             const chunks = chunk(r);
             for (const c of chunks) {
                 const { query, args } = this.upd.query(this._schema, this._table, c, cId, cName);
@@ -791,19 +793,20 @@ class SQLEntity extends Entity {
             next();
         });
         this.upsert = (req, res, next) => __awaiter(this, void 0, void 0, function* () {
+            var _a, _b;
             const l = res.locals;
             const rows = req.body.rows;
             const conflictTarget = req.body.conflictTarget;
             const dbClient = l.dbClient || null;
-            const cId = l.consumerId;
-            const cName = l.consumerName;
+            const cId = (_a = l.consumer) === null || _a === void 0 ? void 0 : _a.id;
+            const cName = (_b = l.consumer) === null || _b === void 0 ? void 0 : _b.nickname;
             if (!conflictTarget) {
                 return next({ status: 400, msg: "Missing conflictTarget for upsert operation" });
             }
             if (!rows || !Array.isArray(rows) || rows.length === 0) {
                 return next({ status: 400, msg: "Missing or empty rows array for upsert operation" });
             }
-            log.debug(`${LOGS_PREFIX}upsert(rows=${rows.length}, conflictTarget=${conflictTarget}, consumerId=${cId})`);
+            log.debug(() => `${LOGS_PREFIX}upsert(rows=${rows.length}, conflictTarget=${conflictTarget}, consumerId=${cId})`);
             const rtn = this.ups.rtn("id");
             const chunks = chunk(rows);
             for (const c of chunks) {
@@ -824,12 +827,13 @@ class SQLEntity extends Entity {
             next();
         });
         this.archive = (req, res, next) => __awaiter(this, void 0, void 0, function* () {
+            var _a, _b;
             const l = res.locals;
-            let r = req.body.rows;
+            const r = req.body.rows;
             const dbClient = l.dbClient || null;
-            const cId = l.consumerId;
-            const cName = l.consumerName;
-            log.debug(`${LOGS_PREFIX}archive(rows=${r.length}, consumerId=${cId})`);
+            const cId = (_a = l.consumer) === null || _a === void 0 ? void 0 : _a.id;
+            const cName = (_b = l.consumer) === null || _b === void 0 ? void 0 : _b.nickname;
+            log.debug(() => `${LOGS_PREFIX}archive(rows=${r.length}, consumerId=${cId})`);
             const chunks = chunk(r);
             for (const c of chunks) {
                 const { query, args } = this.arc.query(this._schema, this._table, c, cId, cName);
@@ -846,7 +850,7 @@ class SQLEntity extends Entity {
             const rows = req.body.rows;
             const dbClient = res.locals.dbClient || null;
             const ids = rows.map((row) => row.id);
-            log.debug(`${LOGS_PREFIX}delete ${rows.length} rows : (${ids.join(", ")})`);
+            log.debug(() => `${LOGS_PREFIX}delete ${rows.length} rows : (${ids.join(", ")})`);
             const { query, args } = queryById(this._schema, this._table, ids);
             try {
                 yield execute(query, args, dbClient);
@@ -859,7 +863,7 @@ class SQLEntity extends Entity {
         this.deleteArchive = (req, res, next) => {
             const date = req.body.date;
             const dbClient = res.locals.dbClient || null;
-            log.debug(`${LOGS_PREFIX}deleteArchive(schema=${this._schema}, table=${this._table}, date=${date})`);
+            log.debug(() => `${LOGS_PREFIX}deleteArchive(schema=${this._schema}, table=${this._table}, date=${date})`);
             executeArchived(this._schema, this._table, date, queryByDate(), dbClient)
                 .then(() => next())
                 .catch((err) => next(err));
@@ -868,9 +872,10 @@ class SQLEntity extends Entity {
             const id = req.params.id;
             const dbClient = res.locals.dbClient || null;
             if (!id) {
-                return next({ status: 400, msg: "Missing id" });
+                next({ status: 400, msg: "Missing id" });
+                return;
             }
-            log.debug(`${LOGS_PREFIX}getHistory(schema=${this._schema}, table=${this._table}, id=${id})`);
+            log.debug(() => `${LOGS_PREFIX}getHistory(schema=${this._schema}, table=${this._table}, id=${id})`);
             const sql = `
       SELECT id, tstamp, operation, "consumerId", "consumerName"
       FROM log.history
@@ -892,16 +897,16 @@ class SQLEntity extends Entity {
                 .catch((err) => next(err));
         };
         this.sync = (req, res, next) => __awaiter(this, void 0, void 0, function* () {
-            var _a;
+            var _a, _b, _c;
             const l = res.locals;
             const rows = req.body.rows;
             const idField = (_a = req.body.idField) !== null && _a !== void 0 ? _a : 'id';
-            const cId = l.consumerId;
-            const cName = l.consumerName;
+            const cId = (_b = l.consumer) === null || _b === void 0 ? void 0 : _b.id;
+            const cName = (_c = l.consumer) === null || _c === void 0 ? void 0 : _c.nickname;
             if (!rows || !Array.isArray(rows)) {
                 return next({ status: 400, msg: "Missing or invalid rows array for sync operation" });
             }
-            log.debug(`${LOGS_PREFIX}sync(rows=${rows.length}, idField=${idField}, consumerId=${cId})`);
+            log.debug(() => `${LOGS_PREFIX}sync(rows=${rows.length}, idField=${idField}, consumerId=${cId})`);
             const cleanedFilters = cleanFilters(req.body.filters, this.properties) || null;
             const { conditions, args: filterArgs } = add(cleanedFilters);
             const whereClause = conditions.length ? ` WHERE ${conditions.join(' AND ')}` : '';
@@ -961,7 +966,7 @@ class SQLEntity extends Entity {
         });
         this._table = name;
         this._schema = schema;
-        log.info(`${LOGS_PREFIX}Creating SQLEntity: "${name}"`);
+        log.info(() => `${LOGS_PREFIX}Creating SQLEntity: "${name}"`);
         for (const p of properties) {
             this.mapProps(p.operations, p.key);
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dwtechs/antity-pgsql",
-  "version": "0.15.1",
+  "version": "0.16.0",
   "description": "Open source library to add PostgreSQL support to @dwtechs/Antity entities.",
   "keywords": [
     "entities"
@@ -37,7 +37,7 @@
   ],
   "dependencies": {
     "@dwtechs/checkard": "3.6.0",
-    "@dwtechs/winstan": "0.5.0",
+    "@dwtechs/winstan": "0.7.0",
     "@dwtechs/antity": "0.16.0",
     "@dwtechs/sparray": "0.2.1",
     "pg": "8.20.0"