@autorest/java 4.1.43 → 4.1.45

package/core/package.json

@@ -6,7 +6,7 @@
   "type": "module",
   "scripts": {
     "build": "pnpm build:all && pnpm check:eng && pnpm gen-compiler-extern-signature",
-    "build:all": "pnpm -r --workspace-concurrency=Infinity --aggregate-output --reporter=append-only build",
+    "build:all": "pnpm -r --workspace-concurrency=Infinity build",
     "check:eng": "tsc -p ./tsconfig.eng.json --noEmit",
     "setup:min": "pnpm install && pnpm --filter \"@typespec/prettier-plugin-typespec...\" run build",
     "check-version-mismatch": "syncpack list-mismatches",
@@ -22,7 +22,7 @@
     "lint": "eslint . --max-warnings=0",
     "lint:fix": "eslint . --fix",
     "merge-coverage": "c8 -- report --reporter=cobertura --reporter=text",
-    "pack:all": "chronus pack --pack-destination ./temp/artifacts",
+    "pack:all": "chronus pack --exclude standalone --pack-destination ./temp/artifacts",
     "preinstall": "npx only-allow pnpm",
     "prepare-publish": "pnpm chronus version",
     "purge": "rimraf --glob \"packages/*/node_modules/\"",
@@ -40,38 +40,41 @@
     "upload-manifest": "pnpm -r --filter=@typespec/http-specs run upload-manifest"
   },
   "devDependencies": {
-    "@chronus/chronus": "^0.13.0",
-    "@chronus/github": "^0.4.4",
-    "@eslint/js": "^9.15.0",
-    "@microsoft/api-extractor": "^7.47.11",
-    "@octokit/core": "^6.1.2",
+    "@alloy-js/prettier-plugin-alloy": "^0.1.0",
+    "@chronus/chronus": "^0.15.0",
+    "@chronus/github": "^0.4.7",
+    "@eslint/js": "^9.18.0",
+    "@microsoft/api-extractor": "^7.49.1",
+    "@octokit/core": "^6.1.3",
     "@octokit/plugin-paginate-graphql": "^5.2.4",
-    "@octokit/plugin-rest-endpoint-methods": "^13.2.6",
+    "@octokit/plugin-rest-endpoint-methods": "^13.3.0",
     "@pnpm/find-workspace-packages": "^6.0.9",
     "@types/micromatch": "^4.0.9",
-    "@types/node": "~22.7.9",
-    "@vitest/coverage-v8": "^2.1.5",
-    "c8": "^10.1.2",
-    "cspell": "^8.16.0",
-    "eslint": "^9.15.0",
+    "@types/node": "~22.10.10",
+    "@vitest/coverage-v8": "^3.0.4",
+    "c8": "^10.1.3",
+    "cspell": "^8.17.2",
+    "eslint": "^9.18.0",
     "eslint-plugin-deprecation": "^3.0.0",
     "eslint-plugin-import": "^2.31.0",
-    "eslint-plugin-react-hooks": "5.1.0-rc-fb9a90fa48-20240614",
+    "eslint-plugin-react-hooks": "5.1.0",
     "eslint-plugin-unicorn": "^56.0.1",
     "eslint-plugin-vitest": "^0.5.4",
     "micromatch": "^4.0.8",
     "picocolors": "~1.1.1",
-    "playwright": "^1.49.0",
-    "prettier": "~3.3.3",
+    "playwright": "^1.50.0",
+    "prettier": "~3.4.2",
     "prettier-plugin-astro": "^0.14.1",
     "prettier-plugin-organize-imports": "~4.1.0",
+    "prettier-plugin-sh": "^0.14.0",
     "rimraf": "~6.0.1",
     "syncpack": "^13.0.0",
     "tsx": "^4.19.2",
-    "typescript": "~5.6.3",
-    "typescript-eslint": "^8.15.0",
-    "vitest": "^2.1.5",
-    "yaml": "~2.5.1"
+    "typescript": "~5.7.3",
+    "typescript-eslint": "^8.21.0",
+    "vite-plugin-node-polyfills": "^0.23.0",
+    "vitest": "^3.0.5",
+    "yaml": "~2.7.0"
   },
   "syncpack": {
     "dependencyTypes": [

package/package.json

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

package/readme.md

@@ -161,7 +161,7 @@ With the fields specified below:
 |-----|----|--------|-----------|-------|
 |operationId|String|true|The `operationId` of the operation. For global polling configuration, use `default`. Case insensitive.|`Pets_put`|
 |strategy|String|false|The invocation to construct a polling strategy. Use fully qualified class name if outside the implementation subpackage specified in `namespace` & `implementation-subpackage`. Use dynamic literals `{httpPipeline}`, `{context}`, `{serializerAdapter}`, `{endpoint}`, `{serviceVersion}`, `{intermediate-type}`, `{final-type}` if these components are required to construct the polling strategy. Default is `new DefaultPollingStrategy<>(new PollingStrategyOptions({httpPipeline}).setEndpoint({endpoint}).setContext({context}).setServiceVersion({serviceVersion}))`.|`new com.azure.core.util.polling.OperationResourcePollingStrategy<>({httpPipeline}, {context})`|
-|sync-stragety|String|false|Similar to `stragety`. It refers to the synchronous operation resource polling strategy.||
+|sync-strategy|String|false|Similar to `strategy`. It refers to the synchronous operation resource polling strategy.||
 |intermediate-type|String|false|The type of the polling intermediate type. Use fully qualified class name if outside the base package specified in `namespace`. Default is the return type specified on the operation in Swagger, or `BinaryData` if the operation returns `void`.|`PollResult`,`com.azure.core.util.BinaryData`|
 |final-type|String|false|The type of the final result type. Use fully qualified class name if outside the base package specified in `namespace`. Default is the return type specified on the operation in Swagger, or `BinaryData` if the operation returns `void`.|`Pet`,`com.azure.core.util.BinaryData`|
 |poll-interval|integer|false|The default interval in seconds to poll with (can be modified by users in `PollerFlux` and `SyncPoller`. Default is 1.|30|
@@ -296,6 +296,159 @@ This contains the generated classes from the [test swaggers](https://github.com/
 
 This also contains test code for these generated code under `src/test`. Running the tests will hit the test server running locally (see https://github.com/Azure/autorest.testserver for instructions) and verify the correctness of the generated code.
 
+# Working with the core submodule
+
+This repository uses a git
+[submodule](https://git-scm.com/book/en/v2/Git-Tools-Submodules) for the
+[TypeSpec OSS core](https://github.com/microsoft/typespec).
+
+This section covers some basic everyday tasks for working with it. The steps
+below are are really just one possible workflow. There's more than one way
+to accomplish these tasks and if you prefer to do it differently, that's
+fine too!
+
+## Configuring git to recurse submodules automatically for most commands
+
+Run the following command:
+
+```
+git config --global submodule.recurse true
+```
+
+This will effectively pass `--recurse-submodules` for you to git commands
+that accept it. It should eliminate some of the common pain points around
+submodules.
+
+NOTE: git clone is exceptional, see below.
+
+## Cloning recursively
+
+`git clone` does not recurse submodules automatically, even with
+submodule.recurse=true as configured above.
+
+Fork the repo, then clone recursively as follows:
+
+```
+git clone --recurse-submodules https://github.com/(your_username)/autorest.java
+```
+
+## Updating and initializing the submodule
+
+In some situations, even with the above setting, you may still end up with the core/ folder
+being uninitialized and not having a good clone of microsoft/typespec, or with the core/ folder
+initialized, but checked out to the wrong commit for the current branch. To fix this, run the
+following command to update and initialize the submodule:
+
+```
+git submodule update --init
+```
+
+## Point the submodule origin remote to your fork
+
+You can change the remotes of the submodule so that `origin` is your fork of
+microsoft/typespec rather than microsoft/typespec itself, and microsoft/typespec is
+`upstream`:
+
+```
+cd [repo_root]
+cd core
+git remote remove origin
+git remote add origin https://github.com/(your_username)/typespec
+git remote add upstream https://github.com/microsoft/typespec
+```
+
+## Build
+
+Run "Build-TypeSpec.ps1" script to build `@azure-tools/typespec-java` as TypeSpec emitter.
+
+The TypeSpec emitter can be installed via e.g.
+```
+npm install [repo_root]/typespec-extension/azure-tools-typespec-java-[version].tgz
+```
+
+Run "Build-AutoRest.ps1" script to build `@autorest/java` as Autorest extension.
+
+The AutoRest extension can be used via e.g.
+```
+autorest --use="[repo_root]" --java [readme.md]
+```
+
+:warning: the script would "checkout" unstaged code in "./core" submodule. Please stage/commit your code there.
+
+Before building Maven project and packaging NPM package, the script does 3 things:
+
+1. Apply a patch to code in "core", mainly for switching to `azure-autorest-customization` as customization lib. -- This is the only step that affect AutoRest extension.
+2. Build the JAR for `core/packages/http-client-java/generator/http-client-generator` module (with the patch to code in step 1), and copy it to `typespec-extension/generator/http-client-generator`.
+3. Copy the source from `core/packages/http-client-java/emitter` (with the patch to code in step 1) to `typespec-extension`.
+
+If you do not plan to modify these patched files in your PR, you can use "assume-unchanged" to ignore the changes on these files:
+```
+git update-index --assume-unchanged packages/http-client-java/emitter/src/code-model-builder.ts packages/http-client-java/emitter/src/lib.ts packages/http-client-java/generator/http-client-generator-core/pom.xml packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/postprocessor/Postprocessor.java packages/http-client-java/generator/http-client-generator/src/main/resources/readme/pom.xml
+```
+"no-assume-unchanged" would unset the files marked by "assume-unchanged".
+
+Alternatively, you can commit the patched files, and revert this commit before creating the pull request for review.
+
+## Making a cross-cutting change across both repos
+
+1. Make matching branches:
+
+```
+cd core
+git checkout -b featurebranch
+
+cd ..
+git checkout -b featurebranch
+```
+
+2. Make your changes as needed to both repos.
+
+3. Commit changes to both repos:
+
+```
+cd core
+git commit -a -m "Core part of my change"
+
+cd ..
+git commit -a -m "Azure-specific part of my change"
+```
+
+4. Push
+
+```
+git push origin featurebranch
+```
+
+NOTE: If you configured submodule.recurse=true as shown above, this will
+automatically push the submodule typespec branch along with the autorest.java
+branch. If you prefer not to use that, then `cd core` and push that too.
+
+5. Create 2 PRs from the two branches that were pushed to your
+   microsoft/typespec and Azure/autorest.java forks. Start with the microsoft/typespec
+   PR, then follow up with the Azure/autorest.java PR that depends on it.
+
+6. Get approval for both PRs before merging either of them.
+
+7. Merge the microsoft/typespec PR first.
+
+8. Update the submodule to point to the actual commit you merged to microsoft/typespec main:
+
+```
+cd core
+git fetch --all
+git checkout upstream/main
+
+cd ..
+git commit -a -m "Update submodule"
+git push origin featurebranch
+```
+
+9. Merge the autorest.java PR and you're done.
+
+Note that you only need to do all of the above when your changes span both
+repos. If you are only changing one repo or the other, then just work in
+each individual repo as you would any other.
+
 # Contributing
 
 This project welcomes contributions and suggestions.  Most contributions require you to agree to a

package/typespec-extension/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@azure-tools/typespec-java",
-  "version": "0.26.1",
+  "version": "0.27.4",
   "description": "TypeSpec library for emitting Java client from the TypeSpec REST protocol binding",
   "keywords": [
     "TypeSpec"
@@ -17,21 +17,21 @@
   },
   "license": "MIT",
   "type": "module",
-  "main": "dist/src/emitter.js",
+  "main": "dist/src/index.js",
   "exports": {
-    ".": "./dist/src/emitter.js",
-    "./testing": "./dist/src/testing/index.js"
+    ".": {
+      "types": "./dist/src/index.d.ts",
+      "default": "./dist/src/index.js"
+    }
   },
-  "tspMain": "dist/src/emitter.js",
   "engines": {
-    "node": ">=14.0.0"
+    "node": ">=18.0.0"
   },
   "scripts": {
     "clean": "rimraf ./dist ./temp",
     "build": "tsc -p .",
     "watch": "tsc -p . --watch",
-    "test": "mocha",
-    "test-official": "c8 mocha --forbid-only",
+    "test": "vitest run",
     "lint": "eslint . --ext .ts --max-warnings=0",
     "lint:fix": "eslint . --fix --ext .ts",
     "format": "npm run -s prettier -- --write",
@@ -45,17 +45,18 @@
     "generator/http-client-generator/target/emitter.jar"
   ],
   "peerDependencies": {
-    "@azure-tools/typespec-azure-core": ">=0.48.0 <1.0.0",
-    "@azure-tools/typespec-azure-resource-manager": ">=0.48.0 <1.0.0",
-    "@azure-tools/typespec-autorest": ">=0.48.0 <1.0.0",
-    "@azure-tools/typespec-azure-rulesets": ">=0.48.0 <1.0.0",
-    "@azure-tools/typespec-client-generator-core": ">=0.48.5 <1.0.0",
-    "@typespec/compiler": ">=0.62.0 <1.0.0",
-    "@typespec/http": ">=0.62.0 <1.0.0",
-    "@typespec/openapi": ">=0.62.0 <1.0.0",
-    "@typespec/rest": ">=0.62.0 <1.0.0",
-    "@typespec/versioning": ">=0.62.0 <1.0.0",
-    "@typespec/xml": ">=0.62.0 <1.0.0"
+    "@azure-tools/typespec-azure-core": ">=0.50.0 <1.0.0",
+    "@azure-tools/typespec-azure-resource-manager": ">=0.50.0 <1.0.0",
+    "@azure-tools/typespec-autorest": ">=0.50.0 <1.0.0",
+    "@azure-tools/typespec-azure-rulesets": ">=0.50.0 <1.0.0",
+    "@azure-tools/typespec-client-generator-core": ">=0.50.3 <1.0.0",
+    "@typespec/compiler": ">=0.64.0 <1.0.0",
+    "@typespec/http": ">=0.64.0 <1.0.0",
+    "@typespec/openapi": ">=0.64.0 <1.0.0",
+    "@typespec/rest": ">=0.64.0 <1.0.0",
+    "@typespec/versioning": ">=0.64.0 <1.0.0",
+    "@typespec/xml": ">=0.64.0 <1.0.0",
+    "@azure-tools/typespec-liftr-base": ">=0.7.0 <1.0.0"
   },
   "dependencies": {
     "@autorest/codemodel": "~4.20.0",
@@ -63,29 +64,31 @@
     "lodash": "~4.17.21"
   },
   "devDependencies": {
-    "@azure-tools/typespec-azure-core": "0.48.0",
-    "@azure-tools/typespec-azure-resource-manager": "0.48.0",
-    "@azure-tools/typespec-autorest": "0.48.0",
-    "@azure-tools/typespec-azure-rulesets": "0.48.0",
-    "@azure-tools/typespec-client-generator-core": "0.48.5",
+    "@azure-tools/typespec-azure-core": "0.51.0",
+    "@azure-tools/typespec-azure-resource-manager": "0.51.0",
+    "@azure-tools/typespec-autorest": "0.51.0",
+    "@azure-tools/typespec-azure-rulesets": "0.51.0",
+    "@azure-tools/typespec-client-generator-core": "0.51.0",
     "@types/js-yaml": "~4.0.9",
-    "@types/lodash": "~4.17.13",
-    "@types/mocha": "~10.0.9",
-    "@types/node": "~22.9.0",
-    "@typescript-eslint/eslint-plugin": "~8.14.0",
-    "@typescript-eslint/parser": "~8.14.0",
-    "@typespec/compiler": "0.62.0",
-    "@typespec/http": "0.62.0",
-    "@typespec/openapi": "0.62.0",
-    "@typespec/rest": "0.62.0",
-    "@typespec/versioning": "0.62.0",
-    "@typespec/xml": "0.62.0",
-    "c8": "~10.1.2",
+    "@types/lodash": "~4.17.15",
+    "@types/node": "~22.13.1",
+    "@typescript-eslint/eslint-plugin": "~8.24.0",
+    "@typescript-eslint/parser": "~8.24.0",
+    "@typespec/compiler": "0.65.0",
+    "@typespec/http": "0.65.0",
+    "@typespec/openapi": "0.65.0",
+    "@typespec/rest": "0.65.0",
+    "@typespec/versioning": "0.65.0",
+    "@typespec/xml": "0.65.0",
+    "@vitest/coverage-v8": "^3.0.5",
+    "@vitest/ui": "^3.0.5",
+    "c8": "~10.1.3",
     "eslint": "~8.57.0",
     "eslint-plugin-deprecation": "~3.0.0",
-    "mocha": "~10.8.2",
-    "prettier": "~3.3.3",
+    "prettier": "~3.5.0",
     "rimraf": "~6.0.1",
-    "typescript": "~5.6.3"
+    "typescript": "~5.7.3",
+    "vitest": "^3.0.5",
+    "@azure-tools/typespec-liftr-base": "0.7.0"
   }
 }

package/typespec-tests/package.json

@@ -6,28 +6,29 @@
     "format": "npm run -s prettier -- --write",
     "check-format": "npm run prettier -- --check",
     "prettier": "prettier --config ./.prettierrc.yaml **/*.tsp",
-    "testserver-run": "npx cadl-ranch serve ./node_modules/@azure-tools/cadl-ranch-specs/http --coverageFile ./cadl-ranch-coverage-java.json"
+    "spector-serve": "tsp-spector serve ./node_modules/@typespec/http-specs/specs ./node_modules/@azure-tools/azure-http-specs/specs --coverageFile ./tsp-spector-coverage-java.json"
   },
   "dependencies": {
-    "@azure-tools/cadl-ranch-specs": "0.39.4",
-    "@azure-tools/typespec-java": "file:/../typespec-extension/azure-tools-typespec-java-0.26.1.tgz"
+    "@typespec/http-specs": "0.1.0-alpha.9",
+    "@azure-tools/azure-http-specs": "0.1.0-alpha.6",
+    "@azure-tools/typespec-java": "file:/../typespec-extension/azure-tools-typespec-java-0.27.4.tgz"
   },
   "devDependencies": {
-    "@typespec/prettier-plugin-typespec": "~0.62.0",
+    "@typespec/prettier-plugin-typespec": "~0.65.0",
     "prettier-plugin-organize-imports": "4.1.0",
-    "prettier": "~3.3.3"
+    "prettier": "~3.5.0"
   },
   "overrides": {
-    "@typespec/compiler": "~0.62.0",
-    "@typespec/http": "~0.62.0",
-    "@typespec/rest": "~0.62.0",
-    "@typespec/versioning": "~0.62.0",
-    "@typespec/openapi": "~0.62.0",
-    "@typespec/xml": "~0.62.0",
-    "@azure-tools/typespec-azure-core": "~0.48.0",
-    "@azure-tools/typespec-client-generator-core": "~0.48.0",
-    "@azure-tools/typespec-azure-resource-manager": "~0.48.0",
-    "@azure-tools/typespec-autorest": "~0.48.0"
+    "@typespec/compiler": "~0.65.0",
+    "@typespec/http": "~0.65.0",
+    "@typespec/rest": "~0.65.0",
+    "@typespec/versioning": "~0.65.0",
+    "@typespec/openapi": "~0.65.0",
+    "@typespec/xml": "~0.65.0",
+    "@azure-tools/typespec-azure-core": "~0.51.0",
+    "@azure-tools/typespec-client-generator-core": "~0.51.0",
+    "@azure-tools/typespec-azure-resource-manager": "~0.51.0",
+    "@azure-tools/typespec-autorest": "~0.51.0"
   },
   "private": true
 }