From 6e37ccb2eeb4a603c661e324ad505e79f2369c61 Mon Sep 17 00:00:00 2001 From: Ferdi Koomen Date: Thu, 7 Nov 2019 02:06:57 +0100 Subject: [PATCH] - Fixed format of comments --- src/openApi/v2/parser/getComment.ts | 9 ++++++++- src/openApi/v2/parser/getParameter.ts | 4 +++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/openApi/v2/parser/getComment.ts b/src/openApi/v2/parser/getComment.ts index 0b5c9564..1db502e9 100644 --- a/src/openApi/v2/parser/getComment.ts +++ b/src/openApi/v2/parser/getComment.ts @@ -1,6 +1,13 @@ +import { EOL } from 'os'; + export function getComment(comment: string | undefined): string | undefined { if (comment) { - return comment.replace(/(\r\n|\n|\r)+/g, '$1 * '); + return comment + .split(/(\r\n|\n|\r)+/g) + .filter(line => line) + .map(line => line.trim()) + .join(EOL) + .replace(/(\r\n|\n|\r)+/g, '$1 * '); } return undefined; } diff --git a/src/openApi/v2/parser/getParameter.ts b/src/openApi/v2/parser/getParameter.ts index 8d2f6d9a..5fb1d484 100644 --- a/src/openApi/v2/parser/getParameter.ts +++ b/src/openApi/v2/parser/getParameter.ts @@ -17,7 +17,7 @@ export function getParameter(openApi: OpenApi, parameter: OpenApiParameter): Par let parameterType = 'any'; let parameterBase = 'any'; let parameterTemplate: string | null = null; - const parameterImports: string[] = []; + let parameterImports: string[] = []; // If the parameter has a type than it can be a basic or generic type. if (parameter.type) { @@ -62,6 +62,7 @@ export function getParameter(openApi: OpenApi, parameter: OpenApiParameter): Par if (parameter.enum) { parameterType = getEnumType(parameter.enum); parameterBase = 'string'; + parameterImports = []; } // Check if this could be a special enum where values are documented in the description. @@ -70,6 +71,7 @@ export function getParameter(openApi: OpenApi, parameter: OpenApiParameter): Par if (enumType) { parameterType = enumType; parameterBase = 'number'; + parameterImports = []; } }