@typespec/openapi3 1.13.0-dev.6 → 1.13.0-dev.7
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/README.md +35 -3
- package/dist/src/cli/actions/convert/generators/generate-operation.d.ts.map +1 -1
- package/dist/src/cli/actions/convert/generators/generate-operation.js +13 -8
- package/dist/src/cli/actions/convert/generators/generate-operation.js.map +1 -1
- package/dist/src/cli/actions/convert/transforms/transform-paths.d.ts.map +1 -1
- package/dist/src/cli/actions/convert/transforms/transform-paths.js +8 -2
- package/dist/src/cli/actions/convert/transforms/transform-paths.js.map +1 -1
- package/package.json +8 -8
package/README.md
CHANGED
|
@@ -44,10 +44,15 @@ See [Configuring output directory for more info](https://typespec.io/docs/handbo
|
|
|
44
44
|
|
|
45
45
|
### `file-type`
|
|
46
46
|
|
|
47
|
-
**Type:** `
|
|
47
|
+
**Type:** `"yaml" | "json" | ("yaml" | "json")[]`
|
|
48
48
|
|
|
49
49
|
If the content should be serialized as YAML or JSON. Can be a single value or an array to emit multiple formats. Default 'yaml', if not specified infer from the `output-file` extension
|
|
50
50
|
|
|
51
|
+
**Options:**
|
|
52
|
+
|
|
53
|
+
- `"yaml" | "json"`
|
|
54
|
+
- `("yaml" | "json")[]`
|
|
55
|
+
|
|
51
56
|
### `output-file`
|
|
52
57
|
|
|
53
58
|
**Type:** `string`
|
|
@@ -86,12 +91,16 @@ Example Multiple service with versioning
|
|
|
86
91
|
|
|
87
92
|
### `openapi-versions`
|
|
88
93
|
|
|
89
|
-
**Type:** `
|
|
94
|
+
**Type:** `"3.0.0" | "3.1.0" | "3.2.0"`
|
|
95
|
+
|
|
96
|
+
**Default:** `["3.0.0"]`
|
|
90
97
|
|
|
91
98
|
### `new-line`
|
|
92
99
|
|
|
93
100
|
**Type:** `"crlf" | "lf"`
|
|
94
101
|
|
|
102
|
+
**Default:** `"lf"`
|
|
103
|
+
|
|
95
104
|
Set the newline character for emitting files.
|
|
96
105
|
|
|
97
106
|
### `omit-unreachable-types`
|
|
@@ -105,6 +114,8 @@ By default all types declared under the service namespace will be included. With
|
|
|
105
114
|
|
|
106
115
|
**Type:** `"inline-only" | "never"`
|
|
107
116
|
|
|
117
|
+
**Default:** `"never"`
|
|
118
|
+
|
|
108
119
|
If the generated openapi types should have the `x-typespec-name` extension set with the name of the TypeSpec type that created it.
|
|
109
120
|
This extension is meant for debugging and should not be depended on.
|
|
110
121
|
|
|
@@ -112,6 +123,8 @@ This extension is meant for debugging and should not be depended on.
|
|
|
112
123
|
|
|
113
124
|
**Type:** `"double-int" | "int64"`
|
|
114
125
|
|
|
126
|
+
**Default:** `"int64"`
|
|
127
|
+
|
|
115
128
|
How to handle safeint type. Options are:
|
|
116
129
|
|
|
117
130
|
- `double-int`: Will produce `type: integer, format: double-int`
|
|
@@ -123,6 +136,8 @@ Default: `int64`
|
|
|
123
136
|
|
|
124
137
|
**Type:** `boolean`
|
|
125
138
|
|
|
139
|
+
**Default:** `false`
|
|
140
|
+
|
|
126
141
|
If true, then for models emitted as object schemas we default `additionalProperties` to false for
|
|
127
142
|
OpenAPI 3.0, and `unevaluatedProperties` to false for OpenAPI 3.1, if not explicitly specified elsewhere.
|
|
128
143
|
Default: `false`
|
|
@@ -138,7 +153,24 @@ See https://github.com/OAI/OpenAPI-Specification/discussions/4622 for discussion
|
|
|
138
153
|
|
|
139
154
|
### `operation-id-strategy`
|
|
140
155
|
|
|
141
|
-
**Type:** `
|
|
156
|
+
**Type:** `"parent-container" | "fqn" | "explicit-only" | object { kind, separator }`
|
|
157
|
+
|
|
158
|
+
**Options:**
|
|
159
|
+
|
|
160
|
+
- `"parent-container" | "fqn" | "explicit-only"` (default: `"parent-container"`)
|
|
161
|
+
|
|
162
|
+
Determines how to generate operation IDs when `@operationId` is not used.
|
|
163
|
+
Avaliable options are:
|
|
164
|
+
|
|
165
|
+
- `parent-container`: Uses the parent namespace and operation name to generate the ID.
|
|
166
|
+
- `fqn`: Uses the fully qualified name of the operation to generate the ID.
|
|
167
|
+
- `explicit-only`: Only use explicitly defined operation IDs.
|
|
168
|
+
- `object { kind, separator }`
|
|
169
|
+
|
|
170
|
+
| Name | Type | Default | Description |
|
|
171
|
+
| ----------- | ------------------------------------------------ | -------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
|
|
172
|
+
| `kind` | `"parent-container" \| "fqn" \| "explicit-only"` | `"parent-container"` | Determines how to generate operation IDs when `@operationId` is not used.<br />Avaliable options are:<br /> - `parent-container`: Uses the parent namespace and operation name to generate the ID.<br /> - `fqn`: Uses the fully qualified name of the operation to generate the ID.<br /> - `explicit-only`: Only use explicitly defined operation IDs. |
|
|
173
|
+
| `separator` | `string` | | Separator used to join segment in the operation name. |
|
|
142
174
|
|
|
143
175
|
## Decorators
|
|
144
176
|
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generate-operation.d.ts","sourceRoot":"","sources":["../../../../../../src/cli/actions/convert/generators/generate-operation.ts"],"names":[],"mappings":"AACA,OAAO,EACL,iBAAiB,EAGlB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAK9C,wBAAgB,iBAAiB,CAAC,SAAS,EAAE,iBAAiB,EAAE,OAAO,EAAE,OAAO,GAAG,MAAM,
|
|
1
|
+
{"version":3,"file":"generate-operation.d.ts","sourceRoot":"","sources":["../../../../../../src/cli/actions/convert/generators/generate-operation.ts"],"names":[],"mappings":"AACA,OAAO,EACL,iBAAiB,EAGlB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAK9C,wBAAgB,iBAAiB,CAAC,SAAS,EAAE,iBAAiB,EAAE,OAAO,EAAE,OAAO,GAAG,MAAM,CAiCxF"}
|
|
@@ -1,13 +1,16 @@
|
|
|
1
1
|
import { generateDocs } from "../utils/docs.js";
|
|
2
|
-
import { generateDecorators } from "./generate-decorators.js";
|
|
2
|
+
import { generateDecorators, generateDirectives } from "./generate-decorators.js";
|
|
3
3
|
import { generateOperationReturnType } from "./generate-response-expressions.js";
|
|
4
4
|
export function generateOperation(operation, context) {
|
|
5
|
-
const
|
|
5
|
+
const preamble = [];
|
|
6
|
+
const operationParts = [];
|
|
6
7
|
if (operation.doc) {
|
|
7
|
-
|
|
8
|
+
preamble.push(generateDocs(operation.doc));
|
|
8
9
|
}
|
|
9
|
-
|
|
10
|
-
|
|
10
|
+
// Directives (e.g. #deprecated) must each be on their own line before the operation
|
|
11
|
+
preamble.push(...generateDirectives(operation.directives));
|
|
12
|
+
operationParts.push(...operation.tags.map((t) => `@tag("${t}")`));
|
|
13
|
+
operationParts.push(generateDecorators(operation.decorators).join(" "));
|
|
11
14
|
// generate parameters
|
|
12
15
|
const parameters = [
|
|
13
16
|
...operation.parameters.map((p) => generateOperationParameter(operation, p, context)),
|
|
@@ -15,10 +18,12 @@ export function generateOperation(operation, context) {
|
|
|
15
18
|
];
|
|
16
19
|
const responses = generateOperationReturnType(operation, context);
|
|
17
20
|
if (operation.fixmes?.length) {
|
|
18
|
-
|
|
21
|
+
operationParts.push("\n", ...operation.fixmes.map((f) => `// FIXME: ${f}\n`));
|
|
19
22
|
}
|
|
20
|
-
|
|
21
|
-
|
|
23
|
+
operationParts.push(`op ${operation.name}(${parameters.join(", ")}): ${responses};`);
|
|
24
|
+
const preambleStr = preamble.join("\n");
|
|
25
|
+
const operationStr = operationParts.join(" ");
|
|
26
|
+
return preambleStr ? `${preambleStr}\n${operationStr}` : operationStr;
|
|
22
27
|
}
|
|
23
28
|
function generateOperationParameter(operation, parameter, context) {
|
|
24
29
|
if ("$ref" in parameter) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generate-operation.js","sourceRoot":"","sources":["../../../../../../src/cli/actions/convert/generators/generate-operation.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;
|
|
1
|
+
{"version":3,"file":"generate-operation.js","sourceRoot":"","sources":["../../../../../../src/cli/actions/convert/generators/generate-operation.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transform-paths.d.ts","sourceRoot":"","sources":["../../../../../../src/cli/actions/convert/transforms/transform-paths.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,gBAAgB,EAGhB,kBAAkB,EAGnB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,
|
|
1
|
+
{"version":3,"file":"transform-paths.d.ts","sourceRoot":"","sources":["../../../../../../src/cli/actions/convert/transforms/transform-paths.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,gBAAgB,EAGhB,kBAAkB,EAGnB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAEL,iBAAiB,EAGlB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAU9C;;;;;GAKG;AACH,wBAAgB,cAAc,CAC5B,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,gBAAgB,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,kBAAkB,CAAC,EAC5E,OAAO,EAAE,OAAO,GACf,iBAAiB,EAAE,CAkErB"}
|
|
@@ -43,8 +43,11 @@ export function transformPaths(paths, context) {
|
|
|
43
43
|
usedOperationIds.add(operationId);
|
|
44
44
|
}
|
|
45
45
|
const requestBodies = transformRequestBodies(operation.requestBody, context);
|
|
46
|
+
const directives = operation.deprecated
|
|
47
|
+
? [{ name: "deprecated", message: "deprecated" }]
|
|
48
|
+
: [];
|
|
46
49
|
// Check if we need to split the operation due to incompatible content types
|
|
47
|
-
const splitOperations = splitOperationByContentType(operationId, decorators, dedupeParameters([...routeParameters, ...parameters]), operation.description, requestBodies, operationResponses, tags, fixmes, usedOperationIds);
|
|
50
|
+
const splitOperations = splitOperationByContentType(operationId, decorators, dedupeParameters([...routeParameters, ...parameters]), operation.description, requestBodies, operationResponses, tags, fixmes, directives, usedOperationIds);
|
|
48
51
|
operations.push(...splitOperations);
|
|
49
52
|
}
|
|
50
53
|
}
|
|
@@ -92,13 +95,14 @@ function transformOperationParameter(parameter, context) {
|
|
|
92
95
|
* Splits an operation into multiple operations if it has incompatible content types
|
|
93
96
|
* (e.g., multipart/form-data and application/json)
|
|
94
97
|
*/
|
|
95
|
-
function splitOperationByContentType(operationId, decorators, parameters, doc, requestBodies, responses, tags, fixmes, usedOperationIds) {
|
|
98
|
+
function splitOperationByContentType(operationId, decorators, parameters, doc, requestBodies, responses, tags, fixmes, directives, usedOperationIds) {
|
|
96
99
|
// If no request bodies or only one content type, no splitting needed
|
|
97
100
|
if (requestBodies.length <= 1) {
|
|
98
101
|
return [
|
|
99
102
|
{
|
|
100
103
|
...getScopeAndName(operationId),
|
|
101
104
|
decorators,
|
|
105
|
+
directives,
|
|
102
106
|
parameters,
|
|
103
107
|
doc,
|
|
104
108
|
operationId,
|
|
@@ -118,6 +122,7 @@ function splitOperationByContentType(operationId, decorators, parameters, doc, r
|
|
|
118
122
|
{
|
|
119
123
|
...getScopeAndName(operationId),
|
|
120
124
|
decorators,
|
|
125
|
+
directives,
|
|
121
126
|
parameters,
|
|
122
127
|
doc,
|
|
123
128
|
operationId,
|
|
@@ -170,6 +175,7 @@ function splitOperationByContentType(operationId, decorators, parameters, doc, r
|
|
|
170
175
|
operations.push({
|
|
171
176
|
...getScopeAndName(newOperationId),
|
|
172
177
|
decorators: newDecorators,
|
|
178
|
+
directives,
|
|
173
179
|
parameters,
|
|
174
180
|
doc,
|
|
175
181
|
operationId: newOperationId,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transform-paths.js","sourceRoot":"","sources":["../../../../../../src/cli/actions/convert/transforms/transform-paths.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"transform-paths.js","sourceRoot":"","sources":["../../../../../../src/cli/actions/convert/transforms/transform-paths.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@typespec/openapi3",
|
|
3
|
-
"version": "1.13.0-dev.
|
|
3
|
+
"version": "1.13.0-dev.7",
|
|
4
4
|
"author": "Microsoft Corporation",
|
|
5
5
|
"description": "TypeSpec library for emitting OpenAPI 3.0 and OpenAPI 3.1 from the TypeSpec REST protocol binding and converting OpenAPI3 to TypeSpec",
|
|
6
6
|
"homepage": "https://typespec.io",
|
|
@@ -52,11 +52,11 @@
|
|
|
52
52
|
"yaml": "^2.8.3"
|
|
53
53
|
},
|
|
54
54
|
"peerDependencies": {
|
|
55
|
-
"@typespec/compiler": "^1.12.0 || >= 1.13.0-dev.
|
|
55
|
+
"@typespec/compiler": "^1.12.0 || >= 1.13.0-dev.14",
|
|
56
56
|
"@typespec/events": "^0.82.0 || >= 0.83.0-dev.0",
|
|
57
|
-
"@typespec/http": "^1.12.0 || >= 1.13.0-dev.
|
|
57
|
+
"@typespec/http": "^1.12.0 || >= 1.13.0-dev.1",
|
|
58
58
|
"@typespec/json-schema": "^1.12.0 || >= 1.13.0-dev.1",
|
|
59
|
-
"@typespec/openapi": "^1.12.0 || >= 1.13.0-dev.
|
|
59
|
+
"@typespec/openapi": "^1.12.0 || >= 1.13.0-dev.4",
|
|
60
60
|
"@typespec/sse": "^0.82.0 || >= 0.83.0-dev.0",
|
|
61
61
|
"@typespec/streams": "^0.82.0 || >= 0.83.0-dev.0",
|
|
62
62
|
"@typespec/versioning": "^0.82.0 || >= 0.83.0-dev.0"
|
|
@@ -84,16 +84,16 @@
|
|
|
84
84
|
"devDependencies": {
|
|
85
85
|
"@types/node": "^25.5.2",
|
|
86
86
|
"@types/yargs": "^17.0.35",
|
|
87
|
-
"@typespec/compiler": "^1.12.0 || >= 1.13.0-dev.
|
|
87
|
+
"@typespec/compiler": "^1.12.0 || >= 1.13.0-dev.14",
|
|
88
88
|
"@typespec/events": "^0.82.0 || >= 0.83.0-dev.0",
|
|
89
|
-
"@typespec/http": "^1.12.0 || >= 1.13.0-dev.
|
|
89
|
+
"@typespec/http": "^1.12.0 || >= 1.13.0-dev.1",
|
|
90
90
|
"@typespec/json-schema": "^1.12.0 || >= 1.13.0-dev.1",
|
|
91
91
|
"@typespec/library-linter": "^0.82.0 || >= 0.83.0-dev.0",
|
|
92
|
-
"@typespec/openapi": "^1.12.0 || >= 1.13.0-dev.
|
|
92
|
+
"@typespec/openapi": "^1.12.0 || >= 1.13.0-dev.4",
|
|
93
93
|
"@typespec/rest": "^0.82.0 || >= 0.83.0-dev.0",
|
|
94
94
|
"@typespec/sse": "^0.82.0 || >= 0.83.0-dev.0",
|
|
95
95
|
"@typespec/streams": "^0.82.0 || >= 0.83.0-dev.0",
|
|
96
|
-
"@typespec/tspd": "^0.74.2 || >= 0.
|
|
96
|
+
"@typespec/tspd": "^0.74.2 || >= 0.75.0-dev.6",
|
|
97
97
|
"@typespec/versioning": "^0.82.0 || >= 0.83.0-dev.0",
|
|
98
98
|
"@typespec/xml": "^0.82.0 || >= 0.83.0-dev.0",
|
|
99
99
|
"@vitest/coverage-v8": "^4.1.3",
|