tspace-mysql 1.4.7 → 1.4.8

package/dist/lib/tspace/Model.js

@@ -16,10 +16,10 @@ exports.Model = void 0;
 const pluralize_1 = __importDefault(require("pluralize"));
 const DB_1 = require("./DB");
 const Schema_1 = require("./Schema");
-const AbstractModel_1 = require("./Abstract/AbstractModel");
-const ProxyHandler_1 = require("./ProxyHandler");
-const StateHandler_1 = require("./StateHandler");
-const RelationHandler_1 = require("./RelationHandler");
+const AbstractModel_1 = require("./Abstracts/AbstractModel");
+const Proxy_1 = require("./Handlers/Proxy");
+const State_1 = require("./Handlers/State");
+const Relation_1 = require("./Handlers/Relation");
 /**
  *
  * 'Model' class is a representation of a database table
@@ -41,7 +41,7 @@ class Model extends AbstractModel_1.AbstractModel {
          */
         this.define();
         this.boot();
-        return new Proxy(this, ProxyHandler_1.proxyHandler);
+        return new Proxy(this, Proxy_1.proxyHandler);
     }
     /**
      * The 'define' method is a special method that you can define within a model.
@@ -145,7 +145,6 @@ class Model extends AbstractModel_1.AbstractModel {
      *        this.useRegistry()
      *     }
      * }
-     
      */
     useRegistry() {
         this._setState('REGISTRY', Object.assign(Object.assign({}, this._getState('REGISTRY')), { '$attach': this._attach, '$detach': this._detach }));
@@ -247,11 +246,31 @@ class Model extends AbstractModel_1.AbstractModel {
         this._makeTableName();
         return this;
     }
+    /**
+     * The "useCamelCase" method is used to assign pattern camelCase.
+     * @return {this} this
+     * @example
+     * class User extends Model {
+     *     constructor() {
+     *        this.useCamelCase()
+     *     }
+     * }
+     */
     useCamelCase() {
         this._setState('PATTERN', this.$constants('PATTERN').camelCase);
         this._makeTableName();
         return this;
     }
+    /**
+     * The "SnakeCase" method is used to assign pattern snake_case.
+     * @return {this} this
+     * @example
+     * class User extends Model {
+     *     constructor() {
+     *        this.SnakeCase()
+     *     }
+     * }
+     */
     useSnakeCase() {
         this._setState('PATTERN', this.$constants('PATTERN').snake_case);
         this._makeTableName();
@@ -447,7 +466,7 @@ class Model extends AbstractModel_1.AbstractModel {
      * @override
      * @return {promise<string>} string
      */
-    _exceptColumns() {
+    exceptColumns() {
         return __awaiter(this, void 0, void 0, function* () {
             const excepts = this._getState('EXCEPTS');
             const hasDot = excepts.some((except) => /\./.test(except));
@@ -459,7 +478,11 @@ class Model extends AbstractModel_1.AbstractModel {
             const tableNames = names.length ? [...new Set(names)] : [this._getState('TABLE_NAME')];
             const removeExcepts = [];
             for (const tableName of tableNames) {
-                if (this._getState('SCHEMA_TABLE') && (tableName === this._getState('TABLE_NAME').replace(/`/g, ''))) {
+                const isHasSchema = [
+                    this._getState('SCHEMA_TABLE') != null,
+                    tableName.replace(/`/g, '') === this._getState('TABLE_NAME').replace(/`/g, '')
+                ].every(d => d);
+                if (isHasSchema) {
                     const columns = Object.keys(this._getState('SCHEMA_TABLE'));
                     const removeExcept = columns.filter((column) => {
                         return excepts.every((except) => {
@@ -470,7 +493,7 @@ class Model extends AbstractModel_1.AbstractModel {
                             return except !== column;
                         });
                     });
-                    removeExcepts.push(hasDot ? removeExcept.map(r => `\`${tableName}\`.${r}`) : removeExcept);
+                    removeExcepts.push(hasDot ? removeExcept.map(r => `${tableName}.${r}`) : removeExcept);
                     continue;
                 }
                 const sql = [
@@ -515,6 +538,135 @@ class Model extends AbstractModel_1.AbstractModel {
         relation.query = callback(new relation.model());
         return this;
     }
+    /**
+     *
+     * The 'makeSelectStatement' method is used to make select statement.
+     * @return {Promise<string>} string
+     */
+    makeSelectStatement() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const schemaModel = this.getSchemaModel();
+            const makeStatement = (columns) => {
+                return [
+                    `${this.$constants('SELECT')}`,
+                    `${columns.join(', ')}`,
+                    `${this.$constants('FROM')}`,
+                    `\`${this.getTableName()}\``,
+                ].join(' ');
+            };
+            if (schemaModel == null) {
+                const schemaTable = yield this.getSchema();
+                const columns = schemaTable.map(column => `\`${this.getTableName()}\`.\`${column.Field}\``);
+                return makeStatement(columns);
+            }
+            const columns = Object.keys(schemaModel).map((column) => `\`${this.getTableName()}\`.\`${column}\``);
+            return makeStatement(columns);
+        });
+    }
+    /**
+     *
+     * The 'makeInsertStatement' method is used to make insert table statement.
+     * @return {Promise<string>} string
+     */
+    makeInsertStatement() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const schemaModel = this.getSchemaModel();
+            const makeStatement = (columns) => {
+                return [
+                    `${this.$constants('INSERT')}`,
+                    `\`${this.getTableName()}\``,
+                    `(${columns.join(', ')})`,
+                    `${this.$constants('VALUES')}`,
+                    `(${Array(columns.length).fill('?').join(' , ')})`
+                ].join(' ');
+            };
+            if (schemaModel == null) {
+                const schemaTable = yield this.getSchema();
+                const columns = schemaTable.map(column => `\`${column.Field}\``);
+                return makeStatement(columns);
+            }
+            const columns = Object.keys(schemaModel).map((column) => `\`${column}\``);
+            return makeStatement(columns);
+        });
+    }
+    /**
+     *
+     * The 'makeUpdateStatement' method is used to make update table statement.
+     * @return {Promise<string>} string
+     */
+    makeUpdateStatement() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const schemaModel = this.getSchemaModel();
+            const makeStatement = (columns) => {
+                return [
+                    `${this.$constants('UPDATE')}`,
+                    `\`${this.getTableName()}\``,
+                    `${this.$constants('SET')}`,
+                    `(${columns.join(', ')})`
+                ].join(' ');
+            };
+            if (schemaModel == null) {
+                const schemaTable = yield this.getSchema();
+                const columns = schemaTable.map(column => `\`${column.Field}\` = ?`);
+                return makeStatement(columns);
+            }
+            const columns = Object.keys(schemaModel).map((column) => `\`${column}\` = ?`);
+            return makeStatement(columns);
+        });
+    }
+    /**
+     *
+     * The 'makeDeleteStatement' method is used to make delete statement.
+     * @return {Promise<string>} string
+     */
+    makeDeleteStatement() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const makeStatement = () => {
+                return [
+                    `${this.$constants('DELETE')}`,
+                    `${this.$constants('FROM')}`,
+                    `\`${this.getTableName()}\``,
+                    `${this.$constants('WHERE')}`,
+                    `?where_expression`
+                ].join(' ');
+            };
+            return makeStatement();
+        });
+    }
+    /**
+     *
+     * The 'makeCreateStatement' method is used to make create table statement.
+     * @return {Promise<string>} string
+     */
+    makeCreateStatement() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const schemaModel = this.getSchemaModel();
+            const makeStatement = (columns) => {
+                return [
+                    `${this.$constants('CREATE_TABLE_NOT_EXISTS')}`,
+                    `\`${this.getTableName()}\``,
+                    `(`,
+                    `\n${columns === null || columns === void 0 ? void 0 : columns.join(',\n')}`,
+                    `\n)`,
+                    `${this.$constants('ENGINE')}`
+                ].join(' ');
+            };
+            if (schemaModel == null) {
+                const columns = yield this.showSchema();
+                return makeStatement(columns);
+            }
+            let columns = [];
+            for (const key in schemaModel) {
+                const data = schemaModel[key];
+                const { type, attributes } = data;
+                columns = [
+                    ...columns,
+                    `${key} ${type} ${attributes === null || attributes === void 0 ? void 0 : attributes.join(' ')}`
+                ];
+            }
+            return makeStatement(columns);
+        });
+    }
     /**
      *
      * Clone instance of model
@@ -547,7 +699,7 @@ class Model extends AbstractModel_1.AbstractModel {
         if ((options === null || options === void 0 ? void 0 : options.delete) == null)
             newInstance.$state.set('DELETE', '');
         if ((options === null || options === void 0 ? void 0 : options.where) == null)
-            newInstance.$state.set('WHERE', '');
+            newInstance.$state.set('WHERE', []);
         if ((options === null || options === void 0 ? void 0 : options.limit) == null)
             newInstance.$state.set('LIMIT', '');
         if ((options === null || options === void 0 ? void 0 : options.offset) == null)
@@ -559,7 +711,7 @@ class Model extends AbstractModel_1.AbstractModel {
         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', '');
+            newInstance.$state.set('JOIN', []);
         return newInstance;
     }
     /**
@@ -710,6 +862,19 @@ class Model extends AbstractModel_1.AbstractModel {
         this._setState('RELATIONS', (_a = this.$relation) === null || _a === void 0 ? void 0 : _a.apply(nameRelations, 'all'));
         return this;
     }
+    /**
+    * The 'withAll' method is used to eager load related (relations) data when retrieving records from a database.
+    *
+    * Eager loading allows you to retrieve a primary model and its related models in a more efficient
+    * It's method ignore soft delete
+    * @param {...string} nameRelations if data exists return blank
+    * @return {this} this
+    */
+    withCount(...nameRelations) {
+        var _a;
+        this._setState('RELATIONS', (_a = this.$relation) === null || _a === void 0 ? void 0 : _a.apply(nameRelations, 'count'));
+        return this;
+    }
     /**
      * The 'withTrashed' method is used to eager load related (relations) data when retrieving records from a database.
      *
@@ -780,7 +945,7 @@ class Model extends AbstractModel_1.AbstractModel {
      * @return {this} this
      */
     has(...nameRelations) {
-        return this.relationsExists(...nameRelations);
+        return this.withExists(...nameRelations);
     }
     /**
      *
@@ -832,6 +997,7 @@ class Model extends AbstractModel_1.AbstractModel {
      */
     withQuery(nameRelation, callback) {
         var _a;
+        this.with(nameRelation);
         (_a = this.$relation) === null || _a === void 0 ? void 0 : _a.callback(nameRelation, callback);
         return this;
     }
