@hyperix/hooks 0.3.0 → 0.3.1

package/dist/use-trade-history.d.ts

@@ -1,5 +1,5 @@
 import { type UseInfiniteQueryOptions, type UseInfiniteQueryResult } from "@tanstack/react-query";
-import { type UseUserFillsOptions, type UserFill } from "./use-user-fills.js";
+import { type UserFillsData, type UseUserFillsOptions, type UserFill } from "./use-user-fills.js";
 export type TradeHistory = UserFill & {
     displayCoin: string;
     quoteCoin: string;
@@ -27,6 +27,10 @@ export type InfiniteTradeHistoryPageParam = {
     startTime: number;
     endTime: number;
 };
+type RawTradeHistoryPage = UserFillsData & {
+    startTime: number;
+    endTime: number;
+};
 type InfiniteTradeHistoryQueryKey = [
     "infinite-trade-history",
     `0x${string}`,
@@ -34,7 +38,7 @@ type InfiniteTradeHistoryQueryKey = [
     number,
     number | undefined
 ];
-export type UseInfiniteTradeHistoryOptions = Omit<UseInfiniteQueryOptions<TradeHistoryPage, Error, InfiniteTradeHistoryData, InfiniteTradeHistoryQueryKey, InfiniteTradeHistoryPageParam>, "queryKey" | "queryFn" | "initialPageParam" | "getNextPageParam" | "select"> & {
+export type UseInfiniteTradeHistoryOptions = Omit<UseInfiniteQueryOptions<RawTradeHistoryPage, Error, InfiniteTradeHistoryData, InfiniteTradeHistoryQueryKey, InfiniteTradeHistoryPageParam>, "queryKey" | "queryFn" | "initialPageParam" | "getNextPageParam" | "select"> & {
     aggregateByTime?: boolean;
     endTime?: number;
     pageDurationMs?: number;

package/dist/use-trade-history.js

@@ -8,6 +8,14 @@ const DEFAULT_TRADE_HISTORY_PAGE_DURATION_MS = 7 * 24 * 60 * 60 * 1000;
 function getFillKey(fill) {
     return `${fill.hash}-${fill.tid}-${fill.time}`;
 }
+function sortFills(fills) {
+    return [...fills].sort((a, b) => {
+        if (a.time !== b.time) {
+            return b.time - a.time;
+        }
+        return b.tid - a.tid;
+    });
+}
 function formatTradeHistoryFill(fill, spotPair) {
     const price = new Decimal(fill.px);
     if (!spotPair) {
@@ -44,14 +52,9 @@ function formatTradeHistoryFill(fill, spotPair) {
     };
 }
 function sortTradeHistory(fills) {
-    return [...fills].sort((a, b) => {
-        if (a.time !== b.time) {
-            return b.time - a.time;
-        }
-        return b.tid - a.tid;
-    });
+    return sortFills(fills);
 }
-function mergeTradeHistoryFills(pages, realtimeFills) {
+function mergeFills(pages, realtimeFills) {
     const fillsByKey = new Map();
     for (const page of pages) {
         for (const fill of page.fills) {
@@ -61,7 +64,13 @@ function mergeTradeHistoryFills(pages, realtimeFills) {
     for (const fill of realtimeFills) {
         fillsByKey.set(getFillKey(fill), fill);
     }
-    return sortTradeHistory([...fillsByKey.values()]);
+    return sortFills([...fillsByKey.values()]);
+}
+function formatTradeHistoryPage(page, symbolConverter) {
+    return {
+        ...page,
+        fills: sortTradeHistory(page.fills.map((fill) => formatTradeHistoryFill(fill, symbolConverter?.getSpotByPairId(fill.coin)))),
+    };
 }
 function flattenTradeHistoryPages(pages) {
     const fills = [];
@@ -111,16 +120,19 @@ export function useInfiniteTradeHistory(user, options = {}) {
         pageDurationMs,
         endTime,
     ];
-    const selectTradeHistoryData = useMemo(() => (data) => ({
-        pages: data.pages,
-        user,
-        fills: flattenTradeHistoryPages(data.pages),
-    }), [user]);
+    const selectTradeHistoryData = useMemo(() => (data) => {
+        const pages = data.pages.map((page) => formatTradeHistoryPage(page, symbolConverter));
+        return {
+            pages,
+            user,
+            fills: flattenTradeHistoryPages(pages),
+        };
+    }, [symbolConverter, user]);
     useUserFills(user, {
         aggregateByTime,
         enabled: enabled && realtime,
         onUpdate: (event) => {
-            const realtimeFills = sortTradeHistory(event.fills.map((fill) => formatTradeHistoryFill(fill, symbolConverter?.getSpotByPairId(fill.coin))));
+            const realtimeFills = sortFills(event.fills);
             if (realtimeFills.length === 0) {
                 return;
             }
@@ -129,7 +141,7 @@ export function useInfiniteTradeHistory(user, options = {}) {
                 if (!previousData || !latestPage) {
                     return previousData;
                 }
-                const fills = mergeTradeHistoryFills([latestPage], realtimeFills);
+                const fills = mergeFills([latestPage], realtimeFills);
                 return {
                     ...previousData,
                     pages: [
@@ -158,7 +170,7 @@ export function useInfiniteTradeHistory(user, options = {}) {
                     endTime: pageParam.endTime,
                     aggregateByTime,
                 });
-            const fills = sortTradeHistory(rawFills.map((fill) => formatTradeHistoryFill(fill, symbolConverter?.getSpotByPairId(fill.coin))));
+            const fills = sortFills(rawFills);
             if (pageParam.latest) {
                 return getLatestPageFromFills(user, fills, pageParam.endTime, pageDurationMs);
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hyperix/hooks",
-  "version": "0.3.0",
+  "version": "0.3.1",
   "type": "module",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",