@develit-services/rbac 0.7.1 → 1.0.0

package/dist/database/schema.d.cts

@@ -1,2 +1,3 @@
-export { r as role, a as roleScope, u as userRole, b as userScope } from '../shared/rbac.D5N_wrRb.cjs';
+export { r as role, a as roleScope, u as userRole, b as userScope } from '../shared/rbac.CNbKvNcg.cjs';
+import 'drizzle-orm';
 import 'drizzle-orm/sqlite-core';

package/dist/database/schema.d.mts

@@ -1,2 +1,3 @@
-export { r as role, a as roleScope, u as userRole, b as userScope } from '../shared/rbac.D5N_wrRb.mjs';
+export { r as role, a as roleScope, u as userRole, b as userScope } from '../shared/rbac.CNbKvNcg.mjs';
+import 'drizzle-orm';
 import 'drizzle-orm/sqlite-core';

package/dist/database/schema.d.ts

@@ -1,2 +1,3 @@
-export { r as role, a as roleScope, u as userRole, b as userScope } from '../shared/rbac.D5N_wrRb.js';
+export { r as role, a as roleScope, u as userRole, b as userScope } from '../shared/rbac.CNbKvNcg.js';
+import 'drizzle-orm';
 import 'drizzle-orm/sqlite-core';

package/dist/export/worker.cjs

@@ -1,7 +1,5 @@
 'use strict';
 
-Object.defineProperty(exports, '__esModule', { value: true });
-
 const backendSdk = require('@develit-io/backend-sdk');
 const database_schema = require('../shared/rbac.D4H9O9-q.cjs');
 const drizzleOrm = require('drizzle-orm');
@@ -11,6 +9,25 @@ const cloudflare_workers = require('cloudflare:workers');
 const d1 = require('drizzle-orm/d1');
 require('drizzle-orm/sqlite-core');
 
