@autorest/typescript 6.0.0-beta.7 → 6.0.0-rc.1

package/src/generators/test/sampleTestGenerator.ts

@@ -0,0 +1,32 @@
+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 generateSampleTestFile(
+    project: Project
+  ) {
+    const { generateTest, restLevelClient } = getAutorestOptions();
+    if (!generateTest) {
+      return;
+    }
+    const metadata = {}
+    if (restLevelClient) {
+      const file = fs.readFileSync(path.join(__dirname, "rlcSampleTest.spec.ts.hbs"), {
+        encoding: "utf-8"
+      });
+      const readmeFileContents = hbs.compile(file, { noEscape: true });
+      project.createSourceFile("test/public/sampleTest.spec.ts", readmeFileContents(metadata), {
+        overwrite: true
+      });
+    } else {
+      const file = fs.readFileSync(path.join(__dirname, "sampleTest.ts.hbs"), {
+        encoding: "utf-8"
+      });
+      const readmeFileContents = hbs.compile(file, { noEscape: true });
+      project.createSourceFile("test/sampleTest.ts", readmeFileContents(metadata), {
+        overwrite: true
+      });
+    }
+  }

package/src/generators/tracingFileGenerator.ts

@@ -2,8 +2,6 @@
 // Licensed under the MIT License.
 
 import { Project, SourceFile, VariableDeclarationKind } from "ts-morph";
