tspace-mysql 1.4.0 → 1.4.2

package/README.md

@@ -1001,9 +1001,9 @@ tspace-mysql query "SELECT * FROM users"
 # Dump
 Command will be dump database or table into file
 ```js
-tspace-mysql dump:db --db=database --values
+tspace-mysql dump:db "database" --values // backup with values in the tables
 
-tspace-mysql dump:table --table=table --values
+tspace-mysql dump:table "table" --values // backup with values in the table
 
 ```
 
@@ -1011,6 +1011,8 @@ tspace-mysql dump:table --table=table --values
 Command will be generate models from table in database
 ```js
 tspace-mysql generate:models --dir=<folder for creating>
+or 
+tspace-mysql gen:models --dir=<folder for creating>
 
 ```
 

package/dist/cli/dump/db.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const lib_1 = require("../../lib");
 exports.default = (cmd) => {
-    const { dir, cwd, fs, values, db } = cmd;
+    const { dir, cwd, fs, values, env, sql } = cmd;
     if (dir) {
         try {
             fs.accessSync(`${cwd}/${dir}`, fs.F_OK, {
@@ -15,24 +15,26 @@ exports.default = (cmd) => {
             });
         }
     }
-    if (values) {
-        const directory = `${cwd}/${dir}/dump-schema_${+new Date()}.sql`;
-        new lib_1.DB().backupSchemaToFile({
-            filePath: directory,
-            database: db
-        })
-            .then(r => console.log(`dump schema database "${db}" file successfully`))
-            .catch(err => console.log(err))
-            .finally(() => process.exit(0));
+    if (sql == null || sql === '') {
+        console.log(`Example  tspace-mysql dump:db "table" --dir=app/table`);
+        process.exit(0);
     }
-    else {
-        const directory = `${cwd}/${dir}/dump_${+new Date()}.sql`;
-        new lib_1.DB().backupToFile({
+    if (!values) {
+        const directory = `${cwd}/${dir}/dump-schema_${+new Date()}.sql`;
+        new lib_1.DB().loadEnv(env).backupSchemaToFile({
             filePath: directory,
-            database: db
+            database: sql
         })
-            .then(r => console.log(`dump database "${db}" file successfully`))
+            .then(r => console.log(`dump schema database "${sql}" file successfully`))
             .catch(err => console.log(err))
             .finally(() => process.exit(0));
     }
+    const directory = `${cwd}/${dir}/dump_${+new Date()}.sql`;
+    new lib_1.DB().loadEnv(env).backupToFile({
+        filePath: directory,
+        database: sql
+    })
+        .then(r => console.log(`dump database "${sql}" file successfully`))
+        .catch(err => console.log(err))
+        .finally(() => process.exit(0));
 };

package/dist/cli/dump/table.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const lib_1 = require("../../lib");
 exports.default = (cmd) => {
-    const { dir, cwd, fs, values, table } = cmd;
+    const { dir, cwd, fs, values, sql } = cmd;
     if (dir) {
         try {
             fs.accessSync(`${cwd}/${dir}`, fs.F_OK, {
@@ -15,24 +15,26 @@ exports.default = (cmd) => {
             });
         }
     }
-    if (values) {
+    if (sql == null || sql === '') {
+        console.log(`Example  tspace-mysql dump:table "table" --dir=app/table`);
+        process.exit(0);
+    }
+    if (!values) {
         const directory = `${cwd}/${dir}/dump-schema_${+new Date()}.sql`;
         new lib_1.DB().backupTableSchemaToFile({
             filePath: directory,
-            table
-        })
-            .then(r => console.log(`dump table schema "${table}" file successfully`))
-            .catch(err => console.log(err))
-            .finally(() => process.exit(0));
-    }
-    else {
-        const directory = `${cwd}/${dir}/dump_${+new Date()}.sql`;
-        new lib_1.DB().backupTableToFile({
-            filePath: directory,
-            table
+            table: sql
         })
-            .then(r => console.log(`dump table "${table}" file successfully`))
+            .then(r => console.log(`dump table schema "${sql}" file successfully`))
             .catch(err => console.log(err))
             .finally(() => process.exit(0));
     }
+    const directory = `${cwd}/${dir}/dump_${+new Date()}.sql`;
+    new lib_1.DB().backupTableToFile({
+        filePath: directory,
+        table: sql
+    })
+        .then(r => console.log(`dump table "${sql}" file successfully`))
+        .catch(err => console.log(err))
+        .finally(() => process.exit(0));
 };

package/dist/cli/generate/make.js

@@ -7,7 +7,7 @@ const model_1 = __importDefault(require("./model"));
 const pluralize_1 = __importDefault(require("pluralize"));
 const lib_1 = require("../../lib");
 exports.default = (cmd) => {
-    const { dir, cwd, type, fs, npm } = cmd;
+    const { dir, cwd, type, fs, env, npm } = cmd;
     if (dir) {
         try {
             fs.accessSync(`${cwd}/${dir}`, fs.F_OK, {
@@ -27,26 +27,48 @@ exports.default = (cmd) => {
         }
         return str.join('');
     };
-    new lib_1.DB().rawQuery('SHOW TABLES')
+    const formatSchema = (data) => {
+        const formattedCode = {};
+        for (const field of data) {
+            const [key, value] = field.split(":").map((item) => item.trim());
+            formattedCode[key] = value;
+        }
+        return formattedCode;
+    };
+    new lib_1.DB()
+        .loadEnv(env)
+        .rawQuery('SHOW TABLES')
         .then(tables => {
         var _a;
         for (let i = 0; i < tables.length; i++) {
             const table = String((_a = Object.values(tables[i])) === null || _a === void 0 ? void 0 : _a.shift());
             const model = snakeCaseToPascal(pluralize_1.default.singular(table));
-            new lib_1.DB().rawQuery(`SHOW COLUMNS FROM ${table}`).then(raw => {
-                let schema = '';
-                for (const r of raw) {
-                    schema += `${r.Field} : `;
-                    schema += `new Blueprint().${/^[^()]*$/.test(r.Type) ? `${r.Type.toLocaleLowerCase()}()` : r.Type.toLocaleLowerCase()}`;
-                    schema += `${r.Null === 'YES' ? '.null()' : '.notNull()'}`;
-                    schema += r.Key === 'PRI' ? '.primary()' : r.Key === 'UNI' ? '.unique()' : '';
-                    schema += r.Default != null ? `.default('${r.Default}')` : '';
-                    schema += `${r.Extra === 'auto_increment' ? '.autoIncrement()' : ''},
-                    `;
+            new lib_1.DB().loadEnv(env).rawQuery(`SHOW COLUMNS FROM \`${table}\``).then(raws => {
+                let schema = [];
+                for (const index in raws) {
+                    const raw = raws[i];
+                    const str = [
+                        `${raw.Field} : `,
+                        `new Blueprint().${/^[^()]*$/.test(raw.Type)
+                            ? raw.Type === 'int unsigned'
+                                ? 'int().unsigned()'
+                                : `${raw.Type.toLocaleLowerCase()}()`
+                            : raw.Type.toLocaleLowerCase()}`,
+                        `${raw.Null === 'YES' ? '.null()' : '.notNull()'}`,
+                        raw.Key === 'PRI' ? '.primary()' : raw.Key === 'UNI' ? '.unique()' : '',
+                        raw.Default != null ? `.default('${raw.Default}')` : '',
+                        `${raw.Extra === 'auto_increment' ? '.autoIncrement()' : ''},`
+                    ].join('');
+                    const isLast = Number(index) + 1 === raws.length;
+                    schema.push(isLast ? str.replace(/,\s*$/, "") : str);
+                }
+                const formattedSchema = formatSchema(schema);
+                let str = "this.useSchema({\n";
+                for (const formatKey in formattedSchema) {
+                    str += `          ${formatKey} : ${formattedSchema[formatKey]} \n`;
                 }
-                const data = (0, model_1.default)(model, npm, `this.useSchema({
-                    ${schema.replace(/,\s*$/, "")}
-                })`);
+                str += "        })";
+                const data = (0, model_1.default)(model, npm, `${str}`);
                 fs.writeFile(`${cwd}/${dir}/${model}${type !== null && type !== void 0 ? type : '.ts'}`, data, (err) => {
                     if (err)
                         throw err;
@@ -57,6 +79,5 @@ exports.default = (cmd) => {
         }
         console.log('\nGenerate Models has completed');
     })
-        .catch(err => console.log(err))
-        .finally(() => process.exit(0));
+        .catch(err => console.log(err));
 };

package/dist/cli/index.js

@@ -12,7 +12,7 @@ const make_3 = __importDefault(require("./migrate/make"));
 const make_4 = __importDefault(require("./generate/make"));
 const query_1 = __importDefault(require("./query"));
 const db_1 = __importDefault(require("./dump/db"));
-const db_2 = __importDefault(require("./dump/db"));
+const table_1 = __importDefault(require("./dump/table"));
 const commands = {
     'query': query_1.default,
     'make:model': make_1.default,
@@ -22,7 +22,7 @@ const commands = {
     'generate:models': make_4.default,
     'gen:models': make_4.default,
     'dump:db': db_1.default,
-    'dump:table': db_2.default
+    'dump:table': table_1.default
 };
 try {
     const name = (_c = (_b = (_a = process.argv.slice(2)) === null || _a === void 0 ? void 0 : _a.find(data => {
@@ -62,19 +62,22 @@ try {
         db,
         table,
         values,
+        env,
         npm: 'tspace-mysql'
     };
     commands[process.argv[2]](cmd);
 }
 catch (err) {
     console.log(`
-        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"
-        tspace-mysql generate:models --dir=app/Models 
-        tspace-mysql dump:db --db=database --dir=app/db
-        tspace-mysql dump:table --table=table --dir=app/table
+        \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 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);

package/dist/cli/query/index.js

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const lib_1 = require("../../lib");
 exports.default = (cmd) => {
-    const { sql } = cmd;
-    new lib_1.DB().rawQuery(sql === null || sql === void 0 ? void 0 : sql.replace(/`/g, ''))
+    const { sql, env } = cmd;
+    new lib_1.DB().loadEnv(env).rawQuery(sql === null || sql === void 0 ? void 0 : sql.replace(/`/g, ''))
         .then(result => console.log(result))
         .catch(err => console.log(err))
         .finally(() => process.exit(0));

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

@@ -1,4 +1,6 @@
+import { loadOptionsEnvironment } from './options';
 import { Connection, Options } from '../tspace/Interface';
+export { loadOptionsEnvironment };
 export declare class PoolConnection {
     private OPTIONS;
     /**

package/dist/lib/connection/index.js

@@ -1,12 +1,36 @@
 "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 __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Pool = exports.PoolConnection = void 0;
+exports.Pool = exports.PoolConnection = exports.loadOptionsEnvironment = void 0;
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
-const options_1 = __importDefault(require("./options"));
+const options_1 = __importStar(require("./options"));
+Object.defineProperty(exports, "loadOptionsEnvironment", { enumerable: true, get: function () { return options_1.loadOptionsEnvironment; } });
 const mysql2_1 = require("mysql2");
 class PoolConnection {
     /**

package/dist/lib/connection/options.d.ts

@@ -1,3 +1,21 @@
+export declare const loadOptionsEnvironment: () => Readonly<{
+    [x: string]: any;
+    HOST?: string | null | undefined;
+    PORT?: string | number | undefined;
+    USERNAME?: string | null | undefined;
+    PASSWORD?: string | null | undefined;
+    DATABASE?: string | null | undefined;
+    CONNECTION_LIMIT?: string | number | undefined;
+    QUEUE_LIMIT?: string | number | undefined;
+    TIMEOUT?: string | number | undefined;
+    CHARSET?: string | null | undefined;
+    CONNECTION_ERROR?: string | boolean | undefined;
+    WAIT_FOR_CONNECTIONS?: string | boolean | undefined;
+    DATE_STRINGS?: string | boolean | undefined;
+    KEEP_ALIVE_DELAY?: string | number | undefined;
+    ENABLE_KEEP_ALIVE?: string | boolean | undefined;
+    MULTIPLE_STATEMENTS?: string | boolean | undefined;
+}>;
 declare const _default: Readonly<{
     [x: string]: any;
     HOST?: string | null | undefined;

package/dist/lib/connection/options.js

@@ -3,6 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.loadOptionsEnvironment = void 0;
 const dotenv_1 = __importDefault(require("dotenv"));
 const path_1 = __importDefault(require("path"));
 const fs_1 = __importDefault(require("fs"));
@@ -46,4 +47,37 @@ for (const [key, value] of Object.entries(env)) {
     if (/^[0-9]+$/.test(value))
         env[key] = +value;
 }
+const loadOptionsEnvironment = () => {
+    const environment = () => {
+        var _a;
+        const NODE_ENV = (_a = process.env) === null || _a === void 0 ? void 0 : _a.NODE_ENV;
+        const env = path_1.default.join(path_1.default.resolve(), '.env');
+        if (NODE_ENV == null)
+            return env;
+        const envWithEnviroment = path_1.default.join(path_1.default.resolve(), `.env.${NODE_ENV}`);
+        if (fs_1.default.existsSync(envWithEnviroment))
+            return envWithEnviroment;
+        return env;
+    };
+    const ENV = dotenv_1.default.config({ path: environment() }).parsed;
+    const env = {
+        host: (ENV === null || ENV === void 0 ? void 0 : ENV.DB_HOST) || (ENV === null || ENV === void 0 ? void 0 : ENV.TSPACE_HOST),
+        port: (ENV === null || ENV === void 0 ? void 0 : ENV.DB_PORT) || (ENV === null || ENV === void 0 ? void 0 : ENV.TSPACE_PORT) || 3306,
+        username: (ENV === null || ENV === void 0 ? void 0 : ENV.DB_USERNAME) || (ENV === null || ENV === void 0 ? void 0 : ENV.TSPACE_USERNAME),
+        password: (ENV === null || ENV === void 0 ? void 0 : ENV.DB_PASSWORD) || (ENV === null || ENV === void 0 ? void 0 : ENV.TSPACE_PASSWORD) || '',
+        database: (ENV === null || ENV === void 0 ? void 0 : ENV.DB_DATABASE) || (ENV === null || ENV === void 0 ? void 0 : ENV.TSPACE_DATABASE),
+    };
+    for (const [key, value] of Object.entries(env)) {
+        if (value == null)
+            continue;
+        if (typeof value === 'string' && ['true', 'false'].some(v => value.toLowerCase() === v)) {
+            env[key] = JSON.parse(value.toLowerCase());
+            continue;
+        }
+        if (/^[0-9]+$/.test(value))
+            env[key] = +value;
+    }
+    return Object.freeze(Object.assign({}, env));
+};
+exports.loadOptionsEnvironment = loadOptionsEnvironment;
 exports.default = Object.freeze(Object.assign({}, env));

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

@@ -27,12 +27,24 @@ declare class Blueprint {
      * @return {this} this
      */
     tinyInt(number?: number): this;
+    /**
+     * Assign type 'TINYINT' in table
+     * @param {number} number
+     * @return {this} this
+     */
+    tinyint(number?: number): this;
     /**
      * Assign type 'BIGINT' in table
      * @param {number} number [number = 10]
      * @return {this} this
      */
     bigInt(number?: number): this;
+    /**
+     * Assign type 'BIGINT' in table
+     * @param {number} number [number = 10]
+     * @return {this} this
+     */
+    bigint(number?: number): this;
     /**
      * Assign type 'DOUBLE' in table
      * @param {number} length  between 1-255
@@ -64,17 +76,33 @@ declare class Blueprint {
      * @return {this} this
      */
     longText(): this;
+    /**
+     * Assign type 'LONGTEXT' in table
+     * @return {this} this
+     */
+    longtext(): this;
     /**
      * Assign type 'MEDIUMTEXT' in table
      * @return {this} this
      */
     mediumText(): this;
+    /**
+     * Assign type 'MEDIUMTEXT' in table
+     * @return {this} this
+     */
+    mediumtext(): this;
     /**
      * Assign type 'TINYTEXT' in table
      * @param {number} length [length = 1] length of string
      * @return {this} this
      */
     tinyText(): this;
+    /**
+    * Assign type 'TINYTEXT' in table
+    * @param {number} length [length = 1] length of string
+    * @return {this} this
+    */
+    tinytext(): this;
     /**
      * Assign type 'TEXT' in table
      * @param {number} length [length = 1] length of string
@@ -143,6 +171,11 @@ declare class Blueprint {
      * @return {this} this
      */
     currentTimestamp(): this;
+    /**
+     * Assign attributes 'default currentTimestamp' in table
+     * @return {this} this
+     */
+    currenttimestamp(): this;
     /**
      * Assign attributes 'autoIncrement' in table
      * @return {this} this

package/dist/lib/tspace/Blueprint.js

@@ -40,6 +40,16 @@ class Blueprint {
         this.valueType = Number;
         return this;
     }
+    /**
+     * Assign type 'TINYINT' in table
+     * @param {number} number
+     * @return {this} this
+     */
+    tinyint(number = 1) {
+        this._addAssignType(`TINYINT(${number})`);
+        this.valueType = Number;
+        return this;
+    }
     /**
      * Assign type 'BIGINT' in table
      * @param {number} number [number = 10]
@@ -50,6 +60,16 @@ class Blueprint {
         this.valueType = Number;
         return this;
     }
+    /**
+     * Assign type 'BIGINT' in table
+     * @param {number} number [number = 10]
+     * @return {this} this
+     */
+    bigint(number = 10) {
+        this._addAssignType(`BIGINT(${number})`);
+        this.valueType = Number;
+        return this;
+    }
     /**
      * Assign type 'DOUBLE' in table
      * @param {number} length  between 1-255
@@ -108,6 +128,14 @@ class Blueprint {
         this._addAssignType(`LONGTEXT`);
         return this;
     }
+    /**
+     * Assign type 'LONGTEXT' in table
+     * @return {this} this
+     */
+    longtext() {
+        this._addAssignType(`LONGTEXT`);
+        return this;
+    }
     /**
      * Assign type 'MEDIUMTEXT' in table
      * @return {this} this
@@ -116,6 +144,14 @@ class Blueprint {
         this._addAssignType(`MEDIUMTEXT`);
         return this;
     }
+    /**
+     * Assign type 'MEDIUMTEXT' in table
+     * @return {this} this
+     */
+    mediumtext() {
+        this._addAssignType(`MEDIUMTEXT`);
+        return this;
+    }
     /**
      * Assign type 'TINYTEXT' in table
      * @param {number} length [length = 1] length of string
@@ -125,6 +161,15 @@ class Blueprint {
         this._addAssignType(`TINYTEXT`);
         return this;
     }
+    /**
+    * Assign type 'TINYTEXT' in table
+    * @param {number} length [length = 1] length of string
+    * @return {this} this
+    */
+    tinytext() {
+        this._addAssignType(`TINYTEXT`);
+        return this;
+    }
     /**
      * Assign type 'TEXT' in table
      * @param {number} length [length = 1] length of string
@@ -236,6 +281,14 @@ class Blueprint {
         this._addAssignAttribute(`DEFAULT CURRENT_TIMESTAMP`);
         return this;
     }
+    /**
+     * Assign attributes 'default currentTimestamp' in table
+     * @return {this} this
+     */
+    currenttimestamp() {
+        this._addAssignAttribute(`DEFAULT CURRENT_TIMESTAMP`);
+        return this;
+    }
     /**
      * Assign attributes 'autoIncrement' in table
      * @return {this} this

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

@@ -563,6 +563,12 @@ declare class Builder extends AbstractBuilder {
      * @return {this} this
      */
     connection(options: ConnectionOptions): this;
+    /**
+     *
+     * @param {string} env load environment using with command line arguments
+     * @return {this} this
+     */
+    loadEnv(env?: string): this;
     /**
      *
      * @param {Function} pool pool connection database

package/dist/lib/tspace/Builder.js

@@ -1363,6 +1363,25 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
         this.$pool.set(pool.connection());
         return this;
     }
+    /**
+     *
+     * @param {string} env load environment using with command line arguments
+     * @return {this} this
+     */
+    loadEnv(env) {
+        if (env === null)
+            return this;
+        const options = (0, connection_1.loadOptionsEnvironment)();
+        const pool = new connection_1.PoolConnection({
+            host: String(options.host),
+            port: Number(options.port),
+            database: String(options.database),
+            user: String(options.username),
+            password: String(options.password)
+        });
+        this.$pool.set(pool.connection());
+        return this;
+    }
     /**
      *
      * @param {Function} pool pool connection database

package/package.json

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