tspace-mysql 1.0.3 → 1.0.6

package/README.md

@@ -131,12 +131,14 @@ import Post from '../Post'
 import Comment from '../Comment'
 import User from '../User'
 
+/**
 Folder directory example
 - App
   - Model
     Post.ts
     User.ts
     Comment.ts
+*/   
     
 (async () => {
     const users = await new User()
@@ -147,9 +149,11 @@ Folder directory example
         
     console.log(users)    
 })()
-```
-*User.ts
-```js
+
+/** 
+ * 
+ * User.ts
+*/
 import { Model } from 'tspace-mysql'
 class User extends Model {
     constructor(){
@@ -159,10 +163,10 @@ class User extends Model {
     }
 } 
 export default User
-```
-
-*Post.ts
-```js
+/** 
+ * 
+ * Post.ts
+*/
 import { Model } from 'tspace-mysql'
 
 class Post extends Model {
@@ -173,10 +177,12 @@ class Post extends Model {
     }
 } 
 export default Post
-```
 
-*Comment.ts
-```js
+/** 
+ * 
+ * Comment.ts
+*/
+
 import { Model } from 'tspace-mysql'
 
 class Comment extends Model {
@@ -209,7 +215,7 @@ select(column1 ,column2 ,...N)
 except(column1 ,column2 ,...N)
 only(column1 ,column2 ,...N)
 hidden(column1 ,column2 ,...N)
-join (primary key , table.foreign key) 
+join(primary key , table.foreign key) 
 rightJoin (primary key , table.foreign key) 
 leftJoin (primary key , table.foreign key) 
 limit (limit)
@@ -219,13 +225,10 @@ latest (column)
 oldest (column)
 groupBy (column)
 
-insert(objects)
 create(objects)
 createMultiple(array objects)
 update (objects)
-insertNotExists(objects)
 createNotExists(objects)
-updateOrInsert (objects)
 updateOrCreate (objects)
 /** 
  * relationship
@@ -326,6 +329,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()
     })
     /**
      * 
@@ -334,7 +339,7 @@ import { Schema , Blueprint , DB } from 'tspace-mysql'
     */
 })()
 ```
-tspace-mysql migrate Migrations --dir=App/Models
+tspace-mysql migrate --dir=App/Models/Migrations
 /* migrate all table in folder into database */
 ```js
 * Blueprint method

package/dist/cli/index.js

@@ -19,8 +19,6 @@ 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 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 : '';
@@ -37,5 +35,5 @@ try {
     commands[process.argv[2]](cmd);
 }
 catch (err) {
-    console.log("\n    use make:model <folder/...folder/model name> --m\n    use make:table <folder/folder/...folder> --name=<name>\n    use migrate <folder/folder/...folder> \n");
+    console.log("readme https://www.npmjs.com/package/tspace-mysql");
 }

package/dist/cli/migrate/make.js

