@dwtechs/antity-pgsql 0.4.0 → 0.5.1

package/README.md

@@ -171,17 +171,33 @@ class SQLEntity {
   set table(table: string);
 
   query: {
-    select: (paginate: boolean) => string;
-    update: (rows: Record<string, unknown>[], consumerId: number | string, consumerName: string) => {
+    select: (
+      paginate: boolean,
+      first?: number,
+      rows?: number | null,
+      sortField?: string | null,
+      sortOrder?: "ASC" | "DESC" | null,
+      filters?: Filters | null) => {
         query: string;
-        args: unknown[];
-    };
-    insert: (rows: Record<string, unknown>[], consumerId: number | string, consumerName: string, rtn?: string) => {
-        query: string;
-        args: unknown[];
-    };
-    delete: () => string;
-    return: (prop: string) => string;
+        args: (Filter["value"])[];
+      };
+      update: (
+        rows: Record<string, unknown>[],
+        consumerId?: number | string,
+        consumerName?: string) => {
+          query: string;
+          args: unknown[];
+      };
+      insert: (
+        rows: Record<string, unknown>[],
+        consumerId?: number | string,
+        consumerName?: string,
+        rtn?: string) => {
+          query: string;
+            args: unknown[];
+        };
+        delete: () => string;
+        return: (prop: string) => string;
   };
   get: (req: Request, res: Response, next: NextFunction) => void;
   add: (req: Request, res: Response, next: NextFunction) => Promise<void>;

package/dist/antity-pgsql.d.ts

@@ -77,14 +77,24 @@ declare class SQLEntity extends Entity {
   get table(): string;
   set table(table: string);
   query: {
-    select: (paginate: boolean) => string;
-    update: (rows: Record<string, unknown>[], consumerId: number | string, consumerName: string) => {
-      query: string;
-      args: unknown[];
+    select: (
+      paginate: boolean,
+      first?: number,
+      rows?: number | null,
+      sortField?: string | null,
+      sortOrder?: "ASC" | "DESC" | null,
+      filters?: Filters | null) => {
+        query: string;
+        args: (Filter["value"])[];
     };
-    insert: (rows: Record<string, unknown>[], consumerId: number | string, consumerName: string, rtn?: string) => {
-      query: string;
-      args: unknown[];
+    update: (rows: Record<string,
+      unknown>[], consumerId?: number | string, consumerName?: string) => {
+        query: string;
+        args: unknown[];
+    };
+    insert: (rows: Record<string, unknown>[], consumerId?: number | string, consumerName?: string, rtn?: string) => {
+        query: string;
+        args: unknown[];
     };
     delete: () => string;
     return: (prop: string) => string;

package/dist/antity-pgsql.js

@@ -25,7 +25,7 @@ https://github.com/DWTechs/Antity-pgsql.js
 */
 
 import { isArray, isIn, isString } from '@dwtechs/checkard';
-import { deleteProps, add as add$1, chunk, flatten } from '@dwtechs/sparray';
+import { deleteProps, chunk, flatten } from '@dwtechs/sparray';
 import { log } from '@dwtechs/winstan';
 import { Entity } from '@dwtechs/antity';
 import Pool from 'pg-pool';
@@ -229,7 +229,7 @@ class Select {
         const { filterClause, args } = filter(first, rows, sortField, sortOrder, filters);
         return {
             query: baseQuery + filterClause,
-            args: args
+            args
         };
     }
     execute(query, args, client) {
@@ -253,27 +253,39 @@ function $i(qty, start) {
 
 class Insert {
     constructor() {
-        this._props = ["consumerId", "consumerName"];
-        this._cols = "*";
-        this._nbProps = 2;
+        this._props = [];
+        this._quotedProps = [];
+        this._nbProps = 0;
+        this._cols = "";
     }
     addProp(prop) {
-        this._props = add$1(this._props, quoteIfUppercase(prop), this._props.length - 2);
-        this._cols = this._props.join(", ");
+        this._props.push(prop);
+        this._quotedProps.push(quoteIfUppercase(prop));
         this._nbProps++;
+        this._cols = this._quotedProps.join(", ");
     }
     query(table, rows, consumerId, consumerName, rtn = "") {
-        let query = `INSERT INTO ${quoteIfUppercase(table)} (${this._cols}) VALUES `;
+        const propsToUse = [...this._props];
+        let nbProps = this._nbProps;
+        let cols = this._cols;
+        if (consumerId !== undefined && consumerName !== undefined) {
+            propsToUse.push("consumerId", "consumerName");
+            nbProps += 2;
+            cols += `, "consumerId", "consumerName"`;
+        }
+        let query = `INSERT INTO ${quoteIfUppercase(table)} (${cols}) VALUES `;
         const args = [];
         let i = 0;
         for (const row of rows) {
-            row.consumerId = consumerId;
-            row.consumerName = consumerName;
-            query += `${$i(this._nbProps, i)}, `;
-            for (const prop of this._props) {
+            if (consumerId !== undefined && consumerName !== undefined) {
+                row.consumerId = consumerId;
+                row.consumerName = consumerName;
+            }
+            query += `${$i(nbProps, i)}, `;
+            for (const prop of propsToUse) {
                 args.push(row[prop]);
             }
-            i += this._nbProps;
+            i += nbProps;
         }
         query = query.slice(0, -2);
         if (rtn)
@@ -299,18 +311,24 @@ var __awaiter$2 = (undefined && undefined.__awaiter) || function (thisArg, _argu
 };
 class Update {
     constructor() {
-        this._props = ["consumerId", "consumerName"];
+        this._props = [];
     }
     addProp(prop) {
-        this._props = add$1(this._props, quoteIfUppercase(prop), this._props.length - 2);
+        this._props.push(quoteIfUppercase(prop));
     }
     query(table, rows, consumerId, consumerName) {
-        rows = this.addConsumer(rows, consumerId, consumerName);
+        if (consumerId !== undefined && consumerName !== undefined) {
+            rows = this.addConsumer(rows, consumerId, consumerName);
+        }
+        const propsToUse = [...this._props];
+        if (consumerId !== undefined && consumerName !== undefined) {
+            propsToUse.push("consumerId", "consumerName");
+        }
         const l = rows.length;
         const args = rows.map(row => row.id);
         let query = `UPDATE "${quoteIfUppercase(table)}" SET `;
         let i = args.length + 1;
-        for (const p of this._props) {
+        for (const p of propsToUse) {
             if (rows[0][p] === undefined)
                 continue;
             query += `${p} = CASE `;
@@ -469,22 +487,20 @@ function generateSummary(name, table, properties) {
         lines.push(`│  └─ ${op}: ${count} properties`);
     });
     lines.push(`├─ Property Details:`);
-    properties.forEach((p, index) => {
-        const isLast = index === propLen - 1;
-        const prefix = isLast ? '└─' : '├─';
-        lines.push(`│  ${prefix} ${p.key}:`);
-        lines.push(`│  ${isLast ? ' ' : '│'}   ├─ Type: ${p.type}`);
-        lines.push(`│  ${isLast ? ' ' : '│'}   ├─ Min: ${p.min}`);
-        lines.push(`│  ${isLast ? ' ' : '│'}   ├─ Max: ${p.max}`);
-        lines.push(`│  ${isLast ? ' ' : '│'}   ├─ Required: ${p.required}`);
-        lines.push(`│  ${isLast ? ' ' : '│'}   ├─ Safe: ${p.safe}`);
-        lines.push(`│  ${isLast ? ' ' : '│'}   ├─ TypeCheck: ${p.typeCheck}`);
-        lines.push(`│  ${isLast ? ' ' : '│'}   ├─ Filter: ${p.filter}`);
-        lines.push(`│  ${isLast ? ' ' : '│'}   ├─ Methods: [${p.methods.join(', ')}]`);
-        lines.push(`│  ${isLast ? ' ' : '│'}   ├─ Operations: [${p.operations.join(', ')}]`);
-        lines.push(`│  ${isLast ? ' ' : '│'}   ├─ Sanitize: ${p.sanitize}`);
-        lines.push(`│  ${isLast ? ' ' : '│'}   ├─ Normalize: ${p.normalize}`);
-        lines.push(`│  ${isLast ? ' ' : '│'}   ├─ Validate: ${p.validate}`);
+    properties.forEach((p) => {
+        lines.push(`│ ├─ ${p.key}:`);
+        lines.push(`│ │ ├─ Type: ${p.type}`);
+        lines.push(`│ │ ├─ Min: ${p.min}`);
+        lines.push(`│ │ ├─ Max: ${p.max}`);
+        lines.push(`│ │ ├─ Required: ${p.required}`);
+        lines.push(`│ │ ├─ Safe: ${p.safe}`);
+        lines.push(`│ │ ├─ TypeCheck: ${p.typeCheck}`);
+        lines.push(`│ │ ├─ Filter: ${p.filter}`);
+        lines.push(`│ │ ├─ Methods: [${p.methods.join(', ')}]`);
+        lines.push(`│ │ ├─ Operations: [${p.operations.join(', ')}]`);
+        lines.push(`│ │ ├─ Sanitize: ${p.sanitize}`);
+        lines.push(`│ │ ├─ Normalize: ${p.normalize}`);
+        lines.push(`│ │ ├─ Validate: ${p.validate}`);
     });
     const crudMappings = getCrudMappings(properties);
     lines.push(`├─ CRUD Mappings:`);
@@ -567,8 +583,8 @@ class SQLEntity extends Entity {
             log.debug(`get(first='${first}', rows='${rows}', 
       sortOrder='${sortOrder}', sortField='${sortField}', 
       pagination=${pagination}, filters=${JSON.stringify(filters)}`);
-            const { query: q, args } = this.sel.query(this._table, pagination, first, rows, sortField, sortOrder, filters);
-            this.sel.execute(q, args, dbClient)
+            const { query, args } = this.sel.query(this._table, pagination, first, rows, sortField, sortOrder, filters);
+            this.sel.execute(query, args, dbClient)
                 .then((r) => {
                 l.rows = r.rows;
                 l.total = r.total;

package/package.json

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