@fabriktor/fx 0.0.30 → 0.0.31

package/dist/src/billable/billable.d.ts

@@ -0,0 +1,50 @@
+import type { InBill, OperationResult, PLBillablePeriodsFromDates, PLBillableSetItemQuantity, PLBillableVendorInvoiceFromBill, PLBillableYearSpan, RPBillablePeriodsFromDates, YearSpan } from "@fabriktor/schema";
+import type { BillableOperator, OperationResultOf } from "@fabriktor/client";
+export type BillableFXOptions = {
+    billable: BillableOperator;
+};
+export type GenerateFixedEstimateOptions = {
+    in: InBill;
+};
+export type AcceptFixedEstimateOptions = {
+    in: InBill;
+};
+export type GenerateDynamicEstimateOptions = {
+    in: InBill;
+};
+export type GenerateDynamicBillOptions = {
+    in: InBill;
+    exclude_billed?: boolean;
+};
+export type MarkLocationAchievedOptions = {
+    in: InBill;
+};
+export type YearSpanOptions = PLBillableYearSpan;
+export type PeriodsFromDatesOptions = PLBillablePeriodsFromDates;
+export type VendorInvoiceFromBillOptions = PLBillableVendorInvoiceFromBill;
+export type SetItemQuantityOptions = PLBillableSetItemQuantity;
+export interface BillableFXOperator {
+    generateFixedEstimate(opts: GenerateFixedEstimateOptions): Promise<OperationResult>;
+    acceptFixedEstimate(opts: AcceptFixedEstimateOptions): Promise<OperationResult>;
+    generateDynamicEstimate(opts: GenerateDynamicEstimateOptions): Promise<OperationResult>;
+    generateDynamicBill(opts: GenerateDynamicBillOptions): Promise<OperationResult>;
+    markLocationAchieved(opts: MarkLocationAchievedOptions): Promise<OperationResult>;
+    yearSpan(opts: YearSpanOptions): Promise<OperationResultOf<YearSpan>>;
+    periodsFromDates(opts: PeriodsFromDatesOptions): Promise<OperationResultOf<RPBillablePeriodsFromDates>>;
+    vendorInvoiceFromBill(opts: VendorInvoiceFromBillOptions): Promise<OperationResult>;
+    setItemQuantity(opts: SetItemQuantityOptions): Promise<void>;
+}
+export declare class BillableFX implements BillableFXOperator {
+    private billable;
+    constructor(opts: BillableFXOptions);
+    generateFixedEstimate(opts: GenerateFixedEstimateOptions): Promise<OperationResult>;
+    acceptFixedEstimate(opts: AcceptFixedEstimateOptions): Promise<OperationResult>;
+    generateDynamicEstimate(opts: GenerateDynamicEstimateOptions): Promise<OperationResult>;
+    generateDynamicBill(opts: GenerateDynamicBillOptions): Promise<OperationResult>;
+    markLocationAchieved(opts: MarkLocationAchievedOptions): Promise<OperationResult>;
+    yearSpan(opts: YearSpanOptions): Promise<OperationResultOf<YearSpan>>;
+    periodsFromDates(opts: PeriodsFromDatesOptions): Promise<OperationResultOf<RPBillablePeriodsFromDates>>;
+    vendorInvoiceFromBill(opts: VendorInvoiceFromBillOptions): Promise<OperationResult>;
+    setItemQuantity(opts: SetItemQuantityOptions): Promise<void>;
+}
+export declare function newBillableFX(opts: BillableFXOptions): BillableFX;

package/dist/src/billable/billable.js