-import { PackageDetails } from "../models/packageDetails";
-import { NameType, normalizeName } from "../utils/nameUtils";
 import { getAutorestOptions } from "../autorestSession";
 
 export function generateTracingFile(project: Project) {
@@ -18,7 +16,7 @@ export function generateTracingFile(project: Project) {
 
   file.addImportDeclarations([
     {
-      namedImports: ["createSpanFunction"],
+      namedImports: ["createTracingClient"],
       moduleSpecifier: "@azure/core-tracing"
     }
   ]);
@@ -28,7 +26,7 @@ export function generateTracingFile(project: Project) {
 }
 
 function writeCreateSpanFunction(file: SourceFile) {
-  const { tracingInfo } = getAutorestOptions();
+  const { tracingInfo, packageDetails } = getAutorestOptions();
 
   if (!tracingInfo) {
     return;
@@ -39,29 +37,13 @@ function writeCreateSpanFunction(file: SourceFile) {
     declarationKind: VariableDeclarationKind.Const,
     declarations: [
       {
-        name: "createSpan",
-        initializer: `createSpanFunction({
+        name: "tracingClient",
+        initializer: `createTracingClient({
         namespace: "${tracingInfo.namespace}",
-        packagePrefix: "${tracingInfo.packagePrefix}"
+        packageName: "${packageDetails.name}",
+        packageVersion: "${packageDetails.version}"
       });`
       }
     ]
   });
 }
-
-function getTelemetryPackageName({ nameWithoutScope }: PackageDetails) {
-  return nameWithoutScope
-    .split(/[-._ ]+/)
-    .map(part => normalizeName(part, NameType.Class));
-}
-
-function getTelemetryNamespace(packageDetails: PackageDetails) {
-  const { scopeName } = packageDetails;
-
-  return [
-    ...(scopeName ? [scopeName] : []),
-    ...getTelemetryPackageName(packageDetails)
-  ]
-    .map(part => normalizeName(part, NameType.Class))
-    .join(".");
-}

package/src/generators/utils/pagingOperations.ts

@@ -52,7 +52,6 @@ export function addPagingImports(
   const { disablePagingAsyncIterators } = getAutorestOptions();
   if (!disablePagingAsyncIterators && hasAsyncIteratorOperations(operations)) {
     sourceFile.addImportDeclarations([
-      { moduleSpecifier: "@azure/core-paging" },
       {
         namedImports: ["PagedAsyncIterableIterator"],
         moduleSpecifier: "@azure/core-paging"
@@ -231,7 +230,7 @@ export function writeAsyncIterators(
  * This method enforces Azure SDK Typescript guideline that paging methods should be named list*
  * https://azure.github.io/azure-sdk/typescript_design.html#ts-pagination-provide-list
  */
-function getPublicMethodName(operation: OperationDetails) {
+export function getPublicMethodName(operation: OperationDetails) {
   let initialOperationName = normalizeName(operation.name, NameType.Operation);
   if (initialOperationName.indexOf("list") === 0) {
     initialOperationName = initialOperationName.replace("list", "");

package/src/generators/utils/tracingUtils.ts

@@ -14,11 +14,7 @@ export function addTracingOperationImports(
   if (tracingInfo) {
     sourceFile.addImportDeclarations([
       {
-        namedImports: ["CanonicalCode"],
-        moduleSpecifier: "@opentelemetry/api"
-      },
-      {
-        namedImports: ["createSpan"],
+        namedImports: ["tracingClient"],
         moduleSpecifier: `${traverseToRoot}/tracing`
       }
     ]);

package/src/lroImpl.ts

@@ -0,0 +1,26 @@
+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"
+    });
+  }
+}

package/src/main.ts

@@ -1,7 +1,10 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-import { AutoRestExtension, Host } from "@autorest/extension-base";
+import {
+  AutoRestExtension,
+  AutorestExtensionHost
+} from "@autorest/extension-base";
 import { generateTypeScriptLibrary } from "./typescriptGenerator";
 import { generateRestLevelClient } from "./restLevelClient/generateRestLevel";
 import {
@@ -10,7 +13,7 @@ import {
   getAutorestOptions
 } from "./autorestSession";
 
-export async function processRequest(host: Host) {
+export async function processRequest(host: AutorestExtensionHost) {
   await initializeSession(host);
   const session = getSession();
   const { restLevelClient } = getAutorestOptions();
@@ -19,7 +22,7 @@ export async function processRequest(host: Host) {
     restLevelClient
       ? await generateRestLevelClient()
       : await generateTypeScriptLibrary(session.model, host);
-    session.log(`Autorest.Typescript took ${Date.now() - start}ms`, "");
+    session.info(`Autorest.Typescript took ${Date.now() - start}ms`);
   } catch (err) {
     session.error("An error was encountered while handling a request:", err);
     throw err;
@@ -28,8 +31,8 @@ export async function processRequest(host: Host) {
 
 async function main() {
   const pluginHost = new AutoRestExtension();
-  pluginHost.Add("typescript", processRequest);
-  await pluginHost.Run();
+  pluginHost.add("typescript", processRequest);
+  await pluginHost.run();
 }
 
 main();

package/src/models/clientDetails.ts

@@ -9,6 +9,8 @@ import { ObjectDetails } from "./modelDetails";
 import { EndpointDetails } from "../transforms/urlTransforms";
 import { KnownMediaType } from "@azure-tools/codegen";
 import { Info } from "@autorest/codemodel";
+import { SampleGroup } from "./sampleDetails";
+import { Security } from "@autorest/codemodel";
 
 export interface ClientOptions {
   mediaTypes?: Set<KnownMediaType>;
@@ -17,7 +19,12 @@ export interface ClientOptions {
 
 export interface TracingInfo {
   namespace: string;
-  packagePrefix: string;
+  packagePrefix?: string;
+}
+
+export interface DependencyInfo {
+  link: string;
+  description: string;
 }
 
 export interface ClientDetails {
@@ -32,4 +39,7 @@ export interface ClientDetails {
   parameters: ParameterDetails[];
   options: ClientOptions;
   endpoint: EndpointDetails;
+  samples?: SampleGroup[];
+  allTypes: string[];
+  security: Security
 }

package/src/models/modelDetails.ts

@@ -65,7 +65,7 @@ export type PolymorphicObjectDetails = BasicObjectDetails & {
 export interface PropertyDetails {
   name: string;
   description?: string;
-  defaultValue?: string;
+  defaultValue?: string | number | boolean;
   serializedName: string;
   type: string;
   required: boolean;
@@ -83,7 +83,7 @@ export interface TypeDetails {
   typeName: string;
   isConstant?: boolean;
   nullable?: boolean;
-  defaultValue?: string;
+  defaultValue?: string | number | boolean;
   kind: PropertyKind;
   usedModels: string[];
 }

package/src/models/operationDetails.ts

@@ -103,6 +103,7 @@ export interface OperationSpecDetails {
 export interface OperationGroupDetails {
   key: string;
   name: string;
+  originalKey: string;
   operations: OperationDetails[];
   mediaTypes: Set<KnownMediaType>;
   isTopLevel: boolean;

package/src/models/sampleDetails.ts

@@ -0,0 +1,22 @@
+export interface SampleGroup {
+    sampleFileName: string,
+    clientClassName: string,
+    clientPackageName: string,
+    samples: SampleDetails[],
+    importedTypes?: string[],
+}
+
+export interface SampleDetails {
+    sampleFunctionName: string,
+    clientParameterNames: string,
+    methodParameterNames: string,
+    clientParamAssignments: string[],
+    methodParamAssignments: string[],
+    originalFileLocation?: string,
+    operationName: string,
+    isTopLevel: boolean,
+    isPaging: boolean,
+    operationGroupName: string,
+    operationDescription: string,
+    clientClassName: string,
+}