tspace-mysql 1.4.3 → 1.4.5

package/README.md

@@ -29,6 +29,7 @@ npm install tspace-mysql --save
   - [Deeply Nested Relations](#deeply-nested-relations)
   - [Relation Exists](#relation-exists)
   - [Built in Relation Functions](#built-in-relation-functions)
+- [Schema Sync](#schema-sync)
 - [Query Builder](#query-builder)
 - [Cli](#cli)
   - [Make Model](#make-model)
@@ -150,6 +151,7 @@ const whereNull = await new DB('users').whereNull('username').findOne()
 const whereNotNull = await new DB('users').whereNotNull('username').findOne()
 const whereQuery = await new DB('users').whereQuery(query => query.where('id',1).where('username','tspace')).whereIn('id',[1,2]).findOne()
     // SELECT * FROM `users` WHERE ( `users`.`id` = '1' AND `users`.`username` = 'tspace') AND `users`.`id` IN ('1','2'') LIMIT 1
+const whereJson= await  new DB('users').whereJson({column : 'json',targetKey : 'id', value : '1234' }).findOne()
 ```
 
 Running A Hook Query
@@ -410,11 +412,12 @@ class User extends Model {
      * this.useTable('users')
      * this.useTableSingular() // => 'user'
      * this.useTablePlural() // => 'users'
-     * this.usePattern('snake_case') // => default 'snake_case'   
+     * this.usePattern('camelCase') // => default 'snake_case'   
      * this.useUUID('uuid') // => runing a uuid (universally unique identifier) when insert new data
      * this.useRegistry() // => build-in functions registry
-     * this.useLoadRelationsInRegistry() // => auto generated results from relationship to results
+     * this.useLoadRelationsInRegistry() // => auto generated result from relationship to results
      * this.useBuiltInRelationFunctions() // => build-in functions relationships to results
+     * this.useHooks([(r) => console.log(r)])
      * this.useSchema ({ 
      *     id          : new Blueprint().int().notNull().primary().autoIncrement(),
      *     uuid        : new Blueprint().varchar(50).null(),
@@ -803,6 +806,61 @@ for (const post of posts) {
 
 ```
 
+## Schema Sync
+Sync schema to Models in your directory, 
+Sync will check for create or update table or columns with useSchema in your model. 
+Let's examine a basic model sync class:
+
+```js
+/**
+* 
+* @Ex directory
+* 
+* - node_modules
+* - app
+*   - Models
+*    - User.ts
+*    - Post.ts
+*
+*  // file User.ts
+*  class User extends Model {
+*      constructor(){
+*          super()
+*          this.hasMany({ name : 'posts' , model : Post })
+*          this.useSchema ({ 
+*               id          : new Blueprint().int().notNull().primary().autoIncrement(),
+*               uuid        : new Blueprint().varchar(50).null(),
+*               email       : new Blueprint().int().notNull().unique(),
+*               name        : new Blueprint().varchar(255).null(),
+*               created_at  : new Blueprint().timestamp().null(),
+*               updated_at  : new Blueprint().timestamp().null(),
+*               deleted_at  : new Blueprint().timestamp().null()
+*           })
+*       }
+*   }
+* 
+*   // file Post.ts
+*   class Post extends Model {
+*      constructor(){
+*          super()
+*          this.hasMany({ name : 'comments' , model : Comment })
+*          this.belongsTo({ name : 'user' , model : User })
+*          this.useSchema ({ 
+*               id          : new Blueprint().int().notNull().primary().autoIncrement(),
+*               uuid        : new Blueprint().varchar(50).null(),
+*               user_id     : new Blueprint().int().notNull(),
+*               title       : new Blueprint().varchar(255).null(),
+*               created_at  : new Blueprint().timestamp().null(),
+*               updated_at  : new Blueprint().timestamp().null(),
+*               deleted_at  : new Blueprint().timestamp().null()
+*           })
+*       }
+*   }
+*  
+*/
+await Schema.sync(`app/Models` , { force : true })
+
+```
 ## Query Builder
 Methods builder for queries
 ```js

package/dist/cli/generate/make.js

@@ -65,9 +65,9 @@ exports.default = (cmd) => {
                 const formattedSchema = formatSchema(schema);
                 let str = "this.useSchema({\n";
                 for (const formatKey in formattedSchema) {
-                    str += `          ${formatKey} : ${formattedSchema[formatKey]} \n`;
+                    str += `        ${formatKey} : ${formattedSchema[formatKey]} \n`;
                 }
-                str += "        })";
+                str += "      })";
                 const data = (0, model_1.default)(model, npm, `${str}`);
                 fs.writeFile(`${cwd}/${dir}/${model}${type !== null && type !== void 0 ? type : '.ts'}`, data, (err) => {
                     if (err)

package/dist/lib/connection/index.js

@@ -114,9 +114,9 @@ class PoolConnection {
             database: String(options_1.default.DATABASE),
             user: String(options_1.default.USERNAME),
             password: String(options_1.default.PASSWORD) === '' ? '' : String(options_1.default.PASSWORD),
-            multipleStatements: options_1.default.MULTIPLE_STATEMENTS || false,
-            enableKeepAlive: options_1.default.ENABLE_KEEP_ALIVE || false,
-            keepAliveInitialDelay: options_1.default.KEEP_ALIVE_DELAY || 0,
+            multipleStatements: Boolean(options_1.default.MULTIPLE_STATEMENTS || false),
+            enableKeepAlive: Boolean(options_1.default.ENABLE_KEEP_ALIVE || false),
+            keepAliveInitialDelay: Number.isNaN(Number(options_1.default.KEEP_ALIVE_DELAY || 0) ? 0 : Number(options_1.default.KEEP_ALIVE_DELAY)),
         }));
     }
     _loadOptions() {

package/dist/lib/constants/index.js

@@ -95,13 +95,12 @@ const CONSTANTS = Object.freeze({
         INSERT: '',
         SELECT: '',
         ONLY: [],
-        EXCEPT: [],
+        EXCEPTS: [],
         CHUNK: 0,
         COUNT: '',
         FROM: '',
         JOIN: '',
         WHERE: '',
-        TEST: [],
         GROUP_BY: '',
         ORDER_BY: '',
         LIMIT: '',
@@ -114,7 +113,7 @@ const CONSTANTS = Object.freeze({
         UUID: false,
         PAGE: 1,
         PER_PAGE: 1,
-        HOOK: []
+        HOOKS: []
     },
     MODEL: {
         PRIMARY_KEY: 'id',
@@ -124,7 +123,7 @@ const CONSTANTS = Object.freeze({
         UPDATE: '',
         INSERT: '',
         ONLY: [],
-        EXCEPT: [],
+        EXCEPTS: [],
         CHUNK: 0,
         COUNT: '',
         FROM: '',
@@ -152,7 +151,7 @@ const CONSTANTS = Object.freeze({
         DISTINCT: '',
         PLUCK: '',
         SAVE: '',
-        HOOK: [],
+        HOOKS: [],
         RELATIONS: [],
         RELATIONS_TRASHED: false,
         RELATIONS_EXISTS: false,
@@ -166,7 +165,7 @@ const CONSTANTS = Object.freeze({
         VALIDATE_SCHEMA_DEFINED: null,
         FUNCTION_RELATION: false,
         SCHEMA_TABLE: null,
-        QUERIES: 0
+        RETRY_QUERIES: 0
     }
 });
 exports.CONSTANTS = CONSTANTS;

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

@@ -10,6 +10,7 @@ declare abstract class AbstractModel extends Builder {
     protected abstract useTableSingular(): this;
     protected abstract useTimestamp(): this;
     protected abstract useSoftDelete(): this;
+    protected abstract useHooks(arrayFunctions: Array<Function>): this;
     protected abstract usePattern(pattern: string): this;
     protected abstract useLoadRelationsInRegistry(): this;
     protected abstract useBuiltInRelationFunctions(): this;

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

@@ -81,6 +81,11 @@ declare class Blueprint {
      * @return {this} this
      */
     longtext(): this;
+    /**
+     * Assign type 'JSON' in table
+     * @return {this} this
+     */
+    json(): this;
     /**
      * Assign type 'MEDIUMTEXT' in table
      * @return {this} this

package/dist/lib/tspace/Blueprint.js

@@ -136,6 +136,14 @@ class Blueprint {
         this._addAssignType(`LONGTEXT`);
         return this;
     }
+    /**
+     * Assign type 'JSON' in table
+     * @return {this} this
+     */
+    json() {
+        this._addAssignType(`JSON`);
+        return this;
+    }
     /**
      * Assign type 'MEDIUMTEXT' in table
      * @return {this} this

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

@@ -66,6 +66,21 @@ declare class Builder extends AbstractBuilder {
     whereObject(columns: {
         [key: string]: any;
     }): this;
+    /**
+     * where json target to key in json values default operator '='
+     * @param    {object}  property
+     * @property {string}  property.column
+     * @property {string}  property.targetKey
+     * @property {string}  property.value
+     * @property {string?} property.operator
+     * @return   {this}
+     */
+    whereJson({ column, targetKey, value, operator }: {
+        column: string;
+        targetKey: string;
+        value: string;
+        operator?: string;
+    }): this;
     /**
      * if has 2 arguments  default operator '='
      * @param {string} column
@@ -265,14 +280,25 @@ declare class Builder extends AbstractBuilder {
     /**
      * select by cases
      * @param {array} cases array object [{ when : 'id < 7' , then : 'id is than under 7'}]
-     * @param {string} as
+     * @param {string} as assign name
      * @return {this}
      */
-    case(cases: string | any[], as: string): this;
+    case(cases: {
+        when: string;
+        then: string;
+    }[], as: string): this;
     /**
      *
      * @param {string} pk talbe.pk
      * @param {string} fk talbe.fk
+     * @example
+     * await new DB('users')
+     * .select('users.id as userId','posts.id as postId','email')
+     * .join('users.id','posts.id')
+     * .join('posts.category_id','categories.id')
+     * .where('users.id',1)
+     * .where('posts.id',2)
+     * .get()
      * @return {this}
      */
     join(pk: string, fk: string): this;

package/dist/lib/tspace/Builder.js

@@ -52,7 +52,7 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
      * @return {this} this
      */
     except(...columns) {
-        this.$state.set('EXCEPT', columns.length ? columns : []);
+        this.$state.set('EXCEPTS', columns.length ? columns : []);
         return this;
     }
     /**
@@ -96,6 +96,8 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
         const select = columns.map((column) => {
             if (column === '*')
                 return column;
+            if (/\./.test(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}\``;
@@ -135,7 +137,7 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
             return this;
         const cb = callback(this);
         if (cb instanceof Promise)
-            throw new Error('"when" is not supported a Promise');
+            throw new Error("'when' is not supported a Promise");
         return this;
     }
     /**
@@ -182,6 +184,28 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
         }
         return this;
     }
+    /**
+     * where json target to key in json values default operator '='
+     * @param    {object}  property
+     * @property {string}  property.column
+     * @property {string}  property.targetKey
+     * @property {string}  property.value
+     * @property {string?} property.operator
+     * @return   {this}
+     */
+    whereJson({ column, targetKey, value, operator }) {
+        value = this.$utils.escape(value);
+        value = this._valueTrueFalse(value);
+        this.$state.set('WHERE', [
+            this._queryWhereIsExists()
+                ? `${this.$state.get('WHERE')} ${this.$constants('AND')}`
+                : `${this.$constants('WHERE')}`,
+            `${this._bindTableAndColumnInQueryWhere(column)}->>'$.${targetKey}'`,
+            `${operator == null ? '=' : operator}`,
+            `${this._checkValueHasRaw(value)}`
+        ].join(' '));
+        return this;
+    }
     /**
      * if has 2 arguments  default operator '='
      * @param {string} column
@@ -387,8 +411,8 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
      * @return {this}
      */
     whereSubQuery(column, subQuery) {
-        if (!this.$utils.isQuery(subQuery))
-            throw new Error(`This "${subQuery}" is invalid sub query`);
+        if (!this.$utils.isSubQuery(subQuery))
+            throw new Error(`This "${subQuery}" is invalid. Sub query is should contain 1 column(s)`);
         this.$state.set('WHERE', [
             this._queryWhereIsExists()
                 ? `${this.$state.get('WHERE')} ${this.$constants('AND')}`
@@ -406,8 +430,8 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
      * @return {this}
      */
     whereNotSubQuery(column, subQuery) {
-        if (!this.$utils.isQuery(subQuery))
-            throw new Error(`This "${subQuery}" is invalid sub query`);
+        if (!this.$utils.isSubQuery(subQuery))
+            throw new Error(`This "${subQuery}" is invalid. Sub query is should contain 1 column(s)`);
         this.$state.set('WHERE', [
             this._queryWhereIsExists()
                 ? `${this.$state.get('WHERE')} ${this.$constants('AND')}`
@@ -425,8 +449,8 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
      * @return {this}
      */
     orWhereSubQuery(column, subQuery) {
-        if (!this.$utils.isQuery(subQuery))
-            throw new Error(`This "${subQuery}" is invalid sub query`);
+        if (!this.$utils.isSubQuery(subQuery))
+            throw new Error(`This "${subQuery}" is invalid. Sub query is should contain 1 column(s)`);
         this.$state.set('WHERE', [
             this._queryWhereIsExists()
                 ? `${this.$state.get('WHERE')} ${this.$constants('OR')}`
@@ -444,8 +468,8 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
      * @return {this}
      */
     orWhereNotSubQuery(column, subQuery) {
-        if (!this.$utils.isQuery(subQuery))
-            throw new Error(`This "${subQuery}" is invalid sub query`);
+        if (!this.$utils.isSubQuery(subQuery))
+            throw new Error(`This "${subQuery}" is invalid sub query (Sub query Operand should contain 1 column(s) not select * )`);
         this.$state.set('WHERE', [
             this._queryWhereIsExists()
                 ? `${this.$state.get('WHERE')} ${this.$constants('OR')}`
@@ -745,7 +769,7 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
     /**
      * select by cases
      * @param {array} cases array object [{ when : 'id < 7' , then : 'id is than under 7'}]
-     * @param {string} as
+     * @param {string} as assign name
      * @return {this}
      */
     case(cases, as) {
@@ -780,6 +804,14 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
      *
      * @param {string} pk talbe.pk
      * @param {string} fk talbe.fk
+     * @example
+     * await new DB('users')
+     * .select('users.id as userId','posts.id as postId','email')
+     * .join('users.id','posts.id')
+     * .join('posts.category_id','categories.id')
+     * .where('users.id',1)
+     * .where('posts.id',2)
+     * .get()
      * @return {this}
      */
     join(pk, fk) {
@@ -789,13 +821,13 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
             this.$state.set('JOIN', [
                 `${this.$state.get('JOIN')}`,
                 `${this.$constants('INNER_JOIN')}`,
-                `${table} ${this.$constants('ON')} ${pk} = ${fk}`
+                `\`${table}\` ${this.$constants('ON')} ${pk} = ${fk}`
             ].join(' '));
             return this;
         }
         this.$state.set('JOIN', [
             `${this.$constants('INNER_JOIN')}`,
-            `${table} ${this.$constants('ON')} ${pk} = ${fk}`
+            `\`${table}\` ${this.$constants('ON')} ${pk} = ${fk}`
         ].join(' '));
         return this;
     }
@@ -812,13 +844,13 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
             this.$state.set('JOIN', [
                 `${this.$state.get('JOIN')}`,
                 `${this.$constants('RIGHT_JOIN')}`,
-                `${table} ${this.$constants('ON')} ${pk} = ${fk}`
+                `\`${table}\` ${this.$constants('ON')} ${pk} = ${fk}`
             ].join(' '));
             return this;
         }
         this.$state.set('JOIN', [
             `${this.$constants('RIGHT_JOIN')}`,
-            `${table} ${this.$constants('ON')} ${pk} = ${fk}`
+            `\`${table}\` ${this.$constants('ON')} ${pk} = ${fk}`
         ].join(' '));
         return this;
     }
@@ -835,13 +867,13 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
             this.$state.set('JOIN', [
                 `${this.$state.get('JOIN')}`,
                 `${this.$constants('LEFT_JOIN')}`,
-                `${table} ${this.$constants('ON')} ${pk} = ${fk}`
+                `\`${table}\` ${this.$constants('ON')} ${pk} = ${fk}`
             ].join(' '));
             return this;
         }
         this.$state.set('JOIN', [
             `${this.$constants('LEFT_JOIN')}`,
-            `${table} ${this.$constants('ON')} ${pk} = ${fk}`
+            `\`${table}\` ${this.$constants('ON')} ${pk} = ${fk}`
         ].join(' '));
         return this;
     }
@@ -858,13 +890,13 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
             this.$state.set('JOIN', [
                 `${this.$state.get('JOIN')}`,
                 `${this.$constants('CROSS_JOIN')}`,
-                `${table} ${this.$constants('ON')} ${pk} = ${fk}`
+                `\`${table}\` ${this.$constants('ON')} ${pk} = ${fk}`
             ].join(' '));
             return this;
         }
         this.$state.set('JOIN', [
             `${this.$constants('CROSS_JOIN')}`,
-            `${table} ${this.$constants('ON')} ${pk} = ${fk}`
+            `\`${table}\` ${this.$constants('ON')} ${pk} = ${fk}`
         ].join(' '));
         return this;
     }
@@ -1227,7 +1259,7 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
     hook(func) {
         if (typeof func !== "function")
             throw new Error(`this '${func}' is not a function`);
-        this.$state.set('HOOK', [...this.$state.get('HOOK'), func]);
+        this.$state.set('HOOKS', [...this.$state.get('HOOKS'), func]);
         return this;
     }
     /**
@@ -1238,7 +1270,7 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
     before(func) {
         if (typeof func !== "function")
             throw new Error(`this '${func}' is not a function`);
-        this.$state.set('HOOK', [...this.$state.get('HOOK'), func]);
+        this.$state.set('HOOKS', [...this.$state.get('HOOKS'), func]);
         return this;
     }
     /**
@@ -1415,19 +1447,36 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
      */
     exceptColumns() {
         return __awaiter(this, void 0, void 0, function* () {
-            const sql = [
-                `${this.$constants('SHOW')}`,
-                `${this.$constants('COLUMNS')}`,
-                `${this.$constants('FROM')}`,
-                `${this.$state.get('TABLE_NAME')}`
-            ].join(' ');
-            const rawColumns = yield this.queryStatement(sql);
-            const columns = rawColumns.map((column) => column.Field);
-            const removeExcept = columns.filter((column) => {
-                const excepts = this.$state.get('EXCEPT');
-                return excepts.every((except) => except !== column);
-            });
-            return removeExcept;
+            const excepts = this.$state.get('EXCEPTS');
+            const hasDot = excepts.some((except) => /\./.test(except));
+            const names = excepts.map((except) => {
+                if (/\./.test(except))
+                    return except.split('.')[0];
+                return null;
+            }).filter((d) => d != null);
+            const tableNames = names.length ? [...new Set(names)] : [this.$state.get('TABLE_NAME')];
+            const removeExcepts = [];
+            for (const tableName of tableNames) {
+                const sql = [
+                    `${this.$constants('SHOW')}`,
+                    `${this.$constants('COLUMNS')}`,
+                    `${this.$constants('FROM')}`,
+                    `${tableName}`
+                ].join(' ');
+                const rawColumns = yield this.queryStatement(sql);
+                const columns = rawColumns.map((column) => column.Field);
+                const removeExcept = columns.filter((column) => {
+                    return excepts.every((except) => {
+                        if (/\./.test(except)) {
+                            const [table, _] = except.split('.');
+                            return except !== `${table}.${column}`;
+                        }
+                        return except !== column;
+                    });
+                });
+                removeExcepts.push(hasDot ? removeExcept.map(r => `\`${tableName}\`.${r}`) : removeExcept);
+            }
+            return removeExcepts.flat();
         });
     }
     /**
@@ -1614,7 +1663,7 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
     first() {
         var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
-            if ((_a = this.$state.get('EXCEPT')) === null || _a === void 0 ? void 0 : _a.length)
+            if ((_a = this.$state.get('EXCEPTS')) === null || _a === void 0 ? void 0 : _a.length)
                 this.select(...yield this.exceptColumns());
             this.limit(1);
             let sql = this._buildQuery();
@@ -1628,15 +1677,11 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
                 if (!checkProperty)
                     throw new Error(`can't find property '${pluck}' of result`);
                 const r = newData[pluck] || null;
-                const hook = this.$state.get('HOOK');
-                for (let i in hook)
-                    yield hook[i](r);
+                yield this.$utils.hookHandle(this.$state.get('HOOKS'), r);
                 return r;
             }
             const r = (result === null || result === void 0 ? void 0 : result.shift()) || null;
-            const hook = this.$state.get('HOOK');
-            for (let i in hook)
-                yield hook[i](r);
+            yield this.$utils.hookHandle(this.$state.get('HOOKS'), r);
             return this.resultHandler(r);
         });
     }
@@ -1658,7 +1703,7 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
     firstOrError(message, options) {
         var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
-            if ((_a = this.$state.get('EXCEPT')) === null || _a === void 0 ? void 0 : _a.length)
+            if ((_a = this.$state.get('EXCEPTS')) === null || _a === void 0 ? void 0 : _a.length)
                 this.select(...yield this.exceptColumns());
             let sql = this._buildQuery();
             if (!sql.includes(this.$constants('LIMIT')))
@@ -1676,14 +1721,11 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
                     throw new Error(`can't find property '${pluck}' of result`);
                 const data = newData[pluck] || null;
                 if (data == null) {
-                    if (options == null) {
+                    if (options == null)
                         throw { message, code: 400 };
-                    }
                     throw Object.assign({ message }, options);
                 }
-                const hook = this.$state.get('HOOK');
-                for (let i in hook)
-                    yield hook[i](data);
+                yield this.$utils.hookHandle(this.$state.get('HOOKS'), data);
                 return this.resultHandler(data);
             }
             const data = (result === null || result === void 0 ? void 0 : result.shift()) || null;
@@ -1693,9 +1735,7 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
                 }
                 throw Object.assign({ message }, options);
             }
-            const hook = this.$state.get('HOOK');
-            for (let i in hook)
-                yield hook[i](data);
+            yield this.$utils.hookHandle(this.$state.get('HOOKS'), data);
             return this.resultHandler(data);
         });
     }
@@ -1717,7 +1757,7 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
     get() {
         var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
-            if ((_a = this.$state.get('EXCEPT')) === null || _a === void 0 ? void 0 : _a.length)
+            if ((_a = this.$state.get('EXCEPTS')) === null || _a === void 0 ? void 0 : _a.length)
                 this.select(...yield this.exceptColumns());
             const sql = this._buildQuery();
             const result = yield this.queryStatement(sql);
@@ -1731,9 +1771,7 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
                     resultArray[chunkIndex].push(item);
                     return resultArray;
                 }, []);
-                const hook = this.$state.get('HOOK');
-                for (let i in hook)
-                    yield hook[i](data || []);
+                yield this.$utils.hookHandle(this.$state.get('HOOKS'), data || []);
                 return this.resultHandler(data || []);
             }
             if (this.$state.get('PLUCK')) {
@@ -1742,14 +1780,10 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
                 if (newData.every((d) => d == null)) {
                     throw new Error(`can't find property '${pluck}' of result`);
                 }
-                const hook = this.$state.get('HOOK');
-                for (let i in hook)
-                    yield hook[i](newData || []);
+                yield this.$utils.hookHandle(this.$state.get('HOOKS'), newData || []);
                 return this.resultHandler(newData || []);
             }
-            const hook = this.$state.get('HOOK');
-            for (let i in hook)
-                yield hook[i](result || []);
+            yield this.$utils.hookHandle(this.$state.get('HOOKS'), result || []);
             return this.resultHandler(result || []);
         });
     }
@@ -1771,7 +1805,7 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
     toJSON() {
         var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
-            if ((_a = this.$state.get('EXCEPT')) === null || _a === void 0 ? void 0 : _a.length)
+            if ((_a = this.$state.get('EXCEPTS')) === null || _a === void 0 ? void 0 : _a.length)
                 this.select(...yield this.exceptColumns());
             const sql = this._buildQuery();
             const result = yield this.queryStatement(sql);
@@ -2496,7 +2530,10 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
         return ((_a = String(this.$state.get('WHERE'))) === null || _a === void 0 ? void 0 : _a.includes(this.$constants('WHERE'))) || false;
     }
     _bindTableAndColumnInQueryWhere(column) {
-        return `${this.$state.get('TABLE_NAME')}.\`${column}\``;
+        if (!/\./.test(column))
+            return `${this.$state.get('TABLE_NAME')}.\`${column}\``;
+        const [table, c] = column.split('.');
+        return `\`${table}\`.\`${c}\``;
     }
     _insertNotExists() {
         return __awaiter(this, void 0, void 0, function* () {

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

@@ -241,7 +241,7 @@ declare class Model extends AbstractModel {
      * }
      * @return {this}
     */
-    protected useHook(arrayFunctions: Array<Function>): this;
+    protected useHooks(arrayFunctions: Array<Function>): this;
     /**
      * exceptColumns for method except
      * @return {promise<string>} string
@@ -711,6 +711,12 @@ declare class Model extends AbstractModel {
      * @return {string}
     */
     toSQL(): string;
+    /**
+     *
+     * @override Method
+     * @return {string}
+    */
+    toRawSQL(): string;
     /**
      *
      * @override Method
@@ -974,6 +980,8 @@ declare class Model extends AbstractModel {
      * @return {this} this this
      */
     getSchema(): Promise<any>;
+    getSchemaModel(): Promise<any>;
+    getTableName(): any;
     /**
      *
      * @override Method

package/dist/lib/tspace/Model.js

@@ -339,11 +339,11 @@ class Model extends AbstractModel_1.AbstractModel {
      * }
      * @return {this}
     */
-    useHook(arrayFunctions) {
+    useHooks(arrayFunctions) {
         for (const func of arrayFunctions) {
             if (typeof func !== "function")
                 throw new Error(`this '${func}' is not a function`);
-            this.$state.set('HOOK', [...this.$state.get('HOOK'), func]);
+            this.$state.set('HOOKS', [...this.$state.get('HOOKS'), func]);
         }
         return this;
     }
@@ -353,26 +353,50 @@ class Model extends AbstractModel_1.AbstractModel {
      */
     exceptColumns() {
         return __awaiter(this, void 0, void 0, function* () {
-            if (this.$state.get('SCHEMA_TABLE')) {
-                const columns = Object.keys(this.$state.get('SCHEMA_TABLE'));
+            const excepts = this.$state.get('EXCEPTS');
+            const hasDot = excepts.some((except) => /\./.test(except));
+            const names = excepts.map((except) => {
+                if (/\./.test(except))
+                    return except.split('.')[0];
+                return null;
+            }).filter((d) => d != null);
+            const tableNames = names.length ? [...new Set(names)] : [this.$state.get('TABLE_NAME')];
+            const removeExcepts = [];
+            for (const tableName of tableNames) {
+                if (this.$state.get('SCHEMA_TABLE') && (tableName === this.$state.get('TABLE_NAME').replace(/`/g, ''))) {
+                    const columns = Object.keys(this.$state.get('SCHEMA_TABLE'));
+                    const removeExcept = columns.filter((column) => {
+                        return excepts.every((except) => {
+                            if (/\./.test(except)) {
+                                const [table, _] = except.split('.');
+                                return except !== `${table}.${column}`;
+                            }
+                            return except !== column;
+                        });
+                    });
+                    removeExcepts.push(hasDot ? removeExcept.map(r => `\`${tableName}\`.${r}`) : removeExcept);
+                    continue;
+                }
+                const sql = [
+                    `${this.$constants('SHOW')}`,
+                    `${this.$constants('COLUMNS')}`,
+                    `${this.$constants('FROM')}`,
+                    `${tableName}`
+                ].join(' ');
+                const rawColumns = yield this.queryStatement(sql);
+                const columns = rawColumns.map((column) => column.Field);
                 const removeExcept = columns.filter((column) => {
-                    const excepts = this.$state.get('EXCEPT');
-                    return excepts.every((except) => except !== column);
+                    return excepts.every((except) => {
+                        if (/\./.test(except)) {
+                            const [table, _] = except.split('.');
+                            return except !== `${table}.${column}`;
+                        }
+                        return except !== column;
+                    });
                 });
-                return removeExcept;
+                removeExcepts.push(hasDot ? removeExcept.map(r => `\`${tableName}\`.${r}`) : removeExcept);
             }
-            const rawColumns = yield this.queryStatement([
-                `${this.$constants('SHOW')}`,
-                `${this.$constants('COLUMNS')}`,
-                `${this.$constants('FROM')}`,
-                `${this.$state.get('TABLE_NAME')}`
-            ].join(' '));
-            const columns = rawColumns.map((column) => column.Field);
-            const removeExcept = columns.filter((column) => {
-                const excepts = this.$state.get('EXCEPT');
-                return excepts.every((except) => except !== column);
-            });
-            return removeExcept;
+            return removeExcepts.flat();
         });
     }
     /**
@@ -418,6 +442,8 @@ class Model extends AbstractModel_1.AbstractModel {
         const copy = Object.fromEntries(instance.$state.get());
         const newInstance = new Model();
         newInstance.$state.clone(copy);
+        newInstance.$state.set('SAVE', '');
+        newInstance.$state.set('DEBUG', false);
         if ((options === null || options === void 0 ? void 0 : options.insert) == null)
             newInstance.$state.set('INSERT', '');
         if ((options === null || options === void 0 ? void 0 : options.update) == null)
@@ -430,7 +456,6 @@ class Model extends AbstractModel_1.AbstractModel {
             newInstance.$state.set('LIMIT', '');
         if ((options === null || options === void 0 ? void 0 : options.offset) == null)
             newInstance.$state.set('OFFSET', '');
-        newInstance.$state.set('SAVE', '');
         return newInstance;
     }
     /**
@@ -445,12 +470,12 @@ class Model extends AbstractModel_1.AbstractModel {
             try {
                 if (this.$state.get('DEBUG'))
                     this.$utils.consoleDebug(sql);
-                this.$state.set('QUERIES', this.$state.get('QUERIES') + 1);
+                this.$state.set('RETRY_QUERIES', Number(this.$state.get('RETRY_QUERIES')) + 1);
                 const result = yield this.$pool.query(sql);
                 return result;
             }
-            catch (e) {
-                yield this._checkSchemaOrNextError(e);
+            catch (error) {
+                yield this._checkSchemaOrNextError(error);
                 return yield this.queryStatement(sql);
             }
         });
@@ -469,7 +494,7 @@ class Model extends AbstractModel_1.AbstractModel {
             try {
                 if (this.$state.get('DEBUG'))
                     this.$utils.consoleDebug(sql);
-                this.$state.set('QUERIES', this.$state.get('QUERIES') + 1);
+                this.$state.set('RETRY_QUERIES', Number(this.$state.get('RETRY_QUERIES')) + 1);
                 if (returnId) {
                     const result = yield this.$pool.query(sql);
                     return [result.affectedRows, result.insertId];
@@ -1173,6 +1198,17 @@ class Model extends AbstractModel_1.AbstractModel {
             this.$utils.consoleDebug(sql);
         return this.resultHandler(sql);
     }
+    /**
+     *
+     * @override Method
+     * @return {string}
+    */
+    toRawSQL() {
+        const sql = this._buildQueryModel();
+        if (this.$state.get('DEBUG'))
+            this.$utils.consoleDebug(sql);
+        return this.resultHandler(sql);
+    }
     /**
      *
      * @override Method
@@ -1344,7 +1380,7 @@ class Model extends AbstractModel_1.AbstractModel {
             this._validateMethod('first');
             if (this.$state.get('VOID'))
                 return this.resultHandler(null);
-            if ((_a = this.$state.get('EXCEPT')) === null || _a === void 0 ? void 0 : _a.length)
+            if ((_a = this.$state.get('EXCEPTS')) === null || _a === void 0 ? void 0 : _a.length)
                 this.select(...yield this.exceptColumns());
             this.limit(1);
             if (this.$state.get('RELATIONS_EXISTS')) {
@@ -1378,7 +1414,7 @@ class Model extends AbstractModel_1.AbstractModel {
         var _a;
         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)
+            if ((_a = this.$state.get('EXCEPTS')) === null || _a === void 0 ? void 0 : _a.length)
                 this.select(...yield this.exceptColumns());
             this.limit(1);
             if (this.$state.get('RELATIONS_EXISTS')) {
@@ -1416,7 +1452,7 @@ class Model extends AbstractModel_1.AbstractModel {
             this._validateMethod('get');
             if (this.$state.get('VOID'))
                 return [];
-            if ((_a = this.$state.get('EXCEPT')) === null || _a === void 0 ? void 0 : _a.length)
+            if ((_a = this.$state.get('EXCEPTS')) === null || _a === void 0 ? void 0 : _a.length)
                 this.select(...yield this.exceptColumns());
             let sql = this._buildQueryModel();
             if (this.$state.get('RELATIONS_EXISTS'))
@@ -1455,7 +1491,7 @@ class Model extends AbstractModel_1.AbstractModel {
                 limit = (paginationOptions === null || paginationOptions === void 0 ? void 0 : paginationOptions.limit) || limit;
                 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)
+            if ((_a = this.$state.get('EXCEPTS')) === null || _a === void 0 ? void 0 : _a.length)
                 this.select(...yield this.exceptColumns());
             const offset = (page - 1) * limit;
             this.$state.set('PER_PAGE', limit);
@@ -1493,7 +1529,7 @@ class Model extends AbstractModel_1.AbstractModel {
     getGroupBy(column) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
-            if ((_a = this.$state.get('EXCEPT')) === null || _a === void 0 ? void 0 : _a.length)
+            if ((_a = this.$state.get('EXCEPTS')) === null || _a === void 0 ? void 0 : _a.length)
                 this.select(...yield this.exceptColumns());
             this.$state.set('GROUP_BY', `${this.$constants('GROUP_BY')} ${column}`);
             this.$state.set('SELECT', [
@@ -1723,6 +1759,15 @@ class Model extends AbstractModel_1.AbstractModel {
             return yield this.queryStatement(sql);
         });
     }
+    getSchemaModel() {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.$state.get('SCHEMA_TABLE');
+        });
+    }
+    getTableName() {
+        var _a;
+        return (_a = this.$state.get('TABLE_NAME')) === null || _a === void 0 ? void 0 : _a.replace(/`/g, '');
+    }
     /**
      *
      * @override Method
@@ -2341,15 +2386,11 @@ class Model extends AbstractModel_1.AbstractModel {
             }
             if (this._isPatternSnakeCase()) {
                 const empty = this.$utils.snakeCase(this.resultHandler(emptyData));
-                const hook = this.$state.get('HOOK');
-                for (let i in hook)
-                    yield hook[i](empty);
+                yield this.$utils.hookHandle(this.$state.get('HOOKS'), empty);
                 return empty;
             }
             const empty = this.resultHandler(emptyData);
-            const hook = this.$state.get('HOOK');
-            for (let i in hook)
-                yield hook[i](empty);
+            yield this.$utils.hookHandle(this.$state.get('HOOKS'), empty);
             return empty;
         });
     }
@@ -2441,9 +2482,7 @@ class Model extends AbstractModel_1.AbstractModel {
                     throw new Error('Missing method first get or pagination');
                 }
             }
-            const hook = this.$state.get('HOOK');
-            for (let i in hook)
-                yield hook[i](result);
+            yield this.$utils.hookHandle(this.$state.get('HOOKS'), result);
             return result;
         });
     }
@@ -2835,7 +2874,7 @@ class Model extends AbstractModel_1.AbstractModel {
         var _a, _b, _c, _d, _e;
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                if (this.$state.get('QUERIES') > 3)
+                if (this.$state.get('RETRY_QUERIES') > 3)
                     throw e;
                 const schemaTable = this.$state.get('SCHEMA_TABLE');
                 if (schemaTable == null)
@@ -2862,7 +2901,8 @@ class Model extends AbstractModel_1.AbstractModel {
                         `${this.$state.get('TABLE_NAME')}`,
                         `${this.$constants('ADD')}`,
                         `\`${column}\` ${type} ${attributes.join(' ')}`,
-                        `${this.$constants('AFTER')} \`${findAfterIndex !== null && findAfterIndex !== void 0 ? findAfterIndex : ''}\``
+                        `${this.$constants('AFTER')}`,
+                        `\`${findAfterIndex !== null && findAfterIndex !== void 0 ? findAfterIndex : ''}\``
                     ].join(' ');
                     yield this.queryStatement(sql);
                     return;

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

@@ -2,6 +2,64 @@ import { Builder } from "./Builder";
 declare class Schema extends Builder {
     table: (table: string, schemas: Record<string, any>) => Promise<void>;
     createTable: (table: string, schemas: Record<string, any>) => string;
+    /**
+     *
+     * Sync will check for create or update table or columns with useSchema in your model.
+     * @param {string} pathFolders directory to models
+     * @property {boolean} options.force - forec to always check columns is exists
+     * @property {boolean} options.log   - show log execution with sql statements
+     * @property {boolean} options.delay - wait for execution
+     * @example
+     *
+     * - node_modules
+     * - app
+     *   - Models
+     *     - User.ts
+     *     - Post.ts
+     *
+     *  // file User.ts
+     *  class User extends Model {
+     *      constructor(){
+     *          super()
+     *          this.hasMany({ name : 'posts' , model : Post })
+     *          this.useSchema ({
+     *               id          : new Blueprint().int().notNull().primary().autoIncrement(),
+     *               uuid        : new Blueprint().varchar(50).null(),
+     *               email       : new Blueprint().int().notNull().unique(),
+     *               name        : new Blueprint().varchar(255).null(),
+     *               created_at  : new Blueprint().timestamp().null(),
+     *               updated_at  : new Blueprint().timestamp().null(),
+     *               deleted_at  : new Blueprint().timestamp().null()
+     *           })
+     *       }
+     *   }
+     *
+     *   // file Post.ts
+     *   class Post extends Model {
+     *      constructor(){
+     *          super()
+     *          this.hasMany({ name : 'comments' , model : Comment })
+     *          this.belongsTo({ name : 'user' , model : User })
+     *          this.useSchema ({
+     *               id          : new Blueprint().int().notNull().primary().autoIncrement(),
+     *               uuid        : new Blueprint().varchar(50).null(),
+     *               user_id     : new Blueprint().int().notNull(),
+     *               title       : new Blueprint().varchar(255).null(),
+     *               created_at  : new Blueprint().timestamp().null(),
+     *               updated_at  : new Blueprint().timestamp().null(),
+     *               deleted_at  : new Blueprint().timestamp().null()
+     *           })
+     *       }
+     *   }
+     *
+     *  await Schema.sync(`app/Models` , { force : true })
+     */
+    static sync(pathFolders: string, { force, log, delay }?: {
+        force?: boolean | undefined;
+        log?: boolean | undefined;
+        delay?: number | undefined;
+    }): Promise<void>;
+    private static _syncExecute;
 }
 export { Schema };
 export default Schema;

package/dist/lib/tspace/Schema.js

@@ -1,4 +1,27 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -8,9 +31,15 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Schema = void 0;
 const Builder_1 = require("./Builder");
+const Model_1 = require("./Model");
+const fs_1 = __importDefault(require("fs"));
+const path_1 = __importDefault(require("path"));
 class Schema extends Builder_1.Builder {
     constructor() {
         super(...arguments);
@@ -57,6 +86,119 @@ class Schema extends Builder_1.Builder {
             return sql;
         };
     }
+    /**
+     *
+     * Sync will check for create or update table or columns with useSchema in your model.
+     * @param {string} pathFolders directory to models
+     * @property {boolean} options.force - forec to always check columns is exists
+     * @property {boolean} options.log   - show log execution with sql statements
+     * @property {boolean} options.delay - wait for execution
+     * @example
+     *
+     * - node_modules
+     * - app
+     *   - Models
+     *     - User.ts
+     *     - Post.ts
+     *
+     *  // file User.ts
+     *  class User extends Model {
+     *      constructor(){
+     *          super()
+     *          this.hasMany({ name : 'posts' , model : Post })
+     *          this.useSchema ({
+     *               id          : new Blueprint().int().notNull().primary().autoIncrement(),
+     *               uuid        : new Blueprint().varchar(50).null(),
+     *               email       : new Blueprint().int().notNull().unique(),
+     *               name        : new Blueprint().varchar(255).null(),
+     *               created_at  : new Blueprint().timestamp().null(),
+     *               updated_at  : new Blueprint().timestamp().null(),
+     *               deleted_at  : new Blueprint().timestamp().null()
+     *           })
+     *       }
+     *   }
+     *
+     *   // file Post.ts
+     *   class Post extends Model {
+     *      constructor(){
+     *          super()
+     *          this.hasMany({ name : 'comments' , model : Comment })
+     *          this.belongsTo({ name : 'user' , model : User })
+     *          this.useSchema ({
+     *               id          : new Blueprint().int().notNull().primary().autoIncrement(),
+     *               uuid        : new Blueprint().varchar(50).null(),
+     *               user_id     : new Blueprint().int().notNull(),
+     *               title       : new Blueprint().varchar(255).null(),
+     *               created_at  : new Blueprint().timestamp().null(),
+     *               updated_at  : new Blueprint().timestamp().null(),
+     *               deleted_at  : new Blueprint().timestamp().null()
+     *           })
+     *       }
+     *   }
+     *
+     *  await Schema.sync(`app/Models` , { force : true })
+     */
+    static sync(pathFolders, { force = false, log = false, delay = 3000 } = {}) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const directories = fs_1.default.readdirSync(pathFolders, { withFileTypes: true });
+            const files = yield Promise.all(directories.map((directory) => {
+                const newDir = path_1.default.resolve(String(pathFolders), directory.name);
+                if (directory.isDirectory() && directory.name.toLocaleLowerCase().includes('migrations'))
+                    return null;
+                return directory.isDirectory() ? Schema.sync(newDir, { force, log, delay }) : newDir;
+            }));
+            const pathModels = [].concat(...files).filter(d => d != null || d === '');
+            yield new Promise(r => setTimeout(r, delay));
+            const promises = pathModels.map((pathModel) => Schema._syncExecute({ pathModel, force, log }));
+            yield Promise.all(promises);
+            return;
+        });
+    }
+    static _syncExecute({ pathModel, force, log }) {
+        var _a, _b, _c, _d;
+        return __awaiter(this, void 0, void 0, function* () {
+            const loadModel = yield Promise.resolve(`${pathModel}`).then(s => __importStar(require(s)));
+            if (!loadModel.hasOwnProperty('default') && !(loadModel instanceof Model_1.Model))
+                return;
+            const model = new loadModel.default();
+            const schemaModel = yield model.getSchemaModel();
+            if (!schemaModel)
+                return;
+            const checkTableIsExists = Boolean((yield new Builder_1.Builder().rawQuery(`SHOW TABLES LIKE '${model.getTableName()}';`)).length);
+            if (!checkTableIsExists) {
+                const sql = new Schema().createTable(model.getTableName(), schemaModel);
+                yield new Builder_1.Builder().dd(log).rawQuery(sql);
+                return;
+            }
+            if (!force)
+                return;
+            const schemaTable = yield model.getSchema();
+            const schemaTableKeys = schemaTable.map((k) => k.Field);
+            const schemaModelKeys = Object.keys(schemaModel);
+            const missingColumns = schemaModelKeys.filter(schemaModelKey => !schemaTableKeys.includes(schemaModelKey));
+            if (!missingColumns.length)
+                return;
+            const entries = Object.entries(schemaModel);
+            for (const column of missingColumns) {
+                const indexWithColumn = entries.findIndex(([key]) => key === column);
+                const findAfterIndex = indexWithColumn ? entries[indexWithColumn - 1][0] : null;
+                const type = (_b = (_a = schemaModel[column]) === null || _a === void 0 ? void 0 : _a.type) !== null && _b !== void 0 ? _b : null;
+                const attributes = (_d = (_c = schemaModel[column]) === null || _c === void 0 ? void 0 : _c.attributes) !== null && _d !== void 0 ? _d : null;
+                if (findAfterIndex == null || type == null || attributes == null)
+                    continue;
+                const sql = [
+                    'ALTER TABLE',
+                    `\`${model.getTableName()}\``,
+                    'ADD',
+                    `\`${column}\` ${type} ${attributes.join(' ')}`,
+                    'AFTER',
+                    `\`${findAfterIndex}\``
+                ].join(' ');
+                yield new Builder_1.Builder().dd(log).rawQuery(sql);
+            }
+            return;
+        });
+    }
 }
 exports.Schema = Schema;
 exports.default = Schema;

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

@@ -5,12 +5,13 @@ declare const utils: {
     timestamp: () => string;
     date: () => string;
     escape: (str: any) => any;
-    isQuery: (str: string) => boolean;
+    isSubQuery: (subQuery: string) => boolean;
     generateUUID: () => string;
     covertBooleanToNumber: (data: any) => any;
     snakeCase: (data: any) => any;
     camelCase: (data: any) => any;
     randomString: (length?: number) => string;
+    hookHandle: (hooks: Function[], result: any[] | null) => Promise<void>;
 };
 export { utils };
 export default utils;

package/dist/lib/utils/index.js

@@ -1,4 +1,13 @@
 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.utils = void 0;
 const timestamp = () => {
@@ -34,7 +43,18 @@ const escape = (str) => {
         return str;
     return str.replace(/[\0\b\t\n\r\x1a\'\\]/g, '');
 };
-const isQuery = (str) => /\b(?:SELECT|FROM|WHERE|JOIN|INNER JOIN|LEFT JOIN|RIGHT JOIN|OUTER JOIN|AND|OR|ORDER BY|GROUP BY|LIMIT)\b/i.test(str);
+const isSubQuery = (subQuery) => {
+    const checkIsSubQuery = (/\bSELECT\s+(?!\*)/i.test(subQuery));
+    if (!checkIsSubQuery)
+        return false;
+    const selectMatch = subQuery.match(/^\s*SELECT\s+(.*)\s+FROM/i);
+    if (!selectMatch)
+        return false;
+    const selectColumns = selectMatch[1].trim().split(',');
+    if (selectColumns.length !== 1)
+        return false;
+    return true;
+};
 const columnRelation = (name) => {
     var _a;
     const matches = (_a = name === null || name === void 0 ? void 0 : name.match(/[A-Z]/g)) !== null && _a !== void 0 ? _a : [];
@@ -108,7 +128,7 @@ const randomString = (length = 100) => {
     for (let i = 0; i < length / salt; i++) {
         str += Math.random().toString(36).substring(salt);
     }
-    return str.slice(-length).toLocaleLowerCase().replace(/'/g, 'g');
+    return str.toLocaleLowerCase().replace(/'/g, '').slice(-length);
 };
 const faker = (value) => {
     var _a, _b;
@@ -139,6 +159,11 @@ const faker = (value) => {
     }
     return 'fake data';
 };
+const hookHandle = (hooks, result) => __awaiter(void 0, void 0, void 0, function* () {
+    for (const hook of hooks)
+        yield hook(result);
+    return;
+});
 const utils = {
     consoleDebug,
     faker,
@@ -146,12 +171,13 @@ const utils = {
     timestamp,
     date,
     escape,
-    isQuery,
+    isSubQuery,
     generateUUID,
     covertBooleanToNumber,
     snakeCase,
     camelCase,
-    randomString
+    randomString,
+    hookHandle
 };
 exports.utils = utils;
 exports.default = utils;

package/package.json

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