@autorest/java 4.1.25 → 4.1.27

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (11) hide show
  1. package/androidgen/package.json +3 -3
  2. package/androidgen/target/azure-autorest-androidgen-jar-with-dependencies.jar +0 -0
  3. package/fluentgen/package.json +2 -2
  4. package/fluentgen/target/azure-autorest-fluentgen-jar-with-dependencies.jar +0 -0
  5. package/javagen/package.json +2 -2
  6. package/javagen/target/azure-autorest-javagen-jar-with-dependencies.jar +0 -0
  7. package/package.json +5 -5
  8. package/typespec-extension/package.json +24 -16
  9. package/typespec-extension/readme.md +2 -2
  10. package/typespec-tests/package.json +12 -13
  11. package/typespec-tests/readme.md +15 -0
package/androidgen/package.json CHANGED
@@ -4,8 +4,8 @@
4
4
  "description": "The Android extension for classic generators in AutoRest.",
5
5
  "scripts": {
6
6
  "autorest": "autorest",
7
- "start": "java -jar target/azure-autorest-androidgen-jar-with-dependencies.jar",
8
- "debug": "java -agentlib:jdwp=transport=dt_socket,server=y,suspend=y,quiet=y,address=5005 -jar target/azure-autorest-androidgen-jar-with-dependencies.jar",
7
+ "start": "java --add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED --add-exports=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED --add-exports=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED --add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED --add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED --add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED -jar target/azure-autorest-androidgen-jar-with-dependencies.jar",
8
+ "debug": "java --add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED --add-exports=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED --add-exports=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED --add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED --add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED --add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED -agentlib:jdwp=transport=dt_socket,server=y,suspend=y,quiet=y,address=5005 -jar target/azure-autorest-androidgen-jar-with-dependencies.jar",
9
9
  "build": "mvn package -Dlocal"
10
10
  },
11
11
  "repository": {
@@ -24,4 +24,4 @@
24
24
  "url": "https://github.com/Azure/autorest/issues"
25
25
  },
26
26
  "homepage": "https://github.com/Azure/autorest.java/blob/main/README.md"
27
- }
27
+ }
package/fluentgen/package.json CHANGED
@@ -4,8 +4,8 @@
4
4
  "description": "The Java extension for classic generators in AutoRest.",
5
5
  "scripts": {
6
6
  "autorest": "autorest",
7
- "start": "java -jar target/azure-autorest-fluentgen-jar-with-dependencies.jar",
8
- "debug": "java -agentlib:jdwp=transport=dt_socket,server=y,suspend=y,quiet=y,address=5005 -jar target/azure-autorest-fluentgen-jar-with-dependencies.jar",
7
+ "start": "java --add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED --add-exports=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED --add-exports=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED --add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED --add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED --add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED -jar target/azure-autorest-fluentgen-jar-with-dependencies.jar",
8
+ "debug": "java --add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED --add-exports=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED --add-exports=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED --add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED --add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED --add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED -agentlib:jdwp=transport=dt_socket,server=y,suspend=y,quiet=y,address=5005 -jar target/azure-autorest-fluentgen-jar-with-dependencies.jar",
9
9
  "build": "mvn package -P local"
10
10
  },
