@azure-tools/typespec-ts 0.48.1 → 0.49.0-alpha.20260203.1

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,31 @@ 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 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 +80,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,6 +92,7 @@ function extractRLCOptions(
     emitterOptions["compatibility-query-multi-format"];
   const typespecTitleMap = emitterOptions["typespec-title-map"];
   const hasSubscriptionId = getSubscriptionId(dpgContext);
+  const isMultiService = (dpgContext.allServiceNamespaces?.length ?? 0) > 1;
 
   return {
     ...credentialInfo,
@@ -117,12 +125,13 @@ function extractRLCOptions(
     compatibilityQueryMultiFormat,
     typespecTitleMap,
     ignoreEnumMemberNameNormalize,
-    hasSubscriptionId
+    hasSubscriptionId,
+    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 +199,8 @@ function processAuth(program: Program) {
 
 function getEnableOperationGroup(
   dpgContext: SdkContext,
-  emitterOptions: EmitterOptions
+  emitterOptions: EmitterOptions,
+  isModularLibrary: boolean
 ) {
   if (
     emitterOptions["enable-operation-group"] === true ||
@@ -199,7 +209,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 +241,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>();
@@ -290,7 +303,8 @@ function getFlavor(
 }
 function buildPackageDetails(
   program: Program,
-  emitterOptions: EmitterOptions
+  emitterOptions: EmitterOptions,
+  isModularLibrary: boolean
 ): PackageDetails {
   const defaultDetail = {
     name: "@msinternal/unamedpackage",
@@ -305,7 +319,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 +339,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 +417,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,64 @@ 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)) {
-      clientService.forEach((ns) => services.add(ns));
-    } else {
-      services.add(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 = Array.isArray(client.service)
+        ? client.service
+        : [client.service];
+      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.service;
+      if (Array.isArray(clientService)) {
+        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",

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

@@ -1187,7 +1187,7 @@ function getSchemaForArrayModel(
               .join(" | ");
           }
         }
-      } else if (schema.items.type.includes("|")) {
+      } else if (schema.items?.type?.includes("|")) {
         schema.typeName = `(${schema.items.type})[]`;
       } else {
         schema.typeName = `${schema.items.type}[]`;
@@ -1326,6 +1326,10 @@ function getSchemaForStdScalar(
         type: "number",
         format: "safeint"
       });
+    case "numeric":
+      return applyIntrinsicDecorators(program, type, {
+        type: "number"
+      });
     case "uint8":
       return applyIntrinsicDecorators(program, type, {
         type: "number",
@@ -1657,7 +1661,10 @@ export function predictDefaultValue(
     }
     return specificDefault;
   }
-  const serviceNamespace = getDefaultService(program)?.type;
+  const serviceNamespace = getDefaultService(
+    program,
+    dpgContext.rlcOptions?.isModularLibrary
+  )?.type;
   if (!serviceNamespace) {
     return;
   }
@@ -1668,7 +1675,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, {
@@ -1676,7 +1686,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
@@ -1691,8 +1701,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;
 }
 

package/src/utils/operationUtil.ts

@@ -15,6 +15,7 @@ import {
 } from "@azure-tools/rlc-common";
 import { getLroMetadata } from "@azure-tools/typespec-azure-core";
 import {
+  getDisablePageable,
   getHttpOperationWithCache,
   getWireName,
   InitializedByFlags,
@@ -424,7 +425,15 @@ export function extractPageDetails(
   return undefined;
 }
 
-export function isPagingOperation(program: Program, operation: HttpOperation) {
+export function isPagingOperation(
+  dpgContext: SdkContext,
+  operation: HttpOperation
+) {
+  const { program } = dpgContext;
+  if (getDisablePageable(dpgContext, operation.operation)) {
+    return false;
+  }
+
   return extractPageDetails(program, operation) !== undefined;
 }
 
@@ -471,14 +480,13 @@ function findRootSourceProperty(property: ModelProperty): ModelProperty {
 }
 
 export function hasPagingOperations(client: SdkClient, dpgContext: SdkContext) {
-  const program = dpgContext.program;
   for (const op of listOperationsUnderRLCClient(client)) {
     const route = getHttpOperationWithCache(dpgContext, op);
     // ignore overload base operation
     if (route.overloads && route.overloads?.length > 0) {
       continue;
     }
-    if (isPagingOperation(program, route)) {
+    if (isPagingOperation(dpgContext, route)) {
       return true;
     }
   }

package/static/static-helpers/pagingHelpers.ts

@@ -91,6 +91,7 @@ export interface BuildPagedAsyncIteratorOptions {
   itemName?: string;
   nextLinkName?: string;
   nextLinkMethod?: "GET" | "POST";
+  apiVersion?: string;
 }
 
 /**
@@ -111,14 +112,21 @@ export function buildPagedAsyncIterator<
   const itemName = options.itemName ?? "value";
   const nextLinkName = options.nextLinkName ?? "nextLink";
   const nextLinkMethod = options.nextLinkMethod ?? "GET";
+  const apiVersion = options.apiVersion;
   const pagedResult: PagedResult<TElement, TPage, TPageSettings> = {
     getPage: async (pageLink?: string) => {
-      const result =
-        pageLink === undefined
-          ? await getInitialResponse()
-          : nextLinkMethod === "POST"
-            ? await client.pathUnchecked(pageLink).post()
-            : await client.pathUnchecked(pageLink).get();
+      let result;
+      if (pageLink === undefined) {
+        result = await getInitialResponse();
+      } else {
+        const resolvedPageLink = apiVersion
+          ? addApiVersionToUrl(pageLink, apiVersion)
+          : pageLink;
+        result =
+          nextLinkMethod === "POST"
+            ? await client.pathUnchecked(resolvedPageLink).post()
+            : await client.pathUnchecked(resolvedPageLink).get();
+      }
       checkPagingRequest(result, expectedStatuses);
       const results = await processResponseBody(result as TResponse);
       const nextLink = getNextLink(results, nextLinkName);
@@ -273,3 +281,21 @@ function checkPagingRequest(
     );
   }
 }
+
+/**
+ * Adds the api-version query parameter on a URL if it's not present.
+ * @param url - the URL to modify
+ * @param apiVersion - the API version to set
+ * @returns - the URL with the api-version query parameter set
+ */
+function addApiVersionToUrl(url: string, apiVersion: string): string {
+  // The base URL is only used for parsing and won't appear in the returned URL
+  const urlObj = new URL(url, "https://microsoft.com");
+  if (!urlObj.searchParams.get("api-version")) {
+    // Append one if there is no apiVersion
+    return `${url}${
+      Array.from(urlObj.searchParams.keys()).length > 0 ? "&" : "?"
+    }api-version=${apiVersion}`;
+  }
+  return url;
+}

package/static/static-helpers/pollingHelpers.ts

@@ -38,6 +38,10 @@ export interface GetLongRunningPollerOptions<TResponse> {
    * The function to get the initial response
    */
   getInitialResponse?: () => PromiseLike<TResponse>;
+  /**
+   * The api-version of the LRO
+   */
+  apiVersion?: string;
 }
 export function getLongRunningPoller<
   TResponse extends PathUncheckedResponse,
@@ -48,7 +52,7 @@ export function getLongRunningPoller<
   expectedStatuses: string[],
   options: GetLongRunningPollerOptions<TResponse>
 ): PollerLike<OperationState<TResult>, TResult> {
-  const { restoreFrom, getInitialResponse } = options;
+  const { restoreFrom, getInitialResponse, apiVersion } = options;
   if (!restoreFrom && !getInitialResponse) {
     throw new Error(
       "Either restoreFrom or getInitialResponse must be specified"
@@ -91,7 +95,10 @@ export function getLongRunningPoller<
       }
       let response;
       try {
-        response = await client.pathUnchecked(path).get({ abortSignal });
+        const pollingPath = apiVersion
+          ? addApiVersionToUrl(path, apiVersion)
+          : path;
+        response = await client.pathUnchecked(pollingPath).get({ abortSignal });
       } finally {
         options.abortSignal?.removeEventListener("abort", abortListener);
         pollOptions?.abortSignal?.removeEventListener("abort", abortListener);
@@ -132,3 +139,21 @@ function getLroResponse<TResponse extends PathUncheckedResponse>(
     }
   };
 }
+
+/**
+ * Adds the api-version query parameter on a URL if it's not present.
+ * @param url - the URL to modify
+ * @param apiVersion - the API version to set
+ * @returns - the URL with the api-version query parameter set
+ */
+function addApiVersionToUrl(url: string, apiVersion: string): string {
+  // The base URL is only used for parsing and won't appear in the returned URL
+  const urlObj = new URL(url, "https://microsoft.com");
+  if (!urlObj.searchParams.get("api-version")) {
+    // Append one if there is no apiVersion
+    return `${url}${
+      Array.from(urlObj.searchParams.keys()).length > 0 ? "&" : "?"
+    }api-version=${apiVersion}`;
+  }
+  return url;
+}