tspace-mysql 1.1.8 → 1.2.0

package/dist/lib/tspace/ProxyHandler.d.ts

@@ -1,6 +1,14 @@
 declare const proxyHandler: {
     set: (self: any, name: string, value: any) => boolean;
-    get: (self: any, prop: any, value: any) => any;
+    get: (self: {
+        [x: string]: any;
+        $db: {
+            get: (arg: string) => string;
+        };
+        $logger: {
+            get: () => any;
+        };
+    }, prop: string, value: unknown) => any;
 };
 export { proxyHandler };
 export default proxyHandler;

package/dist/lib/tspace/ProxyHandler.js

@@ -4,27 +4,26 @@ exports.proxyHandler = void 0;
 const Logger_1 = require("./Logger");
 const proxyHandler = {
     set: (self, name, value) => {
-        if (self.$setters?.includes(name))
+        var _a;
+        if ((_a = self.$setters) === null || _a === void 0 ? void 0 : _a.includes(name))
             throw new Error(`no allow to set this ${name}`);
-        self.$attributes = {
-            ...self.$attributes,
-            [name]: value
-        };
+        self.$attributes = Object.assign(Object.assign({}, self.$attributes), { [name]: value });
         return true;
     },
     get: (self, prop, value) => {
+        var _a, _b, _c, _d;
         try {
             new Logger_1.Logger(self, prop);
             switch (prop) {
-                case 'tableName': return self.$db?.get('TABLE_NAME')?.replace(/`/g, '');
+                case 'tableName': return (_b = (_a = self.$db) === null || _a === void 0 ? void 0 : _a.get('TABLE_NAME')) === null || _b === void 0 ? void 0 : _b.replace(/`/g, '');
                 case 'attributes': return self[`$${prop}`];
-                case 'logger': return self.$logger?.get();
-                case 'result': return self.$db?.get('RESULT');
+                case 'logger': return (_c = self.$logger) === null || _c === void 0 ? void 0 : _c.get();
+                case 'result': return (_d = self.$db) === null || _d === void 0 ? void 0 : _d.get('RESULT');
                 default: return Reflect.get(self, prop, value);
             }
         }
         catch (e) {
-            throw new Error(e?.message);
+            throw new Error(e === null || e === void 0 ? void 0 : e.message);
         }
     }
 };

package/dist/lib/tspace/Schema.js

@@ -1,31 +1,44 @@
 "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());
