tspace-mysql 1.2.4 → 1.2.6

package/dist/cli/dump/db.d.ts

@@ -0,0 +1,4 @@
+declare const _default: (cmd: {
+    [x: string]: any;
+}) => void;
+export default _default;

package/dist/cli/dump/db.js

@@ -0,0 +1,25 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const lib_1 = require("../../lib");
+exports.default = (cmd) => {
+    const { dir, cwd, fs, db, type } = cmd;
+    if (dir) {
+        try {
+            fs.accessSync(cwd + `/${dir}`, fs.F_OK, {
+                recursive: true
+            });
+        }
+        catch (e) {
+            fs.mkdirSync(cwd + `/${dir}`, {
+                recursive: true
+            });
+        }
+    }
+    const directory = `${cwd}/${dir}/dump_${+new Date()}.sql`;
+    new lib_1.DB().backupToFile({
+        filePath: directory,
+        database: db
+    })
+        .then(r => console.log('dump file successfully'))
+        .catch(err => console.log(err));
+};

package/dist/cli/index.js

@@ -3,7 +3,7 @@
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
-var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
+var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r;
 Object.defineProperty(exports, "__esModule", { value: true });
 const fs_1 = __importDefault(require("fs"));
 const make_1 = __importDefault(require("./models/make"));
@@ -11,13 +11,15 @@ const make_2 = __importDefault(require("./tables/make"));
 const make_3 = __importDefault(require("./migrate/make"));
 const make_4 = __importDefault(require("./generate/make"));
 const query_1 = __importDefault(require("./query"));
