Repository navigation
Commit 88b1224
committed
fix(_json_schema): preserve None-member metadata and nest Optional tagged union
Address review on the optional-union null-ordering change:
- The union unwrap loop remembered only a has_none flag and appended a
hardcoded {"type": "null"}, dropping any Meta metadata carried on an
Annotated[None, Meta(...)] member. Track the actual none_member subtype
and emit self.to_schema(none_member) so its metadata is preserved.
- Optional[tagged union] flattened the schema shape when no other members
were present. Keep the nested form and emit
{"anyOf": [struct_schema, <null>]} so only ordering, not shape, changes.
Update test_struct_tagged_union_with_none to the nested anyOf shape and add
coverage for Union[Point, Point3D, int, None] and Annotated[None, Meta(...)].1 parent b5b078a commit 88b1224
2 files changed
Lines changed: 51 additions & 10 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
331 | 331 | | |
332 | 332 | | |
333 | 333 | | |
| 334 | + | |
334 | 335 | | |
335 | 336 | | |
336 | 337 | | |
| |||
341 | 342 | | |
342 | 343 | | |
343 | 344 | | |
| 345 | + | |
344 | 346 | | |
345 | 347 | | |
346 | 348 | | |
| |||
358 | 360 | | |
359 | 361 | | |
360 | 362 | | |
361 | | - | |
| 363 | + | |
362 | 364 | | |
| 365 | + | |
| 366 | + | |
363 | 367 | | |
364 | 368 | | |
365 | | - | |
366 | | - | |
367 | 369 | | |
368 | 370 | | |
369 | 371 | | |
370 | 372 | | |
371 | | - | |
| 373 | + | |
372 | 374 | | |
373 | 375 | | |
374 | 376 | | |
375 | | - | |
| 377 | + | |
376 | 378 | | |
377 | 379 | | |
378 | 380 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
925 | 925 | | |
926 | 926 | | |
927 | 927 | | |
928 | | - | |
929 | | - | |
930 | | - | |
931 | | - | |
| 928 | + | |
| 929 | + | |
| 930 | + | |
| 931 | + | |
| 932 | + | |
| 933 | + | |
| 934 | + | |
| 935 | + | |
| 936 | + | |
932 | 937 | | |
933 | | - | |
| 938 | + | |
934 | 939 | | |
935 | 940 | | |
936 | 941 | | |
| |||
979 | 984 | | |
980 | 985 | | |
981 | 986 | | |
| 987 | + | |
| 988 | + | |
| 989 | + | |
| 990 | + | |
| 991 | + | |
| 992 | + | |
| 993 | + | |
| 994 | + | |
| 995 | + | |
| 996 | + | |
| 997 | + | |
| 998 | + | |
| 999 | + | |
| 1000 | + | |
| 1001 | + | |
| 1002 | + | |
| 1003 | + | |
| 1004 | + | |
| 1005 | + | |
| 1006 | + | |
| 1007 | + | |
| 1008 | + | |
| 1009 | + | |
| 1010 | + | |
| 1011 | + | |
| 1012 | + | |
| 1013 | + | |
| 1014 | + | |
| 1015 | + | |
| 1016 | + | |
| 1017 | + | |
| 1018 | + | |
| 1019 | + | |
| 1020 | + | |
982 | 1021 | | |
983 | 1022 | | |
984 | 1023 | | |
| |||
0 commit comments