@azure-tools/typespec-python 0.37.2 → 0.38.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/eng/lint.d.ts.map +1 -1
- package/dist/scripts/eng/lint.js +15 -3
- package/dist/scripts/eng/lint.js.map +1 -1
- package/dist/scripts/eng/regenerate.js +17 -8
- package/dist/scripts/eng/regenerate.js.map +1 -1
- package/dist/src/emitter.d.ts.map +1 -1
- package/dist/src/emitter.js +4 -0
- package/dist/src/emitter.js.map +1 -1
- package/dist/src/lib.d.ts +1 -0
- package/dist/src/lib.d.ts.map +1 -1
- package/dist/src/lib.js +1 -0
- package/dist/src/lib.js.map +1 -1
- package/package.json +7 -8
- package/scripts/__pycache__/venvtools.cpython-310.pyc +0 -0
- package/scripts/eng/lint.ts +14 -3
- package/scripts/eng/regenerate.ts +18 -7
- package/scripts/install.py +0 -1
- package/scripts/prepare.py +1 -1
- package/generator/dev_requirements.txt +0 -12
- package/generator/requirements.txt +0 -12
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lint.d.ts","sourceRoot":"","sources":["../../../scripts/eng/lint.ts"],"names":[],"mappings":"AAyCA,wBAAgB,MAAM,
|
|
1
|
+
{"version":3,"file":"lint.d.ts","sourceRoot":"","sources":["../../../scripts/eng/lint.ts"],"names":[],"mappings":"AAyCA,wBAAgB,MAAM,SAOrB;AAYD,wBAAgB,IAAI,SAOnB;AAED,wBAAgB,OAAO,SAOtB;AAED,wBAAgB,MAAM,SAIrB"}
|
package/dist/scripts/eng/lint.js
CHANGED
|
@@ -30,10 +30,16 @@ const argv = yargs(hideBin(process.argv))
|
|
|
30
30
|
description: "Skip to check eslint",
|
|
31
31
|
}).argv;
|
|
32
32
|
export function pylint() {
|
|
33
|
-
|
|
33
|
+
if (checkPythonFile(argv.folderName)) {
|
|
34
|
+
runCommand(`pylint ${argv.folderName}/ --rcfile ./scripts/eng/pylintrc`, "pylint");
|
|
35
|
+
}
|
|
36
|
+
else {
|
|
37
|
+
console.log("No python file found in the directory");
|
|
38
|
+
console.log("pylint passed");
|
|
39
|
+
}
|
|
34
40
|
}
|
|
35
41
|
function checkPythonFile(directory) {
|
|
36
|
-
const files = fs.readdirSync(directory);
|
|
42
|
+
const files = fs.existsSync(directory) ? fs.readdirSync(directory) : [];
|
|
37
43
|
for (let i = 0; i < files.length; i++) {
|
|
38
44
|
if (path.extname(files[i]) === ".py") {
|
|
39
45
|
return true;
|
|
@@ -51,7 +57,13 @@ export function mypy() {
|
|
|
51
57
|
}
|
|
52
58
|
}
|
|
53
59
|
export function pyright() {
|
|
54
|
-
|
|
60
|
+
if (checkPythonFile(argv.folderName)) {
|
|
61
|
+
runCommand(`pyright ${argv.folderName}/ -p ./scripts/eng/pyrightconfig.json`, "pyright");
|
|
62
|
+
}
|
|
63
|
+
else {
|
|
64
|
+
console.log("No python file found in the directory");
|
|
65
|
+
console.log("pyright passed");
|
|
66
|
+
}
|
|
55
67
|
}
|
|
56
68
|
export function eslint() {
|
|
57
69
|
// const checkWarning = argv.skipWarning ? "" : "--max-warnings=0";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lint.js","sourceRoot":"","sources":["../../../scripts/eng/lint.ts"],"names":[],"mappings":"AAAA,+BAA+B;AAC/B,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AACxC,OAAO,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AACxD,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,IAAI,MAAM,MAAM,CAAC;AASxB,MAAM,aAAa,GAAG,CAAC,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,QAAQ,CAAC,CAAC;AAE9D,wBAAwB;AACxB,MAAM,IAAI,GAAG,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;KACpC,MAAM,CAAC,YAAY,EAAE;IAClB,IAAI,EAAE,QAAQ;IACd,OAAO,EAAE,CAAC,WAAW,EAAE,UAAU,CAAC;IAClC,WAAW,EAAE,oBAAoB;IACjC,OAAO,EAAE,WAAW;CACvB,CAAC;KACD,MAAM,CAAC,SAAS,EAAE;IACf,KAAK,EAAE,GAAG;IACV,IAAI,EAAE,QAAQ;IACd,OAAO,EAAE,aAAa;IACtB,WAAW,EAAE,4BAA4B;CAC5C,CAAC;KACD,MAAM,CAAC,aAAa,EAAE;IACnB,KAAK,EAAE,GAAG;IACV,IAAI,EAAE,SAAS;IACf,WAAW,EAAE,wBAAwB;CACxC,CAAC;KACD,MAAM,CAAC,YAAY,EAAE;IAClB,KAAK,EAAE,GAAG;IACV,IAAI,EAAE,SAAS;IACf,WAAW,EAAE,sBAAsB;CACtC,CAAC,CAAC,IAAiB,CAAC;AAEzB,MAAM,UAAU,MAAM;IAClB,UAAU,CAAC,UAAU,IAAI,CAAC,UAAU,mCAAmC,EAAE,QAAQ,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"lint.js","sourceRoot":"","sources":["../../../scripts/eng/lint.ts"],"names":[],"mappings":"AAAA,+BAA+B;AAC/B,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AACxC,OAAO,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AACxD,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,IAAI,MAAM,MAAM,CAAC;AASxB,MAAM,aAAa,GAAG,CAAC,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,QAAQ,CAAC,CAAC;AAE9D,wBAAwB;AACxB,MAAM,IAAI,GAAG,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;KACpC,MAAM,CAAC,YAAY,EAAE;IAClB,IAAI,EAAE,QAAQ;IACd,OAAO,EAAE,CAAC,WAAW,EAAE,UAAU,CAAC;IAClC,WAAW,EAAE,oBAAoB;IACjC,OAAO,EAAE,WAAW;CACvB,CAAC;KACD,MAAM,CAAC,SAAS,EAAE;IACf,KAAK,EAAE,GAAG;IACV,IAAI,EAAE,QAAQ;IACd,OAAO,EAAE,aAAa;IACtB,WAAW,EAAE,4BAA4B;CAC5C,CAAC;KACD,MAAM,CAAC,aAAa,EAAE;IACnB,KAAK,EAAE,GAAG;IACV,IAAI,EAAE,SAAS;IACf,WAAW,EAAE,wBAAwB;CACxC,CAAC;KACD,MAAM,CAAC,YAAY,EAAE;IAClB,KAAK,EAAE,GAAG;IACV,IAAI,EAAE,SAAS;IACf,WAAW,EAAE,sBAAsB;CACtC,CAAC,CAAC,IAAiB,CAAC;AAEzB,MAAM,UAAU,MAAM;IAClB,IAAI,eAAe,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC;QACnC,UAAU,CAAC,UAAU,IAAI,CAAC,UAAU,mCAAmC,EAAE,QAAQ,CAAC,CAAC;IACvF,CAAC;SAAM,CAAC;QACJ,OAAO,CAAC,GAAG,CAAC,uCAAuC,CAAC,CAAC;QACrD,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;IACjC,CAAC;AACL,CAAC;AAED,SAAS,eAAe,CAAC,SAAiB;IACtC,MAAM,KAAK,GAAG,EAAE,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IACxE,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QACpC,IAAI,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,KAAK,EAAE,CAAC;YACnC,OAAO,IAAI,CAAC;QAChB,CAAC;IACL,CAAC;IACD,OAAO,KAAK,CAAC;AACjB,CAAC;AAED,MAAM,UAAU,IAAI;IAChB,IAAI,eAAe,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC;QACnC,UAAU,CAAC,QAAQ,IAAI,CAAC,UAAU,wCAAwC,EAAE,MAAM,CAAC,CAAC;IACxF,CAAC;SAAM,CAAC;QACJ,OAAO,CAAC,GAAG,CAAC,uCAAuC,CAAC,CAAC;QACrD,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;IAC/B,CAAC;AACL,CAAC;AAED,MAAM,UAAU,OAAO;IACnB,IAAI,eAAe,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC;QACnC,UAAU,CAAC,WAAW,IAAI,CAAC,UAAU,uCAAuC,EAAE,SAAS,CAAC,CAAC;IAC7F,CAAC;SAAM,CAAC;QACJ,OAAO,CAAC,GAAG,CAAC,uCAAuC,CAAC,CAAC;QACrD,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC;IAClC,CAAC;AACL,CAAC;AAED,MAAM,UAAU,MAAM;IAClB,mEAAmE;IACnE,MAAM,YAAY,GAAG,EAAE,CAAC;IACxB,cAAc,CAAC,gBAAgB,YAAY,GAAG,EAAE,QAAQ,CAAC,CAAC;AAC9D,CAAC;AAED,IAAI,IAAI,CAAC,OAAO,KAAK,QAAQ,EAAE,CAAC;IAC5B,MAAM,EAAE,CAAC;AACb,CAAC;KAAM,IAAI,IAAI,CAAC,OAAO,KAAK,MAAM,EAAE,CAAC;IACjC,IAAI,EAAE,CAAC;AACX,CAAC;KAAM,IAAI,IAAI,CAAC,OAAO,KAAK,SAAS,EAAE,CAAC;IACpC,OAAO,EAAE,CAAC;AACd,CAAC;KAAM,IAAI,IAAI,CAAC,OAAO,KAAK,QAAQ,EAAE,CAAC;IACnC,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC;QACnB,MAAM,EAAE,CAAC;IACb,CAAC;AACL,CAAC;KAAM,CAAC;IACJ,MAAM,EAAE,CAAC;IACT,IAAI,EAAE,CAAC;IACP,OAAO,EAAE,CAAC;IACV,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC;QACnB,MAAM,EAAE,CAAC;IACb,CAAC;AACL,CAAC"}
|
|
@@ -10,7 +10,8 @@ import { fileURLToPath } from "url";
|
|
|
10
10
|
const exec = promisify(execCallback);
|
|
11
11
|
// Get the directory of the current file
|
|
12
12
|
const PLUGIN_DIR = resolve(fileURLToPath(import.meta.url), "../../../");
|
|
13
|
-
const
|
|
13
|
+
const AZURE_HTTP_SPECS = resolve(PLUGIN_DIR, "node_modules/@azure-tools/azure-http-specs/specs");
|
|
14
|
+
const HTTP_SPECS = resolve(PLUGIN_DIR, "node_modules/@typespec/http-specs/specs");
|
|
14
15
|
const EMITTER_OPTIONS = {
|
|
15
16
|
"resiliency/srv-driven/old.tsp": {
|
|
16
17
|
"package-name": "resiliency-srv-driven1",
|
|
@@ -96,13 +97,16 @@ const EMITTER_OPTIONS = {
|
|
|
96
97
|
"client/structure/two-operation-group": {
|
|
97
98
|
"package-name": "client-structure-twooperationgroup",
|
|
98
99
|
},
|
|
99
|
-
"
|
|
100
|
+
"client/namespace": {
|
|
101
|
+
"enable-typespec-namespace": "true",
|
|
102
|
+
},
|
|
100
103
|
};
|
|
101
104
|
function toPosix(dir) {
|
|
102
105
|
return dir.replace(/\\/g, "/");
|
|
103
106
|
}
|
|
104
107
|
function getEmitterOption(spec) {
|
|
105
|
-
const
|
|
108
|
+
const specDir = spec.includes("azure") ? AZURE_HTTP_SPECS : HTTP_SPECS;
|
|
109
|
+
const relativeSpec = toPosix(relative(specDir, spec));
|
|
106
110
|
const key = relativeSpec.includes("resiliency/srv-driven/old.tsp") ? relativeSpec : dirname(relativeSpec);
|
|
107
111
|
const result = EMITTER_OPTIONS[key] || [{}];
|
|
108
112
|
return Array.isArray(result) ? result : [result];
|
|
@@ -144,8 +148,6 @@ async function getSubdirectories(baseDir, flags) {
|
|
|
144
148
|
const mainTspPath = join(subDirPath, "main.tsp");
|
|
145
149
|
const clientTspPath = join(subDirPath, "client.tsp");
|
|
146
150
|
const mainTspRelativePath = toPosix(relative(baseDir, mainTspPath));
|
|
147
|
-
if (flags.flavor === "unbranded" && mainTspRelativePath.includes("azure"))
|
|
148
|
-
return;
|
|
149
151
|
// after fix test generation for nested operation group, remove this check
|
|
150
152
|
if (mainTspRelativePath.includes("client-operation-group"))
|
|
151
153
|
return;
|
|
@@ -178,7 +180,8 @@ async function getSubdirectories(baseDir, flags) {
|
|
|
178
180
|
return subdirectories;
|
|
179
181
|
}
|
|
180
182
|
function defaultPackageName(spec) {
|
|
181
|
-
|
|
183
|
+
const specDir = spec.includes("azure") ? AZURE_HTTP_SPECS : HTTP_SPECS;
|
|
184
|
+
return toPosix(relative(specDir, dirname(spec)))
|
|
182
185
|
.replace(/\//g, "-")
|
|
183
186
|
.toLowerCase();
|
|
184
187
|
}
|
|
@@ -201,6 +204,9 @@ function addOptions(spec, generatedFolder, flags) {
|
|
|
201
204
|
options["company-name"] = "Unbranded";
|
|
202
205
|
}
|
|
203
206
|
options["examples-dir"] = toPosix(join(dirname(spec), "examples"));
|
|
207
|
+
if (options["enable-typespec-namespace"] === undefined) {
|
|
208
|
+
options["enable-typespec-namespace"] = "false";
|
|
209
|
+
}
|
|
204
210
|
const configs = Object.entries(options).flatMap(([k, v]) => {
|
|
205
211
|
return `--option @azure-tools/typespec-python.${k}=${v}`;
|
|
206
212
|
});
|
|
@@ -226,8 +232,11 @@ async function regenerate(flags) {
|
|
|
226
232
|
}
|
|
227
233
|
else {
|
|
228
234
|
const flagsResolved = { debug: false, flavor: flags.flavor, ...flags };
|
|
229
|
-
const
|
|
230
|
-
const
|
|
235
|
+
const subdirectoriesForAzure = await getSubdirectories(AZURE_HTTP_SPECS, flagsResolved);
|
|
236
|
+
const subdirectoriesForNonAzure = await getSubdirectories(HTTP_SPECS, flagsResolved);
|
|
237
|
+
const subdirectories = flags.flavor === "azure"
|
|
238
|
+
? [...subdirectoriesForAzure, ...subdirectoriesForNonAzure]
|
|
239
|
+
: subdirectoriesForNonAzure;
|
|
231
240
|
const cmdList = subdirectories.flatMap((subdirectory) => _getCmdList(subdirectory, flagsResolved));
|
|
232
241
|
const PromiseCommands = cmdList.map((tspCommand) => executeCommand(tspCommand));
|
|
233
242
|
await Promise.all(PromiseCommands);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"regenerate.js","sourceRoot":"","sources":["../../../scripts/eng/regenerate.ts"],"names":[],"mappings":"AAAA,+BAA+B;AAC/B,OAAO,EAAE,IAAI,IAAI,YAAY,EAAE,MAAM,eAAe,CAAC;AACrD,OAAO,EAAE,SAAS,EAAE,MAAM,MAAM,CAAC;AACjC,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AACxC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AACxD,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,IAAI,CAAC;AACtC,OAAO,EAAE,aAAa,EAAE,MAAM,KAAK,CAAC;AAEpC,8BAA8B;AAC9B,MAAM,IAAI,GAAG,SAAS,CAAC,YAAY,CAAC,CAAC;AAErC,wCAAwC;AACxC,MAAM,UAAU,GAAG,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,WAAW,CAAC,CAAC;AACxE,MAAM,
|
|
1
|
+
{"version":3,"file":"regenerate.js","sourceRoot":"","sources":["../../../scripts/eng/regenerate.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"emitter.d.ts","sourceRoot":"","sources":["../../src/emitter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACjD,OAAO,EAAE,oBAAoB,EAAE,MAAM,UAAU,CAAC;AAGhD,wBAAsB,OAAO,CAAC,OAAO,EAAE,WAAW,CAAC,oBAAoB,CAAC,
|
|
1
|
+
{"version":3,"file":"emitter.d.ts","sourceRoot":"","sources":["../../src/emitter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACjD,OAAO,EAAE,oBAAoB,EAAE,MAAM,UAAU,CAAC;AAGhD,wBAAsB,OAAO,CAAC,OAAO,EAAE,WAAW,CAAC,oBAAoB,CAAC,iBAMvE"}
|
package/dist/src/emitter.js
CHANGED
|
@@ -1,5 +1,9 @@
|
|
|
1
1
|
import { $onEmit as httpClientPythonOnEmit } from "@typespec/http-client-python";
|
|
2
2
|
export async function $onEmit(context) {
|
|
3
|
+
// set flavor to azure if not set for python azure emitter
|
|
4
|
+
if (context.options.flavor === undefined) {
|
|
5
|
+
context.options.flavor = "azure";
|
|
6
|
+
}
|
|
3
7
|
await httpClientPythonOnEmit(context);
|
|
4
8
|
}
|
|
5
9
|
//# sourceMappingURL=emitter.js.map
|
package/dist/src/emitter.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"emitter.js","sourceRoot":"","sources":["../../src/emitter.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,IAAI,sBAAsB,EAAE,MAAM,8BAA8B,CAAC;AAEjF,MAAM,CAAC,KAAK,UAAU,OAAO,CAAC,OAA0C;IACpE,MAAM,sBAAsB,CAAC,OAAO,CAAC,CAAC;AAC1C,CAAC"}
|
|
1
|
+
{"version":3,"file":"emitter.js","sourceRoot":"","sources":["../../src/emitter.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,IAAI,sBAAsB,EAAE,MAAM,8BAA8B,CAAC;AAEjF,MAAM,CAAC,KAAK,UAAU,OAAO,CAAC,OAA0C;IACpE,0DAA0D;IAC1D,IAAI,OAAO,CAAC,OAAO,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;QACvC,OAAO,CAAC,OAAO,CAAC,MAAM,GAAG,OAAO,CAAC;IACrC,CAAC;IACD,MAAM,sBAAsB,CAAC,OAAO,CAAC,CAAC;AAC1C,CAAC"}
|
package/dist/src/lib.d.ts
CHANGED
|
@@ -15,6 +15,7 @@ export interface PythonEmitterOptions {
|
|
|
15
15
|
"debug"?: boolean;
|
|
16
16
|
"flavor"?: "azure";
|
|
17
17
|
"examples-dir"?: string;
|
|
18
|
+
"enable-typespec-namespace"?: boolean;
|
|
18
19
|
}
|
|
19
20
|
export interface PythonSdkContext<TServiceOperation extends SdkServiceOperation> extends SdkContext<PythonEmitterOptions, TServiceOperation> {
|
|
20
21
|
__endpointPathParameters: Record<string, any>[];
|
package/dist/src/lib.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lib.d.ts","sourceRoot":"","sources":["../../src/lib.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,mBAAmB,EAAE,MAAM,6CAA6C,CAAC;AAG9F,MAAM,WAAW,oBAAoB;IACjC,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,0BAA0B,CAAC,EAAE,OAAO,CAAC;IACrC,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,wBAAwB,CAAC,EAAE,MAAM,CAAC;IAClC,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,cAAc,CAAC,EAAE,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"lib.d.ts","sourceRoot":"","sources":["../../src/lib.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,mBAAmB,EAAE,MAAM,6CAA6C,CAAC;AAG9F,MAAM,WAAW,oBAAoB;IACjC,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,0BAA0B,CAAC,EAAE,OAAO,CAAC;IACrC,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,wBAAwB,CAAC,EAAE,MAAM,CAAC;IAClC,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,cAAc,CAAC,EAAE,MAAM,CAAC;IAGxB,2BAA2B,CAAC,EAAE,OAAO,CAAC;CACzC;AAED,MAAM,WAAW,gBAAgB,CAAC,iBAAiB,SAAS,mBAAmB,CAC3E,SAAQ,UAAU,CAAC,oBAAoB,EAAE,iBAAiB,CAAC;IAC3D,wBAAwB,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,CAAC;CACnD;AAkCD,eAAO,MAAM,IAAI;;+BAAgC,CAAC;AAClD,eAAO,MAAQ,gBAAgB;;;;mBAAE,iBAAiB,4BAAE,SAAS,wFAAS,CAAC"}
|
package/dist/src/lib.js
CHANGED
|
@@ -18,6 +18,7 @@ const EmitterOptionsSchema = {
|
|
|
18
18
|
"debug": { type: "boolean", nullable: true },
|
|
19
19
|
"flavor": { type: "string", nullable: true },
|
|
20
20
|
"examples-dir": { type: "string", nullable: true, format: "absolute-path" },
|
|
21
|
+
"enable-typespec-namespace": { type: "boolean", nullable: true },
|
|
21
22
|
},
|
|
22
23
|
required: [],
|
|
23
24
|
};
|
package/dist/src/lib.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lib.js","sourceRoot":"","sources":["../../src/lib.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,qBAAqB,EAAkB,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"lib.js","sourceRoot":"","sources":["../../src/lib.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,qBAAqB,EAAkB,MAAM,oBAAoB,CAAC;AA4B3E,MAAM,oBAAoB,GAAyC;IAC/D,IAAI,EAAE,QAAQ;IACd,oBAAoB,EAAE,IAAI;IAC1B,UAAU,EAAE;QACR,iBAAiB,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE;QACrD,cAAc,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE;QAClD,YAAY,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE;QAChD,0BAA0B,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE;QAC/D,qBAAqB,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE;QACzD,wBAAwB,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE;QAC5D,qBAAqB,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE;QACzD,iBAAiB,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE;QACtD,aAAa,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE;QACjD,SAAS,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE;QAC9C,cAAc,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE;QAClD,eAAe,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE;QACpD,OAAO,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE;QAC5C,QAAQ,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE;QAC5C,cAAc,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,eAAe,EAAE;QAC3E,2BAA2B,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE;KACnE;IACD,QAAQ,EAAE,EAAE;CACf,CAAC;AAEF,MAAM,MAAM,GAAG;IACX,IAAI,EAAE,8BAA8B;IACpC,WAAW,EAAE,EAAE;IACf,OAAO,EAAE;QACL,OAAO,EAAE,oBAA4D;KACxE;CACK,CAAC;AAEX,MAAM,CAAC,MAAM,IAAI,GAAG,qBAAqB,CAAC,MAAM,CAAC,CAAC;AAClD,MAAM,CAAC,MAAM,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,SAAS,EAAE,GAAG,IAAI,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@azure-tools/typespec-python",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.38.0",
|
|
4
4
|
"author": "Microsoft Corporation",
|
|
5
5
|
"description": "TypeSpec emitter for Python SDKs",
|
|
6
6
|
"homepage": "https://github.com/Azure/autorest.python",
|
|
@@ -42,13 +42,13 @@
|
|
|
42
42
|
"@azure-tools/typespec-azure-resource-manager": ">=0.49.0 <1.0.0",
|
|
43
43
|
"@azure-tools/typespec-autorest": ">=0.49.0 <1.0.0",
|
|
44
44
|
"@azure-tools/typespec-azure-rulesets": ">=0.49.0 <3.0.0",
|
|
45
|
-
"@azure-tools/typespec-client-generator-core": ">=0.49.
|
|
45
|
+
"@azure-tools/typespec-client-generator-core": ">=0.49.1 <1.0.0"
|
|
46
46
|
},
|
|
47
47
|
"dependencies": {
|
|
48
48
|
"js-yaml": "~4.1.0",
|
|
49
49
|
"semver": "~7.6.2",
|
|
50
50
|
"tsx": "~4.19.1",
|
|
51
|
-
"@typespec/http-client-python": "~0.
|
|
51
|
+
"@typespec/http-client-python": "~0.6.2",
|
|
52
52
|
"fs-extra": "~11.2.0"
|
|
53
53
|
},
|
|
54
54
|
"devDependencies": {
|
|
@@ -61,10 +61,9 @@
|
|
|
61
61
|
"@azure-tools/typespec-azure-core": "~0.49.0",
|
|
62
62
|
"@azure-tools/typespec-azure-rulesets": "~0.49.0",
|
|
63
63
|
"@azure-tools/typespec-autorest": "~0.49.0",
|
|
64
|
-
"@azure-tools/typespec-client-generator-core": "~0.49.
|
|
65
|
-
"@azure-tools/
|
|
66
|
-
"@
|
|
67
|
-
"@azure-tools/cadl-ranch": "~0.16.2",
|
|
64
|
+
"@azure-tools/typespec-client-generator-core": "~0.49.1",
|
|
65
|
+
"@azure-tools/azure-http-specs": "0.1.0-alpha.4",
|
|
66
|
+
"@typespec/http-specs": "0.1.0-alpha.5",
|
|
68
67
|
"@types/js-yaml": "~4.0.5",
|
|
69
68
|
"@types/node": "~22.5.4",
|
|
70
69
|
"@types/yargs": "~17.0.33",
|
|
@@ -82,10 +81,10 @@
|
|
|
82
81
|
"clean": "rimraf ./dist ./temp ./venv ./node_modules",
|
|
83
82
|
"build": "tsc -p .",
|
|
84
83
|
"watch": "tsc -p . --watch",
|
|
84
|
+
"install": "tsx ./scripts/run-python3.ts ./scripts/install.py",
|
|
85
85
|
"lint": "tsx ./scripts/eng/lint.ts",
|
|
86
86
|
"lint:fix": "eslint . --fix --ext .ts",
|
|
87
87
|
"format": "npx prettier **/*.ts --write && tsx ./scripts/eng/format.ts",
|
|
88
|
-
"install": "tsx ./scripts/run-python3.ts ./scripts/install.py",
|
|
89
88
|
"regenerate": "tsx ./scripts/eng/regenerate.ts",
|
|
90
89
|
"test": "tsx ./scripts/eng/run-tests.ts"
|
|
91
90
|
}
|
|
Binary file
|
package/scripts/eng/lint.ts
CHANGED
|
@@ -40,10 +40,16 @@ const argv = yargs(hideBin(process.argv))
|
|
|
40
40
|
}).argv as Arguments;
|
|
41
41
|
|
|
42
42
|
export function pylint() {
|
|
43
|
-
|
|
43
|
+
if (checkPythonFile(argv.folderName)) {
|
|
44
|
+
runCommand(`pylint ${argv.folderName}/ --rcfile ./scripts/eng/pylintrc`, "pylint");
|
|
45
|
+
} else {
|
|
46
|
+
console.log("No python file found in the directory");
|
|
47
|
+
console.log("pylint passed");
|
|
48
|
+
}
|
|
44
49
|
}
|
|
50
|
+
|
|
45
51
|
function checkPythonFile(directory: string): boolean {
|
|
46
|
-
const files = fs.readdirSync(directory);
|
|
52
|
+
const files = fs.existsSync(directory) ? fs.readdirSync(directory) : [];
|
|
47
53
|
for (let i = 0; i < files.length; i++) {
|
|
48
54
|
if (path.extname(files[i]) === ".py") {
|
|
49
55
|
return true;
|
|
@@ -62,7 +68,12 @@ export function mypy() {
|
|
|
62
68
|
}
|
|
63
69
|
|
|
64
70
|
export function pyright() {
|
|
65
|
-
|
|
71
|
+
if (checkPythonFile(argv.folderName)) {
|
|
72
|
+
runCommand(`pyright ${argv.folderName}/ -p ./scripts/eng/pyrightconfig.json`, "pyright");
|
|
73
|
+
} else {
|
|
74
|
+
console.log("No python file found in the directory");
|
|
75
|
+
console.log("pyright passed");
|
|
76
|
+
}
|
|
66
77
|
}
|
|
67
78
|
|
|
68
79
|
export function eslint() {
|
|
@@ -12,7 +12,8 @@ const exec = promisify(execCallback);
|
|
|
12
12
|
|
|
13
13
|
// Get the directory of the current file
|
|
14
14
|
const PLUGIN_DIR = resolve(fileURLToPath(import.meta.url), "../../../");
|
|
15
|
-
const
|
|
15
|
+
const AZURE_HTTP_SPECS = resolve(PLUGIN_DIR, "node_modules/@azure-tools/azure-http-specs/specs");
|
|
16
|
+
const HTTP_SPECS = resolve(PLUGIN_DIR, "node_modules/@typespec/http-specs/specs");
|
|
16
17
|
interface TspCommand {
|
|
17
18
|
outputDir: string;
|
|
18
19
|
command: string;
|
|
@@ -103,7 +104,9 @@ const EMITTER_OPTIONS: Record<string, Record<string, string> | Record<string, st
|
|
|
103
104
|
"client/structure/two-operation-group": {
|
|
104
105
|
"package-name": "client-structure-twooperationgroup",
|
|
105
106
|
},
|
|
106
|
-
"
|
|
107
|
+
"client/namespace": {
|
|
108
|
+
"enable-typespec-namespace": "true",
|
|
109
|
+
},
|
|
107
110
|
};
|
|
108
111
|
|
|
109
112
|
function toPosix(dir: string): string {
|
|
@@ -111,7 +114,8 @@ function toPosix(dir: string): string {
|
|
|
111
114
|
}
|
|
112
115
|
|
|
113
116
|
function getEmitterOption(spec: string): Record<string, string>[] {
|
|
114
|
-
const
|
|
117
|
+
const specDir = spec.includes("azure") ? AZURE_HTTP_SPECS : HTTP_SPECS;
|
|
118
|
+
const relativeSpec = toPosix(relative(specDir, spec));
|
|
115
119
|
const key = relativeSpec.includes("resiliency/srv-driven/old.tsp") ? relativeSpec : dirname(relativeSpec);
|
|
116
120
|
const result = EMITTER_OPTIONS[key] || [{}];
|
|
117
121
|
return Array.isArray(result) ? result : [result];
|
|
@@ -167,7 +171,6 @@ async function getSubdirectories(baseDir: string, flags: RegenerateFlags): Promi
|
|
|
167
171
|
const clientTspPath = join(subDirPath, "client.tsp");
|
|
168
172
|
|
|
169
173
|
const mainTspRelativePath = toPosix(relative(baseDir, mainTspPath));
|
|
170
|
-
if (flags.flavor === "unbranded" && mainTspRelativePath.includes("azure")) return;
|
|
171
174
|
|
|
172
175
|
// after fix test generation for nested operation group, remove this check
|
|
173
176
|
if (mainTspRelativePath.includes("client-operation-group")) return;
|
|
@@ -205,7 +208,8 @@ async function getSubdirectories(baseDir: string, flags: RegenerateFlags): Promi
|
|
|
205
208
|
}
|
|
206
209
|
|
|
207
210
|
function defaultPackageName(spec: string): string {
|
|
208
|
-
|
|
211
|
+
const specDir = spec.includes("azure") ? AZURE_HTTP_SPECS : HTTP_SPECS;
|
|
212
|
+
return toPosix(relative(specDir, dirname(spec)))
|
|
209
213
|
.replace(/\//g, "-")
|
|
210
214
|
.toLowerCase();
|
|
211
215
|
}
|
|
@@ -234,6 +238,9 @@ function addOptions(spec: string, generatedFolder: string, flags: RegenerateFlag
|
|
|
234
238
|
options["company-name"] = "Unbranded";
|
|
235
239
|
}
|
|
236
240
|
options["examples-dir"] = toPosix(join(dirname(spec), "examples"));
|
|
241
|
+
if (options["enable-typespec-namespace"] === undefined) {
|
|
242
|
+
options["enable-typespec-namespace"] = "false";
|
|
243
|
+
}
|
|
237
244
|
const configs = Object.entries(options).flatMap(([k, v]) => {
|
|
238
245
|
return `--option @azure-tools/typespec-python.${k}=${v}`;
|
|
239
246
|
});
|
|
@@ -259,8 +266,12 @@ async function regenerate(flags: RegenerateFlagsInput): Promise<void> {
|
|
|
259
266
|
await regenerate({ ...flags, flavor: "unbranded" });
|
|
260
267
|
} else {
|
|
261
268
|
const flagsResolved = { debug: false, flavor: flags.flavor, ...flags };
|
|
262
|
-
const
|
|
263
|
-
const
|
|
269
|
+
const subdirectoriesForAzure = await getSubdirectories(AZURE_HTTP_SPECS, flagsResolved);
|
|
270
|
+
const subdirectoriesForNonAzure = await getSubdirectories(HTTP_SPECS, flagsResolved);
|
|
271
|
+
const subdirectories =
|
|
272
|
+
flags.flavor === "azure"
|
|
273
|
+
? [...subdirectoriesForAzure, ...subdirectoriesForNonAzure]
|
|
274
|
+
: subdirectoriesForNonAzure;
|
|
264
275
|
const cmdList: TspCommand[] = subdirectories.flatMap((subdirectory) =>
|
|
265
276
|
_getCmdList(subdirectory, flagsResolved),
|
|
266
277
|
);
|
package/scripts/install.py
CHANGED
package/scripts/prepare.py
CHANGED
|
@@ -29,7 +29,7 @@ def main():
|
|
|
29
29
|
env_builder = venv.EnvBuilder(with_pip=True)
|
|
30
30
|
venv_context = env_builder.ensure_directories(venv_path)
|
|
31
31
|
try:
|
|
32
|
-
python_run(venv_context, "pip", ["install", "-r", f"{_ROOT_DIR}/
|
|
32
|
+
python_run(venv_context, "pip", ["install", "-r", f"{_ROOT_DIR}/dev_requirements.txt"])
|
|
33
33
|
except FileNotFoundError as e:
|
|
34
34
|
raise ValueError(e.filename)
|
|
35
35
|
|