sorting emitted types by category

- jaxrs client is emitted before data interfaces

Author: vojtechhabarta

typescript-generator-core/src/main/java/cz/habarta/typescript/generator/compiler/ModelCompiler.java

@@ -152,7 +152,7 @@ private <T> TsBeanModel processBean(SymbolTable symbolTable, Model model, Map<Ty
             properties.add(0, new TsPropertyModel(bean.getDiscriminantProperty(), discriminantType, settings.declarePropertiesAsReadOnly, null));
         }
 
-        return new TsBeanModel(bean.getOrigin(), isClass, beanIdentifier, typeParameters, parentType, bean.getTaggedUnionClasses(), interfaces, properties, null, null, bean.getComments());
+        return new TsBeanModel(bean.getOrigin(), TsBeanCategory.Data, isClass, beanIdentifier, typeParameters, parentType, bean.getTaggedUnionClasses(), interfaces, properties, null, null, bean.getComments());
     }
 
     private List<TsPropertyModel> processProperties(SymbolTable symbolTable, Model model, BeanModel bean, String prefix, String suffix) {
@@ -318,7 +318,7 @@ private Symbol createJaxrsResponseType(SymbolTable symbolTable, TsModel tsModel)
     private TsModel createJaxrsInterface(SymbolTable symbolTable, TsModel tsModel, JaxrsApplicationModel jaxrsApplication, Symbol responseSymbol, TsType optionsType) {
         final List<TsMethodModel> methods = processJaxrsMethods(jaxrsApplication, symbolTable, responseSymbol, optionsType, false);
         final String applicationName = getApplicationName(jaxrsApplication);
-        final TsBeanModel interfaceModel = new TsBeanModel(Application.class, false, symbolTable.getSyntheticSymbol(applicationName), null, null, null, null, null, null, methods, null);
+        final TsBeanModel interfaceModel = new TsBeanModel(Application.class, TsBeanCategory.Service, false, symbolTable.getSyntheticSymbol(applicationName), null, null, null, null, null, null, methods, null);
         tsModel.getBeans().add(interfaceModel);
         return tsModel;
     }
@@ -327,7 +327,7 @@ private TsModel createJaxrsClient(SymbolTable symbolTable, TsModel tsModel, Jaxr
         final Symbol httpClientSymbol = symbolTable.getSyntheticSymbol("HttpClient");
 
         // HttpClient interface
-        tsModel.getBeans().add(new TsBeanModel(null, false, httpClientSymbol, null, null, null, null, null, null, Arrays.asList(
+        tsModel.getBeans().add(new TsBeanModel(null, TsBeanCategory.Service, false, httpClientSymbol, null, null, null, null, null, null, Arrays.asList(
                 new TsMethodModel("request", new TsType.GenericReferenceType(responseSymbol, TsType.Any), Arrays.asList(
                         new TsParameterModel("requestConfig", new TsType.ObjectType(
                                 new TsProperty("method", TsType.String),
@@ -349,7 +349,7 @@ private TsModel createJaxrsClient(SymbolTable symbolTable, TsModel tsModel, Jaxr
         final String applicationName = getApplicationName(jaxrsApplication);
         final String applicationClientName = applicationName + "Client";
         final TsType interfaceType = settings.generateJaxrsApplicationInterface ? new TsType.ReferenceType(symbolTable.getSyntheticSymbol(applicationName)) : null;
-        final TsBeanModel clientModel = new TsBeanModel(Application.class, true, symbolTable.getSyntheticSymbol(applicationClientName), null, null, null, Utils.listFromNullable(interfaceType), null, constructor, methods, null);
+        final TsBeanModel clientModel = new TsBeanModel(Application.class, TsBeanCategory.Service, true, symbolTable.getSyntheticSymbol(applicationClientName), null, null, null, Utils.listFromNullable(interfaceType), null, constructor, methods, null);
         tsModel.getBeans().add(clientModel);
         return tsModel;
     }

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

@@ -12,7 +12,7 @@ public class TsAliasModel extends TsDeclarationModel {
     private final TsType definition;
 
     public TsAliasModel(Class<?> origin, Symbol name, List<TsType.GenericVariableType> typeParameters, TsType definition, List<String> comments) {
-        super(origin, name, comments);
+        super(origin, null, name, comments);
         this.typeParameters = typeParameters != null ? typeParameters : Collections.<TsType.GenericVariableType>emptyList();
         this.definition = definition;
     }

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

@@ -0,0 +1,11 @@
+
+package cz.habarta.typescript.generator.emitter;
+
+
+public enum TsBeanCategory {
+
+    // order of these constants determines order of emitted declarations
+    Service,
+    Data,
+
+}

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

@@ -18,8 +18,8 @@ public class TsBeanModel extends TsDeclarationModel {
     private final TsConstructorModel constructor;
     private final List<TsMethodModel> methods;
 
-    public TsBeanModel(Class<?> origin, boolean isClass, Symbol name, List<TsType.GenericVariableType> typeParameters, TsType parent, List<Class<?>> taggedUnionClasses, List<TsType> interfaces, List<TsPropertyModel> properties, TsConstructorModel constructor, List<TsMethodModel> methods, List<String> comments) {
-        super(origin, name, comments);
+    public TsBeanModel(Class<?> origin, TsBeanCategory category, boolean isClass, Symbol name, List<TsType.GenericVariableType> typeParameters, TsType parent, List<Class<?>> taggedUnionClasses, List<TsType> interfaces, List<TsPropertyModel> properties, TsConstructorModel constructor, List<TsMethodModel> methods, List<String> comments) {
+        super(origin, category, name, comments);
         this.isClass = isClass;
         this.typeParameters = Utils.listFromNullable(typeParameters);
         this.parent = parent;
@@ -76,7 +76,7 @@ public List<TsPropertyModel> getProperties() {
     }
 
     public TsBeanModel withProperties(List<TsPropertyModel> properties) {
-        return new TsBeanModel(origin, isClass, name, typeParameters, parent, taggedUnionClasses, interfaces, properties, constructor, methods, comments);
+        return new TsBeanModel(origin, category, isClass, name, typeParameters, parent, taggedUnionClasses, interfaces, properties, constructor, methods, comments);
     }
 
     public TsConstructorModel getConstructor() {
@@ -88,7 +88,7 @@ public List<TsMethodModel> getMethods() {
     }
 
     public TsBeanModel withMethods(List<TsMethodModel> methods) {
-        return new TsBeanModel(origin, isClass, name, typeParameters, parent, taggedUnionClasses, interfaces, properties, constructor, methods, comments);
+        return new TsBeanModel(origin, category, isClass, name, typeParameters, parent, taggedUnionClasses, interfaces, properties, constructor, methods, comments);
     }
 
 }

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

@@ -8,15 +8,13 @@
 public class TsDeclarationModel implements Comparable<TsDeclarationModel> {
 
     protected final Class<?> origin;
+    protected final TsBeanCategory category;
     protected final Symbol name;
     protected final List<String> comments;
 
-    public TsDeclarationModel(Symbol name, List<String> comments) {
-        this(null, name, comments);
-    }
-
-    public TsDeclarationModel(Class<?> origin, Symbol name, List<String> comments) {
+    public TsDeclarationModel(Class<?> origin, TsBeanCategory category, Symbol name, List<String> comments) {
         this.origin = origin;
+        this.category = category;
         this.name = name;
         this.comments = comments;
     }
@@ -35,7 +33,27 @@ public List<String> getComments() {
 
     @Override
     public int compareTo(TsDeclarationModel o) {
-        return name.toString().compareTo(o.name.toString());
+        final int categoryResult = compare(this.category, o.category);
+        if (categoryResult != 0) {
+            return categoryResult;
+        }
+        final int nameResult = compare(this.name.toString(), o.name.toString());
+        if (nameResult != 0) {
+            return nameResult;
+        }
+        return 0;
+    }
+
+    /**
+     * Natural order with null last.
+     * Remove on Java 8.
+     */
+    private static <T extends Comparable<T>> int compare(T o1, T o2) {
+        if (o1 != null) {
+            return o2 != null ? o1.compareTo(o2) : -1;
+        } else {
+            return o2 != null ? 1 : 0;
+        }
     }
 
     @Override

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

@@ -15,7 +15,7 @@ public class TsEnumModel<T> extends TsDeclarationModel {
     private final List<EnumMemberModel<T>> members;
 
     public TsEnumModel(Class<?> origin, Symbol name, EnumKind<T> kind, List<EnumMemberModel<T>> members, List<String> comments) {
-        super(origin, name, comments);
+        super(origin, null, name, comments);
         this.kind = kind;
         this.members = members;
     }