refactor

src/Client.ts

@@ -1,23 +1,35 @@
-import type { OpenAPIConfig } from "./core/OpenAPI.js";
-import type { BaseHttpRequest } from "./core/BaseHttpRequest.js";
+import type { BaseHttpRequest } from "./rest/BaseHttpRequest";
+import type { ApiRequestOptions } from "./rest/ApiRequestOptions";
 
-import { AxiosHttpRequest } from "./core/AxiosHttpRequest.js";
+import { AxiosHttpRequest } from "./rest/AxiosHttpRequest";
+import { Logos } from "./paths/logos";
+import { News } from "./paths/news";
+import { Clock } from "./paths/clock";
+import { Orders } from "./paths/orders";
+import { Assets } from "./paths/assets";
+import { AccountService } from "./paths/AccountService.js";
+import { Calendar } from "./paths/calendar";
+import { Crypto } from "./paths/crypto";
+import { Stocks } from "./paths/stocks";
+import { Screener } from "./paths/screener";
+import { Positions } from "./paths/positions";
+import { Watchlists } from "./paths/watchlists";
+import { Account } from "./paths/account";
+import { PortfolioHistoryService } from "./paths/PortfolioHistoryService.js";
+import { AccountConfigurations } from "./paths/AccountConfigurations";
 
-import { LogoService } from "./services/LogoService.js";
-import { NewsService } from "./services/NewsService.js";
-import { ClockService } from "./services/ClockService.js";
-import { OrdersService } from "./services/OrdersService.js";
-import { AssetsService } from "./services/AssetsService.js";
-import { AccountService } from "./services/AccountService.js";
-import { CalendarService } from "./services/CalendarService.js";
-import { CryptoDataService } from "./services/CryptoDataService.js";
-import { StockDataService } from "./services/StockDataService.js";
-import { ScreenerService } from "./services/ScreenerService.js";
-import { PositionsService } from "./services/PositionsService.js";
-import { WatchlistsService } from "./services/WatchlistsService.js";
-import { AccountActivitiesService } from "./services/AccountActivitiesService.js";
-import { PortfolioHistoryService } from "./services/PortfolioHistoryService.js";
-import { AccountConfigurationsService } from "./services/AccountConfigurationsService.js";
+type Resolver<T> = (options: ApiRequestOptions) => Promise<T>;
+type Headers = Record<string, string>;
+
+export type OpenAPIConfig = {
+  BASE: string;
+  HEADERS?: Headers | Resolver<Headers> | undefined;
+};
+
+export const OpenAPI: OpenAPIConfig = {
+  BASE: "https://paper-api.alpaca.markets",
+  HEADERS: undefined,
+};
 
 type HttpRequestConstructor = new (config: OpenAPIConfig) => BaseHttpRequest;
 
