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

package/lib/actions/add.js

@@ -4,35 +4,25 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.add = add;
-
 var _utils = require("../utils");
-
 function _database() {
   const data = require("@nocobase/database");
-
   _database = function _database() {
     return data;
   };
-
   return data;
 }
-
 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 add(_x, _x2) {
   return _add.apply(this, arguments);
 }
-
 function _add() {
   _add = _asyncToGenerator(function* (ctx, next) {
     const repository = (0, _utils.getRepositoryFromParams)(ctx);
-
     if (!(repository instanceof _database().MultipleRelationRepository || repository instanceof _database().HasManyRepository || repository instanceof _database().ArrayFieldRepository)) {
       return yield next();
     }
-
     yield repository.add(ctx.action.params.values);
     ctx.status = 200;
     yield next();

package/lib/actions/create.js

@@ -4,25 +4,20 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.create = create;
-
 var _utils = require("../utils");
-
 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 create(_x, _x2) {
   return _create.apply(this, arguments);
 }
-
 function _create() {
   _create = _asyncToGenerator(function* (ctx, next) {
     const repository = (0, _utils.getRepositoryFromParams)(ctx);
     const _ctx$action$params = ctx.action.params,
-          whitelist = _ctx$action$params.whitelist,
-          blacklist = _ctx$action$params.blacklist,
-          updateAssociationValues = _ctx$action$params.updateAssociationValues,
-          values = _ctx$action$params.values;
+      whitelist = _ctx$action$params.whitelist,
+      blacklist = _ctx$action$params.blacklist,
+      updateAssociationValues = _ctx$action$params.updateAssociationValues,
+      values = _ctx$action$params.values;
     const instance = yield repository.create({
       values,
       whitelist,

package/lib/actions/destroy.js

@@ -4,23 +4,18 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.destroy = destroy;
-
 var _utils = require("../utils");
-
 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 destroy(_x, _x2) {
   return _destroy.apply(this, arguments);
 }
-
 function _destroy() {
   _destroy = _asyncToGenerator(function* (ctx, next) {
     const repository = (0, _utils.getRepositoryFromParams)(ctx);
     const _ctx$action$params = ctx.action.params,
-          filterByTk = _ctx$action$params.filterByTk,
-          filter = _ctx$action$params.filter;
+      filterByTk = _ctx$action$params.filterByTk,
+      filter = _ctx$action$params.filter;
     const instance = yield repository.destroy({
       filter,
       filterByTk,

package/lib/actions/get.js

@@ -4,26 +4,21 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.get = get;
-
 var _utils = require("../utils");
-
 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 get(_x, _x2) {
   return _get.apply(this, arguments);
 }
-
 function _get() {
   _get = _asyncToGenerator(function* (ctx, next) {
     const repository = (0, _utils.getRepositoryFromParams)(ctx);
     const _ctx$action$params = ctx.action.params,
-          filterByTk = _ctx$action$params.filterByTk,
-          fields = _ctx$action$params.fields,
-          appends = _ctx$action$params.appends,
-          except = _ctx$action$params.except,
-          filter = _ctx$action$params.filter;
+      filterByTk = _ctx$action$params.filterByTk,
+      fields = _ctx$action$params.fields,
+      appends = _ctx$action$params.appends,
+      except = _ctx$action$params.except,
+      filter = _ctx$action$params.filter;
     const instance = yield repository.findOne({
       filterByTk,
       fields,

package/lib/actions/index.js

@@ -3,9 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-
 var _list = require("./list");
-
 Object.keys(_list).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (key in exports && exports[key] === _list[key]) return;
@@ -16,9 +14,7 @@ Object.keys(_list).forEach(function (key) {
     }
   });
 });
-
 var _create = require("./create");
-
 Object.keys(_create).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (key in exports && exports[key] === _create[key]) return;
@@ -29,9 +25,7 @@ Object.keys(_create).forEach(function (key) {
     }
   });
 });
-
 var _update = require("./update");
-
 Object.keys(_update).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (key in exports && exports[key] === _update[key]) return;
@@ -42,9 +36,7 @@ Object.keys(_update).forEach(function (key) {
     }
   });
 });
-
 var _destroy = require("./destroy");
-
 Object.keys(_destroy).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (key in exports && exports[key] === _destroy[key]) return;
@@ -55,9 +47,7 @@ Object.keys(_destroy).forEach(function (key) {
     }
   });
 });
-
 var _get = require("./get");
-
 Object.keys(_get).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (key in exports && exports[key] === _get[key]) return;
@@ -68,9 +58,7 @@ Object.keys(_get).forEach(function (key) {
     }
   });
 });
-
 var _add = require("./add");
-
 Object.keys(_add).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (key in exports && exports[key] === _add[key]) return;
@@ -81,9 +69,7 @@ Object.keys(_add).forEach(function (key) {
     }
   });
 });
