tspace-mysql 1.1.2 → 1.1.3

package/dist/lib/tspace/ProxyHandler.js

@@ -1,41 +1,30 @@
 "use strict";
-var __assign = (this && this.__assign) || function () {
-    __assign = Object.assign || function(t) {
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
-            s = arguments[i];
-            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
-                t[p] = s[p];
-        }
-        return t;
-    };
-    return __assign.apply(this, arguments);
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.proxyHandler = void 0;
-var Logger_1 = require("./Logger");
-var proxyHandler = {
-    set: function (self, name, value) {
-        var _a;
-        var _b;
-        if ((_b = self.$setters) === null || _b === void 0 ? void 0 : _b.includes(name))
-            throw new Error("no allow to set this ".concat(name));
-        self.$attributes = __assign(__assign({}, self.$attributes), (_a = {}, _a[name] = value, _a));
+const Logger_1 = require("./Logger");
+const proxyHandler = {
+    set: (self, name, value) => {
+        if (self.$setters?.includes(name))
+            throw new Error(`no allow to set this ${name}`);
+        self.$attributes = {
+            ...self.$attributes,
+            [name]: value
+        };
         return true;
     },
-    get: function (self, prop, value) {
-        var _a, _b, _c, _d;
+    get: (self, prop, value) => {
         try {
             new Logger_1.Logger(self, prop);
             switch (prop) {
-                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["$".concat(prop)];
-                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');
+                case 'tableName': return self.$db?.get('TABLE_NAME')?.replace(/`/g, '');
+                case 'attributes': return self[`$${prop}`];
+                case 'logger': return self.$logger?.get();
+                case 'result': return self.$db?.get('RESULT');
                 default: return Reflect.get(self, prop, value);
             }
         }
         catch (e) {
-            throw new Error(e.message);
+            throw new Error(e?.message);
         }
     }
 };

package/dist/lib/tspace/Schema.js

@@ -1,123 +1,31 @@
 "use strict";
-var __extends = (this && this.__extends) || (function () {
-    var extendStatics = function (d, b) {
-        extendStatics = Object.setPrototypeOf ||
-            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
-            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
-        return extendStatics(d, b);
-    };
-    return function (d, b) {
-        if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
-        extendStatics(d, b);
-        function __() { this.constructor = d; }
-        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
-    };
-})();
-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());
-    });
-};
-var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [op[0] & 2, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-    }
-};
-var __read = (this && this.__read) || function (o, n) {
-    var m = typeof Symbol === "function" && o[Symbol.iterator];
-    if (!m) return o;
-    var i = m.call(o), r, ar = [], e;
-    try {
-        while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
-    }
-    catch (error) { e = { error: error }; }
-    finally {
+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 {
-            if (r && !r.done && (m = i["return"])) m.call(i);
+            let columns = [];
+            for (const key in schemas) {
+                const data = schemas[key];
+                const { type, attrbuites } = data;
+                columns = [
+                    ...columns,
+                    `${key} ${type} ${attrbuites?.join(' ')}`
+                ];
+            }
+            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`);
         }
-        finally { if (e) throw e.error; }
-    }
-    return ar;
-};
-var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
-    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
-        if (ar || !(i in from)) {
-            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
-            ar[i] = from[i];
+        catch (err) {
+            console.log(err.message?.replace("ER_TABLE_EXISTS_ERROR: ", ""));
         }
-    }
-    return to.concat(ar || Array.prototype.slice.call(from));
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Schema = void 0;
-var Database_1 = require("./Database");
-var Schema = /** @class */ (function (_super) {
-    __extends(Schema, _super);
-    function Schema() {
-        var _this = _super !== null && _super.apply(this, arguments) || this;
-        _this.table = function (table, schemas) { return __awaiter(_this, void 0, void 0, function () {
-            var columns, key, data, type, attrbuites, sql, err_1;
-            var _a;
-            return __generator(this, function (_b) {
-                switch (_b.label) {
-                    case 0:
-                        _b.trys.push([0, 2, , 3]);
-                        columns = [];
-                        for (key in schemas) {
-                            data = schemas[key];
-                            type = data.type, attrbuites = data.attrbuites;
-                            columns = __spreadArray(__spreadArray([], __read(columns), false), [
-                                "".concat(key, " ").concat(type, " ").concat(attrbuites === null || attrbuites === void 0 ? void 0 : attrbuites.join(' '))
-                            ], false);
-                        }
-                        sql = [
-                            "CREATE TABLE IF NOT EXISTS",
-                            "".concat(table, " (").concat(columns === null || columns === void 0 ? void 0 : columns.join(','), ")"),
-                            "ENGINE=INNODB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8"
-                        ].join(' ');
-                        return [4 /*yield*/, this.rawQuery(sql)];
-                    case 1:
-                        _b.sent();
-                        console.log("Migrats : '".concat(table, "' created successfully"));
-                        return [3 /*break*/, 3];
-                    case 2:
-                        err_1 = _b.sent();
-                        console.log((_a = err_1.message) === null || _a === void 0 ? void 0 : _a.replace("ER_TABLE_EXISTS_ERROR: ", ""));
-                        return [3 /*break*/, 3];
-                    case 3: return [2 /*return*/];
-                }
-            });
-        }); };
-        return _this;
-    }
-    return Schema;
-}(Database_1.Database));
+    };
+}
 exports.Schema = Schema;
 exports.default = Schema;

package/dist/lib/tspace/index.js

@@ -4,13 +4,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Blueprint = exports.Schema = exports.Model = exports.DB = void 0;
-var DB_1 = __importDefault(require("./DB"));
+const DB_1 = __importDefault(require("./DB"));
 exports.DB = DB_1.default;
-var Model_1 = __importDefault(require("./Model"));
+const Model_1 = __importDefault(require("./Model"));
 exports.Model = Model_1.default;
-var Schema_1 = __importDefault(require("./Schema"));
+const Schema_1 = __importDefault(require("./Schema"));
 exports.Schema = Schema_1.default;
-var Blueprint_1 = __importDefault(require("./Blueprint"));
+const Blueprint_1 = __importDefault(require("./Blueprint"));
 exports.Blueprint = Blueprint_1.default;
 exports.default = {
     DB: DB_1.default,

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

@@ -1,5 +1,5 @@
-declare const _default: {
-    consoleDebug: (debug?: string | undefined) => void;
+declare const utils: {
+    consoleDebug: (debug?: string) => void;
     tableName: (name: string) => string;
     faker: (value: string) => string | number | boolean;
     columnRelation: (name: string) => string;
@@ -12,4 +12,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

@@ -1,69 +1,43 @@
 "use strict";
-var __assign = (this && this.__assign) || function () {
-    __assign = Object.assign || function(t) {
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
-            s = arguments[i];
-            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
-                t[p] = s[p];
-        }
-        return t;
-    };
-    return __assign.apply(this, arguments);
-};
-var __read = (this && this.__read) || function (o, n) {
-    var m = typeof Symbol === "function" && o[Symbol.iterator];
-    if (!m) return o;
-    var i = m.call(o), r, ar = [], e;
-    try {
-        while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
-    }
-    catch (error) { e = { error: error }; }
-    finally {
-        try {
-            if (r && !r.done && (m = i["return"])) m.call(i);
-        }
-        finally { if (e) throw e.error; }
-    }
-    return ar;
-};
-var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
-    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
-        if (ar || !(i in from)) {
-            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
-            ar[i] = from[i];
-        }
-    }
-    return to.concat(ar || Array.prototype.slice.call(from));
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-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);
+exports.utils = void 0;
+const timestamp = () => {
+    const d = new Date();
+    const year = d.getFullYear();
+    const month = `0${(d.getMonth() + 1)}`.slice(-2);
+    const date = `0${(d.getDate())}`.slice(-2);
+    const hours = `0${(d.getHours())}`.slice(-2);
+    const minutes = `0${(d.getMinutes())}`.slice(-2);
+    const seconds = `0${(d.getSeconds())}`.slice(-2);
+    const ymd = `${[
+        year,
+        month,
+        date
+    ].join('-')}`;
+    const his = `${[
+        hours,
+        minutes,
+        seconds
+    ].join(':')}`;
+    return `${ymd} ${his}`;
+};
+const date = () => {
+    const d = new Date();
+    const year = d.getFullYear();
+    const month = ("0" + (d.getMonth() + 1)).slice(-2);
+    const date = ("0" + d.getDate()).slice(-2);
+    const now = `${year}-${month}-${date}`;
     return now;
 };
-var date = 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 now = "".concat(year, "-").concat(month, "-").concat(date);
-    return now;
-};
-var escape = function (str) {
+const escape = (str) => {
     try {
-        var check = str == null || str === true || str === false || Number.isInteger(str);
+        const check = str == null || str === true || str === false || Number.isInteger(str);
         if (check)
             return str;
-        var regx = /[`+#$&*=;'"\\|,\?~]/;
-        var res = str.split(regx).join("");
-        var regxs = ['DROP TABLE', 'UPDATE ', 'DELETE FROM ', 'OR ', 'SELECT ', 'FROM ', 'WHERE '];
-        for (var i in regxs) {
+        const regx = /[`+#$&*=;\\|,\?~]/;
+        let res = str.split(regx).join("");
+        const regxs = ['DROP TABLE', 'UPDATE ', 'DELETE FROM ', 'OR ', 'SELECT ', 'FROM ', 'WHERE '];
+        for (let i in regxs) {
             if (res.includes(regxs[i])) {
                 res = res.split(regxs[i]).join("");
             }
@@ -74,69 +48,68 @@ var escape = function (str) {
         return str;
     }
 };
-var escapeSubQuery = function (str) {
-    var check = str == null || str === true || str === false || Number.isInteger(str);
+const escapeSubQuery = (str) => {
+    const check = str == null || str === true || str === false || Number.isInteger(str);
     if (check)
         return str;
-    var regx = /[`+#$&;"\\|\?~]/;
-    var res = str.split(regx).join("");
-    var regxs = ['DROP TABLE', 'UPDATE ', 'DELETE FROM ', 'TRUNCATE'];
-    for (var i in regxs) {
+    const regx = /[`+#$&;\\|\?~]/;
+    let res = str.split(regx).join("");
+    const regxs = ['DROP TABLE', 'UPDATE ', 'DELETE FROM ', 'TRUNCATE'];
+    for (let i in regxs) {
         if (res.includes(regxs[i])) {
             res = res.split(regxs[i]).join("");
         }
     }
     return res;
 };
-var columnRelation = function (name) {
-    var _a;
-    var matches = (_a = name === null || name === void 0 ? void 0 : name.match(/[A-Z]/g)) !== null && _a !== void 0 ? _a : [];
+const columnRelation = (name) => {
+    const matches = name?.match(/[A-Z]/g) ?? [];
     if (matches.length > 1) {
-        matches.forEach(function (matche, i) {
+        matches.forEach((matche, i) => {
             if (i > 0)
-                name = name.replace(matche, "_".concat(matche.toUpperCase()));
+                name = name.replace(matche, `_${matche.toUpperCase()}`);
         });
     }
-    return "".concat(name.toLocaleLowerCase());
+    return `${name.toLocaleLowerCase()}`;
 };
-var generateUUID = function () {
-    var date = +new Date();
-    return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
-        var r = Math.random() * 16;
+const generateUUID = () => {
+    const date = +new Date();
+    return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, (c) => {
+        let r = Math.random() * 16;
         r = (date + r) % 16 | 0;
         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'];
+const tableName = (name) => {
+    let tb = name.replace(/([A-Z])/g, (str) => "_" + str.toLowerCase()).slice(1);
+    const lastString = tb.slice(-1);
+    const 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';
+        const checkRule = rule.indexOf(lastString) >= 0;
+        const word = checkRule ? 'es' : 's';
         tb = tb + word;
     }
     return tb;
 };
-var covertBooleanToNumber = function (data) {
+const covertBooleanToNumber = (data) => {
     if (Object.prototype.toString.apply(data).slice(8, -1) === 'Boolean')
         return +data;
     return data;
 };
-var snakeCase = function (obj) {
+const snakeCase = (obj) => {
     try {
         if (typeof (obj) !== "object")
             return obj;
-        Object.entries(obj).forEach(function (_a) {
-            var _b;
-            var _c = __read(_a, 2), oldName = _c[0], _ = _c[1];
-            var newName = oldName.replace(/([A-Z])/g, function (str) { return "_".concat(str.toLowerCase()); });
+        Object.entries(obj).forEach(([oldName, _]) => {
+            const newName = oldName.replace(/([A-Z])/g, (str) => `_${str.toLowerCase()}`);
             if (newName !== oldName) {
                 if (obj.hasOwnProperty(oldName)) {
-                    obj = __assign(__assign({}, obj), (_b = {}, _b[newName] = obj[oldName], _b));
+                    obj = { ...obj,
+                        [newName]: obj[oldName]
+                    };
                     delete obj[oldName];
                 }
             }
@@ -149,17 +122,17 @@ var snakeCase = function (obj) {
         return obj;
     }
 };
-var camelCase = function (obj) {
+const camelCase = (obj) => {
     try {
         if (typeof (obj) !== "object")
             return obj;
-        Object.entries(obj).forEach(function (_a) {
-            var _b;
-            var _c = __read(_a, 2), oldName = _c[0], _ = _c[1];
-            var newName = oldName.replace(/(.(\_|-|\s)+.)/g, function (str) { return str[0] + (str[str.length - 1].toUpperCase()); });
+        Object.entries(obj).forEach(([oldName, _]) => {
+            const newName = oldName.replace(/(.(\_|-|\s)+.)/g, (str) => str[0] + (str[str.length - 1].toUpperCase()));
             if (newName !== oldName) {
                 if (obj.hasOwnProperty(oldName)) {
-                    obj = __assign(__assign({}, obj), (_b = {}, _b[newName] = obj[oldName], _b));
+                    obj = { ...obj,
+                        [newName]: obj[oldName]
+                    };
                     delete obj[oldName];
                 }
             }
@@ -172,12 +145,12 @@ var camelCase = function (obj) {
         return obj;
     }
 };
-var consoleDebug = function (debug) {
+const consoleDebug = (debug) => {
     if (debug == null)
         return;
-    console.log("SQL Statement: \u001B[33m".concat(debug, " \u001B[0m "));
+    console.log(`\nSQL Statement: \x1b[33m${debug} \x1b[0m`);
 };
-var faker = function (value) {
+const faker = (value) => {
     if (!value.search('timestamp'))
         return timestamp();
     if (!value.search('datetime'))
@@ -189,7 +162,7 @@ var faker = function (value) {
     if (!value.search('boolean'))
         return [true, false][Math.round(Math.random())];
     if (!value.search('longtext'))
-        return __spreadArray([], __read(Array(50)), false).map(function () { return Math.random().toString(36).substring(7); }).join('');
+        return [...Array(50)].map(() => Math.random().toString(36).substring(7)).join('');
     if (!value.search('int'))
         return Math.floor(Math.random() * 1000);
     if (!value.search('float'))
@@ -200,17 +173,19 @@ var faker = function (value) {
         return Buffer.from(Math.random().toString(36).substring(7)).toString('base64');
     return 'fake data';
 };
-exports.default = {
-    consoleDebug: consoleDebug,
-    tableName: tableName,
-    faker: faker,
-    columnRelation: columnRelation,
-    timestamp: timestamp,
-    date: date,
-    escape: escape,
-    escapeSubQuery: escapeSubQuery,
-    generateUUID: generateUUID,
-    covertBooleanToNumber: covertBooleanToNumber,
-    snakeCase: snakeCase,
-    camelCase: camelCase
-};
+const utils = {
+    consoleDebug,
+    tableName,
+    faker,
+    columnRelation,
+    timestamp,
+    date,
+    escape,
+    escapeSubQuery,
+    generateUUID,
+    covertBooleanToNumber,
+    snakeCase,
+    camelCase
+};
+exports.utils = utils;
+exports.default = utils;

package/package.json

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