@nocobase/resourcer 1.7.0-beta.8 → 1.8.0-beta.1

package/lib/resourcer.js

@@ -227,7 +227,7 @@ const _ResourceManager = class _ResourceManager {
         ctx.action.resourceName = params.associatedName ? `${params.associatedName}.${params.resourceName}` : params.resourceName;
         ctx.action.params.filterByTk = params.resourceIndex;
         const query = (0, import_utils2.parseQuery)(ctx.request.querystring);
-        if ((0, import_path_to_regexp.pathToRegexp)("/resourcer/{:associatedName.}?:resourceName{\\::actionName}").test(ctx.request.path)) {
+        if ((0, import_path_to_regexp.pathToRegexp)("/resourcer/:rest(.*)").test(ctx.request.path)) {
           ctx.action.mergeParams({
             ...query,
             ...params,

package/lib/utils.js

@@ -67,17 +67,24 @@ function parseRequest(request, options = {}) {
     ...options.accessors || {}
   };
   const keys = [];
-  const regexp = (0, import_path_to_regexp.pathToRegexp)("/resourcer/{:associatedName.}?:resourceName{\\::actionName}", keys);
+  const regexp = (0, import_path_to_regexp.pathToRegexp)("/resourcer/:rest(.*)", keys);
   const reqPath = decodeURI(request.path);
   const matches = regexp.exec(reqPath);
   if (matches) {
     const params2 = {};
-    keys.forEach((obj, index) => {
-      if (matches[index + 1] === void 0) {
-        return;
+    const [resource, action] = matches[1].split(":");
+    const [res1, res2] = resource.split(".");
+    if (res1) {
+      if (res2) {
+        params2["associatedName"] = res1;
+        params2["resourceName"] = res2;
+      } else {
+        params2["resourceName"] = res1;
       }
-      params2[obj.name] = matches[index + 1];
-    });
+    }
+    if (action) {
+      params2["actionName"] = action;
+    }
     return params2;
   }
   const defaults = {

package/package.json

@@ -1,16 +1,16 @@
 {
   "name": "@nocobase/resourcer",
-  "version": "1.7.0-beta.8",
+  "version": "1.8.0-beta.1",
   "description": "",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "license": "AGPL-3.0",
   "dependencies": {
-    "@nocobase/utils": "1.7.0-beta.8",
+    "@nocobase/utils": "1.8.0-beta.1",
     "deepmerge": "^4.2.2",
     "koa-compose": "^4.1.0",
     "lodash": "^4.17.21",
-    "path-to-regexp": "6.2.2",
+    "path-to-regexp": "^6.3.0",
     "qs": "^6.9.4"
   },
   "repository": {
@@ -18,5 +18,5 @@
     "url": "git+https://github.com/nocobase/nocobase.git",
     "directory": "packages/resourcer"
   },
-  "gitHead": "9ad35ee90db98d95dfa660645d155f4f4e81b47c"
+  "gitHead": "103935669123174f2942247202e3d9ff15f0d4ed"
 }