diff --git a/Examples/Angular/ModelFromAssembly/ModelFromAssembly.csproj b/Examples/Angular/ModelFromAssembly/ModelFromAssembly.csproj index b142c6a9..d8e034b5 100644 --- a/Examples/Angular/ModelFromAssembly/ModelFromAssembly.csproj +++ b/Examples/Angular/ModelFromAssembly/ModelFromAssembly.csproj @@ -6,8 +6,8 @@ - - + + diff --git a/Examples/Angular/ModelFromAssembly/Output/another-type.ts b/Examples/Angular/ModelFromAssembly/Output/another-type.ts index 7499fada..86a252a7 100644 --- a/Examples/Angular/ModelFromAssembly/Output/another-type.ts +++ b/Examples/Angular/ModelFromAssembly/Output/another-type.ts @@ -1,6 +1,6 @@ // ------------------------------------------------------------------------------ // -// This code was generated with KY.Generator 6.5.0.0 +// This code was generated with KY.Generator 6.6.0.0 // // Manual changes to this file may cause unexpected behavior in your application. // Manual changes to this file will be overwritten if the code is regenerated. diff --git a/Examples/Angular/ModelFromAssembly/Output/type-to-read.ts b/Examples/Angular/ModelFromAssembly/Output/type-to-read.ts index 2b9aaee1..bcbdd5e7 100644 --- a/Examples/Angular/ModelFromAssembly/Output/type-to-read.ts +++ b/Examples/Angular/ModelFromAssembly/Output/type-to-read.ts @@ -1,6 +1,6 @@ // ------------------------------------------------------------------------------ // -// This code was generated with KY.Generator 6.5.0.0 +// This code was generated with KY.Generator 6.6.0.0 // // Manual changes to this file may cause unexpected behavior in your application. // Manual changes to this file will be overwritten if the code is regenerated. diff --git a/Examples/Angular/ServiceFromAspNetCoreAnnotation/ClientApp/src/app/models/weather-forecast.ts b/Examples/Angular/ServiceFromAspNetCoreAnnotation/ClientApp/src/app/models/weather-forecast.ts index 6bc18b68..d98277fc 100644 --- a/Examples/Angular/ServiceFromAspNetCoreAnnotation/ClientApp/src/app/models/weather-forecast.ts +++ b/Examples/Angular/ServiceFromAspNetCoreAnnotation/ClientApp/src/app/models/weather-forecast.ts @@ -1,6 +1,6 @@ // ------------------------------------------------------------------------------ // -// This code was generated with KY.Generator 6.5.0.0 +// This code was generated with KY.Generator 6.6.0.0 // // Manual changes to this file may cause unexpected behavior in your application. // Manual changes to this file will be overwritten if the code is regenerated. diff --git a/Examples/Angular/ServiceFromAspNetCoreAnnotation/ClientApp/src/app/services/weather-forecast.service.ts b/Examples/Angular/ServiceFromAspNetCoreAnnotation/ClientApp/src/app/services/weather-forecast.service.ts index b5072eea..e9721cca 100644 --- a/Examples/Angular/ServiceFromAspNetCoreAnnotation/ClientApp/src/app/services/weather-forecast.service.ts +++ b/Examples/Angular/ServiceFromAspNetCoreAnnotation/ClientApp/src/app/services/weather-forecast.service.ts @@ -1,6 +1,6 @@ // ------------------------------------------------------------------------------ // -// This code was generated with KY.Generator 6.5.0.0 +// This code was generated with KY.Generator 6.6.0.0 // // Manual changes to this file may cause unexpected behavior in your application. // Manual changes to this file will be overwritten if the code is regenerated. diff --git a/Examples/Angular/ServiceFromAspNetCoreAnnotation/ServiceFromAspNetCoreAnnotation.csproj b/Examples/Angular/ServiceFromAspNetCoreAnnotation/ServiceFromAspNetCoreAnnotation.csproj index 93e7f918..04fa3fde 100644 --- a/Examples/Angular/ServiceFromAspNetCoreAnnotation/ServiceFromAspNetCoreAnnotation.csproj +++ b/Examples/Angular/ServiceFromAspNetCoreAnnotation/ServiceFromAspNetCoreAnnotation.csproj @@ -14,8 +14,8 @@ - - + + diff --git a/Examples/Angular/ServiceFromAspNetCoreSignalRHub/ClientApp/src/app/models/connection-status.ts b/Examples/Angular/ServiceFromAspNetCoreSignalRHub/ClientApp/src/app/models/connection-status.ts index 90061b50..d4a43104 100644 --- a/Examples/Angular/ServiceFromAspNetCoreSignalRHub/ClientApp/src/app/models/connection-status.ts +++ b/Examples/Angular/ServiceFromAspNetCoreSignalRHub/ClientApp/src/app/models/connection-status.ts @@ -1,6 +1,6 @@ // ------------------------------------------------------------------------------ // -// This code was generated with KY.Generator 6.5.0.0 +// This code was generated with KY.Generator 6.6.0.0 // // Manual changes to this file may cause unexpected behavior in your application. // Manual changes to this file will be overwritten if the code is regenerated. diff --git a/Examples/Angular/ServiceFromAspNetCoreSignalRHub/ClientApp/src/app/models/weather-forecast.ts b/Examples/Angular/ServiceFromAspNetCoreSignalRHub/ClientApp/src/app/models/weather-forecast.ts index 7e0c14f1..289729a7 100644 --- a/Examples/Angular/ServiceFromAspNetCoreSignalRHub/ClientApp/src/app/models/weather-forecast.ts +++ b/Examples/Angular/ServiceFromAspNetCoreSignalRHub/ClientApp/src/app/models/weather-forecast.ts @@ -1,6 +1,6 @@ // ------------------------------------------------------------------------------ // -// This code was generated with KY.Generator 6.5.0.0 +// This code was generated with KY.Generator 6.6.0.0 // // Manual changes to this file may cause unexpected behavior in your application. // Manual changes to this file will be overwritten if the code is regenerated. diff --git a/Examples/Angular/ServiceFromAspNetCoreSignalRHub/ClientApp/src/app/services/weather-hub.service.ts b/Examples/Angular/ServiceFromAspNetCoreSignalRHub/ClientApp/src/app/services/weather-hub.service.ts index 4e06603f..72550ca3 100644 --- a/Examples/Angular/ServiceFromAspNetCoreSignalRHub/ClientApp/src/app/services/weather-hub.service.ts +++ b/Examples/Angular/ServiceFromAspNetCoreSignalRHub/ClientApp/src/app/services/weather-hub.service.ts @@ -1,6 +1,6 @@ // ------------------------------------------------------------------------------ // -// This code was generated with KY.Generator 6.5.0.0 +// This code was generated with KY.Generator 6.6.0.0 // // Manual changes to this file may cause unexpected behavior in your application. // Manual changes to this file will be overwritten if the code is regenerated. diff --git a/Examples/Angular/ServiceFromAspNetCoreSignalRHub/ServiceFromAspNetCoreSignalRHub.csproj b/Examples/Angular/ServiceFromAspNetCoreSignalRHub/ServiceFromAspNetCoreSignalRHub.csproj index 1bc3e225..3133e832 100644 --- a/Examples/Angular/ServiceFromAspNetCoreSignalRHub/ServiceFromAspNetCoreSignalRHub.csproj +++ b/Examples/Angular/ServiceFromAspNetCoreSignalRHub/ServiceFromAspNetCoreSignalRHub.csproj @@ -14,8 +14,8 @@ - - + + diff --git a/Examples/Angular/ServiceFromAspNetCoreViaFluentApi/Generator/Generator.csproj b/Examples/Angular/ServiceFromAspNetCoreViaFluentApi/Generator/Generator.csproj index 16f16ca5..d9b09835 100644 --- a/Examples/Angular/ServiceFromAspNetCoreViaFluentApi/Generator/Generator.csproj +++ b/Examples/Angular/ServiceFromAspNetCoreViaFluentApi/Generator/Generator.csproj @@ -5,11 +5,11 @@ - - - - - + + + + + diff --git a/Examples/Angular/ServiceFromAspNetCoreViaFluentApi/Service/ClientApp/src/app/models/weather-forecast.ts b/Examples/Angular/ServiceFromAspNetCoreViaFluentApi/Service/ClientApp/src/app/models/weather-forecast.ts index 033dee09..14488689 100644 --- a/Examples/Angular/ServiceFromAspNetCoreViaFluentApi/Service/ClientApp/src/app/models/weather-forecast.ts +++ b/Examples/Angular/ServiceFromAspNetCoreViaFluentApi/Service/ClientApp/src/app/models/weather-forecast.ts @@ -1,6 +1,6 @@ // ------------------------------------------------------------------------------ // -// This code was generated with KY.Generator 6.5.0.0 +// This code was generated with KY.Generator 6.6.0.0 // // Manual changes to this file may cause unexpected behavior in your application. // Manual changes to this file will be overwritten if the code is regenerated. diff --git a/Examples/Angular/ServiceFromAspNetCoreViaFluentApi/Service/ClientApp/src/app/services/weather-forecast.service.ts b/Examples/Angular/ServiceFromAspNetCoreViaFluentApi/Service/ClientApp/src/app/services/weather-forecast.service.ts index 994a20ac..0b9cf2da 100644 --- a/Examples/Angular/ServiceFromAspNetCoreViaFluentApi/Service/ClientApp/src/app/services/weather-forecast.service.ts +++ b/Examples/Angular/ServiceFromAspNetCoreViaFluentApi/Service/ClientApp/src/app/services/weather-forecast.service.ts @@ -1,6 +1,6 @@ // ------------------------------------------------------------------------------ // -// This code was generated with KY.Generator 6.5.0.0 +// This code was generated with KY.Generator 6.6.0.0 // // Manual changes to this file may cause unexpected behavior in your application. // Manual changes to this file will be overwritten if the code is regenerated. diff --git a/Examples/Angular/ServiceFromSignalRViaFluentApi/ServiceFromSignalRViaFluentApi.csproj b/Examples/Angular/ServiceFromSignalRViaFluentApi/ServiceFromSignalRViaFluentApi.csproj index 6eb19fc8..26efa891 100644 --- a/Examples/Angular/ServiceFromSignalRViaFluentApi/ServiceFromSignalRViaFluentApi.csproj +++ b/Examples/Angular/ServiceFromSignalRViaFluentApi/ServiceFromSignalRViaFluentApi.csproj @@ -13,10 +13,10 @@ - - - - + + + + diff --git a/Tests/AnnotationAsync/AnnotationAsync.csproj b/Tests/AnnotationAsync/AnnotationAsync.csproj index 00b0d1f5..cbdd72bb 100644 --- a/Tests/AnnotationAsync/AnnotationAsync.csproj +++ b/Tests/AnnotationAsync/AnnotationAsync.csproj @@ -7,8 +7,8 @@ - - + + diff --git a/Tests/AnnotationAsyncAssembly/AnnotationAsyncAssembly.csproj b/Tests/AnnotationAsyncAssembly/AnnotationAsyncAssembly.csproj index 743b75cf..d7b72125 100644 --- a/Tests/AnnotationAsyncAssembly/AnnotationAsyncAssembly.csproj +++ b/Tests/AnnotationAsyncAssembly/AnnotationAsyncAssembly.csproj @@ -6,8 +6,8 @@ - - + + diff --git a/Tests/AnnotationInNestedClass/AnnotationInNestedClass.csproj b/Tests/AnnotationInNestedClass/AnnotationInNestedClass.csproj index 8c9a87b7..9c69168d 100644 --- a/Tests/AnnotationInNestedClass/AnnotationInNestedClass.csproj +++ b/Tests/AnnotationInNestedClass/AnnotationInNestedClass.csproj @@ -6,8 +6,8 @@ - - + + diff --git a/Tests/AnnotationsWithMultipleOutputs/AnnotationsWithMultipleOutputs.csproj b/Tests/AnnotationsWithMultipleOutputs/AnnotationsWithMultipleOutputs.csproj index 304c5789..ec12797c 100644 --- a/Tests/AnnotationsWithMultipleOutputs/AnnotationsWithMultipleOutputs.csproj +++ b/Tests/AnnotationsWithMultipleOutputs/AnnotationsWithMultipleOutputs.csproj @@ -6,8 +6,8 @@ - - + + diff --git a/Tests/Fluent/Fluent.Generator/Fluent.Generator.csproj b/Tests/Fluent/Fluent.Generator/Fluent.Generator.csproj index 8cc5236e..b8cf4f57 100644 --- a/Tests/Fluent/Fluent.Generator/Fluent.Generator.csproj +++ b/Tests/Fluent/Fluent.Generator/Fluent.Generator.csproj @@ -6,10 +6,10 @@ - - - - + + + + diff --git a/Tests/Types/Types.csproj b/Tests/Types/Types.csproj index 6ffe2a3e..7b7acf91 100644 --- a/Tests/Types/Types.csproj +++ b/Tests/Types/Types.csproj @@ -6,8 +6,8 @@ - - + + diff --git a/Tests/WebApiController/ClientApp/src/app/edge-cases/services/edge-cases.service.ts b/Tests/WebApiController/ClientApp/src/app/edge-cases/services/edge-cases.service.ts new file mode 100644 index 00000000..42ff8d7f --- /dev/null +++ b/Tests/WebApiController/ClientApp/src/app/edge-cases/services/edge-cases.service.ts @@ -0,0 +1,43 @@ +/* eslint-disable */ +// tslint:disable + +import { HttpClient } from "@angular/common/http"; +import { Injectable } from "@angular/core"; +import { Observable } from "rxjs"; +import { Subject } from "rxjs"; + +@Injectable({ + providedIn: "root" +}) +export class EdgeCasesService { + private readonly http: HttpClient; + public serviceUrl: string = ""; + + public constructor(http: HttpClient) { + this.http = http; + } + + public get(subject: string, httpOptions: {} = undefined): Observable { + let rxjsSubject = new Subject(); + this.http.get(this.serviceUrl + "/edgecases" + "?subject=" + this.convertAny(subject), httpOptions).subscribe(() => { + rxjsSubject.next(); + rxjsSubject.complete(); + }, (error) => rxjsSubject.error(error)); + return rxjsSubject; + } + + public post(subject: string, httpOptions: {} = undefined): Observable { + let rxjsSubject = new Subject(); + this.http.post(this.serviceUrl + "/edgecases" + "?subject=" + this.convertAny(subject), httpOptions).subscribe(() => { + rxjsSubject.next(); + rxjsSubject.complete(); + }, (error) => rxjsSubject.error(error)); + return rxjsSubject; + } + + public convertAny(value: any): string { + return value === null || value === undefined ? "" : value.toString(); + } +} + +// outputid:627408ca-a818-4326-b843-415f5bbfb028 diff --git a/Tests/WebApiController/ClientApp/src/app/routed/services/routed.service.ts b/Tests/WebApiController/ClientApp/src/app/routed/services/routed.service.ts index 7653a346..00c8cecc 100644 --- a/Tests/WebApiController/ClientApp/src/app/routed/services/routed.service.ts +++ b/Tests/WebApiController/ClientApp/src/app/routed/services/routed.service.ts @@ -90,7 +90,7 @@ export class RoutedService { return subject; } - public test5(test: number, httpOptions: {} = undefined): Observable { + public getTest5(test: number, httpOptions: {} = undefined): Observable { let subject = new Subject(); this.http.get(this.serviceUrl + "/routed/test5/" + test, httpOptions).subscribe(() => { subject.next(); @@ -99,7 +99,7 @@ export class RoutedService { return subject; } - public test52(test: number, httpOptions: {} = undefined): Observable { + public postTest5(test: number, httpOptions: {} = undefined): Observable { let subject = new Subject(); this.http.post(this.serviceUrl + "/routed/test5/" + test, httpOptions).subscribe(() => { subject.next(); diff --git a/Tests/WebApiController/Controllers/EdgeCasesController.cs b/Tests/WebApiController/Controllers/EdgeCasesController.cs new file mode 100644 index 00000000..04a34be2 --- /dev/null +++ b/Tests/WebApiController/Controllers/EdgeCasesController.cs @@ -0,0 +1,20 @@ +using KY.Generator; +using Microsoft.AspNetCore.Mvc; + +namespace WebApiController.Controllers +{ + [ApiController] + [Route("[controller]")] + [GenerateAngularService("ClientApp/src/app/edge-cases/services", "ClientApp/src/app/edge-cases/models")] + [GenerateOption(GenerateOption.SkipHeader)] + public class EdgeCasesController : ControllerBase + { + [HttpGet] + public void Get(string subject) + { } + + [HttpPost] + public void Post(string subject) + { } + } +} \ No newline at end of file diff --git a/Tests/WebApiController/WebApiController.csproj b/Tests/WebApiController/WebApiController.csproj index 054ca2c5..f1c94ff5 100644 --- a/Tests/WebApiController/WebApiController.csproj +++ b/Tests/WebApiController/WebApiController.csproj @@ -15,8 +15,8 @@ - - + +