Skip to content

Commit b2401a7

Browse files
feat: refactor client methods + handle queryParams in client method
1 parent 07683ce commit b2401a7

File tree

3 files changed

+43
-26
lines changed

3 files changed

+43
-26
lines changed

src/openApi/v3/parser/getOperation.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,10 @@ export const getOperation = (
8585
});
8686
}
8787

88+
if (codegen.queryParams) {
89+
operation.imports.push(codegen.queryParams);
90+
}
91+
8892
operation.parameters = operation.parameters.sort(sortByRequired);
8993

9094
return operation;

src/templates/exportService.hbs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ export class {{{name}}}{{{@root.postfix}}} {
7979
{{#if parametersQuery}}
8080
query: {
8181
{{#each parametersQuery}}
82-
'{{{prop}}}': {{{name}}},
82+
'{{{prop}}}': queryParams.{{{name}}},
8383
{{/each}}
8484
},
8585
{{/if}}

src/templates/partials/parameters.hbs

Lines changed: 38 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,41 @@
11
{{#if parameters}}
2-
{{#if @root.useOptions~}}
3-
{
4-
{{#each parameters}}
5-
{{{name}}}{{#if default}} = {{{default}}}{{/if}},
6-
{{/each}}
7-
}: {
8-
{{#each parameters}}
9-
{{#ifdef description deprecated}}
10-
/**
11-
{{#if description}}
12-
* {{{escapeComment description}}}
13-
{{/if}}
14-
{{#if deprecated}}
15-
* @deprecated
16-
{{/if}}
17-
*/
18-
{{/ifdef}}
19-
{{{name}}}{{>isRequired}}: {{>type}},
20-
{{/each}}
21-
}
22-
{{~else}}
2+
{{#if parametersPath}}
233

24-
{{#each parameters}}
25-
{{{name}}}{{>isRequired}}: {{>type}}{{#if default}} = {{{default}}}{{/if}},
26-
{{/each}}
27-
{{/if}}
4+
{{#each parametersPath}}
5+
{{{name}}}{{>isRequired}}: {{>type}}{{#if default}} = {{{default}}}{{/if}}{{#unless @last}},
6+
{{/unless}}
7+
{{~/each}}
8+
{{~/if}}
9+
{{~#if parametersPath}}{{#unless parametersBody}}{{#unless parametersQuery}}
10+
{{/unless}}{{/unless}}{{/if}}
11+
{{~#if parametersBody}}
12+
{{~#if parametersPath}},{{/if}}
13+
{{#with parametersBody}}
14+
{{{name}}}: {{>type}}
15+
{{~/with}}
16+
{{~#if parametersQuery}}, {{else}}
17+
{{/if}}
18+
{{~/if}}
19+
{{~#if parametersQuery}}
20+
{{~#if parametersPath}}{{#unless parametersBody}},{{/unless}}{{/if}}
21+
{{#if codegen.queryParams}}
22+
queryParams: {{codegen.queryParams}}
23+
{{else}}
24+
queryParams: {
25+
{{#each parametersQuery}}
26+
{{#ifdef description deprecated}}
27+
/**
28+
{{#if description}}
29+
* {{{escapeComment description}}}
30+
{{/if}}
31+
{{#if deprecated}}
32+
* @deprecated
33+
{{/if}}
34+
*/
35+
{{/ifdef}}
36+
{{{name}}}{{>isRequired}}: {{>type}},
37+
{{/each}}
38+
}
39+
{{/if}}
40+
{{/if}}
2841
{{/if}}

0 commit comments

Comments
 (0)