@azure-tools/typespec-java 0.20.2 → 0.21.1

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

@@ -19,14 +19,14 @@ import { SchemaContext } from "./common/schemas/usage.js";
 import { createPollOperationDetailsSchema, getFileDetailsSchema } from "./external-schemas.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, getDurationFormatFromSdkType, getNonNullSdkType, getUnionDescription, getUsage, isStable, modelIs, pushDistinct, } from "./type-utils.js";
+import { ProcessingCache, getAccess, getDurationFormat, getNonNullSdkType, getUnionDescription, getUsage, isStable, modelIs, pushDistinct, } from "./type-utils.js";
 import { getNamespace, logWarning, pascalCase, removeClientSuffix, stringArrayContainsIgnoreCase, trace, } from "./utils.js";
 const { isEqual } = pkg;
 export class CodeModelBuilder {
     constructor(program1, context) {
         var _a, _b;
         this.loggingEnabled = false;
-        this.schemaCache = new ProcessingCache((type, name) => this.processSchemaFromSdkTypeImpl(type, name));
+        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;
@@ -103,11 +103,11 @@ export class CodeModelBuilder {
                 parameter = this.createApiVersionParameter(arg.name, ParameterLocation.Uri);
             }
             else {
-                const schema = this.processSchemaFromSdkType(arg.type, arg.name);
+                const schema = this.processSchema(arg.type, arg.name);
                 this.trackSchemaUsage(schema, {
                     usage: [SchemaContext.Input, SchemaContext.Output /*SchemaContext.Public*/],
                 });
-                parameter = new Parameter(arg.name, (_a = arg.description) !== null && _a !== void 0 ? _a : "", schema, {
+                parameter = new Parameter(arg.name, (_a = arg.doc) !== null && _a !== void 0 ? _a : "", schema, {
                     implementation: ImplementationLocation.Client,
                     origin: "modelerfour:synthesized/host",
                     required: true,
@@ -160,7 +160,7 @@ export class CodeModelBuilder {
                                 schemeOrApiKeyPrefix = pascalCase(schemeOrApiKeyPrefix);
                                 if (this.isBranded()) {
                                     // Azure would not allow BasicAuth or BearerAuth
-                                    this.logWarning(`{scheme.scheme} auth method is currently not supported.`);
+                                    this.logWarning(`${scheme.scheme} auth method is currently not supported.`);
                                     continue;
                                 }
                             }
@@ -185,30 +185,31 @@ export class CodeModelBuilder {
     }
     processModels() {
         const processedSdkModels = new Set();
-        // lambda to mark model as public
-        const modelAsPublic = (model) => {
-            const schema = this.processSchemaFromSdkType(model, "");
-            this.trackSchemaUsage(schema, {
-                usage: [SchemaContext.Public],
-            });
-        };
+        // cache resolved value of access/usage for the namespace
+        // the value can be set as undefined
+        // it resolves the value from that namespace and its parent namespaces
+        const accessCache = new Map();
+        const usageCache = new Map();
         const sdkModels = getAllModels(this.sdkContext);
         // process sdk models
         for (const model of sdkModels) {
             if (!processedSdkModels.has(model)) {
-                const access = getAccess(model.__raw);
+                const access = getAccess(model.__raw, accessCache);
                 if (access === "public") {
-                    modelAsPublic(model);
+                    const schema = this.processSchema(model, "");
+                    this.trackSchemaUsage(schema, {
+                        usage: [SchemaContext.Public],
+                    });
                 }
                 else if (access === "internal") {
-                    const schema = this.processSchemaFromSdkType(model, model.name);
+                    const schema = this.processSchema(model, model.name);
                     this.trackSchemaUsage(schema, {
                         usage: [SchemaContext.Internal],
                     });
                 }
-                const usage = getUsage(model.__raw);
+                const usage = getUsage(model.__raw, usageCache);
                 if (usage) {
-                    const schema = this.processSchemaFromSdkType(model, "");
+                    const schema = this.processSchema(model, "");
                     this.trackSchemaUsage(schema, {
                         usage: usage,
                     });
@@ -298,8 +299,8 @@ export class CodeModelBuilder {
                 const clientSubNamespace = clientNameSegments.slice(0, -1).join(".");
                 javaNamespace = this.getJavaNamespace(this.namespace + "." + clientSubNamespace);
             }
-            const codeModelClient = new CodeModelClient(clientName, (_b = client.details) !== null && _b !== void 0 ? _b : "", {
-                summary: client.description,
+            const codeModelClient = new CodeModelClient(clientName, (_b = client.doc) !== null && _b !== void 0 ? _b : "", {
+                summary: client.summary,
                 language: {
                     default: {
                         namespace: this.namespace,
@@ -338,16 +339,16 @@ export class CodeModelBuilder {
                 if (initializationProperty.kind === "endpoint") {
                     let sdkPathParameters = [];
                     if (initializationProperty.type.kind === "union") {
-                        if (initializationProperty.type.values.length === 2) {
+                        if (initializationProperty.type.variantTypes.length === 2) {
                             // only get the sdkPathParameters from the endpoint whose serverUrl is not {"endpoint"}
-                            for (const endpointType of initializationProperty.type.values) {
+                            for (const endpointType of initializationProperty.type.variantTypes) {
                                 if (endpointType.kind === "endpoint" && endpointType.serverUrl !== "{endpoint}") {
                                     sdkPathParameters = endpointType.templateArguments;
                                     baseUri = endpointType.serverUrl;
                                 }
                             }
                         }
-                        else if (initializationProperty.type.values.length > 2) {
+                        else if (initializationProperty.type.variantTypes.length > 2) {
                             throw new Error("Multiple server url defined for one client is not supported yet.");
                         }
                     }
@@ -512,9 +513,9 @@ export class CodeModelBuilder {
         const operationId = groupName ? `${groupName}_${operationName}` : `${operationName}`;
         const operationGroup = this.codeModel.getOperationGroup(groupName);
         const operationExamples = this.getOperationExample(sdkMethod);
-        const codeModelOperation = new CodeModelOperation(operationName, (_a = sdkMethod.details) !== null && _a !== void 0 ? _a : "", {
+        const codeModelOperation = new CodeModelOperation(operationName, (_a = sdkMethod.doc) !== null && _a !== void 0 ? _a : "", {
             operationId: operationId,
-            summary: sdkMethod.description,
+            summary: sdkMethod.summary,
             extensions: {
                 "x-ms-examples": operationExamples,
             },
@@ -602,24 +603,24 @@ export class CodeModelBuilder {
             lroMetadata = this.processLroMetadata(codeModelOperation, sdkMethod);
         }
         // responses
-        for (const [code, response] of sdkMethod.operation.responses) {
-            this.processResponse(codeModelOperation, code, response, lroMetadata.longRunning, false);
+        for (const response of sdkMethod.operation.responses) {
+            this.processResponse(codeModelOperation, response.statusCodes, response, lroMetadata.longRunning, false);
         }
         // exception
-        for (const [code, response] of sdkMethod.operation.exceptions) {
-            this.processResponse(codeModelOperation, code, response, lroMetadata.longRunning, true);
+        for (const response of sdkMethod.operation.exceptions) {
+            this.processResponse(codeModelOperation, response.statusCodes, response, lroMetadata.longRunning, true);
         }
         // check for paged
         this.processRouteForPaged(codeModelOperation, sdkMethod.operation.responses, sdkMethod);
         // check for long-running operation
-        this.processRouteForLongRunning(codeModelOperation, sdkMethod.operation.responses, lroMetadata);
+        this.processRouteForLongRunning(codeModelOperation, lroMetadata);
         operationGroup.addOperation(codeModelOperation);
         return codeModelOperation;
     }
     processRouteForPaged(op, responses, sdkMethod) {
         var _a, _b;
         if (sdkMethod.kind === "paging" || sdkMethod.kind === "lropaging") {
-            for (const [_, response] of responses) {
+            for (const response of responses) {
                 const bodyType = response.type;
                 if (bodyType && bodyType.kind === "model") {
                     const itemName = sdkMethod.response.resultPath;
@@ -670,7 +671,7 @@ export class CodeModelBuilder {
             else {
                 const pollType = this.findResponseBody(lroMetadata.pollingInfo.responseModel);
                 const sdkType = getClientType(this.sdkContext, pollType);
-                pollingSchema = this.processSchemaFromSdkType(sdkType, "pollResult");
+                pollingSchema = this.processSchema(sdkType, "pollResult");
             }
             // finalSchema
             if (verb !== "delete" &&
@@ -683,7 +684,7 @@ export class CodeModelBuilder {
                     : lroMetadata.finalEnvelopeResult;
                 const finalType = this.findResponseBody(finalResult);
                 const sdkType = getClientType(this.sdkContext, finalType);
-                finalSchema = this.processSchemaFromSdkType(sdkType, "finalResult");
+                finalSchema = this.processSchema(sdkType, "finalResult");
                 if (useNewPollStrategy &&
                     lroMetadata.finalStep &&
                     lroMetadata.finalStep.kind === "pollingSuccessProperty" &&
@@ -714,7 +715,7 @@ export class CodeModelBuilder {
         }
         return new LongRunningMetadata(false);
     }
-    processRouteForLongRunning(op, responses, lroMetadata) {
+    processRouteForLongRunning(op, lroMetadata) {
         var _a;
         if (lroMetadata.longRunning) {
             op.extensions = (_a = op.extensions) !== null && _a !== void 0 ? _a : {};
@@ -758,7 +759,7 @@ export class CodeModelBuilder {
         else {
             // schema
             const sdkType = getNonNullSdkType(param.type);
-            const schema = this.processSchemaFromSdkType(sdkType, param.name);
+            const schema = this.processSchema(sdkType, param.name);
             let extensions = undefined;
             if (param.kind === "path") {
                 if (param.allowReserved) {
@@ -826,10 +827,17 @@ export class CodeModelBuilder {
                     }
                 }
             }
+            // TODO: use param.onClient after TCGC fix
+            const parameterOnClient = !isApiVersion(this.sdkContext, param) &&
+                param.correspondingMethodParams &&
+                param.correspondingMethodParams.length > 0 &&
+                param.correspondingMethodParams[0].onClient;
             const nullable = param.type.kind === "nullable";
-            const parameter = new Parameter(param.name, (_b = param.details) !== null && _b !== void 0 ? _b : "", schema, {
-                summary: param.description,
-                implementation: ImplementationLocation.Method,
+            const parameter = new Parameter(param.name, (_b = param.doc) !== null && _b !== void 0 ? _b : "", schema, {
+                summary: param.summary,
+                implementation: parameterOnClient
+                    ? ImplementationLocation.Client
+                    : ImplementationLocation.Method,
                 required: !param.optional,
                 nullable: nullable,
                 protocol: {
@@ -846,6 +854,9 @@ export class CodeModelBuilder {
                 extensions: extensions,
             });
             op.addParameter(parameter);
+            if (parameterOnClient) {
+                clientContext.addGlobalParameter(parameter);
+            }
             this.trackSchemaUsage(schema, { usage: [SchemaContext.Input] });
             if (op.convenienceApi) {
                 this.trackSchemaUsage(schema, {
@@ -967,14 +978,14 @@ export class CodeModelBuilder {
         let schema;
         if (unknownRequestBody && sdkType.kind === "bytes") {
             // if it's unknown request body, handle binary request body
-            schema = this.processBinarySchemaFromSdkType(sdkType);
+            schema = this.processBinarySchema(sdkType);
         }
         else {
-            schema = this.processSchemaFromSdkType(getNonNullSdkType(sdkType), sdkBody.name);
+            schema = this.processSchema(getNonNullSdkType(sdkType), sdkBody.name);
         }
         const parameterName = sdkBody.name;
-        const parameter = new Parameter(parameterName, (_a = sdkBody.description) !== null && _a !== void 0 ? _a : "", schema, {
-            summary: sdkBody.details,
+        const parameter = new Parameter(parameterName, (_a = sdkBody.doc) !== null && _a !== void 0 ? _a : "", schema, {
+            summary: sdkBody.summary,
             implementation: ImplementationLocation.Method,
             required: !sdkBody.optional,
             protocol: {
@@ -1153,12 +1164,12 @@ export class CodeModelBuilder {
         headers = [];
         if (sdkResponse.headers) {
             for (const header of sdkResponse.headers) {
-                const schema = this.processSchemaFromSdkType(header.type, header.serializedName);
+                const schema = this.processSchema(header.type, header.serializedName);
                 headers.push(new HttpHeader(header.serializedName, schema, {
                     language: {
                         default: {
                             name: header.serializedName,
-                            description: (_a = header.description) !== null && _a !== void 0 ? _a : header.details,
+                            description: (_a = header.summary) !== null && _a !== void 0 ? _a : header.doc,
                         },
                     },
                 }));
@@ -1197,7 +1208,7 @@ export class CodeModelBuilder {
                 trackConvenienceApi = false;
             }
             if (!schema) {
-                schema = this.processSchemaFromSdkType(bodyType, op.language.default.name + "Response");
+                schema = this.processSchema(bodyType, op.language.default.name + "Response");
             }
             response = new SchemaResponse(schema, {
                 protocol: {
@@ -1266,122 +1277,122 @@ export class CodeModelBuilder {
                 .map((it) => it.toString());
         }
     }
-    processSchemaFromSdkType(type, nameHint) {
+    processSchema(type, nameHint) {
         return this.schemaCache.process(type, nameHint) || fail("Unable to process schema.");
     }
-    processSchemaFromSdkTypeImpl(type, nameHint) {
+    processSchemaImpl(type, nameHint) {
         if (isSdkBuiltInKind(type.kind)) {
-            return this.processBuiltInFromSdkType(type, nameHint);
+            return this.processBuiltInType(type, nameHint);
         }
         else {
             switch (type.kind) {
                 case "enum":
-                    return this.processChoiceSchemaFromSdkType(type, type.name);
+                    return this.processChoiceSchema(type, type.name);
                 case "enumvalue":
-                    return this.processConstantSchemaFromEnumValueFromSdkType(type, nameHint);
+                    return this.processConstantSchemaFromEnumValue(type, nameHint);
                 case "union":
-                    return this.processUnionSchemaFromSdkType(type, type.name);
+                    return this.processUnionSchema(type, type.name);
                 case "model":
-                    return this.processObjectSchemaFromSdkType(type, type.name);
+                    return this.processObjectSchema(type, type.name);
                 case "dict":
-                    return this.processDictionarySchemaFromSdkType(type, nameHint);
+                    return this.processDictionarySchema(type, nameHint);
                 case "array":
-                    return this.processArraySchemaFromSdkType(type, nameHint);
+                    return this.processArraySchema(type, nameHint);
                 case "duration":
-                    return this.processDurationSchemaFromSdkType(type, nameHint, getDurationFormatFromSdkType(type));
+                    return this.processDurationSchema(type, nameHint, getDurationFormat(type));
                 case "constant":
-                    return this.processConstantSchemaFromSdkType(type, nameHint);
+                    return this.processConstantSchema(type, nameHint);
                 case "utcDateTime":
                 case "offsetDateTime":
                     if (type.encode === "unixTimestamp") {
-                        return this.processUnixTimeSchemaFromSdkType(type, nameHint);
+                        return this.processUnixTimeSchema(type, nameHint);
                     }
                     else {
-                        return this.processDateTimeSchemaFromSdkType(type, nameHint, type.encode === "rfc7231");
+                        return this.processDateTimeSchema(type, nameHint, type.encode === "rfc7231");
                     }
             }
         }
         throw new Error(`Unrecognized type: '${type.kind}'.`);
     }
-    processBuiltInFromSdkType(type, nameHint) {
+    processBuiltInType(type, nameHint) {
         nameHint = nameHint || type.kind;
         if (isSdkIntKind(type.kind)) {
             const integerSize = type.kind === "safeint" || type.kind.includes("int64") ? 64 : 32;
-            return this.processIntegerSchemaFromSdkType(type, nameHint, integerSize);
+            return this.processIntegerSchema(type, nameHint, integerSize);
         }
         else {
             switch (type.kind) {
-                case "any":
-                    return this.processAnySchemaFromSdkType();
+                case "unknown":
+                    return this.processAnySchema();
                 case "string":
-                    return this.processStringSchemaFromSdkType(type, nameHint);
+                    return this.processStringSchema(type, nameHint);
                 case "float":
                 case "float32":
                 case "float64":
-                    return this.processNumberSchemaFromSdkType(type, nameHint);
+                    return this.processNumberSchema(type, nameHint);
                 case "decimal":
                 case "decimal128":
-                    return this.processDecimalSchemaFromSdkType(type, nameHint);
+                    return this.processDecimalSchema(type, nameHint);
                 case "bytes":
-                    return this.processByteArraySchemaFromSdkType(type, nameHint);
+                    return this.processByteArraySchema(type, nameHint);
                 case "boolean":
-                    return this.processBooleanSchemaFromSdkType(type, nameHint);
+                    return this.processBooleanSchema(type, nameHint);
                 case "plainTime":
-                    return this.processTimeSchemaFromSdkType(type, nameHint);
+                    return this.processTimeSchema(type, nameHint);
                 case "plainDate":
-                    return this.processDateSchemaFromSdkType(type, nameHint);
+                    return this.processDateSchema(type, nameHint);
                 case "url":
-                    return this.processUrlSchemaFromSdkType(type, nameHint);
+                    return this.processUrlSchema(type, nameHint);
             }
         }
     }
-    processAnySchemaFromSdkType() {
+    processAnySchema() {
         return this.anySchema;
     }
-    processStringSchemaFromSdkType(type, name) {
+    processStringSchema(type, name) {
         var _a;
-        return this.codeModel.schemas.add(new StringSchema(name, (_a = type.details) !== null && _a !== void 0 ? _a : "", {
-            summary: type.description,
+        return this.codeModel.schemas.add(new StringSchema(name, (_a = type.doc) !== null && _a !== void 0 ? _a : "", {
+            summary: type.summary,
         }));
     }
-    processByteArraySchemaFromSdkType(type, name) {
+    processByteArraySchema(type, name) {
         var _a;
         const base64Encoded = type.encode === "base64url";
-        return this.codeModel.schemas.add(new ByteArraySchema(name, (_a = type.details) !== null && _a !== void 0 ? _a : "", {
-            summary: type.description,
+        return this.codeModel.schemas.add(new ByteArraySchema(name, (_a = type.doc) !== null && _a !== void 0 ? _a : "", {
+            summary: type.summary,
             format: base64Encoded ? "base64url" : "byte",
         }));
     }
-    processIntegerSchemaFromSdkType(type, name, precision) {
+    processIntegerSchema(type, name, precision) {
         var _a;
-        const schema = new NumberSchema(name, (_a = type.details) !== null && _a !== void 0 ? _a : "", SchemaType.Integer, precision, {
-            summary: type.description,
+        const schema = new NumberSchema(name, (_a = type.doc) !== null && _a !== void 0 ? _a : "", SchemaType.Integer, precision, {
+            summary: type.summary,
         });
         if (type.encode === "string") {
             schema.encode = type.encode;
         }
         return this.codeModel.schemas.add(schema);
     }
-    processNumberSchemaFromSdkType(type, name) {
+    processNumberSchema(type, name) {
         var _a;
-        return this.codeModel.schemas.add(new NumberSchema(name, (_a = type.details) !== null && _a !== void 0 ? _a : "", SchemaType.Number, 64, {
-            summary: type.description,
+        return this.codeModel.schemas.add(new NumberSchema(name, (_a = type.doc) !== null && _a !== void 0 ? _a : "", SchemaType.Number, 64, {
+            summary: type.summary,
         }));
     }
-    processDecimalSchemaFromSdkType(type, name) {
+    processDecimalSchema(type, name) {
         var _a;
         // "Infinity" maps to "BigDecimal" in Java
-        return this.codeModel.schemas.add(new NumberSchema(name, (_a = type.details) !== null && _a !== void 0 ? _a : "", SchemaType.Number, Infinity, {
-            summary: type.description,
+        return this.codeModel.schemas.add(new NumberSchema(name, (_a = type.doc) !== null && _a !== void 0 ? _a : "", SchemaType.Number, Infinity, {
+            summary: type.summary,
         }));
     }
-    processBooleanSchemaFromSdkType(type, name) {
+    processBooleanSchema(type, name) {
         var _a;
-        return this.codeModel.schemas.add(new BooleanSchema(name, (_a = type.details) !== null && _a !== void 0 ? _a : "", {
-            summary: type.description,
+        return this.codeModel.schemas.add(new BooleanSchema(name, (_a = type.doc) !== null && _a !== void 0 ? _a : "", {
+            summary: type.summary,
         }));
     }
-    processArraySchemaFromSdkType(type, name) {
+    processArraySchema(type, name) {
         var _a;
         let nullableItems = false;
         let elementType = type.valueType;
@@ -1389,16 +1400,16 @@ export class CodeModelBuilder {
             nullableItems = true;
             elementType = elementType.type;
         }
-        const elementSchema = this.processSchemaFromSdkType(elementType, name);
-        return this.codeModel.schemas.add(new ArraySchema(name, (_a = type.details) !== null && _a !== void 0 ? _a : "", elementSchema, {
-            summary: type.description,
+        const elementSchema = this.processSchema(elementType, name);
+        return this.codeModel.schemas.add(new ArraySchema(name, (_a = type.doc) !== null && _a !== void 0 ? _a : "", elementSchema, {
+            summary: type.summary,
             nullableItems: nullableItems,
         }));
     }
-    processDictionarySchemaFromSdkType(type, name) {
+    processDictionarySchema(type, name) {
         var _a;
-        const dictSchema = new DictionarySchema(name, (_a = type.details) !== null && _a !== void 0 ? _a : "", null, {
-            summary: type.description,
+        const dictSchema = new DictionarySchema(name, (_a = type.doc) !== null && _a !== void 0 ? _a : "", null, {
+            summary: type.summary,
         });
         // cache this now before we accidentally recurse on this type.
         if (!this.schemaCache.has(type)) {
@@ -1410,21 +1421,21 @@ export class CodeModelBuilder {
             nullableItems = true;
             elementType = elementType.type;
         }
-        const elementSchema = this.processSchemaFromSdkType(elementType, name);
+        const elementSchema = this.processSchema(elementType, name);
         dictSchema.elementType = elementSchema;
         dictSchema.nullableItems = nullableItems;
         return this.codeModel.schemas.add(dictSchema);
     }
-    processChoiceSchemaFromSdkType(type, name) {
+    processChoiceSchema(type, name) {
         var _a, _b;
         const rawEnumType = type.__raw;
         const namespace = getNamespace(rawEnumType);
-        const valueType = this.processSchemaFromSdkType(type.valueType, type.valueType.kind);
+        const valueType = this.processSchema(type.valueType, type.valueType.kind);
         const choices = [];
-        type.values.forEach((it) => { var _a, _b; return choices.push(new ChoiceValue(it.name, (_a = it.description) !== null && _a !== void 0 ? _a : "", (_b = it.value) !== null && _b !== void 0 ? _b : it.name)); });
+        type.values.forEach((it) => { var _a, _b; return choices.push(new ChoiceValue(it.name, (_a = it.doc) !== null && _a !== void 0 ? _a : "", (_b = it.value) !== null && _b !== void 0 ? _b : it.name)); });
         const schemaType = type.isFixed ? SealedChoiceSchema : ChoiceSchema;
-        const schema = new schemaType((_a = type.name) !== null && _a !== void 0 ? _a : name, (_b = type.details) !== null && _b !== void 0 ? _b : "", {
-            summary: type.description,
+        const schema = new schemaType((_a = type.name) !== null && _a !== void 0 ? _a : name, (_b = type.doc) !== null && _b !== void 0 ? _b : "", {
+            summary: type.summary,
             choiceType: valueType,
             choices: choices,
             language: {
@@ -1439,68 +1450,68 @@ export class CodeModelBuilder {
         schema.crossLanguageDefinitionId = type.crossLanguageDefinitionId;
         return this.codeModel.schemas.add(schema);
     }
-    processConstantSchemaFromSdkType(type, name) {
+    processConstantSchema(type, name) {
         var _a, _b;
-        const valueType = this.processSchemaFromSdkType(type.valueType, type.valueType.kind);
-        return this.codeModel.schemas.add(new ConstantSchema((_a = type.name) !== null && _a !== void 0 ? _a : name, (_b = type.details) !== null && _b !== void 0 ? _b : "", {
-            summary: type.description,
+        const valueType = this.processSchema(type.valueType, type.valueType.kind);
+        return this.codeModel.schemas.add(new ConstantSchema((_a = type.name) !== null && _a !== void 0 ? _a : name, (_b = type.doc) !== null && _b !== void 0 ? _b : "", {
+            summary: type.summary,
             valueType: valueType,
             value: new ConstantValue(type.value),
         }));
     }
-    processConstantSchemaFromEnumValueFromSdkType(type, name) {
+    processConstantSchemaFromEnumValue(type, name) {
         var _a, _b, _c;
-        const valueType = this.processSchemaFromSdkType(type.enumType, type.enumType.name);
-        return this.codeModel.schemas.add(new ConstantSchema((_a = type.name) !== null && _a !== void 0 ? _a : name, (_b = type.details) !== null && _b !== void 0 ? _b : "", {
-            summary: type.description,
+        const valueType = this.processSchema(type.enumType, type.enumType.name);
+        return this.codeModel.schemas.add(new ConstantSchema((_a = type.name) !== null && _a !== void 0 ? _a : name, (_b = type.doc) !== null && _b !== void 0 ? _b : "", {
+            summary: type.summary,
             valueType: valueType,
             value: new ConstantValue((_c = type.value) !== null && _c !== void 0 ? _c : type.name),
         }));
     }
-    processUnixTimeSchemaFromSdkType(type, name) {
+    processUnixTimeSchema(type, name) {
         var _a;
-        return this.codeModel.schemas.add(new UnixTimeSchema(name, (_a = type.details) !== null && _a !== void 0 ? _a : "", {
-            summary: type.description,
+        return this.codeModel.schemas.add(new UnixTimeSchema(name, (_a = type.doc) !== null && _a !== void 0 ? _a : "", {
+            summary: type.summary,
         }));
     }
-    processDateTimeSchemaFromSdkType(type, name, rfc1123) {
+    processDateTimeSchema(type, name, rfc1123) {
         var _a;
-        return this.codeModel.schemas.add(new DateTimeSchema(name, (_a = type.details) !== null && _a !== void 0 ? _a : "", {
-            summary: type.description,
+        return this.codeModel.schemas.add(new DateTimeSchema(name, (_a = type.doc) !== null && _a !== void 0 ? _a : "", {
+            summary: type.summary,
             format: rfc1123 ? "date-time-rfc1123" : "date-time",
         }));
     }
-    processDateSchemaFromSdkType(type, name) {
+    processDateSchema(type, name) {
         var _a;
-        return this.codeModel.schemas.add(new DateSchema(name, (_a = type.details) !== null && _a !== void 0 ? _a : "", {
-            summary: type.description,
+        return this.codeModel.schemas.add(new DateSchema(name, (_a = type.doc) !== null && _a !== void 0 ? _a : "", {
+            summary: type.summary,
         }));
     }
-    processTimeSchemaFromSdkType(type, name) {
+    processTimeSchema(type, name) {
         var _a;
-        return this.codeModel.schemas.add(new TimeSchema(name, (_a = type.details) !== null && _a !== void 0 ? _a : "", {
-            summary: type.description,
+        return this.codeModel.schemas.add(new TimeSchema(name, (_a = type.doc) !== null && _a !== void 0 ? _a : "", {
+            summary: type.summary,
         }));
     }
-    processDurationSchemaFromSdkType(type, name, format = "duration-rfc3339") {
+    processDurationSchema(type, name, format = "duration-rfc3339") {
         var _a;
-        return this.codeModel.schemas.add(new DurationSchema(name, (_a = type.details) !== null && _a !== void 0 ? _a : "", {
-            summary: type.description,
+        return this.codeModel.schemas.add(new DurationSchema(name, (_a = type.doc) !== null && _a !== void 0 ? _a : "", {
+            summary: type.summary,
             format: format,
         }));
     }
-    processUrlSchemaFromSdkType(type, name) {
+    processUrlSchema(type, name) {
         var _a;
-        return this.codeModel.schemas.add(new UriSchema(name, (_a = type.details) !== null && _a !== void 0 ? _a : "", {
-            summary: type.description,
+        return this.codeModel.schemas.add(new UriSchema(name, (_a = type.doc) !== null && _a !== void 0 ? _a : "", {
+            summary: type.summary,
         }));
     }
-    processObjectSchemaFromSdkType(type, name) {
+    processObjectSchema(type, name) {
         var _a, _b;
         const rawModelType = type.__raw;
         const namespace = getNamespace(rawModelType);
-        const objectSchema = new ObjectSchema(name, (_a = type.details) !== null && _a !== void 0 ? _a : "", {
-            summary: type.description,
+        const objectSchema = new ObjectSchema(name, (_a = type.doc) !== null && _a !== void 0 ? _a : "", {
+            summary: type.summary,
             language: {
                 default: {
                     namespace: namespace,
@@ -1519,15 +1530,15 @@ export class CodeModelBuilder {
         }
         // discriminator
         if (type.discriminatedSubtypes && type.discriminatorProperty) {
-            objectSchema.discriminator = new Discriminator(this.processModelPropertyFromSdkType(type.discriminatorProperty));
+            objectSchema.discriminator = new Discriminator(this.processModelProperty(type.discriminatorProperty));
             for (const discriminatorValue in type.discriminatedSubtypes) {
                 const subType = type.discriminatedSubtypes[discriminatorValue];
-                this.processSchemaFromSdkType(subType, subType.name);
+                this.processSchema(subType, subType.name);
             }
         }
         // type is a subtype
         if (type.baseModel) {
-            const parentSchema = this.processSchemaFromSdkType(type.baseModel, type.baseModel.name);
+            const parentSchema = this.processSchema(type.baseModel, type.baseModel.name);
             objectSchema.parents = new Relations();
             objectSchema.parents.immediate.push(parentSchema);
             if (parentSchema instanceof ObjectSchema) {
@@ -1557,11 +1568,11 @@ export class CodeModelBuilder {
                     name: "string",
                     crossLanguageDefinitionId: type.crossLanguageDefinitionId,
                 },
-                description: type.description,
+                description: type.doc,
                 valueType: type.additionalProperties,
                 decorators: [],
             };
-            const parentSchema = this.processSchemaFromSdkType(sdkDictType, "Record");
+            const parentSchema = this.processSchema(sdkDictType, "Record");
             objectSchema.parents = (_b = objectSchema.parents) !== null && _b !== void 0 ? _b : new Relations();
             objectSchema.parents.immediate.push(parentSchema);
             pushDistinct(objectSchema.parents.all, parentSchema);
@@ -1570,7 +1581,7 @@ export class CodeModelBuilder {
         // properties
         for (const prop of type.properties) {
             if (prop.kind === "property" && !prop.discriminator) {
-                objectSchema.addProperty(this.processModelPropertyFromSdkType(prop));
+                objectSchema.addProperty(this.processModelProperty(prop));
             }
         }
         return objectSchema;
@@ -1593,7 +1604,7 @@ export class CodeModelBuilder {
         }
         return type;
     }
-    processModelPropertyFromSdkType(prop) {
+    processModelProperty(prop) {
         var _a;
         let nullable = false;
         let nonNullType = prop.type;
@@ -1621,22 +1632,22 @@ export class CodeModelBuilder {
         if (prop.kind === "property" && prop.multipartOptions) {
             // TODO: handle MultipartOptions.isMulti
             if (prop.multipartOptions.isFilePart) {
-                schema = this.processMultipartFormDataFilePropertySchemaFromSdkType(prop);
+                schema = this.processMultipartFormDataFilePropertySchema(prop);
             }
             else if (prop.type.kind === "model" &&
                 prop.type.properties.some((it) => it.kind === "body")) {
                 // TODO: this is HttpPart of non-File. TCGC should help handle this.
-                schema = this.processSchemaFromSdkType(prop.type.properties.find((it) => it.kind === "body").type, "");
+                schema = this.processSchema(prop.type.properties.find((it) => it.kind === "body").type, "");
             }
             else {
-                schema = this.processSchemaFromSdkType(nonNullType, "");
+                schema = this.processSchema(nonNullType, "");
             }
         }
         else {
-            schema = this.processSchemaFromSdkType(nonNullType, "");
+            schema = this.processSchema(nonNullType, "");
         }
-        return new Property(prop.name, (_a = prop.details) !== null && _a !== void 0 ? _a : "", schema, {
-            summary: prop.description,
+        return new Property(prop.name, (_a = prop.doc) !== null && _a !== void 0 ? _a : "", schema, {
+            summary: prop.summary,
             required: !prop.optional,
             nullable: nullable,
             readOnly: this.isReadOnly(prop),
@@ -1644,7 +1655,7 @@ export class CodeModelBuilder {
             extensions: extensions,
         });
     }
-    processUnionSchemaFromSdkType(type, name) {
+    processUnionSchema(type, name) {
         var _a, _b;
         if (!(type.__raw && type.__raw.kind === "Union")) {
             throw new Error(`Invalid type for union: '${type.kind}'.`);
@@ -1653,18 +1664,18 @@ export class CodeModelBuilder {
         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.details) !== null && _b !== void 0 ? _b : "", {
-            summary: type.description,
+        const unionSchema = new OrSchema(baseName + "Base", (_b = type.doc) !== null && _b !== void 0 ? _b : "", {
+            summary: type.summary,
         });
         unionSchema.anyOf = [];
-        type.values.forEach((it) => {
+        type.variantTypes.forEach((it) => {
             var _a, _b;
             const variantName = this.getUnionVariantName(it.__raw, { depth: 0 });
             const modelName = variantName + baseName;
             const propertyName = "value";
             // these ObjectSchema is not added to codeModel.schemas
-            const objectSchema = new ObjectSchema(modelName, (_a = it.details) !== null && _a !== void 0 ? _a : "", {
-                summary: it.description,
+            const objectSchema = new ObjectSchema(modelName, (_a = it.doc) !== null && _a !== void 0 ? _a : "", {
+                summary: it.summary,
                 language: {
                     default: {
                         namespace: namespace,
@@ -1674,9 +1685,9 @@ export class CodeModelBuilder {
                     },
                 },
             });
-            const variantSchema = this.processSchemaFromSdkType(it, variantName);
-            objectSchema.addProperty(new Property(propertyName, (_b = type.details) !== null && _b !== void 0 ? _b : "", variantSchema, {
-                summary: type.description,
+            const variantSchema = this.processSchema(it, variantName);
+            objectSchema.addProperty(new Property(propertyName, (_b = type.doc) !== null && _b !== void 0 ? _b : "", variantSchema, {
+                summary: type.summary,
                 required: true,
                 readOnly: false,
             }));
@@ -1684,10 +1695,10 @@ export class CodeModelBuilder {
         });
         return this.codeModel.schemas.add(unionSchema);
     }
-    processBinarySchemaFromSdkType(type) {
+    processBinarySchema(type) {
         var _a;
-        return this.codeModel.schemas.add(new BinarySchema((_a = type.description) !== null && _a !== void 0 ? _a : "", {
-            summary: type.details,
+        return this.codeModel.schemas.add(new BinarySchema((_a = type.doc) !== null && _a !== void 0 ? _a : "", {
+            summary: type.summary,
         }));
     }
     getUnionVariantName(type, option) {
@@ -1751,9 +1762,9 @@ export class CodeModelBuilder {
                 throw new Error(`Unrecognized type for union variable: '${type.kind}'.`);
         }
     }
-    processMultipartFormDataFilePropertySchemaFromSdkType(property) {
+    processMultipartFormDataFilePropertySchema(property) {
         var _a, _b, _c, _d;
-        const processSchemaFunc = (type) => this.processSchemaFromSdkType(type, "");
+        const processSchemaFunc = (type) => this.processSchema(type, "");
         if (property.type.kind === "bytes" || property.type.kind === "model") {
             const namespace = property.type.kind === "model"
                 ? ((_a = getNamespace(property.type.__raw)) !== null && _a !== void 0 ? _a : this.namespace)
@@ -1766,7 +1777,7 @@ export class CodeModelBuilder {
                 ? ((_c = getNamespace(property.type.valueType.__raw)) !== null && _c !== void 0 ? _c : this.namespace)
                 : this.namespace;
             return new ArraySchema(property.name, (_d = property.details) !== null && _d !== void 0 ? _d : "", getFileDetailsSchema(property, namespace, this.getJavaNamespace(namespace), this.codeModel.schemas, this.binarySchema, this.stringSchema, processSchemaFunc), {
-                summary: property.description,
+                summary: property.summary,
             });
         }
         else {
@@ -1936,7 +1947,7 @@ export class CodeModelBuilder {
     }
     subscriptionIdParameter(parameter) {
         if (!this._subscriptionParameter) {
-            const description = parameter.description;
+            const description = parameter.doc;
             this._subscriptionParameter = new Parameter("subscriptionId", description ? description : "The ID of the target subscription.", this.stringSchema, {
                 implementation: ImplementationLocation.Client,
                 required: true,