cloudflare 3.0.0-beta.9 → 3.1.0

package/src/index.ts

@@ -9,6 +9,11 @@ import * as Pagination from "./pagination";
 import * as API from "./resources/index";
 
 export interface ClientOptions {
+  /**
+   * Defaults to process.env['CLOUDFLARE_API_TOKEN'].
+   */
+  apiToken?: string | null | undefined;
+
   /**
    * Defaults to process.env['CLOUDFLARE_API_KEY'].
    */
@@ -19,11 +24,6 @@ export interface ClientOptions {
    */
   apiEmail?: string | null | undefined;
 
-  /**
-   * Defaults to process.env['CLOUDFLARE_API_TOKEN'].
-   */
-  apiToken?: string | null | undefined;
-
   /**
    * Defaults to process.env['CLOUDFLARE_API_USER_SERVICE_KEY'].
    */
@@ -88,9 +88,9 @@ export interface ClientOptions {
 
 /** API Client for interfacing with the Cloudflare API. */
 export class Cloudflare extends Core.APIClient {
+  apiToken: string | null;
   apiKey: string | null;
   apiEmail: string | null;
-  apiToken: string | null;
   userServiceKey: string | null;
 
   private _options: ClientOptions;
@@ -98,9 +98,9 @@ export class Cloudflare extends Core.APIClient {
   /**
    * API Client for interfacing with the Cloudflare API.
    *
+   * @param {string | null | undefined} [opts.apiToken=process.env['CLOUDFLARE_API_TOKEN'] ?? null]
    * @param {string | null | undefined} [opts.apiKey=process.env['CLOUDFLARE_API_KEY'] ?? null]
    * @param {string | null | undefined} [opts.apiEmail=process.env['CLOUDFLARE_EMAIL'] ?? null]
-   * @param {string | null | undefined} [opts.apiToken=process.env['CLOUDFLARE_API_TOKEN'] ?? null]
    * @param {string | null | undefined} [opts.userServiceKey=process.env['CLOUDFLARE_API_USER_SERVICE_KEY'] ?? null]
    * @param {string} [opts.baseURL=process.env['CLOUDFLARE_BASE_URL'] ?? https://api.cloudflare.com/client/v4] - Override the default base URL for the API.
    * @param {number} [opts.timeout=1 minute] - The maximum amount of time (in milliseconds) the client will wait for a response before timing out.
@@ -112,16 +112,16 @@ export class Cloudflare extends Core.APIClient {
    */
   constructor({
     baseURL = Core.readEnv('CLOUDFLARE_BASE_URL'),
+    apiToken = Core.readEnv('CLOUDFLARE_API_TOKEN') ?? null,
     apiKey = Core.readEnv('CLOUDFLARE_API_KEY') ?? null,
     apiEmail = Core.readEnv('CLOUDFLARE_EMAIL') ?? null,
-    apiToken = Core.readEnv('CLOUDFLARE_API_TOKEN') ?? null,
     userServiceKey = Core.readEnv('CLOUDFLARE_API_USER_SERVICE_KEY') ?? null,
     ...opts
   }: ClientOptions = {}) {
     const options: ClientOptions = {
+      apiToken,
       apiKey,
       apiEmail,
-      apiToken,
       userServiceKey,
       ...opts,
       baseURL: baseURL || `https://api.cloudflare.com/client/v4`,
@@ -136,9 +136,9 @@ export class Cloudflare extends Core.APIClient {
     });
     this._options = options;
 
+    this.apiToken = apiToken;
     this.apiKey = apiKey;
     this.apiEmail = apiEmail;
-    this.apiToken = apiToken;
     this.userServiceKey = userServiceKey;
   }
 
@@ -146,7 +146,7 @@ export class Cloudflare extends Core.APIClient {
   originCACertificates: API.OriginCACertificates = new API.OriginCACertificates(this);
   ips: API.IPs = new API.IPs(this);
   memberships: API.Memberships = new API.Memberships(this);
-  user: API.UserResource = new API.UserResource(this);
+  user: API.User = new API.User(this);
   zones: API.Zones = new API.Zones(this);
   loadBalancers: API.LoadBalancers = new API.LoadBalancers(this);
   cache: API.Cache = new API.Cache(this);
@@ -154,15 +154,15 @@ export class Cloudflare extends Core.APIClient {
   subscriptions: API.Subscriptions = new API.Subscriptions(this);
   acm: API.ACM = new API.ACM(this);
   argo: API.Argo = new API.Argo(this);
-  availablePlans: API.AvailablePlans = new API.AvailablePlans(this);
-  availableRatePlans: API.AvailableRatePlans = new API.AvailableRatePlans(this);
+  plans: API.Plans = new API.Plans(this);
+  ratePlans: API.RatePlans = new API.RatePlans(this);
   certificateAuthorities: API.CertificateAuthorities = new API.CertificateAuthorities(this);
   clientCertificates: API.ClientCertificates = new API.ClientCertificates(this);
   customCertificates: API.CustomCertificates = new API.CustomCertificates(this);
   customHostnames: API.CustomHostnames = new API.CustomHostnames(this);
   customNameservers: API.CustomNameservers = new API.CustomNameservers(this);
   dns: API.DNS = new API.DNS(this);
-  dnssec: API.DNSSEC = new API.DNSSEC(this);
+  dnssec: API.DNSSECResource = new API.DNSSECResource(this);
   emailRouting: API.EmailRouting = new API.EmailRouting(this);
   filters: API.Filters = new API.Filters(this);
   firewall: API.Firewall = new API.Firewall(this);
@@ -203,13 +203,13 @@ export class Cloudflare extends Core.APIClient {
   storage: API.Storage = new API.Storage(this);
   stream: API.Stream = new API.Stream(this);
   alerting: API.Alerting = new API.Alerting(this);
-  d1: API.D1 = new API.D1(this);
+  d1: API.D1Resource = new API.D1Resource(this);
   r2: API.R2 = new API.R2(this);
   warpConnector: API.WARPConnector = new API.WARPConnector(this);
   workersForPlatforms: API.WorkersForPlatforms = new API.WorkersForPlatforms(this);
   zeroTrust: API.ZeroTrust = new API.ZeroTrust(this);
   challenges: API.Challenges = new API.Challenges(this);
-  hyperdrive: API.Hyperdrive = new API.Hyperdrive(this);
+  hyperdrive: API.HyperdriveResource = new API.HyperdriveResource(this);
   rum: API.RUM = new API.RUM(this);
   vectorize: API.Vectorize = new API.Vectorize(this);
   urlScanner: API.URLScanner = new API.URLScanner(this);
@@ -222,6 +222,7 @@ export class Cloudflare extends Core.APIClient {
   snippets: API.Snippets = new API.Snippets(this);
   calls: API.Calls = new API.Calls(this);
   cloudforceOne: API.CloudforceOne = new API.CloudforceOne(this);
+  eventNotifications: API.EventNotifications = new API.EventNotifications(this);
 
   protected override defaultQuery(): Core.DefaultQuery | undefined {
     return this._options.defaultQuery;
@@ -324,7 +325,7 @@ export class Cloudflare extends Core.APIClient {
   }
 
   protected override stringifyQuery(query: Record<string, unknown>): string {
-    return qs.stringify(query, { arrayFormat: 'comma' });
+    return qs.stringify(query, { arrayFormat: 'repeat' });
   }
 
   static Cloudflare = this;
@@ -342,6 +343,9 @@ export class Cloudflare extends Core.APIClient {
   static InternalServerError = Errors.InternalServerError;
   static PermissionDeniedError = Errors.PermissionDeniedError;
   static UnprocessableEntityError = Errors.UnprocessableEntityError;
+
+  static toFile = Uploads.toFile;
+  static fileFromPath = Uploads.fileFromPath;
 }
 
 export const {
@@ -364,10 +368,6 @@ export import toFile = Uploads.toFile;
 export import fileFromPath = Uploads.fileFromPath;
 
 export namespace Cloudflare {
-  // Helper functions
-  export import toFile = Uploads.toFile;
-  export import fileFromPath = Uploads.fileFromPath;
-
   export import RequestOptions = Core.RequestOptions;
 
   export import V4PagePagination = Pagination.V4PagePagination;
@@ -390,235 +390,70 @@ export namespace Cloudflare {
   export import SinglePageResponse = Pagination.SinglePageResponse;
 
   export import Accounts = API.Accounts;
-  export import Account = API.Account;
-  export import AccountUpdateResponse = API.AccountUpdateResponse;
-  export import AccountListResponse = API.AccountListResponse;
-  export import AccountGetResponse = API.AccountGetResponse;
-  export import AccountListResponsesV4PagePaginationArray = API.AccountListResponsesV4PagePaginationArray;
-  export import AccountUpdateParams = API.AccountUpdateParams;
-  export import AccountListParams = API.AccountListParams;
-  export import AccountGetParams = API.AccountGetParams;
 
   export import OriginCACertificates = API.OriginCACertificates;
-  export import OriginCACertificate = API.OriginCACertificate;
-  export import OriginCACertificateCreateResponse = API.OriginCACertificateCreateResponse;
-  export import OriginCACertificateListResponse = API.OriginCACertificateListResponse;
-  export import OriginCACertificateDeleteResponse = API.OriginCACertificateDeleteResponse;
-  export import OriginCACertificateGetResponse = API.OriginCACertificateGetResponse;
-  export import OriginCACertificateCreateParams = API.OriginCACertificateCreateParams;
 
   export import IPs = API.IPs;
-  export import JDCloudIPs = API.JDCloudIPs;
-  export import IPListResponse = API.IPListResponse;
-  export import IPListParams = API.IPListParams;
 
   export import Memberships = API.Memberships;
-  export import Membership = API.Membership;
-  export import MembershipUpdateResponse = API.MembershipUpdateResponse;
-  export import MembershipDeleteResponse = API.MembershipDeleteResponse;
-  export import MembershipGetResponse = API.MembershipGetResponse;
-  export import MembershipsV4PagePaginationArray = API.MembershipsV4PagePaginationArray;
-  export import MembershipUpdateParams = API.MembershipUpdateParams;
-  export import MembershipListParams = API.MembershipListParams;
-
-  export import UserResource = API.UserResource;
+
   export import User = API.User;
-  export import UserEditResponse = API.UserEditResponse;
-  export import UserGetResponse = API.UserGetResponse;
-  export import UserEditParams = API.UserEditParams;
 
   export import Zones = API.Zones;
-  export import Zone = API.Zone;
-  export import ZoneDeleteResponse = API.ZoneDeleteResponse;
-  export import ZonesV4PagePaginationArray = API.ZonesV4PagePaginationArray;
-  export import ZoneCreateParams = API.ZoneCreateParams;
-  export import ZoneListParams = API.ZoneListParams;
-  export import ZoneDeleteParams = API.ZoneDeleteParams;
-  export import ZoneEditParams = API.ZoneEditParams;
-  export import ZoneGetParams = API.ZoneGetParams;
 
   export import LoadBalancers = API.LoadBalancers;
-  export import LoadBalancer = API.LoadBalancer;
-  export import LoadBalancerListResponse = API.LoadBalancerListResponse;
-  export import LoadBalancerDeleteResponse = API.LoadBalancerDeleteResponse;
-  export import LoadBalancerCreateParams = API.LoadBalancerCreateParams;
-  export import LoadBalancerUpdateParams = API.LoadBalancerUpdateParams;
-  export import LoadBalancerListParams = API.LoadBalancerListParams;
-  export import LoadBalancerDeleteParams = API.LoadBalancerDeleteParams;
-  export import LoadBalancerEditParams = API.LoadBalancerEditParams;
-  export import LoadBalancerGetParams = API.LoadBalancerGetParams;
 
   export import Cache = API.Cache;
-  export import CachePurgeResponse = API.CachePurgeResponse;
-  export import CachePurgeParams = API.CachePurgeParams;
 
   export import SSL = API.SSL;
 
   export import Subscriptions = API.Subscriptions;
-  export import SubscriptionCreateResponse = API.SubscriptionCreateResponse;
-  export import SubscriptionUpdateResponse = API.SubscriptionUpdateResponse;
-  export import SubscriptionListResponse = API.SubscriptionListResponse;
-  export import SubscriptionDeleteResponse = API.SubscriptionDeleteResponse;
-  export import SubscriptionGetResponse = API.SubscriptionGetResponse;
-  export import SubscriptionCreateParams = API.SubscriptionCreateParams;
-  export import SubscriptionUpdateParams = API.SubscriptionUpdateParams;
 
   export import ACM = API.ACM;
 
   export import Argo = API.Argo;
 
-  export import AvailablePlans = API.AvailablePlans;
-  export import BillSubsAPIAvailableRatePlan = API.BillSubsAPIAvailableRatePlan;
-  export import AvailablePlanListResponse = API.AvailablePlanListResponse;
+  export import Plans = API.Plans;
 
-  export import AvailableRatePlans = API.AvailableRatePlans;
-  export import BillSubsRatePlan = API.BillSubsRatePlan;
-  export import AvailableRatePlanGetResponse = API.AvailableRatePlanGetResponse;
+  export import RatePlans = API.RatePlans;
 
   export import CertificateAuthorities = API.CertificateAuthorities;
 
   export import ClientCertificates = API.ClientCertificates;
-  export import TLSCertificatesAndHostnamesClientCertificate = API.TLSCertificatesAndHostnamesClientCertificate;
-  export import TLSCertificatesAndHostnamesClientCertificatesV4PagePaginationArray = API.TLSCertificatesAndHostnamesClientCertificatesV4PagePaginationArray;
-  export import ClientCertificateCreateParams = API.ClientCertificateCreateParams;
-  export import ClientCertificateListParams = API.ClientCertificateListParams;
-  export import ClientCertificateDeleteParams = API.ClientCertificateDeleteParams;
-  export import ClientCertificateEditParams = API.ClientCertificateEditParams;
-  export import ClientCertificateGetParams = API.ClientCertificateGetParams;
 
   export import CustomCertificates = API.CustomCertificates;
-  export import TLSCertificatesAndHostnamesCustomCertificate = API.TLSCertificatesAndHostnamesCustomCertificate;
-  export import CustomCertificateCreateResponse = API.CustomCertificateCreateResponse;
-  export import CustomCertificateDeleteResponse = API.CustomCertificateDeleteResponse;
-  export import CustomCertificateEditResponse = API.CustomCertificateEditResponse;
-  export import CustomCertificateGetResponse = API.CustomCertificateGetResponse;
-  export import TLSCertificatesAndHostnamesCustomCertificatesV4PagePaginationArray = API.TLSCertificatesAndHostnamesCustomCertificatesV4PagePaginationArray;
-  export import CustomCertificateCreateParams = API.CustomCertificateCreateParams;
-  export import CustomCertificateListParams = API.CustomCertificateListParams;
-  export import CustomCertificateDeleteParams = API.CustomCertificateDeleteParams;
-  export import CustomCertificateEditParams = API.CustomCertificateEditParams;
-  export import CustomCertificateGetParams = API.CustomCertificateGetParams;
 
   export import CustomHostnames = API.CustomHostnames;
-  export import TLSCertificatesAndHostnamesCustomHostname = API.TLSCertificatesAndHostnamesCustomHostname;
-  export import CustomHostnameCreateResponse = API.CustomHostnameCreateResponse;
-  export import CustomHostnameListResponse = API.CustomHostnameListResponse;
-  export import CustomHostnameDeleteResponse = API.CustomHostnameDeleteResponse;
-  export import CustomHostnameEditResponse = API.CustomHostnameEditResponse;
-  export import CustomHostnameGetResponse = API.CustomHostnameGetResponse;
-  export import CustomHostnameListResponsesV4PagePaginationArray = API.CustomHostnameListResponsesV4PagePaginationArray;
-  export import CustomHostnameCreateParams = API.CustomHostnameCreateParams;
-  export import CustomHostnameListParams = API.CustomHostnameListParams;
-  export import CustomHostnameDeleteParams = API.CustomHostnameDeleteParams;
-  export import CustomHostnameEditParams = API.CustomHostnameEditParams;
-  export import CustomHostnameGetParams = API.CustomHostnameGetParams;
 
   export import CustomNameservers = API.CustomNameservers;
-  export import DNSCustomNameserversCustomNS = API.DNSCustomNameserversCustomNS;
-  export import CustomNameserverDeleteResponse = API.CustomNameserverDeleteResponse;
-  export import CustomNameserverAvailabiltyResponse = API.CustomNameserverAvailabiltyResponse;
-  export import CustomNameserverGetResponse = API.CustomNameserverGetResponse;
-  export import CustomNameserverVerifyResponse = API.CustomNameserverVerifyResponse;
-  export import CustomNameserverCreateParams = API.CustomNameserverCreateParams;
-  export import CustomNameserverDeleteParams = API.CustomNameserverDeleteParams;
-  export import CustomNameserverAvailabiltyParams = API.CustomNameserverAvailabiltyParams;
-  export import CustomNameserverGetParams = API.CustomNameserverGetParams;
-  export import CustomNameserverVerifyParams = API.CustomNameserverVerifyParams;
 
   export import DNS = API.DNS;
 
-  export import DNSSEC = API.DNSSEC;
-  export import DNSSECDNSSEC = API.DNSSECDNSSEC;
-  export import DNSSECDeleteResponse = API.DNSSECDeleteResponse;
-  export import DNSSECDeleteParams = API.DNSSECDeleteParams;
-  export import DNSSECEditParams = API.DNSSECEditParams;
-  export import DNSSECGetParams = API.DNSSECGetParams;
+  export import DNSSECResource = API.DNSSECResource;
 
   export import EmailRouting = API.EmailRouting;
 
   export import Filters = API.Filters;
-  export import LegacyJhsFilter = API.LegacyJhsFilter;
-  export import FilterCreateResponse = API.FilterCreateResponse;
-  export import LegacyJhsFiltersV4PagePaginationArray = API.LegacyJhsFiltersV4PagePaginationArray;
-  export import FilterCreateParams = API.FilterCreateParams;
-  export import FilterUpdateParams = API.FilterUpdateParams;
-  export import FilterListParams = API.FilterListParams;
 
   export import Firewall = API.Firewall;
 
   export import Healthchecks = API.Healthchecks;
-  export import HealthchecksHealthchecks = API.HealthchecksHealthchecks;
-  export import HealthcheckListResponse = API.HealthcheckListResponse;
-  export import HealthcheckDeleteResponse = API.HealthcheckDeleteResponse;
-  export import HealthcheckCreateParams = API.HealthcheckCreateParams;
-  export import HealthcheckUpdateParams = API.HealthcheckUpdateParams;
-  export import HealthcheckListParams = API.HealthcheckListParams;
-  export import HealthcheckDeleteParams = API.HealthcheckDeleteParams;
-  export import HealthcheckEditParams = API.HealthcheckEditParams;
-  export import HealthcheckGetParams = API.HealthcheckGetParams;
 
   export import KeylessCertificates = API.KeylessCertificates;
-  export import TLSCertificatesAndHostnamesBase = API.TLSCertificatesAndHostnamesBase;
-  export import TLSCertificatesAndHostnamesKeylessCertificate = API.TLSCertificatesAndHostnamesKeylessCertificate;
-  export import KeylessCertificateListResponse = API.KeylessCertificateListResponse;
-  export import KeylessCertificateDeleteResponse = API.KeylessCertificateDeleteResponse;
-  export import KeylessCertificateCreateParams = API.KeylessCertificateCreateParams;
-  export import KeylessCertificateListParams = API.KeylessCertificateListParams;
-  export import KeylessCertificateDeleteParams = API.KeylessCertificateDeleteParams;
-  export import KeylessCertificateEditParams = API.KeylessCertificateEditParams;
-  export import KeylessCertificateGetParams = API.KeylessCertificateGetParams;
 
   export import Logpush = API.Logpush;
 
   export import Logs = API.Logs;
 
   export import OriginTLSClientAuth = API.OriginTLSClientAuth;
-  export import TLSCertificatesAndHostnamesZoneAuthenticatedOriginPull = API.TLSCertificatesAndHostnamesZoneAuthenticatedOriginPull;
-  export import OriginTLSClientAuthCreateResponse = API.OriginTLSClientAuthCreateResponse;
-  export import OriginTLSClientAuthListResponse = API.OriginTLSClientAuthListResponse;
-  export import OriginTLSClientAuthDeleteResponse = API.OriginTLSClientAuthDeleteResponse;
-  export import OriginTLSClientAuthGetResponse = API.OriginTLSClientAuthGetResponse;
-  export import OriginTLSClientAuthCreateParams = API.OriginTLSClientAuthCreateParams;
-  export import OriginTLSClientAuthListParams = API.OriginTLSClientAuthListParams;
-  export import OriginTLSClientAuthDeleteParams = API.OriginTLSClientAuthDeleteParams;
-  export import OriginTLSClientAuthGetParams = API.OriginTLSClientAuthGetParams;
 
   export import Pagerules = API.Pagerules;
-  export import ZonesPageRule = API.ZonesPageRule;
-  export import PageruleCreateResponse = API.PageruleCreateResponse;
-  export import PageruleUpdateResponse = API.PageruleUpdateResponse;
-  export import PageruleListResponse = API.PageruleListResponse;
-  export import PageruleDeleteResponse = API.PageruleDeleteResponse;
-  export import PageruleEditResponse = API.PageruleEditResponse;
-  export import PageruleGetResponse = API.PageruleGetResponse;
-  export import PageruleCreateParams = API.PageruleCreateParams;
-  export import PageruleUpdateParams = API.PageruleUpdateParams;
-  export import PageruleListParams = API.PageruleListParams;
-  export import PageruleDeleteParams = API.PageruleDeleteParams;
-  export import PageruleEditParams = API.PageruleEditParams;
-  export import PageruleGetParams = API.PageruleGetParams;
 
   export import RateLimits = API.RateLimits;
-  export import LegacyJhsRateLimits = API.LegacyJhsRateLimits;
-  export import RateLimitCreateResponse = API.RateLimitCreateResponse;
-  export import RateLimitListResponse = API.RateLimitListResponse;
-  export import RateLimitDeleteResponse = API.RateLimitDeleteResponse;
-  export import RateLimitEditResponse = API.RateLimitEditResponse;
-  export import RateLimitGetResponse = API.RateLimitGetResponse;
-  export import RateLimitListResponsesV4PagePaginationArray = API.RateLimitListResponsesV4PagePaginationArray;
-  export import RateLimitCreateParams = API.RateLimitCreateParams;
-  export import RateLimitListParams = API.RateLimitListParams;
-  export import RateLimitEditParams = API.RateLimitEditParams;
 
   export import SecondaryDNS = API.SecondaryDNS;
 
   export import WaitingRooms = API.WaitingRooms;
-  export import WaitingroomWaitingroom = API.WaitingroomWaitingroom;
-  export import WaitingRoomListResponse = API.WaitingRoomListResponse;
-  export import WaitingRoomDeleteResponse = API.WaitingRoomDeleteResponse;
-  export import WaitingRoomCreateParams = API.WaitingRoomCreateParams;
-  export import WaitingRoomUpdateParams = API.WaitingRoomUpdateParams;
-  export import WaitingRoomEditParams = API.WaitingRoomEditParams;
 
   export import Web3 = API.Web3;
 
@@ -629,60 +464,24 @@ export namespace Cloudflare {
   export import DurableObjects = API.DurableObjects;
 
   export import Queues = API.Queues;
-  export import WorkersQueue = API.WorkersQueue;
-  export import WorkersQueueCreated = API.WorkersQueueCreated;
-  export import WorkersQueueUpdated = API.WorkersQueueUpdated;
-  export import QueueListResponse = API.QueueListResponse;
-  export import QueueDeleteResponse = API.QueueDeleteResponse;
-  export import QueueCreateParams = API.QueueCreateParams;
-  export import QueueUpdateParams = API.QueueUpdateParams;
-  export import QueueListParams = API.QueueListParams;
-  export import QueueDeleteParams = API.QueueDeleteParams;
-  export import QueueGetParams = API.QueueGetParams;
 
   export import ManagedHeaders = API.ManagedHeaders;
-  export import ManagedHeaderListResponse = API.ManagedHeaderListResponse;
-  export import ManagedHeaderEditResponse = API.ManagedHeaderEditResponse;
-  export import ManagedHeaderListParams = API.ManagedHeaderListParams;
-  export import ManagedHeaderEditParams = API.ManagedHeaderEditParams;
 
   export import PageShield = API.PageShield;
-  export import PageShieldGetZoneSettings = API.PageShieldGetZoneSettings;
-  export import PageShieldUpdateZoneSettings = API.PageShieldUpdateZoneSettings;
-  export import PageShieldUpdateParams = API.PageShieldUpdateParams;
-  export import PageShieldGetParams = API.PageShieldGetParams;
 
   export import Rulesets = API.Rulesets;
-  export import RulesetsRulesetResponse = API.RulesetsRulesetResponse;
-  export import RulesetsRulesetsResponse = API.RulesetsRulesetsResponse;
-  export import RulesetCreateParams = API.RulesetCreateParams;
-  export import RulesetUpdateParams = API.RulesetUpdateParams;
-  export import RulesetListParams = API.RulesetListParams;
-  export import RulesetDeleteParams = API.RulesetDeleteParams;
-  export import RulesetGetParams = API.RulesetGetParams;
 
   export import URLNormalization = API.URLNormalization;
-  export import URLNormalizationUpdateResponse = API.URLNormalizationUpdateResponse;
-  export import URLNormalizationGetResponse = API.URLNormalizationGetResponse;
-  export import URLNormalizationUpdateParams = API.URLNormalizationUpdateParams;
-  export import URLNormalizationGetParams = API.URLNormalizationGetParams;
 
   export import Spectrum = API.Spectrum;
 
   export import Addressing = API.Addressing;
 
   export import AuditLogs = API.AuditLogs;
-  export import AuditLogListResponse = API.AuditLogListResponse;
-  export import AuditLogListResponsesV4PagePaginationArray = API.AuditLogListResponsesV4PagePaginationArray;
-  export import AuditLogListParams = API.AuditLogListParams;
 
   export import Billing = API.Billing;
 
   export import BrandProtection = API.BrandProtection;
-  export import IntelPhishingURLInfo = API.IntelPhishingURLInfo;
-  export import IntelPhishingURLSubmit = API.IntelPhishingURLSubmit;
-  export import BrandProtectionSubmitParams = API.BrandProtectionSubmitParams;
-  export import BrandProtectionURLInfoParams = API.BrandProtectionURLInfoParams;
 
   export import Diagnostics = API.Diagnostics;
 
@@ -695,23 +494,10 @@ export namespace Cloudflare {
   export import MagicNetworkMonitoring = API.MagicNetworkMonitoring;
 
   export import MTLSCertificates = API.MTLSCertificates;
-  export import TLSCertificatesAndHostnamesCertificateObjectPost = API.TLSCertificatesAndHostnamesCertificateObjectPost;
-  export import TLSCertificatesAndHostnamesComponentsSchemasCertificateObject = API.TLSCertificatesAndHostnamesComponentsSchemasCertificateObject;
-  export import MTLSCertificateListResponse = API.MTLSCertificateListResponse;
-  export import MTLSCertificateCreateParams = API.MTLSCertificateCreateParams;
-  export import MTLSCertificateListParams = API.MTLSCertificateListParams;
-  export import MTLSCertificateDeleteParams = API.MTLSCertificateDeleteParams;
-  export import MTLSCertificateGetParams = API.MTLSCertificateGetParams;
 
   export import Pages = API.Pages;
 
   export import PCAPs = API.PCAPs;
-  export import PCAPCreateResponse = API.PCAPCreateResponse;
-  export import PCAPListResponse = API.PCAPListResponse;
-  export import PCAPGetResponse = API.PCAPGetResponse;
-  export import PCAPCreateParams = API.PCAPCreateParams;
-  export import PCAPListParams = API.PCAPListParams;
-  export import PCAPGetParams = API.PCAPGetParams;
 
   export import Registrar = API.Registrar;
 
@@ -722,33 +508,14 @@ export namespace Cloudflare {
   export import Storage = API.Storage;
 
   export import Stream = API.Stream;
-  export import StreamVideos = API.StreamVideos;
-  export import StreamListResponse = API.StreamListResponse;
-  export import StreamCreateParams = API.StreamCreateParams;
-  export import StreamListParams = API.StreamListParams;
-  export import StreamDeleteParams = API.StreamDeleteParams;
-  export import StreamGetParams = API.StreamGetParams;
 
   export import Alerting = API.Alerting;
 
-  export import D1 = API.D1;
+  export import D1Resource = API.D1Resource;
 
   export import R2 = API.R2;
 
   export import WARPConnector = API.WARPConnector;
-  export import WARPConnectorCreateResponse = API.WARPConnectorCreateResponse;
-  export import WARPConnectorListResponse = API.WARPConnectorListResponse;
-  export import WARPConnectorDeleteResponse = API.WARPConnectorDeleteResponse;
-  export import WARPConnectorEditResponse = API.WARPConnectorEditResponse;
-  export import WARPConnectorGetResponse = API.WARPConnectorGetResponse;
-  export import WARPConnectorTokenResponse = API.WARPConnectorTokenResponse;
-  export import WARPConnectorListResponsesV4PagePaginationArray = API.WARPConnectorListResponsesV4PagePaginationArray;
-  export import WARPConnectorCreateParams = API.WARPConnectorCreateParams;
-  export import WARPConnectorListParams = API.WARPConnectorListParams;
-  export import WARPConnectorDeleteParams = API.WARPConnectorDeleteParams;
-  export import WARPConnectorEditParams = API.WARPConnectorEditParams;
-  export import WARPConnectorGetParams = API.WARPConnectorGetParams;
-  export import WARPConnectorTokenParams = API.WARPConnectorTokenParams;
 
   export import WorkersForPlatforms = API.WorkersForPlatforms;
 
@@ -756,59 +523,47 @@ export namespace Cloudflare {
 
   export import Challenges = API.Challenges;
 
-  export import Hyperdrive = API.Hyperdrive;
+  export import HyperdriveResource = API.HyperdriveResource;
 
   export import RUM = API.RUM;
 
   export import Vectorize = API.Vectorize;
 
   export import URLScanner = API.URLScanner;
-  export import URLScannerScanResponse = API.URLScannerScanResponse;
-  export import URLScannerScanParams = API.URLScannerScanParams;
 
   export import Radar = API.Radar;
 
   export import BotManagement = API.BotManagement;
-  export import BotManagementUpdateResponse = API.BotManagementUpdateResponse;
-  export import BotManagementGetResponse = API.BotManagementGetResponse;
-  export import BotManagementUpdateParams = API.BotManagementUpdateParams;
-  export import BotManagementGetParams = API.BotManagementGetParams;
 
   export import OriginPostQuantumEncryption = API.OriginPostQuantumEncryption;
-  export import OriginPostQuantumEncryptionUpdateResponse = API.OriginPostQuantumEncryptionUpdateResponse;
-  export import OriginPostQuantumEncryptionGetResponse = API.OriginPostQuantumEncryptionGetResponse;
-  export import OriginPostQuantumEncryptionUpdateParams = API.OriginPostQuantumEncryptionUpdateParams;
-  export import OriginPostQuantumEncryptionGetParams = API.OriginPostQuantumEncryptionGetParams;
 
   export import Speed = API.Speed;
-  export import ObservatorySchedule = API.ObservatorySchedule;
-  export import ObservatoryTrend = API.ObservatoryTrend;
-  export import SpeedDeleteResponse = API.SpeedDeleteResponse;
-  export import SpeedDeleteParams = API.SpeedDeleteParams;
-  export import SpeedScheduleGetParams = API.SpeedScheduleGetParams;
-  export import SpeedTrendsListParams = API.SpeedTrendsListParams;
 
   export import DCVDelegation = API.DCVDelegation;
 
   export import Hostnames = API.Hostnames;
 
   export import Snippets = API.Snippets;
-  export import Snippet = API.Snippet;
-  export import SnippetListResponse = API.SnippetListResponse;
-  export import SnippetDeleteResponse = API.SnippetDeleteResponse;
-  export import SnippetUpdateParams = API.SnippetUpdateParams;
 
   export import Calls = API.Calls;
-  export import CallsApp = API.CallsApp;
-  export import CallsAppWithSecret = API.CallsAppWithSecret;
-  export import CallListResponse = API.CallListResponse;
-  export import CallCreateParams = API.CallCreateParams;
-  export import CallUpdateParams = API.CallUpdateParams;
-  export import CallListParams = API.CallListParams;
-  export import CallDeleteParams = API.CallDeleteParams;
-  export import CallGetParams = API.CallGetParams;
 
   export import CloudforceOne = API.CloudforceOne;
+
+  export import EventNotifications = API.EventNotifications;
+
+  export import ASN = API.ASN;
+  export import AuditLog = API.AuditLog;
+  export import CloudflareTunnel = API.CloudflareTunnel;
+  export import ErrorData = API.ErrorData;
+  export import Identifier = API.Identifier;
+  export import LoadBalancerPreview = API.LoadBalancerPreview;
+  export import Member = API.Member;
+  export import PaginationInfo = API.PaginationInfo;
+  export import Permission = API.Permission;
+  export import PermissionGrant = API.PermissionGrant;
+  export import ResponseInfo = API.ResponseInfo;
+  export import Result = API.Result;
+  export import Role = API.Role;
 }
 
 export default Cloudflare;

package/src/pagination.ts

@@ -264,10 +264,12 @@ export class CursorLimitPagination<Item>
   }
 }
 
-export type SinglePageResponse<Item> = Item[];
+export interface SinglePageResponse<Item> {
+  result: Array<Item>;
+}
 
-export class SinglePage<Item> extends AbstractPage<Item> {
-  items: Array<Item>;
+export class SinglePage<Item> extends AbstractPage<Item> implements SinglePageResponse<Item> {
+  result: Array<Item>;
 
   constructor(
     client: APIClient,
@@ -277,11 +279,11 @@ export class SinglePage<Item> extends AbstractPage<Item> {
   ) {
     super(client, response, body, options);
 
-    this.items = body || [];
+    this.result = body.result || [];
   }
 
   getPaginatedItems(): Item[] {
-    return this.items ?? [];
+    return this.result ?? [];
   }
 
   // @deprecated Please use `nextPageInfo()` instead

package/src/resources/accounts/accounts.ts

@@ -3,7 +3,6 @@
 import * as Core from "../../core";
 import { APIResource } from "../../resource";
 import { isRequestOptions } from "../../core";
-import * as AccountsAPI from "./accounts";
 import * as MembersAPI from "./members";
 import * as RolesAPI from "./roles";
 import { V4PagePaginationArray, type V4PagePaginationArrayParams } from "../../pagination";
@@ -180,6 +179,11 @@ export interface AccountListParams extends V4PagePaginationArrayParams {
    * Direction to order results.
    */
   direction?: 'asc' | 'desc';
+
+  /**
+   * Name of the account.
+   */
+  name?: string;
 }
 
 export interface AccountGetParams {
@@ -187,17 +191,8 @@ export interface AccountGetParams {
 }
 
 export namespace Accounts {
-  export import Account = AccountsAPI.Account;
-  export import AccountUpdateResponse = AccountsAPI.AccountUpdateResponse;
-  export import AccountListResponse = AccountsAPI.AccountListResponse;
-  export import AccountGetResponse = AccountsAPI.AccountGetResponse;
-  export import AccountListResponsesV4PagePaginationArray = AccountsAPI.AccountListResponsesV4PagePaginationArray;
-  export import AccountUpdateParams = AccountsAPI.AccountUpdateParams;
-  export import AccountListParams = AccountsAPI.AccountListParams;
-  export import AccountGetParams = AccountsAPI.AccountGetParams;
   export import Members = MembersAPI.Members;
-  export import AccountMember = MembersAPI.AccountMember;
-  export import AccountMemberWithID = MembersAPI.AccountMemberWithID;
+  export import UserWithInviteCode = MembersAPI.UserWithInviteCode;
   export import MemberListResponse = MembersAPI.MemberListResponse;
   export import MemberDeleteResponse = MembersAPI.MemberDeleteResponse;
   export import MemberListResponsesV4PagePaginationArray = MembersAPI.MemberListResponsesV4PagePaginationArray;
@@ -207,8 +202,6 @@ export namespace Accounts {
   export import MemberDeleteParams = MembersAPI.MemberDeleteParams;
   export import MemberGetParams = MembersAPI.MemberGetParams;
   export import Roles = RolesAPI.Roles;
-  export import IamSchemasRole = RolesAPI.IamSchemasRole;
-  export import RoleListResponse = RolesAPI.RoleListResponse;
   export import RoleGetResponse = RolesAPI.RoleGetResponse;
   export import RoleListParams = RolesAPI.RoleListParams;
   export import RoleGetParams = RolesAPI.RoleGetParams;