@nocobase/resourcer 0.7.7-alpha.1 → 0.8.0-alpha.5

package/lib/action.d.ts

@@ -1,7 +1,7 @@
+import { MergeStrategies } from './assign';
+import Middleware, { MiddlewareType } from './middleware';
 import Resource from './resource';
 import { HandlerType } from './resourcer';
-import Middleware, { MiddlewareType } from './middleware';
-import { MergeStrategies } from './assign';
 export declare type ActionType = string | HandlerType | ActionOptions;
 export declare type DefaultActionType = 'list' | 'create' | 'get' | 'update' | 'destroy' | 'set' | 'add' | 'remove';
 export declare type ActionName = DefaultActionType | Omit<String, DefaultActionType>;

package/lib/action.js

@@ -5,10 +5,10 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = exports.Action = void 0;
 
-function _lodash() {
-  const data = _interopRequireDefault(require("lodash"));
+function _utils() {
+  const data = require("@nocobase/utils");
 
-  _lodash = function _lodash() {
+  _utils = function _utils() {
     return data;
   };
 
@@ -25,20 +25,20 @@ function _koaCompose() {
   return data;
 }
 
-function _utils() {
-  const data = require("@nocobase/utils");
+function _lodash() {
+  const data = _interopRequireDefault(require("lodash"));
 
-  _utils = function _utils() {
+  _lodash = function _lodash() {
     return data;
   };
 
   return data;
 }
 
-var _middleware = _interopRequireDefault(require("./middleware"));
-
 var _assign = require("./assign");
 
+var _middleware = _interopRequireDefault(require("./middleware"));
+
 const _excluded = ["middleware", "middlewares", "handler"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -155,7 +155,8 @@ class Action {
   }
 
   getHandlers() {
-    return [...this.resource.resourcer.getMiddlewares(), ...this.getMiddlewareHandlers(), this.getHandler()].filter(Boolean);
+    const handers = [...this.resource.resourcer.getMiddlewares(), ...this.getMiddlewareHandlers(), this.getHandler()].filter(Boolean);
+    return handers;
   }
 
   execute(context, next) {

package/lib/resource.js

@@ -45,7 +45,11 @@ class Resource {
     const middleware = options.middleware,
           middlewares = options.middlewares,
           _options$actions = options.actions,
-          actions = _options$actions === void 0 ? {} : _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);
@@ -70,11 +74,6 @@ class Resource {
       _iterator.f();
     }
 
-    const _options$only = options.only,
-          only = _options$only === void 0 ? [] : _options$only,
-          _options$except = options.except,
-          except = _options$except === void 0 ? [] : _options$except;
-
     if (except.length > 0) {
       excludes = except;
     } else if (only.length > 0) {

package/lib/resourcer.d.ts

@@ -1,3 +1,4 @@
+import { Toposort, ToposortOptions } from '@nocobase/utils';
 import Action, { ActionName } from './action';
 import Resource, { ResourceOptions } from './resource';
 import { ParsedParams } from './utils';
@@ -129,7 +130,7 @@ export declare class Resourcer {
     protected handlers: Map<ActionName, any>;
     protected actionHandlers: Map<ActionName, any>;
     protected middlewareHandlers: Map<string, any>;
-    protected middlewares: any[];
+    protected middlewares: Toposort<any>;
     readonly options: ResourcerOptions;
     constructor(options?: ResourcerOptions);
     /**
@@ -150,6 +151,7 @@ export declare class Resourcer {
      */
     define(options: ResourceOptions): Resource;
     isDefined(name: string): boolean;
+    removeResource(name: any): boolean;
     registerAction(name: ActionName, handler: HandlerType): void;
     registerActions(handlers: Handlers): void;
     /**
@@ -164,8 +166,8 @@ export declare class Resourcer {
     getResource(name: string): Resource;
     getAction(name: string, action: ActionName): Action;
     getMiddlewares(): any[];
-    use(middlewares: HandlerType | HandlerType[]): void;
-    restApiMiddleware(options?: KoaMiddlewareOptions): (ctx: ResourcerContext, next: () => Promise<any>) => Promise<any>;
+    use(middlewares: HandlerType | HandlerType[], options?: ToposortOptions): void;
+    restApiMiddleware({ prefix, accessors }?: KoaMiddlewareOptions): (ctx: ResourcerContext, next: () => Promise<any>) => Promise<any>;
     middleware(options?: KoaMiddlewareOptions): (ctx: ResourcerContext, next: () => Promise<any>) => Promise<any>;
     /**
      * 实验性 API

package/lib/resourcer.js

@@ -5,6 +5,16 @@ Object.defineProperty(exports, "__esModule", {
 });
 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"));
 
@@ -45,16 +55,6 @@ function _pathToRegexp() {
   return data;
 }
 
-function _utils() {
-  const data = require("@nocobase/utils");
-
-  _utils = function _utils() {
-    return data;
-  };
-
-  return data;
-}
-
 var _resource = _interopRequireDefault(require("./resource"));
 
 var _utils2 = require("./utils");
@@ -92,9 +92,10 @@ class Resourcer {
     this.handlers = new Map();
     this.actionHandlers = new Map();
     this.middlewareHandlers = new Map();
-    this.middlewares = [];
+    this.middlewares = void 0;
     this.options = void 0;
     this.options = options;
+    this.middlewares = new (_utils().Toposort)();
   }
   /**
    * 载入指定目录下的 resource 配置（配置的文件驱动）
@@ -144,6 +145,10 @@ class Resourcer {
     return this.resources.has(name);
   }
 
+  removeResource(name) {
+    return this.resources.delete(name);
+  }
+
   registerAction(name, handler) {
     this.registerActionHandler(name, handler);
   }
@@ -198,24 +203,20 @@ class Resourcer {
   }
 
   getMiddlewares() {
-    return this.middlewares;
+    return this.middlewares.nodes;
   }
 
-  use(middlewares) {
-    if (typeof middlewares === 'function') {
-      this.middlewares.push(middlewares);
-    } else if (Array.isArray(middlewares)) {
-      this.middlewares.push(...middlewares);
-    }
+  use(middlewares, options = {}) {
+    this.middlewares.add(middlewares, options);
   }
 
-  restApiMiddleware(options = {}) {
+  restApiMiddleware({
+    prefix,
+    accessors
+  } = {}) {
     var _this = this;
 
-    const prefix = options.prefix,
-          accessors = options.accessors;
-
-    const restApiMiddleware = /*#__PURE__*/function () {
+    return /*#__PURE__*/function () {
       var _ref = _asyncToGenerator(function* (ctx, next) {
         ctx.resourcer = _this;
         let params = (0, _utils2.parseRequest)({
@@ -272,12 +273,10 @@ class Resourcer {
         }
       });
 
-      return function restApiMiddleware(_x, _x2) {
+      return function (_x, _x2) {
         return _ref.apply(this, arguments);
       };
     }();
-
-    return restApiMiddleware;
   }
 
   middleware(options = {}) {

package/package.json

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