@nocobase/plugin-acl 0.18.0-alpha.9 → 0.19.0-alpha.2

package/dist/externalVersion.js

@@ -1,11 +1,11 @@
 module.exports = {
-  "@nocobase/client": "0.18.0-alpha.9",
-  "@nocobase/acl": "0.18.0-alpha.9",
-  "@nocobase/actions": "0.18.0-alpha.9",
-  "@nocobase/database": "0.18.0-alpha.9",
-  "@nocobase/server": "0.18.0-alpha.9",
+  "@nocobase/client": "0.19.0-alpha.2",
+  "@nocobase/acl": "0.19.0-alpha.2",
+  "@nocobase/actions": "0.19.0-alpha.2",
+  "@nocobase/cache": "0.19.0-alpha.2",
+  "@nocobase/database": "0.19.0-alpha.2",
+  "@nocobase/server": "0.19.0-alpha.2",
   "async-mutex": "0.3.2",
   "lodash": "4.17.21",
-  "@nocobase/cache": "0.18.0-alpha.9",
-  "@nocobase/test": "0.18.0-alpha.9"
+  "@nocobase/test": "0.19.0-alpha.2"
 };

package/dist/server/collections/roles-users.d.ts

@@ -1,3 +1,2 @@
-import { CollectionOptions } from '@nocobase/database';
-declare const _default: CollectionOptions;
+declare const _default: import("@nocobase/database").CollectionOptions;
 export default _default;

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

@@ -20,9 +20,11 @@ __export(roles_users_exports, {
   default: () => roles_users_default
 });
 module.exports = __toCommonJS(roles_users_exports);
-var roles_users_default = {
+var import_database = require("@nocobase/database");
+var roles_users_default = (0, import_database.defineCollection)({
   name: "rolesUsers",
-  duplicator: "optional",
-  namespace: "acl.acl",
+  dumpRules: {
+    group: "user"
+  },
   fields: [{ type: "boolean", name: "default" }]
-};
+});

package/dist/server/collections/roles.d.ts

@@ -1,3 +1,2 @@
-import { CollectionOptions } from '@nocobase/database';
-declare const _default: CollectionOptions;
+declare const _default: import("@nocobase/database").CollectionOptions;
 export default _default;

package/dist/server/collections/roles.js

@@ -20,12 +20,10 @@ __export(roles_exports, {
   default: () => roles_default
 });
 module.exports = __toCommonJS(roles_exports);
-var roles_default = {
-  namespace: "acl.acl",
-  duplicator: {
-    dumpable: "required",
-    with: "uiSchemas"
-  },
+var import_database = require("@nocobase/database");
+var roles_default = (0, import_database.defineCollection)({
+  origin: "@nocobase/plugin-acl",
+  dumpRules: "required",
   name: "roles",
   title: '{{t("Roles")}}',
   autoGenId: false,
@@ -118,4 +116,4 @@ var roles_default = {
       through: "rolesUsers"
     }
   ]
-};
+});

package/dist/server/collections/rolesResources.d.ts

@@ -1,3 +1,2 @@
-import { CollectionOptions } from '@nocobase/database';
-declare const _default: CollectionOptions;
+declare const _default: import("@nocobase/database").CollectionOptions;
 export default _default;

package/dist/server/collections/rolesResources.js

@@ -20,9 +20,9 @@ __export(rolesResources_exports, {
   default: () => rolesResources_default
 });
 module.exports = __toCommonJS(rolesResources_exports);
-var rolesResources_default = {
-  namespace: "acl.acl",
-  duplicator: "required",
+var import_database = require("@nocobase/database");
+var rolesResources_default = (0, import_database.defineCollection)({
+  dumpRules: "required",
   name: "rolesResources",
   model: "RoleResourceModel",
   indexes: [
@@ -50,4 +50,4 @@ var rolesResources_default = {
       target: "rolesResourcesActions"
     }
   ]
-};
+});

package/dist/server/collections/rolesResourcesActions.d.ts

@@ -1,3 +1,2 @@
-import { CollectionOptions } from '@nocobase/database';
-declare const _default: CollectionOptions;
+declare const _default: import("@nocobase/database").CollectionOptions;
 export default _default;

package/dist/server/collections/rolesResourcesActions.js

