@nocobase/resourcer 0.19.0-alpha.9 → 0.20.0-alpha.2

package/lib/resourcer.d.ts

@@ -8,6 +8,7 @@ export interface ResourcerContext {
     [key: string]: any;
 }
 export interface KoaMiddlewareOptions {
+    skipIfDataSourceExists?: boolean;
     /**
      * 前缀
      */
@@ -167,7 +168,7 @@ export declare class Resourcer {
     getAction(name: string, action: ActionName): Action;
     getMiddlewares(): any[];
     use(middlewares: HandlerType | HandlerType[], options?: ToposortOptions): void;
-    restApiMiddleware({ prefix, accessors }?: KoaMiddlewareOptions): (ctx: ResourcerContext, next: () => Promise<any>) => Promise<any>;
+    restApiMiddleware({ prefix, accessors, skipIfDataSourceExists }?: KoaMiddlewareOptions): (ctx: ResourcerContext, next: () => Promise<any>) => Promise<any>;
     middleware(options?: KoaMiddlewareOptions): (ctx: ResourcerContext, next: () => Promise<any>) => Promise<any>;
     /**
      * 实验性 API

package/lib/resourcer.js

@@ -137,8 +137,14 @@ const _Resourcer = class _Resourcer {
   use(middlewares, options = {}) {
     this.middlewares.add(middlewares, options);
   }
-  restApiMiddleware({ prefix, accessors } = {}) {
+  restApiMiddleware({ prefix, accessors, skipIfDataSourceExists = false } = {}) {
     return async (ctx, next) => {
+      if (skipIfDataSourceExists) {
+        const dataSource = ctx.get("x-data-source");
+        if (dataSource) {
+          return next();
+        }
+      }
       ctx.resourcer = this;
       let params = (0, import_utils2.parseRequest)(
         {
@@ -193,6 +199,7 @@ const _Resourcer = class _Resourcer {
         }
         return (0, import_koa_compose.default)(ctx.action.getHandlers())(ctx, next);
       } catch (error) {
+        console.log(error);
         return next();
       }
     };

package/lib/utils.d.ts

@@ -2,6 +2,7 @@ import { ResourceType } from './resource';
 export interface ParseRequest {
     path: string;
     method: string;
+    namespace?: string;
     type?: ResourceType;
 }
 export interface ParseOptions {

package/lib/utils.js

@@ -59,7 +59,8 @@ function parseRequest(request, options = {}) {
   };
   const keys = [];
   const regexp = (0, import_path_to_regexp.pathToRegexp)("/resourcer/{:associatedName.}?:resourceName{\\::actionName}", keys);
-  const matches = regexp.exec(request.path);
+  const reqPath = decodeURI(request.path);
+  const matches = regexp.exec(reqPath);
   if (matches) {
     const params2 = {};
     keys.forEach((obj, index) => {
@@ -160,7 +161,7 @@ function parseRequest(request, options = {}) {
   for (const path in defaults[type]) {
     const keys2 = [];
     const regexp2 = (0, import_path_to_regexp.pathToRegexp)(`${prefix}${path}`, keys2, {});
-    const matches2 = regexp2.exec(request.path);
+    const matches2 = regexp2.exec(reqPath);
     if (!matches2) {
       continue;
     }

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@nocobase/resourcer",
-  "version": "0.19.0-alpha.9",
+  "version": "0.20.0-alpha.2",
   "description": "",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "license": "Apache-2.0",
   "dependencies": {
-    "@nocobase/utils": "0.19.0-alpha.9",
+    "@nocobase/utils": "0.20.0-alpha.2",
     "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": "975f9c58a1995df6a8d7a4d191a0dc4a9769ebc5"
+  "gitHead": "6fb885dfc3554e4b0f29e9a7a1eecbbe85d0eebb"
 }