tspace-mysql 1.5.3 → 1.5.5

package/build/lib/Interface.d.ts

@@ -39,7 +39,7 @@ export interface RelationShip {
     belongsTo: string;
     belongsToMany: string;
 }
-export interface Pagination {
+export interface Pagination<K = any[]> {
     meta: {
         total: number;
         limit: number;
@@ -49,7 +49,7 @@ export interface Pagination {
         next_page: number;
         prev_page: number;
     };
-    data: any[];
+    data: K;
 }
 export interface Backup {
     database: string;

package/build/lib/core/Abstracts/AbstractBuilder.d.ts

@@ -100,7 +100,7 @@ declare abstract class AbstractBuilder {
     abstract findOne(): Promise<Record<string, any> | null>;
     abstract findMany(): Promise<any[]>;
     abstract getGroupBy(column: string): Promise<any[]>;
-    abstract findManyGroupBy(column: string): Promise<any[]>;
+    abstract findGroupBy(column: string): Promise<any[]>;
     abstract toArray(column: string): Promise<any[]>;
     abstract toJSON(): Promise<string>;
     abstract toSQL(): string;

package/build/lib/core/Builder.d.ts

@@ -1207,7 +1207,7 @@ declare class Builder extends AbstractBuilder {
      * @param {string} column
      * @return {promise<Array>}
      */
-    findManyGroupBy(column: string): Promise<any[]>;
+    findGroupBy(column: string): Promise<any[]>;
     /**
      * The 'save' method is used to persist a new 'Model' or new 'DB' instance or update an existing model instance in the database.
      *
@@ -1310,10 +1310,12 @@ declare class Builder extends AbstractBuilder {
         delete?: boolean;
         where?: boolean;
         limit?: boolean;
-        offset?: boolean;
+        orderBy?: boolean;
         join?: boolean;
+        offset?: boolean;
         groupBy?: boolean;
         select?: boolean;
+        having?: boolean;
     }): Builder;
     protected _queryBuilder(): {
         select: () => string;

package/build/lib/core/Builder.js

@@ -26,6 +26,7 @@ const utils_1 = require("../utils");
 const constants_1 = require("../constants");
 const DB_1 = require("./DB");
 const connection_1 = require("../connection");
+const State_1 = require("./Handlers/State");
 class Builder extends AbstractBuilder_1.AbstractBuilder {
     constructor() {
         super();
@@ -499,7 +500,7 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
             throw new Error(`This 'whereIn' method is required array only`);
         const values = array.length
             ? `${array.map((value) => this._checkValueHasRaw(this.$utils.escape(value))).join(',')}`
-            : this.$constants('NULL');
+            : this.$constants(this.$constants('NULL'));
         this.$state.set('WHERE', [
             ...this.$state.get('WHERE'),
             [
@@ -524,7 +525,7 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
             throw new Error(`This 'orWhereIn' method is required array only`);
         const values = array.length
             ? `${array.map((value) => this._checkValueHasRaw(this.$utils.escape(value))).join(',')}`
-            : this.$constants('NULL');
+            : this.$constants(this.$constants('NULL'));
         this.$state.set('WHERE', [
             ...this.$state.get('WHERE'),
             [
@@ -700,9 +701,9 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
                     this.$state.get('WHERE').length ? `${this.$constants('AND')}` : '',
                     `${this.bindColumn(column)}`,
                     `${this.$constants('BETWEEN')}`,
-                    `${this.$constants('NULL')}`,
+                    `${this.$constants(this.$constants('NULL'))}`,
                     `${this.$constants('AND')}`,
-                    `${this.$constants('NULL')}`
+                    `${this.$constants(this.$constants('NULL'))}`
                 ].join(' ')
             ]);
             return this;
@@ -739,9 +740,9 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
                     this.$state.get('WHERE').length ? `${this.$constants('OR')}` : '',
                     `${this.bindColumn(column)}`,
                     `${this.$constants('BETWEEN')}`,
-                    `${this.$constants('NULL')}`,
+                    `${this.$constants(this.$constants('NULL'))}`,
                     `${this.$constants('AND')}`,
-                    `${this.$constants('NULL')}`
+                    `${this.$constants(this.$constants('NULL'))}`
                 ].join(' ')
             ]);
             return this;
@@ -778,9 +779,9 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
                     this.$state.get('WHERE').length ? `${this.$constants('AND')}` : '',
                     `${this.bindColumn(column)}`,
                     `${this.$constants('NOT_BETWEEN')}`,
-                    `${this.$constants('NULL')}`,
+                    `${this.$constants(this.$constants('NULL'))}`,
                     `${this.$constants('AND')}`,
-                    `${this.$constants('NULL')}`
+                    `${this.$constants(this.$constants('NULL'))}`
                 ].join(' ')
             ]);
             return this;
@@ -817,9 +818,9 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
                     this.$state.get('WHERE').length ? `${this.$constants('OR')}` : '',
                     `${this.bindColumn(column)}`,
                     `${this.$constants('NOT_BETWEEN')}`,
-                    `${this.$constants('NULL')}`,
+                    `${this.$constants(this.$constants('NULL'))}`,
                     `${this.$constants('AND')}`,
-                    `${this.$constants('NULL')}`
+                    `${this.$constants(this.$constants('NULL'))}`
                 ].join(' ')
             ]);
             return this;
@@ -1961,8 +1962,8 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
             if (typeof value === 'string' && !(value.includes(this.$constants('RAW')))) {
                 value = this.$utils.escapeActions(value);
             }
-            return `${this.bindColumn(column)} = ${value == null || value === 'NULL'
-                ? 'NULL'
+            return `${this.bindColumn(column)} = ${value == null || value === this.$constants('NULL')
+                ? this.$constants('NULL')
                 : typeof value === 'string' && value.includes(this.$constants('RAW'))
                     ? `${this.$utils.covertBooleanToNumber(value)}`.replace(this.$constants('RAW'), '')
                     : `'${this.$utils.covertBooleanToNumber(value)}'`}`;
@@ -2255,13 +2256,14 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
      */
     pagination(paginationOptions) {
         return __awaiter(this, void 0, void 0, function* () {
-            var _a, _b, _c;
+            var _a, _b;
             let limit = 15;
             let page = 1;
             if (paginationOptions != null) {
                 limit = (paginationOptions === null || paginationOptions === void 0 ? void 0 : paginationOptions.limit) || limit;
                 page = (paginationOptions === null || paginationOptions === void 0 ? void 0 : paginationOptions.page) || page;
             }
+            limit = limit > 1000 ? 1000 : limit;
             const currentPage = page;
             const nextPage = currentPage + 1;
             const prevPage = currentPage - 1 === 0 ? 1 : currentPage - 1;
@@ -2285,22 +2287,14 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
                     },
                     data: []
                 };
-            const sqlCount = [
-                `${this.$constants('SELECT')}`,
-                `${this.$constants('COUNT')}(*)`,
-                `${this.$constants('AS')} total`
-            ].join(' ');
-            const sqlTotal = [
-                sqlCount,
-                this.$state.get('FROM'),
-                this.$state.get('TABLE_NAME'),
-                this._queryBuilder().where()
-            ].join(' ');
-            const count = yield this._queryStatement(sqlTotal);
-            const total = ((_b = count === null || count === void 0 ? void 0 : count.shift()) === null || _b === void 0 ? void 0 : _b.total) || 0;
+            const total = yield new DB_1.DB()
+                .copyBuilder(this, { where: true, join: true })
+                .bind(this.$pool.get())
+                .debug(this.$state.get('DEBUG'))
+                .count();
             let lastPage = Math.ceil(total / limit) || 0;
             lastPage = lastPage > 1 ? lastPage : 1;
-            const totalPage = (_c = result === null || result === void 0 ? void 0 : result.length) !== null && _c !== void 0 ? _c : 0;
+            const totalPage = (_b = result === null || result === void 0 ? void 0 : result.length) !== null && _b !== void 0 ? _b : 0;
             return {
                 meta: {
                     total: total,
@@ -2590,9 +2584,11 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
     count() {
         return __awaiter(this, arguments, void 0, function* (column = 'id') {
             const distinct = this.$state.get('DISTINCT');
-            column = distinct
-                ? `${this.$constants('DISTINCT')} ${this.bindColumn(column)}`
-                : `${this.bindColumn(column)}`;
+            column = column === '*'
+                ? '*'
+                : distinct
+                    ? `${this.$constants('DISTINCT')} ${this.bindColumn(column)}`
+                    : `${this.bindColumn(column)}`;
             this.selectRaw(`${this.$constants('COUNT')}(${column}) ${this.$constants('AS')} \`aggregate\``);
             const sql = this._queryBuilder().select();
             const result = yield this._queryStatement(sql);
@@ -2795,7 +2791,7 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
      * @param {string} column
      * @return {promise<Array>}
      */
-    findManyGroupBy(column) {
+    findGroupBy(column) {
         return __awaiter(this, void 0, void 0, function* () {
             return yield this.getGroupBy(column);
         });
@@ -3031,7 +3027,7 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
                 return `(${Object.values(value).map((v) => {
                     if (typeof v === 'object' && v != null && !Array.isArray(v))
                         return `'${JSON.stringify(v)}'`;
-                    return v == null ? 'NULL' : `'${v}'`;
+                    return v == null ? this.$constants('NULL') : `'${v}'`;
                 }).join(', ')})`;
             });
             return values;
@@ -3159,24 +3155,29 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
         const newInstance = new Builder();
         newInstance.$state.clone(copy);
         newInstance.$state.set('SAVE', '');
-        if ((options === null || options === void 0 ? void 0 : options.insert) == null)
+        newInstance.$state.set('DEBUG', false);
+        if ((options === null || options === void 0 ? void 0 : options.insert) == null || !options.insert)
             newInstance.$state.set('INSERT', '');
-        if ((options === null || options === void 0 ? void 0 : options.update) == null)
+        if ((options === null || options === void 0 ? void 0 : options.update) == null || !options.update)
             newInstance.$state.set('UPDATE', '');
-        if ((options === null || options === void 0 ? void 0 : options.delete) == null)
+        if ((options === null || options === void 0 ? void 0 : options.delete) == null || !options.delete)
             newInstance.$state.set('DELETE', '');
-        if ((options === null || options === void 0 ? void 0 : options.where) == null)
-            newInstance.$state.set('WHERE', '');
-        if ((options === null || options === void 0 ? void 0 : options.limit) == null)
+        if ((options === null || options === void 0 ? void 0 : options.where) == null || !options.where)
+            newInstance.$state.set('WHERE', []);
+        if ((options === null || options === void 0 ? void 0 : options.limit) == null || !options.limit)
             newInstance.$state.set('LIMIT', '');
-        if ((options === null || options === void 0 ? void 0 : options.offset) == null)
+        if ((options === null || options === void 0 ? void 0 : options.offset) == null || !options.offset)
             newInstance.$state.set('OFFSET', '');
-        if ((options === null || options === void 0 ? void 0 : options.groupBy) == null)
+        if ((options === null || options === void 0 ? void 0 : options.groupBy) == null || !options.groupBy)
             newInstance.$state.set('GROUP_BY', '');
-        if ((options === null || options === void 0 ? void 0 : options.select) == null)
-            newInstance.$state.set('SELECT', '');
-        if ((options === null || options === void 0 ? void 0 : options.join) == null)
-            newInstance.$state.set('JOIN', '');
+        if ((options === null || options === void 0 ? void 0 : options.orderBy) == null || !options.orderBy)
+            newInstance.$state.set('ORDER_BY', []);
+        if ((options === null || options === void 0 ? void 0 : options.select) == null || !options.select)
+            newInstance.$state.set('SELECT', []);
+        if ((options === null || options === void 0 ? void 0 : options.join) == null || !options.join)
+            newInstance.$state.set('JOIN', []);
+        if ((options === null || options === void 0 ? void 0 : options.having) == null || !options.having)
+            newInstance.$state.set('HAVING', '');
         return newInstance;
     }
     _queryBuilder() {
@@ -3224,7 +3225,6 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
                 this.$state.get('TABLE_NAME'),
                 bindJoin(this.$state.get('JOIN')),
                 bindWhere(this.$state.get('WHERE')),
-                // this.$state.get('GROUP_BY'),
                 bindGroupBy(this.$state.get('GROUP_BY')),
                 this.$state.get('HAVING'),
                 bindOrderBy(this.$state.get('ORDER_BY')),
@@ -3523,8 +3523,8 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
             if (typeof value === 'string' && !(value.includes(this.$constants('RAW')))) {
                 value = this.$utils.escapeActions(value);
             }
-            return `${this.bindColumn(column)} = ${value == null || value === 'NULL'
-                ? 'NULL'
+            return `${this.bindColumn(column)} = ${value == null || value === this.$constants('NULL')
+                ? this.$constants('NULL')
                 : this._checkValueHasRaw(value)}`;
         });
         return `${this.$constants('SET')} ${values}`;
@@ -3536,8 +3536,8 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
             if (typeof value === 'string' && !(value.includes(this.$constants('RAW')))) {
                 value = this.$utils.escapeActions(value);
             }
-            return `${value == null || value === 'NULL'
-                ? 'NULL'
+            return `${value == null || value === this.$constants('NULL')
+                ? this.$constants('NULL')
                 : this._checkValueHasRaw(value)}`;
         });
         return [
@@ -3555,8 +3555,8 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
                 if (typeof value === 'string' && !(value.includes(this.$constants('RAW')))) {
                     value = this.$utils.escapeActions(value);
                 }
-                return `${value == null || value === 'NULL'
-                    ? 'NULL'
+                return `${value == null || value === this.$constants('NULL')
+                    ? this.$constants('NULL')
                     : this._checkValueHasRaw(value)}`;
             });
             values.push(`(${vals.join(',')})`);
@@ -3572,7 +3572,7 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
         if (useDefault)
             return [operator, '='];
         if (operator == null)
-            throw new Error('Bad arguments');
+            throw new Error(`The arguments are required. Please check the your arguments in method 'where' or etc methods.`);
         if (operator.toUpperCase() === this.$constants('LIKE')) {
             operator = operator.toUpperCase();
         }
@@ -3598,6 +3598,7 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
                 }
             };
         })();
+        this.$state = new State_1.StateHandler('default');
         this.$logger = (() => {
             let logger = [];
             return {

package/build/lib/core/Handlers/State.js

@@ -1,7 +1,39 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.StateHandler = void 0;
-const STATE_DEFAULT = {};
+const STATE_DEFAULT = {
+    PRIMARY_KEY: 'id',
+    VOID: false,
+    RESULT: null,
+    DISTINCT: false,
+    PLUCK: '',
+    SAVE: '',
+    DELETE: '',
+    UPDATE: '',
+    INSERT: '',
+    SELECT: [],
+    ONLY: [],
+    EXCEPTS: [],
+    CHUNK: 0,
+    COUNT: '',
+    FROM: 'FROM',
+    JOIN: [],
+    WHERE: [],
+    GROUP_BY: [],
+    ORDER_BY: [],
+    LIMIT: '',
+    OFFSET: '',
+    HAVING: '',
+    TABLE_NAME: '',
+    UUID_CUSTOM: '',
+    HIDDEN: [],
+    DEBUG: false,
+    UUID: false,
+    PAGE: 1,
+    PER_PAGE: 1,
+    HOOKS: [],
+    RETURN_TYPE: null
+};
 const STATE_DB = {
     PRIMARY_KEY: 'id',
     VOID: false,

package/build/lib/core/Model.d.ts

@@ -1297,14 +1297,14 @@ declare class Model<TSchema extends Record<string, Blueprint | string | number |
      * @param {Function?} cb callback function return query sql
      * @return {promise<array>} Array
     */
-    get<K = Partial<TSchema>>(cb?: Function): Promise<Partial<TSchema[]> & K[]>;
+    get<K>(cb?: Function): Promise<Partial<(TSchema & TRelation & K)>[]>;
     /**
      *
      * @override
      * @param {Function?} cb callback function return query sql
      * @return {promise<array>} Array
     */
-    findMany<K = Partial<TSchema>>(cb?: Function): Promise<Partial<TSchema[]> & K[]>;
+    findMany<K>(cb?: Function): Promise<Partial<(TSchema & TRelation & K)>[]>;
     /**
      * @override
      * @param {object?} paginationOptions by default page = 1 , limit = 15
@@ -1312,10 +1312,10 @@ declare class Model<TSchema extends Record<string, Blueprint | string | number |
      * @property {number} paginationOptions.page
      * @return {promise<Pagination>} Pagination
      */
-    pagination(paginationOptions?: {
+    pagination<K>(paginationOptions?: {
         limit?: number;
         page?: number;
-    }): Promise<Pagination>;
+    }): Promise<Pagination<Partial<(TSchema & TRelation & K)>[]>>;
     /**
     *
     * @override
@@ -1324,16 +1324,22 @@ declare class Model<TSchema extends Record<string, Blueprint | string | number |
     * @property {number}  paginationOptions.page
     * @return   {promise<Pagination>} Pagination
     */
-    paginate(paginationOptions?: {
+    paginate<K>(paginationOptions?: {
         limit?: number;
         page?: number;
-    }): Promise<Pagination>;
+    }): Promise<Pagination<Partial<(TSchema & TRelation & K)>[]>>;
     /**
      * @override
      * @param {string} column
      * @return {Promise<array>} Array
      */
-    getGroupBy(column: string): Promise<any[]>;
+    getGroupBy<K extends Extract<keyof TSchema, string> | `${string}.${string}`>(column: K): Promise<any[]>;
+    /**
+     * @override
+     * @param {string} column
+     * @return {Promise<array>} Array
+     */
+    findGroupBy<K extends Extract<keyof TSchema, string> | `${string}.${string}`>(column: K): Promise<any[]>;
     /**
      * @override
      * @param {object} data for insert
@@ -1467,7 +1473,16 @@ declare class Model<TSchema extends Record<string, Blueprint | string | number |
         when: Record<string, any>;
         columns: Record<string, string | number | boolean | null | undefined>;
     }[]): this;
+    /**
+     * The 'getSchemaModel' method is used get a schema model
+     * @return {Record<string, Blueprint> | null} Record<string, Blueprint> | null
+     */
     getSchemaModel(): Record<string, Blueprint> | null;
+    /**
+     * The 'validation' method is used validate the column by validating
+     * @param {ValidateSchema} schema
+     * @return {this} this
+     */
     validation(schema?: ValidateSchema): this;
     /**
      * The 'bindPattern' method is used to covert column relate with pattern

package/build/lib/core/Model.js

@@ -311,7 +311,7 @@ class Model extends AbstractModel_1.AbstractModel {
             this.$constants('PATTERN').camelCase
         ];
         if (!allowPattern.includes(pattern)) {
-            this._assertError(`tspace-mysql support only pattern ['${this.$constants('PATTERN').snake_case}','${this.$constants('PATTERN').camelCase}']`);
+            throw this._assertError(`The 'tspace-mysql' support only pattern '${this.$constants('PATTERN').snake_case}', '${this.$constants('PATTERN').camelCase}'`);
         }
         this.$state.set('PATTERN', pattern);
         this._makeTableName();
@@ -561,7 +561,7 @@ class Model extends AbstractModel_1.AbstractModel {
     */
     beforeCreatingTable(fn) {
         if (!(fn instanceof Function))
-            this._assertError(`This '${fn}' is not a function`);
+            throw this._assertError(`This '${fn}' is not a function.`);
         this.$state.set('BEFORE_CREATING_TABLE', fn);
         return this;
     }
@@ -633,9 +633,13 @@ class Model extends AbstractModel_1.AbstractModel {
         var _a, _b;
         this.relations(name);
         const relation = this.$state.get('RELATIONS').find((data) => data.name === name);
-        this._assertError(relation == null, `This Relation "${String(name)}" not be register in Model "${(_a = this.constructor) === null || _a === void 0 ? void 0 : _a.name}"`);
+        if (relation == null) {
+            throw this._assertError(`This Relation '${String(name)}' not be register in Model '${(_a = this.constructor) === null || _a === void 0 ? void 0 : _a.name}'.`);
+        }
         const relationHasExists = (_b = Object.values(this.$constants('RELATIONSHIP'))) === null || _b === void 0 ? void 0 : _b.includes(relation.relation);
-        this._assertError(!relationHasExists, `Unknown Relationship in [${this.$constants('RELATIONSHIP')}] !`);
+        if (!relationHasExists) {
+            throw this._assertError(`Unknown relationship in '${this.$constants('RELATIONSHIP')}'.`);
+        }
         if (callback == null) {
             relation.query = new relation.model();
             return this;
@@ -973,7 +977,9 @@ class Model extends AbstractModel_1.AbstractModel {
      * @return {Model} Model
      */
     copyModel(instance, options) {
-        this._assertError(!(instance instanceof Model), 'This instance is not a instanceof Model');
+        if (!(instance instanceof Model)) {
+            throw this._assertError('This instance is not an instanceof Model.');
+        }
         const copy = Object.fromEntries(instance.$state.get());
         const newInstance = new Model();
         newInstance.$state.clone(copy);
@@ -1908,7 +1914,7 @@ class Model extends AbstractModel_1.AbstractModel {
         for (let column in columns) {
             const operator = '=';
             const value = this.$utils.escape(columns[column]);
-            if (value == null) {
+            if (value === null) {
                 this.whereNull(column);
                 continue;
             }
@@ -1978,7 +1984,7 @@ class Model extends AbstractModel_1.AbstractModel {
         const c = this._columnPattern(String(column));
         const values = array.length
             ? `${array.map((value) => this._checkValueHasRaw(this.$utils.escape(value))).join(',')}`
-            : this.$constants('NULL');
+            : this.$constants(this.$constants('NULL'));
         this.$state.set('WHERE', [
             ...this.$state.get('WHERE'),
             [
@@ -2002,7 +2008,7 @@ class Model extends AbstractModel_1.AbstractModel {
         const c = this._columnPattern(String(column));
         const values = array.length
             ? `${array.map((value) => this._checkValueHasRaw(this.$utils.escape(value))).join(',')}`
-            : this.$constants('NULL');
+            : this.$constants(this.$constants('NULL'));
         this.$state.set('WHERE', [
             ...this.$state.get('WHERE'),
             [
@@ -2163,9 +2169,9 @@ class Model extends AbstractModel_1.AbstractModel {
                     this.$state.get('WHERE').length ? `${this.$constants('AND')}` : '',
                     `${this.bindColumn(c)}`,
                     `${this.$constants('BETWEEN')}`,
-                    `${this.$constants('NULL')}`,
+                    `${this.$constants(this.$constants('NULL'))}`,
                     `${this.$constants('AND')}`,
-                    `${this.$constants('NULL')}`
+                    `${this.$constants(this.$constants('NULL'))}`
                 ].join(' ')
             ]);
             return this;
@@ -2201,9 +2207,9 @@ class Model extends AbstractModel_1.AbstractModel {
                     this.$state.get('WHERE').length ? `${this.$constants('OR')}` : '',
                     `${this.bindColumn(c)}`,
                     `${this.$constants('BETWEEN')}`,
-                    `${this.$constants('NULL')}`,
+                    `${this.$constants(this.$constants('NULL'))}`,
                     `${this.$constants('AND')}`,
-                    `${this.$constants('NULL')}`
+                    `${this.$constants(this.$constants('NULL'))}`
                 ].join(' ')
             ]);
             return this;
@@ -2239,9 +2245,9 @@ class Model extends AbstractModel_1.AbstractModel {
                     this.$state.get('WHERE').length ? `${this.$constants('AND')}` : '',
                     `${this.bindColumn(c)}`,
                     `${this.$constants('NOT_BETWEEN')}`,
-                    `${this.$constants('NULL')}`,
+                    `${this.$constants(this.$constants('NULL'))}`,
                     `${this.$constants('AND')}`,
-                    `${this.$constants('NULL')}`
+                    `${this.$constants(this.$constants('NULL'))}`
                 ].join(' ')
             ]);
             return this;
@@ -2277,9 +2283,9 @@ class Model extends AbstractModel_1.AbstractModel {
                     this.$state.get('WHERE').length ? `${this.$constants('OR')}` : '',
                     `${this.bindColumn(c)}`,
                     `${this.$constants('NOT_BETWEEN')}`,
-                    `${this.$constants('NULL')}`,
+                    `${this.$constants(this.$constants('NULL'))}`,
                     `${this.$constants('AND')}`,
-                    `${this.$constants('NULL')}`
+                    `${this.$constants(this.$constants('NULL'))}`
                 ].join(' ')
             ]);
             return this;
@@ -2520,7 +2526,9 @@ class Model extends AbstractModel_1.AbstractModel {
     delete() {
         return __awaiter(this, void 0, void 0, function* () {
             var _a, _b;
-            this._assertError(!this.$state.get('WHERE').length, "The 'delete' method requires the use of 'where' conditions.");
+            if (!this.$state.get('WHERE').length) {
+                throw this._assertError("The 'delete' method requires the use of 'where' conditions.");
+            }
             this.limit(1);
             if (this.$state.get('SOFT_DELETE')) {
                 const deletedAt = this._valuePattern(this.$state.get('SOFT_DELETE_FORMAT'));
@@ -2554,7 +2562,9 @@ class Model extends AbstractModel_1.AbstractModel {
     deleteMany() {
         return __awaiter(this, void 0, void 0, function* () {
             var _a, _b;
-            this._assertError(!this.$state.get('WHERE').length, "The 'deleteMany' method requires the use of 'where' conditions.");
+            if (!this.$state.get('WHERE').length) {
+                throw this._assertError("The 'deleteMany' method requires the use of 'where' conditions.");
+            }
             if (this.$state.get('SOFT_DELETE')) {
                 const deletedAt = this._valuePattern(this.$state.get('SOFT_DELETE_FORMAT'));
                 const sql = new Model()
@@ -2640,7 +2650,9 @@ class Model extends AbstractModel_1.AbstractModel {
                 sql = String((_b = this.$relation) === null || _b === void 0 ? void 0 : _b.loadExists());
             if (cb) {
                 const callbackSql = cb(sql);
-                this._assertError(callbackSql == null || callbackSql === '', 'Please provide a callback for execution');
+                if (callbackSql == null || callbackSql === '') {
+                    throw this._assertError('Please provide a callback for execution');
+                }
                 sql = callbackSql;
             }
             return yield this._execute({
@@ -2710,7 +2722,9 @@ class Model extends AbstractModel_1.AbstractModel {
                 sql = String((_b = this.$relation) === null || _b === void 0 ? void 0 : _b.loadExists());
             if (cb) {
                 const callbackSql = cb(sql);
-                this._assertError(callbackSql == null || callbackSql === '', 'Please provide a callback for execution');
+                if (callbackSql == null || callbackSql === '') {
+                    throw this._assertError('Please provide a callback for execution');
+                }
                 sql = callbackSql;
             }
             return yield this._execute({
@@ -2744,9 +2758,10 @@ class Model extends AbstractModel_1.AbstractModel {
             let limit = 15;
             let page = 1;
             if (paginationOptions != null) {
-                limit = (paginationOptions === null || paginationOptions === void 0 ? void 0 : paginationOptions.limit) || limit;
+                limit = ((paginationOptions === null || paginationOptions === void 0 ? void 0 : paginationOptions.limit) || limit);
                 page = (paginationOptions === null || paginationOptions === void 0 ? void 0 : paginationOptions.page) || page;
             }
+            limit = limit > 1000 ? 1000 : limit;
             if ((_a = this.$state.get('EXCEPTS')) === null || _a === void 0 ? void 0 : _a.length)
                 this.select(...yield this.exceptColumns());
             const offset = (page - 1) * limit;
@@ -2818,6 +2833,16 @@ class Model extends AbstractModel_1.AbstractModel {
             return this._resultHandler(resultData);
         });
     }
+    /**
+     * @override
+     * @param {string} column
+     * @return {Promise<array>} Array
+     */
+    findGroupBy(column) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.getGroupBy(column);
+        });
+    }
     /**
      * @override
      * @param {object} data for insert
@@ -2984,7 +3009,7 @@ class Model extends AbstractModel_1.AbstractModel {
      */
     createOrSelect(data) {
         if (!Object.keys(data).length)
-            throw new Error('This method must be required');
+            throw this._assertError('This method must be required');
         this.$state.set('DATA', data);
         const queryInsert = this._queryInsertModel(data);
         this.$state.set('INSERT', [
@@ -3035,7 +3060,8 @@ class Model extends AbstractModel_1.AbstractModel {
      * @return {this} this
      */
     createNotExists(data) {
-        this._assertError(Array.isArray(data), 'Data must be an array. Only object are supported');
+        if (!Object.keys(data).length)
+            throw this._assertError('This method must be required');
         this.$state.set('DATA', data);
         const query = this._queryInsertModel(data);
         this.$state.set('INSERT', [
@@ -3064,8 +3090,9 @@ class Model extends AbstractModel_1.AbstractModel {
      * @return {this} this
      */
     updateMultiple(cases) {
-        if (!cases.length)
-            this._assertError(`The method 'updateMultiple' array must not be empty.`);
+        if (!cases.length) {
+            throw this._assertError(`The method 'updateMultiple' array must not be empty.`);
+        }
         this.limit(cases.length);
         const updateColumns = cases.reduce((columns, item) => {
             return (item.columns && Object.keys(item.columns).forEach(key => columns[key] = [
@@ -3090,10 +3117,12 @@ class Model extends AbstractModel_1.AbstractModel {
         }
         for (let i = cases.length - 1; i >= 0; i--) {
             const c = cases[i];
-            if (c.when == null || !Object.keys(c.when).length)
-                this._assertError(`This 'when' property is missing some properties`);
-            if (c.columns == null || !Object.keys(c.columns).length)
-                this._assertError(`This 'columns' property is missing some properties`);
+            if (c.when == null || !Object.keys(c.when).length) {
+                throw this._assertError(`This 'when' property is missing some properties.`);
+            }
+            if (c.columns == null || !Object.keys(c.columns).length) {
+                throw this._assertError(`This 'columns' property is missing some properties.`);
+            }
             const when = Object.entries(c.when).map(([key, value]) => {
                 value = this.$utils.escape(value);
                 value = this._valueTrueFalse(value);
@@ -3120,8 +3149,8 @@ class Model extends AbstractModel_1.AbstractModel {
             if (typeof value === 'string' && !(value.includes(this.$constants('RAW')))) {
                 value = this.$utils.escapeActions(value);
             }
-            return `${this.bindColumn(column)} = ${value == null || value === 'NULL'
-                ? 'NULL'
+            return `${this.bindColumn(column)} = ${value == null || value === this.$constants('NULL')
+                ? this.$constants('NULL')
                 : this._checkValueHasRaw(value)}`;
         });
         const query = `${this.$constants('SET')} ${keyValue.join(', ')}`;
@@ -3134,11 +3163,20 @@ class Model extends AbstractModel_1.AbstractModel {
         this.$state.set('SAVE', 'UPDATE');
         return this;
     }
+    /**
+     * The 'getSchemaModel' method is used get a schema model
+     * @return {Record<string, Blueprint> | null} Record<string, Blueprint> | null
+     */
     getSchemaModel() {
         if (this.$schema == null)
             return this.$state.get('SCHEMA_TABLE');
         return this.$schema;
     }
+    /**
+     * The 'validation' method is used validate the column by validating
+     * @param {ValidateSchema} schema
+     * @return {this} this
+     */
     validation(schema) {
         this.$state.set('VALIDATE_SCHEMA', true);
         this.$state.set('VALIDATE_SCHEMA_DEFINED', schema);
@@ -3196,7 +3234,9 @@ class Model extends AbstractModel_1.AbstractModel {
                     };
                 });
             for (let row = 0; row < rows; row++) {
-                this._assertError(this.$state.get('TABLE_NAME') === '' || this.$state.get('TABLE_NAME') == null, "Unknow this table");
+                if (this.$state.get('TABLE_NAME') === '' || this.$state.get('TABLE_NAME') == null) {
+                    throw this._assertError("Unknow this table.");
+                }
                 let columnAndValue = {};
                 for (const { Field: field, Type: type } of fields) {
                     const deletedAt = this._valuePattern(this.$state.get('SOFT_DELETE_FORMAT'));
@@ -3231,7 +3271,7 @@ class Model extends AbstractModel_1.AbstractModel {
             const existsTables = checkTables.map((c) => Object.values(c)[0]);
             const schemaModel = this.getSchemaModel();
             if (schemaModel == null)
-                return this._assertError(schemaModel == null, 'Schema model not found');
+                throw this._assertError(schemaModel == null, 'Schema model not found');
             const checkTableIsExists = existsTables.some((table) => table === this.getTableName());
             const syncForeignKey = (_j) => __awaiter(this, [_j], void 0, function* ({ schemaModel, model }) {
                 var _k;
@@ -3492,7 +3532,7 @@ class Model extends AbstractModel_1.AbstractModel {
                 return;
             const schemaTable = this.getSchemaModel();
             if (schemaTable == null) {
-                return this._assertError(schemaTable == null, `This method "validateSchema" isn't validation without schema. Please use the method "useSchema" for define your schema`);
+                throw this._assertError(`This method "validateSchema" isn't validation without schema. Please use the method "useSchema" for define your schema.`);
             }
             const schemaTableDefined = this.$state.get('VALIDATE_SCHEMA_DEFINED');
             const schema = schemaTableDefined !== null && schemaTableDefined !== void 0 ? schemaTableDefined : Object.keys(schemaTable).reduce((acc, key) => {
@@ -3515,54 +3555,61 @@ class Model extends AbstractModel_1.AbstractModel {
                     if (regexDate.test(r) || regexDateTime.test(r)) {
                         if (typeOf(new Date(r)) === typeOf(new s()))
                             continue;
-                        this._assertError(`This column "${column}" is must be type "${typeOf(new s())}"`);
+                        throw this._assertError(`This column "${column}" is must be type "${typeOf(new s())}".`);
                     }
                     if (typeOf(r) === typeOf(new s()))
                         continue;
-                    this._assertError(`This column "${column}" is must be type "${typeOf(new s())}"`);
-                    continue;
+                    throw this._assertError(`This column "${column}" is must be type "${typeOf(new s())}".`);
+                }
+                if ((s.require && action === 'insert') && (r === '' || r == null)) {
+                    throw this._assertError(`This column "${column}" is required.`);
                 }
-                if (s.require && action === 'insert')
-                    this._assertError(r === '' || r == null, `This column "${column}" is required`);
                 if (r == null)
                     continue;
-                this._assertError((regexDate.test(r) || regexDateTime.test(r)) && typeOf(new Date(r)) !== typeOf(new s.type()) `This column "${column}" is must be type "${typeOf(new s.type())}"`);
-                this._assertError(typeOf(r) !== typeOf(new s.type()), `This column "${column}" is must be type "${typeOf(new s.type())}"`);
+                if ((regexDate.test(r) || regexDateTime.test(r)) && typeOf(new Date(r)) !== typeOf(new s.type())) {
+                    throw this._assertError(`This column "${column}" is must be type "${typeOf(new s.type())}".`);
+                }
+                if (typeOf(r) !== typeOf(new s.type())) {
+                    throw this._assertError(`This column "${column}" is must be type "${typeOf(new s.type())}".`);
+                }
                 if (s.json) {
                     try {
                         JSON.parse(r);
                     }
                     catch (_) {
-                        this._assertError(`This column "${column}" is must be JSON`);
+                        throw this._assertError(`This column "${column}" is must be JSON.`);
                     }
                 }
-                if (s.length) {
-                    return this._assertError((`${r}`.length > s.length), `This column "${column}" is more than "${s.length}" length of characters`);
+                if (s.length && (`${r}`.length > s.length)) {
+                    throw this._assertError(`This column "${column}" is more than "${s.length}" length of characters.`);
                 }
-                if (s.maxLength) {
-                    return this._assertError((`${r}`.length > s.maxLength), `This column "${column}" is more than "${s.maxLength}" length of characters`);
+                if (s.maxLength && (`${r}`.length > s.maxLength)) {
+                    throw this._assertError(`This column "${column}" is more than "${s.maxLength}" length of characters.`);
                 }
-                if (s.minLength) {
-                    return this._assertError((`${r}`.length < s.minLength), `This column "${column}" is less than "${s.minLength}" length of characters`);
+                if (s.minLength && (`${r}`.length < s.minLength)) {
+                    throw this._assertError(`This column "${column}" is less than "${s.minLength}" length of characters`);
                 }
-                if (s.max)
-                    return this._assertError(r > s.max, `This column "${column}" is more than "${s.max}"`);
-                if (s.min)
-                    return this._assertError(r < s.min, `This column "${column}" is less than "${s.min}"`);
-                if (s.enum && s.enum.length) {
-                    return this._assertError(!s.enum.some((e) => e === r), `This column "${column}" is must be in ${s.enum.map((e) => `"${e}"`)}`);
+                if (s.max && r > s.max)
+                    throw this._assertError(`This column "${column}" is more than "${s.max}"`);
+                if (s.min && r < s.min)
+                    throw this._assertError(`This column "${column}" is less than "${s.min}"`);
+                if ((s.enum && s.enum.length) && !s.enum.some((e) => e === r)) {
+                    throw this._assertError(`This column "${column}" is must be in ${s.enum.map((e) => `"${e}"`)}`);
+                }
+                if (s.match && !s.match.test(r)) {
+                    throw this._assertError(`This column "${column}" is not match a regular expression`);
+                }
+                if (s.fn && !(yield s.fn(r))) {
+                    throw this._assertError(`This column "${column}" is not valid with function`);
                 }
-                if (s.match)
-                    return this._assertError(!s.match.test(r), `This column "${column}" is not match a regular expression`);
-                if (s.fn)
-                    return this._assertError(!(yield s.fn(r)), `This column "${column}" is not valid with function`);
                 if (s.unique && action === 'insert') {
                     const exist = yield new Model()
                         .copyModel(this, { select: true, where: true, limit: true })
                         .where(column, r)
                         .debug(this.$state.get('DEBUG'))
                         .exists();
-                    return this._assertError(exist, `This column "${column}" is duplicated`);
+                    if (exist)
+                        throw this._assertError(`This column "${column}" is duplicated`);
                 }
             }
             return;
@@ -3605,12 +3652,14 @@ class Model extends AbstractModel_1.AbstractModel {
             var _a;
             const currentPage = +(this.$state.get('PAGE'));
             const limit = Number(this.$state.get('PER_PAGE'));
-            this._assertError(limit < 1, "This pagination needed limit minimun less 1 for limit");
+            if (limit < 1) {
+                throw this._assertError("This pagination needed limit minimun less 1 for limit");
+            }
             const total = yield new Model()
-                .copyModel(this, { where: true })
+                .copyModel(this, { where: true, join: true })
                 .bind(this.$pool.get())
                 .debug(this.$state.get('DEBUG'))
-                .count();
+                .count(this.$state.get('PRIMARY_KEY'));
             let lastPage = Math.ceil(total / limit) || 0;
             lastPage = lastPage > 1 ? lastPage : 1;
             const nextPage = currentPage + 1;
@@ -3690,7 +3739,7 @@ class Model extends AbstractModel_1.AbstractModel {
                     };
                     break;
                 }
-                default: this._assertError('Missing method first get or pagination');
+                default: throw this._assertError('Missing method first get or pagination');
             }
             if (this._isPatternSnakeCase()) {
                 const empty = this.$utils.snakeCase(this._resultHandler(emptyData));
@@ -3762,7 +3811,9 @@ class Model extends AbstractModel_1.AbstractModel {
                         const pluck = this.$state.get('PLUCK');
                         const newData = res[0];
                         const checkProperty = newData.hasOwnProperty(pluck);
-                        this._assertError(!checkProperty, `Can't find property '${pluck}' of result`);
+                        if (!checkProperty) {
+                            this._assertError(`Can't find property '${pluck}' of results.`);
+                        }
                         result = this._resultHandler(newData[pluck]);
                         break;
                     }
@@ -3781,7 +3832,9 @@ class Model extends AbstractModel_1.AbstractModel {
                         const pluck = this.$state.get('PLUCK');
                         const newData = res[0];
                         const checkProperty = newData.hasOwnProperty(pluck);
-                        this._assertError(!checkProperty, `Can't find property '${pluck}' of result`);
+                        if (!checkProperty) {
+                            throw this._assertError(`Can't find property '${pluck}' of results`);
+                        }
                         result = (_d = this._resultHandler(newData[pluck])) !== null && _d !== void 0 ? _d : null;
                         break;
                     }
@@ -3810,7 +3863,9 @@ class Model extends AbstractModel_1.AbstractModel {
                     if (this.$state.get('PLUCK')) {
                         const pluck = this.$state.get('PLUCK');
                         const newData = data.map((d) => d[pluck]);
-                        this._assertError(newData.every((d) => d == null), `Can't find property '${pluck}' of result`);
+                        if (newData.every((d) => d == null)) {
+                            throw this._assertError(`Can't find property '${pluck}' of results.`);
+                        }
                         result = this._resultHandler(newData);
                         break;
                     }
@@ -3849,9 +3904,13 @@ class Model extends AbstractModel_1.AbstractModel {
     _attach(name, dataId, fields) {
         return __awaiter(this, void 0, void 0, function* () {
             var _a;
-            this._assertError(!Array.isArray(dataId), `this ${dataId} is not an array`);
+            if (!Array.isArray(dataId)) {
+                throw this._assertError(`This '${dataId}' is not an array.`);
+            }
             const relation = (_a = this.$state.get('RELATION')) === null || _a === void 0 ? void 0 : _a.find((data) => data.name === name);
-            this._assertError(!relation, `unknown name relation ['${name}'] in model`);
+            if (!relation) {
+                throw this._assertError(`Unknown relation '${name}' in model.`);
+            }
             const thisTable = this.$utils.columnRelation(this.constructor.name);
             const relationTable = this._classToTableName(relation.model.name, { singular: true });
             const result = this.$state.get('RESULT');
@@ -3882,9 +3941,13 @@ class Model extends AbstractModel_1.AbstractModel {
     }
     _detach(name, dataId) {
         return __awaiter(this, void 0, void 0, function* () {
-            this._assertError(!Array.isArray(dataId), `this ${dataId} is not an array`);
+            if (!Array.isArray(dataId)) {
+                throw this._assertError(`This '${dataId}' is not an array.`);
+            }
             const relation = this.$state.get('RELATION').find((data) => data.name === name);
-            this._assertError(!relation, `unknown name relation [${name}] in model`);
+            if (!relation) {
+                throw this._assertError(`Unknown relation '${name}' in model.`);
+            }
             const thisTable = this.$utils.columnRelation(this.constructor.name);
             const relationTable = this._classToTableName(relation.model.name, { singular: true });
             const result = this.$state.get('RESULT');
@@ -3929,8 +3992,8 @@ class Model extends AbstractModel_1.AbstractModel {
             if (typeof value === 'string' && !(value.includes(this.$constants('RAW')))) {
                 value = this.$utils.escapeActions(value);
             }
-            return `${this.bindColumn(column)} = ${value == null || value === 'NULL'
-                ? 'NULL'
+            return `${this.bindColumn(column)} = ${value == null || value === this.$constants('NULL')
+                ? this.$constants('NULL')
                 : this._checkValueHasRaw(value)}`;
         });
         return `${this.$constants('SET')} ${keyValue.join(', ')}`;
@@ -3954,8 +4017,8 @@ class Model extends AbstractModel_1.AbstractModel {
             if (typeof value === 'string' && !(value.includes(this.$constants('RAW')))) {
                 value = this.$utils.escapeActions(value);
             }
-            return `${value == null || value === 'NULL'
-                ? 'NULL'
+            return `${value == null || value === this.$constants('NULL')
+                ? this.$constants('NULL')
                 : this._checkValueHasRaw(value)}`;
         });
         const sql = [
@@ -3996,8 +4059,8 @@ class Model extends AbstractModel_1.AbstractModel {
                 if (typeof value === 'string' && !(value.includes(this.$constants('RAW')))) {
                     value = this.$utils.escapeActions(value);
                 }
-                return `${value == null || value === 'NULL'
-                    ? 'NULL'
+                return `${value == null || value === this.$constants('NULL')
+                    ? this.$constants('NULL')
                     : this._checkValueHasRaw(value)}`;
             });
             values = [
@@ -4013,7 +4076,9 @@ class Model extends AbstractModel_1.AbstractModel {
     }
     _insertNotExistsModel() {
         return __awaiter(this, void 0, void 0, function* () {
-            this._assertError(!this.$state.get('WHERE').length, "The 'createNotExists' method requires the use of 'where' conditions.");
+            if (!this.$state.get('WHERE').length) {
+                throw this._assertError("The 'createNotExists' method requires the use of 'where' conditions.");
+            }
             const check = (yield new Model()
                 .copyModel(this, { where: true, select: true, limit: true })
                 .bind(this.$pool.get())
@@ -4262,13 +4327,17 @@ class Model extends AbstractModel_1.AbstractModel {
                 const methodCallings = this.$logger.get();
                 const methodsNotAllowed = methodChangeStatements;
                 const findMethodNotAllowed = methodCallings.find((methodCalling) => methodsNotAllowed.includes(methodCalling));
-                this._assertError(methodCallings.some((methodCalling) => methodsNotAllowed.includes(methodCalling)), `This method "${method}" can't using method : [ ${findMethodNotAllowed} ]`);
+                if (methodCallings.some((methodCalling) => methodsNotAllowed.includes(methodCalling))) {
+                    throw this._assertError(`This method '${method}' can't using the method '${findMethodNotAllowed}'.`);
+                }
                 break;
             }
             case 'save': {
                 const methodCallings = this.$logger.get();
                 const methodsSomeAllowed = methodChangeStatements;
-                this._assertError(!methodCallings.some((methodCalling) => methodsSomeAllowed.includes(methodCalling)), `This ${method} method need some : [ ${methodsSomeAllowed.join(', ')} ] methods`);
+                if (!methodCallings.some((methodCalling) => methodsSomeAllowed.includes(methodCalling))) {
+                    throw this._assertError(`This ${method} method need some ${methodsSomeAllowed.map(v => `'${v}'`).join(', ')} methods.`);
+                }
                 break;
             }
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tspace-mysql",
-  "version": "1.5.3",
+  "version": "1.5.5",
   "description": "mysql query builder object relational mapping (ORM)",
   "main": "build/lib/index.js",
   "types": "build/lib/index.d.ts",