tspace-mysql 1.1.2 → 1.1.4

package/dist/lib/tspace/ProxyHandler.js

@@ -35,7 +35,7 @@ var proxyHandler = {
             }
         }
         catch (e) {
-            throw new Error(e.message);
+            throw new Error(e === null || e === void 0 ? void 0 : e.message);
         }
     }
 };

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

@@ -1,6 +1,5 @@
-declare const _default: {
-    consoleDebug: (debug?: string | undefined) => void;
-    tableName: (name: string) => string;
+declare const utils: {
+    consoleDebug: (debug?: string) => void;
     faker: (value: string) => string | number | boolean;
     columnRelation: (name: string) => string;
     timestamp: () => string;
@@ -12,4 +11,5 @@ declare const _default: {
     snakeCase: (obj: any) => any;
     camelCase: (obj: any) => any;
 };
-export default _default;
+export { utils };
+export default utils;

package/dist/lib/utils/index.js

@@ -36,16 +36,26 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
     return to.concat(ar || Array.prototype.slice.call(from));
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.utils = void 0;
 var timestamp = function () {
     var d = new Date();
     var year = d.getFullYear();
-    var month = ("0" + (d.getMonth() + 1)).slice(-2);
-    var date = ("0" + d.getDate()).slice(-2);
-    var hours = ("0" + d.getHours()).slice(-2);
-    var minutes = ("0" + d.getMinutes()).slice(-2);
-    var seconds = ("0" + d.getSeconds()).slice(-2);
-    var now = "".concat(year, "-").concat(month, "-").concat(date, " ").concat(hours, ":").concat(minutes, ":").concat(seconds);
-    return now;
+    var month = "0".concat((d.getMonth() + 1)).slice(-2);
+    var date = "0".concat((d.getDate())).slice(-2);
+    var hours = "0".concat((d.getHours())).slice(-2);
+    var minutes = "0".concat((d.getMinutes())).slice(-2);
+    var seconds = "0".concat((d.getSeconds())).slice(-2);
+    var ymd = "".concat([
+        year,
+        month,
+        date
+    ].join('-'));
+    var his = "".concat([
+        hours,
+        minutes,
+        seconds
+    ].join(':'));
+    return "".concat(ymd, " ").concat(his);
 };
 var date = function () {
     var d = new Date();
@@ -60,7 +70,7 @@ var escape = function (str) {
         var check = str == null || str === true || str === false || Number.isInteger(str);
         if (check)
             return str;
-        var regx = /[`+#$&*=;'"\\|,\?~]/;
+        var regx = /[`+#$&*=;\\|,\?~]/;
         var res = str.split(regx).join("");
         var regxs = ['DROP TABLE', 'UPDATE ', 'DELETE FROM ', 'OR ', 'SELECT ', 'FROM ', 'WHERE '];
         for (var i in regxs) {
@@ -78,15 +88,15 @@ var escapeSubQuery = function (str) {
     var check = str == null || str === true || str === false || Number.isInteger(str);
     if (check)
         return str;
-    var regx = /[`+#$&;"\\|\?~]/;
-    var res = str.split(regx).join("");
+    var regx = /[`+#$&;\\|\?~]/;
+    var result = str.split(regx).join("");
     var regxs = ['DROP TABLE', 'UPDATE ', 'DELETE FROM ', 'TRUNCATE'];
     for (var i in regxs) {
-        if (res.includes(regxs[i])) {
-            res = res.split(regxs[i]).join("");
+        if (result.includes(regxs[i])) {
+            result = result.split(regxs[i]).join("");
         }
     }
-    return res;
+    return result;
 };
 var columnRelation = function (name) {
     var _a;
@@ -107,20 +117,6 @@ var generateUUID = function () {
         return (c === 'x' ? r : (r & 0x3 | 0x8)).toString(16);
     });
 };
-var tableName = function (name) {
-    var tb = name.replace(/([A-Z])/g, function (str) { return "_" + str.toLowerCase(); }).slice(1);
-    var lastString = tb.slice(-1);
-    var rule = ['s', 'ss', 'sh', 'ch', 'x', 'z'];
-    if (lastString === 'y') {
-        tb = tb.slice(0, -1) + 'ies';
-    }
-    else {
-        var checkRule = rule.indexOf(lastString) >= 0;
-        var word = checkRule ? 'es' : 's';
-        tb = tb + word;
-    }
-    return tb;
-};
 var covertBooleanToNumber = function (data) {
     if (Object.prototype.toString.apply(data).slice(8, -1) === 'Boolean')
         return +data;
@@ -175,7 +171,7 @@ var camelCase = function (obj) {
 var consoleDebug = function (debug) {
     if (debug == null)
         return;
-    console.log("SQL Statement: \u001B[33m".concat(debug, " \u001B[0m "));
+    console.log("\nSQL Statement: \u001B[33m".concat(debug, " \u001B[0m"));
 };
 var faker = function (value) {
     if (!value.search('timestamp'))
@@ -200,9 +196,8 @@ var faker = function (value) {
         return Buffer.from(Math.random().toString(36).substring(7)).toString('base64');
     return 'fake data';
 };
-exports.default = {
+var utils = {
     consoleDebug: consoleDebug,
-    tableName: tableName,
     faker: faker,
     columnRelation: columnRelation,
     timestamp: timestamp,
@@ -214,3 +209,5 @@ exports.default = {
     snakeCase: snakeCase,
     camelCase: camelCase
 };
+exports.utils = utils;
+exports.default = utils;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tspace-mysql",
-  "version": "1.1.2",
+  "version": "1.1.4",
   "description": "mysql query builder object relational mapping",
   "main": "dist/lib/index.js",
   "types": "dist/lib/index.d.ts",