+const db_1 = __importDefault(require("./dump/db"));
 const commands = {
     'query': query_1.default,
     'make:model': make_1.default,
     'make:table': make_2.default,
     'make:migration': make_2.default,
     'migrate': make_3.default,
-    'generate:models': make_4.default
+    'generate:models': make_4.default,
+    'dump:db': db_1.default,
 };
 try {
     const name = (_c = (_b = (_a = process.argv.slice(2)) === null || _a === void 0 ? void 0 : _a.find(data => {
@@ -28,11 +30,14 @@ try {
     const dir = (_j = (_h = (_g = process.argv.slice(2)) === null || _g === void 0 ? void 0 : _g.find(data => {
         return data === null || data === void 0 ? void 0 : data.includes('--dir=');
     })) === null || _h === void 0 ? void 0 : _h.replace('--dir=', '/')) !== null && _j !== void 0 ? _j : null;
-    let type = (_m = (_l = (_k = process.argv.slice(2)) === null || _k === void 0 ? void 0 : _k.find(data => {
+    const db = (_m = (_l = (_k = process.argv.slice(2)) === null || _k === void 0 ? void 0 : _k.find(data => {
+        return data === null || data === void 0 ? void 0 : data.includes('--db=');
+    })) === null || _l === void 0 ? void 0 : _l.replace('--db=', '')) !== null && _m !== void 0 ? _m : null;
+    let type = (_q = (_p = (_o = process.argv.slice(2)) === null || _o === void 0 ? void 0 : _o.find(data => {
         return data === null || data === void 0 ? void 0 : data.includes('--type=');
-    })) === null || _l === void 0 ? void 0 : _l.replace('--type=', '.')) !== null && _m !== void 0 ? _m : '.ts';
+    })) === null || _p === void 0 ? void 0 : _p.replace('--type=', '.')) !== null && _q !== void 0 ? _q : '.ts';
     type = ['.js', '.ts'].includes(type) ? type : '.ts';
-    const file = (_o = process.argv.slice(3)[0]) !== null && _o !== void 0 ? _o : '';
+    const file = (_r = process.argv.slice(3)[0]) !== null && _r !== void 0 ? _r : '';
     const cmd = {
         name,
         file,
@@ -42,6 +47,7 @@ try {
         cwd: process.cwd(),
         fs: fs_1.default,
         sql,
+        db,
         npm: 'tspace-mysql'
     };
     commands[process.argv[2]](cmd);
@@ -53,6 +59,7 @@ catch (err) {
         tspace-mysql migrate --dir=App/Models/Migrations --type=js
         tspace-mysql query "SELECT * FROM users"
         tspace-mysql generate:models --dir=app/Models 
+        tspace-mysql dump:db --dir=app/Models 
     `);
     console.log(`Read more https://www.npmjs.com/package/tspace-mysql`);
 }

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

@@ -9,6 +9,7 @@ export interface Relation {
     query?: any | undefined;
     relation?: Object | undefined;
     exists?: boolean | undefined;
+    oldVersion?: boolean | undefined;
 }
 export interface RelationQuery {
     name?: string;

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

@@ -231,7 +231,7 @@ declare class Model extends AbstractModel {
      * @property {string} relation.freezeTable
      * @return   {this}   this
      */
-    protected belongsToMany({ name, as, model, localKey, foreignKey, freezeTable, pivot }: Relation): this;
+    protected belongsToMany({ name, as, model, localKey, foreignKey, freezeTable, pivot, oldVersion }: Relation): this;
     /**
      * Assign the relation in model Objects
      * @param    {object}  relation registry relation in your model

package/dist/lib/tspace/Model.js

@@ -444,7 +444,7 @@ class Model extends AbstractModel_1.AbstractModel {
      * @property {string} relation.freezeTable
      * @return   {this}   this
      */
-    belongsToMany({ name, as, model, localKey, foreignKey, freezeTable, pivot }) {
+    belongsToMany({ name, as, model, localKey, foreignKey, freezeTable, pivot, oldVersion }) {
         const relation = {
             name,
             model,
@@ -454,6 +454,7 @@ class Model extends AbstractModel_1.AbstractModel {
             foreignKey,
             freezeTable,
             pivot,
+            oldVersion,
             query: null
         };
         this.$state.set('RELATION', [...this.$state.get('RELATION'), relation]);
@@ -1472,6 +1473,7 @@ class Model extends AbstractModel_1.AbstractModel {
         var _a, _b, _c, _d;
         const relation = relationModel.relation;
         const model = (_a = relationModel.model) === null || _a === void 0 ? void 0 : _a.name;
+        const oldVersion = relationModel.oldVersion;
         const table = relationModel.freezeTable
             ? relationModel.freezeTable
             : (_b = relationModel.query) === null || _b === void 0 ? void 0 : _b._tableName();
@@ -1516,7 +1518,7 @@ class Model extends AbstractModel_1.AbstractModel {
                 pluralize_1.default.singular((_d = relationModel.query) === null || _d === void 0 ? void 0 : _d._tableName())
             ].sort().join('_'));
         }
-        return { name, as, relation, table, localKey, foreignKey, model, pivot };
+        return { name, as, relation, table, localKey, foreignKey, model, pivot, oldVersion };
     }
     _handleSoftDelete() {
         if (this.$state.get('SOFT_DELETE')) {
@@ -1783,7 +1785,7 @@ class Model extends AbstractModel_1.AbstractModel {
     _belongsToMany(dataFromParent, relation) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
-            const { name, foreignKey, pivot } = this._valueInRelation(relation);
+            const { name, foreignKey, localKey, pivot, oldVersion } = this._valueInRelation(relation);
             const pivotTable = String(((_a = relation.pivot) !== null && _a !== void 0 ? _a : pivot));
             const localKeyId = dataFromParent.map((parent) => {
                 const data = parent[foreignKey];
@@ -1792,7 +1794,7 @@ class Model extends AbstractModel_1.AbstractModel {
                 }
                 return data;
             }).filter((data) => data != null);
-            const dataPerentId = Array.from(new Set(localKeyId)).join(',') || [];
+            const dataPerentId = Array.from(new Set(localKeyId));
             if (!dataPerentId.length && this.$state.get('WITH_EXISTS'))
                 return [];
             const modelOther = new relation.model();
@@ -1800,35 +1802,53 @@ class Model extends AbstractModel_1.AbstractModel {
             const otherlocalKey = 'id';
             const otherforeignKey = this._valuePattern(`${other}Id`);
             const localKeyPivotTable = this._valuePattern([pluralize_1.default.singular(this._tableName()), foreignKey].join("_"));
-            const sqldataChilds = [
-                `${this.$constants('SELECT')}`,
-                `*`,
-                `${this.$constants('FROM')}`,
-                `${pivotTable}`,
-                `${this.$constants('WHERE')}`,
-                `${localKeyPivotTable} ${this.$constants('IN')} (${dataPerentId})`
-            ].join(' ');
-            let dataChilds = yield this.queryStatement(sqldataChilds);
+            const sql = new Model().copyModel(modelOther)
+                .whereReference(`\`${modelOther._tableName()}\`.\`${foreignKey}\``, `\`${pivotTable}\`.\`${localKey}\``)
+                .toString();
+            const queryChildModel = new Model();
+            queryChildModel.$state.set('TABLE_NAME', `\`${pivotTable}\``);
+            const sqldataChilds = queryChildModel
+                .whereIn(localKeyPivotTable, dataPerentId)
+                .when(relation.exists, (query) => query.whereExists(sql))
+                .toString();
+            const dataChilds = yield this.queryStatement(sqldataChilds);
             const otherId = dataChilds.map((sub) => sub[otherforeignKey]).filter((data) => data != null);
             const otherArrId = Array.from(new Set(otherId)) || [];
             const otherdataChilds = yield this.queryStatement(modelOther
-                .bind(this.$pool.get())
                 .whereIn(otherlocalKey, otherArrId)
                 .debug(this.$state.get('DEBUG'))
                 .toString());
-            dataChilds.forEach((sub) => {
-                otherdataChilds.forEach((otherSub) => {
-                    if (otherSub[otherlocalKey] === sub[otherforeignKey]) {
-                        sub[other] = otherSub;
-                    }
+            if (oldVersion) {
+                dataChilds.forEach((sub) => {
+                    otherdataChilds.forEach((otherSub) => {
+                        if (otherSub[otherlocalKey] === sub[otherforeignKey]) {
+                            sub[other] = otherSub;
+                        }
+                    });
                 });
-            });
+                dataFromParent.forEach((dataPerent) => {
+                    if (dataPerent[name] == null)
+                        dataPerent[name] = [];
+                    dataChilds.forEach((sub) => {
+                        if (sub[localKeyPivotTable] === dataPerent[foreignKey]) {
+                            dataPerent[name].push(sub);
+                        }
+                    });
+                });
+                if (this.$state.get('HIDDEN').length)
+                    this._hiddenColumnModel(dataFromParent);
+                return dataFromParent;
+            }
             dataFromParent.forEach((dataPerent) => {
                 if (dataPerent[name] == null)
                     dataPerent[name] = [];
                 dataChilds.forEach((sub) => {
                     if (sub[localKeyPivotTable] === dataPerent[foreignKey]) {
-                        dataPerent[name].push(sub);
+                        const data = otherdataChilds.find(u => u[foreignKey] === sub[localKey]);
+                        if (data != null) {
+                            data.pivot = Object.assign({}, sub);
+                            dataPerent[name].push(data);
+                        }
                     }
                 });
             });
@@ -2396,13 +2416,17 @@ class Model extends AbstractModel_1.AbstractModel {
             case 'get': {
                 const methodCallings = this.$logger.get();
                 const methodsNotAllowed = [
+                    "insert",
                     'create',
                     'createNotExists',
                     'updateOrCreate',
                     'updateOrInsert',
                     'insertOrUpdate',
+                    "createMultiple",
+                    "insertMultiple",
                     'update',
-                    'delete'
+                    'delete',
+                    'restore'
                 ];
                 const findMethodNotAllowed = methodCallings.find((methodCalling) => methodsNotAllowed.includes(methodCalling));
                 this._assertError(methodCallings.some((methodCalling) => methodsNotAllowed.includes(methodCalling)), `this method ${method} can't using method : [ ${findMethodNotAllowed} ]`);

package/package.json

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