From decb96b98b4e7c0ceaafde5a54112d9fb5d19cea Mon Sep 17 00:00:00 2001 From: GuyGitzMagen <96382036+GuyGitzMagen@users.noreply.github.com> Date: Mon, 20 Jun 2022 08:47:05 +0300 Subject: [PATCH] fix typescript node default enum (#12633) * Default enum value and type are seperated by . * classname is added to enum default property --- .../codegen/languages/TypeScriptNodeClientCodegen.java | 6 ++++++ .../src/main/resources/typescript-node/model.mustache | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptNodeClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptNodeClientCodegen.java index a0685ecbe98..cd5cde237a2 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptNodeClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptNodeClientCodegen.java @@ -345,4 +345,10 @@ public class TypeScriptNodeClientCodegen extends AbstractTypeScriptClientCodegen } return def; } + + @Override + public String toEnumDefaultValue(String value, String datatype) { + return datatype + "." + value; + } + } diff --git a/modules/openapi-generator/src/main/resources/typescript-node/model.mustache b/modules/openapi-generator/src/main/resources/typescript-node/model.mustache index 6c1498b1643..5b2d594a99a 100644 --- a/modules/openapi-generator/src/main/resources/typescript-node/model.mustache +++ b/modules/openapi-generator/src/main/resources/typescript-node/model.mustache @@ -19,7 +19,7 @@ export class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{ * {{{.}}} */ {{/description}} - '{{name}}'{{^required}}?{{/required}}: {{#isEnum}}{{{datatypeWithEnum}}}{{/isEnum}}{{^isEnum}}{{{dataType}}}{{#isNullable}} | null{{/isNullable}}{{/isEnum}}{{#defaultValue}} = {{{.}}}{{/defaultValue}}; + '{{name}}'{{^required}}?{{/required}}: {{#isEnum}}{{{datatypeWithEnum}}}{{/isEnum}}{{^isEnum}}{{{dataType}}}{{#isNullable}} | null{{/isNullable}}{{/isEnum}}{{#defaultValue}} = {{#isEnum}}{{classname}}.{{/isEnum}}{{{.}}}{{/defaultValue}}; {{/vars}} {{#discriminator}}