@azure/arm-cognitiveservices 6.1.0 → 7.0.1-alpha.20211221.2

package/rollup.config.js

@@ -1,37 +1,188 @@
-import rollup from "rollup";
-import nodeResolve from "rollup-plugin-node-resolve";
-import sourcemaps from "rollup-plugin-sourcemaps";
-
-/**
- * @type {rollup.RollupFileOptions}
- */
-const config = {
-  input: "./esm/cognitiveServicesManagementClient.js",
-  external: [
-    "@azure/ms-rest-js",
-    "@azure/ms-rest-azure-js"
-  ],
-  output: {
-    file: "./dist/arm-cognitiveservices.js",
-    format: "umd",
-    name: "Azure.ArmCognitiveservices",
-    sourcemap: true,
-    globals: {
-      "@azure/ms-rest-js": "msRest",
-      "@azure/ms-rest-azure-js": "msRestAzure"
-    },
-    banner: `/*
+/*
  * 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.
- */`
-  },
-  plugins: [
-    nodeResolve({ mainFields: ['module', 'main'] }),
-    sourcemaps()
-  ]
+ */
+
+import nodeResolve from "@rollup/plugin-node-resolve";
+import cjs from "@rollup/plugin-commonjs";
+import sourcemaps from "rollup-plugin-sourcemaps";
+import multiEntry from "@rollup/plugin-multi-entry";
+import json from "@rollup/plugin-json";
+
+import nodeBuiltins from "builtin-modules";
+
+/**
+ * Gets the proper configuration needed for rollup's commonJS plugin for @opentelemetry/api.
+ *
+ * NOTE: this manual configuration is only needed because OpenTelemetry uses an
+ * __exportStar downleveled helper function to declare its exports which confuses
+ * rollup's automatic discovery mechanism.
+ *
+ * @returns an object reference that can be `...`'d into your cjs() configuration.
+ */
+export function openTelemetryCommonJs() {
+  const namedExports = {};
+
+  for (const key of [
+    "@opentelemetry/api",
+    "@azure/core-tracing/node_modules/@opentelemetry/api"
+  ]) {
+    namedExports[key] = [
+      "SpanKind",
+      "TraceFlags",
+      "getSpan",
+      "setSpan",
+      "SpanStatusCode",
+      "getSpanContext",
+      "setSpanContext"
+    ];
+  }
+
+  const releasedOpenTelemetryVersions = ["0.10.2", "1.0.0-rc.0"];
+
+  for (const version of releasedOpenTelemetryVersions) {
+    namedExports[
+      // working around a limitation in the rollup common.js plugin - it's not able to resolve these modules so the named exports listed above will not get applied. We have to drill down to the actual path.
+      `../../../common/temp/node_modules/.pnpm/@opentelemetry/api@${version}/node_modules/@opentelemetry/api/build/src/index.js`
+    ] = [
+      "SpanKind",
+      "TraceFlags",
+      "getSpan",
+      "setSpan",
+      "StatusCode",
+      "CanonicalCode",
+      "getSpanContext",
+      "setSpanContext"
+    ];
+  }
+
+  return namedExports;
+}
+
+// #region Warning Handler
+
+/**
+ * A function that can determine whether a rollupwarning should be ignored. If
+ * the function returns `true`, then the warning will not be displayed.
+ */
+
+function ignoreNiseSinonEvalWarnings(warning) {
+  return (
+    warning.code === "EVAL" &&
+    warning.id &&
+      (warning.id.includes("node_modules/nise") ||
+        warning.id.includes("node_modules/sinon")) === true
+  );
+}
+
+function ignoreChaiCircularDependencyWarnings(warning) {
+  return (
+    warning.code === "CIRCULAR_DEPENDENCY" &&
+    warning.importer && warning.importer.includes("node_modules/chai") === true
+  );
+}
+
+const warningInhibitors = [
+  ignoreChaiCircularDependencyWarnings,
+  ignoreNiseSinonEvalWarnings
+];
+
+/**
+ * Construct a warning handler for the shared rollup configuration
+ * that ignores certain warnings that are not relevant to testing.
+ */
+function makeOnWarnForTesting() {
+  return (warning, warn) => {
+    // If every inhibitor returns false (i.e. no inhibitors), then show the warning
+    if (warningInhibitors.every((inhib) => !inhib(warning))) {
+      warn(warning);
+    }
+  };
+}
+
+// #endregion
+
+function makeBrowserTestConfig() {
+  const config = {
+    input: {
+      include: ["dist-esm/test/**/*.spec.js"],
+      exclude: ["dist-esm/test/**/node/**"]
+    },
+    output: {
+      file: `dist-test/index.browser.js`,
+      format: "umd",
+      sourcemap: true
+    },
+    preserveSymlinks: false,
+    plugins: [
+      multiEntry({ exports: false }),
+      nodeResolve({
+        mainFields: ["module", "browser"]
+      }),
+      cjs({
+        namedExports: {
+          // Chai's strange internal architecture makes it impossible to statically
+          // analyze its exports.
+          chai: [
+            "version",
+            "use",
+            "util",
+            "config",
+            "expect",
+            "should",
+            "assert"
+          ],
+          ...openTelemetryCommonJs()
+        }
+      }),
+      json(),
+      sourcemaps()
+      //viz({ filename: "dist-test/browser-stats.html", sourcemap: true })
+    ],
+    onwarn: makeOnWarnForTesting(),
+    // Disable tree-shaking of test code.  In rollup-plugin-node-resolve@5.0.0,
+    // rollup started respecting the "sideEffects" field in package.json.  Since
+    // our package.json sets "sideEffects=false", this also applies to test
+    // code, which causes all tests to be removed by tree-shaking.
+    treeshake: false
+  };
+
+  return config;
+}
+
+const defaultConfigurationOptions = {
+  disableBrowserBundle: false
 };
 
-export default config;
+export function makeConfig(pkg, options) {
+  options = {
+    ...defaultConfigurationOptions,
+    ...(options || {})
+  };
+
+  const baseConfig = {
+    // Use the package's module field if it has one
+    input: pkg["module"] || "dist-esm/src/index.js",
+    external: [
+      ...nodeBuiltins,
+      ...Object.keys(pkg.dependencies),
+      ...Object.keys(pkg.devDependencies)
+    ],
+    output: { file: "dist/index.js", format: "cjs", sourcemap: true },
+    preserveSymlinks: false,
+    plugins: [sourcemaps(), nodeResolve(), cjs()]
+  };
+
+  const config = [baseConfig];
+
+  if (!options.disableBrowserBundle) {
+    config.push(makeBrowserTestConfig());
+  }
+
+  return config;
+}
+
+export default makeConfig(require("./package.json"));

package/src/cognitiveServicesManagementClient.ts

@@ -3,53 +3,108 @@
  * 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.
+ * Changes may cause incorrect behavior and will be lost if the code is regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
-import { TokenCredential } from "@azure/core-auth";
-import * as Models from "./models";
-import * as Mappers from "./models/mappers";
+import * as coreClient from "@azure/core-client";
+import * as coreAuth from "@azure/core-auth";
+import {
+  AccountsImpl,
+  DeletedAccountsImpl,
+  ResourceSkusImpl,
+  OperationsImpl,
+  CommitmentTiersImpl,
+  PrivateEndpointConnectionsImpl,
+  PrivateLinkResourcesImpl,
+  DeploymentsImpl,
+  CommitmentPlansImpl
+} from "./operations";
+import {
+  Accounts,
+  DeletedAccounts,
+  ResourceSkus,
+  Operations,
+  CommitmentTiers,
+  PrivateEndpointConnections,
+  PrivateLinkResources,
+  Deployments,
+  CommitmentPlans
+} from "./operationsInterfaces";
 import * as Parameters from "./models/parameters";
-import * as operations from "./operations";
-import { CognitiveServicesManagementClientContext } from "./cognitiveServicesManagementClientContext";
-
+import * as Mappers from "./models/mappers";
+import {
+  CognitiveServicesManagementClientOptionalParams,
+  CheckSkuAvailabilityOptionalParams,
+  CheckSkuAvailabilityResponse,
+  CheckDomainAvailabilityOptionalParams,
+  CheckDomainAvailabilityResponse
+} from "./models";
 
-class CognitiveServicesManagementClient extends CognitiveServicesManagementClientContext {
-  // Operation groups
-  accounts: operations.Accounts;
-  deletedAccounts: operations.DeletedAccounts;
-  resourceSkus: operations.ResourceSkus;
-  operations: operations.Operations;
-  commitmentTiers: operations.CommitmentTiers;
-  privateEndpointConnections: operations.PrivateEndpointConnections;
-  privateLinkResources: operations.PrivateLinkResources;
-  deployments: operations.Deployments;
-  commitmentPlans: operations.CommitmentPlans;
+export class CognitiveServicesManagementClient extends coreClient.ServiceClient {
+  $host: string;
+  apiVersion: string;
+  subscriptionId: string;
 
   /**
    * Initializes a new instance of the CognitiveServicesManagementClient class.
-   * @param credentials Credentials needed for the client to connect to Azure. Credentials
-   * implementing the TokenCredential interface from the @azure/identity package are recommended. For
-   * more information about these credentials, see
-   * {@link https://www.npmjs.com/package/@azure/identity}. Credentials implementing the
-   * ServiceClientCredentials interface from the older packages @azure/ms-rest-nodeauth and
-   * @azure/ms-rest-browserauth are also supported.
+   * @param credentials Subscription credentials which uniquely identify client subscription.
    * @param subscriptionId The ID of the target subscription.
-   * @param [options] The parameter options
+   * @param options The parameter options
    */
-  constructor(credentials: msRest.ServiceClientCredentials | TokenCredential, subscriptionId: string, options?: Models.CognitiveServicesManagementClientOptions) {
-    super(credentials, subscriptionId, options);
-    this.accounts = new operations.Accounts(this);
-    this.deletedAccounts = new operations.DeletedAccounts(this);
-    this.resourceSkus = new operations.ResourceSkus(this);
-    this.operations = new operations.Operations(this);
-    this.commitmentTiers = new operations.CommitmentTiers(this);
-    this.privateEndpointConnections = new operations.PrivateEndpointConnections(this);
-    this.privateLinkResources = new operations.PrivateLinkResources(this);
-    this.deployments = new operations.Deployments(this);
-    this.commitmentPlans = new operations.CommitmentPlans(this);
+  constructor(
+    credentials: coreAuth.TokenCredential,
+    subscriptionId: string,
+    options?: CognitiveServicesManagementClientOptionalParams
+  ) {
+    if (credentials === undefined) {
+      throw new Error("'credentials' cannot be null");
+    }
+    if (subscriptionId === undefined) {
+      throw new Error("'subscriptionId' cannot be null");
+    }
+
+    // Initializing default values for options
+    if (!options) {
+      options = {};
+    }
+    const defaults: CognitiveServicesManagementClientOptionalParams = {
+      requestContentType: "application/json; charset=utf-8",
+      credential: credentials
+    };
+
+    const packageDetails = `azsdk-js-arm-cognitiveservices/7.0.0`;
+    const userAgentPrefix =
+      options.userAgentOptions && options.userAgentOptions.userAgentPrefix
+        ? `${options.userAgentOptions.userAgentPrefix} ${packageDetails}`
+        : `${packageDetails}`;
+
+    if (!options.credentialScopes) {
+      options.credentialScopes = ["https://management.azure.com/.default"];
+    }
+    const optionsWithDefaults = {
+      ...defaults,
+      ...options,
+      userAgentOptions: {
+        userAgentPrefix
+      },
+      baseUri: options.endpoint || "https://management.azure.com"
+    };
+    super(optionsWithDefaults);
+    // Parameter assignments
+    this.subscriptionId = subscriptionId;
+
+    // Assigning values to Constant parameters
+    this.$host = options.$host || "https://management.azure.com";
+    this.apiVersion = options.apiVersion || "2021-10-01";
+    this.accounts = new AccountsImpl(this);
+    this.deletedAccounts = new DeletedAccountsImpl(this);
+    this.resourceSkus = new ResourceSkusImpl(this);
+    this.operations = new OperationsImpl(this);
+    this.commitmentTiers = new CommitmentTiersImpl(this);
+    this.privateEndpointConnections = new PrivateEndpointConnectionsImpl(this);
+    this.privateLinkResources = new PrivateLinkResourcesImpl(this);
+    this.deployments = new DeploymentsImpl(this);
+    this.commitmentPlans = new CommitmentPlansImpl(this);
   }
 
   /**
@@ -57,100 +112,56 @@ class CognitiveServicesManagementClient extends CognitiveServicesManagementClien
    * @param location Resource location.
    * @param skus The SKU of the resource.
    * @param kind The Kind of the resource.
-   * @param type The Type of the resource.
-   * @param [options] The optional parameters
-   * @returns Promise<Models.CheckSkuAvailabilityResponse>
-   */
-  checkSkuAvailability(location: string, skus: string[], kind: string, type: string, options?: msRest.RequestOptionsBase): Promise<Models.CheckSkuAvailabilityResponse>;
-  /**
-   * @param location Resource location.
-   * @param skus The SKU of the resource.
-   * @param kind The Kind of the resource.
-   * @param type The Type of the resource.
-   * @param callback The callback
+   * @param typeParam The Type of the resource.
+   * @param options The options parameters.
    */
-  checkSkuAvailability(location: string, skus: string[], kind: string, type: string, callback: msRest.ServiceCallback<Models.SkuAvailabilityListResult>): void;
-  /**
-   * @param location Resource location.
-   * @param skus The SKU of the resource.
-   * @param kind The Kind of the resource.
-   * @param type The Type of the resource.
-   * @param options The optional parameters
-   * @param callback The callback
-   */
-  checkSkuAvailability(location: string, skus: string[], kind: string, type: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.SkuAvailabilityListResult>): void;
-  checkSkuAvailability(location: string, skus: string[], kind: string, type: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.SkuAvailabilityListResult>, callback?: msRest.ServiceCallback<Models.SkuAvailabilityListResult>): Promise<Models.CheckSkuAvailabilityResponse> {
+  checkSkuAvailability(
+    location: string,
+    skus: string[],
+    kind: string,
+    typeParam: string,
+    options?: CheckSkuAvailabilityOptionalParams
+  ): Promise<CheckSkuAvailabilityResponse> {
     return this.sendOperationRequest(
-      {
-        location,
-        skus,
-        kind,
-        type,
-        options
-      },
-      checkSkuAvailabilityOperationSpec,
-      callback) as Promise<Models.CheckSkuAvailabilityResponse>;
+      { location, skus, kind, typeParam, options },
+      checkSkuAvailabilityOperationSpec
+    );
   }
 
   /**
    * Check whether a domain is available.
    * @param subdomainName The subdomain name to use.
-   * @param type The Type of the resource.
-   * @param [options] The optional parameters
-   * @returns Promise<Models.CheckDomainAvailabilityResponse>
-   */
-  checkDomainAvailability(subdomainName: string, type: string, options?: Models.CognitiveServicesManagementClientCheckDomainAvailabilityOptionalParams): Promise<Models.CheckDomainAvailabilityResponse>;
-  /**
-   * @param subdomainName The subdomain name to use.
-   * @param type The Type of the resource.
-   * @param callback The callback
-   */
-  checkDomainAvailability(subdomainName: string, type: string, callback: msRest.ServiceCallback<Models.DomainAvailability>): void;
-  /**
-   * @param subdomainName The subdomain name to use.
-   * @param type The Type of the resource.
-   * @param options The optional parameters
-   * @param callback The callback
+   * @param typeParam The Type of the resource.
+   * @param options The options parameters.
    */
-  checkDomainAvailability(subdomainName: string, type: string, options: Models.CognitiveServicesManagementClientCheckDomainAvailabilityOptionalParams, callback: msRest.ServiceCallback<Models.DomainAvailability>): void;
-  checkDomainAvailability(subdomainName: string, type: string, options?: Models.CognitiveServicesManagementClientCheckDomainAvailabilityOptionalParams | msRest.ServiceCallback<Models.DomainAvailability>, callback?: msRest.ServiceCallback<Models.DomainAvailability>): Promise<Models.CheckDomainAvailabilityResponse> {
+  checkDomainAvailability(
+    subdomainName: string,
+    typeParam: string,
+    options?: CheckDomainAvailabilityOptionalParams
+  ): Promise<CheckDomainAvailabilityResponse> {
     return this.sendOperationRequest(
-      {
-        subdomainName,
-        type,
-        options
-      },
-      checkDomainAvailabilityOperationSpec,
-      callback) as Promise<Models.CheckDomainAvailabilityResponse>;
+      { subdomainName, typeParam, options },
+      checkDomainAvailabilityOperationSpec
+    );
   }
-}
 
+  accounts: Accounts;
+  deletedAccounts: DeletedAccounts;
+  resourceSkus: ResourceSkus;
+  operations: Operations;
+  commitmentTiers: CommitmentTiers;
+  privateEndpointConnections: PrivateEndpointConnections;
+  privateLinkResources: PrivateLinkResources;
+  deployments: Deployments;
+  commitmentPlans: CommitmentPlans;
+}
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const checkSkuAvailabilityOperationSpec: msRest.OperationSpec = {
+const serializer = coreClient.createSerializer(Mappers, /* isXml */ false);
+
+const checkSkuAvailabilityOperationSpec: coreClient.OperationSpec = {
+  path:
+    "/subscriptions/{subscriptionId}/providers/Microsoft.CognitiveServices/locations/{location}/checkSkuAvailability",
   httpMethod: "POST",
-  path: "subscriptions/{subscriptionId}/providers/Microsoft.CognitiveServices/locations/{location}/checkSkuAvailability",
-  urlParameters: [
-    Parameters.subscriptionId,
-    Parameters.location
-  ],
-  queryParameters: [
-    Parameters.apiVersion
-  ],
-  headerParameters: [
-    Parameters.acceptLanguage
-  ],
-  requestBody: {
-    parameterPath: {
-      skus: "skus",
-      kind: "kind",
-      type: "type"
-    },
-    mapper: {
-      ...Mappers.CheckSkuAvailabilityParameter,
-      required: true
-    }
-  },
   responses: {
     200: {
       bodyMapper: Mappers.SkuAvailabilityListResult
@@ -159,35 +170,24 @@ const checkSkuAvailabilityOperationSpec: msRest.OperationSpec = {
       bodyMapper: Mappers.ErrorResponse
     }
   },
+  requestBody: {
+    parameterPath: { skus: ["skus"], kind: ["kind"], typeParam: ["typeParam"] },
+    mapper: { ...Mappers.CheckSkuAvailabilityParameter, required: true }
+  },
+  queryParameters: [Parameters.apiVersion],
+  urlParameters: [
+    Parameters.$host,
+    Parameters.subscriptionId,
+    Parameters.location
+  ],
+  headerParameters: [Parameters.contentType, Parameters.accept],
+  mediaType: "json",
   serializer
 };
-
-const checkDomainAvailabilityOperationSpec: msRest.OperationSpec = {
+const checkDomainAvailabilityOperationSpec: coreClient.OperationSpec = {
+  path:
+    "/subscriptions/{subscriptionId}/providers/Microsoft.CognitiveServices/checkDomainAvailability",
   httpMethod: "POST",
-  path: "subscriptions/{subscriptionId}/providers/Microsoft.CognitiveServices/checkDomainAvailability",
-  urlParameters: [
-    Parameters.subscriptionId
-  ],
-  queryParameters: [
-    Parameters.apiVersion
-  ],
-  headerParameters: [
-    Parameters.acceptLanguage
-  ],
-  requestBody: {
-    parameterPath: {
-      subdomainName: "subdomainName",
-      type: "type",
-      kind: [
-        "options",
-        "kind"
-      ]
-    },
-    mapper: {
-      ...Mappers.CheckDomainAvailabilityParameter,
-      required: true
-    }
-  },
   responses: {
     200: {
       bodyMapper: Mappers.DomainAvailability
@@ -196,13 +196,17 @@ const checkDomainAvailabilityOperationSpec: msRest.OperationSpec = {
       bodyMapper: Mappers.ErrorResponse
     }
   },
+  requestBody: {
+    parameterPath: {
+      subdomainName: ["subdomainName"],
+      typeParam: ["typeParam"],
+      kind: ["options", "kind"]
+    },
+    mapper: { ...Mappers.CheckDomainAvailabilityParameter, required: true }
+  },
+  queryParameters: [Parameters.apiVersion],
+  urlParameters: [Parameters.$host, Parameters.subscriptionId],
+  headerParameters: [Parameters.contentType, Parameters.accept],
+  mediaType: "json",
   serializer
 };
-
-export {
-  CognitiveServicesManagementClient,
-  CognitiveServicesManagementClientContext,
-  Models as CognitiveServicesManagementModels,
-  Mappers as CognitiveServicesManagementMappers
-};
-export * from "./operations";

package/src/{models/resourceSkusMappers.ts → index.ts}

@@ -6,12 +6,7 @@
  * Changes may cause incorrect behavior and will be lost if the code is regenerated.
  */
 
-export {
-  ErrorAdditionalInfo,
-  ErrorDetail,
-  ErrorResponse,
-  ResourceSku,
-  ResourceSkuListResult,
-  ResourceSkuRestrictionInfo,
-  ResourceSkuRestrictions
-} from "../models/mappers";
+/// <reference lib="esnext.asynciterable" />
+export * from "./models";
+export { CognitiveServicesManagementClient } from "./cognitiveServicesManagementClient";
+export * from "./operationsInterfaces";

package/src/lroImpl.ts

@@ -0,0 +1,34 @@
+/*
+ * 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.
+ */
+
+import { LongRunningOperation, LroResponse } from "@azure/core-lro";
+
+export class LroImpl<T> implements LongRunningOperation<T> {
+  constructor(
+    private sendOperationFn: (args: any, spec: any) => Promise<LroResponse<T>>,
+    private args: Record<string, unknown>,
+    private spec: {
+      readonly requestBody?: unknown;
+      readonly path?: string;
+      readonly httpMethod: string;
+    } & Record<string, any>,
+    public requestPath: string = spec.path!,
+    public requestMethod: string = spec.httpMethod
+  ) {}
+  public async sendInitialRequest(): Promise<LroResponse<T>> {
+    return this.sendOperationFn(this.args, this.spec);
+  }
+  public async sendPollRequest(path: string): Promise<LroResponse<T>> {
+    const { requestBody, ...restSpec } = this.spec;
+    return this.sendOperationFn(this.args, {
+      ...restSpec,
+      path,
+      httpMethod: "GET"
+    });
+  }
+}