Upgrade to ts http runtime

packages/autorest.typescript/src/autorestSession.ts

@@ -42,6 +42,7 @@ export interface AutorestOptions {
   dependencyInfo?: DependencyInfo;
   lenientModelDeduplication?: boolean;
   useLegacyLro?: boolean;
+  branded?: boolean;
 }
 
 let host: AutorestExtensionHost;

packages/autorest.typescript/src/restLevelClient/transforms/transform.ts

@@ -4,17 +4,17 @@
 import {
   CodeModel,
   ImplementationLocation,
-  ParameterLocation,
-  Protocol
+  ParameterLocation
 } from "@autorest/codemodel";
 import {
-  ImportKind,
   RLCModel,
   HelperFunctionDetails,
   UrlInfo,
   ApiVersionInfo,
   extractPathApiVersion,
-  extractDefinedPosition
+  extractDefinedPosition,
+  buildRuntimeImports,
+  initInternalImports
 } from "@azure-tools/rlc-common";
 import { getAutorestOptions } from "../../autorestSession";
 import { transformBaseUrl } from "../../transforms/urlTransforms";
@@ -38,7 +38,7 @@ import { transformRLCSampleData } from "../../generators/samples/rlcSampleGenera
 
 export function transform(model: CodeModel): RLCModel {
   const { srcPath } = getAutorestOptions();
-  const importDetails = new Map<ImportKind, Set<string>>();
+  const importDetails = initInternalImports();
   const urlInfo = transformUrlInfo(model);
   const rlcModel: RLCModel = {
     libraryName: normalizeName(
@@ -50,11 +50,14 @@ export function transform(model: CodeModel): RLCModel {
     options: transformOptions(model),
     schemas: transformSchemas(model),
     responses: transformResponseTypes(model, importDetails),
-    importSet: importDetails,
     parameters: transformParameterTypes(model, importDetails),
     helperDetails: transformHelperDetails(model),
     urlInfo: transformUrlInfo(model),
-    apiVersionInfo: transformApiVersion(model, urlInfo)
+    apiVersionInfo: transformApiVersion(model, urlInfo),
+    importInfo: {
+      internalImports: importDetails,
+      runtimeImports: buildRuntimeImports()
+    }
   };
   rlcModel.sampleGroups = transformRLCSampleData(model, rlcModel);
   return rlcModel;

packages/autorest.typescript/src/restLevelClient/transforms/transformOptions.ts

@@ -16,7 +16,8 @@ export function transformOptions(model: CodeModel): RLCOptions {
     azureSdkForJs,
     dependencyInfo,
     productDocLink,
-    azureArm
+    azureArm,
+    branded
   } = getAutorestOptions();
   const options: RLCOptions = {};
   options.includeShortcuts = rlcShortcut;
@@ -31,6 +32,7 @@ export function transformOptions(model: CodeModel): RLCOptions {
   options.dependencyInfo = dependencyInfo;
   options.productDocLink = productDocLink;
   options.azureArm = azureArm;
+  options.branded = branded;
   options.serviceInfo = {
     title: model.info.title ?? model.language.default.name,
     description: model.info.description

packages/autorest.typescript/src/restLevelClient/transforms/transformParameterTypes.ts

@@ -12,12 +12,12 @@ import {
   Request as M4OperationRequest
 } from "@autorest/codemodel";
 import {
-  ImportKind,
   ObjectSchema,
   OperationParameter,
   ParameterBodyMetadata,
   ParameterMetadata,
-  Schema
+  Schema,
+  Imports as InnerImports
 } from "@azure-tools/rlc-common";
 import { transformObject } from "./transformSchemas";
 import { getLanguageMetadata } from "../../utils/languageHelpers";
@@ -28,7 +28,7 @@ import { getElementType, primitiveSchemaToType } from "../schemaHelpers";
 
 export function transformParameterTypes(
   model: CodeModel,
-  importDetails: Map<ImportKind, Set<string>>
+  importDetails: InnerImports
 ) {
   const rlcParameters: OperationParameter[] = [];
   let importedModels = new Set<string>();
@@ -81,9 +81,7 @@ export function transformParameterTypes(
     }
     rlcParameters.push(rlcParameter);
   }
-  if (importedModels.size > 0) {
-    importDetails.set(ImportKind.ParameterInput, importedModels);
-  }
+  importDetails.parameter.importsSet = importedModels;
   return rlcParameters;
 }
 

packages/autorest.typescript/src/restLevelClient/transforms/transformResponseTypes.ts

@@ -10,11 +10,11 @@ import {
   SchemaResponse
 } from "@autorest/codemodel";
 import {
-  ImportKind,
   OperationResponse,
   ResponseMetadata,
   ResponseBodySchema,
-  ResponseHeaderSchema
+  ResponseHeaderSchema,
+  Imports as InnerImports
 } from "@azure-tools/rlc-common";
 import { getLanguageMetadata } from "../../utils/languageHelpers";
 import { responseToSchemaResponse } from "../operationHelpers";
@@ -27,7 +27,7 @@ import { isSchemaResponse } from "../../utils/schemaHelpers";
 
 export function transformResponseTypes(
   model: CodeModel,
-  importDetails: Map<ImportKind, Set<string>>
+  importDetails: InnerImports
 ): OperationResponse[] {
   const operations = getAllOperationRequests(model);
   const rlcResponses: OperationResponse[] = [];
@@ -53,7 +53,7 @@ export function transformResponseTypes(
       // transform body
       let body = undefined;
       if (isSchemaResponse(response) || (response as any).binary) {
-        body = transformBody(response, importedModels);    
+        body = transformBody(response, importedModels);
       }
       const rlcResponseUnit: ResponseMetadata = {
         statusCode: getStatusCode(schemaResponse),
@@ -65,9 +65,7 @@ export function transformResponseTypes(
     }
     rlcResponses.push(rlcOperationUnit);
   }
-  if (importedModels.size > 0) {
-    importDetails.set(ImportKind.ResponseOutput, importedModels);
-  }
+  importDetails.response.importsSet = importedModels;
   return rlcResponses;
 }
 

packages/autorest.typescript/src/utils/autorestOptions.ts

@@ -42,6 +42,7 @@ export async function extractAutorestOptions(): Promise<AutorestOptions> {
   const coreHttpCompatMode = await getCoreHttpCompatMode(host);
   const azureSdkForJs = await getAzureSdkForJs(host);
   const dependencyInfo = await getDependencyInfo(host);
+  const branded = await getBranded(host);
 
   return {
     azureArm,
@@ -75,7 +76,8 @@ export async function extractAutorestOptions(): Promise<AutorestOptions> {
     productDocLink,
     coreHttpCompatMode,
     dependencyInfo,
-    useLegacyLro
+    useLegacyLro,
+    branded
   };
 }
 
@@ -335,6 +337,10 @@ async function getCoreHttpCompatMode(
   return (await host.getValue("core-http-compat-mode")) || false;
 }
 
+async function getBranded(host: AutorestExtensionHost): Promise<boolean> {
+  return (await host.getValue("branded")) ?? true;
+}
+
 async function getDependencyInfo(
   host: AutorestExtensionHost
 ): Promise<DependencyInfo | undefined> {

packages/rlc-common/src/buildClient.ts

@@ -19,6 +19,7 @@ import {
   getClientName,
   getImportModuleName
 } from "./helpers/nameConstructors.js";
+import { getImportSpecifier } from "./helpers/importsUtil.js";
 
 function getClientOptionsInterface(
   clientName: string,
@@ -84,7 +85,8 @@ export function buildClient(model: RLCModel): File | undefined {
     addCredentials,
     credentialScopes,
     credentialKeyHeaderName,
-    customHttpAuthHeaderName
+    customHttpAuthHeaderName,
+    branded
   } = model.options;
   const credentialTypes = credentialScopes ? ["TokenCredential"] : [];
 
@@ -160,19 +162,26 @@ export function buildClient(model: RLCModel): File | undefined {
   clientFile.addImportDeclarations([
     {
       namedImports: ["getClient", "ClientOptions"],
-      moduleSpecifier: "@azure-rest/core-client"
-    },
-    {
-      namedImports: ["logger"],
-      moduleSpecifier: getImportModuleName(
-        {
-          cjsName: loggerPath,
-          esModulesName: `${loggerPath}.js`
-        },
-        model
+      moduleSpecifier: getImportSpecifier(
+        "restClient",
+        model.importInfo.runtimeImports
       )
     }
   ]);
+  if (branded !== false) {
+    clientFile.addImportDeclarations([
+      {
+        namedImports: ["logger"],
+        moduleSpecifier: getImportModuleName(
+          {
+            cjsName: loggerPath,
+            esModulesName: `${loggerPath}.js`
+          },
+          model
+        )
+      }
+    ]);
+  }
 
   if (
     addCredentials &&
@@ -185,7 +194,10 @@ export function buildClient(model: RLCModel): File | undefined {
     clientFile.addImportDeclarations([
       {
         namedImports: credentialTypes,
-        moduleSpecifier: "@azure/core-auth"
+        moduleSpecifier: getImportSpecifier(
+          "coreAuth",
+          model.importInfo.runtimeImports
+        )
       }
     ]);
   }
@@ -221,7 +233,8 @@ export function getClientFactoryBody(
   if (!model.options || !model.options.packageDetails || !model.urlInfo) {
     return "";
   }
-  const { includeShortcuts, packageDetails } = model.options;
+  const { includeShortcuts, packageDetails, branded, addCredentials } =
+    model.options;
   let clientPackageName =
     packageDetails!.nameWithoutScope ?? packageDetails?.name ?? "";
   const packageVersion = packageDetails.version;
@@ -308,9 +321,16 @@ export function getClientFactoryBody(
   const apiKeyHeaderName = credentialKeyHeaderName
     ? `apiKeyHeaderName: options.credentials?.apiKeyHeaderName ?? "${credentialKeyHeaderName}",`
     : "";
+  const loggerOptions =
+    branded !== false
+      ? `,
+  loggingOptions: {
+    logger: options.loggingOptions?.logger ?? logger.info
+  }`
+      : "";
 
   const credentialsOptions =
-    scopes || apiKeyHeaderName
+    (scopes || apiKeyHeaderName) && addCredentials
       ? `,
       credentials: {
         ${scopes}
@@ -321,10 +341,7 @@ export function getClientFactoryBody(
         ...options,
         userAgentOptions: {
           userAgentPrefix
-        },
-        loggingOptions: {
-          logger: options.loggingOptions?.logger ?? logger.info
-        }${customHeaderOptions}${credentialsOptions}
+        }${loggerOptions}${customHeaderOptions}${credentialsOptions}
       }`;
 
   const getClient = `const client = getClient(

packages/rlc-common/src/buildClientDefinitions.ts

@@ -29,6 +29,7 @@ import {
   getClientName,
   getImportModuleName
 } from "./helpers/nameConstructors.js";
+import { getImportSpecifier } from "./helpers/importsUtil.js";
 
 export function buildClientDefinitions(model: RLCModel) {
   const options = {
@@ -115,7 +116,10 @@ export function buildClientDefinitions(model: RLCModel) {
   clientDefinitionsFile.addImportDeclarations([
     {
       namedImports: [...options.clientImports],
-      moduleSpecifier: "@azure-rest/core-client"
+      moduleSpecifier: getImportSpecifier(
+        "restClient",
+        model.importInfo.runtimeImports
+      )
     }
   ]);
 

packages/rlc-common/src/buildLogger.ts

@@ -9,6 +9,10 @@ export function buildLogger(model: RLCModel) {
   if (!model.options) {
     return undefined;
   }
+  // Disable logger for non-branded packages
+  if (model.options.branded === false) {
+    return undefined;
+  }
   const project = new Project();
   const { srcPath } = model;
   const { packageDetails } = model.options;