@azure-tools/typespec-java 0.11.2 → 0.12.0

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

@@ -20,6 +20,7 @@ export declare class CodeModelBuilder {
     private isInternal;
     private processModels;
     private processSchemaUsage;
+    private deduplicateSchemaName;
     private resolveSchemaUsage;
     private processClients;
     private needToSkipProcessingOperation;
@@ -43,6 +44,7 @@ export declare class CodeModelBuilder {
     private processByteArraySchema;
     private processIntegerSchema;
     private processNumberSchema;
+    private processDecimalSchema;
     private processBooleanSchema;
     private processArraySchema;
     private processDictionarySchema;

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":"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"}
+{"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

@@ -3,11 +3,11 @@ import { getResourceOperation, getSegment } from "@typespec/rest";
 import { getAuthentication, getServers, getStatusCodeDescription, getHttpOperation, getQueryParamOptions, getHeaderFieldOptions, } from "@typespec/http";
 import { getAddedOnVersions, getVersion } from "@typespec/versioning";
 import { isPollingLocation, getPagedResult, isFixed, getLroMetadata } from "@azure-tools/typespec-azure-core";
-import { listClients, listOperationGroups, listOperationsInOperationGroup, isApiVersion, shouldGenerateConvenient, createSdkContext, shouldGenerateProtocol, isInternal, } from "@azure-tools/typespec-client-generator-core";
+import { listClients, listOperationGroups, listOperationsInOperationGroup, isApiVersion, shouldGenerateConvenient, createSdkContext, shouldGenerateProtocol, isInternal, getCrossLanguageDefinitionId, } from "@azure-tools/typespec-client-generator-core";
 import { fail } from "assert";
 import { AnySchema, ArraySchema, BinaryResponse, BinarySchema, BooleanSchema, ByteArraySchema, ChoiceValue, DateTimeSchema, DateSchema, DictionarySchema, Discriminator, HttpHeader, HttpParameter, ImplementationLocation, NumberSchema, ObjectSchema, Parameter, ParameterLocation, Property, Relations, Response, SchemaResponse, SchemaType, StringSchema, TimeSchema, Security, OAuth2SecurityScheme, KeySecurityScheme, OperationGroup, UriSchema, VirtualParameter, GroupSchema, GroupProperty, ApiVersion, SerializationStyle, Metadata, UnixTimeSchema, Language, } from "@autorest/codemodel";
 import { CodeModel } from "./common/code-model.js";
-import { Client as CodeModelClient } from "./common/client.js";
+import { Client as CodeModelClient, ObjectScheme } from "./common/client.js";
 import { ConvenienceApi, Operation as CodeModelOperation, Request } from "./common/operation.js";
 import { SchemaContext } from "./common/schemas/usage.js";
 import { ChoiceSchema, SealedChoiceSchema } from "./common/schemas/choice.js";
@@ -86,6 +86,7 @@ export class CodeModelBuilder {
         if (this.options.namer) {
             this.codeModel = new PreNamer(this.codeModel).init().process();
         }
+        this.deduplicateSchemaName();
         return this.codeModel;
     }
     processHost(server) {
@@ -180,7 +181,7 @@ export class CodeModelBuilder {
                             const keyScheme = new KeySecurityScheme({
                                 name: "authorization",
                             });
-                            keyScheme.prefix = schemeOrApiKeyPrefix; // TODO (weidxu): modify KeySecurityScheme, after design stable
+                            keyScheme.prefix = schemeOrApiKeyPrefix; // TODO: modify KeySecurityScheme, after design stable
                             securitySchemes.push(keyScheme);
                         }
                         break;
@@ -250,7 +251,7 @@ export class CodeModelBuilder {
         }
     }
     processSchemaUsage() {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
+        var _a, _b, _c, _d, _e, _f, _g;
         (_a = this.codeModel.schemas.objects) === null || _a === void 0 ? void 0 : _a.forEach((it) => this.propagateSchemaUsage(it));
         // post process for schema usage
         (_b = this.codeModel.schemas.objects) === null || _b === void 0 ? void 0 : _b.forEach((it) => this.resolveSchemaUsage(it));
@@ -259,13 +260,16 @@ export class CodeModelBuilder {
         (_e = this.codeModel.schemas.sealedChoices) === null || _e === void 0 ? void 0 : _e.forEach((it) => this.resolveSchemaUsage(it));
         (_f = this.codeModel.schemas.ors) === null || _f === void 0 ? void 0 : _f.forEach((it) => this.resolveSchemaUsage(it));
         (_g = this.codeModel.schemas.constants) === null || _g === void 0 ? void 0 : _g.forEach((it) => this.resolveSchemaUsage(it));
+    }
+    deduplicateSchemaName() {
+        var _a, _b, _c, _d, _e, _f;
         // deduplicate model name
         const nameCount = new Map();
         const deduplicateName = (schema) => {
-            var _a;
+            var _a, _b;
             const name = schema.language.default.name;
             // skip models under "com.azure.core."
-            if (schema.language.default.name && ((_a = schema.language.default.namespace) === null || _a === void 0 ? void 0 : _a.startsWith("com.azure.core."))) {
+            if (name && !((_b = (_a = schema.language.java) === null || _a === void 0 ? void 0 : _a.namespace) === null || _b === void 0 ? void 0 : _b.startsWith("com.azure.core."))) {
                 if (!nameCount.has(name)) {
                     nameCount.set(name, 1);
                 }
@@ -276,11 +280,12 @@ export class CodeModelBuilder {
                 }
             }
         };
-        (_h = this.codeModel.schemas.objects) === null || _h === void 0 ? void 0 : _h.forEach((it) => deduplicateName(it));
-        (_j = this.codeModel.schemas.groups) === null || _j === void 0 ? void 0 : _j.forEach((it) => deduplicateName(it)); // it has RequestConditions
-        (_k = this.codeModel.schemas.choices) === null || _k === void 0 ? void 0 : _k.forEach((it) => deduplicateName(it));
-        (_l = this.codeModel.schemas.sealedChoices) === null || _l === void 0 ? void 0 : _l.forEach((it) => deduplicateName(it));
-        (_m = this.codeModel.schemas.ors) === null || _m === void 0 ? void 0 : _m.forEach((it) => deduplicateName(it));
+        (_a = this.codeModel.schemas.objects) === null || _a === void 0 ? void 0 : _a.forEach((it) => deduplicateName(it));
+        (_b = this.codeModel.schemas.groups) === null || _b === void 0 ? void 0 : _b.forEach((it) => deduplicateName(it)); // it may contain RequestConditions under "com.azure.core."
+        (_c = this.codeModel.schemas.choices) === null || _c === void 0 ? void 0 : _c.forEach((it) => deduplicateName(it));
+        (_d = this.codeModel.schemas.sealedChoices) === null || _d === void 0 ? void 0 : _d.forEach((it) => deduplicateName(it));
+        (_e = this.codeModel.schemas.ors) === null || _e === void 0 ? void 0 : _e.forEach((it) => deduplicateName(it));
+        (_f = this.codeModel.schemas.constants) === null || _f === void 0 ? void 0 : _f.forEach((it) => deduplicateName(it));
     }
     resolveSchemaUsage(schema) {
         if (schema instanceof ObjectSchema ||
@@ -311,6 +316,7 @@ export class CodeModelBuilder {
                 // at present, use global security definition
                 security: this.codeModel.security,
             });
+            codeModelClient.crossLanguageDefinitionId = client.crossLanguageDefinitionId;
             // versioning
             const versioning = getVersion(this.program, client.service);
             if (versioning && versioning.getVersions()) {
@@ -345,7 +351,7 @@ export class CodeModelBuilder {
             codeModelClient.addGlobalParameters(hostParameters);
             const clientContext = new ClientContext(baseUri, hostParameters, codeModelClient.globalParameters, codeModelClient.apiVersions);
             clientContext.preProcessOperations(this.sdkContext, client);
-            const operationGroups = listOperationGroups(this.sdkContext, client);
+            const operationGroups = listOperationGroups(this.sdkContext, client, true);
             const operationWithoutGroup = listOperationsInOperationGroup(this.sdkContext, client);
             let codeModelGroup = new OperationGroup("");
             for (const operation of operationWithoutGroup) {
@@ -358,13 +364,26 @@ export class CodeModelBuilder {
             }
             for (const operationGroup of operationGroups) {
                 const operations = listOperationsInOperationGroup(this.sdkContext, operationGroup);
-                codeModelGroup = new OperationGroup(operationGroup.type.name);
-                for (const operation of operations) {
-                    if (!this.needToSkipProcessingOperation(operation, clientContext)) {
-                        codeModelGroup.addOperation(this.processOperation(operationGroup.type.name, operation, clientContext));
+                // operation group with no operation is skipped
+                if (operations.length > 0) {
+                    const groupPath = operationGroup.groupPath.split(".");
+                    let oprationGroupName;
+                    if (groupPath.length > 1) {
+                        // groupPath should be in format of "OpenAIClient.Chat.Completions"
+                        oprationGroupName = groupPath.slice(1).join("");
+                    }
+                    else {
+                        // protection
+                        oprationGroupName = operationGroup.type.name;
                     }
+                    codeModelGroup = new OperationGroup(oprationGroupName);
+                    for (const operation of operations) {
+                        if (!this.needToSkipProcessingOperation(operation, clientContext)) {
+                            codeModelGroup.addOperation(this.processOperation(oprationGroupName, operation, clientContext));
+                        }
+                    }
+                    codeModelClient.operationGroups.push(codeModelGroup);
                 }
-                codeModelClient.operationGroups.push(codeModelGroup);
             }
             this.codeModel.clients.push(codeModelClient);
         }
@@ -411,10 +430,6 @@ export class CodeModelBuilder {
             this.trace(`Operation '${operation.name}' is temporary skipped, as it is an overloaded operation`);
             return true;
         }
-        else if (clientContext.ignoredOperations.has(operation)) {
-            this.trace(`Operation '${operation.name}' is skipped, as it is used in '@pollingOperation' of a long running operation`);
-            return true;
-        }
         return false;
     }
     processOperation(groupName, operation, clientContext) {
@@ -433,9 +448,11 @@ export class CodeModelBuilder {
                     : undefined,
             },
         });
+        codeModelOperation.crossLanguageDefinitionId = getCrossLanguageDefinitionId(operation);
         codeModelOperation.internalApi = this.isInternal(this.sdkContext, operation);
         const convenienceApiName = this.getConvenienceApiName(operation);
         let generateConvenienceApi = Boolean(convenienceApiName);
+        const generateProtocolApi = shouldGenerateProtocol(this.sdkContext, operation);
         let apiComment = undefined;
         if (generateConvenienceApi) {
             // check if the convenience API need to be disabled for some special cases
@@ -446,10 +463,9 @@ export class CodeModelBuilder {
                 this.logWarning(apiComment);
             }
             else if (operationIsMultipart(op)) {
-                // do not generate convenience method for multipart/form-data
-                generateConvenienceApi = false;
-                // make it internal
+                // do not generate protocol method for multipart/form-data, as it be very hard for user to prepare the request body as BinaryData
                 codeModelOperation.internalApi = true;
+                generateConvenienceApi = false;
                 apiComment = `Protocol API requires serialization of parts with content-disposition and data, as operation '${op.operation.name}' is 'multipart/form-data'`;
                 this.logWarning(apiComment);
             }
@@ -480,8 +496,7 @@ export class CodeModelBuilder {
             codeModelOperation.language.java.comment = apiComment;
         }
         // check for generating protocol api or not
-        codeModelOperation.generateProtocolApi =
-            shouldGenerateProtocol(this.sdkContext, operation) && !codeModelOperation.internalApi;
+        codeModelOperation.generateProtocolApi = generateProtocolApi && !codeModelOperation.internalApi;
         codeModelOperation.addRequest(new Request({
             protocol: {
                 http: {
@@ -597,8 +612,12 @@ export class CodeModelBuilder {
                 }
             }
             // finalSchema
-            if (verb !== "delete" && lroMetadata.logicalResult) {
-                const finalResult = useNewPollStrategy ? lroMetadata.logicalResult : lroMetadata.envelopeResult;
+            if (verb !== "delete" &&
+                lroMetadata.finalResult &&
+                lroMetadata.finalEnvelopeResult &&
+                lroMetadata.finalResult !== "void" &&
+                lroMetadata.finalEnvelopeResult !== "void") {
+                const finalResult = useNewPollStrategy ? lroMetadata.finalResult : lroMetadata.finalEnvelopeResult;
                 const finalType = this.findResponseBody(finalResult);
                 finalSchema = this.processSchema(finalType, "finalResult");
             }
@@ -948,6 +967,9 @@ export class CodeModelBuilder {
         if (operationIsJsonMergePatch(httpOperation)) {
             this.trackSchemaUsage(schema, { usage: [SchemaContext.JsonMergePatch] });
         }
+        if (op.convenienceApi && operationIsMultipart(httpOperation)) {
+            this.trackSchemaUsage(schema, { usage: [SchemaContext.MultipartFormData] });
+        }
         if (!schema.language.default.name && schema instanceof ObjectSchema) {
             // anonymous model
             // name the schema for documentation
@@ -962,8 +984,9 @@ export class CodeModelBuilder {
                 const request = new Request();
                 request.parameters = [];
                 op.convenienceApi.requests.push(request);
-                for (const [key, _] of parameters.properties) {
-                    const existParameter = op.parameters.find((it) => it.language.default.serializedName === key);
+                for (const [_, opParameter] of parameters.properties) {
+                    const serializedName = this.getSerializedName(opParameter);
+                    const existParameter = op.parameters.find((it) => it.language.default.serializedName === serializedName);
                     if (existParameter) {
                         // parameter
                         if (existParameter.implementation === ImplementationLocation.Method &&
@@ -973,7 +996,7 @@ export class CodeModelBuilder {
                     }
                     else {
                         // property from anonymous model
-                        const existBodyProperty = (_c = schema.properties) === null || _c === void 0 ? void 0 : _c.find((it) => it.serializedName === key);
+                        const existBodyProperty = (_c = schema.properties) === null || _c === void 0 ? void 0 : _c.find((it) => it.serializedName === serializedName);
                         if (existBodyProperty) {
                             request.parameters.push(new VirtualParameter(existBodyProperty.language.default.name, existBodyProperty.language.default.description, existBodyProperty.schema, {
                                 originalParameter: parameter,
@@ -1291,7 +1314,7 @@ export class CodeModelBuilder {
             }
             if (scalarName.startsWith("decimal")) {
                 // decimal
-                return this.processNumberSchema(type, nameHint);
+                return this.processDecimalSchema(type, nameHint);
             }
             else if (scalarName.startsWith("int") || scalarName.startsWith("uint") || scalarName === "safeint") {
                 // integer
@@ -1375,6 +1398,12 @@ export class CodeModelBuilder {
             summary: this.getSummary(type),
         }));
     }
+    processDecimalSchema(type, name) {
+        // "Infinity" maps to "BigDecimal" in Java
+        return this.codeModel.schemas.add(new NumberSchema(name, this.getDoc(type), SchemaType.Number, Infinity, {
+            summary: this.getSummary(type),
+        }));
+    }
     processBooleanSchema(type, name) {
         return this.codeModel.schemas.add(new BooleanSchema(name, this.getDoc(type), {
             summary: this.getSummary(type),
@@ -1409,36 +1438,22 @@ export class CodeModelBuilder {
             : this.stringSchema;
         const choices = [];
         type.members.forEach((it) => { var _a; return choices.push(new ChoiceValue(it.name, this.getDoc(it), (_a = it.value) !== null && _a !== void 0 ? _a : it.name)); });
-        if (sealed) {
-            return this.codeModel.schemas.add(new SealedChoiceSchema(name, this.getDoc(type), {
-                summary: this.getSummary(type),
-                choiceType: valueType,
-                choices: choices,
-                language: {
-                    default: {
-                        namespace: namespace,
-                    },
-                    java: {
-                        namespace: getJavaNamespace(namespace),
-                    },
+        const schemaType = sealed ? SealedChoiceSchema : ChoiceSchema;
+        const schema = new schemaType(name, this.getDoc(type), {
+            summary: this.getSummary(type),
+            choiceType: valueType,
+            choices: choices,
+            language: {
+                default: {
+                    namespace: namespace,
                 },
-            }));
-        }
-        else {
-            return this.codeModel.schemas.add(new ChoiceSchema(name, this.getDoc(type), {
-                summary: this.getSummary(type),
-                choiceType: valueType,
-                choices: choices,
-                language: {
-                    default: {
-                        namespace: namespace,
-                    },
-                    java: {
-                        namespace: getJavaNamespace(namespace),
-                    },
+                java: {
+                    namespace: getJavaNamespace(namespace),
                 },
-            }));
-        }
+            },
+        });
+        schema.crossLanguageDefinitionId = getCrossLanguageDefinitionId(type);
+        return this.codeModel.schemas.add(schema);
     }
     processConstantSchemaForLiteral(type, name) {
         const valueType = type.kind === "String"
@@ -1465,6 +1480,10 @@ export class CodeModelBuilder {
     }
     processChoiceSchemaForUnion(type, variants, name) {
         // variants is Literal
+        const kindSet = new Set(variants.map((it) => it.type.kind));
+        // "choice1" | "choice2" is sealed
+        // "choice1" | "choice2" | string is extensible
+        const sealed = kindSet.size === 1;
         variants = variants.filter((it) => it.type.kind === "String" || it.type.kind === "Number" || it.type.kind === "Boolean");
         const kind = variants[0].type.kind;
         const valueType = kind === "String"
@@ -1477,7 +1496,8 @@ export class CodeModelBuilder {
         const choices = [];
         variants.forEach((it) => choices.push(new ChoiceValue(it.type.value.toString(), this.getDoc(it), it.type.value)));
         const namespace = getNamespace(type);
-        return this.codeModel.schemas.add(new ChoiceSchema(name, this.getDoc(type), {
+        const schemaType = sealed ? SealedChoiceSchema : ChoiceSchema;
+        const schema = new schemaType(name, this.getDoc(type), {
             summary: this.getSummary(type),
             choiceType: valueType,
             choices: choices,
@@ -1489,7 +1509,9 @@ export class CodeModelBuilder {
                     namespace: getJavaNamespace(namespace),
                 },
             },
-        }));
+        });
+        // schema.crossLanguageDefinitionId = getCrossLanguageDefinitionId(type);
+        return this.codeModel.schemas.add(schema);
     }
     processUnixTimeSchema(type, name) {
         return this.codeModel.schemas.add(new UnixTimeSchema(name, this.getDoc(type), {
@@ -1526,7 +1548,7 @@ export class CodeModelBuilder {
     processObjectSchema(type, name) {
         var _a, _b;
         const namespace = getNamespace(type);
-        const objectSchema = this.codeModel.schemas.add(new ObjectSchema(name, this.getDoc(type), {
+        const objectSchema = new ObjectScheme(name, this.getDoc(type), {
             summary: this.getSummary(type),
             language: {
                 default: {
@@ -1536,7 +1558,9 @@ export class CodeModelBuilder {
                     namespace: getJavaNamespace(namespace),
                 },
             },
-        }));
+        });
+        objectSchema.crossLanguageDefinitionId = getCrossLanguageDefinitionId(type);
+        this.codeModel.schemas.add(objectSchema);
         // cache this now before we accidentally recurse on this type.
         this.schemaCache.set(type, objectSchema);
         // discriminator
@@ -1544,10 +1568,33 @@ export class CodeModelBuilder {
         const discriminator = getDiscriminator(this.program, type);
         if (discriminator) {
             discriminatorPropertyName = discriminator.propertyName;
-            objectSchema.discriminator = new Discriminator(new Property(discriminatorPropertyName, discriminatorPropertyName, this.stringSchema, {
-                required: true,
-                serializedName: discriminatorPropertyName,
-            }));
+            // find the discriminator property from model
+            // the property is required for getting its serializedName
+            let discriminatorProperty = Array.from(type.properties.values()).find((it) => it.name === discriminatorPropertyName);
+            if (!discriminatorProperty) {
+                // try find the discriminator property from any of its derived models
+                for (const deriveModel of type.derivedModels) {
+                    discriminatorProperty = Array.from(deriveModel.properties.values()).find((it) => it.name === discriminatorPropertyName);
+                    if (discriminatorProperty) {
+                        // found
+                        break;
+                    }
+                }
+            }
+            if (discriminatorProperty) {
+                objectSchema.discriminator = new Discriminator(this.processModelProperty(discriminatorProperty));
+                // as we do not expose the discriminator property, its schema is fine to be just a string (and we do not want to generate an enum that not used anywhere)
+                // TODO: support enum schema, if we expose the discriminator property
+                objectSchema.discriminator.property.schema = this.stringSchema;
+            }
+            else {
+                // fallback to property name, if cannot find the discriminator property
+                objectSchema.discriminator = new Discriminator(new Property(discriminatorPropertyName, discriminatorPropertyName, this.stringSchema, {
+                    required: true,
+                    serializedName: discriminatorPropertyName,
+                }));
+            }
+            objectSchema.discriminator.propertyName = discriminatorPropertyName;
         }
         // parent
         if (type.baseModel) {
@@ -1585,7 +1632,7 @@ export class CodeModelBuilder {
         if (objectSchema.parents) {
             const parentWithDiscriminator = objectSchema.parents.all.find((it) => it instanceof ObjectSchema && it.discriminator);
             if (parentWithDiscriminator) {
-                discriminatorPropertyName = parentWithDiscriminator.discriminator.property.serializedName;
+                discriminatorPropertyName = parentWithDiscriminator.discriminator.propertyName;
                 const discriminatorProperty = Array.from(type.properties.values()).find((it) => it.name === discriminatorPropertyName && (it.type.kind === "String" || it.type.kind === "EnumMember"));
                 if (discriminatorProperty) {
                     if (discriminatorProperty.type.kind === "String") {
@@ -2047,7 +2094,7 @@ export class CodeModelBuilder {
         };
         // Exclude context that not to be propagated
         const schemaUsage = {
-            usage: (_a = schema.usage) === null || _a === void 0 ? void 0 : _a.filter((it) => it !== SchemaContext.Paged && it !== SchemaContext.Anonymous),
+            usage: (_a = schema.usage) === null || _a === void 0 ? void 0 : _a.filter((it) => it !== SchemaContext.Paged && it !== SchemaContext.Anonymous && it !== SchemaContext.MultipartFormData),
             serializationFormats: schema.serializationFormats,
         };
         // Propagate the usage of the initial schema itself