Fix support of fieldName annotations #773
Merged
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
Fix ignoring non-first fieldName annotations at the field declarations
987Nabil
reviewed
Jan 9, 2025
| @@ -256,7 +256,7 @@ private case class DeriveSchema()(using val ctx: Quotes) { | |||
| tpe.asType | |||
| } | |||
| val annotations = paramAnns.getOrElse(label, List.empty) | |||
| val nameExpr = annotations.collectFirst { | |||
There was a problem hiding this comment.
I actually think more the one annotation of the same kind is using the lib wrong. I would keep the old impl, since it is less complicated. You annotate twice? Your problem. Just don't.
There was a problem hiding this comment.
The proposed solution is a workaround for reverse order of annotations in Scala 3 macros.
The better solution would be throwing a compile-time error during derivation or/and runtime error when calculating fieldName value in Schema.Field instances
987Nabil
reviewed
Jan 9, 2025
| val fieldName: String = annotations.collectFirst { | ||
| case f: fieldName => f.name | ||
| }.getOrElse(name) | ||
|
|
||
| val nameAndAliases: scala.collection.immutable.Set[String] = | ||
| annotations.foldLeft(scala.collection.immutable.Set(fieldName)) { (acc, annotation) => |
There was a problem hiding this comment.
is there a difference besides making it a fold?
There was a problem hiding this comment.
It avoids reusing of an old (renamed) field name as an alias
987Nabil
approved these changes
Jan 9, 2025
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.
Fix using of fieldName annotations to rename fields (not aliasing)
Fix ignoring non-first fieldName annotations at the field declarations