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