Skip to content

fix(typescript-angular): restore basePath override from additional properties #25558

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

Open
thekhegay wants to merge 1 commit into
base: master
Choose a base branch
from
+25 −0
Open

fix(typescript-angular): restore basePath override from additional properties #25558

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions ...ator/src/main/java/org/openapitools/codegen/languages/TypeScriptAngularClientCodegen.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -589,6 +589,15 @@ private boolean markHttpResource(CodegenOperation op, Set<String> nicknames) {
return true;
}

@Override
public Map<String, Object> postProcessSupportingFileData(Map<String, Object> objs) {
// supporting files bundle puts server URL over additionalProperties, keep user supplied basePath
if (additionalProperties.containsKey("basePath")) {
objs.put("basePath", additionalProperties.get("basePath"));
}
return super.postProcessSupportingFileData(objs);
}

@Override
public ModelsMap postProcessModels(ModelsMap objs) {
ModelsMap result = super.postProcessModels(objs);
Expand Down
16 changes: 16 additions & 0 deletions ...openapitools/codegen/typescript/typescriptangular/TypeScriptAngularClientCodegenTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -453,6 +453,22 @@ public void testBasePath() throws IOException {
assertThat(fileContents).containsOnlyOnce("basePath = '/relative/url'");
}

@Test
public void testBasePathFromAdditionalProperties() throws IOException {
for (String basePath : new String[]{"", "/api"}) {
File output = Files.createTempDirectory("angular-base-path").toFile();
output.deleteOnExit();
CodegenConfigurator configurator = new CodegenConfigurator()
.setGeneratorName("typescript-angular")
.setInputSpec("src/test/resources/3_0/typescript-angular/issue_20760.yaml")
.setOutputDir(output.getAbsolutePath())
.addAdditionalProperty("basePath", basePath);
new DefaultGenerator().opts(configurator.toClientOptInput()).generate();
String baseService = Files.readString(output.toPath().resolve("api.base.service.ts"));
assertThat(baseService).containsOnlyOnce("protected basePath = '" + basePath + "';");
}
}

@Test
public void testEnumAsConst() throws IOException {
// GIVEN
Expand Down
Loading