setting for sorting type declarations (properties retains original order)

Author: vojtechhabarta

typescript-generator-core/src/main/java/cz/habarta/typescript/generator/Settings.java

@@ -19,5 +19,6 @@ public class Settings {
     public DateMapping mapDate = DateMapping.asDate;
     public TypeProcessor customTypeProcessor = null;
     public boolean sortDeclarations = false;
+    public boolean sortTypeDeclarations = false;
     public boolean noFileComment = false;
 }

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

@@ -40,9 +40,6 @@ private void emitFileComment() {
     }
 
     private void emitModule(TsModel model) {
-        if (settings.sortDeclarations) {
-            model.sort();
-        }
         if (settings.module != null) {
             writeNewLine();
             writeIndentedLine("declare module '" + settings.module + "' {");
@@ -78,12 +75,20 @@ private void emitObjects(TsModel model) {
 
     private void emitInterfaces(TsModel model) {
         String exportPrefix = forceExportKeyword ? "export " : "";
-        for (TsBeanModel bean : model.getBeans()) {
+        final List<TsBeanModel> beans = model.getBeans();
+        if (settings.sortDeclarations || settings.sortTypeDeclarations) {
+            Collections.sort(beans);
+        }
+        for (TsBeanModel bean : beans) {
             writeNewLine();
             final String parent = bean.getParent() != null ? " extends " + bean.getParent() : "";
             writeIndentedLine(exportPrefix + "interface " + bean.getName() + parent + " {");
             indent++;
-            for (TsPropertyModel property : bean.getProperties()) {
+            final List<TsPropertyModel> properties = bean.getProperties();
+            if (settings.sortDeclarations) {
+                Collections.sort(properties);
+            }
+            for (TsPropertyModel property : properties) {
                 emitProperty(property);
             }
             indent--;

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

@@ -2,9 +2,7 @@
 package cz.habarta.typescript.generator.emitter;
 
 import cz.habarta.typescript.generator.*;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
+import java.util.*;
 
 
 public class TsBeanModel implements Comparable<TsBeanModel> {
@@ -40,7 +38,4 @@ public int compareTo(TsBeanModel o) {
         return name.toString().compareTo(o.name.toString());
     }
 
-    public void sort() {
-        Collections.sort(properties);
-    }
 }

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

@@ -18,10 +18,4 @@ public LinkedHashSet<TsType.AliasType> getTypeAliases() {
         return typeAliases;
     }
 
-    public void sort() {
-        for (TsBeanModel bean : beans) {
-            bean.sort();
-        }
-        Collections.sort(beans);
-    }
 }

typescript-generator-gradle-plugin/src/main/java/cz/habarta/typescript/generator/gradle/GenerateTask.java

@@ -27,6 +27,7 @@ public class GenerateTask extends DefaultTask {
     public DateMapping mapDate;
     public String customTypeProcessor;
     public boolean sortDeclarations;
+    public boolean sortTypeDeclarations;
     public boolean noFileComment;
 
 
@@ -65,6 +66,7 @@ public void generate() throws Exception {
             settings.customTypeProcessor = (TypeProcessor) classLoader.loadClass(customTypeProcessor).newInstance();
         }
         settings.sortDeclarations = sortDeclarations;
+        settings.sortTypeDeclarations = sortTypeDeclarations;
         settings.noFileComment = noFileComment;
 
         // TypeScriptGenerator

typescript-generator-maven-plugin/src/main/java/cz/habarta/typescript/generator/maven/GenerateMojo.java

@@ -128,6 +128,12 @@ public class GenerateMojo extends AbstractMojo {
     @Parameter
     private boolean sortDeclarations;
 
+    /**
+     * If true TypeScript type declarations (interfaces) will be sorted alphabetically.
+     */
+    @Parameter
+    private boolean sortTypeDeclarations;
+
     /**
      * If true generated file will not contain comment at the top.
      * By default there is a comment with timestamp and typescript-generator version.
@@ -167,6 +173,7 @@ public void execute() {
                 settings.customTypeProcessor = (TypeProcessor) classLoader.loadClass(customTypeProcessor).newInstance();
             }
             settings.sortDeclarations = sortDeclarations;
+            settings.sortTypeDeclarations = sortTypeDeclarations;
             settings.noFileComment = noFileComment;
 
             // TypeScriptGenerator