tspace-mysql 1.4.4 → 1.4.6

package/dist/lib/tspace/Model.js

@@ -206,7 +206,7 @@ class Model extends AbstractModel_1.AbstractModel {
      * @example
      * class User extends Model {
      *     constructor() {
-     *        this.useSoftDelete('delete_at')
+     *        this.useSoftDelete('deletedAt')
      *     }
      * }
      * @return {this} this
@@ -540,7 +540,7 @@ class Model extends AbstractModel_1.AbstractModel {
     }
     /**
      * Assign build in function to result of data
-     * @param {object} func
+     * @param {Record} func
      * @return {this} this
      */
     registry(func) {
@@ -1133,7 +1133,7 @@ class Model extends AbstractModel_1.AbstractModel {
         return __awaiter(this, void 0, void 0, function* () {
             this.disableSoftDelete();
             this.whereNotNull(this._valuePattern(this.$state.get('SOFT_DELETE_FORMAT')));
-            const sql = this._buildQueryModel();
+            const sql = this._buildQueryStatement();
             return yield this._execute({ sql, type: 'GET' });
         });
     }
@@ -1145,7 +1145,7 @@ class Model extends AbstractModel_1.AbstractModel {
         return __awaiter(this, void 0, void 0, function* () {
             this.disableSoftDelete();
             this.whereNotNull(this._valuePattern(this.$state.get('SOFT_DELETE_FORMAT')));
-            const sql = this._buildQueryModel();
+            const sql = this._buildQueryStatement();
             return yield this._execute({ sql, type: 'GET' });
         });
     }
@@ -1176,162 +1176,6 @@ class Model extends AbstractModel_1.AbstractModel {
     toTableNameAndColumn(column) {
         return `\`${this._tableName()}\`.\`${this._valuePattern(column)}\``;
     }
-    /**
-     *
-     * @override Method
-     * @return {string}
-    */
-    toString() {
-        const sql = this._buildQueryModel();
-        if (this.$state.get('DEBUG'))
-            this.$utils.consoleDebug(sql);
-        return this.resultHandler(sql);
-    }
-    /**
-     *
-     * @override Method
-     * @return {string}
-    */
-    toSQL() {
-        const sql = this._buildQueryModel();
-        if (this.$state.get('DEBUG'))
-            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
-     * @return {promise<string>}
-    */
-    toJSON() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const sql = this._buildQueryModel();
-            const result = yield this.queryStatement(sql);
-            if (this.$state.get('HIDDEN').length)
-                this._hiddenColumnModel(result);
-            return this.resultHandler(JSON.stringify(result));
-        });
-    }
-    /**
-     *
-     * @override Method
-     * @param {string=} column [column=id]
-     * @return {promise<Array>}
-    */
-    toArray(column = 'id') {
-        return __awaiter(this, void 0, void 0, function* () {
-            this.selectRaw(column);
-            const sql = this._buildQueryModel();
-            const result = yield this.queryStatement(sql);
-            const toArray = result.map((data) => data[column]);
-            return this.resultHandler(toArray);
-        });
-    }
-    /**
-     *
-     * @override Method
-     * @param {string=} column [column=id]
-     * @return {promise<number>}
-    */
-    avg(column = 'id') {
-        var _a;
-        return __awaiter(this, void 0, void 0, function* () {
-            this.selectRaw(`${this.$constants('AVG')}(${column}) ${this.$constants('AS')} \`avg\``);
-            const sql = this._buildQueryModel();
-            const result = yield this.queryStatement(sql);
-            return Number(this.resultHandler(((_a = result === null || result === void 0 ? void 0 : result.shift()) === null || _a === void 0 ? void 0 : _a.avg) || 0));
-        });
-    }
-    /**
-     *
-     * @override Method
-     * @param {string} column [column=id]
-     * @return {promise<number>}
-    */
-    sum(column = 'id') {
-        var _a;
-        return __awaiter(this, void 0, void 0, function* () {
-            this.selectRaw(`${this.$constants('SUM')}(${column}) ${this.$constants('AS')} \`sum\``);
-            const sql = this._buildQueryModel();
-            const result = yield this.queryStatement(sql);
-            return Number(this.resultHandler(((_a = result === null || result === void 0 ? void 0 : result.shift()) === null || _a === void 0 ? void 0 : _a.sum) || 0));
-        });
-    }
-    /**
-     *
-     * @override Method
-     * @param {string=} column [column=id]
-     * @return {promise<number>}
-    */
-    max(column = 'id') {
-        var _a;
-        return __awaiter(this, void 0, void 0, function* () {
-            this.selectRaw(`${this.$constants('MAX')}(${column}) ${this.$constants('AS')} \`max\``);
-            const sql = this._buildQueryModel();
-            const result = yield this.queryStatement(sql);
-            return Number(this.resultHandler(((_a = result === null || result === void 0 ? void 0 : result.shift()) === null || _a === void 0 ? void 0 : _a.max) || 0));
-        });
-    }
-    /**
-     *
-     * @override Method
-     * @param {string=} column [column=id]
-     * @return {promise<number>}
-    */
-    min(column = 'id') {
-        var _a;
-        return __awaiter(this, void 0, void 0, function* () {
-            this.selectRaw(`${this.$constants('MIN')}(${column}) ${this.$constants('AS')} \`min\``);
-            const sql = this._buildQueryModel();
-            const result = yield this.queryStatement(sql);
-            return Number(this.resultHandler(((_a = result === null || result === void 0 ? void 0 : result.shift()) === null || _a === void 0 ? void 0 : _a.min) || 0));
-        });
-    }
-    /**
-     *
-     * @override Method
-     * @param {string=} column [column=id]
-     * @return {promise<number>}
-    */
-    count(column = 'id') {
-        var _a;
-        return __awaiter(this, void 0, void 0, function* () {
-            this.selectRaw(`${this.$constants('COUNT')}(${column}) ${this.$constants('AS')} \`total\``);
-            const sql = this._buildQueryModel();
-            const result = yield this.queryStatement(sql);
-            return Number(this.resultHandler(((_a = result === null || result === void 0 ? void 0 : result.shift()) === null || _a === void 0 ? void 0 : _a.total) || 0));
-        });
-    }
-    /**
-     *
-     * execute data return result is exists
-     * @return {promise<boolean>}
-     */
-    exists() {
-        var _a;
-        return __awaiter(this, void 0, void 0, function* () {
-            this.limit(1);
-            const sql = this._buildQueryModel();
-            const result = yield this.queryStatement([
-                `${this.$constants('SELECT')}`,
-                `${this.$constants('EXISTS')}`,
-                `(${sql})`,
-                `${this.$constants('AS')} \`exists\``
-            ].join(' '));
-            return Boolean(this.resultHandler(!!((_a = result === null || result === void 0 ? void 0 : result.shift()) === null || _a === void 0 ? void 0 : _a.exists) || false));
-        });
-    }
     /**
      * delete data from the database
      * @override Method
@@ -1372,14 +1216,14 @@ class Model extends AbstractModel_1.AbstractModel {
     /**
      *
      * @override Method
-     * @return {promise<{[key: string]:any} | null>}
+     * @return {promise<Record<string,any> | null>}
     */
     first() {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
             this._validateMethod('first');
             if (this.$state.get('VOID'))
-                return this.resultHandler(null);
+                return this.resultHandler(undefined);
             if ((_a = this.$state.get('EXCEPTS')) === null || _a === void 0 ? void 0 : _a.length)
                 this.select(...yield this.exceptColumns());
             this.limit(1);
@@ -1390,7 +1234,7 @@ class Model extends AbstractModel_1.AbstractModel {
                 });
             }
             return yield this._execute({
-                sql: this._buildQueryModel(),
+                sql: this._buildQueryStatement(),
                 type: 'FIRST'
             });
         });
