From a1777c1698f608b0004afc9687a0ccdb36be6367 Mon Sep 17 00:00:00 2001 From: Moein Date: Thu, 11 Dec 2025 17:24:30 +0330 Subject: [PATCH 1/3] fix: make queryKey and queryFn not be required --- src/useStellar/useAccount.ts | 5 +++-- src/useStellar/useAccounts.ts | 5 +++-- src/useStellar/useAssets.ts | 5 +++-- src/useStellar/useBalances.ts | 5 +++-- src/useStellar/useClaimableBalances.ts | 5 +++-- src/useStellar/useEffects.ts | 5 +++-- src/useStellar/useLedgers.ts | 5 +++-- src/useStellar/useLiquidityPools.ts | 5 +++-- src/useStellar/useOffers.ts | 6 +++--- src/useStellar/useOperations.ts | 5 +++-- src/useStellar/useOrderbook.ts | 8 ++++---- src/useStellar/usePayments.ts | 5 +++-- src/useStellar/useStrictReceivePaths.ts | 8 ++++---- src/useStellar/useStrictSendPaths.ts | 8 ++++---- src/useStellar/useTradeAggregation.ts | 8 ++++---- src/useStellar/useTrades.ts | 6 +++--- src/useStellar/useTransactions.ts | 26 +++++++++++-------------- src/utils.ts | 6 ++++++ 18 files changed, 69 insertions(+), 57 deletions(-) diff --git a/src/useStellar/useAccount.ts b/src/useStellar/useAccount.ts index e295d23..110b0dd 100644 --- a/src/useStellar/useAccount.ts +++ b/src/useStellar/useAccount.ts @@ -11,13 +11,14 @@ import type { } from '@bluxcc/core/dist/exports/core/getAccount'; import { getAddress, getNetwork } from '../utils'; +import type { WithoutQueryInternals } from '../utils'; type R = GetAccountResult; type O = GetAccountOptions; export function useAccount( options?: O, - queryOptions?: UseQueryOptions, + queryOptions?: WithoutQueryInternals ): UseQueryResult { const address = getAddress(options?.address); const network = getNetwork(options?.network); @@ -50,7 +51,7 @@ export function useAccount( queryKey, queryFn, enabled, - ...queryOptions, + ...(queryOptions as UseQueryOptions | undefined), }); return result; diff --git a/src/useStellar/useAccounts.ts b/src/useStellar/useAccounts.ts index 58c4507..9780f5a 100644 --- a/src/useStellar/useAccounts.ts +++ b/src/useStellar/useAccounts.ts @@ -11,13 +11,14 @@ import type { } from '@bluxcc/core/dist/exports/core/getAccounts'; import { getNetwork } from '../utils'; +import type { WithoutQueryInternals } from '../utils'; type R = GetAccountsResult; type O = GetAccountsOptions; export function useAccounts( options?: O, - queryOptions?: UseQueryOptions, + queryOptions?: WithoutQueryInternals ): UseQueryResult { const network = getNetwork(options?.network); const enabled = queryOptions?.enabled ?? true; @@ -54,7 +55,7 @@ export function useAccounts( queryKey, queryFn, enabled, - ...queryOptions, + ...(queryOptions as UseQueryOptions | undefined), }); return result; diff --git a/src/useStellar/useAssets.ts b/src/useStellar/useAssets.ts index d5ddd7c..471049d 100644 --- a/src/useStellar/useAssets.ts +++ b/src/useStellar/useAssets.ts @@ -11,13 +11,14 @@ import type { } from "@bluxcc/core/dist/exports/core/getAssets"; import { getNetwork } from '../utils'; +import type { WithoutQueryInternals } from '../utils'; type R = GetAssetsResult; type O = GetAssetsOptions; export function useAssets( options?: O, - queryOptions?: UseQueryOptions, + queryOptions?: WithoutQueryInternals ): UseQueryResult { const network = getNetwork(options?.network); const enabled = queryOptions?.enabled ?? true; @@ -52,7 +53,7 @@ export function useAssets( queryKey, queryFn, enabled, - ...queryOptions, + ...(queryOptions as UseQueryOptions | undefined), }); return result; diff --git a/src/useStellar/useBalances.ts b/src/useStellar/useBalances.ts index 15734a1..e722206 100644 --- a/src/useStellar/useBalances.ts +++ b/src/useStellar/useBalances.ts @@ -11,13 +11,14 @@ import type { } from "@bluxcc/core/dist/exports/core/getBalances"; import { getAddress, getNetwork } from '../utils'; +import type { WithoutQueryInternals } from '../utils'; type R = GetBalancesResult; type O = GetBalancesOptions; export function useBalances( options?: O, - queryOptions?: UseQueryOptions, + queryOptions?: WithoutQueryInternals ): UseQueryResult { const address = getAddress(options?.address); const network = getNetwork(options?.network); @@ -53,7 +54,7 @@ export function useBalances( queryKey, queryFn, enabled, - ...queryOptions, + ...(queryOptions as UseQueryOptions | undefined), }); return result; diff --git a/src/useStellar/useClaimableBalances.ts b/src/useStellar/useClaimableBalances.ts index e056f93..042e0ca 100644 --- a/src/useStellar/useClaimableBalances.ts +++ b/src/useStellar/useClaimableBalances.ts @@ -11,13 +11,14 @@ import type { } from "@bluxcc/core/dist/exports/core/getClaimableBalances"; import { getAddress, getNetwork } from '../utils'; +import type { WithoutQueryInternals } from '../utils'; type R = GetClaimableBalancesResult; type O = GetClaimableBalancesOptions; export function useClaimableBalances( options: O, - queryOptions?: UseQueryOptions, + queryOptions?: WithoutQueryInternals ): UseQueryResult { const claimant = getAddress(options.claimant); const network = getNetwork(options?.network); @@ -55,7 +56,7 @@ export function useClaimableBalances( queryKey, queryFn, enabled, - ...queryOptions, + ...(queryOptions as UseQueryOptions | undefined), }); return result; diff --git a/src/useStellar/useEffects.ts b/src/useStellar/useEffects.ts index 5d86514..3247df8 100644 --- a/src/useStellar/useEffects.ts +++ b/src/useStellar/useEffects.ts @@ -11,13 +11,14 @@ import type { } from "@bluxcc/core/dist/exports/core/getEffects"; import { getNetwork } from '../utils'; +import type { WithoutQueryInternals } from '../utils'; type R = GetEffectsResult; type O = GetEffectsOptions; export function useEffects( options?: O, - queryOptions?: UseQueryOptions, + queryOptions?: WithoutQueryInternals ): UseQueryResult { const network = getNetwork(options?.network); const enabled = queryOptions?.enabled ?? true; @@ -55,7 +56,7 @@ export function useEffects( queryKey, queryFn, enabled, - ...queryOptions, + ...(queryOptions as UseQueryOptions | undefined), }); return result; diff --git a/src/useStellar/useLedgers.ts b/src/useStellar/useLedgers.ts index 6a8f36c..c380544 100644 --- a/src/useStellar/useLedgers.ts +++ b/src/useStellar/useLedgers.ts @@ -11,13 +11,14 @@ import type { } from "@bluxcc/core/dist/exports/core/getLedgers"; import { getNetwork } from '../utils'; +import type { WithoutQueryInternals } from '../utils'; type R = GetLedgersResult; type O = GetLedgersOptions; export function useLedgers( options?: O, - queryOptions?: UseQueryOptions, + queryOptions?: WithoutQueryInternals ): UseQueryResult { const network = getNetwork(options?.network); const enabled = queryOptions?.enabled ?? true; @@ -51,7 +52,7 @@ export function useLedgers( queryKey, queryFn, enabled, - ...queryOptions, + ...(queryOptions as UseQueryOptions | undefined), }); return result; diff --git a/src/useStellar/useLiquidityPools.ts b/src/useStellar/useLiquidityPools.ts index c679401..32731ab 100644 --- a/src/useStellar/useLiquidityPools.ts +++ b/src/useStellar/useLiquidityPools.ts @@ -11,13 +11,14 @@ import type { } from "@bluxcc/core/dist/exports/core/getLiquidityPools"; import { getNetwork } from '../utils'; +import type { WithoutQueryInternals } from '../utils'; type R = GetLiquidityPoolsResult; type O = GetLiquidityPoolsOptions; export function useLiquidityPools( options?: O, - queryOptions?: UseQueryOptions, + queryOptions?: WithoutQueryInternals ): UseQueryResult { const network = getNetwork(options?.network); const enabled = queryOptions?.enabled ?? true; @@ -52,7 +53,7 @@ export function useLiquidityPools( queryKey, queryFn, enabled, - ...queryOptions, + ...(queryOptions as UseQueryOptions | undefined), }); return result; diff --git a/src/useStellar/useOffers.ts b/src/useStellar/useOffers.ts index e612d71..e1c389c 100644 --- a/src/useStellar/useOffers.ts +++ b/src/useStellar/useOffers.ts @@ -11,13 +11,14 @@ import type { } from "@bluxcc/core/dist/exports/core/getOffers"; import { getNetwork } from '../utils'; +import type { WithoutQueryInternals } from '../utils'; type R = GetOffersResult; type O = GetOffersOptions; export function useOffers( options?: O, - queryOptions?: UseQueryOptions, + queryOptions?: WithoutQueryInternals ): UseQueryResult { const network = getNetwork(options?.network); const enabled = queryOptions?.enabled ?? true; @@ -28,7 +29,6 @@ export function useOffers( options?.selling, options?.sponsor, options?.seller, - options?.forAccount, options?.cursor, options?.limit, options?.network, @@ -56,7 +56,7 @@ export function useOffers( queryKey, queryFn, enabled, - ...queryOptions, + ...(queryOptions as UseQueryOptions | undefined), }); return result; diff --git a/src/useStellar/useOperations.ts b/src/useStellar/useOperations.ts index aab80bc..e884e8b 100644 --- a/src/useStellar/useOperations.ts +++ b/src/useStellar/useOperations.ts @@ -11,13 +11,14 @@ import type { } from "@bluxcc/core/dist/exports/core/getOperations"; import { getNetwork } from '../utils'; +import type { WithoutQueryInternals } from '../utils'; type R = GetOperationsResult; type O = GetOperationsOptions; export function useOperations( options?: O, - queryOptions?: UseQueryOptions, + queryOptions?: WithoutQueryInternals ): UseQueryResult { const network = getNetwork(options?.network); const enabled = queryOptions?.enabled ?? true; @@ -57,7 +58,7 @@ export function useOperations( queryKey, queryFn, enabled, - ...queryOptions, + ...(queryOptions as UseQueryOptions | undefined), }); return result; diff --git a/src/useStellar/useOrderbook.ts b/src/useStellar/useOrderbook.ts index 63bb39b..4592538 100644 --- a/src/useStellar/useOrderbook.ts +++ b/src/useStellar/useOrderbook.ts @@ -10,8 +10,8 @@ import type { } from "@bluxcc/core/dist/exports/core/getOrderbook"; import { Asset } from '@stellar/stellar-sdk'; -import { CallBuilderOptions } from '../utils'; -import { getNetwork } from '../utils'; +import { CallBuilderOptions, getNetwork } from '../utils'; +import type { WithoutQueryInternals } from '../utils'; type R = GetOrderbookResult; type O = CallBuilderOptions; @@ -19,7 +19,7 @@ type O = CallBuilderOptions; export function useOrderbook( args: [selling: Asset, buying: Asset], options?: O, - queryOptions?: UseQueryOptions, + queryOptions?: WithoutQueryInternals ): UseQueryResult { const network = getNetwork(options?.network); const enabled = queryOptions?.enabled ?? true; @@ -54,6 +54,6 @@ export function useOrderbook( queryKey, queryFn, enabled, - ...queryOptions, + ...(queryOptions as UseQueryOptions | undefined), }); } diff --git a/src/useStellar/usePayments.ts b/src/useStellar/usePayments.ts index 8b8cc6a..821fe24 100644 --- a/src/useStellar/usePayments.ts +++ b/src/useStellar/usePayments.ts @@ -12,6 +12,7 @@ import type { import { PaymentCallBuilder } from '@stellar/stellar-sdk/lib/horizon/payment_call_builder'; import { ServerApi } from '@stellar/stellar-sdk/lib/horizon'; import { getNetwork } from '../utils'; +import type { WithoutQueryInternals } from '../utils'; type R = { builder: PaymentCallBuilder; @@ -21,7 +22,7 @@ type O = GetPaymentsOptions; export function usePayments( options?: O, - queryOptions?: UseQueryOptions, + queryOptions?: WithoutQueryInternals ): UseQueryResult { const network = getNetwork(options?.network); const enabled = queryOptions?.enabled ?? true; @@ -58,7 +59,7 @@ export function usePayments( queryKey, queryFn, enabled, - ...queryOptions, + ...(queryOptions as UseQueryOptions | undefined), }); return result; diff --git a/src/useStellar/useStrictReceivePaths.ts b/src/useStellar/useStrictReceivePaths.ts index ef9fdc3..e6891c2 100644 --- a/src/useStellar/useStrictReceivePaths.ts +++ b/src/useStellar/useStrictReceivePaths.ts @@ -10,8 +10,8 @@ import type { } from "@bluxcc/core/dist/exports/core/getStrictReceivePaths"; import { Asset } from '@stellar/stellar-sdk'; -import { CallBuilderOptions } from '../utils'; -import { getNetwork } from '../utils'; +import { CallBuilderOptions, getNetwork } from '../utils'; +import type { WithoutQueryInternals } from '../utils'; type R = GetPaymentPathResult; type O = CallBuilderOptions; @@ -23,7 +23,7 @@ export function useStrictReceivePaths( destinationAmount: string, ], options?: O, - queryOptions?: UseQueryOptions, + queryOptions?: WithoutQueryInternals ): UseQueryResult { const network = getNetwork(options?.network); const enabled = queryOptions?.enabled ?? true; @@ -59,7 +59,7 @@ export function useStrictReceivePaths( queryKey, queryFn, enabled, - ...queryOptions, + ...(queryOptions as UseQueryOptions | undefined), }); return result; diff --git a/src/useStellar/useStrictSendPaths.ts b/src/useStellar/useStrictSendPaths.ts index 1ece36c..bfe34ba 100644 --- a/src/useStellar/useStrictSendPaths.ts +++ b/src/useStellar/useStrictSendPaths.ts @@ -10,8 +10,8 @@ import type { } from "@bluxcc/core/dist/exports/core/getStrictSendPaths"; import { Asset } from '@stellar/stellar-sdk'; -import { CallBuilderOptions } from '../utils'; -import { getNetwork } from '../utils'; +import { CallBuilderOptions, getNetwork } from '../utils'; +import type { WithoutQueryInternals } from '../utils'; type R = GetPaymentPathResult; type O = CallBuilderOptions; @@ -23,7 +23,7 @@ export function useStrictSendPaths( destination: string | Asset[], ], options?: O, - queryOptions?: UseQueryOptions, + queryOptions?: WithoutQueryInternals ): UseQueryResult { const network = getNetwork(options?.network); const enabled = queryOptions?.enabled ?? true; @@ -59,7 +59,7 @@ export function useStrictSendPaths( queryKey, queryFn, enabled, - ...queryOptions, + ...(queryOptions as UseQueryOptions | undefined), }); return result; diff --git a/src/useStellar/useTradeAggregation.ts b/src/useStellar/useTradeAggregation.ts index 68289ef..dad74cc 100644 --- a/src/useStellar/useTradeAggregation.ts +++ b/src/useStellar/useTradeAggregation.ts @@ -10,8 +10,8 @@ import type { } from "@bluxcc/core/dist/exports/core/getTradeAggregation"; import { Asset } from '@stellar/stellar-sdk'; -import { CallBuilderOptions } from '../utils'; -import { getNetwork } from '../utils'; +import { CallBuilderOptions, getNetwork } from '../utils'; +import type { WithoutQueryInternals } from '../utils'; type R = GetTradeAggregationResult; type O = CallBuilderOptions; @@ -26,7 +26,7 @@ export function useTradeAggregation( offset: number, ], options?: O, - queryOptions?: UseQueryOptions, + queryOptions?: WithoutQueryInternals ): UseQueryResult { const network = getNetwork(options?.network); const enabled = queryOptions?.enabled ?? true; @@ -65,7 +65,7 @@ export function useTradeAggregation( queryKey, queryFn, enabled, - ...queryOptions, + ...(queryOptions as UseQueryOptions | undefined), }); return result; diff --git a/src/useStellar/useTrades.ts b/src/useStellar/useTrades.ts index 36ccc45..10e8c14 100644 --- a/src/useStellar/useTrades.ts +++ b/src/useStellar/useTrades.ts @@ -11,19 +11,19 @@ import type { } from "@bluxcc/core/dist/exports/core/getTrades"; import { getNetwork } from '../utils'; +import type { WithoutQueryInternals } from "../utils"; type R = GetTradesResult; type O = GetTradesOptions; export function useTrades( options?: O, - queryOptions?: UseQueryOptions, + queryOptions?: WithoutQueryInternals ): UseQueryResult { const network = getNetwork(options?.network); const enabled = queryOptions?.enabled ?? true; const deps = [ - options?.forAccount, options?.forAssetPair, options?.forOffer, options?.forType, @@ -56,7 +56,7 @@ export function useTrades( queryKey, queryFn, enabled, - ...queryOptions, + ...(queryOptions as UseQueryOptions | undefined), }); return result; diff --git a/src/useStellar/useTransactions.ts b/src/useStellar/useTransactions.ts index c9f4eae..076bd34 100644 --- a/src/useStellar/useTransactions.ts +++ b/src/useStellar/useTransactions.ts @@ -1,23 +1,20 @@ -import { useMemo } from 'react'; +import { useMemo } from "react"; import { getTransactions } from "@bluxcc/core"; -import { - useQuery, - UseQueryResult, - UseQueryOptions, -} from '@tanstack/react-query'; +import { useQuery, UseQueryResult, UseQueryOptions } from "@tanstack/react-query"; import type { GetTransactionsResult, GetTransactionsOptions, } from "@bluxcc/core/dist/exports/core/getTransactions"; -import { getNetwork } from '../utils'; +import { getNetwork } from "../utils"; +import type { WithoutQueryInternals } from "../utils"; type R = GetTransactionsResult; type O = GetTransactionsOptions; export function useTransactions( options?: O, - queryOptions?: UseQueryOptions, + queryOptions?: WithoutQueryInternals ): UseQueryResult { const network = getNetwork(options?.network); const enabled = queryOptions?.enabled ?? true; @@ -35,8 +32,8 @@ export function useTransactions( ]; const queryKey = useMemo( - () => ['blux', 'transactions', network, ...deps], - [network, ...deps], + () => ["blux", "transactions", network, ...deps], + [network, ...deps] ); const queryFn = useMemo( @@ -45,18 +42,17 @@ export function useTransactions( ...options, network, }; - return getTransactions(opts); }, - [network, ...deps], + [network, ...deps] ); const result = useQuery({ queryKey, queryFn, enabled, - ...queryOptions, - }); + ...(queryOptions as UseQueryOptions | undefined), +}); return result; -} \ No newline at end of file +} diff --git a/src/utils.ts b/src/utils.ts index 408579d..2bf0ee9 100644 --- a/src/utils.ts +++ b/src/utils.ts @@ -1,4 +1,5 @@ import { getState } from '@bluxcc/core'; +import { UseQueryOptions } from '@tanstack/react-query'; export type CallBuilderOptions = { cursor?: string; @@ -7,6 +8,11 @@ export type CallBuilderOptions = { order?: 'asc' | 'desc'; }; +export type WithoutQueryInternals = Omit< + UseQueryOptions, + "queryKey" | "queryFn" +>; + export const checkConfigCreated = () => { const { stellar } = getState(); From d3e32a3bcbf88f3755dd562077c173fa6b5388d8 Mon Sep 17 00:00:00 2001 From: Moein Date: Thu, 11 Dec 2025 17:44:56 +0330 Subject: [PATCH 2/3] fix: fix the result priorities --- src/useStellar/useAccount.ts | 4 ++-- src/useStellar/useAccounts.ts | 4 ++-- src/useStellar/useAssets.ts | 4 ++-- src/useStellar/useBalances.ts | 4 ++-- src/useStellar/useClaimableBalances.ts | 4 ++-- src/useStellar/useEffects.ts | 4 ++-- src/useStellar/useLedgers.ts | 4 ++-- src/useStellar/useLiquidityPools.ts | 4 ++-- src/useStellar/useOffers.ts | 4 ++-- src/useStellar/useOperations.ts | 4 ++-- src/useStellar/useOrderbook.ts | 4 ++-- src/useStellar/usePayments.ts | 4 ++-- src/useStellar/useStrictReceivePaths.ts | 4 ++-- src/useStellar/useStrictSendPaths.ts | 4 ++-- src/useStellar/useTradeAggregation.ts | 4 ++-- src/useStellar/useTrades.ts | 4 ++-- src/useStellar/useTransactions.ts | 10 +++++++--- 17 files changed, 39 insertions(+), 35 deletions(-) diff --git a/src/useStellar/useAccount.ts b/src/useStellar/useAccount.ts index 110b0dd..d3692e0 100644 --- a/src/useStellar/useAccount.ts +++ b/src/useStellar/useAccount.ts @@ -48,10 +48,10 @@ export function useAccount( ); const result = useQuery({ + ...(queryOptions as UseQueryOptions | undefined), + enabled, queryKey, queryFn, - enabled, - ...(queryOptions as UseQueryOptions | undefined), }); return result; diff --git a/src/useStellar/useAccounts.ts b/src/useStellar/useAccounts.ts index 9780f5a..38544eb 100644 --- a/src/useStellar/useAccounts.ts +++ b/src/useStellar/useAccounts.ts @@ -52,10 +52,10 @@ export function useAccounts( ); const result = useQuery({ + ...(queryOptions as UseQueryOptions | undefined), + enabled, queryKey, queryFn, - enabled, - ...(queryOptions as UseQueryOptions | undefined), }); return result; diff --git a/src/useStellar/useAssets.ts b/src/useStellar/useAssets.ts index 471049d..075a7ad 100644 --- a/src/useStellar/useAssets.ts +++ b/src/useStellar/useAssets.ts @@ -50,10 +50,10 @@ export function useAssets( ); const result = useQuery({ + ...(queryOptions as UseQueryOptions | undefined), + enabled, queryKey, queryFn, - enabled, - ...(queryOptions as UseQueryOptions | undefined), }); return result; diff --git a/src/useStellar/useBalances.ts b/src/useStellar/useBalances.ts index e722206..9579be7 100644 --- a/src/useStellar/useBalances.ts +++ b/src/useStellar/useBalances.ts @@ -51,10 +51,10 @@ export function useBalances( ); const result = useQuery({ + ...(queryOptions as UseQueryOptions | undefined), + enabled, queryKey, queryFn, - enabled, - ...(queryOptions as UseQueryOptions | undefined), }); return result; diff --git a/src/useStellar/useClaimableBalances.ts b/src/useStellar/useClaimableBalances.ts index 042e0ca..111c6d0 100644 --- a/src/useStellar/useClaimableBalances.ts +++ b/src/useStellar/useClaimableBalances.ts @@ -53,10 +53,10 @@ export function useClaimableBalances( ); const result = useQuery({ + ...(queryOptions as UseQueryOptions | undefined), + enabled, queryKey, queryFn, - enabled, - ...(queryOptions as UseQueryOptions | undefined), }); return result; diff --git a/src/useStellar/useEffects.ts b/src/useStellar/useEffects.ts index 3247df8..b16368b 100644 --- a/src/useStellar/useEffects.ts +++ b/src/useStellar/useEffects.ts @@ -53,10 +53,10 @@ export function useEffects( ); const result = useQuery({ + ...(queryOptions as UseQueryOptions | undefined), + enabled, queryKey, queryFn, - enabled, - ...(queryOptions as UseQueryOptions | undefined), }); return result; diff --git a/src/useStellar/useLedgers.ts b/src/useStellar/useLedgers.ts index c380544..8468f1d 100644 --- a/src/useStellar/useLedgers.ts +++ b/src/useStellar/useLedgers.ts @@ -49,10 +49,10 @@ export function useLedgers( ); const result = useQuery({ + ...(queryOptions as UseQueryOptions | undefined), + enabled, queryKey, queryFn, - enabled, - ...(queryOptions as UseQueryOptions | undefined), }); return result; diff --git a/src/useStellar/useLiquidityPools.ts b/src/useStellar/useLiquidityPools.ts index 32731ab..0102420 100644 --- a/src/useStellar/useLiquidityPools.ts +++ b/src/useStellar/useLiquidityPools.ts @@ -50,10 +50,10 @@ export function useLiquidityPools( ); const result = useQuery({ + ...(queryOptions as UseQueryOptions | undefined), + enabled, queryKey, queryFn, - enabled, - ...(queryOptions as UseQueryOptions | undefined), }); return result; diff --git a/src/useStellar/useOffers.ts b/src/useStellar/useOffers.ts index e1c389c..c71214c 100644 --- a/src/useStellar/useOffers.ts +++ b/src/useStellar/useOffers.ts @@ -53,10 +53,10 @@ export function useOffers( ); const result = useQuery({ + ...(queryOptions as UseQueryOptions | undefined), + enabled, queryKey, queryFn, - enabled, - ...(queryOptions as UseQueryOptions | undefined), }); return result; diff --git a/src/useStellar/useOperations.ts b/src/useStellar/useOperations.ts index e884e8b..ab0fda7 100644 --- a/src/useStellar/useOperations.ts +++ b/src/useStellar/useOperations.ts @@ -55,10 +55,10 @@ export function useOperations( ); const result = useQuery({ + ...(queryOptions as UseQueryOptions | undefined), + enabled, queryKey, queryFn, - enabled, - ...(queryOptions as UseQueryOptions | undefined), }); return result; diff --git a/src/useStellar/useOrderbook.ts b/src/useStellar/useOrderbook.ts index 4592538..4ff0926 100644 --- a/src/useStellar/useOrderbook.ts +++ b/src/useStellar/useOrderbook.ts @@ -51,9 +51,9 @@ export function useOrderbook( ); return useQuery({ + ...(queryOptions as UseQueryOptions | undefined), + enabled, queryKey, queryFn, - enabled, - ...(queryOptions as UseQueryOptions | undefined), }); } diff --git a/src/useStellar/usePayments.ts b/src/useStellar/usePayments.ts index 821fe24..31b71b1 100644 --- a/src/useStellar/usePayments.ts +++ b/src/useStellar/usePayments.ts @@ -56,10 +56,10 @@ export function usePayments( ); const result = useQuery({ + ...(queryOptions as UseQueryOptions | undefined), + enabled, queryKey, queryFn, - enabled, - ...(queryOptions as UseQueryOptions | undefined), }); return result; diff --git a/src/useStellar/useStrictReceivePaths.ts b/src/useStellar/useStrictReceivePaths.ts index e6891c2..5acb5d8 100644 --- a/src/useStellar/useStrictReceivePaths.ts +++ b/src/useStellar/useStrictReceivePaths.ts @@ -56,10 +56,10 @@ export function useStrictReceivePaths( ); const result = useQuery({ + ...(queryOptions as UseQueryOptions | undefined), + enabled, queryKey, queryFn, - enabled, - ...(queryOptions as UseQueryOptions | undefined), }); return result; diff --git a/src/useStellar/useStrictSendPaths.ts b/src/useStellar/useStrictSendPaths.ts index bfe34ba..274660c 100644 --- a/src/useStellar/useStrictSendPaths.ts +++ b/src/useStellar/useStrictSendPaths.ts @@ -56,10 +56,10 @@ export function useStrictSendPaths( ); const result = useQuery({ + ...(queryOptions as UseQueryOptions | undefined), + enabled, queryKey, queryFn, - enabled, - ...(queryOptions as UseQueryOptions | undefined), }); return result; diff --git a/src/useStellar/useTradeAggregation.ts b/src/useStellar/useTradeAggregation.ts index dad74cc..2e61923 100644 --- a/src/useStellar/useTradeAggregation.ts +++ b/src/useStellar/useTradeAggregation.ts @@ -62,10 +62,10 @@ export function useTradeAggregation( ); const result = useQuery({ + ...(queryOptions as UseQueryOptions | undefined), + enabled, queryKey, queryFn, - enabled, - ...(queryOptions as UseQueryOptions | undefined), }); return result; diff --git a/src/useStellar/useTrades.ts b/src/useStellar/useTrades.ts index 10e8c14..ae9635c 100644 --- a/src/useStellar/useTrades.ts +++ b/src/useStellar/useTrades.ts @@ -53,10 +53,10 @@ export function useTrades( ); const result = useQuery({ + ...(queryOptions as UseQueryOptions | undefined), + enabled, queryKey, queryFn, - enabled, - ...(queryOptions as UseQueryOptions | undefined), }); return result; diff --git a/src/useStellar/useTransactions.ts b/src/useStellar/useTransactions.ts index 076bd34..dcce1ba 100644 --- a/src/useStellar/useTransactions.ts +++ b/src/useStellar/useTransactions.ts @@ -1,6 +1,10 @@ import { useMemo } from "react"; import { getTransactions } from "@bluxcc/core"; -import { useQuery, UseQueryResult, UseQueryOptions } from "@tanstack/react-query"; +import { + useQuery, + UseQueryResult, + UseQueryOptions, +} from '@tanstack/react-query'; import type { GetTransactionsResult, GetTransactionsOptions, @@ -48,10 +52,10 @@ export function useTransactions( ); const result = useQuery({ + ...(queryOptions as UseQueryOptions | undefined), + enabled, queryKey, queryFn, - enabled, - ...(queryOptions as UseQueryOptions | undefined), }); return result; From c9950ba43523782e9987307085fe40fc94d75822 Mon Sep 17 00:00:00 2001 From: Moein Date: Thu, 11 Dec 2025 17:55:58 +0330 Subject: [PATCH 3/3] fix: change type name WithoutQueryInternals to QueryOptions --- src/useStellar/useAccount.ts | 4 ++-- src/useStellar/useAccounts.ts | 4 ++-- src/useStellar/useAssets.ts | 4 ++-- src/useStellar/useBalances.ts | 4 ++-- src/useStellar/useClaimableBalances.ts | 4 ++-- src/useStellar/useEffects.ts | 4 ++-- src/useStellar/useLedgers.ts | 4 ++-- src/useStellar/useLiquidityPools.ts | 4 ++-- src/useStellar/useOffers.ts | 4 ++-- src/useStellar/useOperations.ts | 4 ++-- src/useStellar/useOrderbook.ts | 4 ++-- src/useStellar/usePayments.ts | 4 ++-- src/useStellar/useStrictReceivePaths.ts | 4 ++-- src/useStellar/useStrictSendPaths.ts | 4 ++-- src/useStellar/useTradeAggregation.ts | 4 ++-- src/useStellar/useTrades.ts | 4 ++-- src/useStellar/useTransactions.ts | 4 ++-- src/utils.ts | 2 +- 18 files changed, 35 insertions(+), 35 deletions(-) diff --git a/src/useStellar/useAccount.ts b/src/useStellar/useAccount.ts index d3692e0..86ab863 100644 --- a/src/useStellar/useAccount.ts +++ b/src/useStellar/useAccount.ts @@ -11,14 +11,14 @@ import type { } from '@bluxcc/core/dist/exports/core/getAccount'; import { getAddress, getNetwork } from '../utils'; -import type { WithoutQueryInternals } from '../utils'; +import type { QueryOptions } from '../utils'; type R = GetAccountResult; type O = GetAccountOptions; export function useAccount( options?: O, - queryOptions?: WithoutQueryInternals + queryOptions?: QueryOptions ): UseQueryResult { const address = getAddress(options?.address); const network = getNetwork(options?.network); diff --git a/src/useStellar/useAccounts.ts b/src/useStellar/useAccounts.ts index 38544eb..7a79945 100644 --- a/src/useStellar/useAccounts.ts +++ b/src/useStellar/useAccounts.ts @@ -11,14 +11,14 @@ import type { } from '@bluxcc/core/dist/exports/core/getAccounts'; import { getNetwork } from '../utils'; -import type { WithoutQueryInternals } from '../utils'; +import type { QueryOptions } from '../utils'; type R = GetAccountsResult; type O = GetAccountsOptions; export function useAccounts( options?: O, - queryOptions?: WithoutQueryInternals + queryOptions?: QueryOptions ): UseQueryResult { const network = getNetwork(options?.network); const enabled = queryOptions?.enabled ?? true; diff --git a/src/useStellar/useAssets.ts b/src/useStellar/useAssets.ts index 075a7ad..7fbd2f8 100644 --- a/src/useStellar/useAssets.ts +++ b/src/useStellar/useAssets.ts @@ -11,14 +11,14 @@ import type { } from "@bluxcc/core/dist/exports/core/getAssets"; import { getNetwork } from '../utils'; -import type { WithoutQueryInternals } from '../utils'; +import type { QueryOptions } from '../utils'; type R = GetAssetsResult; type O = GetAssetsOptions; export function useAssets( options?: O, - queryOptions?: WithoutQueryInternals + queryOptions?: QueryOptions ): UseQueryResult { const network = getNetwork(options?.network); const enabled = queryOptions?.enabled ?? true; diff --git a/src/useStellar/useBalances.ts b/src/useStellar/useBalances.ts index 9579be7..c818740 100644 --- a/src/useStellar/useBalances.ts +++ b/src/useStellar/useBalances.ts @@ -11,14 +11,14 @@ import type { } from "@bluxcc/core/dist/exports/core/getBalances"; import { getAddress, getNetwork } from '../utils'; -import type { WithoutQueryInternals } from '../utils'; +import type { QueryOptions } from '../utils'; type R = GetBalancesResult; type O = GetBalancesOptions; export function useBalances( options?: O, - queryOptions?: WithoutQueryInternals + queryOptions?: QueryOptions ): UseQueryResult { const address = getAddress(options?.address); const network = getNetwork(options?.network); diff --git a/src/useStellar/useClaimableBalances.ts b/src/useStellar/useClaimableBalances.ts index 111c6d0..5bd0571 100644 --- a/src/useStellar/useClaimableBalances.ts +++ b/src/useStellar/useClaimableBalances.ts @@ -11,14 +11,14 @@ import type { } from "@bluxcc/core/dist/exports/core/getClaimableBalances"; import { getAddress, getNetwork } from '../utils'; -import type { WithoutQueryInternals } from '../utils'; +import type { QueryOptions } from '../utils'; type R = GetClaimableBalancesResult; type O = GetClaimableBalancesOptions; export function useClaimableBalances( options: O, - queryOptions?: WithoutQueryInternals + queryOptions?: QueryOptions ): UseQueryResult { const claimant = getAddress(options.claimant); const network = getNetwork(options?.network); diff --git a/src/useStellar/useEffects.ts b/src/useStellar/useEffects.ts index b16368b..2fa3321 100644 --- a/src/useStellar/useEffects.ts +++ b/src/useStellar/useEffects.ts @@ -11,14 +11,14 @@ import type { } from "@bluxcc/core/dist/exports/core/getEffects"; import { getNetwork } from '../utils'; -import type { WithoutQueryInternals } from '../utils'; +import type { QueryOptions } from '../utils'; type R = GetEffectsResult; type O = GetEffectsOptions; export function useEffects( options?: O, - queryOptions?: WithoutQueryInternals + queryOptions?: QueryOptions ): UseQueryResult { const network = getNetwork(options?.network); const enabled = queryOptions?.enabled ?? true; diff --git a/src/useStellar/useLedgers.ts b/src/useStellar/useLedgers.ts index 8468f1d..1acc234 100644 --- a/src/useStellar/useLedgers.ts +++ b/src/useStellar/useLedgers.ts @@ -11,14 +11,14 @@ import type { } from "@bluxcc/core/dist/exports/core/getLedgers"; import { getNetwork } from '../utils'; -import type { WithoutQueryInternals } from '../utils'; +import type { QueryOptions } from '../utils'; type R = GetLedgersResult; type O = GetLedgersOptions; export function useLedgers( options?: O, - queryOptions?: WithoutQueryInternals + queryOptions?: QueryOptions ): UseQueryResult { const network = getNetwork(options?.network); const enabled = queryOptions?.enabled ?? true; diff --git a/src/useStellar/useLiquidityPools.ts b/src/useStellar/useLiquidityPools.ts index 0102420..d23182e 100644 --- a/src/useStellar/useLiquidityPools.ts +++ b/src/useStellar/useLiquidityPools.ts @@ -11,14 +11,14 @@ import type { } from "@bluxcc/core/dist/exports/core/getLiquidityPools"; import { getNetwork } from '../utils'; -import type { WithoutQueryInternals } from '../utils'; +import type { QueryOptions } from '../utils'; type R = GetLiquidityPoolsResult; type O = GetLiquidityPoolsOptions; export function useLiquidityPools( options?: O, - queryOptions?: WithoutQueryInternals + queryOptions?: QueryOptions ): UseQueryResult { const network = getNetwork(options?.network); const enabled = queryOptions?.enabled ?? true; diff --git a/src/useStellar/useOffers.ts b/src/useStellar/useOffers.ts index c71214c..923eb1b 100644 --- a/src/useStellar/useOffers.ts +++ b/src/useStellar/useOffers.ts @@ -11,14 +11,14 @@ import type { } from "@bluxcc/core/dist/exports/core/getOffers"; import { getNetwork } from '../utils'; -import type { WithoutQueryInternals } from '../utils'; +import type { QueryOptions } from '../utils'; type R = GetOffersResult; type O = GetOffersOptions; export function useOffers( options?: O, - queryOptions?: WithoutQueryInternals + queryOptions?: QueryOptions ): UseQueryResult { const network = getNetwork(options?.network); const enabled = queryOptions?.enabled ?? true; diff --git a/src/useStellar/useOperations.ts b/src/useStellar/useOperations.ts index ab0fda7..1fc1d7b 100644 --- a/src/useStellar/useOperations.ts +++ b/src/useStellar/useOperations.ts @@ -11,14 +11,14 @@ import type { } from "@bluxcc/core/dist/exports/core/getOperations"; import { getNetwork } from '../utils'; -import type { WithoutQueryInternals } from '../utils'; +import type { QueryOptions } from '../utils'; type R = GetOperationsResult; type O = GetOperationsOptions; export function useOperations( options?: O, - queryOptions?: WithoutQueryInternals + queryOptions?: QueryOptions ): UseQueryResult { const network = getNetwork(options?.network); const enabled = queryOptions?.enabled ?? true; diff --git a/src/useStellar/useOrderbook.ts b/src/useStellar/useOrderbook.ts index 4ff0926..bedaab9 100644 --- a/src/useStellar/useOrderbook.ts +++ b/src/useStellar/useOrderbook.ts @@ -11,7 +11,7 @@ import type { import { Asset } from '@stellar/stellar-sdk'; import { CallBuilderOptions, getNetwork } from '../utils'; -import type { WithoutQueryInternals } from '../utils'; +import type { QueryOptions } from '../utils'; type R = GetOrderbookResult; type O = CallBuilderOptions; @@ -19,7 +19,7 @@ type O = CallBuilderOptions; export function useOrderbook( args: [selling: Asset, buying: Asset], options?: O, - queryOptions?: WithoutQueryInternals + queryOptions?: QueryOptions ): UseQueryResult { const network = getNetwork(options?.network); const enabled = queryOptions?.enabled ?? true; diff --git a/src/useStellar/usePayments.ts b/src/useStellar/usePayments.ts index 31b71b1..dfa3f65 100644 --- a/src/useStellar/usePayments.ts +++ b/src/useStellar/usePayments.ts @@ -12,7 +12,7 @@ import type { import { PaymentCallBuilder } from '@stellar/stellar-sdk/lib/horizon/payment_call_builder'; import { ServerApi } from '@stellar/stellar-sdk/lib/horizon'; import { getNetwork } from '../utils'; -import type { WithoutQueryInternals } from '../utils'; +import type { QueryOptions } from '../utils'; type R = { builder: PaymentCallBuilder; @@ -22,7 +22,7 @@ type O = GetPaymentsOptions; export function usePayments( options?: O, - queryOptions?: WithoutQueryInternals + queryOptions?: QueryOptions ): UseQueryResult { const network = getNetwork(options?.network); const enabled = queryOptions?.enabled ?? true; diff --git a/src/useStellar/useStrictReceivePaths.ts b/src/useStellar/useStrictReceivePaths.ts index 5acb5d8..7a81459 100644 --- a/src/useStellar/useStrictReceivePaths.ts +++ b/src/useStellar/useStrictReceivePaths.ts @@ -11,7 +11,7 @@ import type { import { Asset } from '@stellar/stellar-sdk'; import { CallBuilderOptions, getNetwork } from '../utils'; -import type { WithoutQueryInternals } from '../utils'; +import type { QueryOptions } from '../utils'; type R = GetPaymentPathResult; type O = CallBuilderOptions; @@ -23,7 +23,7 @@ export function useStrictReceivePaths( destinationAmount: string, ], options?: O, - queryOptions?: WithoutQueryInternals + queryOptions?: QueryOptions ): UseQueryResult { const network = getNetwork(options?.network); const enabled = queryOptions?.enabled ?? true; diff --git a/src/useStellar/useStrictSendPaths.ts b/src/useStellar/useStrictSendPaths.ts index 274660c..7c610a0 100644 --- a/src/useStellar/useStrictSendPaths.ts +++ b/src/useStellar/useStrictSendPaths.ts @@ -11,7 +11,7 @@ import type { import { Asset } from '@stellar/stellar-sdk'; import { CallBuilderOptions, getNetwork } from '../utils'; -import type { WithoutQueryInternals } from '../utils'; +import type { QueryOptions } from '../utils'; type R = GetPaymentPathResult; type O = CallBuilderOptions; @@ -23,7 +23,7 @@ export function useStrictSendPaths( destination: string | Asset[], ], options?: O, - queryOptions?: WithoutQueryInternals + queryOptions?: QueryOptions ): UseQueryResult { const network = getNetwork(options?.network); const enabled = queryOptions?.enabled ?? true; diff --git a/src/useStellar/useTradeAggregation.ts b/src/useStellar/useTradeAggregation.ts index 2e61923..6d3213b 100644 --- a/src/useStellar/useTradeAggregation.ts +++ b/src/useStellar/useTradeAggregation.ts @@ -11,7 +11,7 @@ import type { import { Asset } from '@stellar/stellar-sdk'; import { CallBuilderOptions, getNetwork } from '../utils'; -import type { WithoutQueryInternals } from '../utils'; +import type { QueryOptions } from '../utils'; type R = GetTradeAggregationResult; type O = CallBuilderOptions; @@ -26,7 +26,7 @@ export function useTradeAggregation( offset: number, ], options?: O, - queryOptions?: WithoutQueryInternals + queryOptions?: QueryOptions ): UseQueryResult { const network = getNetwork(options?.network); const enabled = queryOptions?.enabled ?? true; diff --git a/src/useStellar/useTrades.ts b/src/useStellar/useTrades.ts index ae9635c..53a05e5 100644 --- a/src/useStellar/useTrades.ts +++ b/src/useStellar/useTrades.ts @@ -11,14 +11,14 @@ import type { } from "@bluxcc/core/dist/exports/core/getTrades"; import { getNetwork } from '../utils'; -import type { WithoutQueryInternals } from "../utils"; +import type { QueryOptions } from "../utils"; type R = GetTradesResult; type O = GetTradesOptions; export function useTrades( options?: O, - queryOptions?: WithoutQueryInternals + queryOptions?: QueryOptions ): UseQueryResult { const network = getNetwork(options?.network); const enabled = queryOptions?.enabled ?? true; diff --git a/src/useStellar/useTransactions.ts b/src/useStellar/useTransactions.ts index dcce1ba..c085600 100644 --- a/src/useStellar/useTransactions.ts +++ b/src/useStellar/useTransactions.ts @@ -11,14 +11,14 @@ import type { } from "@bluxcc/core/dist/exports/core/getTransactions"; import { getNetwork } from "../utils"; -import type { WithoutQueryInternals } from "../utils"; +import type { QueryOptions } from "../utils"; type R = GetTransactionsResult; type O = GetTransactionsOptions; export function useTransactions( options?: O, - queryOptions?: WithoutQueryInternals + queryOptions?: QueryOptions ): UseQueryResult { const network = getNetwork(options?.network); const enabled = queryOptions?.enabled ?? true; diff --git a/src/utils.ts b/src/utils.ts index 2bf0ee9..72f7085 100644 --- a/src/utils.ts +++ b/src/utils.ts @@ -8,7 +8,7 @@ export type CallBuilderOptions = { order?: 'asc' | 'desc'; }; -export type WithoutQueryInternals = Omit< +export type QueryOptions = Omit< UseQueryOptions, "queryKey" | "queryFn" >;