diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptNestjsServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptNestjsServerCodegen.java index f14f85af91a6..85d23b83f5cb 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptNestjsServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptNestjsServerCodegen.java @@ -435,12 +435,13 @@ private String extractGenericType(String type) { @Override public Map postProcessAllModels(Map objs) { Map result = super.postProcessAllModels(objs); + Map modelsByName = getAllModels(result); for (ModelsMap entry : result.values()) { for (ModelMap mo : entry.getModels()) { CodegenModel cm = mo.getModel(); // Add additional filename information for imports Set parsedImports = parseImports(cm); - mo.put("tsImports", toTsImports(cm, parsedImports)); + mo.put("tsImports", toTsImports(cm, parsedImports, modelsByName)); } } return result; @@ -468,14 +469,18 @@ private Set parseImports(CodegenModel cm) { return newImports; } - private List> toTsImports(CodegenModel cm, Set imports) { + private List> toTsImports(CodegenModel cm, Set imports, + Map modelsByName) { List> tsImports = new ArrayList<>(); for (String im : imports) { if (!im.equals(cm.classname)) { HashMap 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); } } diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/typescript/SharedTypeScriptTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/typescript/SharedTypeScriptTest.java index 3d17e5a95bf9..62617c0ab00a 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/typescript/SharedTypeScriptTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/typescript/SharedTypeScriptTest.java @@ -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"); diff --git a/modules/openapi-generator/src/test/resources/3_0/issue_25711.yaml b/modules/openapi-generator/src/test/resources/3_0/issue_25711.yaml new file mode 100644 index 000000000000..fb6501a7a738 --- /dev/null +++ b/modules/openapi-generator/src/test/resources/3_0/issue_25711.yaml @@ -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