@typespec/openapi3 0.65.0-dev.1 → 0.65.0-dev.3
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 +4 -6
- package/dist/src/cli/actions/convert/convert-file.js.map +1 -1
- package/dist/src/cli/actions/convert/convert.d.ts +7 -1
- package/dist/src/cli/actions/convert/convert.d.ts.map +1 -1
- package/dist/src/cli/actions/convert/convert.js +10 -2
- package/dist/src/cli/actions/convert/convert.js.map +1 -1
- package/dist/src/cli/actions/convert/generators/generate-main.d.ts.map +1 -1
- package/dist/src/cli/actions/convert/generators/generate-main.js +2 -0
- package/dist/src/cli/actions/convert/generators/generate-main.js.map +1 -1
- package/dist/src/cli/actions/convert/generators/generate-model.d.ts +3 -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 +14 -10
- package/dist/src/cli/actions/convert/generators/generate-model.js.map +1 -1
- package/dist/src/cli/actions/convert/generators/generate-operation.d.ts.map +1 -1
- package/dist/src/cli/actions/convert/generators/generate-operation.js +3 -4
- package/dist/src/cli/actions/convert/generators/generate-operation.js.map +1 -1
- package/dist/src/cli/actions/convert/generators/generate-response-expressions.d.ts +7 -0
- package/dist/src/cli/actions/convert/generators/generate-response-expressions.d.ts.map +1 -0
- package/dist/src/cli/actions/convert/generators/generate-response-expressions.js +252 -0
- package/dist/src/cli/actions/convert/generators/generate-response-expressions.js.map +1 -0
- package/dist/src/cli/actions/convert/interfaces.d.ts +2 -2
- package/dist/src/cli/actions/convert/interfaces.d.ts.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 +2 -5
- package/dist/src/cli/actions/convert/transforms/transform-paths.js.map +1 -1
- package/dist/src/cli/actions/convert/transforms/transforms.js +1 -1
- package/dist/src/cli/actions/convert/transforms/transforms.js.map +1 -1
- package/dist/src/cli/actions/convert/utils/context.d.ts +6 -1
- package/dist/src/cli/actions/convert/utils/context.d.ts.map +1 -1
- package/dist/src/cli/actions/convert/utils/context.js +5 -4
- package/dist/src/cli/actions/convert/utils/context.js.map +1 -1
- package/dist/src/cli/actions/convert/utils/generate-helpers.d.ts +3 -0
- package/dist/src/cli/actions/convert/utils/generate-helpers.d.ts.map +1 -0
- package/dist/src/cli/actions/convert/utils/generate-helpers.js +41 -0
- package/dist/src/cli/actions/convert/utils/generate-helpers.js.map +1 -0
- package/package.json +5 -5
- package/dist/src/cli/actions/convert/transforms/transform-operation-responses.d.ts +0 -10
- package/dist/src/cli/actions/convert/transforms/transform-operation-responses.d.ts.map +0 -1
- package/dist/src/cli/actions/convert/transforms/transform-operation-responses.js +0 -175
- package/dist/src/cli/actions/convert/transforms/transform-operation-responses.js.map +0 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"convert-file.d.ts","sourceRoot":"","sources":["../../../../../src/cli/actions/convert/convert-file.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AAEzC,OAAO,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAK3C,wBAAsB,aAAa,CAAC,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,cAAc,
|
|
1
|
+
{"version":3,"file":"convert-file.d.ts","sourceRoot":"","sources":["../../../../../src/cli/actions/convert/convert-file.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AAEzC,OAAO,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAK3C,wBAAsB,aAAa,CAAC,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,cAAc,iBAiCtE"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import
|
|
1
|
+
import OpenAPIParser from "@apidevtools/swagger-parser";
|
|
2
2
|
import { formatTypeSpec, resolvePath } from "@typespec/compiler";
|
|
3
3
|
import { handleInternalCompilerError } from "../../utils.js";
|
|
4
4
|
import { generateMain } from "./generators/generate-main.js";
|
|
@@ -7,8 +7,9 @@ import { createContext } from "./utils/context.js";
|
|
|
7
7
|
export async function convertAction(host, args) {
|
|
8
8
|
// attempt to read the file
|
|
9
9
|
const fullPath = resolvePath(process.cwd(), args.path);
|
|
10
|
-
const
|
|
11
|
-
const
|
|
10
|
+
const parser = new OpenAPIParser();
|
|
11
|
+
const model = await parser.bundle(fullPath);
|
|
12
|
+
const context = createContext(parser, model);
|
|
12
13
|
const program = transform(context);
|
|
13
14
|
let mainTsp;
|
|
14
15
|
try {
|
|
@@ -36,7 +37,4 @@ export async function convertAction(host, args) {
|
|
|
36
37
|
handleInternalCompilerError(formatError);
|
|
37
38
|
}
|
|
38
39
|
}
|
|
39
|
-
function parseOpenApiFile(path) {
|
|
40
|
-
return oaParser.bundle(path);
|
|
41
|
-
}
|
|
42
40
|
//# sourceMappingURL=convert-file.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"convert-file.js","sourceRoot":"","sources":["../../../../../src/cli/actions/convert/convert-file.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"convert-file.js","sourceRoot":"","sources":["../../../../../src/cli/actions/convert/convert-file.ts"],"names":[],"mappings":"AAAA,OAAO,aAAa,MAAM,6BAA6B,CAAC;AACxD,OAAO,EAAE,cAAc,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAGjE,OAAO,EAAE,2BAA2B,EAAE,MAAM,gBAAgB,CAAC;AAE7D,OAAO,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAC7D,OAAO,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAC;AACvD,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAEnD,MAAM,CAAC,KAAK,UAAU,aAAa,CAAC,IAAa,EAAE,IAAoB;IACrE,2BAA2B;IAC3B,MAAM,QAAQ,GAAG,WAAW,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;IACvD,MAAM,MAAM,GAAG,IAAI,aAAa,EAAE,CAAC;IACnC,MAAM,KAAK,GAAG,MAAM,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IAC5C,MAAM,OAAO,GAAG,aAAa,CAAC,MAAM,EAAE,KAAyB,CAAC,CAAC;IACjE,MAAM,OAAO,GAAG,SAAS,CAAC,OAAO,CAAC,CAAC;IACnC,IAAI,OAAe,CAAC;IACpB,IAAI,CAAC;QACH,OAAO,GAAG,YAAY,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IAC3C,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,2BAA2B,CAAC,GAAG,CAAC,CAAC;IACnC,CAAC;IAED,IAAI,WAAW,CAAC;IAChB,2DAA2D;IAC3D,IAAI,CAAC;QACH,OAAO,GAAG,MAAM,cAAc,CAAC,OAAO,EAAE;YACtC,UAAU,EAAE,GAAG;YACf,QAAQ,EAAE,CAAC;SACZ,CAAC,CAAC;IACL,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,WAAW,GAAG,GAAG,CAAC;IACpB,CAAC;IAED,IAAI,IAAI,CAAC,YAAY,CAAC,EAAE,CAAC;QACvB,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC;QACtC,MAAM,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,IAAI,CAAC,YAAY,CAAC,EAAE,UAAU,CAAC,EAAE,OAAO,CAAC,CAAC;IAC7E,CAAC;IAED,IAAI,WAAW,EAAE,CAAC;QAChB,2BAA2B,CAAC,WAAW,CAAC,CAAC;IAC3C,CAAC;AACH,CAAC"}
|
|
@@ -1,3 +1,9 @@
|
|
|
1
1
|
import { OpenAPI3Document } from "../../../types.js";
|
|
2
|
-
export
|
|
2
|
+
export interface ConvertOpenAPI3DocumentOptions {
|
|
3
|
+
/**
|
|
4
|
+
* Whether external $ref pointers will be resolved and included in the output.
|
|
5
|
+
*/
|
|
6
|
+
disableExternalRefs?: boolean;
|
|
7
|
+
}
|
|
8
|
+
export declare function convertOpenAPI3Document(document: OpenAPI3Document, { disableExternalRefs }?: ConvertOpenAPI3DocumentOptions): Promise<string>;
|
|
3
9
|
//# sourceMappingURL=convert.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"convert.d.ts","sourceRoot":"","sources":["../../../../../src/cli/actions/convert/convert.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"convert.d.ts","sourceRoot":"","sources":["../../../../../src/cli/actions/convert/convert.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAKrD,MAAM,WAAW,8BAA8B;IAC7C;;OAEG;IACH,mBAAmB,CAAC,EAAE,OAAO,CAAC;CAC/B;AAED,wBAAsB,uBAAuB,CAC3C,QAAQ,EAAE,gBAAgB,EAC1B,EAAE,mBAAmB,EAAE,GAAE,8BAAmC,mBAoB7D"}
|
|
@@ -1,9 +1,17 @@
|
|
|
1
|
+
import OpenAPIParser from "@apidevtools/swagger-parser";
|
|
1
2
|
import { formatTypeSpec } from "@typespec/compiler";
|
|
2
3
|
import { generateMain } from "./generators/generate-main.js";
|
|
3
4
|
import { transform } from "./transforms/transforms.js";
|
|
4
5
|
import { createContext } from "./utils/context.js";
|
|
5
|
-
export async function convertOpenAPI3Document(document) {
|
|
6
|
-
const
|
|
6
|
+
export async function convertOpenAPI3Document(document, { disableExternalRefs } = {}) {
|
|
7
|
+
const parser = new OpenAPIParser();
|
|
8
|
+
const bundleOptions = disableExternalRefs
|
|
9
|
+
? {
|
|
10
|
+
resolve: { external: false, http: false, file: false },
|
|
11
|
+
}
|
|
12
|
+
: {};
|
|
13
|
+
await parser.bundle(document, bundleOptions);
|
|
14
|
+
const context = createContext(parser, document);
|
|
7
15
|
const program = transform(context);
|
|
8
16
|
const content = generateMain(program, context);
|
|
9
17
|
try {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"convert.js","sourceRoot":"","sources":["../../../../../src/cli/actions/convert/convert.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAEpD,OAAO,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAC7D,OAAO,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAC;AACvD,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"convert.js","sourceRoot":"","sources":["../../../../../src/cli/actions/convert/convert.ts"],"names":[],"mappings":"AAAA,OAAO,aAAa,MAAM,6BAA6B,CAAC;AACxD,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAEpD,OAAO,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAC7D,OAAO,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAC;AACvD,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AASnD,MAAM,CAAC,KAAK,UAAU,uBAAuB,CAC3C,QAA0B,EAC1B,EAAE,mBAAmB,KAAqC,EAAE;IAE5D,MAAM,MAAM,GAAG,IAAI,aAAa,EAAE,CAAC;IACnC,MAAM,aAAa,GAAG,mBAAmB;QACvC,CAAC,CAAC;YACE,OAAO,EAAE,EAAE,QAAQ,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE;SACvD;QACH,CAAC,CAAC,EAAE,CAAC;IACP,MAAM,MAAM,CAAC,MAAM,CAAC,QAAe,EAAE,aAAa,CAAC,CAAC;IACpD,MAAM,OAAO,GAAG,aAAa,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;IAChD,MAAM,OAAO,GAAG,SAAS,CAAC,OAAO,CAAC,CAAC;IACnC,MAAM,OAAO,GAAG,YAAY,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IAC/C,IAAI,CAAC;QACH,OAAO,MAAM,cAAc,CAAC,OAAO,EAAE;YACnC,UAAU,EAAE,GAAG;YACf,QAAQ,EAAE,CAAC;SACZ,CAAC,CAAC;IACL,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,OAAO,CAAC;IACjB,CAAC;AACH,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generate-main.d.ts","sourceRoot":"","sources":["../../../../../../src/cli/actions/convert/generators/generate-main.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"generate-main.d.ts","sourceRoot":"","sources":["../../../../../../src/cli/actions/convert/generators/generate-main.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAO9C,wBAAgB,YAAY,CAAC,OAAO,EAAE,eAAe,EAAE,OAAO,EAAE,OAAO,GAAG,MAAM,CAoB/E"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { generateHelpers } from "../utils/generate-helpers.js";
|
|
1
2
|
import { generateDataType } from "./generate-model.js";
|
|
2
3
|
import { generateNamespace } from "./generate-namespace.js";
|
|
3
4
|
import { generateOperation } from "./generate-operation.js";
|
|
@@ -20,6 +21,7 @@ export function generateMain(program, context) {
|
|
|
20
21
|
${Object.entries(program.namespaces)
|
|
21
22
|
.map(([name, namespace]) => generateNamespace(name, namespace, context))
|
|
22
23
|
.join("\n\n")}
|
|
24
|
+
${generateHelpers(context)}
|
|
23
25
|
`;
|
|
24
26
|
}
|
|
25
27
|
//# sourceMappingURL=generate-main.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generate-main.js","sourceRoot":"","sources":["../../../../../../src/cli/actions/convert/generators/generate-main.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,EAAE,0BAA0B,EAAE,MAAM,4BAA4B,CAAC;AAExE,MAAM,UAAU,YAAY,CAAC,OAAwB,EAAE,OAAgB;IACrE,OAAO;;;;;;;;IAQL,0BAA0B,CAAC,OAAO,CAAC,WAAW,CAAC;;IAE/C,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,gBAAgB,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC;;IAEnE,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,iBAAiB,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC;;IAEzE,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC;SACjC,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,SAAS,CAAC,EAAE,EAAE,CAAC,iBAAiB,CAAC,IAAI,EAAE,SAAS,EAAE,OAAO,CAAC,CAAC;SACvE,IAAI,CAAC,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"generate-main.js","sourceRoot":"","sources":["../../../../../../src/cli/actions/convert/generators/generate-main.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAC/D,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,EAAE,0BAA0B,EAAE,MAAM,4BAA4B,CAAC;AAExE,MAAM,UAAU,YAAY,CAAC,OAAwB,EAAE,OAAgB;IACrE,OAAO;;;;;;;;IAQL,0BAA0B,CAAC,OAAO,CAAC,WAAW,CAAC;;IAE/C,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,gBAAgB,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC;;IAEnE,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,iBAAiB,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC;;IAEzE,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC;SACjC,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,SAAS,CAAC,EAAE,EAAE,CAAC,iBAAiB,CAAC,IAAI,EAAE,SAAS,EAAE,OAAO,CAAC,CAAC;SACvE,IAAI,CAAC,MAAM,CAAC;IACb,eAAe,CAAC,OAAO,CAAC;GACzB,CAAC;AACJ,CAAC"}
|
|
@@ -1,4 +1,6 @@
|
|
|
1
|
-
import { TypeSpecDataTypes } from "../interfaces.js";
|
|
1
|
+
import { TypeSpecDataTypes, TypeSpecModelProperty } from "../interfaces.js";
|
|
2
2
|
import { Context } from "../utils/context.js";
|
|
3
3
|
export declare function generateDataType(type: TypeSpecDataTypes, context: Context): string;
|
|
4
|
+
export declare function generateModelProperty(prop: TypeSpecModelProperty, containerScope: string[], context: Context): string;
|
|
5
|
+
export declare function generateModelExpression(props: TypeSpecModelProperty[], containerScope: string[], context: Context): string;
|
|
4
6
|
//# sourceMappingURL=generate-model.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generate-model.d.ts","sourceRoot":"","sources":["../../../../../../src/cli/actions/convert/generators/generate-model.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,iBAAiB,
|
|
1
|
+
{"version":3,"file":"generate-model.d.ts","sourceRoot":"","sources":["../../../../../../src/cli/actions/convert/generators/generate-model.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,iBAAiB,EAGjB,qBAAqB,EAGtB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAM9C,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,iBAAiB,EAAE,OAAO,EAAE,OAAO,GAAG,MAAM,CAalF;AAwHD,wBAAgB,qBAAqB,CACnC,IAAI,EAAE,qBAAqB,EAC3B,cAAc,EAAE,MAAM,EAAE,EACxB,OAAO,EAAE,OAAO,GACf,MAAM,CAWR;AAED,wBAAgB,uBAAuB,CACrC,KAAK,EAAE,qBAAqB,EAAE,EAC9B,cAAc,EAAE,MAAM,EAAE,EACxB,OAAO,EAAE,OAAO,GACf,MAAM,CAER"}
|
|
@@ -93,16 +93,7 @@ function generateModel(model, context) {
|
|
|
93
93
|
if (model.spread?.length) {
|
|
94
94
|
definitions.push(...model.spread.map((spread) => `...${spread};`));
|
|
95
95
|
}
|
|
96
|
-
definitions.push(...model.properties.map((prop) =>
|
|
97
|
-
// Decorators will be a combination of top-level (parameters) and
|
|
98
|
-
// schema-level decorators.
|
|
99
|
-
const decorators = generateDecorators([
|
|
100
|
-
...prop.decorators,
|
|
101
|
-
...getDecoratorsForSchema(prop.schema),
|
|
102
|
-
]).join(" ");
|
|
103
|
-
const doc = prop.doc ? generateDocs(prop.doc) : "";
|
|
104
|
-
return `${doc}${decorators} ${prop.name}${prop.isOptional ? "?" : ""}: ${context.generateTypeFromRefableSchema(prop.schema, model.scope)};`;
|
|
105
|
-
}));
|
|
96
|
+
definitions.push(...model.properties.map((prop) => generateModelProperty(prop, model.scope, context)));
|
|
106
97
|
if (model.additionalProperties) {
|
|
107
98
|
definitions.push(`...Record<${context.generateTypeFromRefableSchema(model.additionalProperties, model.scope)}>;`);
|
|
108
99
|
}
|
|
@@ -110,6 +101,19 @@ function generateModel(model, context) {
|
|
|
110
101
|
definitions.push(modelDeclaration.close);
|
|
111
102
|
return definitions.join("\n");
|
|
112
103
|
}
|
|
104
|
+
export function generateModelProperty(prop, containerScope, context) {
|
|
105
|
+
// Decorators will be a combination of top-level (parameters) and
|
|
106
|
+
// schema-level decorators.
|
|
107
|
+
const decorators = generateDecorators([
|
|
108
|
+
...prop.decorators,
|
|
109
|
+
...getDecoratorsForSchema(prop.schema),
|
|
110
|
+
]).join(" ");
|
|
111
|
+
const doc = prop.doc ? generateDocs(prop.doc) : "";
|
|
112
|
+
return `${doc}${decorators} ${prop.name}${prop.isOptional ? "?" : ""}: ${context.generateTypeFromRefableSchema(prop.schema, containerScope)};`;
|
|
113
|
+
}
|
|
114
|
+
export function generateModelExpression(props, containerScope, context) {
|
|
115
|
+
return `{ ${props.map((prop) => generateModelProperty(prop, containerScope, context)).join(" ")} }`;
|
|
116
|
+
}
|
|
113
117
|
function generateModelDeclaration(model) {
|
|
114
118
|
const modelName = model.name;
|
|
115
119
|
if (model.is) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generate-model.js","sourceRoot":"","sources":["../../../../../../src/cli/actions/convert/generators/generate-model.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"generate-model.js","sourceRoot":"","sources":["../../../../../../src/cli/actions/convert/generators/generate-model.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,sBAAsB,EAAE,MAAM,wBAAwB,CAAC;AAChE,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAC9D,OAAO,EAAE,8BAA8B,EAAE,MAAM,qBAAqB,CAAC;AAErE,MAAM,UAAU,gBAAgB,CAAC,IAAuB,EAAE,OAAgB;IACxE,QAAQ,IAAI,CAAC,IAAI,EAAE,CAAC;QAClB,KAAK,OAAO;YACV,OAAO,aAAa,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACtC,KAAK,MAAM;YACT,OAAO,YAAY,CAAC,IAAI,CAAC,CAAC;QAC5B,KAAK,OAAO;YACV,OAAO,aAAa,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACtC,KAAK,QAAQ;YACX,OAAO,cAAc,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACvC,KAAK,OAAO;YACV,OAAO,aAAa,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IACxC,CAAC;AACH,CAAC;AAED,SAAS,aAAa,CAAC,KAAoB,EAAE,OAAgB;IAC3D,sDAAsD;IACtD,0EAA0E;IAC1E,8CAA8C;IAC9C,MAAM,WAAW,GAAG,OAAO,CAAC,UAAU,CAAC,KAAK,CAAC,GAAG,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC;IAC/D,OAAO,SAAS,KAAK,CAAC,IAAI,OAAO,WAAW,GAAG,CAAC;AAClD,CAAC;AAED,SAAS,YAAY,CAAC,MAAoB;IACxC,MAAM,WAAW,GAAa,EAAE,CAAC;IAEjC,IAAI,MAAM,CAAC,GAAG,EAAE,CAAC;QACf,WAAW,CAAC,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;IAC7C,CAAC;IAED,WAAW,CAAC,IAAI,CAAC,GAAG,kBAAkB,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC;IAC3D,WAAW,CAAC,IAAI,CAAC,QAAQ,MAAM,CAAC,IAAI,IAAI,CAAC,CAAC;IAE1C,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC;IAE7B,IAAI,MAAM,CAAC,IAAI,EAAE,CAAC;QAChB,WAAW,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;IACvE,CAAC;IAED,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAEtB,OAAO,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAChC,CAAC;AAED,SAAS,cAAc,CAAC,MAAsB,EAAE,OAAgB;IAC9D,MAAM,WAAW,GAAa,EAAE,CAAC;IAEjC,IAAI,MAAM,CAAC,GAAG,EAAE,CAAC;QACf,WAAW,CAAC,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;IAC7C,CAAC;IAED,WAAW,CAAC,IAAI,CAAC,GAAG,kBAAkB,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC;IAC3D,MAAM,IAAI,GAAG,OAAO,CAAC,6BAA6B,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;IAEhF,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;QACvB,WAAW,CAAC,IAAI,CAAC,UAAU,MAAM,CAAC,IAAI,GAAG,CAAC,CAAC;IAC7C,CAAC;SAAM,CAAC;QACN,WAAW,CAAC,IAAI,CAAC,UAAU,MAAM,CAAC,IAAI,YAAY,IAAI,GAAG,CAAC,CAAC;IAC7D,CAAC;IAED,OAAO,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAChC,CAAC;AAED,SAAS,aAAa,CAAC,KAAoB,EAAE,OAAgB;IAC3D,MAAM,WAAW,GAAa,EAAE,CAAC;IAEjC,IAAI,KAAK,CAAC,GAAG,EAAE,CAAC;QACd,WAAW,CAAC,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC;IAC5C,CAAC;IAED,WAAW,CAAC,IAAI,CAAC,GAAG,kBAAkB,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC;IAE1D,WAAW,CAAC,IAAI,CAAC,SAAS,KAAK,CAAC,IAAI,IAAI,CAAC,CAAC;IAE1C,MAAM,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC;IAE5B,IAAI,MAAM,CAAC,IAAI,EAAE,CAAC;QAChB,WAAW,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;IACvE,CAAC;SAAM,IAAI,MAAM,CAAC,KAAK,EAAE,CAAC;QACxB,WAAW,CAAC,IAAI,CACd,GAAG,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,OAAO,CAAC,6BAA6B,CAAC,MAAM,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC,CAC5F,CAAC;IACJ,CAAC;SAAM,IAAI,MAAM,CAAC,KAAK,EAAE,CAAC;QACxB,WAAW,CAAC,IAAI,CACd,GAAG,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,OAAO,CAAC,6BAA6B,CAAC,MAAM,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC,CAC5F,CAAC;IACJ,CAAC;SAAM,CAAC;QACN,iCAAiC;QACjC,MAAM,aAAa,GAAG,8BAA8B,CAAC,MAAM,CAAC,CAAC;QAC7D,IAAI,aAAa,EAAE,CAAC;YAClB,WAAW,CAAC,IAAI,CAAC,GAAG,aAAa,GAAG,CAAC,CAAC;QACxC,CAAC;IACH,CAAC;IAED,IAAI,MAAM,CAAC,QAAQ,EAAE,CAAC;QACpB,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IAC5B,CAAC;IAED,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAEtB,OAAO,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAChC,CAAC;AAED,SAAS,aAAa,CAAC,KAAoB,EAAE,OAAgB;IAC3D,MAAM,WAAW,GAAa,EAAE,CAAC;IACjC,MAAM,gBAAgB,GAAG,wBAAwB,CAAC,KAAK,CAAC,CAAC;IAEzD,IAAI,KAAK,CAAC,GAAG,EAAE,CAAC;QACd,WAAW,CAAC,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC;IAC5C,CAAC;IAED,WAAW,CAAC,IAAI,CAAC,GAAG,kBAAkB,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC;IAC1D,WAAW,CAAC,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC;IAExC,IAAI,KAAK,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC;QACzB,WAAW,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,MAAM,GAAG,CAAC,CAAC,CAAC;IACrE,CAAC;IAED,WAAW,CAAC,IAAI,CACd,GAAG,KAAK,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,qBAAqB,CAAC,IAAI,EAAE,KAAK,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC,CACrF,CAAC;IAEF,IAAI,KAAK,CAAC,oBAAoB,EAAE,CAAC;QAC/B,WAAW,CAAC,IAAI,CACd,aAAa,OAAO,CAAC,6BAA6B,CAAC,KAAK,CAAC,oBAAoB,EAAE,KAAK,CAAC,KAAK,CAAC,IAAI,CAChG,CAAC;IACJ,CAAC;IAED,IAAI,gBAAgB,CAAC,KAAK;QAAE,WAAW,CAAC,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC;IAErE,OAAO,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAChC,CAAC;AAED,MAAM,UAAU,qBAAqB,CACnC,IAA2B,EAC3B,cAAwB,EACxB,OAAgB;IAEhB,iEAAiE;IACjE,2BAA2B;IAC3B,MAAM,UAAU,GAAG,kBAAkB,CAAC;QACpC,GAAG,IAAI,CAAC,UAAU;QAClB,GAAG,sBAAsB,CAAC,IAAI,CAAC,MAAM,CAAC;KACvC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAEb,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,YAAY,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IAEnD,OAAO,GAAG,GAAG,GAAG,UAAU,IAAI,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,KAAK,OAAO,CAAC,6BAA6B,CAAC,IAAI,CAAC,MAAM,EAAE,cAAc,CAAC,GAAG,CAAC;AACjJ,CAAC;AAED,MAAM,UAAU,uBAAuB,CACrC,KAA8B,EAC9B,cAAwB,EACxB,OAAgB;IAEhB,OAAO,KAAK,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,qBAAqB,CAAC,IAAI,EAAE,cAAc,EAAE,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC;AACtG,CAAC;AAID,SAAS,wBAAwB,CAAC,KAAoB;IACpD,MAAM,SAAS,GAAG,KAAK,CAAC,IAAI,CAAC;IAE7B,IAAI,KAAK,CAAC,EAAE,EAAE,CAAC;QACb,OAAO,EAAE,IAAI,EAAE,SAAS,SAAS,OAAO,KAAK,CAAC,EAAE,GAAG,EAAE,CAAC;IACxD,CAAC;IAED,IAAI,KAAK,CAAC,OAAO,EAAE,CAAC;QAClB,OAAO,EAAE,IAAI,EAAE,SAAS,SAAS,YAAY,KAAK,CAAC,OAAO,IAAI,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC;IAC/E,CAAC;IAED,OAAO,EAAE,IAAI,EAAE,SAAS,SAAS,IAAI,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC;AACtD,CAAC"}
|
|
@@ -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;
|
|
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,CAsBxF"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { generateDocs } from "../utils/docs.js";
|
|
2
2
|
import { generateDecorators } from "./generate-decorators.js";
|
|
3
|
+
import { generateOperationReturnType } from "./generate-response-expressions.js";
|
|
3
4
|
export function generateOperation(operation, context) {
|
|
4
5
|
const definitions = [];
|
|
5
6
|
if (operation.doc) {
|
|
@@ -12,10 +13,8 @@ export function generateOperation(operation, context) {
|
|
|
12
13
|
...operation.parameters.map((p) => generateOperationParameter(operation, p, context)),
|
|
13
14
|
...generateRequestBodyParameters(operation.requestBodies, context),
|
|
14
15
|
];
|
|
15
|
-
const
|
|
16
|
-
|
|
17
|
-
: "void";
|
|
18
|
-
definitions.push(`op ${operation.name}(${parameters.join(", ")}): ${responseTypes};`);
|
|
16
|
+
const responses = generateOperationReturnType(operation, context);
|
|
17
|
+
definitions.push(`op ${operation.name}(${parameters.join(", ")}): ${responses};`);
|
|
19
18
|
return definitions.join(" ");
|
|
20
19
|
}
|
|
21
20
|
function generateOperationParameter(operation, parameter, context) {
|
|
@@ -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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"}
|
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
import { TypeSpecOperation } from "../interfaces.js";
|
|
2
|
+
import { Context } from "../utils/context.js";
|
|
3
|
+
/**
|
|
4
|
+
* Generates a union expression of all possible responses for an operation
|
|
5
|
+
*/
|
|
6
|
+
export declare function generateOperationReturnType(operation: TypeSpecOperation, context: Context): string;
|
|
7
|
+
//# sourceMappingURL=generate-response-expressions.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"generate-response-expressions.d.ts","sourceRoot":"","sources":["../../../../../../src/cli/actions/convert/generators/generate-response-expressions.ts"],"names":[],"mappings":"AAOA,OAAO,EAA4C,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAC/F,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAO9C;;GAEG;AACH,wBAAgB,2BAA2B,CACzC,SAAS,EAAE,iBAAiB,EAC5B,OAAO,EAAE,OAAO,GACf,MAAM,CAcR"}
|
|
@@ -0,0 +1,252 @@
|
|
|
1
|
+
import { convertHeaderName } from "../utils/convert-header-name.js";
|
|
2
|
+
import { getDecoratorsForSchema } from "../utils/decorators.js";
|
|
3
|
+
import { generateModelExpression } from "./generate-model.js";
|
|
4
|
+
/**
|
|
5
|
+
* Generates a union expression of all possible responses for an operation
|
|
6
|
+
*/
|
|
7
|
+
export function generateOperationReturnType(operation, context) {
|
|
8
|
+
const expressions = [];
|
|
9
|
+
for (const [statusCode, response] of Object.entries(operation.responses)) {
|
|
10
|
+
expressions.push(...generateReturnTypeForStatusCode({
|
|
11
|
+
statusCode,
|
|
12
|
+
response,
|
|
13
|
+
context,
|
|
14
|
+
operationScope: operation.scope,
|
|
15
|
+
}));
|
|
16
|
+
}
|
|
17
|
+
return expressions.join(" | ");
|
|
18
|
+
}
|
|
19
|
+
function generateReturnTypeForStatusCode(props) {
|
|
20
|
+
const { statusCode, context } = props;
|
|
21
|
+
const response = "$ref" in props.response
|
|
22
|
+
? context.getByRef(props.response.$ref)
|
|
23
|
+
: props.response;
|
|
24
|
+
if (!response) {
|
|
25
|
+
return [];
|
|
26
|
+
}
|
|
27
|
+
const description = props.response.description ?? response.description;
|
|
28
|
+
// collect headers
|
|
29
|
+
const headerProperties = Object.entries(response.headers ?? {})
|
|
30
|
+
.map(([name, header]) => {
|
|
31
|
+
return convertHeaderToProperty({ name, header, context });
|
|
32
|
+
})
|
|
33
|
+
.filter((h) => !!h);
|
|
34
|
+
const contentEntries = Object.entries(response.content ?? {});
|
|
35
|
+
return generateResponseExpressions({
|
|
36
|
+
statusCode,
|
|
37
|
+
description,
|
|
38
|
+
headers: headerProperties,
|
|
39
|
+
contents: contentEntries,
|
|
40
|
+
operationScope: props.operationScope,
|
|
41
|
+
context,
|
|
42
|
+
});
|
|
43
|
+
}
|
|
44
|
+
function getStatusCodeMetadata(statusCode) {
|
|
45
|
+
const isDefault = statusCode === "default";
|
|
46
|
+
if (isDefault) {
|
|
47
|
+
return { statusCode, isDefault };
|
|
48
|
+
}
|
|
49
|
+
const metadata = {
|
|
50
|
+
statusCode,
|
|
51
|
+
isDefault,
|
|
52
|
+
modelProperty: convertStatusCodeToProperty(statusCode),
|
|
53
|
+
};
|
|
54
|
+
if (isValidLiteralStatusCode(statusCode)) {
|
|
55
|
+
metadata.literalStatusCode = parseInt(statusCode, 10);
|
|
56
|
+
metadata.httpLibModel = statusCodeToResponse.get(metadata.literalStatusCode);
|
|
57
|
+
}
|
|
58
|
+
return metadata;
|
|
59
|
+
}
|
|
60
|
+
function handleDefaultResponse({ contents, context, headers, operationScope, description, }) {
|
|
61
|
+
if (!contents.length) {
|
|
62
|
+
return [
|
|
63
|
+
generateDefaultResponse({
|
|
64
|
+
context,
|
|
65
|
+
headers,
|
|
66
|
+
operationScope,
|
|
67
|
+
description,
|
|
68
|
+
}),
|
|
69
|
+
];
|
|
70
|
+
}
|
|
71
|
+
return contents.map(([mediaType, content]) => {
|
|
72
|
+
const bodySchema = content.schema;
|
|
73
|
+
const headerProps = [...headers];
|
|
74
|
+
// application/json is default contentType so can ignore it
|
|
75
|
+
if (mediaType !== "application/json") {
|
|
76
|
+
headerProps.push({
|
|
77
|
+
name: "contentType",
|
|
78
|
+
decorators: [{ name: "header", args: [] }],
|
|
79
|
+
isOptional: false,
|
|
80
|
+
schema: { type: "string", enum: [mediaType] },
|
|
81
|
+
});
|
|
82
|
+
}
|
|
83
|
+
return generateDefaultResponse({
|
|
84
|
+
context,
|
|
85
|
+
headers: headerProps,
|
|
86
|
+
operationScope,
|
|
87
|
+
body: bodySchema && context.generateTypeFromRefableSchema(bodySchema, operationScope),
|
|
88
|
+
description,
|
|
89
|
+
});
|
|
90
|
+
});
|
|
91
|
+
}
|
|
92
|
+
function generateResponseExpressions({ statusCode, contents, context, headers, operationScope, description, }) {
|
|
93
|
+
const hasContents = contents.length > 0;
|
|
94
|
+
const statusCodeMetadata = getStatusCodeMetadata(statusCode);
|
|
95
|
+
if (statusCodeMetadata.isDefault) {
|
|
96
|
+
return handleDefaultResponse({ headers, contents, operationScope, context, description });
|
|
97
|
+
}
|
|
98
|
+
// Scenario 1 - only have a mapped status code - use it directly
|
|
99
|
+
// Example: OkResponse
|
|
100
|
+
if (statusCodeMetadata.httpLibModel && !hasContents && !headers.length) {
|
|
101
|
+
return [statusCodeMetadata.httpLibModel];
|
|
102
|
+
}
|
|
103
|
+
// 200 statusCode is default, we can ignore it since we know we have headers or body to fill out response
|
|
104
|
+
if (statusCodeMetadata.literalStatusCode === 200) {
|
|
105
|
+
statusCodeMetadata.httpLibModel = undefined;
|
|
106
|
+
statusCodeMetadata.modelProperty = undefined;
|
|
107
|
+
}
|
|
108
|
+
// Scenario 2 - have a status code and headers, but no bodies.
|
|
109
|
+
// Example: CreatedResponse & { @header xFoo: string }
|
|
110
|
+
// Example: { @statusCode statusCode: 203, @header xFoo: string }
|
|
111
|
+
if (!hasContents) {
|
|
112
|
+
if (statusCodeMetadata.httpLibModel) {
|
|
113
|
+
return [
|
|
114
|
+
`${statusCodeMetadata.httpLibModel} & ${generateModelExpression(headers, operationScope, context)}`,
|
|
115
|
+
];
|
|
116
|
+
}
|
|
117
|
+
const modelProps = [...headers];
|
|
118
|
+
if (statusCodeMetadata.modelProperty) {
|
|
119
|
+
modelProps.push(statusCodeMetadata.modelProperty);
|
|
120
|
+
}
|
|
121
|
+
return [generateModelExpression(modelProps, operationScope, context)];
|
|
122
|
+
}
|
|
123
|
+
return contents.map(([mediaType, content]) => {
|
|
124
|
+
// Attempt to emit just the Body or an intersection of Body & MappedResponse
|
|
125
|
+
// if there aren't any custom headers.
|
|
126
|
+
const bodySchema = content.schema;
|
|
127
|
+
if (bodySchema && mediaType === "application/json" && !headers.length) {
|
|
128
|
+
// Scenario 3 - have a mapped status code and body schema is a ref using application/json - intersection!
|
|
129
|
+
// Example: CreatedResponse & Widget
|
|
130
|
+
if ("$ref" in bodySchema && statusCodeMetadata.httpLibModel) {
|
|
131
|
+
return `${statusCodeMetadata.httpLibModel} & ${context.generateTypeFromRefableSchema(bodySchema, operationScope)}`;
|
|
132
|
+
}
|
|
133
|
+
// Scenario 4 - 200 status code and using application/json - return just the body
|
|
134
|
+
// Example: Widget
|
|
135
|
+
// Example: Body<string>
|
|
136
|
+
if (statusCodeMetadata.literalStatusCode === 200) {
|
|
137
|
+
const body = context.generateTypeFromRefableSchema(bodySchema, operationScope);
|
|
138
|
+
if ("$ref" in bodySchema) {
|
|
139
|
+
return body;
|
|
140
|
+
}
|
|
141
|
+
return `Body<${body}>`;
|
|
142
|
+
}
|
|
143
|
+
}
|
|
144
|
+
// Scenario 5 - any combination of headers/statusCode/body - common expression
|
|
145
|
+
const modelExpressionProps = [];
|
|
146
|
+
if (statusCodeMetadata.modelProperty) {
|
|
147
|
+
modelExpressionProps.push(statusCodeMetadata.modelProperty);
|
|
148
|
+
}
|
|
149
|
+
modelExpressionProps.push(...headers);
|
|
150
|
+
// application/json is default contentType so can ignore it
|
|
151
|
+
if (mediaType !== "application/json") {
|
|
152
|
+
modelExpressionProps.push({
|
|
153
|
+
name: "contentType",
|
|
154
|
+
decorators: [{ name: "header", args: [] }],
|
|
155
|
+
isOptional: false,
|
|
156
|
+
schema: { type: "string", enum: [mediaType] },
|
|
157
|
+
});
|
|
158
|
+
}
|
|
159
|
+
if (bodySchema) {
|
|
160
|
+
modelExpressionProps.push({
|
|
161
|
+
name: "body",
|
|
162
|
+
isOptional: false,
|
|
163
|
+
decorators: [{ name: "body", args: [] }],
|
|
164
|
+
schema: bodySchema,
|
|
165
|
+
});
|
|
166
|
+
}
|
|
167
|
+
return generateModelExpression(modelExpressionProps, operationScope, context);
|
|
168
|
+
});
|
|
169
|
+
}
|
|
170
|
+
function generateDefaultResponse({ operationScope, context, ...props }) {
|
|
171
|
+
const hasTemplateParams = !!(props.description || props.headers.length || props.body);
|
|
172
|
+
if (!hasTemplateParams)
|
|
173
|
+
return "GeneratedHelpers.DefaultResponse";
|
|
174
|
+
const description = props.description ? `Description = "${props.description}", ` : "";
|
|
175
|
+
const headers = props.headers.length
|
|
176
|
+
? `Headers = ${generateModelExpression(props.headers, operationScope, context)}, `
|
|
177
|
+
: "";
|
|
178
|
+
const body = props.body ? `Body = ${props.body}, ` : "";
|
|
179
|
+
return `GeneratedHelpers.DefaultResponse<${description}${headers}${body}>`;
|
|
180
|
+
}
|
|
181
|
+
function convertStatusCodeToProperty(statusCode) {
|
|
182
|
+
const schema = { type: "integer", format: "int32" };
|
|
183
|
+
if (statusCode === "1XX") {
|
|
184
|
+
schema.minimum = 100;
|
|
185
|
+
schema.maximum = 199;
|
|
186
|
+
}
|
|
187
|
+
else if (statusCode === "2XX") {
|
|
188
|
+
schema.minimum = 200;
|
|
189
|
+
schema.maximum = 299;
|
|
190
|
+
}
|
|
191
|
+
else if (statusCode === "3XX") {
|
|
192
|
+
schema.minimum = 300;
|
|
193
|
+
schema.maximum = 399;
|
|
194
|
+
}
|
|
195
|
+
else if (statusCode === "4XX") {
|
|
196
|
+
schema.minimum = 400;
|
|
197
|
+
schema.maximum = 499;
|
|
198
|
+
}
|
|
199
|
+
else if (statusCode === "5XX") {
|
|
200
|
+
schema.minimum = 500;
|
|
201
|
+
schema.maximum = 599;
|
|
202
|
+
}
|
|
203
|
+
else if (isValidLiteralStatusCode(statusCode)) {
|
|
204
|
+
const literalStatusCode = parseInt(statusCode, 10);
|
|
205
|
+
schema.enum = [literalStatusCode];
|
|
206
|
+
}
|
|
207
|
+
return {
|
|
208
|
+
name: "statusCode",
|
|
209
|
+
schema,
|
|
210
|
+
decorators: [{ name: "statusCode", args: [] }],
|
|
211
|
+
isOptional: false,
|
|
212
|
+
};
|
|
213
|
+
}
|
|
214
|
+
function isValidLiteralStatusCode(statusCode) {
|
|
215
|
+
if (statusCode === "default" || statusCode.endsWith("X"))
|
|
216
|
+
return false;
|
|
217
|
+
const literalStatusCode = parseInt(statusCode, 10);
|
|
218
|
+
return isFinite(literalStatusCode) && literalStatusCode >= 100 && literalStatusCode <= 599;
|
|
219
|
+
}
|
|
220
|
+
function convertHeaderToProperty(props) {
|
|
221
|
+
const { name, context } = props;
|
|
222
|
+
const header = "$ref" in props.header ? context.getByRef(props.header.$ref) : props.header;
|
|
223
|
+
if (!header)
|
|
224
|
+
return;
|
|
225
|
+
const normalizedName = convertHeaderName(name);
|
|
226
|
+
// TODO: handle style
|
|
227
|
+
const headerDecorator = { name: "header", args: [] };
|
|
228
|
+
if (normalizedName !== name) {
|
|
229
|
+
headerDecorator.args.push(name);
|
|
230
|
+
}
|
|
231
|
+
return {
|
|
232
|
+
name: normalizedName,
|
|
233
|
+
decorators: [headerDecorator, ...getDecoratorsForSchema(header.schema)],
|
|
234
|
+
doc: props.header.description ?? header.description ?? header.schema.description,
|
|
235
|
+
isOptional: !header.required,
|
|
236
|
+
schema: header.schema,
|
|
237
|
+
};
|
|
238
|
+
}
|
|
239
|
+
// Map of statusCodes to their Response
|
|
240
|
+
const statusCodeToResponse = new Map([
|
|
241
|
+
[200, "OkResponse"],
|
|
242
|
+
[201, "CreatedResponse"],
|
|
243
|
+
[202, "AcceptedResponse"],
|
|
244
|
+
[204, "NoContentResponse"],
|
|
245
|
+
[304, "NotModifiedResponse"],
|
|
246
|
+
[400, "BadRequestResponse"],
|
|
247
|
+
[401, "UnauthorizedResponse"],
|
|
248
|
+
[403, "ForbiddenResponse"],
|
|
249
|
+
[404, "NotFoundResponse"],
|
|
250
|
+
[409, "ConflictResponse"],
|
|
251
|
+
]);
|
|
252
|
+
//# sourceMappingURL=generate-response-expressions.js.map
|
|
@@ -0,0 +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,5 +1,5 @@
|
|
|
1
1
|
import { Contact, License } from "@typespec/openapi";
|
|
2
|
-
import { OpenAPI3Encoding, OpenAPI3Schema, Refable } from "../../../types.js";
|
|
2
|
+
import { OpenAPI3Encoding, OpenAPI3Responses, OpenAPI3Schema, Refable } from "../../../types.js";
|
|
3
3
|
export interface TypeSpecProgram {
|
|
4
4
|
serviceInfo: TypeSpecServiceInfo;
|
|
5
5
|
namespaces: Record<string, TypeSpecNamespace>;
|
|
@@ -93,7 +93,7 @@ export interface TypeSpecOperation extends TypeSpecDeclaration {
|
|
|
93
93
|
operationId?: string;
|
|
94
94
|
parameters: Refable<TypeSpecOperationParameter>[];
|
|
95
95
|
requestBodies: TypeSpecRequestBody[];
|
|
96
|
-
|
|
96
|
+
responses: OpenAPI3Responses;
|
|
97
97
|
tags: string[];
|
|
98
98
|
}
|
|
99
99
|
export interface TypeSpecOperationParameter {
|
|
@@ -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,EAAE,gBAAgB,EAAE,cAAc,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"interfaces.d.ts","sourceRoot":"","sources":["../../../../../src/cli/actions/convert/interfaces.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
import { OpenAPI3PathItem } from "../../../../types.js";
|
|
2
|
-
import {
|
|
2
|
+
import { TypeSpecOperation } from "../interfaces.js";
|
|
3
3
|
/**
|
|
4
4
|
* Transforms each operation defined under #/paths/{route}/{httpMethod} into a TypeSpec operation.
|
|
5
5
|
* @params models - The array of models to populate with any new models generated from the operation.
|
|
6
6
|
* @param paths
|
|
7
7
|
* @returns
|
|
8
8
|
*/
|
|
9
|
-
export declare function transformPaths(
|
|
9
|
+
export declare function transformPaths(paths: Record<string, OpenAPI3PathItem>): TypeSpecOperation[];
|
|
10
10
|
//# 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,EAGjB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EACL,
|
|
1
|
+
{"version":3,"file":"transform-paths.d.ts","sourceRoot":"","sources":["../../../../../../src/cli/actions/convert/transforms/transform-paths.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,gBAAgB,EAGjB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EACL,iBAAiB,EAGlB,MAAM,kBAAkB,CAAC;AAK1B;;;;;GAKG;AACH,wBAAgB,cAAc,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,gBAAgB,CAAC,GAAG,iBAAiB,EAAE,CAuC3F"}
|
|
@@ -2,14 +2,13 @@ import { printIdentifier } from "@typespec/compiler";
|
|
|
2
2
|
import { getExtensions, getParameterDecorators } from "../utils/decorators.js";
|
|
3
3
|
import { getScopeAndName } from "../utils/get-scope-and-name.js";
|
|
4
4
|
import { supportedHttpMethods } from "../utils/supported-http-methods.js";
|
|
5
|
-
import { collectOperationResponses } from "./transform-operation-responses.js";
|
|
6
5
|
/**
|
|
7
6
|
* Transforms each operation defined under #/paths/{route}/{httpMethod} into a TypeSpec operation.
|
|
8
7
|
* @params models - The array of models to populate with any new models generated from the operation.
|
|
9
8
|
* @param paths
|
|
10
9
|
* @returns
|
|
11
10
|
*/
|
|
12
|
-
export function transformPaths(
|
|
11
|
+
export function transformPaths(paths) {
|
|
13
12
|
const operations = [];
|
|
14
13
|
for (const route of Object.keys(paths)) {
|
|
15
14
|
const routeParameters = paths[route].parameters?.map(transformOperationParameter) ?? [];
|
|
@@ -21,8 +20,6 @@ export function transformPaths(models, paths) {
|
|
|
21
20
|
const parameters = operation.parameters?.map(transformOperationParameter) ?? [];
|
|
22
21
|
const tags = operation.tags?.map((t) => t) ?? [];
|
|
23
22
|
const operationResponses = operation.responses ?? {};
|
|
24
|
-
const responseModels = collectOperationResponses(operation.operationId, operationResponses);
|
|
25
|
-
models.push(...responseModels);
|
|
26
23
|
const decorators = [
|
|
27
24
|
...getExtensions(operation),
|
|
28
25
|
{ name: "route", args: [route] },
|
|
@@ -38,7 +35,7 @@ export function transformPaths(models, paths) {
|
|
|
38
35
|
doc: operation.description,
|
|
39
36
|
operationId: operation.operationId,
|
|
40
37
|
requestBodies: transformRequestBodies(operation.requestBody),
|
|
41
|
-
|
|
38
|
+
responses: operationResponses,
|
|
42
39
|
tags: tags,
|
|
43
40
|
});
|
|
44
41
|
}
|
|
@@ -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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"}
|
|
@@ -6,7 +6,7 @@ import { transformServiceInfo } from "./transform-service-info.js";
|
|
|
6
6
|
export function transform(context) {
|
|
7
7
|
const openapi = context.openApi3Doc;
|
|
8
8
|
const models = collectDataTypes(context);
|
|
9
|
-
const operations = transformPaths(
|
|
9
|
+
const operations = transformPaths(openapi.paths);
|
|
10
10
|
return {
|
|
11
11
|
serviceInfo: transformServiceInfo(openapi.info),
|
|
12
12
|
...transformNamespaces(models, operations),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transforms.js","sourceRoot":"","sources":["../../../../../../src/cli/actions/convert/transforms/transforms.ts"],"names":[],"mappings":"AAEA,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,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AAEnE,MAAM,UAAU,SAAS,CAAC,OAAgB;IACxC,MAAM,OAAO,GAAG,OAAO,CAAC,WAAW,CAAC;IACpC,MAAM,MAAM,GAAG,gBAAgB,CAAC,OAAO,CAAC,CAAC;IACzC,MAAM,UAAU,GAAG,cAAc,CAAC,
|
|
1
|
+
{"version":3,"file":"transforms.js","sourceRoot":"","sources":["../../../../../../src/cli/actions/convert/transforms/transforms.ts"],"names":[],"mappings":"AAEA,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,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AAEnE,MAAM,UAAU,SAAS,CAAC,OAAgB;IACxC,MAAM,OAAO,GAAG,OAAO,CAAC,WAAW,CAAC;IACpC,MAAM,MAAM,GAAG,gBAAgB,CAAC,OAAO,CAAC,CAAC;IACzC,MAAM,UAAU,GAAG,cAAc,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IAEjD,OAAO;QACL,WAAW,EAAE,oBAAoB,CAAC,OAAO,CAAC,IAAI,CAAC;QAC/C,GAAG,mBAAmB,CAAC,MAAM,EAAE,UAAU,CAAC;QAC1C,aAAa,EAAE,EAAE;KAClB,CAAC;AACJ,CAAC;AAED,SAAS,gBAAgB,CAAC,OAAgB;IACxC,MAAM,MAAM,GAAoB,EAAE,CAAC;IACnC,uCAAuC;IACvC,yBAAyB,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IAC3C,2CAA2C;IAC3C,4BAA4B,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IAE9C,OAAO,MAAM,CAAC;AAChB,CAAC"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import type OpenAPIParser from "@apidevtools/swagger-parser";
|
|
1
2
|
import { OpenAPI3Document, OpenAPI3Schema, Refable } from "../../../../types.js";
|
|
2
3
|
export interface Context {
|
|
3
4
|
readonly openApi3Doc: OpenAPI3Document;
|
|
@@ -5,6 +6,10 @@ export interface Context {
|
|
|
5
6
|
generateTypeFromRefableSchema(schema: Refable<OpenAPI3Schema>, callingScope: string[]): string;
|
|
6
7
|
getRefName(ref: string, callingScope: string[]): string;
|
|
7
8
|
getSchemaByRef(ref: string): OpenAPI3Schema | undefined;
|
|
9
|
+
getByRef<T>(ref: string): T | undefined;
|
|
8
10
|
}
|
|
9
|
-
export
|
|
11
|
+
export type Parser = {
|
|
12
|
+
$refs: OpenAPIParser["$refs"];
|
|
13
|
+
};
|
|
14
|
+
export declare function createContext(parser: Parser, openApi3Doc: OpenAPI3Document): Context;
|
|
10
15
|
//# 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,EAAE,gBAAgB,EAAE,cAAc,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AAIjF,MAAM,WAAW,OAAO;IACtB,QAAQ,CAAC,WAAW,EAAE,gBAAgB,CAAC;IACvC,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAC;IAE/B,6BAA6B,CAAC,MAAM,EAAE,OAAO,CAAC,cAAc,CAAC,EAAE,YAAY,EAAE,MAAM,EAAE,GAAG,MAAM,CAAC;IAC/F,UAAU,CAAC,GAAG,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,GAAG,MAAM,CAAC;IACxD,cAAc,CAAC,GAAG,EAAE,MAAM,GAAG,cAAc,GAAG,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"context.d.ts","sourceRoot":"","sources":["../../../../../../src/cli/actions/convert/utils/context.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,aAAa,MAAM,6BAA6B,CAAC;AAC7D,OAAO,EAAE,gBAAgB,EAAE,cAAc,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AAIjF,MAAM,WAAW,OAAO;IACtB,QAAQ,CAAC,WAAW,EAAE,gBAAgB,CAAC;IACvC,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAC;IAE/B,6BAA6B,CAAC,MAAM,EAAE,OAAO,CAAC,cAAc,CAAC,EAAE,YAAY,EAAE,MAAM,EAAE,GAAG,MAAM,CAAC;IAC/F,UAAU,CAAC,GAAG,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,GAAG,MAAM,CAAC;IACxD,cAAc,CAAC,GAAG,EAAE,MAAM,GAAG,cAAc,GAAG,SAAS,CAAC;IACxD,QAAQ,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,GAAG,CAAC,GAAG,SAAS,CAAC;CACzC;AAED,MAAM,MAAM,MAAM,GAAG;IACnB,KAAK,EAAE,aAAa,CAAC,OAAO,CAAC,CAAC;CAC/B,CAAC;AAEF,wBAAgB,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,gBAAgB,GAAG,OAAO,CAsBpF"}
|
|
@@ -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(openApi3Doc) {
|
|
3
|
+
export function createContext(parser, openApi3Doc) {
|
|
4
4
|
const rootNamespace = generateNamespaceName(openApi3Doc.info.title);
|
|
5
5
|
const schemaExpressionGenerator = new SchemaToExpressionGenerator(rootNamespace);
|
|
6
6
|
const context = {
|
|
@@ -13,9 +13,10 @@ export function createContext(openApi3Doc) {
|
|
|
13
13
|
return schemaExpressionGenerator.generateTypeFromRefableSchema(schema, callingScope);
|
|
14
14
|
},
|
|
15
15
|
getSchemaByRef(ref) {
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
16
|
+
return this.getByRef(ref);
|
|
17
|
+
},
|
|
18
|
+
getByRef(ref) {
|
|
19
|
+
return parser.$refs.get(ref);
|
|
19
20
|
},
|
|
20
21
|
};
|
|
21
22
|
return context;
|
|
@@ -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":"AAEA,OAAO,EAAE,2BAA2B,EAAE,MAAM,iCAAiC,CAAC;AAC9E,OAAO,EAAE,qBAAqB,EAAE,MAAM,8BAA8B,CAAC;AAgBrE,MAAM,UAAU,aAAa,CAAC,MAAc,EAAE,WAA6B;IACzE,MAAM,aAAa,GAAG,qBAAqB,CAAC,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACpE,MAAM,yBAAyB,GAAG,IAAI,2BAA2B,CAAC,aAAa,CAAC,CAAC;IAEjF,MAAM,OAAO,GAAY;QACvB,WAAW;QACX,aAAa;QACb,UAAU,CAAC,GAAW,EAAE,YAAsB;YAC5C,OAAO,yBAAyB,CAAC,UAAU,CAAC,GAAG,EAAE,YAAY,CAAC,CAAC;QACjE,CAAC;QACD,6BAA6B,CAAC,MAA+B,EAAE,YAAsB;YACnF,OAAO,yBAAyB,CAAC,6BAA6B,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;QACvF,CAAC;QACD,cAAc,CAAC,GAAG;YAChB,OAAO,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;QAC5B,CAAC;QACD,QAAQ,CAAC,GAAG;YACV,OAAO,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAC/B,CAAC;KACF,CAAC;IAEF,OAAO,OAAO,CAAC;AACjB,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"generate-helpers.d.ts","sourceRoot":"","sources":["../../../../../../src/cli/actions/convert/utils/generate-helpers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAGvC,wBAAgB,eAAe,CAAC,OAAO,EAAE,OAAO,GAAG,MAAM,CAYxD"}
|
|
@@ -0,0 +1,41 @@
|
|
|
1
|
+
import { supportedHttpMethods } from "./supported-http-methods.js";
|
|
2
|
+
export function generateHelpers(context) {
|
|
3
|
+
const helpers = [];
|
|
4
|
+
if (usesDefaultResponse(context)) {
|
|
5
|
+
helpers.push(DEFAULT_RESPONSE_TEMPLATE);
|
|
6
|
+
}
|
|
7
|
+
if (helpers.length) {
|
|
8
|
+
return `namespace GeneratedHelpers {\n${helpers.join("\n")}\n}`;
|
|
9
|
+
}
|
|
10
|
+
return "";
|
|
11
|
+
}
|
|
12
|
+
const DEFAULT_RESPONSE_TEMPLATE = `
|
|
13
|
+
@doc(Description)
|
|
14
|
+
@error
|
|
15
|
+
model DefaultResponse<Description extends valueof string = "", Body = void, Headers extends {} = {}> {
|
|
16
|
+
@body body: Body;
|
|
17
|
+
...Headers;
|
|
18
|
+
}
|
|
19
|
+
`.trim();
|
|
20
|
+
function usesDefaultResponse(context) {
|
|
21
|
+
const doc = context.openApi3Doc;
|
|
22
|
+
// Check #/components/responses for status codes
|
|
23
|
+
for (const [statusCode] of Object.keys(doc.components?.responses ?? {})) {
|
|
24
|
+
if (statusCode === "default")
|
|
25
|
+
return true;
|
|
26
|
+
}
|
|
27
|
+
// Check #/paths/{path}/{method}/responses for status codes
|
|
28
|
+
for (const pathItem of Object.values(doc.paths)) {
|
|
29
|
+
for (const method of supportedHttpMethods) {
|
|
30
|
+
const operation = pathItem[method];
|
|
31
|
+
if (!operation)
|
|
32
|
+
continue;
|
|
33
|
+
for (const statusCode of Object.keys(operation.responses ?? {})) {
|
|
34
|
+
if (statusCode === "default")
|
|
35
|
+
return true;
|
|
36
|
+
}
|
|
37
|
+
}
|
|
38
|
+
}
|
|
39
|
+
return false;
|
|
40
|
+
}
|
|
41
|
+
//# sourceMappingURL=generate-helpers.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"generate-helpers.js","sourceRoot":"","sources":["../../../../../../src/cli/actions/convert/utils/generate-helpers.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AAEnE,MAAM,UAAU,eAAe,CAAC,OAAgB;IAC9C,MAAM,OAAO,GAAa,EAAE,CAAC;IAE7B,IAAI,mBAAmB,CAAC,OAAO,CAAC,EAAE,CAAC;QACjC,OAAO,CAAC,IAAI,CAAC,yBAAyB,CAAC,CAAC;IAC1C,CAAC;IAED,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;QACnB,OAAO,iCAAiC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC;IAClE,CAAC;IAED,OAAO,EAAE,CAAC;AACZ,CAAC;AAED,MAAM,yBAAyB,GAAG;;;;;;;CAOjC,CAAC,IAAI,EAAE,CAAC;AAET,SAAS,mBAAmB,CAAC,OAAgB;IAC3C,MAAM,GAAG,GAAG,OAAO,CAAC,WAAW,CAAC;IAChC,gDAAgD;IAChD,KAAK,MAAM,CAAC,UAAU,CAAC,IAAI,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,UAAU,EAAE,SAAS,IAAI,EAAE,CAAC,EAAE,CAAC;QACxE,IAAI,UAAU,KAAK,SAAS;YAAE,OAAO,IAAI,CAAC;IAC5C,CAAC;IAED,2DAA2D;IAC3D,KAAK,MAAM,QAAQ,IAAI,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC;QAChD,KAAK,MAAM,MAAM,IAAI,oBAAoB,EAAE,CAAC;YAC1C,MAAM,SAAS,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC;YACnC,IAAI,CAAC,SAAS;gBAAE,SAAS;YACzB,KAAK,MAAM,UAAU,IAAI,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,SAAS,IAAI,EAAE,CAAC,EAAE,CAAC;gBAChE,IAAI,UAAU,KAAK,SAAS;oBAAE,OAAO,IAAI,CAAC;YAC5C,CAAC;QACH,CAAC;IACH,CAAC;IAED,OAAO,KAAK,CAAC;AACf,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@typespec/openapi3",
|
|
3
|
-
"version": "0.65.0-dev.
|
|
3
|
+
"version": "0.65.0-dev.3",
|
|
4
4
|
"author": "Microsoft Corporation",
|
|
5
5
|
"description": "TypeSpec library for emitting OpenAPI 3.0 from the TypeSpec REST protocol binding and converting OpenAPI3 to TypeSpec",
|
|
6
6
|
"homepage": "https://typespec.io",
|
|
@@ -42,7 +42,7 @@
|
|
|
42
42
|
"!dist/test/**"
|
|
43
43
|
],
|
|
44
44
|
"dependencies": {
|
|
45
|
-
"@
|
|
45
|
+
"@apidevtools/swagger-parser": "~10.1.1",
|
|
46
46
|
"openapi-types": "~12.1.3",
|
|
47
47
|
"yaml": "~2.7.0"
|
|
48
48
|
},
|
|
@@ -62,7 +62,7 @@
|
|
|
62
62
|
}
|
|
63
63
|
},
|
|
64
64
|
"devDependencies": {
|
|
65
|
-
"@types/node": "~22.10.
|
|
65
|
+
"@types/node": "~22.10.10",
|
|
66
66
|
"@types/yargs": "~17.0.33",
|
|
67
67
|
"@typespec/compiler": "~0.64.0 || >=0.65.0-dev <0.65.0",
|
|
68
68
|
"@typespec/http": "~0.64.0 || >=0.65.0-dev <0.65.0",
|
|
@@ -72,13 +72,13 @@
|
|
|
72
72
|
"@typespec/rest": "~0.64.0 || >=0.65.0-dev <0.65.0",
|
|
73
73
|
"@typespec/versioning": "~0.64.0 || >=0.65.0-dev <0.65.0",
|
|
74
74
|
"@typespec/xml": "~0.64.0 || >=0.65.0-dev <0.65.0",
|
|
75
|
-
"@vitest/coverage-v8": "^3.0.
|
|
75
|
+
"@vitest/coverage-v8": "^3.0.4",
|
|
76
76
|
"@vitest/ui": "^3.0.3",
|
|
77
77
|
"c8": "^10.1.3",
|
|
78
78
|
"cross-env": "~7.0.3",
|
|
79
79
|
"rimraf": "~6.0.1",
|
|
80
80
|
"typescript": "~5.7.3",
|
|
81
|
-
"vitest": "^3.0.
|
|
81
|
+
"vitest": "^3.0.4",
|
|
82
82
|
"@typespec/tspd": "~0.46.0"
|
|
83
83
|
},
|
|
84
84
|
"scripts": {
|
|
@@ -1,10 +0,0 @@
|
|
|
1
|
-
import { OpenAPI3Responses } from "../../../../types.js";
|
|
2
|
-
import { TypeSpecModel } from "../interfaces.js";
|
|
3
|
-
/**
|
|
4
|
-
* Transforms #/paths/{route}/{httpMethod}/responses into TypeSpec models.
|
|
5
|
-
* @param operationId - Used to generate model names with scopes.
|
|
6
|
-
* @param operationResponses - The responses object for an operation.
|
|
7
|
-
*/
|
|
8
|
-
export declare function collectOperationResponses(operationId: string, operationResponses: OpenAPI3Responses): TypeSpecModel[];
|
|
9
|
-
export declare function generateResponseModelName(operationId: string, statusCode: string, contentType?: string): string;
|
|
10
|
-
//# sourceMappingURL=transform-operation-responses.d.ts.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"transform-operation-responses.d.ts","sourceRoot":"","sources":["../../../../../../src/cli/actions/convert/transforms/transform-operation-responses.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,iBAAiB,EAIlB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAqB,aAAa,EAAyB,MAAM,kBAAkB,CAAC;AAK3F;;;;GAIG;AACH,wBAAgB,yBAAyB,CACvC,WAAW,EAAE,MAAM,EACnB,kBAAkB,EAAE,iBAAiB,GACpC,aAAa,EAAE,CAqFjB;AA2ED,wBAAgB,yBAAyB,CACvC,WAAW,EAAE,MAAM,EACnB,UAAU,EAAE,MAAM,EAClB,WAAW,CAAC,EAAE,MAAM,GACnB,MAAM,CASR"}
|
|
@@ -1,175 +0,0 @@
|
|
|
1
|
-
import { printIdentifier } from "@typespec/compiler";
|
|
2
|
-
import { convertHeaderName } from "../utils/convert-header-name.js";
|
|
3
|
-
import { getDecoratorsForSchema, getExtensions } from "../utils/decorators.js";
|
|
4
|
-
import { getScopeAndName } from "../utils/get-scope-and-name.js";
|
|
5
|
-
/**
|
|
6
|
-
* Transforms #/paths/{route}/{httpMethod}/responses into TypeSpec models.
|
|
7
|
-
* @param operationId - Used to generate model names with scopes.
|
|
8
|
-
* @param operationResponses - The responses object for an operation.
|
|
9
|
-
*/
|
|
10
|
-
export function collectOperationResponses(operationId, operationResponses) {
|
|
11
|
-
const models = [];
|
|
12
|
-
const rootDecorators = getExtensions(operationResponses);
|
|
13
|
-
for (const statusCode of Object.keys(operationResponses)) {
|
|
14
|
-
const response = operationResponses[statusCode];
|
|
15
|
-
const decorators = [...rootDecorators];
|
|
16
|
-
if ("$ref" in response) {
|
|
17
|
-
//TODO: Support for referencing #/components/responseBodies
|
|
18
|
-
continue;
|
|
19
|
-
}
|
|
20
|
-
// These headers will be applied to all of the models for this operation/statusCode
|
|
21
|
-
const commonProperties = [];
|
|
22
|
-
if (response.headers) {
|
|
23
|
-
for (const name of Object.keys(response.headers)) {
|
|
24
|
-
const property = convertHeaderToProperty(name, response.headers[name]);
|
|
25
|
-
if (property)
|
|
26
|
-
commonProperties.push(property);
|
|
27
|
-
}
|
|
28
|
-
}
|
|
29
|
-
decorators.push(...getExtensions(response));
|
|
30
|
-
// `default` status code is treated as the fallback for any status codes returned that aren't defined.
|
|
31
|
-
if (statusCode === "default") {
|
|
32
|
-
decorators.push({ name: "defaultResponse", args: [] });
|
|
33
|
-
}
|
|
34
|
-
else {
|
|
35
|
-
commonProperties.push(convertStatusCodeToProperty(statusCode));
|
|
36
|
-
}
|
|
37
|
-
if (isErrorStatusCode(statusCode)) {
|
|
38
|
-
decorators.push({ name: "error", args: [] });
|
|
39
|
-
}
|
|
40
|
-
const scopeAndName = getScopeAndName(operationId);
|
|
41
|
-
if (!response.content) {
|
|
42
|
-
// This is common when there is no actual request body, just a statusCode, e.g. for errors
|
|
43
|
-
models.push({
|
|
44
|
-
kind: "model",
|
|
45
|
-
scope: scopeAndName.scope,
|
|
46
|
-
name: generateResponseModelName(scopeAndName.rawName, statusCode),
|
|
47
|
-
decorators,
|
|
48
|
-
properties: commonProperties,
|
|
49
|
-
doc: response.description,
|
|
50
|
-
});
|
|
51
|
-
}
|
|
52
|
-
else {
|
|
53
|
-
// An operation may produce multiple content types, so need a model for each one.
|
|
54
|
-
for (const contentType of Object.keys(response.content ?? {})) {
|
|
55
|
-
const properties = [...commonProperties];
|
|
56
|
-
const contentBody = response.content[contentType];
|
|
57
|
-
// Wouldn't expect schema can be undefined since that implies contentType is not needed.
|
|
58
|
-
if (contentBody.schema) {
|
|
59
|
-
properties.push({
|
|
60
|
-
name: "body",
|
|
61
|
-
isOptional: false, // TODO: use the real value
|
|
62
|
-
decorators: [{ name: "bodyRoot", args: [] }],
|
|
63
|
-
schema: contentBody.schema,
|
|
64
|
-
});
|
|
65
|
-
}
|
|
66
|
-
// Default is application/json, so it doesn't need to be specified
|
|
67
|
-
if (contentType !== "application/json") {
|
|
68
|
-
properties.push({
|
|
69
|
-
name: "contentType",
|
|
70
|
-
decorators: [{ name: "header", args: [] }],
|
|
71
|
-
isOptional: false,
|
|
72
|
-
schema: { type: "string", enum: [contentType] },
|
|
73
|
-
});
|
|
74
|
-
}
|
|
75
|
-
models.push({
|
|
76
|
-
kind: "model",
|
|
77
|
-
scope: scopeAndName.scope,
|
|
78
|
-
name: generateResponseModelName(scopeAndName.rawName, statusCode, contentType),
|
|
79
|
-
decorators,
|
|
80
|
-
properties,
|
|
81
|
-
doc: response.description,
|
|
82
|
-
});
|
|
83
|
-
}
|
|
84
|
-
}
|
|
85
|
-
}
|
|
86
|
-
return models;
|
|
87
|
-
}
|
|
88
|
-
function convertHeaderToProperty(name, meta) {
|
|
89
|
-
const normalizedName = convertHeaderName(name);
|
|
90
|
-
// TODO: handle style
|
|
91
|
-
const headerDecorator = { name: "header", args: [] };
|
|
92
|
-
if (normalizedName !== name) {
|
|
93
|
-
headerDecorator.args.push(name);
|
|
94
|
-
}
|
|
95
|
-
if ("$ref" in meta) {
|
|
96
|
-
// Unhandled right now
|
|
97
|
-
return;
|
|
98
|
-
}
|
|
99
|
-
return {
|
|
100
|
-
name: normalizedName,
|
|
101
|
-
decorators: [headerDecorator, ...getDecoratorsForSchema(meta.schema)],
|
|
102
|
-
doc: meta.description ?? meta.schema.description,
|
|
103
|
-
isOptional: !meta.required,
|
|
104
|
-
schema: meta.schema,
|
|
105
|
-
};
|
|
106
|
-
}
|
|
107
|
-
function convertStatusCodeToProperty(statusCode) {
|
|
108
|
-
const schema = { type: "integer", format: "int32" };
|
|
109
|
-
if (statusCode === "1XX") {
|
|
110
|
-
schema.minimum = 100;
|
|
111
|
-
schema.maximum = 199;
|
|
112
|
-
}
|
|
113
|
-
else if (statusCode === "2XX") {
|
|
114
|
-
schema.minimum = 200;
|
|
115
|
-
schema.maximum = 299;
|
|
116
|
-
}
|
|
117
|
-
else if (statusCode === "3XX") {
|
|
118
|
-
schema.minimum = 300;
|
|
119
|
-
schema.maximum = 399;
|
|
120
|
-
}
|
|
121
|
-
else if (statusCode === "4XX") {
|
|
122
|
-
schema.minimum = 400;
|
|
123
|
-
schema.maximum = 499;
|
|
124
|
-
}
|
|
125
|
-
else if (statusCode === "5XX") {
|
|
126
|
-
schema.minimum = 500;
|
|
127
|
-
schema.maximum = 599;
|
|
128
|
-
}
|
|
129
|
-
else {
|
|
130
|
-
const literalStatusCode = parseInt(statusCode, 10);
|
|
131
|
-
if (!isValidLiteralStatusCode(literalStatusCode)) {
|
|
132
|
-
// TODO: Emit warning or // FIXME
|
|
133
|
-
}
|
|
134
|
-
else {
|
|
135
|
-
schema.enum = [literalStatusCode];
|
|
136
|
-
}
|
|
137
|
-
}
|
|
138
|
-
return {
|
|
139
|
-
name: "statusCode",
|
|
140
|
-
schema,
|
|
141
|
-
decorators: [{ name: "statusCode", args: [] }],
|
|
142
|
-
isOptional: false,
|
|
143
|
-
};
|
|
144
|
-
}
|
|
145
|
-
function isValidLiteralStatusCode(statusCode) {
|
|
146
|
-
return isFinite(statusCode) && statusCode >= 100 && statusCode <= 599;
|
|
147
|
-
}
|
|
148
|
-
function isErrorStatusCode(statusCode) {
|
|
149
|
-
if (["1XX", "2XX", "3XX", "default"].includes(statusCode)) {
|
|
150
|
-
return false;
|
|
151
|
-
}
|
|
152
|
-
else if (["4XX", "5XX"].includes(statusCode)) {
|
|
153
|
-
return true;
|
|
154
|
-
}
|
|
155
|
-
const literalStatusCode = parseInt(statusCode, 10);
|
|
156
|
-
return isFinite(literalStatusCode) && literalStatusCode >= 400;
|
|
157
|
-
}
|
|
158
|
-
export function generateResponseModelName(operationId, statusCode, contentType) {
|
|
159
|
-
if (statusCode === "default") {
|
|
160
|
-
statusCode = "Default";
|
|
161
|
-
}
|
|
162
|
-
let modelName = `${operationId}${statusCode}`;
|
|
163
|
-
if (contentType) {
|
|
164
|
-
modelName += convertContentType(contentType);
|
|
165
|
-
}
|
|
166
|
-
return printIdentifier(modelName + "Response");
|
|
167
|
-
}
|
|
168
|
-
function convertContentType(contentType) {
|
|
169
|
-
return contentType
|
|
170
|
-
.replaceAll("*", "Star")
|
|
171
|
-
.split("/")
|
|
172
|
-
.map((s) => s.substring(0, 1).toUpperCase() + s.substring(1))
|
|
173
|
-
.join("");
|
|
174
|
-
}
|
|
175
|
-
//# sourceMappingURL=transform-operation-responses.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"transform-operation-responses.js","sourceRoot":"","sources":["../../../../../../src/cli/actions/convert/transforms/transform-operation-responses.ts"],"names":[],"mappings":"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"}
|