@azure-tools/typespec-python 0.38.0 → 0.38.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.
- package/dist/scripts/eng/regenerate.js +22 -7
- package/dist/scripts/eng/regenerate.js.map +1 -1
- package/package.json +24 -24
- package/scripts/__pycache__/venvtools.cpython-310.pyc +0 -0
- package/scripts/eng/mypy.ini +1 -1
- package/scripts/eng/regenerate.ts +24 -7
- package/scripts/prepare.py +2 -2
- package/scripts/run_tsp.py +2 -2
- package/scripts/venvtools.py +2 -2
|
@@ -104,12 +104,30 @@ const EMITTER_OPTIONS = {
|
|
|
104
104
|
function toPosix(dir) {
|
|
105
105
|
return dir.replace(/\\/g, "/");
|
|
106
106
|
}
|
|
107
|
-
function getEmitterOption(spec) {
|
|
107
|
+
function getEmitterOption(spec, flavor) {
|
|
108
108
|
const specDir = spec.includes("azure") ? AZURE_HTTP_SPECS : HTTP_SPECS;
|
|
109
109
|
const relativeSpec = toPosix(relative(specDir, spec));
|
|
110
110
|
const key = relativeSpec.includes("resiliency/srv-driven/old.tsp") ? relativeSpec : dirname(relativeSpec);
|
|
111
|
-
const
|
|
112
|
-
|
|
111
|
+
const emitter_options = EMITTER_OPTIONS[key] || [{}];
|
|
112
|
+
const result = Array.isArray(emitter_options) ? emitter_options : [emitter_options];
|
|
113
|
+
function updateOptions(options) {
|
|
114
|
+
if (options["package-name"] && options["enable-typespec-namespace"] === undefined) {
|
|
115
|
+
options["enable-typespec-namespace"] = "false";
|
|
116
|
+
}
|
|
117
|
+
}
|
|
118
|
+
if (flavor !== "azure") {
|
|
119
|
+
for (const options of result) {
|
|
120
|
+
if (Array.isArray(options)) {
|
|
121
|
+
for (const option of options) {
|
|
122
|
+
updateOptions(option);
|
|
123
|
+
}
|
|
124
|
+
}
|
|
125
|
+
else {
|
|
126
|
+
updateOptions(options);
|
|
127
|
+
}
|
|
128
|
+
}
|
|
129
|
+
}
|
|
130
|
+
return result;
|
|
113
131
|
}
|
|
114
132
|
// Function to execute CLI commands asynchronously
|
|
115
133
|
async function executeCommand(tspCommand) {
|
|
@@ -187,7 +205,7 @@ function defaultPackageName(spec) {
|
|
|
187
205
|
}
|
|
188
206
|
function addOptions(spec, generatedFolder, flags) {
|
|
189
207
|
const emitterConfigs = [];
|
|
190
|
-
for (const config of getEmitterOption(spec)) {
|
|
208
|
+
for (const config of getEmitterOption(spec, flags.flavor)) {
|
|
191
209
|
const options = { ...config };
|
|
192
210
|
options["flavor"] = flags.flavor;
|
|
193
211
|
for (const [k, v] of Object.entries(SpecialFlags[flags.flavor] ?? {})) {
|
|
@@ -204,9 +222,6 @@ function addOptions(spec, generatedFolder, flags) {
|
|
|
204
222
|
options["company-name"] = "Unbranded";
|
|
205
223
|
}
|
|
206
224
|
options["examples-dir"] = toPosix(join(dirname(spec), "examples"));
|
|
207
|
-
if (options["enable-typespec-namespace"] === undefined) {
|
|
208
|
-
options["enable-typespec-namespace"] = "false";
|
|
209
|
-
}
|
|
210
225
|
const configs = Object.entries(options).flatMap(([k, v]) => {
|
|
211
226
|
return `--option @azure-tools/typespec-python.${k}=${v}`;
|
|
212
227
|
});
|
|
@@ -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.38.
|
|
3
|
+
"version": "0.38.2",
|
|
4
4
|
"author": "Microsoft Corporation",
|
|
5
5
|
"description": "TypeSpec emitter for Python SDKs",
|
|
6
6
|
"homepage": "https://github.com/Azure/autorest.python",
|
|
@@ -33,37 +33,37 @@
|
|
|
33
33
|
"generator/**"
|
|
34
34
|
],
|
|
35
35
|
"peerDependencies": {
|
|
36
|
-
"@typespec/compiler": ">=0.
|
|
37
|
-
"@typespec/http": ">=0.
|
|
38
|
-
"@typespec/rest": ">=0.
|
|
39
|
-
"@typespec/versioning": ">=0.
|
|
40
|
-
"@typespec/openapi": ">=0.
|
|
41
|
-
"@azure-tools/typespec-azure-core": ">=0.
|
|
42
|
-
"@azure-tools/typespec-azure-resource-manager": ">=0.
|
|
43
|
-
"@azure-tools/typespec-autorest": ">=0.
|
|
44
|
-
"@azure-tools/typespec-azure-rulesets": ">=0.
|
|
45
|
-
"@azure-tools/typespec-client-generator-core": ">=0.
|
|
36
|
+
"@typespec/compiler": ">=0.64.0 <1.0.0",
|
|
37
|
+
"@typespec/http": ">=0.64.0 <1.0.0",
|
|
38
|
+
"@typespec/rest": ">=0.64.0 <1.0.0",
|
|
39
|
+
"@typespec/versioning": ">=0.64.0 <1.0.0",
|
|
40
|
+
"@typespec/openapi": ">=0.64.0 <1.0.0",
|
|
41
|
+
"@azure-tools/typespec-azure-core": ">=0.50.0 <1.0.0",
|
|
42
|
+
"@azure-tools/typespec-azure-resource-manager": ">=0.50.0 <1.0.0",
|
|
43
|
+
"@azure-tools/typespec-autorest": ">=0.50.0 <1.0.0",
|
|
44
|
+
"@azure-tools/typespec-azure-rulesets": ">=0.50.0 <3.0.0",
|
|
45
|
+
"@azure-tools/typespec-client-generator-core": ">=0.50.2 <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.6.
|
|
51
|
+
"@typespec/http-client-python": "~0.6.9",
|
|
52
52
|
"fs-extra": "~11.2.0"
|
|
53
53
|
},
|
|
54
54
|
"devDependencies": {
|
|
55
|
-
"@typespec/compiler": "~0.
|
|
56
|
-
"@typespec/http": "~0.
|
|
57
|
-
"@typespec/rest": "~0.
|
|
58
|
-
"@typespec/versioning": "~0.
|
|
59
|
-
"@typespec/openapi": "~0.
|
|
60
|
-
"@azure-tools/typespec-azure-resource-manager": "~0.
|
|
61
|
-
"@azure-tools/typespec-azure-core": "~0.
|
|
62
|
-
"@azure-tools/typespec-azure-rulesets": "~0.
|
|
63
|
-
"@azure-tools/typespec-autorest": "~0.
|
|
64
|
-
"@azure-tools/typespec-client-generator-core": "~0.
|
|
65
|
-
"@azure-tools/azure-http-specs": "0.1.0-alpha.
|
|
66
|
-
"@typespec/http-specs": "0.1.0-alpha.
|
|
55
|
+
"@typespec/compiler": "~0.64.0",
|
|
56
|
+
"@typespec/http": "~0.64.0",
|
|
57
|
+
"@typespec/rest": "~0.64.0",
|
|
58
|
+
"@typespec/versioning": "~0.64.0",
|
|
59
|
+
"@typespec/openapi": "~0.64.0",
|
|
60
|
+
"@azure-tools/typespec-azure-resource-manager": "~0.50.0",
|
|
61
|
+
"@azure-tools/typespec-azure-core": "~0.50.0",
|
|
62
|
+
"@azure-tools/typespec-azure-rulesets": "~0.50.0",
|
|
63
|
+
"@azure-tools/typespec-autorest": "~0.50.0",
|
|
64
|
+
"@azure-tools/typespec-client-generator-core": "~0.50.2",
|
|
65
|
+
"@azure-tools/azure-http-specs": "0.1.0-alpha.5",
|
|
66
|
+
"@typespec/http-specs": "0.1.0-alpha.7",
|
|
67
67
|
"@types/js-yaml": "~4.0.5",
|
|
68
68
|
"@types/node": "~22.5.4",
|
|
69
69
|
"@types/yargs": "~17.0.33",
|
|
Binary file
|
package/scripts/eng/mypy.ini
CHANGED
|
@@ -113,12 +113,32 @@ function toPosix(dir: string): string {
|
|
|
113
113
|
return dir.replace(/\\/g, "/");
|
|
114
114
|
}
|
|
115
115
|
|
|
116
|
-
function getEmitterOption(spec: string): Record<string, string>[] {
|
|
116
|
+
function getEmitterOption(spec: string, flavor: string): Record<string, string>[] {
|
|
117
117
|
const specDir = spec.includes("azure") ? AZURE_HTTP_SPECS : HTTP_SPECS;
|
|
118
118
|
const relativeSpec = toPosix(relative(specDir, spec));
|
|
119
119
|
const key = relativeSpec.includes("resiliency/srv-driven/old.tsp") ? relativeSpec : dirname(relativeSpec);
|
|
120
|
-
const
|
|
121
|
-
|
|
120
|
+
const emitter_options = EMITTER_OPTIONS[key] || [{}];
|
|
121
|
+
const result = Array.isArray(emitter_options) ? emitter_options : [emitter_options];
|
|
122
|
+
|
|
123
|
+
function updateOptions(options: Record<string, string>): void {
|
|
124
|
+
if (options["package-name"] && options["enable-typespec-namespace"] === undefined) {
|
|
125
|
+
options["enable-typespec-namespace"] = "false";
|
|
126
|
+
}
|
|
127
|
+
}
|
|
128
|
+
|
|
129
|
+
if (flavor !== "azure") {
|
|
130
|
+
for (const options of result) {
|
|
131
|
+
if (Array.isArray(options)) {
|
|
132
|
+
for (const option of options) {
|
|
133
|
+
updateOptions(option);
|
|
134
|
+
}
|
|
135
|
+
} else {
|
|
136
|
+
updateOptions(options);
|
|
137
|
+
}
|
|
138
|
+
}
|
|
139
|
+
}
|
|
140
|
+
|
|
141
|
+
return result;
|
|
122
142
|
}
|
|
123
143
|
|
|
124
144
|
// Function to execute CLI commands asynchronously
|
|
@@ -221,7 +241,7 @@ interface EmitterConfig {
|
|
|
221
241
|
|
|
222
242
|
function addOptions(spec: string, generatedFolder: string, flags: RegenerateFlags): EmitterConfig[] {
|
|
223
243
|
const emitterConfigs: EmitterConfig[] = [];
|
|
224
|
-
for (const config of getEmitterOption(spec)) {
|
|
244
|
+
for (const config of getEmitterOption(spec, flags.flavor)) {
|
|
225
245
|
const options: Record<string, string> = { ...config };
|
|
226
246
|
options["flavor"] = flags.flavor;
|
|
227
247
|
for (const [k, v] of Object.entries(SpecialFlags[flags.flavor] ?? {})) {
|
|
@@ -238,9 +258,6 @@ function addOptions(spec: string, generatedFolder: string, flags: RegenerateFlag
|
|
|
238
258
|
options["company-name"] = "Unbranded";
|
|
239
259
|
}
|
|
240
260
|
options["examples-dir"] = toPosix(join(dirname(spec), "examples"));
|
|
241
|
-
if (options["enable-typespec-namespace"] === undefined) {
|
|
242
|
-
options["enable-typespec-namespace"] = "false";
|
|
243
|
-
}
|
|
244
261
|
const configs = Object.entries(options).flatMap(([k, v]) => {
|
|
245
262
|
return `--option @azure-tools/typespec-python.${k}=${v}`;
|
|
246
263
|
});
|
package/scripts/prepare.py
CHANGED
|
@@ -22,9 +22,9 @@ _ROOT_DIR = Path(__file__).parent.parent
|
|
|
22
22
|
|
|
23
23
|
def main():
|
|
24
24
|
venv_path = _ROOT_DIR / "venv"
|
|
25
|
-
|
|
25
|
+
venv_preexists = venv_path.exists()
|
|
26
26
|
|
|
27
|
-
assert
|
|
27
|
+
assert venv_preexists # Otherwise install was not done
|
|
28
28
|
|
|
29
29
|
env_builder = venv.EnvBuilder(with_pip=True)
|
|
30
30
|
venv_context = env_builder.ensure_directories(venv_path)
|
package/scripts/run_tsp.py
CHANGED
|
@@ -16,9 +16,9 @@ _LOGGER = logging.getLogger(__name__)
|
|
|
16
16
|
|
|
17
17
|
if __name__ == "__main__":
|
|
18
18
|
venv_path = _ROOT_DIR / "venv"
|
|
19
|
-
|
|
19
|
+
venv_preexists = venv_path.exists()
|
|
20
20
|
|
|
21
|
-
assert
|
|
21
|
+
assert venv_preexists # Otherwise install was not done
|
|
22
22
|
|
|
23
23
|
env_builder = venv.EnvBuilder(with_pip=True)
|
|
24
24
|
venv_context = env_builder.ensure_directories(venv_path)
|
package/scripts/venvtools.py
CHANGED
|
@@ -49,9 +49,9 @@ def create(
|
|
|
49
49
|
|
|
50
50
|
@contextmanager
|
|
51
51
|
def create_venv_with_package(packages):
|
|
52
|
-
"""Create a venv with these packages in a temp dir and
|
|
52
|
+
"""Create a venv with these packages in a temp dir and yield the env.
|
|
53
53
|
|
|
54
|
-
packages should be an iterable of pip version
|
|
54
|
+
packages should be an iterable of pip version instructions (e.g. package~=1.2.3)
|
|
55
55
|
"""
|
|
56
56
|
with tempfile.TemporaryDirectory() as tempdir:
|
|
57
57
|
myenv = create(tempdir, with_pip=True, upgrade_deps=True)
|