@azure/arm-resourcehealth 3.1.1-alpha.20230127.1 → 3.2.0

package/src/operations/childResources.ts

@@ -6,7 +6,8 @@
  * Changes may cause incorrect behavior and will be lost if the code is regenerated.
  */
 
-import { PagedAsyncIterableIterator } from "@azure/core-paging";
+import { PagedAsyncIterableIterator, PageSettings } from "@azure/core-paging";
+import { setContinuationToken } from "../pagingHelper";
 import { ChildResources } from "../operationsInterfaces";
 import * as coreClient from "@azure/core-client";
 import * as Mappers from "../models/mappers";
@@ -53,23 +54,35 @@ export class ChildResourcesImpl implements ChildResources {
       [Symbol.asyncIterator]() {
         return this;
       },
-      byPage: () => {
-        return this.listPagingPage(resourceUri, options);
+      byPage: (settings?: PageSettings) => {
+        if (settings?.maxPageSize) {
+          throw new Error("maxPageSize is not supported by this operation.");
+        }
+        return this.listPagingPage(resourceUri, options, settings);
       }
     };
   }
 
   private async *listPagingPage(
     resourceUri: string,
-    options?: ChildResourcesListOptionalParams
+    options?: ChildResourcesListOptionalParams,
+    settings?: PageSettings
   ): AsyncIterableIterator<AvailabilityStatus[]> {
-    let result = await this._list(resourceUri, options);
-    yield result.value || [];
-    let continuationToken = result.nextLink;
+    let result: ChildResourcesListResponse;
+    let continuationToken = settings?.continuationToken;
+    if (!continuationToken) {
+      result = await this._list(resourceUri, options);
+      let page = result.value || [];
+      continuationToken = result.nextLink;
+      setContinuationToken(page, continuationToken);
+      yield page;
+    }
     while (continuationToken) {
       result = await this._listNext(resourceUri, continuationToken, options);
       continuationToken = result.nextLink;
-      yield result.value || [];
+      let page = result.value || [];
+      setContinuationToken(page, continuationToken);
+      yield page;
     }
   }
 
@@ -153,11 +166,6 @@ const listNextOperationSpec: coreClient.OperationSpec = {
       bodyMapper: Mappers.ErrorResponse
     }
   },
-  queryParameters: [
-    Parameters.apiVersion,
-    Parameters.filter,
-    Parameters.expand
-  ],
   urlParameters: [
     Parameters.$host,
     Parameters.resourceUri,

package/src/operations/emergingIssues.ts

@@ -6,7 +6,8 @@
  * Changes may cause incorrect behavior and will be lost if the code is regenerated.
  */
 
-import { PagedAsyncIterableIterator } from "@azure/core-paging";
+import { PagedAsyncIterableIterator, PageSettings } from "@azure/core-paging";
+import { setContinuationToken } from "../pagingHelper";
 import { EmergingIssues } from "../operationsInterfaces";
 import * as coreClient from "@azure/core-client";
 import * as Mappers from "../models/mappers";
@@ -16,9 +17,9 @@ import {
   EmergingIssuesGetResult,
   EmergingIssuesListNextOptionalParams,
   EmergingIssuesListOptionalParams,
+  EmergingIssuesListResponse,
   EmergingIssuesGetOptionalParams,
   EmergingIssuesGetResponse,
-  EmergingIssuesListResponse,
   EmergingIssuesListNextResponse
 } from "../models";
 
@@ -50,22 +51,34 @@ export class EmergingIssuesImpl implements EmergingIssues {
       [Symbol.asyncIterator]() {
         return this;
       },
-      byPage: () => {
-        return this.listPagingPage(options);
+      byPage: (settings?: PageSettings) => {
+        if (settings?.maxPageSize) {
+          throw new Error("maxPageSize is not supported by this operation.");
+        }
+        return this.listPagingPage(options, settings);
       }
     };
   }
 
   private async *listPagingPage(
-    options?: EmergingIssuesListOptionalParams
+    options?: EmergingIssuesListOptionalParams,
+    settings?: PageSettings
   ): AsyncIterableIterator<EmergingIssuesGetResult[]> {
-    let result = await this._list(options);
-    yield result.value || [];
-    let continuationToken = result.nextLink;
+    let result: EmergingIssuesListResponse;
+    let continuationToken = settings?.continuationToken;
+    if (!continuationToken) {
+      result = await this._list(options);
+      let page = result.value || [];
+      continuationToken = result.nextLink;
+      setContinuationToken(page, continuationToken);
+      yield page;
+    }
     while (continuationToken) {
       result = await this._listNext(continuationToken, options);
       continuationToken = result.nextLink;
-      yield result.value || [];
+      let page = result.value || [];
+      setContinuationToken(page, continuationToken);
+      yield page;
     }
   }
 
@@ -158,7 +171,6 @@ const listNextOperationSpec: coreClient.OperationSpec = {
       bodyMapper: Mappers.ErrorResponse
     }
   },
-  queryParameters: [Parameters.apiVersion],
   urlParameters: [Parameters.$host, Parameters.nextLink],
   headerParameters: [Parameters.accept],
   serializer

package/src/pagingHelper.ts

