archive-gh-me/openapi-typescript-codegen
1
0
Fork 0
mirror of https://github.com/ferdikoomen/openapi-typescript-codegen.git synced 2025-12-08 20:16:21 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of github.com:ferdikoomen/openapi-typescript-codegen

Browse Source 
# Conflicts:
#	src/templates/core/fetch/getHeaders.hbs
#	src/templates/core/node/getHeaders.hbs
#	src/templates/core/xhr/getHeaders.hbs
This commit is contained in:
Ferdi Koomen 2021-09-27 18:50:04 +02:00
commit f77b0b7558
3 changed files with 50 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/openApi/v3/parser/getRef.spec.ts
View File

@ -34,4 +34,28 @@ describe('getRef', () => {
type: 'integer',
});
});
it('should produce correct result for encoded ref path', () => {
expect(
getRef(
{
openapi: '3.0',
info: {
title: 'dummy',
version: '1.0',
},
paths: {
'/api/user/{id}': {
description: 'This is an Example path',
},
},
},
{
$ref: '#/paths/~1api~1user~1%7Bid%7D',
}
)
).toEqual({
description: 'This is an Example path',
});
});
});

4
src/openApi/v3/parser/getRef.ts
View File

@ -1,6 +1,9 @@
import type { OpenApi } from '../interfaces/OpenApi';
import type { OpenApiReference } from '../interfaces/OpenApiReference';
const escapedSlash = /~1/g;
const escapedTilde = /~0/g;
export function getRef<T>(openApi: OpenApi, item: T & OpenApiReference): T {
if (item.$ref) {
// Fetch the paths to the definitions, this converts:
@ -14,6 +17,7 @@ export function getRef<T>(openApi: OpenApi, item: T & OpenApiReference): T {
// if we cannot find it, then we throw an error.
let result: any = openApi;
paths.forEach((path: string): void => {
path = decodeURIComponent(path.replace(escapedSlash, '/').replace(escapedTilde, '~'));
if (result.hasOwnProperty(path)) {
result = result[path];
} else {

26
test/__snapshots__/index.spec.js.snap
View File

@ -165,11 +165,20 @@ async function getHeaders(options: ApiRequestOptions): Promise<Headers> {
const password = await resolve(options, OpenAPI.PASSWORD);
const defaultHeaders = await resolve(options, OpenAPI.HEADERS);
const headers = new Headers({
const filteredHeaders = Object.entries({
Accept: 'application/json',
...defaultHeaders,
...options.headers,
});
}).reduce((acc, [headerKey, headerValue]) => {
if (typeof headerValue !== 'undefined') {
return {
...acc,
[headerKey]: headerValue,
};
}
return acc;
}, {});
const headers = new Headers(filteredHeaders);
if (isStringWithValue(token)) {
headers.append('Authorization', \`Bearer \${token}\`);
@ -2520,11 +2529,20 @@ async function getHeaders(options: ApiRequestOptions): Promise<Headers> {
const password = await resolve(options, OpenAPI.PASSWORD);
const defaultHeaders = await resolve(options, OpenAPI.HEADERS);
const headers = new Headers({
const filteredHeaders = Object.entries({
Accept: 'application/json',
...defaultHeaders,
...options.headers,
});
}).reduce((acc, [headerKey, headerValue]) => {
if (typeof headerValue !== 'undefined') {
return {
...acc,
[headerKey]: headerValue,
};
}
return acc;
}, {});
const headers = new Headers(filteredHeaders);
if (isStringWithValue(token)) {
headers.append('Authorization', \`Bearer \${token}\`);