Wrap client options and type inside client module

Author: razor-x

generate-routes.ts

@@ -234,10 +234,9 @@ ${renderExports(route)}
 const renderImports = ({ namespace, subresources }: Route): string =>
   `
 import type { RouteRequestParams, RouteResponse, RouteRequestBody } from '@seamapi/types/connect'
-import { Axios } from 'axios'
 import type { SetNonNullable } from 'type-fest'
 
-import { createClient } from 'lib/seam/connect/client.js'
+import { type Client, createClient } from 'lib/seam/connect/client.js'
 import {
   isSeamHttpOptionsWithApiKey,
   isSeamHttpOptionsWithClient,
@@ -268,7 +267,7 @@ const renderClass = (
 ): string =>
   `
 export class SeamHttp${pascalCase(namespace)} {
-  client: Axios
+  client: Client
 
   ${constructors
     .replaceAll(': SeamHttp ', `: SeamHttp${pascalCase(namespace)} `)

src/lib/seam/connect/client.ts

@@ -1,5 +1,5 @@
-import axios, { type Axios } from 'axios'
-import axiosRetry, { exponentialDelay } from 'axios-retry'
+import axios, { type Axios, type AxiosRequestConfig } from 'axios'
+import axiosRetry, { type AxiosRetry, exponentialDelay } from 'axios-retry'
 
 import { paramsSerializer } from 'lib/params-serializer.js'
 
@@ -10,6 +10,16 @@ import {
   type SeamHttpOptions,
 } from './options.js'
 
+export type Client = Axios
+
+export interface ClientOptions {
+  endpoint?: string
+  axiosOptions?: AxiosRequestConfig
+  axiosRetryOptions?: AxiosRetryConfig
+}
+
+type AxiosRetryConfig = Parameters<AxiosRetry>[1]
+
 export const createClient = (options: Required<SeamHttpOptions>): Axios => {
   if (isSeamHttpOptionsWithClient(options)) return options.client
 

src/lib/seam/connect/options.ts

@@ -1,24 +1,17 @@
-import type { Axios, AxiosRequestConfig } from 'axios'
-import type { AxiosRetry } from 'axios-retry'
+import type { Client, ClientOptions } from './client.js'
 
 export type SeamHttpOptions =
   | SeamHttpOptionsFromEnv
   | SeamHttpOptionsWithClient
   | SeamHttpOptionsWithApiKey
   | SeamHttpOptionsWithClientSessionToken
 
-interface SeamHttpCommonOptions {
-  endpoint?: string
-  axiosOptions?: AxiosRequestConfig
-  axiosRetryOptions?: AxiosRetryConfig
-}
-
-type AxiosRetryConfig = Parameters<AxiosRetry>[1]
+type SeamHttpCommonOptions = ClientOptions
 
 export type SeamHttpOptionsFromEnv = SeamHttpCommonOptions
 
 export interface SeamHttpOptionsWithClient {
-  client: Axios
+  client: Client
 }
 
 export const isSeamHttpOptionsWithClient = (
@@ -27,7 +20,7 @@ export const isSeamHttpOptionsWithClient = (
   if (!('client' in options)) return false
   if (options.client == null) return false
 
-  const keys = Object.keys(options)
+  const keys = Object.keys(options).filter((k) => k !== 'client')
   if (keys.length > 0) {
     throw new SeamHttpInvalidOptionsError(
       `The client option cannot be used with any other option, but received: ${keys.join(

src/lib/seam/connect/routes/access-codes-unmanaged.ts

@@ -4,10 +4,9 @@
  */
 
 import type { RouteRequestBody, RouteResponse } from '@seamapi/types/connect'
-import type { Axios } from 'axios'
 import type { SetNonNullable } from 'type-fest'
 
-import { createClient } from 'lib/seam/connect/client.js'
+import { type Client, createClient } from 'lib/seam/connect/client.js'
 import {
   isSeamHttpOptionsWithApiKey,
   isSeamHttpOptionsWithClient,
@@ -21,7 +20,7 @@ import {
 import { parseOptions } from 'lib/seam/connect/parse-options.js'
 
 export class SeamHttpAccessCodesUnmanaged {
-  client: Axios
+  client: Client
 
   constructor(apiKeyOrOptions: string | SeamHttpOptions = {}) {
     const options = parseOptions(apiKeyOrOptions)

src/lib/seam/connect/routes/access-codes.ts

@@ -4,10 +4,9 @@
  */
 
 import type { RouteRequestBody, RouteResponse } from '@seamapi/types/connect'
-import type { Axios } from 'axios'
 import type { SetNonNullable } from 'type-fest'
 
-import { createClient } from 'lib/seam/connect/client.js'
+import { type Client, createClient } from 'lib/seam/connect/client.js'
 import {
   isSeamHttpOptionsWithApiKey,
   isSeamHttpOptionsWithClient,
@@ -23,7 +22,7 @@ import { parseOptions } from 'lib/seam/connect/parse-options.js'
 import { SeamHttpAccessCodesUnmanaged } from './access-codes-unmanaged.js'
 
 export class SeamHttpAccessCodes {
-  client: Axios
+  client: Client
 
   constructor(apiKeyOrOptions: string | SeamHttpOptions = {}) {
     const options = parseOptions(apiKeyOrOptions)

src/lib/seam/connect/routes/acs-access-groups.ts

@@ -4,10 +4,9 @@
  */
 
 import type { RouteRequestBody, RouteResponse } from '@seamapi/types/connect'
-import type { Axios } from 'axios'
 import type { SetNonNullable } from 'type-fest'
 
-import { createClient } from 'lib/seam/connect/client.js'
+import { type Client, createClient } from 'lib/seam/connect/client.js'
 import {
   isSeamHttpOptionsWithApiKey,
   isSeamHttpOptionsWithClient,
@@ -21,7 +20,7 @@ import {
 import { parseOptions } from 'lib/seam/connect/parse-options.js'
 
 export class SeamHttpAcsAccessGroups {
-  client: Axios
+  client: Client
 
   constructor(apiKeyOrOptions: string | SeamHttpOptions = {}) {
     const options = parseOptions(apiKeyOrOptions)

src/lib/seam/connect/routes/acs-credentials.ts

@@ -4,10 +4,9 @@
  */
 
 import type { RouteRequestBody, RouteResponse } from '@seamapi/types/connect'
-import type { Axios } from 'axios'
 import type { SetNonNullable } from 'type-fest'
 
-import { createClient } from 'lib/seam/connect/client.js'
+import { type Client, createClient } from 'lib/seam/connect/client.js'
 import {
   isSeamHttpOptionsWithApiKey,
   isSeamHttpOptionsWithClient,
@@ -21,7 +20,7 @@ import {
 import { parseOptions } from 'lib/seam/connect/parse-options.js'
 
 export class SeamHttpAcsCredentials {
-  client: Axios
+  client: Client
 
   constructor(apiKeyOrOptions: string | SeamHttpOptions = {}) {
     const options = parseOptions(apiKeyOrOptions)

src/lib/seam/connect/routes/acs-systems.ts

@@ -4,10 +4,9 @@
  */
 
 import type { RouteRequestBody, RouteResponse } from '@seamapi/types/connect'
-import type { Axios } from 'axios'
 import type { SetNonNullable } from 'type-fest'
 
-import { createClient } from 'lib/seam/connect/client.js'
+import { type Client, createClient } from 'lib/seam/connect/client.js'
 import {
   isSeamHttpOptionsWithApiKey,
   isSeamHttpOptionsWithClient,
@@ -21,7 +20,7 @@ import {
 import { parseOptions } from 'lib/seam/connect/parse-options.js'
 
 export class SeamHttpAcsSystems {
-  client: Axios
+  client: Client
 
   constructor(apiKeyOrOptions: string | SeamHttpOptions = {}) {
     const options = parseOptions(apiKeyOrOptions)

src/lib/seam/connect/routes/acs-users.ts

@@ -4,10 +4,9 @@
  */
 
 import type { RouteRequestBody, RouteResponse } from '@seamapi/types/connect'
-import type { Axios } from 'axios'
 import type { SetNonNullable } from 'type-fest'
 
-import { createClient } from 'lib/seam/connect/client.js'
+import { type Client, createClient } from 'lib/seam/connect/client.js'
 import {
   isSeamHttpOptionsWithApiKey,
   isSeamHttpOptionsWithClient,
@@ -21,7 +20,7 @@ import {
 import { parseOptions } from 'lib/seam/connect/parse-options.js'
 
 export class SeamHttpAcsUsers {
-  client: Axios
+  client: Client
 
   constructor(apiKeyOrOptions: string | SeamHttpOptions = {}) {
     const options = parseOptions(apiKeyOrOptions)

src/lib/seam/connect/routes/acs.ts

@@ -3,9 +3,7 @@
  * Do not edit this file or add other files to this directory.
  */
 
-import type { Axios } from 'axios'
-
-import { createClient } from 'lib/seam/connect/client.js'
+import { type Client, createClient } from 'lib/seam/connect/client.js'
 import {
   isSeamHttpOptionsWithApiKey,
   isSeamHttpOptionsWithClient,
@@ -24,7 +22,7 @@ import { SeamHttpAcsSystems } from './acs-systems.js'
 import { SeamHttpAcsUsers } from './acs-users.js'
 
 export class SeamHttpAcs {
-  client: Axios
+  client: Client
 
   constructor(apiKeyOrOptions: string | SeamHttpOptions = {}) {
     const options = parseOptions(apiKeyOrOptions)