Add the cloudSetting option for ARM Modular SDK

packages/typespec-test/test/NetworkAnalytics.Management/generated/typespec-ts/sdk/test/arm-test/review/arm-networkanalytics.api.md

@@ -343,6 +343,13 @@ export enum KnownActionType {
     Internal = "Internal"
 }
 
+// @public
+export enum KnownAzureClouds {
+    AZURE_CHINA_CLOUD = "AZURE_CHINA_CLOUD",
+    AZURE_PUBLIC_CLOUD = "AZURE_PUBLIC_CLOUD",
+    AZURE_US_GOVERNMENT = "AZURE_US_GOVERNMENT"
+}
+
 // @public
 export enum KnownControlState {
     Disabled = "Disabled",
@@ -442,6 +449,7 @@ export class NetworkAnalyticsApi {
 // @public
 export interface NetworkAnalyticsApiOptionalParams extends ClientOptions {
     apiVersion?: string;
+    cloudSetting?: string;
 }
 
 // @public

packages/typespec-test/test/NetworkAnalytics.Management/generated/typespec-ts/sdk/test/arm-test/src/api/networkAnalyticsApiContext.ts

@@ -19,6 +19,8 @@ export interface NetworkAnalyticsApiOptionalParams extends ClientOptions {
   /** The API version to use for this operation. */
   /** Known values of {@link KnownVersions} that the service accepts. */
   apiVersion?: string;
+  /** Azure cloud setting, known values of {@link KnownAzureClouds} */
+  cloudSetting?: string;
 }
 
 export function createNetworkAnalyticsApi(
@@ -27,7 +29,10 @@ export function createNetworkAnalyticsApi(
   options: NetworkAnalyticsApiOptionalParams = {},
 ): NetworkAnalyticsApiContext {
   const endpointUrl =
-    options.endpoint ?? options.baseUrl ?? "https://management.azure.com";
+    options.endpoint ??
+    options.baseUrl ??
+    getArmEndpoint(options.cloudSetting) ??
+    "https://management.azure.com";
   const prefixFromOptions = options?.userAgentOptions?.userAgentPrefix;
   const userAgentInfo = `azsdk-js-arm-networkanalytics/1.0.0-beta.1`;
   const userAgentPrefix = prefixFromOptions
@@ -65,3 +70,22 @@ export function createNetworkAnalyticsApi(
     subscriptionId,
   } as NetworkAnalyticsApiContext;
 }
+
+/** Get the ARM endpoint for the client. */
+function getArmEndpoint(cloudSetting?: string): string | undefined {
+  if (cloudSetting === undefined) {
+    return undefined;
+  }
+  const cloudEndpoints: Record<string, string> = {
+    AZURE_CHINA_CLOUD: "https://management.chinacloudapi.cn/",
+    AZURE_US_GOVERNMENT: "https://management.usgovcloudapi.net/",
+    AZURE_PUBLIC_CLOUD: "https://management.azure.com/",
+  };
+  if (cloudSetting in cloudEndpoints) {
+    return cloudEndpoints[cloudSetting];
+  } else {
+    throw new Error(
+      `Unknown cloud setting: ${cloudSetting}. Please refer the enum KnownAzureClouds for possible values.`,
+    );
+  }
+}

packages/typespec-test/test/NetworkAnalytics.Management/generated/typespec-ts/sdk/test/arm-test/src/index.ts

@@ -7,8 +7,6 @@ import {
   PagedAsyncIterableIterator,
 } from "./static-helpers/pagingHelpers.js";
 
-export { NetworkAnalyticsApi } from "./networkAnalyticsApi.js";
-export { restorePoller, RestorePollerOptions } from "./restorePollerHelpers.js";
 export {
   Operation,
   OperationDisplay,
@@ -67,7 +65,10 @@ export {
   RoleAssignmentDetail,
   ListRoleAssignments,
   KnownVersions,
+  KnownAzureClouds,
 } from "./models/index.js";
+export { NetworkAnalyticsApi } from "./networkAnalyticsApi.js";
+export { restorePoller, RestorePollerOptions } from "./restorePollerHelpers.js";
 export { NetworkAnalyticsApiOptionalParams } from "./api/index.js";
 export {
   DataProductsListBySubscriptionOptionalParams,

packages/typespec-test/test/NetworkAnalytics.Management/generated/typespec-ts/sdk/test/arm-test/src/models/index.ts

@@ -59,4 +59,5 @@ export {
   RoleAssignmentDetail,
   ListRoleAssignments,
   KnownVersions,
+  KnownAzureClouds,
 } from "./models.js";

packages/typespec-test/test/NetworkAnalytics.Management/generated/typespec-ts/sdk/test/arm-test/src/models/models.ts

@@ -1448,3 +1448,13 @@ export enum KnownVersions {
   /** The 2023-11-15 stable version. */
   V20231115 = "2023-11-15",
 }
+
+/** An enum to describe Azure Cloud. */
+export enum KnownAzureClouds {
+  /** Azure public cloud, which is the default cloud for Azure SDKs. */
+  AZURE_PUBLIC_CLOUD = "AZURE_PUBLIC_CLOUD",
+  /** Azure China cloud */
+  AZURE_CHINA_CLOUD = "AZURE_CHINA_CLOUD",
+  /** Azure US government cloud */
+  AZURE_US_GOVERNMENT = "AZURE_US_GOVERNMENT",
+}

packages/typespec-test/test/ai/generated/typespec-ts/src/index.ts

@@ -8,7 +8,6 @@ import {
   PagedAsyncIterableIterator,
 } from "./static-helpers/pagingHelpers.js";
 
-export { AIProjectClient } from "./aiProjectClient.js";
 export {
   GetWorkspaceResponse,
   WorkspaceProperties,
@@ -245,6 +244,7 @@ export {
   RunAdditionalFieldList,
   VectorStoreFileStatusFilter,
 } from "./models/agents/index.js";
+export { AIProjectClient } from "./aiProjectClient.js";
 export { AIProjectClientOptionalParams } from "./api/index.js";
 export {
   AgentsListVectorStoreFileBatchFilesOptionalParams,

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

@@ -7,7 +7,6 @@ import {
   PagedAsyncIterableIterator,
 } from "./static-helpers/pagingHelpers.js";
 
-export { AnomalyDetectorClient } from "./anomalyDetectorClient.js";
 export { APIVersion } from "./models/index.js";
 export {
   MultivariateMultivariateDetectionResult,
@@ -46,6 +45,7 @@ export {
   UnivariateUnivariateChangePointDetectionOptions,
   UnivariateUnivariateChangePointDetectionResult,
 } from "./models/univariate/index.js";
+export { AnomalyDetectorClient } from "./anomalyDetectorClient.js";
 export { AnomalyDetectorClientOptionalParams } from "./api/index.js";
 export {
   MultivariateDetectMultivariateLastAnomalyOptionalParams,

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

@@ -7,7 +7,6 @@ import {
   PagedAsyncIterableIterator,
 } from "./static-helpers/pagingHelpers.js";
 
-export { BatchClient } from "./batchClient.js";
 export {
   BatchApplication,
   BatchError,
@@ -202,6 +201,7 @@ export {
   StatusLevelTypes,
   KnownVersions,
 } from "./models/index.js";
+export { BatchClient } from "./batchClient.js";
 export {
   BatchClientOptionalParams,
   ListNodeFilesOptionalParams,

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

@@ -1,7 +1,6 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-export { ChatProtocolClient } from "./chatProtocolClient.js";
 export {
   StreamingChatCompletionOptionsRecord,
   ChatMessage,
@@ -15,6 +14,7 @@ export {
   ChatChoiceRecord,
   KnownAPIVersion,
 } from "./models/index.js";
+export { ChatProtocolClient } from "./chatProtocolClient.js";
 export {
   ChatProtocolClientOptionalParams,
   CreateOptionalParams,

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

@@ -7,7 +7,6 @@ import {
   PagedAsyncIterableIterator,
 } from "./static-helpers/pagingHelpers.js";
 
-export { ContentSafetyClient } from "./contentSafetyClient.js";
 export {
   AnalyzeTextOptions,
   TextCategory,
@@ -35,6 +34,7 @@ export {
   RemoveTextBlocklistItemsOptions,
   KnownVersions,
 } from "./models/index.js";
+export { ContentSafetyClient } from "./contentSafetyClient.js";
 export {
   ContentSafetyClientOptionalParams,
   ListTextBlocklistItemsOptionalParams,

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

@@ -1,7 +1,6 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-export { EventGridClient } from "./eventGridClient.js";
 export {
   CloudEvent,
   PublishResult,
@@ -16,6 +15,7 @@ export {
   ReleaseDelay,
   KnownServiceApiVersions,
 } from "./models/index.js";
+export { EventGridClient } from "./eventGridClient.js";
 export {
   EventGridClientOptionalParams,
   RenewCloudEventLocksOptionalParams,

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

@@ -1,8 +1,6 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-export { RadiologyInsightsClient } from "./radiologyInsightsClient.js";
-export { restorePoller, RestorePollerOptions } from "./restorePollerHelpers.js";
 export {
   PatientRecord,
   PatientInfo,
@@ -76,6 +74,8 @@ export {
   DomainResourceUnion,
   Narrative,
 } from "./models/fhir/r4/index.js";
+export { RadiologyInsightsClient } from "./radiologyInsightsClient.js";
+export { restorePoller, RestorePollerOptions } from "./restorePollerHelpers.js";
 export {
   InferRadiologyInsightsOptionalParams,
   RadiologyInsightsClientOptionalParams,

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

@@ -1,10 +1,10 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-export { FooClient } from "./fooClient.js";
 export { A } from "./models/index.js";
 export { BA } from "./models/b/index.js";
 export { BEA } from "./models/b/e/index.js";
+export { FooClient } from "./fooClient.js";
 export { FooClientOptionalParams, Op1OptionalParams } from "./api/index.js";
 export { BOp1OptionalParams } from "./api/b/index.js";
 export { DOp1OptionalParams } from "./api/d/index.js";

packages/typespec-test/test/loadtesting_modular/generated/typespec-ts/src/index.ts

@@ -7,7 +7,6 @@ import {
   PagedAsyncIterableIterator,
 } from "./static-helpers/pagingHelpers.js";
 
-export { LoadTestAdministrationClient } from "./loadTestAdministration/loadTestAdministrationClient.js";
 export {
   Test,
   PassFailCriteria,
@@ -92,6 +91,7 @@ export {
   RecommendationCategory,
   KnownAPIVersions,
 } from "./models/index.js";
+export { LoadTestAdministrationClient } from "./loadTestAdministration/loadTestAdministrationClient.js";
 export {
   LoadTestAdministrationClientOptionalParams,
   DeleteTestOptionalParams,

packages/typespec-test/test/openai_generic/generated/typespec-ts/src/index.ts

@@ -3,7 +3,6 @@
 
 import { FileContents } from "./static-helpers/multipartHelpers.js";
 
-export { OpenAIClient } from "./openAIClient.js";
 export {
   CreateCompletionRequest,
   Prompt,
@@ -53,6 +52,7 @@ export {
   ListFineTuningJobEventsResponse,
   FineTuningJobEvent,
 } from "./models/index.js";
+export { OpenAIClient } from "./openAIClient.js";
 export { OpenAIClientOptionalParams } from "./api/index.js";
 export { CompletionsCreateOptionalParams } from "./api/completions/index.js";
 export { EditsCreateOptionalParams } from "./api/edits/index.js";

packages/typespec-test/test/openai_modular/generated/typespec-ts/src/index.ts

@@ -3,7 +3,6 @@
 
 import { FileContents } from "./static-helpers/multipartHelpers.js";
 
-export { OpenAIClient } from "./openAIClient.js";
 export {
   AudioTranscriptionOptions,
   AudioTranscriptionFormat,
@@ -147,6 +146,7 @@ export {
   EmbeddingsUsage,
   KnownServiceApiVersions,
 } from "./models/index.js";
+export { OpenAIClient } from "./openAIClient.js";
 export {
   OpenAIClientOptionalParams,
   GetEmbeddingsOptionalParams,

packages/typespec-test/test/openai_non_branded/generated/typespec-ts/src/index.ts

@@ -2,7 +2,6 @@
 
 import { FileContents } from "./static-helpers/multipartHelpers.js";
 
-export { OpenAIClient } from "./openAIClient.js";
 export {
   CreateCompletionRequest,
   Prompt,
@@ -52,6 +51,7 @@ export {
   ListFineTuningJobEventsResponse,
   FineTuningJobEvent,
 } from "./models/index.js";
+export { OpenAIClient } from "./openAIClient.js";
 export { OpenAIClientOptionalParams } from "./api/index.js";
 export { CompletionsCreateOptionalParams } from "./api/completions/index.js";
 export { EditsCreateOptionalParams } from "./api/edits/index.js";

packages/typespec-test/test/overloads_modular/generated/typespec-ts/src/index.ts

@@ -1,8 +1,8 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-export { WidgetManagerClient } from "./widgetManagerClient.js";
 export { KnownVersions } from "./models/index.js";
+export { WidgetManagerClient } from "./widgetManagerClient.js";
 export { WidgetManagerClientOptionalParams } from "./api/index.js";
 export {
   FooOperationsGetAvatarAsJpegOptionalParams,

packages/typespec-test/test/parametrizedHost/generated/typespec-ts/src/index.ts

@@ -1,8 +1,8 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-export { ParametrizedHostClient } from "./parametrizedHostClient.js";
 export { Collection } from "./models/index.js";
+export { ParametrizedHostClient } from "./parametrizedHostClient.js";
 export { ParametrizedHostClientOptionalParams } from "./api/index.js";
 export { ConfidentialLedgerListCollectionsOptionalParams } from "./api/confidentialLedger/index.js";
 export { ConfidentialLedgerOperations } from "./classic/index.js";

packages/typespec-test/test/schemaRegistry/generated/typespec-ts/src/index.ts

@@ -7,7 +7,6 @@ import {
   PagedAsyncIterableIterator,
 } from "./static-helpers/pagingHelpers.js";
 
-export { SchemaRegistryClient } from "./schemaRegistryClient.js";
 export {
   SchemaGroup,
   SchemaVersion,
@@ -18,6 +17,7 @@ export {
   KnownServiceApiVersions,
   ContentTypeEnum,
 } from "./models/index.js";
+export { SchemaRegistryClient } from "./schemaRegistryClient.js";
 export { SchemaRegistryClientOptionalParams } from "./api/index.js";
 export {
   SchemaOperationsRegisterSchemaOptionalParams,

packages/typespec-test/test/todo_non_branded/generated/typespec-ts/src/index.ts

@@ -7,7 +7,6 @@ import {
   PagedAsyncIterableIterator,
 } from "./static-helpers/pagingHelpers.js";
 
-export { TodoClient } from "./todoClient.js";
 export {
   User,
   ApiError,
@@ -30,6 +29,7 @@ export {
   UserExistsResponse,
   InvalidUserResponse,
 } from "./models/users/index.js";
+export { TodoClient } from "./todoClient.js";
 export { TodoClientOptionalParams } from "./api/index.js";
 export {
   TodoItemsDeleteOptionalParams,

packages/typespec-test/test/widget_dpg/generated/typespec-ts/src/index.ts

@@ -7,8 +7,6 @@ import {
   PagedAsyncIterableIterator,
 } from "./static-helpers/pagingHelpers.js";
 
-export { SAPWidgetServiceClient } from "./sapWidgetServiceClient.js";
-export { restorePoller, RestorePollerOptions } from "./restorePollerHelpers.js";
 export {
   Widget,
   WidgetError,
@@ -17,6 +15,8 @@ export {
   NonReferencedModel,
   KnownVersions,
 } from "./models/index.js";
+export { SAPWidgetServiceClient } from "./sapWidgetServiceClient.js";
+export { restorePoller, RestorePollerOptions } from "./restorePollerHelpers.js";
 export { SAPWidgetServiceClientOptionalParams } from "./api/index.js";
 export {
   BudgetsContinueOptionalParams,

packages/typespec-ts/src/index.ts

@@ -287,15 +287,19 @@ export async function $onEmit(context: EmitContext) {
     );
 
     const isMultiClients = dpgContext.sdkPackage.clients.length > 1;
+    const clientMap = getClientHierarchyMap(dpgContext);
+    const hasModularClients = clientMap.length > 0;
     console.time("onEmit: emit models");
-    emitTypes(dpgContext, { sourceRoot: modularSourcesRoot });
+    emitTypes(dpgContext, {
+      sourceRoot: modularSourcesRoot,
+      hasModularClients
+    });
     console.timeEnd("onEmit: emit models");
     buildSubpathIndexFile(modularEmitterOptions, "models", undefined, {
       recursive: true
     });
     console.time("onEmit: emit source files");
-    const clientMap = getClientHierarchyMap(dpgContext);
-    if (clientMap.length === 0) {
+    if (hasModularClients) {
       // If no clients, we still need to build the root index file
       buildRootIndex(dpgContext, modularEmitterOptions, rootIndexFile);
     }