ztechno_core 0.0.49 → 0.0.51

package/lib/mail_service.d.ts

@@ -1,6 +1,7 @@
+import SMTPTransport from 'nodemailer/lib/smtp-transport';
 import { MailOptionsHtml, MailOptionsText, MailServiceOptions } from './typings/mail_types';
 export declare class ZMailService {
   private opt;
   constructor(opt: MailServiceOptions);
-  send(mailOpts: MailOptionsText | MailOptionsHtml): Promise<any>;
+  send(mailOpts: MailOptionsText | MailOptionsHtml): Promise<SMTPTransport.SentMessageInfo>;
 }

package/lib/mail_service.js

@@ -1,13 +1,18 @@
 'use strict';
+var __importDefault =
+  (this && this.__importDefault) ||
+  function (mod) {
+    return mod && mod.__esModule ? mod : { default: mod };
+  };
 Object.defineProperty(exports, '__esModule', { value: true });
 exports.ZMailService = void 0;
-const nodemailer = require('nodemailer');
+const nodemailer_1 = __importDefault(require('nodemailer'));
 class ZMailService {
   constructor(opt) {
     this.opt = opt;
   }
   send(mailOpts) {
-    const mailTransporter = nodemailer.createTransport({
+    const mailTransporter = nodemailer_1.default.createTransport({
       service: 'gmail',
       auth: this.opt.auth,
     });
@@ -17,6 +22,8 @@ class ZMailService {
       subject: mailOpts.subject,
       text: mailOpts.body || undefined,
       html: mailOpts.html || undefined,
+      dkim: mailOpts.dkim,
+      priority: mailOpts.priority,
     };
     return new Promise((resolve, reject) => {
       mailTransporter.sendMail(mailDetails, function (err, data) {

package/lib/sql_service.d.ts

@@ -2,16 +2,40 @@ import * as mysql from 'mysql';
 type ZOnErrorCallback = (err: mysql.MysqlError) => any;
 type ZOnLogCallback = (log: string) => any;
 export declare class ZSqlService {
+  private options;
   private pool;
   private defaultPoolconfig;
   private listeners;
   private databaseName;
   get database(): string;
-  constructor(options: mysql.PoolConfig);
+  constructor(
+    options: mysql.PoolConfig & {
+      dateStringTimezone?: string;
+    },
+  );
   on(eventName: 'err', listener: ZOnErrorCallback): void;
   on(eventName: 'log', listener: ZOnLogCallback): void;
   private triggerEvent;
   private getPoolConnection;
+  exec(opt: {
+    query: string;
+    params?:
+      | any[]
+      | {
+          [key: string]: any;
+        };
+  }): Promise<{
+    insertId: number;
+    affectedRows: number;
+  }>;
+  exec<T = any>(opt: {
+    query: string;
+    params?:
+      | any[]
+      | {
+          [key: string]: any;
+        };
+  }): Promise<T>;
   query(
     sql: string,
     params?:
@@ -30,7 +54,8 @@ export declare class ZSqlService {
       | {
           [key: string]: any;
         },
-  ): Promise<T>;
+  ): Promise<T[]>;
   private formatQueryParams;
+  private isSqlDate;
 }
 export {};

package/lib/sql_service.js

@@ -47,6 +47,7 @@ class ZSqlService {
     return this.databaseName;
   }
   constructor(options) {
+    this.options = options;
     this.defaultPoolconfig = {
       connectionLimit: 10,
       timeout: 20000,
@@ -82,6 +83,23 @@ class ZSqlService {
       this.pool.getConnection((err, con) => (err ? reject(err) : resolve(con)));
     });
   }
+  async exec(opt) {
+    const rows = await this.query(opt.query, opt.params);
+    if (!Array.isArray(rows)) {
+      return rows;
+    }
+    if (!this.options.dateStringTimezone) {
+      return rows;
+    }
+    return rows.map((row) => {
+      Object.keys(row).map((key) => {
+        if (this.isSqlDate(row[key])) {
+          row[key] = new Date(row[key] + this.options.dateStringTimezone);
+        }
+      });
+      return row;
+    });
+  }
   async query(sql, params) {
     try {
       const con = await this.getPoolConnection();
@@ -112,5 +130,19 @@ class ZSqlService {
       return values.hasOwnProperty(key) ? con.escape(values[key]) : txt;
     });
   }
+  isSqlDate(str) {
+    if (
+      str &&
+      typeof str === 'string' &&
+      str[4] === '-' &&
+      str[7] === '-' &&
+      str[10] === ' ' &&
+      str[13] === ':' &&
+      str[16] === ':'
+    ) {
+      return true;
+    }
+    return false;
+  }
 }
 exports.ZSqlService = ZSqlService;

package/lib/translate_service.d.ts

@@ -1,20 +1,14 @@
-import { ZSqlService } from './sql_service';
 import { TranslateData, dbTranslationRow } from '.';
+import { ATranslateLang, TranslateServiceOptions } from './typings/translate_types';
 export declare class ZTranslateService {
   private opt;
   private localCache;
   private get sql();
   surpressErrors: boolean;
-  getLanguages(): string[];
+  getLanguages(): ATranslateLang[];
   getSourceLang(): string;
   getDefaultLang(): string;
-  constructor(opt: {
-    sqlService: ZSqlService;
-    googleApiKey: string;
-    languages?: string[];
-    defaultLang?: string;
-    sourceLang?: string;
-  });
+  constructor(opt: TranslateServiceOptions);
   private codes;
   getLang(cookies: { [key: string]: string }): string;
   translateText(langOrReq: string | any, text: string): Promise<string>;

package/lib/translate_service.js

@@ -9,7 +9,12 @@ class ZTranslateService {
     return this.opt.sqlService;
   }
   getLanguages() {
-    return this.opt.languages || ['en', 'nl'];
+    return (
+      this.opt.languages || [
+        { lang: 'en', text: 'English' },
+        { lang: 'nl', text: 'Nederlands' },
+      ]
+    );
   }
   getSourceLang() {
     return this.opt.sourceLang || 'en';
@@ -33,17 +38,14 @@ class ZTranslateService {
       [`&#8482`]: `™`,
     };
     translate.key = opt.googleApiKey;
-    this.getLanguages().map((lang) => (this.localCache[lang] = {}));
+    this.getLanguages().map((lang) => (this.localCache[lang.lang] = {}));
     setInterval(() => this.clearLocalCache(), 1000 * 60 * 60); // Every Hour
   }
   getLang(cookies) {
     const defaultLang = this.getDefaultLang();
     const langKey = (cookies.lang || defaultLang).toLowerCase();
-    const langs = this.getLanguages();
-    if (!langs.includes(langKey)) {
-      return defaultLang;
-    }
-    return langKey;
+    const foundLang = this.getLanguages().find((l) => l.lang === langKey);
+    return foundLang === undefined ? defaultLang : foundLang.lang;
   }
   async translateText(langOrReq, text) {
     const lang = typeof langOrReq === 'string' ? langOrReq : this.getLang(langOrReq.cookies);

package/lib/typings/mail_types.d.ts

@@ -1,3 +1,4 @@
+import nodemailer from 'nodemailer';
 export type MailServiceOptions = {
   auth: {
     user: string;
@@ -9,7 +10,7 @@ export type MailOptionsBase = {
   recipient: string;
   subject: string;
   from?: string;
-};
+} & Pick<nodemailer.SendMailOptions, 'dkim' | 'priority'>;
 export type MailOptionsText = MailOptionsBase & {
   body: string;
 };

package/lib/typings/translate_types.d.ts

@@ -1,3 +1,4 @@
+import { ZSqlService } from '../sql_service';
 export type ZDom = {} & ZNode;
 export type ZNode = {
   getAttribute: (attr: string) => string;
@@ -32,3 +33,14 @@ export type dbTranslationRow = {
   key: string;
   value: string;
 };
+export type ATranslateLang = {
+  lang: string;
+  text: string;
+};
+export type TranslateServiceOptions = {
+  sqlService: ZSqlService;
+  googleApiKey: string;
+  languages?: ATranslateLang[];
+  defaultLang?: string;
+  sourceLang?: string;
+};

package/lib/user_service.d.ts

@@ -12,7 +12,7 @@ export declare class ZUserService {
   register({ email, pass, role, admin }: ZRequiredUserColumns): Promise<{
     session: string;
   }>;
-  fetch(opt?: { limit: number }): Promise<any[]>;
+  fetch(opt?: { limit: number }): Promise<any[][]>;
   exists(
     opt:
       | {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ztechno_core",
-  "version": "0.0.49",
+  "version": "0.0.51",
   "description": "Core files for ztechno framework",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -29,6 +29,7 @@
   "devDependencies": {
     "@types/jest": "^29.2.3",
     "@types/mysql": "^2.15.21",
+    "@types/nodemailer": "^6.4.14",
     "jest": "^29.3.1",
     "prettier": "^2.7.1",
     "ts-jest": "^29.0.3",