Skip to content

Conversation

@btpnlsl
Copy link
Contributor

@btpnlsl btpnlsl commented Jul 28, 2025

Fixes #21639

PR #21464 provided some changes to add serialization & deserialization logic for primitive and enum types used by the ToJSONTypes & FromJSONTyped methods of 'oneOf' models.

There are a couple of cases where the if-statements used in the ToJSONTyped methods generated by the template are missing closing parentheses, such as when serializing an Array, Array.

This PR fixes these cases and modifies the unit test for Issue 21295 to check for the correct number of closing parenthesis.

Just as a side note, having the unit test check for string literals is probably not a great long term strategy as the approach is brittle; changes in formatting which are technically correct can break these tests. It would probably be better to have a tool like assertj (which is used for the Java generation tests) or to use some sort of typescript linting tools to check the output of each test. I took a look at using typescript-eslint, but it seems that that tooling is dependent on running with npm.

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.

Typescript: @TiFu (2017/07) @taxpon (2017/07) @sebastianhaas (2017/07) @kenisteward (2017/07) @Vrolijkx (2017/09) @macjohnny (2018/01) @topce (2018/10) @akehir (2019/07) @petejohansonxo (2019/11) @amakhrov (2020/02) @davidgamero (2022/03) @mkusaka (2022/04) @joscha (2024/10)
PR #21464 - @DavidGrath

@DavidGrath
Copy link
Contributor

@btpnlsl , thanks for the fix

Just as a side note, having the unit test check for string literals is probably not a great long term strategy

#21414

Copy link
Member

@macjohnny macjohnny left a comment

Choose a reason for hiding this comment

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

thanks for the fix

@macjohnny macjohnny merged commit 7c1dce4 into OpenAPITools:master Jul 29, 2025
15 checks passed
@wing328 wing328 added this to the 7.15.0 milestone Aug 9, 2025
Goopher pushed a commit to Goopher/openapi-generator that referenced this pull request Sep 9, 2025
OpenAPITools#21645)

* Modify unit tests for typescript-fetch, issue 21259 to check for closing parens & fix a typo in TypeScriptFetchModelTest

* Fix bug in closing parens in modelOneOf.mustache and some spacing adjustments

* Update samples

---------

Co-authored-by: Chris Gual <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[BUG][typescript-fetch] OneOf models missing closing parentheses in ToJSONTyped method in some cases

5 participants