@tachybase/acl 1.3.52 → 1.3.53

package/lib/acl.d.ts

@@ -1,4 +1,5 @@
 import EventEmitter from 'node:events';
+import { Context } from '@tachybase/actions';
 import { Toposort, ToposortOptions } from '@tachybase/utils';
 import { ACLAvailableAction, AvailableActionOptions } from './acl-available-action';
 import { ACLAvailableStrategy, AvailableStrategyOptions } from './acl-available-strategy';
@@ -105,7 +106,7 @@ export declare class ACL extends EventEmitter {
     /**
      * @internal
      */
-    parseJsonTemplate(json: any, ctx: any): Promise<any>;
+    parseJsonTemplate(json: any, ctx: Context): Promise<any>;
     middleware(): (ctx: any, next: any) => Promise<any>;
     /**
      * @internal

package/lib/acl.js

@@ -280,7 +280,7 @@ const _ACL = class _ACL extends import_node_events.default {
       const roleName = ctx.state.currentRole || "anonymous";
       const { resourceName: rawResourceName, actionName } = ctx.action;
       let resourceName = rawResourceName;
-      if (rawResourceName.includes(".")) {
+      if (rawResourceName == null ? void 0 : rawResourceName.includes(".")) {
         resourceName = rawResourceName.split(".").pop();
       }
       if (ctx.getCurrentRepository) {
@@ -308,7 +308,7 @@ const _ACL = class _ACL extends import_node_events.default {
     const roleName = ctx.state.currentRole || "anonymous";
     const { resourceName: rawResourceName, actionName } = ctx.action;
     let resourceName = rawResourceName;
-    if (rawResourceName.includes(".")) {
+    if (rawResourceName == null ? void 0 : rawResourceName.includes(".")) {
       resourceName = rawResourceName.split(".").pop();
     }
     if (ctx.getCurrentRepository) {
@@ -357,18 +357,17 @@ const _ACL = class _ACL extends import_node_events.default {
         const resourcerAction = ctx.action;
         const { resourceName, actionName } = ctx.permission;
         const permission = ctx.permission;
-        ((_a = ctx.log) == null ? void 0 : _a.info) && ctx.log.info("ctx permission", permission);
+        (_a = ctx.logger) == null ? void 0 : _a.info("ctx permission", permission);
         if ((!permission.can || typeof permission.can !== "object") && !permission.skip) {
           ctx.throw(403, "No permissions");
-          return;
         }
         const params = ((_b = permission.can) == null ? void 0 : _b.params) || acl.fixedParamsManager.getParams(resourceName, actionName);
-        ((_c = ctx.log) == null ? void 0 : _c.info) && ctx.log.info("acl params", params);
+        (_c = ctx.logger) == null ? void 0 : _c.info("acl params", params);
         if (params && resourcerAction.mergeParams) {
           const filteredParams = acl.filterParams(ctx, resourceName, params);
           const parsedParams = await acl.parseJsonTemplate(filteredParams, ctx);
           ctx.permission.parsedParams = parsedParams;
-          ((_d = ctx.log) == null ? void 0 : _d.info) && ctx.log.info("acl parsedParams", parsedParams);
+          (_d = ctx.logger) == null ? void 0 : _d.info("acl parsedParams", parsedParams);
           ctx.permission.rawParams = import_lodash.default.cloneDeep(resourcerAction.params);
           resourcerAction.mergeParams(parsedParams, {
             appends: /* @__PURE__ */ __name((x, y) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tachybase/acl",
-  "version": "1.3.52",
+  "version": "1.3.53",
   "description": "",
   "license": "Apache-2.0",
   "main": "./lib/index.js",
@@ -9,11 +9,13 @@
     "koa-compose": "^4.1.0",
     "lodash": "4.17.21",
     "minimatch": "^5.1.6",
-    "@tachybase/resourcer": "1.3.52",
-    "@tachybase/utils": "1.3.52"
+    "@tachybase/resourcer": "1.3.53",
+    "@tachybase/actions": "1.3.53",
+    "@tachybase/utils": "1.3.53"
   },
   "devDependencies": {
     "@types/lodash": "4.17.20",
+    "@types/minimatch": "^6.0.0",
     "@types/node": "20.17.10"
   }
 }