react-native-candle 0.1.33 → 0.1.35

package/src/index.ts

@@ -10,13 +10,13 @@ import type {
   FiatAsset,
   FiatAssetQuoteRequest,
   FiatAssetRef,
+  FiatMarketAccountKind,
   AssetAccount as InternalAssetAccount,
   Counterparty as InternalCounterparty,
   TradeAsset as InternalTradeAsset,
   TradeAssetRef as InternalTradeAssetRef,
   TradeQuery as InternalTradeQuery,
   TradeQuote as InternalTradeQuote,
-  LegalAccountKind,
   LinkedAccount,
   LinkedAccountRef,
   LinkedAccountStatusRef,
@@ -36,6 +36,7 @@ import type {
   ServiceCounterparty,
   TradeAssetQuoteRequest,
   TradeState,
+  TransportAccountKind,
   TransportAsset,
   TransportAssetQuoteRequest,
   TransportAssetRef,
@@ -135,16 +136,7 @@ export class CandleClient {
     );
   }
 
-  public async getLinkedAccounts(): Promise<
-    (
-      | (LinkedAccount & {
-          details: { state: "active" } & ActiveLinkedAccountDetails;
-        })
-      | (LinkedAccount & {
-          details: { state: "inactive" | "unavailable" };
-        })
-    )[]
-  > {
+  public async getLinkedAccounts(): Promise<LinkedAccountDetail[]> {
     const accounts = await this.candle.getLinkedAccounts();
     return accounts.map((account) => {
       if (account.details.activeLinkedAccountDetails !== undefined) {
@@ -471,6 +463,14 @@ export class CandleClient {
     }
   }
 
+  private assertFiatAssetKind(kind: string): "fiat" {
+    if (kind !== "fiat") {
+      throw new Error("Internal Candle Error: corrupted market account.");
+    } else {
+      return kind;
+    }
+  }
+
   private assertMarketAssetKind(kind: string): "stock" | "crypto" {
     if (kind !== "stock" && kind !== "crypto") {
       throw new Error("Internal Candle Error: corrupted market account.");
@@ -479,27 +479,31 @@ export class CandleClient {
     }
   }
 
+  private assertTransportAssetKind(kind: string): "transport" {
+    if (kind !== "transport") {
+      throw new Error("Internal Candle Error: corrupted market account.");
+    } else {
+      return kind;
+    }
+  }
+
   private convertToAssetAccount(account: InternalAssetAccount): AssetAccount {
-    const { legalAccountKind, nickname } = account;
-    const { fiatAccountDetails, marketAccountDetails } = account.details;
+    const { fiatAccount, marketAccount, transportAccount } = account;
 
-    if (fiatAccountDetails !== undefined) {
+    if (fiatAccount !== undefined) {
       return {
-        legalAccountKind,
-        nickname,
-        details: {
-          ...fiatAccountDetails,
-          assetKind: "fiat",
-        },
+        ...fiatAccount,
+        assetKind: this.assertFiatAssetKind(fiatAccount.assetKind),
       };
-    } else if (marketAccountDetails !== undefined) {
+    } else if (marketAccount !== undefined) {
       return {
-        legalAccountKind,
-        nickname,
-        details: {
-          ...marketAccountDetails,
-          assetKind: this.assertMarketAssetKind(marketAccountDetails.assetKind),
-        },
+        ...marketAccount,
+        assetKind: this.assertMarketAssetKind(marketAccount.assetKind),
+      };
+    } else if (transportAccount !== undefined) {
+      return {
+        ...transportAccount,
+        assetKind: this.assertTransportAssetKind(transportAccount.assetKind),
       };
     } else {
       throw new Error("Internal Candle Error: corrupted asset account.");
@@ -562,26 +566,28 @@ type TradeQueryAssetKind =
   | "nothing";
 
 type AssetAccount = {
-  legalAccountKind: LegalAccountKind;
+  serviceAccountID: string;
   nickname: string;
-  details:
-    | {
-        assetKind: "fiat";
-        serviceAccountID: string;
-        currencyCode: string;
-        balance?: number;
-        linkedAccountID: string;
-        service: Service;
-        ach?: ACHDetails;
-        wire?: WireDetails;
-      }
-    | {
-        assetKind: "stock" | "crypto";
-        serviceAccountID: string;
-        linkedAccountID: string;
-        service: Service;
-      };
-};
+  linkedAccountID: string;
+  service: Service;
+} & (
+  | {
+      assetKind: "fiat";
+      accountKind: FiatMarketAccountKind;
+      currencyCode: string;
+      balance?: number;
+      ach?: ACHDetails;
+      wire?: WireDetails;
+    }
+  | {
+      assetKind: "stock" | "crypto";
+      accountKind: FiatMarketAccountKind;
+    }
+  | {
+      assetKind: "transport";
+      accountKind: TransportAccountKind;
+    }
+);
 
 type Trade = {
   dateTime: string;
@@ -598,6 +604,14 @@ type TradeAssetRef =
   | ({ assetKind: "fiat" } & FiatAssetRef)
   | ({ assetKind: "stock" | "crypto" } & MarketTradeAssetRef);
 
+type LinkedAccountDetail =
+  | (LinkedAccount & {
+      details: { state: "active" } & ActiveLinkedAccountDetails;
+    })
+  | (LinkedAccount & {
+      details: { state: "inactive" | "unavailable" };
+    });
+
 export type {
   Address,
   AppUser,
@@ -607,7 +621,9 @@ export type {
   Coordinates,
   Counterparty,
   LinkedAccount,
+  LinkedAccountDetail,
   LinkedAccountRef,
+  LinkedAccountStatusRef,
   Service,
   Trade,
   TradeAsset,

package/src/specs/RNCandle.nitro.ts

@@ -19,9 +19,20 @@ export type WireDetails = {
   routingNumber: string;
 };
 
-type FiatAccountDetails = {
+export type FiatMarketAccountKind =
+  | "individual"
+  | "joint"
+  | "traditionalIRA"
+  | "rothIRA"
+  | "business";
+
+export type TransportAccountKind = "individual" | "joint" | "business";
+
+type FiatAccount = {
   assetKind: string; // fiat
   serviceAccountID: string;
+  accountKind: FiatMarketAccountKind;
+  nickname: string;
   currencyCode: string;
   balance?: number;
   ach?: ACHDetails;
@@ -30,31 +41,31 @@ type FiatAccountDetails = {
   service: Service;
 };
 
-type MarketAccountDetails = {
+type MarketAccount = {
   assetKind: string; // "stock" | "crypto"
   serviceAccountID: string;
+  accountKind: FiatMarketAccountKind;
+  nickname: string;
   linkedAccountID: string;
   service: Service;
 };
 
-type AssetAccountDetails = {
-  fiatAccountDetails?: FiatAccountDetails;
-  marketAccountDetails?: MarketAccountDetails;
+type TransportAccount = {
+  assetKind: string; // "transport"
+  serviceAccountID: string;
+  accountKind: TransportAccountKind;
+  nickname: string;
+  linkedAccountID: string;
+  service: Service;
 };
 
-export type LegalAccountKind =
-  | "individual"
-  | "joint"
-  | "traditionalIra"
-  | "rothIra";
-
 export type AssetAccount = {
-  legalAccountKind: LegalAccountKind;
-  nickname: string;
-  details: AssetAccountDetails;
+  fiatAccount?: FiatAccount;
+  marketAccount?: MarketAccount;
+  transportAccount?: TransportAccount;
 };
 
-type AssetAccountKind = "fiat" | "stock" | "crypto";
+type AssetAccountKind = "fiat" | "stock" | "crypto" | "transport";
 
 export type AssetAccountQuery = {
   linkedAccountIDs?: string;
@@ -98,6 +109,7 @@ export type TransportAsset = {
   assetKind: string; // "transport"
   serviceTradeID: string;
   serviceAssetID: string;
+  serviceAccountID: string;
   name: string;
   description: string;
   // FIXME: use URL type for url fields

package/nitrogen/generated/ios/swift/AssetAccountDetails.swift

@@ -1,83 +0,0 @@
-///
-/// AssetAccountDetails.swift
-/// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
-/// https://github.com/mrousavy/nitro
-/// Copyright © 2025 Marc Rousavy @ Margelo
-///
-
-import NitroModules
-
-/// Represents an instance of `AssetAccountDetails`, backed by a C++ struct.
-public typealias AssetAccountDetails = margelo.nitro.rncandle.AssetAccountDetails
-
-extension AssetAccountDetails {
-  private typealias bridge = margelo.nitro.rncandle.bridge.swift
-
-  /**
-   * Create a new instance of `AssetAccountDetails`.
-   */
-  public init(fiatAccountDetails: FiatAccountDetails?, marketAccountDetails: MarketAccountDetails?)
-  {
-    self.init(
-      { () -> bridge.std__optional_FiatAccountDetails_ in
-        if let __unwrappedValue = fiatAccountDetails {
-          return bridge.create_std__optional_FiatAccountDetails_(__unwrappedValue)
-        } else {
-          return .init()
-        }
-      }(),
-      { () -> bridge.std__optional_MarketAccountDetails_ in
-        if let __unwrappedValue = marketAccountDetails {
-          return bridge.create_std__optional_MarketAccountDetails_(__unwrappedValue)
-        } else {
-          return .init()
-        }
-      }())
-  }
-
-  public var fiatAccountDetails: FiatAccountDetails? {
-    @inline(__always)
-    get {
-      return { () -> FiatAccountDetails? in
-        if let __unwrapped = self.__fiatAccountDetails.value {
-          return __unwrapped
-        } else {
-          return nil
-        }
-      }()
-    }
-    @inline(__always)
-    set {
-      self.__fiatAccountDetails = { () -> bridge.std__optional_FiatAccountDetails_ in
-        if let __unwrappedValue = newValue {
-          return bridge.create_std__optional_FiatAccountDetails_(__unwrappedValue)
-        } else {
-          return .init()
-        }
-      }()
-    }
-  }
-
-  public var marketAccountDetails: MarketAccountDetails? {
-    @inline(__always)
-    get {
-      return { () -> MarketAccountDetails? in
-        if let __unwrapped = self.__marketAccountDetails.value {
-          return __unwrapped
-        } else {
-          return nil
-        }
-      }()
-    }
-    @inline(__always)
-    set {
-      self.__marketAccountDetails = { () -> bridge.std__optional_MarketAccountDetails_ in
-        if let __unwrappedValue = newValue {
-          return bridge.create_std__optional_MarketAccountDetails_(__unwrappedValue)
-        } else {
-          return .init()
-        }
-      }()
-    }
-  }
-}

package/nitrogen/generated/shared/c++/AssetAccountDetails.hpp

@@ -1,78 +0,0 @@
-///
-/// AssetAccountDetails.hpp
-/// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
-/// https://github.com/mrousavy/nitro
-/// Copyright © 2025 Marc Rousavy @ Margelo
-///
-
-#pragma once
-
-#if __has_include(<NitroModules/JSIConverter.hpp>)
-#include <NitroModules/JSIConverter.hpp>
-#else
-#error NitroModules cannot be found! Are you sure you installed NitroModules properly?
-#endif
-#if __has_include(<NitroModules/NitroDefines.hpp>)
-#include <NitroModules/NitroDefines.hpp>
-#else
-#error NitroModules cannot be found! Are you sure you installed NitroModules properly?
-#endif
-
-// Forward declaration of `FiatAccountDetails` to properly resolve imports.
-namespace margelo::nitro::rncandle { struct FiatAccountDetails; }
-// Forward declaration of `MarketAccountDetails` to properly resolve imports.
-namespace margelo::nitro::rncandle { struct MarketAccountDetails; }
-
-#include <optional>
-#include "FiatAccountDetails.hpp"
-#include "MarketAccountDetails.hpp"
-
-namespace margelo::nitro::rncandle {
-
-  /**
-   * A struct which can be represented as a JavaScript object (AssetAccountDetails).
-   */
-  struct AssetAccountDetails {
-  public:
-    std::optional<FiatAccountDetails> fiatAccountDetails     SWIFT_PRIVATE;
-    std::optional<MarketAccountDetails> marketAccountDetails     SWIFT_PRIVATE;
-
-  public:
-    AssetAccountDetails() = default;
-    explicit AssetAccountDetails(std::optional<FiatAccountDetails> fiatAccountDetails, std::optional<MarketAccountDetails> marketAccountDetails): fiatAccountDetails(fiatAccountDetails), marketAccountDetails(marketAccountDetails) {}
-  };
-
-} // namespace margelo::nitro::rncandle
-
-namespace margelo::nitro {
-
-  using namespace margelo::nitro::rncandle;
-
-  // C++ AssetAccountDetails <> JS AssetAccountDetails (object)
-  template <>
-  struct JSIConverter<AssetAccountDetails> final {
-    static inline AssetAccountDetails fromJSI(jsi::Runtime& runtime, const jsi::Value& arg) {
-      jsi::Object obj = arg.asObject(runtime);
-      return AssetAccountDetails(
-        JSIConverter<std::optional<FiatAccountDetails>>::fromJSI(runtime, obj.getProperty(runtime, "fiatAccountDetails")),
-        JSIConverter<std::optional<MarketAccountDetails>>::fromJSI(runtime, obj.getProperty(runtime, "marketAccountDetails"))
-      );
-    }
-    static inline jsi::Value toJSI(jsi::Runtime& runtime, const AssetAccountDetails& arg) {
-      jsi::Object obj(runtime);
-      obj.setProperty(runtime, "fiatAccountDetails", JSIConverter<std::optional<FiatAccountDetails>>::toJSI(runtime, arg.fiatAccountDetails));
-      obj.setProperty(runtime, "marketAccountDetails", JSIConverter<std::optional<MarketAccountDetails>>::toJSI(runtime, arg.marketAccountDetails));
-      return obj;
-    }
-    static inline bool canConvert(jsi::Runtime& runtime, const jsi::Value& value) {
-      if (!value.isObject()) {
-        return false;
-      }
-      jsi::Object obj = value.getObject(runtime);
-      if (!JSIConverter<std::optional<FiatAccountDetails>>::canConvert(runtime, obj.getProperty(runtime, "fiatAccountDetails"))) return false;
-      if (!JSIConverter<std::optional<MarketAccountDetails>>::canConvert(runtime, obj.getProperty(runtime, "marketAccountDetails"))) return false;
-      return true;
-    }
-  };
-
-} // namespace margelo::nitro