Skip to content

Commit bd68761

Browse files
committed
fix: bug #1433
1 parent 637935c commit bd68761

9 files changed

Lines changed: 608 additions & 1170 deletions

File tree

.changeset/pretty-chicken-film.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"swagger-typescript-api": patch
3+
---
4+
5+
fixed bug linked with unused query param (bug #1433 , 1 point)

templates/default/procedure-call.ejs

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,16 @@ const requestConfigParam = {
2121
2222
const argToTmpl = ({ name, optional, type, defaultValue }) => `${name}${!defaultValue && optional ? '?' : ''}: ${type}${defaultValue ? ` = ${defaultValue}` : ''}`;
2323
24+
const extractedRequestParamsName = pathParams.length
25+
? query
26+
? `{ ${_.join(pathParamsNames, ", ")}, ...${queryName} }`
27+
: `{ ${_.join(pathParamsNames, ", ")} }`
28+
: queryName;
29+
2430
const rawWrapperArgs = config.extractRequestParams ?
2531
_.compact([
2632
requestParams && {
27-
name: pathParams.length ? `{ ${_.join(pathParamsNames, ", ")}, ...${queryName} }` : queryName,
33+
name: extractedRequestParamsName,
2834
optional: false,
2935
type: getInlineParseContent(requestParams),
3036
},

templates/modular/procedure-call.ejs

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,16 @@ const requestConfigParam = {
2121
2222
const argToTmpl = ({ name, optional, type, defaultValue }) => `${name}${!defaultValue && optional ? '?' : ''}: ${type}${defaultValue ? ` = ${defaultValue}` : ''}`;
2323
24+
const extractedRequestParamsName = pathParams.length
25+
? query
26+
? `{ ${_.join(pathParamsNames, ", ")}, ...${queryName} }`
27+
: `{ ${_.join(pathParamsNames, ", ")} }`
28+
: queryName;
29+
2430
const rawWrapperArgs = config.extractRequestParams ?
2531
_.compact([
2632
requestParams && {
27-
name: pathParams.length ? `{ ${_.join(pathParamsNames, ", ")}, ...${queryName} }` : queryName,
33+
name: extractedRequestParamsName,
2834
optional: false,
2935
type: getInlineParseContent(requestParams),
3036
},

0 commit comments

Comments
 (0)