@azure-tools/typespec-java 0.27.3 → 0.27.5

package/dist/src/code-model-builder.d.ts

@@ -1,4 +1,4 @@
-import { AnySchema, BinarySchema, BooleanSchema, NumberSchema, ObjectSchema, Parameter, Schema, StringSchema } from "@autorest/codemodel";
+import { AnySchema, BinarySchema, BooleanSchema, NumberSchema, ObjectSchema, Schema, StringSchema } from "@autorest/codemodel";
 import { SdkType } from "@azure-tools/typespec-client-generator-core";
 import { EmitContext, Program, Type, Union } from "@typespec/compiler";
 import { CodeModel } from "./common/code-model.js";
@@ -50,8 +50,11 @@ export declare class CodeModelBuilder {
     private processRouteForPaged;
     private processLroMetadata;
     private processRouteForLongRunning;
-    private _armApiVersionParameter?;
     private processParameter;
+    private processParameterGrouping;
+    private processSdkMethodOverride;
+    private processGroupSchema;
+    private checkGroupingAfterBodyParameterFlatten;
     private processEtagHeaderParameters;
     private processParameterBody;
     private addParameterOrBodyPropertyToCodeModelRequest;
@@ -109,9 +112,10 @@ export declare class CodeModelBuilder {
     get pollResultSchema(): ObjectSchema;
     private createApiVersionParameter;
     private _apiVersionParameter?;
-    get apiVersionParameter(): Parameter;
     private _apiVersionParameterInPath?;
-    get apiVersionParameterInPath(): Parameter;
+    private _apiVersionParameterInHeader?;
+    private _armApiVersionParameter?;
+    private getApiVersionParameter;
     private isSubscriptionId;
     private subscriptionIdParameter;
     private _subscriptionParameter?;

package/dist/src/code-model-builder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"code-model-builder.d.ts","sourceRoot":"","sources":["../../src/code-model-builder.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,SAAS,EAIT,YAAY,EACZ,aAAa,EAeb,YAAY,EAEZ,YAAY,EAEZ,SAAS,EAKT,MAAM,EAMN,YAAY,EAKb,MAAM,qBAAqB,CAAC;AAE7B,OAAO,EAuBL,OAAO,EAOR,MAAM,6CAA6C,CAAC;AACrD,OAAO,EACL,WAAW,EAKX,OAAO,EACP,IAAI,EAEJ,KAAK,EAQN,MAAM,oBAAoB,CAAC;AAc5B,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AASnD,OAAO,EAAE,cAAc,EAAsC,MAAM,UAAU,CAAC;AAc9E,OAAO,EACL,eAAe,EAShB,MAAM,iBAAiB,CAAC;AAczB,qBAAa,gBAAgB;IAC3B,OAAO,CAAC,OAAO,CAAU;IACzB,OAAO,CAAC,eAAe,CAAkB;IACzC,OAAO,CAAC,SAAS,CAAS;IAC1B,OAAO,CAAC,iBAAiB,CAAU;IACnC,OAAO,CAAC,mBAAmB,CAAW;IACtC,OAAO,CAAC,UAAU,CAAc;IAChC,OAAO,CAAC,OAAO,CAAiB;IAChC,OAAO,CAAC,SAAS,CAAY;IAC7B,OAAO,CAAC,cAAc,CAA8B;IACpD,OAAO,CAAC,gBAAgB,CAAY;IAEpC,QAAQ,CAAC,WAAW,mCAElB;IACF,QAAQ,CAAC,iBAAiB,sCAA6C;IAGvE,OAAO,CAAC,UAAU,CAAqB;gBAEpB,QAAQ,EAAE,OAAO,EAAE,OAAO,EAAE,WAAW,CAAC,cAAc,CAAC;IAmD7D,KAAK,IAAI,OAAO,CAAC,SAAS,CAAC;IAmDxC,OAAO,CAAC,qBAAqB;IAoC7B,OAAO,CAAC,WAAW;IAqFnB,OAAO,CAAC,SAAS;IAIjB,OAAO,CAAC,aAAa;IA2CrB,OAAO,CAAC,kBAAkB;IAY1B,OAAO,CAAC,qBAAqB;IA+B7B,OAAO,CAAC,kBAAkB;IAmC1B,OAAO,CAAC,cAAc;IAUtB,OAAO,CAAC,aAAa;IA8KrB,OAAO,CAAC,yBAAyB;IA4BjC,OAAO,CAAC,6BAA6B;IAYrC;;;;;;;OAOG;IACH,OAAO,CAAC,sBAAsB;IAgB9B,OAAO,CAAC,6BAA6B;IAkBrC;;OAEG;IACH,OAAO,CAAC,0BAA0B;IAIlC,OAAO,CAAC,mBAAmB;IAuB3B,OAAO,CAAC,gBAAgB;IA6KxB,OAAO,CAAC,oBAAoB;IAsD5B,OAAO,CAAC,kBAAkB;IA6G1B,OAAO,CAAC,0BAA0B;IAQlC,OAAO,CAAC,uBAAuB,CAAC,CAAY;IAE5C,OAAO,CAAC,gBAAgB;IAoKxB,OAAO,CAAC,2BAA2B;IA0InC,OAAO,CAAC,oBAAoB;IAgM5B,OAAO,CAAC,4CAA4C;IAiEpD,OAAO,CAAC,eAAe;IA+HvB,OAAO,CAAC,cAAc;IAetB,OAAO,CAAC,aAAa;IAIrB,OAAO,CAAC,iBAAiB;IA8CzB,OAAO,CAAC,kBAAkB;IAyC1B,OAAO,CAAC,gBAAgB;IAIxB,OAAO,CAAC,mBAAmB;IAQ3B,OAAO,CAAC,sBAAsB;IAU9B,OAAO,CAAC,oBAAoB;IAc5B,OAAO,CAAC,mBAAmB;IAQ3B,OAAO,CAAC,oBAAoB;IAS5B,OAAO,CAAC,oBAAoB;IAQ5B,OAAO,CAAC,kBAAkB;IAiB1B,OAAO,CAAC,uBAAuB;IAwB/B,OAAO,CAAC,mBAAmB;IAgC3B,OAAO,CAAC,qBAAqB;IAY7B,OAAO,CAAC,kCAAkC;IAY1C,OAAO,CAAC,qBAAqB;IAQ7B,OAAO,CAAC,qBAAqB;IAa7B,OAAO,CAAC,iBAAiB;IAQzB,OAAO,CAAC,iBAAiB;IAQzB,OAAO,CAAC,qBAAqB;IAa7B,OAAO,CAAC,gBAAgB;IAQxB,OAAO,CAAC,mBAAmB;IA0F3B,OAAO,CAAC,oBAAoB;IAwD5B,OAAO,CAAC,kBAAkB;IAkD1B,OAAO,CAAC,mBAAmB;IAQ3B,OAAO,CAAC,mBAAmB;IA4D3B,OAAO,CAAC,0CAA0C;IAqDlD,OAAO,CAAC,MAAM;IAId,OAAO,CAAC,UAAU;IAIlB,OAAO,CAAC,UAAU;IAoBlB,OAAO,CAAC,QAAQ;IAQhB,OAAO,CAAC,aAAa;IAuBrB,OAAO,CAAC,qBAAqB;IAS7B,OAAO,CAAC,oBAAoB;IAkB5B,OAAO,CAAC,gBAAgB;IAoDxB,OAAO,CAAC,KAAK;IAIb,OAAO,CAAC,aAAa,CAAC,CAAe;IACrC,IAAI,YAAY,IAAI,YAAY,CAK/B;IAED,OAAO,CAAC,cAAc,CAAC,CAAe;IACtC,IAAI,aAAa,IAAI,YAAY,CAOhC;IAED,OAAO,CAAC,aAAa,CAAC,CAAe;IACrC,IAAI,YAAY,IAAI,YAAY,CAO/B;IAED,OAAO,CAAC,cAAc,CAAC,CAAgB;IACvC,IAAI,aAAa,IAAI,aAAa,CAOjC;IAED,OAAO,CAAC,UAAU,CAAC,CAAY;IAC/B,IAAI,SAAS,IAAI,SAAS,CAIzB;IAED,OAAO,CAAC,aAAa,CAAC,CAAe;IACrC,IAAI,YAAY,IAAI,YAAY,CAK/B;IAED,OAAO,CAAC,iBAAiB,CAAC,CAAe;IACzC,IAAI,gBAAgB,IAAI,YAAY,CAQnC;IAED,OAAO,CAAC,yBAAyB;IA8BjC,OAAO,CAAC,oBAAoB,CAAC,CAAY;IACzC,IAAI,mBAAmB,IAAI,SAAS,CAQnC;IAED,OAAO,CAAC,0BAA0B,CAAC,CAAY;IAC/C,IAAI,yBAAyB,IAAI,SAAS,CASzC;IAED,OAAO,CAAC,gBAAgB;IAIxB,OAAO,CAAC,uBAAuB;IAwB/B,OAAO,CAAC,sBAAsB,CAAC,CAAY;IAE3C,OAAO,CAAC,oBAAoB;IA+E5B,OAAO,CAAC,gBAAgB;IAyBxB,OAAO,CAAC,KAAK;CAGd"}
+{"version":3,"file":"code-model-builder.d.ts","sourceRoot":"","sources":["../../src/code-model-builder.ts"],"names":[],"mappings":"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"}

package/dist/src/code-model-builder.js

@@ -1,6 +1,6 @@
 import { AnySchema, ApiVersion, ArraySchema, BinaryResponse, BinarySchema, BooleanSchema, ByteArraySchema, ChoiceValue, DateSchema, DateTimeSchema, DictionarySchema, Discriminator, GroupProperty, GroupSchema, HttpHeader, HttpParameter, ImplementationLocation, KeySecurityScheme, Language, Metadata, NumberSchema, OAuth2SecurityScheme, ObjectSchema, OperationGroup, Parameter, ParameterLocation, Property, Relations, Response, SchemaResponse, SchemaType, Security, SerializationStyle, StringSchema, TimeSchema, UnixTimeSchema, UriSchema, VirtualParameter, } from "@autorest/codemodel";
 import { KnownMediaType } from "@azure-tools/codegen";
-import { createSdkContext, getAllModels, isApiVersion, isSdkBuiltInKind, isSdkIntKind, } from "@azure-tools/typespec-client-generator-core";
+import { createSdkContext, getAllModels, getHttpOperationParameter, isSdkBuiltInKind, isSdkIntKind, } from "@azure-tools/typespec-client-generator-core";
 import { NoTarget, getDoc, getNamespaceFullName, getOverloadedOperation, getSummary, isArrayModelType, isRecordModelType, listServices, } from "@typespec/compiler";
 import { Visibility, getAuthentication, } from "@typespec/http";
 import { getSegment } from "@typespec/rest";
@@ -17,7 +17,7 @@ import { OrSchema } from "./common/schemas/relationship.js";
 import { DurationSchema } from "./common/schemas/time.js";
 import { SchemaContext } from "./common/schemas/usage.js";
 import { createPollOperationDetailsSchema, getFileDetailsSchema } from "./external-schemas.js";
-import { createDiagnostic, reportDiagnostic } from "./lib.js";
+import { LIB_NAME, createDiagnostic, reportDiagnostic } from "./lib.js";
 import { ClientContext } from "./models.js";
 import { CONTENT_TYPE_KEY, ORIGIN_API_VERSION, SPECIAL_HEADER_NAMES, cloneOperationParameter, getServiceVersion, isKnownContentType, isLroNewPollingStrategy, operationIsJsonMergePatch, operationIsMultipart, operationIsMultipleContentTypes, } from "./operation-utils.js";
 import { ProcessingCache, getAccess, getDurationFormat, getNonNullSdkType, getPropertySerializedName, getUnionDescription, getUsage, modelIs, pushDistinct, } from "./type-utils.js";
@@ -73,7 +73,8 @@ export class CodeModelBuilder {
         if (this.program.hasError()) {
             return this.codeModel;
         }
-        this.sdkContext = await createSdkContext(this.emitterContext, "@azure-tools/typespec-java", {
+        this.sdkContext = await createSdkContext(this.emitterContext, LIB_NAME, {
+            additionalDecorators: ["Azure\\.ClientGenerator\\.Core\\.@override"],
             versioning: { previewStringRegex: /$/ },
         }); // include all versions and do the filter by ourselves
         // java namespace
@@ -157,6 +158,7 @@ export class CodeModelBuilder {
                                     scopes: [],
                                 });
                                 scheme.flows.forEach((it) => oauth2Scheme.scopes.push(...it.scopes.map((it) => it.value)));
+                                oauth2Scheme.flows = scheme.flows;
                                 securitySchemes.push(oauth2Scheme);
                             }
                             else {
@@ -684,12 +686,12 @@ export class CodeModelBuilder {
             this.processParameter(codeModelOperation, param, clientContext);
         }
         // body
+        let bodyParameterFlattened = false;
         if (httpOperation.bodyParam && httpOperation.__raw && httpOperation.bodyParam.type.__raw) {
-            this.processParameterBody(codeModelOperation, httpOperation.__raw, httpOperation, httpOperation.bodyParam);
+            bodyParameterFlattened = this.processParameterBody(codeModelOperation, sdkMethod, httpOperation.bodyParam);
         }
-        // group ETag header parameters, if exists
-        if (this.options["group-etag-headers"]) {
-            this.processEtagHeaderParameters(codeModelOperation, sdkMethod.operation);
+        if (generateConvenienceApi) {
+            this.processParameterGrouping(codeModelOperation, sdkMethod, bodyParameterFlattened);
         }
         // lro metadata
         let lroMetadata = new LongRunningMetadata(false);
@@ -717,31 +719,27 @@ export class CodeModelBuilder {
             for (const response of responses) {
                 const bodyType = response.type;
                 if (bodyType && bodyType.kind === "model") {
-                    const itemClientName = sdkMethod.response.resultPath;
-                    const nextLinkClientName = sdkMethod.nextLinkPath;
                     let itemSerializedName = undefined;
                     let nextLinkSerializedName = undefined;
+                    const itemSegments = sdkMethod.response.resultSegments;
+                    const nextLinkSegments = sdkMethod.pagingMetadata.nextLinkSegments;
+                    // TODO: in future the property could be nested, so that the "itemSegments" or "nextLinkSegments" would contain more than 1 element
+                    if (itemSegments) {
+                        // "itemsSegments" should exist for "paging"/"lropaging"
+                        const lastSegment = itemSegments[itemSegments.length - 1];
+                        if (lastSegment.kind === "property") {
+                            itemSerializedName = getPropertySerializedName(lastSegment);
+                        }
+                    }
+                    if (nextLinkSegments) {
+                        const lastSegment = nextLinkSegments[nextLinkSegments.length - 1];
+                        if (lastSegment.kind === "property") {
+                            nextLinkSerializedName = getPropertySerializedName(lastSegment);
+                        }
+                    }
                     (_a = op.responses) === null || _a === void 0 ? void 0 : _a.forEach((r) => {
-                        var _a;
                         if (r instanceof SchemaResponse) {
                             this.trackSchemaUsage(r.schema, { usage: [SchemaContext.Paged] });
-                            // find serializedName for items and nextLink
-                            if (r.schema instanceof ObjectSchema) {
-                                (_a = r.schema.properties) === null || _a === void 0 ? void 0 : _a.forEach((p) => {
-                                    if (itemClientName &&
-                                        !itemSerializedName &&
-                                        p.serializedName &&
-                                        p.language.default.name === itemClientName) {
-                                        itemSerializedName = p.serializedName;
-                                    }
-                                    if (nextLinkClientName &&
-                                        !nextLinkSerializedName &&
-                                        p.serializedName &&
-                                        p.language.default.name === nextLinkClientName) {
-                                        nextLinkSerializedName = p.serializedName;
-                                    }
-                                });
-                            }
                         }
                     });
                     op.extensions = (_b = op.extensions) !== null && _b !== void 0 ? _b : {};
@@ -755,7 +753,6 @@ export class CodeModelBuilder {
         }
     }
     processLroMetadata(op, sdkMethod) {
-        var _a;
         const trackConvenienceApi = Boolean(op.convenienceApi);
         const lroMetadata = sdkMethod.lroMetadata;
         if (lroMetadata && lroMetadata.pollingStep) {
@@ -799,20 +796,11 @@ export class CodeModelBuilder {
                 if (useNewPollStrategy &&
                     lroMetadata.finalStep &&
                     lroMetadata.finalStep.kind === "pollingSuccessProperty" &&
-                    lroMetadata.finalResponse.resultPath) {
-                    const finalResultPropertyClientName = lroMetadata.finalResponse.resultPath;
-                    // find serializedName for lro result
-                    if (finalResultPropertyClientName) {
-                        (_a = lroMetadata.finalResponse.envelopeResult.properties) === null || _a === void 0 ? void 0 : _a.forEach((p) => {
-                            var _a, _b, _c;
-                            // TODO: "p.__raw?.name" should be "p.name", after TCGC fix https://github.com/Azure/typespec-azure/issues/2072
-                            if (!finalResultPropertySerializedName &&
-                                p.kind === "property" &&
-                                ((_a = p.serializationOptions.json) === null || _a === void 0 ? void 0 : _a.name) &&
-                                ((_b = p.__raw) === null || _b === void 0 ? void 0 : _b.name) === finalResultPropertyClientName) {
-                                finalResultPropertySerializedName = (_c = p.serializationOptions.json) === null || _c === void 0 ? void 0 : _c.name;
-                            }
-                        });
+                    lroMetadata.finalResponse.resultSegments) {
+                    // TODO: in future the property could be nested, so that the "resultSegments" would contain more than 1 element
+                    const lastSegment = lroMetadata.finalResponse.resultSegments[lroMetadata.finalResponse.resultSegments.length - 1];
+                    if (lastSegment.kind === "property") {
+                        finalResultPropertySerializedName = getPropertySerializedName(lastSegment);
                     }
                 }
             }
@@ -848,7 +836,7 @@ export class CodeModelBuilder {
     }
     processParameter(op, param, clientContext) {
         var _a, _b, _c;
-        if (clientContext.apiVersions && isApiVersion(this.sdkContext, param)) {
+        if (clientContext.apiVersions && param.isApiVersionParam && param.kind !== "cookie") {
             // pre-condition for "isApiVersion": the client supports ApiVersions
             if (this.isArm()) {
                 // Currently we assume ARM tsp only have one client and one api-version.
@@ -861,7 +849,7 @@ export class CodeModelBuilder {
                 op.addParameter(this._armApiVersionParameter);
             }
             else {
-                const parameter = param.kind === "query" ? this.apiVersionParameter : this.apiVersionParameterInPath;
+                const parameter = this.getApiVersionParameter(param);
                 op.addParameter(parameter);
                 clientContext.addGlobalParameter(parameter);
             }
@@ -988,6 +976,182 @@ export class CodeModelBuilder {
             }
         }
     }
+    processParameterGrouping(op, sdkMethod, bodyParameterFlattened) {
+        const httpOperation = sdkMethod.operation;
+        const methodSignatureOverridden = sdkMethod.decorators.some((it) => it.name === "Azure.ClientGenerator.Core.@override");
+        if (methodSignatureOverridden) {
+            // limit the effect of "SdkServiceMethod"
+            // only process it and its parameters, when the "@override" is defined on the operation
+            this.processSdkMethodOverride(op, sdkMethod);
+        }
+        else if (bodyParameterFlattened) {
+            // only do this, if no explicit method override via "@override"
+            this.checkGroupingAfterBodyParameterFlatten(op);
+        }
+        // group ETag header parameters, if exists
+        if (this.options["group-etag-headers"]) {
+            // TODO: unsure what happens, if the etag headers is already processed by override
+            this.processEtagHeaderParameters(op, httpOperation);
+        }
+    }
+    processSdkMethodOverride(op, sdkMethod) {
+        var _a, _b, _c;
+        // method be called, only if "op.convenienceApi"
+        let request = (_b = (_a = op.convenienceApi) === null || _a === void 0 ? void 0 : _a.requests) === null || _b === void 0 ? void 0 : _b[0];
+        let requestParameters;
+        if (request) {
+            requestParameters = request.parameters;
+        }
+        else {
+            op.convenienceApi.requests = [];
+            request = new Request({
+                protocol: op.requests[0].protocol,
+            });
+            op.convenienceApi.requests.push(request);
+            requestParameters = op.parameters;
+        }
+        request.parameters = [];
+        request.signatureParameters = [];
+        function findOperationParameter(parameter) {
+            let opParameter;
+            // ignore constant parameter, usually the "accept" and "content-type" header
+            if (parameter.type.kind !== "constant") {
+                if (parameter.kind === "body") {
+                    // there should be only 1 body parameter
+                    opParameter = requestParameters.find((it) => { var _a; return ((_a = it.protocol.http) === null || _a === void 0 ? void 0 : _a.in) === "body"; });
+                }
+                else if (parameter.kind === "property") {
+                    // body property
+                    // if body property appears on method signature, it should already be flattened, hence the check on VirtualParameter
+                    opParameter = requestParameters.find((it) => it instanceof VirtualParameter &&
+                        it.language.default.serializedName === getPropertySerializedName(parameter));
+                }
+                else {
+                    // query, path, header
+                    opParameter = requestParameters.find((it) => {
+                        var _a;
+                        return ((_a = it.protocol.http) === null || _a === void 0 ? void 0 : _a.in) === parameter.kind &&
+                            it.language.default.serializedName === parameter.serializedName;
+                    });
+                }
+            }
+            return opParameter;
+        }
+        for (const sdkMethodParameter of sdkMethod.parameters) {
+            let httpOperationParameter = getHttpOperationParameter(sdkMethod, sdkMethodParameter);
+            if (httpOperationParameter) {
+                const opParameter = findOperationParameter(httpOperationParameter);
+                if (opParameter) {
+                    request.signatureParameters.push(opParameter);
+                    request.parameters.push(opParameter);
+                }
+            }
+            else {
+                // sdkMethodParameter is a grouping parameter
+                if (sdkMethodParameter.type.kind === "model") {
+                    const opParameters = [];
+                    for (const property of sdkMethodParameter.type.properties) {
+                        httpOperationParameter = getHttpOperationParameter(sdkMethod, property);
+                        if (httpOperationParameter) {
+                            const opParameter = findOperationParameter(httpOperationParameter);
+                            if (opParameter) {
+                                if (opParameter instanceof VirtualParameter) {
+                                    opParameters.push(opParameter);
+                                }
+                                else {
+                                    opParameters.push(opParameter);
+                                }
+                            }
+                        }
+                    }
+                    // group schema
+                    const groupSchema = this.processGroupSchema(sdkMethodParameter.type, opParameters, sdkMethodParameter.type.name);
+                    this.trackSchemaUsage(groupSchema, { usage: [SchemaContext.Input] });
+                    if (op.convenienceApi) {
+                        this.trackSchemaUsage(groupSchema, {
+                            usage: [op.internalApi ? SchemaContext.Internal : SchemaContext.Public],
+                        });
+                    }
+                    // group parameter
+                    const groupParameter = new Parameter(sdkMethodParameter.name, (_c = sdkMethodParameter.doc) !== null && _c !== void 0 ? _c : "", groupSchema, {
+                        summary: sdkMethodParameter.summary,
+                        implementation: ImplementationLocation.Method,
+                        required: !sdkMethodParameter.optional,
+                        nullable: false,
+                    });
+                    request.signatureParameters.push(groupParameter);
+                    request.parameters.push(...opParameters);
+                    request.parameters.push(groupParameter);
+                    opParameters.forEach((it) => {
+                        it.groupedBy = groupParameter;
+                    });
+                }
+            }
+        }
+    }
+    processGroupSchema(type, parameters, name, description = undefined) {
+        // the "GroupSchema" is simliar to "ObjectSchema", but the process is different
+        var _a, _b;
+        if (type && this.schemaCache.has(type)) {
+            return this.schemaCache.get(type);
+        }
+        // option bag schema
+        const optionBagSchema = this.codeModel.schemas.add(new GroupSchema(name, (_b = (_a = type === null || type === void 0 ? void 0 : type.doc) !== null && _a !== void 0 ? _a : description) !== null && _b !== void 0 ? _b : "", {
+            summary: type === null || type === void 0 ? void 0 : type.summary,
+            language: {
+                default: {
+                    namespace: type ? getNamespace(type.__raw) : this.namespace,
+                },
+                java: {
+                    namespace: this.getJavaNamespace(type),
+                },
+            },
+        }));
+        parameters.forEach((it) => {
+            optionBagSchema.add(new GroupProperty(it.language.default.name, it.language.default.description, it.schema, {
+                originalParameter: [it],
+                summary: it.summary,
+                required: it.required,
+                nullable: it.nullable,
+                readOnly: false,
+                serializedName: it.language.default.serializedName,
+            }));
+        });
+        if (type) {
+            // on cache: the GroupProperty actually has a reference to "originalParameter" (though on same type, the parameter should be identical)
+            this.schemaCache.set(type, optionBagSchema);
+        }
+        return optionBagSchema;
+    }
+    checkGroupingAfterBodyParameterFlatten(op) {
+        var _a, _b;
+        // method be called, only if "op.convenienceApi" is defined
+        // method signature of the convenience API after body parameter flatten
+        const request = (_b = (_a = op.convenienceApi) === null || _a === void 0 ? void 0 : _a.requests) === null || _b === void 0 ? void 0 : _b[0];
+        if (request &&
+            request.signatureParameters &&
+            request.parameters &&
+            request.signatureParameters.length > 6) {
+            // create an option bag
+            const name = op.language.default.name + "Options";
+            const optionBagSchema = this.processGroupSchema(undefined, request.parameters, name, `Options for ${op.language.default.name} API`);
+            this.trackSchemaUsage(optionBagSchema, { usage: [SchemaContext.Input] });
+            if (op.convenienceApi) {
+                this.trackSchemaUsage(optionBagSchema, {
+                    usage: [op.internalApi ? SchemaContext.Internal : SchemaContext.Public],
+                });
+            }
+            // option bag parameter
+            const optionBagParameter = new Parameter("options", optionBagSchema.language.default.description, optionBagSchema, {
+                implementation: ImplementationLocation.Method,
+                required: true,
+                nullable: false,
+            });
+            request.signatureParameters = [optionBagParameter];
+            request.parameters.forEach((it) => (it.groupedBy = optionBagParameter));
+            request.parameters.push(optionBagParameter);
+        }
+    }
     processEtagHeaderParameters(op, httpOperation) {
         if (op.convenienceApi && op.parameters && op.signatureParameters) {
             const etagHeadersNames = new Set([
@@ -1090,8 +1254,10 @@ export class CodeModelBuilder {
             }
         }
     }
-    processParameterBody(op, rawHttpOperation, sdkHttpOperation, sdkBody) {
+    processParameterBody(op, sdkMethod, sdkBody) {
         var _a, _b, _c;
+        let bodyParameterFlattened = false;
+        const sdkHttpOperation = sdkMethod.operation;
         // set contentTypes to mediaTypes
         op.requests[0].protocol.http.mediaTypes = sdkBody.contentTypes;
         const unknownRequestBody = op.requests[0].protocol.http.mediaTypes &&
@@ -1133,13 +1299,19 @@ export class CodeModelBuilder {
             this.trackSchemaUsage(schema, { serializationFormats: [KnownMediaType.Multipart] });
         }
         if (op.convenienceApi) {
-            // Explicit body parameter @body or @bodyRoot would result to the existence of rawHttpOperation.parameters.body.property
-            // Implicit body parameter would result to rawHttpOperation.parameters.body.property be undefined
-            // see https://typespec.io/docs/libraries/http/cheat-sheet#data-types
-            const bodyParameterFlatten = schema instanceof ObjectSchema &&
+            /**
+             * Explicit body parameter @body or @bodyRoot would result to the existence of rawHttpOperation.parameters.body.property
+             * Implicit body parameter would result to rawHttpOperation.parameters.body.property be undefined
+             * see https://typespec.io/docs/libraries/http/cheat-sheet#data-types
+             */
+            /**
+             * In TCGC, the condition is 'sdkType.kind === "model" && sdkBody.type !== sdkBody.correspondingMethodParams[0]?.type'.
+             * Basically, it means that the model of the SDK method parameters (typically, more than 1) be different from the model of this single HTTP body parameter.
+             */
+            const bodyParameterFlatten = !this.isArm() &&
+                schema instanceof ObjectSchema &&
                 sdkType.kind === "model" &&
-                !((_c = rawHttpOperation.parameters.body) === null || _c === void 0 ? void 0 : _c.property) &&
-                !this.isArm();
+                sdkBody.type !== ((_c = sdkBody.correspondingMethodParams[0]) === null || _c === void 0 ? void 0 : _c.type);
             if (schema instanceof ObjectSchema && bodyParameterFlatten) {
                 // flatten body parameter
                 const parameters = sdkHttpOperation.parameters;
@@ -1153,8 +1325,10 @@ export class CodeModelBuilder {
                     if (sdkType.isGeneratedName) {
                         schema.language.default.name = pascalCase(op.language.default.name) + "PatchRequest";
                     }
-                    return;
+                    return bodyParameterFlattened;
                 }
+                // flatten body parameter
+                bodyParameterFlattened = true;
                 const schemaUsage = schema.usage;
                 if (!schemaIsPublicBeforeProcess && (schemaUsage === null || schemaUsage === void 0 ? void 0 : schemaUsage.includes(SchemaContext.Public))) {
                     // Public added in this op, change it to PublicSpread
@@ -1162,72 +1336,30 @@ export class CodeModelBuilder {
                     schemaUsage === null || schemaUsage === void 0 ? void 0 : schemaUsage.splice(schemaUsage === null || schemaUsage === void 0 ? void 0 : schemaUsage.indexOf(SchemaContext.Public), 1);
                     this.trackSchemaUsage(schema, { usage: [SchemaContext.PublicSpread] });
                 }
-                if (op.convenienceApi && op.parameters) {
-                    op.convenienceApi.requests = [];
-                    const request = new Request({
-                        protocol: op.requests[0].protocol,
-                    });
-                    request.parameters = [];
-                    op.convenienceApi.requests.push(request);
-                    // header/query/path params
-                    for (const opParameter of parameters) {
-                        this.addParameterOrBodyPropertyToCodeModelRequest(opParameter, op, request, schema, parameter);
-                    }
-                    // body param
-                    if (bodyParameter) {
-                        if (bodyParameter.type.kind === "model") {
-                            for (const bodyProperty of bodyParameter.type.properties) {
-                                if (bodyProperty.kind === "property") {
-                                    this.addParameterOrBodyPropertyToCodeModelRequest(bodyProperty, op, request, schema, parameter);
-                                }
+                op.convenienceApi.requests = [];
+                const request = new Request({
+                    protocol: op.requests[0].protocol,
+                });
+                request.parameters = [];
+                op.convenienceApi.requests.push(request);
+                // header/query/path params
+                for (const opParameter of parameters) {
+                    this.addParameterOrBodyPropertyToCodeModelRequest(opParameter, op, request, schema, parameter);
+                }
+                // body param
+                if (bodyParameter) {
+                    if (bodyParameter.type.kind === "model") {
+                        for (const bodyProperty of bodyParameter.type.properties) {
+                            if (bodyProperty.kind === "property") {
+                                this.addParameterOrBodyPropertyToCodeModelRequest(bodyProperty, op, request, schema, parameter);
                             }
                         }
                     }
-                    request.signatureParameters = request.parameters;
-                    if (request.signatureParameters.length > 6) {
-                        // create an option bag
-                        const name = op.language.default.name + "Options";
-                        const namespace = getNamespace(rawHttpOperation.operation);
-                        // option bag schema
-                        const optionBagSchema = this.codeModel.schemas.add(new GroupSchema(name, `Options for ${op.language.default.name} API`, {
-                            language: {
-                                default: {
-                                    namespace: namespace,
-                                },
-                                java: {
-                                    namespace: this.getJavaNamespace(),
-                                },
-                            },
-                        }));
-                        request.parameters.forEach((it) => {
-                            optionBagSchema.add(new GroupProperty(it.language.default.name, it.language.default.description, it.schema, {
-                                originalParameter: [it],
-                                summary: it.summary,
-                                required: it.required,
-                                nullable: it.nullable,
-                                readOnly: false,
-                                serializedName: it.language.default.serializedName,
-                            }));
-                        });
-                        this.trackSchemaUsage(optionBagSchema, { usage: [SchemaContext.Input] });
-                        if (op.convenienceApi) {
-                            this.trackSchemaUsage(optionBagSchema, {
-                                usage: [op.internalApi ? SchemaContext.Internal : SchemaContext.Public],
-                            });
-                        }
-                        // option bag parameter
-                        const optionBagParameter = new Parameter("options", optionBagSchema.language.default.description, optionBagSchema, {
-                            implementation: ImplementationLocation.Method,
-                            required: true,
-                            nullable: false,
-                        });
-                        request.signatureParameters = [optionBagParameter];
-                        request.parameters.forEach((it) => (it.groupedBy = optionBagParameter));
-                        request.parameters.push(optionBagParameter);
-                    }
                 }
+                request.signatureParameters = request.parameters;
             }
         }
+        return bodyParameterFlattened;
     }
     addParameterOrBodyPropertyToCodeModelRequest(opParameter, op, request, schema, originalParameter) {
         var _a, _b, _c, _d, _e;
@@ -2092,14 +2224,22 @@ export class CodeModelBuilder {
             },
         });
     }
-    get apiVersionParameter() {
-        return (this._apiVersionParameter ||
-            (this._apiVersionParameter = this.createApiVersionParameter("api-version", ParameterLocation.Query)));
-    }
-    get apiVersionParameterInPath() {
-        return (this._apiVersionParameterInPath ||
-            // TODO: hardcode as "apiVersion", as it is what we get from compiler
-            (this._apiVersionParameterInPath = this.createApiVersionParameter("apiVersion", ParameterLocation.Path)));
+    getApiVersionParameter(param) {
+        // apiVersionParameter is cached by param.kind
+        // we didn't expect Azure service have more than 1 type of api-version, and certainly not more than 1 of each kind.
+        if (param.kind === "query") {
+            return (this._apiVersionParameter ||
+                (this._apiVersionParameter = this.createApiVersionParameter(param.serializedName, ParameterLocation.Query)));
+        }
+        else if (param.kind === "path") {
+            return (this._apiVersionParameterInPath ||
+                (this._apiVersionParameterInPath = this.createApiVersionParameter(param.serializedName, ParameterLocation.Path)));
+        }
+        else {
+            // param.kind === "header"
+            return (this._apiVersionParameterInHeader ||
+                (this._apiVersionParameterInHeader = this.createApiVersionParameter(param.serializedName, ParameterLocation.Header)));
+        }
     }
     isSubscriptionId(param) {
         return "subscriptionId".toLocaleLowerCase() === param.serializedName.toLocaleLowerCase();