Merge pull request #83 from vojtechhabarta/non-const-enums-extension

vojtechhabarta · web-flow · commit 84da48ff91ea · 2016-10-01T12:03:37.000+02:00
Extension for enums without const keyword
diff --git a/typescript-generator-core/src/main/java/cz/habarta/typescript/generator/Settings.java b/typescript-generator-core/src/main/java/cz/habarta/typescript/generator/Settings.java
@@ -101,7 +101,7 @@ public void validate() {
         }
         if (outputFileType != TypeScriptFileType.implementationFile) {
             for (EmitterExtension emitterExtension : extensions) {
-                if (emitterExtension.generatesRuntimeCode()) {
+                if (emitterExtension.getFeatures().generatesRuntimeCode) {
                     throw new RuntimeException(String.format("Extension '%s' generates runtime code but 'outputFileType' parameter is not set to 'implementationFile'.",
                             emitterExtension.getClass().getSimpleName()));
                 }
@@ -118,6 +118,15 @@ public void validateFileName(File outputFile) {
         }
     }
 
+    public boolean areDefaultStringEnumsOverriddenByExtension() {
+        for (EmitterExtension extension : extensions) {
+            if (extension.getFeatures().overridesStringEnums) {
+                return true;
+            }
+        }
+        return false;
+    }
+
     private String seeLink() {
         return "For more information see 'http://vojtechhabarta.github.io/typescript-generator/doc/ModulesAndNamespaces.html'.";
     }
diff --git a/typescript-generator-core/src/main/java/cz/habarta/typescript/generator/compiler/ModelCompiler.java b/typescript-generator-core/src/main/java/cz/habarta/typescript/generator/compiler/ModelCompiler.java
@@ -46,11 +46,13 @@ public TsModel javaToTypeScript(Model model) {
         tsModel = transformDates(symbolTable, tsModel);
 
         // enums
-        if (settings.mapEnum == null || settings.mapEnum == EnumMapping.asUnion || settings.mapEnum == EnumMapping.asInlineUnion) {
-            tsModel = transformEnumsToUnions(tsModel);
-        }
-        if (settings.mapEnum == EnumMapping.asInlineUnion) {
-            tsModel = inlineEnums(tsModel, symbolTable);
+        if (!settings.areDefaultStringEnumsOverriddenByExtension()) {
+            if (settings.mapEnum == null || settings.mapEnum == EnumMapping.asUnion || settings.mapEnum == EnumMapping.asInlineUnion) {
+                tsModel = transformEnumsToUnions(tsModel);
+            }
+            if (settings.mapEnum == EnumMapping.asInlineUnion) {
+                tsModel = inlineEnums(tsModel, symbolTable);
+            }
         }
 
         // tagged unions
diff --git a/typescript-generator-core/src/main/java/cz/habarta/typescript/generator/emitter/EmitterExtension.java b/typescript-generator-core/src/main/java/cz/habarta/typescript/generator/emitter/EmitterExtension.java
@@ -6,7 +6,7 @@
 
 public abstract class EmitterExtension {
 
-    public abstract boolean generatesRuntimeCode();
+    public abstract EmitterExtensionFeatures getFeatures();
 
     public void emitElements(Writer writer, Settings settings, boolean exportKeyword, TsModel model) {
     }
diff --git a/typescript-generator-core/src/main/java/cz/habarta/typescript/generator/emitter/EmitterExtensionFeatures.java b/typescript-generator-core/src/main/java/cz/habarta/typescript/generator/emitter/EmitterExtensionFeatures.java
@@ -0,0 +1,10 @@
+
+package cz.habarta.typescript.generator.emitter;
+
+
+public class EmitterExtensionFeatures {
+
+    public boolean generatesRuntimeCode = false;
+    public boolean overridesStringEnums = false;
+
+}
diff --git a/typescript-generator-core/src/main/java/cz/habarta/typescript/generator/ext/EnumConstantsExtension.java b/typescript-generator-core/src/main/java/cz/habarta/typescript/generator/ext/EnumConstantsExtension.java
@@ -1,22 +1,24 @@
 
 package cz.habarta.typescript.generator.ext;
 
-import java.util.Collections;
-import java.util.List;
-
 import cz.habarta.typescript.generator.Settings;
 import cz.habarta.typescript.generator.compiler.EnumKind;
 import cz.habarta.typescript.generator.compiler.EnumMemberModel;
 import cz.habarta.typescript.generator.emitter.EmitterExtension;
+import cz.habarta.typescript.generator.emitter.EmitterExtensionFeatures;
 import cz.habarta.typescript.generator.emitter.TsEnumModel;
 import cz.habarta.typescript.generator.emitter.TsModel;
+import java.util.Collections;
+import java.util.List;
 
 
 public class EnumConstantsExtension extends EmitterExtension {
 
     @Override
-    public boolean generatesRuntimeCode() {
-        return true;
+    public EmitterExtensionFeatures getFeatures() {
+        final EmitterExtensionFeatures features = new EmitterExtensionFeatures();
+        features.generatesRuntimeCode = true;
+        return features;
     }
 
     @Override
@@ -33,4 +35,5 @@ public void emitElements(Writer writer, Settings settings, boolean exportKeyword
             writer.writeIndentedLine("}");
         }
     }
+
 }
diff --git a/typescript-generator-core/src/main/java/cz/habarta/typescript/generator/ext/NonConstEnumsExtension.java b/typescript-generator-core/src/main/java/cz/habarta/typescript/generator/ext/NonConstEnumsExtension.java
@@ -0,0 +1,40 @@
+
+package cz.habarta.typescript.generator.ext;
+
+import cz.habarta.typescript.generator.Settings;
+import cz.habarta.typescript.generator.compiler.EnumKind;
+import cz.habarta.typescript.generator.compiler.EnumMemberModel;
+import cz.habarta.typescript.generator.emitter.EmitterExtension;
+import cz.habarta.typescript.generator.emitter.EmitterExtensionFeatures;
+import cz.habarta.typescript.generator.emitter.TsEnumModel;
+import cz.habarta.typescript.generator.emitter.TsModel;
+import java.util.Collections;
+import java.util.List;
+
+
+public class NonConstEnumsExtension extends EmitterExtension {
+
+    @Override
+    public EmitterExtensionFeatures getFeatures() {
+        final EmitterExtensionFeatures features = new EmitterExtensionFeatures();
+        features.generatesRuntimeCode = true;
+        features.overridesStringEnums = true;
+        return features;
+    }
+
+    @Override
+    public void emitElements(Writer writer, Settings settings, boolean exportKeyword, TsModel model) {
+        String exportString = exportKeyword ? "export " : "";
+        List<TsEnumModel<String>> enums = model.getEnums(EnumKind.StringBased);
+        Collections.sort(enums);
+        for (TsEnumModel<String> tsEnum : enums) {
+            writer.writeIndentedLine("");
+            writer.writeIndentedLine(exportString + "enum " + tsEnum.getName() + " {");
+            for (EnumMemberModel<String> member : tsEnum.getMembers()) {
+                writer.writeIndentedLine(settings.indentString + member.getPropertyName() + ",");
+            }
+            writer.writeIndentedLine("}");
+        }
+    }
+
+}
diff --git a/typescript-generator-core/src/main/java/cz/habarta/typescript/generator/ext/TypeGuardsForJackson2PolymorphismExtension.java b/typescript-generator-core/src/main/java/cz/habarta/typescript/generator/ext/TypeGuardsForJackson2PolymorphismExtension.java
@@ -9,8 +9,10 @@
 public class TypeGuardsForJackson2PolymorphismExtension extends EmitterExtension {
 
     @Override
-    public boolean generatesRuntimeCode() {
-        return true;
+    public EmitterExtensionFeatures getFeatures() {
+        final EmitterExtensionFeatures features = new EmitterExtensionFeatures();
+        features.generatesRuntimeCode = true;
+        return features;
     }
 
     @Override
diff --git a/typescript-generator-core/src/test/java/cz/habarta/typescript/generator/ModulesAndNamespacesTest.java b/typescript-generator-core/src/test/java/cz/habarta/typescript/generator/ModulesAndNamespacesTest.java
@@ -3,6 +3,7 @@
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import cz.habarta.typescript.generator.emitter.EmitterExtension;
+import cz.habarta.typescript.generator.emitter.EmitterExtensionFeatures;
 import cz.habarta.typescript.generator.emitter.TsModel;
 import java.io.File;
 import org.junit.Test;
@@ -61,8 +62,10 @@ enum Align {
     private static class TestFunctionExtention extends EmitterExtension {
 
         @Override
-        public boolean generatesRuntimeCode() {
-            return true;
+        public EmitterExtensionFeatures getFeatures() {
+            final EmitterExtensionFeatures features = new EmitterExtensionFeatures();
+            features.generatesRuntimeCode = true;
+            return features;
         }
 
         @Override

Original file line number	Diff line number	Diff line change
`@@ -101,7 +101,7 @@ public void validate() {`
`101`	`101`	`}`
`102`	`102`	`if (outputFileType != TypeScriptFileType.implementationFile) {`
`103`	`103`	`for (EmitterExtension emitterExtension : extensions) {`
`104`		`- if (emitterExtension.generatesRuntimeCode()) {`
	`104`	`+ if (emitterExtension.getFeatures().generatesRuntimeCode) {`
`105`	`105`	`throw new RuntimeException(String.format("Extension '%s' generates runtime code but 'outputFileType' parameter is not set to 'implementationFile'.",`
`106`	`106`	`emitterExtension.getClass().getSimpleName()));`
`107`	`107`	`}`
`@@ -118,6 +118,15 @@ public void validateFileName(File outputFile) {`
`118`	`118`	`}`
`119`	`119`	`}`
`120`	`120`
	`121`	`+ public boolean areDefaultStringEnumsOverriddenByExtension() {`
	`122`	`+ for (EmitterExtension extension : extensions) {`
	`123`	`+ if (extension.getFeatures().overridesStringEnums) {`
	`124`	`+ return true;`
	`125`	`+ }`
	`126`	`+ }`
	`127`	`+ return false;`
	`128`	`+ }`
	`129`	`+`
`121`	`130`	`private String seeLink() {`
`122`	`131`	`return "For more information see 'http://vojtechhabarta.github.io/typescript-generator/doc/ModulesAndNamespaces.html'.";`
`123`	`132`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`
`7`	`7`	`public abstract class EmitterExtension {`
`8`	`8`
`9`		`- public abstract boolean generatesRuntimeCode();`
	`9`	`+ public abstract EmitterExtensionFeatures getFeatures();`
`10`	`10`
`11`	`11`	`public void emitElements(Writer writer, Settings settings, boolean exportKeyword, TsModel model) {`
`12`	`12`	`}`