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
7 changes: 5 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,15 @@ gen:
gen-buggy:
dotnet run --project OpenApiGen -- Examples/OpenApiGen.config.json Examples/BuggyApi.json generated

gen-fund:
dotnet run --project OpenApiGen -- Examples/OpenApiGen.config.json Examples/FundApi.json generated
gen-invest:
dotnet run --project OpenApiGen -- Examples/OpenApiGen.config.json Examples/InvestApi.json generated

gen-art:
dotnet run --project OpenApiGen -- Examples/FundApi.config.json Examples/ArtApi.json generated

gen-petstore:
dotnet run --project OpenApiGen -- Examples/Default.config.json Examples/PetStore.json generated

help:
dotnet run --project OpenApiGen -- --help

Expand Down
29 changes: 20 additions & 9 deletions OpenApiGen/Generators/TypeScriptAxiosGenerator.cs
Original file line number Diff line number Diff line change
Expand Up @@ -82,21 +82,22 @@ public void Generate(OpenApiDocument document, string outputPath) {

Dictionary<string, string> resDUInterfaces = [];
foreach (var (responseType, response) in op.Responses) {
var responseTypeOrDefault = responseType == "default" ? "0" : responseType;
string? resTypeInterface = null;
if (response.Content?.TryGetValue("application/json", out var resJsonContent) == true) {
resTypeInterface = $"{GenerateInterfaceName(path, method)}{responseType}Response";
resDUInterfaces.Add(responseType, resTypeInterface);
resTypeInterface = $"{GenerateInterfaceName(path, method)}{responseTypeOrDefault}Response";
resDUInterfaces.Add(responseTypeOrDefault, resTypeInterface);
sb.Append($"export type {resTypeInterface} = ");
sb.AppendLine(GenerateType(INDENTATION_SIZE, resJsonContent.Schema ?? new PrimitiveSchema(), [], []));
} else if (response.Content?.TryGetValue("text/plain", out var resTxtContent) == true) {
resTypeInterface = $"{GenerateInterfaceName(path, method)}{responseType}Response";
resDUInterfaces.Add(responseType, resTypeInterface);
resTypeInterface = $"{GenerateInterfaceName(path, method)}{responseTypeOrDefault}Response";
resDUInterfaces.Add(responseTypeOrDefault, resTypeInterface);
sb.Append($"export type {resTypeInterface} = ");
sb.AppendLine(GenerateType(INDENTATION_SIZE, resTxtContent.Schema ?? new PrimitiveSchema(), [], []));
} else if (response.Content == null) {
// void case
resTypeInterface = $"{GenerateInterfaceName(path, method)}{responseType}Response";
resDUInterfaces.Add(responseType, resTypeInterface);
resTypeInterface = $"{GenerateInterfaceName(path, method)}{responseTypeOrDefault}Response";
resDUInterfaces.Add(responseTypeOrDefault, resTypeInterface);
sb.Append($"export type {resTypeInterface} = ");
sb.AppendLine(GenerateType(INDENTATION_SIZE, new PrimitiveSchema(), [], []));
} else {
Expand Down Expand Up @@ -139,11 +140,21 @@ public void Generate(OpenApiDocument document, string outputPath) {
sb.Append(' ', INDENTATION_SIZE); sb.AppendLine($"const __response__ = await axios.{method}(`{ToTemplateString(path)}${{__queryString__}}`{requestArg}, {{ validateStatus: () => true{bearerHeader} }})");
}
sb.Append(' ', INDENTATION_SIZE); sb.AppendLine("switch (__response__.status) {");
Response? defaultResponse = null;
foreach (var (responseType, response) in op.Responses) {
var resTypeInterface = $"{GenerateInterfaceName(path, method)}{responseType}Response";
sb.Append(' ', INDENTATION_SIZE * 2); sb.AppendLine($"case {responseType}: return [{responseType}, __response__.data as {resTypeInterface}]");
if (responseType == "default") {
defaultResponse = response;
} else {
var resTypeInterface = $"{GenerateInterfaceName(path, method)}{responseType}Response";
sb.Append(' ', INDENTATION_SIZE * 2); sb.AppendLine($"case {responseType}: return [{responseType}, __response__.data as {resTypeInterface}]");
}
}
if (defaultResponse is not null) {
var resTypeInterface = $"{GenerateInterfaceName(path, method)}0Response";
sb.Append(' ', INDENTATION_SIZE * 2); sb.AppendLine($"default: return [0, __response__.data as {resTypeInterface}]");
} else {
sb.Append(' ', INDENTATION_SIZE * 2); sb.AppendLine("default: throw Error(`Unexpected status ${__response__.status}`)");
}
sb.Append(' ', INDENTATION_SIZE * 2); sb.AppendLine("default: throw Error(`Unexpected status ${__response__.status}`)");
sb.Append(' ', INDENTATION_SIZE); sb.AppendLine("}");

sb.AppendLine("}");
Expand Down