-
 var _set = require("./set");
-
 Object.keys(_set).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (key in exports && exports[key] === _set[key]) return;
@@ -94,9 +80,7 @@ Object.keys(_set).forEach(function (key) {
     }
   });
 });
-
 var _remove = require("./remove");
-
 Object.keys(_remove).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (key in exports && exports[key] === _remove[key]) return;
@@ -107,9 +91,7 @@ Object.keys(_remove).forEach(function (key) {
     }
   });
 });
-
 var _toggle = require("./toggle");
-
 Object.keys(_toggle).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (key in exports && exports[key] === _toggle[key]) return;
@@ -120,9 +102,7 @@ Object.keys(_toggle).forEach(function (key) {
     }
   });
 });
-
 var _move = require("./move");
-
 Object.keys(_move).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (key in exports && exports[key] === _move[key]) return;

package/lib/actions/list.js

@@ -5,54 +5,70 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.DEFAULT_PER_PAGE = exports.DEFAULT_PAGE = void 0;
 exports.list = list;
-
-var _utils = require("../utils");
-
+function _utils() {
+  const data = require("@nocobase/utils");
+  _utils = function _utils() {
+    return data;
+  };
+  return data;
+}
+var _utils2 = require("../utils");
 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); }); }; }
 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 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); }); }; }
-
 const DEFAULT_PAGE = 1;
 exports.DEFAULT_PAGE = DEFAULT_PAGE;
 const DEFAULT_PER_PAGE = 20;
 exports.DEFAULT_PER_PAGE = DEFAULT_PER_PAGE;
-
 function pageArgsToLimitArgs(page, pageSize) {
   return {
     offset: (page - 1) * pageSize,
     limit: pageSize
   };
 }
-
 function totalPage(total, pageSize) {
   return Math.ceil(total / pageSize);
 }
-
-function findArgs(params) {
-  const fields = params.fields,
-        filter = params.filter,
-        appends = params.appends,
-        except = params.except,
-        sort = params.sort;
+function findArgs(ctx) {
+  const resourceName = ctx.action.resourceName;
+  const params = ctx.action.params;
+  if (params.tree) {
+    const _resourceName$split = resourceName.split('.'),
+      _resourceName$split2 = _slicedToArray(_resourceName$split, 2),
+      collectionName = _resourceName$split2[0],
+      associationName = _resourceName$split2[1];
+    const collection = ctx.db.getCollection(resourceName);
+    // tree collection 或者关系表是 tree collection
+    if (collection.options.tree && !(associationName && collectionName === collection.name)) {
+      var _collection$treeParen;
+      const foreignKey = ((_collection$treeParen = collection.treeParentField) === null || _collection$treeParen === void 0 ? void 0 : _collection$treeParen.foreignKey) || 'parentId';
+      (0, _utils().assign)(params, {
+        filter: {
+          [foreignKey]: null
+        }
+      }, {
+        filter: 'andMerge'
+      });
+    }
+  }
+  const tree = params.tree,
+    fields = params.fields,
+    filter = params.filter,
+    appends = params.appends,
+    except = params.except,
+    sort = params.sort;
   return {
+    tree,
     filter,
     fields,
     appends,
@@ -60,27 +76,23 @@ function findArgs(params) {
     sort
   };
 }
-
-function listWithPagination(_x) {
+function listWithPagination(_x2) {
   return _listWithPagination.apply(this, arguments);
 }
-
 function _listWithPagination() {
   _listWithPagination = _asyncToGenerator(function* (ctx) {
     const _ctx$action$params = ctx.action.params,
-          _ctx$action$params$pa = _ctx$action$params.page,
-          page = _ctx$action$params$pa === void 0 ? DEFAULT_PAGE : _ctx$action$params$pa,
-          _ctx$action$params$pa2 = _ctx$action$params.pageSize,
-          pageSize = _ctx$action$params$pa2 === void 0 ? DEFAULT_PER_PAGE : _ctx$action$params$pa2;
-    const repository = (0, _utils.getRepositoryFromParams)(ctx);
-
+      _ctx$action$params$pa = _ctx$action$params.page,
+      page = _ctx$action$params$pa === void 0 ? DEFAULT_PAGE : _ctx$action$params$pa,
+      _ctx$action$params$pa2 = _ctx$action$params.pageSize,
+      pageSize = _ctx$action$params$pa2 === void 0 ? DEFAULT_PER_PAGE : _ctx$action$params$pa2;
+    const repository = (0, _utils2.getRepositoryFromParams)(ctx);
     const _yield$repository$fin = yield repository.findAndCount(_objectSpread(_objectSpread({
-      context: ctx
-    }, findArgs(ctx.action.params)), pageArgsToLimitArgs(parseInt(String(page)), parseInt(String(pageSize))))),
-          _yield$repository$fin2 = _slicedToArray(_yield$repository$fin, 2),
-          rows = _yield$repository$fin2[0],
-          count = _yield$repository$fin2[1];
-
+        context: ctx
+      }, findArgs(ctx)), pageArgsToLimitArgs(parseInt(String(page)), parseInt(String(pageSize))))),
+      _yield$repository$fin2 = _slicedToArray(_yield$repository$fin, 2),
+      rows = _yield$repository$fin2[0],
+      count = _yield$repository$fin2[1];
     ctx.body = {
       count,
       rows,
@@ -91,30 +103,25 @@ function _listWithPagination() {
   });
   return _listWithPagination.apply(this, arguments);
 }
-
-function listWithNonPaged(_x2) {
+function listWithNonPaged(_x3) {
   return _listWithNonPaged.apply(this, arguments);
 }
-
 function _listWithNonPaged() {
   _listWithNonPaged = _asyncToGenerator(function* (ctx) {
-    const repository = (0, _utils.getRepositoryFromParams)(ctx);
+    const repository = (0, _utils2.getRepositoryFromParams)(ctx);
     const rows = yield repository.find(_objectSpread({
       context: ctx
-    }, findArgs(ctx.action.params)));
+    }, findArgs(ctx)));
     ctx.body = rows;
   });
   return _listWithNonPaged.apply(this, arguments);
 }
