@autorest/typescript 6.0.0-beta.14 → 6.0.0-beta.17

package/src/generators/static/readmeFileGenerator.ts

@@ -5,9 +5,10 @@ import { Project } from "ts-morph";
 import * as hbs from "handlebars";
 import * as fs from "fs";
 import * as path from "path";
-import { ClientDetails } from "../../models/clientDetails";
 import { getAutorestOptions } from "../../autorestSession";
-import { PackageDetails } from "../../models/packageDetails";
+import { Info, Languages } from "@autorest/codemodel";
+import { getLanguageMetadata } from "../../utils/languageHelpers";
+import { normalizeName, NameType } from "../../utils/nameUtils";
 
 /**
  * Meta data information about the service, the package, and the client.
@@ -50,24 +51,38 @@ interface Metadata {
   /** Indicates if the package is a test/releasable package. */
   isReleasablePackage?: boolean;
   /** indicate if the package is management plane SDK */
-  azureArm?: boolean
+  azureArm?: boolean;
+  /** The URL for the service document */
+  serviceDocURL?: string;
+  /** The dependency info for this service */
+  dependencyDescription?: string;
+  dependencyLink?: string;
+  /** Indicates if the package is a multi-client */
+  hasMultiClients?: boolean;
 }
 
 /**
  * Returns meta data information about the service, the package, and the client.
- * @param clientDetails - the client details
- * @param packageDetails - the package details
+ * @param codeModel - include the client details
  * @returns inferred metadata about the service, the package, and the client
  */
 function createMetadata(
-  packageDetails: PackageDetails,
-  clientDetails: ClientDetails,
-  azureOutputDirectory?: string,
-  addCredentials?: boolean,
-  azureArm?: boolean,
-  isTestPackage?: boolean
+  codeModelLanguage: Languages,
+  codeModelInfo: Info
 ): Metadata {
-  const azureHuh = packageDetails.scopeName === "azure";
+  const {
+    packageDetails,
+    azureOutputDirectory,
+    addCredentials,
+    azureArm,
+    isTestPackage,
+    productDocLink,
+    dependencyInfo,
+    multiClient,
+    batch
+  } = getAutorestOptions();
+
+  const azureHuh = packageDetails?.scopeName === "azure" || packageDetails?.scopeName === "azure-rest";
   const repoURL = azureHuh
     ? "https://github.com/Azure/azure-sdk-for-js"
     : undefined;
@@ -79,9 +94,9 @@ function createMetadata(
   const names = relativePackageSourcePath?.split("/").slice(1);
   const packageParentDirectoryName = names?.[0];
   const packageDirectoryName = names?.[1];
-  const clientClassName = clientDetails.name;
-  const clientPackageName = packageDetails.name;
-  const serviceTitle = clientDetails.info?.title ?? clientClassName;
+
+  const clientPackageName = packageDetails?.name;
+  const { clientClassName, serviceTitle } = getClientAndServiceName(codeModelLanguage, codeModelInfo);
   const simpleServiceName =
     /**
      * It is a required convention in Azure swaggers for their titles to end with
@@ -100,6 +115,12 @@ function createMetadata(
     : simpleServiceName;
   const identityPackageURL =
     repoURL && `${repoURL}/tree/main/sdk/identity/identity`;
+
+  var apiRefUrlQueryParameter: string = "";
+  if (packageDetails?.version.includes("beta")) {
+    apiRefUrlQueryParameter = "?view=azure-node-preview";
+  }
+
   return {
     serviceName: serviceName,
     clientPackageName: clientPackageName,
@@ -113,13 +134,13 @@ function createMetadata(
       : packageSourceURL && `${packageSourceURL}/samples`,
     impressionURL: azureHuh
       ? packageParentDirectoryName &&
-        packageDirectoryName &&
-        `https://azure-sdk-impressions.azurewebsites.net/api/impressions/azure-sdk-for-js%2Fsdk%2F${packageParentDirectoryName}%2F${packageDirectoryName}%2FREADME.png`
+      packageDirectoryName &&
+      `https://azure-sdk-impressions.azurewebsites.net/api/impressions/azure-sdk-for-js%2Fsdk%2F${packageParentDirectoryName}%2F${packageDirectoryName}%2FREADME.png`
       : undefined,
     clientDescriptiveName: `${serviceName} client`,
-    description: clientDetails.info?.description,
+    description: codeModelInfo?.description,
     apiRefURL: azureHuh
-      ? `https://docs.microsoft.com/javascript/api/${clientPackageName}`
+      ? `https://docs.microsoft.com/javascript/api/${clientPackageName}${apiRefUrlQueryParameter}`
       : undefined,
     packageNPMURL: `https://www.npmjs.com/package/${clientPackageName}`,
     contributingGuideURL: repoURL && `${repoURL}/blob/main/CONTRIBUTING.md`,
@@ -127,36 +148,31 @@ function createMetadata(
     addCredentials,
     identityPackageURL,
     isReleasablePackage: !isTestPackage,
-    azureArm: azureArm
+    azureArm: azureArm,
+    serviceDocURL: productDocLink,
+    dependencyDescription: dependencyInfo?.description,
+    dependencyLink: dependencyInfo?.link,
+    hasMultiClients: multiClient && batch && batch.length > 1
   };
 }
 
 export function generateReadmeFile(
-  clientDetails: ClientDetails,
+  codeModelLanguage: Languages,
+  codeModelInfo: Info,
   project: Project
 ) {
   const {
-    packageDetails,
-    azureOutputDirectory,
     generateMetadata,
-    addCredentials,
-    azureArm,
-    isTestPackage
+    restLevelClient,
   } = getAutorestOptions();
 
   if (!generateMetadata) {
     return;
   }
 
-  const metadata = createMetadata(
-    packageDetails,
-    clientDetails,
-    azureOutputDirectory,
-    addCredentials,
-    azureArm,
-    isTestPackage
-  );
-  const file = fs.readFileSync(path.join(__dirname, "README.md.hbs"), {
+  const metadata = createMetadata(codeModelLanguage, codeModelInfo);
+  const templateFile = !restLevelClient ? "hlcREADME.md.hbs" : "rlcREADME.md.hbs";
+  const file = fs.readFileSync(path.join(__dirname, templateFile), {
     encoding: "utf-8"
   });
   const readmeFileContents = hbs.compile(file, { noEscape: true });
@@ -164,3 +180,16 @@ export function generateReadmeFile(
     overwrite: true
   });
 }
+
+function getClientAndServiceName(codeModelLanguage: Languages,
+  codeModelInfo: Info) {
+  const { name: clientName } = getLanguageMetadata(codeModelLanguage);
+  const className = normalizeName(
+    clientName,
+    NameType.Class,
+    true /** shouldGuard */
+  );
+  const clientClassName = className;
+  const serviceTitle = codeModelInfo?.title ?? clientClassName;
+  return { clientClassName, serviceTitle };
+}

