Merge pull request #548 from swagger-api/codegen-issue-9339-typescript

set composed schemas alias in order to fix issue

Author: HugoMario

src/main/java/io/swagger/codegen/v3/generators/DefaultCodegenConfig.java

@@ -1387,9 +1387,11 @@ else if (schema instanceof ComposedSchema) {
                 }
             }
             if (oneOf != null && !oneOf.isEmpty()) {
+                codegenModel.dataType = getSchemaType(composed);
                 this.schemaHandler.configureOneOfModel(codegenModel, oneOf);
             }
             if (anyOf != null && !anyOf.isEmpty()) {
+                codegenModel.dataType = getSchemaType(composed);
                 this.schemaHandler.configureAnyOfModel(codegenModel, anyOf);
             }
             if (parent != null) {

src/main/java/io/swagger/codegen/v3/generators/SchemaHandler.java

@@ -6,7 +6,6 @@
 import io.swagger.codegen.v3.CodegenProperty;
 import io.swagger.codegen.v3.generators.util.OpenAPIUtil;
 import io.swagger.v3.oas.models.media.ComposedSchema;
-import io.swagger.v3.oas.models.media.ObjectSchema;
 import io.swagger.v3.oas.models.media.Schema;
 import org.apache.commons.lang3.StringUtils;
 
@@ -15,7 +14,7 @@
 
 public class SchemaHandler {
 
-    private DefaultCodegenConfig codegenConfig;
+    protected DefaultCodegenConfig codegenConfig;
 
     public SchemaHandler(DefaultCodegenConfig codegenConfig) {
         this.codegenConfig = codegenConfig;

src/main/java/io/swagger/codegen/v3/generators/typescript/AbstractTypeScriptClientCodegen.java

@@ -114,6 +114,7 @@ public AbstractTypeScriptClientCodegen() {
         cliOptions.add(new CliOption(CodegenConstants.MODEL_PROPERTY_NAMING, CodegenConstants.MODEL_PROPERTY_NAMING_DESC).defaultValue("camelCase"));
         cliOptions.add(new CliOption(CodegenConstants.SUPPORTS_ES6, CodegenConstants.SUPPORTS_ES6_DESC).defaultValue("false"));
 
+        schemaHandler = new TypeScriptSchemaHandler(this);
     }
 
     @Override
@@ -242,7 +243,7 @@ public String getTypeDeclaration(Schema propertySchema) {
     }
 
     @Override
-    protected void addImport(CodegenModel codegenModel, String type) {
+    public void addImport(CodegenModel codegenModel, String type) {
         if (type == null) {
             return;
         }
@@ -286,9 +287,9 @@ public String toDefaultValue(Schema propertySchema) {
     }
 
     @Override
-    public String getSchemaType(Schema schema) {
+    public String  getSchemaType(Schema schema) {
         String swaggerType = super.getSchemaType(schema);
-        if (swaggerType == null && schema instanceof ComposedSchema) {
+        if (schema instanceof ComposedSchema) {
             ComposedSchema composedSchema = (ComposedSchema)schema;
             if (composedSchema.getAllOf() != null && !composedSchema.getAllOf().isEmpty()) {
                 return String.join(" & ", getTypesFromInterfaces(composedSchema.getAllOf()));

src/main/java/io/swagger/codegen/v3/generators/typescript/TypeScriptSchemaHandler.java

@@ -0,0 +1,29 @@
+package io.swagger.codegen.v3.generators.typescript;
+
+import io.swagger.codegen.v3.CodegenConstants;
+import io.swagger.codegen.v3.CodegenModel;
+import io.swagger.codegen.v3.generators.DefaultCodegenConfig;
+import io.swagger.codegen.v3.generators.SchemaHandler;
+import io.swagger.v3.oas.models.media.Schema;
+
+import java.util.List;
+
+public class TypeScriptSchemaHandler extends SchemaHandler {
+
+    private AbstractTypeScriptClientCodegen codegenConfig;
+
+    public TypeScriptSchemaHandler(DefaultCodegenConfig codegenConfig) {
+        super(codegenConfig);
+        this.codegenConfig = (AbstractTypeScriptClientCodegen) codegenConfig;
+    }
+
+    public void configureOneOfModel(CodegenModel codegenModel, List<Schema> oneOf) {
+        codegenModel.getVendorExtensions().put(CodegenConstants.IS_ALIAS_EXT_NAME, Boolean.TRUE);
+        this.codegenConfig.addImport(codegenModel, codegenModel.dataType);
+    }
+
+    public void configureAnyOfModel(CodegenModel codegenModel, List<Schema> anyOf) {
+        codegenModel.getVendorExtensions().put(CodegenConstants.IS_ALIAS_EXT_NAME, Boolean.TRUE);
+        this.codegenConfig.addImport(codegenModel, codegenModel.dataType);
+    }
+}