orb-billing 5.76.0 → 6.0.0

package/src/resources/invoices.ts

@@ -1,11 +1,13 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-import { APIResource } from '../resource';
-import { isRequestOptions } from '../core';
-import * as Core from '../core';
+import { APIResource } from '../core/resource';
 import * as Shared from './shared';
 import { InvoicesPage } from './shared';
-import { Page, type PageParams } from '../pagination';
+import { APIPromise } from '../core/api-promise';
+import { Page, type PageParams, PagePromise } from '../core/pagination';
+import { buildHeaders } from '../internal/headers';
+import { RequestOptions } from '../internal/request-options';
+import { path } from '../internal/utils/path';
 
 /**
  * An [`Invoice`](/core-concepts#invoice) is a fundamental billing entity, representing the request for payment for
@@ -36,7 +38,7 @@ export class Invoices extends APIResource {
    * });
    * ```
    */
-  create(body: InvoiceCreateParams, options?: Core.RequestOptions): Core.APIPromise<Shared.Invoice> {
+  create(body: InvoiceCreateParams, options?: RequestOptions): APIPromise<Shared.Invoice> {
     return this._client.post('/invoices', { body, ...options });
   }
 
@@ -55,12 +57,8 @@ export class Invoices extends APIResource {
    * const invoice = await client.invoices.update('invoice_id');
    * ```
    */
-  update(
-    invoiceId: string,
-    body: InvoiceUpdateParams,
-    options?: Core.RequestOptions,
-  ): Core.APIPromise<Shared.Invoice> {
-    return this._client.put(`/invoices/${invoiceId}`, { body, ...options });
+  update(invoiceId: string, body: InvoiceUpdateParams, options?: RequestOptions): APIPromise<Shared.Invoice> {
+    return this._client.put(path`/invoices/${invoiceId}`, { body, ...options });
   }
 
   /**
@@ -91,18 +89,10 @@ export class Invoices extends APIResource {
    * ```
    */
   list(
-    query?: InvoiceListParams,
-    options?: Core.RequestOptions,
-  ): Core.PagePromise<InvoicesPage, Shared.Invoice>;
-  list(options?: Core.RequestOptions): Core.PagePromise<InvoicesPage, Shared.Invoice>;
-  list(
-    query: InvoiceListParams | Core.RequestOptions = {},
-    options?: Core.RequestOptions,
-  ): Core.PagePromise<InvoicesPage, Shared.Invoice> {
-    if (isRequestOptions(query)) {
-      return this.list({}, query);
-    }
-    return this._client.getAPIList('/invoices', InvoicesPage, { query, ...options });
+    query: InvoiceListParams | null | undefined = {},
+    options?: RequestOptions,
+  ): PagePromise<InvoicesPage, Shared.Invoice> {
+    return this._client.getAPIList('/invoices', Page<Shared.Invoice>, { query, ...options });
   }
 
   /**
@@ -114,20 +104,20 @@ export class Invoices extends APIResource {
    *
    * @example
    * ```ts
-   * await client.invoices.deleteLineItem(
-   *   'invoice_id',
-   *   'line_item_id',
-   * );
+   * await client.invoices.deleteLineItem('line_item_id', {
+   *   invoice_id: 'invoice_id',
+   * });
    * ```
    */
   deleteLineItem(
-    invoiceId: string,
     lineItemId: string,
-    options?: Core.RequestOptions,
-  ): Core.APIPromise<void> {
-    return this._client.delete(`/invoices/${invoiceId}/invoice_line_items/${lineItemId}`, {
+    params: InvoiceDeleteLineItemParams,
+    options?: RequestOptions,
+  ): APIPromise<void> {
+    const { invoice_id: invoiceId } = params;
+    return this._client.delete(path`/invoices/${invoiceId}/invoice_line_items/${lineItemId}`, {
       ...options,
-      headers: { Accept: '*/*', ...options?.headers },
+      headers: buildHeaders([{ Accept: '*/*' }, options?.headers]),
     });
   }
 
@@ -140,8 +130,8 @@ export class Invoices extends APIResource {
    * const invoice = await client.invoices.fetch('invoice_id');
    * ```
    */
-  fetch(invoiceId: string, options?: Core.RequestOptions): Core.APIPromise<Shared.Invoice> {
-    return this._client.get(`/invoices/${invoiceId}`, options);
+  fetch(invoiceId: string, options?: RequestOptions): APIPromise<Shared.Invoice> {
+    return this._client.get(path`/invoices/${invoiceId}`, options);
   }
 
   /**
@@ -158,8 +148,8 @@ export class Invoices extends APIResource {
    */
   fetchUpcoming(
     query: InvoiceFetchUpcomingParams,
-    options?: Core.RequestOptions,
-  ): Core.APIPromise<InvoiceFetchUpcomingResponse> {
+    options?: RequestOptions,
+  ): APIPromise<InvoiceFetchUpcomingResponse> {
     return this._client.get('/invoices/upcoming', { query, ...options });
   }
 
@@ -178,19 +168,10 @@ export class Invoices extends APIResource {
    */
   issue(
     invoiceId: string,
-    body?: InvoiceIssueParams,
-    options?: Core.RequestOptions,
-  ): Core.APIPromise<Shared.Invoice>;
-  issue(invoiceId: string, options?: Core.RequestOptions): Core.APIPromise<Shared.Invoice>;
-  issue(
-    invoiceId: string,
-    body: InvoiceIssueParams | Core.RequestOptions = {},
-    options?: Core.RequestOptions,
-  ): Core.APIPromise<Shared.Invoice> {
-    if (isRequestOptions(body)) {
-      return this.issue(invoiceId, {}, body);
-    }
-    return this._client.post(`/invoices/${invoiceId}/issue`, { body, ...options });
+    body: InvoiceIssueParams | null | undefined = {},
+    options?: RequestOptions,
+  ): APIPromise<Shared.Invoice> {
+    return this._client.post(path`/invoices/${invoiceId}/issue`, { body, ...options });
   }
 
   /**
@@ -213,22 +194,10 @@ export class Invoices extends APIResource {
    */
   issueSummary(
     invoiceId: string,
-    body?: InvoiceIssueSummaryParams,
-    options?: Core.RequestOptions,
-  ): Core.APIPromise<InvoiceIssueSummaryResponse>;
-  issueSummary(
-    invoiceId: string,
-    options?: Core.RequestOptions,
-  ): Core.APIPromise<InvoiceIssueSummaryResponse>;
-  issueSummary(
-    invoiceId: string,
-    body: InvoiceIssueSummaryParams | Core.RequestOptions = {},
-    options?: Core.RequestOptions,
-  ): Core.APIPromise<InvoiceIssueSummaryResponse> {
-    if (isRequestOptions(body)) {
-      return this.issueSummary(invoiceId, {}, body);
-    }
-    return this._client.post(`/invoices/summary/${invoiceId}/issue`, { body, ...options });
+    body: InvoiceIssueSummaryParams | null | undefined = {},
+    options?: RequestOptions,
+  ): APIPromise<InvoiceIssueSummaryResponse> {
+    return this._client.post(path`/invoices/summary/${invoiceId}/issue`, { body, ...options });
   }
 
   /**
@@ -258,20 +227,10 @@ export class Invoices extends APIResource {
    * ```
    */
   listSummary(
-    query?: InvoiceListSummaryParams,
-    options?: Core.RequestOptions,
-  ): Core.PagePromise<InvoiceListSummaryResponsesPage, InvoiceListSummaryResponse>;
-  listSummary(
-    options?: Core.RequestOptions,
-  ): Core.PagePromise<InvoiceListSummaryResponsesPage, InvoiceListSummaryResponse>;
-  listSummary(
-    query: InvoiceListSummaryParams | Core.RequestOptions = {},
-    options?: Core.RequestOptions,
-  ): Core.PagePromise<InvoiceListSummaryResponsesPage, InvoiceListSummaryResponse> {
-    if (isRequestOptions(query)) {
-      return this.listSummary({}, query);
-    }
-    return this._client.getAPIList('/invoices/summary', InvoiceListSummaryResponsesPage, {
+    query: InvoiceListSummaryParams | null | undefined = {},
+    options?: RequestOptions,
+  ): PagePromise<InvoiceListSummaryResponsesPage, InvoiceListSummaryResponse> {
+    return this._client.getAPIList('/invoices/summary', Page<InvoiceListSummaryResponse>, {
       query,
       ...options,
     });
@@ -292,9 +251,9 @@ export class Invoices extends APIResource {
   markPaid(
     invoiceId: string,
     body: InvoiceMarkPaidParams,
-    options?: Core.RequestOptions,
-  ): Core.APIPromise<Shared.Invoice> {
-    return this._client.post(`/invoices/${invoiceId}/mark_paid`, { body, ...options });
+    options?: RequestOptions,
+  ): APIPromise<Shared.Invoice> {
+    return this._client.post(path`/invoices/${invoiceId}/mark_paid`, { body, ...options });
   }
 
   /**
@@ -310,12 +269,8 @@ export class Invoices extends APIResource {
    * });
    * ```
    */
-  pay(
-    invoiceId: string,
-    body: InvoicePayParams,
-    options?: Core.RequestOptions,
-  ): Core.APIPromise<Shared.Invoice> {
-    return this._client.post(`/invoices/${invoiceId}/pay`, { body, ...options });
+  pay(invoiceId: string, body: InvoicePayParams, options?: RequestOptions): APIPromise<Shared.Invoice> {
+    return this._client.post(path`/invoices/${invoiceId}/pay`, { body, ...options });
   }
 
   /**
@@ -336,12 +291,12 @@ export class Invoices extends APIResource {
    * const invoice = await client.invoices.void('invoice_id');
    * ```
    */
-  void(invoiceId: string, options?: Core.RequestOptions): Core.APIPromise<Shared.Invoice> {
-    return this._client.post(`/invoices/${invoiceId}/void`, options);
+  void(invoiceId: string, options?: RequestOptions): APIPromise<Shared.Invoice> {
+    return this._client.post(path`/invoices/${invoiceId}/void`, options);
   }
 }
 
-export class InvoiceListSummaryResponsesPage extends Page<InvoiceListSummaryResponse> {}
+export type InvoiceListSummaryResponsesPage = Page<InvoiceListSummaryResponse>;
 
 export interface InvoiceFetchUpcomingResponse {
   id: string;
@@ -2127,6 +2082,10 @@ export interface InvoiceListParams extends PageParams {
   subscription_id?: string | null;
 }
 
+export interface InvoiceDeleteLineItemParams {
+  invoice_id: string;
+}
+
 export interface InvoiceFetchUpcomingParams {
   subscription_id: string;
 }
@@ -2219,17 +2178,16 @@ export interface InvoicePayParams {
   shared_payment_token_id: string;
 }
 
-Invoices.InvoiceListSummaryResponsesPage = InvoiceListSummaryResponsesPage;
-
 export declare namespace Invoices {
   export {
     type InvoiceFetchUpcomingResponse as InvoiceFetchUpcomingResponse,
     type InvoiceIssueSummaryResponse as InvoiceIssueSummaryResponse,
     type InvoiceListSummaryResponse as InvoiceListSummaryResponse,
-    InvoiceListSummaryResponsesPage as InvoiceListSummaryResponsesPage,
+    type InvoiceListSummaryResponsesPage as InvoiceListSummaryResponsesPage,
     type InvoiceCreateParams as InvoiceCreateParams,
     type InvoiceUpdateParams as InvoiceUpdateParams,
     type InvoiceListParams as InvoiceListParams,
+    type InvoiceDeleteLineItemParams as InvoiceDeleteLineItemParams,
     type InvoiceFetchUpcomingParams as InvoiceFetchUpcomingParams,
     type InvoiceIssueParams as InvoiceIssueParams,
     type InvoiceIssueSummaryParams as InvoiceIssueSummaryParams,
@@ -2239,4 +2197,4 @@ export declare namespace Invoices {
   };
 }
 
-export { InvoicesPage };
+export { type InvoicesPage };

package/src/resources/items.ts

@@ -1,9 +1,10 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-import { APIResource } from '../resource';
-import { isRequestOptions } from '../core';
-import * as Core from '../core';
-import { Page, type PageParams } from '../pagination';
+import { APIResource } from '../core/resource';
+import { APIPromise } from '../core/api-promise';
+import { Page, type PageParams, PagePromise } from '../core/pagination';
+import { RequestOptions } from '../internal/request-options';
+import { path } from '../internal/utils/path';
 
 /**
  * The Item resource represents a sellable product or good. Items are associated with all line items, billable metrics,
@@ -20,7 +21,7 @@ export class Items extends APIResource {
    * });
    * ```
    */
-  create(body: ItemCreateParams, options?: Core.RequestOptions): Core.APIPromise<Item> {
+  create(body: ItemCreateParams, options?: RequestOptions): APIPromise<Item> {
     return this._client.post('/items', { body, ...options });
   }
 
@@ -32,8 +33,8 @@ export class Items extends APIResource {
    * const item = await client.items.update('item_id');
    * ```
    */
-  update(itemId: string, body: ItemUpdateParams, options?: Core.RequestOptions): Core.APIPromise<Item> {
-    return this._client.put(`/items/${itemId}`, { body, ...options });
+  update(itemId: string, body: ItemUpdateParams, options?: RequestOptions): APIPromise<Item> {
+    return this._client.put(path`/items/${itemId}`, { body, ...options });
   }
 
   /**
@@ -48,16 +49,11 @@ export class Items extends APIResource {
    * }
    * ```
    */
-  list(query?: ItemListParams, options?: Core.RequestOptions): Core.PagePromise<ItemsPage, Item>;
-  list(options?: Core.RequestOptions): Core.PagePromise<ItemsPage, Item>;
   list(
-    query: ItemListParams | Core.RequestOptions = {},
-    options?: Core.RequestOptions,
-  ): Core.PagePromise<ItemsPage, Item> {
-    if (isRequestOptions(query)) {
-      return this.list({}, query);
-    }
-    return this._client.getAPIList('/items', ItemsPage, { query, ...options });
+    query: ItemListParams | null | undefined = {},
+    options?: RequestOptions,
+  ): PagePromise<ItemsPage, Item> {
+    return this._client.getAPIList('/items', Page<Item>, { query, ...options });
   }
 
   /**
@@ -68,8 +64,8 @@ export class Items extends APIResource {
    * const item = await client.items.archive('item_id');
    * ```
    */
-  archive(itemId: string, options?: Core.RequestOptions): Core.APIPromise<Item> {
-    return this._client.post(`/items/${itemId}/archive`, options);
+  archive(itemId: string, options?: RequestOptions): APIPromise<Item> {
+    return this._client.post(path`/items/${itemId}/archive`, options);
   }
 
   /**
@@ -80,12 +76,12 @@ export class Items extends APIResource {
    * const item = await client.items.fetch('item_id');
    * ```
    */
-  fetch(itemId: string, options?: Core.RequestOptions): Core.APIPromise<Item> {
-    return this._client.get(`/items/${itemId}`, options);
+  fetch(itemId: string, options?: RequestOptions): APIPromise<Item> {
+    return this._client.get(path`/items/${itemId}`, options);
   }
 }
 
-export class ItemsPage extends Page<Item> {}
+export type ItemsPage = Page<Item>;
 
 /**
  * The Item resource represents a sellable product or good. Items are associated
@@ -211,12 +207,10 @@ export namespace ItemUpdateParams {
 
 export interface ItemListParams extends PageParams {}
 
-Items.ItemsPage = ItemsPage;
-
 export declare namespace Items {
   export {
     type Item as Item,
-    ItemsPage as ItemsPage,
+    type ItemsPage as ItemsPage,
     type ItemCreateParams as ItemCreateParams,
     type ItemUpdateParams as ItemUpdateParams,
     type ItemListParams as ItemListParams,

package/src/resources/license-types.ts

@@ -1,9 +1,10 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-import { APIResource } from '../resource';
-import { isRequestOptions } from '../core';
-import * as Core from '../core';
-import { Page, type PageParams } from '../pagination';
+import { APIResource } from '../core/resource';
+import { APIPromise } from '../core/api-promise';
+import { Page, type PageParams, PagePromise } from '../core/pagination';
+import { RequestOptions } from '../internal/request-options';
+import { path } from '../internal/utils/path';
 
 /**
  * The LicenseType resource represents a type of license that can be assigned to users.
@@ -17,10 +18,7 @@ export class LicenseTypes extends APIResource {
    * license type has a name and a grouping key that determines how metrics are
    * aggregated for billing purposes.
    */
-  create(
-    body: LicenseTypeCreateParams,
-    options?: Core.RequestOptions,
-  ): Core.APIPromise<LicenseTypeCreateResponse> {
+  create(body: LicenseTypeCreateParams, options?: RequestOptions): APIPromise<LicenseTypeCreateResponse> {
     return this._client.post('/license_types', { body, ...options });
   }
 
@@ -30,11 +28,8 @@ export class LicenseTypes extends APIResource {
    * Use this endpoint to retrieve details about a specific license type, including
    * its name and grouping key.
    */
-  retrieve(
-    licenseTypeId: string,
-    options?: Core.RequestOptions,
-  ): Core.APIPromise<LicenseTypeRetrieveResponse> {
-    return this._client.get(`/license_types/${licenseTypeId}`, options);
+  retrieve(licenseTypeId: string, options?: RequestOptions): APIPromise<LicenseTypeRetrieveResponse> {
+    return this._client.get(path`/license_types/${licenseTypeId}`, options);
   }
 
   /**
@@ -46,24 +41,14 @@ export class LicenseTypes extends APIResource {
    * aggregated for billing purposes.
    */
   list(
-    query?: LicenseTypeListParams,
-    options?: Core.RequestOptions,
-  ): Core.PagePromise<LicenseTypeListResponsesPage, LicenseTypeListResponse>;
-  list(
-    options?: Core.RequestOptions,
-  ): Core.PagePromise<LicenseTypeListResponsesPage, LicenseTypeListResponse>;
-  list(
-    query: LicenseTypeListParams | Core.RequestOptions = {},
-    options?: Core.RequestOptions,
-  ): Core.PagePromise<LicenseTypeListResponsesPage, LicenseTypeListResponse> {
-    if (isRequestOptions(query)) {
-      return this.list({}, query);
-    }
-    return this._client.getAPIList('/license_types', LicenseTypeListResponsesPage, { query, ...options });
+    query: LicenseTypeListParams | null | undefined = {},
+    options?: RequestOptions,
+  ): PagePromise<LicenseTypeListResponsesPage, LicenseTypeListResponse> {
+    return this._client.getAPIList('/license_types', Page<LicenseTypeListResponse>, { query, ...options });
   }
 }
 
-export class LicenseTypeListResponsesPage extends Page<LicenseTypeListResponse> {}
+export type LicenseTypeListResponsesPage = Page<LicenseTypeListResponse>;
 
 /**
  * The LicenseType resource represents a type of license that can be assigned to
@@ -149,14 +134,12 @@ export interface LicenseTypeCreateParams {
 
 export interface LicenseTypeListParams extends PageParams {}
 
-LicenseTypes.LicenseTypeListResponsesPage = LicenseTypeListResponsesPage;
-
 export declare namespace LicenseTypes {
   export {
     type LicenseTypeCreateResponse as LicenseTypeCreateResponse,
     type LicenseTypeRetrieveResponse as LicenseTypeRetrieveResponse,
     type LicenseTypeListResponse as LicenseTypeListResponse,
-    LicenseTypeListResponsesPage as LicenseTypeListResponsesPage,
+    type LicenseTypeListResponsesPage as LicenseTypeListResponsesPage,
     type LicenseTypeCreateParams as LicenseTypeCreateParams,
     type LicenseTypeListParams as LicenseTypeListParams,
   };

package/src/resources/licenses/external-licenses.ts

@@ -1,8 +1,10 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-import { APIResource } from '../../resource';
-import * as Core from '../../core';
+import { APIResource } from '../../core/resource';
 import * as Shared from '../shared';
+import { APIPromise } from '../../core/api-promise';
+import { RequestOptions } from '../../internal/request-options';
+import { path } from '../../internal/utils/path';
 
 export class ExternalLicenses extends APIResource {
   /**
@@ -26,9 +28,12 @@ export class ExternalLicenses extends APIResource {
   getUsage(
     externalLicenseId: string,
     query: ExternalLicenseGetUsageParams,
-    options?: Core.RequestOptions,
-  ): Core.APIPromise<ExternalLicenseGetUsageResponse> {
-    return this._client.get(`/licenses/external_licenses/${externalLicenseId}/usage`, { query, ...options });
+    options?: RequestOptions,
+  ): APIPromise<ExternalLicenseGetUsageResponse> {
+    return this._client.get(path`/licenses/external_licenses/${externalLicenseId}/usage`, {
+      query,
+      ...options,
+    });
   }
 }
 

package/src/resources/licenses/index.ts

@@ -6,7 +6,6 @@ export {
   type ExternalLicenseGetUsageParams,
 } from './external-licenses';
 export {
-  LicenseListResponsesPage,
   Licenses,
   type LicenseCreateResponse,
   type LicenseRetrieveResponse,
@@ -17,6 +16,7 @@ export {
   type LicenseListParams,
   type LicenseDeactivateParams,
   type LicenseRetrieveByExternalIDParams,
+  type LicenseListResponsesPage,
 } from './licenses';
 export {
   Usage,

package/src/resources/licenses/licenses.ts

@@ -1,7 +1,6 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-import { APIResource } from '../../resource';
-import * as Core from '../../core';
+import { APIResource } from '../../core/resource';
 import * as ExternalLicensesAPI from './external-licenses';
 import {
   ExternalLicenseGetUsageParams,
@@ -16,7 +15,10 @@ import {
   UsageGetUsageParams,
   UsageGetUsageResponse,
 } from './usage';
-import { Page, type PageParams } from '../../pagination';
+import { APIPromise } from '../../core/api-promise';
+import { Page, type PageParams, PagePromise } from '../../core/pagination';
+import { RequestOptions } from '../../internal/request-options';
+import { path } from '../../internal/utils/path';
 
 export class Licenses extends APIResource {
   externalLicenses: ExternalLicensesAPI.ExternalLicenses = new ExternalLicensesAPI.ExternalLicenses(
@@ -40,7 +42,7 @@ export class Licenses extends APIResource {
    * });
    * ```
    */
-  create(body: LicenseCreateParams, options?: Core.RequestOptions): Core.APIPromise<LicenseCreateResponse> {
+  create(body: LicenseCreateParams, options?: RequestOptions): APIPromise<LicenseCreateResponse> {
     return this._client.post('/licenses', { body, ...options });
   }
 
@@ -54,8 +56,8 @@ export class Licenses extends APIResource {
    * );
    * ```
    */
-  retrieve(licenseId: string, options?: Core.RequestOptions): Core.APIPromise<LicenseRetrieveResponse> {
-    return this._client.get(`/licenses/${licenseId}`, options);
+  retrieve(licenseId: string, options?: RequestOptions): APIPromise<LicenseRetrieveResponse> {
+    return this._client.get(path`/licenses/${licenseId}`, options);
   }
 
   /**
@@ -73,9 +75,9 @@ export class Licenses extends APIResource {
    */
   list(
     query: LicenseListParams,
-    options?: Core.RequestOptions,
-  ): Core.PagePromise<LicenseListResponsesPage, LicenseListResponse> {
-    return this._client.getAPIList('/licenses', LicenseListResponsesPage, { query, ...options });
+    options?: RequestOptions,
+  ): PagePromise<LicenseListResponsesPage, LicenseListResponse> {
+    return this._client.getAPIList('/licenses', Page<LicenseListResponse>, { query, ...options });
   }
 
   /**
@@ -95,9 +97,9 @@ export class Licenses extends APIResource {
   deactivate(
     licenseId: string,
     body: LicenseDeactivateParams,
-    options?: Core.RequestOptions,
-  ): Core.APIPromise<LicenseDeactivateResponse> {
-    return this._client.post(`/licenses/${licenseId}/deactivate`, { body, ...options });
+    options?: RequestOptions,
+  ): APIPromise<LicenseDeactivateResponse> {
+    return this._client.post(path`/licenses/${licenseId}/deactivate`, { body, ...options });
   }
 
   /**
@@ -105,7 +107,7 @@ export class Licenses extends APIResource {
    *
    * @example
    * ```ts
-   * const response = await client.licenses.retrieveByExternalId(
+   * const response = await client.licenses.retrieveByExternalID(
    *   'external_license_id',
    *   {
    *     license_type_id: 'license_type_id',
@@ -114,16 +116,16 @@ export class Licenses extends APIResource {
    * );
    * ```
    */
-  retrieveByExternalId(
+  retrieveByExternalID(
     externalLicenseId: string,
     query: LicenseRetrieveByExternalIDParams,
-    options?: Core.RequestOptions,
-  ): Core.APIPromise<LicenseRetrieveByExternalIDResponse> {
-    return this._client.get(`/licenses/external_license_id/${externalLicenseId}`, { query, ...options });
+    options?: RequestOptions,
+  ): APIPromise<LicenseRetrieveByExternalIDResponse> {
+    return this._client.get(path`/licenses/external_license_id/${externalLicenseId}`, { query, ...options });
   }
 }
 
-export class LicenseListResponsesPage extends Page<LicenseListResponse> {}
+export type LicenseListResponsesPage = Page<LicenseListResponse>;
 
 export interface LicenseCreateResponse {
   id: string;
@@ -258,7 +260,6 @@ export interface LicenseRetrieveByExternalIDParams {
   subscription_id: string;
 }
 
-Licenses.LicenseListResponsesPage = LicenseListResponsesPage;
 Licenses.ExternalLicenses = ExternalLicenses;
 Licenses.Usage = Usage;
 
@@ -269,7 +270,7 @@ export declare namespace Licenses {
     type LicenseListResponse as LicenseListResponse,
     type LicenseDeactivateResponse as LicenseDeactivateResponse,
     type LicenseRetrieveByExternalIDResponse as LicenseRetrieveByExternalIDResponse,
-    LicenseListResponsesPage as LicenseListResponsesPage,
+    type LicenseListResponsesPage as LicenseListResponsesPage,
     type LicenseCreateParams as LicenseCreateParams,
     type LicenseListParams as LicenseListParams,
     type LicenseDeactivateParams as LicenseDeactivateParams,

package/src/resources/licenses/usage.ts

@@ -1,9 +1,10 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-import { APIResource } from '../../resource';
-import { isRequestOptions } from '../../core';
-import * as Core from '../../core';
+import { APIResource } from '../../core/resource';
 import * as Shared from '../shared';
+import { APIPromise } from '../../core/api-promise';
+import { RequestOptions } from '../../internal/request-options';
+import { path } from '../../internal/utils/path';
 
 export class Usage extends APIResource {
   /**
@@ -20,10 +21,7 @@ export class Usage extends APIResource {
    * });
    * ```
    */
-  getAllUsage(
-    query: UsageGetAllUsageParams,
-    options?: Core.RequestOptions,
-  ): Core.APIPromise<UsageGetAllUsageResponse> {
+  getAllUsage(query: UsageGetAllUsageParams, options?: RequestOptions): APIPromise<UsageGetAllUsageResponse> {
     return this._client.get('/licenses/usage', { query, ...options });
   }
 
@@ -41,19 +39,10 @@ export class Usage extends APIResource {
    */
   getUsage(
     licenseId: string,
-    query?: UsageGetUsageParams,
-    options?: Core.RequestOptions,
-  ): Core.APIPromise<UsageGetUsageResponse>;
-  getUsage(licenseId: string, options?: Core.RequestOptions): Core.APIPromise<UsageGetUsageResponse>;
-  getUsage(
-    licenseId: string,
-    query: UsageGetUsageParams | Core.RequestOptions = {},
-    options?: Core.RequestOptions,
-  ): Core.APIPromise<UsageGetUsageResponse> {
-    if (isRequestOptions(query)) {
-      return this.getUsage(licenseId, {}, query);
-    }
-    return this._client.get(`/licenses/${licenseId}/usage`, { query, ...options });
+    query: UsageGetUsageParams | null | undefined = {},
+    options?: RequestOptions,
+  ): APIPromise<UsageGetUsageResponse> {
+    return this._client.get(path`/licenses/${licenseId}/usage`, { query, ...options });
   }
 }