tspace-mysql 1.5.1 → 1.5.2

package/README.md

@@ -2039,6 +2039,7 @@ import { User } from './User.ts'
 const schemaPhone = {
     id :new Blueprint().int().notNull().primary().autoIncrement(),
     uuid :new Blueprint().varchar(50).null(),
+    userId : new Blueprint().int().notNull(),
     number :new Blueprint().varchar(50).notNull(),
     createdAt :new Blueprint().timestamp().null(),
     updatedAt :new Blueprint().timestamp().null()
@@ -2179,11 +2180,8 @@ const users = await new User().where('idx',1).delete() ❌
 ### Safety Relationships
 
 ```js
-
-import { User , schemaUserType } from './User.ts'
-import { Phone, schemaPhoneType } from './Phone.ts'
-
-+--------------------------------------------------------------------------+
+import { User } from './User.ts'
+import { Phone } from './Phone.ts'
 // Case #1 : Relationship with 2 relations 'phone' and 'phones'
   const users = await new User()
   .relations('phone','phones')
@@ -2225,7 +2223,7 @@ for(const user of users) {
 
 +--------------------------------------------------------------------------+
 
-// Case #2 : Relationship with 2 relations 'phone' and 'phones' and nested relations to 'user'
+// Case #2 : There is a relationship between two entities, 'phone' and 'phones', both of which are related to the 'user' entity through nested relations
   const users = await new User()
   .relations('phone','phones')
   .relationQuery('phone' , (query : Phone) => query.relations('user'))
@@ -2272,6 +2270,110 @@ for(const user of users) {
   }
 
 +--------------------------------------------------------------------------+
+// If you don't want to set types for every returning method such as 'findOne', 'findMany', and so on...
+
+import { Model , Blueprint , SchemaType , RelationType } from 'tspace-mysql'
+import { Phone , SchemaPhoneType }  from '../Phone'
+
+const schemaUser = {
+    id :new Blueprint().int().notNull().primary().autoIncrement(),
+    uuid :new Blueprint().varchar(50).null(),
+    email :new Blueprint().varchar(50).null(),
+    name :new Blueprint().varchar(255).null(),
+    username : new Blueprint().varchar(255).null(),
+    password : new Blueprint().varchar(255).null(),
+    createdAt :new Blueprint().timestamp().null(),
+    updatedAt :new Blueprint().timestamp().null()
+}
+
+type SchemaUserType = SchemaType<typeof schemaUser>
+
+type RelationUserType =  RelationType<{
+    phones : SchemaPhoneType[]
+    phone : SchemaPhoneType
+}>
+
+class User extends Model<SchemaUserType, RelationUserType>  {
+  constructor() {
+    super()
+    this.useSchema(schemaUser)
+    this.hasOne({ model : Phone, name : 'phonex' }) ❌
+    this.hasMany({ model : Phone, name : 'phonesx' }) ❌
+    this.hasOne({ model : Phone, name : 'phone' }) ✅
+    this.hasMany({ model : Phone, name : 'phones' }) ✅
+  }
+}
+
+export { User , SchemaUserType }
+export default User
+
++--------------------------------------------------------------------------+
+
+// in file Phone.ts
+import { Model , Blueprint , SchemaType , RelationType} from 'tspace-mysql'
+import { User } from './User.ts'
+const schemaPhone = {
+    id :new Blueprint().int().notNull().primary().autoIncrement(),
+    uuid :new Blueprint().varchar(50).null(),
+    userId : new Blueprint().int().notNull(),
+    number :new Blueprint().varchar(50).notNull(),
+    createdAt :new Blueprint().timestamp().null(),
+    updatedAt :new Blueprint().timestamp().null()
+}
+
+type SchemaPhoneType = SchemaType<typeof schemaPhone>
+
+type RelationPhoneType = RelationType<{
+    user : SchemaPhoneType[]
+}>
+
+class Phone extends Model<SchemaPhoneType,RelationPhoneType>  {
+  constructor() {
+    super()
+    this.useSchema(schemaPhone)
+    this.useBelongsTo({ model : User, name : 'userx'}) ❌
+    this.useBelongsTo({ model : User, name : 'user'}) ✅
+  }
+}
+
+export { Phone , SchemaPhoneType }
+export default Phone
+
++--------------------------------------------------------------------------+
+
+const users = await new User()
+  .relations('phonex','phonesx') ❌
+  .relationQuery('phonex' ❌ , (query : Phone) => query.relations('user')) ✅
+  .relationQuery('phonesx' ❌ , (query : Phone) => query.relations('user')) ✅
+  .findMany()
+
+const users = await new User()
+  .relations('phone','phones') ✅
+  .relationQuery('phonex' ❌ , (query : Phone) => query.relations('user')) ✅
+  .relationQuery('phonesx' ❌ , (query : Phone) => query.relations('user')) ✅
+  .findMany()
+
+const users = await new User()
+  .relations('phone','phones')
+  .relationQuery('phone' , (query : Phone) => query.relations('userx')) ❌
+  .relationQuery('phones' , (query : Phone) => query.relations('userx')) ❌
+  .findMany()
+
+const users = await new User()
+  .relations('phone','phones') ✅
+  .relationQuery('phone' ✅ , (query : Phone) => query.relations('user')) ✅
+  .relationQuery('phones'✅ , (query : Phone) => query.relations('user')) ✅
+  .findMany()
+
+  for(const user of users) {
+    user.phone.user ✅
+    user.phone.user.id ✅
+    user.phone.userx ❌
+    user.phone.user.idx ❌
+    user.phones.map(phone =>phone.user.id) ✅
+    user.phones.map(phone =>phone.user.idx) ❌
+  }
+
 ```
 
 ## Blueprint

package/build/lib/Interface.d.ts

@@ -1,6 +1,6 @@
 import Model from "./core/Model";
-export interface Relation {
-    name: string;
+export interface Relation<K = any> {
+    name: K extends void ? never : K;
     model: new () => Model;
     as?: string | undefined;
     localKey?: string | undefined;
@@ -16,8 +16,8 @@ export interface Relation {
     oldVersion?: boolean | undefined;
     modelPivot?: new () => Model | undefined;
 }
-export interface RelationQuery {
-    name?: string;
+export interface RelationQuery<K = any> {
+    name?: K extends void ? never : K;
     model: new () => Model;
     as?: string | undefined;
     localKey?: string | undefined;

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

@@ -2,7 +2,8 @@ import { Pattern, Relation, RelationQuery, ValidateSchema } from '../../Interfac
 import { Blueprint } from '../Blueprint';
 import { Builder } from '../Builder';
 import { RelationHandler } from '../Handlers/Relation';
-declare abstract class AbstractModel<T> extends Builder {
+import { Model } from '../Model';
+declare abstract class AbstractModel<T, R> extends Builder {
     protected $relation: RelationHandler | undefined;
     protected $schema: Record<string, Blueprint> | undefined;
     protected $validateSchema: ValidateSchema | undefined;
@@ -48,7 +49,7 @@ declare abstract class AbstractModel<T> extends Builder {
     protected abstract hasMany({ name, model, localKey, foreignKey, freezeTable, as }: Relation): this;
     protected abstract belongsTo({ name, model, localKey, foreignKey, freezeTable, as }: Relation): this;
     protected abstract belongsToMany({ name, model, localKey, foreignKey, freezeTable, as }: Relation): this;
-    protected abstract buildMethodRelation(name: string, callback?: Function): this;
+    protected abstract buildMethodRelation<K extends keyof R>(name: K, callback?: Function): this;
     protected abstract hasOneBuilder({ name, model, localKey, foreignKey, freezeTable, as }: RelationQuery, callback: Function): this;
     protected abstract hasManyBuilder({ name, model, localKey, foreignKey, freezeTable, as }: RelationQuery, callback: Function): this;
     protected abstract belongsToBuilder({ name, model, localKey, foreignKey, freezeTable, as }: RelationQuery, callback: Function): this;
@@ -59,17 +60,17 @@ declare abstract class AbstractModel<T> extends Builder {
     abstract onlyTrashed(): this;
     abstract trashed(): this;
     abstract restore(): Promise<any[]>;
-    abstract with(...nameRelations: string[]): this;
-    abstract withQuery(nameRelations: string, callback: Function): this;
-    abstract withExists(...nameRelations: string[]): this;
-    abstract withTrashed(...nameRelations: string[]): this;
-    abstract withAll(...nameRelations: string[]): this;
-    abstract has(...nameRelations: string[]): this;
-    abstract relations(...nameRelations: string[]): this;
-    abstract relationQuery(nameRelations: string, callback: Function): this;
-    abstract relationsExists(...nameRelations: string[]): this;
-    abstract relationsAll(...nameRelations: string[]): this;
-    abstract relationsTrashed(...nameRelations: string[]): this;
+    abstract with<K extends keyof R>(...nameRelations: K[]): this;
+    abstract withQuery<K extends keyof R, TModel extends Model>(nameRelations: K, callback: (query: TModel) => TModel): this;
+    abstract withExists<K extends keyof R>(...nameRelations: K[]): this;
+    abstract withTrashed<K extends keyof R>(...nameRelations: K[]): this;
+    abstract withAll<K extends keyof R>(...nameRelations: K[]): this;
+    abstract has<K extends keyof R>(...nameRelations: K[]): this;
+    abstract relations<K extends keyof R>(...nameRelations: K[]): this;
+    abstract relationQuery<K extends keyof R, TModel extends Model>(nameRelations: K, callback: (query: TModel) => TModel): this;
+    abstract relationsExists<K extends keyof R>(...nameRelations: K[]): this;
+    abstract relationsAll<K extends keyof R>(...nameRelations: K[]): this;
+    abstract relationsTrashed<K extends keyof R>(...nameRelations: K[]): this;
 }
 export { AbstractModel };
 export default AbstractModel;

package/build/lib/core/Builder.js

@@ -2156,8 +2156,8 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
      * @param {number} value
      * @return {promise<any>}
      */
-    increment(column = 'id', value = 1) {
-        return __awaiter(this, void 0, void 0, function* () {
+    increment() {
+        return __awaiter(this, arguments, void 0, function* (column = 'id', value = 1) {
             const query = `${this.$constants('SET')} ${column} = ${column} + ${value}`;
             this.$state.set('UPDATE', [
                 `${this.$constants('UPDATE')}`,
@@ -2174,8 +2174,8 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
      * @param {number} value
      * @return {promise<any>}
      */
-    decrement(column = 'id', value = 1) {
-        return __awaiter(this, void 0, void 0, function* () {
+    decrement() {
+        return __awaiter(this, arguments, void 0, function* (column = 'id', value = 1) {
             const query = `${this.$constants('SET')} ${column} = ${column} - ${value}`;
             this.$state.set('UPDATE', [
                 `${this.$constants('UPDATE')}`,
@@ -2237,8 +2237,8 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
      * @return {promise<Pagination>}
      */
     pagination(paginationOptions) {
-        var _a, _b, _c;
         return __awaiter(this, void 0, void 0, function* () {
+            var _a, _b, _c;
             let limit = 15;
             let page = 1;
             if (paginationOptions != null) {
@@ -2328,8 +2328,8 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
      * @return {promise<object | null>}
      */
     first(cb) {
-        var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
+            var _a, _b;
             if ((_a = this.$state.get('EXCEPTS')) === null || _a === void 0 ? void 0 : _a.length)
                 this.select(...yield this.exceptColumns());
             this.limit(1);
@@ -2388,8 +2388,8 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
      * @return {promise<object | Error>}
      */
     firstOrError(message, options) {
-        var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
+            var _a, _b;
             if ((_a = this.$state.get('EXCEPTS')) === null || _a === void 0 ? void 0 : _a.length)
                 this.select(...yield this.exceptColumns());
             let sql = this._queryBuilder().select();
@@ -2448,8 +2448,8 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
      * @return {promise<any[]>}
      */
     get(cb) {
-        var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
+            var _a, _b;
             if ((_a = this.$state.get('EXCEPTS')) === null || _a === void 0 ? void 0 : _a.length)
                 this.select(...yield this.exceptColumns());
             let sql = this._queryBuilder().select();
@@ -2533,8 +2533,8 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
      * @param {string=} column [column=id]
      * @return {promise<Array>}
      */
-    toArray(column = 'id') {
-        return __awaiter(this, void 0, void 0, function* () {
+    toArray() {
+        return __awaiter(this, arguments, void 0, function* (column = 'id') {
             this.selectRaw(`${this.bindColumn(column)}`);
             const sql = this._queryBuilder().select();
             const result = yield this._queryStatement(sql);
@@ -2549,8 +2549,8 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
      * @return {promise<boolean>}
      */
     exists() {
-        var _a;
         return __awaiter(this, void 0, void 0, function* () {
+            var _a;
             this.limit(1);
             this.selectRaw('1');
             const sql = this._queryBuilder().select();
@@ -2570,8 +2570,8 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
      * @param {string=} column [column=id]
      * @return {promise<number>}
      */
-    count(column = 'id') {
-        return __awaiter(this, void 0, void 0, function* () {
+    count() {
+        return __awaiter(this, arguments, void 0, function* (column = 'id') {
             const distinct = this.$state.get('DISTINCT');
             column = distinct
                 ? `${this.$constants('DISTINCT')} ${this.bindColumn(column)}`
@@ -2589,8 +2589,8 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
      * @param {string=} column [column=id]
      * @return {promise<number>}
      */
-    avg(column = 'id') {
-        return __awaiter(this, void 0, void 0, function* () {
+    avg() {
+        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)}`;
             this.selectRaw(`${this.$constants('AVG')}(${column}) ${this.$constants('AS')} \`aggregate\``);
@@ -2606,8 +2606,8 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
      * @param {string=} column [column=id]
      * @return {promise<number>}
      */
-    sum(column = 'id') {
-        return __awaiter(this, void 0, void 0, function* () {
+    sum() {
+        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)}`;
             this.selectRaw(`${this.$constants('SUM')}(${column}) ${this.$constants('AS')} \`aggregate\``);
@@ -2623,9 +2623,9 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
      * @param {string=} column [column=id]
      * @return {promise<number>}
      */
-    max(column = 'id') {
-        var _a;
-        return __awaiter(this, void 0, void 0, function* () {
+    max() {
+        return __awaiter(this, arguments, void 0, function* (column = 'id') {
+            var _a;
             const distinct = this.$state.get('DISTINCT');
             column = distinct ? `${this.$constants('DISTINCT')} ${this.bindColumn(column)}` : `${this.bindColumn(column)}`;
             this.selectRaw(`${this.$constants('MAX')}(${column}) ${this.$constants('AS')} \`aggregate\``);
@@ -2641,9 +2641,9 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
      * @param {string=} column [column=id]
      * @return {promise<number>}
      */
-    min(column = 'id') {
-        var _a;
-        return __awaiter(this, void 0, void 0, function* () {
+    min() {
+        return __awaiter(this, arguments, void 0, function* (column = 'id') {
+            var _a;
             const distinct = this.$state.get('DISTINCT');
             column = distinct ? `${this.$constants('DISTINCT')} ${this.bindColumn(column)}` : `${this.bindColumn(column)}`;
             this.selectRaw(`${this.$constants('MIN')}(${column}) ${this.$constants('AS')} \`aggregate\``);
@@ -2659,8 +2659,8 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
      * @return {promise<boolean>}
      */
     delete() {
-        var _a;
         return __awaiter(this, void 0, void 0, function* () {
+            var _a;
             if (!this.$state.get('where').length) {
                 throw new Error("can't delete without where condition");
             }
@@ -2683,8 +2683,8 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
      * @return {promise<boolean>}
      */
     deleteMany() {
-        var _a;
         return __awaiter(this, void 0, void 0, function* () {
+            var _a;
             if (!this.$state.get('where').length) {
                 throw new Error("can't delete without where condition");
             }
@@ -2709,8 +2709,8 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
      * @return {promise<boolean>}
      */
     forceDelete() {
-        var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
+            var _a, _b;
             this.$state.set('DELETE', [
                 `${this.$constants('DELETE')}`,
                 `${this.$state.get('FROM')}`,
@@ -2929,8 +2929,8 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
      * @param {string=} table table name
      * @return {Promise<Array>}
      */
-    showColumns(table = this.$state.get('TABLE_NAME')) {
-        return __awaiter(this, void 0, void 0, function* () {
+    showColumns() {
+        return __awaiter(this, arguments, void 0, function* (table = this.$state.get('TABLE_NAME')) {
             const sql = [
                 `${this.$constants('SHOW')}`,
                 `${this.$constants('COLUMNS')}`,
@@ -2948,8 +2948,8 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
      * @param {string=} table [table= current table name]
      * @return {Promise<Array>}
      */
-    showSchema(table = this.$state.get('TABLE_NAME')) {
-        return __awaiter(this, void 0, void 0, function* () {
+    showSchema() {
+        return __awaiter(this, arguments, void 0, function* (table = this.$state.get('TABLE_NAME')) {
             const sql = [
                 `${this.$constants('SHOW')}`,
                 `${this.$constants('COLUMNS')}`,
@@ -2989,8 +2989,8 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
      * @param {string=} table [table= current table name]
      * @return {Promise<Array>}
      */
-    showSchemas(table = this.$state.get('TABLE_NAME')) {
-        return __awaiter(this, void 0, void 0, function* () {
+    showSchemas() {
+        return __awaiter(this, arguments, void 0, function* (table = this.$state.get('TABLE_NAME')) {
             return this.showSchema(table);
         });
     }
@@ -3001,8 +3001,8 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
      * @param {string=} table table name
      * @return {Promise<Array>}
      */
-    showValues(table = this.$state.get('TABLE_NAME')) {
-        return __awaiter(this, void 0, void 0, function* () {
+    showValues() {
+        return __awaiter(this, arguments, void 0, function* (table = this.$state.get('TABLE_NAME')) {
             const sql = [
                 `${this.$constants('SELECT')}`,
                 '*',
@@ -3266,8 +3266,8 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
             return result;
         });
     }
-    _actionStatement({ sql, returnId = false }) {
-        return __awaiter(this, void 0, void 0, function* () {
+    _actionStatement(_a) {
+        return __awaiter(this, arguments, void 0, function* ({ sql, returnId = false }) {
             if (this.$state.get('DEBUG'))
                 this.$utils.consoleDebug(sql);
             if (returnId) {
@@ -3464,8 +3464,8 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
             }
         });
     }
-    _update(ignoreWhere = false) {
-        return __awaiter(this, void 0, void 0, function* () {
+    _update() {
+        return __awaiter(this, arguments, void 0, function* (ignoreWhere = false) {
             if (!this.$state.get('where').length && !ignoreWhere)
                 throw new Error("can't update without where condition");
             const result = yield this._actionStatement({

package/build/lib/core/DB.js

@@ -443,15 +443,15 @@ class DB extends AbstractDB_1.AbstractDB {
      * @return {Promise<boolean>}
      */
     cloneDB(database) {
-        var _a;
         return __awaiter(this, void 0, void 0, function* () {
+            var _a;
             const db = yield this._queryStatement(`${this.$constants('SHOW_DATABASES')} ${this.$constants('LIKE')} '${database}'`);
             if (Object.values((_a = db[0]) !== null && _a !== void 0 ? _a : []).length)
                 throw new Error(`This database : '${database}' is already exists`);
             const tables = yield this.showTables();
             const backup = yield this._backup({ tables, database });
             yield this._queryStatement(`${this.$constants('CREATE_DATABASE_NOT_EXISTS')} \`${database}\``);
-            const creating = ({ table, values }) => __awaiter(this, void 0, void 0, function* () {
+            const creating = (_b) => __awaiter(this, [_b], void 0, function* ({ table, values }) {
                 try {
                     yield this._queryStatement(table);
                     if (values != null && values !== '')
@@ -486,8 +486,8 @@ class DB extends AbstractDB_1.AbstractDB {
      * @property {string} backup.to.password
      * @return {Promise<void>}
      */
-    backup({ database, to }) {
-        return __awaiter(this, void 0, void 0, function* () {
+    backup(_a) {
+        return __awaiter(this, arguments, void 0, function* ({ database, to }) {
             if (to != null && Object.keys(to).length)
                 this.connection(Object.assign(Object.assign({}, to), { database }));
             return this.cloneDB(database);
@@ -505,8 +505,8 @@ class DB extends AbstractDB_1.AbstractDB {
      * @property {string} backup.to.password
      * @return {Promise<void>}
      */
-    static backup({ database, to }) {
-        return __awaiter(this, void 0, void 0, function* () {
+    static backup(_a) {
+        return __awaiter(this, arguments, void 0, function* ({ database, to }) {
             return new this().backup({ database, to });
         });
     }
@@ -524,9 +524,9 @@ class DB extends AbstractDB_1.AbstractDB {
      * @property {string} backup.connection.password
      * @return {Promise<void>}
      */
-    backupToFile({ filePath, database, connection }) {
-        var _a;
-        return __awaiter(this, void 0, void 0, function* () {
+    backupToFile(_a) {
+        return __awaiter(this, arguments, void 0, function* ({ filePath, database, connection }) {
+            var _b;
             const tables = yield this.showTables();
             const backup = (yield this._backup({ tables, database }))
                 .map(b => {
@@ -539,7 +539,7 @@ class DB extends AbstractDB_1.AbstractDB {
                     values: b.values !== '' ? b.values + "\n" : ""
                 };
             });
-            if (connection != null && ((_a = Object.keys(connection)) === null || _a === void 0 ? void 0 : _a.length))
+            if (connection != null && ((_b = Object.keys(connection)) === null || _b === void 0 ? void 0 : _b.length))
                 this.connection(connection);
             let sql = [
                 `SET SQL_MODE = "NO_AUTO_VALUE_ON_ZERO";`,
@@ -572,8 +572,8 @@ class DB extends AbstractDB_1.AbstractDB {
     * @property {string} backup.connection.password
     * @return {Promise<void>}
     */
-    static backupToFile({ filePath, database, connection }) {
-        return __awaiter(this, void 0, void 0, function* () {
+    static backupToFile(_a) {
+        return __awaiter(this, arguments, void 0, function* ({ filePath, database, connection }) {
             return new this().backupToFile({ filePath, database, connection });
         });
     }
@@ -591,10 +591,10 @@ class DB extends AbstractDB_1.AbstractDB {
      * @property {string} backup.connection.password
      * @return {Promise<void>}
      */
-    backupSchemaToFile({ filePath, database, connection }) {
-        var _a;
-        return __awaiter(this, void 0, void 0, function* () {
-            if (connection != null && ((_a = Object.keys(connection)) === null || _a === void 0 ? void 0 : _a.length))
+    backupSchemaToFile(_a) {
+        return __awaiter(this, arguments, void 0, function* ({ filePath, database, connection }) {
+            var _b;
+            if (connection != null && ((_b = Object.keys(connection)) === null || _b === void 0 ? void 0 : _b.length))
                 this.connection(connection);
             const tables = yield this.showTables();
             const backup = (yield this._backup({ tables, database }))
@@ -634,8 +634,8 @@ class DB extends AbstractDB_1.AbstractDB {
      * @property {string} backup.connection.password
      * @return {Promise<void>}
      */
-    static backupSchemaToFile({ filePath, database, connection }) {
-        return __awaiter(this, void 0, void 0, function* () {
+    static backupSchemaToFile(_a) {
+        return __awaiter(this, arguments, void 0, function* ({ filePath, database, connection }) {
             return new this().backupSchemaToFile({ filePath, database, connection });
         });
     }
@@ -653,10 +653,10 @@ class DB extends AbstractDB_1.AbstractDB {
      * @property {string} backup.connection.password
      * @return {Promise<void>}
      */
-    backupTableToFile({ filePath, table, connection }) {
-        var _a;
-        return __awaiter(this, void 0, void 0, function* () {
-            if (connection != null && ((_a = Object.keys(connection)) === null || _a === void 0 ? void 0 : _a.length))
+    backupTableToFile(_a) {
+        return __awaiter(this, arguments, void 0, function* ({ filePath, table, connection }) {
+            var _b;
+            if (connection != null && ((_b = Object.keys(connection)) === null || _b === void 0 ? void 0 : _b.length))
                 this.connection(connection);
             const schemas = yield this.showSchema(table);
             const createTableSQL = [
@@ -702,8 +702,8 @@ class DB extends AbstractDB_1.AbstractDB {
      * @property {string} backup.connection.password
      * @return {Promise<void>}
      */
-    static backupTableToFile({ filePath, table, connection }) {
-        return __awaiter(this, void 0, void 0, function* () {
+    static backupTableToFile(_a) {
+        return __awaiter(this, arguments, void 0, function* ({ filePath, table, connection }) {
             return new this().backupTableToFile({ filePath, table, connection });
         });
     }
@@ -721,9 +721,9 @@ class DB extends AbstractDB_1.AbstractDB {
      * @property {string} backup.connection.password
      * @return {Promise<void>}
      */
-    backupTableSchemaToFile({ filePath, table, connection }) {
-        var _a;
-        return __awaiter(this, void 0, void 0, function* () {
+    backupTableSchemaToFile(_a) {
+        return __awaiter(this, arguments, void 0, function* ({ filePath, table, connection }) {
+            var _b;
             const schemas = yield this.showSchema(table);
             const createTableSQL = [
                 `${this.$constants('CREATE_TABLE_NOT_EXISTS')}`,
@@ -732,7 +732,7 @@ class DB extends AbstractDB_1.AbstractDB {
                 `${this.$constants('ENGINE')};`,
             ];
             const sql = [createTableSQL.join(' ')];
-            if (connection != null && ((_a = Object.keys(connection)) === null || _a === void 0 ? void 0 : _a.length))
+            if (connection != null && ((_b = Object.keys(connection)) === null || _b === void 0 ? void 0 : _b.length))
                 this.connection(connection);
             fs_1.default.writeFileSync(filePath, (0, sql_formatter_1.format)(sql.join('\n'), {
                 language: 'spark',
@@ -756,13 +756,13 @@ class DB extends AbstractDB_1.AbstractDB {
      * @property {string} backup.connection.password
      * @return {Promise<void>}
      */
-    static backupTableSchemaToFile({ filePath, table, connection }) {
-        return __awaiter(this, void 0, void 0, function* () {
+    static backupTableSchemaToFile(_a) {
+        return __awaiter(this, arguments, void 0, function* ({ filePath, table, connection }) {
             return new this().backupTableSchemaToFile({ filePath, table, connection });
         });
     }
-    _backup({ tables, database }) {
-        return __awaiter(this, void 0, void 0, function* () {
+    _backup(_a) {
+        return __awaiter(this, arguments, void 0, function* ({ tables, database }) {
             const backup = [];
             for (const table of tables) {
                 const schemas = yield this.showSchema(table);

package/build/lib/core/Handlers/Relation.d.ts

@@ -7,8 +7,8 @@ declare class RelationHandler {
     constructor(model: Model);
     load(parents: Record<string, any>[], relation: Relation): Promise<any[]>;
     loadExists(): string;
-    apply(nameRelations: string[], type: 'all' | 'exists' | 'trashed' | 'count' | 'default'): Relation[];
-    callback(nameRelation: string, cb: Function): void;
+    apply(nameRelations: any[], type: 'all' | 'exists' | 'trashed' | 'count' | 'default'): Relation[];
+    callback(nameRelation: any, cb: Function): void;
     hasOne({ name, as, model, localKey, foreignKey, freezeTable }: Relation): void;
     hasMany({ name, as, model, localKey, foreignKey, freezeTable }: Relation): void;
     belongsTo({ name, as, model, localKey, foreignKey, freezeTable }: Relation): void;

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

@@ -22,8 +22,8 @@ class RelationHandler {
         this.$logger = this.MODEL["$logger"];
     }
     load(parents, relation) {
-        var _a;
         return __awaiter(this, void 0, void 0, function* () {
+            var _a;
             const relationIsBelongsToMany = relation.relation === this.$constants('RELATIONSHIP').belongsToMany;
             if (relationIsBelongsToMany) {
                 return yield this._belongsToMany(parents, relation);
@@ -409,8 +409,8 @@ class RelationHandler {
         return dataParents;
     }
     _belongsToMany(parents, relation) {
-        var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
+            var _a, _b;
             const { name, foreignKey, localKey, pivot, oldVersion, modelPivot } = this._valueInRelation(relation);
             const localKeyId = parents.map((parent) => {
                 const data = parent[foreignKey];

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

@@ -11,7 +11,7 @@ import { Relation, Pagination, RelationQuery, ValidateSchema, GlobalSetting } fr
  * const users = await new User().findMany()
  * console.log(users)
  */
-declare class Model<TSchemaModel extends Record<string, Blueprint | string | number | Date> = any> extends AbstractModel<TSchemaModel> {
+declare class Model<TSchemaModel extends Record<string, Blueprint | string | number | Date> = any, TRelationModel = any> extends AbstractModel<TSchemaModel, TRelationModel> {
     constructor();
     /**
      * The 'global' method is used setting global variables in models.
@@ -444,7 +444,7 @@ declare class Model<TSchemaModel extends Record<string, Blueprint | string | num
      * @param    {Function} callback query callback
      * @return   {this}   this
      */
-    protected buildMethodRelation(name: string, callback?: Function): this;
+    protected buildMethodRelation<K extends keyof TRelationModel>(name: K, callback?: Function): this;
     /**
      *
      * @override
@@ -639,7 +639,7 @@ declare class Model<TSchemaModel extends Record<string, Blueprint | string | num
      *  await new User().relations('posts').findMany()
      *
      */
-    with(...nameRelations: string[]): this;
+    with<K extends keyof TRelationModel>(...nameRelations: K[]): this;
     /**
      * The 'withAll' method is used to eager load related (relations) data when retrieving records from a database.
      *
@@ -648,7 +648,7 @@ declare class Model<TSchemaModel extends Record<string, Blueprint | string | num
      * @param {...string} nameRelations if data exists return blank
      * @return {this} this
      */
-    withAll(...nameRelations: string[]): this;
+    withAll<K extends keyof TRelationModel>(...nameRelations: K[]): this;
     /**
     * The 'withAll' method is used to eager load related (relations) data when retrieving records from a database.
     *
@@ -657,7 +657,7 @@ declare class Model<TSchemaModel extends Record<string, Blueprint | string | num
     * @param {...string} nameRelations if data exists return blank
     * @return {this} this
     */
-    withCount(...nameRelations: string[]): this;
+    withCount<K extends keyof TRelationModel>(...nameRelations: K[]): this;
     /**
      * The 'withTrashed' method is used to eager load related (relations) data when retrieving records from a database.
      *
@@ -666,7 +666,7 @@ declare class Model<TSchemaModel extends Record<string, Blueprint | string | num
      * @param {...string} nameRelations if data exists return blank
      * @return {this} this
      */
-    withTrashed(...nameRelations: string[]): this;
+    withTrashed<K extends keyof TRelationModel>(...nameRelations: K[]): this;
     /**
      * The 'withExists' method is used to eager load related (relations) data when retrieving records from a database.
      *
@@ -693,7 +693,7 @@ declare class Model<TSchemaModel extends Record<string, Blueprint | string | num
      *  // use with for results of relationship if relations is exists
      *  await new User().relationsExists('posts').findMany()
      */
-    withExists(...nameRelations: string[]): this;
+    withExists<K extends keyof TRelationModel>(...nameRelations: K[]): this;
     /**
      *
      * Use relations in registry of model return only exists result of relation query
@@ -718,7 +718,7 @@ declare class Model<TSchemaModel extends Record<string, Blueprint | string | num
      *  await new User().has('posts').findMany()
      * @return {this} this
      */
-    has(...nameRelations: string[]): this;
+    has<K extends keyof TRelationModel>(...nameRelations: K[]): this;
     /**
      *
      * The 'withQuery' method is particularly useful when you want to filter or add conditions records based on related data.
@@ -767,7 +767,7 @@ declare class Model<TSchemaModel extends Record<string, Blueprint | string | num
      *  .findMany()
      * @return {this} this
      */
-    withQuery<T extends Model>(nameRelation: string, callback: (query: T) => T): this;
+    withQuery<K extends keyof TRelationModel, TModel extends Model>(nameRelation: K, callback: (query: TModel) => TModel): this;
     /**
      *
      * Use relations in registry of model return result of relation query
@@ -792,7 +792,7 @@ declare class Model<TSchemaModel extends Record<string, Blueprint | string | num
      *  await new User().relations('posts').findMany()
      * @return {this} this
      */
-    relations(...nameRelations: string[]): this;
+    relations(...nameRelations: any[]): this;
     /**
      *
      * Use relations in registry of model return only exists result of relation query
@@ -817,7 +817,7 @@ declare class Model<TSchemaModel extends Record<string, Blueprint | string | num
      *  await new User().relationsExists('posts').findMany()
      * @return {this} this
      */
-    relationsExists(...nameRelations: string[]): this;
+    relationsExists<K extends keyof TRelationModel>(...nameRelations: K[]): this;
     /**
      *
      * Use relation '${name}' registry of model return callback this query model
@@ -864,21 +864,21 @@ declare class Model<TSchemaModel extends Record<string, Blueprint | string | num
      *  .findMany()
      * @return {this} this
      */
-    relationQuery<T extends Model>(nameRelation: string, callback: (query: T) => T): this;
+    relationQuery<K extends keyof TRelationModel, T extends Model>(nameRelation: K, callback: (query: T) => T): this;
     /**
      *
      * Use relations in registry of model return ignore soft deleted
      * @param {...string} nameRelations if data exists return blank
      * @return {this} this
      */
-    relationsAll(...nameRelations: string[]): this;
+    relationsAll<K extends keyof TRelationModel>(...nameRelations: K[]): this;
     /**
      *
      * Use relations in registry of model return only in trash (soft delete)
      * @param {...string} nameRelations if data exists return blank
      * @return {this} this
      */
-    relationsTrashed(...nameRelations: string[]): this;
+    relationsTrashed<K extends keyof TRelationModel>(...nameRelations: K[]): this;
     /**
      * The 'hasOne' relationship defines a one-to-one relationship between two database tables.
      *
@@ -895,7 +895,7 @@ declare class Model<TSchemaModel extends Record<string, Blueprint | string | num
      * @property {string} relation.freezeTable
      * @return   {this}   this
      */
-    protected hasOne({ name, as, model, localKey, foreignKey, freezeTable }: Relation): this;
+    protected hasOne<K extends keyof TRelationModel>({ name, as, model, localKey, foreignKey, freezeTable }: Relation<K>): this;
     /**
      * The 'hasMany' relationship defines a one-to-many relationship between two database tables.
      *
@@ -912,7 +912,7 @@ declare class Model<TSchemaModel extends Record<string, Blueprint | string | num
      * @property {string} relation.freezeTable
      * @return   {this}   this
      */
-    protected hasMany({ name, as, model, localKey, foreignKey, freezeTable }: Relation): this;
+    protected hasMany<K extends keyof TRelationModel>({ name, as, model, localKey, foreignKey, freezeTable }: Relation<K>): this;
     /**
      * The 'belongsTo' relationship defines a one-to-one or many-to-one relationship between two database tables.
      *
@@ -929,7 +929,7 @@ declare class Model<TSchemaModel extends Record<string, Blueprint | string | num
      * @property {string} relation.freezeTable
      * @return   {this}   this
      */
-    protected belongsTo({ name, as, model, localKey, foreignKey, freezeTable }: Relation): this;
+    protected belongsTo<K extends keyof TRelationModel>({ name, as, model, localKey, foreignKey, freezeTable }: Relation<K>): this;
     /**
      * The 'belongsToMany' relationship defines a many-to-many relationship between two database tables.
      *
@@ -949,7 +949,7 @@ declare class Model<TSchemaModel extends Record<string, Blueprint | string | num
      * @property {class?} relation.modelPivot model for pivot
      * @return   {this}   this
      */
-    protected belongsToMany({ name, as, model, localKey, foreignKey, freezeTable, pivot, oldVersion, modelPivot }: Relation): this;
+    protected belongsToMany<K extends keyof TRelationModel>({ name, as, model, localKey, foreignKey, freezeTable, pivot, oldVersion, modelPivot }: Relation<K>): this;
     /**
      * The 'hasOneBuilder' method is useful for creating 'hasOne' relationship to function
      *
@@ -1267,7 +1267,7 @@ declare class Model<TSchemaModel extends Record<string, Blueprint | string | num
      * @param {Function?} cb callback function return query sql
      * @return {promise<Record<string,any> | null>} Record | null
     */
-    first<K>(cb?: Function): Promise<Partial<TSchemaModel> & K | null>;
+    first<K>(cb?: Function): Promise<Partial<TSchemaModel> & K & TRelationModel | null>;
     /**
      * @override
      * @param {Function?} cb callback function return query sql

package/build/lib/core/Model.js

@@ -631,7 +631,7 @@ 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 "${name}" not be register in Model "${(_a = this.constructor) === null || _a === void 0 ? void 0 : _a.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}"`);
         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 (callback == null) {
@@ -1005,8 +1005,8 @@ class Model extends AbstractModel_1.AbstractModel {
      * @return {this} this
      */
     _queryStatement(sql) {
-        var _a;
         return __awaiter(this, void 0, void 0, function* () {
+            var _a;
             try {
                 if (this.$state.get('DEBUG'))
                     this.$utils.consoleDebug(sql);
@@ -1057,9 +1057,9 @@ class Model extends AbstractModel_1.AbstractModel {
      * @property {Function} actions.returnId
      * @return {this} this
      */
-    _actionStatement({ sql, returnId = false }) {
-        var _a;
-        return __awaiter(this, void 0, void 0, function* () {
+    _actionStatement(_a) {
+        return __awaiter(this, arguments, void 0, function* ({ sql, returnId = false }) {
+            var _b;
             try {
                 if (this.$state.get('DEBUG'))
                     this.$utils.consoleDebug(sql);
@@ -1179,7 +1179,7 @@ class Model extends AbstractModel_1.AbstractModel {
                 return result.affectedRows;
             }
             catch (error) {
-                if ((_a = this.$state.get('JOIN')) === null || _a === void 0 ? void 0 : _a.length)
+                if ((_b = this.$state.get('JOIN')) === null || _b === void 0 ? void 0 : _b.length)
                     throw error;
                 yield this._checkSchemaOrNextError(error, Number(this.$state.get('RETRY')));
                 this.$state.set('RETRY', Number(this.$state.get('RETRY')) + 1);
@@ -2495,8 +2495,8 @@ class Model extends AbstractModel_1.AbstractModel {
      * @return {promise<boolean>} promise boolean
      */
     delete() {
-        var _a, _b;
         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.");
             this.limit(1);
             if (this.$state.get('SOFT_DELETE')) {
@@ -2529,8 +2529,8 @@ class Model extends AbstractModel_1.AbstractModel {
      * @return {promise<boolean>} promise boolean
      */
     deleteMany() {
-        var _a, _b;
         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('SOFT_DELETE')) {
                 const deletedAt = this._valuePattern(this.$state.get('SOFT_DELETE_FORMAT'));
@@ -2567,8 +2567,8 @@ class Model extends AbstractModel_1.AbstractModel {
      * @return {promise<boolean>}
      */
     forceDelete() {
-        var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
+            var _a, _b;
             this.disableSoftDelete();
             this.$state.set('DELETE', [
                 `${this.$constants('DELETE')}`,
@@ -2588,8 +2588,8 @@ class Model extends AbstractModel_1.AbstractModel {
      * @return {promise<Record<string,any> | null>} Record | null
     */
     first(cb) {
-        var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
+            var _a, _b;
             this._validateMethod('first');
             if (this.$state.get('VOID'))
                 return this._resultHandler(undefined);
@@ -2625,8 +2625,8 @@ class Model extends AbstractModel_1.AbstractModel {
      * @return {promise<object | Error>} Record | throw error
     */
     firstOrError(message, options) {
-        var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
+            var _a, _b;
             this._validateMethod('firstOrError');
             if ((_a = this.$state.get('EXCEPTS')) === null || _a === void 0 ? void 0 : _a.length)
                 this.select(...yield this.exceptColumns());
@@ -2659,8 +2659,8 @@ class Model extends AbstractModel_1.AbstractModel {
      * @return {promise<array>} Array
     */
     get(cb) {
-        var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
+            var _a, _b;
             this._validateMethod('get');
             if (this.$state.get('VOID'))
                 return [];
@@ -2699,8 +2699,8 @@ class Model extends AbstractModel_1.AbstractModel {
      * @return {promise<Pagination>} Pagination
      */
     pagination(paginationOptions) {
-        var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
+            var _a, _b;
             this._validateMethod('pagination');
             let limit = 15;
             let page = 1;
@@ -2743,8 +2743,8 @@ class Model extends AbstractModel_1.AbstractModel {
      * @return {Promise<array>} Array
      */
     getGroupBy(column) {
-        var _a;
         return __awaiter(this, void 0, void 0, function* () {
+            var _a;
             if ((_a = this.$state.get('EXCEPTS')) === null || _a === void 0 ? void 0 : _a.length)
                 this.select(...yield this.exceptColumns());
             this.selectRaw([
@@ -3184,19 +3184,19 @@ class Model extends AbstractModel_1.AbstractModel {
      * @property {boolean} options.changed - check when column is changed attribute will be change attribute
      * @return {Promise<void>}
      */
-    sync({ force = false, foreign = false, changed = false } = {}) {
-        var _a, _b, _c, _d, _e, _f, _g, _h;
-        return __awaiter(this, void 0, void 0, function* () {
+    sync() {
+        return __awaiter(this, arguments, void 0, function* ({ force = false, foreign = false, changed = false } = {}) {
+            var _a, _b, _c, _d, _e, _f, _g, _h;
             const checkTables = yield this._queryStatement(`${this.$constants('SHOW_TABLES')} ${this.$constants('LIKE')} '${this.getTableName()}'`);
             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');
             const checkTableIsExists = existsTables.some((table) => table === this.getTableName());
-            const syncForeignKey = ({ schemaModel, model }) => __awaiter(this, void 0, void 0, function* () {
-                var _j;
+            const syncForeignKey = (_j) => __awaiter(this, [_j], void 0, function* ({ schemaModel, model }) {
+                var _k;
                 for (const key in schemaModel) {
-                    if (((_j = schemaModel[key]) === null || _j === void 0 ? void 0 : _j.foreignKey) == null)
+                    if (((_k = schemaModel[key]) === null || _k === void 0 ? void 0 : _k.foreignKey) == null)
                         continue;
                     const foreign = schemaModel[key].foreignKey;
                     const table = typeof foreign.on === "string" ? foreign.on : foreign.on.getTableName();
@@ -3528,24 +3528,24 @@ class Model extends AbstractModel_1.AbstractModel {
             return;
         });
     }
-    _execute({ sql, type, message, options }) {
-        var _a, _b;
-        return __awaiter(this, void 0, void 0, function* () {
+    _execute(_a) {
+        return __awaiter(this, arguments, void 0, function* ({ sql, type, message, options }) {
+            var _b, _c;
             let result = yield this._queryStatement(sql);
             if (!result.length)
                 return this._returnEmpty(type, result, message, options);
             const relations = this.$state.get('RELATIONS');
             for (const relation of relations) {
-                result = (_b = yield ((_a = this.$relation) === null || _a === void 0 ? void 0 : _a.load(result, relation))) !== null && _b !== void 0 ? _b : [];
+                result = (_c = yield ((_b = this.$relation) === null || _b === void 0 ? void 0 : _b.load(result, relation))) !== null && _c !== void 0 ? _c : [];
             }
             if (this.$state.get('HIDDEN').length)
                 this._hiddenColumnModel(result);
             return (yield this._returnResult(type, result)) || this._returnEmpty(type, result, message, options);
         });
     }
-    _executeGroup(dataParents, type = 'GET') {
-        var _a, _b, _c;
-        return __awaiter(this, void 0, void 0, function* () {
+    _executeGroup(dataParents_1) {
+        return __awaiter(this, arguments, void 0, function* (dataParents, type = 'GET') {
+            var _a, _b, _c;
             if (!dataParents.length)
                 return this._returnEmpty(type, dataParents);
             const relations = this.$state.get('RELATIONS');
@@ -3561,8 +3561,8 @@ class Model extends AbstractModel_1.AbstractModel {
         });
     }
     _pagination(data) {
-        var _a;
         return __awaiter(this, void 0, void 0, function* () {
+            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");
@@ -3665,8 +3665,8 @@ class Model extends AbstractModel_1.AbstractModel {
         });
     }
     _returnResult(type, data) {
-        var _a, _b, _c, _d, _e;
         return __awaiter(this, void 0, void 0, function* () {
+            var _a, _b, _c, _d, _e;
             const registry = this.$state.get('REGISTRY');
             if (((_a = Object.keys(registry)) === null || _a === void 0 ? void 0 : _a.length) && registry != null) {
                 for (const d of data) {
@@ -3807,8 +3807,8 @@ class Model extends AbstractModel_1.AbstractModel {
         return data;
     }
     _attach(name, dataId, fields) {
-        var _a;
         return __awaiter(this, void 0, void 0, function* () {
+            var _a;
             this._assertError(!Array.isArray(dataId), `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`);
@@ -4019,8 +4019,8 @@ class Model extends AbstractModel_1.AbstractModel {
         });
     }
     _createMultipleModel() {
-        var _a;
         return __awaiter(this, void 0, void 0, function* () {
+            var _a;
             for (const data of (_a = this.$state.get('DATA')) !== null && _a !== void 0 ? _a : []) {
                 yield this._validateSchema(data, 'insert');
             }
@@ -4227,9 +4227,9 @@ class Model extends AbstractModel_1.AbstractModel {
             }
         }
     }
-    _checkSchemaOrNextError(e, retry = 1) {
-        var _a, _b, _c, _d, _e;
-        return __awaiter(this, void 0, void 0, function* () {
+    _checkSchemaOrNextError(e_1) {
+        return __awaiter(this, arguments, void 0, function* (e, retry = 1) {
+            var _a, _b, _c, _d, _e;
             try {
                 if (retry > 2 || this.$state.get('RETRY') > 2)
                     throw e;
@@ -4299,22 +4299,22 @@ class Model extends AbstractModel_1.AbstractModel {
     _makeRelations() {
         if (this.$hasOne != null) {
             for (const hasOne of this.$hasOne) {
-                this.hasOne(Object.assign(Object.assign({}, hasOne), { name: String(hasOne.name) }));
+                this.hasOne(Object.assign(Object.assign({}, hasOne), { name: hasOne.name }));
             }
         }
         if (this.$hasMany != null) {
             for (const hasMany of this.$hasMany) {
-                this.hasMany(Object.assign(Object.assign({}, hasMany), { name: String(hasMany.name) }));
+                this.hasMany(Object.assign(Object.assign({}, hasMany), { name: hasMany.name }));
             }
         }
         if (this.$belongsTo != null) {
             for (const belongsTo of this.$belongsTo) {
-                this.belongsTo(Object.assign(Object.assign({}, belongsTo), { name: String(belongsTo.name) }));
+                this.belongsTo(Object.assign(Object.assign({}, belongsTo), { name: belongsTo.name }));
             }
         }
         if (this.$belongsToMany != null) {
             for (const belongsToMany of this.$belongsToMany) {
-                this.belongsToMany(Object.assign(Object.assign({}, belongsToMany), { name: String(belongsToMany.name) }));
+                this.belongsToMany(Object.assign(Object.assign({}, belongsToMany), { name: belongsToMany.name }));
             }
         }
         return this;

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

@@ -133,8 +133,5 @@ declare class Schema extends Builder {
     private _syncExecute;
     private _syncForeignKey;
 }
-type SchemaType<TSchema, TSpecific = any> = {
-    [K in keyof TSchema]: K extends keyof TSpecific ? TSpecific[K] : any;
-};
-export { Schema, SchemaType };
+export { Schema };
 export default Schema;

package/build/lib/core/Schema.js

@@ -141,8 +141,8 @@ class Schema extends Builder_1.Builder {
     *
     *  await new Schema().sync(`app/Models` , { force : true , log = true, foreign = true , changed = true })
     */
-    sync(pathFolders, { force = false, log = false, foreign = false, changed = false } = {}) {
-        return __awaiter(this, void 0, void 0, function* () {
+    sync(pathFolders_1) {
+        return __awaiter(this, arguments, void 0, function* (pathFolders, { force = false, log = false, foreign = false, changed = false } = {}) {
             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);
@@ -217,8 +217,8 @@ class Schema extends Builder_1.Builder {
      *
      *  await Schema.sync(`app/Models` , { force : true })
      */
-    static sync(pathFolders, { force = false, log = false, foreign = false, changed = false } = {}) {
-        return __awaiter(this, void 0, void 0, function* () {
+    static sync(pathFolders_1) {
+        return __awaiter(this, arguments, void 0, function* (pathFolders, { force = false, log = false, foreign = false, changed = false } = {}) {
             return new this().sync(pathFolders, { force, log, foreign, changed });
         });
     }
@@ -235,9 +235,9 @@ class Schema extends Builder_1.Builder {
             }
         });
     }
-    _syncExecute({ models, force, log, foreign, changed }) {
-        var _a, _b, _c, _d, _e, _f, _g, _h;
-        return __awaiter(this, void 0, void 0, function* () {
+    _syncExecute(_a) {
+        return __awaiter(this, arguments, void 0, function* ({ models, force, log, foreign, changed }) {
+            var _b, _c, _d, _e, _f, _g, _h, _j;
             const checkTables = yield this.query(this.$constants('SHOW_TABLES'));
             const existsTables = checkTables.map((c) => Object.values(c)[0]);
             for (const model of models) {
@@ -283,8 +283,8 @@ class Schema extends Builder_1.Builder {
                     for (const column of wasChangedColumns) {
                         if (column == null)
                             continue;
-                        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;
+                        const type = (_c = (_b = schemaModel[column]) === null || _b === void 0 ? void 0 : _b.type) !== null && _c !== void 0 ? _c : null;
+                        const attributes = (_e = (_d = schemaModel[column]) === null || _d === void 0 ? void 0 : _d.attributes) !== null && _e !== void 0 ? _e : null;
                         const sql = [
                             this.$constants('ALTER_TABLE'),
                             `\`${model.getTableName()}\``,
@@ -302,8 +302,8 @@ class Schema extends Builder_1.Builder {
                 for (const column of missingColumns) {
                     const indexWithColumn = entries.findIndex(([key]) => key === column);
                     const findAfterIndex = indexWithColumn ? entries[indexWithColumn - 1][0] : null;
-                    const type = (_f = (_e = schemaModel[column]) === null || _e === void 0 ? void 0 : _e.type) !== null && _f !== void 0 ? _f : null;
-                    const attributes = (_h = (_g = schemaModel[column]) === null || _g === void 0 ? void 0 : _g.attributes) !== null && _h !== void 0 ? _h : null;
+                    const type = (_g = (_f = schemaModel[column]) === null || _f === void 0 ? void 0 : _f.type) !== null && _g !== void 0 ? _g : null;
+                    const attributes = (_j = (_h = schemaModel[column]) === null || _h === void 0 ? void 0 : _h.attributes) !== null && _j !== void 0 ? _j : null;
                     if (findAfterIndex == null || type == null || attributes == null)
                         continue;
                     const sql = [
@@ -325,11 +325,11 @@ class Schema extends Builder_1.Builder {
             return;
         });
     }
-    _syncForeignKey({ schemaModel, model, log }) {
-        var _a;
-        return __awaiter(this, void 0, void 0, function* () {
+    _syncForeignKey(_a) {
+        return __awaiter(this, arguments, void 0, function* ({ schemaModel, model, log }) {
+            var _b;
             for (const key in schemaModel) {
-                if (((_a = schemaModel[key]) === null || _a === void 0 ? void 0 : _a.foreignKey) == null)
+                if (((_b = schemaModel[key]) === null || _b === void 0 ? void 0 : _b.foreignKey) == null)
                     continue;
                 const foreign = schemaModel[key].foreignKey;
                 if (foreign.on == null)

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

@@ -0,0 +1,6 @@
+export type SchemaType<TSchema, TSpecific = any> = {
+    [K in keyof TSchema]: K extends keyof TSpecific ? TSpecific[K] : any;
+};
+export type RelationType<T> = {
+    [K in keyof T]: T[K];
+};

package/build/lib/core/Type.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

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

@@ -9,6 +9,7 @@ export { Blueprint };
 export { Pool };
 export * from './Decorator';
 export * from './Schema';
+export * from './Type';
 declare const _default: {
     DB: typeof DB;
     Model: typeof Model;

package/build/lib/core/index.js

@@ -29,6 +29,7 @@ const connection_1 = __importDefault(require("../connection"));
 exports.Pool = connection_1.default;
 __exportStar(require("./Decorator"), exports);
 __exportStar(require("./Schema"), exports);
+__exportStar(require("./Type"), exports);
 exports.default = {
     DB: DB_1.default,
     Model: Model_1.default,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tspace-mysql",
-  "version": "1.5.1",
+  "version": "1.5.2",
   "description": "mysql query builder object relational mapping (ORM)",
   "main": "build/lib/index.js",
   "types": "build/lib/index.d.ts",
@@ -15,6 +15,7 @@
     "url": "https://github.com/thanathip41/tspace-mysql.git"
   },
   "keywords": [
+    "tspace",
     "tspace-mysql",
     "mysql",
     "orm",