Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Typescript] update addImport method (fix oneOf) #11689

Merged
merged 9 commits into from
May 30, 2022
Merged

[Typescript] update addImport method (fix oneOf) #11689

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
4aabae3
fix addImport method
ksvirkou-hubspot Feb 22, 2022
1c18501
add function splitComposedType
ksvirkou-hubspot Feb 23, 2022
dbeba0f
super.addImport
ksvirkou-hubspot Feb 23, 2022
664f5a6
add docs for splitComposedType
ksvirkou-hubspot Feb 23, 2022
b66cf72
add docs for splitComposedType
ksvirkou-hubspot Feb 23, 2022
5b9e72a
Merge pull request #1 from OpenAPITools/master
ksvirkou-hubspot Mar 10, 2022
d96e3a9
Merge pull request #2 from OpenAPITools/master
ksvirkou-hubspot Mar 22, 2022
de9bbd0
Merge pull request #3 from ksvirkou-hubspot/master
ksvirkou-hubspot Mar 24, 2022
bbc94da
Merge pull request #8 from OpenAPITools/master
ksvirkou-hubspot Apr 26, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5148,13 +5148,13 @@ protected void addImport(CodegenModel m, String type) {
addImport(m.imports, type);
}

private void addImport(Set<String> importsToBeAddedTo, String type) {
protected void addImport(Set<String> importsToBeAddedTo, String type) {
if (shouldAddImport(type)) {
importsToBeAddedTo.add(type);
}
}

private boolean shouldAddImport(String type) {
protected boolean shouldAddImport(String type) {
return type != null && needToImport(type);
}

Expand Down
25 changes: 24 additions & 1 deletion ...i-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptClientCodegen.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1569,14 +1569,37 @@ protected void addImport(CodegenModel m, String type) {
return;
}

String[] parts = type.split("( [|&] )|[<>]");
String[] parts = splitComposedType(type);
for (String s : parts) {
if (needToImport(s)) {
m.imports.add(s);
}
}
}

@Override
protected void addImport(Set<String> importsToBeAddedTo, String type) {
ksvirkou-hubspot marked this conversation as resolved.
Show resolved Hide resolved
if (type == null) {
return;
}

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

some unit tests would be nice in https://github.com/OpenAPITools/openapi-generator/blob/master/modules/openapi-generator/src/test/java/org/openapitools/codegen/typescript/TypeScriptClientCodegenTest.java

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

there are some tests https://github.com/OpenAPITools/openapi-generator/blob/master/modules/openapi-generator/src/test/java/org/openapitools/codegen/typescript/TypeScriptClientModelTest.java

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can you add tests that are directly related to your code change? i.e. tests that would fail without your change.

Copy link
Contributor Author

@ksvirkou-hubspot ksvirkou-hubspot Feb 23, 2022 •
edited

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok
I ll try to do something
but maybe it would be an example of this in the petstore and test there
I ll think over it

String[] parts = splitComposedType(type);
for (String s : parts) {
super.addImport(importsToBeAddedTo, s);
}
}

/**
* Split composed types
* e.g. TheFirstType | TheSecondType to TheFirstType and TheSecondType
*
* @param type String with composed types
* @return list of types
*/
protected String[] splitComposedType(String type) {
return type.replace(" ","").split("[|&<>]");
}

@Override
public GeneratorLanguage generatorLanguage() { return GeneratorLanguage.TYPESCRIPT; }
}