@fabriktor/fx 0.0.146 → 0.0.147

package/dist/src/chat/forms.d.ts

@@ -3,7 +3,7 @@ import type { EmploymentActor } from "../contacts/scope.js";
 export type ChatFormRecipient = Pick<User, "id" | "account_identity">;
 export type ChatFormPolicy = {
     readonly sender_modes: readonly User["active_mode"][];
-    readonly recipient_identities: readonly User["account_identity"][];
+    readonly recipient_modes: readonly User["active_mode"][];
     readonly allow_group: boolean;
 };
 export declare function canSendChatForm(policy: ChatFormPolicy, actor: EmploymentActor, recipients: readonly ChatFormRecipient[]): boolean;

package/dist/src/chat/forms.js

@@ -1,7 +1,8 @@
 import { normalizeIDs, resolvedID } from "../core/id.js";
-import { isFabriktorUser } from "../users/users.js";
+import { isFabriktorUser, userSupportsMode } from "../users/users.js";
 // Recipients are all other members of the conversation, resolved before use.
-// Recipient eligibility uses account identity, never their transient active mode.
+// Sender modes apply now; recipient modes describe what their identity supports.
+// Do not depend on the recipient's current mode, which Public() omits.
 export function canSendChatForm(policy, actor, recipients) {
     return (!!resolvedID(actor.owner_id) &&
         policy.sender_modes.includes(actor.active_mode) &&
@@ -11,5 +12,5 @@ export function canSendChatForm(policy, actor, recipients) {
             recipients.length &&
         recipients.every((recipient) => recipient.id !== actor.owner_id &&
             isFabriktorUser(recipient) &&
-            policy.recipient_identities.includes(recipient.account_identity)));
+            policy.recipient_modes.some((mode) => userSupportsMode(recipient, mode))));
 }

package/dist/src/routes/availability.d.ts

@@ -7,7 +7,7 @@ import { type RoutesActor } from "./workspace.js";
 export declare const clientAvailabilityMinimumWindows = 3;
 export declare const availabilityRequestPolicy: {
     readonly sender_modes: readonly ["employer"];
-    readonly recipient_identities: readonly ["client"];
+    readonly recipient_modes: readonly ["client"];
     readonly allow_group: false;
 };
 export declare const RoutesChatDataType: {

package/dist/src/routes/availability.js

@@ -11,7 +11,7 @@ import { validateClientAvailabilityInput } from "./validation.js";
 export const clientAvailabilityMinimumWindows = 3;
 export const availabilityRequestPolicy = {
     sender_modes: [UserTypeEmployer],
-    recipient_identities: [UserTypeClient],
+    recipient_modes: [UserTypeClient],
     allow_group: false,
 };
 export const RoutesChatDataType = {

package/dist/src/users/users.d.ts

@@ -15,6 +15,7 @@ export type UpdateExternalUserOptions = {
     owner_id: string;
     in: ExternalUserInput;
 };
+export declare function userSupportsMode(user: Pick<User, "account_identity"> | null | undefined, mode: User["active_mode"]): boolean;
 export declare function isFabriktorUser(user: Pick<User, "account_identity"> | null | undefined): boolean;
 export declare function canManageExternalUser(user: User | null | undefined, owner_id: string): boolean;
 export type SearchExternalUsersOptions = SearchUsersOptions;
@@ -84,3 +85,4 @@ export declare class UsersFX implements UsersFXOperator {
     private updatedUser;
 }
 export declare function newUsersFX(opts: UsersFXOptions): UsersFX;
+export declare function isWorkAccountIdentity(value: string): value is WorkAccountIdentity;

package/dist/src/users/users.js

@@ -27,11 +27,22 @@ const msgWorkIdentityRequiresClient = "A work identity can only be established f
 const msgInvalidWorkIdentity = "Work identity must be employee or employer.";
 const resourceUsername = "username";
 const resourceUser = "user";
+// Mirrors User.ValAccountMode. Public users expose identity, not active mode.
+// A work identity retains Client mode even while its owner is working.
+const accountModes = {
+    [UserTypeClient]: [UserTypeClient],
+    [UserTypeEmployee]: [UserTypeEmployee, UserTypeClient],
+    [UserTypeEmployer]: [UserTypeEmployer, UserTypeClient],
+    [UserTypeExternal]: [UserTypeExternal],
+};
+export function userSupportsMode(user, mode) {
+    return (!!user &&
+        Object.hasOwn(accountModes, user.account_identity) &&
+        accountModes[user.account_identity].includes(mode));
+}
 // External records are private contacts, not messaging accounts.
 export function isFabriktorUser(user) {
-    return (user?.account_identity === UserTypeClient ||
-        user?.account_identity === UserTypeEmployee ||
-        user?.account_identity === UserTypeEmployer);
+    return userSupportsMode(user, UserTypeClient);
 }
 export function canManageExternalUser(user, owner_id) {
     return (!!resolvedID(owner_id) &&
@@ -384,15 +395,12 @@ function errPhoneCodeRequired(field) {
         msg: msgPhoneCodeRequired,
     });
 }
-function isWorkAccountIdentity(value) {
+export function isWorkAccountIdentity(value) {
     return value === UserTypeEmployee || value === UserTypeEmployer;
 }
 function validateActiveMode(accountIdentity, activeMode) {
-    if ((accountIdentity === UserTypeEmployer &&
-        (activeMode === UserTypeEmployer || activeMode === UserTypeClient)) ||
-        (accountIdentity === UserTypeEmployee &&
-            (activeMode === UserTypeEmployee || activeMode === UserTypeClient)) ||
-        (accountIdentity === UserTypeClient && activeMode === UserTypeClient)) {
+    const user = { account_identity: accountIdentity };
+    if (isFabriktorUser(user) && userSupportsMode(user, activeMode)) {
         return;
     }
     throw errValidation({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fabriktor/fx",
-  "version": "0.0.146",
+  "version": "0.0.147",
   "description": "![Fabriktor Logo](./img/fabriktor-character.gif)",
   "type": "module",
   "exports": {