+    });
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Schema = void 0;
 const Database_1 = require("./Database");
 class Schema extends Database_1.Database {
-    table = async (table, schemas) => {
-        try {
-            let columns = [];
-            for (const key in schemas) {
-                const data = schemas[key];
-                const { type, attrbuites } = data;
-                columns = [
-                    ...columns,
-                    `${key} ${type} ${attrbuites?.join(' ')}`
-                ];
+    constructor() {
+        super(...arguments);
+        this.table = (table, schemas) => __awaiter(this, void 0, void 0, function* () {
+            var _a;
+            try {
+                let columns = [];
+                for (const key in schemas) {
+                    const data = schemas[key];
+                    const { type, attrbuites } = data;
+                    columns = [
+                        ...columns,
+                        `${key} ${type} ${attrbuites === null || attrbuites === void 0 ? void 0 : attrbuites.join(' ')}`
+                    ];
+                }
+                const sql = [
+                    `CREATE TABLE IF NOT EXISTS`,
+                    `${table} (${columns === null || columns === void 0 ? void 0 : columns.join(',')})`,
+                    `ENGINE=INNODB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8`
+                ].join(' ');
+                yield this.rawQuery(sql);
+                console.log(`Migrats : '${table}' created successfully`);
             }
-            const sql = [
-                `CREATE TABLE IF NOT EXISTS`,
-                `${table} (${columns?.join(',')})`,
-                `ENGINE=INNODB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8`
-            ].join(' ');
-            await this.rawQuery(sql);
-            console.log(`Migrats : '${table}' created successfully`);
-        }
-        catch (err) {
-            console.log(err.message?.replace("ER_TABLE_EXISTS_ERROR: ", ""));
-        }
-    };
+            catch (err) {
+                console.log((_a = err.message) === null || _a === void 0 ? void 0 : _a.replace(/ER_TABLE_EXISTS_ERROR:/g, ""));
+            }
+        });
+    }
 }
 exports.Schema = Schema;
 exports.default = Schema;

package/dist/lib/utils/index.d.ts

@@ -10,7 +10,6 @@ declare const utils: {
     covertBooleanToNumber: (data: any) => any;
     snakeCase: (obj: any) => any;
     camelCase: (obj: any) => any;
-    test: (testName: string, callback: Function) => Promise<void>;
 };
 export { utils };
 export default utils;

package/dist/lib/utils/index.js

@@ -34,16 +34,13 @@ const escape = (str) => {
         const check = str == null || str === true || str === false || Number.isInteger(str);
         if (check)
             return str;
-        const regx = /[+#$&*=;\\|,\?~]/;
-        let res = str.split(regx).join("");
-        const temp = str.split(regx).join("").toLocaleLowerCase();
         const regxs = ['DROP TABLE', 'UPDATE ', 'DELETE FROM ', 'OR', 'SELECT ', 'FROM ', 'WHERE ', 'OR'];
         for (let i in regxs) {
-            if (temp.includes(regxs[i].toLocaleLowerCase())) {
-                res = res.split(regxs[i]).join("");
+            if (str.includes(regxs[i].toLocaleLowerCase())) {
+                str = str.split(regxs[i]).join("");
             }
         }
-        return res;
+        return str;
     }
     catch (e) {
         return str;
@@ -53,25 +50,20 @@ const escapeSubQuery = (str) => {
     const check = str == null || str === true || str === false || Number.isInteger(str);
     if (check)
         return str;
-    const regx = /[+#$&;\\|\?~]/;
-    let result = str.split(regx).join("");
     const regxs = ['DROP TABLE', 'UPDATE ', 'DELETE FROM ', 'TRUNCATE'];
     for (let i in regxs) {
-        if (result.includes(regxs[i])) {
-            result = result.split(regxs[i]).join("");
+        if (str.includes(regxs[i])) {
+            str = str.split(regxs[i]).join("");
         }
     }
-    return result;
+    return str;
 };
 const columnRelation = (name) => {
-    const matches = name?.match(/[A-Z]/g) ?? [];
-    if (matches.length > 1) {
-        matches.forEach((matche, i) => {
-            if (i > 0)
-                name = name.replace(matche, `_${matche.toUpperCase()}`);
-        });
-    }
-    return `${name.toLocaleLowerCase()}`;
+    var _a;
+    const matches = (_a = name === null || name === void 0 ? void 0 : name.match(/[A-Z]/g)) !== null && _a !== void 0 ? _a : [];
+    if (matches.length < 1)
+        return `${name.toLocaleLowerCase()}`;
+    return name.replace(matches[0], `_${matches[0].toUpperCase()}`);
 };
 const generateUUID = () => {
     const date = +new Date();
@@ -94,9 +86,7 @@ const snakeCase = (obj) => {
             const newName = oldName.replace(/([A-Z])/g, (str) => `_${str.toLocaleLowerCase()}`);
             if (newName !== oldName) {
                 if (obj.hasOwnProperty(oldName)) {
-                    obj = { ...obj,
-                        [newName]: obj[oldName]
-                    };
+                    obj = Object.assign(Object.assign({}, obj), { [newName]: obj[oldName] });
                     delete obj[oldName];
                 }
             }
@@ -117,9 +107,7 @@ const camelCase = (obj) => {
             const newName = oldName.replace(/(.(\_|-|\s)+.)/g, (str) => str[0] + (str[str.length - 1].toUpperCase()));
             if (newName !== oldName) {
                 if (obj.hasOwnProperty(oldName)) {
-                    obj = { ...obj,
-                        [newName]: obj[oldName]
-                    };
+                    obj = Object.assign(Object.assign({}, obj), { [newName]: obj[oldName] });
                     delete obj[oldName];
                 }
             }
@@ -135,7 +123,7 @@ const camelCase = (obj) => {
 const consoleDebug = (debug) => {
     if (debug == null)
         return;
-    console.log(`\x1b[33m${debug}\x1b[0m`);
+    console.log(`-----\n\x1b[33m${debug.replace(/(\r\n|\n|\r|\t)/gm, "").trim()}\x1b[0m`);
 };
 const faker = (value) => {
     if (!value.search('timestamp'))
@@ -160,22 +148,6 @@ const faker = (value) => {
         return Buffer.from(Math.random().toString(36).substring(7)).toString('base64');
     return 'fake data';
 };
-const test = async (testName, callback) => {
-    const startTime = process.hrtime();
-    const diffTimeSs = (hrtime) => {
-        if (hrtime == null)
-            return;
-        const [start, end] = process.hrtime(hrtime);
-        return (start + (end / 1e9)).toFixed(4);
-    };
-    try {
-        await callback();
-        console.log(`Test : \x1b[34m ${testName} \x1b[0m ==> \x1b[32m PASSED \x1b[0m ${diffTimeSs(startTime)} s`);
-    }
-    catch (err) {
-        console.log(`Test : \x1b[34m ${testName} \x1b[0m ==> \x1b[31m FAILED \x1b[0m (${err.message}) , ${diffTimeSs(startTime)} s`);
-    }
-};
 const utils = {
     consoleDebug,
     faker,
@@ -187,8 +159,7 @@ const utils = {
     generateUUID,
     covertBooleanToNumber,
     snakeCase,
-    camelCase,
-    test
+    camelCase
 };
 exports.utils = utils;
 exports.default = utils;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tspace-mysql",
-  "version": "1.1.8",
+  "version": "1.2.0",
   "description": "mysql query builder object relational mapping",
   "main": "dist/lib/index.js",
   "types": "dist/lib/index.d.ts",
@@ -17,6 +17,7 @@
   "keywords": [
     "tspace-mysql",
     "tspace",
+    "mysql",
     "orm",
     "relations",
     "object relation model",
@@ -50,6 +51,7 @@
   "devDependencies": {
     "@types/mysql": "^2.15.19",
     "@types/node": "^17.0.29",
-    "@types/pluralize": "0.0.29"
+    "@types/pluralize": "0.0.29",
+    "tspace-mysql": "^1.1.8"
   }
 }

package/dist/lib/config/env.d.ts

@@ -1,4 +0,0 @@
-declare const _default: Readonly<{
-    [x: string]: string | number | boolean | null | undefined;
-}>;
-export default _default;