@azure-tools/typespec-ts 0.29.0-alpha.20240626.1 → 0.30.0

package/dist/src/modular/emitModels.d.ts

@@ -1,16 +1,16 @@
 import { InterfaceDeclarationStructure, OptionalKind, SourceFile } from "ts-morph";
-import { Client, ModularCodeModel, Type } from "./modularCodeModel.js";
-export declare function isModelWithAdditionalProperties(t: Type): boolean;
+import { Client, ModularCodeModel, Type as ModularType } from "./modularCodeModel.js";
+export declare function isModelWithAdditionalProperties(t: ModularType): boolean;
 /**
  * Extracts all the aliases from the code model
  * 1. alias from polymorphic base model, where we need to use typescript union to combine all the sub models
  * 2. alias from unions, where we also need to use typescript union to combine all the union variants
  */
-export declare function extractAliases(codeModel: ModularCodeModel): Type[];
+export declare function extractAliases(codeModel: ModularCodeModel): ModularType[];
 type InterfaceStructure = OptionalKind<InterfaceDeclarationStructure> & {
     extends: string[];
 };
-export declare function buildModelInterface(model: Type, cache: {
+export declare function buildModelInterface(model: ModularType, cache: {
     coreClientTypes: Set<string>;
     coreLroTypes: Set<string>;
 }): InterfaceStructure;
@@ -18,7 +18,7 @@ export declare function buildModelInterface(model: Type, cache: {
  * This function creates the file containing all the models defined in TypeSpec
  */
 export declare function buildModels(subClient: Client, codeModel: ModularCodeModel): SourceFile | undefined;
-export declare function buildModelTypeAlias(model: Type): {
+export declare function buildModelTypeAlias(model: ModularType): {
     name: string;
     isExported: boolean;
     docs: string[];

package/dist/src/modular/emitModels.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"emitModels.d.ts","sourceRoot":"","sources":["../../../src/modular/emitModels.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,6BAA6B,EAC7B,YAAY,EACZ,UAAU,EAEX,MAAM,UAAU,CAAC;AAKlB,OAAO,EAAE,MAAM,EAAE,gBAAgB,EAAE,IAAI,EAAE,MAAM,uBAAuB,CAAC;AA0BvE,wBAAgB,+BAA+B,CAAC,CAAC,EAAE,IAAI,WAEtD;AAsCD;;;;GAIG;AACH,wBAAgB,cAAc,CAAC,SAAS,EAAE,gBAAgB,GAAG,IAAI,EAAE,CASlE;AA2BD,KAAK,kBAAkB,GAAG,YAAY,CAAC,6BAA6B,CAAC,GAAG;IACtE,OAAO,EAAE,MAAM,EAAE,CAAC;CACnB,CAAC;AAEF,wBAAgB,mBAAmB,CACjC,KAAK,EAAE,IAAI,EACX,KAAK,EAAE;IAAE,eAAe,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IAAC,YAAY,EAAE,GAAG,CAAC,MAAM,CAAC,CAAA;CAAE,GACjE,kBAAkB,CA+BpB;AAGD;;GAEG;AACH,wBAAgB,WAAW,CACzB,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,gBAAgB,GAC1B,UAAU,GAAG,SAAS,CAsFxB;AAgCD,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,IAAI;;;;;EAO9C;AAED,wBAAgB,kBAAkB,CAChC,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,gBAAgB,cA0C5B"}
+{"version":3,"file":"emitModels.d.ts","sourceRoot":"","sources":["../../../src/modular/emitModels.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,6BAA6B,EAC7B,YAAY,EACZ,UAAU,EAEX,MAAM,UAAU,CAAC;AAKlB,OAAO,EACL,MAAM,EACN,gBAAgB,EAChB,IAAI,IAAI,WAAW,EACpB,MAAM,uBAAuB,CAAC;AA6B/B,wBAAgB,+BAA+B,CAAC,CAAC,EAAE,WAAW,WAE7D;AAsCD;;;;GAIG;AACH,wBAAgB,cAAc,CAAC,SAAS,EAAE,gBAAgB,GAAG,WAAW,EAAE,CASzE;AA2BD,KAAK,kBAAkB,GAAG,YAAY,CAAC,6BAA6B,CAAC,GAAG;IACtE,OAAO,EAAE,MAAM,EAAE,CAAC;CACnB,CAAC;AAEF,wBAAgB,mBAAmB,CACjC,KAAK,EAAE,WAAW,EAClB,KAAK,EAAE;IAAE,eAAe,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IAAC,YAAY,EAAE,GAAG,CAAC,MAAM,CAAC,CAAA;CAAE,GACjE,kBAAkB,CA+BpB;AAGD;;GAEG;AACH,wBAAgB,WAAW,CACzB,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,gBAAgB,GAC1B,UAAU,GAAG,SAAS,CA2HxB;AAgCD,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,WAAW;;;;;EAOrD;AAED,wBAAgB,kBAAkB,CAChC,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,gBAAgB,cAgD5B"}

package/dist/src/modular/emitModels.js

@@ -1,9 +1,12 @@
-import { getImportSpecifier } from "@azure-tools/rlc-common";
+import { addImportsToFiles, getImportSpecifier } from "@azure-tools/rlc-common";
 import * as path from "path";
 import { buildOperationOptions } from "./buildOperations.js";
 import { getDocsFromDescription } from "./helpers/docsHelpers.js";
 import { getModularModelFilePath } from "./helpers/namingHelpers.js";
 import { getType } from "./helpers/typeHelpers.js";
+import { buildModelSerializer } from "./serialization/buildSerializerFunction.js";
+import { toCamelCase } from "../utils/casingUtils.js";
+import { addImportBySymbol } from "../utils/importHelper.js";
 // ====== UTILITIES ======
 function isAzureCoreErrorSdkType(t) {
     return (t.name &&
@@ -40,7 +43,7 @@ function extractModels(codeModel) {
         !isAnonymousModel(t)) ||
         isModelWithAdditionalProperties(t));
     for (const model of codeModel.types) {
-        if (model.type === "combined" && model.nullable) {
+        if (model.type === "combined") {
             for (const unionModel of (_a = model.types) !== null && _a !== void 0 ? _a : []) {
                 if (unionModel.type === "model") {
                     models.push(unionModel);
@@ -158,9 +161,24 @@ export function buildModels(subClient, codeModel) {
             if (isModelWithAdditionalProperties(model)) {
                 addExtendedDictInfo(model, modelInterface, codeModel.modularOptions.compatibilityMode);
             }
-            modelsFile.addInterface(modelInterface);
+            if (!modelsFile.getInterface(modelInterface.name)) {
+                modelsFile.addInterface(modelInterface);
+            }
+            // Generate a serializer function next to each model
+            const serializerFunction = buildModelSerializer(model, codeModel.runtimeImports);
+            if (serializerFunction &&
+                !modelsFile.getFunction(toCamelCase(modelInterface.name + "Serializer"))) {
+                modelsFile.addStatements(serializerFunction);
+            }
+            addImportBySymbol("serializeRecord", modelsFile);
+            modelsFile.fixUnusedIdentifiers();
         }
     }
+    const projectRootFromModels = codeModel.clients.length > 1 ? "../.." : "../";
+    addImportsToFiles(codeModel.runtimeImports, modelsFile, {
+        rlcIndex: path.posix.join(projectRootFromModels, "rest", "index.js"),
+        serializerHelpers: path.posix.join(projectRootFromModels, "helpers", "serializerHelpers.js")
+    });
     if (coreClientTypes.size > 0) {
         modelsFile.addImportDeclarations([
             {
@@ -181,6 +199,13 @@ export function buildModels(subClient, codeModel) {
     }
     aliases.forEach((alias) => {
         modelsFile.addTypeAlias(buildModelTypeAlias(alias));
+        if (!models.includes(alias)) {
+            // Generate a serializer function next to each model
+            const serializerFunction = buildModelSerializer(alias, codeModel.runtimeImports);
+            if (serializerFunction) {
+                modelsFile.addStatements(serializerFunction);
+            }
+        }
     });
     return modelsFile;
 }
@@ -233,7 +258,10 @@ export function buildModelsOptions(client, codeModel) {
             namedImports: ["OperationOptions"]
         }
     ]);
-    modelOptionsFile.fixMissingImports();
+    modelOptionsFile.fixMissingImports({}, {
+        importModuleSpecifierPreference: "shortest",
+        importModuleSpecifierEnding: "js"
+    });
     modelOptionsFile
         .getImportDeclarations()
         .filter((id) => {

package/dist/src/modular/emitModels.js.map

@@ -1 +1 @@
-{"version":3,"file":"emitModels.js","sourceRoot":"","sources":["../../../src/modular/emitModels.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"emitModels.js","sourceRoot":"","sources":["../../../src/modular/emitModels.ts"],"names":[],"mappings":"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"}

package/dist/src/modular/helpers/operationHelpers.d.ts

@@ -1,5 +1,5 @@
 import { Imports as RuntimeImports } from "@azure-tools/rlc-common";
-import { SdkContext } from "@azure-tools/typespec-client-generator-core";
+import { SdkContext, SdkModelType, SdkType } from "@azure-tools/typespec-client-generator-core";
 import { FunctionDeclarationStructure, OptionalKind } from "ts-morph";
 import { Client, ModularCodeModel, Operation, Parameter, Property, Type } from "../modularCodeModel.js";
 export declare function getSendPrivateFunction(dpgContext: SdkContext, operation: Operation, clientType: string, runtimeImports: RuntimeImports): OptionalKind<FunctionDeclarationStructure>;
@@ -20,7 +20,11 @@ export declare function getParameterMap(param: Parameter | Property, runtimeImpo
  * This function helps translating an HLC request to RLC request,
  * extracting properties from body and headers and building the RLC response object
  */
-export declare function getRequestModelMapping(modelPropertyType: Type, propertyPath: string | undefined, runtimeImports: RuntimeImports, typeStack?: Type[]): string[];
+interface RequestModelMappingResult {
+    propertiesStr: string[];
+    directAssignment?: boolean;
+}
+export declare function getRequestModelMapping(modelPropertyType: Type, propertyPath: string | undefined, runtimeImports: RuntimeImports, typeStack?: Type[]): RequestModelMappingResult;
 /**
  * This function helps translating an RLC response to an HLC response,
  * extracting properties from body and headers and building the HLC response object
@@ -45,4 +49,8 @@ export declare function hasPagingOnlyOperation(codeModel: ModularCodeModel, need
 export declare function isPagingOnlyOperation(op: Operation): boolean;
 export declare function getAllProperties(type: Type, parents?: Type[]): Property[];
 export declare function getAllAncestors(type: Type): Type[];
+export declare function getPropertySerializationPrefix(modularType: Property | Parameter, propertyPath?: string): string;
+export declare function getPropertyFullName(modularType: Property | Parameter, propertyPath?: string): string;
+export declare function isDiscriminatedUnion(type?: SdkType): type is SdkModelType;
+export {};
 //# sourceMappingURL=operationHelpers.d.ts.map

package/dist/src/modular/helpers/operationHelpers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"operationHelpers.d.ts","sourceRoot":"","sources":["../../../../src/modular/helpers/operationHelpers.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,OAAO,IAAI,cAAc,EAG1B,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAE,UAAU,EAAE,MAAM,6CAA6C,CAAC;AAEzE,OAAO,EACL,4BAA4B,EAC5B,YAAY,EAEb,MAAM,UAAU,CAAC;AAclB,OAAO,EAEL,MAAM,EACN,gBAAgB,EAChB,SAAS,EACT,SAAS,EACT,QAAQ,EACR,IAAI,EACL,MAAM,wBAAwB,CAAC;AAkChC,wBAAgB,sBAAsB,CACpC,UAAU,EAAE,UAAU,EACtB,SAAS,EAAE,SAAS,EACpB,UAAU,EAAE,MAAM,EAClB,cAAc,EAAE,cAAc,GAC7B,YAAY,CAAC,4BAA4B,CAAC,CAoC5C;AAED,wBAAgB,6BAA6B,CAC3C,SAAS,EAAE,SAAS,EACpB,aAAa,EAAE,OAAO,EACtB,oBAAoB,EAAE,OAAO,EAC7B,cAAc,EAAE,cAAc,GAC7B,YAAY,CAAC,4BAA4B,CAAC,CAwI5C;AAkDD;;GAEG;AACH,wBAAgB,oBAAoB,CAClC,SAAS,EAAE,SAAS,EACpB,UAAU,EAAE,MAAM,GACjB,YAAY,CAAC,4BAA4B,CAAC,GAAG;IAAE,YAAY,CAAC,EAAE,MAAM,CAAA;CAAE,CAiDxE;AAkHD,wBAAgB,uBAAuB,CACrC,SAAS,EAAE,SAAS,EACpB,gBAAgB,UAAQ,UAQzB;AAgMD;;GAEG;AACH,wBAAgB,eAAe,CAC7B,KAAK,EAAE,SAAS,GAAG,QAAQ,EAC3B,cAAc,EAAE,cAAc,GAC7B,MAAM,CAmBR;AA0MD;;;;GAIG;AACH,wBAAgB,sBAAsB,CACpC,iBAAiB,EAAE,IAAI,EACvB,YAAY,oBAAiB,EAC7B,cAAc,EAAE,cAAc,EAC9B,SAAS,GAAE,IAAI,EAAO,YAiGvB;AAED;;;GAGG;AACH,wBAAgB,kBAAkB,CAChC,IAAI,EAAE,IAAI,EACV,YAAY,oBAAwB,EACpC,cAAc,EAAE,cAAc,EAC9B,SAAS,GAAE,IAAI,EAAO,YAyFvB;AAED;;;;GAIG;AACH,wBAAgB,wBAAwB,CACtC,IAAI,EAAE,IAAI,EACV,SAAS,EAAE,MAAM,EACjB,cAAc,EAAE,cAAc,EAC9B,QAAQ,EAAE,OAAO,EACjB,SAAS,GAAE,IAAI,EAAO,EACtB,MAAM,CAAC,EAAE,MAAM,GACd,MAAM,CAiGR;AAED;;;;GAIG;AACH,wBAAgB,qBAAqB,CACnC,IAAI,EAAE,IAAI,EACV,WAAW,EAAE,MAAM,EACnB,cAAc,EAAE,cAAc,EAC9B,QAAQ,EAAE,OAAO,EACjB,SAAS,GAAE,IAAI,EAAO,EACtB,MAAM,CAAC,EAAE,MAAM,GACd,MAAM,CA+FR;AAWD,wBAAgB,uBAAuB,CAAC,EAAE,EAAE,SAAS,GAAG,OAAO,CAE9D;AAED,wBAAgB,kBAAkB,CAAC,EAAE,EAAE,SAAS,GAAG,OAAO,CAEzD;AAED,wBAAgB,sBAAsB,CACpC,MAAM,EAAE,MAAM,EACd,OAAO,CAAC,EAAE,OAAO,GAChB,OAAO,CAAC;AACX,wBAAgB,sBAAsB,CACpC,SAAS,EAAE,gBAAgB,EAC3B,OAAO,CAAC,EAAE,OAAO,GAChB,OAAO,CAAC;AAoBX,wBAAgB,qBAAqB,CAAC,EAAE,EAAE,SAAS,GAAG,OAAO,CAE5D;AAED,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,CAAC,EAAE,IAAI,EAAE,GAAG,QAAQ,EAAE,CAczE;AAED,wBAAgB,eAAe,CAAC,IAAI,EAAE,IAAI,GAAG,IAAI,EAAE,CAOlD"}
+{"version":3,"file":"operationHelpers.d.ts","sourceRoot":"","sources":["../../../../src/modular/helpers/operationHelpers.ts"],"names":[],"mappings":"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"}

package/dist/src/modular/helpers/operationHelpers.js

@@ -1,12 +1,12 @@
 import { addImportToSpecifier, getResponseBaseName, getResponseTypeName, NameType } from "@azure-tools/rlc-common";
 import { NoTarget } from "@typespec/compiler";
 import { reportDiagnostic } from "../../lib.js";
-import { toPascalCase } from "../../utils/casingUtils.js";
+import { toCamelCase, toPascalCase } from "../../utils/casingUtils.js";
 import { getCollectionFormatHelper, hasCollectionFormatInfo } from "../../utils/operationUtil.js";
 import { getDeserializeFunctionName, isNormalUnion, isPolymorphicUnion, isSpecialHandledUnion, isSpecialUnionVariant } from "../buildSerializeUtils.js";
 import { getDocsFromDescription, getFixmeForMultilineDocs } from "./docsHelpers.js";
 import { getClassicalLayerPrefix, getOperationName } from "./namingHelpers.js";
-import { buildType } from "./typeHelpers.js";
+import { buildType, isTypeNullable } from "./typeHelpers.js";
 function getRLCResponseType(rlcResponse) {
     if (!(rlcResponse === null || rlcResponse === void 0 ? void 0 : rlcResponse.responses)) {
         return;
@@ -129,7 +129,8 @@ export function getDeserializePrivateFunction(operation, needSubClient, needUnex
         ((deserializedType === null || deserializedType === void 0 ? void 0 : deserializedType.type) === "model" &&
             allParents.some((p) => p.type === "dict")) ||
         response.isBinaryPayload) {
-        statements.push(`return result.body`);
+        // TODO: Fix this any cast when implementing handling dict.
+        statements.push(`return result.body as any`);
     }
     else if (deserializedType &&
         properties.length > 0 &&
@@ -140,9 +141,8 @@ export function getDeserializePrivateFunction(operation, needSubClient, needUnex
         statements.push(`return;`);
     }
     else {
-        statements.push(`return ${deserializeResponseValue(deserializedType, deserializedRoot, runtimeImports, deserializedType.nullable !== undefined
-            ? !deserializedType.nullable
-            : false, [deserializedType], deserializedType.format)}`);
+        statements.push(`return ${deserializeResponseValue(deserializedType, deserializedRoot, runtimeImports, false, // TODO: Calculate if required
+        [deserializedType], deserializedType.format)}`);
     }
     return {
         ...functionStatement,
@@ -384,7 +384,7 @@ function getRequestParameters(dpgContext, operation, runtimeImports) {
 }
 // Specially handle the type for headers because we only allow string/number/boolean values
 function buildHeaderParameter(program, paramMap, param) {
-    if (!param.optional && param.type.nullable === true) {
+    if (!param.optional && isTypeNullable(param.type) === true) {
         reportDiagnostic(program, {
             code: "nullable-required-header",
             target: NoTarget
@@ -395,7 +395,7 @@ function buildHeaderParameter(program, paramMap, param) {
     if (param.optional) {
         conditions.push(`options?.${param.clientName} !== undefined`);
     }
-    if (param.type.nullable === true) {
+    if (isTypeNullable(param.type) === true) {
         conditions.push(`options?.${param.clientName} !== null`);
     }
     return conditions.length > 0
@@ -403,7 +403,7 @@ function buildHeaderParameter(program, paramMap, param) {
         : paramMap;
 }
 function buildBodyParameter(bodyParameter, runtimeImports) {
-    var _a;
+    var _a, _b;
     if (!bodyParameter) {
         return "";
     }
@@ -411,7 +411,7 @@ function buildBodyParameter(bodyParameter, runtimeImports) {
     if (bodyParameter.type.type === "model" &&
         !bodyParameter.type.aliasType &&
         !allParents.some((p) => p.type === "dict")) {
-        const bodyParts = getRequestModelMapping(bodyParameter.type, bodyParameter.clientName, runtimeImports, [bodyParameter.type]);
+        const { propertiesStr: bodyParts } = getRequestModelMapping(bodyParameter.type, bodyParameter.clientName, runtimeImports, [bodyParameter.type]);
         if (bodyParameter && bodyParts.length > 0) {
             const optionalBody = bodyParameter.optional
                 ? `${bodyParameter.clientName} === undefined ? ${bodyParameter.clientName} : `
@@ -422,19 +422,41 @@ function buildBodyParameter(bodyParameter, runtimeImports) {
             return `\nbody: ${bodyParameter.clientName},`;
         }
     }
+    else if (isDiscriminatedUnion(bodyParameter.type.tcgcType)) {
+        const serializerName = toCamelCase(`${bodyParameter.type.name}Serializer`);
+        addImportToSpecifier("modularModel", runtimeImports, serializerName);
+        return `\nbody: ${serializerName}(${bodyParameter.clientName}),`;
+    }
     else if ((bodyParameter.type.type === "model" &&
         (bodyParameter.type.aliasType ||
             allParents.some((p) => p.type === "dict"))) ||
         bodyParameter.type.type === "dict") {
-        return `\nbody: ${bodyParameter.clientName},`;
+        const elementSerializerName = ((_a = bodyParameter.type.elementType) === null || _a === void 0 ? void 0 : _a.type) === "model"
+            ? toCamelCase(`${bodyParameter.type.elementType.name}Serializer`)
+            : "";
+        let modelSerializerName = "";
+        if (bodyParameter.type.type !== "dict") {
+            modelSerializerName = toCamelCase(`${bodyParameter.type.name}Serializer`);
+        }
+        if (modelSerializerName) {
+            return `\nbody: ${modelSerializerName}(${bodyParameter.clientName}),`;
+        }
+        else {
+            // Need to do this so that Records are compatible with additional properties of other types
+            // this should check for compatibility mode once we support the additionalProperties property
+            return `\nbody: serializeRecord(${bodyParameter.clientName} as any, ${elementSerializerName}) as any,`;
+        }
     }
     if (bodyParameter.type.type === "list") {
-        if (((_a = bodyParameter.type.elementType) === null || _a === void 0 ? void 0 : _a.type) === "model" &&
+        if (((_b = bodyParameter.type.elementType) === null || _b === void 0 ? void 0 : _b.type) === "model" &&
             !bodyParameter.type.elementType.aliasType) {
-            const bodyParts = getRequestModelMapping(bodyParameter.type.elementType, "p", runtimeImports, [bodyParameter.type.elementType]);
-            return `\nbody: (${bodyParameter.clientName} ?? []).map((p) => { return {
-        ${bodyParts.join(", ")}
-      };}),`;
+            const { propertiesStr: bodyParts, directAssignment } = getRequestModelMapping(bodyParameter.type.elementType, "p", runtimeImports, [bodyParameter.type.elementType]);
+            const mapBody = directAssignment === true
+                ? bodyParts.join(", ")
+                : `{ ${bodyParts.join(", ")} }`;
+            return `\nbody: (${bodyParameter.clientName} ?? []).map((p) => { 
+      return ${mapBody};
+      }),`;
         }
         return `\nbody: ${bodyParameter.clientName},`;
     }
@@ -516,7 +538,8 @@ function isRequired(param) {
 }
 function getRequired(param, runtimeImports) {
     if (param.type.type === "model") {
-        return `"${param.restApiName}": {${getRequestModelMapping(param.type, param.clientName, runtimeImports, [param.type]).join(",")}}`;
+        const { propertiesStr } = getRequestModelMapping(param.type, param.clientName, runtimeImports, [param.type]);
+        return `"${param.restApiName}": { ${propertiesStr.join(",")} }`;
     }
     return `"${param.restApiName}": ${serializeRequestValue(param.type, param.clientName, runtimeImports, true, [param.type], param.format === undefined &&
         param.location === "header" &&
@@ -540,7 +563,8 @@ function isOptional(param) {
 }
 function getOptional(param, runtimeImports) {
     if (param.type.type === "model") {
-        return `"${param.restApiName}": {${getRequestModelMapping(param.type, "options?." + param.clientName + "?", runtimeImports, [param.type]).join(", ")}}`;
+        const { propertiesStr } = getRequestModelMapping(param.type, "options?." + param.clientName + "?", runtimeImports, [param.type]);
+        return `"${param.restApiName}": { ${propertiesStr.join(", ")} }`;
     }
     if (param.restApiName === "api-version" &&
         param.location === "query") {
@@ -588,35 +612,35 @@ function getPathParameters(operation) {
     return pathParams;
 }
 function getNullableCheck(name, type) {
-    if (!type.nullable) {
+    if (!isTypeNullable(type)) {
         return "";
     }
     return `${name} === null ? null :`;
 }
-/**
- *
- * This function helps translating an HLC request to RLC request,
- * extracting properties from body and headers and building the RLC response object
- */
 export function getRequestModelMapping(modelPropertyType, propertyPath = "body", runtimeImports, typeStack = []) {
-    var _a;
+    var _a, _b;
     const props = [];
     const allParents = getAllAncestors(modelPropertyType);
     const properties = (_a = getAllProperties(modelPropertyType, allParents)) !== null && _a !== void 0 ? _a : [];
     if (properties.length <= 0) {
-        return [];
+        return { propertiesStr: [] };
     }
+    let serializerName = "name" in modelPropertyType && modelPropertyType.name
+        ? `${toCamelCase(modelPropertyType.name)}Serializer`
+        : undefined;
     if (isSpecialHandledUnion(modelPropertyType)) {
-        const deserializeFunctionName = getDeserializeFunctionName(modelPropertyType, "serialize");
-        const definition = `${deserializeFunctionName}(${propertyPath})`;
+        serializerName =
+            serializerName !== null && serializerName !== void 0 ? serializerName : getDeserializeFunctionName(modelPropertyType, "serialize");
+        const definition = `${serializerName}(${propertyPath})`;
         props.push(definition);
-        return props;
+        return { propertiesStr: props, directAssignment: true };
     }
     for (const property of properties) {
         if (property.readonly) {
             continue;
         }
-        const propertyFullName = `${propertyPath}.${property.clientName}`;
+        const nullOrUndefinedPrefix = getPropertySerializationPrefix(property, propertyPath);
+        const propertyFullName = getPropertyFullName(property, propertyPath);
         if (property.type.type === "model") {
             let definition;
             if (property.type.coreTypeInfo === "ErrorType") {
@@ -629,15 +653,23 @@ export function getRequestModelMapping(modelPropertyType, propertyPath = "body",
                     : `!${propertyFullName} ? undefined : ${propertyFullName}${isSpecialModel ? " as any" : ""}`}`;
             }
             else if (isPolymorphicUnion(property.type)) {
-                let nullOrUndefinedPrefix = "";
-                if (property.optional || property.type.nullable) {
-                    nullOrUndefinedPrefix = `!${propertyFullName} ? ${propertyFullName} :`;
-                }
-                const deserializeFunctionName = getDeserializeFunctionName(property.type, "serialize");
+                const deserializeFunctionName = property.type.name
+                    ? `${toCamelCase(property.type.name)}Serializer`
+                    : getDeserializeFunctionName(property.type, "serialize");
                 definition = `"${property.restApiName}": ${nullOrUndefinedPrefix}${deserializeFunctionName}(${propertyFullName})`;
             }
             else {
-                definition = `"${property.restApiName}": ${getNullableCheck(propertyFullName, property.type)} ${!property.optional ? "" : `!${propertyFullName} ? undefined :`} {${getRequestModelMapping(property.type, `${propertyPath}.${property.clientName}${property.optional ? "?" : ""}`, runtimeImports, [...typeStack, property.type])}}`;
+                if (property.type.name) {
+                    serializerName = `${toCamelCase(property.type.name)}Serializer`;
+                    definition = `"${property.restApiName}": ${nullOrUndefinedPrefix}${serializerName}(${propertyPath}.${property.clientName})`;
+                }
+                else {
+                    const { propertiesStr, directAssignment } = getRequestModelMapping(property.type, `${propertyPath}.${property.clientName}${property.optional ? "?" : ""}`, runtimeImports, [...typeStack, property.type]);
+                    const serializeContent = directAssignment === true
+                        ? propertiesStr.join(",")
+                        : `{${propertiesStr.join(",")}}`;
+                    definition = `"${property.restApiName}": ${getNullableCheck(propertyFullName, property.type)} ${!property.optional ? "" : `!${propertyFullName} ? undefined :`} ${serializeContent}`;
+                }
             }
             props.push(definition);
         }
@@ -648,13 +680,29 @@ export function getRequestModelMapping(modelPropertyType, propertyPath = "body",
                 : `!${propertyFullName} ? undefined : ${propertyFullName}${isSpecialModel ? " as any" : ""}`}`;
             props.push(definition);
         }
+        else if (property.type.type === "dict") {
+            const modelName = (_b = property.type.elementType) === null || _b === void 0 ? void 0 : _b.name;
+            serializerName = modelName ? `${toCamelCase(modelName)}Serializer` : "";
+            // definition = `"${property.restApiName}": ${nullOrUndefinedPrefix}${serializerName}(${propertyPath}.${property.clientName})`;
+            const statement = `"${property.restApiName}": ${nullOrUndefinedPrefix} serializeRecord(${propertyFullName} as any, ${serializerName}) as any`;
+            // addImportToSpecifier(
+            //   "serializerHelpers",
+            //   runtimeImports,
+            //   "serializeRecord"
+            // );
+            addImportToSpecifier("modularModel", runtimeImports, serializerName);
+            props.push(statement);
+        }
+        else if (modelPropertyType.type === "enum") {
+            props.push(`"${property.restApiName}": ${nullOrUndefinedPrefix}${propertyPath}.${property.clientName}`);
+        }
         else {
             const dot = propertyPath.endsWith("?") ? "." : "";
             const clientValue = `${propertyPath ? `${propertyPath}${dot}` : `${dot}`}["${property.clientName}"]`;
             props.push(`"${property.restApiName}": ${serializeRequestValue(property.type, clientValue, runtimeImports, !property.optional, [...typeStack, property.type], property.format)}`);
         }
     }
-    return props;
+    return { propertiesStr: props };
 }
 /**
  * This function helps translating an RLC response to an HLC response,
@@ -683,10 +731,7 @@ export function getResponseMapping(type, propertyPath = "result.body", runtimeIm
                     : `!${propertyFullName} ? undefined : ${propertyFullName}${isSpecialModel ? " as any" : ""}`}`;
             }
             else if (isSpecialHandledUnion(property.type)) {
-                let nullOrUndefinedPrefix = "";
-                if (property.optional || property.type.nullable) {
-                    nullOrUndefinedPrefix = `!${propertyFullName} ? ${propertyFullName} :`;
-                }
+                const nullOrUndefinedPrefix = getPropertySerializationPrefix(property, propertyPath);
                 const deserializeFunctionName = getDeserializeFunctionName(property.type, "deserialize");
                 definition = `"${property.clientName}": ${nullOrUndefinedPrefix}${deserializeFunctionName}(${propertyFullName})`;
             }
@@ -720,19 +765,19 @@ export function getResponseMapping(type, propertyPath = "result.body", runtimeIm
 export function deserializeResponseValue(type, restValue, runtimeImports, required, typeStack = [], format) {
     var _a, _b, _c, _d, _e;
     const requiredPrefix = required === false ? `${restValue} === undefined` : "";
-    const nullablePrefix = type.nullable ? `${restValue} === null` : "";
+    const nullablePrefix = isTypeNullable(type) ? `${restValue} === null` : "";
     const requiredOrNullablePrefix = requiredPrefix !== "" && nullablePrefix !== ""
         ? `(${requiredPrefix} || ${nullablePrefix})`
         : `${requiredPrefix}${nullablePrefix}`;
     switch (type.type) {
         case "datetime":
             return required
-                ? type.nullable
+                ? isTypeNullable(type)
                     ? `${restValue} === null ? null : new Date(${restValue})`
                     : `new Date(${restValue})`
                 : `${restValue} !== undefined? new Date(${restValue}): undefined`;
         case "list": {
-            const prefix = required && !type.nullable
+            const prefix = required && !isTypeNullable(type)
                 ? `${restValue}`
                 : `${requiredOrNullablePrefix} ? ${restValue} : ${restValue}`;
             if (((_a = type.elementType) === null || _a === void 0 ? void 0 : _a.type) === "model") {
@@ -741,7 +786,7 @@ export function deserializeResponseValue(type, restValue, runtimeImports, requir
                 }
                 else if (isPolymorphicUnion(type.elementType)) {
                     let nullOrUndefinedPrefix = "";
-                    if (type.elementType.nullable) {
+                    if (isTypeNullable(type.elementType)) {
                         nullOrUndefinedPrefix = `!p ? p :`;
                     }
                     const deserializeFunctionName = getDeserializeFunctionName(type.elementType, "deserialize");
@@ -801,9 +846,9 @@ export function deserializeResponseValue(type, restValue, runtimeImports, requir
  * deserialized correctly
  */
 export function serializeRequestValue(type, clientValue, runtimeImports, required, typeStack = [], format) {
-    var _a, _b, _c, _d, _e, _f, _g;
+    var _a, _b, _c, _d, _e, _f, _g, _h;
     const requiredPrefix = required === false ? `${clientValue} === undefined` : "";
-    const nullablePrefix = type.nullable ? `${clientValue} === null` : "";
+    const nullablePrefix = isTypeNullable(type) ? `${clientValue} === null` : "";
     const requiredOrNullablePrefix = requiredPrefix !== "" && nullablePrefix !== ""
         ? `(${requiredPrefix} || ${nullablePrefix})`
         : `${requiredPrefix}${nullablePrefix}`;
@@ -821,26 +866,36 @@ export function serializeRequestValue(type, clientValue, runtimeImports, require
                     return `${clientValue}${required ? "" : "?"}.getTime()`;
                 case "rfc3339":
                 default:
-                    return `${clientValue}${required ? "" : "?"}.toISOString()`;
+                    return `${getNullableCheck(clientValue, type)} ${clientValue}${required ? "" : "?"}.toISOString()`;
             }
         case "list": {
-            const prefix = required && !type.nullable
+            const prefix = required && !isTypeNullable(type)
                 ? `${clientValue}`
                 : `${requiredOrNullablePrefix}? ${clientValue}: ${clientValue}`;
             if (((_b = type.elementType) === null || _b === void 0 ? void 0 : _b.type) === "model" && !type.elementType.aliasType) {
-                return `${prefix}.map(p => ({${getRequestModelMapping(type.elementType, "p", runtimeImports, [...typeStack, type.elementType])}}))`;
+                if (!type.elementType.name) {
+                    // If it is an anonymous model we need to serialize inline
+                    const { propertiesStr } = getRequestModelMapping(type.elementType, "p", runtimeImports, [...typeStack, type.elementType]);
+                    return `${prefix}.map(p => ({${propertiesStr}}))`;
+                }
+                else {
+                    // When it is not anonymous we can hand it off to the serializer function
+                    return `${prefix}.map(${toCamelCase(type.elementType.name + "Serializer")})`;
+                }
             }
             else if (needsDeserialize(type.elementType) &&
                 !((_c = type.elementType) === null || _c === void 0 ? void 0 : _c.aliasType)) {
-                return `${prefix}.map(p => ${serializeRequestValue(type.elementType, "p", runtimeImports, required, [...typeStack, type.elementType], (_d = type.elementType) === null || _d === void 0 ? void 0 : _d.format)})`;
+                return `${prefix}.map(p => ${serializeRequestValue(type.elementType, "p", runtimeImports, true, [...typeStack, type.elementType], (_d = type.elementType) === null || _d === void 0 ? void 0 : _d.format)})`;
             }
             else if (((_e = type.elementType) === null || _e === void 0 ? void 0 : _e.type) === "model" &&
                 isPolymorphicUnion(type.elementType)) {
                 let nullOrUndefinedPrefix = "";
-                if (type.elementType.nullable) {
+                if (isTypeNullable(type.elementType)) {
                     nullOrUndefinedPrefix = `!p ? p :`;
                 }
-                const serializeFunctionName = getDeserializeFunctionName(type.elementType, "serialize");
+                const serializeFunctionName = ((_f = type.elementType) === null || _f === void 0 ? void 0 : _f.name)
+                    ? `${toCamelCase(type.elementType.name)}Serializer`
+                    : getDeserializeFunctionName(type.elementType, "serialize");
                 return `${prefix}.map(p => ${nullOrUndefinedPrefix}${serializeFunctionName}(p))`;
             }
             else {
@@ -851,8 +906,8 @@ export function serializeRequestValue(type, clientValue, runtimeImports, require
             if (format !== "binary") {
                 addImportToSpecifier("coreUtil", runtimeImports, "uint8ArrayToString");
                 return required
-                    ? `uint8ArrayToString(${clientValue}, "${(_f = getEncodingFormat({ format })) !== null && _f !== void 0 ? _f : "base64"}")`
-                    : `${clientValue} !== undefined ? uint8ArrayToString(${clientValue}, "${(_g = getEncodingFormat({ format })) !== null && _g !== void 0 ? _g : "base64"}"): undefined`;
+                    ? `${getNullableCheck(clientValue, type)} uint8ArrayToString(${clientValue}, "${(_g = getEncodingFormat({ format })) !== null && _g !== void 0 ? _g : "base64"}")`
+                    : `${clientValue} !== undefined ? uint8ArrayToString(${clientValue}, "${(_h = getEncodingFormat({ format })) !== null && _h !== void 0 ? _h : "base64"}"): undefined`;
             }
             return clientValue;
         case "combined":
@@ -860,7 +915,9 @@ export function serializeRequestValue(type, clientValue, runtimeImports, require
                 return `${clientValue}`;
             }
             else if (isSpecialHandledUnion(type)) {
-                const serializeFunctionName = getDeserializeFunctionName(type, "serialize");
+                const serializeFunctionName = type.name
+                    ? `${toCamelCase(type.name)}Serializer`
+                    : getDeserializeFunctionName(type, "serialize");
                 return `${serializeFunctionName}(${clientValue})`;
             }
             else {
@@ -927,4 +984,26 @@ export function getAllAncestors(type) {
     });
     return ancestors;
 }
+export function getPropertySerializationPrefix(modularType, propertyPath) {
+    const propertyFullName = getPropertyFullName(modularType, propertyPath);
+    if (modularType.optional || isTypeNullable(modularType.type)) {
+        return `!${propertyFullName} ? ${propertyFullName} :`;
+    }
+    return "";
+}
+export function getPropertyFullName(modularType, propertyPath) {
+    let fullName = `${modularType.clientName}`;
+    if (propertyPath) {
+        fullName = `${propertyPath}.${modularType.clientName}`;
+    }
+    return fullName;
+}
+export function isDiscriminatedUnion(type) {
+    if (!type) {
+        return false;
+    }
+    return Boolean(type.kind === "model" &&
+        type.discriminatorProperty &&
+        type.discriminatedSubtypes);
+}
 //# sourceMappingURL=operationHelpers.js.map