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

Fixed #596

Browse Source
This commit is contained in:
Ferdi Koomen 2021-03-12 21:19:56 +01:00
parent fb7caaeb78
commit 13bf29c198
8 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/openApi/v2/parser/escapeDescription.spec.ts
View File

@ -9,5 +9,6 @@ describe('escapeDescription', () => {
expect(escapeDescription('')).toEqual('');
expect(escapeDescription('fooBar')).toEqual('fooBar');
expect(escapeDescription('foo \\`test\\` bar')).toEqual('foo \\`test\\` bar');
expect(escapeDescription('foo */bar/*')).toEqual('foo *_/bar/*');
});
});

2
src/openApi/v2/parser/escapeDescription.ts
View File

@ -1,3 +1,3 @@
export function escapeDescription(value: string): string {
return value.replace(/([^\\])`/g, '$1\\`');
return value.replace(/([^\\])`/g, '$1\\`').replace(/(\*\/)/g, '*_/');
}

1
src/openApi/v2/parser/getComment.spec.ts
View File

@ -8,6 +8,7 @@ describe('getComment', () => {
expect(getComment('')).toEqual(null);
expect(getComment('Hello')).toEqual('Hello');
expect(getComment('Hello World!')).toEqual('Hello World!');
expect(getComment('Testing */escape/*')).toEqual('Testing *_/escape/*');
expect(getComment('Testing multiline comments.\nThis must go to the next line.\n\nThis will contain a break.')).toEqual(multiline);
expect(getComment('Testing multiline comments.\r\nThis must go to the next line.\r\n\r\nThis will contain a break.')).toEqual(multiline);
});

2
src/openApi/v2/parser/getComment.ts
View File

@ -7,7 +7,7 @@ import { EOL } from 'os';
*/
export function getComment(comment?: string): string | null {
if (comment) {
return comment.replace(/\r?\n(.*)/g, (_, w) => `${EOL} * ${w.trim()}`);
return comment.replace(/(\*\/)/g, '*_/').replace(/\r?\n(.*)/g, (_, w) => `${EOL} * ${w.trim()}`);
}
return null;
}

1
src/openApi/v3/parser/escapeDescription.spec.ts
View File

@ -9,5 +9,6 @@ describe('escapeDescription', () => {
expect(escapeDescription('')).toEqual('');
expect(escapeDescription('fooBar')).toEqual('fooBar');
expect(escapeDescription('foo \\`test\\` bar')).toEqual('foo \\`test\\` bar');
expect(escapeDescription('foo */bar/*')).toEqual('foo *_/bar/*');
});
});

2
src/openApi/v3/parser/escapeDescription.ts
View File

@ -1,3 +1,3 @@
export function escapeDescription(value: string): string {
return value.replace(/([^\\])`/g, '$1\\`');
return value.replace(/([^\\])`/g, '$1\\`').replace(/(\*\/)/g, '*_/');
}

1
src/openApi/v3/parser/getComment.spec.ts
View File

@ -8,6 +8,7 @@ describe('getComment', () => {
expect(getComment('')).toEqual(null);
expect(getComment('Hello')).toEqual('Hello');
expect(getComment('Hello World!')).toEqual('Hello World!');
expect(getComment('Testing */escape/*')).toEqual('Testing *_/escape/*');
expect(getComment('Testing multiline comments.\nThis must go to the next line.\n\nThis will contain a break.')).toEqual(multiline);
expect(getComment('Testing multiline comments.\r\nThis must go to the next line.\r\n\r\nThis will contain a break.')).toEqual(multiline);
});

2
src/openApi/v3/parser/getComment.ts
View File

@ -7,7 +7,7 @@ import { EOL } from 'os';
*/
export function getComment(comment?: string): string | null {
if (comment) {
return comment.replace(/\r?\n(.*)/g, (_, w) => `${EOL} * ${w.trim()}`);
return comment.replace(/(\*\/)/g, '*_/').replace(/\r?\n(.*)/g, (_, w) => `${EOL} * ${w.trim()}`);
}
return null;
}