tspace-mysql 1.3.1 → 1.3.2

package/README.md

@@ -91,6 +91,8 @@ const selectQuery = await new DB('users').select('id','username').findOne()
 const selectQueries = await new DB('users').select('id','username').findMany() 
     // selectQueries => [{ id : 1, username : 'tspace' } , { id : 2, username : 'tspace2'}]
 
+const selectQueryRaw = await new DB('users').selectRaw('COUNT(id)').findMany() 
+
 /**
  * @example except
  */
@@ -669,6 +671,7 @@ orWhereRaw(sql)
 orWhereIn(column , [])
 orWhereSubQuery(colmn , rawSQL)
 select(column1 ,column2 ,...N)
+selectRaw(column1 ,column2 ,...N)
 except(column1 ,column2 ,...N)
 only(column1 ,column2 ,...N)
 hidden(column1 ,column2 ,...N)
@@ -677,10 +680,15 @@ rightJoin (primary key , table.foreign key)
 leftJoin (primary key , table.foreign key) 
 limit (limit)
 having (condition)
+havingRaw (condition)
 orderBy (column ,'ASC' || 'DSCE')
+orderByRaw(column ,'ASC' || 'DSCE')
 latest (column)
+latestRaw (column)
 oldest (column)
+oldestRaw (column)
 groupBy (column)
+groupByRaw (column)
 create(objects)
 createMultiple(array objects)
 update (objects)

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

@@ -32,10 +32,12 @@ declare abstract class AbstractModel extends Builder {
     abstract with(...nameRelations: string[]): this;
     abstract withQuery(nameRelations: string, callback: Function): this;
     abstract withExists(...nameRelations: string[]): this;
+    abstract withAndTrashed(...nameRelations: string[]): this;
     abstract has(...nameRelations: string[]): this;
     abstract relations(...nameRelations: string[]): this;
     abstract relationQuery(nameRelations: string, callback: Function): this;
     abstract relationsExists(...nameRelations: string[]): this;
+    abstract relationsAndTrashed(...nameRelations: string[]): this;
 }
 export { AbstractModel };
 export default AbstractModel;

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