@@ -31,34 +43,34 @@ interface ClientOptions {
 
 // bundle all account services into one class for convenience
 class AccountServices extends AccountService {
-  activities: AccountActivitiesService;
-  configurations: AccountConfigurationsService;
-  positions: PositionsService;
-  orders: OrdersService;
+  activities: Account;
+  configurations: AccountConfigurations;
+  positions: Positions;
+  orders: Orders;
   portfolioHistory: PortfolioHistoryService;
 
   constructor(httpRequest: BaseHttpRequest) {
     super(httpRequest);
-    this.activities = new AccountActivitiesService(httpRequest);
-    this.configurations = new AccountConfigurationsService(httpRequest);
-    this.positions = new PositionsService(httpRequest);
-    this.orders = new OrdersService(httpRequest);
+    this.activities = new Account(httpRequest);
+    this.configurations = new AccountConfigurations(httpRequest);
+    this.positions = new Positions(httpRequest);
+    this.orders = new Orders(httpRequest);
     this.portfolioHistory = new PortfolioHistoryService(httpRequest);
   }
 }
 
 export class Client {
   private readonly request: BaseHttpRequest;
 
-  public readonly calendar: CalendarService;
-  public readonly clock: ClockService;
-  public readonly assets: AssetsService;
-  public readonly crypto: CryptoDataService;
-  public readonly logo: LogoService;
-  public readonly news: NewsService;
-  public readonly screener: ScreenerService;
-  public readonly stocks: StockDataService;
-  public readonly watchlists: WatchlistsService;
+  public readonly calendar: Calendar;
+  public readonly clock: Clock;
+  public readonly assets: Assets;
+  public readonly crypto: Crypto;
+  public readonly logo: Logos;
+  public readonly news: News;
+  public readonly screener: Screener;
+  public readonly stocks: Stocks;
+  public readonly watchlists: Watchlists;
   public readonly account: AccountServices;
 
   constructor(
@@ -81,14 +93,14 @@ export class Client {
     });
 
     this.account = new AccountServices(this.request);
-    this.watchlists = new WatchlistsService(this.request);
-    this.calendar = new CalendarService(this.request);
-    this.clock = new ClockService(this.request);
-    this.assets = new AssetsService(this.request);
-    this.crypto = new CryptoDataService(this.request);
-    this.logo = new LogoService(this.request);
-    this.news = new NewsService(this.request);
-    this.screener = new ScreenerService(this.request);
-    this.stocks = new StockDataService(this.request);
+    this.watchlists = new Watchlists(this.request);
+    this.calendar = new Calendar(this.request);
+    this.clock = new Clock(this.request);
+    this.assets = new Assets(this.request);
+    this.crypto = new Crypto(this.request);
+    this.logo = new Logos(this.request);
+    this.news = new News(this.request);
+    this.screener = new Screener(this.request);
+    this.stocks = new Stocks(this.request);
   }
 }

src/models/Account.ts → src/entities/Account.ts

@@ -1,8 +1,3 @@
-/* generated using openapi-typescript-codegen -- do no edit */
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
 import type { AccountStatus } from "./AccountStatus.js";
 
 /**

src/models/AccountConfigurations.ts → src/entities/AccountConfigurations.ts

@@ -1,8 +1,3 @@
-/* generated using openapi-typescript-codegen -- do no edit */
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
 /**
  * The account configuration API provides custom configurations about your trading account settings. These configurations control various allow you to modify settings to suit your trading needs.
  */

src/models/AccountStatus.ts → src/entities/AccountStatus.ts

@@ -1,8 +1,3 @@
-/* generated using openapi-typescript-codegen -- do no edit */
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
 /**
  * An enum representing the various possible account status values.
  *

src/models/ActivityType.ts → src/entities/ActivityType.ts

@@ -1,8 +1,3 @@
-/* generated using openapi-typescript-codegen -- do no edit */
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
 /**
  * - FILL
  * Order fills (both partial and full fills)

src/models/AddAssetToWatchlistRequest.ts → src/entities/AddAssetToWatchlistRequest.ts

@@ -1,8 +1,3 @@
-/* generated using openapi-typescript-codegen -- do no edit */
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
 /**
  * Append an asset for the symbol to the end of watchlist asset list
  */

src/models/AssetClass.ts → src/entities/AssetClass.ts

@@ -1,8 +1,3 @@
-/* generated using openapi-typescript-codegen -- do no edit */
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
 /**
  * Represents what class of asset this is. Currently only supports `us_equity` or `crypto`
  */

src/models/Assets.ts → src/entities/Assets.ts

@@ -1,8 +1,3 @@
-/* generated using openapi-typescript-codegen -- do no edit */
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
 import type { AssetClass } from "./AssetClass.js";
 import type { Exchange } from "./Exchange.js";
 

src/models/BarsResponse.ts → src/entities/BarsResponse.ts

