Commit 54c0fe6

author

Nicolas Dorseuil

committed

make sure parameters are array

1 parent a2720ac commit 54c0fe6Copy full SHA for 54c0fe6

File tree

+16

-9

lines changed

+16

-9

lines changed

Lines changed: 5 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,11 @@ function generateCodeSamples(props: {`
`66`	`66`	`const searchParams = new URLSearchParams();`
`67`	`67`	`const headersObject: { [k: string]: string } = {};`
`68`	`68`
`69`		`- data.operation.parameters?.forEach((param) => {`
	`69`	`+ // The parser can sometimes returns invalid parameters (an object instead of an array).`
	`70`	`+ // It should get fixed in scalar, but in the meantime we just ignore the parameters in that case.`
	`71`	`+ const params = Array.isArray(data.operation.parameters) ? data.operation.parameters : [];`
	`72`	`+`
	`73`	`+ params.forEach((param) => {`
`70`	`74`	`if (!param) {`
`71`	`75`	`return;`
`72`	`76`	`}`

Lines changed: 11 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -117,19 +117,22 @@ function getParameterGroupName(paramIn: string, context: OpenAPIClientContext):`
`117`	`117`	`/** Deduplicate parameters by name and in.`
`118`	`118`	`* Some specs have both parameters define at path and operation level.`
`119`	`119`	`* We only want to display one of them.`
	`120`	`+ * Parameters can have the wrong type (object instead of array) sometimes, we just return an empty array in that case.`
`120`	`121`	`*/`
`121`	`122`	`function deduplicateParameters(parameters: OpenAPI.Parameters): OpenAPI.Parameters {`
`122`	`123`	`const seen = new Set();`
`123`	`124`
`124`		`- return parameters.filter((param) => {`
`125`		- const key = `${param.name}:${param.in}`;
	`125`	`+ return Array.isArray(parameters)`
	`126`	`+ ? parameters.filter((param) => {`
	`127`	+ const key = `${param.name}:${param.in}`;
`126`	`128`
`127`		`- if (seen.has(key)) {`
`128`		`- return false;`
`129`		`- }`
	`129`	`+ if (seen.has(key)) {`
	`130`	`+ return false;`
	`131`	`+ }`
`130`	`132`
`131`		`- seen.add(key);`
	`133`	`+ seen.add(key);`
`132`	`134`
`133`		`- return true;`
`134`		`- });`
	`135`	`+ return true;`
	`136`	`+ })`
	`137`	`+ : [];`
`135`	`138`	`}`

Comments

(0)