Merge branch 'master' into github-actions

tastytrade · Mar 8, 2024 · 0c27b4a · 0c27b4a
2 parents adb9752 + 51803ba
commit 0c27b4a
Show file tree

Hide file tree

Showing 22 changed files with 1,560 additions and 1,386 deletions.
diff --git a/jest.config.js b/jest.config.js
@@ -1,10 +1,23 @@
 /** @type {import('ts-jest').JestConfigWithTsJest} */
-module.exports = {
-  preset: 'ts-jest',
-  setupFiles: ["dotenv/config"],
+const config = {
+  preset: 'ts-jest/presets/default-esm',
+  setupFiles: ['dotenv/config'],
   testEnvironment: 'node',
+  extensionsToTreatAsEsm: ['.ts'],
+  moduleNameMapper: {
+    '^(\\.{1,2}/.*)\\.js$': '$1',
+  },
   transform: {
-    '^.+\\.ts?$': 'ts-jest',
+    // '^.+\\.[tj]sx?$' to process js/ts with `ts-jest`
+    // '^.+\\.m?[tj]sx?$' to process js/ts/mjs/mts with `ts-jest`
+    '^.+\\.tsx?$': [
+      'ts-jest',
+      {
+        useESM: true,
+      },
+    ],
   },
-  transformIgnorePatterns: ['<rootDir>/node_modules/']
-};
+  transformIgnorePatterns: ['<rootDir>/node_modules/'],
+};
+
+export default config;
diff --git a/lib/account-streamer.ts b/lib/account-streamer.ts
@@ -1,9 +1,9 @@
 import WebSocket from 'isomorphic-ws'
 import _ from 'lodash'
