@nocobase/plugin-acl 0.13.0-alpha.1 → 0.13.0-alpha.10

package/dist/client/index.js

@@ -1,11 +1 @@
-(function(global, factory) {
-  typeof exports === "object" && typeof module !== "undefined" ? factory(exports, require("@nocobase/client")) : typeof define === "function" && define.amd ? define(["exports", "@nocobase/client"], factory) : (global = typeof globalThis !== "undefined" ? globalThis : global || self, factory(global["@nocobase/plugin-acl"] = {}, global["@nocobase/client"]));
-})(this, function(exports2, client) {
-  "use strict";
-  class AclPlugin extends client.Plugin {
-    async load() {
-    }
-  }
-  exports2.default = AclPlugin;
-  Object.defineProperties(exports2, { __esModule: { value: true }, [Symbol.toStringTag]: { value: "Module" } });
-});
+(function(e,n){typeof exports=="object"&&typeof module!="undefined"?n(exports,require("@nocobase/client")):typeof define=="function"&&define.amd?define(["exports","@nocobase/client"],n):(e=typeof globalThis!="undefined"?globalThis:e||self,n(e["@nocobase/plugin-acl"]={},e["@nocobase/client"]))})(this,function(e,n){"use strict";var c=(e,n,o)=>new Promise((u,l)=>{var d=i=>{try{t(o.next(i))}catch(s){l(s)}},f=i=>{try{t(o.throw(i))}catch(s){l(s)}},t=i=>i.done?u(i.value):Promise.resolve(i.value).then(d,f);t((o=o.apply(e,n)).next())});class o extends n.Plugin{load(){return c(this,null,function*(){})}}e.default=o,Object.defineProperties(e,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}})});

package/dist/index.js

@@ -1,18 +1,39 @@
-'use strict';
-
-Object.defineProperty(exports, '__esModule', { value: true });
-
-var server = require('./server');
-
-
-
-Object.defineProperty(exports, 'default', {
-  enumerable: true,
-  get: function () { return server__namespace.default; }
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var src_exports = {};
+__export(src_exports, {
+  default: () => import_server.default
 });
-Object.keys(server).forEach(function (k) {
-  if (k !== 'default' && !Object.prototype.hasOwnProperty.call(exports, k)) Object.defineProperty(exports, k, {
-    enumerable: true,
-    get: function () { return server[k]; }
-  });
+module.exports = __toCommonJS(src_exports);
+__reExport(src_exports, require("./server"), module.exports);
+var import_server = __toESM(require("./server"));
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  ...require("./server")
 });

package/dist/server/actions/available-actions.js

@@ -1,5 +1,25 @@
-'use strict';
-
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var available_actions_exports = {};
+__export(available_actions_exports, {
+  availableActionResource: () => availableActionResource
+});
+module.exports = __toCommonJS(available_actions_exports);
 const availableActionResource = {
   name: "availableActions",
   actions: {
@@ -16,5 +36,7 @@ const availableActionResource = {
     }
   }
 };
-
-exports.availableActionResource = availableActionResource;
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  availableActionResource
+});

package/dist/server/actions/role-check.js

@@ -1,5 +1,25 @@
-'use strict';
-
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var role_check_exports = {};
+__export(role_check_exports, {
+  checkAction: () => checkAction
+});
+module.exports = __toCommonJS(role_check_exports);
 const map2obj = (map) => {
   const obj = {};
   for (const [key, value] of map) {
@@ -41,5 +61,7 @@ async function checkAction(ctx, next) {
   };
   await next();
 }
-
-exports.checkAction = checkAction;
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  checkAction
+});

package/dist/server/actions/role-collections.js

@@ -1,5 +1,25 @@
-'use strict';
-
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var role_collections_exports = {};
+__export(role_collections_exports, {
+  roleCollectionsResource: () => roleCollectionsResource
+});
+module.exports = __toCommonJS(role_collections_exports);
 function totalPage(total, pageSize) {
   return Math.ceil(total / pageSize);
 }