@@ -15,20 +15,11 @@ var child_process_1 = require("child_process");
 exports.default = (function (_ref) {
     var e_1, _a;
     var _b, _c, _d;
-    var file = _ref.file, type = _ref.type, dir = _ref.dir, cwd = _ref.cwd, fs = _ref.fs;
-    var folder = file;
+    var type = _ref.type, dir = _ref.dir, cwd = _ref.cwd, fs = _ref.fs;
     try {
-        fs.accessSync(cwd + "/".concat(folder), fs.F_OK, {
-            recursive: true
-        });
-    }
-    catch (e) {
-        fs.mkdirSync(cwd + "/".concat(folder), {
-            recursive: true
-        });
-    }
-    try {
-        var path = dir ? "".concat(cwd, "/").concat(dir, "/").concat(folder) : "".concat(cwd, "/").concat(folder);
+        if (dir == null)
+            throw new Error('Not found directory');
+        var path = "".concat(cwd, "/").concat(dir);
         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');
@@ -54,7 +45,6 @@ exports.default = (function (_ref) {
             }
             finally { if (e_1) throw e_1.error; }
         }
-        process.exit(0);
     }
     catch (err) {
         console.log(err.message);

package/dist/cli/models/make.js

@@ -8,17 +8,19 @@ var table_1 = __importDefault(require("../tables/table"));
 var pluralize_1 = __importDefault(require("pluralize"));
 exports.default = (function (_ref) {
     var file = _ref.file, migrate = _ref.migrate, dir = _ref.dir, type = _ref.type, cwd = _ref.cwd, fs = _ref.fs, npm = _ref.npm;
-    try {
-        fs.accessSync(cwd + "/".concat(file), fs.F_OK, {
-            recursive: true
-        });
-    }
-    catch (e) {
-        fs.mkdirSync(cwd + "/".concat(file), {
-            recursive: true
-        });
+    if (dir) {
+        try {
+            fs.accessSync(cwd + "/".concat(dir), fs.F_OK, {
+                recursive: true
+            });
+        }
+        catch (e) {
+            fs.mkdirSync(cwd + "/".concat(dir), {
+                recursive: true
+            });
+        }
     }
-    var model = dir ? "".concat(cwd, "/").concat(dir, "/").concat(file).concat(type) : "".concat(cwd, "/").concat(file, "/").concat(file).concat(type);
+    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)

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

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

package/dist/cli/tables/make.js

@@ -5,11 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 var table_1 = __importDefault(require("./table"));
 exports.default = (function (_ref) {
-    var file = _ref.file, name = _ref.name, type = _ref.type, cwd = _ref.cwd, dir = _ref.dir, fs = _ref.fs, npm = _ref.npm;
-    if (name == null) {
-        console.log("use ".concat(npm, " make:table FOLDER/FOLDER --name=tableName"));
-        process.exit(0);
-    }
+    var file = _ref.file, type = _ref.type, cwd = _ref.cwd, dir = _ref.dir, fs = _ref.fs, npm = _ref.npm;
     try {
         fs.accessSync(cwd + "/".concat(file), fs.F_OK, {
             recursive: true
@@ -21,11 +17,10 @@ exports.default = (function (_ref) {
         });
     }
     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)(name, npm);
+    var table = (0, table_1.default)(file, npm);
     fs.writeFile(folderMigrate, table, function (err) {
         if (err)
             console.log(err.message);
     });
-    console.log("Migration : ".concat(name, " created successfully"));
-    process.exit(0);
+    console.log("Migration : ".concat(file, " created successfully"));
 });

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        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(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/config/env.js

@@ -2,15 +2,26 @@
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
-var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
 var dotenv_1 = __importDefault(require("dotenv"));
 var path_1 = __importDefault(require("path"));
-var NODE_ENV = (_a = process.env) === null || _a === void 0 ? void 0 : _a.NODE_ENV;
-var pathEnv = path_1.default.join(path_1.default.resolve(), ".env.".concat(NODE_ENV));
-if (NODE_ENV == null)
-    pathEnv = path_1.default.join(path_1.default.resolve(), ".env");
-dotenv_1.default.config({ path: pathEnv });
+var fs_1 = __importDefault(require("fs"));
+var environment = function () {
+    var _a;
+    var NODE_ENV = (_a = process.env) === null || _a === void 0 ? void 0 : _a.NODE_ENV;
+    var dotenvWithoutEnviroment = path_1.default.join(path_1.default.resolve(), ".env");
+    var dotenWithEnviroment = path_1.default.join(path_1.default.resolve(), ".env.".concat(NODE_ENV));
+    if (NODE_ENV == null) {
+        if (fs_1.default.existsSync(dotenvWithoutEnviroment))
+            return dotenvWithoutEnviroment;
+        if (fs_1.default.existsSync(dotenWithEnviroment))
+            return dotenWithEnviroment;
+    }
+    if (fs_1.default.existsSync(dotenWithEnviroment))
+        return dotenWithEnviroment;
+    return dotenvWithoutEnviroment;
+};
+dotenv_1.default.config({ path: environment() });
 var env = Object.freeze({
     DB_HOST: process.env.DB_HOST,
     DB_PORT: process.env.DB_PORT,

package/dist/lib/tspace/DB.js

@@ -227,6 +227,7 @@ var DB = /** @class */ (function (_super) {
             HAVING: '',
             TABLE_NAME: '',
             HIDDEN: [],
+            UUID: false,
             DEBUG: false
         };
         return {

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

@@ -5,7 +5,7 @@ declare class Database extends AbstractDatabase {
     distinct(column?: string): this;
     select(...params: string[]): this;
     chunk(chunk: number): this;
-    when(value: string | number | undefined | null, cb: Function): this;
+    when(value: string | number | undefined | null | Boolean, cb: Function): this;
     whereRaw(query: string): this;
     where(column: string, operator?: any, value?: any): this;
     whereId(id: number): this;

package/dist/lib/tspace/Model.js

@@ -1171,19 +1171,18 @@ var Model = /** @class */ (function (_super) {
         }
         return dataParents;
     };
-    Model.prototype._relation = function (parentData, relation) {
+    Model.prototype._relation = function (parents, relation) {
         return __awaiter(this, void 0, void 0, function () {
-            var _a, pk, fk, pkId, dataPerentId, query, childData;
+            var _a, pk, fk, pkId, dataPerentId, query, childs;
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
                         if (!Object.keys(relation).length)
                             return [2 /*return*/, []];
                         _a = this._valueInRelation(relation), pk = _a.pk, fk = _a.fk;
-                        pkId = parentData.map(function (dataPerent) { return dataPerent[pk]; }).filter(function (data) { return data != null; });
+                        pkId = parents.map(function (parent) { return parent[pk]; }).filter(function (data) { return data != null; });
                         dataPerentId = Array.from(new Set(pkId)) || [];
-                        if (!dataPerentId.length && !this.$db.get('WITH_EXISTS'))
-                            throw new Error("can't relationship without primary or foreign key");
+                        // if(!dataPerentId.length && !this.$db.get('WITH_EXISTS')) throw new Error("can't relationship without primary or foreign key")
                         if (!dataPerentId.length && this.$db.get('WITH_EXISTS'))
                             return [2 /*return*/, []];
                         return [4 /*yield*/, relation.query];
@@ -1193,8 +1192,8 @@ var Model = /** @class */ (function (_super) {
                             throw new Error("unknow callback queries in [relation : ".concat(relation.name, "]"));
                         return [4 /*yield*/, query.whereIn(fk, dataPerentId).debug(this.$db.get('DEBUG')).get()];
                     case 2:
-                        childData = _b.sent();
-                        return [2 /*return*/, childData];
+                        childs = _b.sent();
+                        return [2 /*return*/, childs];
                 }
             });
         });
@@ -1226,7 +1225,7 @@ var Model = /** @class */ (function (_super) {
                         dataChilds_1 = _e.sent();
                         otherId = dataChilds_1.map(function (sub) { return sub[otherFk_1]; }).filter(function (data) { return data != null; });
                         otherArrId = Array.from(new Set(otherId)) || [];
-                        return [4 /*yield*/, modelOther.whereIn(otherPk_1, otherArrId).get()];
+                        return [4 /*yield*/, this._queryStatementModel(modelOther.whereIn(otherPk_1, otherArrId).toSQL())];
                     case 2:
                         otherdataChilds_1 = _e.sent();
                         dataChilds_1.forEach(function (sub) {
@@ -1313,14 +1312,14 @@ var Model = /** @class */ (function (_super) {
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
-                        currentPage = this.$db.get('PAGE');
+                        currentPage = +(this.$db.get('PAGE'));
                         this.select("".concat(this.$utils().constants('COUNT'), "(*) ").concat(this.$utils().constants('AS'), " total"));
                         sql = this._getSQLModel();
                         return [4 /*yield*/, this._queryStatementModel(sql)];
                     case 1:
                         res = _b.sent();
                         total = (res === null || res === void 0 ? void 0 : res.shift().total) || 0;
-                        limit = this.$db.get('PER_PAGE');
+                        limit = +(this.$db.get('PER_PAGE'));
                         lastPage = Math.ceil(total / limit) || 0;
                         lastPage = lastPage > 1 ? lastPage : 1;
                         nextPage = currentPage + 1;
@@ -1897,7 +1896,7 @@ var Model = /** @class */ (function (_super) {
         var _a;
         if (transaction === void 0) { transaction = { query: [{ table: '', id: '' }] }; }
         return __awaiter(this, void 0, void 0, function () {
-            var attributes, query_1, query, _b;
+            var attributes, query, query, _b;
             return __generator(this, function (_c) {
                 switch (_c.label) {
                     case 0:
@@ -1905,14 +1904,15 @@ var Model = /** @class */ (function (_super) {
                         attributes = this.$attributes;
                         if ((_a = Object.keys(attributes)) === null || _a === void 0 ? void 0 : _a.length) {
                             if (this.$db.get('WHERE')) {
-                                query_1 = this._queryUpdateModel(attributes);
-                                this.$db.set('UPDATE', "".concat(this.$utils().constants('UPDATE'), " ").concat(this.$db.get('TABLE_NAME'), " ").concat(query_1));
+                                query = this._queryUpdateModel(attributes);
+                                this.$db.set('UPDATE', "".concat(this.$utils().constants('UPDATE'), " ").concat(this.$db.get('TABLE_NAME'), " ").concat(query));
                                 this.$db.set('SAVE', 'UPDATE');
-                                return [2 /*return*/];
                             }
-                            query = this._queryInsertModel(attributes);
-                            this.$db.set('INSERT', "".concat(this.$utils().constants('INSERT'), " ").concat(this.$db.get('TABLE_NAME'), " ").concat(query));
-                            this.$db.set('SAVE', 'INSERT');
+                            else {
+                                query = this._queryInsertModel(attributes);
+                                this.$db.set('INSERT', "".concat(this.$utils().constants('INSERT'), " ").concat(this.$db.get('TABLE_NAME'), " ").concat(query));
+                                this.$db.set('SAVE', 'INSERT');
+                            }
                         }
                         _b = this.$db.get('SAVE');
                         switch (_b) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tspace-mysql",
-  "version": "1.0.3",
+  "version": "1.0.6",
   "description": "mysql query builder object relational mapping",
   "main": "dist/lib/index.js",
   "types": "dist/lib/index.d.ts",
@@ -38,6 +38,10 @@
   },
   "homepage": "https://github.com/thanathip41",
   "scripts": {
+    "start" : "ts-node ./test/index.ts",
+    "prod" : "set NODE_ENV=production&& ts-node ./test/index.ts",
+    "dev" : "set NODE_ENV=development&& ts-node ./test/index.ts",
+    "test" : "set NODE_ENV=test&& ts-node ./test/index.ts",
     "build": "tsc",
     "prepare": "npm run build"
   },