11
11
  "repository": {
package/javagen/package.json CHANGED
@@ -4,8 +4,8 @@
4
4
  "description": "The Java extension for classic generators in AutoRest.",
5
5
  "scripts": {
6
6
  "autorest": "autorest",
7
- "start": "java -jar target/azure-autorest-javagen-jar-with-dependencies.jar",
8
- "debug": "java -agentlib:jdwp=transport=dt_socket,server=y,suspend=y,quiet=y,address=5005 -jar target/azure-autorest-javagen-jar-with-dependencies.jar",
7
+ "start": "java --add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED --add-exports=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED --add-exports=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED --add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED --add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED --add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED -jar target/azure-autorest-javagen-jar-with-dependencies.jar",
8
+ "debug": "java --add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED --add-exports=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED --add-exports=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED --add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED --add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED --add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED -agentlib:jdwp=transport=dt_socket,server=y,suspend=y,quiet=y,address=5005 -jar target/azure-autorest-javagen-jar-with-dependencies.jar",
9
9
  "build": "mvn package -Dlocal"
10
10
  },
11
11
  "repository": {
package/package.json CHANGED
@@ -1,11 +1,11 @@
1
1
  {
2
2
  "name": "@autorest/java",
3
- "version": "4.1.25",
3
+ "version": "4.1.27",
4
4
  "description": "The Java extension for classic generators in AutoRest.",
5
5
  "scripts": {
6
6
  "autorest": "autorest",
7
- "start": "java -jar javagen/target/azure-autorest-javagen-jar-with-dependencies.jar",
8
- "debug": "java -agentlib:jdwp=transport=dt_socket,server=y,suspend=y,quiet=y,address=5005 -jar javagen/target/azure-autorest-javagen-jar-with-dependencies.jar",
7
+ "start": "java --add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED --add-exports=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED --add-exports=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED --add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED --add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED --add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED -jar javagen/target/azure-autorest-javagen-jar-with-dependencies.jar",
8
+ "debug": "java --add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED --add-exports=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED --add-exports=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED --add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED --add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED --add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED -agentlib:jdwp=transport=dt_socket,server=y,suspend=y,quiet=y,address=5005 -jar javagen/target/azure-autorest-javagen-jar-with-dependencies.jar",
9
9
  "build": "mvn package -P local",
10
10
  "generate": "./generate",
11
11
  "testserver-run": "autorest-testserver run",
@@ -39,7 +39,7 @@
39
39
  "*/target/*-jar-with-dependencies.jar"
40
40
  ],
41
41
  "devDependencies": {
42
- "autorest": "^3.0.0",
43
- "@microsoft.azure/autorest.testserver": "3.3.45"
42
+ "autorest": "^3.7.1",
43
+ "@microsoft.azure/autorest.testserver": "3.3.48"
44
44
  }
45
45
  }
package/typespec-extension/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@azure-tools/typespec-java",
3
- "version": "0.12.0",
3
+ "version": "0.13.4",
4
4
  "description": "TypeSpec library for emitting Java client from the TypeSpec REST protocol binding",
5
5
  "keywords": [
6
6
  "TypeSpec"
@@ -42,15 +42,16 @@
42
42
  "lib/*.tsp",
43
43
  "dist/**",
44
44
  "!dist/test/**",
45
- "target/azure-typespec-extension-jar-with-dependencies.jar"
45
+ "target/emitter.jar"
46
46
  ],
47
47
  "peerDependencies": {
48
- "@typespec/compiler": ">=0.50.0 <1.0.0",
49
- "@typespec/rest": ">=0.50.0 <1.0.0",
50
- "@typespec/openapi": ">=0.50.0 <1.0.0",
51
- "@typespec/versioning": ">=0.50.0 <1.0.0",
52
- "@azure-tools/typespec-azure-core": ">=0.36.0 <1.0.0",
53
- "@azure-tools/typespec-client-generator-core": ">=0.36.1 <1.0.0"
48
+ "@typespec/compiler": ">=0.52.0 <1.0.0",
49
+ "@typespec/http": ">=0.52.0 <1.0.0",
50
+ "@typespec/rest": ">=0.52.0 <1.0.0",
51
+ "@typespec/openapi": ">=0.52.0 <1.0.0",
52
+ "@typespec/versioning": ">=0.52.0 <1.0.0",
53
+ "@azure-tools/typespec-azure-core": ">=0.38.0 <1.0.0",
54
+ "@azure-tools/typespec-client-generator-core": ">=0.39.0 <1.0.0"
54
55
  },
55
56
  "dependencies": {
56
57
  "@autorest/codemodel": "~4.20.0",
@@ -58,18 +59,25 @@
58
59
  "js-yaml": "~4.1.0"
59
60
  },
60
61
  "devDependencies": {
61
- "prettier": "~3.1.0",
62
+ "prettier": "~3.2.5",
62
63
  "@types/lodash": "~4.14.202",
63
64
  "@types/js-yaml": "~4.0.9",
64
65
  "@types/mocha": "~10.0.6",
65
- "@types/node": "~20.10.0",
66
- "c8": "~8.0.1",
67
- "eslint": "~8.54.0",
66
+ "@types/node": "~20.11.16",
67
+ "c8": "~9.1.0",
68
+ "eslint": "~8.56.0",
68
69
  "mocha": "~10.2.0",
69
70
  "rimraf": "~5.0.5",
70
- "typescript": "~5.3.2",
71
- "@typescript-eslint/parser": "~6.12.0",
72
- "@typescript-eslint/eslint-plugin": "~6.12.0",
73
- "eslint-plugin-deprecation": "~2.0.0"
71
+ "typescript": "~5.3.3",
72
+ "@typescript-eslint/parser": "~6.21.0",
73
+ "@typescript-eslint/eslint-plugin": "~6.21.0",
74
+ "eslint-plugin-deprecation": "~2.0.0",
75
+ "@azure-tools/typespec-azure-core": "0.39.0",
76
+ "@azure-tools/typespec-client-generator-core": "0.39.0",
77
+ "@typespec/compiler": "0.53.0",
78
+ "@typespec/http": "0.53.0",
79
+ "@typespec/openapi": "0.53.0",
80
+ "@typespec/rest": "0.53.0",
81
+ "@typespec/versioning": "0.53.0"
74
82
  }
75
83
  }
package/typespec-extension/readme.md CHANGED
@@ -4,7 +4,7 @@ Install [Node.js](https://nodejs.org/en/download/) 16 or above. (Verify by `node
4
4
 
5
5
  Install [Java](https://docs.microsoft.com/java/openjdk/download) 11 or above. (Verify by `java --version`)
6
6
 
7
- Install [TypeSpec](https://github.com/microsoft/typespec/) 0.47.
7
+ Install [TypeSpec](https://github.com/microsoft/typespec/) 0.53.
8
8
 
9
9
  # Initialize TypeSpec Project
10
10
 
@@ -61,8 +61,8 @@ options:
61
61
  generate-samples: true
62
62
  generate-tests: true
63
63
  examples-directory: "./examples"
64
- namer: false
65
64
  partial-update: false
65
+ models-subpackage: "models"
66
66
  custom-types-subpackage: "implementation.models"
67
67
  custom-types: InternalModel1,InternalModel2
68
68
  ```
package/typespec-tests/package.json CHANGED
@@ -9,24 +9,23 @@
9
9
  "testserver-run": "npx cadl-ranch serve ./node_modules/@azure-tools/cadl-ranch-specs/http --coverageFile ./cadl-ranch-coverage-java.json"
10
10
  },
11
11
  "dependencies": {
12
- "@typespec/openapi": ">=0.50.0 <1.0.0",
13
- "@azure-tools/typespec-autorest": ">=0.36.1 <1.0.0",
14
- "@azure-tools/cadl-ranch-specs": "0.27.1",
15
- "@azure-tools/typespec-java": "file:/../typespec-extension/azure-tools-typespec-java-0.12.0.tgz"
12
+ "@azure-tools/cadl-ranch-specs": "0.29.0",
13
+ "@azure-tools/typespec-java": "file:/../typespec-extension/azure-tools-typespec-java-0.13.4.tgz"
16
14
  },
17
15
  "devDependencies": {
18
- "@typespec/prettier-plugin-typespec": "~0.50.0",
16
+ "@typespec/prettier-plugin-typespec": "~0.53.0",
17
+ "@azure-tools/typespec-azure-resource-manager": "~0.39.0",
19
18
  "prettier-plugin-organize-imports": "3.2.4",
20
- "prettier": "~3.1.0"
19
+ "prettier": "~3.2.5"
21
20
  },
22
21
  "overrides": {
23
- "@typespec/compiler": ">=0.50.0 <1.0.0",
24
- "@typespec/http": ">=0.50.0 <1.0.0",
25
- "@typespec/rest": ">=0.50.0 <1.0.0",
26
- "@typespec/versioning": ">=0.50.0 <1.0.0",
27
- "@typespec/openapi": ">=0.50.0 <1.0.0",
28
- "@azure-tools/typespec-azure-core": ">=0.36.0 <1.0.0",
29
- "@azure-tools/typespec-client-generator-core": ">=0.36.0 <1.0.0"
22
+ "@typespec/compiler": ">=0.52.0 <1.0.0",
23
+ "@typespec/http": ">=0.52.0 <1.0.0",
24
+ "@typespec/rest": ">=0.52.0 <1.0.0",
25
+ "@typespec/versioning": ">=0.52.0 <1.0.0",
26
+ "@typespec/openapi": ">=0.52.0 <1.0.0",
27
+ "@azure-tools/typespec-azure-core": ">=0.38.0 <1.0.0",
28
+ "@azure-tools/typespec-client-generator-core": ">=0.38.0 <1.0.0"
30
29
  },
31
30
  "private": true
32
31
  }
package/typespec-tests/readme.md CHANGED
@@ -38,6 +38,21 @@ This is usually to do a quick check whether the modified TypeSpec-Java works as
38
38
 
39
39
  Generated code will be at `./typespec-tests/tsp-output/` folder for inspect.
40
40
 
41
+ ## Debugging Java code
42
+
43
+ `tspconfig.yaml` already configured
44
+ ```yaml
45
+ dev-options:
46
+ generate-code-model: true
47
+ ```
48
+
49
+ With this option, a `code-model.yaml` file is kept in `./typespec-tests/tsp-output/` folder after `tsp compile <target.tsp>`.
50
+
51
+ `Main.java` under `./typespec-extension` would load this `code-model.yaml` file as default, and run the Java code to generate the code (`google-java-format` used in the module requires adding `--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED --add-exports=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED --add-exports=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED --add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED --add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED --add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED` to VM options).
52
+ At this stage, one can modify or debug the Java code (`./typespec-extension/src/main/java/`) in IDE. The code generated in `./typespec-tests/tsp-output/` would reflect the modified Java code.
53
+
54
+ Notice: there maybe some difference of other option between `tspconfig.yaml` and `EmitterOptions.java`. Remember to temporary modify `EmitterOptions.java` to reflect the option in `tspconfig.yaml` when running `Main.java` this way. (e.g. set `streamStyleSerialization` to `true`)
55
+
41
56
  ## Troubleshooting
42
57
 
43
58
  ### New version of `@typespec/compiler` etc.