diff --git a/src/openApi/v2/parser/getOperationParameterDefault.ts b/src/openApi/v2/parser/getOperationParameterDefault.ts index 9fd51cba..330c476d 100644 --- a/src/openApi/v2/parser/getOperationParameterDefault.ts +++ b/src/openApi/v2/parser/getOperationParameterDefault.ts @@ -2,16 +2,24 @@ import { OperationParameter } from '../../../client/interfaces/OperationParamete import { OpenApiParameter } from '../interfaces/OpenApiParameter'; export function getOperationParameterDefault(parameter: OpenApiParameter, operationParameter: OperationParameter): string | undefined { + if (parameter.default === undefined) { + return; + } + if (parameter.default === null) { return 'null'; } - switch (typeof parameter.default) { + const type = parameter.type || typeof parameter.default; + + switch (type) { + case 'int': + case 'integer': case 'number': if (operationParameter.export == 'enum' && operationParameter.enum.length && operationParameter.enum[parameter.default]) { return operationParameter.enum[parameter.default].value; } - return JSON.stringify(parameter.default); + return parameter.default; case 'boolean': return JSON.stringify(parameter.default); diff --git a/src/openApi/v3/parser/getModelDefault.ts b/src/openApi/v3/parser/getModelDefault.ts index 3064efc7..595588f4 100644 --- a/src/openApi/v3/parser/getModelDefault.ts +++ b/src/openApi/v3/parser/getModelDefault.ts @@ -2,16 +2,24 @@ import { Model } from '../../../client/interfaces/Model'; import { OpenApiSchema } from '../interfaces/OpenApiSchema'; export function getModelDefault(definition: OpenApiSchema, model?: Model): string | undefined { + if (definition.default === undefined) { + return; + } + if (definition.default === null) { return 'null'; } - switch (typeof definition.default) { + const type = definition.type || typeof definition.default; + + switch (type) { + case 'int': + case 'integer': case 'number': if (model && model.export == 'enum' && model.enum.length && model.enum[definition.default]) { return model.enum[definition.default].value; } - return JSON.stringify(definition.default); + return definition.default; case 'boolean': return JSON.stringify(definition.default);