@dwtechs/antity-pgsql 0.2.1 → 0.3.1

package/README.md

@@ -181,11 +181,11 @@ class SQLEntity {
     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;
+  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;
 
 }
 

package/dist/antity-pgsql.d.ts

@@ -87,13 +87,11 @@ declare class SQLEntity extends Entity {
     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;
+  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;
 }
 
 declare function filter(

package/dist/antity-pgsql.js

@@ -147,8 +147,22 @@ function deleteIdleProperties(res) {
     res._prebuiltEmptyResultObject = undefined;
 }
 
+const reserved = [
+    'all', 'analyse', 'analyze', 'and', 'any', 'array', 'as', 'asc', 'asymmetric',
+    'authorization', 'between', 'binary', 'both', 'case', 'cast', 'check', 'collate',
+    'column', 'constraint', 'create', 'cross', 'current_catalog', 'current_date',
+    'current_role', 'current_schema', 'current_time', 'current_timestamp', 'current_user',
+    'default', 'deferrable', 'desc', 'distinct', 'do', 'else', 'end', 'except', 'false',
+    'fetch', 'for', 'foreign', 'from', 'full', 'grant', 'group', 'having', 'ilike', 'in',
+    'initially', 'inner', 'intersect', 'into', 'is', 'isnull', 'join', 'lateral', 'leading',
+    'left', 'like', 'limit', 'localtime', 'localtimestamp', 'natural', 'not', 'notnull',
+    'null', 'offset', 'on', 'only', 'or', 'order', 'outer', 'overlaps', 'placing', 'primary',
+    'references', 'returning', 'right', 'select', 'session_user', 'similar', 'some', 'symmetric',
+    'table', 'tablesample', 'then', 'to', 'trailing', 'true', 'union', 'unique', 'user', 'using',
+    'variadic', 'verbose', 'when', 'where', 'window', 'with'
+];
 function quoteIfUppercase(word) {
-    if (/[A-Z]/.test(word))
+    if (/[A-Z]/.test(word) || reserved.includes(word.toLowerCase()))
         return `"${word}"`;
     return word;
 }
@@ -436,45 +450,31 @@ class SQLEntity extends Entity {
                 return this.ins.rtn(prop);
             }
         };
-        this._table = name;
-        for (const p of properties) {
-            this.mapProps(p.methods, p.key);
-        }
-    }
-    get table() {
-        return this._table;
-    }
-    set table(table) {
-        if (!isString(table, "!0"))
-            throw new Error('table must be a string of length > 0');
-        this._table = table;
-    }
-    get(req, res, next) {
-        var _a;
-        const l = res.locals;
-        const b = req.body;
-        const first = (_a = b === null || b === void 0 ? void 0 : b.first) !== null && _a !== void 0 ? _a : 0;
-        const rows = b.rows || null;
-        const sortField = b.sortField || null;
-        const sortOrder = b.sortOrder === -1 || b.sortOrder === "DESC" ? "DESC" : "ASC";
-        const filters = this.cleanFilters(b.filters) || null;
-        const pagination = b.pagination || false;
-        const dbClient = l.dbClient || null;
-        log.debug(`get(first='${first}', rows='${rows}', 
+        this.get = (req, res, next) => {
+            var _a;
+            const l = res.locals;
+            const b = req.body;
+            const first = (_a = b === null || b === void 0 ? void 0 : b.first) !== null && _a !== void 0 ? _a : 0;
+            const rows = b.rows || null;
+            const sortField = b.sortField || null;
+            const sortOrder = b.sortOrder === -1 || b.sortOrder === "DESC" ? "DESC" : "ASC";
+            const filters = this.cleanFilters(b.filters) || 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)}`);
-        const { filterClause, args } = filter(first, rows, sortField, sortOrder, filters);
-        const q = this.sel.query(this._table, pagination) + filterClause;
-        this.sel.execute(q, args, dbClient)
-            .then((r) => {
-            l.rows = r.rows;
-            l.total = r.total;
-            next();
-        })
-            .catch((err) => next(err));
-    }
-    add(req, res, next) {
-        return __awaiter(this, void 0, void 0, function* () {
+            const { filterClause, args } = filter(first, rows, sortField, sortOrder, filters);
+            const q = this.sel.query(this._table, pagination) + filterClause;
+            this.sel.execute(q, args, dbClient)
+                .then((r) => {
+                l.rows = r.rows;
+                l.total = r.total;
+                next();
+            })
+                .catch((err) => next(err));
+        };
+        this.add = (req, res, next) => __awaiter(this, void 0, void 0, function* () {
             const l = res.locals;
             const rows = req.body.rows;
             const dbClient = l.dbClient || null;
@@ -500,9 +500,7 @@ class SQLEntity extends Entity {
             l.rows = flatten(chunks);
             next();
         });
-    }
-    update(req, res, next) {
-        return __awaiter(this, void 0, void 0, function* () {
+        this.update = (req, res, next) => __awaiter(this, void 0, void 0, function* () {
             const l = res.locals;
             const rows = req.body.rows;
             const dbClient = l.dbClient || null;
@@ -521,9 +519,7 @@ class SQLEntity extends Entity {
             }
             next();
         });
-    }
-    archive(req, res, next) {
-        return __awaiter(this, void 0, void 0, function* () {
+        this.archive = (req, res, next) => __awaiter(this, void 0, void 0, function* () {
             const l = res.locals;
             let rows = req.body.rows;
             const dbClient = l.dbClient || null;
@@ -543,15 +539,27 @@ class SQLEntity extends Entity {
             }
             next();
         });
+        this.delete = (req, res, next) => {
+            const date = req.body.date;
+            const dbClient = res.locals.dbClient || null;
+            log.debug(`delete archived`);
+            const q = query(this._table);
+            execute(date, q, dbClient)
+                .then(() => next())
+                .catch((err) => next(err));
+        };
+        this._table = name;
+        for (const p of properties) {
+            this.mapProps(p.methods, p.key);
+        }
+    }
+    get table() {
+        return this._table;
     }
-    delete(req, res, next) {
-        const date = req.body.date;
-        const dbClient = res.locals.dbClient || null;
-        log.debug(`delete archived`);
-        const q = query(this._table);
-        execute(date, q, dbClient)
-            .then(() => next())
-            .catch((err) => next(err));
+    set table(table) {
+        if (!isString(table, "!0"))
+            throw new Error('table must be a string of length > 0');
+        this._table = table;
     }
     cleanFilters(filters) {
         for (const k in filters) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dwtechs/antity-pgsql",
-  "version": "0.2.1",
+  "version": "0.3.1",
   "description": "Open source library for easy entity management",
   "keywords": [
     "entities"
@@ -38,7 +38,7 @@
   "dependencies": {
     "@dwtechs/checkard": "3.2.3",
     "@dwtechs/winstan": "0.4.0",
-    "@dwtechs/antity": "0.9.0",
+    "@dwtechs/antity": "0.9.2",
     "@dwtechs/sparray": "0.2.0",
     "pg": "8.13.1"
   },