-
-
Notifications
You must be signed in to change notification settings - Fork 6.5k
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
[haskell][haskell-yesod] Fix special char replacements #16197
Merged
wing328
merged 5 commits into
OpenAPITools:master
from
msakai:fix-haskell-special-char-replacements
Jul 28, 2023
Merged
[haskell][haskell-yesod] Fix special char replacements #16197
wing328
merged 5 commits into
OpenAPITools:master
from
msakai:fix-haskell-special-char-replacements
Jul 28, 2023
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
fixOperatorChars() does not change input strings since special characters have already been replaced in DefaultCodegen.fromModel().
…ng removeFieldLabelPrefix table We switched from the conversion done by fixOperatorChars() to the conversion done by DefaultCodegen.fromModel() and the latter does not insert quote characters. So We modify the removeFieldLabelPrefix table to conform the new mapping.
…LabelPrefix function Aeson's fieldLabelModifier always convert Haskell field names to JSON field names, whether at parse time or not. (Note that stripPrefix and uncapitalize do not take such parameter)
…prefix Because replaceSpecialChars can corrupt prefix if the prefix contains a replacement string of a specfial character as a substring.
Sorry, I won't be able to review this - it's been years since my last contribution. |
tested locally and the tests passed, e.g.
|
I tested the first example spec above with the following code: module Main where
import qualified Data.Aeson as J
import qualified Data.ByteString.Lazy.Char8 as BL
import Test.Types
main :: IO ()
main = do
let s = BL.pack "{\"&id\":\"foo\",\"text\":\"bar\"}"
putStrLn (BL.unpack s)
let val :: HelloResponse
Just val = J.decode s
print val
print $ J.encode val
print $ J.encode val == s Result before applying the changes of this PR:
Result after applying the changes of this PR:
|
Thanks for sharing the test result. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Special character replacements in the
haskell
and thehaskell-yesod
generators are not working correctly, and this PR fixes the issue and some related issues.The main problem is that those generators generate code that assumes the quotation mark prefixes, but the generated field names do not have the quotation mark prefixes. It seems that those generators try to use
fixOperatorChars
to perform special character replacements with quotation marks, but special characters have already been replaced inDefaultCodegen.fromModel()
which does not insert quotation marks (c.f. #16161).For example, the following spec resulted in the code that does not work properly.
Generated code (Note that
specialChars
table contains entries like("$", "'Dollar")
andDollar
is prefixed with a quotation mark).:There are two options to solve the problem:
fixOperatorChars
instead of the conversion byDefaultCodegen.fromModel()
, orDefaultCodegen.fromModel()
.This PR chooses the latter option.
This PR also fixes two related problems:
There seems to be a misunderstanding about aeson's
fieldLabelModifier
in the original code. The current generated code usesforParsing
parameter to switch conversion direction. But this is not necessary.fieldLabelModifier
is always used to convert Haskell field names to JSON field names, whether at parse time or not. (Note thatstripPrefix
anduncapitalize
do not take such parameters)Change the order of
replaceSpecialChars
andstripPrefix
. Because replaceSpecialChars can corrupt prefix if the prefix contains a replacement string of a special character as a substring. (Consider the following example spec)Generated code:
PR checklist
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.
master
(6.3.0) (minor release - breaking changes with fallbacks),7.0.x
(breaking changes without fallbacks)cc: @f-f @Drezil