@typespec/openapi3 1.5.0 → 1.6.0-dev.10
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/convert-file.d.ts.map +1 -1
- package/dist/src/cli/actions/convert/convert-file.js +11 -4
- package/dist/src/cli/actions/convert/convert-file.js.map +1 -1
- package/dist/src/cli/actions/convert/convert.d.ts +2 -2
- package/dist/src/cli/actions/convert/convert.d.ts.map +1 -1
- package/dist/src/cli/actions/convert/convert.js +13 -6
- package/dist/src/cli/actions/convert/convert.js.map +1 -1
- package/dist/src/cli/actions/convert/generators/common.d.ts +3 -0
- package/dist/src/cli/actions/convert/generators/common.d.ts.map +1 -0
- package/dist/src/cli/actions/convert/generators/common.js +10 -0
- package/dist/src/cli/actions/convert/generators/common.js.map +1 -0
- package/dist/src/cli/actions/convert/generators/generate-decorators.d.ts.map +1 -1
- package/dist/src/cli/actions/convert/generators/generate-decorators.js +15 -1
- package/dist/src/cli/actions/convert/generators/generate-decorators.js.map +1 -1
- package/dist/src/cli/actions/convert/generators/generate-model.d.ts.map +1 -1
- package/dist/src/cli/actions/convert/generators/generate-model.js +18 -1
- package/dist/src/cli/actions/convert/generators/generate-model.js.map +1 -1
- package/dist/src/cli/actions/convert/generators/generate-operation.js +6 -11
- package/dist/src/cli/actions/convert/generators/generate-operation.js.map +1 -1
- package/dist/src/cli/actions/convert/generators/generate-response-expressions.js +3 -3
- package/dist/src/cli/actions/convert/generators/generate-response-expressions.js.map +1 -1
- package/dist/src/cli/actions/convert/generators/generate-servers.d.ts.map +1 -1
- package/dist/src/cli/actions/convert/generators/generate-servers.js +9 -3
- package/dist/src/cli/actions/convert/generators/generate-servers.js.map +1 -1
- package/dist/src/cli/actions/convert/generators/generate-types.d.ts +6 -6
- package/dist/src/cli/actions/convert/generators/generate-types.d.ts.map +1 -1
- package/dist/src/cli/actions/convert/generators/generate-types.js +25 -2
- package/dist/src/cli/actions/convert/generators/generate-types.js.map +1 -1
- package/dist/src/cli/actions/convert/interfaces.d.ts +9 -9
- package/dist/src/cli/actions/convert/interfaces.d.ts.map +1 -1
- package/dist/src/cli/actions/convert/transforms/transform-component-parameters.d.ts.map +1 -1
- package/dist/src/cli/actions/convert/transforms/transform-component-parameters.js +5 -2
- package/dist/src/cli/actions/convert/transforms/transform-component-parameters.js.map +1 -1
- 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 +20 -12
- package/dist/src/cli/actions/convert/transforms/transform-component-schemas.js.map +1 -1
- package/dist/src/cli/actions/convert/transforms/transform-paths.d.ts +2 -2
- package/dist/src/cli/actions/convert/transforms/transform-paths.d.ts.map +1 -1
- package/dist/src/cli/actions/convert/transforms/transform-paths.js +100 -14
- package/dist/src/cli/actions/convert/transforms/transform-paths.js.map +1 -1
- package/dist/src/cli/actions/convert/transforms/transforms.js.map +1 -1
- package/dist/src/cli/actions/convert/utils/context.d.ts +5 -9
- package/dist/src/cli/actions/convert/utils/context.d.ts.map +1 -1
- package/dist/src/cli/actions/convert/utils/context.js +27 -2
- package/dist/src/cli/actions/convert/utils/context.js.map +1 -1
- package/dist/src/cli/actions/convert/utils/decorators.d.ts +3 -3
- package/dist/src/cli/actions/convert/utils/decorators.d.ts.map +1 -1
- package/dist/src/cli/actions/convert/utils/decorators.js +12 -5
- package/dist/src/cli/actions/convert/utils/decorators.js.map +1 -1
- package/dist/src/cli/actions/convert/utils/docs.d.ts +1 -1
- package/dist/src/cli/actions/convert/utils/docs.d.ts.map +1 -1
- package/dist/src/cli/actions/convert/utils/docs.js +7 -8
- package/dist/src/cli/actions/convert/utils/docs.js.map +1 -1
- package/dist/src/index.d.ts +1 -1
- package/dist/src/index.d.ts.map +1 -1
- package/dist/src/index.js.map +1 -1
- package/dist/src/lib.d.ts +1 -1
- package/dist/src/lib.d.ts.map +1 -1
- package/dist/src/lib.js +3 -1
- package/dist/src/lib.js.map +1 -1
- package/dist/src/openapi-spec-mappings.d.ts.map +1 -1
- package/dist/src/openapi-spec-mappings.js +10 -0
- package/dist/src/openapi-spec-mappings.js.map +1 -1
- package/dist/src/openapi.js +5 -1
- package/dist/src/openapi.js.map +1 -1
- package/dist/src/schema-emitter.d.ts +2 -2
- package/dist/src/schema-emitter.d.ts.map +1 -1
- package/dist/src/schema-emitter.js +67 -16
- package/dist/src/schema-emitter.js.map +1 -1
- package/dist/src/types.d.ts +331 -23
- package/dist/src/types.d.ts.map +1 -1
- package/dist/src/visibility-usage.d.ts +1 -0
- package/dist/src/visibility-usage.d.ts.map +1 -1
- package/dist/src/visibility-usage.js +6 -0
- package/dist/src/visibility-usage.js.map +1 -1
- package/package.json +22 -21
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { Contact, License } from "@typespec/openapi";
|
|
2
|
-
import { OpenAPI3Encoding, OpenAPI3Responses,
|
|
2
|
+
import { OpenAPI3Encoding, OpenAPI3Responses, Refable, SupportedOpenAPISchema } from "../../../types.js";
|
|
3
3
|
export interface TypeSpecProgram {
|
|
4
4
|
serviceInfo: TypeSpecServiceInfo;
|
|
5
5
|
namespaces: Record<string, TypeSpecNamespace>;
|
|
@@ -68,7 +68,7 @@ export type TypeSpecDataTypes = TypeSpecAlias | TypeSpecEnum | TypeSpecModel | T
|
|
|
68
68
|
export interface TypeSpecModel extends TypeSpecDeclaration {
|
|
69
69
|
kind: "model";
|
|
70
70
|
properties: TypeSpecModelProperty[];
|
|
71
|
-
additionalProperties?: Refable<
|
|
71
|
+
additionalProperties?: Refable<SupportedOpenAPISchema>;
|
|
72
72
|
/**
|
|
73
73
|
* Note: Only one of `extends` or `is` should be specified.
|
|
74
74
|
*/
|
|
@@ -80,7 +80,7 @@ export interface TypeSpecModel extends TypeSpecDeclaration {
|
|
|
80
80
|
/**
|
|
81
81
|
* Defaults to 'object'
|
|
82
82
|
*/
|
|
83
|
-
type?:
|
|
83
|
+
type?: SupportedOpenAPISchema["type"];
|
|
84
84
|
spread?: string[];
|
|
85
85
|
/**
|
|
86
86
|
* Whether the model is referenced as a multipart request body and needs to be emitted as a set of http parts
|
|
@@ -97,15 +97,15 @@ export interface TypeSpecAlias extends Pick<TypeSpecDeclaration, "name" | "doc"
|
|
|
97
97
|
}
|
|
98
98
|
export interface TypeSpecEnum extends TypeSpecDeclaration {
|
|
99
99
|
kind: "enum";
|
|
100
|
-
schema:
|
|
100
|
+
schema: SupportedOpenAPISchema;
|
|
101
101
|
}
|
|
102
102
|
export interface TypeSpecUnion extends TypeSpecDeclaration {
|
|
103
103
|
kind: "union";
|
|
104
|
-
schema:
|
|
104
|
+
schema: SupportedOpenAPISchema;
|
|
105
105
|
}
|
|
106
106
|
export interface TypeSpecScalar extends TypeSpecDeclaration {
|
|
107
107
|
kind: "scalar";
|
|
108
|
-
schema:
|
|
108
|
+
schema: SupportedOpenAPISchema;
|
|
109
109
|
}
|
|
110
110
|
export interface TypeSpecModelProperty {
|
|
111
111
|
name: string;
|
|
@@ -117,7 +117,7 @@ export interface TypeSpecModelProperty {
|
|
|
117
117
|
* Example: location decorators for parameters
|
|
118
118
|
*/
|
|
119
119
|
decorators: TypeSpecDecorator[];
|
|
120
|
-
schema: Refable<
|
|
120
|
+
schema: Refable<SupportedOpenAPISchema>;
|
|
121
121
|
}
|
|
122
122
|
export interface TypeSpecOperation extends TypeSpecDeclaration {
|
|
123
123
|
operationId?: string;
|
|
@@ -132,13 +132,13 @@ export interface TypeSpecOperationParameter {
|
|
|
132
132
|
doc?: string;
|
|
133
133
|
decorators: TypeSpecDecorator[];
|
|
134
134
|
isOptional: boolean;
|
|
135
|
-
schema: Refable<
|
|
135
|
+
schema: Refable<SupportedOpenAPISchema>;
|
|
136
136
|
}
|
|
137
137
|
export interface TypeSpecRequestBody {
|
|
138
138
|
contentType: string;
|
|
139
139
|
doc?: string;
|
|
140
140
|
isOptional: boolean;
|
|
141
141
|
encoding?: Record<string, OpenAPI3Encoding>;
|
|
142
|
-
schema?: Refable<
|
|
142
|
+
schema?: Refable<SupportedOpenAPISchema>;
|
|
143
143
|
}
|
|
144
144
|
//# sourceMappingURL=interfaces.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"interfaces.d.ts","sourceRoot":"","sources":["../../../../../src/cli/actions/convert/interfaces.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,
|
|
1
|
+
{"version":3,"file":"interfaces.d.ts","sourceRoot":"","sources":["../../../../../src/cli/actions/convert/interfaces.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transform-component-parameters.d.ts","sourceRoot":"","sources":["../../../../../../src/cli/actions/convert/transforms/transform-component-parameters.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,iBAAiB,EAAyB,MAAM,kBAAkB,CAAC;AAC5E,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAI9C;;;;;;;GAOG;AACH,wBAAgB,4BAA4B,CAC1C,OAAO,EAAE,OAAO,EAChB,SAAS,EAAE,iBAAiB,EAAE,GAC7B,IAAI,
|
|
1
|
+
{"version":3,"file":"transform-component-parameters.d.ts","sourceRoot":"","sources":["../../../../../../src/cli/actions/convert/transforms/transform-component-parameters.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,iBAAiB,EAAyB,MAAM,kBAAkB,CAAC;AAC5E,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAI9C;;;;;;;GAOG;AACH,wBAAgB,4BAA4B,CAC1C,OAAO,EAAE,OAAO,EAChB,SAAS,EAAE,iBAAiB,EAAE,GAC7B,IAAI,CASN"}
|
|
@@ -15,6 +15,8 @@ export function transformComponentParameters(context, dataTypes) {
|
|
|
15
15
|
return;
|
|
16
16
|
for (const name of Object.keys(parameters)) {
|
|
17
17
|
const parameter = parameters[name];
|
|
18
|
+
if ("$ref" in parameter)
|
|
19
|
+
continue;
|
|
18
20
|
transformComponentParameter(dataTypes, name, parameter);
|
|
19
21
|
}
|
|
20
22
|
}
|
|
@@ -31,12 +33,13 @@ function transformComponentParameter(dataTypes, key, parameter) {
|
|
|
31
33
|
});
|
|
32
34
|
}
|
|
33
35
|
function getModelPropertyFromParameter(parameter) {
|
|
36
|
+
const parameterSchema = "schema" in parameter ? (parameter.schema ?? {}) : {};
|
|
34
37
|
return {
|
|
35
38
|
name: printIdentifier(parameter.name),
|
|
36
39
|
isOptional: !parameter.required,
|
|
37
|
-
doc: parameter.description ??
|
|
40
|
+
doc: parameter.description ?? parameterSchema.description,
|
|
38
41
|
decorators: getParameterDecorators(parameter),
|
|
39
|
-
schema:
|
|
42
|
+
schema: parameterSchema,
|
|
40
43
|
};
|
|
41
44
|
}
|
|
42
45
|
//# sourceMappingURL=transform-component-parameters.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transform-component-parameters.js","sourceRoot":"","sources":["../../../../../../src/cli/actions/convert/transforms/transform-component-parameters.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAIrD,OAAO,EAAE,sBAAsB,EAAE,MAAM,wBAAwB,CAAC;AAChE,OAAO,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AAEjE;;;;;;;GAOG;AACH,MAAM,UAAU,4BAA4B,CAC1C,OAAgB,EAChB,SAA8B;IAE9B,MAAM,UAAU,GAAG,OAAO,CAAC,WAAW,CAAC,UAAU,EAAE,UAAU,CAAC;IAC9D,IAAI,CAAC,UAAU;QAAE,OAAO;IAExB,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC;QAC3C,MAAM,SAAS,GAAG,UAAU,CAAC,IAAI,CAAC,CAAC;QACnC,2BAA2B,CAAC,SAAS,EAAE,IAAI,EAAE,SAAS,CAAC,CAAC;IAC1D,CAAC;AACH,CAAC;AAED,SAAS,2BAA2B,CAClC,SAA8B,EAC9B,GAAW,EACX,
|
|
1
|
+
{"version":3,"file":"transform-component-parameters.js","sourceRoot":"","sources":["../../../../../../src/cli/actions/convert/transforms/transform-component-parameters.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAIrD,OAAO,EAAE,sBAAsB,EAAE,MAAM,wBAAwB,CAAC;AAChE,OAAO,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AAEjE;;;;;;;GAOG;AACH,MAAM,UAAU,4BAA4B,CAC1C,OAAgB,EAChB,SAA8B;IAE9B,MAAM,UAAU,GAAG,OAAO,CAAC,WAAW,CAAC,UAAU,EAAE,UAAU,CAAC;IAC9D,IAAI,CAAC,UAAU;QAAE,OAAO;IAExB,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC;QAC3C,MAAM,SAAS,GAAG,UAAU,CAAC,IAAI,CAAC,CAAC;QACnC,IAAI,MAAM,IAAI,SAAS;YAAE,SAAS;QAClC,2BAA2B,CAAC,SAAS,EAAE,IAAI,EAAE,SAAS,CAAC,CAAC;IAC1D,CAAC;AACH,CAAC;AAED,SAAS,2BAA2B,CAClC,SAA8B,EAC9B,GAAW,EACX,SAAkD;IAElD,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,eAAe,CAAC,GAAG,CAAC,CAAC;IAC7C,0DAA0D;IAC1D,KAAK,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;IAE5B,SAAS,CAAC,IAAI,CAAC;QACb,IAAI,EAAE,OAAO;QACb,KAAK;QACL,IAAI;QACJ,UAAU,EAAE,EAAE;QACd,UAAU,EAAE,CAAC,6BAA6B,CAAC,SAAS,CAAC,CAAC;KACvD,CAAC,CAAC;AACL,CAAC;AAED,SAAS,6BAA6B,CACpC,SAAkD;IAElD,MAAM,eAAe,GAAG,QAAQ,IAAI,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IAC9E,OAAO;QACL,IAAI,EAAE,eAAe,CAAC,SAAS,CAAC,IAAI,CAAC;QACrC,UAAU,EAAE,CAAC,SAAS,CAAC,QAAQ;QAC/B,GAAG,EAAE,SAAS,CAAC,WAAW,IAAI,eAAe,CAAC,WAAW;QACzD,UAAU,EAAE,sBAAsB,CAAC,SAAS,CAAC;QAC7C,MAAM,EAAE,eAAe;KACxB,CAAC;AACJ,CAAC"}
|
|
@@ -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,CAgQ7F"}
|
|
@@ -46,6 +46,8 @@ export function transformComponentSchemas(context, models) {
|
|
|
46
46
|
});
|
|
47
47
|
}
|
|
48
48
|
function populateEnum(types, name, schema) {
|
|
49
|
+
if ("$ref" in schema)
|
|
50
|
+
return;
|
|
49
51
|
const tsEnum = {
|
|
50
52
|
kind: "enum",
|
|
51
53
|
...getScopeAndName(name),
|
|
@@ -73,23 +75,27 @@ export function transformComponentSchemas(context, models) {
|
|
|
73
75
|
decorators: [...getDecoratorsForSchema(effectiveSchema)],
|
|
74
76
|
doc: effectiveSchema.description || schema.description,
|
|
75
77
|
properties: [
|
|
76
|
-
...getModelPropertiesFromObjectSchema(effectiveSchema),
|
|
78
|
+
...("$ref" in effectiveSchema ? [] : getModelPropertiesFromObjectSchema(effectiveSchema)),
|
|
77
79
|
...allOfDetails.properties,
|
|
78
80
|
],
|
|
79
|
-
additionalProperties:
|
|
80
|
-
?
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
81
|
+
additionalProperties: "additionalProperties" in effectiveSchema
|
|
82
|
+
? effectiveSchema.additionalProperties === true
|
|
83
|
+
? {} // Use empty object to represent Record<unknown>
|
|
84
|
+
: typeof effectiveSchema.additionalProperties === "object"
|
|
85
|
+
? effectiveSchema.additionalProperties
|
|
86
|
+
: undefined
|
|
87
|
+
: undefined,
|
|
84
88
|
extends: allOfDetails.extends,
|
|
85
89
|
is: isParent,
|
|
86
|
-
type: effectiveSchema.type,
|
|
90
|
+
type: "type" in effectiveSchema ? effectiveSchema.type : undefined,
|
|
87
91
|
spread: allOfDetails.spread,
|
|
88
92
|
isModelReferencedAsMultipartRequestBody,
|
|
89
93
|
encoding,
|
|
90
94
|
});
|
|
91
95
|
}
|
|
92
96
|
function populateUnion(types, name, schema) {
|
|
97
|
+
if ("$ref" in schema)
|
|
98
|
+
return;
|
|
93
99
|
// Extract description and decorators from meaningful union members
|
|
94
100
|
const unionMetadata = extractUnionMetadata(schema);
|
|
95
101
|
const union = {
|
|
@@ -145,7 +151,7 @@ export function transformComponentSchemas(context, models) {
|
|
|
145
151
|
...getScopeAndName(name),
|
|
146
152
|
decorators: getDecoratorsForSchema(schema),
|
|
147
153
|
doc: schema.description,
|
|
148
|
-
schema,
|
|
154
|
+
schema: "$ref" in schema ? {} : schema,
|
|
149
155
|
});
|
|
150
156
|
}
|
|
151
157
|
function getAllOfDetails(schema, callingScope) {
|
|
@@ -153,7 +159,7 @@ export function transformComponentSchemas(context, models) {
|
|
|
153
159
|
spread: [],
|
|
154
160
|
properties: [],
|
|
155
161
|
};
|
|
156
|
-
if (!schema.allOf) {
|
|
162
|
+
if ("$ref" in schema || !schema.allOf) {
|
|
157
163
|
return details;
|
|
158
164
|
}
|
|
159
165
|
let foundParentWithDiscriminator = false;
|
|
@@ -186,7 +192,7 @@ export function transformComponentSchemas(context, models) {
|
|
|
186
192
|
return details;
|
|
187
193
|
}
|
|
188
194
|
function getModelIs(schema, callingScope) {
|
|
189
|
-
if (schema.type !== "array") {
|
|
195
|
+
if ("$ref" in schema || schema.type !== "array") {
|
|
190
196
|
return;
|
|
191
197
|
}
|
|
192
198
|
return context.generateTypeFromRefableSchema(schema, callingScope);
|
|
@@ -199,6 +205,8 @@ export function transformComponentSchemas(context, models) {
|
|
|
199
205
|
* Otherwise, returns the original schema.
|
|
200
206
|
*/
|
|
201
207
|
function unwrapSingleAnyOfOneOf(schema) {
|
|
208
|
+
if ("$ref" in schema)
|
|
209
|
+
return schema;
|
|
202
210
|
const unionMembers = schema.anyOf || schema.oneOf;
|
|
203
211
|
if (!unionMembers) {
|
|
204
212
|
return schema;
|
|
@@ -252,13 +260,13 @@ function getTypeSpecKind(schema) {
|
|
|
252
260
|
if ("$ref" in schema) {
|
|
253
261
|
return "alias";
|
|
254
262
|
}
|
|
255
|
-
if (schema.enum && schema.type === "string" && !schema.nullable) {
|
|
263
|
+
if (schema.enum && schema.type === "string" && (!("nullable" in schema) || !schema.nullable)) {
|
|
256
264
|
return "enum";
|
|
257
265
|
}
|
|
258
266
|
else if (schema.anyOf ||
|
|
259
267
|
schema.oneOf ||
|
|
260
268
|
schema.enum ||
|
|
261
|
-
schema.nullable ||
|
|
269
|
+
("nullable" in schema && schema.nullable) ||
|
|
262
270
|
(Array.isArray(schema.type) && schema.type.includes("null"))) {
|
|
263
271
|
// Check if anyOf/oneOf has a single meaningful inline object schema
|
|
264
272
|
const unionMembers = schema.anyOf || schema.oneOf;
|
|
@@ -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,
|
|
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,4 +1,4 @@
|
|
|
1
|
-
import { OpenAPI3PathItem } from "../../../../types.js";
|
|
1
|
+
import { OpenAPI3PathItem, OpenAPIPathItem3_2 } from "../../../../types.js";
|
|
2
2
|
import { TypeSpecOperation } from "../interfaces.js";
|
|
3
3
|
import { Context } from "../utils/context.js";
|
|
4
4
|
/**
|
|
@@ -7,5 +7,5 @@ import { Context } from "../utils/context.js";
|
|
|
7
7
|
* @param paths
|
|
8
8
|
* @returns
|
|
9
9
|
*/
|
|
10
|
-
export declare function transformPaths(paths: Record<string, OpenAPI3PathItem>, context: Context): TypeSpecOperation[];
|
|
10
|
+
export declare function transformPaths(paths: Record<string, OpenAPI3PathItem> | Record<string, OpenAPIPathItem3_2>, context: Context): TypeSpecOperation[];
|
|
11
11
|
//# sourceMappingURL=transform-paths.d.ts.map
|
|
@@ -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,
|
|
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,EACL,iBAAiB,EAGlB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAM9C;;;;;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,CA2DrB"}
|
|
@@ -42,17 +42,10 @@ export function transformPaths(paths, context) {
|
|
|
42
42
|
else {
|
|
43
43
|
usedOperationIds.add(operationId);
|
|
44
44
|
}
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
doc: operation.description,
|
|
50
|
-
operationId: operationId,
|
|
51
|
-
requestBodies: transformRequestBodies(operation.requestBody, context),
|
|
52
|
-
responses: operationResponses,
|
|
53
|
-
tags: tags,
|
|
54
|
-
fixmes,
|
|
55
|
-
});
|
|
45
|
+
const requestBodies = transformRequestBodies(operation.requestBody, context);
|
|
46
|
+
// 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);
|
|
48
|
+
operations.push(...splitOperations);
|
|
56
49
|
}
|
|
57
50
|
}
|
|
58
51
|
return operations;
|
|
@@ -84,9 +77,102 @@ function transformOperationParameter(parameter) {
|
|
|
84
77
|
doc: parameter.description,
|
|
85
78
|
decorators: getParameterDecorators(parameter),
|
|
86
79
|
isOptional: !parameter.required,
|
|
87
|
-
schema: parameter.schema,
|
|
80
|
+
schema: "schema" in parameter ? (parameter.schema ?? {}) : {},
|
|
88
81
|
};
|
|
89
82
|
}
|
|
83
|
+
/**
|
|
84
|
+
* Splits an operation into multiple operations if it has incompatible content types
|
|
85
|
+
* (e.g., multipart/form-data and application/json)
|
|
86
|
+
*/
|
|
87
|
+
function splitOperationByContentType(operationId, decorators, parameters, doc, requestBodies, responses, tags, fixmes, usedOperationIds) {
|
|
88
|
+
// If no request bodies or only one content type, no splitting needed
|
|
89
|
+
if (requestBodies.length <= 1) {
|
|
90
|
+
return [
|
|
91
|
+
{
|
|
92
|
+
...getScopeAndName(operationId),
|
|
93
|
+
decorators,
|
|
94
|
+
parameters,
|
|
95
|
+
doc,
|
|
96
|
+
operationId,
|
|
97
|
+
requestBodies,
|
|
98
|
+
responses,
|
|
99
|
+
tags,
|
|
100
|
+
fixmes,
|
|
101
|
+
},
|
|
102
|
+
];
|
|
103
|
+
}
|
|
104
|
+
// Group request bodies by compatibility
|
|
105
|
+
const multipartBodies = requestBodies.filter((r) => r.contentType.startsWith("multipart/"));
|
|
106
|
+
const nonMultipartBodies = requestBodies.filter((r) => !r.contentType.startsWith("multipart/"));
|
|
107
|
+
// If all are the same type (all multipart or all non-multipart), no splitting needed
|
|
108
|
+
if (multipartBodies.length === 0 || nonMultipartBodies.length === 0) {
|
|
109
|
+
return [
|
|
110
|
+
{
|
|
111
|
+
...getScopeAndName(operationId),
|
|
112
|
+
decorators,
|
|
113
|
+
parameters,
|
|
114
|
+
doc,
|
|
115
|
+
operationId,
|
|
116
|
+
requestBodies,
|
|
117
|
+
responses,
|
|
118
|
+
tags,
|
|
119
|
+
fixmes,
|
|
120
|
+
},
|
|
121
|
+
];
|
|
122
|
+
}
|
|
123
|
+
// Need to split into separate operations
|
|
124
|
+
const operations = [];
|
|
125
|
+
// Helper to create a suffix from content type
|
|
126
|
+
const getContentTypeSuffix = (contentType) => {
|
|
127
|
+
if (contentType.startsWith("multipart/")) {
|
|
128
|
+
return "Multipart";
|
|
129
|
+
}
|
|
130
|
+
else if (contentType === "application/json") {
|
|
131
|
+
return "Json";
|
|
132
|
+
}
|
|
133
|
+
else if (contentType.startsWith("application/")) {
|
|
134
|
+
// Remove 'application/' and capitalize first letter
|
|
135
|
+
const type = contentType.replace("application/", "");
|
|
136
|
+
return type.charAt(0).toUpperCase() + type.slice(1).replace(/[^a-zA-Z0-9]/g, "");
|
|
137
|
+
}
|
|
138
|
+
else if (contentType.startsWith("text/")) {
|
|
139
|
+
const type = contentType.replace("text/", "");
|
|
140
|
+
return type.charAt(0).toUpperCase() + type.slice(1).replace(/[^a-zA-Z0-9]/g, "");
|
|
141
|
+
}
|
|
142
|
+
// Default: sanitize content type
|
|
143
|
+
return contentType.replace(/[^a-zA-Z0-9]/g, "");
|
|
144
|
+
};
|
|
145
|
+
// Group bodies that can share an operation (same category)
|
|
146
|
+
const bodyGroups = [];
|
|
147
|
+
if (multipartBodies.length > 0) {
|
|
148
|
+
bodyGroups.push(multipartBodies);
|
|
149
|
+
}
|
|
150
|
+
// For non-multipart, group by exact content type
|
|
151
|
+
for (const body of nonMultipartBodies) {
|
|
152
|
+
bodyGroups.push([body]);
|
|
153
|
+
}
|
|
154
|
+
// Create an operation for each group
|
|
155
|
+
for (const bodyGroup of bodyGroups) {
|
|
156
|
+
const suffix = getContentTypeSuffix(bodyGroup[0].contentType);
|
|
157
|
+
const newOperationId = `${operationId}${suffix}`;
|
|
158
|
+
// Track the new operation ID to avoid conflicts
|
|
159
|
+
usedOperationIds.add(newOperationId);
|
|
160
|
+
// Add @sharedRoute decorator
|
|
161
|
+
const newDecorators = [{ name: "sharedRoute", args: [] }, ...decorators];
|
|
162
|
+
operations.push({
|
|
163
|
+
...getScopeAndName(newOperationId),
|
|
164
|
+
decorators: newDecorators,
|
|
165
|
+
parameters,
|
|
166
|
+
doc,
|
|
167
|
+
operationId: newOperationId,
|
|
168
|
+
requestBodies: bodyGroup,
|
|
169
|
+
responses,
|
|
170
|
+
tags,
|
|
171
|
+
fixmes,
|
|
172
|
+
});
|
|
173
|
+
}
|
|
174
|
+
return operations;
|
|
175
|
+
}
|
|
90
176
|
function transformRequestBodies(requestBodies, context) {
|
|
91
177
|
if (!requestBodies) {
|
|
92
178
|
return [];
|
|
@@ -105,8 +191,8 @@ function transformRequestBodies(requestBodies, context) {
|
|
|
105
191
|
contentType,
|
|
106
192
|
isOptional: !requestBodies.required,
|
|
107
193
|
doc: description ?? requestBodies.description,
|
|
108
|
-
encoding: contentBody.encoding,
|
|
109
|
-
schema: contentBody.schema,
|
|
194
|
+
encoding: "encoding" in contentBody ? contentBody.encoding : undefined,
|
|
195
|
+
schema: "schema" in contentBody ? contentBody.schema : {},
|
|
110
196
|
});
|
|
111
197
|
}
|
|
112
198
|
return typespecBodies;
|
|
@@ -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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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transforms.js","sourceRoot":"","sources":["../../../../../../src/cli/actions/convert/transforms/transforms.ts"],"names":[],"mappings":"AAQA,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,MAAM,UAAU,SAAS,CAAC,OAAgB;IACxC,MAAM,OAAO,GAAG,OAAO,CAAC,WAAW,CAAC;IAEpC,0DAA0D;IAC1D,uBAAuB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IAE1C,MAAM,MAAM,GAAG,gBAAgB,CAAC,OAAO,CAAC,CAAC;IACzC,MAAM,UAAU,GAAG,cAAc,CAAC,OAAO,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;IAE1D,OAAO;QACL,WAAW,EAAE,oBAAoB,CAAC,OAAO,CAAC,IAAI,CAAC;QAC/C,GAAG,mBAAmB,CAAC,MAAM,EAAE,UAAU,CAAC;QAC1C,aAAa,EAAE,EAAE;QACjB,OAAO,EAAE,gBAAgB,CAAC,OAAO,CAAC,OAAO,IAAI,EAAE,CAAC;QAChD,IAAI,EAAE,aAAa,CAAC,OAAO,CAAC,IAAI,IAAI,EAAE,CAAC;KACxC,CAAC;AACJ,CAAC;AAED;;;GAGG;AACH,SAAS,uBAAuB,CAAC,
|
|
1
|
+
{"version":3,"file":"transforms.js","sourceRoot":"","sources":["../../../../../../src/cli/actions/convert/transforms/transforms.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,13 +1,12 @@
|
|
|
1
|
-
import
|
|
2
|
-
import { OpenAPI3Document, OpenAPI3Encoding, OpenAPI3Schema, Refable } from "../../../../types.js";
|
|
1
|
+
import { OpenAPI3Encoding, Refable, SupportedOpenAPIDocuments, SupportedOpenAPISchema } from "../../../../types.js";
|
|
3
2
|
import { Logger } from "../../../types.js";
|
|
4
3
|
export interface Context {
|
|
5
|
-
readonly openApi3Doc:
|
|
4
|
+
readonly openApi3Doc: SupportedOpenAPIDocuments;
|
|
6
5
|
readonly rootNamespace: string;
|
|
7
6
|
readonly logger: Logger;
|
|
8
|
-
generateTypeFromRefableSchema(schema: Refable<
|
|
7
|
+
generateTypeFromRefableSchema(schema: Refable<SupportedOpenAPISchema>, callingScope: string[], isHttpPart?: boolean, encoding?: Record<string, OpenAPI3Encoding>): string;
|
|
9
8
|
getRefName(ref: string, callingScope: string[]): string;
|
|
10
|
-
getSchemaByRef(ref: string):
|
|
9
|
+
getSchemaByRef(ref: string): SupportedOpenAPISchema | undefined;
|
|
11
10
|
getByRef<T>(ref: string): T | undefined;
|
|
12
11
|
/**
|
|
13
12
|
* Register a schema as being used in a multipart form context with encoding information.
|
|
@@ -28,8 +27,5 @@ export interface Context {
|
|
|
28
27
|
*/
|
|
29
28
|
getPartType(propType: string, name: string, isHttpPart: boolean, encoding: Record<string, OpenAPI3Encoding> | undefined, isEnumType: boolean, isUnionType: boolean): string;
|
|
30
29
|
}
|
|
31
|
-
export
|
|
32
|
-
$refs: OpenAPIParser["$refs"];
|
|
33
|
-
};
|
|
34
|
-
export declare function createContext(parser: Parser, openApi3Doc: OpenAPI3Document, logger?: Logger, namespace?: string): Context;
|
|
30
|
+
export declare function createContext(openApi3Doc: SupportedOpenAPIDocuments, logger?: Logger, namespace?: string): Context;
|
|
35
31
|
//# sourceMappingURL=context.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"context.d.ts","sourceRoot":"","sources":["../../../../../../src/cli/actions/convert/utils/context.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"context.d.ts","sourceRoot":"","sources":["../../../../../../src/cli/actions/convert/utils/context.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,gBAAgB,EAEhB,OAAO,EACP,yBAAyB,EACzB,sBAAsB,EACvB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAI3C,MAAM,WAAW,OAAO;IACtB,QAAQ,CAAC,WAAW,EAAE,yBAAyB,CAAC;IAChD,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAC;IAC/B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IAExB,6BAA6B,CAC3B,MAAM,EAAE,OAAO,CAAC,sBAAsB,CAAC,EACvC,YAAY,EAAE,MAAM,EAAE,EACtB,UAAU,CAAC,EAAE,OAAO,EACpB,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,gBAAgB,CAAC,GAC1C,MAAM,CAAC;IACV,UAAU,CAAC,GAAG,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,GAAG,MAAM,CAAC;IACxD,cAAc,CAAC,GAAG,EAAE,MAAM,GAAG,sBAAsB,GAAG,SAAS,CAAC;IAChE,QAAQ,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,GAAG,CAAC,GAAG,SAAS,CAAC;IAExC;;;OAGG;IACH,uBAAuB,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,gBAAgB,CAAC,GAAG,IAAI,CAAC;IAExF;;OAEG;IACH,0BAA0B,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,gBAAgB,CAAC,GAAG,SAAS,CAAC;IACtF;;OAEG;IACH,2CAA2C,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;IAClE;;;OAGG;IACH,WAAW,CACT,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,MAAM,EACZ,UAAU,EAAE,OAAO,EACnB,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,gBAAgB,CAAC,GAAG,SAAS,EACtD,UAAU,EAAE,OAAO,EACnB,WAAW,EAAE,OAAO,GACnB,MAAM,CAAC;CACX;AAED,wBAAgB,aAAa,CAC3B,WAAW,EAAE,yBAAyB,EACtC,MAAM,CAAC,EAAE,MAAM,EACf,SAAS,CAAC,EAAE,MAAM,GACjB,OAAO,CAoGT"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { SchemaToExpressionGenerator } from "../generators/generate-types.js";
|
|
2
2
|
import { generateNamespaceName } from "./generate-namespace-name.js";
|
|
3
|
-
export function createContext(
|
|
3
|
+
export function createContext(openApi3Doc, logger, namespace) {
|
|
4
4
|
const rootNamespace = namespace
|
|
5
5
|
? generateNamespaceName(namespace)
|
|
6
6
|
: generateNamespaceName(openApi3Doc.info.title);
|
|
@@ -27,7 +27,32 @@ export function createContext(parser, openApi3Doc, logger, namespace) {
|
|
|
27
27
|
return this.getByRef(ref);
|
|
28
28
|
},
|
|
29
29
|
getByRef(ref) {
|
|
30
|
-
|
|
30
|
+
const splitRef = ref.split("/");
|
|
31
|
+
const componentKind = splitRef[2]; // #/components/schemas/Pet -> components
|
|
32
|
+
const componentName = splitRef[3]; // #/components/schemas/Pet -> Pet
|
|
33
|
+
switch (componentKind) {
|
|
34
|
+
case "schemas":
|
|
35
|
+
return openApi3Doc.components?.schemas?.[componentName];
|
|
36
|
+
case "responses":
|
|
37
|
+
return openApi3Doc.components?.responses?.[componentName];
|
|
38
|
+
case "parameters":
|
|
39
|
+
return openApi3Doc.components?.parameters?.[componentName];
|
|
40
|
+
case "examples":
|
|
41
|
+
return openApi3Doc.components?.examples?.[componentName];
|
|
42
|
+
case "requestBodies":
|
|
43
|
+
return openApi3Doc.components?.requestBodies?.[componentName];
|
|
44
|
+
case "headers":
|
|
45
|
+
return openApi3Doc.components?.headers?.[componentName];
|
|
46
|
+
case "securitySchemes":
|
|
47
|
+
return openApi3Doc.components?.securitySchemes?.[componentName];
|
|
48
|
+
case "links":
|
|
49
|
+
return openApi3Doc.components?.links?.[componentName];
|
|
50
|
+
case "callbacks":
|
|
51
|
+
return openApi3Doc.components?.callbacks?.[componentName];
|
|
52
|
+
default:
|
|
53
|
+
this.logger.warn(`Unsupported component kind in $ref: ${ref}`);
|
|
54
|
+
return undefined;
|
|
55
|
+
}
|
|
31
56
|
},
|
|
32
57
|
registerMultipartSchema(ref, encoding) {
|
|
33
58
|
multipartSchemas.set(ref, encoding ?? null);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"context.js","sourceRoot":"","sources":["../../../../../../src/cli/actions/convert/utils/context.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"context.js","sourceRoot":"","sources":["../../../../../../src/cli/actions/convert/utils/context.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
import { Extensions, OpenAPI3Parameter, OpenAPI3Schema, OpenAPISchema3_1, Refable } from "../../../../types.js";
|
|
1
|
+
import { Extensions, OpenAPI3Parameter, OpenAPI3Schema, OpenAPIParameter3_2, OpenAPISchema3_1, OpenAPISchema3_2, Refable } from "../../../../types.js";
|
|
2
2
|
import { TypeSpecDecorator } from "../interfaces.js";
|
|
3
3
|
export declare function getExtensions(element: Extensions): TypeSpecDecorator[];
|
|
4
|
-
export declare function getParameterDecorators(parameter: OpenAPI3Parameter): TypeSpecDecorator[];
|
|
4
|
+
export declare function getParameterDecorators(parameter: OpenAPI3Parameter | OpenAPIParameter3_2): TypeSpecDecorator[];
|
|
5
5
|
export declare function normalizeObjectValueToTSValueExpression(value: any): string;
|
|
6
|
-
export declare function getDecoratorsForSchema(schema: Refable<OpenAPI3Schema | OpenAPISchema3_1>): TypeSpecDecorator[];
|
|
6
|
+
export declare function getDecoratorsForSchema(schema: Refable<OpenAPI3Schema | OpenAPISchema3_1 | OpenAPISchema3_2>): 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,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,
|
|
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,mBAAmB,EACnB,gBAAgB,EAChB,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,GAAG,mBAAmB,uBAYxF;AAsCD,wBAAgB,uCAAuC,CAAC,KAAK,EAAE,GAAG,GAAG,MAAM,CAU1E;AAoDD,wBAAgB,sBAAsB,CACpC,MAAM,EAAE,OAAO,CAAC,cAAc,GAAG,gBAAgB,GAAG,gBAAgB,CAAC,GACpE,iBAAiB,EAAE,CAsDrB"}
|