@azure-tools/typespec-java 0.14.0 → 0.15.0
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 +2 -0
- package/dist/src/code-model-builder.d.ts.map +1 -1
- package/dist/src/code-model-builder.js +24 -19
- package/dist/src/code-model-builder.js.map +1 -1
- package/dist/src/emitter.d.ts +2 -1
- package/dist/src/emitter.d.ts.map +1 -1
- package/dist/src/emitter.js +20 -9
- package/dist/src/emitter.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +15 -15
- package/readme.md +1 -1
- package/target/emitter.jar +0 -0
package/dist/src/emitter.js
CHANGED
|
@@ -11,7 +11,8 @@ const EmitterOptionsSchema = {
|
|
|
11
11
|
properties: {
|
|
12
12
|
"namespace": { type: "string", nullable: true },
|
|
13
13
|
"output-dir": { type: "string", nullable: true },
|
|
14
|
-
"
|
|
14
|
+
"package-dir": { type: "string", nullable: true },
|
|
15
|
+
"flavor": { type: "string", nullable: true, default: "Azure" },
|
|
15
16
|
// service
|
|
16
17
|
"service-name": { type: "string", nullable: true },
|
|
17
18
|
"service-versions": { type: "array", items: { type: "string" }, nullable: true },
|
|
@@ -45,15 +46,25 @@ export const $lib = createTypeSpecLibrary({
|
|
|
45
46
|
},
|
|
46
47
|
});
|
|
47
48
|
export async function $onEmit(context) {
|
|
48
|
-
var _a, _b, _c, _d, _e, _f, _g;
|
|
49
|
+
var _a, _b, _c, _d, _e, _f, _g, _h;
|
|
49
50
|
const program = context.program;
|
|
50
51
|
const options = context.options;
|
|
52
|
+
if (!options["flavor"]) {
|
|
53
|
+
if ((_a = options["package-dir"]) === null || _a === void 0 ? void 0 : _a.toLocaleLowerCase().startsWith("azure")) {
|
|
54
|
+
// Azure package
|
|
55
|
+
options["flavor"] = "Azure";
|
|
56
|
+
}
|
|
57
|
+
else {
|
|
58
|
+
// default
|
|
59
|
+
options["flavor"] = "Azure";
|
|
60
|
+
}
|
|
61
|
+
}
|
|
51
62
|
const builder = new CodeModelBuilder(program, context);
|
|
52
63
|
const codeModel = await builder.build();
|
|
53
64
|
if (!program.compilerOptions.noEmit && !program.hasError()) {
|
|
54
65
|
const __dirname = dirname(fileURLToPath(import.meta.url));
|
|
55
66
|
const moduleRoot = resolvePath(__dirname, "..", "..");
|
|
56
|
-
const outputPath = (
|
|
67
|
+
const outputPath = (_b = options["output-dir"]) !== null && _b !== void 0 ? _b : context.emitterOutputDir;
|
|
57
68
|
options["output-dir"] = getNormalizedAbsolutePath(outputPath, undefined);
|
|
58
69
|
options["arm"] = codeModel.arm;
|
|
59
70
|
const codeModelFileName = resolvePath(outputPath, "./code-model.yaml");
|
|
@@ -70,14 +81,14 @@ export async function $onEmit(context) {
|
|
|
70
81
|
program.trace("typespec-java", `Exec JAR ${jarFileName}`);
|
|
71
82
|
const javaArgs = [];
|
|
72
83
|
javaArgs.push(`-DemitterOptions=${emitterOptions}`);
|
|
73
|
-
if ((
|
|
84
|
+
if ((_c = options["dev-options"]) === null || _c === void 0 ? void 0 : _c.debug) {
|
|
74
85
|
javaArgs.push("-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=*:5005");
|
|
75
86
|
}
|
|
76
|
-
if ((
|
|
77
|
-
javaArgs.push("-Dorg.slf4j.simpleLogger.defaultLogLevel=" + ((
|
|
87
|
+
if ((_d = options["dev-options"]) === null || _d === void 0 ? void 0 : _d.loglevel) {
|
|
88
|
+
javaArgs.push("-Dorg.slf4j.simpleLogger.defaultLogLevel=" + ((_e = options["dev-options"]) === null || _e === void 0 ? void 0 : _e.loglevel));
|
|
78
89
|
}
|
|
79
|
-
if ((
|
|
80
|
-
javaArgs.push("-Dcodegen.java.temp.directory=" + ((
|
|
90
|
+
if ((_f = options["dev-options"]) === null || _f === void 0 ? void 0 : _f["java-temp-dir"]) {
|
|
91
|
+
javaArgs.push("-Dcodegen.java.temp.directory=" + ((_g = options["dev-options"]) === null || _g === void 0 ? void 0 : _g["java-temp-dir"]));
|
|
81
92
|
}
|
|
82
93
|
javaArgs.push("-jar");
|
|
83
94
|
javaArgs.push(jarFileName);
|
|
@@ -146,7 +157,7 @@ export async function $onEmit(context) {
|
|
|
146
157
|
throw error;
|
|
147
158
|
}
|
|
148
159
|
}
|
|
149
|
-
if (!((
|
|
160
|
+
if (!((_h = options["dev-options"]) === null || _h === void 0 ? void 0 : _h["generate-code-model"])) {
|
|
150
161
|
await program.host.rm(codeModelFileName);
|
|
151
162
|
}
|
|
152
163
|
}
|
package/dist/src/emitter.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"emitter.js","sourceRoot":"","sources":["../../src/emitter.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,qBAAqB,EAErB,yBAAyB,EAEzB,QAAQ,EACR,WAAW,GACZ,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,IAAI,EAAE,MAAM,SAAS,CAAC;AAC/B,OAAO,EAAE,KAAK,EAAE,MAAM,eAAe,CAAC;AACtC,OAAO,EAAE,QAAQ,EAAE,MAAM,IAAI,CAAC;AAC9B,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAC/B,OAAO,EAAE,aAAa,EAAE,MAAM,KAAK,CAAC;
|
|
1
|
+
{"version":3,"file":"emitter.js","sourceRoot":"","sources":["../../src/emitter.ts"],"names":[],"mappings":"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"}
|