ztechno_core 0.0.60 → 0.0.62

package/lib/express.d.ts

@@ -1,6 +1 @@
-import * as express from 'express';
-export declare function middleware(): (
-  req: express.Request,
-  res: express.Response,
-  next: express.NextFunction,
-) => Promise<void>;
+export declare function middleware(): (req: Express.Request, res: Express.Response, next: any) => Promise<any>;

package/lib/express.js

@@ -6,7 +6,7 @@ function middleware() {
     if (req.cookies === undefined) {
       throw new Error(`Module 'cookie-parser' isn't initialized. Please use app.use(cookieParser())`);
     }
-    if (req.cookies?.session === undefined) {
+    if (req.cookies.session === undefined) {
       return next();
     }
     const auth = await userService.auth({ session: req.cookies?.session });

package/lib/index.d.ts

@@ -4,6 +4,7 @@ import { ZMailService } from './mail_service';
 import { ZSqlService } from './sql_service';
 import { ZTranslateService } from './translate_service';
 import { ZUserService } from './user_service';
+export { middleware } from './express';
 export { HashStruct } from './typings/crypto_types';
 export {
   MailOptions,
@@ -13,6 +14,6 @@ export {
   MailServiceOptions,
   MailResponse,
 } from './typings/mail_types';
-export { TranslateData, ZDom, ZNode, ZNodeText, dbTranslationRow } from './typings/translate_types';
+export { TranslateData, Dom as ZDom, Node as ZNode, ZNodeText, dbTranslationRow } from './typings/translate_types';
 export { ZRequiredUserColumns, ZUser, ZUserCredentials, ZUserSession } from './typings/user_types';
 export { ZCryptoService, ZMailService, ZSqlService, ZTranslateService, ZUserService, ZEngineBase };

package/lib/index.js

@@ -6,6 +6,7 @@ exports.ZEngineBase =
   exports.ZSqlService =
   exports.ZMailService =
   exports.ZCryptoService =
+  exports.middleware =
     void 0;
 const engine_base_1 = require('./engine_base');
 Object.defineProperty(exports, 'ZEngineBase', {
@@ -49,3 +50,10 @@ Object.defineProperty(exports, 'ZUserService', {
     return user_service_1.ZUserService;
   },
 });
+var express_1 = require('./express');
+Object.defineProperty(exports, 'middleware', {
+  enumerable: true,
+  get: function () {
+    return express_1.middleware;
+  },
+});

package/lib/translate_service.d.ts

@@ -1,4 +1,4 @@
-import { TranslateData, dbTranslationRow } from '.';
+import { TranslateData, dbTranslationRow } from './index';
 import { ATranslateLang, TranslateServiceOptions } from './typings/translate_types';
 export declare class ZTranslateService {
   private opt;
@@ -16,6 +16,7 @@ export declare class ZTranslateService {
     html: string,
     cookies: {
       lang: string;
+    } & {
       [key: string]: string;
     },
   ): Promise<string>;

package/lib/translate_service.js

@@ -1,9 +1,13 @@
 'use strict';
+var __importDefault =
+  (this && this.__importDefault) ||
+  function (mod) {
+    return mod && mod.__esModule ? mod : { default: mod };
+  };
 Object.defineProperty(exports, '__esModule', { value: true });
 exports.ZTranslateService = void 0;
-const DomParser = require('dom-parser');
-const translate = require('translate');
-const htmlParser = new DomParser();
+const dom_parser_1 = require('dom-parser');
+const translate_1 = __importDefault(require('translate'));
 class ZTranslateService {
   get sql() {
     return this.opt.sqlService;
@@ -37,7 +41,8 @@ class ZTranslateService {
       [`&#163`]: `£`,
       [`&#8482`]: `™`,
     };
-    translate.key = opt.googleApiKey;
+    translate_1.default.key = opt.googleApiKey;
+    this.surpressErrors = opt.surpressErrors ?? true;
     this.getLanguages().map((lang) => (this.localCache[lang.lang] = {}));
     setInterval(() => this.clearLocalCache(), 1000 * 60 * 60); // Every Hour
   }
@@ -80,7 +85,7 @@ class ZTranslateService {
     }
     let result;
     try {
-      result = await translate(text, {
+      result = await (0, translate_1.default)(text, {
         from: this.getSourceLang(),
         to: lang,
       });
@@ -93,7 +98,7 @@ class ZTranslateService {
   async translateHtml(html, cookies) {
     const lang = this.getLang(cookies);
     const srcLang = this.getSourceLang();
-    const dom = htmlParser.parseFromString(html);
+    const dom = (0, dom_parser_1.parseFromString)(html);
     const htmlNodes = dom.getElementsByTagName('html');
     const mainNodes = dom.getElementsByTagName('main');
     const isView = htmlNodes.length === 0;
@@ -108,6 +113,7 @@ class ZTranslateService {
     return output.startsWith(`<!DOCTYPE html>`) ? output : `<!DOCTYPE html>\r\n${output}`;
   }
   translateHtmlRec(lang, node, promises, skipTranslate = false) {
+    if (this.opt.verbose) this.opt.verbose(node.nodeName, node);
     if (node.getAttribute('notranslate') != null) {
       skipTranslate = true;
     }
@@ -130,6 +136,7 @@ class ZTranslateService {
           })
           .catch((err) => {
             node.text = text;
+            if (this.opt.log) this.opt.log(err, node);
             if (!this.surpressErrors) {
               throw err; // TODO: Find out if surpressing is better
             }

package/lib/typings/translate_types.d.ts

@@ -1,17 +1,17 @@
 import { ZSqlService } from '../sql_service';
-export type ZDom = {} & ZNode;
-export type ZNode = {
+export type Dom = {} & Node;
+export type Node = {
   getAttribute: (attr: string) => string;
-  getElementsByTagName: (tag: string) => ZNode[];
-  getElementsByClassName: (cls: string) => ZNode[];
-  getElementById: (id: string) => ZNode;
-  getElementsByName: (name: string) => ZNode[];
+  getElementsByTagName: (tag: string) => Node[];
+  getElementsByClassName: (cls: string) => Node[];
+  getElementById: (id: string) => Node;
+  getElementsByName: (name: string) => Node[];
   nodeType: string;
   nodeName: string;
-  childNodes: ZNode[];
-  firstChild: ZNode;
-  lastChild: ZNode;
-  parentNode: ZNode;
+  childNodes: Node[];
+  firstChild: Node;
+  lastChild: Node;
+  parentNode: Node;
   attributes: any[];
   innerHTML: string;
   outerHTML: string;
@@ -20,7 +20,7 @@ export type ZNode = {
 };
 export type ZNodeText = {
   text: string;
-} & ZNode;
+} & Node;
 export type TranslateData = {
   value: string;
   meta?: {
@@ -43,4 +43,7 @@ export type TranslateServiceOptions = {
   languages?: ATranslateLang[];
   defaultLang?: string;
   sourceLang?: string;
+  surpressErrors?: boolean;
+  log?: (data: any, context: any) => any;
+  verbose?: (data: any, context: any) => any;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ztechno_core",
-  "version": "0.0.60",
+  "version": "0.0.62",
   "description": "Core files for ztechno framework",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -39,8 +39,7 @@
   },
   "dependencies": {
     "@types/express": "^5.0.0",
-    "dom-parser": "^0.1.6",
-    "express": "^4.21.2",
+    "dom-parser": "^1.1.5",
     "mysql": "^2.18.1",
     "nodemailer": "^6.8.0",
     "translate": "^1.4.1"