@nocobase/plugin-acl 0.9.1-alpha.1 → 0.9.2-alpha.1

package/lib/actions/available-actions.js

@@ -4,17 +4,13 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.availableActionResource = void 0;
-
 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); }); }; }
-
 const availableActionResource = {
   name: 'availableActions',
   actions: {
@@ -33,7 +29,6 @@ const availableActionResource = {
         yield next();
       })();
     }
-
   }
 };
 exports.availableActionResource = availableActionResource;

package/lib/actions/role-check.js

@@ -4,43 +4,29 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.checkAction = checkAction;
-
 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 _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 _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 _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; }
-
 const map2obj = map => {
   const obj = {};
-
   var _iterator = _createForOfIteratorHelper(map),
-      _step;
-
+    _step;
   try {
     for (_iterator.s(); !(_step = _iterator.n()).done;) {
       let _step$value = _slicedToArray(_step.value, 2),
-          key = _step$value[0],
-          value = _step$value[1];
-
+        key = _step$value[0],
+        value = _step$value[1];
       obj[key] = value;
     }
   } catch (err) {
@@ -48,18 +34,14 @@ const map2obj = map => {
   } finally {
     _iterator.f();
   }
-
   return obj;
 };
-
-function checkAction(_x, _x2) {
+function checkAction(_x2, _x3) {
   return _checkAction.apply(this, arguments);
 }
-
 function _checkAction() {
   _checkAction = _asyncToGenerator(function* (ctx, next) {
     const currentRole = ctx.state.currentRole;
-
     if (currentRole) {
       const roleInstance = yield ctx.db.getRepository('roles').findOne({
         filter: {
@@ -86,7 +68,6 @@ function _checkAction() {
     } else {
       throw new Error('Role not found');
     }
-
     yield next();
   });
   return _checkAction.apply(this, arguments);

package/lib/actions/role-collections.js

@@ -4,27 +4,17 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.roleCollectionsResource = void 0;
-
 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); }); }; }
-
 function totalPage(total, pageSize) {
   return Math.ceil(total / pageSize);
 }
-
 const roleCollectionsResource = {
   name: 'roles.collections',
   actions: {
@@ -32,35 +22,35 @@ const roleCollectionsResource = {
       return _asyncToGenerator(function* () {
         const role = ctx.action.params.associatedIndex;
         const _ctx$action$params = ctx.action.params,
-              _ctx$action$params$pa = _ctx$action$params.page,
-              page = _ctx$action$params$pa === void 0 ? 1 : _ctx$action$params$pa,
-              _ctx$action$params$pa2 = _ctx$action$params.pageSize,
-              pageSize = _ctx$action$params$pa2 === void 0 ? 20 : _ctx$action$params$pa2;
+          _ctx$action$params$pa = _ctx$action$params.page,
+          page = _ctx$action$params$pa === void 0 ? 1 : _ctx$action$params$pa,
+          _ctx$action$params$pa2 = _ctx$action$params.pageSize,
+          pageSize = _ctx$action$params$pa2 === void 0 ? 20 : _ctx$action$params$pa2;
         const db = ctx.db;
         const collectionRepository = db.getRepository('collections');
-        const fieldRepository = db.getRepository('fields'); // all collections
-
+        const fieldRepository = db.getRepository('fields');
+        // all collections
         const _yield$collectionRepo = yield collectionRepository.findAndCount({
-          filter: ctx.action.params.filter,
-          sort: 'sort'
-        }),
-              _yield$collectionRepo2 = _slicedToArray(_yield$collectionRepo, 2),
-              collections = _yield$collectionRepo2[0],
-              count = _yield$collectionRepo2[1]; // role collections
-
-
+            filter: ctx.action.params.filter,
+            sort: 'sort'
+          }),
+          _yield$collectionRepo2 = _slicedToArray(_yield$collectionRepo, 2),
+          collections = _yield$collectionRepo2[0],
+          count = _yield$collectionRepo2[1];
+        // role collections
         const roleResources = yield db.getRepository('rolesResources').find({
           filter: {
             roleName: role
           }
-        }); // role collections
-
+        });
+        // role collections
         const roleResourcesNames = roleResources.map(roleResource => roleResource.get('name'));
         const roleResourceActionResourceNames = roleResources.filter(roleResources => roleResources.get('usingActionsConfig')).map(roleResources => roleResources.get('name'));
         const items = collections.map((collection, i) => {
           const exists = roleResourcesNames.includes(collection.get('name'));
           const usingConfig = roleResourceActionResourceNames.includes(collection.get('name')) ? 'resourceAction' : 'strategy';
-          const c = db.getCollection(collection.get('name')); // const children = [...c.fields.values()]
+          const c = db.getCollection(collection.get('name'));
+          // const children = [...c.fields.values()]
           //   .filter(
           //     (f) => f.options.interface && ['hasOne', 'hasMany', 'belongsTo', 'belongsToMany'].includes(f.options.type),
           //   )
@@ -81,7 +71,6 @@ const roleCollectionsResource = {
           //       exists,
           //     };
           //   });
-
           return {
             type: 'collection',
             name: collection.get('name'),
@@ -89,10 +78,11 @@ const roleCollectionsResource = {
             title: collection.get('title'),
             roleName: role,
             usingConfig,
-            exists // children: children.length > 0 ? children : null,
-
+            exists
+            // children: children.length > 0 ? children : null,
           };
         });
+
         ctx.body = {
           count,
           rows: items,
@@ -103,7 +93,6 @@ const roleCollectionsResource = {
         yield next();
       })();
     }
-
   }
 };
 exports.roleCollectionsResource = roleCollectionsResource;

package/lib/actions/user-setDefaultRole.js

@@ -4,26 +4,20 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.setDefaultRole = setDefaultRole;
-
 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 setDefaultRole(_x, _x2) {
   return _setDefaultRole.apply(this, arguments);
 }
-
 function _setDefaultRole() {
   _setDefaultRole = _asyncToGenerator(function* (ctx, next) {
     const roleName = ctx.action.params.values.roleName;
     const db = ctx.db,
-          currentUser = ctx.state.currentUser,
-          values = ctx.action.params.values;
-
+      currentUser = ctx.state.currentUser,
+      values = ctx.action.params.values;
     if (values.roleName == 'anonymous') {
       return next();
     }
-
     const repository = db.getRepository('rolesUsers');
     yield db.sequelize.transaction( /*#__PURE__*/function () {
       var _ref = _asyncToGenerator(function* (transaction) {
@@ -47,7 +41,6 @@ function _setDefaultRole() {
           transaction
         });
       });
-
       return function (_x3) {
         return _ref.apply(this, arguments);
       };

package/lib/collections/roles-users.js

@@ -7,7 +7,7 @@ exports.default = void 0;
 var _default = {
   name: 'rolesUsers',
   duplicator: 'optional',
-  namespace: 'acl',
+  namespace: 'acl.acl',
   fields: [{
     type: 'boolean',
     name: 'default'

package/lib/collections/roles.js

@@ -5,8 +5,11 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _default = {
-  namespace: 'acl',
-  duplicator: 'required',
+  namespace: 'acl.acl',
+  duplicator: {
+    dumpable: 'required',
+    with: 'uiSchemas'
+  },
   name: 'roles',
   title: '{{t("Roles")}}',
   autoGenId: false,

package/lib/collections/rolesResources.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _default = {
-  namespace: 'acl',
+  namespace: 'acl.acl',
   duplicator: 'required',
   name: 'rolesResources',
   model: 'RoleResourceModel',

package/lib/collections/rolesResourcesActions.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _default = {
-  namespace: 'acl',
+  namespace: 'acl.acl',
   duplicator: 'required',
   name: 'rolesResourcesActions',
   model: 'RoleResourceActionModel',

package/lib/collections/rolesResourcesScopes.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _default = {
-  namespace: 'acl',
+  namespace: 'acl.acl',
   duplicator: 'required',
   name: 'rolesResourcesScopes',
   fields: [{

package/lib/collections/users.js

@@ -4,17 +4,13 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 function _database() {
   const data = require("@nocobase/database");
-
   _database = function _database() {
     return data;
   };
-
   return data;
 }
-
 var _default = (0, _database().extend)({
   name: 'users',
   fields: [{
@@ -42,5 +38,4 @@ var _default = (0, _database().extend)({
     }
   }]
 });
-
 exports.default = _default;

package/lib/index.js

@@ -9,7 +9,5 @@ Object.defineProperty(exports, "default", {
     return _server.default;
   }
 });
-
 var _server = _interopRequireDefault(require("./server"));
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }

package/lib/middlewares/setCurrentRole.js

@@ -4,53 +4,40 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.setCurrentRole = setCurrentRole;
-
 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 setCurrentRole(_x, _x2) {
   return _setCurrentRole.apply(this, arguments);
 }
-
 function _setCurrentRole() {
   _setCurrentRole = _asyncToGenerator(function* (ctx, next) {
     let currentRole = ctx.get('X-Role');
-
     if (currentRole === 'anonymous') {
       ctx.state.currentRole = currentRole;
       return next();
     }
-
     if (!ctx.state.currentUser) {
       return next();
     }
-
     const repository = ctx.db.getRepository('users.roles', ctx.state.currentUser.id);
     const roles = yield repository.find();
     ctx.state.currentUser.setDataValue('roles', roles);
-
     if (roles.length == 1) {
       currentRole = roles[0].name;
     } else if (roles.length > 1) {
       const role = roles.find(item => item.name === currentRole);
-
       if (!role) {
         var _ref;
-
         const defaultRole = roles.find(item => {
           var _item$rolesUsers;
-
           return item === null || item === void 0 ? void 0 : (_item$rolesUsers = item.rolesUsers) === null || _item$rolesUsers === void 0 ? void 0 : _item$rolesUsers.default;
         });
         currentRole = (_ref = defaultRole || roles[0]) === null || _ref === void 0 ? void 0 : _ref.name;
       }
     }
-
     if (currentRole) {
       ctx.state.currentRole = currentRole;
     }
-
     yield next();
   });
   return _setCurrentRole.apply(this, arguments);

package/lib/migrations/20221214072638-set-role-snippets.js

@@ -4,25 +4,18 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 function _server() {
   const data = require("@nocobase/server");
-
   _server = function _server() {
     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); }); }; }
-
 class _default extends _server().Migration {
   up() {
     var _this = this;
-
     return _asyncToGenerator(function* () {
       yield _this.app.db.getRepository('roles').update({
         filter: {
@@ -39,11 +32,8 @@ class _default extends _server().Migration {
       });
     })();
   }
-
   down() {
     return _asyncToGenerator(function* () {})();
   }
-
 }
-
 exports.default = _default;

package/lib/model/RoleModel.js

@@ -4,41 +4,32 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.RoleModel = void 0;
-
 function _database() {
   const data = require("@nocobase/database");
-
   _database = function _database() {
     return data;
   };
-
   return data;
 }
-
 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); }
 class RoleModel extends _database().Model {
   writeToAcl(options) {
     const acl = options.acl;
     const roleName = this.get('name');
     let role = acl.getRole(roleName);
-
     if (!role) {
       role = acl.define({
         role: roleName
       });
     }
-
     role.setStrategy(_objectSpread(_objectSpread({}, this.get('strategy') || {}), {}, {
       allowConfigure: this.get('allowConfigure')
     }));
     role.snippets = new Set(this.get('snippets'));
   }
-
 }
-
 exports.RoleModel = RoleModel;

package/lib/model/RoleResourceActionModel.js

@@ -4,84 +4,61 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.RoleResourceActionModel = void 0;
-
 function _database() {
   const data = require("@nocobase/database");
-
   _database = function _database() {
     return data;
   };
-
   return data;
 }
-
 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 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); }); }; }
-
 class RoleResourceActionModel extends _database().Model {
   writeToACL(options) {
     var _this = this;
-
     return _asyncToGenerator(function* () {
       // @ts-ignore
       const db = _this.constructor.database;
       const resourceName = options.resourceName,
-            role = options.role,
-            acl = options.acl,
-            associationFieldsActions = options.associationFieldsActions,
-            grantHelper = options.grantHelper;
-
+        role = options.role,
+        acl = options.acl,
+        associationFieldsActions = options.associationFieldsActions,
+        grantHelper = options.grantHelper;
       const actionName = _this.get('name');
-
       const fields = _this.get('fields');
-
       const actionPath = `${resourceName}:${actionName}`;
       const actionParams = {
         fields
-      }; // @ts-ignore
-
+      };
+      // @ts-ignore
       const scope = yield _this.getScope();
-
       if (scope) {
         actionParams['own'] = scope.get('key') === 'own';
         actionParams['filter'] = scope.get('scope');
       }
-
       role.grantAction(actionPath, actionParams);
       const collection = db.getCollection(resourceName);
-
       if (!collection) {
         return;
       }
-
       const availableAction = acl.resolveActionAlias(actionName);
-
       var _iterator = _createForOfIteratorHelper(fields),
-          _step;
-
+        _step;
       try {
         for (_iterator.s(); !(_step = _iterator.n()).done;) {
           var _associationFieldsAct;
-
           const field = _step.value;
           const collectionField = collection.getField(field);
-
           if (!collectionField) {
             console.log(`${field} does not exist`);
             continue;
           }
-
           const fieldType = collectionField.get('type');
           const fieldActions = associationFieldsActions === null || associationFieldsActions === void 0 ? void 0 : (_associationFieldsAct = associationFieldsActions[fieldType]) === null || _associationFieldsAct === void 0 ? void 0 : _associationFieldsAct[availableAction];
           const fieldTarget = collectionField.get('target');
-
           if (fieldActions) {
             // grant association actions to role
             const associationActions = fieldActions.associationActions || [];
@@ -93,12 +70,10 @@ class RoleResourceActionModel extends _database().Model {
             targetActions.forEach(targetAction => {
               const targetActionPath = `${fieldTarget}:${targetAction}`;
               const existsAction = role.getActionParams(targetActionPath);
-
               if (existsAction) {
                 return;
-              } // set resource target action with current resourceName
-
-
+              }
+              // set resource target action with current resourceName
               grantHelper.resourceTargetActionMap.set(`${role.name}.${resourceName}`, [...(grantHelper.resourceTargetActionMap.get(resourceName) || []), targetActionPath]);
               grantHelper.targetActionResourceMap.set(targetActionPath, [...(grantHelper.targetActionResourceMap.get(targetActionPath) || []), `${role.name}.${resourceName}`]);
               role.grantAction(targetActionPath);
@@ -112,7 +87,5 @@ class RoleResourceActionModel extends _database().Model {
       }
     })();
   }
-
 }
-
 exports.RoleResourceActionModel = RoleResourceActionModel;