@azure-tools/typespec-python 0.27.1 → 0.28.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/scripts/regenerate.d.ts +2 -0
- package/dist/scripts/regenerate.d.ts.map +1 -0
- package/dist/scripts/regenerate.js +259 -0
- package/dist/scripts/regenerate.js.map +1 -0
- package/dist/src/code-model.d.ts.map +1 -1
- package/dist/src/code-model.js +13 -28
- package/dist/src/code-model.js.map +1 -1
- package/dist/src/http.d.ts.map +1 -1
- package/dist/src/http.js +10 -0
- package/dist/src/http.js.map +1 -1
- package/dist/src/types.d.ts +2 -1
- package/dist/src/types.d.ts.map +1 -1
- package/dist/src/types.js +19 -1
- package/dist/src/types.js.map +1 -1
- package/generator/pygen/codegen/models/base.py +1 -1
- package/generator/pygen/codegen/models/parameter.py +6 -0
- package/generator/pygen/codegen/serializers/__init__.py +1 -1
- package/package.json +26 -23
- package/scripts/__pycache__/venvtools.cpython-310.pyc +0 -0
- package/scripts/regenerate.ts +286 -0
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"regenerate.d.ts","sourceRoot":"","sources":["../../scripts/regenerate.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,259 @@
|
|
|
1
|
+
/* eslint-disable no-console */
|
|
2
|
+
import { exec as execCallback } from "child_process";
|
|
3
|
+
import { promisify } from "util";
|
|
4
|
+
import yargs from "yargs";
|
|
5
|
+
import { hideBin } from "yargs/helpers";
|
|
6
|
+
import { dirname, join, relative, resolve } from "path";
|
|
7
|
+
import { promises } from "fs";
|
|
8
|
+
import { fileURLToPath } from "url";
|
|
9
|
+
// Promisify the exec function
|
|
10
|
+
const exec = promisify(execCallback);
|
|
11
|
+
// Get the directory of the current file
|
|
12
|
+
const PLUGIN_DIR = resolve(fileURLToPath(import.meta.url), "../../../");
|
|
13
|
+
const CADL_RANCH_DIR = resolve(PLUGIN_DIR, "node_modules/@azure-tools/cadl-ranch-specs/http");
|
|
14
|
+
const EMITTER_OPTIONS = {
|
|
15
|
+
"resiliency/srv-driven/old.tsp": {
|
|
16
|
+
"package-name": "resiliency-srv-driven1",
|
|
17
|
+
"package-mode": "azure-dataplane",
|
|
18
|
+
"package-pprint-name": "ResiliencySrvDriven1",
|
|
19
|
+
},
|
|
20
|
+
"resiliency/srv-driven": {
|
|
21
|
+
"package-name": "resiliency-srv-driven2",
|
|
22
|
+
"package-mode": "azure-dataplane",
|
|
23
|
+
"package-pprint-name": "ResiliencySrvDriven2",
|
|
24
|
+
},
|
|
25
|
+
"authentication/http/custom": {
|
|
26
|
+
"package-name": "authentication-http-custom",
|
|
27
|
+
},
|
|
28
|
+
"authentication/union": {
|
|
29
|
+
"package-name": "authentication-union",
|
|
30
|
+
},
|
|
31
|
+
"type/array": {
|
|
32
|
+
"package-name": "typetest-array",
|
|
33
|
+
},
|
|
34
|
+
"type/dictionary": {
|
|
35
|
+
"package-name": "typetest-dictionary",
|
|
36
|
+
},
|
|
37
|
+
"type/enum/extensible": {
|
|
38
|
+
"package-name": "typetest-enum-extensible",
|
|
39
|
+
},
|
|
40
|
+
"type/enum/fixed": {
|
|
41
|
+
"package-name": "typetest-enum-fixed",
|
|
42
|
+
},
|
|
43
|
+
"type/model/empty": {
|
|
44
|
+
"package-name": "typetest-model-empty",
|
|
45
|
+
},
|
|
46
|
+
"type/model/flatten": {
|
|
47
|
+
"package-name": "typetest-model-flatten",
|
|
48
|
+
},
|
|
49
|
+
"type/model/inheritance/enum-discriminator": {
|
|
50
|
+
"package-name": "typetest-model-enumdiscriminator",
|
|
51
|
+
},
|
|
52
|
+
"type/model/inheritance/nested-discriminator": {
|
|
53
|
+
"package-name": "typetest-model-nesteddiscriminator",
|
|
54
|
+
},
|
|
55
|
+
"type/model/inheritance/not-discriminated": {
|
|
56
|
+
"package-name": "typetest-model-notdiscriminated",
|
|
57
|
+
},
|
|
58
|
+
"type/model/inheritance/single-discriminator": {
|
|
59
|
+
"package-name": "typetest-model-singlediscriminator",
|
|
60
|
+
},
|
|
61
|
+
"type/model/inheritance/recursive": {
|
|
62
|
+
"package-name": "typetest-model-recursive",
|
|
63
|
+
},
|
|
64
|
+
"type/model/usage": {
|
|
65
|
+
"package-name": "typetest-model-usage",
|
|
66
|
+
},
|
|
67
|
+
"type/model/visibility": [
|
|
68
|
+
{ "package-name": "typetest-model-visibility" },
|
|
69
|
+
{ "package-name": "headasbooleantrue", "head-as-boolean": "true" },
|
|
70
|
+
{ "package-name": "headasbooleanfalse", "head-as-boolean": "false" },
|
|
71
|
+
],
|
|
72
|
+
"type/property/nullable": {
|
|
73
|
+
"package-name": "typetest-property-nullable",
|
|
74
|
+
},
|
|
75
|
+
"type/property/optionality": {
|
|
76
|
+
"package-name": "typetest-property-optional",
|
|
77
|
+
},
|
|
78
|
+
"type/property/additional-properties": {
|
|
79
|
+
"package-name": "typetest-property-additionalproperties",
|
|
80
|
+
},
|
|
81
|
+
"type/scalar": {
|
|
82
|
+
"package-name": "typetest-scalar",
|
|
83
|
+
},
|
|
84
|
+
"type/property/value-types": {
|
|
85
|
+
"package-name": "typetest-property-valuetypes",
|
|
86
|
+
},
|
|
87
|
+
"type/union": {
|
|
88
|
+
"package-name": "typetest-union",
|
|
89
|
+
},
|
|
90
|
+
"azure/core/lro/rpc": {
|
|
91
|
+
"package-name": "azurecore-lro-rpc",
|
|
92
|
+
},
|
|
93
|
+
"client/structure/multi-client": {
|
|
94
|
+
"package-name": "client-structure-multiclient",
|
|
95
|
+
},
|
|
96
|
+
"client/structure/renamed-operation": {
|
|
97
|
+
"package-name": "client-structure-renamedoperation",
|
|
98
|
+
},
|
|
99
|
+
"client/structure/two-operation-group": {
|
|
100
|
+
"package-name": "client-structure-twooperationgroup",
|
|
101
|
+
},
|
|
102
|
+
"mgmt/sphere": [{ "package-name": "azure-mgmt-spheredpg" }],
|
|
103
|
+
};
|
|
104
|
+
function toPosix(dir) {
|
|
105
|
+
return dir.replace(/\\/g, "/");
|
|
106
|
+
}
|
|
107
|
+
function getEmitterOption(spec) {
|
|
108
|
+
const relativeSpec = toPosix(relative(CADL_RANCH_DIR, spec));
|
|
109
|
+
const key = relativeSpec.includes("resiliency/srv-driven/old.tsp") ? relativeSpec : dirname(relativeSpec);
|
|
110
|
+
const result = EMITTER_OPTIONS[key] || [{}];
|
|
111
|
+
return Array.isArray(result) ? result : [result];
|
|
112
|
+
}
|
|
113
|
+
// Function to execute CLI commands asynchronously
|
|
114
|
+
async function executeCommand(command) {
|
|
115
|
+
try {
|
|
116
|
+
const { stdout, stderr } = await exec(command);
|
|
117
|
+
if (stdout)
|
|
118
|
+
console.log(`stdout: ${stdout}`);
|
|
119
|
+
if (stderr)
|
|
120
|
+
console.error(`stderr: ${stderr}`);
|
|
121
|
+
}
|
|
122
|
+
catch (error) {
|
|
123
|
+
console.error(`exec error: ${error}`);
|
|
124
|
+
throw error;
|
|
125
|
+
}
|
|
126
|
+
}
|
|
127
|
+
const SpecialFlags = {
|
|
128
|
+
azure: {
|
|
129
|
+
"generate-test": true,
|
|
130
|
+
"generate-sample": true,
|
|
131
|
+
},
|
|
132
|
+
};
|
|
133
|
+
async function getSubdirectories(baseDir, flags) {
|
|
134
|
+
const subdirectories = [];
|
|
135
|
+
async function searchDir(currentDir) {
|
|
136
|
+
const items = await promises.readdir(currentDir, { withFileTypes: true });
|
|
137
|
+
const promisesArray = items.map(async (item) => {
|
|
138
|
+
const subDirPath = join(currentDir, item.name);
|
|
139
|
+
if (item.isDirectory()) {
|
|
140
|
+
const mainTspPath = join(subDirPath, "main.tsp");
|
|
141
|
+
const clientTspPath = join(subDirPath, "client.tsp");
|
|
142
|
+
const mainTspRelativePath = toPosix(relative(baseDir, mainTspPath));
|
|
143
|
+
if (flags.flavor === "unbranded" && mainTspRelativePath.includes("azure"))
|
|
144
|
+
return;
|
|
145
|
+
const hasMainTsp = await promises
|
|
146
|
+
.access(mainTspPath)
|
|
147
|
+
.then(() => true)
|
|
148
|
+
.catch(() => false);
|
|
149
|
+
const hasClientTsp = await promises
|
|
150
|
+
.access(clientTspPath)
|
|
151
|
+
.then(() => true)
|
|
152
|
+
.catch(() => false);
|
|
153
|
+
if (mainTspRelativePath.toLowerCase().includes(flags.name || "")) {
|
|
154
|
+
if (mainTspRelativePath.includes("resiliency/srv-driven")) {
|
|
155
|
+
subdirectories.push(resolve(subDirPath, "old.tsp"));
|
|
156
|
+
}
|
|
157
|
+
if (hasClientTsp) {
|
|
158
|
+
subdirectories.push(resolve(subDirPath, "client.tsp"));
|
|
159
|
+
}
|
|
160
|
+
else if (hasMainTsp) {
|
|
161
|
+
subdirectories.push(resolve(subDirPath, "main.tsp"));
|
|
162
|
+
}
|
|
163
|
+
}
|
|
164
|
+
// Recursively search in the subdirectory
|
|
165
|
+
await searchDir(subDirPath);
|
|
166
|
+
}
|
|
167
|
+
});
|
|
168
|
+
await Promise.all(promisesArray);
|
|
169
|
+
}
|
|
170
|
+
await searchDir(baseDir);
|
|
171
|
+
return subdirectories;
|
|
172
|
+
}
|
|
173
|
+
function defaultPackageName(spec) {
|
|
174
|
+
return toPosix(relative(CADL_RANCH_DIR, dirname(spec)))
|
|
175
|
+
.replace(/\//g, "-")
|
|
176
|
+
.toLowerCase();
|
|
177
|
+
}
|
|
178
|
+
function addOptions(spec, generatedFolder, flags) {
|
|
179
|
+
var _a;
|
|
180
|
+
const emitterConfigs = [];
|
|
181
|
+
for (const config of getEmitterOption(spec)) {
|
|
182
|
+
const options = { ...config };
|
|
183
|
+
options["flavor"] = flags.flavor;
|
|
184
|
+
for (const [k, v] of Object.entries((_a = SpecialFlags[flags.flavor]) !== null && _a !== void 0 ? _a : {})) {
|
|
185
|
+
options[k] = v;
|
|
186
|
+
}
|
|
187
|
+
if (options["emitter-output-dir"] === undefined) {
|
|
188
|
+
const packageName = options["package-name"] || defaultPackageName(spec);
|
|
189
|
+
options["emitter-output-dir"] = toPosix(`${generatedFolder}/test/${flags.flavor}/generated/${packageName}`);
|
|
190
|
+
}
|
|
191
|
+
if (flags.debug) {
|
|
192
|
+
options["debug"] = "true";
|
|
193
|
+
}
|
|
194
|
+
if (flags.flavor === "unbranded") {
|
|
195
|
+
options["company-name"] = "Unbranded";
|
|
196
|
+
}
|
|
197
|
+
options["examples-directory"] = toPosix(join(dirname(spec), "examples"));
|
|
198
|
+
const configs = Object.entries(options).flatMap(([k, v]) => {
|
|
199
|
+
return `--option @azure-tools/typespec-python.${k}=${v}`;
|
|
200
|
+
});
|
|
201
|
+
emitterConfigs.push(configs.join(" "));
|
|
202
|
+
}
|
|
203
|
+
return emitterConfigs;
|
|
204
|
+
}
|
|
205
|
+
async function _regenerateSingle(spec, flags) {
|
|
206
|
+
// Perform some asynchronous operation here
|
|
207
|
+
const options = addOptions(spec, PLUGIN_DIR, flags);
|
|
208
|
+
const commandPromises = options.map((option) => {
|
|
209
|
+
const command = `tsp compile ${spec} --emit=${toPosix(PLUGIN_DIR)} ${option}`;
|
|
210
|
+
console.log(command);
|
|
211
|
+
return executeCommand(command);
|
|
212
|
+
});
|
|
213
|
+
await Promise.all(commandPromises);
|
|
214
|
+
}
|
|
215
|
+
async function regenerate(flags) {
|
|
216
|
+
if (flags.flavor === undefined) {
|
|
217
|
+
const azureGeneration = await regenerate({ ...flags, flavor: "azure" });
|
|
218
|
+
const unbrandedGeneration = await regenerate({ ...flags, flavor: "unbranded" });
|
|
219
|
+
return azureGeneration && unbrandedGeneration;
|
|
220
|
+
}
|
|
221
|
+
else {
|
|
222
|
+
const flagsResolved = { debug: false, flavor: flags.flavor, ...flags };
|
|
223
|
+
const CADL_RANCH_DIR = resolve(PLUGIN_DIR, "node_modules/@azure-tools/cadl-ranch-specs/http");
|
|
224
|
+
const subdirectories = await getSubdirectories(CADL_RANCH_DIR, flagsResolved);
|
|
225
|
+
const promises = subdirectories.map(async (subdirectory) => {
|
|
226
|
+
// Perform additional asynchronous operations on each subdirectory here
|
|
227
|
+
await _regenerateSingle(subdirectory, flagsResolved);
|
|
228
|
+
});
|
|
229
|
+
await Promise.all(promises);
|
|
230
|
+
return true;
|
|
231
|
+
}
|
|
232
|
+
}
|
|
233
|
+
// try {
|
|
234
|
+
// const output = await executeCommand('tsp compile');
|
|
235
|
+
// console.log(`Command output: ${output}`);
|
|
236
|
+
// } catch (error) {
|
|
237
|
+
// console.error(`Command failed: ${error}`);
|
|
238
|
+
// }
|
|
239
|
+
// PARSE INPUT ARGUMENTS
|
|
240
|
+
const argv = yargs(hideBin(process.argv))
|
|
241
|
+
.option("flavor", {
|
|
242
|
+
type: "string",
|
|
243
|
+
choices: ["azure", "unbranded"],
|
|
244
|
+
description: "Specify the flavor",
|
|
245
|
+
})
|
|
246
|
+
.option("debug", {
|
|
247
|
+
alias: "d",
|
|
248
|
+
type: "boolean",
|
|
249
|
+
description: "Debug mode",
|
|
250
|
+
})
|
|
251
|
+
.option("name", {
|
|
252
|
+
alias: "n",
|
|
253
|
+
type: "string",
|
|
254
|
+
description: "Specify filename if you only want to generate a subset",
|
|
255
|
+
}).argv;
|
|
256
|
+
regenerate(argv)
|
|
257
|
+
.then(() => console.log("Regeneration successful"))
|
|
258
|
+
.catch((error) => console.error(`Regeneration failed: ${error.message}`));
|
|
259
|
+
//# sourceMappingURL=regenerate.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"regenerate.js","sourceRoot":"","sources":["../../scripts/regenerate.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"code-model.d.ts","sourceRoot":"","sources":["../../src/code-model.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"code-model.d.ts","sourceRoot":"","sources":["../../src/code-model.ts"],"names":[],"mappings":"AAAA,OAAO,EAWH,mBAAmB,EAGtB,MAAM,6CAA6C,CAAC;AAIrD,OAAO,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAgM5C,wBAAgB,aAAa,CAAC,iBAAiB,SAAS,mBAAmB,EACvE,UAAU,EAAE,gBAAgB,CAAC,iBAAiB,CAAC,uBA+BlD"}
|
package/dist/src/code-model.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { UsageFlags, getCrossLanguagePackageId, } from "@azure-tools/typespec-client-generator-core";
|
|
2
|
-
import { KnownTypes, getType, simpleTypesMap, typesMap } from "./types.js";
|
|
2
|
+
import { KnownTypes, emitEndpointType, getType, simpleTypesMap, typesMap } from "./types.js";
|
|
3
3
|
import { emitParamBase, getImplementation, removeUnderscoresFromNamespace } from "./utils.js";
|
|
4
4
|
import { emitBasicHttpMethod, emitLroHttpMethod, emitLroPagingHttpMethod, emitPagingHttpMethod } from "./http.js";
|
|
5
5
|
import { ignoreDiagnostics } from "@typespec/compiler";
|
|
@@ -45,35 +45,13 @@ function emitLroPagingMethod(context, rootClient, method, operationGroupName) {
|
|
|
45
45
|
}
|
|
46
46
|
function emitMethodParameter(context, parameter) {
|
|
47
47
|
if (parameter.kind === "endpoint") {
|
|
48
|
-
if (parameter.type.
|
|
49
|
-
const
|
|
50
|
-
|
|
51
|
-
params.push({
|
|
52
|
-
...emitParamBase(context, param),
|
|
53
|
-
wireName: param.name,
|
|
54
|
-
location: "endpointPath",
|
|
55
|
-
implementation: getImplementation(context, param),
|
|
56
|
-
clientDefaultValue: param.clientDefaultValue,
|
|
57
|
-
skipUrlEncoding: param.urlEncode === false,
|
|
58
|
-
});
|
|
59
|
-
context.__endpointPathParameters.push(params.at(-1));
|
|
48
|
+
if (parameter.type.kind === "union") {
|
|
49
|
+
for (const endpointVal of parameter.type.values) {
|
|
50
|
+
return emitEndpointType(context, endpointVal);
|
|
60
51
|
}
|
|
61
|
-
return params;
|
|
62
52
|
}
|
|
63
53
|
else {
|
|
64
|
-
return
|
|
65
|
-
{
|
|
66
|
-
optional: parameter.optional,
|
|
67
|
-
description: parameter.description || "",
|
|
68
|
-
clientName: context.arm ? "base_url" : "endpoint",
|
|
69
|
-
clientDefaultValue: parameter.type.serverUrl,
|
|
70
|
-
wireName: "$host",
|
|
71
|
-
location: "path",
|
|
72
|
-
type: KnownTypes.string,
|
|
73
|
-
implementation: getImplementation(context, parameter),
|
|
74
|
-
inOverload: false,
|
|
75
|
-
},
|
|
76
|
-
];
|
|
54
|
+
return emitEndpointType(context, parameter.type);
|
|
77
55
|
}
|
|
78
56
|
}
|
|
79
57
|
const base = {
|
|
@@ -154,12 +132,19 @@ function emitClient(context, client) {
|
|
|
154
132
|
const parameters = (_b = (_a = client.initialization) === null || _a === void 0 ? void 0 : _a.properties.map((x) => emitMethodParameter(context, x)).reduce((a, b) => [...a, ...b])) !== null && _b !== void 0 ? _b : [];
|
|
155
133
|
const endpointParameter = (_c = client.initialization) === null || _c === void 0 ? void 0 : _c.properties.find((x) => x.kind === "endpoint");
|
|
156
134
|
const operationGroups = emitOperationGroups(context, client, client, "");
|
|
135
|
+
let url;
|
|
136
|
+
if ((endpointParameter === null || endpointParameter === void 0 ? void 0 : endpointParameter.type.kind) === "union") {
|
|
137
|
+
url = endpointParameter.type.values[0].serverUrl;
|
|
138
|
+
}
|
|
139
|
+
else {
|
|
140
|
+
url = endpointParameter === null || endpointParameter === void 0 ? void 0 : endpointParameter.type.serverUrl;
|
|
141
|
+
}
|
|
157
142
|
return {
|
|
158
143
|
name: client.name,
|
|
159
144
|
description: (_d = client.description) !== null && _d !== void 0 ? _d : "",
|
|
160
145
|
parameters,
|
|
161
146
|
operationGroups,
|
|
162
|
-
url
|
|
147
|
+
url,
|
|
163
148
|
apiVersions: client.apiVersions,
|
|
164
149
|
arm: context.arm,
|
|
165
150
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"code-model.js","sourceRoot":"","sources":["../../src/code-model.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"code-model.js","sourceRoot":"","sources":["../../src/code-model.ts"],"names":[],"mappings":"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"}
|
package/dist/src/http.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"http.d.ts","sourceRoot":"","sources":["../../src/http.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,qBAAqB,EAErB,aAAa,EAEb,gBAAgB,EAEhB,yBAAyB,EACzB,mBAAmB,EACnB,sBAAsB,
|
|
1
|
+
{"version":3,"file":"http.d.ts","sourceRoot":"","sources":["../../src/http.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,qBAAqB,EAErB,aAAa,EAEb,gBAAgB,EAEhB,yBAAyB,EACzB,mBAAmB,EACnB,sBAAsB,EAOzB,MAAM,6CAA6C,CAAC;AAYrD,OAAO,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAiB5C,wBAAgB,mBAAmB,CAC/B,OAAO,EAAE,gBAAgB,CAAC,gBAAgB,CAAC,EAC3C,UAAU,EAAE,aAAa,CAAC,gBAAgB,CAAC,EAC3C,MAAM,EAAE,qBAAqB,CAAC,gBAAgB,CAAC,EAC/C,kBAAkB,EAAE,MAAM,GAC3B,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,CAWvB;AAiED,wBAAgB,iBAAiB,CAC7B,OAAO,EAAE,gBAAgB,CAAC,gBAAgB,CAAC,EAC3C,UAAU,EAAE,aAAa,CAAC,gBAAgB,CAAC,EAC3C,MAAM,EAAE,mBAAmB,CAAC,gBAAgB,CAAC,EAC7C,kBAAkB,EAAE,MAAM,GAC3B,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,CAGvB;AAED,wBAAgB,oBAAoB,CAChC,OAAO,EAAE,gBAAgB,CAAC,gBAAgB,CAAC,EAC3C,UAAU,EAAE,aAAa,CAAC,gBAAgB,CAAC,EAC3C,MAAM,EAAE,sBAAsB,CAAC,gBAAgB,CAAC,EAChD,kBAAkB,EAAE,MAAM,GAC3B,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,CAGvB;AAED,wBAAgB,uBAAuB,CACnC,OAAO,EAAE,gBAAgB,CAAC,gBAAgB,CAAC,EAC3C,UAAU,EAAE,aAAa,CAAC,gBAAgB,CAAC,EAC3C,MAAM,EAAE,yBAAyB,CAAC,gBAAgB,CAAC,EACnD,kBAAkB,EAAE,MAAM,GAC3B,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,CAIvB"}
|
package/dist/src/http.js
CHANGED
|
@@ -4,6 +4,15 @@ import { KnownTypes, getType } from "./types.js";
|
|
|
4
4
|
function isContentTypeParameter(parameter) {
|
|
5
5
|
return parameter.serializedName.toLowerCase() === "content-type";
|
|
6
6
|
}
|
|
7
|
+
function arrayToRecord(examples) {
|
|
8
|
+
const result = {};
|
|
9
|
+
if (examples) {
|
|
10
|
+
for (const [index, example] of examples.entries()) {
|
|
11
|
+
result[index] = { ...example.rawExample, "x-ms-original-file": example.filePath };
|
|
12
|
+
}
|
|
13
|
+
}
|
|
14
|
+
return result;
|
|
15
|
+
}
|
|
7
16
|
export function emitBasicHttpMethod(context, rootClient, method, operationGroupName) {
|
|
8
17
|
return [
|
|
9
18
|
{
|
|
@@ -100,6 +109,7 @@ function emitHttpOperation(context, rootClient, operationGroupName, operation, m
|
|
|
100
109
|
wantTracing: true,
|
|
101
110
|
exposeStreamKeyword: true,
|
|
102
111
|
crossLanguageDefinitionId: method === null || method === void 0 ? void 0 : method.crossLanguageDefintionId,
|
|
112
|
+
samples: arrayToRecord(method === null || method === void 0 ? void 0 : method.operation.examples),
|
|
103
113
|
};
|
|
104
114
|
if (result.bodyParameter &&
|
|
105
115
|
((_a = operation.bodyParam) === null || _a === void 0 ? void 0 : _a.type.kind) === "model" &&
|
package/dist/src/http.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"http.js","sourceRoot":"","sources":["../../src/http.ts"],"names":[],"mappings":"AAAA,OAAO,EAcH,UAAU,
|
|
1
|
+
{"version":3,"file":"http.js","sourceRoot":"","sources":["../../src/http.ts"],"names":[],"mappings":"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"}
|
package/dist/src/types.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { Type } from "@typespec/compiler";
|
|
2
2
|
import { HttpAuth } from "@typespec/http";
|
|
3
|
-
import { SdkType, SdkServiceOperation } from "@azure-tools/typespec-client-generator-core";
|
|
3
|
+
import { SdkType, SdkServiceOperation, SdkEndpointType } from "@azure-tools/typespec-client-generator-core";
|
|
4
4
|
import { PythonSdkContext } from "./lib.js";
|
|
5
5
|
export declare const typesMap: Map<SdkType, Record<string, any>>;
|
|
6
6
|
export declare const simpleTypesMap: Map<string | null, Record<string, any>>;
|
|
@@ -26,4 +26,5 @@ export declare const KnownTypes: {
|
|
|
26
26
|
type: string;
|
|
27
27
|
};
|
|
28
28
|
};
|
|
29
|
+
export declare function emitEndpointType<TServiceOperation extends SdkServiceOperation>(context: PythonSdkContext<TServiceOperation>, type: SdkEndpointType): Record<string, any>[];
|
|
29
30
|
//# sourceMappingURL=types.d.ts.map
|
package/dist/src/types.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,oBAAoB,CAAC;AAC1C,OAAO,EAAE,QAAQ,EAAc,MAAM,gBAAgB,CAAC;AACtD,OAAO,EAEH,OAAO,EAYP,mBAAmB,
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,oBAAoB,CAAC;AAC1C,OAAO,EAAE,QAAQ,EAAc,MAAM,gBAAgB,CAAC;AACtD,OAAO,EAEH,OAAO,EAYP,mBAAmB,EACnB,eAAe,EAClB,MAAM,6CAA6C,CAAC;AAGrD,OAAO,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAE5C,eAAO,MAAM,QAAQ,mCAA0C,CAAC;AAChE,eAAO,MAAM,cAAc,yCAAgD,CAAC;AAE5E,MAAM,WAAW,cAAc;IAC3B,IAAI,EAAE,YAAY,CAAC;IACnB,MAAM,EAAE,QAAQ,CAAC;CACpB;AAED,MAAM,WAAW,mBAAmB;IAChC,IAAI,EAAE,qBAAqB,CAAC;IAC5B,KAAK,EAAE,cAAc,EAAE,CAAC;CAC3B;AAcD,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CASpF;AAED,wBAAgB,OAAO,CAAC,iBAAiB,SAAS,mBAAmB,EACjE,OAAO,EAAE,gBAAgB,CAAC,iBAAiB,CAAC,EAC5C,IAAI,EAAE,cAAc,GAAG,mBAAmB,GAAG,IAAI,GAAG,OAAO,EAC3D,QAAQ,UAAQ,GACjB,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAmDrB;AA0RD,wBAAgB,eAAe,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAcvE;AAED,eAAO,MAAM,UAAU;;;;;;;;;;CAItB,CAAC;AAEF,wBAAgB,gBAAgB,CAAC,iBAAiB,SAAS,mBAAmB,EAC1E,OAAO,EAAE,gBAAgB,CAAC,iBAAiB,CAAC,EAC5C,IAAI,EAAE,eAAe,GACtB,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,CAiBvB"}
|
package/dist/src/types.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { Visibility } from "@typespec/http";
|
|
2
2
|
import { dump } from "js-yaml";
|
|
3
|
-
import { camelToSnakeCase, getAddedOn } from "./utils.js";
|
|
3
|
+
import { camelToSnakeCase, emitParamBase, getAddedOn, getImplementation } from "./utils.js";
|
|
4
4
|
export const typesMap = new Map();
|
|
5
5
|
export const simpleTypesMap = new Map();
|
|
6
6
|
function isEmptyModel(type) {
|
|
@@ -352,4 +352,22 @@ export const KnownTypes = {
|
|
|
352
352
|
anyObject: { type: "any-object" },
|
|
353
353
|
any: { type: "any" },
|
|
354
354
|
};
|
|
355
|
+
export function emitEndpointType(context, type) {
|
|
356
|
+
const params = [];
|
|
357
|
+
for (const param of type.templateArguments) {
|
|
358
|
+
const paramBase = emitParamBase(context, param);
|
|
359
|
+
paramBase.clientName = context.arm ? "base_url" : paramBase.clientName;
|
|
360
|
+
params.push({
|
|
361
|
+
...paramBase,
|
|
362
|
+
optional: Boolean(param.clientDefaultValue),
|
|
363
|
+
wireName: param.name,
|
|
364
|
+
location: "endpointPath",
|
|
365
|
+
implementation: getImplementation(context, param),
|
|
366
|
+
clientDefaultValue: param.clientDefaultValue,
|
|
367
|
+
skipUrlEncoding: param.urlEncode === false,
|
|
368
|
+
});
|
|
369
|
+
context.__endpointPathParameters.push(params.at(-1));
|
|
370
|
+
}
|
|
371
|
+
return params;
|
|
372
|
+
}
|
|
355
373
|
//# sourceMappingURL=types.js.map
|
package/dist/src/types.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/types.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/types.ts"],"names":[],"mappings":"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"}
|
|
@@ -55,7 +55,7 @@ class BaseType(BaseModel, ABC): # pylint: disable=too-many-public-methods
|
|
|
55
55
|
return self.imports(**kwargs)
|
|
56
56
|
|
|
57
57
|
def imports_for_sample(self) -> FileImport:
|
|
58
|
-
return self.
|
|
58
|
+
return FileImport(self.code_model)
|
|
59
59
|
|
|
60
60
|
@staticmethod
|
|
61
61
|
def serialize_sample_value(value: Any) -> str:
|
|
@@ -381,6 +381,12 @@ class ClientParameter(Parameter):
|
|
|
381
381
|
):
|
|
382
382
|
# this means i am the base url
|
|
383
383
|
return ParameterMethodLocation.KEYWORD_ONLY
|
|
384
|
+
if (
|
|
385
|
+
self.client_default_value is not None
|
|
386
|
+
and self.code_model.options["from_typespec"]
|
|
387
|
+
and not self.code_model.options["azure_arm"]
|
|
388
|
+
):
|
|
389
|
+
return ParameterMethodLocation.KEYWORD_ONLY
|
|
384
390
|
return ParameterMethodLocation.POSITIONAL
|
|
385
391
|
|
|
386
392
|
|
|
@@ -516,7 +516,7 @@ class JinjaSerializer(ReaderAndWriter): # pylint: disable=abstract-method
|
|
|
516
516
|
and operation.api_versions[0] != self.code_model.options["default_api_version"]
|
|
517
517
|
):
|
|
518
518
|
continue
|
|
519
|
-
samples = operation.yaml_data
|
|
519
|
+
samples = operation.yaml_data.get("samples")
|
|
520
520
|
if not samples or operation.name.startswith("_"):
|
|
521
521
|
continue
|
|
522
522
|
for value in samples.values():
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@azure-tools/typespec-python",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.28.0",
|
|
4
4
|
"author": "Microsoft Corporation",
|
|
5
5
|
"description": "TypeSpec emitter for Python SDKs",
|
|
6
6
|
"homepage": "https://github.com/Azure/autorest.python",
|
|
@@ -33,16 +33,16 @@
|
|
|
33
33
|
"scripts/**"
|
|
34
34
|
],
|
|
35
35
|
"peerDependencies": {
|
|
36
|
-
"@azure-tools/typespec-azure-core": ">=0.
|
|
37
|
-
"@azure-tools/typespec-azure-resource-manager": ">=0.
|
|
38
|
-
"@azure-tools/typespec-autorest": ">=0.
|
|
39
|
-
"@azure-tools/typespec-client-generator-core": ">=0.
|
|
40
|
-
"@azure-tools/typespec-azure-rulesets": ">=0.
|
|
41
|
-
"@typespec/compiler": ">=0.
|
|
42
|
-
"@typespec/http": ">=0.
|
|
43
|
-
"@typespec/rest": ">=0.
|
|
44
|
-
"@typespec/versioning": ">=0.
|
|
45
|
-
"@typespec/openapi": ">=0.
|
|
36
|
+
"@azure-tools/typespec-azure-core": ">=0.45.0 <1.0.0",
|
|
37
|
+
"@azure-tools/typespec-azure-resource-manager": ">=0.45.0 <1.0.0",
|
|
38
|
+
"@azure-tools/typespec-autorest": ">=0.45.0 <1.0.0",
|
|
39
|
+
"@azure-tools/typespec-client-generator-core": ">=0.45.1 <1.0.0",
|
|
40
|
+
"@azure-tools/typespec-azure-rulesets": ">=0.45.0 <3.0.0",
|
|
41
|
+
"@typespec/compiler": ">=0.59.0 <1.0.0",
|
|
42
|
+
"@typespec/http": ">=0.59.0 <1.0.0",
|
|
43
|
+
"@typespec/rest": ">=0.59.0 <1.0.0",
|
|
44
|
+
"@typespec/versioning": ">=0.59.0 <1.0.0",
|
|
45
|
+
"@typespec/openapi": ">=0.59.0 <1.0.0"
|
|
46
46
|
},
|
|
47
47
|
"dependenciesMeta": {
|
|
48
48
|
"@azure-tools/typespec-client-generator-core": {
|
|
@@ -51,33 +51,35 @@
|
|
|
51
51
|
},
|
|
52
52
|
"dependencies": {
|
|
53
53
|
"js-yaml": "~4.1.0",
|
|
54
|
-
"@typespec/openapi3": "~0.
|
|
54
|
+
"@typespec/openapi3": "~0.59.0",
|
|
55
55
|
"@autorest/system-requirements": "~1.0.2",
|
|
56
56
|
"fs-extra": "~11.2.0",
|
|
57
57
|
"semver": "~7.6.2"
|
|
58
58
|
},
|
|
59
59
|
"devDependencies": {
|
|
60
|
-
"@azure-tools/typespec-azure-resource-manager": "~0.
|
|
61
|
-
"@azure-tools/typespec-autorest": "~0.
|
|
60
|
+
"@azure-tools/typespec-azure-resource-manager": "~0.45.0",
|
|
61
|
+
"@azure-tools/typespec-autorest": "~0.45.0",
|
|
62
62
|
"@azure-tools/cadl-ranch-expect": "~0.14.1",
|
|
63
63
|
"@azure-tools/cadl-ranch-specs": "~0.34.5",
|
|
64
64
|
"@types/js-yaml": "~4.0.5",
|
|
65
65
|
"@types/mocha": "~10.0.1",
|
|
66
66
|
"@types/node": "^18.16.3",
|
|
67
|
+
"@types/yargs": "17.0.32",
|
|
67
68
|
"@typespec/eslint-config-typespec": "~0.55.0",
|
|
68
|
-
"@typespec/openapi": "~0.
|
|
69
|
+
"@typespec/openapi": "~0.59.0",
|
|
69
70
|
"c8": "~7.13.0",
|
|
70
71
|
"eslint": "^8.57.0",
|
|
71
72
|
"mocha": "~10.2.0",
|
|
72
73
|
"rimraf": "~5.0.0",
|
|
73
74
|
"typescript": "~5.1.3",
|
|
74
|
-
"@azure-tools/typespec-azure-core": "~0.
|
|
75
|
-
"@azure-tools/typespec-client-generator-core": "
|
|
76
|
-
"@typespec/compiler": "~0.
|
|
77
|
-
"@typespec/http": "~0.
|
|
78
|
-
"@typespec/rest": "~0.
|
|
79
|
-
"@typespec/versioning": "~0.
|
|
80
|
-
"@azure-tools/typespec-azure-rulesets": "0.
|
|
75
|
+
"@azure-tools/typespec-azure-core": "~0.45.0",
|
|
76
|
+
"@azure-tools/typespec-client-generator-core": "0.45.1",
|
|
77
|
+
"@typespec/compiler": "~0.59.0",
|
|
78
|
+
"@typespec/http": "~0.59.0",
|
|
79
|
+
"@typespec/rest": "~0.59.0",
|
|
80
|
+
"@typespec/versioning": "~0.59.0",
|
|
81
|
+
"@azure-tools/typespec-azure-rulesets": "0.45.0",
|
|
82
|
+
"yargs": "~17.2.1"
|
|
81
83
|
},
|
|
82
84
|
"scripts": {
|
|
83
85
|
"clean": "rimraf ./dist ./temp",
|
|
@@ -87,6 +89,7 @@
|
|
|
87
89
|
"test-official": "c8 mocha --forbid-only",
|
|
88
90
|
"lint": "eslint . --ext .ts --max-warnings=0",
|
|
89
91
|
"lint:fix": "eslint . --fix --ext .ts",
|
|
90
|
-
"install": "node ./scripts/run-python3.cjs ./scripts/install.py"
|
|
92
|
+
"install": "node ./scripts/run-python3.cjs ./scripts/install.py",
|
|
93
|
+
"regenerate": "node ./dist/scripts/regenerate.js"
|
|
91
94
|
}
|
|
92
95
|
}
|
|
Binary file
|
|
@@ -0,0 +1,286 @@
|
|
|
1
|
+
/* eslint-disable no-console */
|
|
2
|
+
import { exec as execCallback } from "child_process";
|
|
3
|
+
import { promisify } from "util";
|
|
4
|
+
import yargs from "yargs";
|
|
5
|
+
import { hideBin } from "yargs/helpers";
|
|
6
|
+
import { dirname, join, relative, resolve } from "path";
|
|
7
|
+
import { promises } from "fs";
|
|
8
|
+
import { fileURLToPath } from "url";
|
|
9
|
+
|
|
10
|
+
// Promisify the exec function
|
|
11
|
+
const exec = promisify(execCallback);
|
|
12
|
+
|
|
13
|
+
// Get the directory of the current file
|
|
14
|
+
const PLUGIN_DIR = resolve(fileURLToPath(import.meta.url), "../../../");
|
|
15
|
+
const CADL_RANCH_DIR = resolve(PLUGIN_DIR, "node_modules/@azure-tools/cadl-ranch-specs/http");
|
|
16
|
+
|
|
17
|
+
const EMITTER_OPTIONS: Record<string, Record<string, string> | Record<string, string>[]> = {
|
|
18
|
+
"resiliency/srv-driven/old.tsp": {
|
|
19
|
+
"package-name": "resiliency-srv-driven1",
|
|
20
|
+
"package-mode": "azure-dataplane",
|
|
21
|
+
"package-pprint-name": "ResiliencySrvDriven1",
|
|
22
|
+
},
|
|
23
|
+
"resiliency/srv-driven": {
|
|
24
|
+
"package-name": "resiliency-srv-driven2",
|
|
25
|
+
"package-mode": "azure-dataplane",
|
|
26
|
+
"package-pprint-name": "ResiliencySrvDriven2",
|
|
27
|
+
},
|
|
28
|
+
"authentication/http/custom": {
|
|
29
|
+
"package-name": "authentication-http-custom",
|
|
30
|
+
},
|
|
31
|
+
"authentication/union": {
|
|
32
|
+
"package-name": "authentication-union",
|
|
33
|
+
},
|
|
34
|
+
"type/array": {
|
|
35
|
+
"package-name": "typetest-array",
|
|
36
|
+
},
|
|
37
|
+
"type/dictionary": {
|
|
38
|
+
"package-name": "typetest-dictionary",
|
|
39
|
+
},
|
|
40
|
+
"type/enum/extensible": {
|
|
41
|
+
"package-name": "typetest-enum-extensible",
|
|
42
|
+
},
|
|
43
|
+
"type/enum/fixed": {
|
|
44
|
+
"package-name": "typetest-enum-fixed",
|
|
45
|
+
},
|
|
46
|
+
"type/model/empty": {
|
|
47
|
+
"package-name": "typetest-model-empty",
|
|
48
|
+
},
|
|
49
|
+
"type/model/flatten": {
|
|
50
|
+
"package-name": "typetest-model-flatten",
|
|
51
|
+
},
|
|
52
|
+
"type/model/inheritance/enum-discriminator": {
|
|
53
|
+
"package-name": "typetest-model-enumdiscriminator",
|
|
54
|
+
},
|
|
55
|
+
"type/model/inheritance/nested-discriminator": {
|
|
56
|
+
"package-name": "typetest-model-nesteddiscriminator",
|
|
57
|
+
},
|
|
58
|
+
"type/model/inheritance/not-discriminated": {
|
|
59
|
+
"package-name": "typetest-model-notdiscriminated",
|
|
60
|
+
},
|
|
61
|
+
"type/model/inheritance/single-discriminator": {
|
|
62
|
+
"package-name": "typetest-model-singlediscriminator",
|
|
63
|
+
},
|
|
64
|
+
"type/model/inheritance/recursive": {
|
|
65
|
+
"package-name": "typetest-model-recursive",
|
|
66
|
+
},
|
|
67
|
+
"type/model/usage": {
|
|
68
|
+
"package-name": "typetest-model-usage",
|
|
69
|
+
},
|
|
70
|
+
"type/model/visibility": [
|
|
71
|
+
{ "package-name": "typetest-model-visibility" },
|
|
72
|
+
{ "package-name": "headasbooleantrue", "head-as-boolean": "true" },
|
|
73
|
+
{ "package-name": "headasbooleanfalse", "head-as-boolean": "false" },
|
|
74
|
+
],
|
|
75
|
+
"type/property/nullable": {
|
|
76
|
+
"package-name": "typetest-property-nullable",
|
|
77
|
+
},
|
|
78
|
+
"type/property/optionality": {
|
|
79
|
+
"package-name": "typetest-property-optional",
|
|
80
|
+
},
|
|
81
|
+
"type/property/additional-properties": {
|
|
82
|
+
"package-name": "typetest-property-additionalproperties",
|
|
83
|
+
},
|
|
84
|
+
"type/scalar": {
|
|
85
|
+
"package-name": "typetest-scalar",
|
|
86
|
+
},
|
|
87
|
+
"type/property/value-types": {
|
|
88
|
+
"package-name": "typetest-property-valuetypes",
|
|
89
|
+
},
|
|
90
|
+
"type/union": {
|
|
91
|
+
"package-name": "typetest-union",
|
|
92
|
+
},
|
|
93
|
+
"azure/core/lro/rpc": {
|
|
94
|
+
"package-name": "azurecore-lro-rpc",
|
|
95
|
+
},
|
|
96
|
+
"client/structure/multi-client": {
|
|
97
|
+
"package-name": "client-structure-multiclient",
|
|
98
|
+
},
|
|
99
|
+
"client/structure/renamed-operation": {
|
|
100
|
+
"package-name": "client-structure-renamedoperation",
|
|
101
|
+
},
|
|
102
|
+
"client/structure/two-operation-group": {
|
|
103
|
+
"package-name": "client-structure-twooperationgroup",
|
|
104
|
+
},
|
|
105
|
+
"mgmt/sphere": [{ "package-name": "azure-mgmt-spheredpg" }],
|
|
106
|
+
};
|
|
107
|
+
|
|
108
|
+
function toPosix(dir: string): string {
|
|
109
|
+
return dir.replace(/\\/g, "/");
|
|
110
|
+
}
|
|
111
|
+
|
|
112
|
+
function getEmitterOption(spec: string): Record<string, string>[] {
|
|
113
|
+
const relativeSpec = toPosix(relative(CADL_RANCH_DIR, spec));
|
|
114
|
+
const key = relativeSpec.includes("resiliency/srv-driven/old.tsp") ? relativeSpec : dirname(relativeSpec);
|
|
115
|
+
const result = EMITTER_OPTIONS[key] || [{}];
|
|
116
|
+
return Array.isArray(result) ? result : [result];
|
|
117
|
+
}
|
|
118
|
+
|
|
119
|
+
// Function to execute CLI commands asynchronously
|
|
120
|
+
async function executeCommand(command: string): Promise<void> {
|
|
121
|
+
try {
|
|
122
|
+
const { stdout, stderr } = await exec(command);
|
|
123
|
+
if (stdout) console.log(`stdout: ${stdout}`);
|
|
124
|
+
if (stderr) console.error(`stderr: ${stderr}`);
|
|
125
|
+
} catch (error) {
|
|
126
|
+
console.error(`exec error: ${error}`);
|
|
127
|
+
throw error;
|
|
128
|
+
}
|
|
129
|
+
}
|
|
130
|
+
|
|
131
|
+
interface RegenerateFlagsInput {
|
|
132
|
+
flavor?: "azure" | "unbranded";
|
|
133
|
+
debug?: boolean;
|
|
134
|
+
name?: string;
|
|
135
|
+
}
|
|
136
|
+
|
|
137
|
+
interface RegenerateFlags {
|
|
138
|
+
flavor: "azure" | "unbranded";
|
|
139
|
+
debug: boolean;
|
|
140
|
+
name?: string;
|
|
141
|
+
}
|
|
142
|
+
|
|
143
|
+
const SpecialFlags: Record<string, Record<string, any>> = {
|
|
144
|
+
azure: {
|
|
145
|
+
"generate-test": true,
|
|
146
|
+
"generate-sample": true,
|
|
147
|
+
},
|
|
148
|
+
};
|
|
149
|
+
|
|
150
|
+
async function getSubdirectories(baseDir: string, flags: RegenerateFlags): Promise<string[]> {
|
|
151
|
+
const subdirectories: string[] = [];
|
|
152
|
+
|
|
153
|
+
async function searchDir(currentDir: string) {
|
|
154
|
+
const items = await promises.readdir(currentDir, { withFileTypes: true });
|
|
155
|
+
|
|
156
|
+
const promisesArray = items.map(async (item) => {
|
|
157
|
+
const subDirPath = join(currentDir, item.name);
|
|
158
|
+
if (item.isDirectory()) {
|
|
159
|
+
const mainTspPath = join(subDirPath, "main.tsp");
|
|
160
|
+
const clientTspPath = join(subDirPath, "client.tsp");
|
|
161
|
+
|
|
162
|
+
const mainTspRelativePath = toPosix(relative(baseDir, mainTspPath));
|
|
163
|
+
if (flags.flavor === "unbranded" && mainTspRelativePath.includes("azure")) return;
|
|
164
|
+
|
|
165
|
+
const hasMainTsp = await promises
|
|
166
|
+
.access(mainTspPath)
|
|
167
|
+
.then(() => true)
|
|
168
|
+
.catch(() => false);
|
|
169
|
+
const hasClientTsp = await promises
|
|
170
|
+
.access(clientTspPath)
|
|
171
|
+
.then(() => true)
|
|
172
|
+
.catch(() => false);
|
|
173
|
+
|
|
174
|
+
if (mainTspRelativePath.toLowerCase().includes(flags.name || "")) {
|
|
175
|
+
if (mainTspRelativePath.includes("resiliency/srv-driven")) {
|
|
176
|
+
subdirectories.push(resolve(subDirPath, "old.tsp"));
|
|
177
|
+
}
|
|
178
|
+
if (hasClientTsp) {
|
|
179
|
+
subdirectories.push(resolve(subDirPath, "client.tsp"));
|
|
180
|
+
} else if (hasMainTsp) {
|
|
181
|
+
subdirectories.push(resolve(subDirPath, "main.tsp"));
|
|
182
|
+
}
|
|
183
|
+
}
|
|
184
|
+
|
|
185
|
+
// Recursively search in the subdirectory
|
|
186
|
+
await searchDir(subDirPath);
|
|
187
|
+
}
|
|
188
|
+
});
|
|
189
|
+
|
|
190
|
+
await Promise.all(promisesArray);
|
|
191
|
+
}
|
|
192
|
+
|
|
193
|
+
await searchDir(baseDir);
|
|
194
|
+
return subdirectories;
|
|
195
|
+
}
|
|
196
|
+
|
|
197
|
+
function defaultPackageName(spec: string): string {
|
|
198
|
+
return toPosix(relative(CADL_RANCH_DIR, dirname(spec)))
|
|
199
|
+
.replace(/\//g, "-")
|
|
200
|
+
.toLowerCase();
|
|
201
|
+
}
|
|
202
|
+
|
|
203
|
+
function addOptions(spec: string, generatedFolder: string, flags: RegenerateFlags): string[] {
|
|
204
|
+
const emitterConfigs: string[] = [];
|
|
205
|
+
for (const config of getEmitterOption(spec)) {
|
|
206
|
+
const options: Record<string, string> = { ...config };
|
|
207
|
+
options["flavor"] = flags.flavor;
|
|
208
|
+
for (const [k, v] of Object.entries(SpecialFlags[flags.flavor] ?? {})) {
|
|
209
|
+
options[k] = v;
|
|
210
|
+
}
|
|
211
|
+
if (options["emitter-output-dir"] === undefined) {
|
|
212
|
+
const packageName = options["package-name"] || defaultPackageName(spec);
|
|
213
|
+
options["emitter-output-dir"] = toPosix(`${generatedFolder}/test/${flags.flavor}/generated/${packageName}`);
|
|
214
|
+
}
|
|
215
|
+
if (flags.debug) {
|
|
216
|
+
options["debug"] = "true";
|
|
217
|
+
}
|
|
218
|
+
if (flags.flavor === "unbranded") {
|
|
219
|
+
options["company-name"] = "Unbranded";
|
|
220
|
+
}
|
|
221
|
+
options["examples-directory"] = toPosix(join(dirname(spec), "examples"));
|
|
222
|
+
const configs = Object.entries(options).flatMap(([k, v]) => {
|
|
223
|
+
return `--option @azure-tools/typespec-python.${k}=${v}`;
|
|
224
|
+
});
|
|
225
|
+
emitterConfigs.push(configs.join(" "));
|
|
226
|
+
}
|
|
227
|
+
return emitterConfigs;
|
|
228
|
+
}
|
|
229
|
+
|
|
230
|
+
async function _regenerateSingle(spec: string, flags: RegenerateFlags): Promise<void> {
|
|
231
|
+
// Perform some asynchronous operation here
|
|
232
|
+
const options = addOptions(spec, PLUGIN_DIR, flags);
|
|
233
|
+
const commandPromises = options.map((option) => {
|
|
234
|
+
const command = `tsp compile ${spec} --emit=${toPosix(PLUGIN_DIR)} ${option}`;
|
|
235
|
+
console.log(command);
|
|
236
|
+
return executeCommand(command);
|
|
237
|
+
});
|
|
238
|
+
await Promise.all(commandPromises);
|
|
239
|
+
}
|
|
240
|
+
|
|
241
|
+
async function regenerate(flags: RegenerateFlagsInput): Promise<boolean> {
|
|
242
|
+
if (flags.flavor === undefined) {
|
|
243
|
+
const azureGeneration = await regenerate({ ...flags, flavor: "azure" });
|
|
244
|
+
const unbrandedGeneration = await regenerate({ ...flags, flavor: "unbranded" });
|
|
245
|
+
return azureGeneration && unbrandedGeneration;
|
|
246
|
+
} else {
|
|
247
|
+
const flagsResolved = { debug: false, flavor: flags.flavor, ...flags };
|
|
248
|
+
const CADL_RANCH_DIR = resolve(PLUGIN_DIR, "node_modules/@azure-tools/cadl-ranch-specs/http");
|
|
249
|
+
const subdirectories = await getSubdirectories(CADL_RANCH_DIR, flagsResolved);
|
|
250
|
+
const promises = subdirectories.map(async (subdirectory) => {
|
|
251
|
+
// Perform additional asynchronous operations on each subdirectory here
|
|
252
|
+
await _regenerateSingle(subdirectory, flagsResolved);
|
|
253
|
+
});
|
|
254
|
+
await Promise.all(promises);
|
|
255
|
+
return true;
|
|
256
|
+
}
|
|
257
|
+
}
|
|
258
|
+
|
|
259
|
+
// try {
|
|
260
|
+
// const output = await executeCommand('tsp compile');
|
|
261
|
+
// console.log(`Command output: ${output}`);
|
|
262
|
+
// } catch (error) {
|
|
263
|
+
// console.error(`Command failed: ${error}`);
|
|
264
|
+
// }
|
|
265
|
+
|
|
266
|
+
// PARSE INPUT ARGUMENTS
|
|
267
|
+
const argv = yargs(hideBin(process.argv))
|
|
268
|
+
.option("flavor", {
|
|
269
|
+
type: "string",
|
|
270
|
+
choices: ["azure", "unbranded"],
|
|
271
|
+
description: "Specify the flavor",
|
|
272
|
+
})
|
|
273
|
+
.option("debug", {
|
|
274
|
+
alias: "d",
|
|
275
|
+
type: "boolean",
|
|
276
|
+
description: "Debug mode",
|
|
277
|
+
})
|
|
278
|
+
.option("name", {
|
|
279
|
+
alias: "n",
|
|
280
|
+
type: "string",
|
|
281
|
+
description: "Specify filename if you only want to generate a subset",
|
|
282
|
+
}).argv;
|
|
283
|
+
|
|
284
|
+
regenerate(argv as RegenerateFlags)
|
|
285
|
+
.then(() => console.log("Regeneration successful"))
|
|
286
|
+
.catch((error) => console.error(`Regeneration failed: ${error.message}`));
|