@azure-tools/typespec-java 0.27.1 → 0.27.2
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.
- package/dist/src/code-model-builder.d.ts +0 -1
- package/dist/src/code-model-builder.d.ts.map +1 -1
- package/dist/src/code-model-builder.js +85 -41
- package/dist/src/code-model-builder.js.map +1 -1
- package/dist/src/common/client.d.ts +1 -4
- package/dist/src/common/client.d.ts.map +1 -1
- package/dist/src/common/operation.d.ts +1 -2
- package/dist/src/common/operation.d.ts.map +1 -1
- package/dist/src/common/operation.js.map +1 -1
- package/dist/src/emitter.d.ts.map +1 -1
- package/dist/src/emitter.js +21 -9
- package/dist/src/emitter.js.map +1 -1
- package/dist/src/external-schemas.d.ts.map +1 -1
- package/dist/src/external-schemas.js +3 -4
- package/dist/src/external-schemas.js.map +1 -1
- package/dist/src/utils.d.ts +7 -2
- package/dist/src/utils.d.ts.map +1 -1
- package/dist/src/utils.js +12 -7
- package/dist/src/utils.js.map +1 -1
- package/dist/src/validate.d.ts +1 -0
- package/dist/src/validate.d.ts.map +1 -1
- package/dist/src/validate.js +34 -9
- package/dist/src/validate.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/generator/http-client-generator/target/emitter.jar +0 -0
- package/package.json +28 -28
- package/readme.md +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"external-schemas.js","sourceRoot":"","sources":["../../src/external-schemas.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,WAAW,EAEX,YAAY,EACZ,QAAQ,GAIT,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"external-schemas.js","sourceRoot":"","sources":["../../src/external-schemas.ts"],"names":[],"mappings":"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"}
|
package/dist/src/utils.d.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { Program, Type } from "@typespec/compiler";
|
|
2
2
|
import { SpawnOptions } from "child_process";
|
|
3
|
-
export declare function logError(program: Program, msg: string): void;
|
|
4
|
-
export declare function logWarning(program: Program, msg: string): void;
|
|
3
|
+
export declare function logError(program: Program, msg: string, code?: string): void;
|
|
4
|
+
export declare function logWarning(program: Program, msg: string, code?: string): void;
|
|
5
5
|
export declare function trace(program: Program, msg: string): void;
|
|
6
6
|
export declare function pascalCase(name: string): string;
|
|
7
7
|
export declare function getNamespace(type: Type | undefined): string | undefined;
|
|
@@ -11,5 +11,10 @@ export type SpawnReturns = {
|
|
|
11
11
|
stdout: string;
|
|
12
12
|
stderr: string;
|
|
13
13
|
};
|
|
14
|
+
export declare class SpawnError extends Error {
|
|
15
|
+
stdout: string;
|
|
16
|
+
stderr: string;
|
|
17
|
+
constructor(message: string, stdout: string, stderr: string);
|
|
18
|
+
}
|
|
14
19
|
export declare function spawnAsync(command: string, args: readonly string[], options: SpawnOptions): Promise<SpawnReturns>;
|
|
15
20
|
//# sourceMappingURL=utils.d.ts.map
|
package/dist/src/utils.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,OAAO,EAAE,IAAI,EAAE,MAAM,oBAAoB,CAAC;AAC7D,OAAO,EAAS,YAAY,EAAE,MAAM,eAAe,CAAC;AAEpD,wBAAgB,QAAQ,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,OAAO,EAAE,IAAI,EAAE,MAAM,oBAAoB,CAAC;AAC7D,OAAO,EAAS,YAAY,EAAE,MAAM,eAAe,CAAC;AAEpD,wBAAgB,QAAQ,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,IAAI,GAAE,MAA2B,QAOxF;AAED,wBAAgB,UAAU,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,IAAI,GAAE,MAA2B,QAO1F;AAED,wBAAgB,KAAK,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,QAElD;AAED,wBAAgB,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAM/C;AAED,wBAAgB,YAAY,CAAC,IAAI,EAAE,IAAI,GAAG,SAAS,GAAG,MAAM,GAAG,SAAS,CAmBvE;AAED,wBAAgB,6BAA6B,CAAC,UAAU,EAAE,MAAM,EAAE,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAIxF;AAED,wBAAgB,kBAAkB,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,CAG7D;AAED,MAAM,MAAM,YAAY,GAAG;IACzB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,qBAAa,UAAW,SAAQ,KAAK;IACnC,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;gBAEH,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM;CAK5D;AAED,wBAAsB,UAAU,CAC9B,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,SAAS,MAAM,EAAE,EACvB,OAAO,EAAE,YAAY,GACpB,OAAO,CAAC,YAAY,CAAC,CAoDvB"}
|
package/dist/src/utils.js
CHANGED
|
@@ -1,18 +1,16 @@
|
|
|
1
1
|
import { NoTarget } from "@typespec/compiler";
|
|
2
2
|
import { spawn } from "child_process";
|
|
3
|
-
export function logError(program, msg) {
|
|
4
|
-
trace(program, msg);
|
|
3
|
+
export function logError(program, msg, code = "http-client-java") {
|
|
5
4
|
program.reportDiagnostic({
|
|
6
|
-
code:
|
|
5
|
+
code: code,
|
|
7
6
|
severity: "error",
|
|
8
7
|
message: msg,
|
|
9
8
|
target: NoTarget,
|
|
10
9
|
});
|
|
11
10
|
}
|
|
12
|
-
export function logWarning(program, msg) {
|
|
13
|
-
trace(program, msg);
|
|
11
|
+
export function logWarning(program, msg, code = "http-client-java") {
|
|
14
12
|
program.reportDiagnostic({
|
|
15
|
-
code:
|
|
13
|
+
code: code,
|
|
16
14
|
severity: "warning",
|
|
17
15
|
message: msg,
|
|
18
16
|
target: NoTarget,
|
|
@@ -57,6 +55,13 @@ export function removeClientSuffix(clientName) {
|
|
|
57
55
|
const clientSuffix = "Client";
|
|
58
56
|
return clientName.endsWith(clientSuffix) ? clientName.slice(0, -clientSuffix.length) : clientName;
|
|
59
57
|
}
|
|
58
|
+
export class SpawnError extends Error {
|
|
59
|
+
constructor(message, stdout, stderr) {
|
|
60
|
+
super(message);
|
|
61
|
+
this.stdout = stdout;
|
|
62
|
+
this.stderr = stderr;
|
|
63
|
+
}
|
|
64
|
+
}
|
|
60
65
|
export async function spawnAsync(command, args, options) {
|
|
61
66
|
return new Promise((resolve, reject) => {
|
|
62
67
|
const childProcess = spawn(command, args, options);
|
|
@@ -82,7 +87,7 @@ export async function spawnAsync(command, args, options) {
|
|
|
82
87
|
childProcess.on("exit", (code, signal) => {
|
|
83
88
|
if (code !== 0) {
|
|
84
89
|
if (code) {
|
|
85
|
-
error = new
|
|
90
|
+
error = new SpawnError(`${command} ended with code '${code}'.`, stdout.join(""), stderr.join(""));
|
|
86
91
|
}
|
|
87
92
|
else {
|
|
88
93
|
error = new Error(`${command} terminated by signal '${signal}'.`);
|
package/dist/src/utils.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAiB,MAAM,oBAAoB,CAAC;AAC7D,OAAO,EAAE,KAAK,EAAgB,MAAM,eAAe,CAAC;AAEpD,MAAM,UAAU,QAAQ,CAAC,OAAgB,EAAE,GAAW
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/utils.ts"],"names":[],"mappings":"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"}
|
package/dist/src/validate.d.ts
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { Program } from "@typespec/compiler";
|
|
2
2
|
export declare const JDK_NOT_FOUND_MESSAGE = "Java Development Kit (JDK) is not found in PATH. Please install JDK 17 or above. Microsoft Build of OpenJDK can be downloaded from https://learn.microsoft.com/java/openjdk/download";
|
|
3
|
+
export declare const CODE_RUNTIME_DEPENDENCY = "invalid-runtime-dependency";
|
|
3
4
|
export declare function validateDependencies(program: Program | undefined, logDiagnostic?: boolean): Promise<void>;
|
|
4
5
|
//# sourceMappingURL=validate.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validate.d.ts","sourceRoot":"","sources":["../../src/validate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAG7C,eAAO,MAAM,qBAAqB,yLACsJ,CAAC;
|
|
1
|
+
{"version":3,"file":"validate.d.ts","sourceRoot":"","sources":["../../src/validate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAG7C,eAAO,MAAM,qBAAqB,yLACsJ,CAAC;AACzL,eAAO,MAAM,uBAAuB,+BAA+B,CAAC;AAEpE,wBAAsB,oBAAoB,CACxC,OAAO,EAAE,OAAO,GAAG,SAAS,EAC5B,aAAa,GAAE,OAAe,iBAyD/B"}
|
package/dist/src/validate.js
CHANGED
|
@@ -1,20 +1,25 @@
|
|
|
1
|
-
import { logError, spawnAsync } from "./utils.js";
|
|
1
|
+
import { logError, spawnAsync, trace } from "./utils.js";
|
|
2
2
|
export const JDK_NOT_FOUND_MESSAGE = "Java Development Kit (JDK) is not found in PATH. Please install JDK 17 or above. Microsoft Build of OpenJDK can be downloaded from https://learn.microsoft.com/java/openjdk/download";
|
|
3
|
+
export const CODE_RUNTIME_DEPENDENCY = "invalid-runtime-dependency";
|
|
3
4
|
export async function validateDependencies(program, logDiagnostic = false) {
|
|
4
|
-
var _a;
|
|
5
|
+
var _a, _b;
|
|
5
6
|
// Check JDK and version
|
|
6
7
|
try {
|
|
7
8
|
const result = await spawnAsync("javac", ["-version"], { stdio: "pipe" });
|
|
8
9
|
const javaVersion = (_a = findJavaVersion(result.stdout)) !== null && _a !== void 0 ? _a : findJavaVersion(result.stderr);
|
|
9
10
|
if (javaVersion) {
|
|
10
|
-
if (
|
|
11
|
+
if (program && logDiagnostic) {
|
|
12
|
+
trace(program, `Java Development Kit (JDK) in PATH is version ${javaVersion}.`);
|
|
13
|
+
}
|
|
14
|
+
const javaMajorVersion = getJavaMajorVersion(javaVersion);
|
|
15
|
+
if (javaMajorVersion < 11) {
|
|
11
16
|
// the message is JDK 17, because clientcore depends on JDK 17
|
|
12
17
|
// emitter only require JDK 11
|
|
13
18
|
const message = `Java Development Kit (JDK) in PATH is version ${javaVersion}. Please install JDK 17 or above. Microsoft Build of OpenJDK can be downloaded from https://learn.microsoft.com/java/openjdk/download`;
|
|
14
19
|
// // eslint-disable-next-line no-console
|
|
15
20
|
// console.log("[ERROR] " + message);
|
|
16
21
|
if (program && logDiagnostic) {
|
|
17
|
-
logError(program, message);
|
|
22
|
+
logError(program, message, CODE_RUNTIME_DEPENDENCY);
|
|
18
23
|
}
|
|
19
24
|
}
|
|
20
25
|
}
|
|
@@ -27,14 +32,20 @@ export async function validateDependencies(program, logDiagnostic = false) {
|
|
|
27
32
|
// // eslint-disable-next-line no-console
|
|
28
33
|
// console.log("[ERROR] " + message);
|
|
29
34
|
if (program && logDiagnostic) {
|
|
30
|
-
logError(program, message);
|
|
35
|
+
logError(program, message, CODE_RUNTIME_DEPENDENCY);
|
|
31
36
|
}
|
|
32
37
|
}
|
|
33
38
|
// Check Maven
|
|
34
39
|
// nodejs does not allow spawn of .cmd on win32
|
|
35
40
|
const shell = process.platform === "win32";
|
|
36
41
|
try {
|
|
37
|
-
await spawnAsync("mvn", ["-v"], { stdio: "pipe", shell: shell });
|
|
42
|
+
const result = await spawnAsync("mvn", ["-v"], { stdio: "pipe", shell: shell });
|
|
43
|
+
const mavenVersion = (_b = findMavenVersion(result.stdout)) !== null && _b !== void 0 ? _b : findMavenVersion(result.stderr);
|
|
44
|
+
if (mavenVersion) {
|
|
45
|
+
if (program && logDiagnostic) {
|
|
46
|
+
trace(program, `Apache Maven in PATH is version ${mavenVersion}.`);
|
|
47
|
+
}
|
|
48
|
+
}
|
|
38
49
|
}
|
|
39
50
|
catch (error) {
|
|
40
51
|
let message = error.message;
|
|
@@ -45,13 +56,19 @@ export async function validateDependencies(program, logDiagnostic = false) {
|
|
|
45
56
|
// // eslint-disable-next-line no-console
|
|
46
57
|
// console.log("[ERROR] " + message);
|
|
47
58
|
if (program && logDiagnostic) {
|
|
48
|
-
logError(program, message);
|
|
59
|
+
logError(program, message, CODE_RUNTIME_DEPENDENCY);
|
|
49
60
|
}
|
|
50
61
|
}
|
|
51
62
|
}
|
|
52
63
|
function findJavaVersion(output) {
|
|
53
|
-
const
|
|
54
|
-
|
|
64
|
+
const matches = output.match(/javac ([\d.]+).*/);
|
|
65
|
+
if (matches && matches.length > 1) {
|
|
66
|
+
return matches[1];
|
|
67
|
+
}
|
|
68
|
+
return undefined;
|
|
69
|
+
}
|
|
70
|
+
function getJavaMajorVersion(version) {
|
|
71
|
+
const matches = version.match(/(\d+)\.(\d+)\..*/);
|
|
55
72
|
if (matches && matches.length > 2) {
|
|
56
73
|
if (matches[1] === "1") {
|
|
57
74
|
// "javac 1.8.0_422" -> 8
|
|
@@ -62,6 +79,14 @@ function findJavaVersion(output) {
|
|
|
62
79
|
return +matches[1];
|
|
63
80
|
}
|
|
64
81
|
}
|
|
82
|
+
return 0;
|
|
83
|
+
}
|
|
84
|
+
function findMavenVersion(output) {
|
|
85
|
+
// there is control characters in the output
|
|
86
|
+
const matches = output.match(/.*Apache Maven ([\d.]+).*/);
|
|
87
|
+
if (matches && matches.length > 1) {
|
|
88
|
+
return matches[1];
|
|
89
|
+
}
|
|
65
90
|
return undefined;
|
|
66
91
|
}
|
|
67
92
|
//# sourceMappingURL=validate.js.map
|
package/dist/src/validate.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validate.js","sourceRoot":"","sources":["../../src/validate.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"validate.js","sourceRoot":"","sources":["../../src/validate.ts"],"names":[],"mappings":"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"}
|