@@ -0,0 +1,74 @@
+// Copyright (C) Fabriktor, Inc. 2025-present.
+//
+// Licensed under the Apache License, Version 2.0 (the "License"); you may
+// not use this file except in compliance with the License. You may obtain
+// a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+const billTypeFixed = "fixed";
+const billTypeDynamic = "dynamic";
+export class BillableFX {
+    billable;
+    constructor(opts) {
+        this.billable = opts.billable;
+    }
+    async generateFixedEstimate(opts) {
+        return await this.billable.generateBill(billWith(opts.in, {
+            type: billTypeFixed,
+            is_estimate: true,
+        }));
+    }
+    async acceptFixedEstimate(opts) {
+        return await this.billable.generateBill(billWith(opts.in, {
+            type: billTypeFixed,
+            is_estimate: false,
+        }));
+    }
+    async generateDynamicEstimate(opts) {
+        return await this.billable.generateBill(billWith(opts.in, {
+            type: billTypeDynamic,
+            is_estimate: true,
+        }));
+    }
+    async generateDynamicBill(opts) {
+        return await this.billable.generateBill(billWith(opts.in, {
+            type: billTypeDynamic,
+            is_estimate: false,
+            exclude_billed: opts.exclude_billed,
+        }));
+    }
+    async markLocationAchieved(opts) {
+        return await this.billable.generateBill(billWith(opts.in, {
+            is_location_achieved: true,
+        }));
+    }
+    async yearSpan(opts) {
+        return await this.billable.yearSpan(opts);
+    }
+    async periodsFromDates(opts) {
+        return await this.billable.periodsFromDates(opts);
+    }
+    async vendorInvoiceFromBill(opts) {
+        return await this.billable.vendorInvoiceFromBill(opts);
+    }
+    async setItemQuantity(opts) {
+        await this.billable.setItemQuantity(opts);
+    }
+}
+export function newBillableFX(opts) {
+    return new BillableFX(opts);
+}
+function billWith(x, overrides) {
+    const out = {
+        ...x,
+        ...defined(overrides),
+    };
+    return out;
+}
+function defined(x) {
+    const out = {};
+    for (const [k, v] of Object.entries(x)) {
+        if (v !== undefined) {
+            out[k] = v;
+        }
+    }
+    return out;
+}

package/dist/src/calls/calls.d.ts

@@ -0,0 +1,33 @@
+import type { PLCallsMintVideoToken, PLNotificationsRelay } from "@fabriktor/schema";
+import type { CallsOperator, NotificationsOperator } from "@fabriktor/client";
+export type MintVideoTokenOptions = PLCallsMintVideoToken;
+export type StartCallOptions = {
+    mint: MintVideoTokenOptions;
+    notification: PLNotificationsRelay;
+};
+export type AnswerCallOptions = {
+    mint: MintVideoTokenOptions;
+    self_notification: PLNotificationsRelay;
+};
+export type CancelCallOptions = {
+    notification: PLNotificationsRelay;
+};
+export type CallsFXOptions = {
+    calls: CallsOperator;
+    notifications: NotificationsOperator;
+};
+export interface CallsFXOperator {
+    startCall(opts: StartCallOptions): Promise<string>;
+    answerCall(opts: AnswerCallOptions): Promise<string>;
+    cancelCall(opts: CancelCallOptions): Promise<void>;
+}
+export declare class CallsFX implements CallsFXOperator {
+    private calls;
+    private notifications;
+    constructor(opts: CallsFXOptions);
+    startCall(opts: StartCallOptions): Promise<string>;
+    answerCall(opts: AnswerCallOptions): Promise<string>;
+    cancelCall(opts: CancelCallOptions): Promise<void>;
+    private requireVideoToken;
+}
+export declare function newCallsFX(opts: CallsFXOptions): CallsFX;

package/dist/src/calls/calls.js

@@ -0,0 +1,37 @@
+// Copyright (C) Fabriktor, Inc. 2025-present.
+//
+// Licensed under the Apache License, Version 2.0 (the "License"); you may
+// not use this file except in compliance with the License. You may obtain
+// a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+import { errVideoTokenMintFailed } from "../core/err.js";
+export class CallsFX {
+    calls;
+    notifications;
+    constructor(opts) {
+        this.calls = opts.calls;
+        this.notifications = opts.notifications;
+    }
+    async startCall(opts) {
+        const token = await this.requireVideoToken(opts.mint);
+        await this.notifications.relayNotification(opts.notification);
+        return token;
+    }
+    async answerCall(opts) {
+        const token = await this.requireVideoToken(opts.mint);
+        await this.notifications.relayNotification(opts.self_notification);
+        return token;
+    }
+    async cancelCall(opts) {
+        await this.notifications.relayNotification(opts.notification);
+    }
+    async requireVideoToken(opts) {
+        const out = await this.calls.mintVideoToken(opts);
+        if (out.value === undefined || out.value.trim() === "") {
+            throw errVideoTokenMintFailed();
+        }
+        return out.value;
+    }
+}
+export function newCallsFX(opts) {
+    return new CallsFX(opts);
+}

package/dist/src/core/err.d.ts

