ztechno_core 0.0.28 → 0.0.31

package/lib/sql_service.d.ts

@@ -6,12 +6,19 @@ export declare class ZSqlService {
   private defaultPoolconfig;
   private listeners;
   private databaseName;
-  constructor(options: mysql.PoolConfig);
   get database(): string;
-  on(eventName: 'err', listener: ZOnErrorCallback): any;
-  on(eventName: 'log', listener: ZOnLogCallback): any;
+  constructor(options: mysql.PoolConfig);
+  on(eventName: 'err', listener: ZOnErrorCallback): void;
+  on(eventName: 'log', listener: ZOnLogCallback): void;
   private triggerEvent;
   private getPoolConnection;
-  query(sql: string, escaped?: any[]): Promise<any>;
+  query<T = any>(
+    sql: string,
+    params?:
+      | any[]
+      | {
+          [key: string]: any;
+        },
+  ): Promise<T[]>;
 }
 export {};

package/lib/sql_service.js

@@ -43,6 +43,9 @@ Object.defineProperty(exports, '__esModule', { value: true });
 exports.ZSqlService = void 0;
 const mysql = __importStar(require('mysql'));
 class ZSqlService {
+  get database() {
+    return this.databaseName;
+  }
   constructor(options) {
     this.defaultPoolconfig = {
       connectionLimit: 10,
@@ -54,6 +57,17 @@ 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.on('error', (err) => {
         this.triggerEvent('err', err);
       });
@@ -62,9 +76,6 @@ class ZSqlService {
       });
     });
   }
-  get database() {
-    return this.databaseName;
-  }
   on(eventName, listener) {
     if (!this.listeners.hasOwnProperty(eventName))
       throw new Error(`EventName not supported for ZSqlService.on(${eventName}, ...)`);
@@ -80,12 +91,12 @@ class ZSqlService {
       this.pool.getConnection((err, con) => (err ? reject(err) : resolve(con)));
     });
   }
-  async query(sql, escaped = []) {
+  async query(sql, params) {
     try {
       const con = await this.getPoolConnection();
       try {
         const output = await new Promise((resolve, reject) => {
-          con.query(sql, escaped, (err, result) => (err ? reject(err) : resolve(result)));
+          con.query(sql, params, (err, result) => (err ? reject(err) : resolve(result)));
         });
         con.release();
         return output;

package/lib/translate_service.d.ts

@@ -37,7 +37,7 @@ export declare class ZTranslateService {
     },
   ): Promise<string>;
   private translateHtmlRec;
-  update(key: string, lang: string, data: TranslateData): Promise<any>;
+  update(key: string, lang: string, data: TranslateData): Promise<any[]>;
   private checkLocalCache;
   private insertLocalCache;
   private clearLocalCache;

package/lib/user_service.js

@@ -60,6 +60,9 @@ class ZUserService {
     return { session };
   }
   async auth(opt) {
+    if (!opt.session || (!opt.name && !opt.pass)) {
+      return { authenticated: false };
+    }
     const res = await (opt.session
       ? this.sqlService.query(
           `

package/package.json

@@ -1,45 +1,45 @@
-{
-  "name": "ztechno_core",
-  "version": "0.0.28",
-  "description": "Core files for ztechno framework",
-  "main": "lib/index.js",
-  "types": "lib/index.d.ts",
-  "typings": "lib/index.d.ts",
-  "license": "MIT",
-  "author": "Ivan Auda (ZTechnologies International)",
-  "files": [
-    "lib/**/*"
-  ],
-  "scripts": {
-    "test": "jest --config jestconfig.json",
-    "build": "tsc",
-    "format": "prettier --write \"lib/**/*.ts\" \"lib/**/*.js\"",
-    "lint": "tslint -p tsconfig.json",
-    "preversion": "npm run lint",
-    "version": "npm run format && git add -A src",
-    "postversion": "git push && git push --tags",
-    "update": "npm run build && npm version patch && npm publish"
-  },
-  "keywords": [
-    "ztechno",
-    "core",
-    "utils",
-    "service"
-  ],
-  "devDependencies": {
-    "@types/jest": "^29.2.3",
-    "@types/mysql": "^2.15.21",
-    "jest": "^29.3.1",
-    "prettier": "^2.7.1",
-    "ts-jest": "^29.0.3",
-    "tslint": "^6.1.3",
-    "tslint-config-prettier": "^1.18.0",
-    "typescript": "^4.9.3"
-  },
-  "dependencies": {
-    "dom-parser": "^0.1.6",
-    "mysql": "^2.18.1",
-    "nodemailer": "^6.8.0",
-    "translate": "^1.4.1"
-  }
-}
+{
+  "name": "ztechno_core",
+  "version": "0.0.31",
+  "description": "Core files for ztechno framework",
+  "main": "lib/index.js",
+  "types": "lib/index.d.ts",
+  "typings": "lib/index.d.ts",
+  "license": "MIT",
+  "author": "Ivan Auda (ZTechnologies International)",
+  "files": [
+    "lib/**/*"
+  ],
+  "scripts": {
+    "test": "jest --config jestconfig.json",
+    "build": "tsc",
+    "format": "prettier --write \"lib/**/*.ts\" \"lib/**/*.js\"",
+    "lint": "tslint -p tsconfig.json",
+    "preversion": "npm run lint",
+    "version": "npm run format && git add -A src",
+    "postversion": "git push && git push --tags",
+    "update": "npm run build && npm version patch && npm publish"
+  },
+  "keywords": [
+    "ztechno",
+    "core",
+    "utils",
+    "service"
+  ],
+  "devDependencies": {
+    "@types/jest": "^29.2.3",
+    "@types/mysql": "^2.15.21",
+    "jest": "^29.3.1",
+    "prettier": "^2.7.1",
+    "ts-jest": "^29.0.3",
+    "tslint": "^6.1.3",
+    "tslint-config-prettier": "^1.18.0",
+    "typescript": "^4.9.3"
+  },
+  "dependencies": {
+    "dom-parser": "^0.1.6",
+    "mysql": "^2.18.1",
+    "nodemailer": "^6.8.0",
+    "translate": "^1.4.1"
+  }
+}