@azure-tools/typespec-java 0.8.10 → 0.8.12

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

@@ -17,7 +17,10 @@ export declare class CodeModelBuilder {
     build(): Promise<CodeModel>;
     private processHost;
     private processAuth;
+    private isInternal;
     private processModels;
+    private processSchemaUsage;
+    private resolveSchemaUsage;
     private processClients;
     private needToSkipProcessingOperation;
     private processOperation;

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,7 +3,7 @@ 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, getAllModels, isInclude, } from "@azure-tools/typespec-client-generator-core";
+import { listClients, listOperationGroups, listOperationsInOperationGroup, isApiVersion, shouldGenerateConvenient, createSdkContext, shouldGenerateProtocol, isInternal, } 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";
@@ -19,7 +19,7 @@ import { PreNamer } from "./prenamer/prenamer.js";
 import { createPollResultSchema } 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, } from "./type-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, originApiVersion, specialHeaderNames, loadExamples, isLroNewPollingStrategy, operationIsMultipleContentTypes, cloneOperationParameter, operationRefersUnion, } from "./operation-utils.js";
 import pkg from "lodash";
 const { isEqual } = pkg;
@@ -78,12 +78,10 @@ export class CodeModelBuilder {
         }
     }
     async build() {
-        var _a;
         this.operationExamples = await loadExamples(this.program, this.options);
-        this.processClients();
-        // TODO (weidxu): temporarily disabled support for `@include`
-        // this.processModels();
-        (_a = this.codeModel.schemas.objects) === null || _a === void 0 ? void 0 : _a.forEach((it) => this.propagateSchemaUsage(it));
+        const clients = this.processClients();
+        this.processModels(clients);
+        this.processSchemaUsage();
         if (this.options.namer) {
             this.codeModel = new PreNamer(this.codeModel).init().process();
         }
@@ -100,7 +98,7 @@ export class CodeModelBuilder {
                 else {
                     const schema = this.processSchema(it.type, it.name);
                     this.trackSchemaUsage(schema, {
-                        usage: [SchemaContext.Input, SchemaContext.Output /*SchemaContext.ConvenienceApi*/],
+                        usage: [SchemaContext.Input, SchemaContext.Output /*SchemaContext.Public*/],
                     });
                     parameter = new Parameter(it.name, this.getDoc(it), schema, {
                         implementation: ImplementationLocation.Client,
@@ -190,20 +188,79 @@ export class CodeModelBuilder {
             });
         }
     }
-    processModels() {
-        const allModels = getAllModels(this.sdkContext);
-        for (const model of allModels) {
-            if (isInclude(this.sdkContext, model)) {
-                const schema = this.processSchema(model, model.name);
-                if (this.isSchemaUsageEmpty(schema)) {
-                    // if the model/schema is not processed by any operation, treat it as a stand-alone model, and make it input-output
-                    this.trackSchemaUsage(schema, {
-                        usage: [SchemaContext.Input, SchemaContext.Output],
-                    });
+    isInternal(context, operation) {
+        const access = getAccess(operation);
+        if (access) {
+            return access === "internal";
+        }
+        else {
+            // fallback to "internal", it will be
+            return isInternal(context, operation);
+        }
+    }
+    processModels(clients) {
+        const processedModels = new Set();
+        for (const client of clients) {
+            const models = Array.from(client.service.models.values());
+            Array.from(client.service.enums.values()).forEach((it) => models.push(it));
+            for (const model of models) {
+                if (!processedModels.has(model)) {
+                    const access = getAccess(model);
+                    if (access === "public") {
+                        // 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 schema = this.processSchema(model, model.name);
+                        this.trackSchemaUsage(schema, {
+                            usage: [SchemaContext.Public],
+                        });
+                    }
+                    else if (access === "internal") {
+                        const schema = this.processSchema(model, model.name);
+                        this.trackSchemaUsage(schema, {
+                            usage: [SchemaContext.Internal],
+                        });
+                    }
+                    const usage = getUsage(model);
+                    if (usage) {
+                        const schema = this.processSchema(model, model.name);
+                        this.trackSchemaUsage(schema, {
+                            usage: usage,
+                        });
+                    }
+                    processedModels.add(model);
+                }
+            }
+        }
+    }
+    processSchemaUsage() {
+        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));
+        (_c = this.codeModel.schemas.groups) === null || _c === void 0 ? void 0 : _c.forEach((it) => this.resolveSchemaUsage(it));
+        (_d = this.codeModel.schemas.choices) === null || _d === void 0 ? void 0 : _d.forEach((it) => this.resolveSchemaUsage(it));
+        (_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));
+    }
+    resolveSchemaUsage(schema) {
+        if (schema instanceof ObjectSchema ||
+            schema instanceof GroupSchema ||
+            schema instanceof ChoiceSchema ||
+            schema instanceof SealedChoiceSchema ||
+            schema instanceof OrSchema ||
+            schema instanceof ConstantSchema) {
+            const schemaUsage = schema.usage;
+            // Public override Internal
+            if (schemaUsage === null || schemaUsage === void 0 ? void 0 : schemaUsage.includes(SchemaContext.Public)) {
+                const index = schemaUsage.indexOf(SchemaContext.Internal);
+                if (index >= 0) {
+                    schemaUsage.splice(index, 1);
                 }
-                this.trackSchemaUsage(schema, {
-                    usage: [SchemaContext.ConvenienceApi],
-                });
             }
         }
     }
@@ -307,6 +364,7 @@ export class CodeModelBuilder {
                 }
             }
         }
+        return clients;
     }
     needToSkipProcessingOperation(operation, clientContext) {
         // don't generate protocol and convenience method for overloaded operations
@@ -337,8 +395,11 @@ export class CodeModelBuilder {
                     : undefined,
             },
         });