@@ -1,26 +1,63 @@
 export declare const FXErrKind: {
-    readonly UsernameResolveFailed: "username_resolve_failed";
-    readonly UsernameInvalid: "username_invalid";
-    readonly PhoneRequired: "phone_required";
-    readonly PhoneCodeRequired: "phone_code_required";
+    readonly Required: "required";
+    readonly Validation: "validation";
+    readonly ResolveFailed: "resolve_failed";
     readonly Unknown: "unknown";
 };
 export type FXErrKind = (typeof FXErrKind)[keyof typeof FXErrKind];
-export type FXErrOptions = {
+export type FieldOf<T extends object> = Extract<keyof T, string>;
+export type FXErrOptions<T extends object = Record<string, unknown>> = {
     kind: FXErrKind;
     msg: string;
+    field?: FieldOf<T>;
+    resource?: string;
+    cause?: unknown;
+};
+export type RequiredFXErrOptions<T extends object = Record<string, unknown>> = {
+    field: FieldOf<T>;
+    msg: string;
+    cause?: unknown;
+};
+export type ValidationFXErrOptions<T extends object = Record<string, unknown>> = {
+    field?: FieldOf<T>;
+    msg: string;
+    cause?: unknown;
+};
+export type ResolveFailedFXErrOptions<T extends object = Record<string, unknown>> = {
+    resource: string;
+    msg: string;
+    field?: FieldOf<T>;
+    cause?: unknown;
+};
+export type UsernameInvalidFXErrOptions<T extends object = Record<string, unknown>> = {
+    field: FieldOf<T>;
+    msg: string;
+    cause?: unknown;
+};
+type FXErrRuntimeOptions = {
+    kind: FXErrKind;
+    msg: string;
+    field?: string;
+    resource?: string;
     cause?: unknown;
 };
 export declare class FXErr extends Error {
     readonly kind: FXErrKind;
+    readonly field?: string;
+    readonly resource?: string;
     readonly cause?: unknown;
-    constructor(opts: FXErrOptions);
+    constructor(opts: FXErrRuntimeOptions);
 }
-export declare function errFX(opts: FXErrOptions): FXErr;
-export declare function errUsernameResolveFailed(): FXErr;
-export declare function errUsernameInvalid(msg: string): FXErr;
-export declare function errPhoneRequired(): FXErr;
-export declare function errPhoneCodeRequired(): FXErr;
+export declare function errFX<T extends object = Record<string, unknown>>(opts: FXErrOptions<T>): FXErr;
+export declare function errRequired<T extends object = Record<string, unknown>>(opts: RequiredFXErrOptions<T>): FXErr;
+export declare function errValidation<T extends object = Record<string, unknown>>(opts: ValidationFXErrOptions<T>): FXErr;
+export declare function errResolveFailed<T extends object = Record<string, unknown>>(opts: ResolveFailedFXErrOptions<T>): FXErr;
+export declare function errUsernameResolveFailed<T extends object = Record<string, unknown>>(field?: FieldOf<T>): FXErr;
+export declare function errVideoTokenMintFailed(): FXErr;
+export declare function errUsernameInvalid<T extends object = Record<string, unknown>>(opts: UsernameInvalidFXErrOptions<T>): FXErr;
+export declare function errPhoneRequired<T extends object = Record<string, unknown>>(field: FieldOf<T>): FXErr;
+export declare function errPhoneCodeRequired<T extends object = Record<string, unknown>>(field: FieldOf<T>): FXErr;
 export declare function errUnknown(cause: unknown): FXErr;
 export declare function isFXErr(err: unknown): err is FXErr;
 export declare function fxErrMessage(err: unknown): string;
+export {};

package/dist/src/core/err.js

@@ -5,49 +5,94 @@
 // a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
 const msgUnknownFXErr = "Unknown FX error.";
 const msgUnableToResolveUsername = "Unable to resolve username.";
+const msgUnableToMintVideoToken = "Unable to mint video token.";
 const msgPhoneRequired = "Phone number is required.";
 const msgPhoneCodeRequired = "Verification code is required.";
+const resourceUsername = "username";
+const resourceVideoToken = "video_token";
 export const FXErrKind = {
-    UsernameResolveFailed: "username_resolve_failed",
-    UsernameInvalid: "username_invalid",
-    PhoneRequired: "phone_required",
-    PhoneCodeRequired: "phone_code_required",
+    Required: "required",
+    Validation: "validation",
+    ResolveFailed: "resolve_failed",
     Unknown: "unknown",
 };
 export class FXErr extends Error {
     kind;
+    field;
+    resource;
     cause;
     constructor(opts) {
         super(opts.msg);
         this.name = new.target.name;
         this.kind = opts.kind;
+        this.field = opts.field;
+        this.resource = opts.resource;
         this.cause = opts.cause;
     }
 }
 export function errFX(opts) {
-    return new FXErr(opts);
+    return new FXErr({
+        kind: opts.kind,
+        msg: opts.msg,
+        field: opts.field,
+        resource: opts.resource,
+        cause: opts.cause,
+    });
 }
-export function errUsernameResolveFailed() {
+export function errRequired(opts) {
     return errFX({
-        kind: FXErrKind.UsernameResolveFailed,
-        msg: msgUnableToResolveUsername,
+        kind: FXErrKind.Required,
+        msg: opts.msg,
+        field: opts.field,
+        cause: opts.cause,
     });
 }
-export function errUsernameInvalid(msg) {
+export function errValidation(opts) {
     return errFX({
-        kind: FXErrKind.UsernameInvalid,
-        msg,
+        kind: FXErrKind.Validation,
+        msg: opts.msg,
+        field: opts.field,
+        cause: opts.cause,
     });
 }
-export function errPhoneRequired() {
+export function errResolveFailed(opts) {
     return errFX({
-        kind: FXErrKind.PhoneRequired,
+        kind: FXErrKind.ResolveFailed,
+        msg: opts.msg,
+        field: opts.field,
+        resource: opts.resource,
+        cause: opts.cause,
+    });
+}
+export function errUsernameResolveFailed(field) {
+    return errResolveFailed({
+        resource: resourceUsername,
+        field,
+        msg: msgUnableToResolveUsername,
+    });
+}
+export function errVideoTokenMintFailed() {
+    return errResolveFailed({
+        resource: resourceVideoToken,
+        msg: msgUnableToMintVideoToken,
+    });
+}
+export function errUsernameInvalid(opts) {
+    return errValidation({
+        field: opts.field,
+        msg: opts.msg,
+        cause: opts.cause,
+    });
+}
+export function errPhoneRequired(field) {
+    return errRequired({
+        field,
         msg: msgPhoneRequired,
     });
 }
-export function errPhoneCodeRequired() {
-    return errFX({
-        kind: FXErrKind.PhoneCodeRequired,
+export function errPhoneCodeRequired(field) {
+    return errRequired({
+        field,
         msg: msgPhoneCodeRequired,
     });
 }

package/dist/src/fx.d.ts

@@ -1,10 +1,15 @@
-import type { PreferencesOperator, TmpPhonesOperator, TmpUsernamesOperator, UsersOperator } from "@fabriktor/client";
+import type { BillableOperator, CallsOperator, NotificationsOperator, PreferencesOperator, TmpPhonesOperator, TmpUsernamesOperator, UsersOperator } from "@fabriktor/client";
 import type { AuthOperator } from "./auth/auth.js";
+import type { BillableFX, BillableFXOperator } from "./billable/billable.js";
+import type { CallsFX, CallsFXOperator } from "./calls/calls.js";
 import type { PreferencesFX, PreferencesFXOperator } from "./preferences/preferences.js";
 import type { SessionFX, SessionFXOperator } from "./session/session.js";
 import type { UsersFX, UsersFXOperator } from "./users/users.js";
 export type FXOptions = {
     auth: AuthOperator;
+    billable: BillableOperator;
+    calls: CallsOperator;
+    notifications: NotificationsOperator;
     users: UsersOperator;
     tmp_usernames: TmpUsernamesOperator;
     tmp_phones: TmpPhonesOperator;
@@ -15,11 +20,15 @@ export type DefaultFXOptions = {
     auth: AuthOperator;
 };
 export interface FXOperator {
+    billable: BillableFXOperator;
+    calls: CallsFXOperator;
     users: UsersFXOperator;
     session: SessionFXOperator;
     preferences: PreferencesFXOperator;
 }
 export declare class FX implements FXOperator {
+    billable: BillableFX;
+    calls: CallsFX;
     users: UsersFX;
     session: SessionFX;
     preferences: PreferencesFX;

package/dist/src/fx.js

@@ -3,15 +3,26 @@
 // Licensed under the Apache License, Version 2.0 (the "License"); you may
 // not use this file except in compliance with the License. You may obtain
 // a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
-import { newHTTPClient, newPreferencesClient, newTmpPhonesClient, newTmpUsernamesClient, newUsersClient, } from "@fabriktor/client";
+import { newBillableClient, newCallsClient, newHTTPClient, newNotificationsClient, newPreferencesClient, newTmpPhonesClient, newTmpUsernamesClient, newUsersClient, } from "@fabriktor/client";
+import { newBillableFX } from "./billable/billable.js";
+import { newCallsFX } from "./calls/calls.js";
 import { newPreferencesFX } from "./preferences/preferences.js";
 import { newSessionFX } from "./session/session.js";
 import { newUsersFX } from "./users/users.js";
 export class FX {
+    billable;
+    calls;
     users;
     session;
     preferences;
     constructor(opts) {
+        this.billable = newBillableFX({
+            billable: opts.billable,
+        });
+        this.calls = newCallsFX({
+            calls: opts.calls,
+            notifications: opts.notifications,
+        });
         this.users = newUsersFX({
             users: opts.users,
             tmp_usernames: opts.tmp_usernames,
@@ -22,7 +33,8 @@ export class FX {
         });
         this.session = newSessionFX({
             auth: opts.auth,
-            users: this.users,
+            users: opts.users,
+            users_fx: this.users,
         });
     }
 }
@@ -34,6 +46,21 @@ export function newDefaultFX(opts) {
     const get_token = () => opts.auth.getToken();
     return newFX({
         auth: opts.auth,
+        billable: newBillableClient({
+            http,
+            base_url: opts.base_url,
+            get_token,
+        }),
+        calls: newCallsClient({
+            http,
+            base_url: opts.base_url,
+            get_token,
+        }),
+        notifications: newNotificationsClient({
+            http,
+            base_url: opts.base_url,
+            get_token,
+        }),
         users: newUsersClient({
             http,
             base_url: opts.base_url,

package/dist/src/index.d.ts

@@ -1,4 +1,6 @@
 export * from "./auth/auth.js";
+export * from "./billable/billable.js";
+export * from "./calls/calls.js";
 export * from "./core/err.js";
 export * from "./fx.js";
 export * from "./preferences/preferences.js";

package/dist/src/index.js

@@ -1,4 +1,6 @@
 export * from "./auth/auth.js";
+export * from "./billable/billable.js";
+export * from "./calls/calls.js";
 export * from "./core/err.js";
 export * from "./fx.js";
 export * from "./preferences/preferences.js";

package/dist/src/preferences/preferences.d.ts

@@ -1,5 +1,5 @@
-import { type InPrefLanguage, type OperationResult, type PrefLanguage } from "@fabriktor/schema";
-import type { InsertOneOptionsCRUD, OperationResultOf, PreferencesOperator, QueryOptionsCRUD, ReplaceOneOptionsCRUD } from "@fabriktor/client";
+import type { OperationResult } from "@fabriktor/schema";
+import type { PreferencesOperator } from "@fabriktor/client";
 export type EnsurePrefLanguageOptions = {
     owner_id: string;
     language: string;
@@ -7,9 +7,6 @@ export type EnsurePrefLanguageOptions = {
     speech_to_text_source_language?: string;
 };
 export interface PreferencesFXOperator {
-    queryPrefLanguages(opts?: QueryOptionsCRUD): Promise<OperationResultOf<PrefLanguage[]>>;
-    insertOnePrefLanguage(opts: InsertOneOptionsCRUD<InPrefLanguage>): Promise<OperationResult>;
-    replaceOnePrefLanguage(opts: ReplaceOneOptionsCRUD<InPrefLanguage>): Promise<OperationResult>;
     ensurePrefLanguage(opts: EnsurePrefLanguageOptions): Promise<OperationResult>;
 }
 export type PreferencesFXOptions = {
@@ -18,9 +15,6 @@ export type PreferencesFXOptions = {
 export declare class PreferencesFX implements PreferencesFXOperator {
     private preferences;
     constructor(opts: PreferencesFXOptions);
-    queryPrefLanguages(opts?: QueryOptionsCRUD): Promise<OperationResultOf<PrefLanguage[]>>;
-    insertOnePrefLanguage(opts: InsertOneOptionsCRUD<InPrefLanguage>): Promise<OperationResult>;
-    replaceOnePrefLanguage(opts: ReplaceOneOptionsCRUD<InPrefLanguage>): Promise<OperationResult>;
     ensurePrefLanguage(opts: EnsurePrefLanguageOptions): Promise<OperationResult>;
 }
 export declare function newPreferencesFX(opts: PreferencesFXOptions): PreferencesFX;

package/dist/src/preferences/preferences.js

@@ -3,28 +3,17 @@
 // Licensed under the Apache License, Version 2.0 (the "License"); you may
 // not use this file except in compliance with the License. You may obtain
 // a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
-import { OperationResultValueKey, } from "@fabriktor/schema";
+import { queryParam } from "@fabriktor/client";
 export class PreferencesFX {
     preferences;
     constructor(opts) {
         this.preferences = opts.preferences;
     }
-    async queryPrefLanguages(opts) {
-        return await this.preferences.queryPrefLanguages(opts);
-    }
-    async insertOnePrefLanguage(opts) {
-        return await this.preferences.insertOnePrefLanguage(opts);
-    }
-    async replaceOnePrefLanguage(opts) {
-        return await this.preferences.replaceOnePrefLanguage(opts);
-    }
     async ensurePrefLanguage(opts) {
         const out = await this.preferences.queryPrefLanguages({
-            query: {
-                owner_id: opts.owner_id,
-            },
+            query: queryParam("owner_id", opts.owner_id),
         });
-        const prefs = out[OperationResultValueKey] ?? [];
+        const prefs = out.value ?? [];
         const pref = prefs[0];
         const input = {
             is_default: false,

package/dist/src/session/session.d.ts

@@ -1,7 +1,7 @@
-import type { Op } from "@fabriktor/client";
 import type { InUser, PLUsersForgotPassword, PLUsersSignInLink, PLUsersVerifyEmail, UpsertResult } from "@fabriktor/schema";
+import type { BootstrapOptions, OperationResultOf, UsersOperator } from "@fabriktor/client";
 import type { AuthEmailOptions, AuthOperator } from "../auth/auth.js";
-import type { BootstrapOptions, UsersFXOperator } from "../users/users.js";
+import type { UsersFXOperator } from "../users/users.js";
 export type SignInMode = "email" | "username";
 export type SignInOptions = {
     mode: SignInMode;
@@ -13,12 +13,13 @@ export type SignUpAndBootstrapOptions = AuthEmailOptions & {
 };
 export type SessionFXOptions = {
     auth: AuthOperator;
-    users: UsersFXOperator;
+    users: UsersOperator;
+    users_fx: UsersFXOperator;
 };
 export interface SessionFXOperator {
     startSignUp(opts: AuthEmailOptions): Promise<void>;
-    finishSignUp(opts: BootstrapOptions): Promise<Op<UpsertResult>>;
-    signUpAndBootstrap(opts: SignUpAndBootstrapOptions): Promise<Op<UpsertResult>>;
+    finishSignUp(opts: BootstrapOptions): Promise<OperationResultOf<UpsertResult>>;
+    signUpAndBootstrap(opts: SignUpAndBootstrapOptions): Promise<OperationResultOf<UpsertResult>>;
     signIn(opts: SignInOptions): Promise<void>;
     signInWithEmail(opts: AuthEmailOptions): Promise<void>;
     signOut(): Promise<void>;
@@ -30,10 +31,11 @@ export interface SessionFXOperator {
 export declare class SessionFX implements SessionFXOperator {
     private auth;
     private users;
+    private users_fx;
     constructor(opts: SessionFXOptions);
     startSignUp(opts: AuthEmailOptions): Promise<void>;
-    finishSignUp(opts: BootstrapOptions): Promise<Op<UpsertResult>>;
-    signUpAndBootstrap(opts: SignUpAndBootstrapOptions): Promise<Op<UpsertResult>>;
+    finishSignUp(opts: BootstrapOptions): Promise<OperationResultOf<UpsertResult>>;
+    signUpAndBootstrap(opts: SignUpAndBootstrapOptions): Promise<OperationResultOf<UpsertResult>>;
     signIn(opts: SignInOptions): Promise<void>;
     signInWithEmail(opts: AuthEmailOptions): Promise<void>;
     signOut(): Promise<void>;

package/dist/src/session/session.js

@@ -6,9 +6,11 @@
 export class SessionFX {
     auth;
     users;
+    users_fx;
     constructor(opts) {
         this.auth = opts.auth;
         this.users = opts.users;
+        this.users_fx = opts.users_fx;
     }
     async startSignUp(opts) {
         await this.auth.signUp({
@@ -33,7 +35,7 @@ export class SessionFX {
     async signIn(opts) {
         const email = opts.mode === "email"
             ? opts.identifier
-            : await this.users.resolveUsername({
+            : await this.users_fx.resolveUsername({
                 username: opts.identifier,
             });
         await this.signInWithEmail({
@@ -49,13 +51,19 @@ export class SessionFX {
         await this.auth.signOut();
     }
     async forgotPassword(opts) {
-        await this.users.forgotPassword(opts);
+        await this.users.forgotPassword({
+            email: opts.email,
+        });
     }
     async sendSignInLink(opts) {
-        await this.users.sendSignInLink(opts);
+        await this.users.sendSignInLink({
+            email: opts.email,
+        });
     }
     async sendEmailVerification(opts) {
-        await this.users.sendEmailVerification(opts);
+        await this.users.sendEmailVerification({
+            language: opts.language,
+        });
     }
     async checkEmailVerification() {
         await this.auth.reloadUser();

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

@@ -1,45 +1,26 @@
-import type { InUser, OperationResult, PLUsersVerifyEmail, PLUsersContactList, PLUsersForgotPassword, PLUsersResolveUsername, PLUsersSendCode, PLUsersSignInLink, PLUsersUsername, PLUsersVerifyCode, UpsertResult, User } from "@fabriktor/schema";
-import type { Op, TmpPhonesOperator, TmpUsernamesOperator, UsernameVerification, UsersOperator, GetByUIDOptions, SearchOptions } from "@fabriktor/client";
+import type { PLUsersResolveUsername, PLUsersSendCode, PLUsersUsername, PLUsersVerifyCode } from "@fabriktor/schema";
+import type { OperationResultOf, TmpPhonesOperator, TmpUsernamesOperator, UsernameVerification, UsersOperator } from "@fabriktor/client";
 export type UsersFXOptions = {
     users: UsersOperator;
     tmp_usernames: TmpUsernamesOperator;
     tmp_phones: TmpPhonesOperator;
 };
-export type BootstrapOptions = {
-    in: InUser;
-};
 export interface UsersFXOperator {
-    bootstrap(opts: BootstrapOptions): Promise<Op<UpsertResult>>;
-    sync(): Promise<OperationResult>;
-    sendEmailVerification(opts: PLUsersVerifyEmail): Promise<void>;
-    forgotPassword(opts: PLUsersForgotPassword): Promise<void>;
-    sendSignInLink(opts: PLUsersSignInLink): Promise<void>;
     resolveUsername(opts: PLUsersResolveUsername): Promise<string>;
-    verifyUsername(opts: PLUsersUsername): Promise<Op<UsernameVerification>>;
-    generateUsernames(opts: PLUsersUsername): Promise<Op<UsernameVerification>>;
+    verifyUsername(opts: PLUsersUsername): Promise<OperationResultOf<UsernameVerification>>;
+    generateUsernames(opts: PLUsersUsername): Promise<OperationResultOf<UsernameVerification>>;
     sendPhoneCode(opts: PLUsersSendCode): Promise<void>;
     verifyPhoneCode(opts: PLUsersVerifyCode): Promise<void>;
-    match(opts: PLUsersContactList): Promise<Op<User[]>>;
-    search(opts: SearchOptions): Promise<Op<User[]>>;
-    getByUID(opts: GetByUIDOptions): Promise<Op<User[]>>;
 }
 export declare class UsersFX implements UsersFXOperator {
     private users;
     private tmp_usernames;
     private tmp_phones;
     constructor(opts: UsersFXOptions);
-    bootstrap(opts: BootstrapOptions): Promise<Op<UpsertResult>>;
-    sync(): Promise<OperationResult>;
-    sendEmailVerification(opts: PLUsersVerifyEmail): Promise<void>;
-    forgotPassword(opts: PLUsersForgotPassword): Promise<void>;
-    sendSignInLink(opts: PLUsersSignInLink): Promise<void>;
     resolveUsername(opts: PLUsersResolveUsername): Promise<string>;
-    verifyUsername(opts: PLUsersUsername): Promise<Op<UsernameVerification>>;
-    generateUsernames(opts: PLUsersUsername): Promise<Op<UsernameVerification>>;
+    verifyUsername(opts: PLUsersUsername): Promise<OperationResultOf<UsernameVerification>>;
+    generateUsernames(opts: PLUsersUsername): Promise<OperationResultOf<UsernameVerification>>;
     sendPhoneCode(opts: PLUsersSendCode): Promise<void>;
     verifyPhoneCode(opts: PLUsersVerifyCode): Promise<void>;
-    match(opts: PLUsersContactList): Promise<Op<User[]>>;
-    search(opts: SearchOptions): Promise<Op<User[]>>;
-    getByUID(opts: GetByUIDOptions): Promise<Op<User[]>>;
 }
 export declare function newUsersFX(opts: UsersFXOptions): UsersFX;

package/dist/src/users/users.js

@@ -15,58 +15,25 @@ export class UsersFX {
         this.tmp_usernames = opts.tmp_usernames;
         this.tmp_phones = opts.tmp_phones;
     }
-    async bootstrap(opts) {
-        return await this.users.bootstrap({
-            in: opts.in,
-        });
-    }
-    async sync() {
-        return await this.users.sync();
-    }
-    async sendEmailVerification(opts) {
-        return await this.users.sendEmailVerification(opts);
-    }
-    async forgotPassword(opts) {
-        return await this.users.forgotPassword({
-            email: opts.email,
-        });
-    }
-    async sendSignInLink(opts) {
-        return await this.users.sendSignInLink({
-            email: opts.email,
-        });
-    }
-    // public async resolveUsername(opts: PLUsersResolveUsername): Promise<string> {
-    //   const username = normalizeUsername(opts.username);
-    //   const out = await this.users.resolveUsername({
-    //     username,
-    //   });
-    //   if (out.value === undefined) {
-    //     throw errUsernameResolveFailed();
-    //   }
-    //   return out.value;
-    // }
     async resolveUsername(opts) {
         const username = normalizeUsername(opts.username);
-        console.log("[fx/users.resolveUsername] normalized", {
-            input: opts.username,
-            username,
-        });
         const out = await this.users.resolveUsername({
             username,
         });
-        console.log("[fx/users.resolveUsername] response", out);
         if (out.value === undefined ||
             out.value.trim() === "" ||
             !out.value.includes("@")) {
-            throw errUsernameResolveFailed();
+            throw errUsernameResolveFailed("username");
         }
         return out.value;
     }
     async verifyUsername(opts) {
         const check = validateUsernameFormat(opts.to_validate);
         if (!check.valid) {
-            throw errUsernameInvalid(check.error);
+            throw errUsernameInvalid({
+                field: "to_validate",
+                msg: check.error,
+            });
         }
         return await this.tmp_usernames.verify({
             words: opts.words,
@@ -82,7 +49,7 @@ export class UsersFX {
     async sendPhoneCode(opts) {
         const phone = normalizePhone(opts.phone);
         if (!validatePhone(phone)) {
-            throw errPhoneRequired();
+            throw errPhoneRequired("phone");
         }
         return await this.tmp_phones.send({
             phone,
@@ -92,32 +59,16 @@ export class UsersFX {
         const phone = normalizePhone(opts.phone);
         const code = normalizePhoneCode(opts.code);
         if (!validatePhone(phone)) {
-            throw errPhoneRequired();
+            throw errPhoneRequired("phone");
         }
         if (!validatePhoneCode(code)) {
-            throw errPhoneCodeRequired();
+            throw errPhoneCodeRequired("code");
         }
         return await this.tmp_phones.verify({
             phone,
             code,
         });
     }
-    async match(opts) {
-        return await this.users.match({
-            contacts: opts.contacts,
-        });
-    }
-    async search(opts) {
-        return await this.users.search({
-            q: opts.q,
-            limit: opts.limit,
-        });
-    }
-    async getByUID(opts) {
-        return await this.users.getByUID({
-            uid: opts.uid,
-        });
-    }
 }
 export function newUsersFX(opts) {
     return new UsersFX(opts);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fabriktor/fx",
-  "version": "0.0.30",
+  "version": "0.0.31",
   "description": "![Fabriktor Logo](./img/fabriktor-character.gif)",
   "type": "module",
   "exports": {
@@ -17,7 +17,7 @@
     "typescript": "^6.0.3"
   },
   "dependencies": {
-    "@fabriktor/client": "^0.0.25",
-    "@fabriktor/schema": "^0.0.18"
+    "@fabriktor/client": "0.0.32",
+    "@fabriktor/schema": "0.0.27"
   }
 }