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

package/lib/acl-available-action.js

@@ -4,7 +4,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.ACLAvailableAction = void 0;
-
 class ACLAvailableAction {
   constructor(name, options) {
     this.name = void 0;
@@ -12,7 +11,5 @@ class ACLAvailableAction {
     this.name = name;
     this.options = options;
   }
-
 }
-
 exports.ACLAvailableAction = ACLAvailableAction;

package/lib/acl-available-strategy.js

@@ -4,31 +4,20 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.predicate = exports.ACLAvailableStrategy = void 0;
-
 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 _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; }
-
 const predicate = {
   own: {
     filter: {
@@ -38,7 +27,6 @@ const predicate = {
   all: {}
 };
 exports.predicate = predicate;
-
 class ACLAvailableStrategy {
   constructor(acl, options) {
     this.acl = void 0;
@@ -49,48 +37,36 @@ class ACLAvailableStrategy {
     this.options = options;
     this.allowConfigure = options.allowConfigure;
     let actions = this.options.actions;
-
     if (_lodash().default.isString(actions) && actions != '*') {
       actions = [actions];
     }
-
     if (_lodash().default.isArray(actions)) {
       this.actionsAsObject = actions.reduce((carry, action) => {
         const _action$split = action.split(':'),
-              _action$split2 = _slicedToArray(_action$split, 2),
-              actionName = _action$split2[0],
-              predicate = _action$split2[1];
-
+          _action$split2 = _slicedToArray(_action$split, 2),
+          actionName = _action$split2[0],
+          predicate = _action$split2[1];
         carry[actionName] = predicate;
         return carry;
       }, {});
     }
   }
-
   matchAction(actionName) {
     var _this$actionsAsObject;
-
     if (this.options.actions == '*') {
       return true;
     }
-
     if ((_this$actionsAsObject = this.actionsAsObject) === null || _this$actionsAsObject === void 0 ? void 0 : _this$actionsAsObject.hasOwnProperty(actionName)) {
       const predicateName = this.actionsAsObject[actionName];
-
       if (predicateName) {
         return _lodash().default.cloneDeep(predicate[predicateName]);
       }
-
       return true;
     }
-
     return false;
   }
-
   allow(resourceName, actionName) {
     return this.matchAction(this.acl.resolveActionAlias(actionName));
   }
-
 }
-
 exports.ACLAvailableStrategy = ACLAvailableStrategy;

package/lib/acl-resource.js

@@ -4,7 +4,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.ACLResource = void 0;
-
 class ACLResource {
   constructor(options) {
     this.actions = new Map();
@@ -15,24 +14,20 @@ class ACLResource {
     this.role = options.role;
     this.name = options.name;
     const actionsOption = options.actions || {};
-
     for (var _i = 0, _Object$keys = Object.keys(actionsOption); _i < _Object$keys.length; _i++) {
       const actionName = _Object$keys[_i];
       this.actions.set(actionName, actionsOption[actionName]);
     }
   }
-
   getActions() {
     return Array.from(this.actions.keys()).reduce((carry, key) => {
       carry[key] = this.actions.get(key);
       return carry;
     }, {});
   }
-
   getAction(name) {
     return this.actions.get(name) || this.actions.get(this.acl.resolveActionAlias(name));
   }
-
   setAction(name, params) {
     const context = {
       role: this.role,
@@ -45,18 +40,14 @@ class ACLResource {
     this.acl.emit('beforeGrantAction', context);
     this.actions.set(name, context.params);
   }
-
   setActions(actions) {
     for (var _i2 = 0, _Object$keys2 = Object.keys(actions); _i2 < _Object$keys2.length; _i2++) {
       const actionName = _Object$keys2[_i2];
       this.setAction(actionName, actions[actionName]);
     }
   }
-
   removeAction(name) {
     this.actions.delete(name);
   }
-
 }
-
 exports.ACLResource = ACLResource;

package/lib/acl-role.js

@@ -4,47 +4,30 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.ACLRole = void 0;
-
 var _aclAvailableStrategy = require("./acl-available-strategy");
-
 var _aclResource = require("./acl-resource");
-
 function _lodash() {
   const data = _interopRequireDefault(require("lodash"));
-
   _lodash = function _lodash() {
     return data;
   };
-
   return data;
 }
-
 function _minimatch() {
   const data = _interopRequireDefault(require("minimatch"));
-
   _minimatch = function _minimatch() {
     return data;
   };
-
   return data;
 }
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 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; }
-
 class ACLRole {
   constructor(acl, name) {
     this.acl = void 0;
@@ -55,44 +38,35 @@ class ACLRole {
     this.acl = acl;
     this.name = name;
   }
-
   getResource(name) {
     return this.resources.get(name);
   }
-
   setStrategy(value) {
     this.strategy = value;
   }
-
   getStrategy() {
     if (!this.strategy) {
       return null;
     }
-
     return _lodash().default.isString(this.strategy) ? this.acl.availableStrategy.get(this.strategy) : new _aclAvailableStrategy.ACLAvailableStrategy(this.acl, this.strategy);
   }
-
   getResourceActionsParams(resourceName) {
     const resource = this.getResource(resourceName);
     return resource.getActions();
   }
-
   revokeResource(resourceName) {
     for (var _i = 0, _arr = [...this.resources.keys()]; _i < _arr.length; _i++) {
       const key = _arr[_i];
-
       if (key === resourceName || key.includes(`${resourceName}.`)) {
         this.resources.delete(key);
       }
     }
   }
-
   grantAction(path, options) {
     let _this$getResourceActi = this.getResourceActionFromPath(path),
-        resource = _this$getResourceActi.resource,
-        resourceName = _this$getResourceActi.resourceName,
-        actionName = _this$getResourceActi.actionName;
-
+      resource = _this$getResourceActi.resource,
+      resourceName = _this$getResourceActi.resourceName,
+      actionName = _this$getResourceActi.actionName;
     if (!resource) {
       resource = new _aclResource.ACLResource({
         role: this,
@@ -100,48 +74,37 @@ class ACLRole {
       });
       this.resources.set(resourceName, resource);
     }
-
     resource.setAction(actionName, options);
   }
-
   getActionParams(path) {
     const _this$getResourceActi2 = this.getResourceActionFromPath(path),
-          action = _this$getResourceActi2.action;
-
+      action = _this$getResourceActi2.action;
     return action;
   }
-
   revokeAction(path) {
     const _this$getResourceActi3 = this.getResourceActionFromPath(path),
-          resource = _this$getResourceActi3.resource,
-          actionName = _this$getResourceActi3.actionName;
-
+      resource = _this$getResourceActi3.resource,
+      actionName = _this$getResourceActi3.actionName;
     resource.removeAction(actionName);
   }
-
   effectiveSnippets() {
     const allowedSnippets = new Set();
     const rejectedSnippets = new Set();
     const availableSnippets = this.acl.snippetManager.snippets;
-
     var _iterator = _createForOfIteratorHelper(this.snippets),
-        _step;
-
+      _step;
     try {
       for (_iterator.s(); !(_step = _iterator.n()).done;) {
         let snippetRule = _step.value;
         const negated = snippetRule.startsWith('!');
         snippetRule = negated ? snippetRule.slice(1) : snippetRule;
-
         var _iterator2 = _createForOfIteratorHelper(availableSnippets),
-            _step2;
-
+          _step2;
         try {
           for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
             const _step2$value = _slicedToArray(_step2.value, 2),
-                  _ = _step2$value[0],
-                  availableSnippet = _step2$value[1];
-
+              _ = _step2$value[0],
+              availableSnippet = _step2$value[1];
             if ((0, _minimatch().default)(availableSnippet.name, snippetRule)) {
               if (negated) {
                 rejectedSnippets.add(availableSnippet.name);
@@ -155,42 +118,34 @@ class ACLRole {
         } finally {
           _iterator2.f();
         }
-      } // get difference of allowed and rejected snippets
-
+      }
+      // get difference of allowed and rejected snippets
     } catch (err) {
       _iterator.e(err);
     } finally {
       _iterator.f();
     }
-
     const effectiveSnippets = new Set([...allowedSnippets].filter(x => !rejectedSnippets.has(x)));
     return {
       allowed: [...effectiveSnippets],
       rejected: [...rejectedSnippets]
     };
   }
-
   snippetAllowed(actionPath) {
     const effectiveSnippets = this.effectiveSnippets();
-
     const getActions = snippets => {
       return snippets.map(snippetName => this.acl.snippetManager.snippets.get(snippetName).actions).flat();
     };
-
     const allowedActions = getActions(effectiveSnippets.allowed);
     const rejectedActions = getActions(effectiveSnippets.rejected);
-
     const actionMatched = (actionPath, actionRule) => {
       return (0, _minimatch().default)(actionPath, actionRule);
     };
-
     var _iterator3 = _createForOfIteratorHelper(allowedActions),
-        _step3;
-
+      _step3;
     try {
       for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
         const action = _step3.value;
-
         if (actionMatched(actionPath, action)) {
           return true;
         }
@@ -200,14 +155,11 @@ class ACLRole {
     } finally {
       _iterator3.f();
     }
-
     var _iterator4 = _createForOfIteratorHelper(rejectedActions),
-        _step4;
-
+      _step4;
     try {
       for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
         const action = _step4.value;
-
         if (actionMatched(actionPath, action)) {
           return false;
         }
@@ -217,21 +169,16 @@ class ACLRole {
     } finally {
       _iterator4.f();
     }
-
     return null;
   }
-
   toJSON() {
     const actions = {};
-
     var _iterator5 = _createForOfIteratorHelper(this.resources.keys()),
-        _step5;
-
+      _step5;
     try {
       for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
         const resourceName = _step5.value;
         const resourceActions = this.getResourceActionsParams(resourceName);
-
         for (var _i2 = 0, _Object$keys = Object.keys(resourceActions); _i2 < _Object$keys.length; _i2++) {
           const actionName = _Object$keys[_i2];
           actions[`${resourceName}:${actionName}`] = resourceActions[actionName];
@@ -242,7 +189,6 @@ class ACLRole {
     } finally {
       _iterator5.f();
     }
-
     return {
       role: this.name,
       strategy: this.strategy,
@@ -250,20 +196,16 @@ class ACLRole {
       snippets: Array.from(this.snippets)
     };
   }
-
   getResourceActionFromPath(path) {
     const _path$split = path.split(':'),
-          _path$split2 = _slicedToArray(_path$split, 2),
-          resourceName = _path$split2[0],
-          actionName = _path$split2[1];
-
+      _path$split2 = _slicedToArray(_path$split, 2),
+      resourceName = _path$split2[0],
+      actionName = _path$split2[1];
     const resource = this.resources.get(resourceName);
     let action = null;
-
     if (resource) {
       action = resource.getAction(actionName);
     }
-
     return {
       resourceName,
       actionName,
@@ -271,7 +213,5 @@ class ACLRole {
       action
     };
   }
-
 }
-
 exports.ACLRole = ACLRole;

package/lib/acl.js

@@ -4,95 +4,62 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.ACL = void 0;
-
 function _utils() {
   const data = require("@nocobase/utils");
-
   _utils = function _utils() {
     return data;
   };
-
   return data;
 }
-
 function _events() {
   const data = _interopRequireDefault(require("events"));
-
   _events = function _events() {
     return data;
   };
-
   return data;
 }
-
 function _jsonTemplates() {
   const data = _interopRequireDefault(require("json-templates"));
-
   _jsonTemplates = function _jsonTemplates() {
     return data;
   };
-
   return data;
 }
-
 function _koaCompose() {
   const data = _interopRequireDefault(require("koa-compose"));
-
   _koaCompose = function _koaCompose() {
     return data;
   };
-
   return data;
 }
-
 function _lodash() {
   const data = _interopRequireDefault(require("lodash"));
-
   _lodash = function _lodash() {
     return data;
   };
-
   return data;
 }
-
 var _aclAvailableAction = require("./acl-available-action");
-
 var _aclAvailableStrategy = require("./acl-available-strategy");
-
 var _aclRole = require("./acl-role");
-
 var _allowManager = require("./allow-manager");
-
 var _fixedParamsManager = _interopRequireDefault(require("./fixed-params-manager"));
-
 var _snippetManager = _interopRequireDefault(require("./snippet-manager"));
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 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 _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 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 ACL extends _events().default {
   constructor() {
     super();
@@ -113,14 +80,12 @@ class ACL extends _events().default {
     });
     this.beforeGrantAction(ctx => {
       const actionName = this.resolveActionAlias(ctx.actionName);
-
       if (_lodash().default.isPlainObject(ctx.params)) {
         if ((actionName === 'create' || actionName === 'update') && ctx.params.fields) {
           ctx.params = _objectSpread(_objectSpread({}, _lodash().default.omit(ctx.params, 'fields')), {}, {
             whitelist: ctx.params.fields
           });
         }
-
         if (actionName === 'view' && ctx.params.fields) {
           const appendFields = ['id', 'createdAt', 'updatedAt'];
           ctx.params = _objectSpread(_objectSpread({}, _lodash().default.omit(ctx.params, 'fields')), {}, {
@@ -135,46 +100,35 @@ class ACL extends _events().default {
     });
     this.addCoreMiddleware();
   }
-
   addCoreMiddleware() {
     const acl = this;
-
     const filterParams = (ctx, resourceName, params) => {
       var _params$filter;
-
       if (params === null || params === void 0 ? void 0 : (_params$filter = params.filter) === null || _params$filter === void 0 ? void 0 : _params$filter.createdById) {
         const collection = ctx.db.getCollection(resourceName);
-
         if (!collection || !collection.getField('createdById')) {
           return _lodash().default.omit(params, 'filter.createdById');
         }
       }
-
       return params;
     };
-
     this.middlewares.add( /*#__PURE__*/function () {
       var _ref = _asyncToGenerator(function* (ctx, next) {
         var _ctx$log, _permission$can, _ctx$log2;
-
         const resourcerAction = ctx.action;
         const _ctx$action = ctx.action,
-              resourceName = _ctx$action.resourceName,
-              actionName = _ctx$action.actionName;
+          resourceName = _ctx$action.resourceName,
+          actionName = _ctx$action.actionName;
         const permission = ctx.permission;
         ((_ctx$log = ctx.log) === null || _ctx$log === void 0 ? void 0 : _ctx$log.info) && ctx.log.info('ctx permission', permission);
-
         if ((!permission.can || typeof permission.can !== 'object') && !permission.skip) {
           ctx.throw(403, 'No permissions');
           return;
         }
-
         const params = ((_permission$can = permission.can) === null || _permission$can === void 0 ? void 0 : _permission$can.params) || acl.fixedParamsManager.getParams(resourceName, actionName);
         ((_ctx$log2 = ctx.log) === null || _ctx$log2 === void 0 ? void 0 : _ctx$log2.info) && ctx.log.info('acl params', params);
-
         if (params && resourcerAction.mergeParams) {
           var _ctx$log3;
-
           const filteredParams = filterParams(ctx, resourceName, params);
           const parsedParams = acl.parseJsonTemplate(filteredParams, ctx);
           ctx.permission.parsedParams = parsedParams;
@@ -185,20 +139,16 @@ class ACL extends _events().default {
               if (!x) {
                 return [];
               }
-
               if (!y) {
                 return x;
               }
-
               return x.filter(i => y.includes(i.split('.').shift()));
             }
           });
           ctx.permission.mergedParams = _lodash().default.cloneDeep(resourcerAction.params);
         }
-
         yield next();
       });
-
       return function (_x, _x2) {
         return _ref.apply(this, arguments);
       };
@@ -207,58 +157,43 @@ class ACL extends _events().default {
       group: 'core'
     });
   }
-
   define(options) {
     const roleName = options.role;
     const role = new _aclRole.ACLRole(this, roleName);
-
     if (options.strategy) {
       role.strategy = options.strategy;
     }
-
     const actions = options.actions || {};
-
     for (var _i = 0, _Object$entries = Object.entries(actions); _i < _Object$entries.length; _i++) {
       const _Object$entries$_i = _slicedToArray(_Object$entries[_i], 2),
-            actionName = _Object$entries$_i[0],
-            actionParams = _Object$entries$_i[1];
-
+        actionName = _Object$entries$_i[0],
+        actionParams = _Object$entries$_i[1];
       role.grantAction(actionName, actionParams);
     }
-
     this.roles.set(roleName, role);
     return role;
   }
-
   getRole(name) {
     return this.roles.get(name);
   }
-
   removeRole(name) {
     return this.roles.delete(name);
   }
-
   registerConfigResources(names) {
     names.forEach(name => this.registerConfigResource(name));
   }
-
   registerConfigResource(name) {
     this.configResources.push(name);
   }
-
   isConfigResource(name) {
     return this.configResources.includes(name);
   }
-
   setAvailableAction(name, options = {}) {
     this.availableActions.set(name, new _aclAvailableAction.ACLAvailableAction(name, options));
-
     if (options.aliases) {
       const aliases = _lodash().default.isArray(options.aliases) ? options.aliases : [options.aliases];
-
       var _iterator = _createForOfIteratorHelper(aliases),
-          _step;
-
+        _step;
       try {
         for (_iterator.s(); !(_step = _iterator.n()).done;) {
           const alias = _step.value;
@@ -271,60 +206,45 @@ class ACL extends _events().default {
       }
     }
   }
-
   getAvailableAction(name) {
     const actionName = this.actionAlias.get(name) || name;
     return this.availableActions.get(actionName);
   }
-
   getAvailableActions() {
     return this.availableActions;
   }
-
   setAvailableStrategy(name, options) {
     this.availableStrategy.set(name, new _aclAvailableStrategy.ACLAvailableStrategy(this, options));
   }
-
   beforeGrantAction(listener) {
     this.addListener('beforeGrantAction', listener);
   }
-
   can(options) {
     const role = options.role,
-          resource = options.resource,
-          action = options.action;
+      resource = options.resource,
+      action = options.action;
     const aclRole = this.roles.get(role);
-
     if (!aclRole) {
       return null;
     }
-
     const snippetAllowed = aclRole.snippetAllowed(`${resource}:${action}`);
-
     if (snippetAllowed === false) {
       return null;
     }
-
     const fixedParams = this.fixedParamsManager.getParams(resource, action);
-
     const mergeParams = result => {
       const params = result['params'] || {};
       const mergedParams = (0, _utils().assign)(params, fixedParams);
-
       if (Object.keys(mergedParams).length) {
         result['params'] = mergedParams;
       } else {
         delete result['params'];
       }
-
       return result;
     };
-
     const aclResource = aclRole.getResource(resource);
-
     if (aclResource) {
       const actionParams = aclResource.getAction(action);
-
       if (actionParams) {
         // handle single action config
         return mergeParams({
@@ -337,19 +257,14 @@ class ACL extends _events().default {
         return null;
       }
     }
-
     const roleStrategy = aclRole.getStrategy();
-
     if (!roleStrategy && !snippetAllowed) {
       return null;
     }
-
     let roleStrategyParams = roleStrategy === null || roleStrategy === void 0 ? void 0 : roleStrategy.allow(resource, this.resolveActionAlias(action));
-
     if (!roleStrategyParams && snippetAllowed) {
       roleStrategyParams = {};
     }
-
     if (roleStrategyParams) {
       const result = {
         role,
@@ -357,43 +272,33 @@ class ACL extends _events().default {
         action,
         params: {}
       };
-
       if (_lodash().default.isPlainObject(roleStrategyParams)) {
         result['params'] = roleStrategyParams;
       }
-
       return mergeParams(result);
     }
-
     return null;
   }
-
   isAvailableAction(actionName) {
     return this.availableActions.has(this.resolveActionAlias(actionName));
   }
-
   resolveActionAlias(action) {
     return this.actionAlias.get(action) ? this.actionAlias.get(action) : action;
   }
-
   use(fn, options) {
     this.middlewares.add(fn, _objectSpread({
       group: 'prep'
     }, options));
   }
-
   allow(resourceName, actionNames, condition) {
     return this.skip(resourceName, actionNames, condition);
   }
-
   skip(resourceName, actionNames, condition) {
     if (!Array.isArray(actionNames)) {
       actionNames = [actionNames];
     }
-
     var _iterator2 = _createForOfIteratorHelper(actionNames),
-        _step2;
-
+      _step2;
     try {
       for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
         const actionName = _step2.value;
@@ -405,7 +310,6 @@ class ACL extends _events().default {
       _iterator2.f();
     }
   }
-
   parseJsonTemplate(json, ctx) {
     return (0, _jsonTemplates().default)(json)({
       ctx: {
@@ -413,22 +317,19 @@ class ACL extends _events().default {
       }
     });
   }
-
   middleware() {
     const acl = this;
     return /*#__PURE__*/function () {
       var _ACLMiddleware = _asyncToGenerator(function* (ctx, next) {
         const roleName = ctx.state.currentRole || 'anonymous';
         const _ctx$action2 = ctx.action,
-              resourceName = _ctx$action2.resourceName,
-              actionName = _ctx$action2.actionName;
-
+          resourceName = _ctx$action2.resourceName,
+          actionName = _ctx$action2.actionName;
         ctx.can = options => {
           return acl.can(_objectSpread({
             role: roleName
           }, options));
         };
-
         ctx.permission = {
           can: ctx.can({
             resource: resourceName,
@@ -437,30 +338,24 @@ class ACL extends _events().default {
         };
         return (0, _koaCompose().default)(acl.middlewares.nodes)(ctx, next);
       });
-
       function ACLMiddleware(_x3, _x4) {
         return _ACLMiddleware.apply(this, arguments);
       }
-
       return ACLMiddleware;
     }();
   }
-
   getActionParams(ctx) {
     var _this = this;
-
     return _asyncToGenerator(function* () {
       const roleName = ctx.state.currentRole || 'anonymous';
       const _ctx$action3 = ctx.action,
-            resourceName = _ctx$action3.resourceName,
-            actionName = _ctx$action3.actionName;
-
+        resourceName = _ctx$action3.resourceName,
+        actionName = _ctx$action3.actionName;
       ctx.can = options => {
         return _this.can(_objectSpread({
           role: roleName
         }, options));
       };
-
       ctx.permission = {
         can: ctx.can({
           resource: resourceName,
@@ -470,15 +365,11 @@ class ACL extends _events().default {
       yield (0, _koaCompose().default)(_this.middlewares.nodes)(ctx, /*#__PURE__*/_asyncToGenerator(function* () {}));
     })();
   }
-
   addFixedParams(resource, action, merger) {
     this.fixedParamsManager.addParams(resource, action, merger);
   }
-
   registerSnippet(snippet) {
     this.snippetManager.register(snippet);
   }
-
 }
-
 exports.ACL = ACL;

package/lib/allow-manager.js

@@ -4,23 +4,16 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.AllowManager = 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 _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 AllowManager {
   constructor(acl) {
     this.acl = void 0;
@@ -36,83 +29,63 @@ class AllowManager {
     this.registerAllowCondition('allowConfigure', /*#__PURE__*/function () {
       var _ref = _asyncToGenerator(function* (ctx) {
         var _role$getStrategy;
-
         const roleName = ctx.state.currentRole;
-
         if (!roleName) {
           return false;
         }
-
         const role = acl.getRole(roleName);
-
         if (!role) {
           return false;
         }
-
         return (_role$getStrategy = role.getStrategy()) === null || _role$getStrategy === void 0 ? void 0 : _role$getStrategy.allowConfigure;
       });
-
       return function (_x) {
         return _ref.apply(this, arguments);
       };
     }());
   }
-
   allow(resourceName, actionName, condition) {
     const actionMap = this.skipActions.get(resourceName) || new Map();
     actionMap.set(actionName, condition || true);
     this.skipActions.set(resourceName, actionMap);
   }
-
   getAllowedConditions(resourceName, actionName) {
     const fetchActionSteps = ['*', resourceName];
     const results = [];
-
     for (var _i = 0, _fetchActionSteps = fetchActionSteps; _i < _fetchActionSteps.length; _i++) {
       const fetchActionStep = _fetchActionSteps[_i];
       const resource = this.skipActions.get(fetchActionStep);
-
       if (resource) {
         for (var _i2 = 0, _arr = ['*', actionName]; _i2 < _arr.length; _i2++) {
           const fetchActionStep = _arr[_i2];
           const condition = resource.get(fetchActionStep);
-
           if (condition) {
             results.push(typeof condition === 'string' ? this.registeredCondition.get(condition) : condition);
           }
         }
       }
     }
-
     return results;
   }
-
   registerAllowCondition(name, condition) {
     this.registeredCondition.set(name, condition);
   }
-
   isAllowed(resourceName, actionName, ctx) {
     var _this = this;
-
     return _asyncToGenerator(function* () {
       const skippedConditions = _this.getAllowedConditions(resourceName, actionName);
-
       var _iterator = _createForOfIteratorHelper(skippedConditions),
-          _step;
-
+        _step;
       try {
         for (_iterator.s(); !(_step = _iterator.n()).done;) {
           const skippedCondition = _step.value;
-
           if (skippedCondition) {
             let skipResult = false;
-
             if (typeof skippedCondition === 'function') {
               skipResult = yield skippedCondition(ctx);
             } else if (skippedCondition) {
               skipResult = true;
             }
-
             if (skipResult) {
               return true;
             }
@@ -123,36 +96,28 @@ class AllowManager {
       } finally {
         _iterator.f();
       }
-
       return false;
     })();
   }
-
   aclMiddleware() {
     var _this2 = this;
-
     return /*#__PURE__*/function () {
       var _ref2 = _asyncToGenerator(function* (ctx, next) {
         const _ctx$action = ctx.action,
-              resourceName = _ctx$action.resourceName,
-              actionName = _ctx$action.actionName;
+          resourceName = _ctx$action.resourceName,
+          actionName = _ctx$action.actionName;
         let skip = yield _this2.acl.allowManager.isAllowed(resourceName, actionName, ctx);
-
         if (skip) {
           ctx.permission = _objectSpread(_objectSpread({}, ctx.permission || {}), {}, {
             skip: true
           });
         }
-
         yield next();
       });
-
       return function (_x2, _x3) {
         return _ref2.apply(this, arguments);
       };
     }();
   }
-
 }
-
 exports.AllowManager = AllowManager;

package/lib/fixed-params-manager.js

@@ -4,50 +4,36 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 function _utils() {
   const data = require("@nocobase/utils");
-
   _utils = function _utils() {
     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; }
-
 const SPLIT = ':';
-
 class FixedParamsManager {
   constructor() {
     this.merger = new Map();
   }
-
   addParams(resource, action, merger) {
     const path = this.getActionPath(resource, action);
     this.merger.set(path, [...this.getParamsMerger(resource, action), merger]);
   }
-
   getParamsMerger(resource, action) {
     const path = this.getActionPath(resource, action);
     return this.merger.get(path) || [];
   }
-
   getActionPath(resource, action) {
     return `${resource}${SPLIT}${action}`;
   }
-
   getParams(resource, action, extraParams = {}) {
     const results = {};
-
     var _iterator = _createForOfIteratorHelper(this.getParamsMerger(resource, action)),
-        _step;
-
+      _step;
     try {
       for (_iterator.s(); !(_step = _iterator.n()).done;) {
         const merger = _step.value;
@@ -58,14 +44,11 @@ class FixedParamsManager {
     } finally {
       _iterator.f();
     }
-
     if (extraParams) {
       FixedParamsManager.mergeParams(results, extraParams);
     }
-
     return results;
   }
-
   static mergeParams(a, b) {
     (0, _utils().assign)(a, b, {
       filter: 'andMerge',
@@ -77,7 +60,5 @@ class FixedParamsManager {
       sort: 'overwrite'
     });
   }
-
 }
-
 exports.default = FixedParamsManager;

package/lib/index.js

@@ -3,9 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-
 var _acl = require("./acl");
-
 Object.keys(_acl).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (key in exports && exports[key] === _acl[key]) return;
@@ -16,9 +14,7 @@ Object.keys(_acl).forEach(function (key) {
     }
   });
 });
-
 var _aclAvailableAction = require("./acl-available-action");
-
 Object.keys(_aclAvailableAction).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (key in exports && exports[key] === _aclAvailableAction[key]) return;
@@ -29,9 +25,7 @@ Object.keys(_aclAvailableAction).forEach(function (key) {
     }
   });
 });
-
 var _aclAvailableStrategy = require("./acl-available-strategy");
-
 Object.keys(_aclAvailableStrategy).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (key in exports && exports[key] === _aclAvailableStrategy[key]) return;
@@ -42,9 +36,7 @@ Object.keys(_aclAvailableStrategy).forEach(function (key) {
     }
   });
 });
-
 var _aclResource = require("./acl-resource");
-
 Object.keys(_aclResource).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (key in exports && exports[key] === _aclResource[key]) return;
@@ -55,9 +47,7 @@ Object.keys(_aclResource).forEach(function (key) {
     }
   });
 });
-
 var _aclRole = require("./acl-role");
-
 Object.keys(_aclRole).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (key in exports && exports[key] === _aclRole[key]) return;
@@ -68,9 +58,7 @@ Object.keys(_aclRole).forEach(function (key) {
     }
   });
 });
-
 var _noPermissionError = require("./no-permission-error");
-
 Object.keys(_noPermissionError).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (key in exports && exports[key] === _noPermissionError[key]) return;
@@ -81,9 +69,7 @@ Object.keys(_noPermissionError).forEach(function (key) {
     }
   });
 });
-
 var _skipMiddleware = require("./skip-middleware");
-
 Object.keys(_skipMiddleware).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (key in exports && exports[key] === _skipMiddleware[key]) return;

package/lib/no-permission-error.js

@@ -4,12 +4,9 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.NoPermissionError = void 0;
-
 class NoPermissionError extends Error {
   constructor(...args) {
     super(...args);
   }
-
 }
-
 exports.NoPermissionError = NoPermissionError;

package/lib/skip-middleware.js

@@ -4,33 +4,25 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.skip = void 0;
-
 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 skip = options => {
   return /*#__PURE__*/function () {
     var _ACLSkipMiddleware = _asyncToGenerator(function* (ctx, next) {
       const _ctx$action = ctx.action,
-            resourceName = _ctx$action.resourceName,
-            actionName = _ctx$action.actionName;
-
+        resourceName = _ctx$action.resourceName,
+        actionName = _ctx$action.actionName;
       if (resourceName === options.resourceName && actionName === options.actionName) {
         ctx.permission = {
           skip: true
         };
       }
-
       yield next();
     });
-
     function ACLSkipMiddleware(_x, _x2) {
       return _ACLSkipMiddleware.apply(this, arguments);
     }
-
     return ACLSkipMiddleware;
   }();
 };
-
 exports.skip = skip;

package/lib/snippet-manager.js

@@ -4,19 +4,14 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 function _minimatch() {
   const data = _interopRequireDefault(require("minimatch"));
-
   _minimatch = function _minimatch() {
     return data;
   };
-
   return data;
 }
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 class Snippet {
   constructor(name, actions) {
     this.name = void 0;
@@ -24,37 +19,27 @@ class Snippet {
     this.name = name;
     this.actions = actions;
   }
-
 }
-
 class SnippetManager {
   constructor() {
     this.snippets = new Map();
   }
-
   register(snippet) {
     this.snippets.set(snippet.name, snippet);
   }
-
   allow(actionPath, snippetName) {
     const negated = snippetName.startsWith('!');
     snippetName = negated ? snippetName.slice(1) : snippetName;
     const snippet = this.snippets.get(snippetName);
-
     if (!snippet) {
       throw new Error(`Snippet ${snippetName} not found`);
     }
-
     const matched = snippet.actions.some(action => (0, _minimatch().default)(actionPath, action));
-
     if (matched) {
       return negated ? false : true;
     }
-
     return null;
   }
-
 }
-
 var _default = SnippetManager;
 exports.default = _default;

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@nocobase/acl",
-  "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/resourcer": "0.9.1-alpha.2",
-    "@nocobase/utils": "0.9.1-alpha.2",
+    "@nocobase/resourcer": "0.9.2-alpha.2",
+    "@nocobase/utils": "0.9.2-alpha.2",
     "json-templates": "^4.2.0",
     "minimatch": "^5.1.1"
   },
@@ -16,5 +16,5 @@
     "url": "git+https://github.com/nocobase/nocobase.git",
     "directory": "packages/acl"
   },
-  "gitHead": "d588a68eca4feed4642a4cb317301011266fe5c9"
+  "gitHead": "1a0de6908b2b1854bdf434fcafa8909cb65bb8a3"
 }