Merge #194, refactored into ClassEnumExtension

Author: vojtechhabarta

typescript-generator-core/src/main/java/cz/habarta/typescript/generator/emitter/TsModel.java

@@ -48,6 +48,10 @@ public TsModel withBeans(List<TsBeanModel> beans) {
         return new TsModel(beans, enums, originalStringEnums, typeAliases, helpers);
     }
 
+    public TsModel withoutBeans(List<TsBeanModel> beans) {
+        return new TsModel(Utils.removeAll(this.beans, beans), enums, originalStringEnums, typeAliases, helpers);
+    }
+
     public List<TsEnumModel> getEnums() {
         return enums;
     }

typescript-generator-core/src/main/java/cz/habarta/typescript/generator/ext/ClassEnumExtension.java

@@ -0,0 +1,71 @@
+
+package cz.habarta.typescript.generator.ext;
+
+import cz.habarta.typescript.generator.Extension;
+import cz.habarta.typescript.generator.compiler.EnumKind;
+import cz.habarta.typescript.generator.compiler.EnumMemberModel;
+import cz.habarta.typescript.generator.compiler.ModelCompiler;
+import cz.habarta.typescript.generator.compiler.ModelTransformer;
+import cz.habarta.typescript.generator.compiler.SymbolTable;
+import cz.habarta.typescript.generator.emitter.EmitterExtensionFeatures;
+import cz.habarta.typescript.generator.emitter.TsBeanModel;
+import cz.habarta.typescript.generator.emitter.TsEnumModel;
+import cz.habarta.typescript.generator.emitter.TsModel;
+import java.lang.reflect.Field;
+import java.util.*;
+
+
+public class ClassEnumExtension extends Extension {
+
+    public static final String CFG_CLASS_ENUM_PATTERN = "classEnumPattern";
+
+    private String classEnumPattern = "ClassEnum";
+
+    @Override
+    public EmitterExtensionFeatures getFeatures() {
+        return new EmitterExtensionFeatures();
+    }
+
+    @Override
+    public void setConfiguration(Map<String, String> configuration) throws RuntimeException {
+        if (configuration.containsKey(CFG_CLASS_ENUM_PATTERN)) {
+            classEnumPattern = configuration.get(CFG_CLASS_ENUM_PATTERN);
+        }
+    }
+
+    @Override
+    public List<TransformerDefinition> getTransformers() {
+        return Arrays.asList(new TransformerDefinition(ModelCompiler.TransformationPhase.BeforeEnums, new ModelTransformer() {
+            @Override
+            public TsModel transformModel(SymbolTable symbolTable, TsModel model) {
+                List<TsBeanModel> beans = model.getBeans();
+
+                List<TsBeanModel> classEnums = new ArrayList<>();
+                for (TsBeanModel bean : beans) {
+                    if (bean.getName().getSimpleName().contains(classEnumPattern))
+                        classEnums.add(bean);
+                }
+
+                List<TsEnumModel> stringEnums = new ArrayList<>();
+                for (TsBeanModel tsBeanModel : classEnums) {
+                    List<EnumMemberModel> members = new ArrayList<>();
+                    for (Field declaredField : tsBeanModel.getOrigin().getDeclaredFields()) {
+                        if (declaredField.getType().getName().equals(tsBeanModel.getOrigin().getName())) {
+                            members.add(new EnumMemberModel(declaredField.getName(), declaredField.getName(), null));
+                        }
+                    }
+                    TsEnumModel temp = new TsEnumModel(
+                            tsBeanModel.getOrigin(),
+                            tsBeanModel.getName(),
+                            EnumKind.StringBased,
+                            members,
+                            null
+                    );
+                    stringEnums.add(temp);
+                }
+
+                return model.withEnums(stringEnums).withoutBeans(classEnums);
+            }
+        }));
+    }
+}

typescript-generator-core/src/test/java/cz/habarta/typescript/generator/DummyClassEnum.java

@@ -0,0 +1,27 @@
+package cz.habarta.typescript.generator;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+
+import java.util.Objects;
+
+public class DummyClassEnum {
+
+    public static final DummyClassEnum ATYPE  = new DummyClassEnum("ATYPE");
+    public static final DummyClassEnum BTYPE  = new DummyClassEnum("BTYPE");
+    public static final DummyClassEnum CTYPE  = new DummyClassEnum("CTYPE");
+
+    private final String value;
+
+    @JsonCreator
+    public DummyClassEnum(String value) {
+        this.value = Objects.requireNonNull(value);
+    }
+
+    @JsonValue
+    public String getValue() { return value; }
+
+    @Override
+    public String toString() { return value; }
+
+}

typescript-generator-core/src/test/java/cz/habarta/typescript/generator/EnumTest.java

@@ -4,8 +4,7 @@
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonValue;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
+import cz.habarta.typescript.generator.ext.ClassEnumExtension;
 import java.util.*;
 import static org.junit.Assert.*;
 import org.junit.Test;
@@ -95,6 +94,25 @@ public void testEnumAsEnum() {
         assertEquals(expected.trim(), output.trim());
     }
 
+    @Test
+    public void testClassAsEnum() {
+        final Settings settings = TestUtils.settings();
+        settings.mapEnum = EnumMapping.asEnum;
+        settings.jsonLibrary = JsonLibrary.jaxb;
+        final ClassEnumExtension classEnumExtension = new ClassEnumExtension();
+        classEnumExtension.setConfiguration(Collections.singletonMap("classEnumPattern", "ClassEnum"));
+        settings.extensions.add(classEnumExtension);
+        final String output = new TypeScriptGenerator(settings).generateTypeScript(Input.from(DummyClassEnum.class));
+        final String expected = (
+            "\ndeclare const enum DummyClassEnum {\n" +
+            "    ATYPE = 'ATYPE',\n" +
+            "    BTYPE = 'BTYPE',\n" +
+            "    CTYPE = 'CTYPE',\n" +
+            "}\n"
+        ).replace("'", "\"");
+        assertEquals(expected.trim(), output.trim());
+    }
+
     @Test
     public void testEnumWithJsonPropertyAnnotations() {
         final Settings settings = TestUtils.settings();