@azure-tools/typespec-ts 0.42.1 → 0.43.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@azure-tools/typespec-ts",
-  "version": "0.42.1",
+  "version": "0.43.0",
   "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.25-dev.0",
-    "@typespec/spector": "0.1.0-alpha.16-dev.2",
-    "@typespec/spec-api": "0.1.0-alpha.8-dev.0",
-    "@typespec/tspd": "0.70.0",
-    "@azure-tools/azure-http-specs": "0.1.0-alpha.24-dev.0",
-    "@azure-tools/typespec-autorest": "^0.58.0",
-    "@azure-tools/typespec-azure-core": "^0.58.0",
-    "@azure-tools/typespec-azure-resource-manager": "^0.58.0",
-    "@azure-tools/typespec-client-generator-core": "^0.58.0",
+    "@typespec/http-specs": "0.1.0-alpha.26-dev.0",
+    "@typespec/spector": "0.1.0-alpha.18-dev.0",
+    "@typespec/spec-api": "0.1.0-alpha.9-dev.0",
+    "@typespec/tspd": "0.72.1",
+    "@azure-tools/azure-http-specs": "0.1.0-alpha.26-dev.1",
+    "@azure-tools/typespec-autorest": "^0.59.0",
+    "@azure-tools/typespec-azure-core": "^0.59.0",
+    "@azure-tools/typespec-azure-resource-manager": "^0.59.0",
+    "@azure-tools/typespec-client-generator-core": "^0.59.0",
     "@azure/abort-controller": "^2.1.2",
     "@azure/core-auth": "^1.6.0",
     "@azure/core-lro": "^3.1.0",
@@ -41,12 +41,12 @@
     "@types/node": "^18.0.0",
     "@typescript-eslint/eslint-plugin": "^8.28.0",
     "@typescript-eslint/parser": "^8.28.0",
-    "@typespec/compiler": "^1.2.1",
-    "@typespec/http": "^1.2.1",
-    "@typespec/openapi": "^1.2.1",
-    "@typespec/rest": "^0.72.1",
+    "@typespec/compiler": "^1.3.0",
+    "@typespec/http": "^1.3.0",
+    "@typespec/openapi": "^1.3.0",
+    "@typespec/rest": "^0.73.0",
     "@typespec/ts-http-runtime": "^0.1.0",
-    "@typespec/versioning": "^0.72.1",
+    "@typespec/versioning": "^0.73.0",
     "chai": "^4.3.6",
     "chalk": "^4.0.0",
     "cross-env": "^7.0.3",
@@ -68,16 +68,16 @@
     "js-yaml": "^4.1.0"
   },
   "peerDependencies": {
-    "@azure-tools/typespec-azure-core": "^0.58.0",
-    "@azure-tools/typespec-client-generator-core": "^0.58.0",
-    "@typespec/compiler": "^1.2.1",
-    "@typespec/http": "^1.2.1",
-    "@typespec/rest": "^0.72.1",
-    "@typespec/versioning": "^0.72.1",
-    "@typespec/xml": "^0.72.1"
+    "@azure-tools/typespec-azure-core": "^0.59.0",
+    "@azure-tools/typespec-client-generator-core": "^0.59.0",
+    "@typespec/compiler": "^1.3.0",
+    "@typespec/http": "^1.3.0",
+    "@typespec/rest": "^0.73.0",
+    "@typespec/versioning": "^0.73.0",
+    "@typespec/xml": "^0.73.0"
   },
   "dependencies": {
-    "@azure-tools/rlc-common": "^0.42.1",
+    "@azure-tools/rlc-common": "^0.43.0",
     "fs-extra": "^11.1.0",
     "lodash": "^4.17.21",
     "prettier": "^3.3.3",
@@ -146,7 +146,7 @@
     "stop-test-server": "npx tsp-spector server stop",
     "unit-test": "npm-run-all --parallel unit-test:rlc unit-test:modular",
     "unit-test:rlc": "cross-env TS_NODE_PROJECT=tsconfig.json mocha -r ts-node/register --experimental-specifier-resolution=node --experimental-modules=true  --timeout 36000 './test/unit/**/*.spec.ts'",
-    "unit-test:modular": "cross-env TS_NODE_PROJECT=tsconfig.test.json mocha -r ts-node/register --experimental-specifier-resolution=node --experimental-modules=true  --no-timeout './test/modularUnit/**/*.spec.ts' --reporter-options maxDiffSize=20000",
+    "unit-test:modular": "cross-env TS_NODE_PROJECT=tsconfig.test.json NODE_OPTIONS='--max-old-space-size=8192' mocha -r ts-node/register --experimental-specifier-resolution=node --experimental-modules=true  --no-timeout './test/modularUnit/**/*.spec.ts' --reporter-options maxDiffSize=20000",
     "regen-docs": "npm run build && tspd doc . --enable-experimental --output-dir ./website/src/content/docs/docs/emitters/clients/typespec-ts/reference --skip-js"
   }
 }

