Fix Union Types Import Issue

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,65 @@ public void processOpts() {
         }
     }
 
+    @Override
+    public String toModelImport( String name){
+        if(name.contains("|")){
+            List<String> names = Arrays.asList(name.split("\\|"));
+           return names.stream()
+                   .map(withSpace->withSpace.replaceAll(" ",""))
+                   .map(noSpace->super.toModelImport(noSpace))
+                   .collect(Collectors.joining("|"));
+        }
+        return super.toModelImport(name);
+    }
+
+    protected String toModelImportForUnionTypes(String name, Function<String,String> toModelImportSingle){
+        if(name.contains("|")){
+            List<String> names = Arrays.asList(name.split("\\|"));
+            return names.stream()
+                    .map(withSpace->withSpace.replaceAll(" ",""))
+                    .map(noSpace->toModelImportSingle.apply(noSpace))
+                    .collect(Collectors.joining("|"));
+        }
+        return toModelImportSingle.apply(name);
+    }
+
+    @Override
+    public Map<String, Object> postProcessOperationsWithModels(final Map<String, Object> objs, final List<Object> allModels) {
+        Map<String, Object> objsUnderProcess=  super.postProcessOperationsWithModels(objs, allModels);
+
+        if(Boolean.valueOf(objsUnderProcess.get("hasImport").toString())){
+            objsUnderProcess.put("imports", splitUniontypeImports((List<Map<String,String>>) objsUnderProcess.get("imports")));
+        }
+        return objsUnderProcess;
+    }
+
+    protected List<Object> splitUniontypeImports(List<Map<String,String>> imports){
+        List<Object> splittedImports = Lists.newArrayList();
+        imports.forEach(
+                (importEntry)->{
+                    if(importEntry.get("import").contains("|")){
+                        String[] importsForEntry = importEntry.get("import").split("\\|");
+                        String[] classNamesForEntry = importEntry.get("classname").replaceAll(" ","").split("\\|");
+                        if(importsForEntry.length != classNamesForEntry.length){
+                            throw new RuntimeException(String.format("Size of imports and class names do not match. Imports: %s ClassNames: %s",importsForEntry.toString(),classNamesForEntry.toString()));
+                        }
+                        for(int i=0; i < importsForEntry.length;i++){
+                            Map<String,String> splittedImportEntry=   Maps.newHashMap();
+                            splittedImportEntry.put("import",importsForEntry[i]);
+                            splittedImportEntry.put("classname",classNamesForEntry[i]);
+                            if(!imports.contains(splittedImportEntry)) {
+                                splittedImports.add(splittedImportEntry);
+                            }
+                        }
+                    }else {
+                        splittedImports.add(importEntry);
+                    }
+                }
+        );
+        return splittedImports;
+    }
+
     @Override
     public void preprocessOpenAPI(OpenAPI openAPI) {
 

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

@@ -27,6 +27,7 @@
 
 import java.io.File;
 import java.util.*;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -176,7 +177,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 +195,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 +334,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)) {
@@ -359,6 +360,7 @@ public void postProcessParameter(CodegenParameter parameter) {
 
     @Override
     public Map<String, Object> postProcessOperationsWithModels(Map<String, Object> operations, List<Object> allModels) {
+        operations =  super.postProcessOperationsWithModels(operations, allModels);
         Map<String, Object> objs = (Map<String, Object>) operations.get("operations");
 
         // Add filename information for api imports
@@ -546,10 +548,13 @@ public String toModelFilename(String name) {
 
     @Override
     public String toModelImport(String name) {
-        if (importMapping.containsKey(name)) {
-            return importMapping.get(name);
-        }
-        return modelPackage() + "/" + toModelFilename(name).substring(DEFAULT_IMPORT_PREFIX.length());
+        Function<String,String> toModelImportAngular = (s) -> {
+            if (importMapping.containsKey(s)) {
+                return importMapping.get(s);
+            }
+            return modelPackage() + "/" + toModelFilename(s).substring(DEFAULT_IMPORT_PREFIX.length());
+        };
+        return toModelImportForUnionTypes(name,toModelImportAngular);
     }
 
     public String getNpmRepository() {

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptAxiosClientCodegen.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.media.Schema;
 import io.swagger.v3.parser.util.SchemaTypeUtil;
 import org.apache.commons.lang3.StringUtils;
@@ -26,7 +28,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.*;
 
@@ -148,6 +149,11 @@ public Map<String, Object> postProcessOperationsWithModels(Map<String, Object> o
         return objs;
     }
 
+    @Override
+    public String toModelImport(final String name) {
+        return toModelImportForUnionTypes(name,super::toModelImport);
+    }
+
     @Override
     public Map<String, Object> postProcessAllModels(Map<String, Object> objs) {
         Map<String, Object> result = super.postProcessAllModels(objs);

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

@@ -29,6 +29,7 @@
 
 import java.io.File;
 import java.util.*;
+import java.util.function.Function;
 
 import static org.openapitools.codegen.utils.StringUtils.camelize;
 
@@ -158,11 +159,13 @@ public String toModelFilename(String name) {
 
     @Override
     public String toModelImport(String name) {
-        if (importMapping.containsKey(name)) {
-            return importMapping.get(name);
-        }
-
-        return modelPackage() + "/" + camelize(toModelName(name), true);
+        Function<String,String> toModelImportNode = s -> {
+            if (importMapping.containsKey(s)) {
+                return importMapping.get(s);
+            }
+            return modelPackage() + "/" + camelize(toModelName(s), true);
+        };
+        return toModelImportForUnionTypes(name,toModelImportNode);
     }
 
     @Override
@@ -197,6 +200,7 @@ private List<Map<String, String>> toTsImports(CodegenModel cm, Set<String> impor
 
     @Override
     public Map<String, Object> postProcessOperationsWithModels(Map<String, Object> operations, List<Object> allModels) {
+        operations = super.postProcessOperationsWithModels(operations, allModels);
         Map<String, Object> objs = (Map<String, Object>) operations.get("operations");
 
         // The api.mustache template requires all of the auth methods for the whole api

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"
+            }
+          }
+        }
+      }
+    }
+  }
+}