@@ -11,7 +31,7 @@ const roleCollectionsResource = {
       const { page = 1, pageSize = 20 } = ctx.action.params;
       const db = ctx.db;
       const collectionRepository = db.getRepository("collections");
-      db.getRepository("fields");
+      const fieldRepository = db.getRepository("fields");
       const [collections, count] = await collectionRepository.findAndCount({
         filter: ctx.action.params.filter,
         sort: "sort"
@@ -26,7 +46,7 @@ const roleCollectionsResource = {
       const items = collections.map((collection, i) => {
         const exists = roleResourcesNames.includes(collection.get("name"));
         const usingConfig = roleResourceActionResourceNames.includes(collection.get("name")) ? "resourceAction" : "strategy";
-        db.getCollection(collection.get("name"));
+        const c = db.getCollection(collection.get("name"));
         return {
           type: "collection",
           name: collection.get("name"),
@@ -49,5 +69,7 @@ const roleCollectionsResource = {
     }
   }
 };
-
-exports.roleCollectionsResource = roleCollectionsResource;
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  roleCollectionsResource
+});

package/dist/server/actions/user-setDefaultRole.js

@@ -1,5 +1,25 @@
-'use strict';
-
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var user_setDefaultRole_exports = {};
+__export(user_setDefaultRole_exports, {
+  setDefaultRole: () => setDefaultRole
+});
+module.exports = __toCommonJS(user_setDefaultRole_exports);
 async function setDefaultRole(ctx, next) {
   const {
     values: { roleName }
@@ -39,5 +59,7 @@ async function setDefaultRole(ctx, next) {
   ctx.body = "ok";
   await next();
 }
-
-exports.setDefaultRole = setDefaultRole;
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  setDefaultRole
+});

package/dist/server/collections/roles-users.js

@@ -1,10 +1,28 @@
-'use strict';
-
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var roles_users_exports = {};
+__export(roles_users_exports, {
+  default: () => roles_users_default
+});
+module.exports = __toCommonJS(roles_users_exports);
 var roles_users_default = {
   name: "rolesUsers",
   duplicator: "optional",
   namespace: "acl.acl",
   fields: [{ type: "boolean", name: "default" }]
 };
-
-module.exports = roles_users_default;

package/dist/server/collections/roles.js

@@ -1,5 +1,25 @@
-'use strict';
-
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var roles_exports = {};
+__export(roles_exports, {
+  default: () => roles_default
+});
+module.exports = __toCommonJS(roles_exports);
 var roles_default = {
   namespace: "acl.acl",
   duplicator: {
@@ -99,5 +119,3 @@ var roles_default = {
     }
   ]
 };
-
-module.exports = roles_default;

package/dist/server/collections/rolesResources.js

@@ -1,5 +1,25 @@
-'use strict';
-
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var rolesResources_exports = {};
+__export(rolesResources_exports, {
+  default: () => rolesResources_default
+});
+module.exports = __toCommonJS(rolesResources_exports);
 var rolesResources_default = {
   namespace: "acl.acl",
   duplicator: "required",
@@ -31,5 +51,3 @@ var rolesResources_default = {
     }
   ]
 };
-
-module.exports = rolesResources_default;

package/dist/server/collections/rolesResourcesActions.js

@@ -1,5 +1,25 @@
-'use strict';
-
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var rolesResourcesActions_exports = {};
+__export(rolesResourcesActions_exports, {
+  default: () => rolesResourcesActions_default
+});
+module.exports = __toCommonJS(rolesResourcesActions_exports);
 var rolesResourcesActions_default = {
   namespace: "acl.acl",
   duplicator: "required",
@@ -29,5 +49,3 @@ var rolesResourcesActions_default = {
     }
   ]
 };
-
-module.exports = rolesResourcesActions_default;

package/dist/server/collections/rolesResourcesScopes.js

@@ -1,5 +1,25 @@
-'use strict';
-
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var rolesResourcesScopes_exports = {};
+__export(rolesResourcesScopes_exports, {
+  default: () => rolesResourcesScopes_default
+});
+module.exports = __toCommonJS(rolesResourcesScopes_exports);
 var rolesResourcesScopes_default = {
   namespace: "acl.acl",
   duplicator: "required",
@@ -23,5 +43,3 @@ var rolesResourcesScopes_default = {
     }
   ]
 };
-
-module.exports = rolesResourcesScopes_default;

package/dist/server/collections/users.js