package/src/index.ts

@@ -548,11 +548,9 @@ export async function createContextWithDefaultOptions(
   context: EmitContext<Record<string, any>>
 ): Promise<SdkContext> {
   const flattenUnionAsEnum =
-    context.options["experimental-extensible-enums"] === undefined &&
-    context.options["experimentalExtensibleEnums"] === undefined
+    context.options["experimental-extensible-enums"] === undefined
       ? isArm(context)
-      : (context.options["experimental-extensible-enums"] ??
-        context.options["experimentalExtensibleEnums"]);
+      : context.options["experimental-extensible-enums"];
   const tcgcSettings = {
     "generate-protocol-methods": true,
     "generate-convenience-methods": true,
@@ -579,10 +577,7 @@ export async function createContextWithDefaultOptions(
 
 // TODO: should be removed once tcgc issue is resolved https://github.com/Azure/typespec-azure/issues/1794
 function isArm(context: EmitContext<Record<string, any>>) {
-  const packageName =
-    (context?.options["package-details"] ??
-      context?.options["packageDetails"] ??
-      {})["name"] ?? "";
+  const packageName = (context?.options["package-details"] ?? {})["name"] ?? "";
   return packageName?.startsWith("@azure/arm-");
 }
 

package/src/lib.ts

@@ -454,7 +454,13 @@ const libDef = {
     "no-paging-items-defined": {
       severity: "warning",
       messages: {
-        default: paramMessage`Please specify @items property for the paging operation - ${"operationName"}.`
+        default: paramMessage`Operation '${"operationName"}' is marked with @list but does not have @pageItems defined.`
+      }
+    },
+    "un-supported-paging-cases": {
+      severity: "warning",
+      messages: {
+        default: paramMessage`Nested paging items in ${"operationName"} are not supported and will be ignored.`
       }
     },
     "decimal-to-number": {

package/src/modular/buildClientContext.ts

@@ -26,8 +26,10 @@ import { useDependencies } from "../framework/hooks/useDependencies.js";
 import { buildEnumTypes, getApiVersionEnum } from "./emitModels.js";
 import {
   SdkClientType,
+  SdkCredentialParameter,
+  SdkEndpointParameter,
   SdkHttpParameter,
-  SdkParameter,
+  SdkMethodParameter,
   SdkServiceOperation
 } from "@azure-tools/typespec-client-generator-core";
 import { getModularClientOptions } from "../utils/clientUtils.js";
@@ -283,7 +285,11 @@ export function buildClientContext(
 
 function getDocsWithKnownVersion(
   dpgContext: SdkContext,
-  param: SdkParameter | SdkHttpParameter
+  param:
+    | SdkMethodParameter
+    | SdkEndpointParameter
+    | SdkCredentialParameter
+    | SdkHttpParameter
 ) {
   const docs = getDocsFromDescription(param.doc);
   if (param.name.toLowerCase() !== "apiversion") {

package/src/modular/emitModels.ts

@@ -15,14 +15,13 @@ import {
 } from "@azure-tools/rlc-common";
 import {
   SdkArrayType,
-  SdkBodyModelPropertyType,
+  SdkModelPropertyType,
   SdkClientType,
   SdkDictionaryType,
   SdkEnumType,
   SdkEnumValueType,
   SdkHttpOperation,
   SdkMethod,
-  SdkModelPropertyType,
   SdkModelType,
   SdkNullableType,
   SdkServiceMethod,
@@ -504,7 +503,7 @@ function addExtendedDictInfo(
     : undefined;
   if (context.rlcOptions?.compatibilityMode) {
     const ancestors = getAllAncestors(model);
-    const properties = getAllProperties(model, ancestors);
+    const properties = getAllProperties(context, model, ancestors);
     let anyType = true;
     if (!additionalPropertiesType) {
       // case 1: if additionalProperties is not defined, we should use any type
@@ -530,7 +529,7 @@ function addExtendedDictInfo(
     const additionalPropertiesType = model.additionalProperties
       ? getTypeExpression(context, model.additionalProperties)
       : undefined;
-    const name = getAdditionalPropertiesName(model);
+    const name = getAdditionalPropertiesName(context, model);
     if (name !== "additionalProperties") {
       // report diagnostic for additionalProperties
       reportDiagnostic(context.program, {
@@ -554,9 +553,12 @@ function addExtendedDictInfo(
   }
 }
 
-export function getAdditionalPropertiesName(model: SdkModelType): string {
+export function getAdditionalPropertiesName(
+  context: SdkContext,
+  model: SdkModelType
+): string {
   const ancestors = getAllAncestors(model);
-  const properties = getAllProperties(model, ancestors);
+  const properties = getAllProperties(context, model, ancestors);
   const nameConflict = properties.find(
     (p) => p.name === "additionalProperties"
   );
@@ -712,7 +714,7 @@ function buildModelProperty(
     name: normalizedPropName,
     type: typeExpression,
     hasQuestionToken: property.optional,
-    isReadonly: isReadOnly(property as SdkBodyModelPropertyType)
+    isReadonly: isReadOnly(property as SdkModelPropertyType)
   };
 
   if (property.doc) {

package/src/modular/helpers/clientHelpers.ts

@@ -6,8 +6,10 @@ import {
 } from "ts-morph";
 import {
   SdkClientType,
+  SdkCredentialParameter,
+  SdkEndpointParameter,
   SdkHttpParameter,
-  SdkParameter,
+  SdkMethodParameter,
   SdkServiceOperation
 } from "@azure-tools/typespec-client-generator-core";
 
@@ -32,6 +34,12 @@ interface ClientParameterOptions {
   apiVersionAsRequired?: boolean;
 }
 
+type SdkParameter =
+  | SdkMethodParameter
+  | SdkEndpointParameter
+  | SdkCredentialParameter
+  | SdkHttpParameter;
+
 export function getClientParameters(
   client: SdkClientType<SdkServiceOperation>,
   dpgContext: SdkContext,
@@ -44,7 +52,7 @@ export function getClientParameters(
     apiVersionAsRequired: true
   }
 ) {
-  const clientParams: (SdkParameter | SdkHttpParameter)[] = [];
+  const clientParams: SdkParameter[] = [];
   for (const property of client.clientInitialization.parameters) {
     if (
       property.type.kind === "union" &&
@@ -62,9 +70,9 @@ export function getClientParameters(
     }
   }
 
-  const hasDefaultValue = (p: SdkParameter | SdkHttpParameter) =>
+  const hasDefaultValue = (p: SdkParameter) =>
     p.clientDefaultValue || p.__raw?.defaultValue || p.type.kind === "constant";
-  const isRequired = (p: SdkParameter | SdkHttpParameter) =>
+  const isRequired = (p: SdkParameter) =>
     !p.optional &&
     ((!hasDefaultValue(p) &&
       !(
@@ -73,13 +81,10 @@ export function getClientParameters(
         hasDefaultValue(p.type.templateArguments[0])
       )) ||
       (options.apiVersionAsRequired && p.isApiVersionParam));
-  const isOptional = (p: SdkParameter | SdkHttpParameter) =>
-    p.optional || hasDefaultValue(p);
-  const skipCredentials = (p: SdkParameter | SdkHttpParameter) =>
-    p.kind !== "credential";
-  const skipMethodParam = (p: SdkParameter | SdkHttpParameter) =>
-    p.kind !== "method";
-  const armSpecific = (p: SdkParameter | SdkHttpParameter) =>
+  const isOptional = (p: SdkParameter) => p.optional || hasDefaultValue(p);
+  const skipCredentials = (p: SdkParameter) => p.kind !== "credential";
+  const skipMethodParam = (p: SdkParameter) => p.kind !== "method";
+  const armSpecific = (p: SdkParameter) =>
     !(p.kind === "endpoint" && dpgContext.arm);
   const filters = [
     options.requiredOnly ? isRequired : undefined,
@@ -134,7 +139,7 @@ export function getClientParametersDeclaration(
 
 function getClientParameterTypeExpression(
   context: SdkContext,
-  parameter: SdkParameter | SdkHttpParameter
+  parameter: SdkParameter
 ) {
   // Special handle to work around the fact that TCGC creates a union type for endpoint. The reason they do this
   // is to provide a way for users to either pass the value to fill in the template of the whole endpoint. Basically they are
@@ -151,9 +156,7 @@ function getClientParameterTypeExpression(
   return getTypeExpression(context, parameter.type);
 }
 
-export function getClientParameterName(
-  parameter: SdkParameter | SdkHttpParameter
-) {
+export function getClientParameterName(parameter: SdkParameter) {
   // We have been calling this endpointParam, so special handling this here to make sure there are no unexpected side effects
   if (
     (parameter.type.kind === "union" &&

package/src/modular/helpers/operationHelpers.ts

@@ -46,6 +46,7 @@ import {
 } from "../type-expressions/get-type-expression.js";
 import { SdkContext } from "../../utils/interfaces.js";
 import {
+  isHttpMetadata,
   isReadOnly,
   SdkBodyParameter,
   SdkClientType,
@@ -55,10 +56,10 @@ import {
   SdkLroPagingServiceMethod,
   SdkLroServiceMethod,
   SdkMethod,
+  SdkMethodParameter,
   SdkModelPropertyType,
   SdkModelType,
   SdkPagingServiceMethod,
-  SdkServiceParameter,
   SdkType
 } from "@azure-tools/typespec-client-generator-core";
 import { isMetadata } from "@typespec/http";
@@ -153,7 +154,7 @@ export function getDeserializePrivateFunction(
   const response = operation.response;
   const restResponse = operation.operation.responses[0];
   let returnType;
-  if (isLroOnly && operation.operation.verb.toLowerCase() !== "patch") {
+  if (isLroOnly) {
     returnType = buildLroReturnType(context, operation);
   } else if (response.type && restResponse) {
     returnType = {
@@ -686,7 +687,7 @@ function getHeaderAndBodyParameters(
 
   const parametersImplementation: Record<
     "header" | "body",
-    { paramMap: string; param: SdkServiceParameter }[]
+    { paramMap: string; param: SdkHttpParameter }[]
   > = {
     header: [],
     body: []
@@ -744,7 +745,7 @@ function getHeaderAndBodyParameters(
 function buildHeaderParameter(
   program: Program,
   paramMap: string,
-  param: SdkServiceParameter,
+  param: SdkHttpParameter,
   optionalParamName: string = "options"
 ): string {
   const paramName = param.name;
@@ -829,7 +830,7 @@ function getEncodingFormat(type: { format?: string }) {
  */
 export function getParameterMap(
   context: SdkContext,
-  param: SdkServiceParameter,
+  param: SdkHttpParameter,
   optionalParamName: string = "options"
 ): string {
   if (isConstant(param.type)) {
@@ -854,7 +855,7 @@ export function getParameterMap(
 
 function getCollectionFormat(
   context: SdkContext,
-  param: SdkServiceParameter,
+  param: SdkHttpParameter,
   optionalParamName: string = "options"
 ) {
   const serializedName = getPropertySerializedName(param);
@@ -887,7 +888,7 @@ function getCollectionFormat(
   )}${additionalParam}): undefined`;
 }
 
-function isContentType(param: SdkServiceParameter): boolean {
+function isContentType(param: SdkHttpParameter): boolean {
   return (
     param.kind === "header" &&
     param.serializedName.toLowerCase() === "content-type"
@@ -895,7 +896,7 @@ function isContentType(param: SdkServiceParameter): boolean {
 }
 
 function getContentTypeValue(
-  param: SdkServiceParameter,
+  param: SdkHttpParameter,
   optionalParamName: string = "options"
 ) {
   const defaultValue = param.clientDefaultValue;
@@ -914,11 +915,11 @@ function getContentTypeValue(
   }
 }
 
-function isRequired(param: SdkModelPropertyType) {
+function isRequired(param: SdkHttpParameter) {
   return !param.optional;
 }
 
-function getRequired(context: SdkContext, param: SdkModelPropertyType) {
+function getRequired(context: SdkContext, param: SdkHttpParameter) {
   const serializedName = getPropertySerializedName(param);
   const clientValue = `${param.onClient ? "context." : ""}${param.name}`;
   if (param.type.kind === "model") {
@@ -950,7 +951,7 @@ function isConstant(param: SdkType): param is SdkConstantType {
   return param.kind === "constant";
 }
 
-function isOptional(param: SdkModelPropertyType) {
+function isOptional(param: SdkHttpParameter) {
   return Boolean(param.optional);
 }
 
@@ -1001,7 +1002,7 @@ function getOptionalForType(
 /**
  * Builds the assignment for when a property or parameter has a default value
  */
-function getDefaultValue(param: SdkServiceParameter) {
+function getDefaultValue(param: SdkHttpParameter) {
   return param.clientDefaultValue;
 }
 
@@ -1043,7 +1044,7 @@ function getQueryParameters(
   );
   const parametersImplementation: Record<
     "query",
-    { paramMap: string; param: SdkServiceParameter }[]
+    { paramMap: string; param: SdkHttpParameter }[]
   > = {
     query: []
   };
@@ -1079,7 +1080,7 @@ function escapeUriTemplateParamName(name: string) {
 }
 
 function getPathParamExpr(
-  param: SdkModelPropertyType,
+  param: SdkMethodParameter | SdkModelPropertyType,
   defaultValue?: string,
   optionalParamName: string = "options"
 ) {
@@ -1154,7 +1155,7 @@ export function getRequestModelProperties(
   const props: [string, string][] = [];
   const allParents = getAllAncestors(modelPropertyType);
   const properties: SdkModelPropertyType[] =
-    getAllProperties(modelPropertyType, allParents) ?? [];
+    getAllProperties(context, modelPropertyType, allParents) ?? [];
   if (properties.length <= 0) {
     return [];
   }
@@ -1191,14 +1192,14 @@ export function getRequestModelMapping(
   ).map(([name, value]) => `"${name}": ${value}`);
 }
 
-function getPropertySerializedName(property: SdkModelPropertyType) {
-  return property.kind !== "credential" &&
-    property.kind !== "method" &&
-    property.kind !== "endpoint" &&
-    property.kind !== "responseheader"
-    ? // eslint-disable-next-line
-      property.serializedName
-    : property.name;
+function getPropertySerializedName(
+  property: SdkHttpParameter | SdkModelPropertyType
+) {
+  return (
+    (property.kind === "property"
+      ? property.serializationOptions.json?.name
+      : property.serializedName) ?? property.name
+  );
 }
 
 /**
@@ -1212,7 +1213,7 @@ export function getResponseMapping(
 ) {
   const allParents = type.kind === "model" ? getAllAncestors(type) : [];
   const properties =
-    type.kind === "model" ? getAllProperties(type, allParents) : [];
+    type.kind === "model" ? getAllProperties(context, type, allParents) : [];
   const props: string[] = [];
   for (const property of properties) {
     if (isMetadata(context.program, property.__raw!)) {
@@ -1481,6 +1482,7 @@ export function isPagingOnlyOperation(
 }
 
 export function getAllProperties(
+  context: SdkContext,
   type: SdkType,
   parents?: SdkType[]
 ): SdkModelPropertyType[] {
@@ -1489,14 +1491,14 @@ export function getAllProperties(
     return [];
   }
   parents?.forEach((p) => {
-    getAllProperties(p).forEach((prop) => {
+    getAllProperties(context, p).forEach((prop) => {
       propertiesMap.set(prop.name, prop);
     });
   });
   if (type.kind === "model" && type.properties) {
     type.properties
       .filter((p) => {
-        return p.kind === "property";
+        return p.kind === "property" && !isHttpMetadata(context, p);
       })
       .forEach((p) => {
         propertiesMap.set(p.name, p);
@@ -1517,7 +1519,7 @@ export function getAllAncestors(type: SdkType): SdkType[] {
 
 export function getPropertySerializationPrefix(
   context: SdkContext,
-  property: SdkServiceParameter | SdkModelPropertyType,
+  property: SdkHttpParameter | SdkModelPropertyType,
   propertyPath?: string
 ) {
   const propertyFullName = getPropertyFullName(context, property, propertyPath);
@@ -1530,7 +1532,7 @@ export function getPropertySerializationPrefix(
 
 export function getPropertyFullName(
   context: SdkContext,
-  property: SdkServiceParameter | SdkModelPropertyType,
+  property: SdkHttpParameter | SdkModelPropertyType,
   propertyPath?: string
 ) {
   const normalizedPropertyName = normalizeModelPropertyName(context, property)

package/src/modular/helpers/typeHelpers.ts

@@ -1,7 +1,9 @@
 import { NameType, normalizeName } from "@azure-tools/rlc-common";
 import {
   SdkBodyParameter,
-  SdkModelPropertyType,
+  SdkCredentialParameter,
+  SdkEndpointParameter,
+  SdkMethodParameter,
   SdkType
 } from "@azure-tools/typespec-client-generator-core";
 
@@ -71,7 +73,7 @@ export function isDateTimeTypeKind(kind: string): boolean {
 }
 
 export function isCredentialType(
-  type: SdkType | SdkModelPropertyType
+  type: SdkEndpointParameter | SdkCredentialParameter | SdkMethodParameter
 ): boolean {
   return type.kind === "credential";
 }

package/src/modular/serialization/buildDeserializerFunction.ts

@@ -366,7 +366,7 @@ function getAdditionalPropertiesStatement(
     return undefined;
   }
   const allParents = getAllAncestors(type);
-  const properties = getAllProperties(type, allParents);
+  const properties = getAllProperties(context, type, allParents);
   const excludeProperties = properties
     .filter((p) => !!p.name)
     .map((p) => `"${p.name}"`);
@@ -383,7 +383,7 @@ function getAdditionalPropertiesStatement(
   }
   return context.rlcOptions?.compatibilityMode === true
     ? "...item,"
-    : `${getAdditionalPropertiesName(type)}: ${resolveReference(SerializationHelpers.serializeRecord)}(${params.join(",")}),`;
+    : `${getAdditionalPropertiesName(context, type)}: ${resolveReference(SerializationHelpers.serializeRecord)}(${params.join(",")}),`;
 }
 
 function buildDictTypeDeserializer(

package/src/modular/serialization/buildSerializerFunction.ts

@@ -345,7 +345,7 @@ function buildModelTypeSerializer(
     // TODO: cleaner abstraction, quite a bit of duplication with the non-MFD stuff here
     const parts: string[] = [];
 
-    const properties = getAllProperties(type, getAllAncestors(type));
+    const properties = getAllProperties(context, type, getAllAncestors(type));
     for (const property of properties) {
       if (property.kind !== "property") {
         continue;
@@ -354,35 +354,36 @@ function buildModelTypeSerializer(
 
       let partDefinition: string;
       // eslint-disable-next-line
-      if (property.isMultipartFileInput) {
+      const multipart = property.serializationOptions.multipart;
+      if (multipart?.isFilePart) {
         const createFilePartDescriptorDefinition = resolveReference(
           MultipartHelpers.createFilePartDescriptor
         );
         // eslint-disable-next-line
-        const itemPath = property.multipartOptions?.isMulti
+        const itemPath = multipart.isMulti
           ? "x"
           : getPropertyFullName(context, property, "item");
         /* eslint-disable */
-        partDefinition = `${createFilePartDescriptorDefinition}("${property.serializedName}", ${itemPath}, )`;
+        partDefinition = `${createFilePartDescriptorDefinition}("${multipart.name}", ${itemPath}, )`;
 
         // If the TypeSpec doesn't specify a default content type, TCGC will infer a default of "*/*".
         // In this case, we actually want the content type to be left unset so that Core will take care of
         // setting the content type correctly.
         // eslint-disable
         const contentType =
-          property.multipartOptions?.defaultContentTypes?.[0] === "*/*"
+          multipart.defaultContentTypes?.[0] === "*/*"
             ? undefined
-            : property.multipartOptions?.defaultContentTypes?.[0];
+            : multipart.defaultContentTypes?.[0];
 
-        if (property.multipartOptions?.isMulti) {
-          partDefinition = `...(item["${property.serializedName}"].map((x: unknown) => ${createFilePartDescriptorDefinition}("${property.serializedName}", x${contentType ? `,"${contentType}"` : ""})))`;
+        if (multipart.isMulti) {
+          partDefinition = `...(item["${multipart.name}"].map((x: unknown) => ${createFilePartDescriptorDefinition}("${multipart.name}", x${contentType ? `,"${contentType}"` : ""})))`;
         } else {
-          partDefinition = `${createFilePartDescriptorDefinition}("${property.serializedName}", item["${property.serializedName}"]${contentType ? `, "${contentType}"` : ""})`;
+          partDefinition = `${createFilePartDescriptorDefinition}("${multipart.name}", item["${multipart.name}"]${contentType ? `, "${contentType}"` : ""})`;
         }
-      } else if (property.multipartOptions?.isMulti) {
-        partDefinition = `...((${expr}).map((x: unknown) => ({ name: "${property.serializedName}", body: x })))`;
+      } else if (multipart?.isMulti) {
+        partDefinition = `...((${expr}).map((x: unknown) => ({ name: "${multipart?.name}", body: x })))`;
       } else {
-        partDefinition = `{ name: "${property.serializedName}", body: (${expr}) }`;
+        partDefinition = `{ name: "${multipart?.name}", body: (${expr}) }`;
       }
       /* eslint-disable */
       if (property.optional) {
@@ -441,7 +442,7 @@ function getAdditionalPropertiesStatement(
     false,
     true
   );
-  const params = [`item.${getAdditionalPropertiesName(type)}`];
+  const params = [`item.${getAdditionalPropertiesName(context, type)}`];
   if (typeof deserializerFunction === "string") {
     params.push("undefined");
     params.push(deserializerFunction);

package/src/modular/type-expressions/get-type-expression.ts

@@ -1,4 +1,5 @@
 import {
+  SdkHttpParameter,
   SdkModelPropertyType,
   SdkType
 } from "@azure-tools/typespec-client-generator-core";
@@ -16,7 +17,7 @@ export interface EmitTypeOptions {
 
 export function normalizeModelPropertyName(
   context: SdkContext,
-  property: SdkModelPropertyType
+  property: SdkModelPropertyType | SdkHttpParameter
 ): string {
   const normalizedPropName = normalizeName(property.name, NameType.Property);
   return context.rlcOptions?.ignorePropertyNameNormalize