tspace-mysql 1.0.2 → 1.0.5

package/README.md

@@ -142,7 +142,7 @@ Folder directory example
     const users = await new User()
         .with('posts','comments') /* relations -> hasMany: posts & comments  */
         .withQuery('posts', (query) => query.with('user'))   /* relation -> belongsTo: post by user  */
-        .withQuery('comments', (query) => query.with('user','post'))   /* relation -> belongsTo: comment by user? & comment in post? */
+        .withQuery('comments', (query) => query.with('user','post'))   /* relation -> belongsTo: comment by user? & comment in post*/
         .findMany()
         
     console.log(users)    
@@ -266,25 +266,24 @@ save() /*for action statements insert update or delete */
 npm install tspace-mysql -g
 ```js
 
-tspace-mysql make:model <folder/name model> --m  --f=... --name=.... --js
+tspace-mysql make:model <MODEL NAME> --m  --dir=... --js
 * optional
-    --m  /* created table for migrate in <FOLDER/migrations> */
-    --f=folder/...folder /* created table for migrate in <CUSTOM FOLDER> default  <FOLDER/migrations> */ 
-    --js /* extension .js default .ts */
-    --name=NAME /* class name default <NAME> in input cli */
+    --m  /* created table for migrate */
+    --dir=directory /* created model in directory */ 
+    --type=js /* extension js default ts */
 
-tspace-mysql make:table <folder> --name=....
-* required
-    --name=TABLE_NAME  /* created table for migrate in <folder> */
+tspace-mysql make:migration <TABLE NAME>
 * optional
-    --js /* extension .js default .ts */
+    --type=js /* extension js default ts */
+    --dir=directory /* created table in directory */ 
     
- tspace-mysql migrate <folder> --js
+ tspace-mysql migrate <FOLDER> --js
  * optional
-    --js /* extension .js default .ts */
+    --type=js /* extension js default ts */
+    --dir=directory /* find migrate in directory */ 
 ```
 
-tspace-mysql make:model App/Models/User --m
+tspace-mysql make:model User --m --dir=App/Models
 ```js
 /* Ex folder 
 - node_modules
@@ -308,7 +307,7 @@ class User extends Model{
 }
 export default User
 ```
-tspace-mysql make:table App/Models/Migrations --name=users
+tspace-mysql make:migration users --dir=App/Models/Migrations
 ```js
 /* Ex folder 
 - node_modules
@@ -327,6 +326,8 @@ import { Schema , Blueprint , DB } from 'tspace-mysql'
         email : new Blueprint().varchar(255).unique(),
         email_verify : new Blueprint().tinyInt(),
         password : new Blueprint().varchar(255),
+        created_at : new Blueprint().null().timestamp(),
+        updated_at : new Blueprint().null().timestamp()
     })
     /**
      * 
@@ -335,7 +336,7 @@ import { Schema , Blueprint , DB } from 'tspace-mysql'
     */
 })()
 ```
