Skip to content
Open
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
29 changes: 29 additions & 0 deletions src/NSwag.CodeGeneration.TypeScript.Tests/FetchTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -232,5 +232,34 @@ public async Task When_no_includeHttpContext()
Assert.DoesNotContain("httpContext?: HttpContext", code);
Assert.DoesNotContain("context: httpContext", code);
}

[Fact]
public async Task When_abort_signal_and_generate_client_interfaces()
{
// Arrange
var generator = new WebApiOpenApiDocumentGenerator(new WebApiOpenApiDocumentGeneratorSettings
{
SchemaSettings = new NewtonsoftJsonSchemaGeneratorSettings { SchemaType = SchemaType.Swagger2 }
});

var document = await generator.GenerateForControllerAsync<DiscussionController>();
var json = document.ToJson();

// Act
var codeGen = new TypeScriptClientGenerator(document, new TypeScriptClientGeneratorSettings
{
Template = TypeScriptTemplate.Fetch,
UseAbortSignal = true,
GenerateClientInterfaces = true,
TypeScriptGeneratorSettings =
{
TypeScriptVersion = 2.7m
}
});
var code = codeGen.GenerateFile();

// Assert
Assert.Contains("signal?: AbortSignal): Promise<void>;", code);
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
{% for operation in Operations %}

{% template Client.Method.Documentation %}
{{ operation.MethodAccessModifier }}{{ operation.ActualOperationName }}({% for parameter in operation.Parameters %}{{ parameter.VariableName }}{% if GenerateOptionalParameters and parameter.IsOptional %}?{% endif %}: {{ parameter.Type }}{{ parameter.TypePostfix }}{% if parameter.IsLast == false %}, {% endif %}{% endfor %}): Promise<{{ operation.ResultType }}>;
{{ operation.MethodAccessModifier }}{{ operation.ActualOperationName }}({% for parameter in operation.Parameters %}{{ parameter.VariableName }}{% if GenerateOptionalParameters and parameter.IsOptional %}?{% endif %}: {{ parameter.Type }}{{ parameter.TypePostfix }}{% if parameter.IsLast == false %}, {% endif %}{% endfor %}{% if UseAbortSignal %}{% if operation.Parameters.size > 0 %}, {% endif %}signal?: AbortSignal{% endif %}): Promise<{{ operation.ResultType }}>;
{%- endfor %}}
{%- endif -%}

Expand Down