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

package/lib/update-associations.js

@@ -12,91 +12,76 @@ exports.updateModelByValues = updateModelByValues;
 exports.updateMultipleAssociation = updateMultipleAssociation;
 exports.updateSingleAssociation = updateSingleAssociation;
 exports.updateThroughTableValue = updateThroughTableValue;
-
 var _model = require("./model");
-
 var _updateGuard = require("./update-guard");
-
+function _lodash() {
+  const data = _interopRequireDefault(require("lodash"));
+  _lodash = function _lodash() {
+    return data;
+  };
+  return data;
+}
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 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 _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(_e2) { throw _e2; }, 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(_e3) { didErr = true; err = _e3; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
-
 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); }); }; }
-
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
-
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-
 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 _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
-
+function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-
 function isUndefinedOrNull(value) {
   return typeof value === 'undefined' || value === null;
 }
-
 function isStringOrNumber(value) {
   return typeof value === 'string' || typeof value === 'number';
 }
-
 function getKeysByPrefix(keys, prefix) {
   return keys.filter(key => key.startsWith(`${prefix}.`)).map(key => key.substring(prefix.length + 1));
 }
-
 function modelAssociations(instance) {
   return instance.constructor.associations;
 }
-
 function belongsToManyAssociations(instance) {
   const associations = modelAssociations(instance);
   return Object.entries(associations).filter(entry => {
     const _entry = _slicedToArray(entry, 2),
-          key = _entry[0],
-          association = _entry[1];
-
+      key = _entry[0],
+      association = _entry[1];
     return association.associationType == 'BelongsToMany';
   }).map(association => {
     return association[1];
   });
 }
-
 function modelAssociationByKey(instance, key) {
   return modelAssociations(instance)[key];
 }