-tspace-mysql migrate App/Models/Migrations
+tspace-mysql migrate Migrations --dir=App/Models
 /* migrate all table in folder into database */
 ```js
 * Blueprint method

package/dist/cli/index.js

@@ -3,7 +3,7 @@
 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;
+var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
 Object.defineProperty(exports, "__esModule", { value: true });
 var fs_1 = __importDefault(require("fs"));
 var make_1 = __importDefault(require("./models/make"));
@@ -12,19 +12,23 @@ var make_3 = __importDefault(require("./migrate/make"));
 var commands = {
     'make:model': make_1.default,
     'make:table': make_2.default,
+    'make:migration': make_2.default,
     'migrate': make_3.default
 };
 try {
     var name = (_c = (_b = (_a = process.argv.slice(2)) === null || _a === void 0 ? void 0 : _a.find(function (data) { return data === null || data === void 0 ? void 0 : data.includes('--name='); })) === null || _b === void 0 ? void 0 : _b.replace('--name=', '')) !== null && _c !== void 0 ? _c : null;
     var migrate = (_e = (_d = process.argv.slice(2)) === null || _d === void 0 ? void 0 : _d.includes('--m')) !== null && _e !== void 0 ? _e : false;
-    var migrateFolder = (_h = (_g = (_f = process.argv.slice(2)) === null || _f === void 0 ? void 0 : _f.find(function (data) { return data === null || data === void 0 ? void 0 : data.includes('--f='); })) === null || _g === void 0 ? void 0 : _g.replace('--f=', '/')) !== null && _h !== void 0 ? _h : null;
-    var path = (_j = process.argv.slice(3)) === null || _j === void 0 ? void 0 : _j.shift();
-    var type = ((_l = (_k = process.argv.slice(2)) === null || _k === void 0 ? void 0 : _k.includes('--js')) !== null && _l !== void 0 ? _l : false) ? '.js' : '.ts';
+    var dir = (_h = (_g = (_f = process.argv.slice(2)) === null || _f === void 0 ? void 0 : _f.find(function (data) { return data === null || data === void 0 ? void 0 : data.includes('--dir='); })) === null || _g === void 0 ? void 0 : _g.replace('--dir=', '/')) !== null && _h !== void 0 ? _h : null;
+    // const migrateFolder = process.argv.slice(2)?.find(data => data?.includes('--f='))?.replace('--f=','/') ?? null
+    // const type = process.argv.slice(2)?.includes('--js') ?? false ? '.js' : '.ts'
+    var type = (_l = (_k = (_j = process.argv.slice(2)) === null || _j === void 0 ? void 0 : _j.find(function (data) { return data === null || data === void 0 ? void 0 : data.includes('--type='); })) === null || _k === void 0 ? void 0 : _k.replace('--type=', '.')) !== null && _l !== void 0 ? _l : '.ts';
+    type = ['.js', '.ts'].includes(type) ? type : '.ts';
+    var file = (_o = (_m = process.argv.slice(3)) === null || _m === void 0 ? void 0 : _m.shift()) !== null && _o !== void 0 ? _o : '';
     var cmd = {
         name: name,
-        path: path,
+        file: file,
+        dir: dir,
         migrate: migrate,
-        migrateFolder: migrateFolder,
         type: type,
         cwd: process.cwd(),
         fs: fs_1.default,

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

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

package/dist/cli/migrate/make.js

@@ -15,29 +15,29 @@ var child_process_1 = require("child_process");
 exports.default = (function (_ref) {
     var e_1, _a;
     var _b, _c, _d;
-    var path = _ref.path, type = _ref.type, cwd = _ref.cwd, fs = _ref.fs;
-    var split = path.split('/') || path;
-    var f = split.join('/');
+    var file = _ref.file, type = _ref.type, dir = _ref.dir, cwd = _ref.cwd, fs = _ref.fs;
+    var folder = file;
     try {
-        fs.accessSync(cwd + "/".concat(f), fs.F_OK, {
+        fs.accessSync(cwd + "/".concat(folder), fs.F_OK, {
             recursive: true
         });
     }
     catch (e) {
-        fs.mkdirSync(cwd + "/".concat(f), {
+        fs.mkdirSync(cwd + "/".concat(folder), {
             recursive: true
         });
     }
     try {
-        var dir = "".concat(cwd, "/").concat(f);
-        var files = (_b = fs.readdirSync(dir)) !== null && _b !== void 0 ? _b : [];
+        var path = dir ? "".concat(cwd, "/").concat(dir, "/").concat(folder) : "".concat(cwd, "/").concat(folder);
+        var files = (_b = fs.readdirSync(path)) !== null && _b !== void 0 ? _b : [];
         if (!(files === null || files === void 0 ? void 0 : files.length))
             console.log('this folder is empty');
         var cmd = type === '.js' ? 'node' : 'ts-node';
+        var sum = 0;
         try {
             for (var files_1 = __values(files), files_1_1 = files_1.next(); !files_1_1.done; files_1_1 = files_1.next()) {
-                var t = files_1_1.value;
-                var run = (0, child_process_1.exec)("".concat(cmd, " ").concat(dir, "/").concat(t));
+                var _file = files_1_1.value;
+                var run = (0, child_process_1.exec)("".concat(cmd, " ").concat(path, "/").concat(_file));
                 (_c = run === null || run === void 0 ? void 0 : run.stdout) === null || _c === void 0 ? void 0 : _c.on('data', function (data) {
                     if (data)
                         console.log(data);
@@ -46,6 +46,7 @@ exports.default = (function (_ref) {
                     if (err)
                         console.error(err);
                 });
+                sum++;
             }
         }
         catch (e_1_1) { e_1 = { error: e_1_1 }; }
@@ -55,6 +56,8 @@ exports.default = (function (_ref) {
             }
             finally { if (e_1) throw e_1.error; }
         }
+        if (sum === file.length)
+            process.exit(0);
     }
     catch (err) {
         console.log(err.message);

package/dist/cli/models/make.d.ts

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

package/dist/cli/models/make.js

@@ -5,43 +5,42 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 var model_1 = __importDefault(require("./model"));
 var table_1 = __importDefault(require("../tables/table"));
-var utils_1 = __importDefault(require("../../lib/utils"));
+var pluralize_1 = __importDefault(require("pluralize"));
 exports.default = (function (_ref) {
-    var path = _ref.path, migrate = _ref.migrate, migrateFolder = _ref.migrateFolder, type = _ref.type, name = _ref.name, cwd = _ref.cwd, fs = _ref.fs, npm = _ref.npm;
-    var split = path.split('/') || path;
-    var model = split.pop();
-    var f = split.join('/');
-    try {
-        fs.accessSync(cwd + "/".concat(f), fs.F_OK, {
-            recursive: true
-        });
-    }
-    catch (e) {
-        fs.mkdirSync(cwd + "/".concat(f), {
-            recursive: true
-        });
+    var file = _ref.file, migrate = _ref.migrate, dir = _ref.dir, type = _ref.type, cwd = _ref.cwd, fs = _ref.fs, npm = _ref.npm;
+    if (dir) {
+        try {
+            fs.accessSync(cwd + "/".concat(dir), fs.F_OK, {
+                recursive: true
+            });
+        }
+        catch (e) {
+            fs.mkdirSync(cwd + "/".concat(dir), {
+                recursive: true
+            });
+        }
     }
-    var folder = "".concat(cwd, "/").concat(f, "/").concat(model).concat(type);
-    var data = (0, model_1.default)(name || model, npm);
-    fs.writeFile(folder, data, function (err) {
+    var model = dir ? "".concat(cwd, "/").concat(dir, "/").concat(file).concat(type) : "".concat(cwd, "/").concat(file).concat(type);
+    var data = (0, model_1.default)(file, npm);
+    fs.writeFile(model, data, function (err) {
         if (err)
             throw err.message;
     });
-    console.log("Model : '".concat(model, "' created successfully"));
+    console.log("Model : '".concat(file, "' created successfully"));
     if (migrate) {
-        var tableName = utils_1.default.tableName(name || model);
-        var folder_1 = migrateFolder !== null && migrateFolder !== void 0 ? migrateFolder : "/".concat(f, "/Migrations");
+        var tableName = (0, pluralize_1.default)(file.replace(/([A-Z])/g, function (str) { return '_' + str.toLowerCase(); }).slice(1));
+        var folder = dir ? "".concat(dir, "/Migrations") : "/Migrations";
         try {
-            fs.accessSync(cwd + folder_1, fs.F_OK, {
+            fs.accessSync(cwd + folder, fs.F_OK, {
                 recursive: true
             });
         }
         catch (e) {
-            fs.mkdirSync(cwd + folder_1, {
+            fs.mkdirSync(cwd + folder, {
                 recursive: true
             });
         }
-        var folderMigrate = "".concat(cwd, "/").concat(folder_1, "/create_").concat(tableName, "_table").concat(type);
+        var folderMigrate = "".concat(cwd, "/").concat(folder, "/create_").concat(tableName, "_table").concat(type);
         var table = (0, table_1.default)(tableName, npm);
         fs.writeFile(folderMigrate, table, function (err) {
             if (err)

package/dist/cli/tables/make.d.ts

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

package/dist/cli/tables/make.js

@@ -5,28 +5,27 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 var table_1 = __importDefault(require("./table"));
 exports.default = (function (_ref) {
-    var path = _ref.path, name = _ref.name, type = _ref.type, cwd = _ref.cwd, fs = _ref.fs, npm = _ref.npm;
-    var split = path.split('/') || path;
-    var f = split.join('/');
-    if (name == null)
-        console.log("use ".concat(npm, " make:table FOLDER/FOLDER --name=tableName"));
-    else {
-        try {
-            fs.accessSync(cwd + "/".concat(f), fs.F_OK, {
-                recursive: true
-            });
-        }
-        catch (e) {
-            fs.mkdirSync(cwd + "/".concat(f), {
-                recursive: true
-            });
-        }
-        var folderMigrate = "".concat(cwd, "/").concat(f, "/create_").concat(name, "_table").concat(type);
-        var table = (0, table_1.default)(name, npm);
-        fs.writeFile(folderMigrate, table, function (err) {
-            if (err)
-                console.log(err.message);
+    var file = _ref.file, type = _ref.type, cwd = _ref.cwd, dir = _ref.dir, fs = _ref.fs, npm = _ref.npm;
+    // if(name == null) {
+    //   console.log(`use ${npm} make:migration <NAME TABLE> --dir=<DIRECTORY>`)
+    //   process.exit(0);
+    // }
+    try {
+        fs.accessSync(cwd + "/".concat(file), fs.F_OK, {
+            recursive: true
         });
-        console.log("Migration : ".concat(name, " created successfully"));
     }
+    catch (e) {
+        fs.mkdirSync(cwd + "/".concat(file), {
+            recursive: true
+        });
+    }
+    var folderMigrate = dir ? "".concat(cwd, "/").concat(dir, "/create_").concat(file, "_table").concat(type) : "".concat(cwd, "/create_").concat(file, "_table").concat(type);
+    var table = (0, table_1.default)(file, npm);
+    fs.writeFile(folderMigrate, table, function (err) {
+        if (err)
+            console.log(err.message);
+    });
+    console.log("Migration : ".concat(file, " created successfully"));
+    process.exit(0);
 });

package/dist/cli/tables/table.d.ts

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

package/dist/cli/tables/table.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-var Table = function (model, npm) {
-    return "import { Schema , Blueprint , DB } from '".concat(npm, "'\n(async () => {\n    await new Schema().table('").concat(model, "',{ \n        id :  new Blueprint().int().notNull().primary().autoIncrement(),\n        name : new Blueprint().varchar(120).default('my name'),\n        email : new Blueprint().varchar(120).unique(),\n        email_verify : new Blueprint().tinyInt(),\n        password : new Blueprint().varchar(120),\n        birthdate : new Blueprint().date()\n    })\n\n    /**\n     * \n     *  @Faker data\n     *  await new DB().table('").concat(model, "').faker(5)\n    */\n})()\n");
+var Table = function (table, npm) {
+    return "import { Schema , Blueprint , DB } from '".concat(npm, "'\n(async () => {\n    await new Schema().table('").concat(table, "',{ \n        id :  new Blueprint().int().notNull().primary().autoIncrement(),\n        name : new Blueprint().varchar(120).default('my name'),\n        email : new Blueprint().varchar(120).unique(),\n        email_verify : new Blueprint().tinyInt(),\n        password : new Blueprint().varchar(120),\n        birthdate : new Blueprint().date(),\n        created_at : new Blueprint().null().timestamp(),\n        updated_at : new Blueprint().null().timestamp()\n    })\n\n    /**\n     * \n     *  @Faker data\n     *  await new DB().table('").concat(table, "').faker(5)\n    */\n})()\n");
 };
 exports.default = Table;

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

@@ -1,4 +1,4 @@
 declare const configs: {
-    [x: string]: string;
+    [x: string]: Object | undefined;
 };
 export default configs;

package/dist/lib/{utils/constant.d.ts → constants/index.d.ts}

@@ -1,4 +1,4 @@
 declare const constant: {
-    [x: string]: any;
+    [x: string]: string | Object;
 };
 export default constant;

package/dist/lib/{utils/constant.js → constants/index.js}

@@ -5,8 +5,6 @@ var constant = Object.freeze({
     SHOW: 'SHOW',
     FIELDS: 'FIELDS',
     COLUMNS: 'COLUMNS',
-    MYSQL: 'mysql',
-    POSTGRESQL: 'pg',
     WHERE: 'WHERE',
     BETWEEN: 'BETWEEN',
     AND: 'AND',

package/dist/lib/index.d.ts

@@ -1,7 +1,7 @@
 /**
   * The entry point.
   *
-  * @module tspace-myorm
+  * @module tspace-mysql
 */
 import * as tspace from './tspace';
 export * from './tspace';

package/dist/lib/index.js

@@ -29,7 +29,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 /**
   * The entry point.
   *
-  * @module tspace-myorm
+  * @module tspace-mysql
 */
 var tspace = __importStar(require("./tspace"));
 __exportStar(require("./tspace"), exports);

package/dist/lib/tspace/DB.js

@@ -214,7 +214,8 @@ var DB = /** @class */ (function (_super) {
             INSERT: '',
             SELECT: '',
             ONLY: [],
-            EXCEPT: [''],
+            EXCEPT: [],
+            CHUNK: 0,
             COUNT: '',
             FROM: '',
             JOIN: '',
@@ -230,9 +231,11 @@ var DB = /** @class */ (function (_super) {
         };
         return {
             get: function (key) {
-                if (key)
-                    return db[key];
-                return db;
+                if (key == null)
+                    return db;
+                if (!db.hasOwnProperty(key))
+                    throw new Error("can't get this [".concat(key, "]"));
+                return db[key];
             },
             set: function (key, value) {
                 if (!db.hasOwnProperty(key))

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

@@ -4,6 +4,9 @@ declare class Database extends AbstractDatabase {
     only(...params: Array<string>): this;
     distinct(column?: string): this;
     select(...params: string[]): this;
+    chunk(chunk: number): this;
+    when(value: string | number | undefined | null, cb: Function): this;
+    whereRaw(query: string): this;
     where(column: string, operator?: any, value?: any): this;
     whereId(id: number): this;
     whereEmail(email: string): this;
@@ -122,6 +125,7 @@ declare class Database extends AbstractDatabase {
     max(column?: string): Promise<any>;
     min(column?: string): Promise<any>;
     delete(): Promise<boolean>;
+    forceDelete(): Promise<boolean>;
     getGroupBy(column: string): Promise<any>;
     findManyGroupBy(column: string): Promise<any>;
     save(transaction?: {