@azure-tools/typespec-python 0.60.1 → 0.60.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.
@@ -3,204 +3,22 @@ import { exec as execCallback } from "child_process";
3
3
  import { promisify } from "util";
4
4
  import yargs from "yargs";
5
5
  import { hideBin } from "yargs/helpers";
6
- import { dirname, join, relative, resolve } from "path";
6
+ import { join, resolve } from "path";
7
7
  import { promises, rmSync } from "fs";
8
8
  import { fileURLToPath } from "url";
9
+ import { BASE_AZURE_EMITTER_OPTIONS, BASE_EMITTER_OPTIONS, buildOptions, regenerate, toPosix, } from "./regenerate-common.js";
9
10
  // Promisify the exec function
10
11
  const exec = promisify(execCallback);
11
12
  // Get the directory of the current file
12
13
  const PLUGIN_DIR = resolve(fileURLToPath(import.meta.url), "../../../");
13
14
  const AZURE_HTTP_SPECS = resolve(PLUGIN_DIR, "node_modules/@azure-tools/azure-http-specs/specs");
14
15
  const HTTP_SPECS = resolve(PLUGIN_DIR, "node_modules/@typespec/http-specs/specs");
15
- // Add this near the top with other constants
16
- const SKIP_SPECS = ["type/file"];
16
+ const EMITTER_NAME = "@azure-tools/typespec-python";
17
17
  const AZURE_EMITTER_OPTIONS = {
18
- "azure/client-generator-core/access": {
19
- namespace: "specs.azure.clientgenerator.core.access",
20
- },
21
- "azure/client-generator-core/alternate-type": {
22
- namespace: "specs.azure.clientgenerator.core.alternatetype",
23
- },
24
- "azure/client-generator-core/api-version": {
25
- namespace: "specs.azure.clientgenerator.core.apiversion",
26
- },
27
- "azure/client-generator-core/client-initialization/default": {
28
- namespace: "specs.azure.clientgenerator.core.clientinitialization.default",
29
- },
30
- "azure/client-generator-core/client-initialization/individually": {
31
- namespace: "specs.azure.clientgenerator.core.clientinitialization.individually",
32
- },
33
- "azure/client-generator-core/client-initialization/individuallyParent": {
34
- namespace: "specs.azure.clientgenerator.core.clientinitialization.individuallyparent",
35
- },
36
- "azure/client-generator-core/client-location": {
37
- namespace: "specs.azure.clientgenerator.core.clientlocation",
38
- },
39
- "azure/client-generator-core/deserialize-empty-string-as-null": {
40
- namespace: "specs.azure.clientgenerator.core.emptystring",
41
- },
42
- "azure/client-generator-core/flatten-property": {
43
- namespace: "specs.azure.clientgenerator.core.flattenproperty",
44
- },
45
- "azure/client-generator-core/usage": {
46
- namespace: "specs.azure.clientgenerator.core.usage",
47
- },
48
- "azure/client-generator-core/override": {
49
- namespace: "specs.azure.clientgenerator.core.override",
50
- },
51
- "azure/client-generator-core/hierarchy-building": {
52
- namespace: "specs.azure.clientgenerator.core.hierarchybuilding",
53
- },
54
- "azure/core/basic": {
55
- namespace: "specs.azure.core.basic",
56
- },
57
- "azure/core/lro/rpc": {
58
- namespace: "specs.azure.core.lro.rpc",
59
- },
60
- "azure/core/lro/standard": {
61
- namespace: "specs.azure.core.lro.standard",
62
- },
63
- "azure/core/model": {
64
- namespace: "specs.azure.core.model",
65
- },
66
- "azure/core/page": {
67
- namespace: "specs.azure.core.page",
68
- },
69
- "azure/core/scalar": {
70
- namespace: "specs.azure.core.scalar",
71
- },
72
- "azure/core/traits": {
73
- namespace: "specs.azure.core.traits",
74
- },
75
- "azure/encode/duration": {
76
- namespace: "specs.azure.encode.duration",
77
- },
78
- "azure/example/basic": {
79
- namespace: "specs.azure.example.basic",
80
- },
81
- "azure/payload/pageable": {
82
- namespace: "specs.azure.payload.pageable",
83
- },
84
- "azure/versioning/previewVersion": {
85
- namespace: "specs.azure.versioning.previewversion",
86
- },
87
- "client/structure/default": {
88
- namespace: "client.structure.service",
89
- },
90
- "client/structure/multi-client": {
91
- "package-name": "client-structure-multiclient",
92
- "namespace": "client.structure.multiclient",
93
- },
94
- "client/structure/renamed-operation": {
95
- "package-name": "client-structure-renamedoperation",
96
- "namespace": "client.structure.renamedoperation",
97
- },
98
- "client/structure/two-operation-group": {
99
- "package-name": "client-structure-twooperationgroup",
100
- "namespace": "client.structure.twooperationgroup",
101
- },
102
- "client/naming": {
103
- namespace: "client.naming.main",
104
- },
105
- "client/overload": {
106
- namespace: "client.overload",
107
- },
108
- "encode/duration": {
109
- namespace: "encode.duration",
110
- },
111
- "encode/numeric": {
112
- namespace: "encode.numeric",
113
- },
114
- "parameters/basic": {
115
- namespace: "parameters.basic",
116
- },
117
- "parameters/spread": {
118
- namespace: "parameters.spread",
119
- },
120
- "payload/content-negotiation": {
121
- namespace: "payload.contentnegotiation",
122
- },
123
- "payload/multipart": {
124
- namespace: "payload.multipart",
125
- },
126
- "serialization/encoded-name/json": {
127
- namespace: "serialization.encodedname.json",
128
- },
129
- "special-words": {
130
- namespace: "specialwords",
131
- },
132
- "service/multi-service": {
133
- namespace: "service.multiservice",
134
- },
18
+ ...BASE_AZURE_EMITTER_OPTIONS,
135
19
  };
