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

package/lib/action.js

@@ -4,57 +4,39 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = exports.Action = void 0;
-
 function _utils() {
   const data = require("@nocobase/utils");
-
   _utils = function _utils() {
     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 _middleware = _interopRequireDefault(require("./middleware"));
-
 const _excluded = ["middleware", "middlewares", "handler"];
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 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); }
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
-
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
-
 class Action {
   constructor(options) {
     this.handler = void 0;
@@ -68,26 +50,22 @@ class Action {
     this.resourceOf = void 0;
     this.middlewares = [];
     options = (0, _utils().requireModule)(options);
-
     if (typeof options === 'function') {
       options = {
         handler: options
       };
     }
-
     const _options = options,
-          middleware = _options.middleware,
-          _options$middlewares = _options.middlewares,
-          middlewares = _options$middlewares === void 0 ? [] : _options$middlewares,
-          handler = _options.handler,
-          params = _objectWithoutProperties(_options, _excluded);
-
+      middleware = _options.middleware,
+      _options$middlewares = _options.middlewares,
+      middlewares = _options$middlewares === void 0 ? [] : _options$middlewares,
+      handler = _options.handler,
+      params = _objectWithoutProperties(_options, _excluded);
     this.middlewares = _middleware.default.toInstanceArray(middleware || middlewares);
     this.handler = handler;
     this.options = options;
     this.mergeParams(params);
   }
-
   toJSON() {
     return {
       actionName: this.actionName,
@@ -96,10 +74,8 @@ class Action {
       params: this.params
     };
   }
-
   clone() {
     const options = _lodash().default.cloneDeep(this.options);
-
     delete options.middleware;
     delete options.middlewares;
     const action = new Action(options);
@@ -108,20 +84,16 @@ class Action {
     action.middlewares.push(...this.middlewares);
     return action;
   }
-
   setContext(context) {
     this.context = context;
   }
-
   mergeParams(params, strategies = {}) {
     if (!this.params) {
       this.params = {};
     }
-
     if (!params) {
       return;
     }
-
     (0, _utils().assign)(this.params, params, _objectSpread({
       filter: 'andMerge',
       fields: 'intersect',
@@ -132,75 +104,58 @@ class Action {
       sort: 'overwrite'
     }, strategies));
   }
-
   setResource(resource) {
     this.resource = resource;
     return this;
   }
-
   getResource() {
     return this.resource;
   }
-
   getOptions() {
     return this.options;
   }
-
   setName(name) {
     this.name = name;
     return this;
   }
-
   getName() {
     return this.name;
   }
-
   getMiddlewareHandlers() {
     return this.middlewares.filter(middleware => middleware.canAccess(this.name)).map(middleware => middleware.getHandler());
   }
-
   getHandler() {
     const handler = (0, _utils().requireModule)(this.handler || this.resource.resourcer.getRegisteredHandler(this.name));
-
     if (typeof handler !== 'function') {
       throw new Error('Handler must be a function!');
     }
-
     return handler;
   }
-
   getHandlers() {
     const handlers = [...this.resource.resourcer.getMiddlewares(), ...this.getMiddlewareHandlers(), this.getHandler()].filter(Boolean);
     return handlers;
   }
-
   execute(context, next) {
     var _this = this;
-
     return _asyncToGenerator(function* () {
       return yield (0, _koaCompose().default)(_this.getHandlers())(context, next);
     })();
   }
-
   static toInstanceMap(actions, resource) {
     return new Map(Object.entries(actions).map(([key, options]) => {
       let action;
-
       if (options instanceof Action) {
         action = options;
       } else {
         action = new Action(options);
       }
-
       action.setName(key);
       action.setResource(resource);
       resource && action.middlewares.unshift(...resource.middlewares);
       return [key, action];
     }));
   }
-
 }
-
 exports.Action = Action;
 var _default = Action;
 exports.default = _default;

package/lib/index.js

@@ -5,9 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 var _exportNames = {};
 exports.default = void 0;
-
 var _resourcer = _interopRequireWildcard(require("./resourcer"));
-
 Object.keys(_resourcer).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
@@ -19,9 +17,7 @@ Object.keys(_resourcer).forEach(function (key) {
     }
   });
 });
-
 var _utils = require("./utils");
-
 Object.keys(_utils).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
@@ -33,9 +29,7 @@ Object.keys(_utils).forEach(function (key) {
     }
   });
 });
