Fix Union Types Import Issue

modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenConfig.java

@@ -174,6 +174,8 @@ public interface CodegenConfig {
 
     String toModelImport(String name);
 
+    Map<String,String> toModelImportMap(String name);
+
     String toApiImport(String name);
 
     void addOperationToGroup(String tag, String resourcePath, Operation operation, CodegenOperation co, Map<String, List<CodegenOperation>> operations);

modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java

@@ -22,6 +22,7 @@
 import com.github.benmanes.caffeine.cache.Ticker;
 import com.google.common.base.CaseFormat;
 import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.Maps;
 import com.samskivert.mustache.Mustache;
 import com.samskivert.mustache.Mustache.Compiler;
 import com.samskivert.mustache.Mustache.Lambda;
@@ -1367,6 +1368,16 @@ public String toModelImport(String name) {
         }
     }
 
+    /**
+     * Returns the same content as [[toModelImport]] with key the fully-qualified Model name and value the initial input.
+     * In case of union types this method has a key for each separate model and import.
+     * @param name the name of the "Model"
+     * @return Map of fully-qualified models.
+     */
+    public Map<String,String> toModelImportMap(String name){
+        return Collections.singletonMap(this.toModelImport(name),name);
+    }
+
     /**
      * Return the fully-qualified "Api" name for import
      *

modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultGenerator.java

@@ -17,6 +17,8 @@
 
 package org.openapitools.codegen;
 
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
 import io.swagger.v3.core.util.Json;
 import io.swagger.v3.oas.models.OpenAPI;
 import io.swagger.v3.oas.models.Operation;
@@ -1077,24 +1079,8 @@ private Map<String, Object> processOperations(CodegenConfig config, String tag,
             allImports.addAll(op.imports);
         }
 
-        List<Map<String, String>> imports = new ArrayList<>();
-        Set<String> mappingSet = new TreeSet<>();
-        for (String nextImport : allImports) {
-            Map<String, String> im = new LinkedHashMap<>();
-            String mapping = config.importMapping().get(nextImport);
-            if (mapping == null) {
-                mapping = config.toModelImport(nextImport);
-            }
-
-            if (mapping != null && !mappingSet.contains(mapping)) { // ensure import (mapping) is unique
-                mappingSet.add(mapping);
-                im.put("import", mapping);
-                im.put("classname", nextImport);
-                if (!imports.contains(im)) { // avoid duplicates
-                    imports.add(im);
-                }
-            }
-        }
+        Map<String,String> mappings = getAllImportsMapppings(allImports);
+        List<Map<String, String>> imports = toImportsObjects(mappings);
 
         operations.put("imports", imports);
 
@@ -1115,6 +1101,32 @@ private Map<String, Object> processOperations(CodegenConfig config, String tag,
         return operations;
     }
 
+    private Map<String,String> getAllImportsMapppings(Set<String> allImports){
+        Map<String,String> result = Maps.newHashMap();
+        allImports.forEach(nextImport->{
+            String mapping = config.importMapping().get(nextImport);
+            if(mapping!= null){
+                result.put(mapping,nextImport);
+            }else{
+                result.putAll(config.toModelImportMap(nextImport));
+            }
+        });
+        return result;
+    }
+
+    private List<Map<String,String>> toImportsObjects(Map<String,String> mappedImports){
+        List<Map<String, String>> result = Lists.newArrayList();
+        mappedImports.entrySet().forEach(mapping->{
+            Map<String, String> im = new LinkedHashMap<>();
+            im.put("import", mapping.getKey());
+            im.put("classname", mapping.getValue());
+            if (!result.contains(im)) { // avoid duplicates
+                result.add(im);
+                }
+        });
+        return result;
+     }
+
     private Map<String, Object> processModels(CodegenConfig config, Map<String, Schema> definitions) {
         Map<String, Object> objs = new HashMap<>();
         objs.put("package", config.modelPackage());

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractTypeScriptClientCodegen.java

@@ -17,6 +17,8 @@
 
 package org.openapitools.codegen.languages;
 
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
 import io.swagger.v3.oas.models.OpenAPI;
 import io.swagger.v3.oas.models.media.ArraySchema;
 import io.swagger.v3.oas.models.media.ComposedSchema;
@@ -35,6 +37,7 @@
 import java.io.File;
 import java.text.SimpleDateFormat;
 import java.util.*;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -221,6 +224,38 @@ public void processOpts() {
         }
     }
 
+    @Override
+    public String toModelImport( String name){
+        if(name.contains("|")){
+           List<String> names = Arrays.asList(name.split("\\|"));
+           LOGGER.warn("The import is a union type. Consider using the toModelImportMap method.");
+           return names.stream()
+                   .map(withSpace->withSpace.replaceAll(" ",""))
+                   .map(noSpace->super.toModelImport(noSpace))
+                   .collect(Collectors.joining("|"));
+        }
+        return super.toModelImport(name);
+    }
+
+    /**
+     * Maps the fully qualified model import to the initial given name. In case of union types the map will have multiple entries.
+     * For example for "classA | classB" the map will two entries have ["model.classA","classA"] and ["model.classB","classB"].
+     *
+     * @param name the name of the "Model"
+     * @return Map between the fully qualified model import and the initial given name.
+     */
+    @Override
+    public Map<String,String> toModelImportMap( String name){
+        if(name.contains("|")){
+            List<String> names = Arrays.asList(name.replace(" ","").split("\\|"));
+            Map<String,String> result = Maps.newHashMap();
+            names.forEach(s->result.put(toModelImport(s),s));
+            return  result;
+        }
+        return Collections.singletonMap(toModelImport(name),name);
+    }
+
+
     @Override
     public void preprocessOpenAPI(OpenAPI openAPI) {
 

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptAngularClientCodegen.java

@@ -176,7 +176,7 @@ public void processOpts() {
                 apiTemplateFiles.put("apiInterface.mustache", "Interface.ts");
             }
         }