136
20
  const EMITTER_OPTIONS = {
137
- "resiliency/srv-driven/old.tsp": {
138
- "package-name": "resiliency-srv-driven1",
139
- "namespace": "resiliency.srv.driven1",
140
- "package-mode": "azure-dataplane",
141
- "package-pprint-name": "ResiliencySrvDriven1",
142
- },
143
- "resiliency/srv-driven": {
144
- "package-name": "resiliency-srv-driven2",
145
- "namespace": "resiliency.srv.driven2",
146
- "package-mode": "azure-dataplane",
147
- "package-pprint-name": "ResiliencySrvDriven2",
148
- },
149
- "authentication/api-key": {
150
- "clear-output-folder": "true",
151
- },
152
- "authentication/http/custom": {
153
- "package-name": "authentication-http-custom",
154
- "namespace": "authentication.http.custom",
155
- "package-pprint-name": "Authentication Http Custom",
156
- },
157
- "authentication/union": [
158
- {
159
- "package-name": "authentication-union",
160
- "namespace": "authentication.union",
161
- },
162
- {
163
- "package-name": "setuppy-authentication-union",
164
- "namespace": "setuppy.authentication.union",
165
- "keep-setup-py": "true",
166
- },
167
- ],
168
- "type/array": {
169
- "package-name": "typetest-array",
170
- "namespace": "typetest.array",
171
- },
172
- "type/dictionary": {
173
- "package-name": "typetest-dictionary",
174
- "namespace": "typetest.dictionary",
175
- },
176
- "type/enum/extensible": {
177
- "package-name": "typetest-enum-extensible",
178
- "namespace": "typetest.enum.extensible",
179
- },
180
- "type/enum/fixed": {
181
- "package-name": "typetest-enum-fixed",
182
- "namespace": "typetest.enum.fixed",
183
- },
184
- "type/model/empty": {
185
- "package-name": "typetest-model-empty",
186
- "namespace": "typetest.model.empty",
187
- },
188
- "type/model/inheritance/enum-discriminator": {
189
- "package-name": "typetest-model-enumdiscriminator",
190
- "namespace": "typetest.model.enumdiscriminator",
191
- },
192
- "type/model/inheritance/nested-discriminator": {
193
- "package-name": "typetest-model-nesteddiscriminator",
194
- "namespace": "typetest.model.nesteddiscriminator",
195
- },
196
- "type/model/inheritance/not-discriminated": {
197
- "package-name": "typetest-model-notdiscriminated",
198
- "namespace": "typetest.model.notdiscriminated",
199
- },
200
- "type/model/inheritance/single-discriminator": {
201
- "package-name": "typetest-model-singlediscriminator",
202
- "namespace": "typetest.model.singlediscriminator",
203
- },
21
+ ...BASE_EMITTER_OPTIONS,
204
22
  "type/model/inheritance/recursive": [
205
23
  {
206
24
  "package-name": "typetest-model-recursive",
@@ -213,54 +31,6 @@ const EMITTER_OPTIONS = {
213
31
  "clear-output-folder": "true",
214
32
  },
215
33
  ],
216
- "type/model/usage": {
217
- "package-name": "typetest-model-usage",
218
- "namespace": "typetest.model.usage",
219
- },
220
- "type/model/visibility": [
221
- {
222
- "package-name": "typetest-model-visibility",
223
- "namespace": "typetest.model.visibility",
224
- },
225
- {
226
- "package-name": "headasbooleantrue",
227
- "namespace": "headasbooleantrue",
228
- "head-as-boolean": "true",
229
- },
230
- {
231
- "package-name": "headasbooleanfalse",
232
- "namespace": "headasbooleanfalse",
233
- "head-as-boolean": "false",
234
- },
235
- ],
236
- "type/property/nullable": {
237
- "package-name": "typetest-property-nullable",
238
- "namespace": "typetest.property.nullable",
239
- },
240
- "type/property/optionality": {
241
- "package-name": "typetest-property-optional",
242
- "namespace": "typetest.property.optional",
243
- },
244
- "type/property/additional-properties": {
245
- "package-name": "typetest-property-additionalproperties",
246
- "namespace": "typetest.property.additionalproperties",
247
- },
248
- "type/scalar": {
249
- "package-name": "typetest-scalar",
250
- "namespace": "typetest.scalar",
251
- },
252
- "type/property/value-types": {
253
- "package-name": "typetest-property-valuetypes",
254
- "namespace": "typetest.property.valuetypes",
255
- },
256
- "type/union": {
257
- "package-name": "typetest-union",
258
- "namespace": "typetest.union",
259
- },
260
- "type/union/discriminated": {
261
- "package-name": "typetest-discriminatedunion",
262
- "namespace": "typetest.discriminatedunion",
263
- },
264
34
  "client/structure/client-operation-group": {
265
35
  "package-name": "client-structure-clientoperationgroup",
266
36
  "namespace": "client.structure.clientoperationgroup",
@@ -277,31 +47,13 @@ const EMITTER_OPTIONS = {
277
47
  "package-name": "client-structure-twooperationgroup",
278
48
  "namespace": "client.structure.twooperationgroup",
279
49
  },
280
- "type/file": {
281
- "package-name": "typetest-file",
282
- "namespace": "typetest.file",
283
- },
284
- "documentation": {
285
- "package-name": "specs-documentation",
286
- "namespace": "specs.documentation",
287
- },
288
50
  };
289
- function toPosix(dir) {
290
- return dir.replace(/\\/g, "/");
291
- }
292
- function getEmitterOption(spec, flavor) {
293
- const specDir = spec.includes("azure") ? AZURE_HTTP_SPECS : HTTP_SPECS;
294
- const relativeSpec = toPosix(relative(specDir, spec));
295
- const key = relativeSpec.includes("resiliency/srv-driven/old.tsp") ? relativeSpec : dirname(relativeSpec);
296
- const emitter_options = EMITTER_OPTIONS[key] || (flavor === "azure" ? AZURE_EMITTER_OPTIONS[key] : [{}]) || [{}];
297
- const result = Array.isArray(emitter_options) ? emitter_options : [emitter_options];
298
- return result;
299
- }
300
51
  // Function to execute CLI commands asynchronously
301
52
  async function executeCommand(tspCommand) {
302
53
  try {
303
- console.log(`exec: ${tspCommand.command}`);
304
- const { stdout, stderr } = await exec(tspCommand.command);
54
+ const cmd = tspCommand.command;
55
+ console.log(`exec: ${cmd}`);
56
+ const { stdout, stderr } = await exec(cmd);
305
57
  if (stdout)
306
58
  console.log(`stdout: ${stdout}`);
307
59
  if (stderr)
@@ -313,109 +65,6 @@ async function executeCommand(tspCommand) {
313
65
  throw error;
314
66
  }
315
67
  }
316
- const SpecialFlags = {
317
- azure: {
318
- "generate-test": true,
319
- "generate-sample": true,
320
- },
321
- };
322
- async function getSubdirectories(baseDir, flags) {
323
- const subdirectories = [];
324
- async function searchDir(currentDir) {
325
- const items = await promises.readdir(currentDir, { withFileTypes: true });
326
- const promisesArray = items.map(async (item) => {
327
- const subDirPath = join(currentDir, item.name);
328
- if (item.isDirectory()) {
329
- const mainTspPath = join(subDirPath, "main.tsp");
330
- const clientTspPath = join(subDirPath, "client.tsp");
331
- const mainTspRelativePath = toPosix(relative(baseDir, mainTspPath));
332
- // Replace the individual skip checks with:
333
- if (SKIP_SPECS.some((skipSpec) => mainTspRelativePath.includes(skipSpec)))
334
- return;
335
- const hasMainTsp = await promises
336
- .access(mainTspPath)
337
- .then(() => true)
338
- .catch(() => false);
339
- const hasClientTsp = await promises
340
- .access(clientTspPath)
341
- .then(() => true)
342
- .catch(() => false);
343
- if (mainTspRelativePath.toLowerCase().includes(flags.name || "")) {
344
- if (mainTspRelativePath.includes("resiliency/srv-driven")) {
345
- subdirectories.push(resolve(subDirPath, "old.tsp"));
346
- }
347
- if (hasClientTsp) {
348
- subdirectories.push(resolve(subDirPath, "client.tsp"));
349
- }
350
- else if (hasMainTsp) {
351
- subdirectories.push(resolve(subDirPath, "main.tsp"));
352
- }
353
- }
354
- // Recursively search in the subdirectory
355
- await searchDir(subDirPath);
356
- }
357
- });
358
- await Promise.all(promisesArray);
359
- }
360
- await searchDir(baseDir);
361
- return subdirectories;
362
- }
363
- function defaultPackageName(spec) {
364
- const specDir = spec.includes("azure") ? AZURE_HTTP_SPECS : HTTP_SPECS;
365
- return toPosix(relative(specDir, dirname(spec)))
366
- .replace(/\//g, "-")
367
- .toLowerCase();
368
- }
369
- function addOptions(spec, generatedFolder, flags) {
370
- const emitterConfigs = [];
371
- for (const config of getEmitterOption(spec, flags.flavor)) {
372
- const options = { ...config };
373
- options["flavor"] = flags.flavor;
374
- for (const [k, v] of Object.entries(SpecialFlags[flags.flavor] ?? {})) {
375
- options[k] = v;
376
- }
377
- if (options["emitter-output-dir"] === undefined) {
378
- const packageName = options["package-name"] || defaultPackageName(spec);
379
- options["emitter-output-dir"] = toPosix(`${generatedFolder}/test/${flags.flavor}/generated/${packageName}`);
380
- }
381
- if (flags.debug) {
382
- options["debug"] = "true";
383
- }
384
- options["examples-dir"] = toPosix(join(dirname(spec), "examples"));
385
- const configs = Object.entries(options).flatMap(([k, v]) => {
386
- return `--option @azure-tools/typespec-python.${k}=${typeof v === "string" && v.indexOf(" ") > -1 ? `"${v}"` : v}`;
387
- });
388
- emitterConfigs.push({
389
- optionsStr: configs.join(" "),
390
- outputDir: options["emitter-output-dir"],
391
- });
392
- }
393
- return emitterConfigs;
394
- }
395
- function _getCmdList(spec, flags) {
396
- return addOptions(spec, PLUGIN_DIR, flags).map((option) => {
397
- return {
398
- outputDir: option.outputDir,
399
- command: `tsp compile ${spec} --emit=${toPosix(PLUGIN_DIR)} ${option.optionsStr}`,
400
- };
401
- });
402
- }
403
- async function runTaskPool(tasks, poolLimit) {
404
- async function worker(start, end) {
405
- while (start < end) {
406
- await tasks[start]();
407
- start++;
408
- }
409
- }
410
- const workers = [];
411
- let start = 0;
412
- while (start < tasks.length) {
413
- const end = Math.min(start + poolLimit, tasks.length);
414
- workers.push((async () => await worker(start, end))());
415
- start = end;
416
- }
417
- await Promise.all(workers);
418
- }
419
68
  // create some files before regeneration. After regeneration, these files should be deleted and we will test it
420
69
  // in test case
421
70
  async function preprocess(flags) {
@@ -428,28 +77,28 @@ async function preprocess(flags) {
428
77
  await promises.writeFile(join(...folderParts, "generation", "subdir", "to_be_kept.py"), "# This file is to be kept after regeneration");
429
78
  }
430
79
  }
431
- async function regenerate(flags) {
432
- if (flags.flavor === undefined) {
433
- await regenerate({ ...flags, flavor: "azure" });
434
- await regenerate({ ...flags, flavor: "unbranded" });
435
- }
436
- else {
437
- await preprocess(flags);
438
- const flagsResolved = { debug: false, flavor: flags.flavor, ...flags };
439
- const subdirectoriesForAzure = await getSubdirectories(AZURE_HTTP_SPECS, flagsResolved);
440
- const subdirectoriesForNonAzure = await getSubdirectories(HTTP_SPECS, flagsResolved);
441
- const subdirectories = flags.flavor === "azure"
442
- ? [...subdirectoriesForAzure, ...subdirectoriesForNonAzure]
443
- : subdirectoriesForNonAzure;
444
- const cmdList = subdirectories.flatMap((subdirectory) => _getCmdList(subdirectory, flagsResolved));
445
- // Create tasks as functions for the pool
446
- const tasks = cmdList.map((tspCommand) => {
447
- return () => executeCommand(tspCommand);
448
- });
449
- // Run tasks with a concurrency limit
450
- await runTaskPool(tasks, 30);
451
- }
80
+ function _getCmdList(spec, flags) {
81
+ return buildOptions(spec, PLUGIN_DIR, flags, config).map((po) => {
82
+ const optionsStr = Object.entries(po.options)
83
+ .flatMap(([k, v]) => {
84
+ return `--option ${EMITTER_NAME}.${k}=${typeof v === "string" && v.indexOf(" ") > -1 ? `"${v}"` : v}`;
85
+ })
86
+ .join(" ");
87
+ return {
88
+ outputDir: po.outputDir,
89
+ command: `tsp compile ${spec} --emit=${toPosix(PLUGIN_DIR)} ${optionsStr}`,
90
+ };
91
+ });
452
92
  }
93
+ const config = {
94
+ azureHttpSpecs: AZURE_HTTP_SPECS,
95
+ httpSpecs: HTTP_SPECS,
96
+ emitterOptions: EMITTER_OPTIONS,
97
+ azureEmitterOptions: AZURE_EMITTER_OPTIONS,
98
+ preprocess,
99
+ getCmdList: _getCmdList,
100
+ executeCommand,
101
+ };
453
102
  // PARSE INPUT ARGUMENTS
454
103
  const argv = yargs(hideBin(process.argv))
455
104
  .option("flavor", {
@@ -468,7 +117,7 @@ const argv = yargs(hideBin(process.argv))
468
117
  description: "Specify filename if you only want to generate a subset",
469
118
  }).argv;
470
119
  const start = performance.now();
471
- regenerate(argv)
120
+ regenerate(argv, config)
472
121
  .then(() => console.log(`Regeneration successful, time taken: ${Math.round((performance.now() - start) / 1000)} s`))
473
122
  .catch((error) => console.error(`Regeneration failed: ${error.message}`));
474
123
  //# sourceMappingURL=regenerate.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"regenerate.js","sourceRoot":"","sources":["../../../scripts/eng/regenerate.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"regenerate.js","sourceRoot":"","sources":["../../../scripts/eng/regenerate.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@azure-tools/typespec-python",
3
- "version": "0.60.1",
3
+ "version": "0.60.2",
4
4
  "author": "Microsoft Corporation",
5
5
  "description": "TypeSpec emitter for Python SDKs",
6
6
  "homepage": "https://github.com/Azure/autorest.python",
@@ -36,7 +36,7 @@
36
36
  ],
37
37
  "peerDependencies": {
38
38
  "@typespec/compiler": "^1.9.0",
39
- "@typespec/http": "^1.9.0",
39
+ "@typespec/http": "^1.9.1",
40
40
  "@typespec/rest": ">=0.79.0 <1.0.0",
41
41
  "@typespec/versioning": ">=0.79.0 <1.0.0",
42
42
  "@typespec/openapi": "^1.9.0",
@@ -48,44 +48,44 @@
48
48
  "@azure-tools/typespec-azure-resource-manager": ">=0.65.0 <1.0.0",
49
49
  "@azure-tools/typespec-autorest": ">=0.65.0 <1.0.0",
50
50
  "@azure-tools/typespec-azure-rulesets": ">=0.65.0 <1.0.0",
51
- "@azure-tools/typespec-client-generator-core": ">=0.65.0 <1.0.0"
51
+ "@azure-tools/typespec-client-generator-core": ">=0.65.3 <1.0.0"
52
52
  },
53
53
  "dependencies": {
54
54
  "js-yaml": "~4.1.0",
55
55
  "semver": "~7.6.2",
56
- "tsx": "~4.19.1",
57
- "@typespec/http-client-python": "~0.27.1",
56
+ "tsx": "^4.21.0",
57
+ "@typespec/http-client-python": "~0.27.2",
58
58
  "fs-extra": "~11.2.0"
59
59
  },
60
60
  "devDependencies": {
61
61
  "@typespec/compiler": "^1.9.0",
62
- "@typespec/http": "^1.9.0",
62
+ "@typespec/http": "^1.9.1",
63
63
  "@typespec/rest": "~0.79.0",
64
64
  "@typespec/versioning": "~0.79.0",
65
65
  "@typespec/openapi": "^1.9.0",
66
66
  "@typespec/events": "~0.79.0",
67
67
  "@typespec/sse": "~0.79.0",
68
68
  "@typespec/streams": "~0.79.0",
69
- "@typespec/tspd": "~0.70.0",
69
+ "@typespec/tspd": "~0.74.0",
70
70
  "@typespec/xml": "~0.79.0",
71
71
  "@azure-tools/typespec-azure-resource-manager": "~0.65.0",
72
72
  "@azure-tools/typespec-azure-core": "~0.65.0",
73
73
  "@azure-tools/typespec-azure-rulesets": "~0.65.0",
74
74
  "@azure-tools/typespec-autorest": "~0.65.0",
75
- "@azure-tools/typespec-client-generator-core": "~0.65.0",
76
- "@azure-tools/azure-http-specs": "0.1.0-alpha.37",
77
- "@typespec/http-specs": "0.1.0-alpha.32",
75
+ "@azure-tools/typespec-client-generator-core": "~0.65.3",
76
+ "@azure-tools/azure-http-specs": "0.1.0-alpha.38-dev.2",
77
+ "@typespec/http-specs": "0.1.0-alpha.33-dev.2",
78
78
  "@typespec/spector": "0.1.0-alpha.23",
79
79
  "@typespec/spec-api": "0.1.0-alpha.12",
80
80
  "@types/js-yaml": "~4.0.5",
81
- "@types/node": "~24.1.0",
81
+ "@types/node": "~25.0.2",
82
82
  "@types/yargs": "~17.0.33",
83
83
  "@types/semver": "7.5.8",
84
84
  "c8": "^10.1.3",
85
- "vitest": "^3.1.2",
86
- "rimraf": "~6.0.1",
87
- "typescript": "~5.8.2",
88
- "typescript-eslint": "^8.21.0",
85
+ "vitest": "^4.0.15",
86
+ "rimraf": "~6.1.2",
87
+ "typescript": "~5.9.2",
88
+ "typescript-eslint": "^8.49.0",
89
89
  "yargs": "~17.7.2",
90
90
  "chalk": "5.3.0",
91
91
  "@types/fs-extra": "11.0.4"