@@ -20,9 +20,9 @@ __export(rolesResourcesActions_exports, {
   default: () => rolesResourcesActions_default
 });
 module.exports = __toCommonJS(rolesResourcesActions_exports);
-var rolesResourcesActions_default = {
-  namespace: "acl.acl",
-  duplicator: "required",
+var import_database = require("@nocobase/database");
+var rolesResourcesActions_default = (0, import_database.defineCollection)({
+  dumpRules: "required",
   name: "rolesResourcesActions",
   model: "RoleResourceActionModel",
   fields: [
@@ -48,4 +48,4 @@ var rolesResourcesActions_default = {
       onDelete: "RESTRICT"
     }
   ]
-};
+});

package/dist/server/collections/rolesResourcesScopes.d.ts

@@ -1,3 +1,2 @@
-import { CollectionOptions } from '@nocobase/database';
-declare const _default: CollectionOptions;
+declare const _default: import("@nocobase/database").CollectionOptions;
 export default _default;

package/dist/server/collections/rolesResourcesScopes.js

@@ -20,9 +20,9 @@ __export(rolesResourcesScopes_exports, {
   default: () => rolesResourcesScopes_default
 });
 module.exports = __toCommonJS(rolesResourcesScopes_exports);
-var rolesResourcesScopes_default = {
-  namespace: "acl.acl",
-  duplicator: "required",
+var import_database = require("@nocobase/database");
+var rolesResourcesScopes_default = (0, import_database.defineCollection)({
+  dumpRules: "required",
   name: "rolesResourcesScopes",
   fields: [
     {
@@ -42,4 +42,4 @@ var rolesResourcesScopes_default = {
       name: "scope"
     }
   ]
-};
+});

package/dist/server/collections/users.js

@@ -21,7 +21,7 @@ __export(users_exports, {
 });
 module.exports = __toCommonJS(users_exports);
 var import_database = require("@nocobase/database");
-var users_default = (0, import_database.extend)({
+var users_default = (0, import_database.extendCollection)({
   name: "users",
   fields: [
     {

package/dist/server/migrations/20221214072638-set-role-snippets.d.ts

@@ -1,5 +1,6 @@
 import { Migration } from '@nocobase/server';
 export default class extends Migration {
+    appVersion: string;
     up(): Promise<void>;
     down(): Promise<void>;
 }

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

@@ -22,8 +22,9 @@ __export(set_role_snippets_exports, {
 module.exports = __toCommonJS(set_role_snippets_exports);
 var import_server = require("@nocobase/server");
 class set_role_snippets_default extends import_server.Migration {
+  appVersion = "<0.9.0-alpha.1";
   async up() {
-    const result = await this.app.version.satisfies("<0.9.3-alpha.1");
+    const result = await this.app.version.satisfies("<0.9.0-alpha.1");
     if (!result) {
       return;
     }

package/dist/server/server.js

@@ -323,7 +323,6 @@ class PluginACL extends import_server.Plugin {
       }
     };
     this.app.on("afterLoad", writeRolesToACL);
-    this.app.on("afterInstall", writeRolesToACL);
     this.app.on("afterInstallPlugin", async (plugin) => {
       if (plugin.getName() !== "users") {
         return;
@@ -757,8 +756,8 @@ class PluginACL extends import_server.Plugin {
     await this.importCollections((0, import_path.resolve)(__dirname, "collections"));
     this.db.extendCollection({
       name: "rolesUischemas",
-      namespace: "acl.acl",
-      duplicator: "required"
+      dumpRules: "required",
+      origin: this.options.packageName
     });
   }
 }

package/package.json

@@ -4,7 +4,7 @@
   "displayName.zh-CN": "权限控制",
   "description": "A simple access control based on roles, resources and actions",
   "description.zh-CN": "基于角色、资源和操作的权限控制。",
-  "version": "0.18.0-alpha.9",
+  "version": "0.19.0-alpha.2",
   "license": "AGPL-3.0",
   "main": "./dist/server/index.js",
   "devDependencies": {
@@ -29,5 +29,5 @@
     "url": "git+https://github.com/nocobase/nocobase.git",
     "directory": "packages/plugins/acl"
   },
-  "gitHead": "34ca0df4eede2e83fc86297b0fe19eba970e2b1b"
+  "gitHead": "cff5b77ecf12ccdb450d50d505b3aa44a68478c8"
 }