-
-function updateModelByValues(_x, _x2, _x3) {
+function updateModelByValues(_x2, _x3, _x4) {
   return _updateModelByValues.apply(this, arguments);
 }
-
 function _updateModelByValues() {
   _updateModelByValues = _asyncToGenerator(function* (instance, values, options) {
     if (!(options === null || options === void 0 ? void 0 : options.sanitized)) {
-      const guard = new _updateGuard.UpdateGuard(); //@ts-ignore
-
+      const guard = new _updateGuard.UpdateGuard();
+      //@ts-ignore
       guard.setModel(instance.constructor);
       guard.setBlackList(options.blacklist);
       guard.setWhiteList(options.whitelist);
       guard.setAssociationKeysToBeUpdate(options.updateAssociationValues);
       values = guard.sanitize(values);
     }
-
     yield instance.update(values, options);
     yield updateAssociations(instance, values, options);
   });
   return _updateModelByValues.apply(this, arguments);
 }
-
-function updateThroughTableValue(_x4, _x5, _x6, _x7) {
+function updateThroughTableValue(_x5, _x6, _x7, _x8) {
   return _updateThroughTableValue.apply(this, arguments);
 }
 /**
@@ -105,21 +90,17 @@ function updateThroughTableValue(_x4, _x5, _x6, _x7) {
  * @param values
  * @param options
  */
-
-
 function _updateThroughTableValue() {
   _updateThroughTableValue = _asyncToGenerator(function* (instance, throughName, throughValues, source, transaction = null) {
     // update through table values
     var _iterator = _createForOfIteratorHelper(belongsToManyAssociations(instance)),
-        _step;
-
+      _step;
     try {
       for (_iterator.s(); !(_step = _iterator.n()).done;) {
         const belongsToMany = _step.value;
         // @ts-ignore
         const throughModel = belongsToMany.through.model;
         const throughModelName = throughModel.name;
-
         if (throughModelName === throughModelName) {
           const where = {
             [belongsToMany.foreignKey]: instance.get(belongsToMany.sourceKey),
@@ -139,54 +120,43 @@ function _updateThroughTableValue() {
   });
   return _updateThroughTableValue.apply(this, arguments);
 }
-
-function updateAssociations(_x8, _x9) {
+function updateAssociations(_x9, _x10) {
   return _updateAssociations.apply(this, arguments);
 }
-
 function _updateAssociations() {
   _updateAssociations = _asyncToGenerator(function* (instance, values, options = {}) {
     // if no values set, return
     if (!values) {
       return;
     }
-
     if (options === null || options === void 0 ? void 0 : options.updateAssociationValues) {
       options.recursive = true;
     }
-
     let newTransaction = false;
     let transaction = options.transaction;
-
     if (!transaction) {
       newTransaction = true;
       transaction = yield instance.sequelize.transaction();
     }
-
     const keys = Object.keys(values);
-
     try {
       for (var _i2 = 0, _Object$keys = Object.keys(modelAssociations(instance)); _i2 < _Object$keys.length; _i2++) {
         const key = _Object$keys[_i2];
-
         if (keys.includes(key)) {
           yield updateAssociation(instance, key, values[key], _objectSpread(_objectSpread({}, options), {}, {
             transaction
           }));
         }
-      } // update through table values
-
-
+      }
+      // update through table values
       var _iterator2 = _createForOfIteratorHelper(belongsToManyAssociations(instance)),
-          _step2;
-
+        _step2;
       try {
         for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
           const belongsToMany = _step2.value;
           // @ts-ignore
           const throughModel = belongsToMany.through.model;
           const throughModelName = throughModel.name;
-
           if (values[throughModelName] && options.sourceModel) {
             const where = {
               [belongsToMany.foreignKey]: instance.get(belongsToMany.sourceKey),
@@ -204,7 +174,6 @@ function _updateAssociations() {
       } finally {
         _iterator2.f();
       }
-
       if (newTransaction) {
         yield transaction.commit();
       }
@@ -212,28 +181,23 @@ function _updateAssociations() {
       if (newTransaction) {
         yield transaction.rollback();
       }
-
       throw error;
     }
   });
   return _updateAssociations.apply(this, arguments);
 }
-
 function isReverseAssociationPair(a, b) {
   const typeSet = new Set();
   typeSet.add(a.associationType);
   typeSet.add(b.associationType);
-
   if (typeSet.size == 1 && typeSet.has('BelongsToMany')) {
     return a.through.tableName === b.through.tableName && a.target.name === b.source.name && b.target.name === a.source.name && a.foreignKey === b.otherKey && a.sourceKey === b.targetKey && a.otherKey === b.foreignKey && a.targetKey === b.sourceKey;
   }
-
   if (typeSet.has('HasOne') && typeSet.has('BelongsTo') || typeSet.has('HasMany') && typeSet.has('BelongsTo')) {
     const sourceAssoc = a.associationType == 'BelongsTo' ? b : a;
     const targetAssoc = sourceAssoc == a ? b : a;
     return sourceAssoc.source.name === targetAssoc.target.name && sourceAssoc.foreignKey === targetAssoc.foreignKey && sourceAssoc.sourceKey === targetAssoc.targetKey;
   }
-
   return false;
 }
 /**
@@ -243,9 +207,7 @@ function isReverseAssociationPair(a, b) {
  * @param value
  * @param options
  */
-
-
-function updateAssociation(_x10, _x11, _x12) {
+function updateAssociation(_x11, _x12, _x13) {
   return _updateAssociation.apply(this, arguments);
 }
 /**
@@ -255,25 +217,19 @@ function updateAssociation(_x10, _x11, _x12) {
  * @param value
  * @param options
  */
-
-
 function _updateAssociation() {
   _updateAssociation = _asyncToGenerator(function* (instance, key, value, options = {}) {
     const association = modelAssociationByKey(instance, key);
-
     if (!association) {
       return false;
     }
-
     if (options.associationContext && isReverseAssociationPair(association, options.associationContext)) {
       return false;
     }
-
     switch (association.associationType) {
       case 'HasOne':
       case 'BelongsTo':
         return updateSingleAssociation(instance, key, value, options);
-
       case 'HasMany':
       case 'BelongsToMany':
         return updateMultipleAssociation(instance, key, value, options);
@@ -281,8 +237,7 @@ function _updateAssociation() {
   });
   return _updateAssociation.apply(this, arguments);
 }
-
-function updateSingleAssociation(_x13, _x14, _x15) {
+function updateSingleAssociation(_x14, _x15, _x16) {
   return _updateSingleAssociation.apply(this, arguments);
 }
 /**
@@ -292,35 +247,27 @@ function updateSingleAssociation(_x13, _x14, _x15) {
  * @param value
  * @param options
  */
-
-
 function _updateSingleAssociation() {
   _updateSingleAssociation = _asyncToGenerator(function* (model, key, value, options = {}) {
     const association = modelAssociationByKey(model, key);
-
     if (!association) {
       return false;
     }
-
     if (!['undefined', 'string', 'number', 'object'].includes(typeof value)) {
       return false;
     }
-
     if (Array.isArray(value)) {
       throw new Error(`The value of '${key}' cannot be in array format`);
     }
-
     const recursive = options.recursive,
-          context = options.context,
-          _options$updateAssoci = options.updateAssociationValues,
-          updateAssociationValues = _options$updateAssoci === void 0 ? [] : _options$updateAssoci,
-          transaction = options.transaction;
+      context = options.context,
+      _options$updateAssoci = options.updateAssociationValues,
+      updateAssociationValues = _options$updateAssoci === void 0 ? [] : _options$updateAssoci,
+      transaction = options.transaction;
     const keys = getKeysByPrefix(updateAssociationValues, key);
-
     try {
       // set method of association
       const setAccessor = association.accessors.set;
-
       const removeAssociation = /*#__PURE__*/function () {
         var _ref = _asyncToGenerator(function* () {
           yield model[setAccessor](null, {
@@ -329,16 +276,13 @@ function _updateSingleAssociation() {
           model.setDataValue(key, null);
           return true;
         });
-
         return function removeAssociation() {
           return _ref.apply(this, arguments);
         };
       }();
-
       if (isUndefinedOrNull(value)) {
         return yield removeAssociation();
       }
-
       if (isStringOrNumber(value)) {
         yield model[setAccessor](value, {
           context,
@@ -346,7 +290,6 @@ function _updateSingleAssociation() {
         });
         return true;
       }
-
       if (value instanceof _model.Model) {
         yield model[setAccessor](value, {
           context,
@@ -355,20 +298,17 @@ function _updateSingleAssociation() {
         model.setDataValue(key, value);
         return true;
       }
-
       const createAccessor = association.accessors.create;
       let dataKey;
       let M;
-
       if (association.associationType === 'BelongsTo') {
-        M = association.target; // @ts-ignore
-
+        M = association.target;
+        // @ts-ignore
         dataKey = association.targetKey;
       } else {
         M = association.target;
         dataKey = M.primaryKeyAttribute;
       }
-
       if (isStringOrNumber(value[dataKey])) {
         let instance = yield M.findOne({
           where: {
@@ -376,23 +316,19 @@ function _updateSingleAssociation() {
           },
           transaction
         });
-
         if (instance) {
           yield model[setAccessor](instance, {
             context,
             transaction
           });
-
           if (!recursive) {
             return;
           }
-
           if (updateAssociationValues.includes(key)) {
             yield instance.update(value, _objectSpread(_objectSpread({}, options), {}, {
               transaction
             }));
           }
-
           yield updateAssociations(instance, value, _objectSpread(_objectSpread({}, options), {}, {
             transaction,
             associationContext: association,
@@ -402,7 +338,6 @@ function _updateSingleAssociation() {
           return true;
         }
       }
-
       const instance = yield model[createAccessor](value, {
         context,
         transaction
@@ -412,8 +347,8 @@ function _updateSingleAssociation() {
         associationContext: association,
         updateAssociationValues: keys
       }));
-      model.setDataValue(key, instance); // @ts-ignore
-
+      model.setDataValue(key, instance);
+      // @ts-ignore
       if (association.targetKey) {
         model.setDataValue(association.foreignKey, instance[dataKey]);
       }
@@ -423,34 +358,27 @@ function _updateSingleAssociation() {
   });
   return _updateSingleAssociation.apply(this, arguments);
 }
-
-function updateMultipleAssociation(_x16, _x17, _x18) {
+function updateMultipleAssociation(_x17, _x18, _x19) {
   return _updateMultipleAssociation.apply(this, arguments);
 }
-
 function _updateMultipleAssociation() {
   _updateMultipleAssociation = _asyncToGenerator(function* (model, key, value, options = {}) {
     const association = modelAssociationByKey(model, key);
-
     if (!association) {
       return false;
     }
-
     if (!['undefined', 'string', 'number', 'object'].includes(typeof value)) {
       return false;
     }
-
     const recursive = options.recursive,
-          context = options.context,
-          _options$updateAssoci2 = options.updateAssociationValues,
-          updateAssociationValues = _options$updateAssoci2 === void 0 ? [] : _options$updateAssoci2,
-          transaction = options.transaction;
+      context = options.context,
+      _options$updateAssoci2 = options.updateAssociationValues,
+      updateAssociationValues = _options$updateAssoci2 === void 0 ? [] : _options$updateAssoci2,
+      transaction = options.transaction;
     const keys = getKeysByPrefix(updateAssociationValues, key);
-
     try {
       const setAccessor = association.accessors.set;
       const createAccessor = association.accessors.create;
-
       if (isUndefinedOrNull(value)) {
         yield model[setAccessor](null, {
           transaction,
@@ -459,7 +387,6 @@ function _updateMultipleAssociation() {
         model.setDataValue(key, null);
         return;
       }
-
       if (isStringOrNumber(value)) {
         yield model[setAccessor](value, {
           transaction,
@@ -468,61 +395,46 @@ function _updateMultipleAssociation() {
         });
         return;
       }
-
-      if (!Array.isArray(value)) {
-        value = [value];
-      }
-
-      const list1 = []; // to be setted
-
-      const list2 = []; // to be added
-
-      const created = [];
-
+      value = _lodash().default.castArray(value);
+      const setItems = []; // to be setted
+      const objectItems = []; // to be added
+      // iterate item in value
       var _iterator3 = _createForOfIteratorHelper(value),
-          _step3;
-
+        _step3;
       try {
         for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
           const item = _step3.value;
-
           if (isUndefinedOrNull(item)) {
             continue;
           }
-
           if (isStringOrNumber(item)) {
-            list1.push(item);
+            setItems.push(item);
           } else if (item instanceof _model.Model) {
-            list1.push(item);
+            setItems.push(item);
           } else if (item.sequelize) {
-            list1.push(item);
+            setItems.push(item);
           } else if (typeof item === 'object') {
             const targetKey = association.targetKey || 'id';
-
             if (item[targetKey]) {
-              created.push(item[targetKey]);
-              list1.push(item[targetKey]);
+              setItems.push(item[targetKey]);
             }
-
-            list2.push(item);
+            objectItems.push(item);
           }
-        } // associate targets in lists1
-
+        }
+        // associate targets in lists1
       } catch (err) {
         _iterator3.e(err);
       } finally {
         _iterator3.f();
       }
-
-      yield model[setAccessor](list1, {
+      yield model[setAccessor](setItems, {
         transaction,
         context,
         individualHooks: true
       });
-      const list3 = [];
-
-      for (var _i3 = 0, _list = list2; _i3 < _list.length; _i3++) {
-        const item = _list[_i3];
+      const newItems = [];
+      for (var _i3 = 0, _objectItems = objectItems; _i3 < _objectItems.length; _i3++) {
+        const item = _objectItems[_i3];
         const pk = association.target.primaryKeyAttribute;
         const through = association.through ? association.through.model.name : null;
         const accessorOptions = {
@@ -530,11 +442,9 @@ function _updateMultipleAssociation() {
           transaction
         };
         const throughValue = item[through];
-
         if (throughValue) {
           accessorOptions['through'] = throughValue;
         }
-
         if (isUndefinedOrNull(item[pk])) {
           // create new record
           const instance = yield model[createAccessor](item, accessorOptions);
@@ -543,43 +453,34 @@ function _updateMultipleAssociation() {
             associationContext: association,
             updateAssociationValues: keys
           }));
-          list3.push(instance);
+          newItems.push(instance);
         } else {
           // set & update record
           const instance = yield association.target.findByPk(item[pk], {
             transaction
           });
-
           if (!instance) {
             continue;
           }
-
           const addAccessor = association.accessors.add;
-
-          if (!created.includes(item[pk])) {
-            yield model[addAccessor](item[pk], accessorOptions);
-          }
-
+          yield model[addAccessor](item[pk], accessorOptions);
           if (!recursive) {
             continue;
           }
-
           if (updateAssociationValues.includes(key)) {
             yield instance.update(item, _objectSpread(_objectSpread({}, options), {}, {
               transaction
             }));
           }
-
           yield updateAssociations(instance, item, _objectSpread(_objectSpread({}, options), {}, {
             transaction,
             associationContext: association,
             updateAssociationValues: keys
           }));
-          list3.push(instance);
+          newItems.push(instance);
         }
       }
-
-      model.setDataValue(key, list1.concat(list3));
+      model.setDataValue(key, setItems.concat(newItems));
     } catch (error) {
       throw error;
     }