@nocobase/acl 2.0.0-alpha.52 → 2.0.0-alpha.54

package/lib/acl.js

@@ -196,6 +196,13 @@ const _ACL = class _ACL extends import_events.default {
     if (!aclRole) {
       return null;
     }
+    if (role === "root") {
+      return {
+        resource,
+        action,
+        role
+      };
+    }
     const actionPath = `${rawResourceName ? rawResourceName : resource}:${action}`;
     const snippetAllowed = aclRole.snippetAllowed(actionPath);
     const fixedParams = this.fixedParamsManager.getParams(rawResourceName ? rawResourceName : resource, action);

package/lib/snippet-manager.js

@@ -56,7 +56,12 @@ const _SnippetManager = class _SnippetManager {
     if (snippet.name.includes("*") || snippet.name.endsWith(".")) {
       throw new Error(`Invalid snippet name: ${snippet.name}, name should not include * or end with dot.`);
     }
-    this.snippets.set(snippet.name, snippet);
+    const existed = this.snippets.get(snippet.name);
+    if (existed) {
+      existed.actions = Array.from(/* @__PURE__ */ new Set([...existed.actions, ...snippet.actions]));
+    } else {
+      this.snippets.set(snippet.name, snippet);
+    }
   }
   allow(actionPath, snippetName) {
     const negated = snippetName.startsWith("!");

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@nocobase/acl",
-  "version": "2.0.0-alpha.52",
+  "version": "2.0.0-alpha.54",
   "description": "",
   "license": "AGPL-3.0",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "dependencies": {
-    "@nocobase/resourcer": "2.0.0-alpha.52",
-    "@nocobase/utils": "2.0.0-alpha.52",
+    "@nocobase/resourcer": "2.0.0-alpha.54",
+    "@nocobase/utils": "2.0.0-alpha.54",
     "minimatch": "^5.1.1"
   },
   "repository": {
@@ -15,5 +15,5 @@
     "url": "git+https://github.com/nocobase/nocobase.git",
     "directory": "packages/acl"
   },
-  "gitHead": "b32992d8baeb4ca6616d839ca2f9c023d49476a9"
+  "gitHead": "68c84deaabba0ebec7407bf7245376b8d843449c"
 }