@typespec/openapi3 1.6.0-dev.14 → 1.6.0-dev.15
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/src/cli/actions/convert/generators/generate-response-expressions.js +10 -14
- package/dist/src/cli/actions/convert/generators/generate-response-expressions.js.map +1 -1
- package/dist/src/cli/actions/convert/transforms/transforms.d.ts.map +1 -1
- package/dist/src/cli/actions/convert/transforms/transforms.js +32 -10
- package/dist/src/cli/actions/convert/transforms/transforms.js.map +1 -1
- package/package.json +1 -1
|
@@ -122,21 +122,17 @@ function generateResponseExpressions({ statusCode, contents, context, headers, o
|
|
|
122
122
|
}
|
|
123
123
|
return contents.map(([mediaType, content]) => {
|
|
124
124
|
// Special handling for Server-Sent Events
|
|
125
|
-
if (
|
|
126
|
-
context.
|
|
125
|
+
if (!context.openApi3Doc.openapi.startsWith("3.0") &&
|
|
126
|
+
!context.openApi3Doc.openapi.startsWith("3.1") &&
|
|
127
|
+
mediaType === "text/event-stream" &&
|
|
128
|
+
"itemSchema" in content &&
|
|
129
|
+
content.itemSchema &&
|
|
130
|
+
typeof content.itemSchema === "object" &&
|
|
131
|
+
"$ref" in content.itemSchema) {
|
|
127
132
|
// Check for itemSchema (OpenAPI 3.2 extension)
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
const eventUnionType = context.generateTypeFromRefableSchema(itemSchema, operationScope);
|
|
132
|
-
return `SSEStream<${eventUnionType}>`;
|
|
133
|
-
}
|
|
134
|
-
}
|
|
135
|
-
else if (content.schema && "$ref" in content.schema) {
|
|
136
|
-
// Fallback: use schema directly if no itemSchema
|
|
137
|
-
const eventUnionType = context.generateTypeFromRefableSchema(content.schema, operationScope);
|
|
138
|
-
return `SSEStream<${eventUnionType}>`;
|
|
139
|
-
}
|
|
133
|
+
const eventUnionType = context.generateTypeFromRefableSchema(content.itemSchema, operationScope);
|
|
134
|
+
context.markSSEUsage();
|
|
135
|
+
return `SSEStream<${eventUnionType}>`;
|
|
140
136
|
// If no proper schema reference, fall through to regular handling
|
|
141
137
|
}
|
|
142
138
|
// Attempt to emit just the Body or an intersection of Body & MappedResponse
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generate-response-expressions.js","sourceRoot":"","sources":["../../../../../../src/cli/actions/convert/generators/generate-response-expressions.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"generate-response-expressions.js","sourceRoot":"","sources":["../../../../../../src/cli/actions/convert/generators/generate-response-expressions.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transforms.d.ts","sourceRoot":"","sources":["../../../../../../src/cli/actions/convert/transforms/transforms.ts"],"names":[],"mappings":"AAUA,OAAO,EAAiB,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAClE,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AA0B9C,wBAAgB,SAAS,CAAC,OAAO,EAAE,OAAO,GAAG,eAAe,
|
|
1
|
+
{"version":3,"file":"transforms.d.ts","sourceRoot":"","sources":["../../../../../../src/cli/actions/convert/transforms/transforms.ts"],"names":[],"mappings":"AAUA,OAAO,EAAiB,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAClE,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AA0B9C,wBAAgB,SAAS,CAAC,OAAO,EAAE,OAAO,GAAG,eAAe,CAwB3D"}
|
|
@@ -26,7 +26,10 @@ export function transform(context) {
|
|
|
26
26
|
// Pre-scan for multipart schemas before generating models
|
|
27
27
|
scanForMultipartSchemas(openapi, context);
|
|
28
28
|
// Pre-scan for SSE event schemas before generating models
|
|
29
|
-
|
|
29
|
+
if (!context.openApi3Doc.openapi.startsWith("3.0") &&
|
|
30
|
+
!context.openApi3Doc.openapi.startsWith("3.1")) {
|
|
31
|
+
scanForSSESchemas(openapi, context);
|
|
32
|
+
}
|
|
30
33
|
const models = collectDataTypes(context);
|
|
31
34
|
const operations = transformPaths(openapi.paths, context);
|
|
32
35
|
return {
|
|
@@ -63,8 +66,8 @@ function scanForSSESchemas(openapi, context) {
|
|
|
63
66
|
scanPathForSSESchemas(path, context);
|
|
64
67
|
}
|
|
65
68
|
}
|
|
69
|
+
const methods = ["get", "post", "put", "patch", "delete", "head"];
|
|
66
70
|
function scanPathForMultipartSchemas(path, context) {
|
|
67
|
-
const methods = ["get", "post", "put", "patch", "delete", "head"];
|
|
68
71
|
for (const method of methods) {
|
|
69
72
|
const operation = path[method];
|
|
70
73
|
if (!operation?.requestBody)
|
|
@@ -97,15 +100,34 @@ function scanOperationForMultipartSchemas(requestBodyRef, context) {
|
|
|
97
100
|
}
|
|
98
101
|
}
|
|
99
102
|
function scanPathForSSESchemas(path, context) {
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
+
for (const method of methods) {
|
|
104
|
+
const operation = path[method];
|
|
105
|
+
if (!operation?.responses)
|
|
106
|
+
continue;
|
|
107
|
+
// Handle responses which could be a reference or actual responses
|
|
108
|
+
const responses = resolveReference(operation.responses, context);
|
|
109
|
+
if (!responses)
|
|
110
|
+
return;
|
|
111
|
+
scanOperationForSSESchemas(responses, context);
|
|
112
|
+
}
|
|
113
|
+
if ("query" in path && path.query && path.query.responses) {
|
|
114
|
+
// Handle responses which could be a reference or actual responses
|
|
115
|
+
const responses = resolveReference(path.query.responses, context);
|
|
116
|
+
if (!responses)
|
|
117
|
+
return;
|
|
118
|
+
scanOperationForSSESchemas(responses, context);
|
|
119
|
+
}
|
|
120
|
+
if ("additionalOperations" in path && path.additionalOperations) {
|
|
121
|
+
for (const additionalOperation of Object.values(path.additionalOperations)) {
|
|
122
|
+
if (additionalOperation.responses) {
|
|
123
|
+
// Handle responses which could be a reference or actual responses
|
|
124
|
+
const responses = resolveReference(additionalOperation.responses, context);
|
|
125
|
+
if (!responses)
|
|
126
|
+
return;
|
|
127
|
+
scanOperationForSSESchemas(responses, context);
|
|
128
|
+
}
|
|
129
|
+
}
|
|
103
130
|
}
|
|
104
|
-
// Handle responses which could be a reference or actual responses
|
|
105
|
-
const responses = resolveReference(path.get.responses, context);
|
|
106
|
-
if (!responses)
|
|
107
|
-
return;
|
|
108
|
-
scanOperationForSSESchemas(responses, context);
|
|
109
131
|
}
|
|
110
132
|
function scanOperationForSSESchemas(responses, context) {
|
|
111
133
|
for (const response of Object.values(responses)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transforms.js","sourceRoot":"","sources":["../../../../../../src/cli/actions/convert/transforms/transforms.ts"],"names":[],"mappings":"AAYA,OAAO,EAAE,4BAA4B,EAAE,MAAM,qCAAqC,CAAC;AACnF,OAAO,EAAE,yBAAyB,EAAE,MAAM,kCAAkC,CAAC;AAC7E,OAAO,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AAChE,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAC1D,OAAO,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AACnE,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAEpD;;;;;GAKG;AACH,SAAS,gBAAgB,CAAI,aAAyB,EAAE,OAAgB;IACtE,IAAI,aAAa,IAAI,OAAO,aAAa,KAAK,QAAQ,IAAI,MAAM,IAAI,aAAa,EAAE,CAAC;QAClF,MAAM,GAAG,GAAG,aAAa,CAAC,IAAI,CAAC;QAC/B,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE,CAAC;YAC5B,OAAO,OAAO,CAAC,QAAQ,CAAI,GAAG,CAAC,CAAC;QAClC,CAAC;QACD,OAAO,SAAS,CAAC;IACnB,CAAC;IACD,OAAO,aAAkB,CAAC;AAC5B,CAAC;AAED,MAAM,UAAU,SAAS,CAAC,OAAgB;IACxC,MAAM,OAAO,GAAG,OAAO,CAAC,WAAW,CAAC;IAEpC,0DAA0D;IAC1D,uBAAuB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IAE1C,0DAA0D;IAC1D,iBAAiB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"transforms.js","sourceRoot":"","sources":["../../../../../../src/cli/actions/convert/transforms/transforms.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.6.0-dev.
|
|
3
|
+
"version": "1.6.0-dev.15",
|
|
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",
|