ztechno_core 0.0.33 → 0.0.35

package/lib/sql_service.d.ts

@@ -12,6 +12,17 @@ export declare class ZSqlService {
   on(eventName: 'log', listener: ZOnLogCallback): void;
   private triggerEvent;
   private getPoolConnection;
+  query(
+    sql: string,
+    params?:
+      | any[]
+      | {
+          [key: string]: any;
+        },
+  ): Promise<{
+    insertId: number;
+    affectedRows: number;
+  }>;
   query<T = any>(
     sql: string,
     params?:
@@ -19,10 +30,7 @@ export declare class ZSqlService {
       | {
           [key: string]: any;
         },
-  ): Promise<
-    T[] & {
-      insertId?: number;
-    }
-  >;
+  ): Promise<T>;
+  private formatQueryParams;
 }
 export {};

package/lib/sql_service.js

@@ -57,17 +57,8 @@ class ZSqlService {
     this.databaseName = options.database;
     this.pool = mysql.createPool(Object.assign({}, this.defaultPoolconfig, options));
     this.pool.on('connection', (connection) => {
-      connection.config.queryFormat = function (query, values) {
-        if (!values) {
-          return query;
-        }
-        return query.replace(
-          /\:(\w+)/g,
-          function (txt, key) {
-            return values.hasOwnProperty(key) ? this.escape(values[key]) : txt;
-          }.bind(this),
-        );
-      };
+      // connection.config.queryFormat = function (query, values) {
+      // }
       connection.on('error', (err) => {
         this.triggerEvent('err', err);
       });
@@ -96,7 +87,12 @@ class ZSqlService {
       const con = await this.getPoolConnection();
       try {
         const output = await new Promise((resolve, reject) => {
-          con.query(sql, params, (err, result) => (err ? reject(err) : resolve(result)));
+          if (Array.isArray(params)) {
+            con.query(sql, params, (err, result) => (err ? reject(err) : resolve(result)));
+          } else {
+            sql = this.formatQueryParams(con, sql, params);
+            con.query(sql, (err, result) => (err ? reject(err) : resolve(result)));
+          }
         });
         con.release();
         return output;
@@ -108,5 +104,13 @@ class ZSqlService {
       throw err;
     }
   }
+  formatQueryParams(con, query, values) {
+    if (!values) {
+      return query;
+    }
+    return query.replace(/\:(\w+)/g, (txt, key) => {
+      return values.hasOwnProperty(key) ? con.escape(values[key]) : txt;
+    });
+  }
 }
 exports.ZSqlService = ZSqlService;

package/lib/translate_service.d.ts

@@ -41,11 +41,10 @@ export declare class ZTranslateService {
     key: string,
     lang: string,
     data: TranslateData,
-  ): Promise<
-    any[] & {
-      insertId?: number;
-    }
-  >;
+  ): Promise<{
+    insertId: number;
+    affectedRows: number;
+  }>;
   private checkLocalCache;
   private insertLocalCache;
   private clearLocalCache;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ztechno_core",
-  "version": "0.0.33",
+  "version": "0.0.35",
   "description": "Core files for ztechno framework",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",