@orderly.network/hooks 1.1.8 → 1.1.9

package/esm/orderly/useFundingRates.d.ts

@@ -1,2 +1,7 @@
-export declare const useFundingRates: () => any;
+import { type API } from "@orderly.network/types";
+export declare const useFundingRates: () => {
+    [x: string]: (key?: keyof API.FundingRate | undefined, defaultValue?: (string | number) | undefined) => any;
+} & {
+    isNil: boolean;
+};
 //# sourceMappingURL=useFundingRates.d.ts.map

package/esm/orderly/useFundingRates.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useFundingRates.d.ts","sourceRoot":"","sources":["../../src/orderly/useFundingRates.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,eAAe,WAwB3B,CAAC"}
+{"version":3,"file":"useFundingRates.d.ts","sourceRoot":"","sources":["../../src/orderly/useFundingRates.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,GAAG,EAAE,MAAM,wBAAwB,CAAC;AAGlD,eAAO,MAAM,eAAe;;;;CAuB3B,CAAC"}

package/esm/orderly/useFundingRates.js

@@ -16,6 +16,5 @@ export const useFundingRates = () => {
             return obj;
         },
     });
-    // @ts-ignore
     return createGetter(data);
 };

package/esm/orderly/useOrderEntry.js

@@ -76,8 +76,8 @@ export function useOrderEntry(symbolOrOrder, sideOrOptions, reduceOnly, options)
     const quoteDP = useMemo(() => {
         return getPrecisionByNumber(symbolInfo[symbol]("quote_tick", 0));
     }, [symbolInfo]);
