Fix Nested XML Serialization (#3730)

* Fix nested serialization

* fix hardcoded contentType property name

* Support includeRootSlash

* Fix xml serialization

* fix return type

* Fix record serialization

* Update tests

* disable auto formatting in xml

Author: joheredi

packages/typespec-ts/package.json

@@ -73,7 +73,7 @@
     "@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.4",
+    "@azure-tools/typespec-client-generator-core": "^0.64.6",
     "@azure/abort-controller": "^2.1.2",
     "@azure/core-auth": "^1.6.0",
     "@azure/core-lro": "^3.1.0",

packages/typespec-ts/src/modular/buildOperations.ts

@@ -86,7 +86,8 @@ export function buildOperationFiles(
       const sendOperationDeclaration = getSendPrivateFunction(
         dpgContext,
         [prefixes, op],
-        clientType
+        clientType,
+        client
       );
       const deserializeOperationDeclaration = getDeserializePrivateFunction(
         dpgContext,

packages/typespec-ts/src/modular/emitModels.ts

@@ -51,6 +51,8 @@ import {
 import {
   buildXmlModelSerializer,
   buildXmlModelDeserializer,
+  buildXmlObjectModelSerializer,
+  buildXmlObjectModelDeserializer,
   hasXmlSerialization
 } from "./serialization/buildXmlSerializerFunction.js";
 import path from "path";
@@ -384,6 +386,14 @@ function addSerializationFunctions(
   if (typeOrProperty.kind === "model" && hasXmlSerialization(typeOrProperty)) {
     const xmlSerializerRefKey = refkey(typeOrProperty, "xmlSerializer");
     const xmlDeserializerRefKey = refkey(typeOrProperty, "xmlDeserializer");
+    const xmlObjectSerializerRefKey = refkey(
+      typeOrProperty,
+      "xmlObjectSerializer"
+    );
+    const xmlObjectDeserializerRefKey = refkey(
+      typeOrProperty,
+      "xmlObjectDeserializer"
+    );
 
     const xmlSerializationFunction = buildXmlModelSerializer(
       context,
@@ -398,6 +408,24 @@ function addSerializationFunctions(
       addDeclaration(sourceFile, xmlSerializationFunction, xmlSerializerRefKey);
     }
 
+    // Also generate XML object serializer for nested object serialization
+    const xmlObjectSerializationFunction = buildXmlObjectModelSerializer(
+      context,
+      typeOrProperty,
+      options
+    );
+    if (
+      xmlObjectSerializationFunction &&
+      typeof xmlObjectSerializationFunction !== "string" &&
+      xmlObjectSerializationFunction.name
+    ) {
+      addDeclaration(
+        sourceFile,
+        xmlObjectSerializationFunction,
+        xmlObjectSerializerRefKey
+      );
+    }
+
     const xmlDeserializationFunction = buildXmlModelDeserializer(
       context,
       typeOrProperty,
@@ -414,6 +442,24 @@ function addSerializationFunctions(
         xmlDeserializerRefKey
       );
     }
+
+    // Also generate XML object deserializer for nested object deserialization
+    const xmlObjectDeserializationFunction = buildXmlObjectModelDeserializer(
+      context,
+      typeOrProperty,
+      options
+    );
+    if (
+      xmlObjectDeserializationFunction &&
+      typeof xmlObjectDeserializationFunction !== "string" &&
+      xmlObjectDeserializationFunction.name
+    ) {
+      addDeclaration(
+        sourceFile,
+        xmlObjectDeserializationFunction,
+        xmlObjectDeserializerRefKey
+      );
+    }
   }
 }
 

packages/typespec-ts/src/modular/helpers/operationHelpers.ts

@@ -71,9 +71,11 @@ import {
 } from "../type-expressions/get-type-expression.js";
 import { SdkContext } from "../../utils/interfaces.js";
 import {
+  getClientOptions,
   isHttpMetadata,
   isReadOnly,
   SdkBodyParameter,
+  SdkClientType,
   SdkConstantType,
   SdkEnumType,
   SdkHttpOperation,
@@ -96,7 +98,8 @@ import { emitInlineModel } from "../type-expressions/get-model-expression.js";
 export function getSendPrivateFunction(
   dpgContext: SdkContext,
   method: [string[], ServiceOperation],
-  clientType: string
+  clientType: string,
+  client?: SdkClientType<SdkHttpOperation>
 ): OptionalKind<FunctionDeclarationStructure> {
   const operation = method[1];
   const parameters = getOperationSignatureParameters(
@@ -128,7 +131,15 @@ export function getSendPrivateFunction(
     // Generate a unique local variable name that doesn't conflict with parameter names
     const paramNames = new Set(parameters.map((p) => p.name));
     const pathVarName = generateLocallyUniqueName("path", paramNames);
-    statements.push(`const ${pathVarName} = ${resolveReference(UrlTemplateHelpers.parseTemplate)}("${operation.operation.uriTemplate}", {
+    const includeRootSlash = client
+      ? getClientOptions(client, "includeRootSlash") !== false
+      : true;
+
+    const uriTemplate = includeRootSlash
+      ? operation.operation.uriTemplate
+      : operation.operation.uriTemplate.replace(/^\//, "");
+
+    statements.push(`const ${pathVarName} = ${resolveReference(UrlTemplateHelpers.parseTemplate)}("${uriTemplate}", {
         ${urlTemplateParams.join(",\n")}
         },{
       allowReserved: ${optionalParamName}?.requestOptions?.skipUrlEncoding
@@ -1347,7 +1358,7 @@ function getContentTypeValue(
   } else {
     return `contentType: ${
       !param.optional
-        ? "contentType"
+        ? normalizeName(param.name, NameType.Property)
         : `${optionalParamName}.` + param.name + " as any"
     }`;
   }