Skip to content

Commit 028bedf

Browse files
committed
[typescript-angular] fix generated service interface when useHttpResource=true
1 parent f3e3dd7 commit 028bedf

3 files changed

Lines changed: 36 additions & 12 deletions

File tree

modules/openapi-generator/src/main/resources/typescript-angular/apiInterface.mustache

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import { {{configurationClassName}} } from '
2020
{{#allParams.0}}
2121
export interface {{#prefixParameterInterfaces}}{{classname}}{{/prefixParameterInterfaces}}{{operationIdCamelCase}}RequestParams {
2222
{{#allParams}}
23-
{{paramName}}{{^required}}?{{/required}}: {{#useHttpResource}}Signal<{{/useHttpResource}}{{{dataType}}}{{#isNullable}} | null{{/isNullable}}{{#useHttpResource}}>{{/useHttpResource}};
23+
{{paramName}}{{^required}}?{{/required}}: {{{dataType}}}{{#isNullable}} | null{{/isNullable}};
2424
{{/allParams}}
2525
}
2626

@@ -38,17 +38,19 @@ export interface {{classname}}Interface {
3838
configuration: {{configurationClassName}};
3939

4040
{{#operation}}
41-
/**
42-
* {{summary}}
43-
* {{notes}}
44-
* @endpoint {{httpMethod}} {{{vendorExtensions.x-path-from-spec}}}
45-
{{^useSingleRequestParameter}}
46-
{{#allParams}}* @param {{paramName}} {{description}}
47-
{{/allParams}}{{/useSingleRequestParameter}}{{#useSingleRequestParameter}}{{#allParams.0}}* @param requestParameters
48-
{{/allParams.0}}{{/useSingleRequestParameter}}{{#isDeprecated}}
49-
* @deprecated
50-
{{/isDeprecated}}*/
51-
{{nickname}}({{^useSingleRequestParameter}}{{#allParams}}{{paramName}}{{^required}}?{{/required}}: {{{dataType}}}, {{/allParams}}{{/useSingleRequestParameter}}{{#useSingleRequestParameter}}{{#allParams.0}}requestParameters: {{#prefixParameterInterfaces}}{{classname}}{{/prefixParameterInterfaces}}{{operationIdCamelCase}}RequestParams, {{/allParams.0}}{{/useSingleRequestParameter}}extraHttpRequestParams?: any): Observable<{{{returnType}}}{{^returnType}}{}{{/returnType}}>;
41+
{{#useHttpResource}}
42+
{{#isGet}}
43+
{{> operationInterfaceHttpResource }}
44+
{{/isGet}}
45+
{{/useHttpResource}}
46+
{{^useHttpResource}}
47+
{{> operationInterfaceObservable }}
48+
{{/useHttpResource}}
49+
{{#useHttpResource}}
50+
{{^isGet}}
51+
{{> operationInterfaceObservable }}
52+
{{/isGet}}
53+
{{/useHttpResource}}
5254

5355
{{/operation}}
5456
}
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
/**
2+
* {{summary}}
3+
* {{notes}}
4+
* @endpoint {{httpMethod}} {{{vendorExtensions.x-path-from-spec}}}
5+
{{^useSingleRequestParameter}}
6+
{{#allParams}}* @param {{paramName}} {{description}}
7+
{{/allParams}}{{/useSingleRequestParameter}}{{#useSingleRequestParameter}}{{#allParams.0}}* @param requestParameters
8+
{{/allParams.0}}{{/useSingleRequestParameter}}{{#isDeprecated}}
9+
* @deprecated
10+
{{/isDeprecated}}*/
11+
{{nickname}}({{^useSingleRequestParameter}}{{#allParams}}{{paramName}}{{^required}}?{{/required}}: Signal<{{{dataType}}}> | {{{dataType}}}, {{/allParams}}{{/useSingleRequestParameter}}{{#useSingleRequestParameter}}{{#allParams.0}}requestParameters: Signal<{{#prefixParameterInterfaces}}{{classname}}{{/prefixParameterInterfaces}}{{operationIdCamelCase}}RequestParams> | {{#prefixParameterInterfaces}}{{classname}}{{/prefixParameterInterfaces}}{{operationIdCamelCase}}RequestParams, {{/allParams.0}}{{/useSingleRequestParameter}}extraHttpRequestParams?: any): HttpResourceRef<{{{returnType}}}{{^returnType}}{}{{/returnType}}>;
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
/**
2+
* {{summary}}
3+
* {{notes}}
4+
* @endpoint {{httpMethod}} {{{vendorExtensions.x-path-from-spec}}}
5+
{{^useSingleRequestParameter}}
6+
{{#allParams}}* @param {{paramName}} {{description}}
7+
{{/allParams}}{{/useSingleRequestParameter}}{{#useSingleRequestParameter}}{{#allParams.0}}* @param requestParameters
8+
{{/allParams.0}}{{/useSingleRequestParameter}}{{#isDeprecated}}
9+
* @deprecated
10+
{{/isDeprecated}}*/
11+
{{nickname}}({{^useSingleRequestParameter}}{{#allParams}}{{paramName}}{{^required}}?{{/required}}: {{{dataType}}}, {{/allParams}}{{/useSingleRequestParameter}}{{#useSingleRequestParameter}}{{#allParams.0}}requestParameters: {{#prefixParameterInterfaces}}{{classname}}{{/prefixParameterInterfaces}}{{operationIdCamelCase}}RequestParams, {{/allParams.0}}{{/useSingleRequestParameter}}extraHttpRequestParams?: any): Observable<{{{returnType}}}{{^returnType}}{}{{/returnType}}>;

0 commit comments

Comments
 (0)