-import type { JsonMap, JsonValue } from './utils/json-util'
-import { JsonBuilder } from './utils/json-util'
-import TastytradeSession from './models/tastytrade-session'
-import { MinTlsVersion } from './utils/constants'
+import type { JsonMap, JsonValue } from './utils/json-util.js'
+import { JsonBuilder } from './utils/json-util.js'
+import TastytradeSession from './models/tastytrade-session.js'
+import { MinTlsVersion } from './utils/constants.js'
 
 export enum STREAMER_STATE {
   Open = 0,

diff --git a/lib/market-data-streamer.ts b/lib/market-data-streamer.ts
@@ -1,7 +1,7 @@
 import WebSocket from 'isomorphic-ws'
 import _ from 'lodash'
 import { v4 as uuidv4 } from 'uuid'
-import { MinTlsVersion } from './utils/constants'
+import { MinTlsVersion } from './utils/constants.js'
 
 export enum MarketDataSubscriptionType {
   Candle = 'Candle',

diff --git a/lib/services/account-status-service.ts b/lib/services/account-status-service.ts
@@ -1,5 +1,5 @@
-import extractResponseData from "../utils/response-util";
-import TastytradeHttpClient from "./tastytrade-http-client";
+import extractResponseData from "../utils/response-util.js";
+import TastytradeHttpClient from "./tastytrade-http-client.js";
 
 // create the central class that aggregates all services
 export default class AccountStatusService {

diff --git a/lib/services/accounts-and-customers-service.ts b/lib/services/accounts-and-customers-service.ts
@@ -1,5 +1,5 @@
-import extractResponseData from "../utils/response-util";
-import TastytradeHttpClient from "./tastytrade-http-client";
+import extractResponseData from "../utils/response-util.js";
+import TastytradeHttpClient from "./tastytrade-http-client.js";
 
 export default class AccountsAndCustomersService {
     constructor(private httpClient: TastytradeHttpClient) {

diff --git a/lib/services/balances-and-positions-service.ts b/lib/services/balances-and-positions-service.ts
@@ -1,5 +1,5 @@
-import extractResponseData from "../utils/response-util";
-import TastytradeHttpClient from "./tastytrade-http-client";
+import extractResponseData from "../utils/response-util.js";
+import TastytradeHttpClient from "./tastytrade-http-client.js";
 
 export default class BalancesAndPositionsService {
     constructor(private httpClient: TastytradeHttpClient) {

diff --git a/lib/services/instruments-service.ts b/lib/services/instruments-service.ts
@@ -1,5 +1,5 @@
-import extractResponseData from "../utils/response-util";
-import TastytradeHttpClient from "./tastytrade-http-client";
+import extractResponseData from "../utils/response-util.js";
+import TastytradeHttpClient from "./tastytrade-http-client.js";
 import _ from 'lodash'
 
 export default class InstrumentsService {

diff --git a/lib/services/margin-requirements-service.ts b/lib/services/margin-requirements-service.ts
@@ -1,5 +1,5 @@
-import extractResponseData from "../utils/response-util";
-import TastytradeHttpClient from "./tastytrade-http-client";
+import extractResponseData from "../utils/response-util.js";
+import TastytradeHttpClient from "./tastytrade-http-client.js";
 
 export default class MarginRequirementsService {
     constructor(private httpClient: TastytradeHttpClient) {

diff --git a/lib/services/market-metrics-service.ts b/lib/services/market-metrics-service.ts
@@ -1,5 +1,5 @@
-import extractResponseData from "../utils/response-util";
-import TastytradeHttpClient from "./tastytrade-http-client";
+import extractResponseData from "../utils/response-util.js";
+import TastytradeHttpClient from "./tastytrade-http-client.js";
 
 export default class MarketMetricsService {
     constructor(private httpClient: TastytradeHttpClient) {

diff --git a/lib/services/net-liquidating-value-history-service.ts b/lib/services/net-liquidating-value-history-service.ts
@@ -1,5 +1,5 @@
-import extractResponseData from "../utils/response-util";
-import TastytradeHttpClient from "./tastytrade-http-client";
+import extractResponseData from "../utils/response-util.js";
+import TastytradeHttpClient from "./tastytrade-http-client.js";
 
 export default class NetLiquidatingValueHistoryService {
     constructor(private httpClient: TastytradeHttpClient) {

diff --git a/lib/services/orders-service.ts b/lib/services/orders-service.ts
@@ -1,5 +1,5 @@
-import extractResponseData from "../utils/response-util";
-import TastytradeHttpClient from "./tastytrade-http-client";
+import extractResponseData from "../utils/response-util.js";
+import TastytradeHttpClient from "./tastytrade-http-client.js";
 
 export default class OrderService {
     constructor(private httpClient: TastytradeHttpClient) {

diff --git a/lib/services/risk-parameters-service.ts b/lib/services/risk-parameters-service.ts
@@ -1,5 +1,5 @@
-import extractResponseData from "../utils/response-util";
-import TastytradeHttpClient from "./tastytrade-http-client";
+import extractResponseData from "../utils/response-util.js";
+import TastytradeHttpClient from "./tastytrade-http-client.js";
 
 export default class RiskParametersService {
     constructor(private httpClient: TastytradeHttpClient) {

diff --git a/lib/services/session-service.ts b/lib/services/session-service.ts
@@ -1,5 +1,5 @@
-import extractResponseData from "../utils/response-util";
-import TastytradeHttpClient from "./tastytrade-http-client";
+import extractResponseData from "../utils/response-util.js";
+import TastytradeHttpClient from "./tastytrade-http-client.js";
 
 export default class SessionService {
     constructor(public httpClient: TastytradeHttpClient) {

diff --git a/lib/services/symbol-search-service.ts b/lib/services/symbol-search-service.ts
@@ -1,5 +1,5 @@
-import extractResponseData from "../utils/response-util";
-import TastytradeHttpClient from "./tastytrade-http-client";
+import extractResponseData from "../utils/response-util.js";
+import TastytradeHttpClient from "./tastytrade-http-client.js";
 
 export default class SymbolSearchService {
     constructor(private httpClient: TastytradeHttpClient) {

diff --git a/lib/services/tastytrade-http-client.ts b/lib/services/tastytrade-http-client.ts
@@ -1,7 +1,7 @@
-import TastytradeSession from "../models/tastytrade-session"
+import TastytradeSession from "../models/tastytrade-session.js"
 import axios from "axios"
 import qs from 'qs'
-import { recursiveDasherizeKeys } from "../utils/json-util"
+import { recursiveDasherizeKeys } from "../utils/json-util.js"
 import _ from 'lodash'
 
 const ParamsSerializer = {

diff --git a/lib/services/transactions-service.ts b/lib/services/transactions-service.ts
@@ -1,5 +1,5 @@
-import extractResponseData from "../utils/response-util";
-import TastytradeHttpClient from "./tastytrade-http-client";
+import extractResponseData from "../utils/response-util.js";
+import TastytradeHttpClient from "./tastytrade-http-client.js";
 
 export default class TransactionsService {
     constructor(private httpClient: TastytradeHttpClient) {

diff --git a/lib/services/watchlists-service.ts b/lib/services/watchlists-service.ts
@@ -1,5 +1,5 @@
-import extractResponseData from "../utils/response-util";
-import TastytradeHttpClient from "./tastytrade-http-client";
+import extractResponseData from "../utils/response-util.js";
+import TastytradeHttpClient from "./tastytrade-http-client.js";
 
 export default class WatchlistsService {
     constructor(private httpClient: TastytradeHttpClient) {

diff --git a/lib/tastytrade-api.ts b/lib/tastytrade-api.ts
@@ -1,22 +1,22 @@
-import TastytradeHttpClient from "./services/tastytrade-http-client"
-import { AccountStreamer, STREAMER_STATE, Disposer, StreamerStateObserver } from './account-streamer'
-import MarketDataStreamer, { CandleSubscriptionOptions, CandleType, MarketDataSubscriptionType, MarketDataListener } from "./market-data-streamer"
+import TastytradeHttpClient from "./services/tastytrade-http-client.js"
+import { AccountStreamer, STREAMER_STATE, type Disposer, type StreamerStateObserver } from './account-streamer.js'
+import MarketDataStreamer, { type CandleSubscriptionOptions, CandleType, MarketDataSubscriptionType, type MarketDataListener } from "./market-data-streamer.js"
 
 //Services:
-import SessionService from "./services/session-service"
-import AccountStatusService from "./services/account-status-service"
-import AccountsAndCustomersService from "./services/accounts-and-customers-service"
-import BalancesAndPositionsService from "./services/balances-and-positions-service"
-import InstrumentsService from "./services/instruments-service"
-import MarginRequirementsService from "./services/margin-requirements-service"
-import MarketMetricsService from "./services/market-metrics-service"
-import NetLiquidatingValueHistoryService from "./services/net-liquidating-value-history-service"
-import OrderService from "./services/orders-service"
-import RiskParametersService from "./services/risk-parameters-service"
-import SymbolSearchService from "./services/symbol-search-service"
-import TransactionsService from "./services/transactions-service"
-import WatchlistsService from "./services/watchlists-service"
-import TastytradeSession from "./models/tastytrade-session"
+import SessionService from "./services/session-service.js"
+import AccountStatusService from "./services/account-status-service.js"
+import AccountsAndCustomersService from "./services/accounts-and-customers-service.js"
+import BalancesAndPositionsService from "./services/balances-and-positions-service.js"
+import InstrumentsService from "./services/instruments-service.js"
+import MarginRequirementsService from "./services/margin-requirements-service.js"
+import MarketMetricsService from "./services/market-metrics-service.js"
+import NetLiquidatingValueHistoryService from "./services/net-liquidating-value-history-service.js"
+import OrderService from "./services/orders-service.js"
+import RiskParametersService from "./services/risk-parameters-service.js"
+import SymbolSearchService from "./services/symbol-search-service.js"
+import TransactionsService from "./services/transactions-service.js"
+import WatchlistsService from "./services/watchlists-service.js"
+import TastytradeSession from "./models/tastytrade-session.js"
 
 export default class TastytradeClient {
   public readonly httpClient: TastytradeHttpClient
@@ -61,5 +61,5 @@ export default class TastytradeClient {
   }
 }
 
-export { MarketDataStreamer, MarketDataSubscriptionType, MarketDataListener, CandleSubscriptionOptions, CandleType }
-export { AccountStreamer, STREAMER_STATE, Disposer, StreamerStateObserver }
+export { MarketDataStreamer, MarketDataSubscriptionType, type MarketDataListener, type CandleSubscriptionOptions, CandleType }
+export { AccountStreamer, STREAMER_STATE, type Disposer, type StreamerStateObserver }