Skip to content

Commit 93c5769

Browse files
committed
fixed imports in typescript angular
1 parent 79a813b commit 93c5769

File tree

2 files changed

+20
-0
lines changed

2 files changed

+20
-0
lines changed

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

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
import io.swagger.codegen.v3.CodegenParameter;
1616
import io.swagger.codegen.v3.CodegenOperation;
1717
import io.swagger.codegen.v3.SupportingFile;
18+
import io.swagger.codegen.v3.utils.ModelUtils;
1819
import io.swagger.codegen.v3.utils.SemVer;
1920
import io.swagger.v3.oas.models.media.ArraySchema;
2021
import io.swagger.v3.oas.models.media.BinarySchema;
@@ -27,6 +28,9 @@
2728
import org.slf4j.Logger;
2829
import org.slf4j.LoggerFactory;
2930

31+
import static io.swagger.codegen.v3.CodegenConstants.IS_ENUM_EXT_NAME;
32+
import static io.swagger.codegen.v3.generators.handlebars.ExtensionHelper.getBooleanValue;
33+
3034
public class TypeScriptAngularClientCodegen extends AbstractTypeScriptClientCodegen {
3135

3236
private static Logger LOGGER = LoggerFactory.getLogger(TypeScriptAngularClientCodegen.class);
@@ -455,6 +459,21 @@ public Map<String, Object> postProcessModels(Map<String, Object> objs) {
455459
return result;
456460
}
457461

462+
@Override
463+
public Map<String, Object> postProcessAllModels(Map<String, Object> processedModels) {
464+
for (Map.Entry<String, Object> entry : processedModels.entrySet()) {
465+
final Map<String, Object> inner = (Map<String, Object>) entry.getValue();
466+
final List<Map<String, Object>> models = (List<Map<String, Object>>) inner.get("models");
467+
for (Map<String, Object> mo : models) {
468+
final CodegenModel codegenModel = (CodegenModel) mo.get("model");
469+
if (codegenModel.getIsAlias() && codegenModel.imports != null && !codegenModel.imports.isEmpty()) {
470+
mo.put("tsImports", toTsImports(codegenModel, codegenModel.imports));
471+
}
472+
}
473+
}
474+
return processedModels;
475+
}
476+
458477
private List<Map<String, String>> toTsImports(CodegenModel cm, Set<String> imports) {
459478
List<Map<String, String>> tsImports = new ArrayList<>();
460479
for (String im : imports) {

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ public void processComposedSchemas(CodegenModel codegenModel, Schema schema, Map
2828

2929
if (isAlias) {
3030
codegenModel.getVendorExtensions().put(CodegenConstants.IS_ALIAS_EXT_NAME, Boolean.TRUE);
31+
codegenModel.dataType = this.codegenConfig.getSchemaType(schema);
3132
this.codegenConfig.addImport(codegenModel, codegenModel.dataType);
3233
}
3334
}

0 commit comments

Comments
 (0)