@@ -1,8 +1,3 @@
-/* generated using openapi-typescript-codegen -- do no edit */
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
 import type { Bar } from "./Bar.js";
 
 export type BarsResponse = {

src/models/Calendar.ts → src/entities/Calendar.ts

@@ -1,8 +1,3 @@
-/* generated using openapi-typescript-codegen -- do no edit */
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
 export type Calendar = {
   /**
    * Date string in “%Y-%m-%d” format

src/models/CanceledOrderResponse.ts → src/entities/CanceledOrderResponse.ts

@@ -1,8 +1,3 @@
-/* generated using openapi-typescript-codegen -- do no edit */
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
 /**
  * Represents the result of a request to cancel and order
  */

src/models/Clock.ts → src/entities/Clock.ts

@@ -1,8 +1,3 @@
-/* generated using openapi-typescript-codegen -- do no edit */
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
 export type Clock = {
   /**
    * Current timestamp

src/models/Exchange.ts → src/entities/Exchange.ts

@@ -1,8 +1,3 @@
-/* generated using openapi-typescript-codegen -- do no edit */
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
 /**
  * Represents the current exchanges Alpaca supports. List is currently:
  *

src/models/ExchangesResponse.ts → src/entities/ExchangesResponse.ts

@@ -1,8 +1,3 @@
-/* generated using openapi-typescript-codegen -- do no edit */
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
 /**
  * Returns an object representing the exchanges we support. The keys are the short form codes you will see in our responses and the values are their respective full names.
  */

src/models/GetNewsResponse.ts → src/entities/GetNewsResponse.ts

@@ -1,8 +1,3 @@
-/* generated using openapi-typescript-codegen -- do no edit */
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
 import type { News } from "./News.js";
 
 export type GetNewsResponse = {

src/models/LatestBarResponse.ts → src/entities/LatestBarResponse.ts

@@ -1,8 +1,3 @@
-/* generated using openapi-typescript-codegen -- do no edit */
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
 import type { Bar } from "./Bar.js";
 
 /**

src/models/LatestMultiBarsResponse.ts → src/entities/LatestMultiBarsResponse.ts

@@ -1,8 +1,3 @@
-/* generated using openapi-typescript-codegen -- do no edit */
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
 import type { Bar } from "./Bar.js";
 
 /**

src/entities/LatestMultiQuotesResponse.ts

@@ -0,0 +1,5 @@
+import type { Quote } from "./Quote.js";
+
+export type LatestMultiQuotesResponse = {
+  quotes: Record<string, Quote>;
+};

src/entities/LatestMultiTradesResponse.ts

@@ -0,0 +1,5 @@
+import type { Trade } from "./Trade.js";
+
+export type LatestMultiTradesResponse = {
+  trades: Record<string, Trade>;
+};

src/models/LatestQuoteResponse.ts → src/entities/LatestQuoteResponse.ts

@@ -1,8 +1,3 @@
-/* generated using openapi-typescript-codegen -- do no edit */
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
 import type { Quote } from "./Quote.js";
 
 /**

src/models/LatestTradeResponse.ts → src/entities/LatestTradeResponse.ts

@@ -1,8 +1,3 @@
-/* generated using openapi-typescript-codegen -- do no edit */
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
 import type { Trade } from "./Trade.js";
 
 /**

src/models/MarketMoverAsset.ts → src/entities/MarketMoverAsset.ts

@@ -1,8 +1,3 @@
-/* generated using openapi-typescript-codegen -- do no edit */
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
 /**
  * Name or source of given news article
  */

src/models/MarketMoversResponse.ts → src/entities/MarketMoversResponse.ts

@@ -1,8 +1,3 @@
-/* generated using openapi-typescript-codegen -- do no edit */
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
 import type { MarketMoverAsset } from "./MarketMoverAsset.js";
 
 /**

src/models/MultiBarsResponse.ts → src/entities/MultiBarsResponse.ts

@@ -1,8 +1,3 @@
-/* generated using openapi-typescript-codegen -- do no edit */
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
 import type { Bar } from "./Bar.js";
 
 /**

src/models/MultiQuotesReponse.ts → src/entities/MultiQuotesReponse.ts

@@ -1,8 +1,3 @@
-/* generated using openapi-typescript-codegen -- do no edit */
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
 import type { Quote } from "./Quote.js";
 
 /**