tspace-mysql 1.5.0 → 1.5.2

package/build/cli/dump/db.js

@@ -16,7 +16,7 @@ exports.default = (cmd) => {
         }
     }
     if (sql == null || sql === '') {
-        console.log(`Example  tspace-mysql dump:db "table" --dir=app/table`);
+        console.log(`Example tspace-mysql dump:db "table" --dir=app/table`);
         process.exit(0);
     }
     if (!values) {
@@ -30,7 +30,8 @@ exports.default = (cmd) => {
             .finally(() => process.exit(0));
     }
     const directory = `${cwd}/${dir}/dump_${+new Date()}.sql`;
-    new lib_1.DB().loadEnv(env).backupToFile({
+    new lib_1.DB().loadEnv(env)
+        .backupToFile({
         filePath: directory,
         database: sql
     })

package/build/cli/generate/make.js

@@ -24,17 +24,17 @@ const formatSchema = (data) => {
 };
 exports.default = (cmd) => {
     const { dir, cwd, type, fs, decorator, env, npm } = cmd;
-    if (dir) {
-        try {
-            fs.accessSync(`${cwd}/${dir}`, fs.F_OK, {
-                recursive: true
-            });
-        }
-        catch (e) {
-            fs.mkdirSync(`${cwd}/${dir}`, {
-                recursive: true
-            });
-        }
+    if (dir == null)
+        throw new Error("Cannot find directory please specify the directory : '--dir=${directory}'");
+    try {
+        fs.accessSync(`${cwd}/${dir}`, fs.F_OK, {
+            recursive: true
+        });
+    }
+    catch (e) {
+        fs.mkdirSync(`${cwd}/${dir}`, {
+            recursive: true
+        });
     }
     if (decorator) {
         new lib_1.DB()
@@ -84,8 +84,8 @@ exports.default = (cmd) => {
                         str += `    ${s.schemaColumn} \n`;
                         str += `    ${s.publicColumn} ${isLast ? '' : '\n\n'}`;
                     }
-                    const data = (0, modelDecorator_1.default)(model, npm, str, table);
-                    fs.writeFile(`mock/${model}${'.ts'}`, data, (err) => {
+                    const data = (0, modelDecorator_1.default)(model, npm, str);
+                    fs.writeFile(`${cwd}/${dir}/${model}${type !== null && type !== void 0 ? type : '.ts'}`, data, (err) => {
                         if (err)
                             throw err;
                     });
@@ -94,7 +94,8 @@ exports.default = (cmd) => {
             }
             console.log('\nGenerate Models has completed');
         })
-            .catch(err => console.log(err));
+            .catch(err => console.log(err))
+            .finally(() => process.exit(0));
         return;
     }
     new lib_1.DB()
@@ -141,5 +142,6 @@ exports.default = (cmd) => {
         }
         console.log('\nGenerate Models has completed');
     })
-        .catch(err => console.log(err));
+        .catch(err => console.log(err))
+        .finally(() => process.exit(0));
 };

package/build/cli/generate/modelDecorator.d.ts

@@ -1,2 +1,2 @@
-declare const Model: (model: string, npm: string, schema: string, table: string) => string;
+declare const Model: (model: string, npm: string, schema: string) => string;
 export default Model;

package/build/cli/generate/modelDecorator.js

@@ -1,9 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const Model = (model, npm, schema, table) => {
-    return `import { Model , Blueprint , Column, Table } from '${npm}'
+const Model = (model, npm, schema) => {
+    return `import { Model , Blueprint , Column } from '${npm}'
 
-@Table('${table}')
 class ${model} extends Model {
 
 ${schema}

package/build/cli/index.js

@@ -3,13 +3,15 @@
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
-var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3;
+var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10;
 Object.defineProperty(exports, "__esModule", { value: true });
 const fs_1 = __importDefault(require("fs"));
 const make_1 = __importDefault(require("./models/make"));
 const make_2 = __importDefault(require("./tables/make"));
 const make_3 = __importDefault(require("./migrate/make"));
 const make_4 = __importDefault(require("./generate/make"));
+const make_5 = __importDefault(require("./migrations/make"));
+const make_db_1 = __importDefault(require("./migrations/make-db"));
 const query_1 = __importDefault(require("./query"));
 const db_1 = __importDefault(require("./dump/db"));
 const table_1 = __importDefault(require("./dump/table"));
@@ -22,7 +24,28 @@ const commands = {
     'generate:models': make_4.default,
     'gen:models': make_4.default,
     'dump:db': db_1.default,
-    'dump:table': table_1.default
+    'dump:table': table_1.default,
+    'migrations:models': make_5.default,
+    'migrations:db': make_db_1.default,
+    'help': () => {
+        console.log(`
+        \x1b[31m
+            tspace-mysql make:model User --m --dir=app/Models  
+            tspace-mysql make:migration users --dir=app/Models/Migrations
+            tspace-mysql migrate --dir=App/Models/Migrations --type=js
+            tspace-mysql query "SELECT * FROM users" --env=development
+            tspace-mysql generate:models --dir=app/Models --env=development
+            tspace-mysql generate:models --dir=app/Models --env=development --decorators
+            tspace-mysql dump:db "database" --dir=app/db --v --env=development
+            tspace-mysql dump:table "table" --dir=app/table --v --env=development
+            tspace-mysql migrations:models --dir=migrations --models=src/models --generate
+            tspace-mysql migrations:models --dir=migrations --models=src/models --push
+            tspace-mysql migrations:db --dir=migrations --generate
+            tspace-mysql migrations:db --dir=migrations --push
+        \x1b[0m
+    `);
+        console.log(`Read more https://www.npmjs.com/package/tspace-mysql`);
+    }
 };
 try {
     const name = (_c = (_b = (_a = process.argv.slice(2)) === null || _a === void 0 ? void 0 : _a.find(data => {
@@ -33,28 +56,34 @@ try {
     const dir = (_j = (_h = (_g = process.argv.slice(2)) === null || _g === void 0 ? void 0 : _g.find(data => {
         return data === null || data === void 0 ? void 0 : data.includes('--dir=');
     })) === null || _h === void 0 ? void 0 : _h.replace('--dir=', '/')) !== null && _j !== void 0 ? _j : null;
-    const db = (_m = (_l = (_k = process.argv.slice(2)) === null || _k === void 0 ? void 0 : _k.find(data => {
+    const models = (_m = (_l = (_k = process.argv.slice(2)) === null || _k === void 0 ? void 0 : _k.find(data => {
+        return data === null || data === void 0 ? void 0 : data.includes('--models=');
+    })) === null || _l === void 0 ? void 0 : _l.replace('--models=', '/')) !== null && _m !== void 0 ? _m : null;
+    const db = (_q = (_p = (_o = process.argv.slice(2)) === null || _o === void 0 ? void 0 : _o.find(data => {
         return data === null || data === void 0 ? void 0 : data.includes('--db=');
-    })) === null || _l === void 0 ? void 0 : _l.replace('--db=', '')) !== null && _m !== void 0 ? _m : null;
-    const table = (_q = (_p = (_o = process.argv.slice(2)) === null || _o === void 0 ? void 0 : _o.find(data => {
+    })) === null || _p === void 0 ? void 0 : _p.replace('--db=', '')) !== null && _q !== void 0 ? _q : null;
+    const table = (_t = (_s = (_r = process.argv.slice(2)) === null || _r === void 0 ? void 0 : _r.find(data => {
         return data === null || data === void 0 ? void 0 : data.includes('--table=');
-    })) === null || _p === void 0 ? void 0 : _p.replace('--table=', '')) !== null && _q !== void 0 ? _q : null;
-    let type = ((_t = (_s = (_r = process.argv.slice(2)) === null || _r === void 0 ? void 0 : _r.find(data => {
+    })) === null || _s === void 0 ? void 0 : _s.replace('--table=', '')) !== null && _t !== void 0 ? _t : null;
+    let type = ((_w = (_v = (_u = process.argv.slice(2)) === null || _u === void 0 ? void 0 : _u.find(data => {
         return data === null || data === void 0 ? void 0 : data.includes('--type=');
-    })) === null || _s === void 0 ? void 0 : _s.replace('--type=', '.')) !== null && _t !== void 0 ? _t : '.ts');
+    })) === null || _v === void 0 ? void 0 : _v.replace('--type=', '.')) !== null && _w !== void 0 ? _w : '.ts');
     type = ['.js', '.ts'].includes(type) ? type : '.ts';
-    const file = (_u = process.argv.slice(3)[0]) !== null && _u !== void 0 ? _u : '';
-    const env = (_x = (_w = (_v = process.argv.slice(2)) === null || _v === void 0 ? void 0 : _v.find(data => {
+    const file = (_x = process.argv.slice(3)[0]) !== null && _x !== void 0 ? _x : '';
+    const env = (_0 = (_z = (_y = process.argv.slice(2)) === null || _y === void 0 ? void 0 : _y.find(data => {
         return data === null || data === void 0 ? void 0 : data.includes('--env=');
-    })) === null || _w === void 0 ? void 0 : _w.replace('--env=', '')) !== null && _x !== void 0 ? _x : null;
-    const values = (_0 = (((_y = process.argv.slice(2)) === null || _y === void 0 ? void 0 : _y.includes('--values')) || ((_z = process.argv.slice(2)) === null || _z === void 0 ? void 0 : _z.includes('--v')))) !== null && _0 !== void 0 ? _0 : false;
-    const decorator = (_3 = (((_1 = process.argv.slice(2)) === null || _1 === void 0 ? void 0 : _1.includes('--decorator')) || ((_2 = process.argv.slice(2)) === null || _2 === void 0 ? void 0 : _2.includes('--decorators')))) !== null && _3 !== void 0 ? _3 : false;
+    })) === null || _z === void 0 ? void 0 : _z.replace('--env=', '')) !== null && _0 !== void 0 ? _0 : null;
+    const values = (_3 = (((_1 = process.argv.slice(2)) === null || _1 === void 0 ? void 0 : _1.includes('--values')) || ((_2 = process.argv.slice(2)) === null || _2 === void 0 ? void 0 : _2.includes('--v')))) !== null && _3 !== void 0 ? _3 : false;
+    const decorator = (_6 = (((_4 = process.argv.slice(2)) === null || _4 === void 0 ? void 0 : _4.includes('--decorator')) || ((_5 = process.argv.slice(2)) === null || _5 === void 0 ? void 0 : _5.includes('--decorators')))) !== null && _6 !== void 0 ? _6 : false;
+    const push = (_8 = (_7 = process.argv.slice(2)) === null || _7 === void 0 ? void 0 : _7.includes('--push')) !== null && _8 !== void 0 ? _8 : false;
+    const generate = (_10 = (_9 = process.argv.slice(2)) === null || _9 === void 0 ? void 0 : _9.includes('--generate')) !== null && _10 !== void 0 ? _10 : false;
     if (env != null)
         process.env.NODE_ENV = env;
     const cmd = {
         name,
         file,
         dir,
+        models,
         migrate,
         type,
         cwd: process.cwd(),
@@ -65,23 +94,12 @@ try {
         values,
         decorator,
         env,
+        push,
+        generate,
         npm: 'tspace-mysql'
     };
     commands[process.argv[2]](cmd);
 }
 catch (err) {
-    console.log(`
-        \x1b[31m
-            tspace-mysql make:model User --m --dir=app/Models  
-            tspace-mysql make:migration users --dir=app/Models/Migrations
-            tspace-mysql migrate --dir=App/Models/Migrations --type=js
-            tspace-mysql query "SELECT * FROM users" --env=development
-            tspace-mysql generate:models --dir=app/Models --env=development
-            tspace-mysql generate:models --dir=app/Models --env=development --decorators
-            tspace-mysql dump:db "database" --dir=app/db --v --env=development
-            tspace-mysql dump:table "table" --dir=app/table --v --env=development
-        \x1b[0m
-    `);
-    console.log(`Read more https://www.npmjs.com/package/tspace-mysql`);
-    process.exit(0);
+    console.log("The input command failed. Please try again using 'tspace-mysql help'");
 }

package/build/cli/migrate/make.d.ts

@@ -1,4 +1,4 @@
-declare const _default: (commandInput: {
+declare const _default: (cmd: {
     [x: string]: any;
 }) => void;
 export default _default;

package/build/cli/migrate/make.js

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const child_process_1 = require("child_process");
-exports.default = (commandInput) => {
+exports.default = (cmd) => {
     var _a, _b, _c;
-    const { type, dir, cwd, fs } = commandInput;
+    const { type, dir, cwd, fs } = cmd;
     try {
         if (dir == null)
             throw new Error('Not found directory');

package/build/cli/migrations/make-db.d.ts

@@ -0,0 +1,4 @@
+declare const _default: (cmd: {
+    [x: string]: any;
+}) => never;
+export default _default;

package/build/cli/migrations/make-db.js

@@ -0,0 +1,58 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const lib_1 = require("../../lib");
+exports.default = (cmd) => {
+    const { dir, cwd, fs, env, sql, push, generate } = cmd;
+    if (dir) {
+        try {
+            fs.accessSync(`${cwd}/${dir}`, fs.F_OK, {
+                recursive: true
+            });
+        }
+        catch (e) {
+            fs.mkdirSync(`${cwd}/${dir}`, {
+                recursive: true
+            });
+        }
+    }
+    if (push) {
+        const filePath = `${cwd}/${dir}/migrations.sql`;
+        const sqlString = fs.readFileSync(filePath, 'utf8');
+        const sqlStatements = sqlString.split(';');
+        for (const sql of sqlStatements) {
+            if (sql.trim() === '')
+                continue;
+            const createTableStatements = sql
+                .split(';')
+                .filter((statement) => statement.trim().startsWith('CREATE TABLE IF NOT EXISTS'));
+            const table = createTableStatements.map((statement) => {
+                const tableNameMatch = statement.match(/`([^`]+)`/);
+                return tableNameMatch && tableNameMatch[1];
+            })[0];
+            new lib_1.DB()
+                .loadEnv(env)
+                .rawQuery(`${sql}`)
+                .then(_ => console.log(table == null
+                ? `The query '${sql}' has been successfully`
+                : `The table '${table}' has been successfully`))
+                .catch(e => console.log(`Failed to push changes errors: '${e.message}'`));
+        }
+        return process.exit(0);
+    }
+    if (sql == null || sql === '') {
+        return process.exit(0);
+    }
+    if (generate) {
+        const directory = `${cwd}/${dir}/migrations.sql`;
+        new lib_1.DB()
+            .loadEnv(env)
+            .backupToFile({
+            filePath: directory,
+            database: sql
+        })
+            .then(_ => console.log(`Migrations are migrating successfully`))
+            .catch(e => console.log(`Failed to migrate errors: '${e.message}'`))
+            .finally(() => process.exit(0));
+    }
+    throw new Error("Do you want to generate or push changes ? use '--generate' or '--push");
+};

package/build/cli/migrations/make.d.ts

@@ -0,0 +1,2 @@
+declare const _default: (cmd: Record<string, any>) => never;
+export default _default;

package/build/cli/migrations/make.js

@@ -0,0 +1,201 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+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 __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const lib_1 = require("../../lib");
+const child_process_1 = require("child_process");
+const sql_formatter_1 = require("sql-formatter");
+const path_1 = __importDefault(require("path"));
+exports.default = (cmd) => {
+    const { dir, cwd, fs, generate, push, models, env } = cmd;
+    if (models == null)
+        throw new Error("Cannot find directory to your models please specify the directory : '--models=src/app/models'");
+    if (dir == null)
+        throw new Error("Cannot find directory please specify the directory : '--dir=${directory}'");
+    try {
+        fs.accessSync(`${cwd}/${dir}`, fs.F_OK, {
+            recursive: true
+        });
+    }
+    catch (e) {
+        fs.mkdirSync(`${cwd}/${dir}`, {
+            recursive: true
+        });
+    }
+    const migrations = (pathFolders) => __awaiter(void 0, void 0, void 0, function* () {
+        const directories = fs.readdirSync(pathFolders, { withFileTypes: true });
+        const files = (yield Promise.all(directories.map((directory) => {
+            const newDir = path_1.default.resolve(String(pathFolders), directory.name);
+            if (directory.isDirectory() && directory.name.toLocaleLowerCase().includes('migrations'))
+                return null;
+            return directory.isDirectory() ? lib_1.Schema.sync(newDir) : newDir;
+        })));
+        let pathModels = [].concat(...files).filter(d => d != null || d === '');
+        yield new Promise(r => setTimeout(r, 3000));
+        const isFileTs = pathModels.some(pathModel => /\.ts$/.test(pathModel) && !(/\.d\.ts$/.test(pathModel)));
+        const outDirForBuildTs = '__tmp-migrations-ts__';
+        if (isFileTs) {
+            for (const pathModel of pathModels) {
+                const command = `tsc "${pathModel}" --outDir ${outDirForBuildTs} --target es6 --esModuleInterop --module commonjs --allowJs`;
+                try {
+                    (0, child_process_1.execSync)(command, { stdio: 'inherit' });
+                }
+                catch (error) { }
+            }
+            const directories = fs.readdirSync(outDirForBuildTs, { withFileTypes: true });
+            const files = (yield Promise.all(directories.map((directory) => {
+                const newDir = path_1.default.resolve(String(outDirForBuildTs), directory.name);
+                if (directory.isDirectory() && directory.name.toLocaleLowerCase().includes('migrations'))
+                    return null;
+                return directory.isDirectory() ? lib_1.Schema.sync(newDir) : newDir;
+            })));
+            pathModels = [].concat(...files).filter(d => d != null || d === '');
+        }
+        const models = yield Promise.all(pathModels.map((pathModel) => _import(pathModel)).filter(d => d != null));
+        if (isFileTs) {
+            const removeFolderRecursive = (folderPath) => {
+                if (fs.existsSync(folderPath)) {
+                    fs.readdirSync(folderPath).forEach((file) => {
+                        const curPath = path_1.default.join(folderPath, file);
+                        if (fs.lstatSync(curPath).isDirectory())
+                            removeFolderRecursive(curPath);
+                        fs.unlinkSync(curPath);
+                    });
+                    fs.rmdirSync(folderPath);
+                }
+            };
+            removeFolderRecursive(outDirForBuildTs);
+        }
+        if (!models.length)
+            return;
+        const createTableQueries = [];
+        const foreignKeyQueries = [];
+        for (const model of models) {
+            if (model == null)
+                continue;
+            const schemaModel = model.getSchemaModel();
+            if (!schemaModel)
+                continue;
+            const createTable = new lib_1.Schema().createTable(`\`${model.getTableName()}\``, schemaModel);
+            createTableQueries.push(createTable);
+            const foreignKey = _foreignKey({
+                schemaModel,
+                model
+            });
+            if (foreignKey == null)
+                continue;
+            foreignKeyQueries.push(foreignKey);
+        }
+        let sql = [
+            `${createTableQueries.map(c => {
+                return (0, sql_formatter_1.format)(c, {
+                    language: 'spark',
+                    tabWidth: 2,
+                    linesBetweenQueries: 1,
+                }) + ";";
+            }).join('\n\n')}\n`,
+            `${foreignKeyQueries.map(f => `${f};`).join('\n')}`,
+        ];
+        fs.writeFileSync(`${cwd}/${dir}/migrations.sql`, sql.join('\n'));
+        return;
+    });
+    const _import = (pathModel) => __awaiter(void 0, void 0, void 0, function* () {
+        try {
+            const loadModel = yield Promise.resolve(`${pathModel}`).then(s => __importStar(require(s)));
+            const model = new loadModel.default();
+            return model;
+        }
+        catch (err) {
+            console.log(`Check your 'Model' from path : '${pathModel}' is not instance of Model`);
+            return null;
+        }
+    });
+    const _foreignKey = ({ schemaModel, model }) => {
+        var _a;
+        for (const key in schemaModel) {
+            if (((_a = schemaModel[key]) === null || _a === void 0 ? void 0 : _a.foreignKey) == null)
+                continue;
+            const foreign = schemaModel[key].foreignKey;
+            if (foreign.on == null)
+                continue;
+            const onReference = typeof foreign.on === "string" ? foreign.on : new foreign.on;
+            const table = typeof onReference === "string" ? onReference : onReference.getTableName();
+            const constraintName = `\`${model.getTableName()}(${key})_${table}(${foreign.references})\``;
+            const sql = [
+                "ALTER TABLE",
+                `\`${model.getTableName()}\``,
+                'ADD CONSTRAINT',
+                `${constraintName}`,
+                `FOREIGN KEY(\`${key}\`)`,
+                `REFERENCES \`${table}\`(\`${foreign.references}\`)`,
+                `ON DELETE ${foreign.onDelete} ON UPDATE ${foreign.onUpdate}`
+            ].join(' ');
+            return sql;
+        }
+    };
+    if (push) {
+        const filePath = `${cwd}/${dir}/migrations.sql`;
+        const sqlString = fs.readFileSync(filePath, 'utf8');
+        const sqlStatements = sqlString.split(';');
+        for (const sql of sqlStatements) {
+            if (sql.trim() === '')
+                continue;
+            const createTableStatements = sql
+                .split(';')
+                .filter((statement) => statement.trim().startsWith('CREATE TABLE IF NOT EXISTS'));
+            const table = createTableStatements.map((statement) => {
+                const tableNameMatch = statement.match(/`([^`]+)`/);
+                return tableNameMatch && tableNameMatch[1];
+            })[0];
+            new lib_1.DB()
+                .loadEnv(env)
+                .rawQuery(`${sql}`)
+                .then(_ => console.log(table == null
+                ? `The query '${sql}' has been successfully`
+                : `The table '${table}' has been successfully`))
+                .catch(e => console.log(`Failed to push changes errors: '${e.message}'`));
+        }
+        return process.exit(0);
+    }
+    if (generate) {
+        migrations(`${cwd}/${models}`)
+            .then(_ => console.log(`Migrations are migrating successfully`))
+            .catch(e => console.log(`Failed to migrate errors: '${e.message}'`))
+            .finally(() => process.exit(0));
+        return process.exit(0);
+    }
+    throw new Error("Do you want to generate or push changes ? use '--generate' or '--push");
+};

package/build/lib/Interface.d.ts

@@ -1,6 +1,6 @@
-import Model from "./tspace/Model";
-export interface Relation {
-    name: string;
+import Model from "./core/Model";
+export interface Relation<K = any> {
+    name: K extends void ? never : K;
     model: new () => Model;
     as?: string | undefined;
     localKey?: string | undefined;
@@ -16,8 +16,8 @@ export interface Relation {
     oldVersion?: boolean | undefined;
     modelPivot?: new () => Model | undefined;
 }
-export interface RelationQuery {
-    name?: string;
+export interface RelationQuery<K = any> {
+    name?: K extends void ? never : K;
     model: new () => Model;
     as?: string | undefined;
     localKey?: string | undefined;
@@ -99,12 +99,14 @@ export interface PoolCallback {
     release: () => void;
 }
 export interface ConnectionTransaction {
+    on: (event: PoolEvent, data: any) => void;
     query: (sql: string) => Promise<any>;
     startTransaction: () => Promise<any>;
     commit: () => Promise<any>;
     rollback: () => Promise<any>;
 }
 export interface Connection {
+    on: (event: PoolEvent, data: any) => void;
     query: (sql: string) => Promise<any>;
     connection: () => Promise<ConnectionTransaction>;
 }
@@ -157,8 +159,25 @@ export type ValidateSchemaDecorator = NumberConstructor | StringConstructor | Da
     json?: boolean;
     fn?: Function;
 };
+export type NonEmptyArray<T> = [T, ...T[]];
 export interface GlobalSetting {
     softDelete?: boolean;
     uuid?: boolean;
     timestamp?: boolean;
+    logger?: boolean;
 }
+export interface Operator {
+    equals: string;
+    notEquals: string;
+    greaterThan: string;
+    lessThan: string;
+    greaterThanOrEqual: string;
+    lessThanOrEqual: string;
+    like: string;
+    notLike: string;
+    in: string;
+    notIn: string;
+    isNull: string;
+    isNotNull: string;
+}
+export type PoolEvent = 'CONNECTION' | 'RELEASE' | 'QUERY' | 'SLOW_QUERY' | 'SELECT' | 'INSERT' | 'UPDATE' | 'DELETE';

package/build/lib/connection/index.d.ts

@@ -1,6 +1,8 @@
+/// <reference types="node" />
+import { EventEmitter } from 'events';
 import { loadOptionsEnvironment } from './options';
 import { Connection, Options } from '../Interface';
-export declare class PoolConnection {
+export declare class PoolConnection extends EventEmitter {
     private OPTIONS;
     /**
      *
@@ -15,6 +17,8 @@ export declare class PoolConnection {
      * @property {Function} Connection.connection
      */
     connection(): Connection;
+    private _detectEventQuery;
+    private _detectQueryType;
     private _defaultOptions;
     private _loadOptions;
     private _convertStringToObject;