-    const baseIMR = useMemo(() => symbolInfo[symbol]("base_imr"), [symbolInfo]);
-    const baseMMR = useMemo(() => symbolInfo[symbol]("base_mmr"), [symbolInfo]);
+    const baseIMR = useMemo(() => symbolInfo[symbol]("base_imr", 0), [symbolInfo]);
+    const baseMMR = useMemo(() => symbolInfo[symbol]("base_mmr", 0), [symbolInfo]);
     const { data: markPrice } = useMarkPrice(symbol);
     // const markPrice = 1;
     const diffOrderEntry = (prev, current) => {
@@ -233,7 +233,6 @@ export function useOrderEntry(symbolOrOrder, sideOrOptions, reduceOnly, options)
                         // ...omit(["order_price"], values),
                         ...data,
                     })).then((res) => {
-                        console.log("--------------------res::::", res);
                         // resolve(res);
                         if (res.success) {
                             // TODO: remove when the WS service is fixed
@@ -328,12 +327,14 @@ export function useOrderEntry(symbolOrOrder, sideOrOptions, reduceOnly, options)
     }, [parsedData, markPrice]);
     /// validator order info
     useEffect(() => {
-        if (!markPrice)
+        if (!markPrice || symbolInfo.isNil)
             return;
         // validate order data;
-        validator(formattedOrder)?.then((err) => {
+        validator(formattedOrder)
+            ?.then((err) => {
             setErrors(err);
-        });
+        })
+            .catch((err) => { });
     }, [
         formattedOrder.broker_id,
         formattedOrder.order_quantity,

package/esm/orderly/usePositionStream.d.ts

@@ -15,7 +15,20 @@ export declare const usePositionStream: (symbol?: string, options?: SWRConfigura
     readonly totalCollateral: Decimal;
     readonly totalValue: Decimal;
     readonly totalUnrealizedROI: number;
-}, any, {
+}, {
+    margin_ratio: (key?: "margin_ratio" | "initial_margin_ratio" | "maintenance_margin_ratio" | "open_margin_ratio" | "current_margin_ratio_with_orders" | "initial_margin_ratio_with_orders" | "maintenance_margin_ratio_with_orders" | "total_collateral_value" | "free_collateral" | "total_pnl_24_h" | undefined, defaultValue?: number | undefined) => any;
+    initial_margin_ratio: (key?: "margin_ratio" | "initial_margin_ratio" | "maintenance_margin_ratio" | "open_margin_ratio" | "current_margin_ratio_with_orders" | "initial_margin_ratio_with_orders" | "maintenance_margin_ratio_with_orders" | "total_collateral_value" | "free_collateral" | "total_pnl_24_h" | undefined, defaultValue?: number | undefined) => any;
+    maintenance_margin_ratio: (key?: "margin_ratio" | "initial_margin_ratio" | "maintenance_margin_ratio" | "open_margin_ratio" | "current_margin_ratio_with_orders" | "initial_margin_ratio_with_orders" | "maintenance_margin_ratio_with_orders" | "total_collateral_value" | "free_collateral" | "total_pnl_24_h" | undefined, defaultValue?: number | undefined) => any;
+    open_margin_ratio: (key?: "margin_ratio" | "initial_margin_ratio" | "maintenance_margin_ratio" | "open_margin_ratio" | "current_margin_ratio_with_orders" | "initial_margin_ratio_with_orders" | "maintenance_margin_ratio_with_orders" | "total_collateral_value" | "free_collateral" | "total_pnl_24_h" | undefined, defaultValue?: number | undefined) => any;
+    current_margin_ratio_with_orders: (key?: "margin_ratio" | "initial_margin_ratio" | "maintenance_margin_ratio" | "open_margin_ratio" | "current_margin_ratio_with_orders" | "initial_margin_ratio_with_orders" | "maintenance_margin_ratio_with_orders" | "total_collateral_value" | "free_collateral" | "total_pnl_24_h" | undefined, defaultValue?: number | undefined) => any;
+    initial_margin_ratio_with_orders: (key?: "margin_ratio" | "initial_margin_ratio" | "maintenance_margin_ratio" | "open_margin_ratio" | "current_margin_ratio_with_orders" | "initial_margin_ratio_with_orders" | "maintenance_margin_ratio_with_orders" | "total_collateral_value" | "free_collateral" | "total_pnl_24_h" | undefined, defaultValue?: number | undefined) => any;
+    maintenance_margin_ratio_with_orders: (key?: "margin_ratio" | "initial_margin_ratio" | "maintenance_margin_ratio" | "open_margin_ratio" | "current_margin_ratio_with_orders" | "initial_margin_ratio_with_orders" | "maintenance_margin_ratio_with_orders" | "total_collateral_value" | "free_collateral" | "total_pnl_24_h" | undefined, defaultValue?: number | undefined) => any;
+    total_collateral_value: (key?: "margin_ratio" | "initial_margin_ratio" | "maintenance_margin_ratio" | "open_margin_ratio" | "current_margin_ratio_with_orders" | "initial_margin_ratio_with_orders" | "maintenance_margin_ratio_with_orders" | "total_collateral_value" | "free_collateral" | "total_pnl_24_h" | undefined, defaultValue?: number | undefined) => any;
+    free_collateral: (key?: "margin_ratio" | "initial_margin_ratio" | "maintenance_margin_ratio" | "open_margin_ratio" | "current_margin_ratio_with_orders" | "initial_margin_ratio_with_orders" | "maintenance_margin_ratio_with_orders" | "total_collateral_value" | "free_collateral" | "total_pnl_24_h" | undefined, defaultValue?: number | undefined) => any;
+    total_pnl_24_h: (key?: "margin_ratio" | "initial_margin_ratio" | "maintenance_margin_ratio" | "open_margin_ratio" | "current_margin_ratio_with_orders" | "initial_margin_ratio_with_orders" | "maintenance_margin_ratio_with_orders" | "total_collateral_value" | "free_collateral" | "total_pnl_24_h" | undefined, defaultValue?: number | undefined) => any;
+} & {
+    isNil: boolean;
+}, {
     readonly loading: false;
     readonly error: any;
     readonly refresh: import("swr/_internal").KeyedMutator<API.PositionInfo>;

package/esm/orderly/usePositionStream.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"usePositionStream.d.ts","sourceRoot":"","sources":["../../src/orderly/usePositionStream.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,KAAK,gBAAgB,EAAE,MAAM,KAAK,CAAC;AAI5C,OAAO,EAAE,KAAK,GAAG,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAK/D,OAAO,EAAE,OAAO,EAAQ,MAAM,wBAAwB,CAAC;AAIvD,KAAK,SAAS,GAAG,WAAW,GAAG,WAAW,CAAC;AAE3C,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,GAAG,EAAE,CAAC;IACZ,OAAO,EAAE,OAAO,CAAC;IACjB,KAAK,EAAE,CACL,KAAK,EAAE,IAAI,CAAC,WAAW,EAAE,YAAY,GAAG,aAAa,GAAG,MAAM,CAAC,KAC5D,IAAI,CAAC;CACX;AAED,eAAO,MAAM,iBAAiB,YAInB,MAAM,YACL,gBAAgB,GAAG;IAAE,QAAQ,CAAC,EAAE,SAAS,CAAA;CAAE;;;;;;;;;;EAiRtD,CAAC;AAEF,eAAO,MAAM,yBAAyB,sBAIpC,CAAC"}
+{"version":3,"file":"usePositionStream.d.ts","sourceRoot":"","sources":["../../src/orderly/usePositionStream.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,KAAK,gBAAgB,EAAE,MAAM,KAAK,CAAC;AAI5C,OAAO,EAAE,KAAK,GAAG,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAK/D,OAAO,EAAE,OAAO,EAAQ,MAAM,wBAAwB,CAAC;AAIvD,KAAK,SAAS,GAAG,WAAW,GAAG,WAAW,CAAC;AAE3C,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,GAAG,EAAE,CAAC;IACZ,OAAO,EAAE,OAAO,CAAC;IACjB,KAAK,EAAE,CACL,KAAK,EAAE,IAAI,CAAC,WAAW,EAAE,YAAY,GAAG,aAAa,GAAG,MAAM,CAAC,KAC5D,IAAI,CAAC;CACX;AAED,eAAO,MAAM,iBAAiB,YAInB,MAAM,YACL,gBAAgB,GAAG;IAAE,QAAQ,CAAC,EAAE,SAAS,CAAA;CAAE;;;;;;;;;;;;;;;;;;;;;;;EAsRtD,CAAC;AAEF,eAAO,MAAM,yBAAyB,sBAIpC,CAAC"}

package/esm/orderly/usePositionStream.js

@@ -51,7 +51,7 @@ symbol, options) => {
         return data;
     }, [tickers]);
     const formatedPositions = useMemo(() => {
-        if (!data?.rows || !symbolInfo || !accountInfo)
+        if (!data?.rows || symbolInfo.isNil || !accountInfo)
             return null;
         const filteredData = typeof symbol === "undefined" || symbol === ""
             ? data.rows
@@ -63,7 +63,7 @@ symbol, options) => {
             // const price = (markPrices as any)[item.symbol] ?? item.mark_price;
             const unRealizedPrice = propOr(item.mark_price, item.symbol, priceMode === "markPrice" ? markPrices : tickerPrices);
             const price = propOr(item.mark_price, item.symbol, markPrices);
-            const info = symbolInfo?.[item.symbol];
+            const info = symbolInfo[item.symbol];
             //
             const notional = positions.notional(item.position_qty, price);
             const unrealPnl = positions.unrealizedPnL({
@@ -203,6 +203,7 @@ symbol, options) => {
     //     updatePositions();
     //   });
     // }, []);
+    const positionInfoGetter = createGetter(data, 1);
     return [
         {
             rows: positionsRows,
@@ -214,7 +215,7 @@ symbol, options) => {
             totalValue,
             totalUnrealizedROI,
         },
-        createGetter(data, 1),
+        positionInfoGetter,
         {
             // close: onClosePosition,
             loading: false,

package/esm/orderly/useSymbolsInfo.d.ts

@@ -1,2 +1,7 @@
-export declare const useSymbolsInfo: () => Record<string, any>;
+import { type API } from "@orderly.network/types";
+export declare const useSymbolsInfo: () => {
+    [x: string]: (key?: keyof API.SymbolExt | undefined, defaultValue?: (string | number) | undefined) => any;
+} & {
+    isNil: boolean;
+};
 //# sourceMappingURL=useSymbolsInfo.d.ts.map

package/esm/orderly/useSymbolsInfo.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useSymbolsInfo.d.ts","sourceRoot":"","sources":["../../src/orderly/useSymbolsInfo.ts"],"names":[],"mappings":"AAKA,eAAO,MAAM,cAAc,2BAoC1B,CAAC"}
+{"version":3,"file":"useSymbolsInfo.d.ts","sourceRoot":"","sources":["../../src/orderly/useSymbolsInfo.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,GAAG,EAAE,MAAM,wBAAwB,CAAC;AAIlD,eAAO,MAAM,cAAc;;;;CAgC1B,CAAC"}

package/esm/orderly/useSymbolsInfo.js

@@ -2,7 +2,7 @@ import { useQuery } from "../useQuery";
 import { createGetter } from "../utils/createGetter";
 import { getPrecisionByNumber } from "@orderly.network/utils";
 export const useSymbolsInfo = () => {
-    const { data = {} } = useQuery(`/v1/public/info`, {
+    const { data } = useQuery(`/v1/public/info`, {
         focusThrottleInterval: 1000 * 60 * 60 * 24,
         dedupingInterval: 1000 * 60 * 60 * 24,
         revalidateOnFocus: false,

package/esm/unuse/useTokenInfo.d.ts

@@ -1,2 +1,7 @@
-export declare const useTokenInfo: () => any;
+import { type API } from "@orderly.network/types";
+export declare const useTokenInfo: () => {
+    [x: string]: (key?: keyof API.TokenInfo | undefined, defaultValue?: (string | number) | undefined) => any;
+} & {
+    isNil: boolean;
+};
 //# sourceMappingURL=useTokenInfo.d.ts.map

package/esm/unuse/useTokenInfo.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useTokenInfo.d.ts","sourceRoot":"","sources":["../../src/unuse/useTokenInfo.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,YAAY,WAwBxB,CAAC"}
+{"version":3,"file":"useTokenInfo.d.ts","sourceRoot":"","sources":["../../src/unuse/useTokenInfo.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,GAAG,EAAE,MAAM,wBAAwB,CAAC;AAGlD,eAAO,MAAM,YAAY;;;;CAwBxB,CAAC"}

package/esm/utils/createGetter.d.ts

@@ -1,4 +1,11 @@
 type objectDepth = 1 | 2;
-export declare function createGetter<T extends Record<string, any>, K extends keyof T = string>(data: T, depth?: objectDepth): any;
+type ValueOf<T> = T[keyof T];
+export declare function createGetter<T extends any, K extends string = string, Key = keyof T>(data: Record<string, T> | null | undefined, depth?: objectDepth): (typeof depth extends 1 ? {
+    [P in K]: (defaultValue?: any) => any;
+} : {
+    [P in K]: (key?: Key, defaultValue?: ValueOf<T>) => any;
+}) & {
+    isNil: boolean;
+};
 export {};
 //# sourceMappingURL=createGetter.d.ts.map

package/esm/utils/createGetter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createGetter.d.ts","sourceRoot":"","sources":["../../src/utils/createGetter.ts"],"names":[],"mappings":"AAAA,KAAK,WAAW,GAAG,CAAC,GAAG,CAAC,CAAC;AAGzB,wBAAgB,YAAY,CAC1B,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAC7B,CAAC,SAAS,MAAM,CAAC,GAAG,MAAM,EAC1B,IAAI,EAAE,CAAC,EAAE,KAAK,GAAE,WAAe,OAsBhC"}
+{"version":3,"file":"createGetter.d.ts","sourceRoot":"","sources":["../../src/utils/createGetter.ts"],"names":[],"mappings":"AAGA,KAAK,WAAW,GAAG,CAAC,GAAG,CAAC,CAAC;AASzB,KAAK,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;AAG7B,wBAAgB,YAAY,CAC1B,CAAC,SAAS,GAAG,EACb,CAAC,SAAS,MAAM,GAAG,MAAM,EACzB,GAAG,GAAG,MAAM,CAAC,EAEb,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,GAAG,IAAI,GAAG,SAAS,EAC1C,KAAK,GAAE,WAAe,GACrB,CAAC,OAAO,KAAK,SAAS,CAAC,GACtB;KAAG,CAAC,IAAI,CAAC,GAAG,CAAC,YAAY,CAAC,EAAE,GAAG,KAAK,GAAG;CAAE,GACzC;KAAG,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,GAAG,EAAE,YAAY,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,KAAK,GAAG;CAAE,CAAC,GAAG;IACjE,KAAK,EAAE,OAAO,CAAC;CAChB,CAyBA"}

package/esm/utils/createGetter.js

@@ -1,6 +1,11 @@
+import { isNil } from "ramda";
+// export function createGetter<T extends Record<string, any>, K extends keyof T>(
 export function createGetter(data, depth = 2) {
     return new Proxy(data || {}, {
         get(target, property, receiver) {
+            if (property === "isNil") {
+                return isNil(data);
+            }
             if (depth === 1) {
                 return (defaultValue) => {
                     if (!target)

package/esm/utils/swr.js

@@ -31,7 +31,7 @@ export const updateOrdersHandler = (key, updatedOrder, orders) => {
     let formattedOrder = {
         ...underscoreOrder,
         updated_time: updatedOrder.timestamp,
-        type: updatedOrder.type.replace("_ORDER", ""),
+        type: typeof underscoreOrder.type === 'string' ? updatedOrder.type.replace("_ORDER", "") : updatedOrder.type,
         //@ts-ignore
         // visible_quantity: updatedOrder.visibleQuantity || updatedOrder.visible,
     };

package/esm/version.d.ts

@@ -5,6 +5,6 @@ declare global {
         };
     }
 }
-declare const _default: "1.1.8";
+declare const _default: "1.1.9";
 export default _default;
 //# sourceMappingURL=version.d.ts.map

package/esm/version.js

@@ -1,6 +1,6 @@
 if (typeof window !== 'undefined') {
     window.__ORDERLY_VERSION__ = window.__ORDERLY_VERSION__ || {};
-    window.__ORDERLY_VERSION__["@orderly.network/hooks"] = "1.1.8";
+    window.__ORDERLY_VERSION__["@orderly.network/hooks"] = "1.1.9";
 }
 ;
-export default "1.1.8";
+export default "1.1.9";

package/lib/orderly/useFundingRates.d.ts

@@ -1,2 +1,7 @@
-export declare const useFundingRates: () => any;
+import { type API } from "@orderly.network/types";
+export declare const useFundingRates: () => {
+    [x: string]: (key?: keyof API.FundingRate | undefined, defaultValue?: (string | number) | undefined) => any;
+} & {
+    isNil: boolean;
+};
 //# sourceMappingURL=useFundingRates.d.ts.map

package/lib/orderly/useFundingRates.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useFundingRates.d.ts","sourceRoot":"","sources":["../../src/orderly/useFundingRates.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,eAAe,WAwB3B,CAAC"}
+{"version":3,"file":"useFundingRates.d.ts","sourceRoot":"","sources":["../../src/orderly/useFundingRates.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,GAAG,EAAE,MAAM,wBAAwB,CAAC;AAGlD,eAAO,MAAM,eAAe;;;;CAuB3B,CAAC"}

package/lib/orderly/useFundingRates.js

@@ -19,7 +19,6 @@ const useFundingRates = () => {
             return obj;
         },
     });
-    // @ts-ignore
     return (0, createGetter_1.createGetter)(data);
 };
 exports.useFundingRates = useFundingRates;

package/lib/orderly/useOrderEntry.js

@@ -79,8 +79,8 @@ function useOrderEntry(symbolOrOrder, sideOrOptions, reduceOnly, options) {
     const quoteDP = (0, react_1.useMemo)(() => {
         return (0, utils_1.getPrecisionByNumber)(symbolInfo[symbol]("quote_tick", 0));
     }, [symbolInfo]);
-    const baseIMR = (0, react_1.useMemo)(() => symbolInfo[symbol]("base_imr"), [symbolInfo]);
-    const baseMMR = (0, react_1.useMemo)(() => symbolInfo[symbol]("base_mmr"), [symbolInfo]);
+    const baseIMR = (0, react_1.useMemo)(() => symbolInfo[symbol]("base_imr", 0), [symbolInfo]);
+    const baseMMR = (0, react_1.useMemo)(() => symbolInfo[symbol]("base_mmr", 0), [symbolInfo]);
     const { data: markPrice } = (0, useMarkPrice_1.useMarkPrice)(symbol);
     // const markPrice = 1;
     const diffOrderEntry = (prev, current) => {
@@ -236,7 +236,6 @@ function useOrderEntry(symbolOrOrder, sideOrOptions, reduceOnly, options) {
                         // ...omit(["order_price"], values),
                         ...data,
                     })).then((res) => {
-                        console.log("--------------------res::::", res);
                         // resolve(res);
                         if (res.success) {
                             // TODO: remove when the WS service is fixed
@@ -331,12 +330,14 @@ function useOrderEntry(symbolOrOrder, sideOrOptions, reduceOnly, options) {
     }, [parsedData, markPrice]);
     /// validator order info
     (0, react_1.useEffect)(() => {
-        if (!markPrice)
+        if (!markPrice || symbolInfo.isNil)
             return;
         // validate order data;
-        validator(formattedOrder)?.then((err) => {
+        validator(formattedOrder)
+            ?.then((err) => {
             setErrors(err);
-        });
+        })
+            .catch((err) => { });
     }, [
         formattedOrder.broker_id,
         formattedOrder.order_quantity,

package/lib/orderly/usePositionStream.d.ts

@@ -15,7 +15,20 @@ export declare const usePositionStream: (symbol?: string, options?: SWRConfigura
     readonly totalCollateral: Decimal;
     readonly totalValue: Decimal;
     readonly totalUnrealizedROI: number;
-}, any, {
+}, {
+    margin_ratio: (key?: "margin_ratio" | "initial_margin_ratio" | "maintenance_margin_ratio" | "open_margin_ratio" | "current_margin_ratio_with_orders" | "initial_margin_ratio_with_orders" | "maintenance_margin_ratio_with_orders" | "total_collateral_value" | "free_collateral" | "total_pnl_24_h" | undefined, defaultValue?: number | undefined) => any;
+    initial_margin_ratio: (key?: "margin_ratio" | "initial_margin_ratio" | "maintenance_margin_ratio" | "open_margin_ratio" | "current_margin_ratio_with_orders" | "initial_margin_ratio_with_orders" | "maintenance_margin_ratio_with_orders" | "total_collateral_value" | "free_collateral" | "total_pnl_24_h" | undefined, defaultValue?: number | undefined) => any;
+    maintenance_margin_ratio: (key?: "margin_ratio" | "initial_margin_ratio" | "maintenance_margin_ratio" | "open_margin_ratio" | "current_margin_ratio_with_orders" | "initial_margin_ratio_with_orders" | "maintenance_margin_ratio_with_orders" | "total_collateral_value" | "free_collateral" | "total_pnl_24_h" | undefined, defaultValue?: number | undefined) => any;
+    open_margin_ratio: (key?: "margin_ratio" | "initial_margin_ratio" | "maintenance_margin_ratio" | "open_margin_ratio" | "current_margin_ratio_with_orders" | "initial_margin_ratio_with_orders" | "maintenance_margin_ratio_with_orders" | "total_collateral_value" | "free_collateral" | "total_pnl_24_h" | undefined, defaultValue?: number | undefined) => any;
+    current_margin_ratio_with_orders: (key?: "margin_ratio" | "initial_margin_ratio" | "maintenance_margin_ratio" | "open_margin_ratio" | "current_margin_ratio_with_orders" | "initial_margin_ratio_with_orders" | "maintenance_margin_ratio_with_orders" | "total_collateral_value" | "free_collateral" | "total_pnl_24_h" | undefined, defaultValue?: number | undefined) => any;
+    initial_margin_ratio_with_orders: (key?: "margin_ratio" | "initial_margin_ratio" | "maintenance_margin_ratio" | "open_margin_ratio" | "current_margin_ratio_with_orders" | "initial_margin_ratio_with_orders" | "maintenance_margin_ratio_with_orders" | "total_collateral_value" | "free_collateral" | "total_pnl_24_h" | undefined, defaultValue?: number | undefined) => any;
+    maintenance_margin_ratio_with_orders: (key?: "margin_ratio" | "initial_margin_ratio" | "maintenance_margin_ratio" | "open_margin_ratio" | "current_margin_ratio_with_orders" | "initial_margin_ratio_with_orders" | "maintenance_margin_ratio_with_orders" | "total_collateral_value" | "free_collateral" | "total_pnl_24_h" | undefined, defaultValue?: number | undefined) => any;
+    total_collateral_value: (key?: "margin_ratio" | "initial_margin_ratio" | "maintenance_margin_ratio" | "open_margin_ratio" | "current_margin_ratio_with_orders" | "initial_margin_ratio_with_orders" | "maintenance_margin_ratio_with_orders" | "total_collateral_value" | "free_collateral" | "total_pnl_24_h" | undefined, defaultValue?: number | undefined) => any;
+    free_collateral: (key?: "margin_ratio" | "initial_margin_ratio" | "maintenance_margin_ratio" | "open_margin_ratio" | "current_margin_ratio_with_orders" | "initial_margin_ratio_with_orders" | "maintenance_margin_ratio_with_orders" | "total_collateral_value" | "free_collateral" | "total_pnl_24_h" | undefined, defaultValue?: number | undefined) => any;
+    total_pnl_24_h: (key?: "margin_ratio" | "initial_margin_ratio" | "maintenance_margin_ratio" | "open_margin_ratio" | "current_margin_ratio_with_orders" | "initial_margin_ratio_with_orders" | "maintenance_margin_ratio_with_orders" | "total_collateral_value" | "free_collateral" | "total_pnl_24_h" | undefined, defaultValue?: number | undefined) => any;
+} & {
+    isNil: boolean;
+}, {
     readonly loading: false;
     readonly error: any;
     readonly refresh: import("swr/_internal").KeyedMutator<API.PositionInfo>;

package/lib/orderly/usePositionStream.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"usePositionStream.d.ts","sourceRoot":"","sources":["../../src/orderly/usePositionStream.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,KAAK,gBAAgB,EAAE,MAAM,KAAK,CAAC;AAI5C,OAAO,EAAE,KAAK,GAAG,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAK/D,OAAO,EAAE,OAAO,EAAQ,MAAM,wBAAwB,CAAC;AAIvD,KAAK,SAAS,GAAG,WAAW,GAAG,WAAW,CAAC;AAE3C,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,GAAG,EAAE,CAAC;IACZ,OAAO,EAAE,OAAO,CAAC;IACjB,KAAK,EAAE,CACL,KAAK,EAAE,IAAI,CAAC,WAAW,EAAE,YAAY,GAAG,aAAa,GAAG,MAAM,CAAC,KAC5D,IAAI,CAAC;CACX;AAED,eAAO,MAAM,iBAAiB,YAInB,MAAM,YACL,gBAAgB,GAAG;IAAE,QAAQ,CAAC,EAAE,SAAS,CAAA;CAAE;;;;;;;;;;EAiRtD,CAAC;AAEF,eAAO,MAAM,yBAAyB,sBAIpC,CAAC"}
+{"version":3,"file":"usePositionStream.d.ts","sourceRoot":"","sources":["../../src/orderly/usePositionStream.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,KAAK,gBAAgB,EAAE,MAAM,KAAK,CAAC;AAI5C,OAAO,EAAE,KAAK,GAAG,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAK/D,OAAO,EAAE,OAAO,EAAQ,MAAM,wBAAwB,CAAC;AAIvD,KAAK,SAAS,GAAG,WAAW,GAAG,WAAW,CAAC;AAE3C,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,GAAG,EAAE,CAAC;IACZ,OAAO,EAAE,OAAO,CAAC;IACjB,KAAK,EAAE,CACL,KAAK,EAAE,IAAI,CAAC,WAAW,EAAE,YAAY,GAAG,aAAa,GAAG,MAAM,CAAC,KAC5D,IAAI,CAAC;CACX;AAED,eAAO,MAAM,iBAAiB,YAInB,MAAM,YACL,gBAAgB,GAAG;IAAE,QAAQ,CAAC,EAAE,SAAS,CAAA;CAAE;;;;;;;;;;;;;;;;;;;;;;;EAsRtD,CAAC;AAEF,eAAO,MAAM,yBAAyB,sBAIpC,CAAC"}

package/lib/orderly/usePositionStream.js

@@ -54,7 +54,7 @@ symbol, options) => {
         return data;
     }, [tickers]);
     const formatedPositions = (0, react_1.useMemo)(() => {
-        if (!data?.rows || !symbolInfo || !accountInfo)
+        if (!data?.rows || symbolInfo.isNil || !accountInfo)
             return null;
         const filteredData = typeof symbol === "undefined" || symbol === ""
             ? data.rows
@@ -66,7 +66,7 @@ symbol, options) => {
             // const price = (markPrices as any)[item.symbol] ?? item.mark_price;
             const unRealizedPrice = (0, ramda_1.propOr)(item.mark_price, item.symbol, priceMode === "markPrice" ? markPrices : tickerPrices);
             const price = (0, ramda_1.propOr)(item.mark_price, item.symbol, markPrices);
-            const info = symbolInfo?.[item.symbol];
+            const info = symbolInfo[item.symbol];
             //
             const notional = perp_1.positions.notional(item.position_qty, price);
             const unrealPnl = perp_1.positions.unrealizedPnL({
@@ -206,6 +206,7 @@ symbol, options) => {
     //     updatePositions();
     //   });
     // }, []);
+    const positionInfoGetter = (0, createGetter_1.createGetter)(data, 1);
     return [
         {
             rows: positionsRows,
@@ -217,7 +218,7 @@ symbol, options) => {
             totalValue,
             totalUnrealizedROI,
         },
-        (0, createGetter_1.createGetter)(data, 1),
+        positionInfoGetter,
         {
             // close: onClosePosition,
             loading: false,

package/lib/orderly/useSymbolsInfo.d.ts

@@ -1,2 +1,7 @@
-export declare const useSymbolsInfo: () => Record<string, any>;
+import { type API } from "@orderly.network/types";
+export declare const useSymbolsInfo: () => {
+    [x: string]: (key?: keyof API.SymbolExt | undefined, defaultValue?: (string | number) | undefined) => any;
+} & {
+    isNil: boolean;
+};
 //# sourceMappingURL=useSymbolsInfo.d.ts.map

package/lib/orderly/useSymbolsInfo.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useSymbolsInfo.d.ts","sourceRoot":"","sources":["../../src/orderly/useSymbolsInfo.ts"],"names":[],"mappings":"AAKA,eAAO,MAAM,cAAc,2BAoC1B,CAAC"}
+{"version":3,"file":"useSymbolsInfo.d.ts","sourceRoot":"","sources":["../../src/orderly/useSymbolsInfo.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,GAAG,EAAE,MAAM,wBAAwB,CAAC;AAIlD,eAAO,MAAM,cAAc;;;;CAgC1B,CAAC"}

package/lib/orderly/useSymbolsInfo.js

@@ -5,7 +5,7 @@ const useQuery_1 = require("../useQuery");
 const createGetter_1 = require("../utils/createGetter");
 const utils_1 = require("@orderly.network/utils");
 const useSymbolsInfo = () => {
-    const { data = {} } = (0, useQuery_1.useQuery)(`/v1/public/info`, {
+    const { data } = (0, useQuery_1.useQuery)(`/v1/public/info`, {
         focusThrottleInterval: 1000 * 60 * 60 * 24,
         dedupingInterval: 1000 * 60 * 60 * 24,
         revalidateOnFocus: false,

package/lib/unuse/useTokenInfo.d.ts

@@ -1,2 +1,7 @@
-export declare const useTokenInfo: () => any;
+import { type API } from "@orderly.network/types";
+export declare const useTokenInfo: () => {
+    [x: string]: (key?: keyof API.TokenInfo | undefined, defaultValue?: (string | number) | undefined) => any;
+} & {
+    isNil: boolean;
+};
 //# sourceMappingURL=useTokenInfo.d.ts.map

package/lib/unuse/useTokenInfo.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useTokenInfo.d.ts","sourceRoot":"","sources":["../../src/unuse/useTokenInfo.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,YAAY,WAwBxB,CAAC"}
+{"version":3,"file":"useTokenInfo.d.ts","sourceRoot":"","sources":["../../src/unuse/useTokenInfo.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,GAAG,EAAE,MAAM,wBAAwB,CAAC;AAGlD,eAAO,MAAM,YAAY;;;;CAwBxB,CAAC"}

package/lib/utils/createGetter.d.ts

@@ -1,4 +1,11 @@
 type objectDepth = 1 | 2;
-export declare function createGetter<T extends Record<string, any>, K extends keyof T = string>(data: T, depth?: objectDepth): any;
+type ValueOf<T> = T[keyof T];
+export declare function createGetter<T extends any, K extends string = string, Key = keyof T>(data: Record<string, T> | null | undefined, depth?: objectDepth): (typeof depth extends 1 ? {
+    [P in K]: (defaultValue?: any) => any;
+} : {
+    [P in K]: (key?: Key, defaultValue?: ValueOf<T>) => any;
+}) & {
+    isNil: boolean;
+};
 export {};
 //# sourceMappingURL=createGetter.d.ts.map

package/lib/utils/createGetter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createGetter.d.ts","sourceRoot":"","sources":["../../src/utils/createGetter.ts"],"names":[],"mappings":"AAAA,KAAK,WAAW,GAAG,CAAC,GAAG,CAAC,CAAC;AAGzB,wBAAgB,YAAY,CAC1B,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAC7B,CAAC,SAAS,MAAM,CAAC,GAAG,MAAM,EAC1B,IAAI,EAAE,CAAC,EAAE,KAAK,GAAE,WAAe,OAsBhC"}
+{"version":3,"file":"createGetter.d.ts","sourceRoot":"","sources":["../../src/utils/createGetter.ts"],"names":[],"mappings":"AAGA,KAAK,WAAW,GAAG,CAAC,GAAG,CAAC,CAAC;AASzB,KAAK,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;AAG7B,wBAAgB,YAAY,CAC1B,CAAC,SAAS,GAAG,EACb,CAAC,SAAS,MAAM,GAAG,MAAM,EACzB,GAAG,GAAG,MAAM,CAAC,EAEb,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,GAAG,IAAI,GAAG,SAAS,EAC1C,KAAK,GAAE,WAAe,GACrB,CAAC,OAAO,KAAK,SAAS,CAAC,GACtB;KAAG,CAAC,IAAI,CAAC,GAAG,CAAC,YAAY,CAAC,EAAE,GAAG,KAAK,GAAG;CAAE,GACzC;KAAG,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,GAAG,EAAE,YAAY,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,KAAK,GAAG;CAAE,CAAC,GAAG;IACjE,KAAK,EAAE,OAAO,CAAC;CAChB,CAyBA"}

package/lib/utils/createGetter.js

@@ -1,9 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createGetter = void 0;
+const ramda_1 = require("ramda");
+// export function createGetter<T extends Record<string, any>, K extends keyof T>(
 function createGetter(data, depth = 2) {
     return new Proxy(data || {}, {
         get(target, property, receiver) {
+            if (property === "isNil") {
+                return (0, ramda_1.isNil)(data);
+            }
             if (depth === 1) {
                 return (defaultValue) => {
                     if (!target)

package/lib/utils/swr.js

@@ -35,7 +35,7 @@ const updateOrdersHandler = (key, updatedOrder, orders) => {
     let formattedOrder = {
         ...underscoreOrder,
         updated_time: updatedOrder.timestamp,
-        type: updatedOrder.type.replace("_ORDER", ""),
+        type: typeof underscoreOrder.type === 'string' ? updatedOrder.type.replace("_ORDER", "") : updatedOrder.type,
         //@ts-ignore
         // visible_quantity: updatedOrder.visibleQuantity || updatedOrder.visible,
     };

package/lib/version.d.ts

@@ -5,6 +5,6 @@ declare global {
         };
     }
 }
-declare const _default: "1.1.8";
+declare const _default: "1.1.9";
 export default _default;
 //# sourceMappingURL=version.d.ts.map

package/lib/version.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 if (typeof window !== 'undefined') {
     window.__ORDERLY_VERSION__ = window.__ORDERLY_VERSION__ || {};
-    window.__ORDERLY_VERSION__["@orderly.network/hooks"] = "1.1.8";
+    window.__ORDERLY_VERSION__["@orderly.network/hooks"] = "1.1.9";
 }
 ;
-exports.default = "1.1.8";
+exports.default = "1.1.9";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@orderly.network/hooks",
-  "version": "1.1.8",
+  "version": "1.1.9",
   "description": "",
   "main": "lib/index.js",
   "module": "esm/index.js",
@@ -20,25 +20,25 @@
     "@types/jest": "^29.5.3",
     "@types/ramda": "^0.29.3",
     "@types/react": "^18.2.38",
-    "react": "^18.2.0",
     "jest": "^29.6.1",
+    "react": "^18.2.0",
     "react-test-renderer": "^18.2.0",
     "rimraf": "^5.0.5",
     "tsup": "^7.1.0",
     "typedoc": "^0.24.8",
     "typescript": "^5.1.6",
-    "tsconfig": "0.1.7"
+    "tsconfig": "0.1.8"
   },
   "dependencies": {
     "ramda": "^0.29.0",
     "swr": "^2.2.4",
     "use-constant": "^1.1.1",
     "use-debounce": "^9.0.4",
-    "@orderly.network/utils": "0.1.7",
-    "@orderly.network/net": "1.1.7",
-    "@orderly.network/perp": "2.0.7",
-    "@orderly.network/types": "0.2.7",
-    "@orderly.network/core": "0.2.7"
+    "@orderly.network/core": "0.2.8",
+    "@orderly.network/net": "1.1.8",
+    "@orderly.network/perp": "2.0.8",
+    "@orderly.network/types": "0.2.8",
+    "@orderly.network/utils": "0.1.8"
   },
   "publishConfig": {
     "access": "public"