@azure-tools/typespec-java 0.28.0 → 0.29.1
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 +4 -3
- package/dist/src/code-model-builder.d.ts.map +1 -1
- package/dist/src/code-model-builder.js +20 -20
- package/dist/src/code-model-builder.js.map +1 -1
- package/dist/src/common/client.d.ts +8 -1
- package/dist/src/common/client.d.ts.map +1 -1
- package/dist/src/common/client.js +11 -4
- package/dist/src/common/client.js.map +1 -1
- package/dist/src/emitter.d.ts.map +1 -1
- package/dist/src/emitter.js +10 -7
- package/dist/src/emitter.js.map +1 -1
- package/dist/src/options.d.ts.map +1 -1
- package/dist/src/options.js +6 -2
- package/dist/src/options.js.map +1 -1
- package/dist/src/validate.d.ts +2 -0
- package/dist/src/validate.d.ts.map +1 -1
- package/dist/src/validate.js +12 -3
- 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 +36 -36
- package/readme.md +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../../src/common/client.ts"],"names":[],"mappings":"AACA,OAAO,EACL,MAAM,EACN,UAAU,EACV,QAAQ,EACR,cAAc,EACd,SAAS,EACT,QAAQ,EACR,QAAQ,EACT,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAEnD,MAAM,WAAW,MAAO,SAAQ,MAAM;IACpC,sBAAsB;IACtB,eAAe,EAAE,KAAK,CAAC,cAAc,CAAC,CAAC;IAEvC,gBAAgB,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC,CAAC;IAEpC,QAAQ,EAAE,QAAQ,CAAC;IAEnB,cAAc,CAAC,EAAE,cAAc,CAAC;IAEhC;;OAEG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB;;OAEG;IACH,UAAU,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IAC1B;;OAEG;IACH,iBAAiB,EAAE,OAAO,CAAC;IAC3B;;OAEG;IACH,oBAAoB,EAAE,OAAO,CAAC;CAC/B;AAED,qBAAa,MAAO,SAAQ,MAAO,YAAW,MAAM;gBACtC,IAAI,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,iBAAiB,CAAC,EAAE,WAAW,CAAC,MAAM,CAAC;IAYtF,OAAO,KAAK,OAAO,GAElB;IAED,mBAAmB,CAAC,UAAU,EAAE,SAAS,EAAE;IAI3C,YAAY,CAAC,SAAS,EAAE,MAAM;
|
|
1
|
+
{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../../src/common/client.ts"],"names":[],"mappings":"AACA,OAAO,EACL,MAAM,EACN,UAAU,EACV,QAAQ,EACR,cAAc,EACd,SAAS,EACT,QAAQ,EACR,QAAQ,EACT,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAEnD,MAAM,WAAW,MAAO,SAAQ,MAAM;IACpC,sBAAsB;IACtB,eAAe,EAAE,KAAK,CAAC,cAAc,CAAC,CAAC;IAEvC,gBAAgB,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC,CAAC;IAEpC,QAAQ,EAAE,QAAQ,CAAC;IAEnB,cAAc,CAAC,EAAE,cAAc,CAAC;IAEhC;;OAEG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB;;OAEG;IACH,UAAU,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IAC1B;;OAEG;IACH,iBAAiB,EAAE,OAAO,CAAC;IAC3B;;OAEG;IACH,oBAAoB,EAAE,OAAO,CAAC;CAC/B;AAED,qBAAa,MAAO,SAAQ,MAAO,YAAW,MAAM;gBACtC,IAAI,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,iBAAiB,CAAC,EAAE,WAAW,CAAC,MAAM,CAAC;IAYtF,OAAO,KAAK,OAAO,GAElB;IAED,mBAAmB,CAAC,UAAU,EAAE,SAAS,EAAE;IAI3C;;;;;;OAMG;IACH,YAAY,CAAC,SAAS,EAAE,MAAM,EAAE,iBAAiB,EAAE,OAAO,EAAE,oBAAoB,EAAE,OAAO;CAS1F;AAED,qBAAa,cAAe,SAAQ,QAAQ;gBAC9B,IAAI,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,WAAW,CAAC,cAAc,CAAC;CAczF;AAED,MAAM,WAAW,aAAa;IAC5B;;;OAGG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,qBAAa,yBAAyB;IACpC;;OAEG;IACH,SAAS,EAAE,SAAS,CAAC;IAErB;;;OAGG;IACH,gBAAgB,CAAC,EAAE,KAAK,CAAC,QAAQ,CAAC,CAAC;IACnC;;OAEG;IACH,cAAc,CAAC,EAAE,UAAU,CAAC;gBAEhB,SAAS,EAAE,SAAS,EAAE,gBAAgB,CAAC,EAAE,QAAQ,EAAE,EAAE,cAAc,CAAC,EAAE,UAAU;CAK7F"}
|
|
@@ -16,12 +16,19 @@ export class Client extends Aspect {
|
|
|
16
16
|
addGlobalParameters(parameters) {
|
|
17
17
|
this.globals.push(...parameters);
|
|
18
18
|
}
|
|
19
|
-
|
|
19
|
+
/**
|
|
20
|
+
* Add a sub Client to Client.
|
|
21
|
+
*
|
|
22
|
+
* @param subClient the sub Client
|
|
23
|
+
* @param buildMethodPublic the sub Client can be initialized by its ClientBuilder
|
|
24
|
+
* @param parentAccessorPublic the sub Client can be accessed by its parent Client
|
|
25
|
+
*/
|
|
26
|
+
addSubClient(subClient, buildMethodPublic, parentAccessorPublic) {
|
|
20
27
|
subClient.parent = this;
|
|
21
|
-
subClient.buildMethodPublic =
|
|
22
|
-
subClient.parentAccessorPublic =
|
|
28
|
+
subClient.buildMethodPublic = buildMethodPublic;
|
|
29
|
+
subClient.parentAccessorPublic = parentAccessorPublic;
|
|
23
30
|
this.subClients.push(subClient);
|
|
24
|
-
// at present, sub client must
|
|
31
|
+
// at present, sub client must be in same namespace of its parent client
|
|
25
32
|
subClient.language.java.namespace = this.language.java.namespace;
|
|
26
33
|
}
|
|
27
34
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client.js","sourceRoot":"","sources":["../../../src/common/client.ts"],"names":[],"mappings":"AAAA,qEAAqE;AACrE,OAAO,EACL,MAAM,EAEN,QAAQ,EAIR,QAAQ,GACT,MAAM,qBAAqB,CAAC;AA+B7B,MAAM,OAAO,MAAO,SAAQ,MAAM;IAChC,YAAY,IAAY,EAAE,WAAmB,EAAE,iBAAuC;QACpF,KAAK,CAAC,IAAI,EAAE,WAAW,EAAE,iBAAiB,CAAC,CAAC;QAE5C,IAAI,CAAC,eAAe,GAAG,EAAE,CAAC;QAC1B,IAAI,CAAC,QAAQ,GAAG,IAAI,QAAQ,CAAC,KAAK,CAAC,CAAC;QACpC,IAAI,CAAC,UAAU,GAAG,EAAE,CAAC;QACrB,IAAI,CAAC,iBAAiB,GAAG,IAAI,CAAC;QAC9B,IAAI,CAAC,oBAAoB,GAAG,KAAK,CAAC;QAElC,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,iBAAiB,CAAC,CAAC;IACxC,CAAC;IAED,IAAY,OAAO;QACjB,OAAO,IAAI,CAAC,gBAAgB,IAAI,CAAC,IAAI,CAAC,gBAAgB,GAAG,EAAE,CAAC,CAAC;IAC/D,CAAC;IAED,mBAAmB,CAAC,UAAuB;QACzC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,UAAU,CAAC,CAAC;IACnC,CAAC;IAED,YAAY,CAAC,SAAiB;
|
|
1
|
+
{"version":3,"file":"client.js","sourceRoot":"","sources":["../../../src/common/client.ts"],"names":[],"mappings":"AAAA,qEAAqE;AACrE,OAAO,EACL,MAAM,EAEN,QAAQ,EAIR,QAAQ,GACT,MAAM,qBAAqB,CAAC;AA+B7B,MAAM,OAAO,MAAO,SAAQ,MAAM;IAChC,YAAY,IAAY,EAAE,WAAmB,EAAE,iBAAuC;QACpF,KAAK,CAAC,IAAI,EAAE,WAAW,EAAE,iBAAiB,CAAC,CAAC;QAE5C,IAAI,CAAC,eAAe,GAAG,EAAE,CAAC;QAC1B,IAAI,CAAC,QAAQ,GAAG,IAAI,QAAQ,CAAC,KAAK,CAAC,CAAC;QACpC,IAAI,CAAC,UAAU,GAAG,EAAE,CAAC;QACrB,IAAI,CAAC,iBAAiB,GAAG,IAAI,CAAC;QAC9B,IAAI,CAAC,oBAAoB,GAAG,KAAK,CAAC;QAElC,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,iBAAiB,CAAC,CAAC;IACxC,CAAC;IAED,IAAY,OAAO;QACjB,OAAO,IAAI,CAAC,gBAAgB,IAAI,CAAC,IAAI,CAAC,gBAAgB,GAAG,EAAE,CAAC,CAAC;IAC/D,CAAC;IAED,mBAAmB,CAAC,UAAuB;QACzC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,UAAU,CAAC,CAAC;IACnC,CAAC;IAED;;;;;;OAMG;IACH,YAAY,CAAC,SAAiB,EAAE,iBAA0B,EAAE,oBAA6B;QACvF,SAAS,CAAC,MAAM,GAAG,IAAI,CAAC;QACxB,SAAS,CAAC,iBAAiB,GAAG,iBAAiB,CAAC;QAChD,SAAS,CAAC,oBAAoB,GAAG,oBAAoB,CAAC;QACtD,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAEhC,wEAAwE;QACxE,SAAS,CAAC,QAAQ,CAAC,IAAK,CAAC,SAAS,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAK,CAAC,SAAS,CAAC;IACrE,CAAC;CACF;AAED,MAAM,OAAO,cAAe,SAAQ,QAAQ;IAC1C,YAAY,IAAY,EAAE,WAAmB,EAAE,WAAyC;QACtF,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,KAAK,CACR;YACE,QAAQ,EAAE;gBACR,OAAO,EAAE;oBACP,IAAI,EAAE,IAAI;oBACV,WAAW,EAAE,WAAW;iBACzB;aACF;SACF,EACD,WAAW,CACZ,CAAC;IACJ,CAAC;CACF;AAUD,MAAM,OAAO,yBAAyB;IAgBpC,YAAY,SAAoB,EAAE,gBAA6B,EAAE,cAA2B;QAC1F,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,IAAI,CAAC,gBAAgB,GAAG,gBAAgB,CAAC;QACzC,IAAI,CAAC,cAAc,GAAG,cAAc,CAAC;IACvC,CAAC;CACF"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"emitter.d.ts","sourceRoot":"","sources":["../../src/emitter.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,WAAW,EAKZ,MAAM,oBAAoB,CAAC;AAQ5B,OAAO,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAI9C,wBAAsB,OAAO,CAAC,OAAO,EAAE,WAAW,CAAC,cAAc,CAAC,
|
|
1
|
+
{"version":3,"file":"emitter.d.ts","sourceRoot":"","sources":["../../src/emitter.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,WAAW,EAKZ,MAAM,oBAAoB,CAAC;AAQ5B,OAAO,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAI9C,wBAAsB,OAAO,CAAC,OAAO,EAAE,WAAW,CAAC,cAAc,CAAC,iBA0HjE"}
|
package/dist/src/emitter.js
CHANGED
|
@@ -8,7 +8,7 @@ import { LibName, reportDiagnostic } from "./lib.js";
|
|
|
8
8
|
import { DiagnosticError, spawnAsync, SpawnError, trace } from "./utils.js";
|
|
9
9
|
import { validateDependencies } from "./validate.js";
|
|
10
10
|
export async function $onEmit(context) {
|
|
11
|
-
var _a, _b, _c, _d, _e, _f;
|
|
11
|
+
var _a, _b, _c, _d, _e, _f, _g, _h, _j;
|
|
12
12
|
const program = context.program;
|
|
13
13
|
if (!program.compilerOptions.noEmit) {
|
|
14
14
|
await validateDependencies(program, true);
|
|
@@ -48,6 +48,9 @@ export async function $onEmit(context) {
|
|
|
48
48
|
const outputPath = context.emitterOutputDir;
|
|
49
49
|
options["output-dir"] = getNormalizedAbsolutePath(outputPath, undefined);
|
|
50
50
|
options.arm = codeModel.arm;
|
|
51
|
+
if ((_c = (_b = (_a = codeModel.info) === null || _a === void 0 ? void 0 : _a.license) === null || _b === void 0 ? void 0 : _b.extensions) === null || _c === void 0 ? void 0 : _c.header) {
|
|
52
|
+
options["license-header"] = codeModel.info.license.extensions.header;
|
|
53
|
+
}
|
|
51
54
|
const codeModelFileName = resolvePath(outputPath, "./code-model.yaml");
|
|
52
55
|
await promises.mkdir(outputPath, { recursive: true }).catch((err) => {
|
|
53
56
|
if (err.code !== "EISDIR" && err.code !== "EEXIST") {
|
|
@@ -67,14 +70,14 @@ export async function $onEmit(context) {
|
|
|
67
70
|
trace(program, `Exec JAR ${jarFileName}`);
|
|
68
71
|
const javaArgs = [];
|
|
69
72
|
javaArgs.push(`-DemitterOptions=${emitterOptions}`);
|
|
70
|
-
if ((
|
|
73
|
+
if ((_d = options["dev-options"]) === null || _d === void 0 ? void 0 : _d.debug) {
|
|
71
74
|
javaArgs.push("-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=*:5005");
|
|
72
75
|
}
|
|
73
|
-
if ((
|
|
74
|
-
javaArgs.push("-Dorg.slf4j.simpleLogger.defaultLogLevel=" + ((
|
|
76
|
+
if ((_e = options["dev-options"]) === null || _e === void 0 ? void 0 : _e.loglevel) {
|
|
77
|
+
javaArgs.push("-Dorg.slf4j.simpleLogger.defaultLogLevel=" + ((_f = options["dev-options"]) === null || _f === void 0 ? void 0 : _f.loglevel));
|
|
75
78
|
}
|
|
76
|
-
if ((
|
|
77
|
-
javaArgs.push("-Dcodegen.java.temp.directory=" + ((
|
|
79
|
+
if ((_g = options["dev-options"]) === null || _g === void 0 ? void 0 : _g["java-temp-dir"]) {
|
|
80
|
+
javaArgs.push("-Dcodegen.java.temp.directory=" + ((_h = options["dev-options"]) === null || _h === void 0 ? void 0 : _h["java-temp-dir"]));
|
|
78
81
|
}
|
|
79
82
|
javaArgs.push("-jar");
|
|
80
83
|
javaArgs.push(jarFileName);
|
|
@@ -106,7 +109,7 @@ export async function $onEmit(context) {
|
|
|
106
109
|
});
|
|
107
110
|
}
|
|
108
111
|
}
|
|
109
|
-
if (!((
|
|
112
|
+
if (!((_j = options["dev-options"]) === null || _j === void 0 ? void 0 : _j["generate-code-model"])) {
|
|
110
113
|
await program.host.rm(codeModelFileName);
|
|
111
114
|
}
|
|
112
115
|
}
|
package/dist/src/emitter.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"emitter.js","sourceRoot":"","sources":["../../src/emitter.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,yBAAyB,EACzB,QAAQ,EAER,WAAW,GACZ,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,QAAQ,EAAE,MAAM,IAAI,CAAC;AAC9B,OAAO,EAAE,IAAI,EAAE,MAAM,SAAS,CAAC;AAC/B,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAC/B,OAAO,EAAE,aAAa,EAAE,MAAM,KAAK,CAAC;AACpC,OAAO,EAAE,gBAAgB,EAAqB,MAAM,yBAAyB,CAAC;AAE9E,OAAO,EAAE,OAAO,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAErD,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,UAAU,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AAC5E,OAAO,EAAE,oBAAoB,EAAE,MAAM,eAAe,CAAC;AAErD,MAAM,CAAC,KAAK,UAAU,OAAO,CAAC,OAAoC;;IAChE,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;IAChC,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC,MAAM,EAAE,CAAC;QACpC,MAAM,oBAAoB,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IAC5C,CAAC;IAED,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC;QACxB,MAAM,OAAO,GAAG,OAAO,CAAC,OAA4B,CAAC;QACrD,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC;YACvB,IAAI,OAAO,KAAK,4BAA4B,EAAE,CAAC;gBAC7C,OAAO,CAAC,QAAQ,CAAC,GAAG,OAAO,CAAC;YAC9B,CAAC;QACH,CAAC;QAED,IAAI,SAAgC,CAAC;QACrC,IAAI,CAAC;YACH,MAAM,OAAO,GAAG,IAAI,gBAAgB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;YACvD,SAAS,GAAG,MAAM,OAAO,CAAC,KAAK,EAAE,CAAC;QACpC,CAAC;QAAC,OAAO,KAAU,EAAE,CAAC;YACpB,IAAI,KAAK,YAAY,eAAe,EAAE,CAAC;gBACrC,6BAA6B;gBAC7B,OAAO,CAAC,gBAAgB,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;YAC7C,CAAC;iBAAM,CAAC;gBACN,gBAAgB;gBAChB,gBAAgB,CAAC,OAAO,EAAE;oBACxB,IAAI,EAAE,eAAe;oBACrB,MAAM,EAAE;wBACN,YAAY,EAAE,sOAAsO;qBACrP;oBACD,MAAM,EAAE,QAAQ;iBACjB,CAAC,CAAC;gBACH,KAAK,CAAC,OAAO,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC;YAC9B,CAAC;QACH,CAAC;QAED,IAAI,SAAS,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC,MAAM,EAAE,CAAC;YACxE,MAAM,SAAS,GAAG,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;YAC1D,MAAM,UAAU,GAAG,WAAW,CAAC,SAAS,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;YAEtD,MAAM,UAAU,GAAG,OAAO,CAAC,gBAAgB,CAAC;YAC5C,OAAO,CAAC,YAAY,CAAC,GAAG,yBAAyB,CAAC,UAAU,EAAE,SAAS,CAAC,CAAC;YAEzE,OAAO,CAAC,GAAG,GAAG,SAAS,CAAC,GAAG,CAAC;
|
|
1
|
+
{"version":3,"file":"emitter.js","sourceRoot":"","sources":["../../src/emitter.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"options.d.ts","sourceRoot":"","sources":["../../src/options.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"options.d.ts","sourceRoot":"","sources":["../../src/options.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAEpD,eAAO,MAAM,QAAQ,+BAA+B,CAAC;AAErD,MAAM,WAAW,UAAU;IACzB,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAChC,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,UAAU,CAAC,EAAE,KAAK,GAAG,OAAO,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC;IACzD,eAAe,CAAC,EAAE,MAAM,CAAC;CAC1B;AAID,MAAM,WAAW,cAAc;IAC7B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,cAAc,CAAC,EAAE,MAAM,CAAC;IAExB,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAE3B,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,yBAAyB,CAAC,EAAE,MAAM,CAAC;IACnC,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAE/B,sBAAsB,CAAC,EAAE,MAAM,EAAE,CAAC;IAClC,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAE7B,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAChC,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,iCAAiC,CAAC,EAAE,OAAO,CAAC;IAE5C,aAAa,CAAC,EAAE,UAAU,CAAC;CAC5B;AAED,eAAO,MAAM,oBAAoB,EAAE,cAAc,CAAC,cAAc,CAoE/D,CAAC"}
|
package/dist/src/options.js
CHANGED
|
@@ -1,17 +1,21 @@
|
|
|
1
|
+
import { BrandedSdkEmitterOptions, UnbrandedSdkEmitterOptions } from "@azure-tools/typespec-client-generator-core";
|
|
1
2
|
export const LIB_NAME = "@azure-tools/typespec-java";
|
|
2
3
|
export const EmitterOptionsSchema = {
|
|
3
4
|
type: "object",
|
|
4
5
|
properties: {
|
|
5
6
|
// service
|
|
6
|
-
|
|
7
|
+
...BrandedSdkEmitterOptions.namespace,
|
|
7
8
|
"service-name": { type: "string", nullable: true },
|
|
8
9
|
// sample and test
|
|
10
|
+
...BrandedSdkEmitterOptions["examples-dir"],
|
|
9
11
|
"generate-samples": { type: "boolean", nullable: true, default: true },
|
|
10
12
|
"generate-tests": { type: "boolean", nullable: true, default: true },
|
|
11
13
|
"enable-sync-stack": { type: "boolean", nullable: true, default: true },
|
|
12
14
|
"stream-style-serialization": { type: "boolean", nullable: true, default: true },
|
|
13
15
|
"use-object-for-unknown": { type: "boolean", nullable: true, default: false },
|
|
14
16
|
// customization
|
|
17
|
+
...UnbrandedSdkEmitterOptions["generate-protocol-methods"],
|
|
18
|
+
...UnbrandedSdkEmitterOptions["generate-convenience-methods"],
|
|
15
19
|
"partial-update": { type: "boolean", nullable: true, default: false },
|
|
16
20
|
"models-subpackage": { type: "string", nullable: true },
|
|
17
21
|
"custom-types": { type: "string", nullable: true },
|
|
@@ -21,7 +25,7 @@ export const EmitterOptionsSchema = {
|
|
|
21
25
|
"skip-special-headers": { type: "array", items: { type: "string" }, nullable: true },
|
|
22
26
|
"enable-subclient": { type: "boolean", nullable: true, default: false },
|
|
23
27
|
// versioning
|
|
24
|
-
"api-version"
|
|
28
|
+
...UnbrandedSdkEmitterOptions["api-version"],
|
|
25
29
|
"advanced-versioning": { type: "boolean", nullable: true, default: false },
|
|
26
30
|
"service-version-exclude-preview": { type: "boolean", nullable: true, default: false },
|
|
27
31
|
// dev options
|
package/dist/src/options.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"options.js","sourceRoot":"","sources":["../../src/options.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"options.js","sourceRoot":"","sources":["../../src/options.ts"],"names":[],"mappings":"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"}
|
package/dist/src/validate.d.ts
CHANGED
|
@@ -2,4 +2,6 @@ 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
3
|
export declare const CODE_JAVA_SDK_DEPENDENCY = "invalid-java-sdk-dependency";
|
|
4
4
|
export declare function validateDependencies(program: Program | undefined, logDiagnostic?: boolean): Promise<void>;
|
|
5
|
+
export declare function findJavaVersion(output: string): string | undefined;
|
|
6
|
+
export declare function getJavaMajorVersion(version: string): number;
|
|
5
7
|
//# sourceMappingURL=validate.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validate.d.ts","sourceRoot":"","sources":["../../src/validate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAIvD,eAAO,MAAM,qBAAqB,yLACsJ,CAAC;AACzL,eAAO,MAAM,wBAAwB,gCAAgC,CAAC;AAEtE,wBAAsB,oBAAoB,CACxC,OAAO,EAAE,OAAO,GAAG,SAAS,EAC5B,aAAa,GAAE,OAAe,iBAyE/B"}
|
|
1
|
+
{"version":3,"file":"validate.d.ts","sourceRoot":"","sources":["../../src/validate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAIvD,eAAO,MAAM,qBAAqB,yLACsJ,CAAC;AACzL,eAAO,MAAM,wBAAwB,gCAAgC,CAAC;AAEtE,wBAAsB,oBAAoB,CACxC,OAAO,EAAE,OAAO,GAAG,SAAS,EAC5B,aAAa,GAAE,OAAe,iBAyE/B;AAED,wBAAgB,eAAe,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAMlE;AAED,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAoB3D"}
|
package/dist/src/validate.js
CHANGED
|
@@ -80,16 +80,17 @@ export async function validateDependencies(program, logDiagnostic = false) {
|
|
|
80
80
|
}
|
|
81
81
|
}
|
|
82
82
|
}
|
|
83
|
-
function findJavaVersion(output) {
|
|
83
|
+
export function findJavaVersion(output) {
|
|
84
84
|
const matches = output.match(/javac ([\d.]+).*/);
|
|
85
85
|
if (matches && matches.length > 1) {
|
|
86
86
|
return matches[1];
|
|
87
87
|
}
|
|
88
88
|
return undefined;
|
|
89
89
|
}
|
|
90
|
-
function getJavaMajorVersion(version) {
|
|
91
|
-
|
|
90
|
+
export function getJavaMajorVersion(version) {
|
|
91
|
+
let matches = version.match(/(\d+)\.(\d+).*/);
|
|
92
92
|
if (matches && matches.length > 2) {
|
|
93
|
+
// match pattern "major.minor*"
|
|
93
94
|
if (matches[1] === "1") {
|
|
94
95
|
// "javac 1.8.0_422" -> 8
|
|
95
96
|
return +matches[2];
|
|
@@ -99,6 +100,14 @@ function getJavaMajorVersion(version) {
|
|
|
99
100
|
return +matches[1];
|
|
100
101
|
}
|
|
101
102
|
}
|
|
103
|
+
else {
|
|
104
|
+
// match pattern "major*"
|
|
105
|
+
matches = version.match(/(\d+).*/);
|
|
106
|
+
if (matches && matches.length > 1) {
|
|
107
|
+
// "javac 24" -> 24
|
|
108
|
+
return +matches[1];
|
|
109
|
+
}
|
|
110
|
+
}
|
|
102
111
|
return 0;
|
|
103
112
|
}
|
|
104
113
|
function findMavenVersion(output) {
|
package/dist/src/validate.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validate.js","sourceRoot":"","sources":["../../src/validate.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"validate.js","sourceRoot":"","sources":["../../src/validate.ts"],"names":[],"mappings":"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"}
|