@azure/arm-commerce 3.0.0 → 4.0.0-beta.1

package/package.json

@@ -1,59 +1,101 @@
 {
   "name": "@azure/arm-commerce",
+  "sdk-type": "mgmt",
   "author": "Microsoft Corporation",
-  "description": "UsageManagementClient Library with typescript type definitions for node.js and browser.",
-  "version": "3.0.0",
+  "description": "A generated SDK for UsageManagementClient.",
+  "version": "4.0.0-beta.1",
+  "engines": { "node": ">=12.0.0" },
   "dependencies": {
-    "@azure/ms-rest-azure-js": "^2.1.0",
-    "@azure/ms-rest-js": "^2.2.0",
-    "@azure/core-auth": "^1.1.4",
-    "tslib": "^1.10.0"
+    "@azure/core-paging": "^1.2.0",
+    "@azure/core-client": "^1.0.0",
+    "@azure/core-auth": "^1.3.0",
+    "@azure/core-rest-pipeline": "^1.1.0",
+    "tslib": "^2.2.0"
   },
-  "keywords": [
-    "node",
-    "azure",
-    "typescript",
-    "browser",
-    "isomorphic"
-  ],
+  "keywords": ["node", "azure", "typescript", "browser", "isomorphic"],
   "license": "MIT",
-  "main": "./dist/arm-commerce.js",
-  "module": "./esm/usageManagementClient.js",
-  "types": "./esm/usageManagementClient.d.ts",
+  "main": "./dist/index.js",
+  "module": "./dist-esm/src/index.js",
+  "types": "./types/arm-commerce.d.ts",
   "devDependencies": {
-    "typescript": "^3.6.0",
-    "rollup": "^1.18.0",
-    "rollup-plugin-node-resolve": "^5.2.0",
+    "@microsoft/api-extractor": "^7.18.11",
+    "@rollup/plugin-commonjs": "11.0.2",
+    "@rollup/plugin-json": "^4.0.0",
+    "@rollup/plugin-multi-entry": "^3.0.0",
+    "@rollup/plugin-node-resolve": "^8.0.0",
+    "mkdirp": "^1.0.4",
+    "rollup": "^1.16.3",
     "rollup-plugin-sourcemaps": "^0.4.2",
-    "uglify-js": "^3.6.0"
+    "typescript": "~4.2.0",
+    "uglify-js": "^3.4.9",
+    "rimraf": "^3.0.0",
+    "@azure/identity": "^2.0.1",
+    "@azure-tools/test-recorder": "^1.0.0",
+    "mocha": "^7.1.1",
+    "cross-env": "^7.0.2"
   },
-  "homepage": "https://github.com/Azure/azure-sdk-for-js/tree/feature/v4/sdk/commerce/arm-commerce",
+  "homepage": "https://github.com/Azure/azure-sdk-for-js/tree/main/sdk/commerce/arm-commerce",
   "repository": {
     "type": "git",
     "url": "https://github.com/Azure/azure-sdk-for-js.git"
   },
-  "bugs": {
-    "url": "https://github.com/Azure/azure-sdk-for-js/issues"
-  },
+  "bugs": { "url": "https://github.com/Azure/azure-sdk-for-js/issues" },
   "files": [
     "dist/**/*.js",
     "dist/**/*.js.map",
     "dist/**/*.d.ts",
     "dist/**/*.d.ts.map",
-    "esm/**/*.js",
-    "esm/**/*.js.map",
-    "esm/**/*.d.ts",
-    "esm/**/*.d.ts.map",
+    "dist-esm/**/*.js",
+    "dist-esm/**/*.js.map",
+    "dist-esm/**/*.d.ts",
+    "dist-esm/**/*.d.ts.map",
     "src/**/*.ts",
     "README.md",
+    "LICENSE",
     "rollup.config.js",
-    "tsconfig.json"
+    "tsconfig.json",
+    "review/*",
+    "CHANGELOG.md",
+    "types/*"
   ],
   "scripts": {
-    "build": "tsc && rollup -c rollup.config.js && npm run minify",
-    "minify": "uglifyjs -c -m --comments --source-map \"content='./dist/arm-commerce.js.map'\" -o ./dist/arm-commerce.min.js ./dist/arm-commerce.js",
-    "prepack": "npm install && npm run build"
+    "build": "npm run clean && tsc && rollup -c 2>&1 && npm run minify && mkdirp ./review && npm run extract-api",
+    "minify": "uglifyjs -c -m --comments --source-map \"content='./dist/index.js.map'\" -o ./dist/index.min.js ./dist/index.js",
+    "prepack": "npm run build",
+    "pack": "npm pack 2>&1",
+    "extract-api": "api-extractor run --local",
+    "lint": "echo skipped",
+    "audit": "echo skipped",
+    "clean": "rimraf dist dist-browser dist-esm test-dist temp types *.tgz *.log",
+    "build:node": "echo skipped",
+    "build:browser": "echo skipped",
+    "build:test": "echo skipped",
+    "build:samples": "echo skipped.",
+    "check-format": "echo skipped",
+    "execute:samples": "echo skipped",
+    "format": "echo skipped",
+    "test": "npm run integration-test",
+    "test:node": "echo skipped",
+    "test:browser": "echo skipped",
+    "unit-test": "npm run unit-test:node && npm run unit-test:browser",
+    "unit-test:node": "cross-env TEST_MODE=playback npm run integration-test:node",
+    "unit-test:browser": "echo skipped",
+    "integration-test": "npm run integration-test:node && npm run integration-test:browser",
+    "integration-test:node": "mocha -r esm --require ts-node/register --timeout 1200000 --full-trace test/*.ts --reporter ../../../common/tools/mocha-multi-reporter.js",
+    "integration-test:browser": "echo skipped",
+    "docs": "echo skipped"
   },
   "sideEffects": false,
-  "autoPublish": true
+  "//metadata": {
+    "constantPaths": [
+      { "path": "src/UsageManagementClient.ts", "prefix": "packageDetails" }
+    ]
+  },
+  "autoPublish": true,
+  "//sampleConfiguration": {
+    "productName": "",
+    "productSlugs": ["azure"],
+    "disableDocsMs": true,
+    "apiRefLink": "https://docs.microsoft.com/javascript/api/@azure/arm-commerce?view=azure-node-preview"
+  }
 }

