Skip to content

Always include shape fields for closed shapes #84

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.

Sign up for GitHub

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

Merged
ianhoffman merged 1 commit into from
Jul 22, 2025
Merged

Always include shape fields for closed shapes #84

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/Codegen/Typing/TypeSystem.hack
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,6 +256,7 @@ final abstract class TypeSystem {
$required = ($required_field_counts[$name] ?? 0) === $num_shapes;

if (
$is_closed_shape ||
$required ||
// While we could skip non-required aliases which point to `mixed`, that seems
// overly complicated.
Expand Down
3 changes: 3 additions & 0 deletions tests/AnyOfRefiningTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,9 @@ final class AnyOfRefiningTest extends BaseCodegenTestCase {
$ret['codegen']->build();
$ret = self::getBuilder('anyof-schema-vecs.json', 'AnyOfValidatorVecs');
$ret['codegen']->build();
$ret = self::getBuilder('anyof-nested-anyof.json', 'AnyOfNestedAnyOf');
$ret['codegen']->build();

}

public function testNullableString(): void {
Expand Down
53 changes: 53 additions & 0 deletions tests/examples/anyof-nested-anyof.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
{
"anyOf": [
{
"type": "object",
"additionalProperties": false,
"properties": {
"bar": {
"anyOf": [
{
"$ref": "#/definitions/testObj"
},
{
"type": "string"
},
{
"type": "null"
}
]
}
}
},
{
"type": "object",
"additionalProperties": false,
"properties": {
"bar": {
"anyOf": [
{
"$ref": "#/definitions/testObj"
},
{
"type": "string"
},
{
"type": "null"
}
]
}
}
}
],
"definitions": {
"testObj": {
"type": "object",
"additionalProperties": false,
"properties": {
"qux": {
"type": "string"
}
}
}
}
}
Loading