@azure-tools/typespec-ts 0.49.0 → 0.49.1

package/src/transform/transform.ts

@@ -58,7 +58,7 @@ export async function transformRLCModel(
       ? client.name
       : (options?.title ??
           client.name ??
-          getDefaultService(program)?.title ??
+          getDefaultService(program, options.isModularLibrary)?.title ??
           ""),
     NameType.Class
   );
@@ -123,7 +123,10 @@ export function transformUrlInfo(
   const importedModels = new Set<string>();
   const usage = [SchemaContext.Exception, SchemaContext.Input];
   const program = dpgContext.program;
-  const serviceNs = getDefaultService(program)?.type;
+  const serviceNs = getDefaultService(
+    program,
+    dpgContext.rlcOptions?.isModularLibrary
+  )?.type;
   let endpoint = undefined;
   const urlParameters: PathParameter[] = [];
   if (serviceNs) {

package/src/transform/transformSchemas.ts

@@ -89,7 +89,10 @@ export function transformSchemas(client: SdkClient, dpgContext: SdkContext) {
     }
   }
   function transformHostParameters() {
-    const serviceNs = getDefaultService(program)?.type;
+    const serviceNs = getDefaultService(
+      program,
+      dpgContext.rlcOptions?.isModularLibrary
+    )?.type;
     if (serviceNs) {
       const host = getServers(program, serviceNs);
       if (host && host?.[0] && host?.[0]?.parameters) {

package/src/transform/transfromRLCOptions.ts

@@ -33,10 +33,7 @@ export function transformRLCOptions(
     emitterOptions,
     dpgContext.generationPathDetail?.rootDir ?? ""
   );
-  if (emitterOptions["is-modular-library"] !== false) {
-    options.isModularLibrary = true;
-  }
-  const batch = getRLCClients(dpgContext);
+  const batch = getRLCClients(dpgContext, options.isModularLibrary);
   options.batch = batch;
   return options;
 }
@@ -46,20 +43,33 @@ function extractRLCOptions(
   generationRootDir: string
 ): RLCOptions {
   const program = dpgContext.program;
+  // Compute isModularLibrary early - defaults to true unless explicitly set to false
+  const isModularLibrary = emitterOptions["is-modular-library"] !== false;
   const includeShortcuts = getIncludeShortcuts(emitterOptions);
-  const packageDetails = getPackageDetails(program, emitterOptions);
+  const packageDetails = getPackageDetails(
+    program,
+    emitterOptions,
+    isModularLibrary
+  );
   const flavor = getFlavor(emitterOptions, packageDetails);
   const moduleKind = getModuleKind(emitterOptions);
-  const serviceInfo = getServiceInfo(program);
+  const serviceInfo = getServiceInfo(program, isModularLibrary);
+  const includeHeadersInResponse =
+    emitterOptions["include-headers-in-response"] === true;
   const azureSdkForJs = getAzureSdkForJs(emitterOptions, flavor);
   const generateMetadata = getGenerateMetadata(emitterOptions);
   const generateTest = getGenerateTest(emitterOptions, flavor);
   const generateSample = getGenerateSample(dpgContext, emitterOptions);
-  const credentialInfo = getCredentialInfo(program, emitterOptions);
+  const credentialInfo = getCredentialInfo(
+    program,
+    emitterOptions,
+    isModularLibrary
+  );
   const azureOutputDirectory = getAzureOutputDirectory(generationRootDir);
   const enableOperationGroup = getEnableOperationGroup(
     dpgContext,
-    emitterOptions
+    emitterOptions,
+    isModularLibrary
   );
   const enableModelNamespace = getEnableModelNamespace(
     dpgContext,
@@ -72,7 +82,6 @@ function extractRLCOptions(
   const title = emitterOptions.title;
   const dependencyInfo = emitterOptions["dependency-info"];
   const productDocLink = emitterOptions["product-doc-link"];
-  const isModularLibrary = emitterOptions["is-modular-library"];
   const compatibilityMode = emitterOptions["compatibility-mode"];
   const compatibilityLro = emitterOptions["compatibility-lro"];
   const experimentalExtensibleEnums =
@@ -85,9 +94,15 @@ function extractRLCOptions(
     emitterOptions["compatibility-query-multi-format"];
   const typespecTitleMap = emitterOptions["typespec-title-map"];
   const hasSubscriptionId = getSubscriptionId(dpgContext);
+  const ignoreNullableOnOptional = getIgnoreNullableOnOptional(
+    emitterOptions,
+    flavor
+  );
+  const isMultiService = (dpgContext.allServiceNamespaces?.length ?? 0) > 1;
 
   return {
     ...credentialInfo,
+    includeHeadersInResponse,
     flavor,
     moduleKind,
     includeShortcuts,
@@ -117,12 +132,14 @@ function extractRLCOptions(
     compatibilityQueryMultiFormat,
     typespecTitleMap,
     ignoreEnumMemberNameNormalize,
-    hasSubscriptionId
+    hasSubscriptionId,
+    ignoreNullableOnOptional,
+    isMultiService
   };
 }
 
-function processAuth(program: Program) {
-  const serviceNs = getDefaultService(program)?.type;
+function processAuth(program: Program, isModularLibrary: boolean) {
+  const serviceNs = getDefaultService(program, isModularLibrary)?.type;
   if (!serviceNs) {
     return undefined;
   }
@@ -190,7 +207,8 @@ function processAuth(program: Program) {
 
 function getEnableOperationGroup(
   dpgContext: SdkContext,
-  emitterOptions: EmitterOptions
+  emitterOptions: EmitterOptions,
+  isModularLibrary: boolean
 ) {
   if (
     emitterOptions["enable-operation-group"] === true ||
@@ -199,7 +217,7 @@ function getEnableOperationGroup(
     return emitterOptions["enable-operation-group"];
   }
   // Only detect if existing name conflicts if customers don't set hierarchyClient to true
-  return detectIfNameConflicts(dpgContext);
+  return detectIfNameConflicts(dpgContext, isModularLibrary);
 }
 
 function getEnableModelNamespace(
@@ -231,8 +249,11 @@ function getClearOutputFolder(emitterOptions: EmitterOptions) {
   return emitterOptions["clear-output-folder"] ? true : false;
 }
 
-function detectIfNameConflicts(dpgContext: SdkContext) {
-  const clients = getRLCClients(dpgContext);
+function detectIfNameConflicts(
+  dpgContext: SdkContext,
+  isModularLibrary: boolean
+) {
+  const clients = getRLCClients(dpgContext, isModularLibrary);
   for (const client of clients) {
     // only consider it's conflict when there are conflicts in the same client
     const nameSet = new Set<string>();
@@ -251,6 +272,18 @@ function detectIfNameConflicts(dpgContext: SdkContext) {
   return false;
 }
 
+function getIgnoreNullableOnOptional(
+  emitterOptions: EmitterOptions,
+  flavor: PackageFlavor
+): boolean {
+  // If explicitly set in options, use that value
+  if (emitterOptions["ignore-nullable-on-optional"] !== undefined) {
+    return Boolean(emitterOptions["ignore-nullable-on-optional"]);
+  }
+  // Default to true for Azure services (same as HLC behavior)
+  return flavor === "azure";
+}
+
 function getIncludeShortcuts(emitterOptions: EmitterOptions) {
   return Boolean(emitterOptions["include-shortcuts"]);
 }
@@ -290,7 +323,8 @@ function getFlavor(
 }
 function buildPackageDetails(
   program: Program,
-  emitterOptions: EmitterOptions
+  emitterOptions: EmitterOptions,
+  isModularLibrary: boolean
 ): PackageDetails {
   const defaultDetail = {
     name: "@msinternal/unamedpackage",
@@ -305,7 +339,9 @@ function buildPackageDetails(
     name:
       emitterOptions["package-details"]?.name ??
       normalizeName(
-        emitterOptions?.title ?? getDefaultService(program)?.title ?? "",
+        emitterOptions?.title ??
+          getDefaultService(program, isModularLibrary)?.title ??
+          "",
         NameType.Class
       ),
     version: emitterOptions["package-details"]?.version ?? "1.0.0-beta.1",
@@ -323,13 +359,17 @@ function buildPackageDetails(
 
 function getPackageDetails(
   program: Program,
-  emitterOptions: EmitterOptions
+  emitterOptions: EmitterOptions,
+  isModularLibrary: boolean
 ): PackageDetails {
-  return buildPackageDetails(program, emitterOptions);
+  return buildPackageDetails(program, emitterOptions, isModularLibrary);
 }
 
-function getServiceInfo(program: Program): ServiceInfo {
-  const defaultService = getDefaultService(program);
+function getServiceInfo(
+  program: Program,
+  isModularLibrary: boolean
+): ServiceInfo {
+  const defaultService = getDefaultService(program, isModularLibrary);
   return {
     title: defaultService?.title,
     description: defaultService && getDoc(program, defaultService.type)
@@ -397,9 +437,10 @@ function getGenerateSample(
 
 export function getCredentialInfo(
   program: Program,
-  emitterOptions: EmitterOptions
+  emitterOptions: EmitterOptions,
+  isModularLibrary: boolean = true
 ) {
-  const securityInfo = processAuth(program);
+  const securityInfo = processAuth(program, isModularLibrary);
   const addCredentials =
     emitterOptions["add-credentials"] === false
       ? false

package/src/utils/clientUtils.ts

@@ -18,23 +18,58 @@ import { SdkContext } from "./interfaces.js";
 import { ModularClientOptions } from "../modular/interfaces.js";
 import { NameType, normalizeName } from "@azure-tools/rlc-common";
 
-export function getRLCClients(dpgContext: SdkContext): SdkClient[] {
-  const services = new Set<Namespace>();
-  listClients(dpgContext).forEach((c) => {
-    const clientService = c.service;
-    if (Array.isArray(clientService)) {
+export function getRLCClients(
+  dpgContext: SdkContext,
+  isModularLibrary?: boolean
+): SdkClient[] {
+  const modular =
+    isModularLibrary ?? dpgContext.rlcOptions?.isModularLibrary ?? false;
+  const clients = listClients(dpgContext);
+  const rawServiceNamespaces =
+    dpgContext.allServiceNamespaces ?? listAllServiceNamespaces(dpgContext);
+
+  // For one client in Modular: Return the client from listClients with multi-service support
+  if (modular && clients.length === 1) {
+    return clients.map((client) => {
+      const services = client.services;
+      return {
+        ...client,
+        services: services,
+        crossLanguageDefinitionId: `${getNamespaceFullName(
+          services[0]!
+        )}.${client.name}`
+      };
+    });
+  } else {
+    // For RLC and multiple clients in Modular:
+    // Flatten all services and return one client per service
+    const services = new Set<Namespace>();
+    clients.forEach((c) => {
+      const clientService = c.services;
       clientService.forEach((ns) => services.add(ns));
-    } else {
-      services.add(clientService);
+    });
+
+    if (services.size > 0) {
+      return [...services.values()].map((service) => {
+        const clientName = service.name + "Client";
+        return {
+          kind: "SdkClient",
+          name: clientName,
+          service: service,
+          type: service,
+          services: [service],
+          arm: Boolean(dpgContext.arm),
+          crossLanguageDefinitionId: `${getNamespaceFullName(
+            service
+          )}.${clientName}`,
+          subOperationGroups: []
+        };
+      });
     }
-  });
-  const rawServiceNamespaces = listAllServiceNamespaces(dpgContext);
-  if (services.size === 0 && rawServiceNamespaces.length > 0) {
-    // If no clients are found, fall back to raw service namespaces
-    [...rawServiceNamespaces.values()].forEach((ns) => services.add(ns));
   }
 
-  return [...services.values()].map((service) => {
+  // Fallback to raw service namespaces if no clients found
+  return rawServiceNamespaces.map((service) => {
     const clientName = service.name + "Client";
     return {
       kind: "SdkClient",
@@ -53,9 +88,7 @@ export function getRLCClients(dpgContext: SdkContext): SdkClient[] {
 
 export function listOperationsUnderRLCClient(client: SdkClient): Operation[] {
   const operations = [];
-  const serviceArray = Array.isArray(client.service)
-    ? client.service
-    : [client.service];
+  const serviceArray = client.services;
   const queue: (Namespace | Interface)[] = [...serviceArray];
   while (queue.length > 0) {
     const current = queue.shift()!;

package/src/utils/crossLanguageDef.ts

@@ -5,6 +5,7 @@ import { SdkContext } from "./interfaces.js";
 import { transformModularEmitterOptions } from "../modular/buildModularOptions.js";
 import { getMethodHierarchiesMap } from "./operationUtil.js";
 import { NameType, normalizeName } from "@azure-tools/rlc-common";
+import { UsageFlags } from "@azure-tools/typespec-client-generator-core";
 
 export function generateCrossLanguageDefinitionFile(dpgContext: SdkContext): {
   CrossLanguagePackageId: string;
@@ -28,6 +29,13 @@ export function generateCrossLanguageDefinitionFile(dpgContext: SdkContext): {
       model.crossLanguageDefinitionId;
   }
   for (const enm of dpgContext.sdkPackage.enums) {
+    // Skip api version enum for multi-service scenarios since each service may have different versions
+    if (
+      dpgContext.rlcOptions?.isMultiService &&
+      enm.usage === UsageFlags.ApiVersionEnum
+    ) {
+      continue;
+    }
     CrossLanguageDefinitionId[`${packageName}!Known${enm.name}:enum`] =
       enm.crossLanguageDefinitionId;
   }

package/src/utils/interfaces.ts

@@ -1,12 +1,13 @@
 import { RLCOptions, SchemaContext } from "@azure-tools/rlc-common";
 import { SdkContext as TCGCSdkContext } from "@azure-tools/typespec-client-generator-core";
-import { ModelProperty } from "@typespec/compiler";
+import { ModelProperty, Namespace } from "@typespec/compiler";
 import { KnownMediaType } from "./mediaTypes.js";
 
 export interface SdkContext extends TCGCSdkContext {
   rlcOptions?: RLCOptions;
   generationPathDetail?: GenerationDirDetail;
   hasApiVersionInClient?: boolean;
+  allServiceNamespaces?: Namespace[];
 }
 
 export interface GenerationDirDetail {

package/src/utils/modelUtils.ts

@@ -232,10 +232,7 @@ export function getSchemaForType(
         });
         schema.type = "object";
       }
-    } else if (
-      !isArrayModelType(program, type) &&
-      !isRecordModelType(program, type)
-    ) {
+    } else if (!isArrayModelType(type) && !isRecordModelType(type)) {
       if (usage && usage.includes(SchemaContext.Output)) {
         schema.outputTypeName = `${schema.name}Output`;
       }
@@ -659,7 +656,7 @@ function getSchemaForModel(
     isRequestBody,
     mediaTypes: contentTypes
   } = options ?? {};
-  if (isArrayModelType(dpgContext.program, model)) {
+  if (isArrayModelType(model)) {
     return getSchemaForArrayModel(dpgContext, model, options);
   }
 
@@ -680,7 +677,7 @@ function getSchemaForModel(
     true /** shouldGuard */
   );
 
-  if (model.name === "Record" && isRecordModelType(program, model)) {
+  if (model.name === "Record" && isRecordModelType(model)) {
     return getSchemaForRecordModel(dpgContext, model, { usage });
   }
   modelSchema.typeName = modelSchema.name;
@@ -748,7 +745,7 @@ function getSchemaForModel(
   if (needRef) {
     return modelSchema;
   }
-  if (isRecordModelType(program, model)) {
+  if (isRecordModelType(model)) {
     modelSchema.parents = {
       all: [getSchemaForRecordModel(dpgContext, model, { usage })],
       immediate: [getSchemaForRecordModel(dpgContext, model, { usage })]
@@ -1113,7 +1110,7 @@ function getSchemaForArrayModel(
   if (!indexer) {
     return schema;
   }
-  if (isArrayModelType(program, type)) {
+  if (isArrayModelType(type)) {
     schema = {
       type: "array",
       items: getSchemaForType(dpgContext, indexer.value!, {
@@ -1210,7 +1207,7 @@ function getSchemaForRecordModel(
   if (!indexer) {
     return schema;
   }
-  if (isRecordModelType(program, type)) {
+  if (isRecordModelType(type)) {
     const valueType = getSchemaForType(dpgContext, indexer?.value, {
       usage,
       needRef: !isAnonymousModelType(indexer.value)
@@ -1661,7 +1658,10 @@ export function predictDefaultValue(
     }
     return specificDefault;
   }
-  const serviceNamespace = getDefaultService(program)?.type;
+  const serviceNamespace = getDefaultService(
+    program,
+    dpgContext.rlcOptions?.isModularLibrary
+  )?.type;
   if (!serviceNamespace) {
     return;
   }
@@ -1672,7 +1672,10 @@ export function predictDefaultValue(
   return;
 }
 
-export function getDefaultService(program: Program): Service | undefined {
+export function getDefaultService(
+  program: Program,
+  isModularLibrary: boolean = true
+): Service | undefined {
   const services = listServices(program);
   if (!services || services.length === 0) {
     reportDiagnostic(program, {
@@ -1680,7 +1683,7 @@ export function getDefaultService(program: Program): Service | undefined {
       target: NoTarget
     });
   }
-  if (services.length > 1) {
+  if (services.length > 1 && !isModularLibrary) {
     reportDiagnostic(program, {
       code: "more-than-one-service",
       target: NoTarget
@@ -1695,8 +1698,12 @@ export function getDefaultApiVersionString(
   dpgContext: SdkContext
 ): string | undefined {
   const program = dpgContext.program;
-  return getDefaultService(program)
-    ? getDefaultApiVersion(dpgContext, getDefaultService(program)!.type)?.value
+  const isModularLibrary = dpgContext.rlcOptions?.isModularLibrary;
+  return getDefaultService(program, isModularLibrary)
+    ? getDefaultApiVersion(
+        dpgContext,
+        getDefaultService(program, isModularLibrary)!.type
+      )?.value
     : undefined;
 }
 
@@ -1922,10 +1929,7 @@ export function getCollectionFormat(
 ): string | undefined {
   const type = param.param;
   const encode = getEncode(context.program, param.param);
-  if (
-    type.type.kind === "Model" &&
-    isArrayModelType(context.program, type.type)
-  ) {
+  if (type.type.kind === "Model" && isArrayModelType(type.type)) {
     if (param.explode) {
       return "multi";
     }

package/static/static-helpers/serialization/serialize-record.ts

@@ -2,11 +2,11 @@ export function serializeRecord(
   item: any,
   excludes?: string[],
   serializer?: (item: any) => any
-) {
-  excludes = excludes ?? [];
+): Record<string, any> {
+  const propertiesToExclude = excludes ?? [];
   const res: any = {};
   for (const key of Object.keys(item)) {
-    if (excludes.includes(key) || item[key] === undefined) {
+    if (propertiesToExclude.includes(key) || item[key] === undefined) {
       continue;
     }
     if (serializer) {