Fixes #22533: angular typescript generation import statements from same file or package being overwitten by one another

[thomasgalicia1]

…itten

Fix angular typescript generation import statements based on import mappings being overwritten by one another resulting in only one type to be imported from the file or package

PR checklist

• Read the contribution guidelines.
• Pull Request title clearly describes the work in the pull request and Pull Request description provides details about how to validate the work. Missing information here may result in delayed response from the community.
• Run the following to build the project and update samples:

  ./mvnw clean package || exit
  ./bin/generate-samples.sh ./bin/configs/*.yaml || exit
  ./bin/utils/export_docs_generators.sh || exit
  

  (For Windows users, please run the script in WSL)
  Commit all changed files.
  This is important, as CI jobs will verify all generator outputs of your HEAD commit as it would merge with master.
  These must match the expectations made by your contribution.
  You may regenerate an individual generator by passing the relevant config(s) as an argument to the script, for example ./bin/generate-samples.sh bin/configs/java*.
  IMPORTANT: Do NOT purge/delete any folders/files (e.g. tests) when regenerating the samples as manually written tests may be removed.
• File the PR against the correct branch: master (upcoming 7.x.0 minor release - breaking changes with fallbacks), 8.0.x (breaking changes without fallbacks)
• If your PR solves a reported issue, reference it using GitHub's linking syntax (e.g., having "fixes #123" present in the PR description)
• If your PR is targeting a particular programming language, @mention the technical committee members, so they are more likely to review the pull request.

---

Summary by cubic

Fixes #22533 by preventing TypeScript Angular client imports from being overwritten when multiple types come from the same file or package. We now merge same-file imports and keep unique (import path, symbol) pairs so all needed types are imported.

• Bug Fixes
  • DefaultGenerator: track unique (import path, classname) pairs and convert them to import objects to avoid collisions.
  • typescript-angular: merge same-file imports into a single import { A, B } from 'pkg' and set filename/classname on operations.
  • Tests/cleanup: add a unit test for import merging; revert sample updates; remove accidental formatting.

^{Written for commit e63b695. Summary will update on new commits.}

[cubic-dev-ai]

1 issue found across 3 files

Prompt for AI agents (unresolved issues)

Check if these issues are valid — if so, understand the root cause of each and fix them. If appropriate, use sub-agents to investigate and fix each issue separately.


<file name="modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultGenerator.java">

<violation number="1" location="modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultGenerator.java:1744">
P2: Operation import aggregation now collapses composed imports to a single `toModelImport(...)` result, so generators that depend on `toModelImportMap(...)` expanding one symbol into multiple imports can lose required imports in generated operation files.</violation>
</file>

_{Reply with feedback, questions, or to request a fix. Tag @cubic-dev-ai to re-run a review.}

[cubic-dev-ai]

P2: Operation import aggregation now collapses composed imports to a single toModelImport(...) result, so generators that depend on toModelImportMap(...) expanding one symbol into multiple imports can lose required imports in generated operation files.

Prompt for AI agents

Check if this issue is valid — if so, understand the root cause and fix it. At modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultGenerator.java, line 1744:

<comment>Operation import aggregation now collapses composed imports to a single `toModelImport(...)` result, so generators that depend on `toModelImportMap(...)` expanding one symbol into multiple imports can lose required imports in generated operation files.</comment>

<file context>
@@ -1734,6 +1735,16 @@ private Map<String, String> getAllImportsMappings(Set<String> allImports) {
+            if (mapping != null) {
+                return Pair.of(mapping, nextImport);
+            }
+            return Pair.of(config.toModelImport(nextImport), nextImport);
+        }).collect(Collectors.toSet());
+    }
</file context>