Skip to content

Commit 275ec27

Browse files
committed
Merge branch 'master' of github.com:ferdikoomen/openapi-typescript-codegen
2 parents bfbb6d2 + d5ca21c commit 275ec27

File tree

3 files changed

+8
-5
lines changed

3 files changed

+8
-5
lines changed

src/openApi/v3/parser/getOperationParameterName.spec.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,7 @@ describe('getOperationParameterName', () => {
1313
expect(getOperationParameterName('123.foo.bar')).toEqual('fooBar');
1414
expect(getOperationParameterName('Foo-Bar')).toEqual('fooBar');
1515
expect(getOperationParameterName('FOO-BAR')).toEqual('fooBar');
16+
expect(getOperationParameterName('foo[bar]')).toEqual('fooBar');
17+
expect(getOperationParameterName('foo.bar[]')).toEqual('fooBarArray');
1618
});
1719
});

src/openApi/v3/parser/getOperationParameterName.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import { reservedWords } from '../../../utils/reservedWords';
99
export const getOperationParameterName = (value: string): string => {
1010
const clean = value
1111
.replace(/^[^a-zA-Z]+/g, '')
12+
.replace('[]', 'Array')
1213
.replace(/[^\w\-]+/g, '-')
1314
.trim();
1415
return camelCase(clean).replace(reservedWords, '_$1');

src/templates/core/OpenAPI.hbs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ export type OpenAPIConfig = {
1010
VERSION: string;
1111
WITH_CREDENTIALS: boolean;
1212
CREDENTIALS: 'include' | 'omit' | 'same-origin';
13-
TOKEN?: string | Resolver<string>;
14-
USERNAME?: string | Resolver<string>;
15-
PASSWORD?: string | Resolver<string>;
16-
HEADERS?: Headers | Resolver<Headers>;
17-
ENCODE_PATH?: (path: string) => string;
13+
TOKEN?: string | Resolver<string> | undefined;
14+
USERNAME?: string | Resolver<string> | undefined;
15+
PASSWORD?: string | Resolver<string> | undefined;
16+
HEADERS?: Headers | Resolver<Headers> | undefined;
17+
ENCODE_PATH?: ((path: string) => string) | undefined;
1818
};
1919

2020
export const OpenAPI: OpenAPIConfig = {

0 commit comments

Comments
 (0)