ztechno_core 0.0.9 → 0.0.11

package/lib/translate_service.d.ts

@@ -12,14 +12,20 @@ type dbTranslationRow = {
   value: string;
 };
 export declare class ZTranslateService {
-  private sql;
+  private opt;
   private localCache;
+  private get sql();
   surpressErrors: boolean;
   getLanguages(): string[];
   getSourceLang(): string;
   getDefaultLang(): string;
-  constructor(sql: ZSqlService);
-  static init(opt: { key: string }): void;
+  constructor(opt: {
+    sqlService: ZSqlService;
+    googleApiKey: string;
+    languages?: string[];
+    defaultLang?: string;
+    sourceLang?: string;
+  });
   private codes;
   getLang(cookies: { [key: string]: string }): string;
   translateText(langOrReq: string | any, text: string): Promise<string>;
@@ -42,6 +48,12 @@ export declare class ZTranslateService {
     [key: string]: dbTranslationRow[];
   }>;
   private fetchAll;
-  static get(sqlService: ZSqlService): ZTranslateService;
+  static get(opt: {
+    sqlService: ZSqlService;
+    googleApiKey: string;
+    languages?: string[];
+    defaultLang?: string;
+    sourceLang?: string;
+  }): ZTranslateService;
 }
 export {};

package/lib/translate_service.js

@@ -6,17 +6,20 @@ const translate = require('translate');
 const htmlParser = new DomParser();
 let instance = null;
 class ZTranslateService {
+  get sql() {
+    return this.opt.sqlService;
+  }
   getLanguages() {
-    return ['en', 'nl'];
+    return this.opt.languages || ['en', 'nl'];
   }
   getSourceLang() {
-    return 'nl';
+    return this.opt.defaultLang || 'en';
   }
   getDefaultLang() {
-    return 'nl';
+    return this.opt.defaultLang || 'en';
   }
-  constructor(sql) {
-    this.sql = sql;
+  constructor(opt) {
+    this.opt = opt;
     this.localCache = {};
     this.surpressErrors = true;
     this.codes = {
@@ -30,12 +33,10 @@ class ZTranslateService {
       [`&#163`]: `£`,
       [`&#8482`]: `™`,
     };
+    translate.key = opt.googleApiKey;
     this.getLanguages().map((lang) => (this.localCache[lang] = {}));
     setInterval(() => this.clearLocalCache(), 1000 * 60 * 60); // Every Hour
   }
-  static init(opt) {
-    translate.key = opt.key;
-  }
   getLang(cookies) {
     const defaultLang = this.getDefaultLang();
     const langKey = (cookies.lang || defaultLang).toLowerCase();
@@ -90,13 +91,13 @@ class ZTranslateService {
   }
   async translateHtml(html, cookies) {
     const lang = this.getLang(cookies);
-    const defaultLang = this.getDefaultLang();
+    const srcLang = this.getSourceLang();
     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) {
+    if (lang !== srcLang) {
       const node = isView ? domNode : domNode.getElementsByTagName('body')[0];
       const promises = [];
       this.translateHtmlRec(lang, node, promises);
@@ -210,9 +211,9 @@ class ZTranslateService {
   fetchAll() {
     return this.sql.query(`SELECT \`key\`, \`lang\`, \`value\`, \`verified\`, \`created_at\` FROM translations`);
   }
-  static get(sqlService) {
+  static get(opt) {
     if (instance == null) {
-      instance = new ZTranslateService(sqlService);
+      instance = new ZTranslateService(opt);
     }
     return instance;
   }

package/package.json

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