@azure-tools/typespec-ts 0.48.0 → 0.48.1-alpha.20260127.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@azure-tools/typespec-ts",
-  "version": "0.48.0",
+  "version": "0.48.1-alpha.20260127.1",
   "description": "An experimental TypeSpec emitter for TypeScript RLC",
   "main": "dist/src/index.js",
   "type": "module",
@@ -18,15 +18,15 @@
   "license": "MIT",
   "devDependencies": {
     "@azure-rest/core-client": "^2.3.1",
-    "@typespec/http-specs": "0.1.0-alpha.31-dev.1",
-    "@typespec/spector": "0.1.0-alpha.23-dev.0",
+    "@typespec/http-specs": "0.1.0-alpha.32-dev.1",
+    "@typespec/spector": "0.1.0-alpha.23-dev.1",
     "@typespec/spec-api": "0.1.0-alpha.13-dev.0",
     "@typespec/tspd": "0.73.3",
-    "@azure-tools/azure-http-specs": "0.1.0-alpha.35-dev.9",
+    "@azure-tools/azure-http-specs": "0.1.0-alpha.37-dev.1",
     "@azure-tools/typespec-autorest": "^0.64.0",
     "@azure-tools/typespec-azure-core": "^0.64.0",
     "@azure-tools/typespec-azure-resource-manager": "^0.64.0",
-    "@azure-tools/typespec-client-generator-core": "^0.64.1",
+    "@azure-tools/typespec-client-generator-core": "^0.64.4",
     "@azure/abort-controller": "^2.1.2",
     "@azure/core-auth": "^1.6.0",
     "@azure/core-lro": "^3.1.0",
@@ -65,7 +65,7 @@
   },
   "peerDependencies": {
     "@azure-tools/typespec-azure-core": "^0.64.0",
-    "@azure-tools/typespec-client-generator-core": "^0.64.1",
+    "@azure-tools/typespec-client-generator-core": "^0.64.4",
     "@typespec/compiler": "^1.8.0",
     "@typespec/http": "^1.8.0",
     "@typespec/rest": "^0.78.0",
@@ -73,7 +73,8 @@
     "@typespec/xml": "^0.78.0"
   },
   "dependencies": {
-    "@azure-tools/rlc-common": "^0.48.0",
+    "@azure-tools/rlc-common": "0.48.1-alpha.20260127.1",
+    "fast-xml-parser": "^4.5.0",
     "fs-extra": "^11.1.0",
     "lodash": "^4.17.21",
     "prettier": "^3.3.3",

package/src/index.ts

@@ -18,7 +18,8 @@ import {
   PollingHelpers,
   SerializationHelpers,
   SimplePollerHelpers,
-  UrlTemplateHelpers
+  UrlTemplateHelpers,
+  XmlHelpers
 } from "./modular/static-helpers-metadata.js";
 import {
   RLCModel,
@@ -92,6 +93,7 @@ import { getModuleExports } from "./modular/buildProjectFiles.js";
 import { getClientHierarchyMap, getRLCClients } from "./utils/clientUtils.js";
 import { join } from "path";
 import { loadStaticHelpers } from "./framework/load-static-helpers.js";
+import { packageUsesXmlSerialization } from "./modular/serialization/buildXmlSerializerFunction.js";
 import { provideBinder } from "./framework/hooks/binder.js";
 import { provideSdkTypes } from "./framework/hooks/sdkTypes.js";
 import { transformRLCModel } from "./transform/transform.js";
@@ -135,7 +137,8 @@ export async function $onEmit(context: EmitContext) {
       ...SimplePollerHelpers,
       ...UrlTemplateHelpers,
       ...MultipartHelpers,
-      ...CloudSettingHelpers
+      ...CloudSettingHelpers,
+      ...XmlHelpers
     },
     {
       sourcesDir: dpgContext.generationPathDetail?.modularSourcesDir,
@@ -479,17 +482,29 @@ export async function $onEmit(context: EmitContext) {
         modularPackageInfo = {
           exports: getModuleExports(context, modularEmitterOptions)
         };
+        // Build dependencies
+        const dependencies: Record<string, string> = {};
+        if (isAzureFlavor) {
+          dependencies["@azure/core-util"] = "^1.9.2";
+        }
+        // Add fast-xml-parser if XML serialization is used
+        if (packageUsesXmlSerialization(dpgContext.sdkPackage)) {
+          dependencies["fast-xml-parser"] = "^4.5.0";
+        }
         if (isAzureFlavor) {
           modularPackageInfo = {
             ...modularPackageInfo,
-            dependencies: {
-              "@azure/core-util": "^1.9.2"
-            },
+            dependencies,
             clientContextPaths: getRelativeContextPaths(
               context,
               modularEmitterOptions
             )
           };
+        } else if (Object.keys(dependencies).length > 0) {
+          modularPackageInfo = {
+            ...modularPackageInfo,
+            dependencies
+          };
         }
       }
       commonBuilders.push((model) =>

package/src/modular/buildClientContext.ts

@@ -200,10 +200,20 @@ export function buildClientContext(
   const { endpointParamName: endpointParam, assignedOptionalParams } =
     buildGetClientEndpointParam(factoryFunction, dpgContext, client);
   const credentialParam = buildGetClientCredentialParam(client, emitterOptions);
+
+  // Get api version param early so we can use its name when building options
+  const apiVersionParam = getClientParameters(client, dpgContext).find(
+    (x) => x.isApiVersionParam
+  );
+  const apiVersionParamName = apiVersionParam
+    ? getClientParameterName(apiVersionParam)
+    : undefined;
+
   const optionsParam = buildGetClientOptionsParam(
     factoryFunction,
     emitterOptions,
-    endpointParam
+    endpointParam,
+    apiVersionParamName
   );
 
   factoryFunction.addStatements(
@@ -230,9 +240,6 @@ export function buildClientContext(
   }
 
   let apiVersionPolicyStatement = `clientContext.pipeline.removePolicy({ name: "ApiVersionPolicy" });`;
-  const apiVersionParam = getClientParameters(client, dpgContext).find(
-    (x) => x.isApiVersionParam
-  );
   const endpointParameter = getClientParameters(client, dpgContext, {
     onClientOnly: false,
     requiredOnly: true,
@@ -248,7 +255,7 @@ export function buildClientContext(
     const apiVersionInEndpoint =
       templateArguments && templateArguments.find((p) => p.isApiVersionParam);
     if (!apiVersionInEndpoint && apiVersionParam.clientDefaultValue) {
-      apiVersionPolicyStatement += `const apiVersion = options.apiVersion ?? "${apiVersionParam.clientDefaultValue}";`;
+      apiVersionPolicyStatement += `const ${apiVersionParamName} = options.${apiVersionParamName} ?? "${apiVersionParam.clientDefaultValue}";`;
     }
 
     if (apiVersionParam.kind === "method") {

package/src/modular/buildOperations.ts

@@ -11,7 +11,8 @@ import {
   getOperationFunction,
   getOperationOptionsName,
   getSendPrivateFunction,
-  isLroOnlyOperation
+  isLroOnlyOperation,
+  isLroAndPagingOperation
 } from "./helpers/operationHelpers.js";
 
 import { OperationPathAndDeserDetails } from "./interfaces.js";
@@ -30,7 +31,8 @@ import {
 } from "@azure-tools/typespec-client-generator-core";
 import {
   getMethodHierarchiesMap,
-  ServiceOperation
+  ServiceOperation,
+  hasDualFormatSupport
 } from "../utils/operationUtil.js";
 import { resolveReference } from "../framework/reference.js";
 import { useDependencies } from "../framework/hooks/useDependencies.js";
@@ -144,6 +146,20 @@ export function buildOperationOptions(
     docs: ["Delay to wait until next poll, in milliseconds."]
   };
 
+  // Check if this operation supports both JSON and XML content types
+  const bodyContentTypes = operation.operation.bodyParam?.contentTypes ?? [];
+  const isDualFormat = hasDualFormatSupport(bodyContentTypes);
+
+  // Content type option for dual-format operations
+  const contentTypeOption = {
+    name: "contentType",
+    type: "string",
+    hasQuestionToken: true,
+    docs: [
+      'The content type for the request body. Defaults to "application/json". Use "application/xml" for XML serialization.'
+    ]
+  };
+
   // handle optional body parameter
   // if (operation.operation.bodyParam?.optional === true) {
   //   options.push(operation.operation.bodyParam);
@@ -151,12 +167,27 @@ export function buildOperationOptions(
   const operationOptionsReference = resolveReference(
     dependencies.OperationOptions
   );
+
+  // Build the additional options array
+  const additionalOptions: {
+    name: string;
+    type: string;
+    hasQuestionToken: boolean;
+    docs: string[];
+  }[] = [];
+  if (isLroOnlyOperation(operation) || isLroAndPagingOperation(operation)) {
+    additionalOptions.push(lroOptions);
+  }
+  if (isDualFormat) {
+    additionalOptions.push(contentTypeOption);
+  }
+
   const operationOptionsInterface: InterfaceDeclarationStructure = {
     kind: StructureKind.Interface,
     name,
     isExported: true,
     extends: [operationOptionsReference],
-    properties: (isLroOnlyOperation(operation) ? [lroOptions] : []).concat(
+    properties: additionalOptions.concat(
       options.map((p) => {
         return {
           docs: getDocsFromDescription(p.doc),

package/src/modular/emitModels.ts

@@ -48,6 +48,11 @@ import {
   buildModelSerializer,
   buildPropertySerializer
 } from "./serialization/buildSerializerFunction.js";
+import {
+  buildXmlModelSerializer,
+  buildXmlModelDeserializer,
+  hasXmlSerialization
+} from "./serialization/buildXmlSerializerFunction.js";
 import path from "path";
 import { refkey } from "../framework/refkey.js";
 import { useContext } from "../contextManager.js";
@@ -334,6 +339,8 @@ function addSerializationFunctions(
     nameOnly: false,
     skipDiscriminatedUnionSuffix
   };
+
+  // Add JSON serializers
   const serializationFunction =
     typeOrProperty.kind === "property"
       ? buildPropertySerializer(context, typeOrProperty, options)
@@ -359,6 +366,42 @@ function addSerializationFunctions(
   ) {
     addDeclaration(sourceFile, deserializationFunction, deserializerRefKey);
   }
+
+  // Add XML serializers if the type has XML serialization options
+  if (typeOrProperty.kind === "model" && hasXmlSerialization(typeOrProperty)) {
+    const xmlSerializerRefKey = refkey(typeOrProperty, "xmlSerializer");
+    const xmlDeserializerRefKey = refkey(typeOrProperty, "xmlDeserializer");
+
+    const xmlSerializationFunction = buildXmlModelSerializer(
+      context,
+      typeOrProperty,
+      options
+    );
+    if (
+      xmlSerializationFunction &&
+      typeof xmlSerializationFunction !== "string" &&
+      xmlSerializationFunction.name
+    ) {
+      addDeclaration(sourceFile, xmlSerializationFunction, xmlSerializerRefKey);
+    }
+
+    const xmlDeserializationFunction = buildXmlModelDeserializer(
+      context,
+      typeOrProperty,
+      options
+    );
+    if (
+      xmlDeserializationFunction &&
+      typeof xmlDeserializationFunction !== "string" &&
+      xmlDeserializationFunction.name
+    ) {
+      addDeclaration(
+        sourceFile,
+        xmlDeserializationFunction,
+        xmlDeserializerRefKey
+      );
+    }
+  }
 }
 
 function buildUnionType(

package/src/modular/emitSamples.ts

@@ -281,7 +281,7 @@ function prepareExampleValue(
   onClient?: boolean
 ): ExampleValue {
   return {
-    name: normalizeName(name, NameType.Parameter),
+    name: normalizeName(name, NameType.Parameter, true),
     value:
       typeof value === "string" ? value : getParameterValue(context, value),
     isOptional: Boolean(isOptional),
@@ -411,7 +411,7 @@ function prepareExampleParameters(
   const bodyParam = method.operation.bodyParam;
   const bodySerializeName = bodyParam?.serializedName;
   const bodyExample = parameterMap[bodySerializeName ?? ""];
-  if (bodySerializeName && bodyExample && bodyExample.value) {
+  if (bodyParam && bodyExample && bodyExample.value) {
     if (
       isSpreadBodyParameter(bodyParam) &&
       bodyParam.type.kind === "model" &&

package/src/modular/helpers/clientHelpers.ts

@@ -249,12 +249,14 @@ export function buildGetClientEndpointParam(
  *
  * @param context - context in which the options are being passed; statements will be added to this context
  *                  to help build the options shape
+ * @param apiVersionParamName - the name of the api version parameter in options (e.g., "apiVersion" or "version")
  * @returns - an expression representing the options to be passed in to getClient
  */
 export function buildGetClientOptionsParam(
   context: StatementedNode,
   emitterOptions: ModularEmitterOptions,
-  endpointParam: string
+  endpointParam: string,
+  apiVersionParamName?: string
 ): string {
   const userAgentOptions = buildUserAgentOptions(
     context,
@@ -264,7 +266,9 @@ export function buildGetClientOptionsParam(
   const loggingOptions = buildLoggingOptions(emitterOptions.options.flavor);
   const credentials = buildCredentials(emitterOptions, endpointParam);
 
-  let expr = "const { apiVersion: _, ...updatedOptions } = {";
+  // Use the actual api version parameter name for destructuring, defaulting to "apiVersion"
+  const apiVersionDestructure = apiVersionParamName ?? "apiVersion";
+  let expr = `const { ${apiVersionDestructure}: _, ...updatedOptions } = {`;
 
   expr += "...options,";