@temboplus/afloat 0.1.70 → 0.1.72

package/dist/lib/api/base-repository.d.ts

@@ -108,7 +108,7 @@ export declare class BaseRepository<TContract extends AppRouter> {
      * // - x-request-id: "uuid-v4-string"
      * ```
      */
-    get client(): { [TKey in keyof TContract]: TContract[TKey] extends import("@ts-rest/core").AppRoute ? import("@ts-rest/core").AppRouteFunction<TContract[TKey], InitClientArgs, import("@ts-rest/core").PartialClientInferRequest<TContract[TKey], InitClientArgs>> : TContract[TKey] extends AppRouter ? TContract[TKey] extends infer T extends AppRouter ? { [TKey_1 in keyof T]: TContract[TKey][TKey_1] extends import("@ts-rest/core").AppRoute ? import("@ts-rest/core").AppRouteFunction<TContract[TKey][TKey_1], InitClientArgs, import("@ts-rest/core").PartialClientInferRequest<TContract[TKey][TKey_1], InitClientArgs>> : TContract[TKey][TKey_1] extends AppRouter ? TContract[TKey][TKey_1] extends infer T_1 extends AppRouter ? { [TKey_2 in keyof T_1]: TContract[TKey][TKey_1][TKey_2] extends import("@ts-rest/core").AppRoute ? import("@ts-rest/core").AppRouteFunction<TContract[TKey][TKey_1][TKey_2], InitClientArgs, import("@ts-rest/core").PartialClientInferRequest<TContract[TKey][TKey_1][TKey_2], InitClientArgs>> : TContract[TKey][TKey_1][TKey_2] extends AppRouter ? TContract[TKey][TKey_1][TKey_2] extends infer T_2 extends AppRouter ? { [TKey_3 in keyof T_2]: TContract[TKey][TKey_1][TKey_2][TKey_3] extends import("@ts-rest/core").AppRoute ? import("@ts-rest/core").AppRouteFunction<TContract[TKey][TKey_1][TKey_2][TKey_3], InitClientArgs, import("@ts-rest/core").PartialClientInferRequest<TContract[TKey][TKey_1][TKey_2][TKey_3], InitClientArgs>> : TContract[TKey][TKey_1][TKey_2][TKey_3] extends AppRouter ? TContract[TKey][TKey_1][TKey_2][TKey_3] extends infer T_3 extends AppRouter ? { [TKey_4 in keyof T_3]: TContract[TKey][TKey_1][TKey_2][TKey_3][TKey_4] extends import("@ts-rest/core").AppRoute ? import("@ts-rest/core").AppRouteFunction<TContract[TKey][TKey_1][TKey_2][TKey_3][TKey_4], InitClientArgs, import("@ts-rest/core").PartialClientInferRequest<TContract[TKey][TKey_1][TKey_2][TKey_3][TKey_4], InitClientArgs>> : TContract[TKey][TKey_1][TKey_2][TKey_3][TKey_4] extends AppRouter ? TContract[TKey][TKey_1][TKey_2][TKey_3][TKey_4] extends infer T_4 extends AppRouter ? { [TKey_5 in keyof T_4]: TContract[TKey][TKey_1][TKey_2][TKey_3][TKey_4][TKey_5] extends import("@ts-rest/core").AppRoute ? import("@ts-rest/core").AppRouteFunction<TContract[TKey][TKey_1][TKey_2][TKey_3][TKey_4][TKey_5], InitClientArgs, import("@ts-rest/core").PartialClientInferRequest<TContract[TKey][TKey_1][TKey_2][TKey_3][TKey_4][TKey_5], InitClientArgs>> : TContract[TKey][TKey_1][TKey_2][TKey_3][TKey_4][TKey_5] extends AppRouter ? TContract[TKey][TKey_1][TKey_2][TKey_3][TKey_4][TKey_5] extends infer T_5 extends AppRouter ? { [TKey_6 in keyof T_5]: TContract[TKey][TKey_1][TKey_2][TKey_3][TKey_4][TKey_5][TKey_6] extends import("@ts-rest/core").AppRoute ? import("@ts-rest/core").AppRouteFunction<TContract[TKey][TKey_1][TKey_2][TKey_3][TKey_4][TKey_5][TKey_6], InitClientArgs, import("@ts-rest/core").PartialClientInferRequest<TContract[TKey][TKey_1][TKey_2][TKey_3][TKey_4][TKey_5][TKey_6], InitClientArgs>> : TContract[TKey][TKey_1][TKey_2][TKey_3][TKey_4][TKey_5][TKey_6] extends AppRouter ? TContract[TKey][TKey_1][TKey_2][TKey_3][TKey_4][TKey_5][TKey_6] extends infer T_6 extends AppRouter ? { [TKey_7 in keyof T_6]: TContract[TKey][TKey_1][TKey_2][TKey_3][TKey_4][TKey_5][TKey_6][TKey_7] extends import("@ts-rest/core").AppRoute ? import("@ts-rest/core").AppRouteFunction<TContract[TKey][TKey_1][TKey_2][TKey_3][TKey_4][TKey_5][TKey_6][TKey_7], InitClientArgs, import("@ts-rest/core").PartialClientInferRequest<TContract[TKey][TKey_1][TKey_2][TKey_3][TKey_4][TKey_5][TKey_6][TKey_7], InitClientArgs>> : TContract[TKey][TKey_1][TKey_2][TKey_3][TKey_4][TKey_5][TKey_6][TKey_7] extends AppRouter ? TContract[TKey][TKey_1][TKey_2][TKey_3][TKey_4][TKey_5][TKey_6][TKey_7] extends infer T_7 extends AppRouter ? { [TKey_8 in keyof T_7]: TContract[TKey][TKey_1][TKey_2][TKey_3][TKey_4][TKey_5][TKey_6][TKey_7][TKey_8] extends import("@ts-rest/core").AppRoute ? import("@ts-rest/core").AppRouteFunction<TContract[TKey][TKey_1][TKey_2][TKey_3][TKey_4][TKey_5][TKey_6][TKey_7][TKey_8], InitClientArgs, import("@ts-rest/core").PartialClientInferRequest<TContract[TKey][TKey_1][TKey_2][TKey_3][TKey_4][TKey_5][TKey_6][TKey_7][TKey_8], InitClientArgs>> : TContract[TKey][TKey_1][TKey_2][TKey_3][TKey_4][TKey_5][TKey_6][TKey_7][TKey_8] extends AppRouter ? TContract[TKey][TKey_1][TKey_2][TKey_3][TKey_4][TKey_5][TKey_6][TKey_7][TKey_8] extends infer T_8 extends AppRouter ? { [TKey_9 in keyof T_8]: TContract[TKey][TKey_1][TKey_2][TKey_3][TKey_4][TKey_5][TKey_6][TKey_7][TKey_8][TKey_9] extends import("@ts-rest/core").AppRoute ? import("@ts-rest/core").AppRouteFunction<TContract[TKey][TKey_1][TKey_2][TKey_3][TKey_4][TKey_5][TKey_6][TKey_7][TKey_8][TKey_9], InitClientArgs, import("@ts-rest/core").PartialClientInferRequest<TContract[TKey][TKey_1][TKey_2][TKey_3][TKey_4][TKey_5][TKey_6][TKey_7][TKey_8][TKey_9], InitClientArgs>> : TContract[TKey][TKey_1][TKey_2][TKey_3][TKey_4][TKey_5][TKey_6][TKey_7][TKey_8][TKey_9] extends AppRouter ? TContract[TKey][TKey_1][TKey_2][TKey_3][TKey_4][TKey_5][TKey_6][TKey_7][TKey_8][TKey_9] extends infer T_9 extends AppRouter ? { [TKey_10 in keyof T_9]: TContract[TKey][TKey_1][TKey_2][TKey_3][TKey_4][TKey_5][TKey_6][TKey_7][TKey_8][TKey_9][TKey_10] extends import("@ts-rest/core").AppRoute ? import("@ts-rest/core").AppRouteFunction<TContract[TKey][TKey_1][TKey_2][TKey_3][TKey_4][TKey_5][TKey_6][TKey_7][TKey_8][TKey_9][TKey_10], InitClientArgs, import("@ts-rest/core").PartialClientInferRequest<TContract[TKey][TKey_1][TKey_2][TKey_3][TKey_4][TKey_5][TKey_6][TKey_7][TKey_8][TKey_9][TKey_10], InitClientArgs>> : TContract[TKey][TKey_1][TKey_2][TKey_3][TKey_4][TKey_5][TKey_6][TKey_7][TKey_8][TKey_9][TKey_10] extends AppRouter ? /*elided*/ any : never; } : never : never; } : never : never; } : never : never; } : never : never; } : never : never; } : never : never; } : never : never; } : never : never; } : never : never; } : never : never; };
+    get client(): { [TKey in keyof TContract]: TContract[TKey] extends import("@ts-rest/core").AppRoute ? import("@ts-rest/core").AppRouteFunction<TContract[TKey], InitClientArgs, import("@ts-rest/core").PartialClientInferRequest<TContract[TKey], InitClientArgs>> : TContract[TKey] extends AppRouter ? TContract[TKey] extends infer T extends AppRouter ? { [TKey_2 in keyof T]: T[TKey_2] extends import("@ts-rest/core").AppRoute ? import("@ts-rest/core").AppRouteFunction<T[TKey_2], TClientArgs, import("@ts-rest/core").PartialClientInferRequest<T[TKey_2], TClientArgs>> : T[TKey_2] extends AppRouter ? T[TKey_2] extends infer T_1 extends AppRouter ? { [TKey_3 in keyof T_1]: T_1[TKey_3] extends import("@ts-rest/core").AppRoute ? import("@ts-rest/core").AppRouteFunction<T_1[TKey_3], TClientArgs, import("@ts-rest/core").PartialClientInferRequest<T_1[TKey_3], TClientArgs>> : T_1[TKey_3] extends AppRouter ? T_1[TKey_3] extends infer T_2 extends AppRouter ? { [TKey_4 in keyof T_2]: T_2[TKey_4] extends import("@ts-rest/core").AppRoute ? import("@ts-rest/core").AppRouteFunction<T_2[TKey_4], TClientArgs, import("@ts-rest/core").PartialClientInferRequest<T_2[TKey_4], TClientArgs>> : T_2[TKey_4] extends AppRouter ? T_2[TKey_4] extends infer T_3 extends AppRouter ? { [TKey_5 in keyof T_3]: T_3[TKey_5] extends import("@ts-rest/core").AppRoute ? import("@ts-rest/core").AppRouteFunction<T_3[TKey_5], TClientArgs, import("@ts-rest/core").PartialClientInferRequest<T_3[TKey_5], TClientArgs>> : T_3[TKey_5] extends AppRouter ? T_3[TKey_5] extends infer T_4 extends AppRouter ? { [TKey_6 in keyof T_4]: T_4[TKey_6] extends import("@ts-rest/core").AppRoute ? import("@ts-rest/core").AppRouteFunction<T_4[TKey_6], TClientArgs, import("@ts-rest/core").PartialClientInferRequest<T_4[TKey_6], TClientArgs>> : T_4[TKey_6] extends AppRouter ? T_4[TKey_6] extends infer T_5 extends AppRouter ? { [TKey_7 in keyof T_5]: T_5[TKey_7] extends import("@ts-rest/core").AppRoute ? import("@ts-rest/core").AppRouteFunction<T_5[TKey_7], TClientArgs, import("@ts-rest/core").PartialClientInferRequest<T_5[TKey_7], TClientArgs>> : T_5[TKey_7] extends AppRouter ? T_5[TKey_7] extends infer T_6 extends AppRouter ? { [TKey_8 in keyof T_6]: T_6[TKey_8] extends import("@ts-rest/core").AppRoute ? import("@ts-rest/core").AppRouteFunction<T_6[TKey_8], TClientArgs, import("@ts-rest/core").PartialClientInferRequest<T_6[TKey_8], TClientArgs>> : T_6[TKey_8] extends AppRouter ? T_6[TKey_8] extends infer T_7 extends AppRouter ? { [TKey_9 in keyof T_7]: T_7[TKey_9] extends import("@ts-rest/core").AppRoute ? import("@ts-rest/core").AppRouteFunction<T_7[TKey_9], TClientArgs, import("@ts-rest/core").PartialClientInferRequest<T_7[TKey_9], TClientArgs>> : T_7[TKey_9] extends AppRouter ? T_7[TKey_9] extends infer T_8 extends AppRouter ? { [TKey_10 in keyof T_8]: T_8[TKey_10] extends import("@ts-rest/core").AppRoute ? import("@ts-rest/core").AppRouteFunction<T_8[TKey_10], TClientArgs, import("@ts-rest/core").PartialClientInferRequest<T_8[TKey_10], TClientArgs>> : T_8[TKey_10] extends AppRouter ? T_8[TKey_10] extends infer T_9 extends AppRouter ? { [TKey_11 in keyof T_9]: T_9[TKey_11] extends import("@ts-rest/core").AppRoute ? import("@ts-rest/core").AppRouteFunction<T_9[TKey_11], TClientArgs, import("@ts-rest/core").PartialClientInferRequest<T_9[TKey_11], TClientArgs>> : T_9[TKey_11] extends AppRouter ? /*elided*/ any : never; } : never : never; } : never : never; } : never : never; } : never : never; } : never : never; } : never : never; } : never : never; } : never : never; } : never : never; } : never : never; };
     /**
      * Updates the authentication token used by this repository.
      *

package/dist/models/contact-info.model.d.ts

@@ -9,11 +9,15 @@ import type { BankSwiftCode, MNOId } from "@temboplus/frontend-core";
  * Serves as the foundation for type-safe contact handling throughout the application,
  * ensuring consistent behavior between mobile money and bank transfer contacts.
  *
+ * **Country Code Handling:**
+ * The country code is always derived from the underlying domain objects (PhoneNumber or Bank)
+ * rather than being passed as a separate parameter, ensuring consistency and single source of truth.
+ *
  * @abstract
  * @class BaseContactInfo
  *
  * @property {ContactType} type - The type of contact (either "Mobile" or "Bank")
- * @property {ISO2CountryCode} countryCode - The ISO2 country code where this contact operates
+ * @property {ISO2CountryCode} countryCode - The ISO2 country code derived from PhoneNumber or Bank
  *
  * @example
  * ```typescript
@@ -25,6 +29,7 @@ import type { BankSwiftCode, MNOId } from "@temboplus/frontend-core";
  * function processContact(contact: BaseContactInfo) {
  *   console.log(`Processing ${contact.type} contact: ${contact.displayName}`);
  *   console.log(`Channel: ${contact.channelDisplayName}`);
+ *   console.log(`Country: ${contact.countryCode}`); // Always available
  * }
  * ```
  */
@@ -37,7 +42,7 @@ declare abstract class BaseContactInfo {
      *
      * @protected
      * @param {ContactType} type - The type of contact to create ("Mobile" or "Bank")
-     * @param {ISO2CountryCode} countryCode - The ISO2 country code for this contact
+     * @param {ISO2CountryCode} countryCode - The ISO2 country code derived from domain objects
      */
     constructor(type: ContactType, countryCode: ISO2CountryCode);
     /**
@@ -117,12 +122,14 @@ declare abstract class BaseContactInfo {
  *
  * This class properly delegates MNO-related logic to country-specific implementations,
  * supporting both countries with Mobile Number Portability (MNP) and those without.
+ * The country code is always derived from the PhoneNumber object, ensuring consistency.
  *
  * **Key Features:**
  * - Automatic MNO detection for countries without MNP (e.g., Tanzania)
  * - Explicit MNO requirement for countries with MNP (e.g., Kenya)
  * - Country-specific validation through MNOUtils delegation
  * - Comprehensive error handling with structured context
+ * - Country code derived from PhoneNumber (single source of truth)
  *
  * **MNP Handling:**
  * - **Tanzania (no MNP)**: MNO is always auto-detected from phone number prefix, ignoring any provided MNO
@@ -140,6 +147,7 @@ declare abstract class BaseContactInfo {
  * // Tanzania - MNO auto-detected from prefix (ignores provided MNO)
  * const tzContact = new MobileContactInfo("John Doe", tzPhoneNumber);
  * console.log(tzContact.channel); // "VODACOM" (auto-detected)
+ * console.log(tzContact.countryCode); // "TZ" (from phoneNumber)
  *
  * // Tanzania - Even with explicit MNO, it's auto-detected from prefix
  * const tzExplicit = new MobileContactInfo("John Doe", tzPhoneNumber, TZMNOId.AIRTEL);
@@ -147,6 +155,7 @@ declare abstract class BaseContactInfo {
  *
  * // Kenya - MNO must be explicit due to MNP
  * const keContact = new MobileContactInfo("Jane Smith", kePhoneNumber, KEMNOId.SAFARICOM);
+ * console.log(keContact.countryCode); // "KE" (from phoneNumber)
  *
  * // Kenya - This would throw an error (MNO required)
  * // const keContact = new MobileContactInfo("Jane Smith", kePhoneNumber); // ❌ Error
@@ -164,12 +173,13 @@ export declare class MobileContactInfo extends BaseContactInfo {
      * **Validation Process:**
      * 1. Validates name is non-empty
      * 2. Validates phone number structure
-     * 3. Handles MNO validation based on country MNP status:
+     * 3. Extracts country code from PhoneNumber object
+     * 4. Handles MNO validation based on country MNP status:
      *    - **Countries with MNP (KE)**: Requires explicit MNO, validates it's valid for country
      *    - **Countries without MNP (TZ)**: Always auto-detects MNO from phone number prefix (ignores provided MNO)
      *
      * @param {string} name - The contact's personal name (required, non-empty)
-     * @param {PhoneNumber} phoneNumber - The validated phone number object
+     * @param {PhoneNumber} phoneNumber - The validated phone number object (contains country code)
      * @param {MNOId} [mnoId] - MNO ID. Required for MNP countries (KE), ignored for non-MNP countries (TZ)
      *
      * @throws {ContactInfoError} When any validation fails:
@@ -199,21 +209,20 @@ export declare class MobileContactInfo extends BaseContactInfo {
     /**
      * Creates a MobileContactInfo instance from a ContactDTO object.
      * Handles validation and MNO extraction from the DTO's channel field.
+     * The country code is automatically derived from the parsed phone number.
      *
      * **Process:**
      * 1. Validates DTO type is "Mobile"
-     * 2. Validates country code format
-     * 3. Parses phone number with country context
-     * 4. Handles MNO based on country MNP status:
+     * 2. Parses phone number (extracts country code from E164 format)
+     * 3. Handles MNO based on country MNP status:
      *    - **MNP countries**: Uses channel field (required)
      *    - **Non-MNP countries**: Auto-detects from phone number (ignores channel field)
-     * 5. Delegates to constructor for final validation
+     * 4. Delegates to constructor for final validation
      *
      * @static
      * @param {ContactDTO} info - The contact data transfer object
      * @param {string} info.type - Must be "Mobile"
-     * @param {string} info.accountNo - The phone number string to parse
-     * @param {string} info.countryCode - ISO2 country code
+     * @param {string} info.accountNo - The phone number string to parse (should be E164 format)
      * @param {string} info.displayName - The contact's name
      * @param {string} [info.channel] - MNO ID (required for MNP countries, ignored for non-MNP countries)
      *
@@ -225,7 +234,6 @@ export declare class MobileContactInfo extends BaseContactInfo {
      * const tzContactDTO = {
      *   type: "Mobile",
      *   accountNo: "+255712345678", // Vodacom prefix
-     *   countryCode: "TZ",
      *   displayName: "John Doe",
      *   channel: "AIRTEL" // This will be ignored, Vodacom will be auto-detected
      * };
@@ -234,36 +242,39 @@ export declare class MobileContactInfo extends BaseContactInfo {
      * const keContactDTO = {
      *   type: "Mobile",
      *   accountNo: "+254712345678",
-     *   countryCode: "KE",
      *   displayName: "Jane Smith",
      *   channel: "SAFARICOM" // Required for Kenya
      * };
      *
      * const tzContact = MobileContactInfo.fromContactDTO(tzContactDTO);
      * console.log(tzContact?.channelId); // "VODACOM" (not "AIRTEL")
+     * console.log(tzContact?.countryCode); // "TZ" (from phone number)
      *
      * const keContact = MobileContactInfo.fromContactDTO(keContactDTO);
      * console.log(keContact?.channelId); // "SAFARICOM"
+     * console.log(keContact?.countryCode); // "KE" (from phone number)
      * ```
      */
     static fromContactDTO(info: ContactDTO): MobileContactInfo | undefined;
     /**
      * Creates a MobileContactInfo instance from a PayoutDTO object.
      * Extracts mobile contact information from payout data structure.
+     * The country code is derived from the parsed phone number.
      *
      * **Process:**
-     * 1. Validates country code format
-     * 2. Parses phone number from msisdn field
-     * 3. Handles MNO based on country MNP status:
+     * 1. Validates country code format in DTO
+     * 2. Parses phone number from msisdn field (uses DTO country as hint)
+     * 3. Uses phone number's country code (derived from E164 format)
+     * 4. Handles MNO based on country MNP status:
      *    - **MNP countries**: Uses channel field (required)
      *    - **Non-MNP countries**: Auto-detects from phone number (ignores channel field)
-     * 4. Uses payeeName as the contact name
-     * 5. Delegates to constructor for validation
+     * 5. Uses payeeName as the contact name
+     * 6. Delegates to constructor for validation
      *
      * @static
      * @param {PayoutDTO} info - The payout data transfer object
-     * @param {string} info.msisdn - The phone number in various formats
-     * @param {string} info.countryCode - ISO2 country code
+     * @param {string} info.msisdn - The phone number in E164 or local format
+     * @param {string} info.countryCode - ISO2 country code (used as parsing hint)
      * @param {string} info.payeeName - The recipient's name
      * @param {string} [info.channel] - MNO ID (required for MNP countries, ignored for non-MNP countries)
      *
@@ -289,6 +300,7 @@ export declare class MobileContactInfo extends BaseContactInfo {
      *
      * const tzContact = MobileContactInfo.fromPayoutDTO(tzPayoutDTO);
      * console.log(tzContact?.channelName); // "M-Pesa" (Vodacom's service)
+     * console.log(tzContact?.countryCode); // "TZ" (from phoneNumber)
      * ```
      */
     static fromPayoutDTO(info: PayoutDTO): MobileContactInfo | undefined;
@@ -317,6 +329,7 @@ export declare class MobileContactInfo extends BaseContactInfo {
      *   console.log(unknownData.name); // ✅ Type-safe access
      *   console.log(unknownData.phoneNumber.e164Format); // ✅ Type-safe
      *   console.log(unknownData.mnoId); // ✅ Type-safe
+     *   console.log(unknownData.countryCode); // ✅ Type-safe (from phoneNumber)
      * } else {
      *   console.log("Invalid MobileContactInfo structure");
      * }
@@ -414,15 +427,15 @@ export declare class MobileContactInfo extends BaseContactInfo {
     get accountName(): string;
     /**
      * Gets the phone number formatted for display and storage.
-     * Returns the number in international numeric format (without + prefix).
+     * Returns the number in e164 format (with + prefix).
      *
      * @override
-     * @returns {string} Phone number in international numeric format (e.g., "255712345678")
+     * @returns {string} Phone number in e164 format (e.g., "+255712345678")
      *
      * @example
      * ```typescript
      * const contact = new MobileContactInfo("John", phoneNumber);
-     * console.log(contact.accNumber); // "255712345678"
+     * console.log(contact.accountNumber); // "+255712345678"
      * ```
      */
     get accountNumber(): string;
@@ -456,11 +469,11 @@ export declare class MobileContactInfo extends BaseContactInfo {
      * @example
      * ```typescript
      * const contact = new MobileContactInfo("John", tzPhone, TZMNOId.VODACOM);
-     * console.log(contact.channel); // "VODACOM" (for MNP countries)
+     * console.log(contact.channelId); // "VODACOM" (for MNP countries)
      *
      * // For non-MNP countries, always returns auto-detected value
      * const contact2 = new MobileContactInfo("John", tzPhone, TZMNOId.AIRTEL); // AIRTEL ignored
-     * console.log(contact2.channel); // "VODACOM" (auto-detected from phone prefix)
+     * console.log(contact2.channelId); // "VODACOM" (auto-detected from phone prefix)
      * ```
      */
     get channelId(): MNOId;
@@ -479,14 +492,14 @@ export declare class MobileContactInfo extends BaseContactInfo {
      * @example
      * ```typescript
      * const vodacomContact = new MobileContactInfo("John", tzPhone, TZMNOId.VODACOM);
-     * console.log(vodacomContact.channelDisplayName); // "M-Pesa"
+     * console.log(vodacomContact.channelName); // "M-Pesa"
      *
      * const safaricomContact = new MobileContactInfo("Jane", kePhone, KEMNOId.SAFARICOM);
-     * console.log(safaricomContact.channelDisplayName); // "M-Pesa"
+     * console.log(safaricomContact.channelName); // "M-Pesa"
      *
      * // For non-MNP countries, shows auto-detected service regardless of provided MNO
      * const tzContact = new MobileContactInfo("Bob", tzVodacomPhone, TZMNOId.AIRTEL); // AIRTEL ignored
-     * console.log(tzContact.channelDisplayName); // "M-Pesa" (Vodacom's service, auto-detected)
+     * console.log(tzContact.channelName); // "M-Pesa" (Vodacom's service, auto-detected)
      * ```
      *
      * @remarks
@@ -498,6 +511,7 @@ export declare class MobileContactInfo extends BaseContactInfo {
 /**
  * Implementation of BaseContactInfo for bank account contacts.
  * Handles storage, validation, and display of contact details specific to bank transfers.
+ * The country code is automatically derived from the Bank object.
  *
  * This class provides comprehensive validation for bank account information including
  * SWIFT code validation, account name verification, and account number format checking.
@@ -507,6 +521,7 @@ export declare class MobileContactInfo extends BaseContactInfo {
  * - Account name format validation
  * - Account number format validation (country-specific rules)
  * - Integration with Bank service for institution data
+ * - Country code derived from Bank (single source of truth)
  *
  * @extends BaseContactInfo
  * @class BankContactInfo
@@ -521,10 +536,11 @@ export declare class MobileContactInfo extends BaseContactInfo {
  * const bank = Bank.from("CORUTZTZ", "TZ"); // CRDB Bank
  * const contact = new BankContactInfo("John Doe", bank, "0150123456789");
  *
- * console.log(contact.channel); // "CORUTZTZ" (SWIFT code)
- * console.log(contact.channelDisplayName); // "CRDB" (bank short name)
- * console.log(contact.displayName); // "John Doe"
- * console.log(contact.accNumber); // "0150123456789"
+ * console.log(contact.channelId); // "CORUTZTZ" (SWIFT code)
+ * console.log(contact.channelName); // "CRDB" (bank short name)
+ * console.log(contact.accountName); // "John Doe"
+ * console.log(contact.accountNumber); // "0150123456789"
+ * console.log(contact.countryCode); // "TZ" (from bank)
  * ```
  *
  * @throws {ContactInfoError} When validation fails (invalid account name, number, or bank)
@@ -535,14 +551,16 @@ export declare class BankContactInfo extends BaseContactInfo {
     readonly accNo: string;
     /**
      * Creates a new bank contact with comprehensive validation.
+     * The country code is automatically extracted from the Bank object.
      *
      * **Validation Process:**
-     * 1. **Account name validation**: Checks format and character requirements
-     * 2. **Account number validation**: Validates format per country banking rules
-     * 3. **Bank validation**: Ensures bank object is valid and contains required data
+     * 1. **Country code extraction**: Derived from bank.countryCode
+     * 2. **Account name validation**: Checks format and character requirements
+     * 3. **Account number validation**: Validates format per country banking rules
+     * 4. **Bank validation**: Ensures bank object is valid and contains required data
      *
      * @param {string} accName - The bank account holder's name (must pass BankValidation.validateAccountName)
-     * @param {Bank} bank - The bank institution object (must be valid Bank instance)
+     * @param {Bank} bank - The bank institution object (must be valid Bank instance with countryCode)
      * @param {string} accNo - The bank account number (must pass country-specific validation)
      *
      * @throws {ContactInfoError} When validation fails:
@@ -556,6 +574,7 @@ export declare class BankContactInfo extends BaseContactInfo {
      *   const bank = Bank.from("CORUTZTZ", "TZ");
      *   const contact = new BankContactInfo("John Doe", bank, "0150123456789");
      *   console.log("Bank contact created successfully");
+     *   console.log(`Country: ${contact.countryCode}`); // "TZ" (from bank)
      * } catch (error) {
      *   if (error instanceof ContactInfoError) {
      *     console.log(`Validation failed: ${error.message}`);
@@ -567,19 +586,20 @@ export declare class BankContactInfo extends BaseContactInfo {
     /**
      * Creates a BankContactInfo instance from a ContactDTO object.
      * Handles SWIFT code validation and bank lookup.
+     * The country code is derived from the SWIFT code.
      *
      * **Process:**
      * 1. Validates DTO type is "Bank"
-     * 2. Validates country code format
-     * 3. Validates SWIFT code format and existence
-     * 4. Looks up bank information using SWIFT code
-     * 5. Delegates to constructor for final validation
+     * 2. Extracts SWIFT code from channel field
+     * 3. Derives country code from SWIFT code
+     * 4. Validates SWIFT code format and existence
+     * 5. Looks up bank information using SWIFT code
+     * 6. Delegates to constructor for final validation
      *
      * @static
      * @param {ContactDTO} info - The contact data transfer object
      * @param {string} info.type - Must be "Bank"
      * @param {string} info.channel - The SWIFT code for the bank
-     * @param {string} info.countryCode - ISO2 country code
      * @param {string} info.displayName - The account holder's name
      * @param {string} info.accountNo - The bank account number
      *
@@ -590,14 +610,14 @@ export declare class BankContactInfo extends BaseContactInfo {
      * const contactDTO = {
      *   type: "Bank",
      *   channel: "CORUTZTZ", // CRDB Bank SWIFT code
-     *   countryCode: "TZ",
      *   displayName: "John Doe",
      *   accountNo: "0150123456789"
      * };
      *
      * const contact = BankContactInfo.fromContactDTO(contactDTO);
      * if (contact) {
-     *   console.log(`Created bank contact: ${contact.displayName} at ${contact.bank.shortName}`);
+     *   console.log(`Created bank contact: ${contact.accountName} at ${contact.bank.shortName}`);
+     *   console.log(`Country: ${contact.countryCode}`); // "TZ" (derived from SWIFT)
      * }
      * ```
      */
@@ -605,20 +625,21 @@ export declare class BankContactInfo extends BaseContactInfo {
     /**
      * Creates a BankContactInfo instance from a PayoutDTO object.
      * Parses bank information from the payout's msisdn field using "swiftcode:accountno" format.
+     * The country code is derived from the parsed phone number or validated against the SWIFT code.
      *
      * **Expected Format:** The msisdn field should contain "SWIFTCODE:ACCOUNTNUMBER"
      *
      * **Process:**
-     * 1. Validates country code format
+     * 1. Validates country code format in DTO (used as hint/validation)
      * 2. Splits msisdn field on ":" delimiter
      * 3. Validates SWIFT code format and existence
-     * 4. Looks up bank information
+     * 4. Looks up bank information (bank contains country code)
      * 5. Creates contact with parsed information
      *
      * @static
      * @param {PayoutDTO} info - The payout data transfer object
      * @param {string} info.msisdn - Bank info in format "SWIFTCODE:ACCOUNTNUMBER"
-     * @param {string} info.countryCode - ISO2 country code
+     * @param {string} info.countryCode - ISO2 country code (used for validation)
      * @param {string} info.payeeName - The account holder's name
      *
      * @returns {BankContactInfo | undefined} New instance if successful, undefined if parsing fails
@@ -633,9 +654,10 @@ export declare class BankContactInfo extends BaseContactInfo {
      *
      * const contact = BankContactInfo.fromPayoutDTO(payoutDTO);
      * if (contact) {
-     *   console.log(`Payout to: ${contact.displayName}`);
+     *   console.log(`Payout to: ${contact.accountName}`);
      *   console.log(`Bank: ${contact.bank.fullName}`);
-     *   console.log(`Account: ${contact.accNumber}`);
+     *   console.log(`Account: ${contact.accountNumber}`);
+     *   console.log(`Country: ${contact.countryCode}`); // "TZ" (from bank)
      * }
      * ```
      *
@@ -670,6 +692,7 @@ export declare class BankContactInfo extends BaseContactInfo {
      *   console.log(unknownData.accName); // ✅ Type-safe access
      *   console.log(unknownData.bank.fullName); // ✅ Type-safe
      *   console.log(unknownData.accNo); // ✅ Type-safe
+     *   console.log(unknownData.countryCode); // ✅ Type-safe (from bank)
      * } else {
      *   console.log("Invalid BankContactInfo structure");
      * }
@@ -731,10 +754,10 @@ export declare class BankContactInfo extends BaseContactInfo {
      * @example
      * ```typescript
      * const contact = new BankContactInfo("John", crdBank, "123456789");
-     * console.log(contact.channel); // "CORUTZTZ"
+     * console.log(contact.channelId); // "CORUTZTZ"
      *
      * // Type-safe usage
-     * if (contact.channel === "CORUTZTZ") {
+     * if (contact.channelId === "CORUTZTZ") {
      *   console.log("This is a CRDB Bank account");
      * }
      * ```
@@ -749,10 +772,10 @@ export declare class BankContactInfo extends BaseContactInfo {
      * @example
      * ```typescript
      * const crdContact = new BankContactInfo("John", crdBank, "123456789");
-     * console.log(crdContact.channelDisplayName); // "CRDB"
+     * console.log(crdContact.channelName); // "CRDB"
      *
      * const kcbContact = new BankContactInfo("Jane", kcbBank, "987654321");
-     * console.log(kcbContact.channelDisplayName); // "KCB"
+     * console.log(kcbContact.channelName); // "KCB"
      * ```
      *
      * @remarks
@@ -770,6 +793,7 @@ export declare class BankContactInfo extends BaseContactInfo {
  * - **Runtime type discrimination**: Use `contact.type` to determine specific type
  * - **Comprehensive validation**: Each type provides its own validation logic
  * - **Consistent API**: Both types implement BaseContactInfo interface
+ * - **Country code access**: Always available via contact.countryCode (derived from domain objects)
  *
  * @typedef {MobileContactInfo | BankContactInfo} ContactInfo
  *
@@ -777,8 +801,9 @@ export declare class BankContactInfo extends BaseContactInfo {
  * ```typescript
  * // Type-safe handling of mixed contact types
  * function processContact(contact: ContactInfo) {
- *   console.log(`Processing ${contact.type} contact: ${contact.displayName}`);
- *   console.log(`Channel: ${contact.channelDisplayName}`);
+ *   console.log(`Processing ${contact.type} contact: ${contact.accountName}`);
+ *   console.log(`Channel: ${contact.channelName}`);
+ *   console.log(`Country: ${contact.countryCode}`); // Always available
  *
  *   // Type discrimination for specific behavior
  *   if (contact.type === "Mobile") {

package/dist/models/contact.model.d.ts

@@ -1,6 +1,5 @@
 import { type ContactDTO, ContactType } from "../features/contact/contact.dtos";
 import { type ContactInfo } from "./contact-info.model";
-import { Country, ISO2CountryCode } from "@temboplus/frontend-core";
 /**
  * Contact class that wraps the Zod schema and provides additional functionality
  */
@@ -87,21 +86,7 @@ export declare class Contact {
      * - "Display Name" as fallback
      */
     get accNameLabel(): string;
-    /**
-     * Country code associated with this contact
-     *
-     * @returns {string} Two-letter ISO country code
-     * @throws an error if the country code is not a valid ISO-2 country code
-     */
-    get countryCode(): ISO2CountryCode;
     get channelName(): string;
-    /**
-     * Country object associated with this contact
-     *
-     * @returns {Country} Country instance representing the contact's country
-     * @throws
-     */
-    get country(): Country;
     /**
      * Creates a Contact instance from raw data
      * @throws {ZodError} if validation fails

package/package.json

@@ -1,15 +1,12 @@
 {
   "name": "@temboplus/afloat",
-  "version": "0.1.70",
+  "version": "0.1.72",
   "description": "A foundational library for Temboplus-Afloat projects.",
-  "main": "./dist/index.cjs.js",
-  "module": "./dist/index.esm.js",
-  "types": "./dist/index.d.ts",
   "type": "module",
   "exports": {
     ".": {
-      "import": "./dist/index.esm.js",
-      "require": "./dist/index.cjs.js",
+      "import": "./dist/index.js",
+      "require": "./dist/index.cjs",
       "types": "./dist/index.d.ts"
     }
   },
@@ -19,8 +16,7 @@
   "scripts": {
     "build": "rollup -c rollup.config.js",
     "prepare": "npm run build",
-    "dev": "npm run build -- --watch",
-    "test": "echo \"Error: no test specified\" && exit 1"
+    "dev": "npm run build -- --watch"
   },
   "repository": {
     "type": "git",
@@ -37,12 +33,9 @@
   },
   "homepage": "https://github.com/TemboPlus-Frontend/afloat-js#readme",
   "peerDependencies": {
-    "@temboplus/frontend-core": "^0.2.16",
-    "@ts-rest/core": "^3.52.1",
     "tslib": "^2.8.1",
     "uuid": "^11.1.0",
-    "zod": "^3.24.2",
-    "zustand": "^4.5.7"
+    "zod": "^3.24.2"
   },
   "devDependencies": {
     "@rollup/plugin-alias": "^5.1.1",
@@ -57,5 +50,10 @@
     "ts-jest": "^29.3.1",
     "ts-node": "^10.9.2",
     "typescript": "^5.8.3"
+  },
+  "dependencies": {
+    "@temboplus/frontend-core": "^0.2.17",
+    "zustand": "^4.5.7",
+    "@ts-rest/core": "^3.52.1"
   }
 }