From 720d379ba190769e2bcf17b6858836102d6706db Mon Sep 17 00:00:00 2001 From: XiaofeiCao Date: Tue, 3 Jun 2025 16:06:14 +0800 Subject: [PATCH 1/6] sync core --- core | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core b/core index eb614bee9d..41296b1943 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit eb614bee9d7aca4420d97c346a660b94ed0879a9 +Subproject commit 41296b194339c5f8c58b98185f551bc1f057c6ac From 2f2da6f2dfb0d2b0ad62c7e56c39dd880b445799 Mon Sep 17 00:00:00 2001 From: XiaofeiCao Date: Tue, 3 Jun 2025 16:09:05 +0800 Subject: [PATCH 2/6] package.json --- typespec-extension/package-lock.json | 4 ++-- typespec-extension/package.json | 2 +- typespec-tests/package.json | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/typespec-extension/package-lock.json b/typespec-extension/package-lock.json index d782281e18..7af0bb60ea 100644 --- a/typespec-extension/package-lock.json +++ b/typespec-extension/package-lock.json @@ -1,12 +1,12 @@ { "name": "@azure-tools/typespec-java", - "version": "0.31.0", + "version": "0.31.1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@azure-tools/typespec-java", - "version": "0.31.0", + "version": "0.31.1", "license": "MIT", "dependencies": { "@autorest/codemodel": "~4.20.1", diff --git a/typespec-extension/package.json b/typespec-extension/package.json index 1bbf9a3e06..97bb8c5fd0 100644 --- a/typespec-extension/package.json +++ b/typespec-extension/package.json @@ -1,6 +1,6 @@ { "name": "@azure-tools/typespec-java", - "version": "0.31.0", + "version": "0.31.1", "description": "TypeSpec library for emitting Java client from the TypeSpec REST protocol binding", "keywords": [ "TypeSpec" diff --git a/typespec-tests/package.json b/typespec-tests/package.json index 790de3ea88..105c705a45 100644 --- a/typespec-tests/package.json +++ b/typespec-tests/package.json @@ -13,7 +13,7 @@ "@typespec/spector": "0.1.0-alpha.14", "@typespec/http-specs": "0.1.0-alpha.22", "@azure-tools/azure-http-specs": "0.1.0-alpha.18", - "@azure-tools/typespec-java": "file:/../typespec-extension/azure-tools-typespec-java-0.31.0.tgz" + "@azure-tools/typespec-java": "file:/../typespec-extension/azure-tools-typespec-java-0.31.1.tgz" }, "devDependencies": { "@typespec/prettier-plugin-typespec": "^1.0.0", From 565a223bd65a8ada8e3076bc1e3fd1a2bff479aa Mon Sep 17 00:00:00 2001 From: XiaofeiCao Date: Tue, 3 Jun 2025 17:04:01 +0800 Subject: [PATCH 3/6] update emitter-options --- typespec-extension/src/options.ts | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/typespec-extension/src/options.ts b/typespec-extension/src/options.ts index 764d7a90eb..71ccf91825 100644 --- a/typespec-extension/src/options.ts +++ b/typespec-extension/src/options.ts @@ -115,6 +115,12 @@ export const EmitterOptionsSchema: JSONSchemaType = { description: "Specify the Java class that to be executed by emitter for [code customization](https://github.com/Azure/autorest.java/blob/main/customization-base/README.md), during post-process.", nullable: true, }, + "rename-model": { + type: "object", + description: "Specify models to rename, in case unable to rename models through TCGC, e.g. anonymous models or resource list models. Format should be in key-value form.", + additionalProperties: true, + nullable: true, + }, // configure "skip-special-headers": { From ecb2ebc805241c08458dd35a39d8e279ba406253 Mon Sep 17 00:00:00 2001 From: XiaofeiCao Date: Tue, 3 Jun 2025 17:04:11 +0800 Subject: [PATCH 4/6] changelog.md --- typespec-extension/changelog.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/typespec-extension/changelog.md b/typespec-extension/changelog.md index 456f6472c5..84629d9f3b 100644 --- a/typespec-extension/changelog.md +++ b/typespec-extension/changelog.md @@ -1,5 +1,9 @@ # Release History +## 0.31.1 (2025-06-04) + +Compatible with compiler 1.0.0. + ## 0.31.0 (2025-05-28) Compatible with compiler 1.0.0. From 8bf6873f836e35d5266c35e497955f4792c5c5a5 Mon Sep 17 00:00:00 2001 From: xiaofeicao Date: Tue, 3 Jun 2025 20:15:13 +0800 Subject: [PATCH 5/6] fix options.ts --- typespec-extension/src/options.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/typespec-extension/src/options.ts b/typespec-extension/src/options.ts index 71ccf91825..7185c87f06 100644 --- a/typespec-extension/src/options.ts +++ b/typespec-extension/src/options.ts @@ -116,8 +116,8 @@ export const EmitterOptionsSchema: JSONSchemaType = { nullable: true, }, "rename-model": { - type: "object", - description: "Specify models to rename, in case unable to rename models through TCGC, e.g. anonymous models or resource list models. Format should be in key-value form.", + type: ["string", "object"], + description: "Specify models to rename, in case unable to do so through TCGC. E.g. anonymous models or resource list models. Format should be in key-value form, or a comma separated string that follows 'BeforeRename:AfterRename' pattern.", additionalProperties: true, nullable: true, }, From 8d55319eca4b957502614cbe8d149b3b58362230 Mon Sep 17 00:00:00 2001 From: XiaofeiCao Date: Wed, 4 Jun 2025 11:03:53 +0800 Subject: [PATCH 6/6] sync core to main --- core | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core b/core index 41296b1943..08049367bc 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit 41296b194339c5f8c58b98185f551bc1f057c6ac +Subproject commit 08049367bc6fbcfce97f99fd52058b1f15917ef6