-
 var _middleware = require("./middleware");
-
 Object.keys(_middleware).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
@@ -47,9 +41,7 @@ Object.keys(_middleware).forEach(function (key) {
     }
   });
 });
-
 var _action = require("./action");
-
 Object.keys(_action).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
@@ -61,9 +53,7 @@ Object.keys(_action).forEach(function (key) {
     }
   });
 });
-
 var _resource = require("./resource");
-
 Object.keys(_resource).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
@@ -75,10 +65,7 @@ Object.keys(_resource).forEach(function (key) {
     }
   });
 });
-
 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; }
-
 var _default = _resourcer.default;
 exports.default = _default;

package/lib/middleware.js

@@ -6,35 +6,26 @@ Object.defineProperty(exports, "__esModule", {
 exports.Middleware = void 0;
 exports.branch = branch;
 exports.default = void 0;
-
 function _koaCompose() {
   const data = _interopRequireDefault(require("koa-compose"));
-
   _koaCompose = function _koaCompose() {
     return data;
   };
-
   return data;
 }
-
 function _utils() {
   const data = require("@nocobase/utils");
-
   _utils = function _utils() {
     return data;
   };
-
   return data;
 }
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 class Middleware {
   constructor(options) {
     this.options = void 0;
     this.middlewares = [];
     options = (0, _utils().requireModule)(options);
-
     if (typeof options === 'function') {
       this.options = {
         handler: options
@@ -43,61 +34,47 @@ class Middleware {
       this.options = options;
     }
   }
-
   getHandler() {
     const handler = (0, _utils().requireModule)(this.options.handler);
-
     if (typeof handler !== 'function') {
       throw new Error('Handler must be a function!');
     }
-
     return (ctx, next) => (0, _koaCompose().default)([handler, ...this.middlewares])(ctx, next);
   }
-
   use(middleware) {
     this.middlewares.push(middleware);
   }
-
   disuse(middleware) {
     this.middlewares.splice(this.middlewares.indexOf(middleware), 1);
   }
-
   canAccess(name) {
     const _this$options = this.options,
-          _this$options$only = _this$options.only,
-          only = _this$options$only === void 0 ? [] : _this$options$only,
-          _this$options$except = _this$options.except,
-          except = _this$options$except === void 0 ? [] : _this$options$except;
-
+      _this$options$only = _this$options.only,
+      only = _this$options$only === void 0 ? [] : _this$options$only,
+      _this$options$except = _this$options.except,
+      except = _this$options$except === void 0 ? [] : _this$options$except;
     if (only.length > 0) {
       return only.includes(name);
     }
-
     if (except.length > 0) {
       return !except.includes(name);
     }
-
     return true;
   }
-
   static toInstanceArray(middlewares) {
     if (!middlewares) {
       return [];
     }
-
     if (!Array.isArray(middlewares)) {
       middlewares = [middlewares];
     }
-
     return middlewares.map(middleware => {
       if (middleware instanceof Middleware) {
         return middleware;
       }
-
       if (typeof middleware === 'object') {
         return new Middleware(middleware);
       }
-
       if (typeof middleware === 'function') {
         return new Middleware({
           handler: middleware
@@ -105,27 +82,20 @@ class Middleware {
       }
     });
   }
-
 }
-
 exports.Middleware = Middleware;
 var _default = Middleware;
 exports.default = _default;
-
 function branch(map = {}, reducer, options = {}) {
   return (ctx, next) => {
     const key = reducer(ctx);
-
     if (!key) {
       return options.keyNotFound ? options.keyNotFound(ctx, next) : ctx.throw(404);
     }
-
     const handler = map[key];
-
     if (!handler) {
       return options.handlerNotSet ? options.handlerNotSet(ctx, next) : ctx.throw(404);
     }
-
     return handler(ctx, next);
   };
 }

package/lib/resource.js

@@ -4,37 +4,23 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = exports.Resource = void 0;
-
 function _lodash() {
   const data = _interopRequireDefault(require("lodash"));
-
   _lodash = function _lodash() {
     return data;
   };
-
   return data;
 }
-
 var _action = _interopRequireDefault(require("./action"));
-
 var _middleware = _interopRequireDefault(require("./middleware"));
-
 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 Resource {
   constructor(options, resourcer) {
     this.resourcer = void 0;
@@ -43,27 +29,24 @@ class Resource {
     this.options = void 0;
     this.except = void 0;
     const middleware = options.middleware,
-          middlewares = options.middlewares,
-          _options$actions = options.actions,
-          actions = _options$actions === void 0 ? {} : _options$actions,
-          _options$only = options.only,
-          only = _options$only === void 0 ? [] : _options$only,
-          _options$except = options.except,
-          except = _options$except === void 0 ? [] : _options$except;
+      middlewares = options.middlewares,
+      _options$actions = options.actions,
+      actions = _options$actions === void 0 ? {} : _options$actions,
+      _options$only = options.only,
+      only = _options$only === void 0 ? [] : _options$only,
+      _options$except = options.except,
+      except = _options$except === void 0 ? [] : _options$except;
     this.options = options;
     this.resourcer = resourcer;
     this.middlewares = _middleware.default.toInstanceArray(middleware || middlewares);
     let excludes = [];
-
     var _iterator = _createForOfIteratorHelper(resourcer.getRegisteredHandlers()),
-        _step;
-
+      _step;
     try {
       for (_iterator.s(); !(_step = _iterator.n()).done;) {
         const _step$value = _slicedToArray(_step.value, 2),
-              name = _step$value[0],
-              handler = _step$value[1];
-
+          name = _step$value[0],
+          handler = _step$value[1];
         if (!actions[name]) {
           actions[name] = handler;
         }
@@ -73,39 +56,30 @@ class Resource {
     } finally {
       _iterator.f();
     }
-
     if (except.length > 0) {
       excludes = except;
     } else if (only.length > 0) {
       excludes = Object.keys(actions).filter(name => !only.includes(name));
     }
-
     this.except = excludes;
     this.actions = _action.default.toInstanceMap(_lodash().default.omit(actions, excludes), this);
   }
-
   getName() {
     return this.options.name;
   }
-
   getExcept() {
     return this.except;
   }
-
   getAction(action) {
     if (this.except.includes(action)) {
       throw new Error(`${action} action is not allowed`);
     }
-
     if (!this.actions.has(action)) {
       throw new Error(`${action} action does not exist`);
     }
-
     return this.actions.get(action);
   }
-
 }
-
 exports.Resource = Resource;
 var _default = Resource;
 exports.default = _default;

package/lib/resourcer.js

@@ -4,91 +4,63 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = exports.Resourcer = void 0;
-
 function _utils() {
   const data = require("@nocobase/utils");
-
   _utils = function _utils() {
     return data;
   };
-
   return data;
 }
-
 function _glob() {
   const data = _interopRequireDefault(require("glob"));
-
   _glob = function _glob() {
     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;
 }
-
 function _pathToRegexp() {
   const data = require("path-to-regexp");
-
   _pathToRegexp = function _pathToRegexp() {
     return data;
   };
-
   return data;
 }
-
 var _resource = _interopRequireDefault(require("./resource"));
-
 var _utils2 = require("./utils");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 function 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; }
-
 class Resourcer {
-  /**
-   * 全局定义的 action handlers
-   */
   constructor(options = {}) {
     this.resources = new Map();
+    /**
+     * 全局定义的 action handlers
+     */
     this.handlers = new Map();
     this.actionHandlers = new Map();
     this.middlewareHandlers = new Map();
@@ -106,18 +78,14 @@ class Resourcer {
    * @param {string}   [options.directory] 指定配置所在路径
    * @param {array}    [options.extensions = ['js', 'ts', 'json']] 文件后缀
    */
-
-
   import(options) {
     const _options$extensions = options.extensions,
-          extensions = _options$extensions === void 0 ? ['js', 'ts', 'json'] : _options$extensions,
-          directory = options.directory;
+      extensions = _options$extensions === void 0 ? ['js', 'ts', 'json'] : _options$extensions,
+      directory = options.directory;
     const patten = `${directory}/*.{${extensions.join(',')}}`;
-
     const files = _glob().default.sync(patten, {
       ignore: ['**/*.d.ts']
     });
-
     const resources = new Map();
     files.forEach(file => {
       const options = (0, _utils().requireModule)(file);
@@ -132,27 +100,21 @@ class Resourcer {
    * @param name
    * @param options
    */
-
-
   define(options) {
     const name = options.name;
     const resource = new _resource.default(options, this);
     this.resources.set(name, resource);
     return resource;
   }
-
   isDefined(name) {
     return this.resources.has(name);
   }
-
   removeResource(name) {
     return this.resources.delete(name);
   }
-
   registerAction(name, handler) {
     this.registerActionHandler(name, handler);
   }
-
   registerActions(handlers) {
     this.registerActionHandlers(handlers);
   }
@@ -161,61 +123,47 @@ class Resourcer {
    *
    * @param handlers
    */
-
-
   registerActionHandlers(handlers) {
     for (var _i = 0, _Object$entries = Object.entries(handlers); _i < _Object$entries.length; _i++) {
       const _Object$entries$_i = _slicedToArray(_Object$entries[_i], 2),
-            name = _Object$entries$_i[0],
-            handler = _Object$entries$_i[1];
-
+        name = _Object$entries$_i[0],
+        handler = _Object$entries$_i[1];
       this.registerActionHandler(name, handler);
     }
   }
-
   registerActionHandler(name, handler) {
     this.actionHandlers.set(name, handler);
   }
-
   getRegisteredHandler(name) {
     return this.actionHandlers.get(name);
   }
-
   getRegisteredHandlers() {
     return this.actionHandlers;
   }
-
   getResource(name) {
     if (!this.resources.has(name)) {
       throw new Error(`${name} resource does not exist`);
     }
-
     return this.resources.get(name);
   }
-
   getAction(name, action) {
     // 支持注册局部 action
     if (this.actionHandlers.has(`${name}:${action}`)) {
       return this.getResource(name).getAction(`${name}:${action}`);
     }
-
     return this.getResource(name).getAction(action);
   }
-
   getMiddlewares() {
     return this.middlewares.nodes;
   }
-
   use(middlewares, options = {}) {
     this.middlewares.add(middlewares, options);
   }
-
   restApiMiddleware({
     prefix,
     accessors
   } = {}) {
     var _this = this;
-
     return /*#__PURE__*/function () {
       var _ref = _asyncToGenerator(function* (ctx, next) {
         ctx.resourcer = _this;
@@ -226,15 +174,12 @@ class Resourcer {
           prefix: _this.options.prefix || prefix,
           accessors: _this.options.accessors || accessors
         });
-
         if (!params) {
           return next();
         }
-
         try {
-          const resource = _this.getResource((0, _utils2.getNameByParams)(params)); // 为关系资源时，暂时需要再执行一遍 parseRequest
-
-
+          const resource = _this.getResource((0, _utils2.getNameByParams)(params));
+          // 为关系资源时，暂时需要再执行一遍 parseRequest
           if (resource.options.type && resource.options.type !== 'single') {
             params = (0, _utils2.parseRequest)({
               path: ctx.request.path,
@@ -244,13 +189,11 @@ class Resourcer {
               prefix: _this.options.prefix || prefix,
               accessors: _this.options.accessors || accessors
             });
-
             if (!params) {
               return next();
             }
-          } // action 需要 clone 之后再赋给 ctx
-
-
+          }
+          // action 需要 clone 之后再赋给 ctx
           ctx.action = _this.getAction((0, _utils2.getNameByParams)(params), params.actionName).clone();
           ctx.action.setContext(ctx);
           ctx.action.actionName = params.actionName;
@@ -258,7 +201,6 @@ class Resourcer {
           ctx.action.resourceName = params.associatedName ? `${params.associatedName}.${params.resourceName}` : params.resourceName;
           ctx.action.params.filterByTk = params.resourceIndex;
           const query = (0, _utils2.parseQuery)(ctx.request.querystring);
-
           if ((0, _pathToRegexp().pathToRegexp)('/resourcer/{:associatedName.}?:resourceName{\\::actionName}').test(ctx.request.path)) {
             ctx.action.mergeParams(_objectSpread(_objectSpread(_objectSpread({}, query), params), ctx.request.body));
           } else {
@@ -266,19 +208,16 @@ class Resourcer {
               values: ctx.request.body
             }));
           }
-
           return (0, _koaCompose().default)(ctx.action.getHandlers())(ctx, next);
         } catch (error) {
           return next();
         }
       });
-
-      return function (_x, _x2) {
+      return function (_x2, _x3) {
         return _ref.apply(this, arguments);
       };
     }();
   }
-
   middleware(options = {}) {
     return this.restApiMiddleware(options);
   }
@@ -289,22 +228,17 @@ class Resourcer {
    * @param context
    * @param next
    */
-
-
   execute(options, context = {}, next) {
     var _this2 = this;
-
     return _asyncToGenerator(function* () {
       const resource = options.resource,
-            action = options.action;
+        action = options.action;
       context.resourcer = _this2;
       context.action = _this2.getAction(resource, action);
       return yield context.action.execute(context, next);
     })();
   }
-
 }
-
 exports.Resourcer = Resourcer;
 var _default = Resourcer;
 exports.default = _default;

package/lib/utils.js

@@ -8,63 +8,44 @@ exports.mergeFields = mergeFields;
 exports.parseFields = parseFields;
 exports.parseQuery = parseQuery;
 exports.parseRequest = parseRequest;
-
 function _lodash() {
   const data = _interopRequireDefault(require("lodash"));
-
   _lodash = function _lodash() {
     return data;
   };
-
   return data;
 }
-
 function _pathToRegexp() {
   const data = require("path-to-regexp");
-
   _pathToRegexp = function _pathToRegexp() {
     return data;
   };
-
   return data;
 }
-
 function _qs() {
   const data = _interopRequireDefault(require("qs"));
-
   _qs = function _qs() {
     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; }
-
 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); } // @ts-ignore
 function getNameByParams(params) {
   const resourceName = params.resourceName,
-        associatedName = params.associatedName;
+    associatedName = params.associatedName;
   return associatedName ? `${associatedName}.${resourceName}` : resourceName;
 }
-
 function parseRequest(request, options = {}) {
   const accessors = _objectSpread({
     // 常规 actions
@@ -78,23 +59,19 @@ function parseRequest(request, options = {}) {
     set: 'set',
     remove: 'remove'
   }, options.accessors || {});
-
   const keys = [];
   const regexp = (0, _pathToRegexp().pathToRegexp)('/resourcer/{:associatedName.}?:resourceName{\\::actionName}', keys);
   const matches = regexp.exec(request.path);
-
   if (matches) {
     const params = {};
     keys.forEach((obj, index) => {
       if (matches[index + 1] === undefined) {
         return;
       }
-
       params[obj.name] = matches[index + 1];
     });
     return params;
   }
-
   const defaults = {
     single: {
       '/:resourceName': {
@@ -176,78 +153,62 @@ function parseRequest(request, options = {}) {
   };
   const params = {};
   let prefix = (options.prefix || '').trim().replace(/\/$/, '');
-
   if (prefix && !prefix.startsWith('/')) {
     prefix = `/${prefix}`;
   }
-
   const _request$type = request.type,
-        type = _request$type === void 0 ? 'single' : _request$type;
-
+    type = _request$type === void 0 ? 'single' : _request$type;
   for (const path in defaults[type]) {
     const keys = [];
     const regexp = (0, _pathToRegexp().pathToRegexp)(`${prefix}${path}`, keys, {});
     const matches = regexp.exec(request.path);
-
     if (!matches) {
       continue;
     }
-
     keys.forEach((obj, index) => {
       if (matches[index + 1] === undefined) {
         return;
       }
-
       params[obj.name] = matches[index + 1];
     });
     params.actionName = _lodash().default.get(defaults, [type, path, request.method.toLowerCase()]);
   }
-
   if (Object.keys(params).length === 0) {
     return false;
   }
-
   if (params.resourceName) {
     const _params$resourceName$ = params.resourceName.split(':'),
-          _params$resourceName$2 = _slicedToArray(_params$resourceName$, 2),
-          resourceName = _params$resourceName$2[0],
-          actionName = _params$resourceName$2[1];
-
+      _params$resourceName$2 = _slicedToArray(_params$resourceName$, 2),
+      resourceName = _params$resourceName$2[0],
+      actionName = _params$resourceName$2[1];
     if (actionName) {
       params.resourceName = resourceName;
       params.actionName = actionName;
     }
   }
-
   return params;
 }
-
 function parseQuery(input) {
   // 自带 query 处理的不太给力，需要用 qs 转一下
   const query = _qs().default.parse(input, {
     // 原始 query string 中如果一个键连等号“=”都没有可以被认为是 null 类型
-    strictNullHandling: true // 逗号分隔转换为数组
+    strictNullHandling: true
+    // 逗号分隔转换为数组
     // comma: true,
-
-  }); // filter 支持 json string
-
-
+  });
+  // filter 支持 json string
   if (typeof query.filter === 'string') {
     query.filter = JSON.parse(query.filter);
   }
-
   return query;
 }
-
 function parseFields(fields) {
   if (!fields) {
     return {};
   }
-
   if (typeof fields === 'string') {
     fields = fields.split(',').map(field => field.trim());
   }
-
   if (Array.isArray(fields)) {
     const onlyFields = [];
     const output = {};
@@ -258,46 +219,39 @@ function parseFields(fields) {
         if (item.only) {
           onlyFields.push(...item.only.toString().split(','));
         }
-
         Object.assign(output, parseFields(item));
       }
     });
-
     if (onlyFields.length) {
       output.only = onlyFields;
     }
-
     return output;
   }
-
   if (fields.only && typeof fields.only === 'string') {
     fields.only = fields.only.split(',').map(field => field.trim());
   }
-
   if (fields.except && typeof fields.except === 'string') {
     fields.except = fields.except.split(',').map(field => field.trim());
   }
-
   if (fields.appends && typeof fields.appends === 'string') {
     fields.appends = fields.appends.split(',').map(field => field.trim());
   }
-
   return fields;
 }
-
 function mergeFields(defaults, inputs) {
   let fields = {};
   defaults = parseFields(defaults);
   inputs = parseFields(inputs);
-
   if (inputs.only) {
     // 前端提供 only，后端提供 only
     if (defaults.only) {
       fields.only = defaults.only.filter(field => inputs.only.includes(field));
-    } // 前端提供 only，后端提供 except，输出 only 排除 except
+    }
+    // 前端提供 only，后端提供 except，输出 only 排除 except
     else if (defaults.except) {
       fields.only = inputs.only.filter(field => !defaults.except.includes(field));
-    } // 前端提供 only，后端没有提供 only 或 except
+    }
+    // 前端提供 only，后端没有提供 only 或 except
     else {
       fields.only = inputs.only;
     }
@@ -305,23 +259,22 @@ function mergeFields(defaults, inputs) {
     // 前端提供 except，后端提供 only，只输出 only 里排除 except 的字段
     if (defaults.only) {
       fields.only = defaults.only.filter(field => !inputs.except.includes(field));
-    } // 前端提供 except，后端提供 except 或不提供，合并 except
+    }
+    // 前端提供 except，后端提供 except 或不提供，合并 except
     else {
       fields.except = _lodash().default.uniq([...inputs.except, ...(defaults.except || [])]);
     }
-  } // 前端没提供 only 或 except
+  }
+  // 前端没提供 only 或 except
   else {
     fields = defaults;
-  } // 如果前端提供了 appends
-
-
+  }
+  // 如果前端提供了 appends
   if (!_lodash().default.isEmpty(inputs.appends)) {
     fields.appends = _lodash().default.uniq([...inputs.appends, ...(defaults.appends || [])]);
   }
-
   if (!fields.appends) {
     fields.appends = [];
   }
-
   return fields;
 }

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@nocobase/resourcer",
-  "version": "0.9.1-alpha.1",
+  "version": "0.9.2-alpha.1",
   "description": "",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "license": "Apache-2.0",
   "dependencies": {
-    "@nocobase/utils": "0.9.1-alpha.1",
+    "@nocobase/utils": "0.9.2-alpha.1",
     "deepmerge": "^4.2.2",
     "koa-compose": "^4.1.0",
     "lodash": "^4.17.21",
@@ -18,5 +18,5 @@
     "url": "git+https://github.com/nocobase/nocobase.git",
     "directory": "packages/resourcer"
   },
-  "gitHead": "56cb184b00dc383b853015d525bf6e79dea92169"
+  "gitHead": "a4f103eb0144f07205aff7b2a6be8ea6aa1330df"
 }