-
-function list(_x3, _x4) {
+function list(_x4, _x5) {
   return _list.apply(this, arguments);
 }
-
 function _list() {
   _list = _asyncToGenerator(function* (ctx, next) {
     const paginate = ctx.action.params.paginate;
-
     if (paginate === false || paginate === 'false') {
       yield listWithNonPaged(ctx);
       ctx.paginate = false;
@@ -122,7 +129,6 @@ function _list() {
       yield listWithPagination(ctx);
       ctx.paginate = true;
     }
-
     yield next();
   });
   return _list.apply(this, arguments);

package/lib/actions/move.js

@@ -5,73 +5,56 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.SortAbleCollection = void 0;
 exports.move = move;
-
 function _sequelize() {
   const data = require("sequelize");
-
   _sequelize = function _sequelize() {
     return data;
   };
-
   return data;
 }
-
 function _database() {
   const data = require("@nocobase/database");
-
   _database = function _database() {
     return data;
   };
-
   return data;
 }
-
 var _utils = require("../utils");
-
 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 move(_x, _x2) {
   return _move.apply(this, arguments);
 }
-
 function _move() {
   _move = _asyncToGenerator(function* (ctx, next) {
     const repository = (0, _utils.getRepositoryFromParams)(ctx);
     const _ctx$action$params = ctx.action.params,
-          sourceId = _ctx$action$params.sourceId,
-          targetId = _ctx$action$params.targetId,
-          sortField = _ctx$action$params.sortField,
-          targetScope = _ctx$action$params.targetScope,
-          sticky = _ctx$action$params.sticky,
-          method = _ctx$action$params.method;
-
+      sourceId = _ctx$action$params.sourceId,
+      targetId = _ctx$action$params.targetId,
+      sortField = _ctx$action$params.sortField,
+      targetScope = _ctx$action$params.targetScope,
+      sticky = _ctx$action$params.sticky,
+      method = _ctx$action$params.method;
     if (repository instanceof _database().Repository) {
       const sortAbleCollection = new SortAbleCollection(repository.collection, sortField);
-
       if (sourceId && targetId) {
         yield sortAbleCollection.move(sourceId, targetId, {
           insertAfter: method === 'insertAfter'
         });
-      } // change scope
-
-
+      }
+      // change scope
       if (sourceId && targetScope) {
         yield sortAbleCollection.changeScope(sourceId, targetScope, method);
       }
-
       if (sourceId && sticky) {
         yield sortAbleCollection.sticky(sourceId);
       }
     }
-
     ctx.body = 'ok';
     yield next();
   });
   return _move.apply(this, arguments);
 }
-
 class SortAbleCollection {
   constructor(collection, fieldName = 'sort') {
     this.collection = void 0;
@@ -79,56 +62,44 @@ class SortAbleCollection {
     this.scopeKey = void 0;
     this.collection = collection;
     this.field = collection.getField(fieldName);
-
     if (!(this.field instanceof _database().SortField)) {
       throw new Error(`${fieldName} is not a sort field`);
     }
-
     this.scopeKey = this.field.get('scopeKey');
-  } // insert source position to target position
-
-
+  }
+  // insert source position to target position
   move(sourceInstanceId, targetInstanceId, options = {}) {
     var _this = this;
-
     return _asyncToGenerator(function* () {
       const sourceInstance = yield _this.collection.repository.findById(sourceInstanceId);
       const targetInstance = yield _this.collection.repository.findById(targetInstanceId);
-
       if (_this.scopeKey && sourceInstance.get(_this.scopeKey) !== targetInstance.get(_this.scopeKey)) {
         yield sourceInstance.update({
           [_this.scopeKey]: targetInstance.get(_this.scopeKey)
         });
       }
-
       yield _this.sameScopeMove(sourceInstance, targetInstance, options);
     })();
   }
-
   changeScope(sourceInstanceId, targetScope, method) {
     var _this2 = this;
-
     return _asyncToGenerator(function* () {
       const sourceInstance = yield _this2.collection.repository.findById(sourceInstanceId);
       const targetScopeValue = targetScope[_this2.scopeKey];
-
       if (targetScopeValue && sourceInstance.get(_this2.scopeKey) !== targetScopeValue) {
         yield sourceInstance.update({
           [_this2.scopeKey]: targetScopeValue
         }, {
           silent: false
         });
-
         if (method === 'prepend') {
           yield _this2.sticky(sourceInstanceId);
         }
       }
     })();
   }
-
   sticky(sourceInstanceId) {
     var _this3 = this;
-
     return _asyncToGenerator(function* () {
       const sourceInstance = yield _this3.collection.repository.findById(sourceInstanceId);
       yield sourceInstance.update({
@@ -138,24 +109,18 @@ class SortAbleCollection {
       });
     })();
   }
-
   sameScopeMove(sourceInstance, targetInstance, options) {
     var _this4 = this;
-
     return _asyncToGenerator(function* () {
       const fieldName = _this4.field.get('name');
-
       const sourceSort = sourceInstance.get(fieldName);
       let targetSort = targetInstance.get(fieldName);
-
       if (options.insertAfter) {
         targetSort = targetSort + 1;
       }
-
       let scopeValue = _this4.scopeKey ? sourceInstance.get(_this4.scopeKey) : null;
       let updateCondition;
       let change;
-
       if (targetSort > sourceSort) {
         updateCondition = {
           [_sequelize().Op.gt]: sourceSort,
@@ -169,17 +134,14 @@ class SortAbleCollection {
         };
         change = 1;
       }
-
       const where = {
         [fieldName]: updateCondition
       };
-
       if (scopeValue) {
         where[_this4.scopeKey] = {
           [_sequelize().Op.eq]: scopeValue
         };
       }
-
       yield _this4.collection.model.increment(fieldName, {
         where,
         by: change,
@@ -192,7 +154,5 @@ class SortAbleCollection {
       });
     })();
   }
-
 }
-
 exports.SortAbleCollection = SortAbleCollection;

package/lib/actions/remove.js

@@ -4,8 +4,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.remove = void 0;
-
 var _utils = require("../utils");
-
 const remove = (0, _utils.RelationRepositoryActionBuilder)('remove');
 exports.remove = remove;

package/lib/actions/set.js

@@ -4,8 +4,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.set = void 0;
-
 var _utils = require("../utils");
-
 const set = (0, _utils.RelationRepositoryActionBuilder)('set');
 exports.set = set;

package/lib/actions/toggle.js

@@ -4,35 +4,25 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.toggle = toggle;
-
 function _database() {
   const data = require("@nocobase/database");
-
   _database = function _database() {
     return data;
   };
-
   return data;
 }
-
 var _utils = require("../utils");
-
 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 toggle(_x, _x2) {
   return _toggle.apply(this, arguments);
 }
-
 function _toggle() {
   _toggle = _asyncToGenerator(function* (ctx, next) {
     const repository = (0, _utils.getRepositoryFromParams)(ctx);
-
     if (!(repository instanceof _database().BelongsToManyRepository)) {
       return yield next();
     }
-
     yield repository.toggle(ctx.action.params.values);
     ctx.body = 'ok';
     yield next();

package/lib/actions/update.js

@@ -4,28 +4,23 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.update = update;
-
 var _utils = require("../utils");
-
 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 update(_x, _x2) {
   return _update.apply(this, arguments);
 }
-
 function _update() {
   _update = _asyncToGenerator(function* (ctx, next) {
     const repository = (0, _utils.getRepositoryFromParams)(ctx);
     const _ctx$action$params = ctx.action.params,
-          forceUpdate = _ctx$action$params.forceUpdate,
-          filterByTk = _ctx$action$params.filterByTk,
-          values = _ctx$action$params.values,
-          whitelist = _ctx$action$params.whitelist,
-          blacklist = _ctx$action$params.blacklist,
-          filter = _ctx$action$params.filter,
-          updateAssociationValues = _ctx$action$params.updateAssociationValues;
+      forceUpdate = _ctx$action$params.forceUpdate,
+      filterByTk = _ctx$action$params.filterByTk,
+      values = _ctx$action$params.values,
+      whitelist = _ctx$action$params.whitelist,
+      blacklist = _ctx$action$params.blacklist,
+      filter = _ctx$action$params.filter,
+      updateAssociationValues = _ctx$action$params.updateAssociationValues;
     ctx.body = yield repository.update({
       filterByTk,
       values,

package/lib/index.js

@@ -6,32 +6,21 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 exports.registerActions = registerActions;
 exports.utils = void 0;
-
 function _lodash() {
   const data = _interopRequireDefault(require("lodash"));
-
   _lodash = function _lodash() {
     return data;
   };
-
   return data;
 }
-
 var actions = _interopRequireWildcard(require("./actions"));
-
 var _utils = _interopRequireWildcard(require("./utils"));
-
 exports.utils = _utils;
-
 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 _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 function registerActions(api) {
   api.actions(_lodash().default.pick(actions, ['add', 'create', 'destroy', 'get', 'list', 'remove', 'set', 'toggle', 'update', 'move']));
 }
-
 var _default = actions;
 exports.default = _default;

package/lib/utils.js

@@ -5,23 +5,17 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.RelationRepositoryActionBuilder = RelationRepositoryActionBuilder;
 exports.getRepositoryFromParams = getRepositoryFromParams;
-
 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 getRepositoryFromParams(ctx) {
   const _ctx$action = ctx.action,
-        resourceName = _ctx$action.resourceName,
-        resourceOf = _ctx$action.resourceOf;
-
+    resourceName = _ctx$action.resourceName,
+    resourceOf = _ctx$action.resourceOf;
   if (resourceOf) {
     return ctx.db.getRepository(resourceName, resourceOf);
   }
-
   return ctx.db.getRepository(resourceName);
 }
-
 function RelationRepositoryActionBuilder(method) {
   return /*#__PURE__*/function () {
     var _ref = _asyncToGenerator(function* (ctx, next) {
@@ -30,7 +24,6 @@ function RelationRepositoryActionBuilder(method) {
       ctx.status = 200;
       yield next();
     });
-
     return function (_x, _x2) {
       return _ref.apply(this, arguments);
     };

package/package.json

@@ -1,22 +1,19 @@
 {
   "name": "@nocobase/actions",
-  "version": "0.9.1-alpha.2",
+  "version": "0.9.2-alpha.2",
   "description": "",
   "license": "Apache-2.0",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "dependencies": {
-    "@nocobase/cache": "0.9.1-alpha.2",
-    "@nocobase/database": "0.9.1-alpha.2",
-    "@nocobase/resourcer": "0.9.1-alpha.2"
-  },
-  "devDependencies": {
-    "@nocobase/test": "0.9.1-alpha.2"
+    "@nocobase/cache": "0.9.2-alpha.2",
+    "@nocobase/database": "0.9.2-alpha.2",
+    "@nocobase/resourcer": "0.9.2-alpha.2"
   },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/nocobase/nocobase.git",
     "directory": "packages/actions"
   },
-  "gitHead": "d588a68eca4feed4642a4cb317301011266fe5c9"
+  "gitHead": "1a0de6908b2b1854bdf434fcafa8909cb65bb8a3"
 }