@@ -860,7 +1026,7 @@ class Model extends AbstractModel_1.AbstractModel {
      * @return {this} this
      */
     relations(...nameRelations) {
-        return this.relations(...nameRelations);
+        return this.with(...nameRelations);
     }
     /**
      *
@@ -887,7 +1053,7 @@ class Model extends AbstractModel_1.AbstractModel {
      * @return {this} this
      */
     relationsExists(...nameRelations) {
-        return this.relationsExists(...nameRelations);
+        return this.withExists(...nameRelations);
     }
     /**
      *
@@ -945,7 +1111,7 @@ class Model extends AbstractModel_1.AbstractModel {
      * @return {this} this
      */
     relationsAll(...nameRelations) {
-        return this.relationsAll(...nameRelations);
+        return this.withAll(...nameRelations);
     }
     /**
      *
@@ -954,7 +1120,7 @@ class Model extends AbstractModel_1.AbstractModel {
      * @return {this} this
      */
     relationsTrashed(...nameRelations) {
-        return this.relationsTrashed(...nameRelations);
+        return this.withTrashed(...nameRelations);
     }
     /**
      * The 'hasOne' relationship defines a one-to-one relationship between two database tables.
@@ -1235,8 +1401,7 @@ class Model extends AbstractModel_1.AbstractModel {
     delete() {
         var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
-            if (!this._getState('WHERE'))
-                throw new Error("Can't delete without where condition");
+            this._assertError(!this._getState('where').length, "This method 'delete' is require to use 'where' conditions");
             this.limit(1);
             if (this._getState('SOFT_DELETE')) {
                 const deletedAt = this._valuePattern(this._getState('SOFT_DELETE_FORMAT'));
@@ -1270,14 +1435,13 @@ class Model extends AbstractModel_1.AbstractModel {
     deleteMany() {
         var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
-            if (!this._getState('WHERE'))
-                throw new Error("Can't delete without where condition");
+            this._assertError(!this._getState('where').length, "This method 'delete' is require to use 'where' conditions");
             if (this._getState('SOFT_DELETE')) {
                 const deletedAt = this._valuePattern(this._getState('SOFT_DELETE_FORMAT'));
                 const sql = new Model()
                     .copyModel(this, { where: true, limit: true })
                     .bind(this.$pool.get())
-                    .update({
+                    .updateMany({
                     [deletedAt]: this.$utils.timestamp()
                 })
                     .toString();
@@ -1308,7 +1472,7 @@ class Model extends AbstractModel_1.AbstractModel {
             if (this._getState('VOID'))
                 return this._resultHandler(undefined);
             if ((_a = this._getState('EXCEPTS')) === null || _a === void 0 ? void 0 : _a.length)
-                this.select(...yield this._exceptColumns());
+                this.select(...yield this.exceptColumns());
             this.limit(1);
             if (this._getState('RELATIONS_EXISTS')) {
                 return yield this._execute({
@@ -1340,7 +1504,7 @@ class Model extends AbstractModel_1.AbstractModel {
         return __awaiter(this, void 0, void 0, function* () {
             this._validateMethod('firstOrError');
             if ((_a = this._getState('EXCEPTS')) === null || _a === void 0 ? void 0 : _a.length)
-                this.select(...yield this._exceptColumns());
+                this.select(...yield this.exceptColumns());
             this.limit(1);
             if (this._getState('RELATIONS_EXISTS')) {
                 return yield this._execute({
@@ -1378,7 +1542,7 @@ class Model extends AbstractModel_1.AbstractModel {
             if (this._getState('VOID'))
                 return [];
             if ((_a = this._getState('EXCEPTS')) === null || _a === void 0 ? void 0 : _a.length)
-                this.select(...yield this._exceptColumns());
+                this.select(...yield this.exceptColumns());
             let sql = this._queryBuilder().select();
             if (this._getState('RELATIONS_EXISTS'))
                 sql = String((_b = this.$relation) === null || _b === void 0 ? void 0 : _b.loadExists());
@@ -1416,7 +1580,7 @@ class Model extends AbstractModel_1.AbstractModel {
                 page = (paginationOptions === null || paginationOptions === void 0 ? void 0 : paginationOptions.page) || page;
             }
             if ((_a = this._getState('EXCEPTS')) === null || _a === void 0 ? void 0 : _a.length)
-                this.select(...yield this._exceptColumns());
+                this.select(...yield this.exceptColumns());
             const offset = (page - 1) * limit;
             this._setState('PER_PAGE', limit);
             this._setState('PAGE', page);
@@ -1453,7 +1617,7 @@ class Model extends AbstractModel_1.AbstractModel {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
             if ((_a = this._getState('EXCEPTS')) === null || _a === void 0 ? void 0 : _a.length)
-                this.select(...yield this._exceptColumns());
+                this.select(...yield this.exceptColumns());
             this.selectRaw([
                 `\`${column}\`,`,
                 `${this.$constants('GROUP_CONCAT')}(id)`,
@@ -1721,25 +1885,22 @@ class Model extends AbstractModel_1.AbstractModel {
     insertNotExists(data) {
         return this.createNotExists(data);
     }
-    /**
-     *
-     * get schema from table
-     * @return {this} this this
-     */
-    getSchema() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const sql = [
-                `${this.$constants('SHOW')}`,
-                `${this.$constants('COLUMNS')}`,
-                `${this.$constants('FROM')}`,
-                `\`${this._getState('TABLE_NAME').replace(/\`/g, '')}\``
-            ].join(' ');
-            return yield this._queryStatement(sql);
-        });
-    }
     getSchemaModel() {
         return this._getState('SCHEMA_TABLE');
     }
