@fabriktor/fx 0.0.135 → 0.0.137

package/dist/src/core/multi-create.d.ts

@@ -28,6 +28,7 @@ export type MultiCreateEntry<Input, Result> = {
     readonly created_id?: string;
     readonly result?: Result;
     readonly error?: unknown;
+    readonly skipped?: boolean;
 };
 export type MultiCreateSnapshot<Input, Result> = {
     readonly entries: readonly MultiCreateEntry<Input, Result>[];
@@ -48,7 +49,7 @@ export declare class MultiCreatePool {
 export type MultiCreateOptions<Input, Result> = {
     run: (input: Input, attempt: MultiCreateAttempt) => Promise<Result>;
     pool?: MultiCreatePool;
-    check?: (inputs: readonly Input[], signal: AbortSignal) => Promise<void>;
+    check?: (inputs: readonly Input[], signal: AbortSignal) => Promise<void | ReadonlyMap<Input, unknown>>;
     on_blocked?: (entry: MultiCreateEntry<Input, Result>) => void;
     retry_same_request?: boolean;
     before_request?: () => void;
@@ -68,6 +69,7 @@ export declare class MultiCreator<Input, Result> {
     subscribe(listener: EventListener<MultiCreateSnapshot<Input, Result>>): () => void;
     add(input: Input): string;
     edit(id: string, input: Input): boolean;
+    skip(id: string, skipped: boolean): boolean;
     remove(id: string): boolean;
     start(): Promise<void>;
     private begin;

package/dist/src/core/multi-create.js

@@ -84,7 +84,22 @@ export class MultiCreator {
         const entry = this.entries.find((entry) => entry.id === id);
         if (this.running || entry?.status !== MultiCreateStatus.Pending)
             return false;
-        this.replace({ ...entry, input: structuredClone(input) });
+        this.replace({
+            ...entry,
+            input: structuredClone(input),
+            error: undefined,
+            skipped: false,
+        });
+        return true;
+    }
+    skip(id, skipped) {
+        const entry = this.entries.find((entry) => entry.id === id);
+        if (this.running ||
+            entry?.status !== MultiCreateStatus.Pending ||
+            entry.attempted ||
+            entry.created_id)
+            return false;
+        this.replace({ ...entry, skipped });
         return true;
     }
     remove(id) {
@@ -98,7 +113,7 @@ export class MultiCreator {
     start() {
         if (this.running)
             return this.completion;
-        const pending = this.entries.filter((entry) => entry.status === MultiCreateStatus.Pending);
+        const pending = this.entries.filter((entry) => entry.status === MultiCreateStatus.Pending && !entry.skipped);
         return this.begin(pending);
     }
     begin(pending) {
@@ -142,8 +157,21 @@ export class MultiCreator {
         try {
             signal.throwIfAborted();
             this.opts.before_request?.();
-            await this.opts.check?.(pending.filter((entry) => !entry.created_id).map((entry) => entry.input), signal);
+            const issues = await this.opts.check?.(pending
+                .filter((entry) => !entry.created_id)
+                .map((entry) => entry.input), signal);
             signal.throwIfAborted();
+            for (const entry of pending) {
+                if (issues?.has(entry.input))
+                    this.reject(entry, issues.get(entry.input));
+                else if (entry.error !== undefined)
+                    this.replace({ ...entry, error: undefined });
+            }
+            // Leave unaffected entries ready for the user's next selection.
+            if (issues?.size) {
+                this.settle(pending);
+                return;
+            }
         }
         catch (error) {
             for (const entry of pending)
@@ -155,6 +183,7 @@ export class MultiCreator {
             let current = {
                 ...entry,
                 status: MultiCreateStatus.Creating,
+                error: undefined,
             };
             this.replace(current);
             try {

package/dist/src/payments/payments.d.ts

@@ -1,11 +1,16 @@
 import { PaymentEntityTypeBill, PaymentEntityTypePayroll, type Bill, type Payroll, PSPPaymentStatusPending, PSPPaymentStatusPartial, PSPPaymentStatusFull, type CreditLedgerEntry, type Payment, type PmtAccount, type PmtBankAccount, type PmtCard, type PmtCustomer, type PmtPublicSession, type PmtRefund, type SortStripeBalanceResult } from "@fabriktor/schema";
 import { type PaymentsOperator, type BillableOperator, type PayrollsOperator } from "@fabriktor/client";
+import { PreActionBlocked } from "../core/pre-action.js";
 import { type SearchOptions, type OwnerSearchOptions, type SearchPage } from "../core/search.js";
 import { EventBus } from "../core/events.js";
 import type { MultiCreateAttempt, MultiCreateCheckpoint } from "../core/multi-create.js";
 export declare const PaymentsPreActionReason: {
     readonly RecipientNotOnboarded: "recipient_not_onboarded";
 };
+export declare class PaymentRecipientNotReady extends PreActionBlocked {
+    readonly recipient_id: string;
+    constructor(recipient_id: string);
+}
 type PurchaseCreditsPayload = Parameters<PaymentsOperator["purchaseCredits"]>[0];
 type OpenPublicSessionPayload = Parameters<PaymentsOperator["openPmtPublicSession"]>[0];
 type PaymentFromPublicSessionPayload = Parameters<PaymentsOperator["paymentFromPublicSession"]>[0];
@@ -195,7 +200,7 @@ export type PaymentsFXOptions = {
     events?: EventBus;
 };
 export interface PaymentsFXOperator {
-    checkEntityPaymentRecipients(entities: readonly ResolvePayableEntityOptions[], signal?: AbortSignal): Promise<void>;
+    checkEntityPaymentRecipients(entities: readonly ResolvePayableEntityOptions[], signal?: AbortSignal): Promise<ReadonlyMap<ResolvePayableEntityOptions, PaymentRecipientNotReady>>;
     resolvePayableEntity(opts: ResolvePayableEntityOptions): Promise<PayableEntityBalance>;
     searchPayableEntities(opts: SearchPayableEntitiesOptions): Promise<SearchPage<PayableEntityBalance>>;
     createEntityPayment(opts: CreateEntityPaymentOptions, attempt: MultiCreateAttempt): Promise<Payment>;
@@ -249,7 +254,7 @@ export declare class PaymentsFX implements PaymentsFXOperator {
     searchPayableEntities(opts: SearchPayableEntitiesOptions): Promise<SearchPage<PayableEntityBalance>>;
     resolvePayableEntity(opts: ResolvePayableEntityOptions): Promise<PayableEntityBalance>;
     private findPayableEntity;
-    checkEntityPaymentRecipients(entities: readonly ResolvePayableEntityOptions[], signal?: AbortSignal): Promise<void>;
+    checkEntityPaymentRecipients(entities: readonly ResolvePayableEntityOptions[], signal?: AbortSignal): Promise<ReadonlyMap<ResolvePayableEntityOptions, PaymentRecipientNotReady>>;
     private checkPaymentRecipient;
     createEntityPayment(opts: CreateEntityPaymentOptions, attempt: MultiCreateAttempt): Promise<Payment>;
     createPayment(opts: CreatePaymentOptions): Promise<Payment>;

package/dist/src/payments/payments.js

@@ -5,7 +5,7 @@
 // a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
 import { CreditLedgerSourceAndroidIAP, CreditLedgerSourceAppleIAP, CreditLedgerSourceStripe, ZeroID, PaymentKindMain, PaymentEntityTypeBill, PaymentEntityTypePayroll, PSPActionableStatusSucceeded, PSPActionableStatusFailed, PSPActionableStatusCanceled, PSPPaymentStatusPending, PSPPaymentStatusPartial, PSPPaymentStatusFull, } from "@fabriktor/schema";
 import { queryParams, } from "@fabriktor/client";
-import { runPreActionCheck } from "../core/pre-action.js";
+import { PreActionBlocked, isPreActionBlocked, runPreActionCheck, } from "../core/pre-action.js";
 import { errResolveFailed, errValidation } from "../core/err.js";
 import { normalizeIDs, requiredOperationID, resolvedID } from "../core/id.js";
 import { runOwnerSearch, runSearch, } from "../core/search.js";
@@ -13,6 +13,13 @@ import { createEvent, EventBus } from "../core/events.js";
 export const PaymentsPreActionReason = {
     RecipientNotOnboarded: "recipient_not_onboarded",
 };
+export class PaymentRecipientNotReady extends PreActionBlocked {
+    recipient_id;
+    constructor(recipient_id) {
+        super(PaymentsPreActionReason.RecipientNotOnboarded);
+        this.recipient_id = recipient_id;
+    }
+}
 const entityPaymentQuerySize = 30;
 const publicAmountPattern = /^\d+$/;
 const resourcePayment = "payment";
@@ -347,31 +354,54 @@ export class PaymentsFX {
     }
     // Check the whole selection before starting a batch; never retain readiness across actions.
     async checkEntityPaymentRecipients(entities, signal) {
-        const recipients = new Set();
+        const recipients = new Map();
+        const issues = new Map();
         for (const opts of entities) {
             signal?.throwIfAborted();
             const entity = await this.findPayableEntity({ ...opts, signal });
-            recipients.add(entity.recipient_id);
+            const entries = recipients.get(entity.recipient_id) ?? [];
+            entries.push(opts);
+            recipients.set(entity.recipient_id, entries);
         }
-        for (const recipient_id of recipients)
-            await this.checkPaymentRecipient(recipient_id, signal);
+        for (const [recipient_id, entries] of recipients) {
+            try {
+                await this.checkPaymentRecipient(recipient_id, signal);
+            }
+            catch (error) {
+                if (!(error instanceof PaymentRecipientNotReady))
+                    throw error;
+                for (const entry of entries)
+                    issues.set(entry, error);
+            }
+        }
+        return issues;
     }
     async checkPaymentRecipient(recipient_id, signal) {
         if (!resolvedID(recipient_id))
             throw errValidation({ msg: msgPaymentEntityInvalid });
-        await runPreActionCheck({
-            reason: PaymentsPreActionReason.RecipientNotOnboarded,
-            allowed: async () => {
-                signal?.throwIfAborted();
-                const out = await this.payments.onboardingStatus({ recipient_id, signal });
-                if (typeof out.value !== "boolean")
-                    throw errResolveFailed({
-                        resource: resourcePmtAccount,
-                        msg: msgPmtAccountMissing,
+        try {
+            await runPreActionCheck({
+                reason: PaymentsPreActionReason.RecipientNotOnboarded,
+                allowed: async () => {
+                    signal?.throwIfAborted();
+                    const out = await this.payments.onboardingStatus({
+                        recipient_id,
+                        signal,
                     });
-                return out.value;
-            },
-        });
+                    if (typeof out.value !== "boolean")
+                        throw errResolveFailed({
+                            resource: resourcePmtAccount,
+                            msg: msgPmtAccountMissing,
+                        });
+                    return out.value;
+                },
+            });
+        }
+        catch (error) {
+            if (isPreActionBlocked(error))
+                throw new PaymentRecipientNotReady(recipient_id);
+            throw error;
+        }
     }
     async createEntityPayment(opts, attempt) {
         if (attempt.created_id)

package/dist/src/payrolls/workspace.js

@@ -470,7 +470,7 @@ export class PayrollsWorkspace {
                         source.employee_id === input.employee_id &&
                         source.currency === input.currency, "source");
                 }
-                await this.adjustments(actor, input.AdjustmentRef, input.currency, signal);
+                await this.adjustments(actor, input.adjustment_ref, input.currency, signal);
                 break;
             }
             case PayrollResource.EmployeeConfigs:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fabriktor/fx",
-  "version": "0.0.135",
+  "version": "0.0.137",
   "description": "![Fabriktor Logo](./img/fabriktor-character.gif)",
   "type": "module",
   "exports": {
@@ -17,8 +17,8 @@
     "typescript": "^6.0.3"
   },
   "dependencies": {
-    "@fabriktor/client": "0.0.94",
+    "@fabriktor/client": "0.0.95",
     "@fabriktor/fx": "0.0.94",
-    "@fabriktor/schema": "0.0.66"
+    "@fabriktor/schema": "0.0.67"
   }
 }