@azure/arm-appinsights 5.0.0-beta.6 → 5.0.0-beta.7

package/src/operations/webTests.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 { WebTests } from "../operationsInterfaces";
 import * as coreClient from "@azure/core-client";
 import * as Mappers from "../models/mappers";
@@ -16,11 +17,13 @@ import {
   WebTest,
   WebTestsListByResourceGroupNextOptionalParams,
   WebTestsListByResourceGroupOptionalParams,
+  WebTestsListByResourceGroupResponse,
   WebTestsListNextOptionalParams,
   WebTestsListOptionalParams,
+  WebTestsListResponse,
   WebTestsListByComponentNextOptionalParams,
   WebTestsListByComponentOptionalParams,
-  WebTestsListByResourceGroupResponse,
+  WebTestsListByComponentResponse,
   WebTestsGetOptionalParams,
   WebTestsGetResponse,
   WebTestsCreateOrUpdateOptionalParams,
@@ -29,8 +32,6 @@ import {
   WebTestsUpdateTagsOptionalParams,
   WebTestsUpdateTagsResponse,
   WebTestsDeleteOptionalParams,
-  WebTestsListResponse,
-  WebTestsListByComponentResponse,
   WebTestsListByResourceGroupNextResponse,
   WebTestsListNextResponse,
   WebTestsListByComponentNextResponse
@@ -66,19 +67,33 @@ export class WebTestsImpl implements WebTests {
       [Symbol.asyncIterator]() {
         return this;
       },
-      byPage: () => {
-        return this.listByResourceGroupPagingPage(resourceGroupName, options);
+      byPage: (settings?: PageSettings) => {
+        if (settings?.maxPageSize) {
+          throw new Error("maxPageSize is not supported by this operation.");
+        }
+        return this.listByResourceGroupPagingPage(
+          resourceGroupName,
+          options,
+          settings
+        );
       }
     };
   }
 
   private async *listByResourceGroupPagingPage(
     resourceGroupName: string,
-    options?: WebTestsListByResourceGroupOptionalParams
+    options?: WebTestsListByResourceGroupOptionalParams,
+    settings?: PageSettings
   ): AsyncIterableIterator<WebTest[]> {
-    let result = await this._listByResourceGroup(resourceGroupName, options);
-    yield result.value || [];
-    let continuationToken = result.nextLink;
+    let result: WebTestsListByResourceGroupResponse;
+    let continuationToken = settings?.continuationToken;
+    if (!continuationToken) {
+      result = await this._listByResourceGroup(resourceGroupName, options);
+      let page = result.value || [];
+      continuationToken = result.nextLink;
+      setContinuationToken(page, continuationToken);
+      yield page;
+    }
     while (continuationToken) {
       result = await this._listByResourceGroupNext(
         resourceGroupName,
@@ -86,7 +101,9 @@ export class WebTestsImpl implements WebTests {
         options
       );
       continuationToken = result.nextLink;
-      yield result.value || [];
+      let page = result.value || [];
+      setContinuationToken(page, continuationToken);
+      yield page;
     }
   }
 
@@ -117,22 +134,34 @@ export class WebTestsImpl implements WebTests {
       [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?: WebTestsListOptionalParams
+    options?: WebTestsListOptionalParams,
+    settings?: PageSettings
   ): AsyncIterableIterator<WebTest[]> {
-    let result = await this._list(options);
-    yield result.value || [];
-    let continuationToken = result.nextLink;
+    let result: WebTestsListResponse;
+    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;
     }
   }
 
@@ -167,11 +196,15 @@ export class WebTestsImpl implements WebTests {
       [Symbol.asyncIterator]() {
         return this;
       },
-      byPage: () => {
+      byPage: (settings?: PageSettings) => {
+        if (settings?.maxPageSize) {
+          throw new Error("maxPageSize is not supported by this operation.");
+        }
         return this.listByComponentPagingPage(
           componentName,
           resourceGroupName,
-          options
+          options,
+          settings
         );
       }
     };
@@ -180,15 +213,22 @@ export class WebTestsImpl implements WebTests {
   private async *listByComponentPagingPage(
     componentName: string,
     resourceGroupName: string,
-    options?: WebTestsListByComponentOptionalParams
+    options?: WebTestsListByComponentOptionalParams,
+    settings?: PageSettings
   ): AsyncIterableIterator<WebTest[]> {
-    let result = await this._listByComponent(
-      componentName,
-      resourceGroupName,
-      options
-    );
-    yield result.value || [];
-    let continuationToken = result.nextLink;
+    let result: WebTestsListByComponentResponse;
+    let continuationToken = settings?.continuationToken;
+    if (!continuationToken) {
+      result = await this._listByComponent(
+        componentName,
+        resourceGroupName,
+        options
+      );
+      let page = result.value || [];
+      continuationToken = result.nextLink;
+      setContinuationToken(page, continuationToken);
+      yield page;
+    }
     while (continuationToken) {
       result = await this._listByComponentNext(
         componentName,
@@ -197,7 +237,9 @@ export class WebTestsImpl implements WebTests {
         options
       );
       continuationToken = result.nextLink;
-      yield result.value || [];
+      let page = result.value || [];
+      setContinuationToken(page, continuationToken);
+      yield page;
     }
   }
 

package/src/operations/workItemConfigurations.ts

@@ -6,7 +6,7 @@
  * 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 { WorkItemConfigurations } from "../operationsInterfaces";
 import * as coreClient from "@azure/core-client";
 import * as Mappers from "../models/mappers";
@@ -60,8 +60,16 @@ export class WorkItemConfigurationsImpl implements WorkItemConfigurations {
       [Symbol.asyncIterator]() {
         return this;
       },
-      byPage: () => {
-        return this.listPagingPage(resourceGroupName, resourceName, options);
+      byPage: (settings?: PageSettings) => {
+        if (settings?.maxPageSize) {
+          throw new Error("maxPageSize is not supported by this operation.");
+        }
+        return this.listPagingPage(
+          resourceGroupName,
+          resourceName,
+          options,
+          settings
+        );
       }
     };
   }
@@ -69,9 +77,11 @@ export class WorkItemConfigurationsImpl implements WorkItemConfigurations {
   private async *listPagingPage(
     resourceGroupName: string,
     resourceName: string,
-    options?: WorkItemConfigurationsListOptionalParams
+    options?: WorkItemConfigurationsListOptionalParams,
+    _settings?: PageSettings
   ): AsyncIterableIterator<WorkItemConfiguration[]> {
-    let result = await this._list(resourceGroupName, resourceName, options);
+    let result: WorkItemConfigurationsListResponse;
+    result = await this._list(resourceGroupName, resourceName, options);
     yield result.value || [];
   }
 

package/src/operations/workbookTemplates.ts

@@ -6,7 +6,7 @@
  * 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 { WorkbookTemplates } from "../operationsInterfaces";
 import * as coreClient from "@azure/core-client";
 import * as Mappers from "../models/mappers";
@@ -55,17 +55,26 @@ export class WorkbookTemplatesImpl implements WorkbookTemplates {
       [Symbol.asyncIterator]() {
         return this;
       },
-      byPage: () => {
-        return this.listByResourceGroupPagingPage(resourceGroupName, options);
+      byPage: (settings?: PageSettings) => {
+        if (settings?.maxPageSize) {
+          throw new Error("maxPageSize is not supported by this operation.");
+        }
+        return this.listByResourceGroupPagingPage(
+          resourceGroupName,
+          options,
+          settings
+        );
       }
     };
   }
 
   private async *listByResourceGroupPagingPage(
     resourceGroupName: string,
-    options?: WorkbookTemplatesListByResourceGroupOptionalParams
+    options?: WorkbookTemplatesListByResourceGroupOptionalParams,
+    _settings?: PageSettings
   ): AsyncIterableIterator<WorkbookTemplate[]> {
-    let result = await this._listByResourceGroup(resourceGroupName, options);
+    let result: WorkbookTemplatesListByResourceGroupResponse;
+    result = await this._listByResourceGroup(resourceGroupName, options);
     yield result.value || [];
   }
 

package/src/operations/workbooks.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 { Workbooks } from "../operationsInterfaces";
 import * as coreClient from "@azure/core-client";
 import * as Mappers from "../models/mappers";
@@ -17,12 +18,13 @@ import {
   CategoryType,
   WorkbooksListBySubscriptionNextOptionalParams,
   WorkbooksListBySubscriptionOptionalParams,
+  WorkbooksListBySubscriptionResponse,
   WorkbooksListByResourceGroupNextOptionalParams,
   WorkbooksListByResourceGroupOptionalParams,
+  WorkbooksListByResourceGroupResponse,
   WorkbooksRevisionsListNextOptionalParams,
   WorkbooksRevisionsListOptionalParams,
-  WorkbooksListBySubscriptionResponse,
-  WorkbooksListByResourceGroupResponse,
+  WorkbooksRevisionsListResponse,
   WorkbooksGetOptionalParams,
   WorkbooksGetResponse,
   WorkbooksDeleteOptionalParams,
@@ -30,7 +32,6 @@ import {
   WorkbooksCreateOrUpdateResponse,
   WorkbooksUpdateOptionalParams,
   WorkbooksUpdateResponse,
-  WorkbooksRevisionsListResponse,
   WorkbooksRevisionGetOptionalParams,
   WorkbooksRevisionGetResponse,
   WorkbooksListBySubscriptionNextResponse,
@@ -68,19 +69,29 @@ export class WorkbooksImpl implements Workbooks {
       [Symbol.asyncIterator]() {
         return this;
       },
-      byPage: () => {
-        return this.listBySubscriptionPagingPage(category, options);
+      byPage: (settings?: PageSettings) => {
+        if (settings?.maxPageSize) {
+          throw new Error("maxPageSize is not supported by this operation.");
+        }
+        return this.listBySubscriptionPagingPage(category, options, settings);
       }
     };
   }
 
   private async *listBySubscriptionPagingPage(
     category: CategoryType,
-    options?: WorkbooksListBySubscriptionOptionalParams
+    options?: WorkbooksListBySubscriptionOptionalParams,
+    settings?: PageSettings
   ): AsyncIterableIterator<Workbook[]> {
-    let result = await this._listBySubscription(category, options);
-    yield result.value || [];
-    let continuationToken = result.nextLink;
+    let result: WorkbooksListBySubscriptionResponse;
+    let continuationToken = settings?.continuationToken;
+    if (!continuationToken) {
+      result = await this._listBySubscription(category, options);
+      let page = result.value || [];
+      continuationToken = result.nextLink;
+      setContinuationToken(page, continuationToken);
+      yield page;
+    }
     while (continuationToken) {
       result = await this._listBySubscriptionNext(
         category,
@@ -88,7 +99,9 @@ export class WorkbooksImpl implements Workbooks {
         options
       );
       continuationToken = result.nextLink;
-      yield result.value || [];
+      let page = result.value || [];
+      setContinuationToken(page, continuationToken);
+      yield page;
     }
   }
 
@@ -127,11 +140,15 @@ export class WorkbooksImpl implements Workbooks {
       [Symbol.asyncIterator]() {
         return this;
       },
-      byPage: () => {
+      byPage: (settings?: PageSettings) => {
+        if (settings?.maxPageSize) {
+          throw new Error("maxPageSize is not supported by this operation.");
+        }
         return this.listByResourceGroupPagingPage(
           resourceGroupName,
           category,
-          options
+          options,
+          settings
         );
       }
     };
@@ -140,15 +157,22 @@ export class WorkbooksImpl implements Workbooks {
   private async *listByResourceGroupPagingPage(
     resourceGroupName: string,
     category: CategoryType,
-    options?: WorkbooksListByResourceGroupOptionalParams
+    options?: WorkbooksListByResourceGroupOptionalParams,
+    settings?: PageSettings
   ): AsyncIterableIterator<Workbook[]> {
-    let result = await this._listByResourceGroup(
-      resourceGroupName,
-      category,
-      options
-    );
-    yield result.value || [];
-    let continuationToken = result.nextLink;
+    let result: WorkbooksListByResourceGroupResponse;
+    let continuationToken = settings?.continuationToken;
+    if (!continuationToken) {
+      result = await this._listByResourceGroup(
+        resourceGroupName,
+        category,
+        options
+      );
+      let page = result.value || [];
+      continuationToken = result.nextLink;
+      setContinuationToken(page, continuationToken);
+      yield page;
+    }
     while (continuationToken) {
       result = await this._listByResourceGroupNext(
         resourceGroupName,
@@ -157,7 +181,9 @@ export class WorkbooksImpl implements Workbooks {
         options
       );
       continuationToken = result.nextLink;
-      yield result.value || [];
+      let page = result.value || [];
+      setContinuationToken(page, continuationToken);
+      yield page;
     }
   }
 
@@ -198,11 +224,15 @@ export class WorkbooksImpl implements Workbooks {
       [Symbol.asyncIterator]() {
         return this;
       },
-      byPage: () => {
+      byPage: (settings?: PageSettings) => {
+        if (settings?.maxPageSize) {
+          throw new Error("maxPageSize is not supported by this operation.");
+        }
         return this.revisionsListPagingPage(
           resourceGroupName,
           resourceName,
-          options
+          options,
+          settings
         );
       }
     };
@@ -211,15 +241,22 @@ export class WorkbooksImpl implements Workbooks {
   private async *revisionsListPagingPage(
     resourceGroupName: string,
     resourceName: string,
-    options?: WorkbooksRevisionsListOptionalParams
+    options?: WorkbooksRevisionsListOptionalParams,
+    settings?: PageSettings
   ): AsyncIterableIterator<Workbook[]> {
-    let result = await this._revisionsList(
-      resourceGroupName,
-      resourceName,
-      options
-    );
-    yield result.value || [];
-    let continuationToken = result.nextLink;
+    let result: WorkbooksRevisionsListResponse;
+    let continuationToken = settings?.continuationToken;
+    if (!continuationToken) {
+      result = await this._revisionsList(
+        resourceGroupName,
+        resourceName,
+        options
+      );
+      let page = result.value || [];
+      continuationToken = result.nextLink;
+      setContinuationToken(page, continuationToken);
+      yield page;
+    }
     while (continuationToken) {
       result = await this._revisionsListNext(
         resourceGroupName,
@@ -228,7 +265,9 @@ export class WorkbooksImpl implements Workbooks {
         options
       );
       continuationToken = result.nextLink;
-      yield result.value || [];
+      let page = result.value || [];
+      setContinuationToken(page, continuationToken);
+      yield page;
     }
   }
 

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 a result page from a pageable operation, returns a
+ * continuation token that can be used to begin paging from
+ * that point later.
+ * @param page A result object from calling .byPage() on a paged operation.
+ * @returns The continuation token that can be passed into byPage().
+ */
+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/tsconfig.json

@@ -15,11 +15,17 @@
     ],
     "declaration": true,
     "outDir": "./dist-esm",
-    "importHelpers": true
+    "importHelpers": true,
+    "paths": {
+      "@azure/arm-appinsights": [
+        "./src/index"
+      ]
+    }
   },
   "include": [
     "./src/**/*.ts",
-    "./test/**/*.ts"
+    "./test/**/*.ts",
+    "samples-dev/**/*.ts"
   ],
   "exclude": [
     "node_modules"