tsp, bump dependency (#2816)

Author: weidongxu-microsoft

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autorest/java",
-  "version": "4.1.29",
+  "version": "4.1.30",
   "description": "The Java extension for classic generators in AutoRest.",
   "scripts": {
     "autorest": "autorest",

typespec-extension/changelog.md

@@ -1,8 +1,8 @@
 # Release History
 
-## 0.16.4 (Unreleased)
+## 0.17.0 (2024-06-14)
 
-Compatible with compiler 0.56.
+Compatible with compiler 0.57.
 
 ## 0.16.3 (2024-06-03)
 

typespec-extension/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@azure-tools/typespec-java",
-  "version": "0.16.4",
+  "version": "0.17.0",
   "description": "TypeSpec library for emitting Java client from the TypeSpec REST protocol binding",
   "keywords": [
     "TypeSpec"
@@ -45,38 +45,38 @@
     "target/emitter.jar"
   ],
   "peerDependencies": {
-    "@azure-tools/typespec-azure-core": ">=0.42.0 <1.0.0",
-    "@azure-tools/typespec-azure-resource-manager": ">=0.42.1 <1.0.0",
-    "@azure-tools/typespec-azure-rulesets": ">=0.42.1 <1.0.0",
-    "@azure-tools/typespec-client-generator-core": ">=0.42.2 <1.0.0",
-    "@typespec/compiler": ">=0.56.0 <1.0.0",
-    "@typespec/http": ">=0.56.0 <1.0.0",
-    "@typespec/openapi": ">=0.56.0 <1.0.0",
-    "@typespec/rest": ">=0.56.0 <1.0.0",
-    "@typespec/versioning": ">=0.56.0 <1.0.0"
+    "@azure-tools/typespec-azure-core": ">=0.43.0 <1.0.0",
+    "@azure-tools/typespec-azure-resource-manager": ">=0.43.0 <1.0.0",
+    "@azure-tools/typespec-azure-rulesets": ">=0.43.0 <1.0.0",
+    "@azure-tools/typespec-client-generator-core": ">=0.43.0 <1.0.0",
+    "@typespec/compiler": ">=0.57.0 <1.0.0",
+    "@typespec/http": ">=0.57.0 <1.0.0",
+    "@typespec/openapi": ">=0.57.0 <1.0.0",
+    "@typespec/rest": ">=0.57.0 <1.0.0",
+    "@typespec/versioning": ">=0.57.0 <1.0.0"
   },
   "dependencies": {
     "@autorest/codemodel": "~4.20.0",
     "js-yaml": "~4.1.0",
     "lodash": "~4.17.21"
   },
   "devDependencies": {
-    "@azure-tools/typespec-autorest": "0.42.1",
-    "@azure-tools/typespec-azure-core": "0.42.0",
-    "@azure-tools/typespec-azure-resource-manager": "0.42.1",
-    "@azure-tools/typespec-azure-rulesets": "0.42.1",
-    "@azure-tools/typespec-client-generator-core": "0.42.3",
+    "@azure-tools/typespec-autorest": "0.43.0",
+    "@azure-tools/typespec-azure-core": "0.43.0",
+    "@azure-tools/typespec-azure-resource-manager": "0.43.0",
+    "@azure-tools/typespec-azure-rulesets": "0.43.0",
+    "@azure-tools/typespec-client-generator-core": "0.43.0",
     "@types/js-yaml": "~4.0.9",
     "@types/lodash": "~4.17.1",
     "@types/mocha": "~10.0.6",
     "@types/node": "~20.12.10",
     "@typescript-eslint/eslint-plugin": "~7.8.0",
     "@typescript-eslint/parser": "~7.8.0",
-    "@typespec/compiler": "0.56.0",
-    "@typespec/http": "0.56.0",
-    "@typespec/openapi": "0.56.0",
-    "@typespec/rest": "0.56.0",
-    "@typespec/versioning": "0.56.0",
+    "@typespec/compiler": "0.57.0",
+    "@typespec/http": "0.57.0",
+    "@typespec/openapi": "0.57.0",
+    "@typespec/rest": "0.57.0",
+    "@typespec/versioning": "0.57.0",
     "c8": "~9.1.0",
     "eslint": "~8.57.0",
     "eslint-plugin-deprecation": "~2.0.0",

typespec-extension/package.json

@@ -104,6 +104,7 @@ import {
   Authentication,
   HttpOperation,
   HttpOperationBody,
+  HttpOperationMultipartBody,
   HttpOperationParameter,
   HttpOperationResponse,
   HttpServer,
@@ -152,6 +153,7 @@ import {
   ProcessingCache,
   getAccess,
   getDurationFormatFromSdkType,
+  getNonNullSdkType,
   getUnionDescription,
   getUsage,
   hasScalarAsBase,
@@ -719,7 +721,7 @@ export class CodeModelBuilder {
       },
     });
 
-    codeModelOperation.crossLanguageDefinitionId = getCrossLanguageDefinitionId(operation);
+    codeModelOperation.crossLanguageDefinitionId = getCrossLanguageDefinitionId(this.sdkContext, operation);
     codeModelOperation.internalApi = this.isInternal(this.sdkContext, operation);
 
     const convenienceApiName = this.getConvenienceApiName(operation);
@@ -789,9 +791,9 @@ export class CodeModelBuilder {
     this.addAcceptHeaderParameter(codeModelOperation, op.responses);
     // body
     if (op.parameters.body) {
-      if (op.parameters.body.parameter) {
-        if (!isVoidType(op.parameters.body.parameter.type)) {
-          this.processParameterBody(codeModelOperation, op, op.parameters.body.parameter);
+      if (op.parameters.body.property) {
+        if (!isVoidType(op.parameters.body.property.type)) {
+          this.processParameterBody(codeModelOperation, op, op.parameters.body.property);
         }
       } else if (op.parameters.body.type) {
         let bodyType = this.getEffectiveSchemaType(op.parameters.body.type);
@@ -1018,7 +1020,7 @@ export class CodeModelBuilder {
     } else {
       // schema
       let schema;
-      const sdkType = getClientType(this.sdkContext, param.param);
+      const sdkType = getNonNullSdkType(getClientType(this.sdkContext, param.param));
       if (
         param.type === "header" &&
         param.param.type.kind === "Scalar" &&
@@ -1532,7 +1534,7 @@ export class CodeModelBuilder {
       }
     }
 
-    let responseBody: HttpOperationBody | undefined = undefined;
+    let responseBody: HttpOperationBody | HttpOperationMultipartBody | undefined = undefined;
     let bodyType: Type | undefined = undefined;
     let trackConvenienceApi: boolean = Boolean(op.convenienceApi);
     if (resp.responses && resp.responses.length > 0 && resp.responses[0].body) {
@@ -1802,10 +1804,18 @@ export class CodeModelBuilder {
   }
 
   private processArraySchemaFromSdkType(type: SdkArrayType, name: string): ArraySchema {
-    const elementSchema = this.processSchemaFromSdkType(type.valueType, name);
+    let nullableItems = false;
+    let elementType = type.valueType;
+    if (elementType.kind === "nullable") {
+      nullableItems = true;
+      elementType = elementType.type;
+    }
+
+    const elementSchema = this.processSchemaFromSdkType(elementType, name);
     return this.codeModel.schemas.add(
       new ArraySchema(name, type.details ?? "", elementSchema, {
         summary: type.description,
+        nullableItems: nullableItems,
       }),
     );
   }
@@ -1820,10 +1830,16 @@ export class CodeModelBuilder {
       this.schemaCache.set(type, dictSchema);
     }
 
-    const elementSchema = this.processSchemaFromSdkType(type.valueType, name);
+    let nullableItems = false;
+    let elementType = type.valueType;
+    if (elementType.kind === "nullable") {
+      nullableItems = true;
+      elementType = elementType.type;
+    }
+    const elementSchema = this.processSchemaFromSdkType(elementType, name);
     dictSchema.elementType = elementSchema;
 
-    dictSchema.nullableItems = type.nullableValues;
+    dictSchema.nullableItems = nullableItems;
 
     return this.codeModel.schemas.add(dictSchema);
   }
@@ -2001,11 +2017,8 @@ export class CodeModelBuilder {
         keyType: {
           kind: "string",
           encode: "string",
-          nullable: false,
         },
         description: type.description,
-        nullableValues: false,
-        nullable: false,
         valueType: type.additionalProperties,
       };
       const parentSchema = this.processSchemaFromSdkType(sdkDictType, "Record");
@@ -2044,8 +2057,13 @@ export class CodeModelBuilder {
   }
 
   private processModelPropertyFromSdkType(prop: SdkModelPropertyType): Property {
-    let schema = this.processSchemaFromSdkType(prop.type, "");
-    let nullable = prop.nullable;
+    let nullable = false;
+    let nonNullType = prop.type;
+    if (nonNullType.kind === "nullable") {
+      nullable = true;
+      nonNullType = nonNullType.type;
+    }
+    let schema = this.processSchemaFromSdkType(nonNullType, "");
 
     let extensions: Record<string, any> | undefined = undefined;
     if (this.isSecret(prop)) {

typespec-extension/src/code-model-builder.ts

@@ -221,8 +221,8 @@ export function operationRefersUnion(
   }
   // request body
   if (op.parameters.body) {
-    if (op.parameters.body.parameter) {
-      const ret = unionReferredByType(program, op.parameters.body.parameter.type, cache);
+    if (op.parameters.body.property) {
+      const ret = unionReferredByType(program, op.parameters.body.property.type, cache);
       if (ret) {
         return ret;
       }

typespec-extension/src/operation-utils.ts

@@ -22,7 +22,7 @@ import { SchemaContext } from "@autorest/codemodel";
 import { DurationSchema } from "./common/schemas/time.js";
 import { getNamespace } from "./utils.js";
 import { getUnionAsEnum } from "@azure-tools/typespec-azure-core";
-import { SdkDurationType, isSdkFloatKind, isSdkIntKind } from "@azure-tools/typespec-client-generator-core";
+import { SdkDurationType, SdkType, isSdkFloatKind, isSdkIntKind } from "@azure-tools/typespec-client-generator-core";
 import { Version } from "@typespec/versioning";
 
 /** Acts as a cache for processing inputs.
@@ -91,6 +91,10 @@ export function isNullableType(type: Type): boolean {
   }
 }
 
+export function getNonNullSdkType(type: SdkType): SdkType {
+  return type.kind === "nullable" ? type.type : type;
+}
+
 export function getDurationFormat(encode: EncodeData): DurationSchema["format"] {
   let format: DurationSchema["format"] = "duration-rfc3339";
   // duration encoded as seconds

typespec-extension/src/type-utils.ts

@@ -10,23 +10,23 @@
   },
   "dependencies": {
     "@azure-tools/cadl-ranch-specs": "0.33.4",
-    "@azure-tools/typespec-java": "file:/../typespec-extension/azure-tools-typespec-java-0.16.4.tgz"
+    "@azure-tools/typespec-java": "file:/../typespec-extension/azure-tools-typespec-java-0.17.0.tgz"
   },
   "devDependencies": {
-    "@typespec/prettier-plugin-typespec": "~0.56.0",
+    "@typespec/prettier-plugin-typespec": "~0.57.0",
     "prettier-plugin-organize-imports": "3.2.4",
     "prettier": "~3.2.5"
   },
   "overrides": {
-    "@typespec/compiler": ">=0.56.0 <1.0.0",
-    "@typespec/http": ">=0.56.0 <1.0.0",
-    "@typespec/rest": ">=0.56.0 <1.0.0",
-    "@typespec/versioning": ">=0.56.0 <1.0.0",
-    "@typespec/openapi": ">=0.56.0 <1.0.0",
-    "@azure-tools/typespec-azure-core": ">=0.42.0 <1.0.0",
-    "@azure-tools/typespec-client-generator-core": ">=0.42.2 <1.0.0",
-    "@azure-tools/typespec-azure-resource-manager": ">=0.42.0 <1.0.0",
-    "@azure-tools/typespec-autorest": ">=0.42.0 <1.0.0"
+    "@typespec/compiler": ">=0.57.0 <1.0.0",
+    "@typespec/http": ">=0.57.0 <1.0.0",
+    "@typespec/rest": ">=0.57.0 <1.0.0",
+    "@typespec/versioning": ">=0.57.0 <1.0.0",
+    "@typespec/openapi": ">=0.57.0 <1.0.0",
+    "@azure-tools/typespec-azure-core": ">=0.43.0 <1.0.0",
+    "@azure-tools/typespec-client-generator-core": ">=0.43.0 <1.0.0",
+    "@azure-tools/typespec-azure-resource-manager": ">=0.43.0 <1.0.0",
+    "@azure-tools/typespec-autorest": ">=0.43.0 <1.0.0"
   },
   "private": true
 }

typespec-tests/package.json

@@ -18,7 +18,7 @@
 @Immutable
 public class AbstractModel implements JsonSerializable<AbstractModel> {
     /*
-     * The kind property.
+     * Discriminator property for AbstractModel.
      */
     @Generated
     private String kind = "AbstractModel";
@@ -40,7 +40,7 @@ protected AbstractModel(String name) {
     }
 
     /**
-     * Get the kind property: The kind property.
+     * Get the kind property: Discriminator property for AbstractModel.
      * 
      * @return the kind value.
      */

typespec-tests/src/main/java/com/_specs_/azure/clientgenerator/core/access/implementation/models/AbstractModel.java

@@ -17,7 +17,7 @@
 @Immutable
 public final class RealModel extends AbstractModel {
     /*
-     * The kind property.
+     * Discriminator property for AbstractModel.
      */
     @Generated
     private String kind = "real";
@@ -33,7 +33,7 @@ private RealModel(String name) {
     }
 
     /**
-     * Get the kind property: The kind property.
+     * Get the kind property: Discriminator property for AbstractModel.
      * 
      * @return the kind value.
      */