Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/types/OpenAPI3.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ export interface OpenAPI3Schemas {

export interface OpenAPI3Paths {
[path: string]: {
[method: string]: OpenAPI3Operation;
[method: string]: OpenAPI3Operation | Parameter[];
};
}

Expand Down
179 changes: 99 additions & 80 deletions src/v3.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ import {
OpenAPI3Paths,
OpenAPI3SchemaObject,
OpenAPI3Schemas,
OpenAPI3Operation,
Parameter,
SwaggerToTSOptions,
} from "./types";
import {
Expand Down Expand Up @@ -153,100 +155,117 @@ export default function generateTypesV3(
return output;
}

function transformParameters(parameters: Parameter[]): string {
const allParameters: Record<
string,
Record<string, OpenAPI3Parameter | string>
> = {};

let output = `parameters: {\n`;

parameters.forEach((p) => {
if ("$ref" in p) {
const referencedValue = (p.$ref
.substr(2)
.split("/")
.reduce(
(value, property) => value[property],
input
) as unknown) as OpenAPI3Parameter;

if (!allParameters[referencedValue.in])
allParameters[referencedValue.in] = {};

allParameters[referencedValue.in][referencedValue.name] = transformRef(
p.$ref
);
return;
}

if (!allParameters[p.in]) allParameters[p.in] = {};
allParameters[p.in][p.name] = p;
});

Object.entries(allParameters).forEach(([loc, locParams]) => {
output += `"${loc}": {\n`;
Object.entries(locParams).forEach(([paramName, paramProps]) => {
if (typeof paramProps === "string") {
output += `"${paramName}": ${paramProps}\n`;
return;
}
if (paramProps.description) output += comment(paramProps.description);
output += `"${paramName}"${
paramProps.required === true ? "" : "?"
}: ${transform(paramProps.schema)};\n`;
});
output += `}\n`;
});
output += `}\n`;

return output;
}

function transformPaths(paths: OpenAPI3Paths): string {
let output = "";
Object.entries(paths).forEach(([path, methods]) => {
output += `"${path}": {\n`;
Object.entries(methods).forEach(([method, operation]) => {
if (operation.description) output += comment(operation.description);
output += `"${method}": {\n`;

// handle parameters
if (operation.parameters) {
output += `parameters: {\n`;
const allParameters: Record<
string,
Record<string, OpenAPI3Parameter | string>
> = {};
operation.parameters.forEach((p) => {
if ("$ref" in p) {
const referencedValue = (p.$ref
.substr(2)
.split("/")
.reduce(
(value, property) => value[property],
input
) as unknown) as OpenAPI3Parameter;

if (!allParameters[referencedValue.in])
allParameters[referencedValue.in] = {};

allParameters[referencedValue.in][
referencedValue.name
] = transformRef(p.$ref);
return;
}

if (!allParameters[p.in]) allParameters[p.in] = {};
allParameters[p.in][p.name] = p;
});
Object.entries(methods).forEach(([method, operation]) => {
// skip the parameters "method" for shared parameters - we'll handle it later
if (method !== "parameters") {
operation = operation as OpenAPI3Operation;
if (operation.description) output += comment(operation.description);
output += `"${method}": {\n`;

// handle operation parameters
if (operation.parameters) {
output += transformParameters(operation.parameters);
}

Object.entries(allParameters).forEach(([loc, locParams]) => {
output += `"${loc}": {\n`;
Object.entries(locParams).forEach(([paramName, paramProps]) => {
if (typeof paramProps === "string") {
output += `"${paramName}": ${paramProps}\n`;
return;
// handle requestBody
if (operation.requestBody) {
output += `requestBody: {\n`;
Object.entries(operation.requestBody.content).forEach(
([contentType, { schema }]) => {
output += `"${contentType}": ${transform(schema)};\n`;
}
if (paramProps.description)
output += comment(paramProps.description);
output += `"${paramName}"${
paramProps.required === true ? "" : "?"
}: ${transform(paramProps.schema)};\n`;
});
);
output += `}\n`;
});
output += `}\n`;
}
}

// handle requestBody
if (operation.requestBody) {
output += `requestBody: {\n`;
Object.entries(operation.requestBody.content).forEach(
([contentType, { schema }]) => {
output += `"${contentType}": ${transform(schema)};\n`;
// handle responses
output += `responses: {\n`;
Object.entries(operation.responses).forEach(
([statusCode, response]) => {
if (response.description) output += comment(response.description);
if (!response.content || !Object.keys(response.content).length) {
const type =
statusCode === "204" || Math.floor(+statusCode / 100) === 3
? "never"
: "unknown";
output += `"${statusCode}": ${type};\n`;
return;
}
output += `"${statusCode}": {\n`;
Object.entries(response.content).forEach(
([contentType, encodedResponse]) => {
output += `"${contentType}": ${transform(
encodedResponse.schema
)};\n`;
}
);
output += `}\n`;
}
);
output += `}\n`;
output += `}\n`;
}

// handle responses
output += `responses: {\n`;
Object.entries(operation.responses).forEach(
([statusCode, response]) => {
if (response.description) output += comment(response.description);
if (!response.content || !Object.keys(response.content).length) {
const type =
statusCode === "204" || Math.floor(+statusCode / 100) === 3
? "never"
: "unknown";
output += `"${statusCode}": ${type};\n`;
return;
}
output += `"${statusCode}": {\n`;
Object.entries(response.content).forEach(
([contentType, encodedResponse]) => {
output += `"${contentType}": ${transform(
encodedResponse.schema
)};\n`;
}
);
output += `}\n`;
}
);
output += `}\n`;
output += `}\n`;
});

if (methods.parameters) {
// Handle shared parameters
output += transformParameters(methods.parameters as Parameter[]);
}
output += `}\n`;
});
return output;
Expand Down
42 changes: 42 additions & 0 deletions tests/v3/index.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -824,4 +824,46 @@ describe("OpenAPI3 features", () => {
`)
);
});
it("parameters on entire path (#346)", () => {
const schema: OpenAPI3 = {
openapi: "3.0.1",
paths: {
"/{example}": {
get: {
responses: {},
},
parameters: [
{
name: "example",
in: "path",
required: true,
schema: {
type: "string"
}
},
],
},
},
};

expect(swaggerToTS(schema)).toEqual(
format(`
export interface paths {

"/{example}": {
get: {
responses: {};
};
parameters: {
path: {
example: string;
};
};
};
}

export interface components {}
`)
);
});
});