@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) Microsoft Corporation.
+ * Licensed under the MIT License.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ * Changes may cause incorrect behavior and will be lost if the code is regenerated.
+ */
+
+export interface PageInfo {
+  continuationToken?: string;
+}
+
+const pageMap = new WeakMap<object, PageInfo>();
+
+/**
+ * Given the last `.value` produced by the `byPage` iterator,
+ * returns a continuation token that can be used to begin paging from
+ * that point later.
+ * @param page An object from accessing `value` on the IteratorResult from a `byPage` iterator.
+ * @returns The continuation token that can be passed into byPage() during future calls.
+ */
+export function getContinuationToken(page: unknown): string | undefined {
+  if (typeof page !== "object" || page === null) {
+    return undefined;
+  }
+  return pageMap.get(page)?.continuationToken;
+}
+
+export function setContinuationToken(
+  page: unknown,
+  continuationToken: string | undefined
+): void {
+  if (typeof page !== "object" || page === null || !continuationToken) {
+    return;
+  }
+  const pageInfo = pageMap.get(page) ?? {};
+  pageInfo.continuationToken = continuationToken;
+  pageMap.set(page, pageInfo);
+}

package/types/arm-resourcehealth.d.ts

@@ -70,10 +70,6 @@ export declare type AvailabilityStatusesGetByResourceResponse = AvailabilityStat
 
 /** Optional parameters. */
 export declare interface AvailabilityStatusesListByResourceGroupNextOptionalParams extends coreClient.OperationOptions {
-    /** The filter to apply on the operation. For more information please see https://docs.microsoft.com/en-us/rest/api/apimanagement/apis?redirectedfrom=MSDN */
-    filter?: string;
-    /** Setting $expand=recommendedactions in url query expands the recommendedactions in the response. */
-    expand?: string;
 }
 
 /** Contains response data for the listByResourceGroupNext operation. */
@@ -92,10 +88,6 @@ export declare type AvailabilityStatusesListByResourceGroupResponse = Availabili
 
 /** Optional parameters. */
 export declare interface AvailabilityStatusesListBySubscriptionIdNextOptionalParams extends coreClient.OperationOptions {
-    /** The filter to apply on the operation. For more information please see https://docs.microsoft.com/en-us/rest/api/apimanagement/apis?redirectedfrom=MSDN */
-    filter?: string;
-    /** Setting $expand=recommendedactions in url query expands the recommendedactions in the response. */
-    expand?: string;
 }
 
 /** Contains response data for the listBySubscriptionIdNext operation. */
@@ -114,10 +106,6 @@ export declare type AvailabilityStatusesListBySubscriptionIdResponse = Availabil
 
 /** Optional parameters. */
 export declare interface AvailabilityStatusesListNextOptionalParams extends coreClient.OperationOptions {
-    /** The filter to apply on the operation. For more information please see https://docs.microsoft.com/en-us/rest/api/apimanagement/apis?redirectedfrom=MSDN */
-    filter?: string;
-    /** Setting $expand=recommendedactions in url query expands the recommendedactions in the response. */
-    expand?: string;
 }
 
 /** Contains response data for the listNext operation. */
@@ -222,10 +210,6 @@ export declare type ChildAvailabilityStatusesGetByResourceResponse = Availabilit
 
 /** Optional parameters. */
 export declare interface ChildAvailabilityStatusesListNextOptionalParams extends coreClient.OperationOptions {
-    /** The filter to apply on the operation. For more information please see https://docs.microsoft.com/en-us/rest/api/apimanagement/apis?redirectedfrom=MSDN */
-    filter?: string;
-    /** Setting $expand=recommendedactions in url query expands the recommendedactions in the response. */
-    expand?: string;
 }
 
 /** Contains response data for the listNext operation. */
@@ -257,10 +241,6 @@ export declare interface ChildResources {
 
 /** Optional parameters. */
 export declare interface ChildResourcesListNextOptionalParams extends coreClient.OperationOptions {
-    /** The filter to apply on the operation. For more information please see https://docs.microsoft.com/en-us/rest/api/apimanagement/apis?redirectedfrom=MSDN */
-    filter?: string;
-    /** Setting $expand=recommendedactions in url query expands the recommendedactions in the response. */
-    expand?: string;
 }
 
 /** Contains response data for the listNext operation. */
@@ -359,6 +339,15 @@ export declare interface ErrorResponse {
     readonly details?: string;
 }
 
+/**
+ * Given the last `.value` produced by the `byPage` iterator,
+ * returns a continuation token that can be used to begin paging from
+ * that point later.
+ * @param page An object from accessing `value` on the IteratorResult from a `byPage` iterator.
+ * @returns The continuation token that can be passed into byPage() during future calls.
+ */
+export declare function getContinuationToken(page: unknown): string | undefined;
+
 /** Object of impacted region. */
 export declare interface ImpactedRegion {
     /** The impacted region id. */

package/types/tsdoc-metadata.json

@@ -5,7 +5,7 @@
   "toolPackages": [
     {
       "packageName": "@microsoft/api-extractor",
-      "packageVersion": "7.34.0"
+      "packageVersion": "7.34.2"
     }
   ]
 }