ztechno_core 0.0.5 → 0.0.7

package/lib/crypto_service.js

@@ -41,37 +41,35 @@ var __importStar =
   };
 Object.defineProperty(exports, '__esModule', { value: true });
 exports.ZCryptoService = void 0;
-var crypto = __importStar(require('crypto'));
-var algorithm = 'aes-256-cbc';
-var key = Buffer.from([
+const crypto = __importStar(require('crypto'));
+const algorithm = 'aes-256-cbc';
+const key = Buffer.from([
   253, 144, 73, 128, 71, 94, 34, 3, 28, 128, 194, 166, 132, 154, 14, 87, 221, 202, 92, 56, 139, 10, 38, 122, 120, 7,
   149, 40, 211, 218, 217, 3,
 ]);
-var iv = Buffer.from([0, 209, 223, 20, 147, 45, 14, 107, 93, 6, 76, 206, 176, 55, 245, 134]);
-var ZCryptoService = /** @class */ (function () {
-  function ZCryptoService() {}
-  ZCryptoService.encrypt = function (text) {
-    var cipher = crypto.createCipheriv(algorithm, Buffer.from(key), iv);
-    var encrypted = cipher.update(text);
+const iv = Buffer.from([0, 209, 223, 20, 147, 45, 14, 107, 93, 6, 76, 206, 176, 55, 245, 134]);
+class ZCryptoService {
+  static encrypt(text) {
+    const cipher = crypto.createCipheriv(algorithm, Buffer.from(key), iv);
+    let encrypted = cipher.update(text);
     encrypted = Buffer.concat([encrypted, cipher.final()]);
     return { iv: iv.toString('hex'), encryptedData: encrypted.toString('hex') };
-  };
-  ZCryptoService.decrypt = function (data) {
-    var niv = Buffer.from(data.iv, 'hex');
-    var encryptedText = Buffer.from(data.encryptedData, 'hex');
-    var decipher = crypto.createDecipheriv(algorithm, Buffer.from(key), niv);
-    var decrypted = decipher.update(encryptedText);
+  }
+  static decrypt(data) {
+    const niv = Buffer.from(data.iv, 'hex');
+    const encryptedText = Buffer.from(data.encryptedData, 'hex');
+    const decipher = crypto.createDecipheriv(algorithm, Buffer.from(key), niv);
+    let decrypted = decipher.update(encryptedText);
     decrypted = Buffer.concat([decrypted, decipher.final()]);
     return decrypted.toString();
-  };
-  ZCryptoService.decryptJSON = function (data) {
+  }
+  static decryptJSON(data) {
     try {
-      var decrypted = ZCryptoService.decrypt(data);
+      const decrypted = ZCryptoService.decrypt(data);
       return JSON.parse(decrypted);
     } catch (err) {
-      throw new Error("Couldn't decrypt JSON ".concat(JSON.stringify(data)));
+      throw new Error(`Couldn't decrypt JSON ${JSON.stringify(data)}`);
     }
-  };
-  return ZCryptoService;
-})();
+  }
+}
 exports.ZCryptoService = ZCryptoService;

package/lib/index.js

@@ -1,28 +1,28 @@
 'use strict';
 Object.defineProperty(exports, '__esModule', { value: true });
 exports.ZTranslateService = exports.ZSqlService = exports.ZMailService = exports.ZCryptoService = void 0;
-var crypto_service_1 = require('./crypto_service');
+const crypto_service_1 = require('./crypto_service');
 Object.defineProperty(exports, 'ZCryptoService', {
   enumerable: true,
   get: function () {
     return crypto_service_1.ZCryptoService;
   },
 });
-var mail_service_1 = require('./mail_service');
+const mail_service_1 = require('./mail_service');
 Object.defineProperty(exports, 'ZMailService', {
   enumerable: true,
   get: function () {
     return mail_service_1.ZMailService;
   },
 });
-var sql_service_1 = require('./sql_service');
+const sql_service_1 = require('./sql_service');
 Object.defineProperty(exports, 'ZSqlService', {
   enumerable: true,
   get: function () {
     return sql_service_1.ZSqlService;
   },
 });
-var translate_service_1 = require('./translate_service');
+const translate_service_1 = require('./translate_service');
 Object.defineProperty(exports, 'ZTranslateService', {
   enumerable: true,
   get: function () {

package/lib/mail_service.js

@@ -1,35 +1,34 @@
 'use strict';
 Object.defineProperty(exports, '__esModule', { value: true });
 exports.ZMailService = void 0;
-var nodemailer = require('nodemailer');
-var instance = null;
-var ZMailService = /** @class */ (function () {
-  function ZMailService(opt) {
+const nodemailer = require('nodemailer');
+let instance = null;
+class ZMailService {
+  constructor(opt) {
     this.opt = opt;
   }
-  ZMailService.prototype.send = function (mailOpts) {
-    var mailTransporter = nodemailer.createTransport({
+  send(mailOpts) {
+    const mailTransporter = nodemailer.createTransport({
       service: 'gmail',
       auth: this.opt.auth,
     });
-    var mailDetails = {
+    const mailDetails = {
       from: this.opt.mailSender,
       to: mailOpts.recipient,
       subject: mailOpts.subject,
       text: mailOpts.body,
     };
-    return new Promise(function (resolve, reject) {
+    return new Promise((resolve, reject) => {
       mailTransporter.sendMail(mailDetails, function (err, data) {
         return err ? reject(err) : resolve('success'); // data)
       });
     });
-  };
-  ZMailService.get = function (opt) {
+  }
+  static get(opt) {
     if (instance == null) {
       instance = new ZMailService(opt);
     }
     return instance;
-  };
-  return ZMailService;
-})();
+  }
+}
 exports.ZMailService = ZMailService;

package/lib/sql_service.js

@@ -39,185 +39,42 @@ var __importStar =
     __setModuleDefault(result, mod);
     return result;
   };
-var __awaiter =
-  (this && this.__awaiter) ||
-  function (thisArg, _arguments, P, generator) {
-    function adopt(value) {
-      return value instanceof P
-        ? value
-        : new P(function (resolve) {
-            resolve(value);
-          });
-    }
-    return new (P || (P = Promise))(function (resolve, reject) {
-      function fulfilled(value) {
-        try {
-          step(generator.next(value));
-        } catch (e) {
-          reject(e);
-        }
-      }
-      function rejected(value) {
-        try {
-          step(generator['throw'](value));
-        } catch (e) {
-          reject(e);
-        }
-      }
-      function step(result) {
-        result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected);
-      }
-      step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-  };
-var __generator =
-  (this && this.__generator) ||
-  function (thisArg, body) {
-    var _ = {
-        label: 0,
-        sent: function () {
-          if (t[0] & 1) throw t[1];
-          return t[1];
-        },
-        trys: [],
-        ops: [],
-      },
-      f,
-      y,
-      t,
-      g;
-    return (
-      (g = { next: verb(0), throw: verb(1), return: verb(2) }),
-      typeof Symbol === 'function' &&
-        (g[Symbol.iterator] = function () {
-          return this;
-        }),
-      g
-    );
-    function verb(n) {
-      return function (v) {
-        return step([n, v]);
-      };
-    }
-    function step(op) {
-      if (f) throw new TypeError('Generator is already executing.');
-      while ((g && ((g = 0), op[0] && (_ = 0)), _))
-        try {
-          if (
-            ((f = 1),
-            y &&
-              (t = op[0] & 2 ? y['return'] : op[0] ? y['throw'] || ((t = y['return']) && t.call(y), 0) : y.next) &&
-              !(t = t.call(y, op[1])).done)
-          )
-            return t;
-          if (((y = 0), t)) op = [op[0] & 2, t.value];
-          switch (op[0]) {
-            case 0:
-            case 1:
-              t = op;
-              break;
-            case 4:
-              _.label++;
-              return { value: op[1], done: false };
-            case 5:
-              _.label++;
-              y = op[1];
-              op = [0];
-              continue;
-            case 7:
-              op = _.ops.pop();
-              _.trys.pop();
-              continue;
-            default:
-              if (!((t = _.trys), (t = t.length > 0 && t[t.length - 1])) && (op[0] === 6 || op[0] === 2)) {
-                _ = 0;
-                continue;
-              }
-              if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) {
-                _.label = op[1];
-                break;
-              }
-              if (op[0] === 6 && _.label < t[1]) {
-                _.label = t[1];
-                t = op;
-                break;
-              }
-              if (t && _.label < t[2]) {
-                _.label = t[2];
-                _.ops.push(op);
-                break;
-              }
-              if (t[2]) _.ops.pop();
-              _.trys.pop();
-              continue;
-          }
-          op = body.call(thisArg, _);
-        } catch (e) {
-          op = [6, e];
-          y = 0;
-        } finally {
-          f = t = 0;
-        }
-      if (op[0] & 5) throw op[1];
-      return { value: op[0] ? op[1] : void 0, done: true };
-    }
-  };
 Object.defineProperty(exports, '__esModule', { value: true });
 exports.ZSqlService = void 0;
-var mysql = __importStar(require('mysql'));
-var instance = null;
-var logError = function (err) {
+const mysql = __importStar(require('mysql'));
+let instance = null;
+const logError = (err) => {
   if (err) throw err;
 };
-var ZSqlService = /** @class */ (function () {
-  function ZSqlService(credentials) {
+class ZSqlService {
+  constructor(credentials) {
     this.credentials = credentials;
   }
-  ZSqlService.prototype.connect = function () {
-    var _this = this;
-    return new Promise(function (resolve, reject) {
-      var con = mysql.createConnection(_this.credentials);
-      con.connect(function (err) {
+  connect() {
+    return new Promise((resolve, reject) => {
+      const con = mysql.createConnection(this.credentials);
+      con.connect((err) => {
         if (err) return reject(err);
         resolve(con);
       });
     });
-  };
-  ZSqlService.prototype.query = function (sql, escaped) {
-    if (escaped === void 0) {
-      escaped = [];
-    }
-    return __awaiter(this, void 0, void 0, function () {
-      var con, output;
-      return __generator(this, function (_a) {
-        switch (_a.label) {
-          case 0:
-            return [4 /*yield*/, this.connect()];
-          case 1:
-            con = _a.sent();
-            return [
-              4 /*yield*/,
-              new Promise(function (resolve, reject) {
-                con.query(sql, escaped, function (err, result) {
-                  if (err) return reject(err);
-                  resolve(result);
-                });
-              }),
-            ];
-          case 2:
-            output = _a.sent();
-            con.end(logError);
-            return [2 /*return*/, output];
-        }
+  }
+  async query(sql, escaped = []) {
+    const con = await this.connect();
+    const output = await new Promise((resolve, reject) => {
+      con.query(sql, escaped, (err, result) => {
+        if (err) return reject(err);
+        resolve(result);
       });
     });
-  };
-  ZSqlService.get = function (credentials) {
+    con.end(logError);
+    return output;
+  }
+  static get(credentials) {
     if (instance == null) {
       instance = new ZSqlService(credentials);
     }
     return instance;
-  };
-  return ZSqlService;
-})();
+  }
+}
 exports.ZSqlService = ZSqlService;

package/lib/translate_service.d.ts

@@ -1,3 +1,4 @@
+import { ZSqlService } from './sql_service';
 type TranslateData = {
   value: string;
   meta?: {
@@ -11,12 +12,13 @@ type dbTranslationRow = {
   value: string;
 };
 export declare class ZTranslateService {
+  private sql;
   private localCache;
   surpressErrors: boolean;
   getLanguages(): string[];
   getSourceLang(): string;
   getDefaultLang(): string;
-  constructor();
+  constructor(sql: ZSqlService);
   static init(opt: { key: string }): void;
   private codes;
   getLang(cookies: { [key: string]: string }): string;
@@ -40,6 +42,6 @@ export declare class ZTranslateService {
     [key: string]: dbTranslationRow[];
   }>;
   private fetchAll;
-  static get(): ZTranslateService;
+  static get(sqlService: ZSqlService): ZTranslateService;
 }
 export {};

package/lib/translate_service.js

@@ -1,303 +1,134 @@
 'use strict';
-var __awaiter =
-  (this && this.__awaiter) ||
-  function (thisArg, _arguments, P, generator) {
-    function adopt(value) {
-      return value instanceof P
-        ? value
-        : new P(function (resolve) {
-            resolve(value);
-          });
-    }
-    return new (P || (P = Promise))(function (resolve, reject) {
-      function fulfilled(value) {
-        try {
-          step(generator.next(value));
-        } catch (e) {
-          reject(e);
-        }
-      }
-      function rejected(value) {
-        try {
-          step(generator['throw'](value));
-        } catch (e) {
-          reject(e);
-        }
-      }
-      function step(result) {
-        result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected);
-      }
-      step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-  };
-var __generator =
-  (this && this.__generator) ||
-  function (thisArg, body) {
-    var _ = {
-        label: 0,
-        sent: function () {
-          if (t[0] & 1) throw t[1];
-          return t[1];
-        },
-        trys: [],
-        ops: [],
-      },
-      f,
-      y,
-      t,
-      g;
-    return (
-      (g = { next: verb(0), throw: verb(1), return: verb(2) }),
-      typeof Symbol === 'function' &&
-        (g[Symbol.iterator] = function () {
-          return this;
-        }),
-      g
-    );
-    function verb(n) {
-      return function (v) {
-        return step([n, v]);
-      };
-    }
-    function step(op) {
-      if (f) throw new TypeError('Generator is already executing.');
-      while ((g && ((g = 0), op[0] && (_ = 0)), _))
-        try {
-          if (
-            ((f = 1),
-            y &&
-              (t = op[0] & 2 ? y['return'] : op[0] ? y['throw'] || ((t = y['return']) && t.call(y), 0) : y.next) &&
-              !(t = t.call(y, op[1])).done)
-          )
-            return t;
-          if (((y = 0), t)) op = [op[0] & 2, t.value];
-          switch (op[0]) {
-            case 0:
-            case 1:
-              t = op;
-              break;
-            case 4:
-              _.label++;
-              return { value: op[1], done: false };
-            case 5:
-              _.label++;
-              y = op[1];
-              op = [0];
-              continue;
-            case 7:
-              op = _.ops.pop();
-              _.trys.pop();
-              continue;
-            default:
-              if (!((t = _.trys), (t = t.length > 0 && t[t.length - 1])) && (op[0] === 6 || op[0] === 2)) {
-                _ = 0;
-                continue;
-              }
-              if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) {
-                _.label = op[1];
-                break;
-              }
-              if (op[0] === 6 && _.label < t[1]) {
-                _.label = t[1];
-                t = op;
-                break;
-              }
-              if (t && _.label < t[2]) {
-                _.label = t[2];
-                _.ops.push(op);
-                break;
-              }
-              if (t[2]) _.ops.pop();
-              _.trys.pop();
-              continue;
-          }
-          op = body.call(thisArg, _);
-        } catch (e) {
-          op = [6, e];
-          y = 0;
-        } finally {
-          f = t = 0;
-        }
-      if (op[0] & 5) throw op[1];
-      return { value: op[0] ? op[1] : void 0, done: true };
-    }
-  };
 Object.defineProperty(exports, '__esModule', { value: true });
 exports.ZTranslateService = void 0;
-var sql_service_1 = require('./sql_service');
-var DomParser = require('dom-parser');
-var translate = require('translate');
-var htmlParser = new DomParser();
-var sql = sql_service_1.ZSqlService.get();
-var instance = null;
-var ZTranslateService = /** @class */ (function () {
-  function ZTranslateService() {
-    var _a;
-    var _this = this;
-    this.localCache = {};
-    this.surpressErrors = true;
-    this.codes =
-      ((_a = {}),
-      (_a['&#39'] = "'"),
-      (_a['&#34'] = '"'),
-      (_a['&#8220'] = '\u201C'),
-      (_a['&#8221'] = '\u201D'),
-      (_a['&#169'] = '\u00A9'),
-      (_a['&#174'] = '\u00AE'),
-      (_a['&#8364'] = '\u20AC'),
-      (_a['&#163'] = '\u00A3'),
-      (_a['&#8482'] = '\u2122'),
-      _a);
-    this.getLanguages().map(function (lang) {
-      return (_this.localCache[lang] = {});
-    });
-    setInterval(function () {
-      return _this.clearLocalCache();
-    }, 1000 * 60 * 60); // Every Hour
-  }
-  ZTranslateService.prototype.getLanguages = function () {
+const DomParser = require('dom-parser');
+const translate = require('translate');
+const htmlParser = new DomParser();
+let instance = null;
+class ZTranslateService {
+  getLanguages() {
     return ['en', 'nl'];
-  };
-  ZTranslateService.prototype.getSourceLang = function () {
+  }
+  getSourceLang() {
     return 'nl';
-  };
-  ZTranslateService.prototype.getDefaultLang = function () {
+  }
+  getDefaultLang() {
     return 'nl';
-  };
-  ZTranslateService.init = function (opt) {
+  }
+  constructor(sql) {
+    this.sql = sql;
+    this.localCache = {};
+    this.surpressErrors = true;
+    this.codes = {
+      [`&#39`]: `'`,
+      [`&#34`]: `"`,
+      [`&#8220`]: `“`,
+      [`&#8221`]: `”`,
+      [`&#169`]: `©`,
+      [`&#174`]: `®`,
+      [`&#8364`]: `€`,
+      [`&#163`]: `£`,
+      [`&#8482`]: `™`,
+    };
+    this.getLanguages().map((lang) => (this.localCache[lang] = {}));
+    setInterval(() => this.clearLocalCache(), 1000 * 60 * 60); // Every Hour
+  }
+  static init(opt) {
     translate.key = opt.key;
-  };
-  ZTranslateService.prototype.getLang = function (cookies) {
-    var defaultLang = this.getDefaultLang();
-    var langKey = (cookies.lang || defaultLang).toLowerCase();
-    var langs = this.getLanguages();
+  }
+  getLang(cookies) {
+    const defaultLang = this.getDefaultLang();
+    const langKey = (cookies.lang || defaultLang).toLowerCase();
+    const langs = this.getLanguages();
     if (!langs.includes(langKey)) {
       return defaultLang;
     }
     return langKey;
-  };
-  ZTranslateService.prototype.translateText = function (langOrReq, text) {
-    return __awaiter(this, void 0, void 0, function () {
-      var lang, replaceCount, codeIndexStart, first, codeLength, code, localCached, remoteCached, result, err_1;
-      return __generator(this, function (_a) {
-        switch (_a.label) {
-          case 0:
-            lang = typeof langOrReq === 'string' ? langOrReq : this.getLang(langOrReq.cookies);
-            text = text.trim();
-            if (text.length === 1) {
-              return [2 /*return*/, text];
-            }
-            replaceCount = 0;
-            while (text.includes('&#')) {
-              codeIndexStart = text.indexOf('&#');
-              first = text.substring(codeIndexStart);
-              codeLength = first.indexOf('') + 1;
-              code = first.substring(0, codeLength);
-              if (this.codes[code] === undefined) {
-                throw new Error('Cant recognize character code="'.concat(code, '"\n for text=').concat(text, '\n\n'));
-                // return text
-              }
-              text = text.substring(0, codeIndexStart) + this.codes[text] + text.substring(codeIndexStart + codeLength);
-              // text = text.replace(code, codes[text])
-              if (replaceCount++ > 1000) {
-                throw new Error(
-                  'Replace Count > 1000!!! character code="'.concat(code, '"\n for text=').concat(text, '\n\n'),
-                );
-                // return text
-              }
-            }
-            localCached = this.checkLocalCache(text, lang);
-            if (localCached !== false) {
-              return [2 /*return*/, localCached.value];
-            }
-            return [4 /*yield*/, this.fetch(text, lang)];
-          case 1:
-            remoteCached = _a.sent();
-            if (remoteCached !== false) {
-              return [2 /*return*/, remoteCached.value];
-            }
-            _a.label = 2;
-          case 2:
-            _a.trys.push([2, 4, , 5]);
-            return [
-              4 /*yield*/,
-              translate(text, {
-                from: this.getSourceLang(),
-                to: lang,
-              }),
-            ];
-          case 3:
-            result = _a.sent();
-            return [3 /*break*/, 5];
-          case 4:
-            err_1 = _a.sent();
-            result = '?';
-            return [3 /*break*/, 5];
-          case 5:
-            return [4 /*yield*/, this.insert(text, lang, { value: result })];
-          case 6:
-            _a.sent();
-            return [2 /*return*/, result];
-        }
-      });
-    });
-  };
-  ZTranslateService.prototype.translateHtml = function (html, cookies) {
-    return __awaiter(this, void 0, void 0, function () {
-      var lang, defaultLang, dom, htmlNodes, mainNodes, isView, domNode, node, promises, output;
-      return __generator(this, function (_a) {
-        switch (_a.label) {
-          case 0:
-            lang = this.getLang(cookies);
-            defaultLang = this.getDefaultLang();
-            dom = htmlParser.parseFromString(html);
-            htmlNodes = dom.getElementsByTagName('html');
-            mainNodes = dom.getElementsByTagName('main');
-            isView = htmlNodes.length === 0;
-            domNode = isView ? mainNodes[0] : htmlNodes[0];
-            if (!(lang !== defaultLang)) return [3 /*break*/, 2];
-            node = isView ? domNode : domNode.getElementsByTagName('body')[0];
-            promises = [];
-            this.translateHtmlRec(lang, node, promises);
-            return [4 /*yield*/, Promise.all(promises)];
-          case 1:
-            _a.sent();
-            _a.label = 2;
-          case 2:
-            output = domNode ? domNode.outerHTML : html;
-            return [2 /*return*/, output.startsWith('<!DOCTYPE html>') ? output : '<!DOCTYPE html>\r\n'.concat(output)];
-        }
+  }
+  async translateText(langOrReq, text) {
+    const lang = typeof langOrReq === 'string' ? langOrReq : this.getLang(langOrReq.cookies);
+    text = text.trim();
+    if (text.length === 1) {
+      return text;
+    }
+    let replaceCount = 0;
+    while (text.includes('&#')) {
+      const codeIndexStart = text.indexOf('&#');
+      const first = text.substring(codeIndexStart);
+      const codeLength = first.indexOf('') + 1;
+      const code = first.substring(0, codeLength);
+      if (this.codes[code] === undefined) {
+        throw new Error(`Cant recognize character code="${code}"\n for text=${text}\n\n`);
+        // return text
+      }
+      text = text.substring(0, codeIndexStart) + this.codes[text] + text.substring(codeIndexStart + codeLength);
+      // text = text.replace(code, codes[text])
+      if (replaceCount++ > 1000) {
+        throw new Error(`Replace Count > 1000!!! character code="${code}"\n for text=${text}\n\n`);
+        // return text
+      }
+    }
+    const localCached = this.checkLocalCache(text, lang);
+    if (localCached !== false) {
+      return localCached.value;
+    }
+    const remoteCached = await this.fetch(text, lang);
+    if (remoteCached !== false) {
+      return remoteCached.value;
+    }
+    let result;
+    try {
+      result = await translate(text, {
+        from: this.getSourceLang(),
+        to: lang,
       });
-    });
-  };
-  ZTranslateService.prototype.translateHtmlRec = function (lang, node, promises, skipTranslate) {
-    var _this = this;
-    if (skipTranslate === void 0) {
-      skipTranslate = false;
+    } catch (err) {
+      result = '?';
+    }
+    await this.insert(text, lang, { value: result });
+    return result;
+  }
+  async translateHtml(html, cookies) {
+    const lang = this.getLang(cookies);
+    const defaultLang = this.getDefaultLang();
+    const dom = htmlParser.parseFromString(html);
+    const htmlNodes = dom.getElementsByTagName('html');
+    const mainNodes = dom.getElementsByTagName('main');
+    const isView = htmlNodes.length === 0;
+    const domNode = isView ? mainNodes[0] : htmlNodes[0];
+    if (lang !== defaultLang) {
+      const node = isView ? domNode : domNode.getElementsByTagName('body')[0];
+      const promises = [];
+      this.translateHtmlRec(lang, node, promises);
+      await Promise.all(promises);
     }
+    const output = domNode ? domNode.outerHTML : html;
+    return output.startsWith(`<!DOCTYPE html>`) ? output : `<!DOCTYPE html>\r\n${output}`;
+  }
+  translateHtmlRec(lang, node, promises, skipTranslate = false) {
     if (node.getAttribute('notranslate') != null) {
       skipTranslate = true;
     }
     if (node.nodeName === '#text') {
-      var nodeText = node;
-      var text_1 = nodeText.text.replace(/[\r|\n|\r\n]+/g, ' ').replace(/\s\s+/g, ' ');
-      var value = text_1.trim();
-      var meta_1 = {
-        prefix: genSpaces(text_1.length - text_1.trimStart().length),
-        suffix: genSpaces(text_1.length - text_1.trimEnd().length),
+      const nodeText = node;
+      const text = nodeText.text.replace(/[\r|\n|\r\n]+/g, ' ').replace(/\s\s+/g, ' ');
+      const value = text.trim();
+      const meta = {
+        prefix: genSpaces(text.length - text.trimStart().length),
+        suffix: genSpaces(text.length - text.trimEnd().length),
       };
-      if (skipTranslate === true || text_1.length === 0 || !strContainsLetters(text_1)) {
-        node.text = meta_1.prefix + text_1 + meta_1.suffix;
+      if (skipTranslate === true || text.length === 0 || !strContainsLetters(text)) {
+        node.text = meta.prefix + text + meta.suffix;
         return;
       }
       promises.push(
         this.translateText(lang, value)
-          .then(function (translatedText) {
-            node.text = meta_1.prefix + translatedText + meta_1.suffix;
+          .then((translatedText) => {
+            node.text = meta.prefix + translatedText + meta.suffix;
           })
-          .catch(function (err) {
-            node.text = text_1;
-            if (!_this.surpressErrors) {
+          .catch((err) => {
+            node.text = text;
+            if (!this.surpressErrors) {
               throw err; // TODO: Find out if surpressing is better
             }
           }),
@@ -305,131 +136,95 @@ var ZTranslateService = /** @class */ (function () {
       return;
     }
     // const hasChildren = node.childNodes !== undefined
-    for (var _i = 0, _a = node.childNodes || []; _i < _a.length; _i++) {
-      var child = _a[_i];
+    for (const child of node.childNodes || []) {
       this.translateHtmlRec(lang, child, promises, skipTranslate);
     }
-  };
-  ZTranslateService.prototype.update = function (key, lang, data) {
-    return __awaiter(this, void 0, void 0, function () {
-      return __generator(this, function (_a) {
-        switch (_a.label) {
-          case 0:
-            return [
-              4 /*yield*/,
-              sql.query(
-                '\n      INSERT INTO translations\n        (`key`, `lang`, `value`)\n      VALUES\n        (?, ?, ?)\n      ON DUPLICATE KEY UPDATE value=?\n    ',
-                [key, lang, data.value, data.value],
-              ),
-            ];
-          case 1:
-            return [2 /*return*/, _a.sent()];
-        }
-      });
-    });
-  };
-  ZTranslateService.prototype.checkLocalCache = function (key, lang) {
-    var hasLocal = !this.localCache[lang].hasOwnProperty(key);
+  }
+  async update(key, lang, data) {
+    return await this.sql.query(
+      `
+      INSERT INTO translations
+        (\`key\`, \`lang\`, \`value\`)
+      VALUES
+        (?, ?, ?)
+      ON DUPLICATE KEY UPDATE value=?
+    `,
+      [key, lang, data.value, data.value],
+    );
+  }
+  checkLocalCache(key, lang) {
+    const hasLocal = !this.localCache[lang].hasOwnProperty(key);
     return hasLocal ? false : this.localCache[lang][key];
-  };
-  ZTranslateService.prototype.insertLocalCache = function (key, lang, data) {
+  }
+  insertLocalCache(key, lang, data) {
     if (this.localCache[lang].hasOwnProperty(key)) {
       // console.warn(`Translations already cached!`, { key, lang, data})
       return;
     }
     this.localCache[lang][key] = data;
-  };
-  ZTranslateService.prototype.clearLocalCache = function () {
-    var _this = this;
-    Object.keys(this.localCache).map(function (k) {
-      _this.localCache[k] = {};
-    });
-  };
-  ZTranslateService.prototype.fetch = function (key, lang) {
-    return __awaiter(this, void 0, void 0, function () {
-      var results, value;
-      return __generator(this, function (_a) {
-        switch (_a.label) {
-          case 0:
-            return [4 /*yield*/, sql.query('SELECT `value` FROM translations WHERE `lang`=? AND `key`=?', [lang, key])];
-          case 1:
-            results = _a.sent();
-            if (results.length > 0) {
-              value = results[0].value;
-              this.insertLocalCache(key, lang, { value: value });
-              return [2 /*return*/, { value: value }];
-            }
-            return [2 /*return*/, false];
-        }
-      });
-    });
-  };
-  ZTranslateService.prototype.insert = function (key, lang, data) {
-    return __awaiter(this, void 0, void 0, function () {
-      return __generator(this, function (_a) {
-        switch (_a.label) {
-          case 0:
-            return [
-              4 /*yield*/,
-              sql.query('INSERT IGNORE INTO translations (`key`, `lang`, `value`) VALUES (?, ?, ?)', [
-                key,
-                lang,
-                data.value,
-              ]),
-            ];
-          case 1:
-            _a.sent();
-            return [2 /*return*/];
-        }
-      });
+  }
+  clearLocalCache() {
+    Object.keys(this.localCache).map((k) => {
+      this.localCache[k] = {};
     });
-  };
-  ZTranslateService.prototype.fetchLang = function (lang) {
-    return sql.query('SELECT `key`, `lang`, `value`, `verified`, `created_at` FROM translations WHERE `lang`=?', [
+  }
+  async fetch(key, lang) {
+    const results = await this.sql.query(`SELECT \`value\` FROM translations WHERE \`lang\`=? AND \`key\`=?`, [
       lang,
+      key,
     ]);
-  };
-  ZTranslateService.prototype.fetchAllGrouped = function () {
-    return __awaiter(this, void 0, void 0, function () {
-      var output, allTranslations;
-      return __generator(this, function (_a) {
-        switch (_a.label) {
-          case 0:
-            output = {};
-            return [4 /*yield*/, this.fetchAll()];
-          case 1:
-            allTranslations = _a.sent();
-            allTranslations.map(function (translation) {
-              var key = translation.key;
-              if (!output.hasOwnProperty(key)) {
-                output[key] = [];
-              }
-              output[key].push(translation);
-            });
-            return [2 /*return*/, output];
-        }
-      });
+    if (results.length > 0) {
+      // api.query(`UPDATE translations SET last_used=CURRENT_TIMESTAMP WHERE \`lang\`=? AND \`key\`=?`, [lang, key])
+      //   .catch(err => console.error(err))
+      const { value } = results[0];
+      this.insertLocalCache(key, lang, { value });
+      return { value };
+    }
+    return false;
+  }
+  async insert(key, lang, data) {
+    await this.sql.query(`INSERT IGNORE INTO translations (\`key\`, \`lang\`, \`value\`) VALUES (?, ?, ?)`, [
+      key,
+      lang,
+      data.value,
+    ]);
+  }
+  fetchLang(lang) {
+    return this.sql.query(
+      `SELECT \`key\`, \`lang\`, \`value\`, \`verified\`, \`created_at\` FROM translations WHERE \`lang\`=?`,
+      [lang],
+    );
+  }
+  async fetchAllGrouped() {
+    const output = {};
+    const allTranslations = await this.fetchAll();
+    allTranslations.map((translation) => {
+      const { key } = translation;
+      if (!output.hasOwnProperty(key)) {
+        output[key] = [];
+      }
+      output[key].push(translation);
     });
-  };
-  ZTranslateService.prototype.fetchAll = function () {
-    return sql.query('SELECT `key`, `lang`, `value`, `verified`, `created_at` FROM translations');
-  };
-  ZTranslateService.get = function () {
+    return output;
+  }
+  fetchAll() {
+    return this.sql.query(`SELECT \`key\`, \`lang\`, \`value\`, \`verified\`, \`created_at\` FROM translations`);
+  }
+  static get(sqlService) {
     if (instance == null) {
-      instance = new ZTranslateService();
+      instance = new ZTranslateService(sqlService);
     }
     return instance;
-  };
-  return ZTranslateService;
-})();
+  }
+}
 exports.ZTranslateService = ZTranslateService;
 function strContainsLetters(text) {
-  var regExp = /[a-zA-Z]/g;
+  const regExp = /[a-zA-Z]/g;
   return regExp.test(text);
 }
 function genSpaces(length) {
-  var output = '';
-  for (var i = 0; i < length; i++) {
+  let output = '';
+  for (let i = 0; i < length; i++) {
     output += ' ';
   }
   return output;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ztechno_core",
-  "version": "0.0.5",
+  "version": "0.0.7",
   "description": "Core files for ztechno framework",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -17,7 +17,8 @@
     "lint": "tslint -p tsconfig.json",
     "preversion": "npm run lint",
     "version": "npm run format && git add -A src",
-    "postversion": "git push && git push --tags"
+    "postversion": "git push && git push --tags",
+    "update": "npm run build && npm version patch && npm publish"
   },
   "keywords": [
     "ztechno",