@typespec/openapi3 1.5.0-dev.3 → 1.5.0-dev.4
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/transforms/transform-component-schemas.d.ts +2 -2
- package/dist/src/cli/actions/convert/transforms/transform-component-schemas.d.ts.map +1 -1
- package/dist/src/cli/actions/convert/transforms/transform-component-schemas.js +47 -3
- package/dist/src/cli/actions/convert/transforms/transform-component-schemas.js.map +1 -1
- package/dist/src/cli/actions/convert/utils/decorators.d.ts +2 -2
- package/dist/src/cli/actions/convert/utils/decorators.d.ts.map +1 -1
- package/dist/src/cli/actions/convert/utils/decorators.js.map +1 -1
- package/package.json +1 -1
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { TypeSpecDataTypes } from "../interfaces.js";
|
|
2
2
|
import { Context } from "../utils/context.js";
|
|
3
3
|
/**
|
|
4
4
|
* Transforms #/components/schemas into TypeSpec models.
|
|
@@ -7,5 +7,5 @@ import { Context } from "../utils/context.js";
|
|
|
7
7
|
* @param schemas
|
|
8
8
|
* @returns
|
|
9
9
|
*/
|
|
10
|
-
export declare function transformComponentSchemas(context: Context, models:
|
|
10
|
+
export declare function transformComponentSchemas(context: Context, models: TypeSpecDataTypes[]): void;
|
|
11
11
|
//# sourceMappingURL=transform-component-schemas.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transform-component-schemas.d.ts","sourceRoot":"","sources":["../../../../../../src/cli/actions/convert/transforms/transform-component-schemas.ts"],"names":[],"mappings":"AAEA,OAAO,
|
|
1
|
+
{"version":3,"file":"transform-component-schemas.d.ts","sourceRoot":"","sources":["../../../../../../src/cli/actions/convert/transforms/transform-component-schemas.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,iBAAiB,EAKlB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAI9C;;;;;;GAMG;AACH,wBAAgB,yBAAyB,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,iBAAiB,EAAE,GAAG,IAAI,CA+N7F"}
|
|
@@ -81,15 +81,55 @@ export function transformComponentSchemas(context, models) {
|
|
|
81
81
|
});
|
|
82
82
|
}
|
|
83
83
|
function populateUnion(types, name, schema) {
|
|
84
|
+
// Extract description and decorators from meaningful union members
|
|
85
|
+
const unionMetadata = extractUnionMetadata(schema);
|
|
84
86
|
const union = {
|
|
85
87
|
kind: "union",
|
|
86
88
|
...getScopeAndName(name),
|
|
87
|
-
decorators: getDecoratorsForSchema(schema),
|
|
88
|
-
doc: schema.description,
|
|
89
|
+
decorators: [...getDecoratorsForSchema(schema), ...unionMetadata.decorators],
|
|
90
|
+
doc: schema.description ?? unionMetadata.description,
|
|
89
91
|
schema,
|
|
90
92
|
};
|
|
91
93
|
types.push(union);
|
|
92
94
|
}
|
|
95
|
+
/**
|
|
96
|
+
* Extracts meaningful description and decorators from union members.
|
|
97
|
+
* Handles anyOf/oneOf with null, and type arrays like ["string", "null"].
|
|
98
|
+
*/
|
|
99
|
+
function extractUnionMetadata(schema) {
|
|
100
|
+
// Handle anyOf/oneOf scenarios
|
|
101
|
+
const unionMembers = schema.anyOf || schema.oneOf;
|
|
102
|
+
if (unionMembers) {
|
|
103
|
+
const meaningfulMembers = unionMembers.filter((member) => {
|
|
104
|
+
if ("$ref" in member)
|
|
105
|
+
return true; // Redundant, but help the type system understand whether it's a ref or not, and give us access to the type property
|
|
106
|
+
return member.type !== "null"; // Non-null types are meaningful
|
|
107
|
+
});
|
|
108
|
+
// If we have exactly one meaningful member and at least one null, extract from the meaningful one
|
|
109
|
+
if (meaningfulMembers.length === 1 && unionMembers.length > meaningfulMembers.length) {
|
|
110
|
+
const meaningfulMember = meaningfulMembers[0];
|
|
111
|
+
if (!("$ref" in meaningfulMember)) {
|
|
112
|
+
return {
|
|
113
|
+
description: meaningfulMember.description,
|
|
114
|
+
decorators: getDecoratorsForSchema(meaningfulMember),
|
|
115
|
+
};
|
|
116
|
+
}
|
|
117
|
+
}
|
|
118
|
+
}
|
|
119
|
+
// Handle type array scenarios like type: ["string", "null"]
|
|
120
|
+
if (Array.isArray(schema.type)) {
|
|
121
|
+
const nonNullTypes = schema.type.filter((t) => t !== "null");
|
|
122
|
+
// If we have exactly one non-null type, this is essentially a nullable version of that type
|
|
123
|
+
// The schema itself should contain the relevant constraints/description for the non-null type
|
|
124
|
+
if (nonNullTypes.length === 1) {
|
|
125
|
+
// Create a schema without the null type to extract decorators for the non-null part
|
|
126
|
+
const nonNullSchema = { ...schema, type: nonNullTypes[0] };
|
|
127
|
+
return { decorators: getDecoratorsForSchema(nonNullSchema) };
|
|
128
|
+
// The description should already be on the main schema, so we don't override it here
|
|
129
|
+
}
|
|
130
|
+
}
|
|
131
|
+
return { decorators: [] };
|
|
132
|
+
}
|
|
93
133
|
function populateScalar(types, name, schema) {
|
|
94
134
|
types.push({
|
|
95
135
|
kind: "scalar",
|
|
@@ -166,7 +206,11 @@ function getTypeSpecKind(schema) {
|
|
|
166
206
|
if (schema.enum && schema.type === "string" && !schema.nullable) {
|
|
167
207
|
return "enum";
|
|
168
208
|
}
|
|
169
|
-
else if (schema.anyOf ||
|
|
209
|
+
else if (schema.anyOf ||
|
|
210
|
+
schema.oneOf ||
|
|
211
|
+
schema.enum ||
|
|
212
|
+
schema.nullable ||
|
|
213
|
+
(Array.isArray(schema.type) && schema.type.includes("null"))) {
|
|
170
214
|
return "union";
|
|
171
215
|
}
|
|
172
216
|
else if (schema.type === "object" ||
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transform-component-schemas.js","sourceRoot":"","sources":["../../../../../../src/cli/actions/convert/transforms/transform-component-schemas.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAUrD,OAAO,EAAE,sBAAsB,EAAE,MAAM,wBAAwB,CAAC;AAChE,OAAO,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AAEjE;;;;;;GAMG;AACH,MAAM,UAAU,yBAAyB,CAAC,OAAgB,EAAE,
|
|
1
|
+
{"version":3,"file":"transform-component-schemas.js","sourceRoot":"","sources":["../../../../../../src/cli/actions/convert/transforms/transform-component-schemas.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
import { Extensions, OpenAPI3Parameter, OpenAPI3Schema, Refable } from "../../../../types.js";
|
|
1
|
+
import { Extensions, OpenAPI3Parameter, OpenAPI3Schema, OpenAPISchema3_1, Refable } from "../../../../types.js";
|
|
2
2
|
import { TypeSpecDecorator } from "../interfaces.js";
|
|
3
3
|
export declare function getExtensions(element: Extensions): TypeSpecDecorator[];
|
|
4
4
|
export declare function getParameterDecorators(parameter: OpenAPI3Parameter): TypeSpecDecorator[];
|
|
5
5
|
export declare function normalizeObjectValueToTSValueExpression(value: any): string;
|
|
6
|
-
export declare function getDecoratorsForSchema(schema: Refable<OpenAPI3Schema>): TypeSpecDecorator[];
|
|
6
|
+
export declare function getDecoratorsForSchema(schema: Refable<OpenAPI3Schema | OpenAPISchema3_1>): TypeSpecDecorator[];
|
|
7
7
|
//# sourceMappingURL=decorators.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"decorators.d.ts","sourceRoot":"","sources":["../../../../../../src/cli/actions/convert/utils/decorators.ts"],"names":[],"mappings":"AAEA,OAAO,
|
|
1
|
+
{"version":3,"file":"decorators.d.ts","sourceRoot":"","sources":["../../../../../../src/cli/actions/convert/utils/decorators.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,UAAU,EACV,iBAAiB,EACjB,cAAc,EACd,gBAAgB,EAChB,OAAO,EACR,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAW,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAK9D,wBAAgB,aAAa,CAAC,OAAO,EAAE,UAAU,GAAG,iBAAiB,EAAE,CAatE;AAeD,wBAAgB,sBAAsB,CAAC,SAAS,EAAE,iBAAiB,uBAUlE;AAoCD,wBAAgB,uCAAuC,CAAC,KAAK,EAAE,GAAG,GAAG,MAAM,CAU1E;AAoDD,wBAAgB,sBAAsB,CACpC,MAAM,EAAE,OAAO,CAAC,cAAc,GAAG,gBAAgB,CAAC,GACjD,iBAAiB,EAAE,CAgDrB"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"decorators.js","sourceRoot":"","sources":["../../../../../../src/cli/actions/convert/utils/decorators.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"decorators.js","sourceRoot":"","sources":["../../../../../../src/cli/actions/convert/utils/decorators.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.5.0-dev.
|
|
3
|
+
"version": "1.5.0-dev.4",
|
|
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",
|