@autorest/typescript 6.0.0-beta.19 → 6.0.0-beta.20

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/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/models/clientDetails.ts

@@ -18,7 +18,7 @@ export interface ClientOptions {
 
 export interface TracingInfo {
   namespace: string;
-  packagePrefix: string;
+  packagePrefix?: string;
 }
 
 export interface DependencyInfo {

package/src/restLevelClient/generateClientDefinition.ts

@@ -4,6 +4,7 @@ import {
   ParameterLocation,
   ImplementationLocation
 } from "@autorest/codemodel";
+import { isEqual } from "lodash";
 
 import { getResponseTypeName } from "./operationHelpers";
 
@@ -97,7 +98,12 @@ export function generatePathFirstClient(model: CodeModel, project: Project) {
             )}>`
           };
 
-          if (pathDictionary[path].methods[`${method}`]) {
+          if (
+            pathDictionary[path].methods[`${method}`] &&
+            !pathDictionary[path].methods[`${method}`].some(m =>
+              isEqual(m, newMethod)
+            )
+          ) {
             pathDictionary[path].methods[`${method}`].push(newMethod);
           } else {
             pathDictionary[path].methods[`${method}`] = [newMethod];
@@ -119,7 +125,9 @@ export function generatePathFirstClient(model: CodeModel, project: Project) {
 
   const clientName = getLanguageMetadata(model.language).name;
 
-  const clientInterfaceName = clientName.endsWith("Client")? `${clientName}`: `${clientName}Client`;
+  const clientInterfaceName = clientName.endsWith("Client")
+    ? `${clientName}`
+    : `${clientName}Client`;
 
   const { rlcShortcut } = getAutorestOptions();
 
@@ -322,12 +330,6 @@ function getPathFirstRoutesInterfaceDefinition(
   return signatures;
 }
 
-function getClientUriParameter() {
-  const { model } = getSession();
-  const { parameterName } = transformBaseUrl(model);
-  return parameterName;
-}
-
 function generatePathFirstRouteMethodsDefinition(
   operationName: string,
   methods: Methods,

package/src/restLevelClient/generateRestLevel.ts

@@ -28,6 +28,7 @@ import { generateRollupConfig } from "../generators/static/rollupConfigFileGener
 import { generateReadmeFile } from "../generators/static/readmeFileGenerator";
 import * as path from "path";
 import * as fsextra from "fs-extra";
+import { generateSampleEnv } from "../generators/samples/sampleEnvGenerator";
 
 /**
  * Generates a Rest Level Client library
@@ -35,7 +36,7 @@ import * as fsextra from "fs-extra";
 export async function generateRestLevelClient() {
   const host = getHost();
   const { model } = getSession();
-  const { outputPath, srcPath } = getAutorestOptions();
+  const { outputPath, srcPath, generateTest } = getAutorestOptions();
 
   const project = new Project({
     useInMemoryFileSystem: true,
@@ -75,7 +76,9 @@ export async function generateRestLevelClient() {
   generateIndexFile(project);
 
   generateTopLevelIndexFile(model, project);
-
+  if (generateTest) {
+    generateSampleEnv(project);
+  }
   // Save the source files to the virtual filesystem
   project.saveSync();
   const fs = project.getFileSystem();