@nocobase/database 0.9.3-alpha.1 → 0.9.4-alpha.1

package/lib/repository.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.Repository = void 0;
 function _lodash() {
-  const data = _interopRequireWildcard(require("lodash"));
+  const data = _interopRequireDefault(require("lodash"));
   _lodash = function _lodash() {
     return data;
   };
@@ -30,10 +30,8 @@ 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");
+var _eagerLoadingTree = require("./eager-loading/eager-loading-tree");
 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; }
@@ -79,9 +77,6 @@ class RelationRepositoryBuilder {
       }
     }
   }
-  builder() {
-    return this.builderMap;
-  }
   of(id) {
     if (!this.association) {
       return;
@@ -89,6 +84,9 @@ class RelationRepositoryBuilder {
     const klass = this.builder()[this.association.associationType];
     return new klass(this.collection, this.associationName, id);
   }
+  builder() {
+    return this.builderMap;
+  }
 }
 class Repository {
   constructor(collection) {
@@ -131,18 +129,56 @@ class Repository {
       return count;
     })();
   }
+  aggregate(options) {
+    var _this2 = this;
+    return _asyncToGenerator(function* () {
+      var _options$optionsTrans;
+      const method = options.method,
+        field = options.field;
+      const queryOptions = _this2.buildQueryOptions(_objectSpread(_objectSpread({}, options), {}, {
+        fields: []
+      }));
+      (_options$optionsTrans = options.optionsTransformer) === null || _options$optionsTrans === void 0 ? void 0 : _options$optionsTrans.call(options, queryOptions);
+      const hasAssociationFilter = () => {
+        if (queryOptions.include && queryOptions.include.length > 0) {
+          const filterInclude = queryOptions.include.filter(include => {
+            var _JSON$stringify;
+            return Object.keys(include.where || {}).length > 0 || ((_JSON$stringify = JSON.stringify(queryOptions === null || queryOptions === void 0 ? void 0 : queryOptions.filter)) === null || _JSON$stringify === void 0 ? void 0 : _JSON$stringify.includes(include.association));
+          });
+          return filterInclude.length > 0;
+        }
+        return false;
+      };
+      if (hasAssociationFilter()) {
+        const primaryKeyField = _this2.model.primaryKeyAttribute;
+        const queryInterface = _this2.database.sequelize.getQueryInterface();
+        const findOptions = _objectSpread(_objectSpread({}, queryOptions), {}, {
+          raw: true,
+          includeIgnoreAttributes: false,
+          attributes: [[_sequelize().Sequelize.literal(`DISTINCT ${queryInterface.quoteIdentifiers(`${_this2.collection.name}.${primaryKeyField}`)}`), primaryKeyField]]
+        });
+        const ids = yield _this2.model.findAll(findOptions);
+        return yield _this2.model.aggregate(field, method, _objectSpread(_objectSpread({}, _lodash().default.omit(queryOptions, ['where', 'include'])), {}, {
+          where: {
+            [primaryKeyField]: ids.map(node => node[primaryKeyField])
+          }
+        }));
+      }
+      return yield _this2.model.aggregate(field, method, queryOptions);
+    })();
+  }
   /**
    * find
    * @param options
    */
   find(options = {}) {
-    var _this2 = this;
+    var _this3 = this;
     return _asyncToGenerator(function* () {
-      const model = _this2.collection.model;
-      const transaction = yield _this2.getTransaction(options);
+      const model = _this3.collection.model;
+      const transaction = yield _this3.getTransaction(options);
       const opts = _objectSpread({
         subQuery: false
-      }, _this2.buildQueryOptions(options));
+      }, _this3.buildQueryOptions(options));
       let rows;
       if (opts.include && opts.include.length > 0) {
         // @ts-ignore
@@ -154,8 +190,8 @@ class Repository {
           group: `${model.name}.${primaryKeyField}`,
           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));
+            var _JSON$stringify2;
+            return Object.keys(include.where || {}).length > 0 || ((_JSON$stringify2 = JSON.stringify(opts === null || opts === void 0 ? void 0 : opts.filter)) === null || _JSON$stringify2 === void 0 ? void 0 : _JSON$stringify2.includes(include.association));
           })
         }))).map(row => {
           return {
@@ -166,44 +202,23 @@ class Repository {
         if (ids.length == 0) {
           return [];
         }
-        // find template model
-        const templateModel = yield model.findOne(_objectSpread(_objectSpread({}, opts), {}, {
-          includeIgnoreAttributes: false,
-          attributes: [primaryKeyField],
-          group: `${model.name}.${primaryKeyField}`,
-          transaction,
-          limit: 1,
-          offset: 0
-        }));
-        const where = {
-          [primaryKeyField]: {
-            [_sequelize().Op.in]: ids.map(id => id['pk'])
-          }
-        };
-        rows = yield (0, _utils.handleAppendsQuery)({
-          queryPromises: opts.include.map(include => {
-            const options = _objectSpread(_objectSpread({}, (0, _lodash().omit)(opts, ['limit', 'offset', 'filter'])), {}, {
-              include: include,
-              where,
-              transaction
-            });
-            return model.findAll(options).then(rows => {
-              return {
-                rows,
-                include
-              };
-            });
-          }),
-          templateModel: templateModel
+        // find all rows
+        const eagerLoadingTree = _eagerLoadingTree.EagerLoadingTree.buildFromSequelizeOptions({
+          model,
+          rootAttributes: opts.attributes,
+          includeOption: opts.include,
+          rootOrder: opts.order
         });
+        yield eagerLoadingTree.load(ids.map(i => i.pk), transaction);
+        rows = eagerLoadingTree.root.instances;
       } else {
         rows = yield model.findAll(_objectSpread(_objectSpread({}, opts), {}, {
           transaction
         }));
       }
-      yield _this2.collection.db.emitAsync('afterRepositoryFind', {
+      yield _this3.collection.db.emitAsync('afterRepositoryFind', {
         findOptions: options,
-        dataCollection: _this2.collection,
+        dataCollection: _this3.collection,
         data: rows
       });
       return rows;
@@ -214,13 +229,13 @@ class Repository {
    * @param options
    */
   findAndCount(options) {
-    var _this3 = this;
+    var _this4 = this;
     return _asyncToGenerator(function* () {
       options = _objectSpread(_objectSpread({}, options), {}, {
-        transaction: yield _this3.getTransaction(options)
+        transaction: yield _this4.getTransaction(options)
       });
-      const count = yield _this3.count(options);
-      const results = count ? yield _this3.find(options) : [];
+      const count = yield _this4.count(options);
+      const results = count ? yield _this4.find(options) : [];
       return [results, count];
     })();
   }
@@ -237,10 +252,10 @@ class Repository {
    * @param options
    */
   findOne(options) {
-    var _this4 = this;
+    var _this5 = this;
     return _asyncToGenerator(function* () {
-      const transaction = yield _this4.getTransaction(options);
-      const rows = yield _this4.find(_objectSpread(_objectSpread({}, options), {}, {
+      const transaction = yield _this5.getTransaction(options);
+      const rows = yield _this5.find(_objectSpread(_objectSpread({}, options), {}, {
         limit: 1,
         transaction
       }));
@@ -254,20 +269,20 @@ class Repository {
    * @param options
    */
   create(options) {
-    var _this5 = this;
+    var _this6 = this;
     return _asyncToGenerator(function* () {
       if (Array.isArray(options.values)) {
-        return _this5.createMany(_objectSpread(_objectSpread({}, options), {}, {
+        return _this6.createMany(_objectSpread(_objectSpread({}, options), {}, {
           records: options.values
         }));
       }
-      const transaction = yield _this5.getTransaction(options);
-      const guard = _updateGuard.UpdateGuard.fromOptions(_this5.model, _objectSpread(_objectSpread({}, options), {}, {
+      const transaction = yield _this6.getTransaction(options);
+      const guard = _updateGuard.UpdateGuard.fromOptions(_this6.model, _objectSpread(_objectSpread({}, options), {}, {
         action: 'create',
-        underscored: _this5.collection.options.underscored
+        underscored: _this6.collection.options.underscored
       }));
       const values = guard.sanitize(options.values || {});
-      const instance = yield _this5.model.create(values, _objectSpread(_objectSpread({}, options), {}, {
+      const instance = yield _this6.model.create(values, _objectSpread(_objectSpread({}, options), {}, {
         transaction
       }));
       if (!instance) {
@@ -277,10 +292,10 @@ class Repository {
         transaction
       }));
       if (options.hooks !== false) {
-        yield _this5.database.emitAsync(`${_this5.collection.name}.afterCreateWithAssociations`, instance, _objectSpread(_objectSpread({}, options), {}, {
+        yield _this6.database.emitAsync(`${_this6.collection.name}.afterCreateWithAssociations`, instance, _objectSpread(_objectSpread({}, options), {}, {
           transaction
         }));
-        yield _this5.database.emitAsync(`${_this5.collection.name}.afterSaveWithAssociations`, instance, _objectSpread(_objectSpread({}, options), {}, {
+        yield _this6.database.emitAsync(`${_this6.collection.name}.afterSaveWithAssociations`, instance, _objectSpread(_objectSpread({}, options), {}, {
           transaction
         }));
         instance.clearChangedWithAssociations();
@@ -295,9 +310,9 @@ class Repository {
    * @param options
    */
   createMany(options) {
-    var _this6 = this;
+    var _this7 = this;
     return _asyncToGenerator(function* () {
-      const transaction = yield _this6.getTransaction(options);
+      const transaction = yield _this7.getTransaction(options);
       const records = options.records;
       const instances = [];
       var _iterator = _createForOfIteratorHelper(records),
@@ -305,7 +320,7 @@ class Repository {
       try {
         for (_iterator.s(); !(_step = _iterator.n()).done;) {
           const values = _step.value;
-          const instance = yield _this6.create({
+          const instance = yield _this7.create({
             values,
             transaction
           });
@@ -326,20 +341,20 @@ class Repository {
    * @param options
    */
   update(options) {
-    var _this7 = this;
+    var _this8 = this;
     return _asyncToGenerator(function* () {
       if (Array.isArray(options.values)) {
-        return _this7.updateMany(_objectSpread(_objectSpread({}, options), {}, {
+        return _this8.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 transaction = yield _this8.getTransaction(options);
+      const guard = _updateGuard.UpdateGuard.fromOptions(_this8.model, _objectSpread(_objectSpread({}, options), {}, {
+        underscored: _this8.collection.options.underscored
       }));
       const values = guard.sanitize(options.values);
-      const queryOptions = _this7.buildQueryOptions(options);
-      const instances = yield _this7.find(_objectSpread(_objectSpread({}, queryOptions), {}, {
+      const queryOptions = _this8.buildQueryOptions(options);
+      const instances = yield _this8.find(_objectSpread(_objectSpread({}, queryOptions), {}, {
         transaction
       }));
       var _iterator2 = _createForOfIteratorHelper(instances),
@@ -363,10 +378,10 @@ class Repository {
         try {
           for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
             const instance = _step3.value;
-            yield _this7.database.emitAsync(`${_this7.collection.name}.afterUpdateWithAssociations`, instance, _objectSpread(_objectSpread({}, options), {}, {
+            yield _this8.database.emitAsync(`${_this8.collection.name}.afterUpdateWithAssociations`, instance, _objectSpread(_objectSpread({}, options), {}, {
               transaction
             }));
-            yield _this7.database.emitAsync(`${_this7.collection.name}.afterSaveWithAssociations`, instance, _objectSpread(_objectSpread({}, options), {}, {
+            yield _this8.database.emitAsync(`${_this8.collection.name}.afterSaveWithAssociations`, instance, _objectSpread(_objectSpread({}, options), {}, {
               transaction
             }));
             instance.clearChangedWithAssociations();
@@ -381,9 +396,9 @@ class Repository {
     })();
   }
   updateMany(options) {
-    var _this8 = this;
+    var _this9 = this;
     return _asyncToGenerator(function* () {
-      const transaction = yield _this8.getTransaction(options);
+      const transaction = yield _this9.getTransaction(options);
       const records = options.records;
       const instances = [];
       var _iterator4 = _createForOfIteratorHelper(records),
@@ -391,11 +406,11 @@ class Repository {
       try {
         for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
           const values = _step4.value;
-          const filterByTk = values[_this8.model.primaryKeyAttribute];
+          const filterByTk = values[_this9.model.primaryKeyAttribute];
           if (!filterByTk) {
             throw new Error('filterByTk invalid');
           }
-          const instance = yield _this8.update({
+          const instance = yield _this9.update({
             values,
             filterByTk,
             transaction
@@ -411,24 +426,24 @@ class Repository {
     })();
   }
   destroy(options) {
-    var _this9 = this;
+    var _this10 = this;
     return _asyncToGenerator(function* () {
-      const transaction = yield _this9.getTransaction(options);
-      const modelFilterKey = _this9.collection.filterTargetKey;
+      const transaction = yield _this10.getTransaction(options);
+      const modelFilterKey = _this10.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) {
+      if (_this10.collection.model.primaryKeyAttributes.length !== 1 && filterByTk && !_lodash().default.get(_this10.collection.options, 'filterTargetKey')) {
+        if (_this10.collection.model.primaryKeyAttributes.length > 1) {
           throw new Error(`filterByTk is not supported for composite primary key`);
         } else {
           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), {}, {
+        return yield _this10.model.destroy(_objectSpread(_objectSpread({}, options), {}, {
           where: {
             [modelFilterKey]: {
               [_sequelize().Op.in]: filterByTk
@@ -438,26 +453,26 @@ class Repository {
         }));
       }
       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), {}, {
+        if (_this10.collection.model.primaryKeyAttributes.length !== 1 && !_lodash().default.get(_this10.collection.options, 'filterTargetKey')) {
+          const queryOptions = _objectSpread({}, _this10.buildQueryOptions(options));
+          return yield _this10.model.destroy(_objectSpread(_objectSpread({}, queryOptions), {}, {
             transaction
           }));
         }
-        let pks = (yield _this9.find({
+        let pks = (yield _this10.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')), {}, {
+        return yield _this10.destroy(_objectSpread(_objectSpread({}, _lodash().default.omit(options, 'filter')), {}, {
           filterByTk: pks,
           transaction
         }));
       }
       if (options.truncate) {
-        return yield _this9.model.destroy(_objectSpread(_objectSpread({}, options), {}, {
+        return yield _this10.model.destroy(_objectSpread(_objectSpread({}, options), {}, {
           truncate: true,
           transaction
         }));
@@ -490,13 +505,13 @@ class Repository {
     return parser.toSequelizeParams();
   }
   getTransaction(options, autoGen = false) {
-    var _this10 = this;
+    var _this11 = this;
     return _asyncToGenerator(function* () {
       if (_lodash().default.isPlainObject(options) && options.transaction) {
         return options.transaction;
       }
       if (autoGen) {
-        return yield _this10.model.sequelize.transaction();
+        return yield _this11.model.sequelize.transaction();
       }
       return null;
     })();