@azure-tools/typespec-java 0.10.0 → 0.11.1

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

@@ -78,6 +78,8 @@ export declare class CodeModelBuilder {
     get stringSchema(): StringSchema;
     private _integerSchema?;
     get integerSchema(): NumberSchema;
+    private _doubleSchema?;
+    get doubleSchema(): NumberSchema;
     private _booleanSchema?;
     get booleanSchema(): BooleanSchema;
     private _anySchema?;
@@ -91,6 +93,7 @@ export declare class CodeModelBuilder {
     get apiVersionParameterInPath(): Parameter;
     private propagateSchemaUsage;
     private trackSchemaUsage;
+    private isArmLongRunningOperation;
     private isSchemaUsageEmpty;
 }
 //# sourceMappingURL=code-model-builder.d.ts.map

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

@@ -16,12 +16,13 @@ import { OrSchema } from "./common/schemas/relationship.js";
 import { LongRunningMetadata } from "./common/long-running-metadata.js";
 import { DurationSchema } from "./common/schemas/time.js";
 import { PreNamer } from "./prenamer/prenamer.js";
-import { createPollResultSchema } from "./external-schemas.js";
+import { createPollOperationDetailsSchema } from "./external-schemas.js";
 import { ClientContext } from "./models.js";
 import { stringArrayContainsIgnoreCase, getJavaNamespace, getNamespace, pascalCase, logWarning, trace, } from "./utils.js";
-import { ProcessingCache, isModelReferredInTemplate, pushDistinct, modelContainsDerivedModel, getNameForTemplate, getDurationFormat, hasScalarAsBase, isNullableType, isSameLiteralTypes, getAccess, getUsage, unionReferredByType, getUnionName, modelIs, } from "./type-utils.js";
-import { getClientApiVersions, getServiceVersion, operationIsJsonMergePatch, isPayloadProperty, ORIGIN_API_VERSION, SPECIAL_HEADER_NAMES, loadExamples, isLroNewPollingStrategy, operationIsMultipleContentTypes, cloneOperationParameter, operationRefersUnion, operationIsMultipart, isKnownContentType, CONTENT_TYPE_KEY, } from "./operation-utils.js";
+import { ProcessingCache, isModelReferredInTemplate, pushDistinct, modelContainsDerivedModel, getNameForTemplate, getDurationFormat, hasScalarAsBase, isNullableType, isSameLiteralTypes, getAccess, getUsage, getUnionDescription, modelIs, getModelNameForProperty, isAllValueInteger, } from "./type-utils.js";
+import { getClientApiVersions, getServiceVersion, operationIsJsonMergePatch, isPayloadProperty, ORIGIN_API_VERSION, SPECIAL_HEADER_NAMES, loadExamples, isLroNewPollingStrategy, operationIsMultipleContentTypes, cloneOperationParameter, operationIsMultipart, isKnownContentType, CONTENT_TYPE_KEY, } from "./operation-utils.js";
 import pkg from "lodash";
+import { getExtensions } from "@typespec/openapi";
 const { isEqual } = pkg;
 export class CodeModelBuilder {
     constructor(program1, context) {
@@ -34,7 +35,7 @@ export class CodeModelBuilder {
         if (this.options["skip-special-headers"]) {
             this.options["skip-special-headers"].forEach((it) => SPECIAL_HEADER_NAMES.add(it.toLowerCase()));
         }
-        this.sdkContext = createSdkContext(context);
+        this.sdkContext = createSdkContext(context, "@azure-tools/typespec-java");
         const service = listServices(this.program)[0];
         const serviceNamespace = service.type;
         if (serviceNamespace === undefined) {
@@ -166,17 +167,21 @@ export class CodeModelBuilder {
                         break;
                     case "http":
                         {
-                            const schemeOrApiKeyPrefix = scheme.scheme;
+                            let schemeOrApiKeyPrefix = scheme.scheme;
                             if (schemeOrApiKeyPrefix === "basic" || schemeOrApiKeyPrefix === "bearer") {
-                                this.logWarning(`{scheme.scheme} auth method is currently not supported.`);
-                            }
-                            else {
-                                const keyScheme = new KeySecurityScheme({
-                                    name: "authorization",
-                                });
-                                keyScheme.prefix = schemeOrApiKeyPrefix; // TODO (weidxu): modify KeySecurityScheme, after design stable
-                                securitySchemes.push(keyScheme);
+                                // HTTP Authentication should use "Basic token" or "Bearer token"
+                                schemeOrApiKeyPrefix = pascalCase(schemeOrApiKeyPrefix);
+                                if (!(this.options.branded === false)) {
+                                    // Azure would not allow BasicAuth or BearerAuth
+                                    this.logWarning(`{scheme.scheme} auth method is currently not supported.`);
+                                    continue;
+                                }
                             }
+                            const keyScheme = new KeySecurityScheme({
+                                name: "authorization",
+                            });
+                            keyScheme.prefix = schemeOrApiKeyPrefix; // TODO (weidxu): modify KeySecurityScheme, after design stable
+                            securitySchemes.push(keyScheme);
                         }
                         break;
                 }
@@ -207,11 +212,14 @@ export class CodeModelBuilder {
             // lambda to mark model as public
             const modelAsPublic = (model) => {
                 // check it does not contain Union
-                const union = unionReferredByType(this.program, model, this.typeUnionRefCache);
-                if (union) {
-                    const errorMsg = `Model '${getTypeName(model, this.typeNameOptions)}' cannot be set as access=public, as it refers Union '${getUnionName(union, this.typeNameOptions)}'`;
-                    throw new Error(errorMsg);
-                }
+                // const union = unionReferredByType(this.program, model, this.typeUnionRefCache);
+                // if (union) {
+                //   const errorMsg = `Model '${getTypeName(
+                //     model,
+                //     this.typeNameOptions,
+                //   )}' cannot be set as access=public, as it refers Union '${getUnionDescription(union, this.typeNameOptions)}'`;
+                //   throw new Error(errorMsg);
+                // }
                 const schema = this.processSchema(model, model.name);
                 this.trackSchemaUsage(schema, {
                     usage: [SchemaContext.Public],
@@ -242,7 +250,7 @@ export class CodeModelBuilder {
         }
     }
     processSchemaUsage() {
-        var _a, _b, _c, _d, _e, _f, _g;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
         (_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));
@@ -251,6 +259,28 @@ 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));
+        // deduplicate model name
+        const nameCount = new Map();
+        const deduplicateName = (schema) => {
+            var _a;
+            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 (!nameCount.has(name)) {
+                    nameCount.set(name, 1);
+                }
+                else {
+                    const count = nameCount.get(name);
+                    nameCount.set(name, count + 1);
+                    schema.language.default.name = name + count;
+                }
+            }
+        };
+        (_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));
     }
     resolveSchemaUsage(schema) {
         if (schema instanceof ObjectSchema ||
@@ -273,6 +303,9 @@ export class CodeModelBuilder {
         var _a;
         const clients = listClients(this.sdkContext);
         for (const client of clients) {
+            if (client.arm) {
+                this.codeModel.arm = true;
+            }
             const codeModelClient = new CodeModelClient(client.name, this.getDoc(client.type), {
                 summary: this.getSummary(client.type),
                 // at present, use global security definition
@@ -402,7 +435,7 @@ export class CodeModelBuilder {
         });
         codeModelOperation.internalApi = this.isInternal(this.sdkContext, operation);
         const convenienceApiName = this.getConvenienceApiName(operation);
-        let generateConvenienceApi = !!convenienceApiName;
+        let generateConvenienceApi = Boolean(convenienceApiName);
         let apiComment = undefined;
         if (generateConvenienceApi) {
             // check if the convenience API need to be disabled for some special cases
@@ -427,15 +460,17 @@ export class CodeModelBuilder {
                 apiComment = `Convenience API is not generated, as operation '${op.operation.name}' is multiple content-type`;
                 this.logWarning(apiComment);
             }
-            else {
-                const union = operationRefersUnion(this.program, op, this.typeUnionRefCache);
-                if (union) {
-                    // and Union
-                    generateConvenienceApi = false;
-                    apiComment = `Convenience API is not generated, as operation '${op.operation.name}' refers Union '${getUnionName(union, this.typeNameOptions)}'`;
-                    this.logWarning(apiComment);
-                }
-            }
+            // else {
+            //   const union = operationRefersUnion(this.program, op, this.typeUnionRefCache);
+            //   if (union) {
+            //     // and Union
+            //     generateConvenienceApi = false;
+            //     apiComment = `Convenience API is not generated, as operation '${
+            //       op.operation.name
+            //     }' refers Union '${getUnionDescription(union, this.typeNameOptions)}'`;
+            //     this.logWarning(apiComment);
+            //   }
+            // }
         }
         if (generateConvenienceApi && convenienceApiName) {
             codeModelOperation.convenienceApi = new ConvenienceApi(convenienceApiName);
@@ -497,7 +532,7 @@ export class CodeModelBuilder {
         // check for paged
         this.processRouteForPaged(codeModelOperation, op.responses);
         // check for long-running operation
-        this.processRouteForLongRunning(codeModelOperation, op.responses, lroMetadata);
+        this.processRouteForLongRunning(codeModelOperation, operation, op.responses, lroMetadata);
         operationGroup.addOperation(codeModelOperation);
         return codeModelOperation;
     }
@@ -563,7 +598,8 @@ export class CodeModelBuilder {
             }
             // finalSchema
             if (verb !== "delete" && lroMetadata.logicalResult) {
-                const finalType = this.findResponseBody(lroMetadata.logicalResult);
+                const finalResult = useNewPollStrategy ? lroMetadata.logicalResult : lroMetadata.envelopeResult;
+                const finalType = this.findResponseBody(finalResult);
                 finalSchema = this.processSchema(finalType, "finalResult");
             }
             // track usage
@@ -590,8 +626,8 @@ export class CodeModelBuilder {
         }
         return new LongRunningMetadata(false);
     }
-    processRouteForLongRunning(op, responses, lroMetadata) {
-        var _a, _b;
+    processRouteForLongRunning(op, operation, responses, lroMetadata) {
+        var _a, _b, _c;
         if (lroMetadata.longRunning) {
             op.extensions = (_a = op.extensions) !== null && _a !== void 0 ? _a : {};
             op.extensions["x-ms-long-running-operation"] = true;
@@ -608,6 +644,10 @@ export class CodeModelBuilder {
                 }
             }
         }
+        if (this.isArmLongRunningOperation(this.program, operation)) {
+            op.extensions = (_c = op.extensions) !== null && _c !== void 0 ? _c : {};
+            op.extensions["x-ms-long-running-operation"] = true;
+        }
     }
     processParameter(op, param, clientContext) {
         var _a;
@@ -1186,7 +1226,7 @@ export class CodeModelBuilder {
             case "Enum":
                 return this.processChoiceSchema(type, this.getName(type), isFixed(this.program, type));
             case "Union":
-                return this.processUnionSchema(type, nameHint);
+                return this.processUnionSchema(type, this.getName(type, nameHint));
             case "ModelProperty": {
                 let schema = undefined;
                 const knownValues = getKnownValues(this.program, type);
@@ -1195,7 +1235,8 @@ export class CodeModelBuilder {
                     schema = this.processChoiceSchema(knownValues, this.getName(knownValues), false);
                 }
                 else {
-                    schema = this.processSchema(type.type, nameHint + "Model");
+                    const schemaNameHint = pascalCase(getModelNameForProperty(type)) + pascalCase(nameHint);
+                    schema = this.processSchema(type.type, schemaNameHint);
                 }
                 return this.applyModelPropertyDecorators(type, nameHint, schema);
             }
@@ -1244,6 +1285,8 @@ export class CodeModelBuilder {
                     return this.processDurationSchema(type, nameHint);
                 case "url":
                     return this.processUrlSchema(type, nameHint);
+                case "decimal":
+                    return this.processNumberSchema(type, nameHint);
             }
             if (scalarName.startsWith("int") || scalarName.startsWith("uint") || scalarName === "safeint") {
                 // integer
@@ -1354,7 +1397,11 @@ export class CodeModelBuilder {
     }
     processChoiceSchema(type, name, sealed) {
         const namespace = getNamespace(type);
-        const valueType = typeof type.members.values().next().value.value === "number" ? this.integerSchema : this.stringSchema;
+        const valueType = typeof type.members.values().next().value.value === "number"
+            ? isAllValueInteger(Array.from(type.members.values()).map((it) => it.value))
+                ? this.integerSchema
+                : this.doubleSchema
+            : 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) {
@@ -1389,7 +1436,13 @@ export class CodeModelBuilder {
         }
     }
     processConstantSchemaForLiteral(type, name) {
-        const valueType = type.kind === "String" ? this.stringSchema : type.kind === "Boolean" ? this.booleanSchema : this.integerSchema;
+        const valueType = type.kind === "String"
+            ? this.stringSchema
+            : type.kind === "Boolean"
+                ? this.booleanSchema
+                : isAllValueInteger([type.value])
+                    ? this.integerSchema
+                    : this.doubleSchema;
         return this.codeModel.schemas.add(new ConstantSchema(name, this.getDoc(type), {
             summary: this.getSummary(type),
             valueType: valueType,
@@ -1398,7 +1451,7 @@ export class CodeModelBuilder {
     }
     processConstantSchemaForEnumMember(type, name) {
         var _a;
-        const valueType = this.processChoiceSchema(type.enum, this.getName(type.enum), isFixed(this.program, type.enum));
+        const valueType = this.processSchema(type.enum, this.getName(type.enum));
         return this.codeModel.schemas.add(new ConstantSchema(name, this.getDoc(type), {
             summary: this.getSummary(type),
             valueType: valueType,
@@ -1406,8 +1459,16 @@ export class CodeModelBuilder {
         }));
     }
     processChoiceSchemaForUnion(type, variants, name) {
+        // variants is Literal
+        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" ? this.stringSchema : kind === "Boolean" ? this.booleanSchema : this.integerSchema;
+        const valueType = kind === "String"
+            ? this.stringSchema
+            : kind === "Boolean"
+                ? this.booleanSchema
+                : isAllValueInteger(variants.map((it) => it.type.value))
+                    ? this.integerSchema
+                    : this.doubleSchema;
         const choices = [];
         variants.forEach((it) => choices.push(new ChoiceValue(it.type.value.toString(), this.getDoc(it), it.type.value)));
         const namespace = getNamespace(type);
@@ -1681,13 +1742,15 @@ export class CodeModelBuilder {
         }
         // TODO: name from typespec-client-generator-core
         const namespace = getNamespace(type);
-        const unionSchema = new OrSchema(pascalCase(name) + "Base", this.getDoc(type), {
+        const baseName = pascalCase(name) + "Model";
+        this.logWarning(`Convert TypeSpec Union '${getUnionDescription(type, this.typeNameOptions)}' to Class '${baseName}'`);
+        const unionSchema = new OrSchema(baseName + "Base", this.getDoc(type), {
             summary: this.getSummary(type),
         });
         unionSchema.anyOf = [];
         nonNullVariants.forEach((it) => {
             const variantName = this.getUnionVariantName(it.type, { depth: 0 });
-            const modelName = variantName + pascalCase(name);
+            const modelName = variantName + baseName;
             const propertyName = "value";
             // these ObjectSchema is not added to codeModel.schemas
             const objectSchema = new ObjectSchema(modelName, this.getDoc(type), {
@@ -1760,6 +1823,12 @@ export class CodeModelBuilder {
                 else {
                     return pascalCase(type.name);
                 }
+            case "String":
+                return pascalCase(type.value);
+            case "Number":
+                return pascalCase(type.valueAsString);
+            case "Boolean":
+                return pascalCase(type.value ? "True" : "False");
             default:
                 throw new Error(`Unrecognized type for union variable: '${type.kind}'.`);
         }
@@ -1806,15 +1875,15 @@ export class CodeModelBuilder {
             target.templateMapper.args.length > 0) {
             const tspName = getTypeName(target, this.typeNameOptions);
             const newName = getNameForTemplate(target);
-            this.logWarning(`Rename TypeSpec model '${tspName}' to '${newName}'`);
+            this.logWarning(`Rename TypeSpec Model '${tspName}' to '${newName}'`);
             return newName;
         }
-        if (!target.name && nameHint && this.options["namer"]) {
+        if (!target.name && nameHint) {
             const newName = nameHint;
-            this.logWarning(`Rename anonymous TypeSpec model to '${newName}'`);
+            this.logWarning(`Rename anonymous TypeSpec ${target.kind} to '${newName}'`);
             return newName;
         }
-        return target.name;
+        return target.name || "";
     }
     getSerializedName(target) {
         // First get projected name, if not found, return target.name
@@ -1876,6 +1945,10 @@ export class CodeModelBuilder {
         return (this._integerSchema ||
             (this._integerSchema = this.codeModel.schemas.add(new NumberSchema("integer", "simple integer", SchemaType.Integer, 64))));
     }
+    get doubleSchema() {
+        return (this._doubleSchema ||
+            (this._doubleSchema = this.codeModel.schemas.add(new NumberSchema("double", "simple float", SchemaType.Number, 64))));
+    }
     get booleanSchema() {
         return (this._booleanSchema ||
             (this._booleanSchema = this.codeModel.schemas.add(new BooleanSchema("boolean", "simple boolean"))));
@@ -1886,7 +1959,7 @@ export class CodeModelBuilder {
     }
     get pollResultSchema() {
         var _a;
-        return ((_a = this._pollResultSchema) !== null && _a !== void 0 ? _a : (this._pollResultSchema = createPollResultSchema(this.codeModel.schemas, this.stringSchema)));
+        return ((_a = this._pollResultSchema) !== null && _a !== void 0 ? _a : (this._pollResultSchema = createPollOperationDetailsSchema(this.codeModel.schemas, this.stringSchema)));
     }
     createApiVersionParameter(serializedName, parameterLocation) {
         return new Parameter(serializedName, "Version parameter", this.codeModel.schemas.add(new ConstantSchema(serializedName, "API Version", {
@@ -1993,6 +2066,10 @@ export class CodeModelBuilder {
             this.trackSchemaUsage(schema.elementType, schemaUsage);
         }
     }
+    isArmLongRunningOperation(program, op) {
+        var _a;
+        return this.codeModel.arm && Boolean((_a = getExtensions(program, op)) === null || _a === void 0 ? void 0 : _a.get("x-ms-long-running-operation"));
+    }
     isSchemaUsageEmpty(schema) {
         if (schema instanceof ObjectSchema ||
             schema instanceof GroupSchema ||