tspace-mysql 1.3.5 → 1.3.6

package/README.md

@@ -35,7 +35,7 @@ npm install tspace-mysql --save
   - [Make Migration](#make-migration)
   - [Migrate](#migrate)
   - [Query](#query)
-  - [Menerate Models](#generate-models)
+  - [Generate Models](#generate-models)
 - [Blueprint](#blueprint)
 
 ## Configuration
@@ -960,9 +960,9 @@ tspace-mysql make:migration users --dir=app/Models/Migrations
   * @arg --dir=directory => find migrate in directory. default find in root folder
   * @arg --type=js // extension js default ts
   */
-tspace-mysql migrate <folder> --type=... --dir=....
+tspace-mysql migrate <folder> --type=<type file js or ts> --dir=<directory for migrate>
  
-tspace-mysql migrate --dir=App/Models/Migrations --type=js
+tspace-mysql migrate --dir=app/Models/Migrations --type=js
 
 /**
  * 
@@ -989,7 +989,7 @@ tspace-mysql query "SELECT * FROM users"
 # Generate Models
 Command will be generate models from table in database
 ```js
-tspace-mysql generate:models
+tspace-mysql generate:models --dir=<folder for creating>
 
 ```
 
@@ -999,14 +999,14 @@ Schema table created by command make:migration,  you may use the:
 import { Schema , Blueprint , DB } from 'tspace-mysql'
 (async () => {
     await new Schema().table('users',{ 
-        id :  new Blueprint().int().notNull().primary().autoIncrement(),
-        uuid : new Blueprint().varchar(120).null()
-        name : new Blueprint().varchar(120).default('name'),
-        email : new Blueprint().varchar(255).unique().notNull(),
+        id           :  new Blueprint().int().notNull().primary().autoIncrement(),
+        uuid         : new Blueprint().varchar(120).null()
+        name         : new Blueprint().varchar(120).default('name'),
+        email        : new Blueprint().varchar(255).unique().notNull(),
         email_verify : new Blueprint().tinyInt(),
-        password : new Blueprint().varchar(255),
-        created_at : new Blueprint().null().timestamp(),
-        updated_at : new Blueprint().null().timestamp()
+        password     : new Blueprint().varchar(255),
+        created_at   : new Blueprint().null().timestamp(),
+        updated_at   : new Blueprint().null().timestamp()
     })
     /**
      *  

package/dist/cli/generate/model.js

@@ -11,7 +11,7 @@ class ${model} extends Model {
      * @useMethod
      *
      * this.useDebug() // => runing a uuid (universally unique identifier) when insert new data
-     * this.usePrimaryKey('id') // => runing a uuid (universally unique identifier) when insert new data
+     * this.usePrimaryKey('id')
      * this.useTimestamp({ createdAt : 'created_at' , updatedAt : 'updated_at' }) // runing a timestamp when insert or update
      * this.useSoftDelete()
      * this.useTable('users')

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

@@ -431,14 +431,14 @@ declare class Builder extends AbstractBuilder {
      * @param {array} data create multiple data
      * @return {this} this this
      */
-    createMultiple(data: Array<any>): this;
+    createMultiple(data: Array<Record<string, any>>): this;
     /**
      *
      * insert muliple data into the database
      * @param {array} data create multiple data
      * @return {this} this this
      */
-    insertMultiple(data: Array<any>): this;
+    insertMultiple(data: Array<Record<string, any>>): this;
     /**
      *
      * @return {string} return sql query

package/dist/lib/tspace/Builder.js

@@ -1724,7 +1724,7 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
             this.$state.set('SELECT', [
                 `${this.$constants('SELECT')}`,
                 `${this.$constants('COUNT')}(${column})`,
-                `${this.$constants('AS')} total`
+                `${this.$constants('AS')} \`total\``
             ].join(' '));
             const sql = this._buildQuery();
             const result = yield this.queryStatement(sql);
@@ -1747,7 +1747,7 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
                 `${this.$state.get('FROM')}`,
                 `${this.$state.get('TABLE_NAME')}`,
                 `${this.$state.get('WHERE')}`,
-                `${this.$constants('LIMIT')} 1) ${this.$constants('AS')} 'exists'`
+                `${this.$constants('LIMIT')} 1) ${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));
         });
@@ -1764,7 +1764,7 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
             this.$state.set('SELECT', [
                 `${this.$constants('SELECT')}`,
                 `${this.$constants('AVG')}(${column})`,
-                `${this.$constants('AS')} avg`
+                `${this.$constants('AS')} \`avg\``
             ].join(' '));
             const sql = this._buildQuery();
             const result = yield this.queryStatement(sql);
@@ -1780,7 +1780,7 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
     sum(column = 'id') {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
-            this.$state.set('SELECT', `${this.$constants('SELECT')} ${this.$constants('SUM')}(${column}) ${this.$constants('AS')} sum`);
+            this.$state.set('SELECT', `${this.$constants('SELECT')} ${this.$constants('SUM')}(${column}) ${this.$constants('AS')} \`sum\``);
             const sql = this._buildQuery();
             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));
@@ -1795,7 +1795,7 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
     max(column = 'id') {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
-            this.$state.set('SELECT', `${this.$constants('SELECT')} ${this.$constants('MAX')}(${column}) ${this.$constants('AS')} max`);
+            this.$state.set('SELECT', `${this.$constants('SELECT')} ${this.$constants('MAX')}(${column}) ${this.$constants('AS')} \`max\``);
             const sql = this._buildQuery();
             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));
@@ -1810,7 +1810,7 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
     min(column = 'id') {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
-            this.$state.set('SELECT', `${this.$constants('SELECT')} ${this.$constants('MIN')}(${column}) ${this.$constants('AS')} min`);
+            this.$state.set('SELECT', `${this.$constants('SELECT')} ${this.$constants('MIN')}(${column}) ${this.$constants('AS')} \`min\``);
             const sql = this._buildQuery();
             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));
@@ -1986,8 +1986,8 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
                 `${this.$constants('FROM')}`,
                 `\`${table.replace(/\`/g, '')}\``
             ].join(' ');
-            const raw = yield this.queryStatement(sql);
-            const schemas = raw.map((r) => {
+            const raws = yield this.queryStatement(sql);
+            return raws.map((r) => {
                 const schema = [];
                 schema.push(`${r.Field}`);
                 schema.push(`${r.Type}`);
@@ -2011,7 +2011,6 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
                 }
                 return schema.join(' ');
             });
-            return schemas;
         });
     }
     /**

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

@@ -268,7 +268,27 @@ declare class Model extends AbstractModel {
         limit?: boolean;
         offset?: boolean;
     }): Model;
+    /**
+     *
+     * execute the query using raw sql syntax
+     * @override method
+     * @param {string} sql
+     * @return {this} this
+     */
     protected queryStatement(sql: string): Promise<Array<any>>;
+    /**
+     *
+     * execute the query using raw sql syntax actions for insert update and delete
+     * @override method
+     * @param {Object} actions
+     * @property {Function} actions.sql
+     * @property {Function} actions.returnId
+     * @return {this} this
+     */
+    protected actionStatement({ sql, returnId }: {
+        sql: string;
+        returnId?: boolean;
+    }): Promise<any>;
     /**
      * Assign table name
      * @param {string} table table name
@@ -891,11 +911,7 @@ declare class Model extends AbstractModel {
      * @param {array<object>} data create multiple data
      * @return {this} this this
      */
-    createMultiple(data: Array<{
-        [key: string]: any;
-    }> & {
-        length?: never;
-    }): this;
+    createMultiple(data: Array<Record<string, any>>): this;
     /**
      *
      * insert muliple data into the database
@@ -903,11 +919,7 @@ declare class Model extends AbstractModel {
      * @param {array<object>} data create multiple data
      * @return {this} this this
      */
-    insertMultiple(data: Array<{
-        [key: string]: any;
-    }> & {
-        length?: never;
-    }): this;
+    insertMultiple(data: Array<Record<string, any>>): this;
     /**
      *
      * @param {object} data create not exists data
@@ -984,6 +996,7 @@ declare class Model extends AbstractModel {
     private _handleRelations;
     private _handleRelationsQuery;
     private _validateMethod;
+    private _tryToCreateTable;
     private _initialModel;
 }
 export { Model };

package/dist/lib/tspace/Model.js

@@ -399,7 +399,6 @@ class Model extends AbstractModel_1.AbstractModel {
         const copy = Object.fromEntries(instance.$state.get());
         const newInstance = new Model();
         newInstance.$state.clone(copy);
-        newInstance.$state.set('SAVE', '');
         if ((options === null || options === void 0 ? void 0 : options.insert) == null)
             newInstance.$state.set('INSERT', '');
         if ((options === null || options === void 0 ? void 0 : options.update) == null)
@@ -412,8 +411,16 @@ class Model extends AbstractModel_1.AbstractModel {
             newInstance.$state.set('LIMIT', '');
         if ((options === null || options === void 0 ? void 0 : options.offset) == null)
             newInstance.$state.set('OFFSET', '');
+        newInstance.$state.set('SAVE', '');
         return newInstance;
     }
+    /**
+     *
+     * execute the query using raw sql syntax
+     * @override method
+     * @param {string} sql
+     * @return {this} this
+     */
     queryStatement(sql) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
@@ -424,24 +431,42 @@ class Model extends AbstractModel_1.AbstractModel {
                 return result;
             }
             catch (e) {
-                const createTable = this.$state.get('CREATE_TABLE');
-                const tableName = this.$state.get('TABLE_NAME');
-                if (createTable == null)
-                    throw e;
-                if (this.$state.get('QUERIES') > 3)
-                    throw e;
-                try {
-                    yield new Schema_1.Schema()
-                        .debug(this.$state.get('DEBUG'))
-                        .createTable(tableName, createTable);
-                }
-                catch (e) {
-                    throw e;
-                }
+                yield this._tryToCreateTable(e);
                 return yield this.queryStatement(sql);
             }
         });
     }
+    /**
+     *
+     * execute the query using raw sql syntax actions for insert update and delete
+     * @override method
+     * @param {Object} actions
+     * @property {Function} actions.sql
+     * @property {Function} actions.returnId
+     * @return {this} this
+     */
+    actionStatement({ sql, returnId = false }) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                if (this.$state.get('DEBUG'))
+                    this.$utils.consoleDebug(sql);
+                this.$state.set('QUERIES', this.$state.get('QUERIES') + 1);
+                if (returnId) {
+                    const result = yield this.$pool.query(sql);
+                    return [result.affectedRows, result.insertId];
+                }
+                const { affectedRows: result } = yield this.$pool.query(sql);
+                return result;
+            }
+            catch (e) {
+                yield this._tryToCreateTable(e);
+                return yield this.actionStatement({
+                    sql,
+                    returnId
+                });
+            }
+        });
+    }
     /**
      * Assign table name
      * @param {string} table table name
@@ -1073,7 +1098,10 @@ class Model extends AbstractModel_1.AbstractModel {
      * @return {string}
     */
     toString() {
-        return this._buildQueryModel();
+        const sql = this._buildQueryModel();
+        if (this.$state.get('DEBUG'))
+            this.$utils.consoleDebug(sql);
+        return this.resultHandler(sql);
     }
     /**
      *
@@ -1081,7 +1109,10 @@ class Model extends AbstractModel_1.AbstractModel {
      * @return {string}
     */
     toSQL() {
-        return this._buildQueryModel();
+        const sql = this._buildQueryModel();
+        if (this.$state.get('DEBUG'))
+            this.$utils.consoleDebug(sql);
+        return this.resultHandler(sql);
     }
     /**
      *
@@ -1094,7 +1125,7 @@ class Model extends AbstractModel_1.AbstractModel {
             const result = yield this.queryStatement(sql);
             if (this.$state.get('HIDDEN').length)
                 this._hiddenColumnModel(result);
-            return JSON.stringify(result);
+            return this.resultHandler(JSON.stringify(result));
         });
     }
     /**
@@ -1109,7 +1140,7 @@ class Model extends AbstractModel_1.AbstractModel {
             const sql = this._buildQueryModel();
             const result = yield this.queryStatement(sql);
             const toArray = result.map((data) => data[column]);
-            return toArray;
+            return this.resultHandler(toArray);
         });
     }
     /**
@@ -1121,7 +1152,7 @@ class Model extends AbstractModel_1.AbstractModel {
     avg(column = 'id') {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
-            this.selectRaw(`${this.$constants('AVG')}(${column}) ${this.$constants('AS')} avg`);
+            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));
@@ -1136,7 +1167,7 @@ class Model extends AbstractModel_1.AbstractModel {
     sum(column = 'id') {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
-            this.selectRaw(`${this.$constants('SUM')}(${column}) ${this.$constants('AS')} sum`);
+            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));
@@ -1151,7 +1182,7 @@ class Model extends AbstractModel_1.AbstractModel {
     max(column = 'id') {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
-            this.selectRaw(`${this.$constants('MAX')}(${column}) ${this.$constants('AS')} max`);
+            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));
@@ -1166,7 +1197,7 @@ class Model extends AbstractModel_1.AbstractModel {
     min(column = 'id') {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
-            this.selectRaw(`${this.$constants('MIN')}(${column}) ${this.$constants('AS')} min`);
+            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));
@@ -1181,7 +1212,7 @@ class Model extends AbstractModel_1.AbstractModel {
     count(column = 'id') {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
-            this.selectRaw(`${this.$constants('COUNT')}(${column}) ${this.$constants('AS')} total`);
+            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));
@@ -1201,7 +1232,7 @@ class Model extends AbstractModel_1.AbstractModel {
                 `${this.$constants('SELECT')}`,
                 `${this.$constants('EXISTS')}`,
                 `(${sql})`,
-                `${this.$constants('AS')} 'exists'`
+                `${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));
         });
@@ -1702,13 +1733,13 @@ class Model extends AbstractModel_1.AbstractModel {
                 }
             }
             switch (String(this.$state.get('SAVE'))) {
-                case 'INSERT_MULTIPLE': return yield this._createMultipleModel();
                 case 'INSERT': return yield this._insertModel();
                 case 'UPDATE': return yield this._updateModel();
+                case 'INSERT_MULTIPLE': return yield this._createMultipleModel();
                 case 'INSERT_NOT_EXISTS': return yield this._insertNotExistsModel();
                 case 'UPDATE_OR_INSERT': return yield this._updateOrInsertModel();
                 case 'INSERT_OR_SELECT': return yield this._insertOrSelectModel();
-                default: throw new Error(`unknown this [${this.$state.get('SAVE')}]`);
+                default: throw new Error(`Unknown this [${this.$state.get('SAVE')}]`);
             }
         });
     }
@@ -2581,10 +2612,11 @@ class Model extends AbstractModel_1.AbstractModel {
                 return this.resultHandler(null);
             if (!result)
                 return this.resultHandler(null);
-            return yield new Model().copyModel(this)
+            const resultData = yield new Model().copyModel(this)
                 .where('id', id)
                 .bind(this.$pool.get())
                 .first();
+            return this.resultHandler(resultData);
         });
     }
     _createMultipleModel() {
@@ -2765,6 +2797,29 @@ class Model extends AbstractModel_1.AbstractModel {
             }
         }
     }
+    _tryToCreateTable(e) {
+        var _a;
+        return __awaiter(this, void 0, void 0, function* () {
+            const createTable = this.$state.get('CREATE_TABLE');
+            if (createTable == null)
+                throw e;
+            const errorMessage = (_a = e === null || e === void 0 ? void 0 : e.message) !== null && _a !== void 0 ? _a : '';
+            const errorWhenTableIsNotExists = "doesn't exist";
+            if (!errorMessage.toLocaleLowerCase().includes(errorWhenTableIsNotExists))
+                throw e;
+            if (this.$state.get('QUERIES') > 3)
+                throw e;
+            try {
+                const tableName = this.$state.get('TABLE_NAME');
+                yield new Schema_1.Schema()
+                    .debug(this.$state.get('DEBUG'))
+                    .createTable(tableName, createTable);
+            }
+            catch (e) {
+                throw e;
+            }
+        });
+    }
     _initialModel() {
         this.$state = new StateHandler_1.StateHandler(this.$constants('MODEL'));
         this._makeTableName();

package/package.json

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