Fix UserAgentInfo and Constantpaths issues

packages/rlc-common/src/metadata/buildPackageFile.ts

@@ -19,11 +19,12 @@ import { getRelativePartFromSrcPath } from "../helpers/pathUtils.js";
 interface PackageFileOptions {
   exports?: Record<string, any>;
   dependencies?: Record<string, string>;
+  clientContextPaths?: string[];
 }
 
 export function buildPackageFile(
   model: RLCModel,
-  { exports, dependencies }: PackageFileOptions = {}
+  { exports, dependencies, clientContextPaths }: PackageFileOptions = {}
 ) {
   const config: PackageCommonInfoConfig = {
     description: getDescription(model),
@@ -46,7 +47,8 @@ export function buildPackageFile(
     hasLro: hasPollingOperations(model),
     monorepoPackageDirectory: model.options?.azureOutputDirectory,
     specSource: model.options?.sourceFrom ?? "TypeSpec",
-    dependencies
+    dependencies,
+    clientContextPaths
   };
 
   if (isAzureMonorepoPackage(model)) {

packages/rlc-common/src/metadata/packageJson/buildAzureMonorepoPackage.ts

@@ -15,6 +15,7 @@ import {
 export interface AzureMonorepoInfoConfig extends AzurePackageInfoConfig {
   monorepoPackageDirectory?: string;
   clientFilePaths: string[];
+  clientContextPaths?: string[];
 }
 
 /**
@@ -57,18 +58,6 @@ export function getAzureMonorepoDependencies(config: AzureMonorepoInfoConfig) {
 export function getAzureMonorepoPackageInfo(
   config: AzureMonorepoInfoConfig
 ): Record<string, any> {
-  const metadata: Record<string, any> = {
-    constantPaths: []
-  };
-
-  addSwaggerMetadata(metadata, config.specSource);
-  for (const clientFilePath of config.clientFilePaths) {
-    metadata.constantPaths.push({
-      path: clientFilePath,
-      prefix: "userAgentInfo"
-    });
-  }
-
   const commonPackageInfo = getPackageCommonInfo(config);
 
   return {
@@ -83,7 +72,7 @@ export function getAzureMonorepoPackageInfo(
       homepage: `https://github.com/Azure/azure-sdk-for-js/tree/main/${config.monorepoPackageDirectory}/README.md`
     }),
     prettier: "@azure/eslint-plugin-azure-sdk/prettier.json",
-    "//metadata": metadata
+    "//metadata": getMetadataInfo(config)
   };
 }
 
@@ -255,3 +244,21 @@ function getCjsScripts({ moduleKind }: AzureMonorepoInfoConfig) {
     "unit-test:browser": "dev-tool run test:browser"
   };
 }
+
+function getMetadataInfo(config: AzureMonorepoInfoConfig) {
+  const metadata: Record<string, any> = {
+    constantPaths: []
+  };
+  const paths = config.isModularLibrary
+    ? config.clientContextPaths
+    : config.clientFilePaths;
+  addSwaggerMetadata(metadata, config.specSource);
+  for (const path of paths ?? []) {
+    metadata.constantPaths.push({
+      path: path,
+      prefix: "userAgentInfo"
+    });
+  }
+
+  return metadata;
+}

packages/rlc-common/test/integration/mockHelper.ts

@@ -19,6 +19,7 @@ export type TestModelConfig = {
   hasLro?: boolean;
   hasPaging?: boolean;
   isModularLibrary?: boolean;
+  azureSdkForJs?: boolean;
 };
 
 export function createMockModel(config: TestModelConfig = {}): RLCModel {
@@ -48,7 +49,7 @@ export function createMockModel(config: TestModelConfig = {}): RLCModel {
       generateSample: config.withSamples ?? false,
       moduleKind: config.moduleKind,
       sourceFrom: config.source ?? "TypeSpec",
-      isModularLibrary: config.isModularLibrary ?? false
+      isModularLibrary: config.isModularLibrary ?? false,
     },
     helperDetails: {
       hasPaging: config.hasPaging ?? false,

packages/rlc-common/test/integration/packageJson.spec.ts

@@ -446,6 +446,32 @@ describe("Package file generation", () => {
         'dev-tool run vendored prettier --write --config ../../../.prettierrc.json --ignore-path ../../../.prettierignore "src/**/*.{ts,cts,mts}" "test/**/*.{ts,cts,mts}" "*.{js,cjs,mjs,json}" '
       );
     });
+
+    it("[esm] should read clientContextPaths from config for modular", () => {
+      const model = createMockModel({
+        ...baseConfig,
+        moduleKind: "esm",
+        isModularLibrary: true
+      });
+
+      const packageFileContent = buildPackageFile(model, {
+        clientContextPaths: ["src/api/chatCompletionsContext.ts"]
+      });
+      const packageFile = JSON.parse(packageFileContent?.content ?? "{}");
+      expect(packageFile).to.have.property("//metadata");
+      expect(packageFile["//metadata"]["constantPaths"][0]).to.have.property("path", "src/api/chatCompletionsContext.ts", "modular");
+    });
+
+    it("[esm] should read clientPath from config for rlc", () => {
+      const model = createMockModel({
+        ...baseConfig,
+        moduleKind: "esm",
+      });
+      const packageFileContent = buildPackageFile(model);
+      const packageFile = JSON.parse(packageFileContent?.content ?? "{}");
+      expect(packageFile).to.have.property("//metadata");
+      expect(packageFile["//metadata"]["constantPaths"][0]).to.have.property("path", "src/msinternal/test.ts", "rlc");
+    });
   });
 
   describe("Azure flavor for standalone library", () => {

packages/typespec-test/test/NetworkAnalytics.Management/generated/typespec-ts/src/api/networkAnalyticsContext.ts

@@ -19,11 +19,11 @@ export function createNetworkAnalytics(
 ): NetworkAnalyticsContext {
   const endpointUrl =
     options.endpoint ?? options.baseUrl ?? `https://management.azure.com`;
-
   const prefixFromOptions = options?.userAgentOptions?.userAgentPrefix;
+  const userAgentInfo = `azsdk-js-arm-networkanalytics/1.0.0-beta.1`;
   const userAgentPrefix = prefixFromOptions
-    ? `${prefixFromOptions} azsdk-js-api`
-    : "azsdk-js-api";
+    ? `${prefixFromOptions} azsdk-js-api ${userAgentInfo}`
+    : `azsdk-js-api ${userAgentInfo}`;
   const { apiVersion: _, ...updatedOptions } = {
     ...options,
     userAgentOptions: { userAgentPrefix },

packages/typespec-test/test/NetworkAnalytics.Management/generated/typespec-ts/src/networkAnalyticsClient.ts

@@ -40,7 +40,7 @@ export class NetworkAnalyticsClient {
     const prefixFromOptions = options?.userAgentOptions?.userAgentPrefix;
     const userAgentPrefix = prefixFromOptions
       ? `${prefixFromOptions} azsdk-js-client`
-      : "azsdk-js-client";
+      : `azsdk-js-client`;
     this._client = createNetworkAnalytics(credential, {
       ...options,
       userAgentOptions: { userAgentPrefix },

packages/typespec-test/test/anomalyDetector/generated/typespec-ts/src/anomalyDetectorClient.ts

@@ -50,7 +50,7 @@ export class AnomalyDetectorClient {
     const prefixFromOptions = options?.userAgentOptions?.userAgentPrefix;
     const userAgentPrefix = prefixFromOptions
       ? `${prefixFromOptions} azsdk-js-client`
-      : "azsdk-js-client";
+      : `azsdk-js-client`;
     this._client = createAnomalyDetector(endpointParam, credential, {
       ...options,
       userAgentOptions: { userAgentPrefix },

packages/typespec-test/test/anomalyDetector/generated/typespec-ts/src/api/anomalyDetectorContext.ts

@@ -59,11 +59,11 @@ export function createAnomalyDetector(
     options.endpoint ??
     options.baseUrl ??
     `${endpointParam}/anomalydetector/${apiVersion}`;
-
   const prefixFromOptions = options?.userAgentOptions?.userAgentPrefix;
+  const userAgentInfo = `azsdk-js-ai-anomaly-detector/1.0.0-beta.1`;
   const userAgentPrefix = prefixFromOptions
-    ? `${prefixFromOptions} azsdk-js-api`
-    : "azsdk-js-api";
+    ? `${prefixFromOptions} azsdk-js-api ${userAgentInfo}`
+    : `azsdk-js-api ${userAgentInfo}`;
   const { apiVersion: _, ...updatedOptions } = {
     ...options,
     userAgentOptions: { userAgentPrefix },

packages/typespec-test/test/batch_modular/generated/typespec-ts/src/api/batchContext.ts

@@ -21,11 +21,11 @@ export function createBatch(
   options: BatchClientOptionalParams = {},
 ): BatchContext {
   const endpointUrl = options.endpoint ?? options.baseUrl ?? `${endpointParam}`;
-
   const prefixFromOptions = options?.userAgentOptions?.userAgentPrefix;
+  const userAgentInfo = `azsdk-js-batch/1.0.0-beta.1`;
   const userAgentPrefix = prefixFromOptions
-    ? `${prefixFromOptions} azsdk-js-api`
-    : "azsdk-js-api";
+    ? `${prefixFromOptions} azsdk-js-api ${userAgentInfo}`
+    : `azsdk-js-api ${userAgentInfo}`;
   const { apiVersion: _, ...updatedOptions } = {
     ...options,
     userAgentOptions: { userAgentPrefix },

packages/typespec-test/test/batch_modular/generated/typespec-ts/src/batchClient.ts

@@ -216,7 +216,7 @@ export class BatchClient {
     const prefixFromOptions = options?.userAgentOptions?.userAgentPrefix;
     const userAgentPrefix = prefixFromOptions
       ? `${prefixFromOptions} azsdk-js-client`
-      : "azsdk-js-client";
+      : `azsdk-js-client`;
     this._client = createBatch(endpointParam, credential, {
       ...options,
       userAgentOptions: { userAgentPrefix },

packages/typespec-test/test/chatApi_modular/generated/typespec-ts/src/api/chatProtocolContext.ts

@@ -18,11 +18,11 @@ export function createChatProtocol(
   options: ChatProtocolClientOptionalParams = {},
 ): ChatProtocolContext {
   const endpointUrl = options.endpoint ?? options.baseUrl ?? `${endpointParam}`;
-
   const prefixFromOptions = options?.userAgentOptions?.userAgentPrefix;
+  const userAgentInfo = `azsdk-js-ai-chat-protocol/1.0.0-beta.1`;
   const userAgentPrefix = prefixFromOptions
-    ? `${prefixFromOptions} azsdk-js-api`
-    : "azsdk-js-api";
+    ? `${prefixFromOptions} azsdk-js-api ${userAgentInfo}`
+    : `azsdk-js-api ${userAgentInfo}`;
   const { apiVersion: _, ...updatedOptions } = {
     ...options,
     userAgentOptions: { userAgentPrefix },

packages/typespec-test/test/chatApi_modular/generated/typespec-ts/src/chatProtocolClient.ts

@@ -35,7 +35,7 @@ export class ChatProtocolClient {
     const prefixFromOptions = options?.userAgentOptions?.userAgentPrefix;
     const userAgentPrefix = prefixFromOptions
       ? `${prefixFromOptions} azsdk-js-client`
-      : "azsdk-js-client";
+      : `azsdk-js-client`;
     this._client = createChatProtocol(endpointParam, credential, {
       ...options,
       userAgentOptions: { userAgentPrefix },

packages/typespec-test/test/contentsafety_modular/generated/typespec-ts/src/api/contentSafetyContext.ts

@@ -22,11 +22,11 @@ export function createContentSafety(
 ): ContentSafetyContext {
   const endpointUrl =
     options.endpoint ?? options.baseUrl ?? `${endpointParam}/contentsafety`;
-
   const prefixFromOptions = options?.userAgentOptions?.userAgentPrefix;
+  const userAgentInfo = `azsdk-js-ai-content-safety/1.0.0`;
   const userAgentPrefix = prefixFromOptions
-    ? `${prefixFromOptions} azsdk-js-api`
-    : "azsdk-js-api";
+    ? `${prefixFromOptions} azsdk-js-api ${userAgentInfo}`
+    : `azsdk-js-api ${userAgentInfo}`;
   const { apiVersion: _, ...updatedOptions } = {
     ...options,
     userAgentOptions: { userAgentPrefix },

packages/typespec-test/test/contentsafety_modular/generated/typespec-ts/src/contentSafetyClient.ts

@@ -57,7 +57,7 @@ export class ContentSafetyClient {
     const prefixFromOptions = options?.userAgentOptions?.userAgentPrefix;
     const userAgentPrefix = prefixFromOptions
       ? `${prefixFromOptions} azsdk-js-client`
-      : "azsdk-js-client";
+      : `azsdk-js-client`;
     this._client = createContentSafety(endpointParam, credential, {
       ...options,
       userAgentOptions: { userAgentPrefix },

packages/typespec-test/test/eventgrid_modular/generated/typespec-ts/src/api/eventGridContext.ts

@@ -21,11 +21,11 @@ export function createEventGrid(
   options: EventGridClientOptionalParams = {},
 ): EventGridContext {
   const endpointUrl = options.endpoint ?? options.baseUrl ?? `${endpointParam}`;
-
   const prefixFromOptions = options?.userAgentOptions?.userAgentPrefix;
+  const userAgentInfo = `azsdk-js-eventgrid/1.0.0-beta.1`;
   const userAgentPrefix = prefixFromOptions
-    ? `${prefixFromOptions} azsdk-js-api`
-    : "azsdk-js-api";
+    ? `${prefixFromOptions} azsdk-js-api ${userAgentInfo}`
+    : `azsdk-js-api ${userAgentInfo}`;
   const { apiVersion: _, ...updatedOptions } = {
     ...options,
     userAgentOptions: { userAgentPrefix },

packages/typespec-test/test/eventgrid_modular/generated/typespec-ts/src/eventGridClient.ts

@@ -48,7 +48,7 @@ export class EventGridClient {
     const prefixFromOptions = options?.userAgentOptions?.userAgentPrefix;
     const userAgentPrefix = prefixFromOptions
       ? `${prefixFromOptions} azsdk-js-client`
-      : "azsdk-js-client";
+      : `azsdk-js-client`;
     this._client = createEventGrid(endpointParam, credential, {
       ...options,
       userAgentOptions: { userAgentPrefix },

packages/typespec-test/test/healthInsights_radiologyinsights/generated/typespec-ts/src/api/radiologyInsightsContext.ts

@@ -20,11 +20,11 @@ export function createRadiologyInsights(
 ): RadiologyInsightsContext {
   const endpointUrl =
     options.endpoint ?? options.baseUrl ?? `${endpointParam}/health-insights`;
-
   const prefixFromOptions = options?.userAgentOptions?.userAgentPrefix;
+  const userAgentInfo = `azsdk-js-health-insights-radiologyinsights/1.0.0-beta.1`;
   const userAgentPrefix = prefixFromOptions
-    ? `${prefixFromOptions} azsdk-js-api`
-    : "azsdk-js-api";
+    ? `${prefixFromOptions} azsdk-js-api ${userAgentInfo}`
+    : `azsdk-js-api ${userAgentInfo}`;
   const { apiVersion: _, ...updatedOptions } = {
     ...options,
     userAgentOptions: { userAgentPrefix },

packages/typespec-test/test/healthInsights_radiologyinsights/generated/typespec-ts/src/radiologyInsightsClient.ts

@@ -31,7 +31,7 @@ export class RadiologyInsightsClient {
     const prefixFromOptions = options?.userAgentOptions?.userAgentPrefix;
     const userAgentPrefix = prefixFromOptions
       ? `${prefixFromOptions} azsdk-js-client`
-      : "azsdk-js-client";
+      : `azsdk-js-client`;
     this._client = createRadiologyInsights(endpointParam, credential, {
       ...options,
       userAgentOptions: { userAgentPrefix },

packages/typespec-test/test/hierarchy_generic/generated/typespec-ts/src/api/fooContext.ts

@@ -14,9 +14,10 @@ export function createFoo(
   options: FooClientOptionalParams = {},
 ): FooContext {
   const prefixFromOptions = options?.userAgentOptions?.userAgentPrefix;
+  const userAgentInfo = `azsdk-js-hierarchy-generic/1.0.0-beta.1`;
   const userAgentPrefix = prefixFromOptions
-    ? `${prefixFromOptions} azsdk-js-api`
-    : "azsdk-js-api";
+    ? `${prefixFromOptions} azsdk-js-api ${userAgentInfo}`
+    : `azsdk-js-api ${userAgentInfo}`;
   const { apiVersion: _, ...updatedOptions } = {
     ...options,
     userAgentOptions: { userAgentPrefix },

packages/typespec-test/test/hierarchy_generic/generated/typespec-ts/src/fooClient.ts

@@ -24,7 +24,7 @@ export class FooClient {
     const prefixFromOptions = options?.userAgentOptions?.userAgentPrefix;
     const userAgentPrefix = prefixFromOptions
       ? `${prefixFromOptions} azsdk-js-client`
-      : "azsdk-js-client";
+      : `azsdk-js-client`;
     this._client = createFoo(endpointParam, {
       ...options,
       userAgentOptions: { userAgentPrefix },

packages/typespec-test/test/loadtesting_modular/generated/typespec-ts/src/loadTestAdministration/api/loadTestAdministrationContext.ts

@@ -21,11 +21,11 @@ export function createLoadTestAdministration(
 ): LoadTestAdministrationContext {
   const endpointUrl =
     options.endpoint ?? options.baseUrl ?? `https://${endpointParam}`;
-
   const prefixFromOptions = options?.userAgentOptions?.userAgentPrefix;
+  const userAgentInfo = `azsdk-js-load-testing/1.0.1`;
   const userAgentPrefix = prefixFromOptions
-    ? `${prefixFromOptions} azsdk-js-api`
-    : "azsdk-js-api";
+    ? `${prefixFromOptions} azsdk-js-api ${userAgentInfo}`
+    : `azsdk-js-api ${userAgentInfo}`;
   const { apiVersion: _, ...updatedOptions } = {
     ...options,
     userAgentOptions: { userAgentPrefix },

packages/typespec-test/test/loadtesting_modular/generated/typespec-ts/src/loadTestAdministration/loadTestAdministrationClient.ts

@@ -55,7 +55,7 @@ export class LoadTestAdministrationClient {
     const prefixFromOptions = options?.userAgentOptions?.userAgentPrefix;
     const userAgentPrefix = prefixFromOptions
       ? `${prefixFromOptions} azsdk-js-client`
-      : "azsdk-js-client";
+      : `azsdk-js-client`;
     this._client = createLoadTestAdministration(endpointParam, credential, {
       ...options,
       userAgentOptions: { userAgentPrefix },

packages/typespec-test/test/loadtesting_modular/generated/typespec-ts/src/loadTestRun/api/loadTestRunContext.ts

@@ -20,11 +20,11 @@ export function createLoadTestRun(
 ): LoadTestRunContext {
   const endpointUrl =
     options.endpoint ?? options.baseUrl ?? `https://${endpointParam}`;
-
   const prefixFromOptions = options?.userAgentOptions?.userAgentPrefix;
+  const userAgentInfo = `azsdk-js-load-testing/1.0.1`;
   const userAgentPrefix = prefixFromOptions
-    ? `${prefixFromOptions} azsdk-js-api`
-    : "azsdk-js-api";
+    ? `${prefixFromOptions} azsdk-js-api ${userAgentInfo}`
+    : `azsdk-js-api ${userAgentInfo}`;
   const { apiVersion: _, ...updatedOptions } = {
     ...options,
     userAgentOptions: { userAgentPrefix },

packages/typespec-test/test/loadtesting_modular/generated/typespec-ts/src/loadTestRun/loadTestRunClient.ts

@@ -63,7 +63,7 @@ export class LoadTestRunClient {
     const prefixFromOptions = options?.userAgentOptions?.userAgentPrefix;
     const userAgentPrefix = prefixFromOptions
       ? `${prefixFromOptions} azsdk-js-client`
-      : "azsdk-js-client";
+      : `azsdk-js-client`;
     this._client = createLoadTestRun(endpointParam, credential, {
       ...options,
       userAgentOptions: { userAgentPrefix },

packages/typespec-test/test/loadtesting_modular/generated/typespec-ts/src/testProfileAdministration/api/testProfileAdministrationContext.ts

@@ -21,11 +21,11 @@ export function createTestProfileAdministration(
 ): TestProfileAdministrationContext {
   const endpointUrl =
     options.endpoint ?? options.baseUrl ?? `https://${endpointParam}`;
-
   const prefixFromOptions = options?.userAgentOptions?.userAgentPrefix;
+  const userAgentInfo = `azsdk-js-load-testing/1.0.1`;
   const userAgentPrefix = prefixFromOptions
-    ? `${prefixFromOptions} azsdk-js-api`
-    : "azsdk-js-api";
+    ? `${prefixFromOptions} azsdk-js-api ${userAgentInfo}`
+    : `azsdk-js-api ${userAgentInfo}`;
   const { apiVersion: _, ...updatedOptions } = {
     ...options,
     userAgentOptions: { userAgentPrefix },

packages/typespec-test/test/loadtesting_modular/generated/typespec-ts/src/testProfileAdministration/testProfileAdministrationClient.ts

@@ -34,7 +34,7 @@ export class TestProfileAdministrationClient {
     const prefixFromOptions = options?.userAgentOptions?.userAgentPrefix;
     const userAgentPrefix = prefixFromOptions
       ? `${prefixFromOptions} azsdk-js-client`
-      : "azsdk-js-client";
+      : `azsdk-js-client`;
     this._client = createTestProfileAdministration(endpointParam, credential, {
       ...options,
       userAgentOptions: { userAgentPrefix },