hft-js 0.2.0 → 0.3.0

package/src/market.ts

@@ -9,12 +9,17 @@
  * https://github.com/shixiongfei/hft.js
  */
 
-import ctp from "napi-ctp";
+import ctp, { type MarketData as MarketApi } from "napi-ctp";
+import type {
+  DepthMarketDataField,
+  RspUserLoginField,
+  SpecificInstrumentField,
+} from "@napi-ctp/types";
 import { CTPProvider } from "./provider.js";
-import { InstrumentData, OrderBook, TickData } from "./typedef.js";
+import type { InstrumentData, OrderBook, TickData } from "./typedef.js";
 import { isValidPrice, isValidVolume, parseSymbol } from "./utils.js";
 import { calcTapeData } from "./tape.js";
-import {
+import type {
   ILifecycleListener,
   IMarketProvider,
   IMarketRecorderProvider,
@@ -36,7 +41,7 @@ export class Market
   extends CTPProvider
   implements IMarketProvider, IMarketRecorderProvider
 {
-  private marketApi?: ctp.MarketData;
+  private marketApi?: MarketApi;
   private recorder?: IMarketRecorderReceiver;
   private recorderSymbols?: IMarketRecorderSymbols;
   private tradingDay: number;
@@ -96,7 +101,7 @@ export class Market
 
     let fired = false;
 
-    this.marketApi.on<ctp.RspUserLoginField>(
+    this.marketApi.on<RspUserLoginField>(
       ctp.MarketDataEvent.RspUserLogin,
       (_, options) => {
         if (this._isErrorResp(lifecycle, options, "login-error")) {
@@ -128,7 +133,7 @@ export class Market
       },
     );
 
-    this.marketApi.on<ctp.SpecificInstrumentField>(
+    this.marketApi.on<SpecificInstrumentField>(
       ctp.MarketDataEvent.RspSubMarketData,
       (instrument) => {
         if (!this.listener) {
@@ -141,7 +146,7 @@ export class Market
       },
     );
 
-    this.marketApi.on<ctp.SpecificInstrumentField>(
+    this.marketApi.on<SpecificInstrumentField>(
       ctp.MarketDataEvent.RspUnSubMarketData,
       (instrument) => {
         if (!this.listener) {
@@ -154,7 +159,7 @@ export class Market
       },
     );
 
-    this.marketApi.on<ctp.DepthMarketDataField>(
+    this.marketApi.on<DepthMarketDataField>(
       ctp.MarketDataEvent.RtnDepthMarketData,
       (depthMarketData) => {
         const instrumentId = depthMarketData.InstrumentID;
@@ -281,16 +286,15 @@ export class Market
           orderBook: Object.freeze(orderBook),
         });
 
+        const lastTick = this.lastTicks.get(instrumentId);
         const receivers = this.subscribers.get(instrumentId);
 
+        this.lastTicks.set(instrumentId, tick);
+
         if (receivers && receivers.length > 0) {
-          const lastTick = this.lastTicks.get(instrumentId);
           const tape = calcTapeData(tick, lastTick);
-
           receivers.forEach((receiver) => receiver.onTick(tick, tape));
         }
-
-        this.lastTicks.set(instrumentId, tick);
       },
     );
 

package/src/provider.ts

@@ -10,8 +10,8 @@
  */
 
 import fs from "node:fs";
-import ctp from "napi-ctp";
-import { ErrorType, ILifecycleListener } from "./interfaces.js";
+import ctp, { type CallbackOptions } from "napi-ctp";
+import type { ErrorType, ILifecycleListener } from "./interfaces.js";
 
 export class CTPProvider {
   protected readonly flowPath: string;
@@ -53,7 +53,7 @@ export class CTPProvider {
 
   protected _isErrorResp(
     lifecycle: ILifecycleListener,
-    options: ctp.CallbackOptions,
+    options: CallbackOptions,
     error: ErrorType,
   ) {
     if (!options.rspInfo) {
@@ -69,7 +69,7 @@ export class CTPProvider {
   }
 
   protected _parseTime(time: string) {
-    const [hour, minute, second] = time.split(":").map((x) => parseInt(x));
-    return hour * 10000 + minute * 100 + second;
+    const [hh = 0, mm = 0, ss = 0] = time.split(":").map((x) => parseInt(x));
+    return hh * 10000 + mm * 100 + ss;
   }
 }

package/src/tape.ts

@@ -9,7 +9,7 @@
  * https://github.com/shixiongfei/hft.js
  */
 
-import {
+import type {
   TapeData,
   TapeDirection,
   TapeStatus,

package/src/trader.ts

@@ -10,14 +10,36 @@
  */
 
 import Denque from "denque";
-import ctp from "napi-ctp";
+import ctp, { type Trader as TraderApi } from "napi-ctp";
+import type {
+  DepthMarketDataField,
+  DirectionType,
+  InputOrderActionField,
+  InputOrderField,
+  InstrumentCommissionRateField,
+  InstrumentField,
+  InstrumentMarginRateField,
+  InvestorPositionDetailField,
+  InvestorPositionField,
+  OffsetFlagType,
+  OptionsTypeType,
+  OrderField,
+  OrderPriceTypeType,
+  ProductClassType,
+  RspAuthenticateField,
+  RspUserLoginField,
+  SettlementInfoConfirmField,
+  TradeField,
+  TradingAccountField,
+} from "@napi-ctp/types";
 import { CTPProvider } from "./provider.js";
 import { isValidPrice, parseSymbol } from "./utils.js";
-import {
+import type {
   CommissionRate,
   InstrumentData,
   MarginRate,
   OffsetType,
+  OptionsType,
   OrderData,
   OrderFlag,
   OrderStatistic,
@@ -32,7 +54,7 @@ import {
   TradingAccount,
   Writeable,
 } from "./typedef.js";
-import {
+import type {
   ICancelOrderResultReceiver,
   ICommissionRateReceiver,
   IInstrumentReceiver,
@@ -89,7 +111,7 @@ export type TraderOptions = {
 };
 
 export class Trader extends CTPProvider implements ITraderProvider {
-  private traderApi?: ctp.Trader;
+  private traderApi?: TraderApi;
   private tradingDay: number;
   private frontId: number;
   private sessionId: number;
@@ -99,14 +121,14 @@ export class Trader extends CTPProvider implements ITraderProvider {
   private readonly fastQueryLastTick?: FastQueryLastTickFunc;
   private readonly userInfo: CTPUserInfo;
   private readonly receivers: IOrderReceiver[];
-  private readonly accounts: ctp.TradingAccountField[];
-  private readonly positionDetails: ctp.InvestorPositionDetailField[];
-  private readonly instruments: Map<string, ctp.InstrumentField>;
+  private readonly accounts: TradingAccountField[];
+  private readonly positionDetails: InvestorPositionDetailField[];
+  private readonly instruments: Map<string, InstrumentField>;
   private readonly positions: Map<string, PositionInfo>;
-  private readonly orders: Map<string, ctp.OrderField>;
-  private readonly trades: Map<string, ctp.TradeField[]>;
-  private readonly marginRates: Map<string, ctp.InstrumentMarginRateField>;
-  private readonly commRates: Map<string, ctp.InstrumentCommissionRateField>;
+  private readonly orders: Map<string, OrderField>;
+  private readonly trades: Map<string, TradeField[]>;
+  private readonly marginRates: Map<string, InstrumentMarginRateField>;
+  private readonly commRates: Map<string, InstrumentCommissionRateField>;
   private readonly placeOrders: Map<number, IPlaceOrderResultReceiver>;
   private readonly cancelOrders: Map<number, ICancelOrderResultReceiver>;
   private readonly marketOrdersQueue: Map<string, Denque<MarketOrder>>;
@@ -172,7 +194,7 @@ export class Trader extends CTPProvider implements ITraderProvider {
       this.cancelOrders.clear();
     });
 
-    this.traderApi.on<ctp.RspAuthenticateField>(
+    this.traderApi.on<RspAuthenticateField>(
       ctp.TraderEvent.RspAuthenticate,
       (_, options) => {
         if (this._isErrorResp(lifecycle, options, "login-error")) {
@@ -183,7 +205,7 @@ export class Trader extends CTPProvider implements ITraderProvider {
       },
     );
 
-    this.traderApi.on<ctp.RspUserLoginField>(
+    this.traderApi.on<RspUserLoginField>(
       ctp.TraderEvent.RspUserLogin,
       (rspUserLogin, options) => {
         if (this._isErrorResp(lifecycle, options, "login-error")) {
@@ -210,7 +232,7 @@ export class Trader extends CTPProvider implements ITraderProvider {
       },
     );
 
-    this.traderApi.on<ctp.SettlementInfoConfirmField>(
+    this.traderApi.on<SettlementInfoConfirmField>(
       ctp.TraderEvent.RspSettlementInfoConfirm,
       (_, options) => {
         if (this._isErrorResp(lifecycle, options, "login-error")) {
@@ -222,7 +244,7 @@ export class Trader extends CTPProvider implements ITraderProvider {
       },
     );
 
-    this.traderApi.on<ctp.OrderField>(
+    this.traderApi.on<OrderField>(
       ctp.TraderEvent.RspQryOrder,
       (order, options) => {
         if (this._isErrorResp(lifecycle, options, "query-order-error")) {
@@ -241,7 +263,7 @@ export class Trader extends CTPProvider implements ITraderProvider {
       },
     );
 
-    this.traderApi.on<ctp.TradeField>(
+    this.traderApi.on<TradeField>(
       ctp.TraderEvent.RspQryTrade,
       (trade, options) => {
         if (this._isErrorResp(lifecycle, options, "query-trade-error")) {
@@ -266,7 +288,7 @@ export class Trader extends CTPProvider implements ITraderProvider {
       },
     );
 
-    this.traderApi.on<ctp.InstrumentField>(
+    this.traderApi.on<InstrumentField>(
       ctp.TraderEvent.RspQryInstrument,
       (instrument, options) => {
         if (this._isErrorResp(lifecycle, options, "query-instrument-error")) {
@@ -294,7 +316,7 @@ export class Trader extends CTPProvider implements ITraderProvider {
 
     let fired = false;
 
-    this.traderApi.on<ctp.InvestorPositionField>(
+    this.traderApi.on<InvestorPositionField>(
       ctp.TraderEvent.RspQryInvestorPosition,
       (position, options) => {
         if (this._isErrorResp(lifecycle, options, "query-positions-error")) {
@@ -362,7 +384,7 @@ export class Trader extends CTPProvider implements ITraderProvider {
       },
     );
 
-    this.traderApi.on<ctp.OrderField>(ctp.TraderEvent.RtnOrder, (order) => {
+    this.traderApi.on<OrderField>(ctp.TraderEvent.RtnOrder, (order) => {
       const orderId = this._calcOrderId(order);
       const current = this.orders.get(orderId);
 
@@ -469,7 +491,7 @@ export class Trader extends CTPProvider implements ITraderProvider {
       }
     });
 
-    this.traderApi.on<ctp.TradeField>(ctp.TraderEvent.RtnTrade, (trade) => {
+    this.traderApi.on<TradeField>(ctp.TraderEvent.RtnTrade, (trade) => {
       const orderId = this._calcOrderId(trade);
       const trades = this.trades.get(orderId);
 
@@ -503,7 +525,7 @@ export class Trader extends CTPProvider implements ITraderProvider {
       }
     });
 
-    this.traderApi.on<ctp.InstrumentMarginRateField>(
+    this.traderApi.on<InstrumentMarginRateField>(
       ctp.TraderEvent.RspQryInstrumentMarginRate,
       (marginRate, options) => {
         const query = this.marginRatesQueue.shift();
@@ -530,7 +552,7 @@ export class Trader extends CTPProvider implements ITraderProvider {
       },
     );
 
-    this.traderApi.on<ctp.InstrumentCommissionRateField>(
+    this.traderApi.on<InstrumentCommissionRateField>(
       ctp.TraderEvent.RspQryInstrumentCommissionRate,
       (commRate, options) => {
         const query = this.commRatesQueue.shift();
@@ -559,7 +581,7 @@ export class Trader extends CTPProvider implements ITraderProvider {
       },
     );
 
-    this.traderApi.on<ctp.TradingAccountField>(
+    this.traderApi.on<TradingAccountField>(
       ctp.TraderEvent.RspQryTradingAccount,
       (account, options) => {
         if (this._isErrorResp(lifecycle, options, "query-accounts-error")) {
@@ -589,7 +611,7 @@ export class Trader extends CTPProvider implements ITraderProvider {
       },
     );
 
-    this.traderApi.on<ctp.InvestorPositionDetailField>(
+    this.traderApi.on<InvestorPositionDetailField>(
       ctp.TraderEvent.RspQryInvestorPositionDetail,
       (positionDetail, options) => {
         if (
@@ -626,7 +648,7 @@ export class Trader extends CTPProvider implements ITraderProvider {
       },
     );
 
-    this.traderApi.on<ctp.InputOrderField>(
+    this.traderApi.on<InputOrderField>(
       ctp.TraderEvent.RspOrderInsert,
       (order, options) => {
         if (options.rspInfo && order && options.requestId && options.isLast) {
@@ -643,7 +665,7 @@ export class Trader extends CTPProvider implements ITraderProvider {
       },
     );
 
-    this.traderApi.on<ctp.InputOrderActionField>(
+    this.traderApi.on<InputOrderActionField>(
       ctp.TraderEvent.RspOrderAction,
       (order, options) => {
         if (options.rspInfo && order && options.requestId && options.isLast) {
@@ -660,7 +682,7 @@ export class Trader extends CTPProvider implements ITraderProvider {
       },
     );
 
-    this.traderApi.on<ctp.DepthMarketDataField>(
+    this.traderApi.on<DepthMarketDataField>(
       ctp.TraderEvent.RspQryDepthMarketData,
       (depthMarketData, options) => {
         if (
@@ -1179,6 +1201,11 @@ export class Trader extends CTPProvider implements ITraderProvider {
     flag: OrderFlag,
     receiver: IPlaceOrderResultReceiver,
   ) {
+    if (volume <= 0) {
+      receiver.onPlaceOrderError("Invalid Volume");
+      return;
+    }
+
     switch (flag) {
       case "limit":
         return this._placeLimitOrder(
@@ -1241,19 +1268,16 @@ export class Trader extends CTPProvider implements ITraderProvider {
     return `${instrument.InstrumentID}.${instrument.ExchangeID}`;
   }
 
-  private _calcOrderId(orderOrTrade: ctp.OrderField | ctp.TradeField) {
+  private _calcOrderId(orderOrTrade: OrderField | TradeField) {
     const { ExchangeID, TraderID, OrderLocalID } = orderOrTrade;
     return `${ExchangeID}:${TraderID}:${OrderLocalID}`;
   }
 
-  private _calcReceiptId(order: ctp.OrderField | ctp.InputOrderActionField) {
+  private _calcReceiptId(order: OrderField | InputOrderActionField) {
     return `${order.FrontID}:${order.SessionID}:${parseInt(order.OrderRef)}`;
   }
 
-  private _calcOrderStatus(
-    order: ctp.OrderField,
-    traded?: number,
-  ): OrderStatus {
+  private _calcOrderStatus(order: OrderField, traded?: number): OrderStatus {
     switch (order.OrderStatus) {
       case ctp.OrderStatusType.Unknown:
         return "submitted";
@@ -1279,7 +1303,7 @@ export class Trader extends CTPProvider implements ITraderProvider {
     }
   }
 
-  private _calcOrderFlag(orderPriceType: ctp.OrderPriceTypeType): OrderFlag {
+  private _calcOrderFlag(orderPriceType: OrderPriceTypeType): OrderFlag {
     switch (orderPriceType) {
       case ctp.OrderPriceTypeType.LimitPrice:
         return "limit";
@@ -1289,7 +1313,7 @@ export class Trader extends CTPProvider implements ITraderProvider {
     }
   }
 
-  private _calcSideType(direction: ctp.DirectionType): SideType {
+  private _calcSideType(direction: DirectionType): SideType {
     switch (direction) {
       case ctp.DirectionType.Buy:
         return "long";
@@ -1309,7 +1333,7 @@ export class Trader extends CTPProvider implements ITraderProvider {
     }
   }
 
-  private _calcOffsetType(offset: ctp.OffsetFlagType): OffsetType {
+  private _calcOffsetType(offset: OffsetFlagType): OffsetType {
     switch (offset) {
       case ctp.OffsetFlagType.Open:
         return "open";
@@ -1335,7 +1359,7 @@ export class Trader extends CTPProvider implements ITraderProvider {
     }
   }
 
-  private _calcProductType(productClass: ctp.ProductClassType): ProductType {
+  private _calcProductType(productClass: ProductClassType): ProductType {
     switch (productClass) {
       case ctp.ProductClassType.Futures:
         return "futures";
@@ -1343,11 +1367,32 @@ export class Trader extends CTPProvider implements ITraderProvider {
       case ctp.ProductClassType.Options:
         return "options";
 
+      case ctp.ProductClassType.Spot:
+        return "spot";
+
+      case ctp.ProductClassType.SpotOption:
+        return "spot-options";
+
       default:
         throw new Error(`Unsupported product class: ${productClass}`);
     }
   }
 
+  private _calcOptionsType(
+    optionsType: OptionsTypeType,
+  ): OptionsType | undefined {
+    switch (optionsType) {
+      case ctp.OptionsTypeType.CallOptions:
+        return "call";
+
+      case ctp.OptionsTypeType.PutOptions:
+        return "put";
+
+      default:
+        return undefined;
+    }
+  }
+
   private _ensurePositionInfo(symbol: string): PositionInfo {
     let position = this.positions.get(symbol);
 
@@ -1671,7 +1716,7 @@ export class Trader extends CTPProvider implements ITraderProvider {
     }
   }
 
-  private _toTradeData(trade: ctp.TradeField): TradeData {
+  private _toTradeData(trade: TradeField): TradeData {
     return Object.freeze({
       id: trade.TradeID,
       date: parseInt(trade.TradeDate),
@@ -1681,7 +1726,7 @@ export class Trader extends CTPProvider implements ITraderProvider {
     });
   }
 
-  private _toOrderData(order: ctp.OrderField): OrderData {
+  private _toOrderData(order: OrderField): OrderData {
     const orderId = this._calcOrderId(order);
     const trades = this.trades.get(orderId) ?? [];
 
@@ -1697,7 +1742,7 @@ export class Trader extends CTPProvider implements ITraderProvider {
       time: this._parseTime(order.InsertTime),
       flag: this._calcOrderFlag(order.OrderPriceType),
       side: this._calcSideType(order.Direction),
-      offset: this._calcOffsetType(order.CombOffsetFlag as ctp.OffsetFlagType),
+      offset: this._calcOffsetType(order.CombOffsetFlag as OffsetFlagType),
       price: order.LimitPrice,
       volume: order.VolumeTotalOriginal,
       traded: traded,
@@ -1708,7 +1753,7 @@ export class Trader extends CTPProvider implements ITraderProvider {
     });
   }
 
-  private _toInstrumentData(instrument: ctp.InstrumentField): InstrumentData {
+  private _toInstrumentData(instrument: InstrumentField): InstrumentData {
     return Object.freeze({
       symbol: `${instrument.InstrumentID}.${instrument.ExchangeID}`,
       id: instrument.InstrumentID,
@@ -1724,12 +1769,14 @@ export class Trader extends CTPProvider implements ITraderProvider {
       priceTick: instrument.PriceTick,
       maxLimitOrderVolume: instrument.MaxLimitOrderVolume,
       minLimitOrderVolume: instrument.MinLimitOrderVolume,
+      strikePrice: instrument.StrikePrice,
+      optionsType: this._calcOptionsType(instrument.OptionsType),
     });
   }
 
   private _toCommissionRate(
     symbol: string,
-    commRate: ctp.InstrumentCommissionRateField,
+    commRate: InstrumentCommissionRateField,
   ): CommissionRate {
     return Object.freeze({
       symbol: symbol,
@@ -1750,7 +1797,7 @@ export class Trader extends CTPProvider implements ITraderProvider {
 
   private _toMarginRate(
     symbol: string,
-    marginRate: ctp.InstrumentMarginRateField,
+    marginRate: InstrumentMarginRateField,
   ): MarginRate {
     return Object.freeze({
       symbol: symbol,
@@ -1765,11 +1812,12 @@ export class Trader extends CTPProvider implements ITraderProvider {
     });
   }
 
-  private _toTradingAccount(account: ctp.TradingAccountField): TradingAccount {
+  private _toTradingAccount(account: TradingAccountField): TradingAccount {
     return Object.freeze({
       id: account.AccountID,
       currency: account.CurrencyID,
       preBalance: account.PreBalance - account.Withdraw + account.Deposit,
+      preMargin: account.PreMargin,
       balance: account.Balance,
       cash: account.Available,
       margin: account.CurrMargin,
@@ -1781,7 +1829,7 @@ export class Trader extends CTPProvider implements ITraderProvider {
   }
 
   private _toPositionDetail(
-    positionDetail: ctp.InvestorPositionDetailField,
+    positionDetail: InvestorPositionDetailField,
   ): PositionDetail {
     return Object.freeze({
       symbol: this._toSymbol(positionDetail.InstrumentID)!,

package/src/typedef.ts

@@ -168,6 +168,7 @@ export type TradingAccount = Readonly<{
   id: string;
   currency: string;
   preBalance: number;
+  preMargin: number;
   balance: number;
   cash: number;
   margin: number;
@@ -177,7 +178,8 @@ export type TradingAccount = Readonly<{
   frozenCommission: number;
 }>;
 
-export type ProductType = "futures" | "options";
+export type ProductType = "futures" | "options" | "spot" | "spot-options";
+export type OptionsType = "call" | "put";
 
 export type InstrumentData = Readonly<{
   symbol: string;
@@ -194,6 +196,8 @@ export type InstrumentData = Readonly<{
   priceTick: number;
   maxLimitOrderVolume: number;
   minLimitOrderVolume: number;
+  strikePrice: number;
+  optionsType?: OptionsType;
 }>;
 
 export type PriceVolume = Readonly<{

package/src/utils.ts

@@ -9,9 +9,9 @@
  * https://github.com/shixiongfei/hft.js
  */
 
-import { BarData, OrderFlag } from "./typedef.js";
-import { BarInfo } from "./bar.js";
-import {
+import type { BarData, OrderFlag } from "./typedef.js";
+import type { BarInfo } from "./bar.js";
+import type {
   IPlaceOrderResultReceiver,
   IRuntimeEngine,
   IStrategy,
@@ -21,7 +21,7 @@ export const isValidPrice = (x: number) => x !== Number.MAX_VALUE && x !== 0;
 export const isValidVolume = (x: number) => x !== Number.MAX_VALUE && x !== 0;
 
 export const parseSymbol = (symbol: string): [string, string] => {
-  const [instrumentId, exchangeId] = symbol.split(".");
+  const [instrumentId = "", exchangeId = ""] = symbol.split(".");
   return [instrumentId, exchangeId];
 };
 
@@ -40,28 +40,28 @@ export const mergeBarData = (bars: BarData[]): BarData => {
   }
 
   if (bars.length === 1) {
-    return bars[1];
+    return bars[1]!;
   }
 
   const bar: BarInfo = {
-    symbol: bars[0].symbol,
-    date: bars[0].date,
-    time: bars[0].time,
-    openInterest: bars[0].openInterest,
-    openPrice: bars[0].openPrice,
-    highPrice: bars[0].highPrice,
-    lowPrice: bars[0].lowPrice,
-    closePrice: bars[0].closePrice,
-    volume: bars[0].volume,
-    amount: bars[0].volume,
-    delta: bars[0].delta,
-    poc: bars[0].poc,
-    buyVolumes: { ...bars[0].buyVolumes },
-    sellVolumes: { ...bars[0].sellVolumes },
+    symbol: bars[0]!.symbol,
+    date: bars[0]!.date,
+    time: bars[0]!.time,
+    openInterest: bars[0]!.openInterest,
+    openPrice: bars[0]!.openPrice,
+    highPrice: bars[0]!.highPrice,
+    lowPrice: bars[0]!.lowPrice,
+    closePrice: bars[0]!.closePrice,
+    volume: bars[0]!.volume,
+    amount: bars[0]!.volume,
+    delta: bars[0]!.delta,
+    poc: bars[0]!.poc,
+    buyVolumes: { ...bars[0]!.buyVolumes },
+    sellVolumes: { ...bars[0]!.sellVolumes },
   };
 
   for (let i = 1; i < bars.length; ++i) {
-    const nextBar = bars[i];
+    const nextBar = bars[i]!;
 
     bar.openInterest = nextBar.openInterest;
     bar.closePrice = nextBar.closePrice;
@@ -73,14 +73,9 @@ export const mergeBarData = (bars: BarData[]): BarData => {
     bar.amount += nextBar.amount;
 
     for (const price in nextBar.buyVolumes) {
-      const volumeDelta = nextBar.buyVolumes[price];
-
-      if (price in bar.buyVolumes) {
-        bar.buyVolumes[price] += volumeDelta;
-      } else {
-        bar.buyVolumes[price] = volumeDelta;
-      }
+      const volumeDelta = nextBar.buyVolumes[price]!;
 
+      bar.buyVolumes[price] = volumeDelta + (bar.buyVolumes[price] ?? 0);
       bar.delta += volumeDelta;
 
       const priceVP = bar.buyVolumes[price] + (bar.sellVolumes[price] ?? 0);
@@ -92,14 +87,9 @@ export const mergeBarData = (bars: BarData[]): BarData => {
     }
 
     for (const price in nextBar.sellVolumes) {
-      const volumeDelta = nextBar.sellVolumes[price];
-
-      if (price in bar.sellVolumes) {
-        bar.sellVolumes[price] += volumeDelta;
-      } else {
-        bar.sellVolumes[price] = volumeDelta;
-      }
+      const volumeDelta = nextBar.sellVolumes[price]!;
 
+      bar.sellVolumes[price] = volumeDelta + (bar.sellVolumes[price] ?? 0);
       bar.delta -= volumeDelta;
 
       const priceVP = bar.sellVolumes[price] + (bar.buyVolumes[price] ?? 0);