diff --git a/api.md b/api.md index e0179b3005..d039fb44aa 100644 --- a/api.md +++ b/api.md @@ -2569,7 +2569,7 @@ Methods: - client.queues.create({ ...params }) -> QueueCreateResponse | null - client.queues.update(queueId, { ...params }) -> QueueUpdateResponse | null -- client.queues.list({ ...params }) -> QueueListResponsesSinglePage +- client.queues.list({ ...params }) -> QueueListResponse | null - client.queues.delete(queueId, { ...params }) -> QueueDeleteResponse | null - client.queues.get(queueId, { ...params }) -> QueueGetResponse | null diff --git a/src/index.ts b/src/index.ts index afa9131135..99156c6d92 100644 --- a/src/index.ts +++ b/src/index.ts @@ -646,7 +646,6 @@ export namespace Cloudflare { export import QueueListResponse = API.QueueListResponse; export import QueueDeleteResponse = API.QueueDeleteResponse; export import QueueGetResponse = API.QueueGetResponse; - export import QueueListResponsesSinglePage = API.QueueListResponsesSinglePage; export import QueueCreateParams = API.QueueCreateParams; export import QueueUpdateParams = API.QueueUpdateParams; export import QueueListParams = API.QueueListParams; diff --git a/src/resources/index.ts b/src/resources/index.ts index 6c784de717..c3a3bd0b61 100644 --- a/src/resources/index.ts +++ b/src/resources/index.ts @@ -278,7 +278,6 @@ export { QueueListParams, QueueDeleteParams, QueueGetParams, - QueueListResponsesSinglePage, Queues, } from './queues/queues'; export { R2 } from './r2/r2'; diff --git a/src/resources/queues/index.ts b/src/resources/queues/index.ts index bedf2a940e..959ab39f00 100644 --- a/src/resources/queues/index.ts +++ b/src/resources/queues/index.ts @@ -25,7 +25,6 @@ export { QueueListParams, QueueDeleteParams, QueueGetParams, - QueueListResponsesSinglePage, Queues, } from './queues'; export { diff --git a/src/resources/queues/queues.ts b/src/resources/queues/queues.ts index eef626975c..767661cff0 100644 --- a/src/resources/queues/queues.ts +++ b/src/resources/queues/queues.ts @@ -5,7 +5,6 @@ import { APIResource } from 'cloudflare/resource'; import * as QueuesAPI from 'cloudflare/resources/queues/queues'; import * as ConsumersAPI from 'cloudflare/resources/queues/consumers'; import * as MessagesAPI from 'cloudflare/resources/queues/messages'; -import { SinglePage } from 'cloudflare/pagination'; export class Queues extends APIResource { consumers: ConsumersAPI.Consumers = new ConsumersAPI.Consumers(this._client); @@ -46,12 +45,13 @@ export class Queues extends APIResource { /** * Returns the queues owned by an account. */ - list( - params: QueueListParams, - options?: Core.RequestOptions, - ): Core.PagePromise { + list(params: QueueListParams, options?: Core.RequestOptions): Core.APIPromise { const { account_id } = params; - return this._client.getAPIList(`/accounts/${account_id}/queues`, QueueListResponsesSinglePage, options); + return ( + this._client.get(`/accounts/${account_id}/queues`, options) as Core.APIPromise<{ + result: QueueListResponse | null; + }> + )._thenUnwrap((obj) => obj.result); } /** @@ -87,8 +87,6 @@ export class Queues extends APIResource { } } -export class QueueListResponsesSinglePage extends SinglePage {} - export interface Queue { consumers?: unknown; @@ -147,22 +145,26 @@ export interface QueueUpdateResponse { queue_name?: string; } -export interface QueueListResponse { - consumers?: unknown; +export type QueueListResponse = Array; - consumers_total_count?: unknown; +export namespace QueueListResponse { + export interface QueueListResponseItem { + consumers?: unknown; - created_on?: unknown; + consumers_total_count?: unknown; - modified_on?: unknown; + created_on?: unknown; - producers?: unknown; + modified_on?: unknown; - producers_total_count?: unknown; + producers?: unknown; - queue_id?: string; + producers_total_count?: unknown; - queue_name?: string; + queue_id?: string; + + queue_name?: string; + } } export type QueueDeleteResponse = unknown | Array | string; @@ -239,7 +241,6 @@ export namespace Queues { export import QueueListResponse = QueuesAPI.QueueListResponse; export import QueueDeleteResponse = QueuesAPI.QueueDeleteResponse; export import QueueGetResponse = QueuesAPI.QueueGetResponse; - export import QueueListResponsesSinglePage = QueuesAPI.QueueListResponsesSinglePage; export import QueueCreateParams = QueuesAPI.QueueCreateParams; export import QueueUpdateParams = QueuesAPI.QueueUpdateParams; export import QueueListParams = QueuesAPI.QueueListParams;