@@ -50,14 +50,6 @@ declare class Builder extends AbstractBuilder {
      * @return {this} this
      */
     when(condition: string | number | undefined | null | Boolean, callback: Function): this;
-    /**
-     * if has 2 arguments  default operator '='
-     * @param {string} column
-     * @param {string?} operator ['=', '<', '>' ,'!=', '!<', '!>' ,'LIKE']
-     * @param {any?} value
-     * @return {this}
-     */
-    resetWhere(): this;
     /**
      * if has 2 arguments  default operator '='
      * @param {string} column if arguments is object

package/dist/lib/tspace/Builder.js

@@ -90,26 +90,28 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
      * @return {this} this
      */
     select(...columns) {
-        let select = '*';
-        if (columns === null || columns === void 0 ? void 0 : columns.length) {
-            select = columns.map((column) => {
-                if (column.includes(this.$constants('RAW')))
-                    return column === null || column === void 0 ? void 0 : column.replace(this.$constants('RAW'), '').replace(/'/g, '');
-                return `\`${column}\``;
-            }).join(', ');
-        }
+        if (!columns.length)
+            return this;
+        const select = columns.map((column) => {
+            if (column === '*')
+                return column;
+            if (column.includes(this.$constants('RAW')))
+                return column === null || column === void 0 ? void 0 : column.replace(this.$constants('RAW'), '').replace(/'/g, '');
+            return `\`${column}\``;
+        }).join(', ');
         this.$state.set('SELECT', `${this.$constants('SELECT')} ${select}`);
         return this;
     }
     selectRaw(...columns) {
-        let select = '*';
-        if (columns === null || columns === void 0 ? void 0 : columns.length) {
-            select = columns.map((column) => {
-                if (column.includes(this.$constants('RAW')))
-                    return column === null || column === void 0 ? void 0 : column.replace(this.$constants('RAW'), '').replace(/'/g, '');
+        if (!columns.length)
+            return this;
+        const select = columns.map((column) => {
+            if (column === '*')
                 return column;
-            }).join(', ');
-        }
+            if (column.includes(this.$constants('RAW')))
+                return column === null || column === void 0 ? void 0 : column.replace(this.$constants('RAW'), '').replace(/'/g, '');
+            return column;
+        }).join(', ');
         this.$state.set('SELECT', `${this.$constants('SELECT')} ${select}`);
         return this;
     }
@@ -132,17 +134,6 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
             callback(this);
         return this;
     }
-    /**
-     * if has 2 arguments  default operator '='
-     * @param {string} column
-     * @param {string?} operator ['=', '<', '>' ,'!=', '!<', '!>' ,'LIKE']
-     * @param {any?} value
-     * @return {this}
-     */
-    resetWhere() {
-        this.$state.set('WHERE', '');
-        return this;
-    }
     /**
      * if has 2 arguments  default operator '='
      * @param {string} column if arguments is object
@@ -327,7 +318,7 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
             this._queryWhereIsExists()
                 ? `${this.$state.get('WHERE')} ${this.$constants('AND')}`
                 : `${this.$constants('WHERE')}`,
-            `${this._bindTableAndColumnInQueryWhere(column)} ${this.$constants('IN')}`,
+            `${this._bindTableAndColumnInQueryWhere(column)}`,
             `${this.$constants('IN')}`,
             `(${values})`
         ].join(' '));
@@ -349,7 +340,7 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
             this._queryWhereIsExists()
                 ? `${this.$state.get('WHERE')} ${this.$constants('OR')}`
                 : `${this.$constants('WHERE')}`,
-            `${this._bindTableAndColumnInQueryWhere(column)} ${this.$constants('IN')}`,
+            `${this._bindTableAndColumnInQueryWhere(column)}`,
             `${this.$constants('IN')}`,
             `(${values})`
         ].join(' '));
@@ -1771,7 +1762,8 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
                 `*`,
                 `${this.$constants('FROM')}`,
                 `${this.$state.get('TABLE_NAME')}`,
-                `${this.$constants('WHERE')} id ${this.$constants('IN')}`,
+                `${this.$constants('WHERE')} id`,
+                `${this.$constants('IN')}`,
                 `(${data.map((a) => `\'${a}\'`).join(',') || ['0']})`
             ].join(' ');
             const groups = yield this.queryStatement(sqlGroups);
@@ -2201,7 +2193,7 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
                     `${this.$state.get('SELECT')}`,
                     `${this.$state.get('FROM')}`,
                     `${this.$state.get('TABLE_NAME')}`,
-                    `${this.$constants('WHERE')} id = ${id}`
+                    `${this.$constants('WHERE')} ${this.$state.get('TABLE_NAME')}.\`id\` = ${id}`
                 ].join(' ');
                 const data = yield this.queryStatement(sql);
                 const result = (data === null || data === void 0 ? void 0 : data.shift()) || null;

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

@@ -112,7 +112,7 @@ declare class Model extends AbstractModel {
      * exceptColumns for method except
      * @return {promise<string>} string
      */
-    protected exceptColumns(): Promise<string>;
+    protected exceptColumns(): Promise<any>;
     /**
      * Build  method for relation in model
      * @param    {string} name name relation registry in your model
@@ -175,11 +175,11 @@ declare class Model extends AbstractModel {
     with(...nameRelations: Array<string>): this;
     /**
      *
-     * Use relations in registry of model return ignore soft deleted
+     * Use relations in registry of model return normal and in trash
      * @param {...string} nameRelations if data exists return blank
      * @return {this} this
      */
-    withTrashed(...nameRelations: Array<string>): this;
+    withAndTrashed(...nameRelations: Array<string>): this;
     /**
      *
      * Use relations in registry of model return only exists result of relation query
@@ -230,7 +230,7 @@ declare class Model extends AbstractModel {
      * @param {...string} nameRelations if data exists return blank
      * @return {this} this
      */
-    relationTrashed(...nameRelations: Array<string>): this;
+    relationsAndTrashed(...nameRelations: Array<string>): this;
     /**
      * Assign the relation in model Objects
      * @param    {object} relations registry relation in your model

package/dist/lib/tspace/Model.js

@@ -212,7 +212,7 @@ class Model extends AbstractModel_1.AbstractModel {
             if (this.$state.get('SCHEMA')) {
                 const columns = Object.keys(this.$state.get('SCHEMA'));
                 const removeExcept = columns.filter((column) => !this.$state.get('EXCEPT').includes(column));
-                return removeExcept.join(', ');
+                return removeExcept;
             }
             const rawColumns = yield this.queryStatement([
                 `${this.$constants('SHOW')}`,
@@ -222,7 +222,7 @@ class Model extends AbstractModel_1.AbstractModel {
             ].join(' '));
             const columns = rawColumns.map((column) => column.Field);
             const removeExcept = columns.filter((column) => !this.$state.get('EXCEPT').includes(column));
-            return removeExcept.join(', ');
+            return removeExcept;
         });
     }
     /**
@@ -336,11 +336,11 @@ class Model extends AbstractModel_1.AbstractModel {
     }
     /**
      *
-     * Use relations in registry of model return ignore soft deleted
+     * Use relations in registry of model return normal and in trash
      * @param {...string} nameRelations if data exists return blank
      * @return {this} this
      */
-    withTrashed(...nameRelations) {
+    withAndTrashed(...nameRelations) {
         const relations = this._handleRelations(nameRelations);
         relations.forEach(relation => relation.trashed = true);
         const setRelations = this.$state.get('RELATIONS').length
@@ -436,8 +436,8 @@ class Model extends AbstractModel_1.AbstractModel {
      * @param {...string} nameRelations if data exists return blank
      * @return {this} this
      */
-    relationTrashed(...nameRelations) {
-        return this.withTrashed(...nameRelations);
+    relationsAndTrashed(...nameRelations) {
+        return this.withAndTrashed(...nameRelations);
     }
     /**
      * Assign the relation in model Objects
@@ -773,7 +773,7 @@ class Model extends AbstractModel_1.AbstractModel {
     */
     toArray(column = 'id') {
         return __awaiter(this, void 0, void 0, function* () {
-            this.select(column);
+            this.selectRaw(column);
             const sql = this._buildQueryModel();
             const result = yield this.queryStatement(sql);
             const toArray = result.map((data) => data[column]);
@@ -789,7 +789,7 @@ class Model extends AbstractModel_1.AbstractModel {
     avg(column = 'id') {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
-            this.select(`${this.$constants('AVG')}(${column}) ${this.$constants('AS')} avg`);
+            this.selectRaw(`${this.$constants('AVG')}(${column}) ${this.$constants('AS')} avg`);
             const sql = this._buildQueryModel();
             const result = yield this.queryStatement(sql);
             return ((_a = result === null || result === void 0 ? void 0 : result.shift()) === null || _a === void 0 ? void 0 : _a.avg) || 0;
@@ -804,7 +804,7 @@ class Model extends AbstractModel_1.AbstractModel {
     sum(column = 'id') {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
-            this.select(`${this.$constants('SUM')}(${column}) ${this.$constants('AS')} sum`);
+            this.selectRaw(`${this.$constants('SUM')}(${column}) ${this.$constants('AS')} sum`);
             const sql = this._buildQueryModel();
             const result = yield this.queryStatement(sql);
             return ((_a = result === null || result === void 0 ? void 0 : result.shift()) === null || _a === void 0 ? void 0 : _a.sum) || 0;
@@ -819,7 +819,7 @@ class Model extends AbstractModel_1.AbstractModel {
     max(column = 'id') {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
-            this.select(`${this.$constants('MAX')}(${column}) ${this.$constants('AS')} max`);
+            this.selectRaw(`${this.$constants('MAX')}(${column}) ${this.$constants('AS')} max`);
             const sql = this._buildQueryModel();
             const result = yield this.queryStatement(sql);
             return ((_a = result === null || result === void 0 ? void 0 : result.shift()) === null || _a === void 0 ? void 0 : _a.max) || 0;
@@ -834,7 +834,7 @@ class Model extends AbstractModel_1.AbstractModel {
     min(column = 'id') {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
-            this.select(`${this.$constants('MIN')}(${column}) ${this.$constants('AS')} min`);
+            this.selectRaw(`${this.$constants('MIN')}(${column}) ${this.$constants('AS')} min`);
             const sql = this._buildQueryModel();
             const result = yield this.queryStatement(sql);
             return ((_a = result === null || result === void 0 ? void 0 : result.shift()) === null || _a === void 0 ? void 0 : _a.min) || 0;
@@ -849,7 +849,7 @@ class Model extends AbstractModel_1.AbstractModel {
     count(column = 'id') {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
-            this.select(`${this.$constants('COUNT')}(${column}) ${this.$constants('AS')} total`);
+            this.selectRaw(`${this.$constants('COUNT')}(${column}) ${this.$constants('AS')} total`);
             const sql = this._buildQueryModel();
             const result = yield this.queryStatement(sql);
             return ((_a = result === null || result === void 0 ? void 0 : result.shift()) === null || _a === void 0 ? void 0 : _a.total) || 0;
@@ -863,12 +863,12 @@ class Model extends AbstractModel_1.AbstractModel {
     exists() {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
-            this.select(this.$state.get('PRIMARY_KEY'));
+            this.limit(1);
             const sql = this._buildQueryModel();
             const result = yield this.queryStatement([
                 `${this.$constants('SELECT')}`,
                 `${this.$constants('EXISTS')}`,
-                `(${sql} ${this.$constants('LIMIT')} 1)`,
+                `(${sql})`,
                 `${this.$constants('AS')} 'exists'`
             ].join(' '));
             return !!((_a = result === null || result === void 0 ? void 0 : result.shift()) === null || _a === void 0 ? void 0 : _a.exists) || false;
@@ -941,7 +941,7 @@ class Model extends AbstractModel_1.AbstractModel {
             if (this.$state.get('VOID'))
                 return null;
             if ((_a = this.$state.get('EXCEPT')) === null || _a === void 0 ? void 0 : _a.length)
-                this.select(yield this.exceptColumns());
+                this.select(...yield this.exceptColumns());
             this.limit(1);
             if (this.$state.get('RELATIONS_EXISTS')) {
                 return yield this._execute({ sql: this._queryRelationsExists(), type: 'FIRST' });
@@ -969,7 +969,7 @@ class Model extends AbstractModel_1.AbstractModel {
         return __awaiter(this, void 0, void 0, function* () {
             this._validateMethod('firstOrError');
             if ((_a = this.$state.get('EXCEPT')) === null || _a === void 0 ? void 0 : _a.length)
-                this.select(yield this.exceptColumns());
+                this.select(...yield this.exceptColumns());
             this.limit(1);
             if (this.$state.get('RELATIONS_EXISTS')) {
                 return yield this._execute({ sql: this._queryRelationsExists(), type: 'FIRST_OR_ERROR', message, options });
@@ -1036,7 +1036,7 @@ class Model extends AbstractModel_1.AbstractModel {
             if (this.$state.get('VOID'))
                 return [];
             if ((_a = this.$state.get('EXCEPT')) === null || _a === void 0 ? void 0 : _a.length)
-                this.select(yield this.exceptColumns());
+                this.select(...yield this.exceptColumns());
             let sql = this._buildQueryModel();
             if (this.$state.get('RELATIONS_EXISTS'))
                 sql = this._queryRelationsExists();
@@ -1072,7 +1072,7 @@ class Model extends AbstractModel_1.AbstractModel {
                 page = (paginationOptions === null || paginationOptions === void 0 ? void 0 : paginationOptions.page) || page;
             }
             if ((_a = this.$state.get('EXCEPT')) === null || _a === void 0 ? void 0 : _a.length)
-                this.select(yield this.exceptColumns());
+                this.select(...yield this.exceptColumns());
             const offset = (page - 1) * limit;
             this.$state.set('PER_PAGE', limit);
             this.$state.set('PAGE', page);
@@ -1107,7 +1107,7 @@ class Model extends AbstractModel_1.AbstractModel {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
             if ((_a = this.$state.get('EXCEPT')) === null || _a === void 0 ? void 0 : _a.length)
-                this.select(yield this.exceptColumns());
+                this.select(...yield this.exceptColumns());
             this.$state.set('GROUP_BY', `${this.$constants('GROUP_BY')} ${column}`);
             this.$state.set('SELECT', [
                 `${this.$state.get('SELECT')},`,
@@ -1812,7 +1812,6 @@ class Model extends AbstractModel_1.AbstractModel {
                 .whereIn(foreignKey, dataPerentId)
                 .debug(this.$state.get('DEBUG'))
                 .when(relation.trashed, (query) => query.disableSoftDelete())
-                .when(relationIsHasOneOrBelongsTo, (query) => query.limit(1))
                 .get();
             return dataFromRelation;
         });
@@ -1898,7 +1897,7 @@ class Model extends AbstractModel_1.AbstractModel {
         var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
             const currentPage = +(this.$state.get('PAGE'));
-            this.select([
+            this.selectRaw([
                 `${this.$constants('COUNT')}(${this.$state.get('PRIMARY_KEY')})`,
                 `${this.$constants('AS')}`,
                 `total`
@@ -2398,7 +2397,7 @@ class Model extends AbstractModel_1.AbstractModel {
         return __awaiter(this, void 0, void 0, function* () {
             this._assertError(!this.$state.get('WHERE'), "can not update [ update ] without where condition");
             const sql = this._buildQueryModel();
-            const [result] = yield this.actionStatement({ sql });
+            const result = yield this.actionStatement({ sql });
             if (this.$state.get('VOID'))
                 return null;
             if (result == null || !result)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tspace-mysql",
-  "version": "1.3.1",
+  "version": "1.3.2",
   "description": "mysql query builder object relational mapping",
   "main": "dist/lib/index.js",
   "types": "dist/lib/index.d.ts",
@@ -40,7 +40,8 @@
   "dependencies": {
     "dotenv": "^16.0.3",
     "mysql2": "^2.3.3",
-    "pluralize": "^8.0.0"
+    "pluralize": "^8.0.0",
+    "sql-formatter": "^10.7.1"
   },
   "homepage": "https://github.com/thanathip41",
   "scripts": {
@@ -49,7 +50,6 @@
   },
   "devDependencies": {
     "@types/mysql": "^2.15.19",
-    "@types/pluralize": "0.0.29",
-    "tspace-mysql": "^1.1.8"
+    "@types/pluralize": "^0.0.29"
   }
 }