@@ -1,8 +1,27 @@
-'use strict';
-
-var database = require('@nocobase/database');
-
-var users_default = database.extend({
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var users_exports = {};
+__export(users_exports, {
+  default: () => users_default
+});
+module.exports = __toCommonJS(users_exports);
+var import_database = require("@nocobase/database");
+var users_default = (0, import_database.extend)({
   name: "users",
   fields: [
     {
@@ -31,5 +50,3 @@ var users_default = database.extend({
     }
   ]
 });
-
-module.exports = users_default;

package/dist/server/index.js

@@ -1,11 +1,33 @@
-'use strict';
-
-var server = require('./server');
-
-function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
-
-var server__default = /*#__PURE__*/_interopDefault(server);
-
-
-
-module.exports = server__default.default;
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var server_exports = {};
+__export(server_exports, {
+  default: () => import_server.default
+});
+module.exports = __toCommonJS(server_exports);
+var import_server = __toESM(require("./server"));

package/dist/server/middlewares/setCurrentRole.js

@@ -1,5 +1,25 @@
-'use strict';
-
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var setCurrentRole_exports = {};
+__export(setCurrentRole_exports, {
+  setCurrentRole: () => setCurrentRole
+});
+module.exports = __toCommonJS(setCurrentRole_exports);
 async function setCurrentRole(ctx, next) {
   var _a, _b;
   const currentRole = ctx.get("X-Role");
@@ -27,5 +47,7 @@ async function setCurrentRole(ctx, next) {
   }
   await next();
 }
-
-exports.setCurrentRole = setCurrentRole;
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  setCurrentRole
+});

package/dist/server/migrations/20221214072638-set-role-snippets.js

@@ -1,8 +1,27 @@
-'use strict';
-
-var server = require('@nocobase/server');
-
-class set_role_snippets_default extends server.Migration {
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var set_role_snippets_exports = {};
+__export(set_role_snippets_exports, {
+  default: () => set_role_snippets_default
+});
+module.exports = __toCommonJS(set_role_snippets_exports);
+var import_server = require("@nocobase/server");
+class set_role_snippets_default extends import_server.Migration {
   async up() {
     const result = await this.app.version.satisfies("<0.9.3-alpha.1");
     if (!result) {
@@ -21,5 +40,3 @@ class set_role_snippets_default extends server.Migration {
   async down() {
   }
 }
-
-module.exports = set_role_snippets_default;

package/dist/server/model/RoleModel.js

@@ -1,8 +1,27 @@
-'use strict';
-
-var database = require('@nocobase/database');
-
-class RoleModel extends database.Model {
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var RoleModel_exports = {};
+__export(RoleModel_exports, {
+  RoleModel: () => RoleModel
+});
+module.exports = __toCommonJS(RoleModel_exports);
+var import_database = require("@nocobase/database");
+class RoleModel extends import_database.Model {
   writeToAcl(options) {
     const { acl } = options;
     const roleName = this.get("name");
@@ -19,5 +38,7 @@ class RoleModel extends database.Model {
     role.snippets = new Set(this.get("snippets"));
   }
 }
-
-exports.RoleModel = RoleModel;
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  RoleModel
+});

package/dist/server/model/RoleResourceActionModel.js

@@ -1,8 +1,27 @@
-'use strict';
-
-var database = require('@nocobase/database');
-
-class RoleResourceActionModel extends database.Model {
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var RoleResourceActionModel_exports = {};
+__export(RoleResourceActionModel_exports, {
+  RoleResourceActionModel: () => RoleResourceActionModel
+});
+module.exports = __toCommonJS(RoleResourceActionModel_exports);
+var import_database = require("@nocobase/database");
+class RoleResourceActionModel extends import_database.Model {
   async writeToACL(options) {
     var _a;
     const db = this.constructor.database;
@@ -60,5 +79,7 @@ class RoleResourceActionModel extends database.Model {
     }
   }
 }
-
-exports.RoleResourceActionModel = RoleResourceActionModel;
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  RoleResourceActionModel
+});

package/dist/server/model/RoleResourceModel.js

@@ -1,9 +1,28 @@
-'use strict';
-
-var acl = require('@nocobase/acl');
-var database = require('@nocobase/database');
-
-class RoleResourceModel extends database.Model {
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var RoleResourceModel_exports = {};
+__export(RoleResourceModel_exports, {
+  RoleResourceModel: () => RoleResourceModel
+});
+module.exports = __toCommonJS(RoleResourceModel_exports);
+var import_acl = require("@nocobase/acl");
+var import_database = require("@nocobase/database");
+class RoleResourceModel extends import_database.Model {
   async revoke(options) {
     const { role, resourceName, grantHelper } = options;
     role.revokeResource(resourceName);
@@ -20,10 +39,10 @@ class RoleResourceModel extends database.Model {
     grantHelper.resourceTargetActionMap.set(`${role.name}.${resourceName}`, []);
   }
   async writeToACL(options) {
-    const { acl: acl$1, associationFieldsActions, grantHelper } = options;
+    const { acl, associationFieldsActions, grantHelper } = options;
     const resourceName = this.get("name");
     const roleName = this.get("roleName");
-    const role = acl$1.getRole(roleName);
+    const role = acl.getRole(roleName);
     if (!role) {
       console.log(`${roleName} role does not exist`);
       return;
@@ -32,7 +51,7 @@ class RoleResourceModel extends database.Model {
     if (this.usingActionsConfig === false) {
       return;
     }
-    const resource = new acl.ACLResource({
+    const resource = new import_acl.ACLResource({
       role,
       name: resourceName
     });
@@ -42,7 +61,7 @@ class RoleResourceModel extends database.Model {
     });
     for (const action of actions) {
       await action.writeToACL({
-        acl: acl$1,
+        acl,
         role,
         resourceName,
         associationFieldsActions,
@@ -51,5 +70,7 @@ class RoleResourceModel extends database.Model {
     }
   }
 }
-
-exports.RoleResourceModel = RoleResourceModel;
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  RoleResourceModel
+});

package/dist/server/server.js

@@ -1,33 +1,59 @@
-'use strict';
-
-Object.defineProperty(exports, '__esModule', { value: true });
-
-var acl = require('@nocobase/acl');
-var actions = require('@nocobase/actions');
-var database = require('@nocobase/database');
-var server = require('@nocobase/server');
-var lodash = require('lodash');
-var path = require('path');
-var availableActions = require('./actions/available-actions');
-var roleCheck = require('./actions/role-check');
-var roleCollections = require('./actions/role-collections');
-var userSetDefaultRole = require('./actions/user-setDefaultRole');
-var setCurrentRole = require('./middlewares/setCurrentRole');
-var RoleModel = require('./model/RoleModel');
-var RoleResourceActionModel = require('./model/RoleResourceActionModel');
-var RoleResourceModel = require('./model/RoleResourceModel');
-
-function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
-
-var lodash__default = /*#__PURE__*/_interopDefault(lodash);
-
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var server_exports = {};
+__export(server_exports, {
+  GrantHelper: () => GrantHelper,
+  PluginACL: () => PluginACL,
+  default: () => server_default
+});
+module.exports = __toCommonJS(server_exports);
+var import_acl = require("@nocobase/acl");
+var import_actions = require("@nocobase/actions");
+var import_database = require("@nocobase/database");
+var import_server = require("@nocobase/server");
+var import_lodash = __toESM(require("lodash"));
+var import_path = require("path");
+var import_available_actions = require("./actions/available-actions");
+var import_role_check = require("./actions/role-check");
+var import_role_collections = require("./actions/role-collections");
+var import_user_setDefaultRole = require("./actions/user-setDefaultRole");
+var import_setCurrentRole = require("./middlewares/setCurrentRole");
+var import_RoleModel = require("./model/RoleModel");
+var import_RoleResourceActionModel = require("./model/RoleResourceActionModel");
+var import_RoleResourceModel = require("./model/RoleResourceModel");
+var import_async_mutex = require("async-mutex");
 class GrantHelper {
   resourceTargetActionMap = /* @__PURE__ */ new Map();
   targetActionResourceMap = /* @__PURE__ */ new Map();
   constructor() {
   }
 }
-class PluginACL extends server.Plugin {
+class PluginACL extends import_server.Plugin {
   // association field actions config
   associationFieldsActions = {};
   grantHelper = new GrantHelper();
@@ -123,15 +149,15 @@ class PluginACL extends server.Plugin {
   async beforeLoad() {
     this.db.addMigrations({
       namespace: this.name,
-      directory: path.resolve(__dirname, "./migrations"),
+      directory: (0, import_path.resolve)(__dirname, "./migrations"),
       context: {
         plugin: this
       }
     });
     this.app.db.registerModels({
-      RoleResourceActionModel: RoleResourceActionModel.RoleResourceActionModel,
-      RoleResourceModel: RoleResourceModel.RoleResourceModel,
-      RoleModel: RoleModel.RoleModel
+      RoleResourceActionModel: import_RoleResourceActionModel.RoleResourceActionModel,
+      RoleResourceModel: import_RoleResourceModel.RoleResourceModel,
+      RoleModel: import_RoleModel.RoleModel
     });
     this.app.acl.registerSnippet({
       name: `pm.${this.name}.roles`,
@@ -158,20 +184,20 @@ class PluginACL extends server.Plugin {
       if (actionName == "view" || actionName == "export") {
         const associationsFields = fieldsParams.filter((fieldName) => {
           const field = collection.getField(fieldName);
-          return field instanceof database.RelationField;
+          return field instanceof import_database.RelationField;
         });
         ctx.params = {
           ...ctx.params,
-          fields: lodash__default.default.difference(fieldsParams, associationsFields),
+          fields: import_lodash.default.difference(fieldsParams, associationsFields),
           appends: associationsFields
         };
       }
     });
     this.registerAssociationFieldsActions();
-    this.app.resourcer.define(availableActions.availableActionResource);
-    this.app.resourcer.define(roleCollections.roleCollectionsResource);
-    this.app.resourcer.registerActionHandler("roles:check", roleCheck.checkAction);
-    this.app.resourcer.registerActionHandler(`users:setDefaultRole`, userSetDefaultRole.setDefaultRole);
+    this.app.resourcer.define(import_available_actions.availableActionResource);
+    this.app.resourcer.define(import_role_collections.roleCollectionsResource);
+    this.app.resourcer.registerActionHandler("roles:check", import_role_check.checkAction);
+    this.app.resourcer.registerActionHandler(`users:setDefaultRole`, import_user_setDefaultRole.setDefaultRole);
     this.db.on("users.afterCreateWithAssociations", async (model, options) => {
       const { transaction } = options;
       const repository = this.app.db.getRepository("roles");
@@ -256,27 +282,30 @@ class PluginACL extends server.Plugin {
         });
       }
     });
+    const mutex = new import_async_mutex.Mutex();
     this.app.db.on("fields.afterDestroy", async (model, options) => {
-      const collectionName = model.get("collectionName");
-      const fieldName = model.get("name");
-      const resourceActions = await this.app.db.getRepository("rolesResourcesActions").find({
-        filter: {
-          "resource.name": collectionName,
-          "fields.$anyOf": [fieldName]
-        },
-        transaction: options.transaction
-      });
-      for (const resourceAction of resourceActions) {
-        const fields = resourceAction.get("fields");
-        const newFields = fields.filter((field) => field != fieldName);
-        await this.app.db.getRepository("rolesResourcesActions").update({
-          filterByTk: resourceAction.get("id"),
-          values: {
-            fields: newFields
+      await mutex.runExclusive(async () => {
+        const collectionName = model.get("collectionName");
+        const fieldName = model.get("name");
+        const resourceActions = await this.app.db.getRepository("rolesResourcesActions").find({
+          filter: {
+            "resource.name": collectionName,
+            "fields.$anyOf": [fieldName]
           },
           transaction: options.transaction
         });
-      }
+        for (const resourceAction of resourceActions) {
+          const fields = resourceAction.get("fields");
+          const newFields = fields.filter((field) => field != fieldName);
+          await this.app.db.getRepository("rolesResourcesActions").update({
+            filterByTk: resourceAction.get("id"),
+            values: {
+              fields: newFields
+            },
+            transaction: options.transaction
+          });
+        }
+      });
     });
     const writeRolesToACL = async (app, options) => {
       const exists = await this.app.db.collectionExistsInDb("roles");
@@ -358,7 +387,7 @@ class PluginACL extends server.Plugin {
         ]
       });
     });
-    this.app.resourcer.use(setCurrentRole.setCurrentRole, { tag: "setCurrentRole", before: "acl", after: "auth" });
+    this.app.resourcer.use(import_setCurrentRole.setCurrentRole, { tag: "setCurrentRole", before: "acl", after: "auth" });
     this.app.acl.allow("users", "setDefaultRole", "loggedIn");
     this.app.acl.allow("roles", "check", "loggedIn");
     this.app.acl.allow("*", "*", (ctx) => {
@@ -435,9 +464,34 @@ class PluginACL extends server.Plugin {
       return next();
     });
     const parseJsonTemplate = this.app.acl.parseJsonTemplate;
+    this.app.acl.beforeGrantAction(async (ctx) => {
+      const actionName = this.app.acl.resolveActionAlias(ctx.actionName);
+      if (import_lodash.default.isPlainObject(ctx.params)) {
+        if (actionName === "view" && ctx.params.fields) {
+          const appendFields = [];
+          const collection = this.app.db.getCollection(ctx.resourceName);
+          if (!collection) {
+            return;
+          }
+          if (collection.model.primaryKeyAttribute) {
+            appendFields.push(collection.model.primaryKeyAttribute);
+          }
+          if (collection.model.rawAttributes["createdAt"]) {
+            appendFields.push("createdAt");
+          }
+          if (collection.model.rawAttributes["updatedAt"]) {
+            appendFields.push("updatedAt");
+          }
+          ctx.params = {
+            ...import_lodash.default.omit(ctx.params, "fields"),
+            fields: [...ctx.params.fields, ...appendFields]
+          };
+        }
+      }
+    });
     this.app.acl.use(
       async (ctx, next) => {
-        var _a, _b, _c, _d;
+        var _a, _b, _c;
         const { actionName, resourceName, resourceOf } = ctx.action;
         if (resourceName.includes(".") && resourceOf) {
           if (!((_b = (_a = ctx == null ? void 0 : ctx.permission) == null ? void 0 : _a.can) == null ? void 0 : _b.params)) {
@@ -454,10 +508,11 @@ class PluginACL extends server.Plugin {
               ctx.permission.can = false;
             }
           } else {
-            const filter = await parseJsonTemplate(((_d = action == null ? void 0 : action.params) == null ? void 0 : _d.filter) || {}, ctx);
+            const filteredParams = this.app.acl.filterParams(ctx, collectionName, (action == null ? void 0 : action.params) || {});
+            const params = await parseJsonTemplate(filteredParams, ctx);
             const sourceInstance = await ctx.db.getRepository(collectionName).findOne({
               filterByTk: resourceOf,
-              filter
+              filter: params.filter || {}
             });
             if (!sourceInstance) {
               ctx.permission.can = false;
@@ -475,7 +530,7 @@ class PluginACL extends server.Plugin {
         var _a, _b;
         const action = (_b = (_a = ctx.permission) == null ? void 0 : _a.can) == null ? void 0 : _b.action;
         if (action == "destroy" && !ctx.action.resourceName.includes(".")) {
-          const repository = actions.utils.getRepositoryFromParams(ctx);
+          const repository = import_actions.utils.getRepositoryFromParams(ctx);
           const filteredCount = await repository.count(ctx.permission.mergedParams);
           const queryCount = await repository.count(ctx.permission.rawParams);
           if (queryCount > filteredCount) {
@@ -507,9 +562,9 @@ class PluginACL extends server.Plugin {
       const Model = collection.model;
       const primaryKeyField = Model.primaryKeyField || Model.primaryKeyAttribute;
       const dataPath = ((_a = ctx.body) == null ? void 0 : _a.rows) ? "body.rows" : "body";
-      let listData = lodash__default.default.get(ctx, dataPath);
+      let listData = import_lodash.default.get(ctx, dataPath);
       if (actionName == "get") {
-        listData = lodash__default.default.castArray(listData);
+        listData = import_lodash.default.castArray(listData);
       }
       const inspectActions = ["view", "update", "destroy"];
       const actionsParams = [];
@@ -540,13 +595,13 @@ class PluginACL extends server.Plugin {
           },
           permission: {},
           throw(...args) {
-            throw new acl.NoPermissionError(...args);
+            throw new import_acl.NoPermissionError(...args);
           }
         };
         try {
           await this.app.acl.getActionParams(actionCtx);
         } catch (e) {
-          if (e instanceof acl.NoPermissionError) {
+          if (e instanceof import_acl.NoPermissionError) {
             continue;
           }
           throw e;
@@ -572,7 +627,7 @@ class PluginACL extends server.Plugin {
         if (!params) {
           continue;
         }
-        if (lodash__default.default.isEmpty(params) || lodash__default.default.isEmpty(params.filter)) {
+        if (import_lodash.default.isEmpty(params) || import_lodash.default.isEmpty(params.filter)) {
           allAllowed.push(action);
           continue;
         }
@@ -592,7 +647,7 @@ class PluginACL extends server.Plugin {
                 return key.startsWith("$") && key.endsWith("$");
               };
               const iterate = (rootObj, path = []) => {
-                const obj = path.length == 0 ? rootObj : lodash__default.default.get(rootObj, path);
+                const obj = path.length == 0 ? rootObj : import_lodash.default.get(rootObj, path);
                 if (Array.isArray(obj)) {
                   for (let i = 0; i < obj.length; i++) {
                     if (obj[i] === null) {
@@ -611,16 +666,16 @@ class PluginACL extends server.Plugin {
                   if (typeof obj[key] === "object" && obj[key] !== null || typeof obj[key] === "symbol") {
                     iterate(rootObj, [...path, key]);
                   }
-                  if (typeof key === "string" && key !== database.snakeCase(key)) {
+                  if (typeof key === "string" && key !== (0, import_database.snakeCase)(key)) {
                     const setKey = isAssociationKey(key) ? (() => {
                       const parts = key.split(".");
-                      parts[parts.length - 1] = lodash__default.default.snakeCase(parts[parts.length - 1]);
+                      parts[parts.length - 1] = import_lodash.default.snakeCase(parts[parts.length - 1]);
                       const result = parts.join(".");
                       return result.endsWith("$") ? result : `${result}$`;
-                    })() : database.snakeCase(key);
-                    const setValue = lodash__default.default.cloneDeep(obj[key]);
-                    lodash__default.default.unset(rootObj, [...path, key]);
-                    lodash__default.default.set(rootObj, [...path, setKey], setValue);
+                    })() : (0, import_database.snakeCase)(key);
+                    const setValue = import_lodash.default.cloneDeep(obj[key]);
+                    import_lodash.default.unset(rootObj, [...path, key]);
+                    import_lodash.default.set(rootObj, [...path, setKey], setValue);
                   }
                 });
               };
@@ -688,7 +743,7 @@ class PluginACL extends server.Plugin {
     }
   }
   async load() {
-    await this.importCollections(path.resolve(__dirname, "collections"));
+    await this.importCollections((0, import_path.resolve)(__dirname, "collections"));
     this.db.extendCollection({
       name: "rolesUischemas",
       namespace: "acl.acl",
@@ -697,7 +752,8 @@ class PluginACL extends server.Plugin {
   }
 }
 var server_default = PluginACL;
-
-exports.GrantHelper = GrantHelper;
-exports.PluginACL = PluginACL;
-exports.default = server_default;
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  GrantHelper,
+  PluginACL
+});

package/dist/swagger/index.js

@@ -1,5 +1,25 @@
-'use strict';
-
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var swagger_exports = {};
+__export(swagger_exports, {
+  default: () => swagger_default
+});
+module.exports = __toCommonJS(swagger_exports);
 var swagger_default = {
   openapi: "3.0.2",
   info: {
@@ -373,5 +393,3 @@ var swagger_default = {
     }
   }
 };
-
-module.exports = swagger_default;

package/package.json

@@ -4,11 +4,12 @@
   "displayName.zh-CN": "权限控制",
   "description": "A simple access control based on roles, resources and actions",
   "description.zh-CN": "基于角色、资源和操作的权限控制。",
-  "version": "0.13.0-alpha.1",
+  "version": "0.13.0-alpha.10",
   "license": "AGPL-3.0",
   "main": "./dist/server/index.js",
   "devDependencies": {
     "@types/jsonwebtoken": "^8.5.8",
+    "async-mutex": "^0.4.0",
     "jsonwebtoken": "^8.5.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
@@ -27,5 +28,5 @@
     "url": "git+https://github.com/nocobase/nocobase.git",
     "directory": "packages/plugins/acl"
   },
-  "gitHead": "0ebd4e85a1b0b0d0943768ab6cb5c3d824562239"
+  "gitHead": "5360ed81650f6895f3ed39aede2706467d55862c"
 }