Add PropertyOrder #51
Open
+235
−1
Conversation
This file contains hidden or 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
Collaborator
jba
requested changes
Nov 19, 2025
|
|
||
| // Since we collected them backwards, we need to reverse the result | ||
| // to restore the correct order. | ||
| for i, j := 0, len(cleaned)-1; i < j; i, j = i+1, j-1 { |
Collaborator
There was a problem hiding this comment.
Collaborator
There was a problem hiding this comment.
(but I don't think you'll need it)
| "I": {Type: "integer"}, | ||
| "C": {Type: "custom"}, | ||
| "G": {Type: "integer"}, | ||
| "B": {Type: "integer"}, |
Collaborator
There was a problem hiding this comment.
should be bool. The top-level field takes precedence.
| F func() | ||
| C custom | ||
| B bool | ||
| E |
| }, | ||
| Required: []string{"I", "C", "B"}, | ||
| AdditionalProperties: falseSchema(), | ||
| PropertyOrder: []string{"I", "C", "G", "B"}, |
| } | ||
| } | ||
| if skip { | ||
| continue |
Collaborator
There was a problem hiding this comment.
I think you should move L268 to here, before the continue.
|
|
||
| skipPath = field.Index | ||
| for name, prop := range override.Properties { | ||
| s.Properties[name] = prop.CloneSchemas() |
Collaborator
There was a problem hiding this comment.
Unrelated bug: if an anonymous field is first, s.Properties will be nil.
| } | ||
| } | ||
|
|
||
| // Remove PropertyOrder duplicates, keeping the last occurrence |
Collaborator
There was a problem hiding this comment.
I believe there should be no duplicates after the above change.
| // | ||
| // If PropertyOrder is set, it controls the relative ordering of properties in [Schema.MarshalJSON]. | ||
| // The rendered JSON first lists any properties that appear in the PropertyOrder slice in the order | ||
| // they appear, followed by any properties that do not appear in the PropertyOrder slice in an |
Collaborator
There was a problem hiding this comment.
"followed by all other properties..."
|
|
||
| // PropertyOrder records the ordering of properties for JSON rendering. | ||
| // | ||
| // During [For], PropertyOrder is set to the field order, |
| s := &Schema{ | ||
| Type: "object", | ||
| Properties: map[string]*Schema{ | ||
| "A": {Type: "integer"}, |
Collaborator
There was a problem hiding this comment.
Add "E", make sure it's at the end.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Refers to #15