package/review/arm-commerce.api.md

@@ -0,0 +1,178 @@
+## API Report File for "@azure/arm-commerce"
+
+> Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
+
+```ts
+
+import * as coreAuth from '@azure/core-auth';
+import * as coreClient from '@azure/core-client';
+import { PagedAsyncIterableIterator } from '@azure/core-paging';
+
+// @public
+export type AggregationGranularity = "Daily" | "Hourly";
+
+// @public
+export interface ErrorResponse {
+    code?: string;
+    message?: string;
+}
+
+// @public
+export interface InfoField {
+    project?: string;
+}
+
+// @public
+export interface MeterInfo {
+    effectiveDate?: Date;
+    includedQuantity?: number;
+    meterCategory?: string;
+    meterId?: string;
+    meterName?: string;
+    meterRates?: {
+        [propertyName: string]: number;
+    };
+    meterRegion?: string;
+    meterSubCategory?: string;
+    meterTags?: string[];
+    unit?: string;
+}
+
+// @public
+export type MonetaryCommitment = OfferTermInfoAutoGenerated & {
+    name: "Monetary Commitment";
+    tieredDiscount?: {
+        [propertyName: string]: number;
+    };
+    excludedMeterIds?: string[];
+};
+
+// @public
+export type MonetaryCredit = OfferTermInfoAutoGenerated & {
+    name: "Monetary Credit";
+    credit?: number;
+    excludedMeterIds?: string[];
+};
+
+// @public
+export type OfferTermInfo = "Recurring Charge" | "Monetary Commitment" | "Monetary Credit";
+
+// @public
+export interface OfferTermInfoAutoGenerated {
+    effectiveDate?: Date;
+    name: "Monetary Credit" | "Monetary Commitment" | "Recurring Charge";
+}
+
+// @public (undocumented)
+export type OfferTermInfoAutoGeneratedUnion = OfferTermInfoAutoGenerated | MonetaryCredit | MonetaryCommitment | RecurringCharge;
+
+// @public
+export interface RateCard {
+    get(filter: string, options?: RateCardGetOptionalParams): Promise<RateCardGetResponse>;
+}
+
+// @public
+export interface RateCardGetOptionalParams extends coreClient.OperationOptions {
+}
+
+// @public
+export type RateCardGetResponse = ResourceRateCardInfo;
+
+// @public
+export interface RateCardQueryParameters {
+    currency: string;
+    locale: string;
+    offerDurableId: string;
+    regionInfo: string;
+}
+
+// @public
+export type RecurringCharge = OfferTermInfoAutoGenerated & {
+    name: "Recurring Charge";
+    recurringCharge?: number;
+};
+
+// @public
+export interface ResourceRateCardInfo {
+    currency?: string;
+    isTaxIncluded?: boolean;
+    locale?: string;
+    meters?: MeterInfo[];
+    offerTerms?: OfferTermInfoAutoGeneratedUnion[];
+}
+
+// @public
+export interface UsageAggregates {
+    list(reportedStartTime: Date, reportedEndTime: Date, options?: UsageAggregatesListOptionalParams): PagedAsyncIterableIterator<UsageAggregation>;
+}
+
+// @public
+export interface UsageAggregatesListNextOptionalParams extends coreClient.OperationOptions {
+    aggregationGranularity?: AggregationGranularity;
+    continuationToken?: string;
+    showDetails?: boolean;
+}
+
+// @public
+export type UsageAggregatesListNextResponse = UsageAggregationListResult;
+
+// @public
+export interface UsageAggregatesListOptionalParams extends coreClient.OperationOptions {
+    aggregationGranularity?: AggregationGranularity;
+    continuationToken?: string;
+    showDetails?: boolean;
+}
+
+// @public
+export type UsageAggregatesListResponse = UsageAggregationListResult;
+
+// @public
+export interface UsageAggregation {
+    id?: string;
+    infoFields?: InfoField;
+    instanceData?: string;
+    meterCategory?: string;
+    meterId?: string;
+    meterName?: string;
+    meterRegion?: string;
+    meterSubCategory?: string;
+    name?: string;
+    quantity?: number;
+    subscriptionId?: string;
+    type?: string;
+    unit?: string;
+    usageEndTime?: Date;
+    usageStartTime?: Date;
+}
+
+// @public
+export interface UsageAggregationListResult {
+    nextLink?: string;
+    value?: UsageAggregation[];
+}
+
+// @public (undocumented)
+export class UsageManagementClient extends coreClient.ServiceClient {
+    // (undocumented)
+    $host: string;
+    constructor(credentials: coreAuth.TokenCredential, subscriptionId: string, options?: UsageManagementClientOptionalParams);
+    // (undocumented)
+    apiVersion: string;
+    // (undocumented)
+    rateCard: RateCard;
+    // (undocumented)
+    subscriptionId: string;
+    // (undocumented)
+    usageAggregates: UsageAggregates;
+}
+
+// @public
+export interface UsageManagementClientOptionalParams extends coreClient.ServiceClientOptions {
+    $host?: string;
+    apiVersion?: string;
+    endpoint?: string;
+}
+
+// (No @packageDocumentation comment for this package)
+
+```

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/usageManagementClient.js",
-  external: [
-    "@azure/ms-rest-js",
-    "@azure/ms-rest-azure-js"
-  ],
-  output: {
-    file: "./dist/arm-commerce.js",
-    format: "umd",
-    name: "Azure.ArmCommerce",
-    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/{models/rateCardMappers.ts → index.ts}

@@ -6,13 +6,7 @@
  * Changes may cause incorrect behavior and will be lost if the code is regenerated.
  */
 
-export {
-  discriminators,
-  ErrorResponse,
-  MeterInfo,
-  MonetaryCommitment,
-  MonetaryCredit,
-  OfferTermInfo,
-  RecurringCharge,
-  ResourceRateCardInfo
-} from "../models/mappers";
+/// <reference lib="esnext.asynciterable" />
+export * from "./models";
+export { UsageManagementClient } from "./usageManagementClient";
+export * from "./operationsInterfaces";