Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -435,12 +435,13 @@ private String extractGenericType(String type) {
@Override
public Map<String, ModelsMap> postProcessAllModels(Map<String, ModelsMap> objs) {
Map<String, ModelsMap> result = super.postProcessAllModels(objs);
Map<String, CodegenModel> modelsByName = getAllModels(result);
for (ModelsMap entry : result.values()) {
for (ModelMap mo : entry.getModels()) {
CodegenModel cm = mo.getModel();
// Add additional filename information for imports
Set<String> parsedImports = parseImports(cm);
mo.put("tsImports", toTsImports(cm, parsedImports));
mo.put("tsImports", toTsImports(cm, parsedImports, modelsByName));
}
}
return result;
Expand Down Expand Up @@ -468,14 +469,18 @@ private Set<String> parseImports(CodegenModel cm) {
return newImports;
}

private List<Map<String, String>> toTsImports(CodegenModel cm, Set<String> imports) {
private List<Map<String, String>> toTsImports(CodegenModel cm, Set<String> imports,
Map<String, CodegenModel> modelsByName) {
List<Map<String, String>> tsImports = new ArrayList<>();
for (String im : imports) {
if (!im.equals(cm.classname)) {
HashMap<String, String> tsImport = new HashMap<>();
// TVG: This is used as class name in the import statements of the model file
tsImport.put("classname", im);
tsImport.put("filename", toModelFilename(removeModelPrefixSuffix(im)));
CodegenModel importedModel = modelsByName.get(im);
tsImport.put("filename", importedModel != null
? importedModel.classFilename
: toModelFilename(removeModelPrefixSuffix(im)));
tsImports.add(tsImport);
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,22 @@
@Test(groups = {TYPESCRIPT})
public class SharedTypeScriptTest {

@Test(description = "Issue #25711")
public void nestjsServerImportsNumberedInlineModelByItsGeneratedFilename() throws IOException {
Path output = TestUtils.newTempFolder();
CodegenConfigurator config = new CodegenConfigurator()
.setGeneratorName("typescript-nestjs-server")
.setInputSpec("src/test/resources/3_0/issue_25711.yaml")
.setOutputDir(output.toString())
.addAdditionalProperty("fileNaming", "kebab-case");
getGenerator(config).generate();

Path models = output.resolve("models");
Assert.assertTrue(Files.isRegularFile(models.resolve("overlap-one-of-1.ts")));
TestUtils.assertFileContains(models.resolve("overlap.ts"),
"import { OverlapOneOf1 } from './overlap-one-of-1';");
}

@Test(enabled = false)
public void typesInImportsAreSplitTest() throws IOException {
Path output = Files.createTempDirectory("test");
Expand Down
17 changes: 17 additions & 0 deletions modules/openapi-generator/src/test/resources/3_0/issue_25711.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
openapi: 3.0.3
info:
title: Numbered inline models
version: 1.0.0
paths: {}
components:
schemas:
Overlap:
oneOf:
- type: object
properties:
a:
type: string
- type: object
properties:
b:
type: integer
Loading