@dwtechs/antity-pgsql 0.16.0 → 0.17.1

package/README.md

@@ -2,7 +2,7 @@
 [![License: MIT](https://img.shields.io/npm/l/@dwtechs/antity-pgsql.svg?color=brightgreen)](https://opensource.org/licenses/MIT)
 [![npm version](https://badge.fury.io/js/%40dwtechs%2Fantity-pgsql.svg)](https://www.npmjs.com/package/@dwtechs/antity-pgsql)
 [![last version release date](https://img.shields.io/github/release-date/DWTechs/Antity-pgsql.js)](https://www.npmjs.com/package/@dwtechs/antity-pgsql)
-![Jest:coverage](https://img.shields.io/badge/Jest:coverage-54%25-brightgreen.svg)
+![Jest:coverage](https://img.shields.io/badge/Jest:coverage-87%25-brightgreen.svg)
 
 - [Synopsis](#synopsis)
 - [Support](#support)
@@ -311,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 `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.
+- **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` as `creatorId` and `consumer.nickname` as `name` for audit 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` as `updaterId` and `consumer.nickname` as `name` for audit 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` as `creatorId` and `consumer.nickname` as `name` for audit 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` as `updaterId` and `consumer.nickname` as `name` for audit 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.
@@ -376,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**: `consumer.id` and `consumer.nickname` from `res.locals.consumer` are forwarded to inserts and updates for history tracking.
+- **Consumer tracking**: `consumer.id` and `consumer.nickname` from `res.locals.consumer` are forwarded to inserts as `creatorId`/`name` and to updates as `updaterId`/`name` for audit tracking.
 
 ### Upsert (Insert or Update)
 
@@ -440,13 +440,13 @@ const { query, args } = entity.query.upsert(
   'RETURNING id' // return clause (optional)
 );
 // Generates:
-// INSERT INTO public.users (name, email, "consumerId", "consumerName")
+// INSERT INTO public.users (name, email, creatorId, name)
 // VALUES ($1, $2, $3, $4)
 // ON CONFLICT (id) DO UPDATE SET 
 //   name = EXCLUDED.name,
 //   email = EXCLUDED.email,
-//   "consumerId" = EXCLUDED."consumerId",
-//   "consumerName" = EXCLUDED."consumerName"
+//   creatorId = EXCLUDED.creatorId,
+//   name = EXCLUDED.name
 // RETURNING id
 ```
 

package/dist/antity-pgsql.js

@@ -305,7 +305,7 @@ class Insert {
         if (consumerId !== undefined && consumerName !== undefined) {
             propsToUse.push("consumerId", "consumerName");
             nbProps += 2;
-            cols += `, "consumerId", "consumerName"`;
+            cols += `, creatorId, name`;
         }
         let query = `INSERT INTO ${quoteIfUppercase(schema)}.${quoteIfUppercase(table)} (${cols}) VALUES `;
         const args = [];
@@ -365,13 +365,14 @@ class Update {
         for (const p of propsToUse) {
             if (rows[0][p] === undefined)
                 continue;
-            query += `${quoteIfUppercase(p)} = CASE `;
+            const colName = p === "consumerId" ? "updaterId" : p === "consumerName" ? "name" : quoteIfUppercase(p);
+            query += `${colName} = CASE `;
             for (let j = 0; j < l; j++) {
                 const row = rows[j];
                 query += `WHEN id = $${j + 1} THEN $${i++} `;
                 args.push(row[p]);
             }
-            query += `ELSE ${quoteIfUppercase(p)} END, `;
+            query += `ELSE ${colName} END, `;
         }
         query = `${query.slice(0, -2)} WHERE id IN ${$i(l, 0)}`;
         return { query, args };
@@ -412,9 +413,9 @@ class Upsert {
         let cols = this._cols;
         if (consumerId !== undefined && consumerName !== undefined) {
             propsToUse.push("consumerId", "consumerName");
-            quotedPropsToUse.push(`"consumerId"`, `"consumerName"`);
+            quotedPropsToUse.push(`creatorId`, `name`);
             nbProps += 2;
-            cols += `, "consumerId", "consumerName"`;
+            cols += `, creatorId, name`;
         }
         const conflictColumns = Array.isArray(conflictTarget)
             ? conflictTarget.map(col => quoteIfUppercase(col)).join(", ")
@@ -471,7 +472,7 @@ class Archive {
         const args = rows.map(row => row.id);
         let query = `UPDATE ${quoteIfUppercase(schema)}.${quoteIfUppercase(table)} SET archived = true`;
         if (consumerId !== undefined && consumerName !== undefined) {
-            query += `, ${quoteIfUppercase("consumerId")} = $${l + 1}, ${quoteIfUppercase("consumerName")} = $${l + 2}`;
+            query += `, updaterId = $${l + 1}, name = $${l + 2}`;
             args.push(consumerId, consumerName);
         }
         query += ` WHERE id IN ${$i(l, 0)}`;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dwtechs/antity-pgsql",
-  "version": "0.16.0",
+  "version": "0.17.1",
   "description": "Open source library to add PostgreSQL support to @dwtechs/Antity entities.",
   "keywords": [
     "entities"