@nocobase/database 0.9.1-alpha.2 → 0.9.2-alpha.2

package/lib/repository.js

@@ -4,89 +4,57 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.Repository = void 0;
-
 function _lodash() {
   const data = _interopRequireWildcard(require("lodash"));
-
   _lodash = function _lodash() {
     return data;
   };
-
   return data;
 }
-
 function _sequelize() {
   const data = require("sequelize");
-
   _sequelize = function _sequelize() {
     return data;
   };
-
   return data;
 }
-
 var _mustHaveFilterDecorator = _interopRequireDefault(require("./decorators/must-have-filter-decorator"));
-
 var _transactionDecorator = require("./decorators/transaction-decorator");
-
 var _arrayFieldRepository = require("./field-repository/array-field-repository");
-
 var _fields = require("./fields");
-
 var _filterParser = _interopRequireDefault(require("./filter-parser"));
-
 var _optionsParser = require("./options-parser");
-
 var _belongsToManyRepository = require("./relation-repository/belongs-to-many-repository");
-
 var _belongsToRepository = require("./relation-repository/belongs-to-repository");
-
 var _hasmanyRepository = require("./relation-repository/hasmany-repository");
-
 var _hasoneRepository = require("./relation-repository/hasone-repository");
-
 var _updateAssociations = require("./update-associations");
-
 var _updateGuard = require("./update-guard");
-
 var _utils = require("./utils");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-
 function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
