@typespec/openapi3 1.5.0-dev.6 → 1.5.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.
|
@@ -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,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,
|
|
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,CA0O7F"}
|
|
@@ -57,8 +57,10 @@ export function transformComponentSchemas(context, models) {
|
|
|
57
57
|
}
|
|
58
58
|
function populateModel(types, rawName, context, schema) {
|
|
59
59
|
const { name, scope } = getScopeAndName(rawName);
|
|
60
|
-
|
|
61
|
-
const
|
|
60
|
+
// Unwrap single anyOf/oneOf members to get the actual schema
|
|
61
|
+
const effectiveSchema = unwrapSingleAnyOfOneOf(schema);
|
|
62
|
+
const allOfDetails = getAllOfDetails(effectiveSchema, scope);
|
|
63
|
+
const isParent = getModelIs(effectiveSchema, scope);
|
|
62
64
|
const refName = `#/components/schemas/${rawName}`;
|
|
63
65
|
const isModelReferencedAsMultipartRequestBody = context.isSchemaReferenceRegisteredForMultipartForm(refName);
|
|
64
66
|
const encoding = isModelReferencedAsMultipartRequestBody
|
|
@@ -68,17 +70,20 @@ export function transformComponentSchemas(context, models) {
|
|
|
68
70
|
kind: "model",
|
|
69
71
|
name,
|
|
70
72
|
scope,
|
|
71
|
-
decorators: [...getDecoratorsForSchema(
|
|
72
|
-
doc: schema.description,
|
|
73
|
-
properties: [
|
|
74
|
-
|
|
73
|
+
decorators: [...getDecoratorsForSchema(effectiveSchema)],
|
|
74
|
+
doc: effectiveSchema.description || schema.description,
|
|
75
|
+
properties: [
|
|
76
|
+
...getModelPropertiesFromObjectSchema(effectiveSchema),
|
|
77
|
+
...allOfDetails.properties,
|
|
78
|
+
],
|
|
79
|
+
additionalProperties: effectiveSchema.additionalProperties === true
|
|
75
80
|
? {} // Use empty object to represent Record<unknown>
|
|
76
|
-
: typeof
|
|
77
|
-
?
|
|
81
|
+
: typeof effectiveSchema.additionalProperties === "object"
|
|
82
|
+
? effectiveSchema.additionalProperties
|
|
78
83
|
: undefined,
|
|
79
84
|
extends: allOfDetails.extends,
|
|
80
85
|
is: isParent,
|
|
81
|
-
type:
|
|
86
|
+
type: effectiveSchema.type,
|
|
82
87
|
spread: allOfDetails.spread,
|
|
83
88
|
isModelReferencedAsMultipartRequestBody,
|
|
84
89
|
encoding,
|
|
@@ -187,6 +192,46 @@ export function transformComponentSchemas(context, models) {
|
|
|
187
192
|
return context.generateTypeFromRefableSchema(schema, callingScope);
|
|
188
193
|
}
|
|
189
194
|
}
|
|
195
|
+
/**
|
|
196
|
+
* Unwraps a schema with single anyOf/oneOf member to extract the actual schema.
|
|
197
|
+
* If there's a single meaningful (non-null, non-ref) inline object member in anyOf/oneOf,
|
|
198
|
+
* returns that member's schema merged with any properties from the parent schema.
|
|
199
|
+
* Otherwise, returns the original schema.
|
|
200
|
+
*/
|
|
201
|
+
function unwrapSingleAnyOfOneOf(schema) {
|
|
202
|
+
const unionMembers = schema.anyOf || schema.oneOf;
|
|
203
|
+
if (!unionMembers) {
|
|
204
|
+
return schema;
|
|
205
|
+
}
|
|
206
|
+
const meaningfulInlineMembers = unionMembers.filter((member) => {
|
|
207
|
+
// Exclude $ref members and null types
|
|
208
|
+
if ("$ref" in member)
|
|
209
|
+
return false;
|
|
210
|
+
if (!("type" in member))
|
|
211
|
+
return false;
|
|
212
|
+
// In OpenAPI 3.1, type can be "null" (JsonSchemaType includes "null")
|
|
213
|
+
// In OpenAPI 3.0, nullable is used instead, but we still check type here for consistency
|
|
214
|
+
return member.type !== "null";
|
|
215
|
+
});
|
|
216
|
+
// If there's exactly one meaningful inline member AND it's an object type, unwrap it
|
|
217
|
+
if (meaningfulInlineMembers.length === 1) {
|
|
218
|
+
const member = meaningfulInlineMembers[0];
|
|
219
|
+
// Only unwrap if the member is an object schema
|
|
220
|
+
if (!("$ref" in member) && (member.type === "object" || member.properties)) {
|
|
221
|
+
// Merge the member schema with any top-level properties from the parent schema
|
|
222
|
+
// Priority: member properties > parent properties
|
|
223
|
+
// Use member's description if available, otherwise use parent's description
|
|
224
|
+
return {
|
|
225
|
+
...schema,
|
|
226
|
+
...member,
|
|
227
|
+
description: member.description || schema.description,
|
|
228
|
+
anyOf: undefined,
|
|
229
|
+
oneOf: undefined,
|
|
230
|
+
};
|
|
231
|
+
}
|
|
232
|
+
}
|
|
233
|
+
return schema;
|
|
234
|
+
}
|
|
190
235
|
function getModelPropertiesFromObjectSchema({ properties, required = [], }) {
|
|
191
236
|
if (!properties)
|
|
192
237
|
return [];
|
|
@@ -215,6 +260,28 @@ function getTypeSpecKind(schema) {
|
|
|
215
260
|
schema.enum ||
|
|
216
261
|
schema.nullable ||
|
|
217
262
|
(Array.isArray(schema.type) && schema.type.includes("null"))) {
|
|
263
|
+
// Check if anyOf/oneOf has a single meaningful inline object schema
|
|
264
|
+
const unionMembers = schema.anyOf || schema.oneOf;
|
|
265
|
+
if (unionMembers) {
|
|
266
|
+
const meaningfulInlineMembers = unionMembers.filter((member) => {
|
|
267
|
+
// Exclude $ref members and null types
|
|
268
|
+
if ("$ref" in member)
|
|
269
|
+
return false;
|
|
270
|
+
if (!("type" in member))
|
|
271
|
+
return false;
|
|
272
|
+
// In OpenAPI 3.1, type can be "null" (JsonSchemaType includes "null")
|
|
273
|
+
// In OpenAPI 3.0, nullable is used instead, but we still check type here for consistency
|
|
274
|
+
return member.type !== "null";
|
|
275
|
+
});
|
|
276
|
+
// If there's exactly one meaningful inline member AND it's an object type, treat it as a model
|
|
277
|
+
if (meaningfulInlineMembers.length === 1) {
|
|
278
|
+
const member = meaningfulInlineMembers[0];
|
|
279
|
+
// Only unwrap if the member is an object schema
|
|
280
|
+
if (!("$ref" in member) && (member.type === "object" || member.properties)) {
|
|
281
|
+
return "model";
|
|
282
|
+
}
|
|
283
|
+
}
|
|
284
|
+
}
|
|
218
285
|
return "union";
|
|
219
286
|
}
|
|
220
287
|
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,MAA2B;IACrF,MAAM,OAAO,GAAG,OAAO,CAAC,WAAW,CAAC,UAAU,EAAE,OAAO,CAAC;IACxD,IAAI,CAAC,OAAO;QAAE,OAAO;IAErB,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;QACxC,MAAM,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;QAC7B,wBAAwB,CAAC,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;IAC1D,CAAC;IAED,OAAO;IACP,SAAS,wBAAwB,CAC/B,KAA0B,EAC1B,IAAY,EACZ,OAAgB,EAChB,MAAsB;QAEtB,MAAM,IAAI,GAAG,eAAe,CAAC,MAAM,CAAC,CAAC;QACrC,QAAQ,IAAI,EAAE,CAAC;YACb,KAAK,OAAO;gBACV,OAAO,aAAa,CAAC,KAAK,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;YAC5C,KAAK,MAAM;gBACT,OAAO,YAAY,CAAC,KAAK,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;YAC3C,KAAK,OAAO;gBACV,OAAO,aAAa,CAAC,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;YACrD,KAAK,OAAO;gBACV,OAAO,aAAa,CAAC,KAAK,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;YAC5C,KAAK,QAAQ;gBACX,OAAO,cAAc,CAAC,KAAK,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;QAC/C,CAAC;IACH,CAAC;IAED,SAAS,aAAa,CACpB,KAA0B,EAC1B,OAAe,EACf,MAA+B;QAE/B,IAAI,CAAC,CAAC,MAAM,IAAI,MAAM,CAAC,EAAE,CAAC;YACxB,OAAO;QACT,CAAC;QAED,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,eAAe,CAAC,OAAO,CAAC,CAAC;QAEjD,KAAK,CAAC,IAAI,CAAC;YACT,IAAI,EAAE,OAAO;YACb,IAAI;YACJ,KAAK;YACL,GAAG,EAAE,MAAM,CAAC,WAAW;YACvB,GAAG,EAAE,OAAO,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC;SAC5C,CAAC,CAAC;IACL,CAAC;IAED,SAAS,YAAY,CAAC,KAA0B,EAAE,IAAY,EAAE,MAAsB;QACpF,MAAM,MAAM,GAAiB;YAC3B,IAAI,EAAE,MAAM;YACZ,GAAG,eAAe,CAAC,IAAI,CAAC;YACxB,UAAU,EAAE,sBAAsB,CAAC,MAAM,CAAC;YAC1C,GAAG,EAAE,MAAM,CAAC,WAAW;YACvB,MAAM;SACP,CAAC;QAEF,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACrB,CAAC;IAED,SAAS,aAAa,CACpB,KAA0B,EAC1B,OAAe,EACf,OAAgB,EAChB,MAAsB;QAEtB,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,eAAe,CAAC,OAAO,CAAC,CAAC;
|
|
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,MAA2B;IACrF,MAAM,OAAO,GAAG,OAAO,CAAC,WAAW,CAAC,UAAU,EAAE,OAAO,CAAC;IACxD,IAAI,CAAC,OAAO;QAAE,OAAO;IAErB,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;QACxC,MAAM,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;QAC7B,wBAAwB,CAAC,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;IAC1D,CAAC;IAED,OAAO;IACP,SAAS,wBAAwB,CAC/B,KAA0B,EAC1B,IAAY,EACZ,OAAgB,EAChB,MAAsB;QAEtB,MAAM,IAAI,GAAG,eAAe,CAAC,MAAM,CAAC,CAAC;QACrC,QAAQ,IAAI,EAAE,CAAC;YACb,KAAK,OAAO;gBACV,OAAO,aAAa,CAAC,KAAK,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;YAC5C,KAAK,MAAM;gBACT,OAAO,YAAY,CAAC,KAAK,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;YAC3C,KAAK,OAAO;gBACV,OAAO,aAAa,CAAC,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;YACrD,KAAK,OAAO;gBACV,OAAO,aAAa,CAAC,KAAK,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;YAC5C,KAAK,QAAQ;gBACX,OAAO,cAAc,CAAC,KAAK,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;QAC/C,CAAC;IACH,CAAC;IAED,SAAS,aAAa,CACpB,KAA0B,EAC1B,OAAe,EACf,MAA+B;QAE/B,IAAI,CAAC,CAAC,MAAM,IAAI,MAAM,CAAC,EAAE,CAAC;YACxB,OAAO;QACT,CAAC;QAED,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,eAAe,CAAC,OAAO,CAAC,CAAC;QAEjD,KAAK,CAAC,IAAI,CAAC;YACT,IAAI,EAAE,OAAO;YACb,IAAI;YACJ,KAAK;YACL,GAAG,EAAE,MAAM,CAAC,WAAW;YACvB,GAAG,EAAE,OAAO,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC;SAC5C,CAAC,CAAC;IACL,CAAC;IAED,SAAS,YAAY,CAAC,KAA0B,EAAE,IAAY,EAAE,MAAsB;QACpF,MAAM,MAAM,GAAiB;YAC3B,IAAI,EAAE,MAAM;YACZ,GAAG,eAAe,CAAC,IAAI,CAAC;YACxB,UAAU,EAAE,sBAAsB,CAAC,MAAM,CAAC;YAC1C,GAAG,EAAE,MAAM,CAAC,WAAW;YACvB,MAAM;SACP,CAAC;QAEF,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACrB,CAAC;IAED,SAAS,aAAa,CACpB,KAA0B,EAC1B,OAAe,EACf,OAAgB,EAChB,MAAsB;QAEtB,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,eAAe,CAAC,OAAO,CAAC,CAAC;QAEjD,6DAA6D;QAC7D,MAAM,eAAe,GAAG,sBAAsB,CAAC,MAAM,CAAC,CAAC;QAEvD,MAAM,YAAY,GAAG,eAAe,CAAC,eAAe,EAAE,KAAK,CAAC,CAAC;QAC7D,MAAM,QAAQ,GAAG,UAAU,CAAC,eAAe,EAAE,KAAK,CAAC,CAAC;QACpD,MAAM,OAAO,GAAG,wBAAwB,OAAO,EAAE,CAAC;QAClD,MAAM,uCAAuC,GAC3C,OAAO,CAAC,2CAA2C,CAAC,OAAO,CAAC,CAAC;QAC/D,MAAM,QAAQ,GAAG,uCAAuC;YACtD,CAAC,CAAC,OAAO,CAAC,0BAA0B,CAAC,OAAO,CAAC;YAC7C,CAAC,CAAC,SAAS,CAAC;QACd,KAAK,CAAC,IAAI,CAAC;YACT,IAAI,EAAE,OAAO;YACb,IAAI;YACJ,KAAK;YACL,UAAU,EAAE,CAAC,GAAG,sBAAsB,CAAC,eAAe,CAAC,CAAC;YACxD,GAAG,EAAE,eAAe,CAAC,WAAW,IAAI,MAAM,CAAC,WAAW;YACtD,UAAU,EAAE;gBACV,GAAG,kCAAkC,CAAC,eAAe,CAAC;gBACtD,GAAG,YAAY,CAAC,UAAU;aAC3B;YACD,oBAAoB,EAClB,eAAe,CAAC,oBAAoB,KAAK,IAAI;gBAC3C,CAAC,CAAC,EAAE,CAAC,gDAAgD;gBACrD,CAAC,CAAC,OAAO,eAAe,CAAC,oBAAoB,KAAK,QAAQ;oBACxD,CAAC,CAAC,eAAe,CAAC,oBAAoB;oBACtC,CAAC,CAAC,SAAS;YACjB,OAAO,EAAE,YAAY,CAAC,OAAO;YAC7B,EAAE,EAAE,QAAQ;YACZ,IAAI,EAAE,eAAe,CAAC,IAAI;YAC1B,MAAM,EAAE,YAAY,CAAC,MAAM;YAC3B,uCAAuC;YACvC,QAAQ;SACT,CAAC,CAAC;IACL,CAAC;IAED,SAAS,aAAa,CAAC,KAA0B,EAAE,IAAY,EAAE,MAAsB;QACrF,mEAAmE;QACnE,MAAM,aAAa,GAAG,oBAAoB,CAAC,MAAM,CAAC,CAAC;QAEnD,MAAM,KAAK,GAAkB;YAC3B,IAAI,EAAE,OAAO;YACb,GAAG,eAAe,CAAC,IAAI,CAAC;YACxB,UAAU,EAAE,CAAC,GAAG,sBAAsB,CAAC,MAAM,CAAC,EAAE,GAAG,aAAa,CAAC,UAAU,CAAC;YAC5E,GAAG,EAAE,MAAM,CAAC,WAAW,IAAI,aAAa,CAAC,WAAW;YACpD,MAAM;SACP,CAAC;QAEF,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACpB,CAAC;IAED;;;OAGG;IACH,SAAS,oBAAoB,CAAC,MAAyC;QAIrE,+BAA+B;QAC/B,MAAM,YAAY,GAAG,MAAM,CAAC,KAAK,IAAI,MAAM,CAAC,KAAK,CAAC;QAClD,IAAI,YAAY,EAAE,CAAC;YACjB,MAAM,iBAAiB,GAAG,YAAY,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE;gBACvD,IAAI,MAAM,IAAI,MAAM;oBAAE,OAAO,IAAI,CAAC,CAAC,oHAAoH;gBACvJ,OAAO,MAAM,CAAC,IAAI,KAAK,MAAM,CAAC,CAAC,gCAAgC;YACjE,CAAC,CAAC,CAAC;YAEH,kGAAkG;YAClG,IAAI,iBAAiB,CAAC,MAAM,KAAK,CAAC,IAAI,YAAY,CAAC,MAAM,GAAG,iBAAiB,CAAC,MAAM,EAAE,CAAC;gBACrF,MAAM,gBAAgB,GAAG,iBAAiB,CAAC,CAAC,CAAC,CAAC;gBAC9C,IAAI,CAAC,CAAC,MAAM,IAAI,gBAAgB,CAAC,EAAE,CAAC;oBAClC,OAAO;wBACL,WAAW,EAAE,gBAAgB,CAAC,WAAW;wBACzC,UAAU,EAAE,sBAAsB,CAAC,gBAAgB,CAAC;qBACrD,CAAC;gBACJ,CAAC;YACH,CAAC;QACH,CAAC;QAED,4DAA4D;QAC5D,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC;YAC/B,MAAM,YAAY,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,MAAM,CAAC,CAAC;YAC7D,4FAA4F;YAC5F,8FAA8F;YAC9F,IAAI,YAAY,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBAC9B,oFAAoF;gBACpF,MAAM,aAAa,GAAG,EAAE,GAAG,MAAM,EAAE,IAAI,EAAE,YAAY,CAAC,CAAC,CAAC,EAAE,CAAC;gBAC3D,OAAO,EAAE,UAAU,EAAE,sBAAsB,CAAC,aAAa,CAAC,EAAE,CAAC;gBAC7D,qFAAqF;YACvF,CAAC;QACH,CAAC;QAED,OAAO,EAAE,UAAU,EAAE,EAAE,EAAE,CAAC;IAC5B,CAAC;IAED,SAAS,cAAc,CAAC,KAA0B,EAAE,IAAY,EAAE,MAAsB;QACtF,KAAK,CAAC,IAAI,CAAC;YACT,IAAI,EAAE,QAAQ;YACd,GAAG,eAAe,CAAC,IAAI,CAAC;YACxB,UAAU,EAAE,sBAAsB,CAAC,MAAM,CAAC;YAC1C,GAAG,EAAE,MAAM,CAAC,WAAW;YACvB,MAAM;SACP,CAAC,CAAC;IACL,CAAC;IAOD,SAAS,eAAe,CAAC,MAAsB,EAAE,YAAsB;QACrE,MAAM,OAAO,GAAiB;YAC5B,MAAM,EAAE,EAAE;YACV,UAAU,EAAE,EAAE;SACf,CAAC;QAEF,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;YAClB,OAAO,OAAO,CAAC;QACjB,CAAC;QAED,IAAI,4BAA4B,GAAG,KAAK,CAAC;QAEzC,KAAK,MAAM,MAAM,IAAI,MAAM,CAAC,KAAK,EAAE,CAAC;YAClC,2DAA2D;YAC3D,IAAI,CAAC,CAAC,MAAM,IAAI,MAAM,CAAC,EAAE,CAAC;gBACxB,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG,kCAAkC,CAAC,MAAM,CAAC,CAAC,CAAC;gBACvE,SAAS;YACX,CAAC;YAED,MAAM,SAAS,GAAG,OAAO,CAAC,cAAc,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;YAEtD,qFAAqF;YACrF,6BAA6B;YAC7B,IAAI,CAAC,SAAS,EAAE,aAAa,EAAE,CAAC;gBAC9B,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC,CAAC;gBACnE,SAAS;YACX,CAAC;YAED,IAAI,CAAC,4BAA4B,EAAE,CAAC;gBAClC,OAAO,CAAC,OAAO,GAAG,OAAO,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC;gBAChE,4BAA4B,GAAG,IAAI,CAAC;gBACpC,SAAS;YACX,CAAC;YAED,kFAAkF;YAClF,6EAA6E;YAC7E,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;gBACpB,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;gBACrC,OAAO,CAAC,OAAO,GAAG,SAAS,CAAC;YAC9B,CAAC;YAED,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC,CAAC;QACrE,CAAC;QAED,OAAO,OAAO,CAAC;IACjB,CAAC;IAED,SAAS,UAAU,CAAC,MAAsB,EAAE,YAAsB;QAChE,IAAI,MAAM,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;YAC5B,OAAO;QACT,CAAC;QACD,OAAO,OAAO,CAAC,6BAA6B,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;IACrE,CAAC;AACH,CAAC;AAED;;;;;GAKG;AACH,SAAS,sBAAsB,CAAC,MAAsB;IACpD,MAAM,YAAY,GAAG,MAAM,CAAC,KAAK,IAAI,MAAM,CAAC,KAAK,CAAC;IAClD,IAAI,CAAC,YAAY,EAAE,CAAC;QAClB,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,MAAM,uBAAuB,GAAG,YAAY,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE;QAC7D,sCAAsC;QACtC,IAAI,MAAM,IAAI,MAAM;YAAE,OAAO,KAAK,CAAC;QACnC,IAAI,CAAC,CAAC,MAAM,IAAI,MAAM,CAAC;YAAE,OAAO,KAAK,CAAC;QACtC,sEAAsE;QACtE,yFAAyF;QACzF,OAAQ,MAAc,CAAC,IAAI,KAAK,MAAM,CAAC;IACzC,CAAC,CAAC,CAAC;IAEH,qFAAqF;IACrF,IAAI,uBAAuB,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACzC,MAAM,MAAM,GAAG,uBAAuB,CAAC,CAAC,CAAC,CAAC;QAC1C,gDAAgD;QAChD,IAAI,CAAC,CAAC,MAAM,IAAI,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,KAAK,QAAQ,IAAI,MAAM,CAAC,UAAU,CAAC,EAAE,CAAC;YAC3E,+EAA+E;YAC/E,kDAAkD;YAClD,4EAA4E;YAC5E,OAAO;gBACL,GAAG,MAAM;gBACT,GAAG,MAAM;gBACT,WAAW,EAAE,MAAM,CAAC,WAAW,IAAI,MAAM,CAAC,WAAW;gBACrD,KAAK,EAAE,SAAS;gBAChB,KAAK,EAAE,SAAS;aACjB,CAAC;QACJ,CAAC;IACH,CAAC;IAED,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,SAAS,kCAAkC,CAAC,EAC1C,UAAU,EACV,QAAQ,GAAG,EAAE,GACE;IACf,IAAI,CAAC,UAAU;QAAE,OAAO,EAAE,CAAC;IAE3B,MAAM,eAAe,GAA4B,EAAE,CAAC;IACpD,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC;QAC3C,MAAM,QAAQ,GAAG,UAAU,CAAC,IAAI,CAAC,CAAC;QAElC,eAAe,CAAC,IAAI,CAAC;YACnB,IAAI,EAAE,eAAe,CAAC,IAAI,CAAC;YAC3B,GAAG,EAAE,QAAQ,CAAC,WAAW;YACzB,MAAM,EAAE,QAAQ;YAChB,UAAU,EAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC;YACpC,UAAU,EAAE,CAAC,GAAG,sBAAsB,CAAC,QAAQ,CAAC,CAAC;SAClD,CAAC,CAAC;IACL,CAAC;IAED,OAAO,eAAe,CAAC;AACzB,CAAC;AAED,SAAS,eAAe,CAAC,MAAsB;IAC7C,IAAI,MAAM,IAAI,MAAM,EAAE,CAAC;QACrB,OAAO,OAAO,CAAC;IACjB,CAAC;IAED,IAAI,MAAM,CAAC,IAAI,IAAI,MAAM,CAAC,IAAI,KAAK,QAAQ,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC;QAChE,OAAO,MAAM,CAAC;IAChB,CAAC;SAAM,IACL,MAAM,CAAC,KAAK;QACZ,MAAM,CAAC,KAAK;QACZ,MAAM,CAAC,IAAI;QACX,MAAM,CAAC,QAAQ;QACf,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,EAC5D,CAAC;QACD,oEAAoE;QACpE,MAAM,YAAY,GAAG,MAAM,CAAC,KAAK,IAAI,MAAM,CAAC,KAAK,CAAC;QAClD,IAAI,YAAY,EAAE,CAAC;YACjB,MAAM,uBAAuB,GAAG,YAAY,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE;gBAC7D,sCAAsC;gBACtC,IAAI,MAAM,IAAI,MAAM;oBAAE,OAAO,KAAK,CAAC;gBACnC,IAAI,CAAC,CAAC,MAAM,IAAI,MAAM,CAAC;oBAAE,OAAO,KAAK,CAAC;gBACtC,sEAAsE;gBACtE,yFAAyF;gBACzF,OAAQ,MAAc,CAAC,IAAI,KAAK,MAAM,CAAC;YACzC,CAAC,CAAC,CAAC;YAEH,+FAA+F;YAC/F,IAAI,uBAAuB,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBACzC,MAAM,MAAM,GAAG,uBAAuB,CAAC,CAAC,CAAC,CAAC;gBAC1C,gDAAgD;gBAChD,IAAI,CAAC,CAAC,MAAM,IAAI,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,KAAK,QAAQ,IAAI,MAAM,CAAC,UAAU,CAAC,EAAE,CAAC;oBAC3E,OAAO,OAAO,CAAC;gBACjB,CAAC;YACH,CAAC;QACH,CAAC;QAED,OAAO,OAAO,CAAC;IACjB,CAAC;SAAM,IACL,MAAM,CAAC,IAAI,KAAK,QAAQ;QACxB,CAAC,MAAM,CAAC,UAAU,IAAI,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC;QAChE,MAAM,CAAC,IAAI,KAAK,OAAO;QACvB,MAAM,CAAC,KAAK;QACZ,MAAM,CAAC,KAAK,EACZ,CAAC;QACD,OAAO,OAAO,CAAC;IACjB,CAAC;IAED,OAAO,QAAQ,CAAC;AAClB,CAAC"}
|
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.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",
|