@cosmicdrift/kumiko-bundled-features 0.332.0 → 0.333.0

package/dist/auth-email-password/handlers/invite-create.write.d.ts

@@ -23,7 +23,8 @@ export type InviteCreateOptions = {
     readonly locale?: AuthMailLocale;
     readonly canAssignRole?: (inviterRoles: readonly string[], targetRole: string) => boolean;
     /** Opt-in allow-list for app-defined (unranked) roles the elevation guard
-     *  would otherwise reject with unassignable_membership_role (fw#2398). */
+     *  would otherwise reject with unassignable_membership_role (fw#2398).
+     *  Rank-aware alternative: declare roles via EXT_ASSIGNABLE_ROLE. */
     readonly additionalAssignableRoles?: readonly string[];
 };
 export declare function createInviteCreateHandler(opts: InviteCreateOptions): import("@cosmicdrift/kumiko-types/define-handler").WriteHandlerDefinition<"invite-create", z.ZodObject<{

package/dist/auth-email-password/handlers/invite-create.write.js

@@ -18,7 +18,7 @@
 // invite-create.
 import { generateToken } from "@cosmicdrift/kumiko-framework/api";
 import { createEventStoreExecutor } from "@cosmicdrift/kumiko-framework/db";
-import { access, defineWriteHandler } from "@cosmicdrift/kumiko-framework/engine";
+import { access, assignableAppRolesFromUsages, defineWriteHandler, EXT_ASSIGNABLE_ROLE, } from "@cosmicdrift/kumiko-framework/engine";
 import { InternalError, writeFailure } from "@cosmicdrift/kumiko-framework/errors";
 import { Temporal } from "temporal-polyfill";
 import * as z from "zod";
@@ -54,7 +54,7 @@ export function createInviteCreateHandler(opts) {
             if (forbiddenRole !== undefined) {
                 return writeFailure(reservedMembershipRoleError(forbiddenRole));
             }
-            const elevationForbidden = findForbiddenRoleAssignment(event.user.roles, [event.payload.role], []);
+            const elevationForbidden = findForbiddenRoleAssignment(event.user.roles, [event.payload.role], [], assignableAppRolesFromUsages(ctx.registry.getExtensionUsages(EXT_ASSIGNABLE_ROLE)));
             if (elevationForbidden !== undefined &&
                 !opts.additionalAssignableRoles?.includes(elevationForbidden)) {
                 return writeFailure(unassignableMembershipRoleError(elevationForbidden));

package/dist/tenant/constants.d.ts

@@ -11,7 +11,7 @@ export declare const MEMBER_STATUS_CELL_COMPONENT: "MemberStatusCell";
 export declare const MEMBER_ROLES_CELL_COMPONENT: "MemberRolesCell";
 /** Closed allowlist for invite-role picker — never free text (escalation guard). */
 export declare const DEFAULT_INVITE_ROLE_OPTIONS: readonly ["User", "Editor", "Admin"];
-export declare const OWNER_INVITE_ROLE_OPTIONS: readonly ["User", "Editor", "Admin", "TenantAdmin"];
+export declare const OWNER_INVITE_ROLE_OPTIONS: readonly ["User", "Member", "Editor", "Admin", "TenantAdmin"];
 export declare const TenantHandlers: {
     readonly create: "tenant:write:create";
     readonly update: "tenant:write:update";

package/dist/tenant/constants.js

@@ -22,7 +22,13 @@ export const DEFAULT_INVITE_ROLE_OPTIONS = ["User", "Editor", "Admin"];
 // Full assignable rank list, used by memberRolesEditScreen: that screen is
 // prefilled with a member's *current* roles, so it must be able to represent
 // every rank a membership can actually hold, including TenantAdmin (fw#2452).
-export const OWNER_INVITE_ROLE_OPTIONS = ["User", "Editor", "Admin", "TenantAdmin"];
+export const OWNER_INVITE_ROLE_OPTIONS = [
+    "User",
+    "Member",
+    "Editor",
+    "Admin",
+    "TenantAdmin",
+];
 // Qualified write handler names (QN format: scope:type:name)
 export const TenantHandlers = {
     create: "tenant:write:create",

package/dist/tenant/feature.d.ts

@@ -1,4 +1,4 @@
-import { type FeatureDefinition } from "@cosmicdrift/kumiko-framework/engine";
+import { type AssignableAppRoles, type FeatureDefinition } from "@cosmicdrift/kumiko-framework/engine";
 export { tenantEntity, tenantTable } from "./schema/tenant.js";
 export type TenantFeatureOptions = {
     /** Adds the /members "invite" drawer button + its `invite-create`
@@ -9,5 +9,8 @@ export type TenantFeatureOptions = {
      *  handler lookup fails). Off by default: `tenant` cannot see whether an
      *  app configured that optional auth-email-password flow. */
     readonly inviteScreen?: boolean;
+    /** Screen options only — the elevation guard always reads the registry. */
+    readonly assignableAppRoles?: AssignableAppRoles;
 };
+export declare function collectAssignableAppRoles(features: readonly FeatureDefinition[]): AssignableAppRoles;
 export declare function createTenantFeature(options?: TenantFeatureOptions): FeatureDefinition;

package/dist/tenant/feature.js

@@ -1,4 +1,4 @@
-import { access, createSystemConfig, createTenantConfig, defineEntityDetailHandler, defineEntityListHandler, defineEntityUpdateHandler, defineFeature, i18nKey, } from "@cosmicdrift/kumiko-framework/engine";
+import { access, assignableAppRolesFromUsages, createSystemConfig, createTenantConfig, defineEntityDetailHandler, defineEntityListHandler, defineEntityUpdateHandler, defineFeature, EXT_ASSIGNABLE_ROLE, i18nKey, } from "@cosmicdrift/kumiko-framework/engine";
 import { activeTenantIdsQuery } from "./handlers/active-tenant-ids.query.js";
 import { addMemberWrite } from "./handlers/add-member.write.js";
 import { cancelInvitationWrite } from "./handlers/cancel-invitation.write.js";
@@ -20,8 +20,13 @@ import { TENANT_I18N } from "./i18n.js";
 import { tenantInvitationEntity } from "./invitation-table.js";
 import { tenantMembershipEntity } from "./membership-table.js";
 import { tenantEntity } from "./schema/tenant.js";
-import { createMembersScreen, inviteCreateScreen, memberRolesEditScreen, tenantEditScreen, tenantListScreen, } from "./screens.js";
+import { createInviteCreateScreen, createMemberRolesEditScreen, createMembersScreen, tenantEditScreen, tenantListScreen, } from "./screens.js";
 export { tenantEntity, tenantTable } from "./schema/tenant.js";
+export function collectAssignableAppRoles(features) {
+    return assignableAppRolesFromUsages(features
+        .flatMap((feature) => feature.extensionUsages)
+        .filter((usage) => usage.extensionName === EXT_ASSIGNABLE_ROLE));
+}
 // --- Feature ---
 export function createTenantFeature(options) {
     return defineFeature("tenant", (r) => {
@@ -33,6 +38,10 @@ export function createTenantFeature(options) {
         });
         r.systemScope();
         r.requires("config");
+        r.extendsRegistrar(EXT_ASSIGNABLE_ROLE, {});
+        r.bootCheck(({ features }) => {
+            collectAssignableAppRoles(features);
+        });
         r.entity("tenant", tenantEntity);
         r.entity("tenant-membership", tenantMembershipEntity);
         r.entity("tenant-invitation", tenantInvitationEntity);
@@ -128,9 +137,9 @@ export function createTenantFeature(options) {
         // §2.6), invite via a drawer-hosted actionForm, role-edit via
         // actionForm. Screen access matches handler access.admin.
         r.screen(createMembersScreen(options));
-        r.screen(memberRolesEditScreen);
+        r.screen(createMemberRolesEditScreen(options?.assignableAppRoles));
         if (options?.inviteScreen) {
-            r.screen(inviteCreateScreen);
+            r.screen(createInviteCreateScreen(options.assignableAppRoles));
         }
         r.nav({
             id: "members",

package/dist/tenant/handlers/update-member-roles.write.js

@@ -1,6 +1,6 @@
 import { fetchOne } from "@cosmicdrift/kumiko-framework/bun-db";
 import { createEventStoreExecutor } from "@cosmicdrift/kumiko-framework/db";
-import { access, createSystemUser, defineWriteHandler, findForbiddenRoleAssignment, withResponseData, } from "@cosmicdrift/kumiko-framework/engine";
+import { access, assignableAppRolesFromUsages, createSystemUser, defineWriteHandler, EXT_ASSIGNABLE_ROLE, findForbiddenRoleAssignment, withResponseData, } from "@cosmicdrift/kumiko-framework/engine";
 import { InternalError, NotFoundError, ValidationError, writeFailure, } from "@cosmicdrift/kumiko-framework/errors";
 import { parseRoles } from "@cosmicdrift/kumiko-framework/utils";
 import * as z from "zod";
@@ -70,7 +70,7 @@ export const updateMemberRolesWrite = defineWriteHandler({
         const row = existing; // @cast-boundary generic-record
         const currentTargetRoles = parseRoles(row["roles"]);
         if (!event.user.roles.includes("system")) {
-            const forbiddenElevation = findForbiddenRoleAssignment(event.user.roles, event.payload.roles, currentTargetRoles);
+            const forbiddenElevation = findForbiddenRoleAssignment(event.user.roles, event.payload.roles, currentTargetRoles, assignableAppRolesFromUsages(ctx.registry.getExtensionUsages(EXT_ASSIGNABLE_ROLE)));
             if (forbiddenElevation !== undefined) {
                 return writeFailure(unassignableMembershipRoleError(forbiddenElevation));
             }

package/dist/tenant/i18n.js

@@ -24,12 +24,14 @@ export const TENANT_I18N = {
     "tenant:entity:__action-form__:field:email": { en: "Email" },
     "tenant:entity:__action-form__:field:role": { en: "Role" },
     "tenant:entity:__action-form__:field:role:option:User": { en: "User" },
+    "tenant:entity:__action-form__:field:role:option:Member": { en: "Member" },
     "tenant:entity:__action-form__:field:role:option:Admin": { en: "Admin" },
     "tenant:entity:__action-form__:field:role:option:TenantAdmin": { en: "Tenant Admin" },
     "tenant:entity:__action-form__:field:role:option:Editor": { en: "Editor" },
     "tenant:entity:__action-form__:field:userId": { en: "User ID" },
     "tenant:entity:__action-form__:field:roles": { en: "Roles" },
     "tenant:entity:__action-form__:field:roles:option:User": { en: "User" },
+    "tenant:entity:__action-form__:field:roles:option:Member": { en: "Member" },
     "tenant:entity:__action-form__:field:roles:option:Admin": { en: "Admin" },
     "tenant:entity:__action-form__:field:roles:option:TenantAdmin": { en: "Tenant Admin" },
     "tenant:entity:__action-form__:field:roles:option:Editor": { en: "Editor" },

package/dist/tenant/index.d.ts

@@ -1,6 +1,6 @@
 export { TenantCommandSchemas } from "./command-schemas.js";
 export { TENANT_FEATURE, TenantErrors, TenantHandlers, TenantQueries } from "./constants.js";
-export { createTenantFeature } from "./feature.js";
+export { collectAssignableAppRoles, createTenantFeature } from "./feature.js";
 export type { InvitationStatus } from "./invitation-table.js";
 export { INVITATION_STATUS, INVITATION_STATUSES, tenantInvitationEntity, tenantInvitationsTable, } from "./invitation-table.js";
 export { isTenantServingPublicContent } from "./is-tenant-serving-public-content.js";

package/dist/tenant/index.js

@@ -1,6 +1,6 @@
 export { TenantCommandSchemas } from "./command-schemas.js";
 export { TENANT_FEATURE, TenantErrors, TenantHandlers, TenantQueries } from "./constants.js";
-export { createTenantFeature } from "./feature.js";
+export { collectAssignableAppRoles, createTenantFeature } from "./feature.js";
 export { INVITATION_STATUS, INVITATION_STATUSES, tenantInvitationEntity, tenantInvitationsTable, } from "./invitation-table.js";
 export { isTenantServingPublicContent } from "./is-tenant-serving-public-content.js";
 export { tenantMembershipEntity, tenantMembershipsTable } from "./membership-table.js";

package/dist/tenant/screens.d.ts

@@ -1,9 +1,35 @@
-import { type EntityEditScreenDefinition, type EntityListScreenDefinition, type ScreenDefinition } from "@cosmicdrift/kumiko-framework/engine";
+import { type AssignableAppRoles, type EntityEditScreenDefinition, type EntityListScreenDefinition, type ScreenDefinition } from "@cosmicdrift/kumiko-framework/engine";
 export declare const tenantListScreen: EntityListScreenDefinition;
 export declare const tenantEditScreen: EntityEditScreenDefinition;
 export declare function createMembersScreen(options?: {
     readonly inviteScreen?: boolean;
 }): ScreenDefinition;
+export declare function createInviteCreateScreen(assignableAppRoles?: AssignableAppRoles): {
+    id: "invite-create";
+    type: "actionForm";
+    handler: "auth-email-password:write:invite-create";
+    fields: {
+        email: {
+            type: "text";
+            required: true;
+            format: "email";
+        };
+        role: {
+            type: "select";
+            options: string[];
+            required: true;
+        };
+    };
+    layout: {
+        sections: {
+            fields: string[];
+        }[];
+    };
+    submitLabel: string;
+    access: {
+        roles: readonly string[];
+    };
+};
 export declare const inviteCreateScreen: {
     id: "invite-create";
     type: "actionForm";
@@ -16,7 +42,7 @@ export declare const inviteCreateScreen: {
         };
         role: {
             type: "select";
-            options: readonly ["User", "Editor", "Admin"];
+            options: string[];
             required: true;
         };
     };
@@ -30,6 +56,36 @@ export declare const inviteCreateScreen: {
         roles: readonly string[];
     };
 };
+export declare function createMemberRolesEditScreen(assignableAppRoles?: AssignableAppRoles): {
+    id: "member-roles-edit";
+    type: "actionForm";
+    handler: "tenant:write:update-member-roles";
+    redirect: "members";
+    cancelTarget: "members";
+    fields: {
+        userId: {
+            type: "text";
+            required: true;
+        };
+        roles: {
+            type: "multiSelect";
+            options: string[];
+            required: true;
+        };
+    };
+    layout: {
+        sections: {
+            fields: (string | {
+                field: string;
+                readOnly: true;
+            })[];
+        }[];
+    };
+    submitLabel: string;
+    access: {
+        roles: readonly string[];
+    };
+};
 export declare const memberRolesEditScreen: {
     id: "member-roles-edit";
     type: "actionForm";
@@ -43,7 +99,7 @@ export declare const memberRolesEditScreen: {
         };
         roles: {
             type: "multiSelect";
-            options: readonly ["User", "Editor", "Admin", "TenantAdmin"];
+            options: string[];
             required: true;
         };
     };

package/dist/tenant/screens.js

@@ -1,5 +1,5 @@
 import { AuthHandlers } from "@cosmicdrift/kumiko-bundled-features/auth-email-password/constants";
-import { access, i18nKey, } from "@cosmicdrift/kumiko-framework/engine";
+import { access, i18nKey, isAssignableByRole, } from "@cosmicdrift/kumiko-framework/engine";
 import { DEFAULT_INVITE_ROLE_OPTIONS, INVITE_CREATE_SCREEN_ID, MEMBER_ROLES_CELL_COMPONENT, MEMBER_ROLES_EDIT_SCREEN_ID, MEMBER_STATUS_CELL_COMPONENT, MEMBERS_SCREEN_ID, OWNER_INVITE_ROLE_OPTIONS, TenantHandlers, TenantQueries, } from "./constants.js";
 // Cross-tenant SystemAdmin platform view of the tenants themselves. The tenant
 // feature runs with `r.systemScope()`, so the entityList returns every tenant.
@@ -138,38 +138,56 @@ export function createMembersScreen(options) {
 // only entry point is the drawer button on /members. Only registered by
 // feature.ts when `TenantFeatureOptions.inviteScreen` is set — see
 // createMembersScreen's doc comment above for why.
-export const inviteCreateScreen = {
-    id: INVITE_CREATE_SCREEN_ID,
-    type: "actionForm",
-    handler: AuthHandlers.inviteCreate,
-    fields: {
-        email: { type: "text", required: true, format: "email" },
-        role: { type: "select", options: DEFAULT_INVITE_ROLE_OPTIONS, required: true },
-    },
-    layout: {
-        sections: [{ fields: ["email", "role"] }],
-    },
-    submitLabel: i18nKey("tenant.members.invite.submit"),
-    access: { roles: access.admin },
-};
-export const memberRolesEditScreen = {
-    id: MEMBER_ROLES_EDIT_SCREEN_ID,
-    type: "actionForm",
-    handler: TenantHandlers.updateMemberRoles,
-    redirect: MEMBERS_SCREEN_ID,
-    cancelTarget: MEMBERS_SCREEN_ID,
-    fields: {
-        userId: { type: "text", required: true },
-        // Prefilled with the member's current roles, so the option list must be
-        // able to represent every assignable rank — DEFAULT_INVITE_ROLE_OPTIONS
-        // omits TenantAdmin and would silently strip it on submit. Escalation
-        // still stays server-side via findForbiddenRoleAssignment (update-member-roles.write.ts).
-        roles: { type: "multiSelect", options: OWNER_INVITE_ROLE_OPTIONS, required: true },
-    },
-    layout: {
-        // Prefill userId from rowAction; readOnly so the operator cannot retarget.
-        sections: [{ fields: [{ field: "userId", readOnly: true }, "roles"] }],
-    },
-    submitLabel: i18nKey("tenant.members.roles.edit.submit"),
-    access: { roles: access.admin },
-};
+export function createInviteCreateScreen(assignableAppRoles = new Map()) {
+    // Admin sees this screen too, so only app roles Admin may grant are offered (fw#2414).
+    const appRoleOptions = [...assignableAppRoles]
+        .filter(([, assignableFrom]) => isAssignableByRole(assignableFrom, "Admin"))
+        .map(([role]) => role);
+    return {
+        id: INVITE_CREATE_SCREEN_ID,
+        type: "actionForm",
+        handler: AuthHandlers.inviteCreate,
+        fields: {
+            email: { type: "text", required: true, format: "email" },
+            role: {
+                type: "select",
+                options: [...DEFAULT_INVITE_ROLE_OPTIONS, ...appRoleOptions],
+                required: true,
+            },
+        },
+        layout: {
+            sections: [{ fields: ["email", "role"] }],
+        },
+        submitLabel: i18nKey("tenant.members.invite.submit"),
+        access: { roles: access.admin },
+    };
+}
+export const inviteCreateScreen = createInviteCreateScreen();
+export function createMemberRolesEditScreen(assignableAppRoles = new Map()) {
+    return {
+        id: MEMBER_ROLES_EDIT_SCREEN_ID,
+        type: "actionForm",
+        handler: TenantHandlers.updateMemberRoles,
+        redirect: MEMBERS_SCREEN_ID,
+        cancelTarget: MEMBERS_SCREEN_ID,
+        fields: {
+            userId: { type: "text", required: true },
+            // Prefilled with the member's current roles, so the option list must be
+            // able to represent every assignable rank — DEFAULT_INVITE_ROLE_OPTIONS
+            // omits TenantAdmin and would silently strip it on submit. Escalation
+            // still stays server-side via findForbiddenRoleAssignment (update-member-roles.write.ts).
+            roles: {
+                type: "multiSelect",
+                options: [...OWNER_INVITE_ROLE_OPTIONS, ...assignableAppRoles.keys()],
+                required: true,
+            },
+        },
+        layout: {
+            // Prefill userId from rowAction; readOnly so the operator cannot retarget.
+            sections: [{ fields: [{ field: "userId", readOnly: true }, "roles"] }],
+        },
+        submitLabel: i18nKey("tenant.members.roles.edit.submit"),
+        access: { roles: access.admin },
+    };
+}
+export const memberRolesEditScreen = createMemberRolesEditScreen();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cosmicdrift/kumiko-bundled-features",
-  "version": "0.332.0",
+  "version": "0.333.0",
   "description": "Built-in features — tenant, user, auth, delivery. The stuff you'd rewrite anyway, already typed.",
   "license": "BUSL-1.1",
   "author": "Marc Frost <marc@cosmicdriftgamestudio.com>",
@@ -483,12 +483,12 @@
     }
   },
   "dependencies": {
-    "@cosmicdrift/kumiko-dispatcher-live": "0.332.0",
-    "@cosmicdrift/kumiko-framework": "0.332.0",
-    "@cosmicdrift/kumiko-headless": "0.332.0",
-    "@cosmicdrift/kumiko-renderer": "0.332.0",
-    "@cosmicdrift/kumiko-renderer-web": "0.332.0",
-    "@cosmicdrift/kumiko-types": "0.332.0",
+    "@cosmicdrift/kumiko-dispatcher-live": "0.333.0",
+    "@cosmicdrift/kumiko-framework": "0.333.0",
+    "@cosmicdrift/kumiko-headless": "0.333.0",
+    "@cosmicdrift/kumiko-renderer": "0.333.0",
+    "@cosmicdrift/kumiko-renderer-web": "0.333.0",
+    "@cosmicdrift/kumiko-types": "0.333.0",
     "@mollie/api-client": "^4.5.0",
     "@node-rs/argon2": "^2.0.2",
     "@types/mailparser": "^3.4.6",
@@ -983,8 +983,8 @@
   ],
   "devDependencies": {
     "@testing-library/user-event": "^14.6.1",
-    "@cosmicdrift/kumiko-locale-de": "0.332.0",
-    "@cosmicdrift/kumiko-locale-es": "0.332.0",
+    "@cosmicdrift/kumiko-locale-de": "0.333.0",
+    "@cosmicdrift/kumiko-locale-es": "0.333.0",
     "jsqr": "^1.4.0"
   }
 }

package/src/tenant/changes.json

@@ -1,4 +1,9 @@
 [
+  {
+    "version": "0.333.0",
+    "type": "improvement",
+    "title": "Apps declare assignable membership roles via EXT_ASSIGNABLE_ROLE"
+  },
   {
     "version": "0.313.0",
     "type": "fix",