@nocobase/acl 0.20.0-alpha.8 → 0.21.0-alpha.1

package/lib/acl.d.ts

@@ -37,11 +37,29 @@ interface CanArgs {
     ctx?: any;
 }
 export declare class ACL extends EventEmitter {
+    /**
+     * @internal
+     */
     availableStrategy: Map<string, ACLAvailableStrategy>;
+    /**
+     * @internal
+     */
     allowManager: AllowManager;
+    /**
+     * @internal
+     */
     snippetManager: SnippetManager;
+    /**
+     * @internal
+     */
     roles: Map<string, ACLRole>;
+    /**
+     * @internal
+     */
     actionAlias: Map<string, string>;
+    /**
+     * @internal
+     */
     configResources: string[];
     protected availableActions: Map<string, ACLAvailableAction>;
     protected fixedParamsManager: FixedParamsManager;
@@ -50,8 +68,17 @@ export declare class ACL extends EventEmitter {
     define(options: DefineOptions): ACLRole;
     getRole(name: string): ACLRole;
     removeRole(name: string): boolean;
+    /**
+     * @internal
+     */
     registerConfigResources(names: string[]): void;
+    /**
+     * @internal
+     */
     registerConfigResource(name: string): void;
+    /**
+     * @internal
+     */
     isConfigResource(name: string): boolean;
     setAvailableAction(name: string, options?: AvailableActionOptions): void;
     getAvailableAction(name: string): ACLAvailableAction;
@@ -59,15 +86,30 @@ export declare class ACL extends EventEmitter {
     setAvailableStrategy(name: string, options: AvailableStrategyOptions): void;
     beforeGrantAction(listener?: Listener): void;
     can(options: CanArgs): CanResult | null;
+    /**
+     * @internal
+     */
     resolveActionAlias(action: string): string;
     use(fn: any, options?: ToposortOptions): void;
     allow(resourceName: string, actionNames: string[] | string, condition?: string | ConditionFunc): void;
+    /**
+     * @deprecated
+     */
     skip(resourceName: string, actionNames: string[] | string, condition?: string | ConditionFunc): void;
+    /**
+     * @internal
+     */
     parseJsonTemplate(json: any, ctx: any): Promise<any>;
     middleware(): (ctx: any, next: any) => Promise<void>;
+    /**
+     * @internal
+     */
     getActionParams(ctx: any): Promise<void>;
     addFixedParams(resource: string, action: string, merger: Merger): void;
     registerSnippet(snippet: SnippetOptions): void;
+    /**
+     * @internal
+     */
     filterParams(ctx: any, resourceName: any, params: any): any;
     protected addCoreMiddleware(): void;
     protected isAvailableAction(actionName: string): boolean;

package/lib/acl.js

@@ -42,11 +42,29 @@ var import_allow_manager = require("./allow-manager");
 var import_fixed_params_manager = __toESM(require("./fixed-params-manager"));
 var import_snippet_manager = __toESM(require("./snippet-manager"));
 const _ACL = class _ACL extends import_events.default {
+  /**
+   * @internal
+   */
   availableStrategy = /* @__PURE__ */ new Map();
+  /**
+   * @internal
+   */
   allowManager = new import_allow_manager.AllowManager(this);
+  /**
+   * @internal
+   */
   snippetManager = new import_snippet_manager.default();
+  /**
+   * @internal
+   */
   roles = /* @__PURE__ */ new Map();
+  /**
+   * @internal
+   */
   actionAlias = /* @__PURE__ */ new Map();
+  /**
+   * @internal
+   */
   configResources = [];
   availableActions = /* @__PURE__ */ new Map();
   fixedParamsManager = new import_fixed_params_manager.default();
@@ -95,12 +113,21 @@ const _ACL = class _ACL extends import_events.default {
   removeRole(name) {
     return this.roles.delete(name);
   }
+  /**
+   * @internal
+   */
   registerConfigResources(names) {
     names.forEach((name) => this.registerConfigResource(name));
   }
+  /**
+   * @internal
+   */
   registerConfigResource(name) {
     this.configResources.push(name);
   }
+  /**
+   * @internal
+   */
   isConfigResource(name) {
     return this.configResources.includes(name);
   }
@@ -133,9 +160,6 @@ const _ACL = class _ACL extends import_events.default {
       return null;
     }
     const snippetAllowed = aclRole.snippetAllowed(`${resource}:${action}`);
-    if (snippetAllowed === false) {
-      return null;
-    }
     const fixedParams = this.fixedParamsManager.getParams(resource, action);
     const mergeParams = /* @__PURE__ */ __name((result) => {
       const params = result["params"] || {};
@@ -178,6 +202,9 @@ const _ACL = class _ACL extends import_events.default {
     }
     return null;
   }
+  /**
+   * @internal
+   */
   resolveActionAlias(action) {
     return this.actionAlias.get(action) ? this.actionAlias.get(action) : action;
   }
@@ -190,6 +217,9 @@ const _ACL = class _ACL extends import_events.default {
   allow(resourceName, actionNames, condition) {
     return this.skip(resourceName, actionNames, condition);
   }
+  /**
+   * @deprecated
+   */
   skip(resourceName, actionNames, condition) {
     if (!Array.isArray(actionNames)) {
       actionNames = [actionNames];
@@ -198,6 +228,9 @@ const _ACL = class _ACL extends import_events.default {
       this.allowManager.allow(resourceName, actionName, condition);
     }
   }
+  /**
+   * @internal
+   */
   async parseJsonTemplate(json, ctx) {
     var _a, _b, _c, _d, _e;
     if (json.filter) {
@@ -235,6 +268,9 @@ const _ACL = class _ACL extends import_events.default {
       return (0, import_koa_compose.default)(acl.middlewares.nodes)(ctx, next);
     }, "ACLMiddleware");
   }
+  /**
+   * @internal
+   */
   async getActionParams(ctx) {
     const roleName = ctx.state.currentRole || "anonymous";
     const { resourceName, actionName } = ctx.action;
@@ -257,6 +293,9 @@ const _ACL = class _ACL extends import_events.default {
   registerSnippet(snippet) {
     this.snippetManager.register(snippet);
   }
+  /**
+   * @internal
+   */
   filterParams(ctx, resourceName, params) {
     var _a;
     if ((_a = params == null ? void 0 : params.filter) == null ? void 0 : _a.createdById) {

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@nocobase/acl",
-  "version": "0.20.0-alpha.8",
+  "version": "0.21.0-alpha.1",
   "description": "",
   "license": "Apache-2.0",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "dependencies": {
-    "@nocobase/resourcer": "0.20.0-alpha.8",
-    "@nocobase/utils": "0.20.0-alpha.8",
+    "@nocobase/resourcer": "0.21.0-alpha.1",
+    "@nocobase/utils": "0.21.0-alpha.1",
     "minimatch": "^5.1.1"
   },
   "repository": {
@@ -15,5 +15,5 @@
     "url": "git+https://github.com/nocobase/nocobase.git",
     "directory": "packages/acl"
   },
-  "gitHead": "39ebc1cefe5a826aecf0b14d73530dfa5f9c2b1c"
+  "gitHead": "afd2f3d1341b85ea9daa7b2667dd4ace1fafb7ff"
 }