@azure-tools/typespec-java 0.27.1 → 0.27.3

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

@@ -1,13 +1,13 @@
 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, getWireName, isApiVersion, isSdkBuiltInKind, isSdkIntKind, } from "@azure-tools/typespec-client-generator-core";
-import { getDoc, getEffectiveModelType, getNamespaceFullName, getOverloadedOperation, getSummary, isArrayModelType, isRecordModelType, listServices, } from "@typespec/compiler";
-import { Visibility, getAuthentication, getHeaderFieldName, getPathParamName, getQueryParamName, isCookieParam, isHeader, isPathParam, isQueryParam, } from "@typespec/http";
+import { createSdkContext, getAllModels, isApiVersion, 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";
 import { getAddedOnVersions } from "@typespec/versioning";
 import { fail } from "assert";
 import pkg from "lodash";
-import { Client as CodeModelClient, } from "./common/client.js";
+import { Client as CodeModelClient } from "./common/client.js";
 import { CodeModel } from "./common/code-model.js";
 import { LongRunningMetadata } from "./common/long-running-metadata.js";
 import { Operation as CodeModelOperation, ConvenienceApi, Request } from "./common/operation.js";
@@ -17,31 +17,31 @@ 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 { ClientContext } from "./models.js";
-import { CONTENT_TYPE_KEY, ORIGIN_API_VERSION, SPECIAL_HEADER_NAMES, cloneOperationParameter, getServiceVersion, isKnownContentType, isLroNewPollingStrategy, isPayloadProperty, operationIsJsonMergePatch, operationIsMultipart, operationIsMultipleContentTypes, } from "./operation-utils.js";
-import { ProcessingCache, getAccess, getDurationFormat, getNonNullSdkType, getUnionDescription, getUsage, isStable, modelIs, pushDistinct, } from "./type-utils.js";
-import { getNamespace, logError, logWarning, pascalCase, removeClientSuffix, stringArrayContainsIgnoreCase, trace, } from "./utils.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";
+import { DiagnosticError, getNamespace, isStableApiVersion, pascalCase, removeClientSuffix, stringArrayContainsIgnoreCase, trace, } from "./utils.js";
 const { isEqual } = pkg;
 export class CodeModelBuilder {
     constructor(program1, context) {
-        var _a, _b, _c;
-        this.loggingEnabled = false;
+        var _a, _b;
         this.schemaCache = new ProcessingCache((type, name) => this.processSchemaImpl(type, name));
         this.typeUnionRefCache = new Map(); // Union means it ref a Union type, null means it does not ref any Union, undefined means type visited but not completed
         this.options = context.options;
         this.program = program1;
         this.emitterContext = context;
-        if ((_a = this.options["dev-options"]) === null || _a === void 0 ? void 0 : _a.loglevel) {
-            this.loggingEnabled = true;
-        }
         if (this.options["skip-special-headers"]) {
             this.options["skip-special-headers"].forEach((it) => SPECIAL_HEADER_NAMES.add(it.toLowerCase()));
         }
         const service = listServices(this.program)[0];
         if (!service) {
-            this.logWarning("TypeSpec for HTTP client should define a service.");
+            reportDiagnostic(this.program, {
+                code: "no-service",
+                target: NoTarget,
+            });
         }
-        this.serviceNamespace = (_b = service === null || service === void 0 ? void 0 : service.type) !== null && _b !== void 0 ? _b : this.program.getGlobalNamespaceType();
+        this.serviceNamespace = (_a = service === null || service === void 0 ? void 0 : service.type) !== null && _a !== void 0 ? _a : this.program.getGlobalNamespaceType();
         this.namespace = getNamespaceFullName(this.serviceNamespace) || "Client";
         const namespace1 = this.namespace;
         this.typeNameOptions = {
@@ -52,7 +52,7 @@ export class CodeModelBuilder {
             },
         };
         // init code model
-        const title = (_c = this.options["service-name"]) !== null && _c !== void 0 ? _c : this.serviceNamespace.name;
+        const title = (_b = this.options["service-name"]) !== null && _b !== void 0 ? _b : this.serviceNamespace.name;
         const description = this.getDoc(this.serviceNamespace);
         this.codeModel = new CodeModel(title, false, {
             info: {
@@ -96,7 +96,7 @@ export class CodeModelBuilder {
         // TODO: it is not very likely, but different client could have different auth
         const auth = getAuthentication(this.program, this.serviceNamespace);
         if (auth) {
-            this.processAuth(auth);
+            this.processAuth(auth, this.serviceNamespace);
         }
         if (this.sdkContext.arm) {
             // ARM
@@ -145,18 +145,33 @@ export class CodeModelBuilder {
         });
         return hostParameters;
     }
-    processAuth(auth) {
+    processAuth(auth, serviceNamespace) {
         const securitySchemes = [];
         for (const option of auth.options) {
             for (const scheme of option.schemes) {
                 switch (scheme.type) {
                     case "oauth2":
                         {
-                            const oauth2Scheme = new OAuth2SecurityScheme({
-                                scopes: [],
-                            });
-                            scheme.flows.forEach((it) => oauth2Scheme.scopes.push(...it.scopes.map((it) => it.value)));
-                            securitySchemes.push(oauth2Scheme);
+                            if (this.isBranded()) {
+                                const oauth2Scheme = new OAuth2SecurityScheme({
+                                    scopes: [],
+                                });
+                                scheme.flows.forEach((it) => oauth2Scheme.scopes.push(...it.scopes.map((it) => it.value)));
+                                securitySchemes.push(oauth2Scheme);
+                            }
+                            else {
+                                // there is no TokenCredential in clientcore, hence use Bearer Authentication directly
+                                reportDiagnostic(this.program, {
+                                    code: "auth-scheme-not-supported",
+                                    messageId: "oauth2Unbranded",
+                                    target: serviceNamespace,
+                                });
+                                const keyScheme = new KeySecurityScheme({
+                                    name: "authorization",
+                                });
+                                keyScheme.prefix = "Bearer";
+                                securitySchemes.push(keyScheme);
+                            }
                         }
                         break;
                     case "apiKey":
@@ -168,7 +183,11 @@ export class CodeModelBuilder {
                                 securitySchemes.push(keyScheme);
                             }
                             else {
-                                this.logWarning(`ApiKey auth is currently only supported for ApiKeyLocation.header.`);
+                                reportDiagnostic(this.program, {
+                                    code: "auth-scheme-not-supported",
+                                    messageId: "apiKeyLocation",
+                                    target: serviceNamespace,
+                                });
                             }
                         }
                         break;
@@ -180,7 +199,12 @@ export class CodeModelBuilder {
                                 schemeOrApiKeyPrefix = pascalCase(schemeOrApiKeyPrefix);
                                 if (this.isBranded()) {
                                     // Azure would not allow BasicAuth or BearerAuth
-                                    this.logWarning(`HTTP auth with ${scheme.scheme} scheme is not supported for Azure.`);
+                                    reportDiagnostic(this.program, {
+                                        code: "auth-scheme-not-supported",
+                                        messageId: "basicAuthBranded",
+                                        format: { scheme: scheme.scheme },
+                                        target: serviceNamespace,
+                                    });
                                     continue;
                                 }
                             }
@@ -341,7 +365,7 @@ export class CodeModelBuilder {
             // at present, use global security definition
             security: this.codeModel.security,
         });
-        codeModelClient.crossLanguageDefinitionId = client.crossLanguageDefinitionId;
+        codeModelClient.language.default.crossLanguageDefinitionId = client.crossLanguageDefinitionId;
         // versioning
         const versions = client.apiVersions;
         if (versions && versions.length > 0) {
@@ -351,7 +375,11 @@ export class CodeModelBuilder {
             else {
                 this.apiVersion = versions.find((it) => it === this.sdkContext.apiVersion);
                 if (!this.apiVersion) {
-                    this.logError("Unrecognized api-version: " + this.sdkContext.apiVersion);
+                    reportDiagnostic(this.program, {
+                        code: "invalid-api-version",
+                        format: { apiVersion: this.sdkContext.apiVersion },
+                        target: NoTarget,
+                    });
                 }
             }
             codeModelClient.apiVersions = [];
@@ -364,7 +392,8 @@ export class CodeModelBuilder {
         // client initialization
         let baseUri = "{endpoint}";
         let hostParameters = [];
-        client.initialization.properties.forEach((initializationProperty) => {
+        client.clientInitialization.parameters.forEach((initializationProperty) => {
+            var _a;
             if (initializationProperty.kind === "endpoint") {
                 let sdkPathParameters = [];
                 if (initializationProperty.type.kind === "union") {
@@ -378,7 +407,10 @@ export class CodeModelBuilder {
                         }
                     }
                     else if (initializationProperty.type.variantTypes.length > 2) {
-                        this.logError("Multiple server url defined for one client is not supported yet.");
+                        reportDiagnostic(this.program, {
+                            code: "multiple-server-not-supported",
+                            target: (_a = initializationProperty.type.__raw) !== null && _a !== void 0 ? _a : NoTarget,
+                        });
                     }
                 }
                 else if (initializationProperty.type.kind === "endpoint") {
@@ -395,6 +427,7 @@ export class CodeModelBuilder {
         // operations without operation group
         const serviceMethodsWithoutSubClient = this.listServiceMethodsUnderClient(client);
         let codeModelGroup = new OperationGroup("");
+        codeModelGroup.language.default.crossLanguageDefinitionId = client.crossLanguageDefinitionId;
         for (const serviceMethod of serviceMethodsWithoutSubClient) {
             if (!this.needToSkipProcessingOperation(serviceMethod.__raw, clientContext)) {
                 codeModelGroup.addOperation(this.processOperation(serviceMethod, clientContext, ""));
@@ -418,6 +451,8 @@ export class CodeModelBuilder {
                 // operation group with no operation is skipped
                 if (serviceMethods.length > 0) {
                     codeModelGroup = new OperationGroup(subClient.name);
+                    codeModelGroup.language.default.crossLanguageDefinitionId =
+                        subClient.crossLanguageDefinitionId;
                     for (const serviceMethod of serviceMethods) {
                         if (!this.needToSkipProcessingOperation(serviceMethod.__raw, clientContext)) {
                             codeModelGroup.addOperation(this.processOperation(serviceMethod, clientContext, subClient.name));
@@ -508,7 +543,7 @@ export class CodeModelBuilder {
         }
         return versions
             .slice(0, versions.indexOf(pinnedApiVersion) + 1)
-            .filter((version) => !excludePreview || !isStable(pinnedApiVersion) || isStable(version));
+            .filter((version) => !excludePreview || !isStableApiVersion(pinnedApiVersion) || isStableApiVersion(version));
     }
     needToSkipProcessingOperation(operation, clientContext) {
         // don't generate protocol and convenience method for overloaded operations
@@ -547,7 +582,7 @@ export class CodeModelBuilder {
         }
     }
     processOperation(sdkMethod, clientContext, groupName) {
-        var _a;
+        var _a, _b, _c, _d;
         const operationName = sdkMethod.name;
         const httpOperation = sdkMethod.operation;
         const operationId = groupName ? `${groupName}_${operationName}` : `${operationName}`;
@@ -560,42 +595,57 @@ export class CodeModelBuilder {
                 "x-ms-examples": operationExamples,
             },
         });
-        codeModelOperation.crossLanguageDefinitionId =
-            sdkMethod.crossLanguageDefintionId;
+        codeModelOperation.language.default.crossLanguageDefinitionId =
+            sdkMethod.crossLanguageDefinitionId;
         codeModelOperation.internalApi = sdkMethod.access === "internal";
         const convenienceApiName = this.getConvenienceApiName(sdkMethod);
         let generateConvenienceApi = sdkMethod.generateConvenient;
         let generateProtocolApi = sdkMethod.generateProtocol;
-        let apiComment = undefined;
+        let diagnostic = undefined;
         if (generateConvenienceApi) {
             // check if the convenience API need to be disabled for some special cases
             if (operationIsMultipart(httpOperation)) {
                 // do not generate protocol method for multipart/form-data, as it be very hard for user to prepare the request body as BinaryData
                 generateProtocolApi = false;
-                apiComment = `Protocol API requires serialization of parts with content-disposition and data, as operation '${operationName}' is 'multipart/form-data'`;
-                this.logWarning(apiComment);
+                diagnostic = createDiagnostic({
+                    code: "protocol-api-not-generated",
+                    messageId: "multipartFormData",
+                    format: { operationName: operationName },
+                    target: (_b = sdkMethod.__raw) !== null && _b !== void 0 ? _b : NoTarget,
+                });
+                this.program.reportDiagnostic(diagnostic);
             }
             else if (operationIsMultipleContentTypes(httpOperation)) {
                 // and multiple content types
                 // issue link: https://github.com/Azure/autorest.java/issues/1958#issuecomment-1562558219
                 generateConvenienceApi = false;
-                apiComment = `Convenience API is not generated, as operation '${operationName}' is multiple content-type`;
-                this.logWarning(apiComment);
+                diagnostic = createDiagnostic({
+                    code: "convenience-api-not-generated",
+                    messageId: "multipleContentType",
+                    format: { operationName: operationName },
+                    target: (_c = sdkMethod.__raw) !== null && _c !== void 0 ? _c : NoTarget,
+                });
+                this.program.reportDiagnostic(diagnostic);
             }
             else if (operationIsJsonMergePatch(httpOperation) &&
                 this.options["stream-style-serialization"] === false) {
                 // do not generate convenient method for json merge patch operation if stream-style-serialization is not enabled
                 generateConvenienceApi = false;
-                apiComment = `Convenience API is not generated, as operation '${operationName}' is 'application/merge-patch+json' and stream-style-serialization is not enabled`;
-                this.logWarning(apiComment);
+                diagnostic = createDiagnostic({
+                    code: "convenience-api-not-generated",
+                    messageId: "jsonMergePatch",
+                    format: { operationName: operationName },
+                    target: (_d = sdkMethod.__raw) !== null && _d !== void 0 ? _d : NoTarget,
+                });
+                this.program.reportDiagnostic(diagnostic);
             }
         }
         if (generateConvenienceApi && convenienceApiName) {
             codeModelOperation.convenienceApi = new ConvenienceApi(convenienceApiName);
         }
-        if (apiComment) {
+        if (diagnostic) {
             codeModelOperation.language.java = new Language();
-            codeModelOperation.language.java.comment = apiComment;
+            codeModelOperation.language.java.comment = diagnostic.message;
         }
         // check for generating protocol api or not
         codeModelOperation.generateProtocolApi = generateProtocolApi && !codeModelOperation.internalApi;
@@ -612,8 +662,7 @@ export class CodeModelBuilder {
         clientContext.hostParameters.forEach((it) => codeModelOperation.addParameter(it));
         // path/query/header parameters
         for (const param of httpOperation.parameters) {
-            // TODO, switch to TCGC param.kind=="cookie"
-            if (param.__raw && isCookieParam(this.program, param.__raw)) {
+            if (param.kind === "cookie") {
                 // ignore cookie parameter
                 continue;
             }
@@ -664,32 +713,49 @@ export class CodeModelBuilder {
     }
     processRouteForPaged(op, responses, sdkMethod) {
         var _a, _b;
-        if (!this.isBranded()) {
-            // TODO: currently unbranded does not support paged operation
-            return;
-        }
         if (sdkMethod.kind === "paging" || sdkMethod.kind === "lropaging") {
             for (const response of responses) {
                 const bodyType = response.type;
                 if (bodyType && bodyType.kind === "model") {
-                    const itemName = sdkMethod.response.resultPath;
-                    const nextLinkName = sdkMethod.nextLinkPath;
-                    op.extensions = (_a = op.extensions) !== null && _a !== void 0 ? _a : {};
-                    op.extensions["x-ms-pageable"] = {
-                        itemName: itemName,
-                        nextLinkName: nextLinkName,
-                    };
-                    (_b = op.responses) === null || _b === void 0 ? void 0 : _b.forEach((r) => {
+                    const itemClientName = sdkMethod.response.resultPath;
+                    const nextLinkClientName = sdkMethod.nextLinkPath;
+                    let itemSerializedName = undefined;
+                    let nextLinkSerializedName = undefined;
+                    (_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 : {};
+                    op.extensions["x-ms-pageable"] = {
+                        itemName: itemSerializedName,
+                        nextLinkName: nextLinkSerializedName,
+                    };
                     break;
                 }
             }
         }
     }
     processLroMetadata(op, sdkMethod) {
+        var _a;
         const trackConvenienceApi = Boolean(op.convenienceApi);
         const lroMetadata = sdkMethod.lroMetadata;
         if (lroMetadata && lroMetadata.pollingStep) {
@@ -734,8 +800,20 @@ export class CodeModelBuilder {
                     lroMetadata.finalStep &&
                     lroMetadata.finalStep.kind === "pollingSuccessProperty" &&
                     lroMetadata.finalResponse.resultPath) {
-                    // final result is the value in lroMetadata.finalStep.target
-                    finalResultPropertySerializedName = 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;
+                            }
+                        });
+                    }
                 }
             }
             // track usage
@@ -769,7 +847,7 @@ export class CodeModelBuilder {
         }
     }
     processParameter(op, param, clientContext) {
-        var _a, _b;
+        var _a, _b, _c;
         if (clientContext.apiVersions && isApiVersion(this.sdkContext, param)) {
             // pre-condition for "isApiVersion": the client supports ApiVersions
             if (this.isArm()) {
@@ -866,19 +944,19 @@ export class CodeModelBuilder {
                             break;
                         default:
                             if (format) {
-                                this.logWarning(`Unrecognized header parameter format: '${format}'.`);
+                                reportDiagnostic(this.program, {
+                                    code: "header-parameter-format-not-supported",
+                                    format: { format: format },
+                                    target: (_b = param.__raw) !== null && _b !== void 0 ? _b : NoTarget,
+                                });
                             }
                             break;
                     }
                 }
             }
-            // TODO: use param.onClient after TCGC fix
-            const parameterOnClient = !isApiVersion(this.sdkContext, param) &&
-                param.correspondingMethodParams &&
-                param.correspondingMethodParams.length > 0 &&
-                param.correspondingMethodParams[0].onClient;
+            const parameterOnClient = param.onClient;
             const nullable = param.type.kind === "nullable";
-            const parameter = new Parameter(param.name, (_b = param.doc) !== null && _b !== void 0 ? _b : "", schema, {
+            const parameter = new Parameter(param.name, (_c = param.doc) !== null && _c !== void 0 ? _c : "", schema, {
                 summary: param.summary,
                 implementation: parameterOnClient
                     ? ImplementationLocation.Client
@@ -1153,7 +1231,9 @@ export class CodeModelBuilder {
     }
     addParameterOrBodyPropertyToCodeModelRequest(opParameter, op, request, schema, originalParameter) {
         var _a, _b, _c, _d, _e;
-        const serializedName = opParameter.serializedName;
+        const serializedName = opParameter.kind === "property"
+            ? getPropertySerializedName(opParameter)
+            : opParameter.serializedName;
         let existParameter;
         if (opParameter.kind !== "property") {
             // not body property
@@ -1195,10 +1275,6 @@ export class CodeModelBuilder {
             }
         }
     }
-    findResponseBody(bodyType) {
-        // find a type that possibly without http metadata like @statusCode
-        return this.getEffectiveSchemaType(bodyType);
-    }
     processResponse(op, statusCode, sdkResponse, longRunning, isErrorResponse) {
         var _a;
         // TODO: what to do if more than 1 response?
@@ -1331,6 +1407,7 @@ export class CodeModelBuilder {
         return this.schemaCache.process(type, nameHint) || fail("Unable to process schema.");
     }
     processSchemaImpl(type, nameHint) {
+        var _a;
         if (isSdkBuiltInKind(type.kind)) {
             return this.processBuiltInType(type, nameHint);
         }
@@ -1362,9 +1439,12 @@ export class CodeModelBuilder {
                     }
             }
         }
-        const errorMsg = `Unrecognized type: '${type.kind}'.`;
-        this.logError(errorMsg);
-        throw new Error(errorMsg);
+        const diagnostic = createDiagnostic({
+            code: "unrecognized-type",
+            format: { typeKind: type.kind },
+            target: (_a = type.__raw) !== null && _a !== void 0 ? _a : NoTarget,
+        });
+        throw new DiagnosticError(diagnostic);
     }
     processBuiltInType(type, nameHint) {
         nameHint = nameHint || type.kind;
@@ -1499,7 +1579,7 @@ export class CodeModelBuilder {
                 },
             },
         });
-        schema.crossLanguageDefinitionId = type.crossLanguageDefinitionId;
+        schema.language.default.crossLanguageDefinitionId = type.crossLanguageDefinitionId;
         return this.codeModel.schemas.add(schema);
     }
     processConstantSchema(type, name) {
@@ -1573,8 +1653,7 @@ export class CodeModelBuilder {
                 },
             },
         });
-        objectSchema.crossLanguageDefinitionId =
-            type.crossLanguageDefinitionId;
+        objectSchema.language.default.crossLanguageDefinitionId = type.crossLanguageDefinitionId;
         this.codeModel.schemas.add(objectSchema);
         // cache this now before we accidentally recurse on this type.
         if (!this.schemaCache.has(type)) {
@@ -1638,26 +1717,8 @@ export class CodeModelBuilder {
         }
         return objectSchema;
     }
-    getEffectiveSchemaType(type) {
-        var _a;
-        const program = this.program;
-        function isSchemaProperty(property) {
-            return isPayloadProperty(program, property);
-        }
-        if (type.kind === "Model") {
-            const effective = getEffectiveModelType(program, type, isSchemaProperty);
-            if (this.isArm() && ((_a = getNamespace(effective)) === null || _a === void 0 ? void 0 : _a.startsWith("Azure.ResourceManager"))) {
-                // e.g. typespec: Catalog is TrackedResource<CatalogProperties>
-                return type;
-            }
-            else if (effective.name) {
-                return effective;
-            }
-        }
-        return type;
-    }
     processModelProperty(prop) {
-        var _a;
+        var _a, _b;
         let nullable = false;
         let nonNullType = prop.type;
         if (nonNullType.kind === "nullable") {
@@ -1681,9 +1742,9 @@ export class CodeModelBuilder {
             extensions = extensions !== null && extensions !== void 0 ? extensions : {};
             extensions["x-ms-mutability"] = mutability;
         }
-        if (prop.kind === "property" && prop.multipartOptions) {
+        if (prop.kind === "property" && prop.serializationOptions.multipart) {
             // TODO: handle MultipartOptions.isMulti
-            if (prop.multipartOptions.isFilePart) {
+            if ((_a = prop.serializationOptions.multipart) === null || _a === void 0 ? void 0 : _a.isFilePart) {
                 schema = this.processMultipartFormDataFilePropertySchema(prop);
             }
             else if (prop.type.kind === "model" &&
@@ -1698,25 +1759,30 @@ export class CodeModelBuilder {
         else {
             schema = this.processSchema(nonNullType, "");
         }
-        return new Property(prop.name, (_a = prop.doc) !== null && _a !== void 0 ? _a : "", schema, {
+        return new Property(prop.name, (_b = prop.doc) !== null && _b !== void 0 ? _b : "", schema, {
             summary: prop.summary,
             required: !prop.optional,
             nullable: nullable,
             readOnly: this.isReadOnly(prop),
-            serializedName: prop.kind === "property" ? prop.serializedName : undefined,
+            serializedName: prop.kind === "property" ? getPropertySerializedName(prop) : undefined,
             extensions: extensions,
         });
     }
     processUnionSchema(type, name) {
-        var _a, _b;
+        var _a, _b, _c;
         if (!(type.__raw && type.__raw.kind === "Union")) {
-            this.logError(`Invalid type for union: '${type.kind}'.`);
+            reportDiagnostic(this.program, {
+                code: "unrecognized-type",
+                messageId: "unionType",
+                format: { typeKind: type.kind },
+                target: (_a = type.__raw) !== null && _a !== void 0 ? _a : NoTarget,
+            });
         }
         const rawUnionType = type.__raw;
         const namespace = getNamespace(rawUnionType);
-        const baseName = (_a = type.name) !== null && _a !== void 0 ? _a : pascalCase(name) + "Model";
-        this.logWarning(`Convert TypeSpec Union '${getUnionDescription(rawUnionType, this.typeNameOptions)}' to Class '${baseName}'`);
-        const unionSchema = new OrSchema(baseName + "Base", (_b = type.doc) !== null && _b !== void 0 ? _b : "", {
+        const baseName = (_b = type.name) !== null && _b !== void 0 ? _b : pascalCase(name) + "Model";
+        this.trace(`Convert TypeSpec Union '${getUnionDescription(rawUnionType, this.typeNameOptions)}' to Class '${baseName}'`);
+        const unionSchema = new OrSchema(baseName + "Base", (_c = type.doc) !== null && _c !== void 0 ? _c : "", {
             summary: type.summary,
         });
         unionSchema.anyOf = [];
@@ -1756,7 +1822,7 @@ export class CodeModelBuilder {
     getUnionVariantName(type, option) {
         var _a, _b;
         if (type === undefined) {
-            this.logError("type is undefined.");
+            this.trace("Union variant type is undefined.");
             return "UnionVariant";
         }
         switch (type.kind) {
@@ -1814,12 +1880,12 @@ export class CodeModelBuilder {
             case "UnionVariant":
                 return (_b = (typeof type.name === "string" ? type.name : undefined)) !== null && _b !== void 0 ? _b : "UnionVariant";
             default:
-                this.logError(`Unrecognized type for union variable: '${type.kind}'.`);
+                this.trace(`Unrecognized type for union variable: '${type.kind}'.`);
                 return "UnionVariant";
         }
     }
     processMultipartFormDataFilePropertySchema(property) {
-        var _a;
+        var _a, _b;
         const processSchemaFunc = (type) => this.processSchema(type, "");
         const processNamespaceFunc = (type) => {
             var _a;
@@ -1839,9 +1905,13 @@ export class CodeModelBuilder {
             });
         }
         else {
-            const errorMsg = `Invalid type for multipart form data: '${property.type.kind}'.`;
-            this.logError(errorMsg);
-            throw new Error(errorMsg);
+            const diagnostic = createDiagnostic({
+                code: "unrecognized-type",
+                messageId: "multipartFormData",
+                format: { typeKind: property.type.kind },
+                target: (_b = property.type.__raw) !== null && _b !== void 0 ? _b : NoTarget,
+            });
+            throw new DiagnosticError(diagnostic);
         }
     }
     getDoc(target) {
@@ -1850,21 +1920,6 @@ export class CodeModelBuilder {
     getSummary(target) {
         return target ? getSummary(this.program, target) : undefined;
     }
-    getSerializedName(target) {
-        if (isHeader(this.program, target)) {
-            return getHeaderFieldName(this.program, target);
-        }
-        else if (isQueryParam(this.program, target)) {
-            return getQueryParamName(this.program, target);
-        }
-        else if (isPathParam(this.program, target)) {
-            return getPathParamName(this.program, target);
-        }
-        else {
-            // TODO: currently this is only for JSON
-            return getWireName(this.sdkContext, target);
-        }
-    }
     isReadOnly(target) {
         const segment = target.__raw ? getSegment(this.program, target.__raw) !== undefined : false;
         if (segment) {
@@ -1946,18 +2001,19 @@ export class CodeModelBuilder {
         // clientNamespace from TCGC
         const clientNamespace = type === null || type === void 0 ? void 0 : type.clientNamespace;
         if (type) {
+            const crossLanguageDefinitionId = type.crossLanguageDefinitionId;
             if (this.isBranded()) {
                 // special handling for namespace of model that cannot be mapped to azure-core
-                if (type.crossLanguageDefinitionId === "TypeSpec.Http.File") {
+                if (crossLanguageDefinitionId === "TypeSpec.Http.File") {
                     // TypeSpec.Http.File
                     return this.baseJavaNamespace;
                 }
-                else if (type.crossLanguageDefinitionId === "Azure.Core.Foundations.OperationState") {
+                else if (crossLanguageDefinitionId === "Azure.Core.Foundations.OperationState") {
                     // Azure.Core.OperationState
                     return this.baseJavaNamespace;
                 }
-                else if (type.crossLanguageDefinitionId === "Azure.Core.ResourceOperationStatus" ||
-                    type.crossLanguageDefinitionId === "Azure.Core.Foundations.OperationStatus") {
+                else if (crossLanguageDefinitionId === "Azure.Core.ResourceOperationStatus" ||
+                    crossLanguageDefinitionId === "Azure.Core.Foundations.OperationStatus") {
                     // Azure.Core.ResourceOperationStatus<>
                     // Azure.Core.Foundations.OperationStatus<>
                     // usually this model will not be generated, but javadoc of protocol method requires it be in SDK namespace
@@ -1969,8 +2025,12 @@ export class CodeModelBuilder {
                 }
             }
             else {
-                // special handling for namespace of model in TypeSpec.Rest.Resource
-                if (type.crossLanguageDefinitionId.startsWith("TypeSpec.Rest.Resource.")) {
+                // special handling for namespace of model in TypeSpec
+                if (crossLanguageDefinitionId === "TypeSpec.Http.File") {
+                    // TypeSpec.Http.File
+                    return this.baseJavaNamespace;
+                }
+                else if (crossLanguageDefinitionId.startsWith("TypeSpec.Rest.Resource.")) {
                     // models in TypeSpec.Rest.Resource
                     return this.baseJavaNamespace;
                 }
@@ -1983,14 +2043,6 @@ export class CodeModelBuilder {
             return clientNamespace.toLowerCase();
         }
     }
-    logError(msg) {
-        logError(this.program, msg);
-    }
-    logWarning(msg) {
-        if (this.loggingEnabled) {
-            logWarning(this.program, msg);
-        }
-    }
     trace(msg) {
         trace(this.program, msg);
     }