+const relations = drizzleOrm.defineRelations(database_schema.schema, (r) => ({
+  role: {
+    roleScopes: r.many.roleScope(),
+    userRoles: r.many.userRole()
+  },
+  roleScope: {
+    role: r.one.role({
+      from: r.roleScope.roleId,
+      to: r.role.id
+    })
+  },
+  userRole: {
+    role: r.one.role({
+      from: r.userRole.roleId,
+      to: r.role.id
+    })
+  }
+}));
+
 const tables = database_schema.schema;
 
 const assignRoleToUserCommand = async ({
@@ -382,7 +399,7 @@ var __decorateClass = (decorators, target, key, kind) => {
 let RbacServiceBase = class extends backendSdk.develitWorker(cloudflare_workers.WorkerEntrypoint) {
   constructor(ctx, env, scopes) {
     super(ctx, env);
-    this.db = d1.drizzle(this.env.RBAC_D1, { schema: tables });
+    this.db = d1.drizzle(this.env.RBAC_D1, { schema: tables, relations });
     this.SCOPES = scopes;
   }
   validateScope(scope) {
@@ -1146,10 +1163,5 @@ const LABELED_SCOPES = [
   // { label: 'Smazat logy účtů', value: 'accounts.logs.delete' },
 ];
 
-const RbacService = defineRbacService({
-  scopes: LABELED_SCOPES
-});
-
 exports.LABELED_SCOPES = LABELED_SCOPES;
-exports.default = RbacService;
 exports.defineRbacService = defineRbacService;

package/dist/export/worker.d.cts

@@ -1,11 +1,11 @@
 import * as _develit_io_backend_sdk from '@develit-io/backend-sdk';
 import { IRPCResponse } from '@develit-io/backend-sdk';
-import { L as LabeledScope$1, t as tables, C as CreateRoleInput, a as CreateRoleOutput, A as AssignRoleToUserInput, b as AssignRoleToUserOutput, c as AssignRolesToUserInput, d as AssignRolesToUserOutput, R as RevokeRoleFromUserInput, e as RevokeRoleFromUserOutput, G as GrantScopeToUserInput, f as GrantScopeToUserOutput, g as GrantScopesToUserInput, h as GrantScopesToUserOutput, i as RevokeScopeFromUserInput, j as RevokeScopeFromUserOutput, k as GrantScopeToRoleInput, l as GrantScopeToRoleOutput, m as RevokeScopeFromRoleInput, n as RevokeScopeFromRoleOutput, o as GetAllUserRolesOutput, p as GetPermissionsOutput, q as GetUserPermissionsInput, r as GetUserPermissionsOutput, V as VerifyAccessInput, s as VerifyAccessOutput, D as DeleteRoleInput, u as DeleteRoleOutput, U as UpdateRoleInput, v as UpdateRoleOutput } from '../shared/rbac.DypKJ7qb.cjs';
+import { L as LabeledScope$1, t as tables, C as CreateRoleInput, a as CreateRoleOutput, A as AssignRoleToUserInput, b as AssignRoleToUserOutput, c as AssignRolesToUserInput, d as AssignRolesToUserOutput, R as RevokeRoleFromUserInput, e as RevokeRoleFromUserOutput, G as GrantScopeToUserInput, f as GrantScopeToUserOutput, g as GrantScopesToUserInput, h as GrantScopesToUserOutput, i as RevokeScopeFromUserInput, j as RevokeScopeFromUserOutput, k as GrantScopeToRoleInput, l as GrantScopeToRoleOutput, m as RevokeScopeFromRoleInput, n as RevokeScopeFromRoleOutput, o as GetAllUserRolesOutput, p as GetPermissionsOutput, q as GetUserPermissionsInput, r as GetUserPermissionsOutput, V as VerifyAccessInput, s as VerifyAccessOutput, D as DeleteRoleInput, u as DeleteRoleOutput, U as UpdateRoleInput, v as UpdateRoleOutput } from '../shared/rbac.bOBgd_Ez.cjs';
 import { WorkerEntrypoint } from 'cloudflare:workers';
 import { DrizzleD1Database } from 'drizzle-orm/d1';
 import 'zod';
 import 'drizzle-orm';
-import '../shared/rbac.D5N_wrRb.cjs';
+import '../shared/rbac.CNbKvNcg.cjs';
 import 'drizzle-orm/sqlite-core';
 
 type TypedScopeObject<TScopes extends readonly LabeledScope$1[]> = {
@@ -45,7 +45,7 @@ declare class RbacServiceBase<TScopes extends readonly LabeledScope$1[] = Labele
 }
 declare function defineRbacService<const TScopes extends readonly LabeledScope$1[]>(config?: {
     scopes: TScopes;
-}): new (ctx: ExecutionContext, env: RbacEnv) => RbacServiceBase<TScopes>;
+}): typeof RbacServiceBase<TScopes>;
 
 declare const SCOPES: readonly ["tickets.read", "tickets.create", "tickets.edit", "tickets.delete", "tickets.archive", "tickets.automations.pause", "tickets.automations.resume", "tickets.dependencies.read", "tickets.dependencies.create", "tickets.dependencies.edit", "tickets.dependencies.delete", "tickets.confirmation.send", "tickets.confirmation.download", "tickets.payments.create", "tickets.payments.read", "tickets.payments.edit", "tickets.payments.delete", "tickets.payments.confirmation.send", "tickets.payments.confirmation.download", "tickets.logs.read", "tickets.logs.create", "tickets.logs.delete", "tickets.{jwt.user.rawUserMetaData.organizationId}.read", "tickets.{jwt.user.rawUserMetaData.organizationId}.create", "tickets.{jwt.user.rawUserMetaData.organizationId}.edit", "tickets.{jwt.user.rawUserMetaData.organizationId}.delete", "tickets.{jwt.user.rawUserMetaData.organizationId}.archive", "tickets.{jwt.user.rawUserMetaData.organizationId}.automations.pause", "tickets.{jwt.user.rawUserMetaData.organizationId}.automations.resume", "tickets.{jwt.user.rawUserMetaData.organizationId}.dependencies.read", "tickets.{jwt.user.rawUserMetaData.organizationId}.dependencies.create", "tickets.{jwt.user.rawUserMetaData.organizationId}.dependencies.edit", "tickets.{jwt.user.rawUserMetaData.organizationId}.dependencies.delete", "tickets.{jwt.user.rawUserMetaData.organizationId}.confirmation.send", "tickets.{jwt.user.rawUserMetaData.organizationId}.confirmation.download", "tickets.{jwt.user.rawUserMetaData.organizationId}.payments.create", "tickets.{jwt.user.rawUserMetaData.organizationId}.payments.read", "tickets.{jwt.user.rawUserMetaData.organizationId}.payments.edit", "tickets.{jwt.user.rawUserMetaData.organizationId}.payments.delete", "tickets.{jwt.user.rawUserMetaData.organizationId}.payments.confirmation.send", "tickets.{jwt.user.rawUserMetaData.organizationId}.payments.confirmation.download", "tickets.{jwt.user.rawUserMetaData.organizationId}.logs.read", "tickets.{jwt.user.rawUserMetaData.organizationId}.logs.create", "tickets.{jwt.user.rawUserMetaData.organizationId}.logs.delete", "clients.read", "clients.create", "clients.edit", "clients.delete", "clients.pin.read", "clients.pin.edit", "clients.trader.edit", "clients.logs.read", "clients.logs.create", "clients.logs.delete", "clients.{jwt.user.rawUserMetaData.organizationId}.read", "clients.{jwt.user.rawUserMetaData.organizationId}.create", "clients.{jwt.user.rawUserMetaData.organizationId}.edit", "clients.{jwt.user.rawUserMetaData.organizationId}.delete", "clients.{jwt.user.rawUserMetaData.organizationId}.pin.read", "clients.{jwt.user.rawUserMetaData.organizationId}.pin.edit", "clients.{jwt.user.rawUserMetaData.organizationId}.trader.edit", "clients.{jwt.user.rawUserMetaData.organizationId}.logs.read", "clients.{jwt.user.rawUserMetaData.organizationId}.logs.create", "clients.{jwt.user.rawUserMetaData.organizationId}.logs.delete", "users.read", "users.create", "users.edit", "users.delete", "users.ban", "users.password.reset.send", "users.password.edit", "users.2fa.enable", "users.2fa.disable", "users.roles.read", "users.roles.edit", "users.scopes.read", "users.scopes.assign", "users.scopes.delete", "users.logs.read", "users.logs.create", "users.logs.delete", "users.{jwt.user.rawUserMetaData.organizationId}.read", "users.{jwt.user.rawUserMetaData.organizationId}.create", "users.{jwt.user.rawUserMetaData.organizationId}.edit", "users.{jwt.user.rawUserMetaData.organizationId}.delete", "users.{jwt.user.rawUserMetaData.organizationId}.ban", "users.{jwt.user.rawUserMetaData.organizationId}.password.reset.send", "users.{jwt.user.rawUserMetaData.organizationId}.password.edit", "users.{jwt.user.rawUserMetaData.organizationId}.2fa.enable", "users.{jwt.user.rawUserMetaData.organizationId}.2fa.disable", "users.{jwt.user.rawUserMetaData.organizationId}.roles.read", "users.{jwt.user.rawUserMetaData.organizationId}.roles.edit", "users.{jwt.user.rawUserMetaData.organizationId}.scopes.read", "users.{jwt.user.rawUserMetaData.organizationId}.scopes.assign", "users.{jwt.user.rawUserMetaData.organizationId}.scopes.delete", "users.{jwt.user.rawUserMetaData.organizationId}.logs.read", "users.{jwt.user.rawUserMetaData.organizationId}.logs.create", "users.{jwt.user.rawUserMetaData.organizationId}.logs.delete", "traders.read", "traders.create", "traders.edit", "traders.delete", "traders.logs", "roles.read", "roles.create", "roles.edit", "roles.delete", "roles.scopes.assign", "roles.scopes.delete", "roles.logs.read", "roles.logs.create", "roles.logs.delete", "roles.users.read", "test.admin", "test.read", "test.edit", "test.delete", "test.{jwt.organizationId}.read", "test.{jwt.user.rawUserMetaData.organizationId}.read", "test.{jwt.user.rawUserMetaData.organizationId}.edit", "test.{param.resourceId}.read", "test.organization.{jwt.user.rawUserMetaData.organizationId}.resource.{jwt.user.rawUserMetaData.organizationId}.read", "test.organization.{jwt.user.rawUserMetaData.organizationId}.branch.{jwt.userData.organizationBranchId}.read", "test.{invalid}.scope", "test.{}.scope", "test.{jwt.}.scope", "test.{.key}.scope"];
 type LabeledScope = {
@@ -54,8 +54,4 @@ type LabeledScope = {
 };
 declare const LABELED_SCOPES: LabeledScope[];
 
-declare const _default: new (ctx: ExecutionContext, env: RbacEnv) => WorkerEntrypoint<RbacEnv>;
-
-// @ts-ignore
-export = _default;
 export { LABELED_SCOPES, defineRbacService };

package/dist/export/worker.d.mts

@@ -1,11 +1,11 @@
 import * as _develit_io_backend_sdk from '@develit-io/backend-sdk';
 import { IRPCResponse } from '@develit-io/backend-sdk';
-import { L as LabeledScope$1, t as tables, C as CreateRoleInput, a as CreateRoleOutput, A as AssignRoleToUserInput, b as AssignRoleToUserOutput, c as AssignRolesToUserInput, d as AssignRolesToUserOutput, R as RevokeRoleFromUserInput, e as RevokeRoleFromUserOutput, G as GrantScopeToUserInput, f as GrantScopeToUserOutput, g as GrantScopesToUserInput, h as GrantScopesToUserOutput, i as RevokeScopeFromUserInput, j as RevokeScopeFromUserOutput, k as GrantScopeToRoleInput, l as GrantScopeToRoleOutput, m as RevokeScopeFromRoleInput, n as RevokeScopeFromRoleOutput, o as GetAllUserRolesOutput, p as GetPermissionsOutput, q as GetUserPermissionsInput, r as GetUserPermissionsOutput, V as VerifyAccessInput, s as VerifyAccessOutput, D as DeleteRoleInput, u as DeleteRoleOutput, U as UpdateRoleInput, v as UpdateRoleOutput } from '../shared/rbac.CSHPMf7E.mjs';
+import { L as LabeledScope$1, t as tables, C as CreateRoleInput, a as CreateRoleOutput, A as AssignRoleToUserInput, b as AssignRoleToUserOutput, c as AssignRolesToUserInput, d as AssignRolesToUserOutput, R as RevokeRoleFromUserInput, e as RevokeRoleFromUserOutput, G as GrantScopeToUserInput, f as GrantScopeToUserOutput, g as GrantScopesToUserInput, h as GrantScopesToUserOutput, i as RevokeScopeFromUserInput, j as RevokeScopeFromUserOutput, k as GrantScopeToRoleInput, l as GrantScopeToRoleOutput, m as RevokeScopeFromRoleInput, n as RevokeScopeFromRoleOutput, o as GetAllUserRolesOutput, p as GetPermissionsOutput, q as GetUserPermissionsInput, r as GetUserPermissionsOutput, V as VerifyAccessInput, s as VerifyAccessOutput, D as DeleteRoleInput, u as DeleteRoleOutput, U as UpdateRoleInput, v as UpdateRoleOutput } from '../shared/rbac.CusjQLB-.mjs';
 import { WorkerEntrypoint } from 'cloudflare:workers';
 import { DrizzleD1Database } from 'drizzle-orm/d1';
 import 'zod';
 import 'drizzle-orm';
-import '../shared/rbac.D5N_wrRb.mjs';
+import '../shared/rbac.CNbKvNcg.mjs';
 import 'drizzle-orm/sqlite-core';
 
 type TypedScopeObject<TScopes extends readonly LabeledScope$1[]> = {
@@ -45,7 +45,7 @@ declare class RbacServiceBase<TScopes extends readonly LabeledScope$1[] = Labele
 }
 declare function defineRbacService<const TScopes extends readonly LabeledScope$1[]>(config?: {
     scopes: TScopes;
-}): new (ctx: ExecutionContext, env: RbacEnv) => RbacServiceBase<TScopes>;
+}): typeof RbacServiceBase<TScopes>;
 
 declare const SCOPES: readonly ["tickets.read", "tickets.create", "tickets.edit", "tickets.delete", "tickets.archive", "tickets.automations.pause", "tickets.automations.resume", "tickets.dependencies.read", "tickets.dependencies.create", "tickets.dependencies.edit", "tickets.dependencies.delete", "tickets.confirmation.send", "tickets.confirmation.download", "tickets.payments.create", "tickets.payments.read", "tickets.payments.edit", "tickets.payments.delete", "tickets.payments.confirmation.send", "tickets.payments.confirmation.download", "tickets.logs.read", "tickets.logs.create", "tickets.logs.delete", "tickets.{jwt.user.rawUserMetaData.organizationId}.read", "tickets.{jwt.user.rawUserMetaData.organizationId}.create", "tickets.{jwt.user.rawUserMetaData.organizationId}.edit", "tickets.{jwt.user.rawUserMetaData.organizationId}.delete", "tickets.{jwt.user.rawUserMetaData.organizationId}.archive", "tickets.{jwt.user.rawUserMetaData.organizationId}.automations.pause", "tickets.{jwt.user.rawUserMetaData.organizationId}.automations.resume", "tickets.{jwt.user.rawUserMetaData.organizationId}.dependencies.read", "tickets.{jwt.user.rawUserMetaData.organizationId}.dependencies.create", "tickets.{jwt.user.rawUserMetaData.organizationId}.dependencies.edit", "tickets.{jwt.user.rawUserMetaData.organizationId}.dependencies.delete", "tickets.{jwt.user.rawUserMetaData.organizationId}.confirmation.send", "tickets.{jwt.user.rawUserMetaData.organizationId}.confirmation.download", "tickets.{jwt.user.rawUserMetaData.organizationId}.payments.create", "tickets.{jwt.user.rawUserMetaData.organizationId}.payments.read", "tickets.{jwt.user.rawUserMetaData.organizationId}.payments.edit", "tickets.{jwt.user.rawUserMetaData.organizationId}.payments.delete", "tickets.{jwt.user.rawUserMetaData.organizationId}.payments.confirmation.send", "tickets.{jwt.user.rawUserMetaData.organizationId}.payments.confirmation.download", "tickets.{jwt.user.rawUserMetaData.organizationId}.logs.read", "tickets.{jwt.user.rawUserMetaData.organizationId}.logs.create", "tickets.{jwt.user.rawUserMetaData.organizationId}.logs.delete", "clients.read", "clients.create", "clients.edit", "clients.delete", "clients.pin.read", "clients.pin.edit", "clients.trader.edit", "clients.logs.read", "clients.logs.create", "clients.logs.delete", "clients.{jwt.user.rawUserMetaData.organizationId}.read", "clients.{jwt.user.rawUserMetaData.organizationId}.create", "clients.{jwt.user.rawUserMetaData.organizationId}.edit", "clients.{jwt.user.rawUserMetaData.organizationId}.delete", "clients.{jwt.user.rawUserMetaData.organizationId}.pin.read", "clients.{jwt.user.rawUserMetaData.organizationId}.pin.edit", "clients.{jwt.user.rawUserMetaData.organizationId}.trader.edit", "clients.{jwt.user.rawUserMetaData.organizationId}.logs.read", "clients.{jwt.user.rawUserMetaData.organizationId}.logs.create", "clients.{jwt.user.rawUserMetaData.organizationId}.logs.delete", "users.read", "users.create", "users.edit", "users.delete", "users.ban", "users.password.reset.send", "users.password.edit", "users.2fa.enable", "users.2fa.disable", "users.roles.read", "users.roles.edit", "users.scopes.read", "users.scopes.assign", "users.scopes.delete", "users.logs.read", "users.logs.create", "users.logs.delete", "users.{jwt.user.rawUserMetaData.organizationId}.read", "users.{jwt.user.rawUserMetaData.organizationId}.create", "users.{jwt.user.rawUserMetaData.organizationId}.edit", "users.{jwt.user.rawUserMetaData.organizationId}.delete", "users.{jwt.user.rawUserMetaData.organizationId}.ban", "users.{jwt.user.rawUserMetaData.organizationId}.password.reset.send", "users.{jwt.user.rawUserMetaData.organizationId}.password.edit", "users.{jwt.user.rawUserMetaData.organizationId}.2fa.enable", "users.{jwt.user.rawUserMetaData.organizationId}.2fa.disable", "users.{jwt.user.rawUserMetaData.organizationId}.roles.read", "users.{jwt.user.rawUserMetaData.organizationId}.roles.edit", "users.{jwt.user.rawUserMetaData.organizationId}.scopes.read", "users.{jwt.user.rawUserMetaData.organizationId}.scopes.assign", "users.{jwt.user.rawUserMetaData.organizationId}.scopes.delete", "users.{jwt.user.rawUserMetaData.organizationId}.logs.read", "users.{jwt.user.rawUserMetaData.organizationId}.logs.create", "users.{jwt.user.rawUserMetaData.organizationId}.logs.delete", "traders.read", "traders.create", "traders.edit", "traders.delete", "traders.logs", "roles.read", "roles.create", "roles.edit", "roles.delete", "roles.scopes.assign", "roles.scopes.delete", "roles.logs.read", "roles.logs.create", "roles.logs.delete", "roles.users.read", "test.admin", "test.read", "test.edit", "test.delete", "test.{jwt.organizationId}.read", "test.{jwt.user.rawUserMetaData.organizationId}.read", "test.{jwt.user.rawUserMetaData.organizationId}.edit", "test.{param.resourceId}.read", "test.organization.{jwt.user.rawUserMetaData.organizationId}.resource.{jwt.user.rawUserMetaData.organizationId}.read", "test.organization.{jwt.user.rawUserMetaData.organizationId}.branch.{jwt.userData.organizationBranchId}.read", "test.{invalid}.scope", "test.{}.scope", "test.{jwt.}.scope", "test.{.key}.scope"];
 type LabeledScope = {
@@ -54,6 +54,4 @@ type LabeledScope = {
 };
 declare const LABELED_SCOPES: LabeledScope[];
 
-declare const _default: new (ctx: ExecutionContext, env: RbacEnv) => WorkerEntrypoint<RbacEnv>;
-
-export { LABELED_SCOPES, _default as default, defineRbacService };
+export { LABELED_SCOPES, defineRbacService };

package/dist/export/worker.d.ts

@@ -1,11 +1,11 @@
 import * as _develit_io_backend_sdk from '@develit-io/backend-sdk';
 import { IRPCResponse } from '@develit-io/backend-sdk';
-import { L as LabeledScope$1, t as tables, C as CreateRoleInput, a as CreateRoleOutput, A as AssignRoleToUserInput, b as AssignRoleToUserOutput, c as AssignRolesToUserInput, d as AssignRolesToUserOutput, R as RevokeRoleFromUserInput, e as RevokeRoleFromUserOutput, G as GrantScopeToUserInput, f as GrantScopeToUserOutput, g as GrantScopesToUserInput, h as GrantScopesToUserOutput, i as RevokeScopeFromUserInput, j as RevokeScopeFromUserOutput, k as GrantScopeToRoleInput, l as GrantScopeToRoleOutput, m as RevokeScopeFromRoleInput, n as RevokeScopeFromRoleOutput, o as GetAllUserRolesOutput, p as GetPermissionsOutput, q as GetUserPermissionsInput, r as GetUserPermissionsOutput, V as VerifyAccessInput, s as VerifyAccessOutput, D as DeleteRoleInput, u as DeleteRoleOutput, U as UpdateRoleInput, v as UpdateRoleOutput } from '../shared/rbac.CkCfjtKu.js';
+import { L as LabeledScope$1, t as tables, C as CreateRoleInput, a as CreateRoleOutput, A as AssignRoleToUserInput, b as AssignRoleToUserOutput, c as AssignRolesToUserInput, d as AssignRolesToUserOutput, R as RevokeRoleFromUserInput, e as RevokeRoleFromUserOutput, G as GrantScopeToUserInput, f as GrantScopeToUserOutput, g as GrantScopesToUserInput, h as GrantScopesToUserOutput, i as RevokeScopeFromUserInput, j as RevokeScopeFromUserOutput, k as GrantScopeToRoleInput, l as GrantScopeToRoleOutput, m as RevokeScopeFromRoleInput, n as RevokeScopeFromRoleOutput, o as GetAllUserRolesOutput, p as GetPermissionsOutput, q as GetUserPermissionsInput, r as GetUserPermissionsOutput, V as VerifyAccessInput, s as VerifyAccessOutput, D as DeleteRoleInput, u as DeleteRoleOutput, U as UpdateRoleInput, v as UpdateRoleOutput } from '../shared/rbac.DhWWcHCj.js';
 import { WorkerEntrypoint } from 'cloudflare:workers';
 import { DrizzleD1Database } from 'drizzle-orm/d1';
 import 'zod';
 import 'drizzle-orm';
-import '../shared/rbac.D5N_wrRb.js';
+import '../shared/rbac.CNbKvNcg.js';
 import 'drizzle-orm/sqlite-core';
 
 type TypedScopeObject<TScopes extends readonly LabeledScope$1[]> = {
@@ -45,7 +45,7 @@ declare class RbacServiceBase<TScopes extends readonly LabeledScope$1[] = Labele
 }
 declare function defineRbacService<const TScopes extends readonly LabeledScope$1[]>(config?: {
     scopes: TScopes;
-}): new (ctx: ExecutionContext, env: RbacEnv) => RbacServiceBase<TScopes>;
+}): typeof RbacServiceBase<TScopes>;
 
 declare const SCOPES: readonly ["tickets.read", "tickets.create", "tickets.edit", "tickets.delete", "tickets.archive", "tickets.automations.pause", "tickets.automations.resume", "tickets.dependencies.read", "tickets.dependencies.create", "tickets.dependencies.edit", "tickets.dependencies.delete", "tickets.confirmation.send", "tickets.confirmation.download", "tickets.payments.create", "tickets.payments.read", "tickets.payments.edit", "tickets.payments.delete", "tickets.payments.confirmation.send", "tickets.payments.confirmation.download", "tickets.logs.read", "tickets.logs.create", "tickets.logs.delete", "tickets.{jwt.user.rawUserMetaData.organizationId}.read", "tickets.{jwt.user.rawUserMetaData.organizationId}.create", "tickets.{jwt.user.rawUserMetaData.organizationId}.edit", "tickets.{jwt.user.rawUserMetaData.organizationId}.delete", "tickets.{jwt.user.rawUserMetaData.organizationId}.archive", "tickets.{jwt.user.rawUserMetaData.organizationId}.automations.pause", "tickets.{jwt.user.rawUserMetaData.organizationId}.automations.resume", "tickets.{jwt.user.rawUserMetaData.organizationId}.dependencies.read", "tickets.{jwt.user.rawUserMetaData.organizationId}.dependencies.create", "tickets.{jwt.user.rawUserMetaData.organizationId}.dependencies.edit", "tickets.{jwt.user.rawUserMetaData.organizationId}.dependencies.delete", "tickets.{jwt.user.rawUserMetaData.organizationId}.confirmation.send", "tickets.{jwt.user.rawUserMetaData.organizationId}.confirmation.download", "tickets.{jwt.user.rawUserMetaData.organizationId}.payments.create", "tickets.{jwt.user.rawUserMetaData.organizationId}.payments.read", "tickets.{jwt.user.rawUserMetaData.organizationId}.payments.edit", "tickets.{jwt.user.rawUserMetaData.organizationId}.payments.delete", "tickets.{jwt.user.rawUserMetaData.organizationId}.payments.confirmation.send", "tickets.{jwt.user.rawUserMetaData.organizationId}.payments.confirmation.download", "tickets.{jwt.user.rawUserMetaData.organizationId}.logs.read", "tickets.{jwt.user.rawUserMetaData.organizationId}.logs.create", "tickets.{jwt.user.rawUserMetaData.organizationId}.logs.delete", "clients.read", "clients.create", "clients.edit", "clients.delete", "clients.pin.read", "clients.pin.edit", "clients.trader.edit", "clients.logs.read", "clients.logs.create", "clients.logs.delete", "clients.{jwt.user.rawUserMetaData.organizationId}.read", "clients.{jwt.user.rawUserMetaData.organizationId}.create", "clients.{jwt.user.rawUserMetaData.organizationId}.edit", "clients.{jwt.user.rawUserMetaData.organizationId}.delete", "clients.{jwt.user.rawUserMetaData.organizationId}.pin.read", "clients.{jwt.user.rawUserMetaData.organizationId}.pin.edit", "clients.{jwt.user.rawUserMetaData.organizationId}.trader.edit", "clients.{jwt.user.rawUserMetaData.organizationId}.logs.read", "clients.{jwt.user.rawUserMetaData.organizationId}.logs.create", "clients.{jwt.user.rawUserMetaData.organizationId}.logs.delete", "users.read", "users.create", "users.edit", "users.delete", "users.ban", "users.password.reset.send", "users.password.edit", "users.2fa.enable", "users.2fa.disable", "users.roles.read", "users.roles.edit", "users.scopes.read", "users.scopes.assign", "users.scopes.delete", "users.logs.read", "users.logs.create", "users.logs.delete", "users.{jwt.user.rawUserMetaData.organizationId}.read", "users.{jwt.user.rawUserMetaData.organizationId}.create", "users.{jwt.user.rawUserMetaData.organizationId}.edit", "users.{jwt.user.rawUserMetaData.organizationId}.delete", "users.{jwt.user.rawUserMetaData.organizationId}.ban", "users.{jwt.user.rawUserMetaData.organizationId}.password.reset.send", "users.{jwt.user.rawUserMetaData.organizationId}.password.edit", "users.{jwt.user.rawUserMetaData.organizationId}.2fa.enable", "users.{jwt.user.rawUserMetaData.organizationId}.2fa.disable", "users.{jwt.user.rawUserMetaData.organizationId}.roles.read", "users.{jwt.user.rawUserMetaData.organizationId}.roles.edit", "users.{jwt.user.rawUserMetaData.organizationId}.scopes.read", "users.{jwt.user.rawUserMetaData.organizationId}.scopes.assign", "users.{jwt.user.rawUserMetaData.organizationId}.scopes.delete", "users.{jwt.user.rawUserMetaData.organizationId}.logs.read", "users.{jwt.user.rawUserMetaData.organizationId}.logs.create", "users.{jwt.user.rawUserMetaData.organizationId}.logs.delete", "traders.read", "traders.create", "traders.edit", "traders.delete", "traders.logs", "roles.read", "roles.create", "roles.edit", "roles.delete", "roles.scopes.assign", "roles.scopes.delete", "roles.logs.read", "roles.logs.create", "roles.logs.delete", "roles.users.read", "test.admin", "test.read", "test.edit", "test.delete", "test.{jwt.organizationId}.read", "test.{jwt.user.rawUserMetaData.organizationId}.read", "test.{jwt.user.rawUserMetaData.organizationId}.edit", "test.{param.resourceId}.read", "test.organization.{jwt.user.rawUserMetaData.organizationId}.resource.{jwt.user.rawUserMetaData.organizationId}.read", "test.organization.{jwt.user.rawUserMetaData.organizationId}.branch.{jwt.userData.organizationBranchId}.read", "test.{invalid}.scope", "test.{}.scope", "test.{jwt.}.scope", "test.{.key}.scope"];
 type LabeledScope = {
@@ -54,8 +54,4 @@ type LabeledScope = {
 };
 declare const LABELED_SCOPES: LabeledScope[];
 
-declare const _default: new (ctx: ExecutionContext, env: RbacEnv) => WorkerEntrypoint<RbacEnv>;
-
-// @ts-ignore
-export = _default;
 export { LABELED_SCOPES, defineRbacService };

package/dist/export/worker.mjs

@@ -1,12 +1,31 @@
 import { uuidv4, first, createInternalError, develitWorker, action, service } from '@develit-io/backend-sdk';
 import { s as schema } from '../shared/rbac.BUAU2nhH.mjs';
-import { eq, and, count, inArray } from 'drizzle-orm';
+import { defineRelations, eq, and, count, inArray } from 'drizzle-orm';
 import { c as createRoleInputSchema, a as assignRoleToUserInputSchema, b as assignRolesToUserInputSchema, r as revokeRoleFromUserInputSchema, f as grantScopeToUserInputSchema, h as grantScopesToUserInputSchema, n as revokeScopeFromUserInputSchema, e as grantScopeToRoleInputSchema, m as revokeScopeFromRoleInputSchema, g as getUserPermissionsInputSchema, v as verifyAccessInputSchema, d as deleteRoleInputSchema, u as updateRoleInputSchema, l as isScopeObject, k as isOrCondition, i as isAndCondition, j as isImplicitAndCondition } from '../shared/rbac.BypNeIm_.mjs';
 import { z } from 'zod';
 import { WorkerEntrypoint } from 'cloudflare:workers';
 import { drizzle } from 'drizzle-orm/d1';
 import 'drizzle-orm/sqlite-core';
 
+const relations = defineRelations(schema, (r) => ({
+  role: {
+    roleScopes: r.many.roleScope(),
+    userRoles: r.many.userRole()
+  },
+  roleScope: {
+    role: r.one.role({
+      from: r.roleScope.roleId,
+      to: r.role.id
+    })
+  },
+  userRole: {
+    role: r.one.role({
+      from: r.userRole.roleId,
+      to: r.role.id
+    })
+  }
+}));
+
 const tables = schema;
 
 const assignRoleToUserCommand = async ({
@@ -378,7 +397,7 @@ var __decorateClass = (decorators, target, key, kind) => {
 let RbacServiceBase = class extends develitWorker(WorkerEntrypoint) {
   constructor(ctx, env, scopes) {
     super(ctx, env);
-    this.db = drizzle(this.env.RBAC_D1, { schema: tables });
+    this.db = drizzle(this.env.RBAC_D1, { schema: tables, relations });
     this.SCOPES = scopes;
   }
   validateScope(scope) {
@@ -1142,8 +1161,4 @@ const LABELED_SCOPES = [
   // { label: 'Smazat logy účtů', value: 'accounts.logs.delete' },
 ];
 
-const RbacService = defineRbacService({
-  scopes: LABELED_SCOPES
-});
-
-export { LABELED_SCOPES, RbacService as default, defineRbacService };
+export { LABELED_SCOPES, defineRbacService };

package/dist/export/wrangler.cjs

@@ -3,13 +3,14 @@
 const backendSdk = require('@develit-io/backend-sdk');
 
 function defineRbacServiceWrangler(config) {
-  const { project, name, envs } = config;
+  const { project, name, d1, envs } = config;
   const base = {
     ...backendSdk.composeWranglerBase({
       project,
       name
     }),
     vars: {
+      ...envs.local.customVars,
       ...envs.local.vars,
       ENVIRONMENT: "localhost"
     },
@@ -23,7 +24,7 @@ function defineRbacServiceWrangler(config) {
       {
         binding: "RBAC_D1",
         database_name: `${project}-rbac`,
-        database_id: envs.local.d1.id,
+        database_id: d1.id,
         migrations_dir: "./src/database/migrations"
       }
     ],
@@ -34,17 +35,10 @@ function defineRbacServiceWrangler(config) {
   )) {
     base.env[envName] = {
       vars: {
+        ...envCfg.customVars,
         ...envCfg.vars,
         ENVIRONMENT: envName
-      },
-      d1_databases: [
-        {
-          binding: "RBAC_D1",
-          database_name: `${project}-rbac-${envName}`,
-          database_id: envCfg.d1.id,
-          migrations_dir: "./src/database/migrations"
-        }
-      ]
+      }
     };
   }
   return base;

package/dist/export/wrangler.d.cts

@@ -1,4 +1,4 @@
-import { R as RbacServiceWranglerConfig } from '../shared/rbac.DUk_qXWk.cjs';
+import { R as RbacServiceWranglerConfig } from '../shared/rbac.ZCOTsP5y.cjs';
 
 declare function defineRbacServiceWrangler(config: RbacServiceWranglerConfig): {
     vars: {

package/dist/export/wrangler.d.mts

@@ -1,4 +1,4 @@
-import { R as RbacServiceWranglerConfig } from '../shared/rbac.DUk_qXWk.mjs';
+import { R as RbacServiceWranglerConfig } from '../shared/rbac.ZCOTsP5y.mjs';
 
 declare function defineRbacServiceWrangler(config: RbacServiceWranglerConfig): {
     vars: {

package/dist/export/wrangler.d.ts

@@ -1,4 +1,4 @@
-import { R as RbacServiceWranglerConfig } from '../shared/rbac.DUk_qXWk.js';
+import { R as RbacServiceWranglerConfig } from '../shared/rbac.ZCOTsP5y.js';
 
 declare function defineRbacServiceWrangler(config: RbacServiceWranglerConfig): {
     vars: {

package/dist/export/wrangler.mjs

@@ -1,13 +1,14 @@
 import { composeWranglerBase } from '@develit-io/backend-sdk';
 
 function defineRbacServiceWrangler(config) {
-  const { project, name, envs } = config;
+  const { project, name, d1, envs } = config;
   const base = {
     ...composeWranglerBase({
       project,
       name
     }),
     vars: {
+      ...envs.local.customVars,
       ...envs.local.vars,
       ENVIRONMENT: "localhost"
     },
@@ -21,7 +22,7 @@ function defineRbacServiceWrangler(config) {
       {
         binding: "RBAC_D1",
         database_name: `${project}-rbac`,
-        database_id: envs.local.d1.id,
+        database_id: d1.id,
         migrations_dir: "./src/database/migrations"
       }
     ],
@@ -32,17 +33,10 @@ function defineRbacServiceWrangler(config) {
   )) {
     base.env[envName] = {
       vars: {
+        ...envCfg.customVars,
         ...envCfg.vars,
         ENVIRONMENT: envName
-      },
-      d1_databases: [
-        {
-          binding: "RBAC_D1",
-          database_name: `${project}-rbac-${envName}`,
-          database_id: envCfg.d1.id,
-          migrations_dir: "./src/database/migrations"
-        }
-      ]
+      }
     };
   }
   return base;

package/dist/shared/rbac.CNbKvNcg.d.cts

@@ -0,0 +1,221 @@
+import * as drizzle_orm from 'drizzle-orm';
+import * as drizzle_orm_sqlite_core from 'drizzle-orm/sqlite-core';
+
+declare const roleScope: drizzle_orm_sqlite_core.SQLiteTableWithColumns<{
+    name: "roles_scopes";
+    schema: undefined;
+    columns: {
+        roleId: drizzle_orm_sqlite_core.SQLiteColumn<{
+            name: string;
+            tableName: "roles_scopes";
+            dataType: "string";
+            data: string;
+            driverParam: string;
+            notNull: true;
+            hasDefault: false;
+            isPrimaryKey: false;
+            isAutoincrement: false;
+            hasRuntimeDefault: false;
+            enumValues: [string, ...string[]];
+            baseColumn: never;
+            identity: undefined;
+            generated: undefined;
+        }, {}>;
+        scope: drizzle_orm_sqlite_core.SQLiteColumn<{
+            name: string;
+            tableName: "roles_scopes";
+            dataType: "string";
+            data: string;
+            driverParam: string;
+            notNull: true;
+            hasDefault: false;
+            isPrimaryKey: false;
+            isAutoincrement: false;
+            hasRuntimeDefault: false;
+            enumValues: [string, ...string[]];
+            baseColumn: never;
+            identity: undefined;
+            generated: undefined;
+        }, {}>;
+        resourceId: drizzle_orm_sqlite_core.SQLiteColumn<{
+            name: string;
+            tableName: "roles_scopes";
+            dataType: "string";
+            data: string;
+            driverParam: string;
+            notNull: false;
+            hasDefault: false;
+            isPrimaryKey: false;
+            isAutoincrement: false;
+            hasRuntimeDefault: false;
+            enumValues: [string, ...string[]];
+            baseColumn: never;
+            identity: undefined;
+            generated: undefined;
+        }, {}>;
+        id: drizzle_orm.IsPrimaryKey<drizzle_orm.NotNull<drizzle_orm_sqlite_core.SQLiteTextBuilderInitial<"id", [string, ...string[]], number | undefined>>>;
+        createdAt: drizzle_orm.HasDefault<drizzle_orm_sqlite_core.SQLiteTimestampBuilderInitial<"created_at">>;
+        createdBy: drizzle_orm.HasDefault<drizzle_orm_sqlite_core.SQLiteTextBuilderInitial<"created_by", [string, ...string[]], number | undefined>>;
+        updatedAt: drizzle_orm.HasDefault<drizzle_orm.HasDefault<drizzle_orm_sqlite_core.SQLiteTimestampBuilderInitial<"updated_at">>>;
+        updatedBy: drizzle_orm.HasDefault<drizzle_orm_sqlite_core.SQLiteTextBuilderInitial<"updated_by", [string, ...string[]], number | undefined>>;
+        deletedAt: drizzle_orm.HasDefault<drizzle_orm_sqlite_core.SQLiteTimestampBuilderInitial<"deleted_at">>;
+        deletedBy: drizzle_orm.HasDefault<drizzle_orm_sqlite_core.SQLiteTextBuilderInitial<"deleted_by", [string, ...string[]], number | undefined>>;
+    };
+    dialect: "sqlite";
+}>;
+
+declare const role: drizzle_orm_sqlite_core.SQLiteTableWithColumns<{
+    name: "roles";
+    schema: undefined;
+    columns: {
+        name: drizzle_orm_sqlite_core.SQLiteColumn<{
+            name: string;
+            tableName: "roles";
+            dataType: "string";
+            data: string;
+            driverParam: string;
+            notNull: true;
+            hasDefault: false;
+            isPrimaryKey: false;
+            isAutoincrement: false;
+            hasRuntimeDefault: false;
+            enumValues: [string, ...string[]];
+            baseColumn: never;
+            identity: undefined;
+            generated: undefined;
+        }, {}>;
+        id: drizzle_orm.IsPrimaryKey<drizzle_orm.NotNull<drizzle_orm_sqlite_core.SQLiteTextBuilderInitial<"id", [string, ...string[]], number | undefined>>>;
+        createdAt: drizzle_orm.HasDefault<drizzle_orm_sqlite_core.SQLiteTimestampBuilderInitial<"created_at">>;
+        createdBy: drizzle_orm.HasDefault<drizzle_orm_sqlite_core.SQLiteTextBuilderInitial<"created_by", [string, ...string[]], number | undefined>>;
+        updatedAt: drizzle_orm.HasDefault<drizzle_orm.HasDefault<drizzle_orm_sqlite_core.SQLiteTimestampBuilderInitial<"updated_at">>>;
+        updatedBy: drizzle_orm.HasDefault<drizzle_orm_sqlite_core.SQLiteTextBuilderInitial<"updated_by", [string, ...string[]], number | undefined>>;
+        deletedAt: drizzle_orm.HasDefault<drizzle_orm_sqlite_core.SQLiteTimestampBuilderInitial<"deleted_at">>;
+        deletedBy: drizzle_orm.HasDefault<drizzle_orm_sqlite_core.SQLiteTextBuilderInitial<"deleted_by", [string, ...string[]], number | undefined>>;
+    };
+    dialect: "sqlite";
+}>;
+
+declare const userRole: drizzle_orm_sqlite_core.SQLiteTableWithColumns<{
+    name: "user_roles";
+    schema: undefined;
+    columns: {
+        userId: drizzle_orm_sqlite_core.SQLiteColumn<{
+            name: string;
+            tableName: "user_roles";
+            dataType: "string";
+            data: string;
+            driverParam: string;
+            notNull: true;
+            hasDefault: false;
+            isPrimaryKey: false;
+            isAutoincrement: false;
+            hasRuntimeDefault: false;
+            enumValues: [string, ...string[]];
+            baseColumn: never;
+            identity: undefined;
+            generated: undefined;
+        }, {}>;
+        roleId: drizzle_orm_sqlite_core.SQLiteColumn<{
+            name: string;
+            tableName: "user_roles";
+            dataType: "string";
+            data: string;
+            driverParam: string;
+            notNull: true;
+            hasDefault: false;
+            isPrimaryKey: false;
+            isAutoincrement: false;
+            hasRuntimeDefault: false;
+            enumValues: [string, ...string[]];
+            baseColumn: never;
+            identity: undefined;
+            generated: undefined;
+        }, {}>;
+        id: drizzle_orm.IsPrimaryKey<drizzle_orm.NotNull<drizzle_orm_sqlite_core.SQLiteTextBuilderInitial<"id", [string, ...string[]], number | undefined>>>;
+        createdAt: drizzle_orm.HasDefault<drizzle_orm_sqlite_core.SQLiteTimestampBuilderInitial<"created_at">>;
+        createdBy: drizzle_orm.HasDefault<drizzle_orm_sqlite_core.SQLiteTextBuilderInitial<"created_by", [string, ...string[]], number | undefined>>;
+        updatedAt: drizzle_orm.HasDefault<drizzle_orm.HasDefault<drizzle_orm_sqlite_core.SQLiteTimestampBuilderInitial<"updated_at">>>;
+        updatedBy: drizzle_orm.HasDefault<drizzle_orm_sqlite_core.SQLiteTextBuilderInitial<"updated_by", [string, ...string[]], number | undefined>>;
+        deletedAt: drizzle_orm.HasDefault<drizzle_orm_sqlite_core.SQLiteTimestampBuilderInitial<"deleted_at">>;
+        deletedBy: drizzle_orm.HasDefault<drizzle_orm_sqlite_core.SQLiteTextBuilderInitial<"deleted_by", [string, ...string[]], number | undefined>>;
+    };
+    dialect: "sqlite";
+}>;
+
+declare const userScope: drizzle_orm_sqlite_core.SQLiteTableWithColumns<{
+    name: "user_scopes";
+    schema: undefined;
+    columns: {
+        userId: drizzle_orm_sqlite_core.SQLiteColumn<{
+            name: string;
+            tableName: "user_scopes";
+            dataType: "string";
+            data: string;
+            driverParam: string;
+            notNull: true;
+            hasDefault: false;
+            isPrimaryKey: false;
+            isAutoincrement: false;
+            hasRuntimeDefault: false;
+            enumValues: [string, ...string[]];
+            baseColumn: never;
+            identity: undefined;
+            generated: undefined;
+        }, {}>;
+        scope: drizzle_orm_sqlite_core.SQLiteColumn<{
+            name: string;
+            tableName: "user_scopes";
+            dataType: "string";
+            data: string;
+            driverParam: string;
+            notNull: true;
+            hasDefault: false;
+            isPrimaryKey: false;
+            isAutoincrement: false;
+            hasRuntimeDefault: false;
+            enumValues: [string, ...string[]];
+            baseColumn: never;
+            identity: undefined;
+            generated: undefined;
+        }, {}>;
+        resourceId: drizzle_orm_sqlite_core.SQLiteColumn<{
+            name: string;
+            tableName: "user_scopes";
+            dataType: "string";
+            data: string;
+            driverParam: string;
+            notNull: false;
+            hasDefault: false;
+            isPrimaryKey: false;
+            isAutoincrement: false;
+            hasRuntimeDefault: false;
+            enumValues: [string, ...string[]];
+            baseColumn: never;
+            identity: undefined;
+            generated: undefined;
+        }, {}>;
+        id: drizzle_orm.IsPrimaryKey<drizzle_orm.NotNull<drizzle_orm_sqlite_core.SQLiteTextBuilderInitial<"id", [string, ...string[]], number | undefined>>>;
+        createdAt: drizzle_orm.HasDefault<drizzle_orm_sqlite_core.SQLiteTimestampBuilderInitial<"created_at">>;
+        createdBy: drizzle_orm.HasDefault<drizzle_orm_sqlite_core.SQLiteTextBuilderInitial<"created_by", [string, ...string[]], number | undefined>>;
+        updatedAt: drizzle_orm.HasDefault<drizzle_orm.HasDefault<drizzle_orm_sqlite_core.SQLiteTimestampBuilderInitial<"updated_at">>>;
+        updatedBy: drizzle_orm.HasDefault<drizzle_orm_sqlite_core.SQLiteTextBuilderInitial<"updated_by", [string, ...string[]], number | undefined>>;
+        deletedAt: drizzle_orm.HasDefault<drizzle_orm_sqlite_core.SQLiteTimestampBuilderInitial<"deleted_at">>;
+        deletedBy: drizzle_orm.HasDefault<drizzle_orm_sqlite_core.SQLiteTextBuilderInitial<"deleted_by", [string, ...string[]], number | undefined>>;
+    };
+    dialect: "sqlite";
+}>;
+
+declare const schema_role: typeof role;
+declare const schema_roleScope: typeof roleScope;
+declare const schema_userRole: typeof userRole;
+declare const schema_userScope: typeof userScope;
+declare namespace schema {
+  export {
+    schema_role as role,
+    schema_roleScope as roleScope,
+    schema_userRole as userRole,
+    schema_userScope as userScope,
+  };
+}
+
+export { roleScope as a, userScope as b, role as r, schema as s, userRole as u };