@@ -1398,7 +1242,7 @@ class Model extends AbstractModel_1.AbstractModel {
     /**
      *
      * @override Method
-     * @return {promise<{[key: string]:any} | null>}
+     * @return {promise<Record<string,any> | null>}
     */
     findOne() {
         return __awaiter(this, void 0, void 0, function* () {
@@ -1424,7 +1268,7 @@ class Model extends AbstractModel_1.AbstractModel {
                 });
             }
             return yield this._execute({
-                sql: this._buildQueryModel(),
+                sql: this._buildQueryStatement(),
                 type: 'FIRST_OR_ERROR',
                 message,
                 options
@@ -1454,7 +1298,7 @@ class Model extends AbstractModel_1.AbstractModel {
                 return [];
             if ((_a = this.$state.get('EXCEPTS')) === null || _a === void 0 ? void 0 : _a.length)
                 this.select(...yield this.exceptColumns());
-            let sql = this._buildQueryModel();
+            let sql = this._buildQueryStatement();
             if (this.$state.get('RELATIONS_EXISTS'))
                 sql = this._queryRelationsExists();
             return yield this._execute({
@@ -1498,7 +1342,7 @@ class Model extends AbstractModel_1.AbstractModel {
             this.$state.set('PAGE', page);
             this.limit(limit);
             this.offset(offset);
-            let sql = this._buildQueryModel();
+            let sql = this._buildQueryStatement();
             if (this.$state.get('RELATIONS_EXISTS'))
                 sql = this._queryRelationsExists();
             return yield this._execute({
@@ -1537,7 +1381,7 @@ class Model extends AbstractModel_1.AbstractModel {
                 `${this.$constants('GROUP_CONCAT')}(id)`,
                 `${this.$constants('AS')} data`
             ].join(' '));
-            const sql = this._buildQueryModel();
+            const sql = this._buildQueryStatement();
             const results = yield this.queryStatement(sql);
             let data = [];
             results.forEach((result) => {
@@ -1570,11 +1414,46 @@ class Model extends AbstractModel_1.AbstractModel {
     /**
      *
      * update data in the database
+     * @param {object} data
+     * @param {array?} updateNotExists options for except update some records in your ${data}
+     * @return {this} this
+     */
+    update(data, updateNotExists = []) {
+        if (!Object.keys(data).length)
+            throw new Error('This method must be required');
+        if (updateNotExists.length) {
+            for (const c of updateNotExists) {
+                for (const column in data) {
+                    if (c !== column)
+                        continue;
+                    const value = data[column];
+                    data[column] = this._updateHandler(column, value);
+                    break;
+                }
+            }
+        }
+        const query = this._queryUpdateModel(data);
+        this.$state.set('UPDATE', [
+            `${this.$constants('UPDATE')}`,
+            `${this.$state.get('TABLE_NAME')}`,
+            `${query}`
+        ].join(' '));
+        this.$state.set('SAVE', 'UPDATE');
+        return this;
+    }
+    /**
+     *
      * @override Method
      * @param {object} data
      * @return {this} this
      */
-    update(data) {
+    updateNotExists(data) {
+        if (!Object.keys(data).length)
+            throw new Error('This method must be required');
+        for (const column in data) {
+            const value = data[column];
+            data[column] = this._updateHandler(column, value);
+        }
         const query = this._queryUpdateModel(data);
         this.$state.set('UPDATE', [
             `${this.$constants('UPDATE')}`,
@@ -1591,6 +1470,8 @@ class Model extends AbstractModel_1.AbstractModel {
      * @return {this} this
      */
     insert(data) {
+        if (!Object.keys(data).length)
+            throw new Error('This method must be required');
         const query = this._queryInsertModel(data);
         this.$state.set('INSERT', [
             `${this.$constants('INSERT')}`,
@@ -1607,6 +1488,8 @@ class Model extends AbstractModel_1.AbstractModel {
      * @return {this} this
      */
     create(data) {
+        if (!Object.keys(data).length)
+            throw new Error('This method must be required');
         const query = this._queryInsertModel(data);
         this.$state.set('INSERT', [
             `${this.$constants('INSERT')}`,
@@ -1623,6 +1506,8 @@ class Model extends AbstractModel_1.AbstractModel {
      * @return {this} this
      */
     updateOrCreate(data) {
+        if (!Object.keys(data).length)
+            throw new Error('This method must be required');
         const queryUpdate = this._queryUpdateModel(data);
         const queryInsert = this._queryInsertModel(data);
         this.$state.set('INSERT', [
@@ -1672,6 +1557,8 @@ class Model extends AbstractModel_1.AbstractModel {
      * @return {this} this
      */
     createOrSelect(data) {
+        if (!Object.keys(data).length)
+            throw new Error('This method must be required');
         const queryInsert = this._queryInsertModel(data);
         this.$state.set('INSERT', [
             `${this.$constants('INSERT')}`,
@@ -1771,7 +1658,7 @@ class Model extends AbstractModel_1.AbstractModel {
     /**
      *
      * @override Method
-     * @return {Promise<Record<string,any> | Array<any> | null | undefined>}
+     * @return {Promise<Record<string,any> | any[] | null | undefined>}
      */
     save() {
         return __awaiter(this, void 0, void 0, function* () {
@@ -1813,12 +1700,14 @@ class Model extends AbstractModel_1.AbstractModel {
     /**
      *
      * fake data into to this table
+     * @override Method
      * @param {number} rows number of rows
      * @return {promise<any>}
      */
     faker(rows = 1) {
         return __awaiter(this, void 0, void 0, function* () {
             let data = [];
+            this.void();
             const sql = [
                 `${this.$constants('SHOW')}`,
                 `${this.$constants('FIELDS')}`,
@@ -1950,7 +1839,13 @@ class Model extends AbstractModel_1.AbstractModel {
         }
         return this;
     }
-    _buildQueryModel() {
+    /**
+     *
+     * generate sql statements
+     * @override
+     * @return {string} string generated query string
+     */
+    _buildQueryStatement() {
         let sql = [];
         while (true) {
             this._handleSoftDelete();
@@ -2152,6 +2047,7 @@ class Model extends AbstractModel_1.AbstractModel {
         }
         const sql = clone
             .bind(this.$pool.get())
+            .select(this.$state.get('PRIMARY_KEY'))
             .whereReference(`\`${this._tableName()}\`.\`${localKey}\``, `\`${query._tableName()}\`.\`${foreignKey}\``)
             .toString();
         return sql;
@@ -2194,11 +2090,12 @@ class Model extends AbstractModel_1.AbstractModel {
             }
             const sql = clone
                 .bind(this.$pool.get())
+                .select(this.$state.get('PRIMARY_KEY'))
                 .whereReference(`\`${this._tableName()}\`.\`${localKey}\``, `\`${query._tableName()}\`.\`${foreignKey}\``)
                 .toString();
             this.whereExists(sql);
         }
-        const sql = this._buildQueryModel();
+        const sql = this._buildQueryStatement();
         return sql;
     }
     _relation(parents, relation) {
@@ -2682,7 +2579,7 @@ class Model extends AbstractModel_1.AbstractModel {
                 returnId: true
             });
             if (this.$state.get('VOID'))
-                return this.resultHandler(null);
+                return this.resultHandler(undefined);
             if (!result)
                 return this.resultHandler(null);
             const resultData = yield new Model().copyModel(this)
@@ -2699,7 +2596,7 @@ class Model extends AbstractModel_1.AbstractModel {
                 returnId: true
             });
             if (this.$state.get('VOID'))
-                return this.resultHandler(null);
+                return this.resultHandler(undefined);
             if (!result)
                 return this.resultHandler(null);
             const arrayId = [...Array(result)].map((_, i) => i + id);
@@ -2720,7 +2617,7 @@ class Model extends AbstractModel_1.AbstractModel {
                         returnId: true
                     });
                     if (this.$state.get('VOID') || !result)
-                        return this.resultHandler(null);
+                        return this.resultHandler(undefined);
                     const data = yield new Model().copyModel(this).bind(this.$pool.get()).where('id', id).first();
                     const resultData = data == null
                         ? null
@@ -2732,7 +2629,7 @@ class Model extends AbstractModel_1.AbstractModel {
                         sql: new Model().copyModel(this, { update: true, where: true }).toString()
                     });
                     if (this.$state.get('VOID') || !result)
-                        return this.resultHandler(null);
+                        return this.resultHandler(undefined);
                     const data = yield new Model().copyModel(this, { where: true }).bind(this.$pool.get()).get();
                     if ((data === null || data === void 0 ? void 0 : data.length) > 1) {
                         for (const v of data)
@@ -2757,7 +2654,7 @@ class Model extends AbstractModel_1.AbstractModel {
                         returnId: true
                     });
                     if (this.$state.get('VOID') || !result)
-                        return this.resultHandler(null);
+                        return this.resultHandler(undefined);
                     const data = yield new Model().copyModel(this).bind(this.$pool.get()).where('id', id).first();
                     const resultData = data == null
                         ? null
@@ -2766,7 +2663,7 @@ class Model extends AbstractModel_1.AbstractModel {
                 }
                 case true: {
                     if (this.$state.get('VOID'))
-                        return this.resultHandler(null);
+                        return this.resultHandler(undefined);
                     const data = yield new Model().copyModel(this, { where: true }).bind(this.$pool.get()).get();
                     if ((data === null || data === void 0 ? void 0 : data.length) > 1) {
                         for (const v of data)
@@ -2782,10 +2679,10 @@ class Model extends AbstractModel_1.AbstractModel {
     _updateModel() {
         return __awaiter(this, void 0, void 0, function* () {
             this._assertError(!String(this.$state.get('WHERE')), "can not update [ update ] without where condition");
-            const sql = this._buildQueryModel();
+            const sql = this._buildQueryStatement();
             const result = yield this.actionStatement({ sql });
             if (this.$state.get('VOID') || !result || result == null)
-                return this.resultHandler(null);
+                return this.resultHandler(undefined);
             const data = yield new Model().copyModel(this, { where: true }).bind(this.$pool.get()).get();
             if ((data === null || data === void 0 ? void 0 : data.length) > 1) {
                 return this.resultHandler(data || []);
@@ -2832,6 +2729,7 @@ class Model extends AbstractModel_1.AbstractModel {
             'insert',
             'create',
             'update',
+            'updateNotExists',
             'delete',
             'forceDelete',
             'restore',

package/dist/lib/tspace/Schema.js

@@ -143,9 +143,11 @@ class Schema extends Builder_1.Builder {
             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);
-                return directory.isDirectory() ? Schema.sync(newDir) : newDir;
+                if (directory.isDirectory() && directory.name.toLocaleLowerCase().includes('migrations'))
+                    return null;
+                return directory.isDirectory() ? Schema.sync(newDir, { force, log, delay }) : newDir;
             }));
-            const pathModels = [].concat(...files);
+            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);
@@ -165,7 +167,7 @@ class Schema extends Builder_1.Builder {
             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);
+                yield new Builder_1.Builder().debug(log).rawQuery(sql);
                 return;
             }
             if (!force)
@@ -183,7 +185,7 @@ class Schema extends Builder_1.Builder {
                 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)
-                    return;
+                    continue;
                 const sql = [
                     'ALTER TABLE',
                     `\`${model.getTableName()}\``,
@@ -192,7 +194,7 @@ class Schema extends Builder_1.Builder {
                     'AFTER',
                     `\`${findAfterIndex}\``
                 ].join(' ');
-                yield new Builder_1.Builder().dd(log).rawQuery(sql);
+                yield new Builder_1.Builder().debug(log).rawQuery(sql);
             }
             return;
         });

package/package.json

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