package/src/generators/static/rlcREADME.md.hbs

@@ -0,0 +1,71 @@
+# {{ clientDescriptiveName }} library for JavaScript
+
+{{ description }}
+
+**Please rely heavily on {{#if serviceDocURL}}[the service's documentation]({{ serviceDocURL }}) and {{/if}}our [REST client docs](https://github.com/Azure/azure-sdk-for-js/blob/main/documentation/rest-clients.md) to use this library**
+
+Key links:
+
+{{#if packageSourceURL}}
+- [Source code]({{ packageSourceURL }})
+{{/if}}
+{{#if packageNPMURL}}
+- [Package (NPM)]({{ packageNPMURL }})
+{{/if}}
+{{#if apiRefURL}}
+- [API reference documentation]({{ apiRefURL }})
+{{/if}}
+{{#if serviceDocURL}}
+- [Product documentation]({{ serviceDocURL }})
+{{/if}}
+{{#if samplesURL}}
+- [Samples]({{ samplesURL }})
+{{/if}}
+
+## Getting started
+
+### Currently supported environments
+
+- Node.js version 14.x.x or higher
+
+### Prerequisites
+
+- You must have an [Azure subscription](https://docs.microsoft.com/en-us/azure/cognitive-services/authentication?tabs=powershell#authenticate-with-an-authentication-token){{#if dependencyLink}} and follow [these]({{ dependencyLink }}) instructions{{/if}} to use this package.
+
+### Install the `{{ clientPackageName }}` package
+
+Install the {{ clientDescriptiveName }} REST client library for JavaScript with `npm`:
+
+```bash
+npm install {{ clientPackageName }}
+```
+
+### Create and authenticate a `{{ clientClassName }}`
+
+To use an [Azure Active Directory (AAD) token credential](https://docs.microsoft.com/en-us/azure/cognitive-services/authentication?tabs=powershell#authenticate-with-an-authentication-token),
+provide an instance of the desired credential type obtained from the
+[@azure/identity](https://github.com/Azure/azure-sdk-for-js/tree/main/sdk/identity/identity#credentials) library.
+
+To authenticate with AAD, you must first `npm` install [`@azure/identity`](https://www.npmjs.com/package/@azure/identity) {{#if dependencyLink}} and
+[{{dependencyDescription }}]({{ dependencyLink }}){{/if}}
+
+After setup, you can choose which type of [credential](https://github.com/Azure/azure-sdk-for-js/tree/main/sdk/identity/identity#credentials) from `@azure/identity` to use.
+As an example, [DefaultAzureCredential](https://github.com/Azure/azure-sdk-for-js/tree/main/sdk/identity/identity#defaultazurecredential)
+can be used to authenticate the client:
+
+Set the values of the client ID, tenant ID, and client secret of the AAD application as environment variables:
+AZURE_CLIENT_ID, AZURE_TENANT_ID, AZURE_CLIENT_SECRET
+
+## Troubleshooting
+
+### Logging
+
+Enabling logging may help uncover useful information about failures. In order to see a log of HTTP requests and responses, set the `AZURE_LOG_LEVEL` environment variable to `info`. Alternatively, logging can be enabled at runtime by calling `setLogLevel` in the `@azure/logger`:
+
+```javascript
+import { setLogLevel } from "@azure/logger";
+
+setLogLevel("info");
+```
+
+For more detailed instructions on how to enable logs, you can look at the [@azure/logger package docs](https://github.com/Azure/azure-sdk-for-js/tree/main/sdk/core/logger).

package/src/generators/static/rollupConfigFileGenerator.ts

@@ -5,12 +5,17 @@ import { Project } from "ts-morph";
 import { getAutorestOptions } from "../../autorestSession";
 
 export function generateRollupConfig(project: Project) {
-  const { generateMetadata } = getAutorestOptions();
+  const { generateMetadata, restLevelClient, azureSdkForJs } = getAutorestOptions();
 
   if (!generateMetadata) {
     return;
   }
 
+  // when it's generating rlc codes, only generate rollup config in codegen test
+  if (restLevelClient && azureSdkForJs) {
+    return;
+  }
+
   const rollupFile = project.createSourceFile("rollup.config.js", undefined, {
     overwrite: true
   });
@@ -24,62 +29,14 @@ export function generateRollupConfig(project: Project) {
     
     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
+     * A function that can determine whether a rollup warning should be ignored. If
      * the function returns \`true\`, then the warning will not be displayed.
      */
     
-    function ignoreNiseSinonEvalWarnings(warning) {
+    function ignoreNiseSinonEval(warning) {
       return (
         warning.code === "EVAL" &&
         (warning.id && ((warning.id.includes("node_modules/nise")) ||
@@ -87,7 +44,7 @@ export function generateRollupConfig(project: Project) {
       );
     }
     
-    function ignoreChaiCircularDependencyWarnings(warning) {
+    function ignoreChaiCircularDependency(warning) {
       return (
         warning.code === "CIRCULAR_DEPENDENCY" &&
         (warning.importer && warning.importer.includes("node_modules/chai") === true)
@@ -95,8 +52,8 @@ export function generateRollupConfig(project: Project) {
     }
     
     const warningInhibitors = [
-      ignoreChaiCircularDependencyWarnings,
-      ignoreNiseSinonEvalWarnings
+      ignoreChaiCircularDependency,
+      ignoreNiseSinonEval
     ];
     
     /**
@@ -131,22 +88,7 @@ export function generateRollupConfig(project: Project) {
           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()
-            }
-          }),
+          cjs(),
           json(),
           sourcemaps()
           //viz({ filename: "dist-test/browser-stats.html", sourcemap: true })
@@ -185,7 +127,7 @@ export function generateRollupConfig(project: Project) {
         ],
         output: { file: "dist/index.js", format: "cjs", sourcemap: true },
         preserveSymlinks: false,
-        plugins: [sourcemaps(), nodeResolve(), cjs()]
+        plugins: [sourcemaps(), nodeResolve()]
       };
     
       const config = [baseConfig];

package/src/generators/static/samples.ts.hbs

@@ -0,0 +1,49 @@
+
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+import {
+{{#if importedTypes.length }}
+  {{#each importedTypes}}
+  {{this}},
+  {{/each}}
+{{/if}}
+  {{clientClassName}}, 
+} from "{{clientPackageName}}";
+import { DefaultAzureCredential } from "@azure/identity";
+
+{{#each samples}}
+/**
+ * This sample demonstrates how to {{this.operationDescription}}
+ *
+ * @summary {{this.operationDescription}}
+ * x-ms-original-file: {{this.originalFileLocation}}
+ */
+async function {{this.sampleFunctionName}}() {
+  {{#each this.clientParamAssignments}}
+  {{this}}
+  {{/each}}
+  {{#each this.methodParamAssignments}}
+  {{this}}
+  {{/each}}
+  const credential = new DefaultAzureCredential();
+  const client = new {{this.clientClassName}}({{this.clientParameterNames}});
+  {{#if this.isPaging}}
+  const resArray = new Array();
+  for await (let item of client{{#unless this.isTopLevel}}.{{this.operationGroupName}}{{/unless}}.{{this.operationName}}({{this.methodParameterNames}})){
+    resArray.push(item);
+  }
+  console.log(resArray);
+  {{else}}  
+  const result = await client
+    {{#unless this.isTopLevel}}
+    .{{this.operationGroupName}}
+    {{/unless}}
+    .{{this.operationName}}({{this.methodParameterNames}});
+  console.log(result);
+  
+  {{/if}}
+}
+
+{{this.sampleFunctionName}}().catch(console.error);
+
+{{/each}}

package/src/generators/static/tsConfigFileGenerator.ts

@@ -4,7 +4,7 @@
 import { Project } from "ts-morph";
 import { getAutorestOptions } from "../../autorestSession";
 
-const highLevelTsConfig = {
+const highLevelTsConfig: Record<string, any>  = {
   compilerOptions: {
     module: "es6",
     moduleResolution: "node",
@@ -25,37 +25,64 @@ const highLevelTsConfig = {
 };
 
 
-const restLevelTsConfig = {
-  compilerOptions: {
-    module: "es6",
-    target: "es2015",
-    moduleResolution: "node",
-    declaration: true,
-    declarationMap: true,
-    outDir: "./dist-esm"
+const restLevelTsConfigInAzureSdkForJs = {
+  "extends": "../../../tsconfig.package",
+  "compilerOptions": {
+    "outDir": "./dist-esm",
+    "declarationDir": "./types",
   },
-  exclude: [
-    "node_modules",
-    "types",
-    "temp",
-    "browser",
-    "dist",
-    "dist-esm",
-    "./samples/**/*.ts"
-  ]
+  "include": ["src/**/*.ts"]
 };
 
+const restLevelTsConfigNotInAzureSdkForJs ={
+  "compilerOptions": {
+    "target": "ES2017",
+    "module": "es6",
+    "lib": [],
+    "declaration": true,
+    "declarationMap": true,
+    "inlineSources": true,
+    "sourceMap": true,
+    "importHelpers": true,
+    "strict": true,
+    "alwaysStrict": true,
+    "noUnusedLocals": true,
+    "noUnusedParameters": true,
+    "noImplicitReturns": true,
+    "noFallthroughCasesInSwitch": true,
+    "forceConsistentCasingInFileNames": true,
+    "moduleResolution": "node",
+    "allowSyntheticDefaultImports": true,
+    "esModuleInterop": true,
+    "outDir": "./dist-esm",
+    "declarationDir": "./types"
+  },
+  "include": ["./src/**/*.ts"]
+}
+
+
 export function generateTsConfig(project: Project) {
-  const { generateMetadata, restLevelClient, generateTest } = getAutorestOptions();
+  const { generateMetadata, restLevelClient, generateTest, packageDetails, generateSample, azureSdkForJs } = getAutorestOptions();
 
   if (!generateMetadata) {
     return;
   }
 
+  const clientPackageName = packageDetails.name;
+
+  const restLevelTsConfig = azureSdkForJs? restLevelTsConfigInAzureSdkForJs : restLevelTsConfigNotInAzureSdkForJs;
+
   if (generateTest) {
     highLevelTsConfig.include.push("./test/**/*.ts");
+    restLevelTsConfig.include.push("./test/**/*.ts");
   }
-  
+
+  if (generateSample) {
+    highLevelTsConfig.include.push("samples-dev/**/*.ts");
+    highLevelTsConfig.compilerOptions["paths"] = {};
+    highLevelTsConfig.compilerOptions["paths"][clientPackageName] = ["./src/index"];
+  }
+
   const tsConfigContents = restLevelClient
     ? restLevelTsConfig
     : highLevelTsConfig;

package/src/generators/test/envBrowserFileGenerator.ts

@@ -0,0 +1,14 @@
+import { Project } from "ts-morph";
+import { getAutorestOptions } from "../../autorestSession";
+
+export function generateEnvBrowserFile(
+  project: Project
+) {
+  const { generateTest, restLevelClient } = getAutorestOptions();
+  if (!generateTest || !restLevelClient) {
+    return;
+  }
+  project.createSourceFile("test/public/utils/env.browser.ts", "", {
+    overwrite: true
+  });
+}

package/src/generators/test/envFileGenerator.ts

@@ -0,0 +1,22 @@
+import { Project } from "ts-morph";
+import * as path from 'path';
+import * as fs from 'fs';
+import * as hbs from "handlebars";
+import { getAutorestOptions } from "../../autorestSession";
+
+export function generateEnvFile(
+    project: Project
+  ) {
+    const { generateTest, restLevelClient } = getAutorestOptions();
+    if (!generateTest || !restLevelClient) {
+      return;
+    }
+    const metadata = {}
+    const file = fs.readFileSync(path.join(__dirname, "rlcEnv.ts.hbs"), {
+      encoding: "utf-8"
+    });
+    const envFileContents = hbs.compile(file, { noEscape: true });
+    project.createSourceFile("test/public/utils/env.ts", envFileContents(metadata), {
+      overwrite: true
+    });
+  }

package/src/generators/test/recordedClientFileGenerator.ts

@@ -0,0 +1,22 @@
+import { Project } from "ts-morph";
+import * as path from 'path';
+import * as fs from 'fs';
+import * as hbs from "handlebars";
+import { getAutorestOptions } from "../../autorestSession";
+
+export function generateRecordedClientFile(
+    project: Project
+  ) {
+    const { generateTest, restLevelClient } = getAutorestOptions();
+    if (!generateTest || !restLevelClient) {
+      return;
+    }
+    const metadata = {}
+    const file = fs.readFileSync(path.join(__dirname, "rlcRecordedClient.ts.hbs"), {
+      encoding: "utf-8"
+    });
+    const recordedClientFileContents = hbs.compile(file, { noEscape: true });
+    project.createSourceFile("test/public/utils/recordedClient.ts", recordedClientFileContents(metadata), {
+      overwrite: true
+    });
+  }

package/src/generators/test/rlcEnv.ts.hbs

@@ -0,0 +1,3 @@
+import * as dotenv from "dotenv";
+
+dotenv.config();

package/src/generators/test/rlcRecordedClient.ts.hbs

@@ -0,0 +1,35 @@
+import { Context } from "mocha";
+import { record, RecorderEnvironmentSetup, Recorder } from "@azure-tools/test-recorder";
+import "./env";
+
+const recorderEnvSetup: RecorderEnvironmentSetup = {
+  replaceableVariables: {
+    ENDPOINT: "https://endpoint",
+    AZURE_CLIENT_ID: "azure_client_id",
+    AZURE_CLIENT_SECRET: "azure_client_secret",
+    AZURE_TENANT_ID: "88888888-8888-8888-8888-888888888888",
+    SUBSCRIPTION_ID: "azure_subscription_id"
+  },
+  customizationsOnRecordings: [
+    (recording: any): any =>
+      recording.replace(/"access_token":"[^"]*"/g, `"access_token":"access_token"`),
+    // If we put ENDPOINT in replaceableVariables above, it will not capture
+    // the endpoint string used with nock, which will be expanded to
+    // https://<endpoint>:443/ and therefore will not match, so we have to do
+    // this instead.
+    (recording: string): string => {
+      const replaced = recording.replace("endpoint:443", "endpoint");
+      return replaced;
+    },
+  ],
+  queryParametersToSkip: []
+};
+
+/**
+* creates the recorder and reads the environment variables from the `.env` file.
+* Should be called first in the test suite to make sure environment variables are
+* read before they are being used.
+*/
+export function createRecorder(context: Context): Recorder {
+    return record(context, recorderEnvSetup);
+}

package/src/generators/test/rlcSampleTest.spec.ts.hbs

@@ -0,0 +1,19 @@
+import { Recorder } from "@azure-tools/test-recorder";
+import * as assert from "assert";
+import { createRecorder } from "./utils/recordedClient";
+
+describe("My test", () => {
+  let recorder: Recorder;
+
+  beforeEach(async function() {
+    recorder = createRecorder(this);
+  });
+
+  afterEach(async function() {
+    await recorder.stop();
+  });
+
+  it("sample test", async function() {
+    assert.equal(1, 1);
+  });
+});