Skip to content
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.

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

fix(typescript-angular): fix model filename including modelNamePrefix #14859

Merged

Conversation

terencehonles
Copy link
Contributor

@terencehonles terencehonles commented Mar 2, 2023

This change removes the modelNamePrefix from the API import filename to be consistent with the processing in the rest of the class.

To test: run openapi-generator-cli generate -i api.yml -g typescript-angular -o gen/api --additional-properties=modelNamePrefix=I

In the original code you'll see:

// model.ts
// <header>
import { IOtherModel } from './other-model';
...
// service.ts
// <header>
// <external-imports>

// @ts-ignore                                                                  
import { IModel } from '../model/i-model'; /** There is no file with name "i-model.ts" */
...

with the changes the first file will remain the same but the second will be:

// service.ts
// <header>
// <external-imports>

// @ts-ignore                                                                  
import { IModel } from '../model/model'; /** This is correct 👍  */
...

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 
    ./bin/generate-samples.sh
    ./bin/utils/export_docs_generators.sh
    
    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*.
    For Windows users, please run the script in Git BASH.
  • In case you are adding a new generator, run the following additional script :
    ./bin/utils/ensure-up-to-date.sh
    
    Commit all changed files.
  • File the PR against the correct branch: master (6.3.0) (minor release - breaking changes with fallbacks), 7.0.x (breaking changes without fallbacks)
  • If your PR is targeting a particular programming language, @mention the technical committee members, so they are more likely to review the pull request.

This change removes the modelNamePrefix from the API import filename
to be consistent with the processing in the rest of the class.
@terencehonles
Copy link
Contributor Author

@macjohnny looks like you might be able to review this? (looking at recent TypeScriptAngular commits)

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.

LGTM
thanks for your contribution

@terencehonles
Copy link
Contributor Author

The tests failures seem unrelated to this PR 🤔

@macjohnny macjohnny merged commit c2f244c into OpenAPITools:master Mar 2, 2023
@terencehonles terencehonles deleted the fix-model-filename-imports branch March 3, 2023 09:50
@wing328 wing328 added this to the 6.5.0 milestone Apr 1, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants