@azure-tools/typespec-java 0.18.2 → 0.18.3

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

@@ -11,10 +11,11 @@ export declare class CodeModelBuilder {
     private sdkContext;
     private options;
     private codeModel;
+    private emitterContext;
+    private serviceNamespace;
     private loggingEnabled;
     readonly schemaCache: ProcessingCache<SdkType, Schema>;
     readonly typeUnionRefCache: Map<Type, Union | null | undefined>;
-    private operationExamples;
     private apiVersion;
     constructor(program1: Program, context: EmitContext<EmitterOptions>);
     build(): Promise<CodeModel>;

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,14 +1,14 @@
 import { AnySchema, ApiVersion, ArraySchema, BinaryResponse, BinarySchema, BooleanSchema, ByteArraySchema, ChoiceValue, DateSchema, DateTimeSchema, DictionarySchema, Discriminator, GroupProperty, GroupSchema, HttpHeader, HttpParameter, ImplementationLocation, KeySecurityScheme, Language, Metadata, NumberSchema, OAuth2SecurityScheme, ObjectSchema, OperationGroup, Parameter, ParameterLocation, Property, Relations, Response, SchemaResponse, SchemaType, Security, SerializationStyle, StringSchema, TimeSchema, UnixTimeSchema, UriSchema, VirtualParameter, } from "@autorest/codemodel";
 import { KnownMediaType } from "@azure-tools/codegen";
 import { getLroMetadata, getPagedResult, isPollingLocation } from "@azure-tools/typespec-azure-core";
-import { createSdkContext, getAllModels, getClientNameOverride, getClientType, getCrossLanguageDefinitionId, getDefaultApiVersion, getHttpOperationWithCache, getWireName, isApiVersion, isInternal, isSdkBuiltInKind, isSdkIntKind, listClients, listOperationGroups, listOperationsInOperationGroup, shouldGenerateConvenient, shouldGenerateProtocol, } from "@azure-tools/typespec-client-generator-core";
+import { createSdkContext, getAllModels, getClientNameOverride, getClientType, getCrossLanguageDefinitionId, getDefaultApiVersion, getHttpOperationWithCache, getWireName, isApiVersion, isInternal, isSdkBuiltInKind, isSdkIntKind, listClients, listOperationGroups, listOperationsInOperationGroup, shouldGenerateConvenient, shouldGenerateProtocol, getHttpOperationExamples, } from "@azure-tools/typespec-client-generator-core";
 import { getDoc, getEffectiveModelType, getEncode, getFriendlyName, getNamespaceFullName, getOverloadedOperation, getProjectedName, getSummary, getVisibility, isArrayModelType, isErrorModel, isRecordModelType, isVoidType, listServices, } from "@typespec/compiler";
 import { Visibility, getAuthentication, getHeaderFieldName, getHeaderFieldOptions, getPathParamName, getQueryParamName, getQueryParamOptions, getServers, getStatusCodeDescription, isHeader, isPathParam, isQueryParam, } from "@typespec/http";
 import { getResourceOperation, getSegment } from "@typespec/rest";
 import { getAddedOnVersions, getVersion } from "@typespec/versioning";
 import { fail } from "assert";
 import pkg from "lodash";
-import { Client as CodeModelClient, ObjectScheme } from "./common/client.js";
+import { Client as CodeModelClient } from "./common/client.js";
 import { CodeModel } from "./common/code-model.js";
 import { LongRunningMetadata } from "./common/long-running-metadata.js";
 import { Operation as CodeModelOperation, ConvenienceApi, Request } from "./common/operation.js";
@@ -19,10 +19,11 @@ import { DurationSchema } from "./common/schemas/time.js";
 import { SchemaContext } from "./common/schemas/usage.js";
 import { createPollOperationDetailsSchema, getFileDetailsSchema } from "./external-schemas.js";
 import { ClientContext } from "./models.js";
-import { ORIGIN_API_VERSION, SPECIAL_HEADER_NAMES, cloneOperationParameter, getServiceVersion, isKnownContentType, isLroNewPollingStrategy, isPayloadProperty, loadExamples, operationIsJsonMergePatch, operationIsMultipart, operationIsMultipleContentTypes, } from "./operation-utils.js";
+import { ORIGIN_API_VERSION, SPECIAL_HEADER_NAMES, cloneOperationParameter, getServiceVersion, isKnownContentType, isLroNewPollingStrategy, isPayloadProperty, operationIsJsonMergePatch, operationIsMultipart, operationIsMultipleContentTypes, } from "./operation-utils.js";
 import { PreNamer } from "./prenamer/prenamer.js";
 import { ProcessingCache, getAccess, getDurationFormatFromSdkType, getNonNullSdkType, getUnionDescription, getUsage, hasScalarAsBase, isArmCommonType, isModelReferredInTemplate, isNullableType, isStable, modelIs, pushDistinct, } from "./type-utils.js";
 import { getJavaNamespace, getNamespace, logWarning, pascalCase, stringArrayContainsIgnoreCase, trace, } from "./utils.js";
+import { pathToFileURL } from "url";
 const { isEqual } = pkg;
 export class CodeModelBuilder {
     constructor(program1, context) {
@@ -30,30 +31,30 @@ export class CodeModelBuilder {
         this.loggingEnabled = false;
         this.schemaCache = new ProcessingCache((type, name) => this.processSchemaFromSdkTypeImpl(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.operationExamples = new Map();
         this.options = context.options;
         this.program = program1;
+        this.emitterContext = context;
         if ((_a = this.options["dev-options"]) === null || _a === void 0 ? void 0 : _a.loglevel) {
             this.loggingEnabled = true;
         }
         if (this.options["skip-special-headers"]) {
             this.options["skip-special-headers"].forEach((it) => SPECIAL_HEADER_NAMES.add(it.toLowerCase()));
         }
-        this.sdkContext = createSdkContext(context, "@azure-tools/typespec-java");
         const service = listServices(this.program)[0];
         const serviceNamespace = service.type;
         if (serviceNamespace === undefined) {
             throw Error("Cannot emit yaml for a namespace that doesn't exist.");
         }
-        // java namespace
+        this.serviceNamespace = serviceNamespace;
         this.namespace = getNamespaceFullName(serviceNamespace) || "Azure.Client";
+        // java namespace
         const javaNamespace = getJavaNamespace(this.namespace);
         const namespace1 = this.namespace;
         this.typeNameOptions = {
             // shorten type names by removing TypeSpec and service namespace
             namespaceFilter(ns) {
                 const name = getNamespaceFullName(ns);
-                return name !== "Cadl" && name !== namespace1;
+                return name !== "TypeSpec" && name !== namespace1;
             },
         };
         // init code model
@@ -75,15 +76,15 @@ export class CodeModelBuilder {
                 },
             },
         });
+    }
+    async build() {
+        this.sdkContext = await createSdkContext(this.emitterContext, "@azure-tools/typespec-java");
         // auth
         // TODO: it is not very likely, but different client could have different auth
-        const auth = getAuthentication(this.program, serviceNamespace);
+        const auth = getAuthentication(this.program, this.serviceNamespace);
         if (auth) {
             this.processAuth(auth);
         }
-    }
-    async build() {
-        this.operationExamples = await loadExamples(this.program, this.options, this.sdkContext);
         if (this.sdkContext.arm) {
             // ARM
             this.codeModel.arm = true;
@@ -473,36 +474,33 @@ export class CodeModelBuilder {
     }
     getOperationExample(operation) {
         var _a, _b;
-        if (((_a = operation.projectionSource) === null || _a === void 0 ? void 0 : _a.kind) === "Operation") {
-            // always use the projectionSource, if available
-            operation = operation.projectionSource;
-        }
-        let operationExample = this.operationExamples.get(operation);
-        if (!operationExample && operation.sourceOperation) {
-            // if the operation is customized in client.tsp, the operation would be different from that of main.tsp
-            // try the operation.sourceOperation
-            operation = operation.sourceOperation;
-            if (((_b = operation.projectionSource) === null || _b === void 0 ? void 0 : _b.kind) === "Operation") {
-                operation = operation.projectionSource;
+        const httpOperationExamples = getHttpOperationExamples(this.sdkContext, operation);
+        if (httpOperationExamples && httpOperationExamples.length > 0) {
+            const operationExamples = {};
+            for (const example of httpOperationExamples) {
+                const operationExample = example.rawExample;
+                operationExample["x-ms-original-file"] = pathToFileURL(example.filePath).toString();
+                operationExamples[(_b = (_a = operationExample.title) !== null && _a !== void 0 ? _a : operationExample.operationId) !== null && _b !== void 0 ? _b : operation.operation.name] =
+                    operationExample;
             }
-            operationExample = this.operationExamples.get(operation);
+            return operationExamples;
+        }
+        else {
+            return undefined;
         }
-        return operationExample;
     }
     processOperation(groupName, operation, clientContext) {
-        var _a, _b, _c;
+        var _a;
         const op = getHttpOperationWithCache(this.sdkContext, operation);
         const operationGroup = this.codeModel.getOperationGroup(groupName);
         const operationName = this.getName(operation);
         const opId = groupName ? `${groupName}_${operationName}` : `${operationName}`;
-        const operationExample = this.getOperationExample(operation);
+        const operationExamples = this.getOperationExample(op);
         const codeModelOperation = new CodeModelOperation(operationName, this.getDoc(operation), {
             operationId: opId,
             summary: this.getSummary(operation),
             extensions: {
-                "x-ms-examples": operationExample
-                    ? { [(_b = (_a = operationExample.title) !== null && _a !== void 0 ? _a : operationExample.operationId) !== null && _b !== void 0 ? _b : operation.name]: operationExample }
-                    : undefined,
+                "x-ms-examples": operationExamples,
             },
         });
         codeModelOperation.crossLanguageDefinitionId = getCrossLanguageDefinitionId(this.sdkContext, operation);
@@ -579,7 +577,7 @@ export class CodeModelBuilder {
                 let bodyType = op.parameters.body.type;
                 if (bodyType.kind === "Model") {
                     // try use resource type as round-trip model
-                    const resourceType = (_c = getResourceOperation(this.program, operation)) === null || _c === void 0 ? void 0 : _c.resourceType;
+                    const resourceType = (_a = getResourceOperation(this.program, operation)) === null || _a === void 0 ? void 0 : _a.resourceType;
                     if (resourceType && op.responses && op.responses.length > 0) {
                         const resp = op.responses[0];
                         if (resp.responses && resp.responses.length > 0 && resp.responses[0].body) {
@@ -1331,16 +1329,7 @@ export class CodeModelBuilder {
                 case "any":
                     return this.processAnySchemaFromSdkType();
                 case "string":
-                case "password":
-                case "guid":
-                case "ipAddress":
-                case "uuid":
-                case "ipV4Address":
-                case "ipV6Address":
-                case "eTag":
-                case "armId":
-                case "azureLocation":
-                    return this.processStringSchemaFromSdkType(type, type.kind);
+                    return this.processStringSchemaFromSdkType(type, nameHint);
                 case "float":
                 case "float32":
                 case "float64":
@@ -1357,7 +1346,6 @@ export class CodeModelBuilder {
                 case "plainDate":
                     return this.processDateSchemaFromSdkType(type, nameHint);
                 case "url":
-                case "uri":
                     return this.processUrlSchemaFromSdkType(type, nameHint);
             }
         }
@@ -1522,7 +1510,7 @@ export class CodeModelBuilder {
         var _a, _b;
         const rawModelType = type.__raw;
         const namespace = getNamespace(rawModelType);
-        const objectSchema = new ObjectScheme(name, (_a = type.details) !== null && _a !== void 0 ? _a : "", {
+        const objectSchema = new ObjectSchema(name, (_a = type.details) !== null && _a !== void 0 ? _a : "", {
             summary: type.description,
             language: {
                 default: {
@@ -1576,6 +1564,8 @@ export class CodeModelBuilder {
                     kind: "string",
                     encode: "string",
                     decorators: [],
+                    name: "string",
+                    crossLanguageDefinitionId: type.crossLanguageDefinitionId,
                 },
                 description: type.description,
                 valueType: type.additionalProperties,
@@ -1638,8 +1628,11 @@ export class CodeModelBuilder {
             extensions = extensions !== null && extensions !== void 0 ? extensions : {};
             extensions["x-ms-mutability"] = mutability;
         }
-        if (prop.kind === "property" && prop.isMultipartFileInput) {
-            schema = this.processMultipartFormDataFilePropertySchemaFromSdkType(prop, this.namespace);
+        if (prop.kind === "property" && prop.multipartOptions) {
+            // TODO: handle MultipartOptions.isMulti
+            if (prop.multipartOptions.isFilePart) {
+                schema = this.processMultipartFormDataFilePropertySchemaFromSdkType(prop, this.namespace);
+            }
         }
         return new Property(prop.name, (_a = prop.details) !== null && _a !== void 0 ? _a : "", schema, {
             summary: prop.description,
@@ -1756,13 +1749,19 @@ export class CodeModelBuilder {
     }
     processMultipartFormDataFilePropertySchemaFromSdkType(property, namespace) {
         var _a;
-        if (property.type.kind === "bytes") {
-            return getFileDetailsSchema(property.name, namespace, this.codeModel.schemas, this.binarySchema, this.stringSchema);
+        const processSchemaFunc = (type) => this.processSchemaFromSdkType(type, "");
+        if (property.type.kind === "bytes" || property.type.kind === "model") {
+            return getFileDetailsSchema(property, namespace, this.codeModel.schemas, this.binarySchema, this.stringSchema, processSchemaFunc);
+        }
+        else if (property.type.kind === "array" &&
+            (property.type.valueType.kind === "bytes" || property.type.valueType.kind === "model")) {
+            return new ArraySchema(property.name, (_a = property.details) !== null && _a !== void 0 ? _a : "", getFileDetailsSchema(property, namespace, this.codeModel.schemas, this.binarySchema, this.stringSchema, processSchemaFunc), {
+                summary: property.description,
+            });
         }
-        else if (property.type.kind === "array" && property.type.valueType.kind === "bytes") {
-            return new ArraySchema(property.name, (_a = property.description) !== null && _a !== void 0 ? _a : "", getFileDetailsSchema(property.name, namespace, this.codeModel.schemas, this.binarySchema, this.stringSchema));
+        else {
+            throw new Error(`Invalid type for multipart form data: '${property.type.kind}'.`);
         }
-        throw new Error(`Invalid type for multipart form data: '${property.type.kind}'.`);
     }
     getDoc(target) {
         return target ? getDoc(this.program, target) || "" : "";