Add GenericBasicType to DirectoryEmitter

Author: dt-danielkaneider

.gitignore

@@ -39,3 +39,4 @@ nbactions.xml
 # generated files
 typescript-generator-core/src/test/**/*.js
 typescript-generator-core/src/test/**/*.js.map
+/.metadata

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

@@ -6,6 +6,7 @@
 import cz.habarta.typescript.generator.TsType;
 import cz.habarta.typescript.generator.TsType.BasicArrayType;
 import cz.habarta.typescript.generator.TsType.FunctionType;
+import cz.habarta.typescript.generator.TsType.GenericBasicType;
 import cz.habarta.typescript.generator.TsType.GenericReferenceType;
 import cz.habarta.typescript.generator.TsType.IndexedArrayType;
 import cz.habarta.typescript.generator.TsType.IntersectionType;
@@ -35,6 +36,10 @@ public DirectoryEmitter(Settings settings) {
         super(settings);
     }
 
+    public Output getOutput() {
+        return output;
+    }
+
     @Override
     public void emit(TsModel model, Writer output, String outputName, boolean closeOutput, boolean forceExportKeyword, int initialIndentationLevel) {
         initSettings(output, forceExportKeyword, initialIndentationLevel);
@@ -150,6 +155,7 @@ private void emitDirectoryExtensions(TsModel model, TsDeclarationModel declarati
         for (EmitterExtension emitterExtension : settings.extensions) {
             if (emitterExtension instanceof DirectoryEmitterExtension) {
                 DirectoryEmitterExtension directoryEmitter = (DirectoryEmitterExtension) emitterExtension;
+                directoryEmitter.setOutput(output);
 
                 final List<String> extensionLines = new ArrayList<>();
                 final EmitterExtension.Writer extensionWriter = line -> extensionLines.add(line);
@@ -190,12 +196,11 @@ private void collectType(Set<TsType> list, TsType type) {
             collectType(list, ((OptionalType) type).type);
         } else if (type instanceof FunctionType) {
             collectType(list, ((FunctionType) type).type);
+        } else if (type instanceof GenericBasicType) {
+            collectTypes(list, ((GenericBasicType) type).typeArguments);
         } else if (type instanceof GenericReferenceType) {
             list.add(type);
-            List<TsType> typeArguments = ((GenericReferenceType) type).typeArguments;
-            for (TsType tsType : typeArguments) {
-                collectType(list, tsType);
-            }
+            collectTypes(list, ((GenericReferenceType) type).typeArguments);
         } else if (type instanceof UnionType) {
             List<TsType> types2 = ((UnionType) type).types;
             for (TsType tsType2 : types2) {

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

@@ -1,10 +1,14 @@
 package cz.habarta.typescript.generator.emitter;
 
+import cz.habarta.typescript.generator.Output;
 import cz.habarta.typescript.generator.Settings;
 import cz.habarta.typescript.generator.emitter.EmitterExtension.Writer;
 
 public interface DirectoryEmitterExtension {
 
     void emitElement(Writer writer, Settings settings, boolean exportKeyword, TsModel model, TsDeclarationModel declaration);
 
+    default void setOutput(Output output) {
+    }
+
 }