@dwtechs/antity-pgsql 0.11.0 → 0.12.0

package/dist/antity-pgsql.js

@@ -24,7 +24,7 @@ SOFTWARE.
 https://github.com/DWTechs/Antity-pgsql.js
 */
 
-import { isArray, isIn, isString } from '@dwtechs/checkard';
+import { isArray, isString, isIn } from '@dwtechs/checkard';
 import { deleteProps, chunk, flatten } from '@dwtechs/sparray';
 import { log } from '@dwtechs/winstan';
 import { Entity } from '@dwtechs/antity';
@@ -107,14 +107,6 @@ function quoteIfUppercase(word) {
 function index(index, matchMode) {
     const i = index.map((i) => `$${i}`);
     switch (matchMode) {
-        case "startsWith":
-            return `${i}%`;
-        case "endsWith":
-            return `%${i}`;
-        case "contains":
-            return `%${i}%`;
-        case "notContains":
-            return `%${i}%`;
         case "in":
             return `(${i})`;
         default:
@@ -159,6 +151,21 @@ function comparator(matchMode) {
     }
 }
 
+function formatValue(value, matchMode) {
+    if (!isString(value))
+        return value;
+    switch (matchMode) {
+        case "startsWith":
+            return `${value}%`;
+        case "endsWith":
+            return `%${value}`;
+        case "contains":
+        case "notContains":
+            return `%${value}%`;
+        default:
+            return value;
+    }
+}
 function add(filters) {
     var _a, _b;
     const conditions = [];
@@ -176,9 +183,9 @@ function add(filters) {
                 if (cond) {
                     groupConditions.push(cond);
                     if (isArray(value))
-                        args.push(...value);
+                        args.push(...value.map((v) => formatValue(v, matchMode)));
                     else
-                        args.push(value);
+                        args.push(formatValue(value, matchMode));
                 }
             }
             if (groupConditions.length > 0) {
@@ -648,12 +655,12 @@ class SQLEntity extends Entity {
         });
         this.update = (req, res, next) => __awaiter(this, void 0, void 0, function* () {
             const l = res.locals;
-            const rows = 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}update(rows=${rows.length}, consumerId=${cId})`);
-            const chunks = chunk(rows);
+            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);
                 try {
@@ -663,6 +670,7 @@ class SQLEntity extends Entity {
                     return next(err);
                 }
             }
+            l.rows = r;
             next();
         });
         this.archive = (req, res, next) => __awaiter(this, void 0, void 0, function* () {

package/package.json

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