+        // TODO (weidxu): temporary disable codeModelOperation.internalApi
+        // codeModelOperation.internalApi = this.isInternal(this.sdkContext, operation);
+        const internalApi = this.isInternal(this.sdkContext, operation);
         const convenienceApiName = this.getConvenienceApiName(operation);
-        let generateConvenienceApi = !!convenienceApiName && !isInternal(this.sdkContext, operation);
+        let generateConvenienceApi = !!convenienceApiName && !internalApi; // at present, internalApi means not convenienceApi. this could change.
         let apiComment = undefined;
         if (generateConvenienceApi) {
             // check if the convenience API need to be disabled for some special cases
@@ -359,19 +420,8 @@ export class CodeModelBuilder {
                 const union = operationRefersUnion(this.program, op, this.typeUnionRefCache);
                 if (union) {
                     // and Union
-                    const getUnionName = (union) => {
-                        let name = union.name;
-                        if (!name) {
-                            const names = [];
-                            union.variants.forEach((it) => {
-                                names.push(getTypeName(it.type, this.typeNameOptions));
-                            });
-                            name = names.join(" | ");
-                        }
-                        return name;
-                    };
                     generateConvenienceApi = false;
-                    apiComment = `Convenience API is not generated, as operation '${op.operation.name}' refers Union '${getUnionName(union)}'`;
+                    apiComment = `Convenience API is not generated, as operation '${op.operation.name}' refers Union '${getUnionName(union, this.typeNameOptions)}'`;
                     this.logWarning(apiComment);
                 }
             }
@@ -385,7 +435,7 @@ export class CodeModelBuilder {
         }
         // check for generating protocol api or not
         codeModelOperation.generateProtocolApi =
-            shouldGenerateProtocol(this.sdkContext, operation) && !isInternal(this.sdkContext, operation);
+            shouldGenerateProtocol(this.sdkContext, operation) && !this.isInternal(this.sdkContext, operation);
         codeModelOperation.addRequest(new Request({
             protocol: {
                 http: {
@@ -492,29 +542,36 @@ export class CodeModelBuilder {
                 pollingSchema = this.pollResultSchema;
             }
             else {
-                if (lroMetadata.pollingInfo.responseModel.name === "OperationStatus" &&
-                    getNamespace(lroMetadata.pollingInfo.responseModel) === "Azure.Core.Foundations") {
+                if (modelIs(lroMetadata.pollingInfo.responseModel, "OperationStatus", "Azure.Core.Foundations")) {
                     pollingSchema = this.pollResultSchema;
                 }
                 else {
-                    pollingSchema = this.processSchema(lroMetadata.pollingInfo.responseModel, "pollResult");
+                    const pollType = this.findResponseBody(lroMetadata.pollingInfo.responseModel);
+                    pollingSchema = this.processSchema(pollType, "pollResult");
                 }
             }
             // finalSchema
             if (verb !== "delete" && lroMetadata.logicalResult) {
-                finalSchema = this.processSchema(lroMetadata.logicalResult, "finalResult");
+                const finalType = this.findResponseBody(lroMetadata.logicalResult);
+                finalSchema = this.processSchema(finalType, "finalResult");
             }
             // track usage
             if (pollingSchema) {
                 this.trackSchemaUsage(pollingSchema, { usage: [SchemaContext.Output] });
-                if (op.convenienceApi) {
-                    this.trackSchemaUsage(pollingSchema, { usage: [SchemaContext.ConvenienceApi] });
+                if (op.internalApi) {
+                    this.trackSchemaUsage(pollingSchema, { usage: [SchemaContext.Internal] });
+                }
+                else if (op.convenienceApi) {
+                    this.trackSchemaUsage(pollingSchema, { usage: [SchemaContext.Public] });
                 }
             }
             if (finalSchema) {
                 this.trackSchemaUsage(finalSchema, { usage: [SchemaContext.Output] });
-                if (op.convenienceApi) {
-                    this.trackSchemaUsage(finalSchema, { usage: [SchemaContext.ConvenienceApi] });
+                if (op.internalApi) {
+                    this.trackSchemaUsage(pollingSchema, { usage: [SchemaContext.Internal] });
+                }
+                else if (op.convenienceApi) {
+                    this.trackSchemaUsage(finalSchema, { usage: [SchemaContext.Public] });
                 }
             }
             op.lroMetadata = new LongRunningMetadata(true, pollingSchema, finalSchema, pollingStrategy);
@@ -652,8 +709,11 @@ export class CodeModelBuilder {
             });
             op.addParameter(parameter);
             this.trackSchemaUsage(schema, { usage: [SchemaContext.Input] });
-            if (op.convenienceApi) {
-                this.trackSchemaUsage(schema, { usage: [SchemaContext.ConvenienceApi] });
+            if (op.internalApi) {
+                this.trackSchemaUsage(schema, { usage: [SchemaContext.Internal] });
+            }
+            else if (op.convenienceApi) {
+                this.trackSchemaUsage(schema, { usage: [SchemaContext.Public] });
             }
             if (param.name.toLowerCase() === "content-type") {
                 let mediaTypes = ["application/json"];
@@ -771,7 +831,13 @@ export class CodeModelBuilder {
                     required: false,
                     nullable: true,
                 });
-                this.trackSchemaUsage(requestConditionsSchema, { usage: [SchemaContext.Input, SchemaContext.ConvenienceApi] });
+                this.trackSchemaUsage(requestConditionsSchema, { usage: [SchemaContext.Input] });
+                if (op.internalApi) {
+                    this.trackSchemaUsage(requestConditionsSchema, { usage: [SchemaContext.Internal] });
+                }
+                else if (op.convenienceApi) {
+                    this.trackSchemaUsage(requestConditionsSchema, { usage: [SchemaContext.Public] });
+                }
                 // update group schema for properties
                 for (const parameter of request.parameters) {
                     if (parameter.language.default.serializedName &&
@@ -817,8 +883,11 @@ export class CodeModelBuilder {
         });
         op.addParameter(parameter);
         this.trackSchemaUsage(schema, { usage: [SchemaContext.Input] });
-        if (op.convenienceApi) {
-            this.trackSchemaUsage(schema, { usage: [SchemaContext.ConvenienceApi] });
+        if (op.internalApi) {
+            this.trackSchemaUsage(schema, { usage: [SchemaContext.Internal] });
+        }
+        else if (op.convenienceApi) {
+            this.trackSchemaUsage(schema, { usage: [SchemaContext.Public] });
         }
         if (!schema.language.default.name && schema instanceof ObjectSchema) {
             // anonymous model
@@ -889,7 +958,7 @@ export class CodeModelBuilder {
                             serializedName: it.language.default.serializedName,
                         }));
                     });
-                    this.trackSchemaUsage(optionBagSchema, { usage: [SchemaContext.Input, SchemaContext.ConvenienceApi] });
+                    this.trackSchemaUsage(optionBagSchema, { usage: [SchemaContext.Input, SchemaContext.Public] });
                     // option bag parameter
                     const optionBagParameter = new Parameter("options", optionBagSchema.language.default.description, optionBagSchema, {
                         implementation: ImplementationLocation.Method,
@@ -916,7 +985,7 @@ export class CodeModelBuilder {
             // headers
             headers = [];
             for (const [key, header] of Object.entries(resp.responses[0].headers)) {
-                const schema = this.processSchema(header.type, key);
+                const schema = this.processSchema(header, key);
                 headers.push(new HttpHeader(key, schema, {
                     language: {
                         default: {
@@ -1042,8 +1111,11 @@ export class CodeModelBuilder {
             op.addResponse(response);
             if (response instanceof SchemaResponse) {
                 this.trackSchemaUsage(response.schema, { usage: [SchemaContext.Output] });
-                if (trackConvenienceApi) {
-                    this.trackSchemaUsage(response.schema, { usage: [SchemaContext.ConvenienceApi] });
+                if (op.internalApi) {
+                    this.trackSchemaUsage(response.schema, { usage: [SchemaContext.Internal] });
+                }
+                else if (trackConvenienceApi) {
+                    this.trackSchemaUsage(response.schema, { usage: [SchemaContext.Public] });
                 }
             }
         }
@@ -1815,7 +1887,7 @@ export class CodeModelBuilder {
                 return;
             }
             processedSchemas.add(schema);
-            if (schema instanceof ObjectSchema) {
+            if (schema instanceof ObjectSchema || schema instanceof GroupSchema) {
                 if (schemaUsage.usage || schemaUsage.serializationFormats) {
                     (_a = schema.properties) === null || _a === void 0 ? void 0 : _a.forEach((p) => {
                         var _a;
@@ -1830,10 +1902,12 @@ export class CodeModelBuilder {
                             innerApplySchemaUsage(p.schema, schemaUsage);
                         }
                     });
-                    (_c = (_b = schema.parents) === null || _b === void 0 ? void 0 : _b.all) === null || _c === void 0 ? void 0 : _c.forEach((p) => innerApplySchemaUsage(p, schemaUsage));
-                    (_e = (_d = schema.parents) === null || _d === void 0 ? void 0 : _d.immediate) === null || _e === void 0 ? void 0 : _e.forEach((p) => innerApplySchemaUsage(p, schemaUsage));
-                    (_g = (_f = schema.children) === null || _f === void 0 ? void 0 : _f.all) === null || _g === void 0 ? void 0 : _g.forEach((c) => innerApplySchemaUsage(c, schemaUsage));
-                    (_j = (_h = schema.children) === null || _h === void 0 ? void 0 : _h.immediate) === null || _j === void 0 ? void 0 : _j.forEach((c) => innerApplySchemaUsage(c, schemaUsage));
+                    if (schema instanceof ObjectSchema) {
+                        (_c = (_b = schema.parents) === null || _b === void 0 ? void 0 : _b.all) === null || _c === void 0 ? void 0 : _c.forEach((p) => innerApplySchemaUsage(p, schemaUsage));
+                        (_e = (_d = schema.parents) === null || _d === void 0 ? void 0 : _d.immediate) === null || _e === void 0 ? void 0 : _e.forEach((p) => innerApplySchemaUsage(p, schemaUsage));
+                        (_g = (_f = schema.children) === null || _f === void 0 ? void 0 : _f.all) === null || _g === void 0 ? void 0 : _g.forEach((c) => innerApplySchemaUsage(c, schemaUsage));
+                        (_j = (_h = schema.children) === null || _h === void 0 ? void 0 : _h.immediate) === null || _j === void 0 ? void 0 : _j.forEach((c) => innerApplySchemaUsage(c, schemaUsage));
+                    }
                     // Object.values(schema.discriminator?.all ?? {}).forEach((d) => {
                     //   innerApplySchemaUsage(d, schemaUsage);
                     // });