@nocobase/acl 2.0.0-beta.9 → 2.0.1

package/lib/acl.d.ts

@@ -13,7 +13,7 @@ import { ACLAvailableAction, AvailableActionOptions } from './acl-available-acti
 import { ACLAvailableStrategy, AvailableStrategyOptions } from './acl-available-strategy';
 import { ACLRole, ResourceActionsOptions, RoleActionParams } from './acl-role';
 import { AllowManager, ConditionFunc } from './allow-manager';
-import FixedParamsManager, { Merger } from './fixed-params-manager';
+import FixedParamsManager, { Merger, GeneralMerger } from './fixed-params-manager';
 import SnippetManager, { SnippetOptions } from './snippet-manager';
 export interface CanResult {
     role: string;
@@ -113,6 +113,7 @@ export declare class ACL extends EventEmitter {
      * @internal
      */
     getActionParams(ctx: any): Promise<void>;
+    addGeneralFixedParams(merger: GeneralMerger): void;
     addFixedParams(resource: string, action: string, merger: Merger): void;
     registerSnippet(snippet: SnippetOptions): void;
     /**

package/lib/acl.js

@@ -368,6 +368,9 @@ const _ACL = class _ACL extends import_events.default {
     await (0, import_koa_compose.default)(this.middlewares.nodes)(ctx, async () => {
     });
   }
+  addGeneralFixedParams(merger) {
+    this.fixedParamsManager.addGeneralParams(merger);
+  }
   addFixedParams(resource, action, merger) {
     this.fixedParamsManager.addParams(resource, action, merger);
   }

package/lib/fixed-params-manager.d.ts

@@ -7,10 +7,13 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 export type Merger = () => object;
+export type GeneralMerger = (resource: string, action: string) => object;
 export type ActionPath = string;
 export default class FixedParamsManager {
     merger: Map<string, Merger[]>;
+    generalMergers: Array<GeneralMerger>;
     addParams(resource: string, action: string, merger: Merger): void;
+    addGeneralParams(merger: GeneralMerger): void;
     getParamsMerger(resource: string, action: string): Merger[];
     protected getActionPath(resource: string, action: string): string;
     getParams(resource: string, action: string, extraParams?: any): {};

package/lib/fixed-params-manager.js

@@ -34,10 +34,14 @@ var import_utils = require("@nocobase/utils");
 const SPLIT = ":";
 const _FixedParamsManager = class _FixedParamsManager {
   merger = /* @__PURE__ */ new Map();
+  generalMergers = [];
   addParams(resource, action, merger) {
     const path = this.getActionPath(resource, action);
     this.merger.set(path, [...this.getParamsMerger(resource, action), merger]);
   }
+  addGeneralParams(merger) {
+    this.generalMergers.push(merger);
+  }
   getParamsMerger(resource, action) {
     const path = this.getActionPath(resource, action);
     return this.merger.get(path) || [];
@@ -47,6 +51,9 @@ const _FixedParamsManager = class _FixedParamsManager {
   }
   getParams(resource, action, extraParams = {}) {
     const results = {};
+    for (const merger of this.generalMergers) {
+      _FixedParamsManager.mergeParams(results, merger(resource, action));
+    }
     for (const merger of this.getParamsMerger(resource, action)) {
       _FixedParamsManager.mergeParams(results, merger());
     }

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@nocobase/acl",
-  "version": "2.0.0-beta.9",
+  "version": "2.0.1",
   "description": "",
   "license": "AGPL-3.0",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "dependencies": {
-    "@nocobase/resourcer": "2.0.0-beta.9",
-    "@nocobase/utils": "2.0.0-beta.9",
+    "@nocobase/resourcer": "2.0.1",
+    "@nocobase/utils": "2.0.1",
     "minimatch": "^5.1.1"
   },
   "repository": {
@@ -15,5 +15,5 @@
     "url": "git+https://github.com/nocobase/nocobase.git",
     "directory": "packages/acl"
   },
-  "gitHead": "36ef50291e22fe1024c819b8748d51a59a5ea4f8"
+  "gitHead": "e41d74b50e2025555dc71969a20fee180b8d0d0d"
 }