@azure-tools/typespec-java 0.12.1 → 0.12.3

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

@@ -28,6 +28,7 @@ export declare class CodeModelBuilder {
     private processRouteForPaged;
     private processLroMetadata;
     private processRouteForLongRunning;
+    private _armApiVersionParameter?;
     private processParameter;
     private addAcceptHeaderParameter;
     private processEtagHeaderParameters;
@@ -60,6 +61,8 @@ export declare class CodeModelBuilder {
     private processUrlSchema;
     private processObjectSchema;
     private getEffectiveSchemaType;
+    private dummyResourceSchema;
+    private dummyObjectSchema;
     private applyModelPropertyDecorators;
     private processModelProperty;
     private processFormatString;
@@ -93,9 +96,13 @@ export declare class CodeModelBuilder {
     get apiVersionParameter(): Parameter;
     private _apiVersionParameterInPath?;
     get apiVersionParameterInPath(): Parameter;
+    private isSubscriptionId;
+    private subscriptionIdParameter;
+    private _subscriptionParameter?;
     private propagateSchemaUsage;
     private trackSchemaUsage;
     private isArmLongRunningOperation;
+    private isArm;
     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

@@ -1,11 +1,12 @@
-import { getDoc, getEffectiveModelType, getFormat, getFriendlyName, getKnownValues, getSummary, getVisibility, ignoreDiagnostics, isArrayModelType, isRecordModelType, isUnknownType, getDiscriminator, isNeverType, listServices, getNamespaceFullName, isNullType, getTypeName, getProjectedName, getService, getEncode, getOverloadedOperation, isErrorModel, } from "@typespec/compiler";
+import { getDoc, getEffectiveModelType, getFormat, getFriendlyName, getKnownValues, getSummary, getVisibility, ignoreDiagnostics, isArrayModelType, isRecordModelType, isUnknownType, getDiscriminator, isNeverType, listServices, getNamespaceFullName, isNullType, getTypeName, getProjectedName, getEncode, getOverloadedOperation, isErrorModel, walkPropertiesInherited, getService, } from "@typespec/compiler";
 import { getResourceOperation, getSegment } from "@typespec/rest";
-import { getAuthentication, getServers, getStatusCodeDescription, getHttpOperation, getQueryParamOptions, getHeaderFieldOptions, } from "@typespec/http";
+import { getAuthentication, getServers, getStatusCodeDescription, getHttpOperation, getQueryParamOptions, getHeaderFieldOptions, isPathParam, } 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, 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 { KnownMediaType } from "@azure-tools/codegen";
 import { CodeModel } from "./common/code-model.js";
 import { Client as CodeModelClient, ObjectScheme } from "./common/client.js";
 import { ConvenienceApi, Operation as CodeModelOperation, Request } from "./common/operation.js";
@@ -21,6 +22,7 @@ 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, 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 { isArmCommonType } from "./type-utils.js";
 import pkg from "lodash";
 import { getExtensions } from "@typespec/openapi";
 const { isEqual } = pkg;
@@ -266,10 +268,14 @@ export class CodeModelBuilder {
         // deduplicate model name
         const nameCount = new Map();
         const deduplicateName = (schema) => {
-            var _a, _b;
+            var _a, _b, _c, _d;
+            // skip models under "Azure.ResourceManager"
+            if (this.isArm() && ((_b = (_a = schema.language.default) === null || _a === void 0 ? void 0 : _a.namespace) === null || _b === void 0 ? void 0 : _b.startsWith("Azure.ResourceManager"))) {
+                return;
+            }
             const name = schema.language.default.name;
             // skip models under "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 (name && !((_d = (_c = schema.language.java) === null || _c === void 0 ? void 0 : _c.namespace) === null || _d === void 0 ? void 0 : _d.startsWith("com.azure.core."))) {
                 if (!nameCount.has(name)) {
                     nameCount.set(name, 1);
                 }
@@ -337,9 +343,6 @@ export class CodeModelBuilder {
                     apiVersion.version = service.version;
                     codeModelClient.apiVersions.push(apiVersion);
                 }
-                else {
-                    throw new Error(`API version not available for client ${client.name}.`);
-                }
             }
             // server
             let baseUri = "{endpoint}";
@@ -456,13 +459,7 @@ export class CodeModelBuilder {
         let apiComment = undefined;
         if (generateConvenienceApi) {
             // check if the convenience API need to be disabled for some special cases
-            if (operationIsJsonMergePatch(op)) {
-                // do not generate convenience method for JSON Merge Patch
-                generateConvenienceApi = false;
-                apiComment = `Convenience API is not generated, as operation '${op.operation.name}' is 'application/merge-patch+json'`;
-                this.logWarning(apiComment);
-            }
-            else if (operationIsMultipart(op)) {
+            if (operationIsMultipart(op)) {
                 // 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 '${op.operation.name}' is 'multipart/form-data'`;
@@ -475,6 +472,12 @@ export class CodeModelBuilder {
                 apiComment = `Convenience API is not generated, as operation '${op.operation.name}' is multiple content-type`;
                 this.logWarning(apiComment);
             }
+            else if (operationIsJsonMergePatch(op) && !this.options["stream-style-serialization"]) {
+                // 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 '${op.operation.name}' is 'application/merge-patch+json' and stream-style-serialization is not enabled`;
+                this.logWarning(apiComment);
+            }
             // else {
             //   const union = operationRefersUnion(this.program, op, this.typeUnionRefCache);
             //   if (union) {
@@ -669,8 +672,26 @@ export class CodeModelBuilder {
     }
     processParameter(op, param, clientContext) {
         var _a;
-        if (isApiVersion(this.sdkContext, param)) {
-            const parameter = param.type === "query" ? this.apiVersionParameter : this.apiVersionParameterInPath;
+        if (clientContext.apiVersions && isApiVersion(this.sdkContext, param)) {
+            // pre-condition for "isApiVersion": the client supports ApiVersions
+            if (this.isArm()) {
+                // Currently we assume ARM tsp only have one client and one api-version.
+                // TODO: How will service define mixed api-versions(like those in Compute RP)?
+                const apiVersion = clientContext.apiVersions[0];
+                if (!this._armApiVersionParameter) {
+                    this._armApiVersionParameter = this.createApiVersionParameter("api-version", param.type === "query" ? ParameterLocation.Query : ParameterLocation.Path, apiVersion);
+                    clientContext.addGlobalParameter(this._armApiVersionParameter);
+                }
+                op.addParameter(this._armApiVersionParameter);
+            }
+            else {
+                const parameter = param.type === "query" ? this.apiVersionParameter : this.apiVersionParameterInPath;
+                op.addParameter(parameter);
+                clientContext.addGlobalParameter(parameter);
+            }
+        }
+        else if (this.isSubscriptionId(param)) {
+            const parameter = this.subscriptionIdParameter(param);
             op.addParameter(parameter);
             clientContext.addGlobalParameter(parameter);
         }
@@ -801,7 +822,7 @@ export class CodeModelBuilder {
             // parameters already include "accept" header
             return;
         }
-        const produces = new Set(["application/json"]);
+        const produces = new Set();
         for (const resp of responses) {
             if (resp.responses && resp.responses.length > 0) {
                 for (const response of resp.responses) {
@@ -809,6 +830,9 @@ export class CodeModelBuilder {
                 }
             }
         }
+        if (produces.size === 0) {
+            produces.add("application/json");
+        }
         const acceptTypes = Array.from(produces.values()).join(", ");
         const acceptSchema = ((_c = this.codeModel.schemas.constants) === null || _c === void 0 ? void 0 : _c.find((it) => it.language.default.name === "accept" && it.value.value === acceptTypes)) ||
             this.codeModel.schemas.add(new ConstantSchema("accept", `Accept: ${acceptTypes}`, {
@@ -967,7 +991,7 @@ export class CodeModelBuilder {
             this.trackSchemaUsage(schema, { usage: [SchemaContext.JsonMergePatch] });
         }
         if (op.convenienceApi && operationIsMultipart(httpOperation)) {
-            this.trackSchemaUsage(schema, { usage: [SchemaContext.MultipartFormData] });
+            this.trackSchemaUsage(schema, { serializationFormats: [KnownMediaType.Multipart] });
         }
         if (!schema.language.default.name && schema instanceof ObjectSchema) {
             // anonymous model
@@ -1097,7 +1121,7 @@ export class CodeModelBuilder {
                             statusCodes: this.getStatusCodes(resp.statusCodes),
                             headers: headers,
                             mediaTypes: responseBody.contentTypes,
-                            knownMediaType: "binary",
+                            knownMediaType: KnownMediaType.Binary,
                         },
                     },
                     language: {
@@ -1260,7 +1284,9 @@ export class CodeModelBuilder {
                     schema = this.processChoiceSchema(knownValues, this.getName(knownValues), false);
                 }
                 else {
-                    const schemaNameHint = pascalCase(getModelNameForProperty(type)) + pascalCase(nameHint);
+                    const schemaNameHint = type.type.kind === "Scalar" && this.program.checker.isStdType(type.type)
+                        ? nameHint // std scalar won't need a nameHint
+                        : pascalCase(getModelNameForProperty(type)) + pascalCase(nameHint);
                     schema = this.processSchema(type.type, schemaNameHint);
                 }
                 return this.applyModelPropertyDecorators(type, nameHint, schema);
@@ -1287,6 +1313,7 @@ export class CodeModelBuilder {
     processScalar(type, formatFromDerived, nameHint) {
         const scalarName = type.name;
         if (this.program.checker.isStdType(type)) {
+            nameHint = scalarName;
             switch (scalarName) {
                 case "string": {
                     const format = formatFromDerived !== null && formatFromDerived !== void 0 ? formatFromDerived : getFormat(this.program, type);
@@ -1547,6 +1574,18 @@ export class CodeModelBuilder {
     processObjectSchema(type, name) {
         var _a, _b;
         const namespace = getNamespace(type);
+        if ((this.isArm() &&
+            (namespace === null || namespace === void 0 ? void 0 : namespace.startsWith("Azure.ResourceManager")) &&
+            // there's ResourceListResult under Azure.ResourceManager namespace,
+            // which shouldn't be considered Resource schema parent
+            ((name === null || name === void 0 ? void 0 : name.startsWith("TrackedResource")) ||
+                (name === null || name === void 0 ? void 0 : name.startsWith("ExtensionResource")) ||
+                (name === null || name === void 0 ? void 0 : name.startsWith("ProxyResource")))) ||
+            name === "ArmResource") {
+            const objectSchema = this.dummyResourceSchema(type, name, namespace);
+            this.codeModel.schemas.add(objectSchema);
+            return objectSchema;
+        }
         const objectSchema = new ObjectScheme(name, this.getDoc(type), {
             summary: this.getSummary(type),
             language: {
@@ -1622,7 +1661,14 @@ export class CodeModelBuilder {
         else if (isRecordModelType(this.program, type)) {
             // "pure" Record processed elsewhere
             // "mixed" Record that have properties, treat the model as "additionalProperties"
-            const parentSchema = this.processDictionarySchema(type, this.getName(type));
+            /* type should have sourceModel, as
+            model Type is Record<> {
+              prop1: string
+            }
+            */
+            const parentSchema = type.sourceModel
+                ? this.processSchema(type.sourceModel, this.getName(type.sourceModel))
+                : this.processDictionarySchema(type, this.getName(type));
             objectSchema.parents = new Relations();
             objectSchema.parents.immediate.push(parentSchema);
             pushDistinct(objectSchema.parents.all, parentSchema);
@@ -1665,18 +1711,47 @@ 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 (effective.name) {
+            if (this.isArm() && ((_a = getNamespace(effective)) === null || _a === void 0 ? void 0 : _a.startsWith("Azure.ResourceManager"))) {
+                // Catalog is TrackedResource<CatalogProperties>
+                return type;
+            }
+            else if (effective.name) {
                 return effective;
             }
         }
         return type;
     }
+    dummyResourceSchema(type, name, namespace) {
+        const resourceModelName = (name === null || name === void 0 ? void 0 : name.startsWith("TrackedResource")) ? "Resource" : "ProxyResource";
+        const resource = this.dummyObjectSchema(type, resourceModelName, namespace);
+        const declaredProperties = walkPropertiesInherited(type);
+        for (const prop of declaredProperties) {
+            resource.addProperty(this.processModelProperty(prop));
+        }
+        return resource;
+    }
+    dummyObjectSchema(type, name, namespace) {
+        return new ObjectScheme(name, this.getDoc(type), {
+            summary: this.getSummary(type),
+            language: {
+                default: {
+                    name: name,
+                    namespace: namespace,
+                },
+                java: {
+                    name: name,
+                    namespace: getJavaNamespace(namespace),
+                },
+            },
+        });
+    }
     applyModelPropertyDecorators(prop, nameHint, schema) {
         // if (schema instanceof StringSchema) {
         //   const decorators = {
@@ -2012,10 +2087,10 @@ export class CodeModelBuilder {
         var _a;
         return ((_a = this._pollResultSchema) !== null && _a !== void 0 ? _a : (this._pollResultSchema = createPollOperationDetailsSchema(this.codeModel.schemas, this.stringSchema)));
     }
-    createApiVersionParameter(serializedName, parameterLocation) {
+    createApiVersionParameter(serializedName, parameterLocation, value = "") {
         return new Parameter(serializedName, "Version parameter", this.codeModel.schemas.add(new ConstantSchema(serializedName, "API Version", {
             valueType: this.stringSchema,
-            value: new ConstantValue(""),
+            value: new ConstantValue(value),
         })), {
             implementation: ImplementationLocation.Client,
             origin: ORIGIN_API_VERSION,
@@ -2039,8 +2114,34 @@ export class CodeModelBuilder {
             // TODO: hardcode as "apiVersion", as it is what we get from compiler
             (this._apiVersionParameterInPath = this.createApiVersionParameter("apiVersion", ParameterLocation.Path)));
     }
-    propagateSchemaUsage(schema) {
+    isSubscriptionId(param) {
         var _a;
+        return ("subscriptionId".toLocaleLowerCase() === ((_a = param === null || param === void 0 ? void 0 : param.name) === null || _a === void 0 ? void 0 : _a.toLocaleLowerCase()) &&
+            param.param &&
+            isArmCommonType(param.param) &&
+            isPathParam(this.program, param.param));
+    }
+    subscriptionIdParameter(parameter) {
+        if (!this._subscriptionParameter) {
+            const param = parameter.param;
+            const description = getDoc(this.program, param);
+            this._subscriptionParameter = new Parameter("subscriptionId", description ? description : "The ID of the target subscription.", this.stringSchema, {
+                implementation: ImplementationLocation.Client,
+                required: true,
+                protocol: {
+                    http: new HttpParameter(ParameterLocation.Path),
+                },
+                language: {
+                    default: {
+                        serializedName: "subscriptionId",
+                    },
+                },
+            });
+        }
+        return this._subscriptionParameter;
+    }
+    propagateSchemaUsage(schema) {
+        var _a, _b;
         const processedSchemas = new Set();
         const innerApplySchemaUsage = (schema, schemaUsage) => {
             this.trackSchemaUsage(schema, schemaUsage);
@@ -2093,8 +2194,8 @@ 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 && it !== SchemaContext.MultipartFormData),
-            serializationFormats: schema.serializationFormats,
+            usage: (_a = schema.usage) === null || _a === void 0 ? void 0 : _a.filter((it) => it !== SchemaContext.Paged && it !== SchemaContext.Anonymous),
+            serializationFormats: (_b = schema.serializationFormats) === null || _b === void 0 ? void 0 : _b.filter((it) => it !== KnownMediaType.Multipart),
         };
         // Propagate the usage of the initial schema itself
         innerPropagateSchemaUsage(schema, schemaUsage);
@@ -2109,6 +2210,9 @@ export class CodeModelBuilder {
             if (schemaUsage.usage) {
                 pushDistinct((schema.usage = schema.usage || []), ...schemaUsage.usage);
             }
+            if (schemaUsage.serializationFormats) {
+                pushDistinct((schema.serializationFormats = schema.serializationFormats || []), ...schemaUsage.serializationFormats);
+            }
         }
         else if (schema instanceof DictionarySchema) {
             this.trackSchemaUsage(schema.elementType, schemaUsage);
@@ -2119,7 +2223,10 @@ export class CodeModelBuilder {
     }
     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"));
+        return this.isArm() && Boolean((_a = getExtensions(program, op)) === null || _a === void 0 ? void 0 : _a.get("x-ms-long-running-operation"));
+    }
+    isArm() {
+        return this.codeModel.arm;
     }
     isSchemaUsageEmpty(schema) {
         if (schema instanceof ObjectSchema ||