@nocobase/resourcer 0.7.4-alpha.7 → 0.7.5-alpha.1

package/lib/action.d.ts

@@ -182,7 +182,7 @@ export declare class Action {
     getOptions(): ActionOptions;
     setName(name: ActionName): this;
     getName(): ActionName;
-    getMiddlewareHandlers(): any[];
+    getMiddlewareHandlers(): ((ctx: any, next: any) => Promise<void>)[];
     getHandler(): any;
     getHandlers(): any[];
     execute(context: any, next?: any): Promise<void>;

package/lib/action.js

@@ -25,7 +25,15 @@ function _koaCompose() {
   return data;
 }
 
-var _utils = require("./utils");
+function _utils() {
+  const data = require("@nocobase/utils");
+
+  _utils = function _utils() {
+    return data;
+  };
+
+  return data;
+}
 
 var _middleware = _interopRequireDefault(require("./middleware"));
 
@@ -61,7 +69,7 @@ class Action {
     this.resourceName = void 0;
     this.resourceOf = void 0;
     this.middlewares = [];
-    options = (0, _utils.requireModule)(options);
+    options = (0, _utils().requireModule)(options);
 
     if (typeof options === 'function') {
       options = {
@@ -137,7 +145,7 @@ class Action {
   }
 
   getHandler() {
-    const handler = (0, _utils.requireModule)(this.handler || this.resource.resourcer.getRegisteredHandler(this.name));
+    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!');

package/lib/assign.js

@@ -49,6 +49,10 @@ function getKeys(target) {
 const mergeStrategies = new Map();
 exports.mergeStrategies = mergeStrategies;
 mergeStrategies.set('overwrite', (_, y) => {
+  if (typeof y === 'string') {
+    y = y.split(',');
+  }
+
   return y;
 });
 mergeStrategies.set('andMerge', (x, y) => {

package/lib/middleware.d.ts

@@ -15,15 +15,18 @@ export interface MiddlewareOptions {
 }
 export declare class Middleware {
     protected options: MiddlewareOptions;
+    private middlewares;
     constructor(options: MiddlewareOptions | Function);
-    getHandler(): any;
+    getHandler(): (ctx: any, next: any) => Promise<void>;
+    use(middleware: HandlerType): void;
+    disuse(middleware: HandlerType): void;
     canAccess(name: ActionName): boolean;
     static toInstanceArray(middlewares: any): Middleware[];
 }
 export default Middleware;
-export declare class MiddlewareManager {
-    protected middlewares: HandlerType[];
-    compose(): (ctx: any, next: any) => Promise<void>;
-    use(middleware: HandlerType): void;
-    unuse(middleware: HandlerType): void;
-}
+export declare function branch(map: {
+    [key: string]: HandlerType;
+}, reducer: (ctx: any) => string, options?: {
+    keyNotFound?(ctx: any, next: any): void;
+    handlerNotSet?(ctx: any, next: any): void;
+}): HandlerType;

package/lib/middleware.js

@@ -3,7 +3,9 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = exports.MiddlewareManager = exports.Middleware = void 0;
+exports.Middleware = void 0;
+exports.branch = branch;
+exports.default = void 0;
 
 function _koaCompose() {
   const data = _interopRequireDefault(require("koa-compose"));
@@ -15,14 +17,23 @@ function _koaCompose() {
   return data;
 }
 
-var _utils = require("./utils");
+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;
-    options = (0, _utils.requireModule)(options);
+    this.middlewares = [];
+    options = (0, _utils().requireModule)(options);
 
     if (typeof options === 'function') {
       this.options = {
@@ -34,13 +45,21 @@ class Middleware {
   }
 
   getHandler() {
-    const handler = (0, _utils.requireModule)(this.options.handler);
+    const handler = (0, _utils().requireModule)(this.options.handler);
 
     if (typeof handler !== 'function') {
       throw new Error('Handler must be a function!');
     }
 
-    return handler;
+    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) {
@@ -93,23 +112,20 @@ exports.Middleware = Middleware;
 var _default = Middleware;
 exports.default = _default;
 
-class MiddlewareManager {
-  constructor() {
-    this.middlewares = [];
-  }
-
-  compose() {
-    return (ctx, next) => (0, _koaCompose().default)(this.middlewares)(ctx, next);
-  }
+function branch(map = {}, reducer, options = {}) {
+  return (ctx, next) => {
+    const key = reducer(ctx);
 
-  use(middleware) {
-    this.middlewares.push(middleware);
-  }
+    if (!key) {
+      return options.keyNotFound ? options.keyNotFound(ctx, next) : ctx.throw(404);
+    }
 
-  unuse(middleware) {
-    this.middlewares.splice(this.middlewares.indexOf(middleware), 1);
-  }
+    const handler = map[key];
 
-}
+    if (!handler) {
+      return options.handlerNotSet ? options.handlerNotSet(ctx, next) : ctx.throw(404);
+    }
 
-exports.MiddlewareManager = MiddlewareManager;
+    return handler(ctx, next);
+  };
+}

package/lib/resourcer.js

@@ -45,9 +45,19 @@ function _pathToRegexp() {
   return data;
 }
 
+function _utils() {
+  const data = require("@nocobase/utils");
+
+  _utils = function _utils() {
+    return data;
+  };
+
+  return data;
+}
+
 var _resource = _interopRequireDefault(require("./resource"));
 
-var _utils = require("./utils");
+var _utils2 = require("./utils");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -109,7 +119,7 @@ class Resourcer {
 
     const resources = new Map();
     files.forEach(file => {
-      const options = (0, _utils.requireModule)(file);
+      const options = (0, _utils().requireModule)(file);
       const table = this.define(typeof options === 'function' ? options(this) : options);
       resources.set(table.getName(), table);
     });
@@ -208,7 +218,7 @@ class Resourcer {
     const restApiMiddleware = /*#__PURE__*/function () {
       var _ref = _asyncToGenerator(function* (ctx, next) {
         ctx.resourcer = _this;
-        let params = (0, _utils.parseRequest)({
+        let params = (0, _utils2.parseRequest)({
           path: ctx.request.path,
           method: ctx.request.method
         }, {
@@ -221,11 +231,11 @@ class Resourcer {
         }
 
         try {
-          const resource = _this.getResource((0, _utils.getNameByParams)(params)); // 为关系资源时，暂时需要再执行一遍 parseRequest
+          const resource = _this.getResource((0, _utils2.getNameByParams)(params)); // 为关系资源时，暂时需要再执行一遍 parseRequest
 
 
           if (resource.options.type && resource.options.type !== 'single') {
-            params = (0, _utils.parseRequest)({
+            params = (0, _utils2.parseRequest)({
               path: ctx.request.path,
               method: ctx.request.method,
               type: resource.options.type
@@ -240,13 +250,13 @@ class Resourcer {
           } // action 需要 clone 之后再赋给 ctx
 
 
-          ctx.action = _this.getAction((0, _utils.getNameByParams)(params), params.actionName).clone();
+          ctx.action = _this.getAction((0, _utils2.getNameByParams)(params), params.actionName).clone();
           ctx.action.setContext(ctx);
           ctx.action.actionName = params.actionName;
           ctx.action.resourceOf = params.associatedIndex;
           ctx.action.resourceName = params.associatedName ? `${params.associatedName}.${params.resourceName}` : params.resourceName;
           ctx.action.params.filterByTk = params.resourceIndex;
-          const query = (0, _utils.parseQuery)(ctx.request.querystring);
+          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));

package/lib/utils.d.ts

@@ -25,7 +25,6 @@ export interface ParsedParams {
 }
 export declare function getNameByParams(params: ParsedParams): string;
 export declare function parseRequest(request: ParseRequest, options?: ParseOptions): ParsedParams | false;
-export declare function requireModule(module: any): any;
 export declare function parseQuery(input: string): any;
 export declare function parseFields(fields: any): any;
 export declare function mergeFields(defaults: any, inputs: any): any;

package/lib/utils.js

@@ -8,7 +8,6 @@ exports.mergeFields = mergeFields;
 exports.parseFields = parseFields;
 exports.parseQuery = parseQuery;
 exports.parseRequest = parseRequest;
-exports.requireModule = requireModule;
 
 function _lodash() {
   const data = _interopRequireDefault(require("lodash"));
@@ -216,18 +215,6 @@ function parseRequest(request, options = {}) {
   return params;
 }
 
-function requireModule(module) {
-  if (typeof module === 'string') {
-    module = require(module);
-  }
-
-  if (typeof module !== 'object') {
-    return module;
-  }
-
-  return module.__esModule ? module.default : module;
-}
-
 function parseQuery(input) {
   // 自带 query 处理的不太给力，需要用 qs 转一下
   const query = _qs().default.parse(input, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/resourcer",
-  "version": "0.7.4-alpha.7",
+  "version": "0.7.5-alpha.1",
   "description": "",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
@@ -12,6 +12,7 @@
     }
   ],
   "dependencies": {
+    "@nocobase/utils": "0.7.5-alpha.1",
     "deepmerge": "^4.2.2",
     "koa-compose": "^4.1.0",
     "lodash": "^4.17.21",
@@ -23,5 +24,5 @@
     "url": "git+https://github.com/nocobase/nocobase.git",
     "directory": "packages/resourcer"
   },
-  "gitHead": "77f22e6da464d19be111835316faf4b94cd80413"
+  "gitHead": "f6eb27b68185bb0c0b4c2cfca1df84205a9b9173"
 }