@dwtechs/antity-pgsql 0.1.1 → 0.2.1

package/README.md

@@ -189,13 +189,19 @@ class SQLEntity {
 
 }
 
-filter(
+function filter(
   first: number,
-  rows: number | null,
+  rows: number,
   sortField: string | null,
-  sortOrder: Sort,
+  sortOrder: Sort = "ASC",
   filters: Filters | null,
-): { filterClause: string, args: (Filter["value"])[] } {
+): { filterClause: string, args: (Filter["value"])[] };
+
+function execute(
+  query: string, 
+  args: (string | number | boolean | Date | number[])[], 
+  client: any,
+): Promise<PGResponse>;
 
 
 ```

package/dist/antity-pgsql.d.ts

@@ -25,17 +25,17 @@ https://github.com/DWTechs/Antity-pgsql.js
 */
 
 import { Entity, Property } from "@dwtechs/antity";
-import type { Request, NextFunction } from 'express';
+import type { Request, Response, NextFunction } from 'express';
 
 export type Operation = "SELECT" | "INSERT" | "UPDATE" | "DELETE";
 export type Sort = "ASC" | "DESC";
 export type Filters = {
-    [key: string]: Filter;
+  [key: string]: Filter;
 };
 export type Filter = {
-    value: string | number | boolean | Date | number[];
-    subProps?: string[];
-    matchMode?: MatchMode;
+  value: string | number | boolean | Date | number[];
+  subProps?: string[];
+  matchMode?: MatchMode;
 };
 export type LogicalOperator = "AND" | "OR";
 export type Comparator = "=" | "<" | ">" | "<=" | ">=" | "<>" | "IS" | "IS NOT" | "IN" | "LIKE" | "NOT LIKE";
@@ -43,75 +43,77 @@ export type MatchMode = "startsWith" | "endsWith" | "contains" | "notContains" |
 export type MappedType = "string" | "number" | "date";
 export type Type = "boolean" | "string" | "number" | "integer" | "float" | "even" | "odd" | "positive" | "negative" | "powerOfTwo" | "ascii" | "array" | "jwt" | "symbol" | "email" | "regex" | "json" | "ipAddress" | "slug" | "hexadecimal" | "date" | "timestamp" | "function" | "htmlElement" | "htmlEventAttribute" | "node" | "object" | "geometry";
 export type Geometry = {
-    lng: number;
-    lat: number;
-    radius: number;
-    bounds: {
-        minLng: number;
-        minLat: number;
-        maxLng: number;
-        maxLat: number;
-    };
+  lng: number;
+  lat: number;
+  radius: number;
+  bounds: {
+    minLng: number;
+    minLat: number;
+    maxLng: number;
+    maxLat: number;
+  };
 };
 export type PGResponse = {
-    rows: Record<string, unknown>[];
-    rowCount: number;
-    total?: number;
-    command?: string;
-    oid?: number;
-    fields?: unknown[];
-    _parsers?: unknown[];
-    _types?: unknown;
-    RowCtor?: unknown;
-    rowAsArray?: boolean;
-};
-export type Response = {
-    rows: Record<string, unknown>[];
-    total?: number;
+  rows: Record<string, unknown>[];
+  rowCount: number;
+  total?: number;
+  command?: string;
+  oid?: number;
+  fields?: unknown[];
+  _parsers?: unknown[];
+  _types?: unknown;
+  RowCtor?: unknown;
+  rowAsArray?: boolean;
 };
 
 declare class SQLEntity extends Entity {
-    private _table;
-    private sel;
-    private ins;
-    private upd;
-    constructor(name: string, properties: Property[]);
-    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[];
-        };
-        insert: (rows: Record<string, unknown>[], consumerId: number | string, consumerName: string, rtn?: string) => {
-            query: string;
-            args: unknown[];
-        };
-        delete: () => string;
-        return: (prop: string) => string;
+  private _table;
+  private sel;
+  private ins;
+  private upd;
+  constructor(name: string, properties: Property[]);
+  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[];
+    };
+    insert: (rows: Record<string, unknown>[], consumerId: number | string, consumerName: string, rtn?: string) => {
+      query: string;
+      args: unknown[];
     };
-    get(req: Request, res: Response, next: NextFunction): void;
-    add(req: Request, res: Response, next: NextFunction): Promise<void>;
-    update(req: Request, res: Response, next: NextFunction): Promise<void>;
-    archive(req: Request, res: Response, next: NextFunction): Promise<void>;
-    delete(req: Request, res: Response, next: NextFunction): void;
-    private cleanFilters;
-    private mapProps;
+    delete: () => string;
+    return: (prop: string) => string;
+  };
+  get(req: Request, res: Response, next: NextFunction): void;
+  add(req: Request, res: Response, next: NextFunction): Promise<void>;
+  update(req: Request, res: Response, next: NextFunction): Promise<void>;
+  archive(req: Request, res: Response, next: NextFunction): Promise<void>;
+  delete(req: Request, res: Response, next: NextFunction): void;
+  private cleanFilters;
+  private mapProps;
 }
 
-declare filter(
-    first: number,
-    rows: number | null,
-    sortField: string | null,
-    sortOrder: Sort,
-    filters: Filters | null,
-  ): { filterClause: string, args: (Filter["value"])[] } {]
+declare function filter(
+  first: number,
+  rows: number | null,
+  sortField: string | null,
+  sortOrder: Sort | null,
+  filters: Filters | null,
+): { filterClause: string, args: (Filter["value"])[] };
   
+declare function execute(
+  query: string, 
+  args: (string | number | boolean | Date | number[])[], 
+  client: any
+): Promise<PGResponse>;
 
 export { 
   SQLEntity,
   Property,
   filter,
+  execute,
 };
 

package/dist/antity-pgsql.js

@@ -127,8 +127,8 @@ function execute$1(query, args, clt) {
     return client
         .query(query, args)
         .then((res) => {
-        perf.end(res, time);
         deleteIdleProperties(res);
+        perf.end(res, time);
         return res;
     })
         .catch((err) => {
@@ -144,6 +144,13 @@ function deleteIdleProperties(res) {
     res._types = undefined;
     res.RowCtor = undefined;
     res.rowAsArray = undefined;
+    res._prebuiltEmptyResultObject = undefined;
+}
+
+function quoteIfUppercase(word) {
+    if (/[A-Z]/.test(word))
+        return `"${word}"`;
+    return word;
 }
 
 class Select {
@@ -153,7 +160,7 @@ class Select {
         this._count = ", COUNT(*) OVER () AS total";
     }
     addProp(prop) {
-        this._props.push(prop);
+        this._props.push(quoteIfUppercase(prop));
         this._cols = this._props.join(", ");
     }
     get props() {
@@ -162,7 +169,7 @@ class Select {
     query(table, paginate) {
         const p = paginate ? this._count : '';
         const c = this._cols ? this._cols : '*';
-        return `SELECT ${c}${p} FROM "${table}"`;
+        return `SELECT ${c}${p} FROM ${quoteIfUppercase(table)}`;
     }
     execute(query, args, client) {
         return execute$1(query, args, client)
@@ -190,12 +197,12 @@ class Insert {
         this._nbProps = 2;
     }
     addProp(prop) {
-        this._props = add$1(this._props, prop, this._props.length - 2);
+        this._props = add$1(this._props, quoteIfUppercase(prop), this._props.length - 2);
         this._cols = this._props.join(", ");
         this._nbProps++;
     }
     query(table, rows, consumerId, consumerName, rtn = "") {
-        let query = `INSERT INTO "${table}" (${this._cols}) VALUES `;
+        let query = `INSERT INTO ${quoteIfUppercase(table)} (${this._cols}) VALUES `;
         const args = [];
         let i = 0;
         for (const row of rows) {
@@ -234,13 +241,13 @@ class Update {
         this._props = ["consumerId", "consumerName"];
     }
     addProp(prop) {
-        this._props = add$1(this._props, prop, this._props.length - 2);
+        this._props = add$1(this._props, quoteIfUppercase(prop), this._props.length - 2);
     }
     query(table, rows, consumerId, consumerName) {
         rows = this.addConsumer(rows, consumerId, consumerName);
         const l = rows.length;
         const args = rows.map(row => row.id);
-        let query = `UPDATE "${table}" SET `;
+        let query = `UPDATE "${quoteIfUppercase(table)}" SET `;
         let i = args.length + 1;
         for (const p of this._props) {
             if (rows[0][p] === undefined)
@@ -277,7 +284,7 @@ var __awaiter$1 = (undefined && undefined.__awaiter) || function (thisArg, _argu
     });
 };
 function query(table) {
-    return `DELETE FROM "${table}" WHERE "archivedAt" < $1`;
+    return `DELETE FROM ${quoteIfUppercase(table)} WHERE "archivedAt" < $1`;
 }
 function execute(date, query, client) {
     return __awaiter$1(this, void 0, void 0, function* () {
@@ -368,7 +375,7 @@ function add(filters) {
     return { conditions, args };
 }
 function addOne(key, indexes, matchMode) {
-    const sqlKey = `\"${key}\"`;
+    const sqlKey = `${quoteIfUppercase(key)}`;
     const comparator$1 = comparator(matchMode);
     const index$1 = index(indexes, matchMode);
     return comparator$1 ? `${sqlKey} ${comparator$1} ${index$1}` : "";
@@ -390,7 +397,8 @@ function where(conditions, operator = "AND") {
 function orderBy(sortField, sortOrder) {
     if (!sortField)
         return "";
-    return ` ORDER BY "${sortField}" ${sortOrder}`;
+    const o = sortOrder || "ASC";
+    return ` ORDER BY ${quoteIfUppercase(sortField)} ${o}`;
 }
 function limit(rows, first) {
     return rows ? ` LIMIT ${rows} OFFSET ${first}` : "";
@@ -585,4 +593,4 @@ class SQLEntity extends Entity {
     }
 }
 
-export { SQLEntity, filter };
+export { SQLEntity, execute$1 as execute, filter };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dwtechs/antity-pgsql",
-  "version": "0.1.1",
+  "version": "0.2.1",
   "description": "Open source library for easy entity management",
   "keywords": [
     "entities"