+    validation(schema) {
+        this._setState('VALIDATE_SCHEMA', true);
+        this._setState('VALIDATE_SCHEMA_DEFINED', schema);
+        return this;
+    }
+    /**
+     * The 'bindPattern' method is used to covert column relate with pattern
+     * @param {string} column
+     * @return {string} return table.column
+     */
+    bindPattern(column) {
+        return this._valuePattern(column);
+    }
     /**
      * @override Method
      * @return {Promise<Record<string,any> | any[] | null | undefined>}
@@ -1749,11 +1910,11 @@ class Model extends AbstractModel_1.AbstractModel {
             const attributes = this.$attributes;
             if (attributes != null) {
                 while (true) {
-                    if (this._getState('WHERE')) {
-                        this.update(attributes);
+                    if (!this._getState('where').length) {
+                        this.create(attributes);
                         break;
                     }
-                    this.create(attributes);
+                    this.update(attributes);
                     break;
                 }
             }
@@ -1778,7 +1939,6 @@ class Model extends AbstractModel_1.AbstractModel {
     faker(rows = 1) {
         return __awaiter(this, void 0, void 0, function* () {
             let data = [];
-            this.void();
             const sql = [
                 `${this.$constants('SHOW')}`,
                 `${this.$constants('FIELDS')}`,
@@ -1790,21 +1950,15 @@ class Model extends AbstractModel_1.AbstractModel {
                 this._assertError(this._getState('TABLE_NAME') === '' || this._getState('TABLE_NAME') == null, "Unknow this table");
                 let columnAndValue = {};
                 for (const { Field: field, Type: type } of fields) {
-                    const passed = ['id', '_id', 'uuid', 'deleted_at', 'deletedAt'].some(p => field.toLowerCase() === p);
+                    const deletedAt = this._valuePattern(this._getState('SOFT_DELETE_FORMAT'));
+                    const passed = ['id', '_id', 'uuid', deletedAt].some(p => field === p);
                     if (passed)
                         continue;
                     columnAndValue = Object.assign(Object.assign({}, columnAndValue), { [field]: this.$utils.faker(type) });
                 }
                 data = [...data, columnAndValue];
             }
-            const query = this._queryInsertMultipleModel(data);
-            this._setState('INSERT', [
-                `${this.$constants('INSERT')}`,
-                `${this._getState('TABLE_NAME')}`,
-                `${query}`
-            ].join(' '));
-            this._setState('SAVE', 'INSERT_MULTIPLE');
-            return yield this.save();
+            return yield this.createMultiple(data).save();
         });
     }
     _valuePattern(value) {
@@ -1837,7 +1991,16 @@ class Model extends AbstractModel_1.AbstractModel {
     _handleSoftDelete() {
         if (this._getState('SOFT_DELETE')) {
             const deletedAt = this._valuePattern(this._getState('SOFT_DELETE_FORMAT'));
-            this.whereNull(deletedAt);
+            const wheres = this._getState('WHERE');
+            const softDeleteIsNull = [
+                this.bindColumn(`${this.getTableName()}.${deletedAt}`),
+                this.$constants('IS_NULL')
+            ].join(' ');
+            if (!wheres.some((where) => where.includes(softDeleteIsNull))) {
+                this.whereNull(deletedAt);
+                return this;
+            }
+            return this;
         }
         return this;
     }
@@ -2339,12 +2502,12 @@ class Model extends AbstractModel_1.AbstractModel {
         return [
             `(${[...new Set(columns)].join(',')})`,
             `${this.$constants('VALUES')}`,
-            `${values.join(',')}`
+            `${values.join(', ')}`
         ].join(' ');
     }
     _insertNotExistsModel() {
         return __awaiter(this, void 0, void 0, function* () {
-            this._assertError(!this._getState('WHERE'), "This method 'createNotExists' is require to use 'where'");
+            this._assertError(!this._getState('where').length, "This method 'createNotExists' is require to use 'where' conditions");
             const check = (yield new Model()
                 .copyModel(this, { where: true, select: true, limit: true })
                 .bind(this.$pool.get())
@@ -2390,8 +2553,9 @@ class Model extends AbstractModel_1.AbstractModel {
         });
     }
     _createMultipleModel() {
+        var _a;
         return __awaiter(this, void 0, void 0, function* () {
-            for (const data of this._getState('DATA')) {
+            for (const data of (_a = this._getState('DATA')) !== null && _a !== void 0 ? _a : []) {
                 yield this._validateSchema(data, 'insert');
             }
             const [result, id] = yield this._actionStatement({
@@ -2416,7 +2580,7 @@ class Model extends AbstractModel_1.AbstractModel {
     }
     _updateOrInsertModel() {
         return __awaiter(this, void 0, void 0, function* () {
-            this._assertError(!this._getState('WHERE'), "This method 'createOrUpdate' is require to use 'where'");
+            this._assertError(!this._getState('where').length, "This method 'createOrUpdate' is require to use 'where' conditions");
             const check = (yield new Model()
                 .copyModel(this, { select: true, where: true, limit: true })
                 .bind(this.$pool.get())
@@ -2471,7 +2635,7 @@ class Model extends AbstractModel_1.AbstractModel {
     }
     _insertOrSelectModel() {
         return __awaiter(this, void 0, void 0, function* () {
-            this._assertError(!this._getState('WHERE'), "This method 'createOrSelect' is require to use 'where'");
+            this._assertError(!this._getState('where').length, "This method 'createOrSelect' is require to use 'where' conditions");
             const check = (yield new Model()
                 .copyModel(this, { select: true, where: true, limit: true })
                 .bind(this.$pool.get())
@@ -2520,7 +2684,7 @@ class Model extends AbstractModel_1.AbstractModel {
     }
     _updateModel() {
         return __awaiter(this, void 0, void 0, function* () {
-            this._assertError(!String(this._getState('WHERE')), "This method 'update' is require to use 'where'");
+            this._assertError(!this._getState('where').length, "This method 'update' is require to use 'where' conditions");
             yield this._validateSchema(this._getState('DATA'), 'update');
             const sql = this._queryBuilder().update();
             const result = yield this._actionStatement({ sql });
@@ -2665,9 +2829,9 @@ class Model extends AbstractModel_1.AbstractModel {
         return;
     }
     _initialModel() {
-        this.$state = new StateHandler_1.StateHandler(this.$constants('MODEL'));
+        this.$state = new State_1.StateHandler(this.$constants('MODEL'));
         this._makeTableName();
-        this.$relation = new RelationHandler_1.RelationHandler(this);
+        this.$relation = new Relation_1.RelationHandler(this);
         return this;
     }
 }

package/dist/lib/tspace/Schema.js

@@ -55,9 +55,9 @@ class Schema extends Builder_1.Builder {
                     ];
                 }
                 const sql = [
-                    `CREATE TABLE IF NOT EXISTS`,
+                    `${this.$constants('CREATE_TABLE_NOT_EXISTS')}`,
                     `${table} (${columns === null || columns === void 0 ? void 0 : columns.join(',')})`,
-                    `ENGINE=INNODB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8`
+                    `${this.$constants('ENGINE')}`
                 ].join(' ');
                 yield this.query(sql);
                 console.log(`Migrats : '${table}' created successfully`);
@@ -78,9 +78,9 @@ class Schema extends Builder_1.Builder {
                 ];
             }
             const sql = [
-                `CREATE TABLE IF NOT EXISTS`,
+                `${this.$constants('CREATE_TABLE_NOT_EXISTS')}`,
                 `${table} (${columns === null || columns === void 0 ? void 0 : columns.join(', ')})`,
-                `ENGINE=INNODB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8`
+                `${this.$constants('ENGINE')}`
             ].join(' ');
             return sql;
         };
@@ -175,7 +175,6 @@ class Schema extends Builder_1.Builder {
         return __awaiter(this, void 0, void 0, function* () {
             const checkTables = yield new Builder_1.Builder().query('SHOW TABLES');
             const existsTables = checkTables.map((c) => Object.values(c)[0]);
-            // console.log(checkTables)
             for (const model of models) {
                 if (model == null)
                     continue;

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

@@ -2,10 +2,12 @@ import DB from './DB';
 import Model from './Model';
 import Schema from './Schema';
 import Blueprint from './Blueprint';
+import Pool from '../connection';
 export { DB };
 export { Model };
 export { Schema };
 export { Blueprint };
+export { Pool };
 declare const _default: {
     DB: typeof DB;
     Model: typeof Model;

package/dist/lib/tspace/index.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Blueprint = exports.Schema = exports.Model = exports.DB = void 0;
+exports.Pool = exports.Blueprint = exports.Schema = exports.Model = exports.DB = void 0;
 const DB_1 = __importDefault(require("./DB"));
 exports.DB = DB_1.default;
 const Model_1 = __importDefault(require("./Model"));
@@ -12,6 +12,8 @@ const Schema_1 = __importDefault(require("./Schema"));
 exports.Schema = Schema_1.default;
 const Blueprint_1 = __importDefault(require("./Blueprint"));
 exports.Blueprint = Blueprint_1.default;
+const connection_1 = __importDefault(require("../connection"));
+exports.Pool = connection_1.default;
 exports.default = {
     DB: DB_1.default,
     Model: Model_1.default,

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

@@ -7,6 +7,7 @@ declare const utils: {
     timestamp: (dateString?: string) => string;
     date: () => string;
     escape: (str: any) => any;
+    escapeXSS: (str: any) => any;
     isSubQuery: (subQuery: string) => boolean;
     generateUUID: () => string;
     covertBooleanToNumber: (data: any) => any;

package/dist/lib/utils/index.js

@@ -49,6 +49,13 @@ const escape = (str) => {
         return str;
     return str.replace(/[\0\b\t\n\r\x1a\'\\]/g, '');
 };
+const escapeXSS = (str) => {
+    if (typeof str !== 'string')
+        return str;
+    return str
+        .replace(/<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script>/gi, '')
+        .replace(/on\w+="[^"]+"/g, '');
+};
 const isSubQuery = (subQuery) => {
     const checkIsSubQuery = (/\bSELECT\s+(?!\*)/i.test(subQuery));
     if (!checkIsSubQuery)
@@ -196,6 +203,7 @@ const utils = {
     timestamp,
     date,
     escape,
+    escapeXSS,
     isSubQuery,
     generateUUID,
     covertBooleanToNumber,

package/package.json

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