-
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
-
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
-
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
-
 var __decorate = void 0 && (void 0).__decorate || function (decorators, target, key, desc) {
   var c = arguments.length,
-      r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc,
-      d;
+    r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc,
+    d;
   if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
   return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-
 const debug = require('debug')('noco-database');
-
 const transaction = (0, _transactionDecorator.transactionWrapperBuilder)(function () {
   return this.collection.model.sequelize.transaction();
 });
-
 class RelationRepositoryBuilder {
   constructor(collection, associationName) {
     this.collection = void 0;
@@ -102,10 +70,8 @@ class RelationRepositoryBuilder {
     this.collection = collection;
     this.associationName = associationName;
     this.association = this.collection.model.associations[this.associationName];
-
     if (!this.association) {
       const field = collection.getField(associationName);
-
       if (field && field instanceof _fields.ArrayField) {
         this.association = {
           associationType: 'ArrayField'
@@ -113,22 +79,17 @@ class RelationRepositoryBuilder {
       }
     }
   }
-
   builder() {
     return this.builderMap;
   }
-
   of(id) {
     if (!this.association) {
       return;
     }
-
     const klass = this.builder()[this.association.associationType];
     return new klass(this.collection, this.associationName, id);
   }
-
 }
-
 class Repository {
   constructor(collection) {
     this.database = void 0;
@@ -141,21 +102,15 @@ class Repository {
   /**
    * return count by filter
    */
-
-
   count(countOptions) {
     var _this = this;
-
     return _asyncToGenerator(function* () {
       var _queryOptions$include;
-
       let options = countOptions ? _lodash().default.clone(countOptions) : {};
       const transaction = yield _this.getTransaction(options);
-
       if (countOptions === null || countOptions === void 0 ? void 0 : countOptions.filter) {
         options = _objectSpread(_objectSpread({}, options), _this.parseFilter(countOptions.filter, countOptions));
       }
-
       if (countOptions === null || countOptions === void 0 ? void 0 : countOptions.filterByTk) {
         options['where'] = {
           [_sequelize().Op.and]: [options['where'] || {}, {
@@ -163,19 +118,16 @@ class Repository {
           }]
         };
       }
-
       const queryOptions = _objectSpread(_objectSpread({}, options), {}, {
         distinct: Boolean(_this.collection.model.primaryKeyAttribute)
       });
-
       if (((_queryOptions$include = queryOptions.include) === null || _queryOptions$include === void 0 ? void 0 : _queryOptions$include.length) === 0) {
         delete queryOptions.include;
       }
-
       const count = yield _this.collection.model.count(_objectSpread(_objectSpread({}, queryOptions), {}, {
         transaction
-      })); // @ts-ignore
-
+      }));
+      // @ts-ignore
       return count;
     })();
   }
@@ -183,21 +135,15 @@ class Repository {
    * find
    * @param options
    */
-
-
   find(options) {
     var _this2 = this;
-
     return _asyncToGenerator(function* () {
       const model = _this2.collection.model;
       const transaction = yield _this2.getTransaction(options);
-
       const opts = _objectSpread({
         subQuery: false
       }, _this2.buildQueryOptions(options));
-
       let rows;
-
       if (opts.include && opts.include.length > 0) {
         // @ts-ignore
         const primaryKeyField = model.primaryKeyField || model.primaryKeyAttribute;
@@ -208,7 +154,6 @@ class Repository {
           transaction,
           include: opts.include.filter(include => {
             var _JSON$stringify;
-
             return Object.keys(include.where || {}).length > 0 || ((_JSON$stringify = JSON.stringify(opts === null || opts === void 0 ? void 0 : opts.filter)) === null || _JSON$stringify === void 0 ? void 0 : _JSON$stringify.includes(include.association));
           })
         }))).map(row => {
@@ -217,11 +162,9 @@ class Repository {
             pk: row.get(primaryKeyField)
           };
         });
-
         if (ids.length == 0) {
           return [];
         }
-
         const templateModel = yield model.findOne(_objectSpread(_objectSpread({}, opts), {}, {
           includeIgnoreAttributes: false,
           attributes: [primaryKeyField],
@@ -242,7 +185,6 @@ class Repository {
               where,
               transaction
             });
-
             return model.findAll(options).then(rows => {
               return {
                 rows,
@@ -257,28 +199,11 @@ class Repository {
           transaction
         }));
       }
-
-      if (_this2.collection.isParent()) {
-        var _iterator = _createForOfIteratorHelper(rows),
-            _step;
-
-        try {
-          for (_iterator.s(); !(_step = _iterator.n()).done;) {
-            const row = _step.value;
-
-            const rowCollectionName = _this2.database.tableNameCollectionMap.get(options.raw ? row['__tableName'] : row.get('__tableName')).name;
-
-            options.raw ? row['__collection'] = rowCollectionName : row.set('__collection', rowCollectionName, {
-              raw: true
-            });
-          }
-        } catch (err) {
-          _iterator.e(err);
-        } finally {
-          _iterator.f();
-        }
-      }
-
+      yield _this2.collection.db.emitAsync('afterRepositoryFind', {
+        findOptions: options,
+        dataCollection: _this2.collection,
+        data: rows
+      });
       return rows;
     })();
   }
@@ -286,11 +211,8 @@ class Repository {
    * find and count
    * @param options
    */
-
-
   findAndCount(options) {
     var _this3 = this;
-
     return _asyncToGenerator(function* () {
       const transaction = yield _this3.getTransaction(options);
       options = _objectSpread(_objectSpread({}, options), {}, {
@@ -305,8 +227,6 @@ class Repository {
    * Find By Id
    *
    */
-
-
   findById(id) {
     return this.collection.model.findByPk(id);
   }
@@ -315,11 +235,8 @@ class Repository {
    *
    * @param options
    */
-
-
   findOne(options) {
     var _this4 = this;
-
     return _asyncToGenerator(function* () {
       const transaction = yield _this4.getTransaction(options);
       const rows = yield _this4.find(_objectSpread(_objectSpread({}, options), {}, {
@@ -335,38 +252,29 @@ class Repository {
    * @param values
    * @param options
    */
-
-
   create(options) {
     var _this5 = this;
-
     return _asyncToGenerator(function* () {
       if (Array.isArray(options.values)) {
         return _this5.createMany(_objectSpread(_objectSpread({}, options), {}, {
           records: options.values
         }));
       }
-
       const transaction = yield _this5.getTransaction(options);
-
       const guard = _updateGuard.UpdateGuard.fromOptions(_this5.model, _objectSpread(_objectSpread({}, options), {}, {
         action: 'create',
         underscored: _this5.collection.options.underscored
       }));
-
       const values = guard.sanitize(options.values || {});
       const instance = yield _this5.model.create(values, _objectSpread(_objectSpread({}, options), {}, {
         transaction
       }));
-
       if (!instance) {
         return;
       }
-
       yield (0, _updateAssociations.updateAssociations)(instance, values, _objectSpread(_objectSpread({}, options), {}, {
         transaction
       }));
-
       if (options.hooks !== false) {
         yield _this5.database.emitAsync(`${_this5.collection.name}.afterCreateWithAssociations`, instance, _objectSpread(_objectSpread({}, options), {}, {
           transaction
@@ -376,7 +284,6 @@ class Repository {
         }));
         instance.clearChangedWithAssociations();
       }
-
       return instance;
     })();
   }
@@ -386,22 +293,17 @@ class Repository {
    * @param records
    * @param options
    */
-
-
   createMany(options) {
     var _this6 = this;
-
     return _asyncToGenerator(function* () {
       const transaction = yield _this6.getTransaction(options);
       const records = options.records;
       const instances = [];
-
-      var _iterator2 = _createForOfIteratorHelper(records),
-          _step2;
-
+      var _iterator = _createForOfIteratorHelper(records),
+        _step;
       try {
-        for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
-          const values = _step2.value;
+        for (_iterator.s(); !(_step = _iterator.n()).done;) {
+          const values = _step.value;
           const instance = yield _this6.create({
             values,
             transaction
@@ -409,11 +311,10 @@ class Repository {
           instances.push(instance);
         }
       } catch (err) {
-        _iterator2.e(err);
+        _iterator.e(err);
       } finally {
-        _iterator2.f();
+        _iterator.f();
       }
-
       return instances;
     })();
   }
@@ -423,56 +324,44 @@ class Repository {
    * @param values
    * @param options
    */
-
-
   update(options) {
     var _this7 = this;
-
     return _asyncToGenerator(function* () {
       if (Array.isArray(options.values)) {
         return _this7.updateMany(_objectSpread(_objectSpread({}, options), {}, {
           records: options.values
         }));
       }
-
       const transaction = yield _this7.getTransaction(options);
-
       const guard = _updateGuard.UpdateGuard.fromOptions(_this7.model, _objectSpread(_objectSpread({}, options), {}, {
         underscored: _this7.collection.options.underscored
       }));
-
       const values = guard.sanitize(options.values);
-
       const queryOptions = _this7.buildQueryOptions(options);
-
       const instances = yield _this7.find(_objectSpread(_objectSpread({}, queryOptions), {}, {
         transaction
       }));
-
-      var _iterator3 = _createForOfIteratorHelper(instances),
-          _step3;
-
+      var _iterator2 = _createForOfIteratorHelper(instances),
+        _step2;
       try {
-        for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
-          const instance = _step3.value;
+        for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+          const instance = _step2.value;
           yield (0, _updateAssociations.updateModelByValues)(instance, values, _objectSpread(_objectSpread({}, options), {}, {
             sanitized: true,
             transaction
           }));
         }
       } catch (err) {
-        _iterator3.e(err);
+        _iterator2.e(err);
       } finally {
-        _iterator3.f();
+        _iterator2.f();
       }
-
       if (options.hooks !== false) {
-        var _iterator4 = _createForOfIteratorHelper(instances),
-            _step4;
-
+        var _iterator3 = _createForOfIteratorHelper(instances),
+          _step3;
         try {
-          for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
-            const instance = _step4.value;
+          for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
+            const instance = _step3.value;
             yield _this7.database.emitAsync(`${_this7.collection.name}.afterUpdateWithAssociations`, instance, _objectSpread(_objectSpread({}, options), {}, {
               transaction
             }));
@@ -482,36 +371,29 @@ class Repository {
             instance.clearChangedWithAssociations();
           }
         } catch (err) {
-          _iterator4.e(err);
+          _iterator3.e(err);
         } finally {
-          _iterator4.f();
+          _iterator3.f();
         }
       }
-
       return instances;
     })();
   }
-
   updateMany(options) {
     var _this8 = this;
-
     return _asyncToGenerator(function* () {
       const transaction = yield _this8.getTransaction(options);
       const records = options.records;
       const instances = [];
-
-      var _iterator5 = _createForOfIteratorHelper(records),
-          _step5;
-
+      var _iterator4 = _createForOfIteratorHelper(records),
+        _step4;
       try {
-        for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
-          const values = _step5.value;
+        for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
+          const values = _step4.value;
           const filterByTk = values[_this8.model.primaryKeyAttribute];
-
           if (!filterByTk) {
             throw new Error('filterByTk invalid');
           }
-
           const instance = yield _this8.update({
             values,
             filterByTk,
@@ -520,29 +402,23 @@ class Repository {
           instances.push(instance);
         }
       } catch (err) {
-        _iterator5.e(err);
+        _iterator4.e(err);
       } finally {
-        _iterator5.f();
+        _iterator4.f();
       }
-
       return instances;
     })();
   }
-
   destroy(options) {
     var _this9 = this;
-
     return _asyncToGenerator(function* () {
       const transaction = yield _this9.getTransaction(options);
       const modelFilterKey = _this9.collection.filterTargetKey;
       options = options;
-
       if (options['individualHooks'] === undefined) {
         options['individualHooks'] = true;
       }
-
       const filterByTk = options.filterByTk && !_lodash().default.isArray(options.filterByTk) ? [options.filterByTk] : options.filterByTk;
-
       if (_this9.collection.model.primaryKeyAttributes.length !== 1 && filterByTk && !_lodash().default.get(_this9.collection.options, 'filterTargetKey')) {
         if (_this9.collection.model.primaryKeyAttributes.length > 1) {
           throw new Error(`filterByTk is not supported for composite primary key`);
@@ -550,7 +426,6 @@ class Repository {
           throw new Error(`filterByTk is not supported for collection that has no primary key`);
         }
       }
-
       if (filterByTk && !options.filter) {
         return yield _this9.model.destroy(_objectSpread(_objectSpread({}, options), {}, {
           where: {
@@ -561,31 +436,25 @@ class Repository {
           transaction
         }));
       }
-
       if (options.filter) {
         if (_this9.collection.model.primaryKeyAttributes.length !== 1 && !_lodash().default.get(_this9.collection.options, 'filterTargetKey')) {
           const queryOptions = _objectSpread({}, _this9.buildQueryOptions(options));
-
           return yield _this9.model.destroy(_objectSpread(_objectSpread({}, queryOptions), {}, {
             transaction
           }));
         }
-
         let pks = (yield _this9.find({
           filter: options.filter,
           transaction
         })).map(instance => instance.get(modelFilterKey));
-
         if (filterByTk) {
           pks = _lodash().default.intersection(pks.map(i => `${i}`), filterByTk.map(i => `${i}`));
         }
-
         return yield _this9.destroy(_objectSpread(_objectSpread({}, _lodash().default.omit(options, 'filter')), {}, {
           filterByTk: pks,
           transaction
         }));
       }
-
       if (options.truncate) {
         return yield _this9.model.destroy(_objectSpread(_objectSpread({}, options), {}, {
           truncate: true,
@@ -597,12 +466,9 @@ class Repository {
   /**
    * @param association target association
    */
-
-
   relation(association) {
     return new RelationRepositoryBuilder(this.collection, association);
   }
-
   buildQueryOptions(options) {
     const parser = new _optionsParser.OptionsParser(options, {
       collection: this.collection
@@ -613,7 +479,6 @@ class Repository {
       where: {}
     }, options), params);
   }
-
   parseFilter(filter, options) {
     const parser = new _filterParser.default(filter, {
       collection: this.collection,
@@ -623,35 +488,24 @@ class Repository {
     });
     return parser.toSequelizeParams();
   }
-
   getTransaction(options, autoGen = false) {
     var _this10 = this;
-
     return _asyncToGenerator(function* () {
       if (_lodash().default.isPlainObject(options) && options.transaction) {
         return options.transaction;
       }
-
       if (autoGen) {
         return yield _this10.model.sequelize.transaction();
       }
-
       return null;
     })();
   }
-
 }
-
 exports.Repository = Repository;
-
 __decorate([transaction()], Repository.prototype, "create", null);
-
 __decorate([transaction()], Repository.prototype, "createMany", null);
-
 __decorate([transaction(), (0, _mustHaveFilterDecorator.default)()], Repository.prototype, "update", null);
-
 __decorate([transaction()], Repository.prototype, "updateMany", null);
-
 __decorate([transaction((args, transaction) => {
   return {
     filterByTk: args[0],