-        
+
         if (additionalProperties.containsKey(USE_SINGLE_REQUEST_PARAMETER)) {
             this.setUseSingleRequestParameter(convertPropertyToBoolean(USE_SINGLE_REQUEST_PARAMETER));
         }
@@ -194,7 +194,7 @@ public void processOpts() {
             ));
         }
 
-        if (ngVersion.atLeast("9.0.0")) {                
+        if (ngVersion.atLeast("9.0.0")) {
             additionalProperties.put(ENFORCE_GENERIC_MODULE_WITH_PROVIDERS, true);
         } else {
             additionalProperties.put(ENFORCE_GENERIC_MODULE_WITH_PROVIDERS, false);
@@ -333,7 +333,7 @@ public boolean getQueryParamObjectFormatKey() {
     public boolean isDataTypeFile(final String dataType) {
         return dataType != null && dataType.equals("Blob");
     }
- 
+
     @Override
     public String getTypeDeclaration(Schema p) {
         if (ModelUtils.isFileSchema(p)) {
@@ -470,48 +470,11 @@ public Map<String, Object> postProcessAllModels(Map<String, Object> objs) {
                         cm.imports.remove(cm.parent);
                     }
                 }
-                // Add additional filename information for imports
-                Set<String> parsedImports = parseImports(cm);
-                mo.put("tsImports", toTsImports(cm, parsedImports));
             }
         }
         return result;
     }
 
-    /**
-     * Parse imports
-     */
-    private Set<String> parseImports(CodegenModel cm) {
-        Set<String> newImports = new HashSet<String>();
-        if (cm.imports.size() > 0) {
-            for (String name : cm.imports) {
-                if (name.indexOf(" | ") >= 0) {
-                    String[] parts = name.split(" \\| ");
-                    for (String s : parts) {
-                        newImports.add(s);
-                    }
-                } else {
-                    newImports.add(name);
-                }
-            }
-        }
-        return newImports;
-    }
-
-    private List<Map<String, String>> toTsImports(CodegenModel cm, Set<String> imports) {
-        List<Map<String, String>> tsImports = new ArrayList<>();
-        for (String im : imports) {
-            if (!im.equals(cm.classname)) {
-                HashMap<String, String> tsImport = new HashMap<>();
-                // TVG: This is used as class name in the import statements of the model file
-                tsImport.put("classname", im);
-                tsImport.put("filename", toModelFilename(removeModelPrefixSuffix(im)));
-                tsImports.add(tsImport);
-            }
-        }
-        return tsImports;
-    }
-
     @Override
     public String toApiName(String name) {
         if (name.length() == 0) {
@@ -549,7 +512,7 @@ public String toModelImport(String name) {
         if (importMapping.containsKey(name)) {
             return importMapping.get(name);
         }
-        return modelPackage() + "/" + toModelFilename(name).substring(DEFAULT_IMPORT_PREFIX.length());
+    return modelPackage() + "/" + toModelFilename(name).substring(DEFAULT_IMPORT_PREFIX.length());
     }
 
     public String getNpmRepository() {

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptAxiosClientCodegen.java

@@ -26,7 +26,6 @@
 import org.openapitools.codegen.CodegenOperation;
 import org.openapitools.codegen.SupportingFile;
 import org.openapitools.codegen.meta.features.DocumentationFeature;
-import org.openapitools.codegen.utils.ModelUtils;
 
 import java.util.*;
 
@@ -134,7 +133,6 @@ public void processOpts() {
 
     @Override
     public Map<String, Object> postProcessOperationsWithModels(Map<String, Object> objs, List<Object> allModels) {
-        objs = super.postProcessOperationsWithModels(objs, allModels);
         Map<String, Object> vals = (Map<String, Object>) objs.getOrDefault("operations", new HashMap<>());
         List<CodegenOperation> operations = (List<CodegenOperation>) vals.getOrDefault("operation", new ArrayList<>());
         /*

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptNodeClientCodegen.java

@@ -161,7 +161,6 @@ public String toModelImport(String name) {
         if (importMapping.containsKey(name)) {
             return importMapping.get(name);
         }
-
         return modelPackage() + "/" + camelize(toModelName(name), true);
     }
 

modules/openapi-generator/src/test/java/org/openapitools/codegen/typescript/SharedTypeScriptTest.java

@@ -0,0 +1,49 @@
+package org.openapitools.codegen.typescript;
+
+import org.apache.commons.io.FileUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.openapitools.codegen.DefaultGenerator;
+import org.openapitools.codegen.Generator;
+import org.openapitools.codegen.config.CodegenConfigurator;
+import org.openapitools.codegen.languages.TypeScriptAxiosClientCodegen;
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.List;
+
+public class SharedTypeScriptTest {
+    @Test
+    public void splitImport() throws IOException {
+        CodegenConfigurator config =
+                new CodegenConfigurator()
+                        .setInputSpec("split-import.json")
+                        .setModelPackage("model")
+                        .setApiPackage("api")
+                        .addAdditionalProperty(
+                                TypeScriptAxiosClientCodegen.SEPARATE_MODELS_AND_API, true);
+
+        config.setGeneratorName("typescript-axios");
+        checkAPIFile(getGenerator(config).generate(), "default-api.ts");
+
+        config.setGeneratorName("typescript-node");
+        checkAPIFile(getGenerator(config).generate(), "defaultApi.ts");
+
+        config.setGeneratorName("typescript-angular");
+        checkAPIFile(getGenerator(config).generate(), "default.service.ts");
+
+    }
+
+    private Generator getGenerator(CodegenConfigurator config) {
+        return new DefaultGenerator().opts(config.toClientOptInput());
+    }
+
+    private void checkAPIFile(List<File> files, String apiFileName) throws IOException {
+        File apiFile = files.stream().filter(file->file.getName().contains(apiFileName)).findFirst().get();
+        String apiFileContent = FileUtils.readFileToString(apiFile);
+        Assert.assertTrue(!apiFileContent.contains("import { OrganizationWrapper | PersonWrapper }"));
+        Assert.assertEquals(StringUtils.countMatches(apiFileContent,"import { PersonWrapper }"),1);
+        Assert.assertEquals(StringUtils.countMatches(apiFileContent,"import { OrganizationWrapper }"),1);
+    }
+}

modules/openapi-generator/src/test/resources/split-import.json

@@ -0,0 +1,74 @@
+{
+  "openapi": "3.0.2",
+  "info": {
+    "title": "SAP Graph - Customers API",
+    "version": "0.1.0"
+  },
+  "paths": {
+    "/Customer": {
+      "get": {
+        "operationId": "getCustomer",
+        "responses": {
+          "200": {
+            "$ref": "#/components/responses/CustomerResponse"
+          }
+        }
+      }
+    },
+    "/Person": {
+      "get": {
+        "operationId": "getPerson",
+        "responses": {
+          "200": {
+            "$ref": "#/components/responses/PersonResponse"
+          }
+        }
+      }
+    }
+  },
+  "components": {
+    "schemas": {
+      "OrganizationWrapper": {
+        "type": "object",
+        "properties": {
+          "id":  {"type": "string"}
+        }
+      },
+      "PersonWrapper": {
+        "type": "object",
+        "properties": {
+          "id":  {"type": "string"}
+        }
+      }
+    },
+    "responses": {
+      "CustomerResponse": {
+        "description": "Get Customer",
+        "content": {
+          "application/json": {
+            "schema": {
+              "oneOf": [
+                {
+                  "$ref": "#/components/schemas/OrganizationWrapper"
+                },
+                {
+                  "$ref": "#/components/schemas/PersonWrapper"
+                }
+              ]
+            }
+          }
+        }
+      },
+      "PersonResponse": {
+        "description": "Get Person",
+        "content": {
+          "application/json": {
+            "schema": {
+              "$ref": "#/components/schemas/PersonWrapper"
+            }
+          }
+        }
+      }
+    }
+  }
+}