TJ Yin

Move `thrift/facebook/json5/*` to `thrift/lib/cpp2/protocol` Summary: This diff moved all files under `thrift/facebook/json5 to `thrift/lib/cpp2/protocol`: * `Json5Protocol.h` is moved to `thrift/lib/cpp2/protocol`. Other files are moved to `thrift/lib/cpp2/protocol/detail`. * `thrift/facebook/json5/test` is moved to `thrift/lib/cpp2/protocol/test` * `thrift/facebook/json5/test/example.thrift` is renamed to `json5_test.thrift` Reviewed By: aristidisp Differential Revision: D95818321 fbshipit-source-id: 19d443e93b3a5ea5965b2e62893407874c9634e2

Remove comparison operators from AnyValue Summary: This diff removed comparison operators (e.g., `operator==`, `operator<`) from AnyValue and AnyRef, since we don't use it in production, let's remove it so that we don't need to maintain the code. Note that after this change, we can't compare two AnyValue directly anymore. Thus for unit-test, we need to cast all AnyValue to the actual type in order to compare. Reviewed By: iahs Differential Revision: D96378660 fbshipit-source-id: 627c375f1303224e476eaca405164f28bd222e2e

Move enum_find from module_types.cpp.h to thrift/lib/cpp2/detail/Enum.h Reviewed By: iahs Differential Revision: D98079473 fbshipit-source-id: c78fc624b4e70e9d8bd5d136797d3fb4f136ef3f

Python support (1): Add main functionalities Summary: Expose Protocol.JSON5 in the Python serializer for deserialize/serialize with unit-tests. Reviewed By: vitaut Differential Revision: D97831965 fbshipit-source-id: 32d5d886d123612affc7c1e0f719e587041daef7

Unify overloaded writeMapBegin Reviewed By: iahs, vitaut Differential Revision: D98774974 fbshipit-source-id: 9ce7f85cfa998544a430b4e8da0011dd1c3e1c61

Fix regression introduced by json5 parsing Summary: Same idea as `escapeStringImpl<EnableExtraAsciiEscapes>`: template parameter for compile-time opts so the compiler can constant-fold opts-dependent branches. This diff templated Input on an OptsPtr type. The default-opts path uses `Input<DefaultOptsPtr>`, where `operator*()` returns a value-initialized serialization_opts, so the compiler sees all opts fields are default and folds the branches. The explicit-opts path uses `Input<serialization_opts const*>` as before. Reviewed By: ilvokhin Differential Revision: D100523161 fbshipit-source-id: 064772b69f51022c5af9c788b199285f5ba39916

Python support (3): Add serialize_json5(object, options) function to allow customizing JsonWriterOptions Summary: - Add serializeJson5 C++ function and expose it through Cython. - Add serialize_json5() and serialize_json5_iobuf() Python functions with a Json5ProtocolWriter::Options class controlling trailing commas, unquoted names, NaN/Infinity handling, and indentation. - Add comprehensive tests for the new APIs including all writer options. Reviewed By: ahilger Differential Revision: D97831963 fbshipit-source-id: 0c6ff1b14f6902079ded2bbedb59b347aba90078

Default Json5Reader::readPrimitive precision to Double Summary: When using `Json5Reader::readPrimitive`, it's bit awkward to have Double everywhere when we don't expect the next value to be floating point (e.g., we expect the next value to be integer). This diff make Double to be the default argument, and updated all callsites except `readDouble` in Json5ProtocolReader. Reviewed By: vitaut Differential Revision: D102205967 fbshipit-source-id: 05b297997a523c28f570b64ecdc6c16a91f1b280

Improve Enum related unit-tests Summary: Add MyEnum2I8, MyEnum2U8, MyEnum2I16, MyEnum2U16, MyEnum2U32 enum variants to enum.thrift with different cpp.EnumUnderlyingType annotations. Extract all MyEnum2-related test cases from EnumTestCpp2.cpp into TYPED_TEST so they run against all 6 enum variants (including the original MyEnum2). Reviewed By: iahs Differential Revision: D98407840 fbshipit-source-id: 60c29d681f7efb55dc2c4997735c63cb0bed9b78

Add writeEnum to all protocol writers Summary: This diff added writeEnum method to all protocol writers that just forward the function call to `writeI32` (besides Json5ProtocolWriter) Reviewed By: iahs Differential Revision: D95345802 fbshipit-source-id: 3998963c15c2fa19e0791c97ebe763e6596df564

Move some test cases from C++ to thrift constant Summary: 1. Moved test cases from JsonDecoderNegativeTest.cpp to json5_negative_test.thrift 2. Moved test cases from JsonDecoderCompatibilityTest.cpp to json5_compatibility_test.thrift So that we can share them with python Reviewed By: hchokshi Differential Revision: D96370596 fbshipit-source-id: 8286399a494431b614d81114ebde300c1043118c

Implement type_class to type tag conversion Reviewed By: iahs Differential Revision: D98672494 fbshipit-source-id: 284bb187e8a084fcb3d1ede5ea85a2a65d2eb3c5

Migrate kSortKeys to return KeyOrder enum Summary: This diff replaced `static bool kSortKeys()` in protocol writer with `static KeyOrder keyOrder()`, where KeyOrder is defiend as ``` /// How to sort keys in set/map during serialization. enum class KeyOrder { /// No sorting applied. Unspecified, /// Sorted by C++ `operator<`, in ascending order. NativeAscending, }; ``` The motivation is that JSON5 uses a different ordering other than simplying sorting keys by `operator<` in set/map. In the next diff, we will introduce `KeyOrder::ObjectModelAscending` for such ordering. Reviewed By: iahs Differential Revision: D96176829 fbshipit-source-id: 68d30606bc783625289f06cd6fd033304ea02e6f

Migrate folly::ordering to std::weak_ordering in Compare.h Reviewed By: iahs Differential Revision: D96346532 fbshipit-source-id: 8d530622c9832104ee6a23103fee362548ae9d4e

Add mapPrimitiveKeysAsMemberNames option to Json5ProtocolWriter Summary: Add `mapPrimitiveKeysAsMemberNames` option to `Json5ProtocolWriter::Options`. When set, maps with primitive key types (bool, integers, float, double, string) use JSON object form with stringified keys; non-primitive keys still use key-value array form. The motivation is having options to make JSON5 protocol output similar to SimpleJSON for easier migraiton. Reviewed By: vitaut Differential Revision: D103640895 fbshipit-source-id: fe1c32b872903a7adf610f3affd69ca2186b4a50

Remove RE2 dependencies from thrift/lib/cpp2/protocol/detail Summary: Replace RE2 regex usage in Json5ProtocolReader.cpp and JsonWriter.cpp with pure C++ equivalents using std::from_chars, std::all_of, and folly::rtrimWhitespace. This eliminates the third-party RE2 dependency from the Json5ProtocolReader and JsonWriter build targets. Reviewed By: vitaut Differential Revision: D103328261 fbshipit-source-id: cdf7921e55fd6832eda692d5cc4bbd9ef3975f00

Add op::for_each_field_id_ascending API Summary: Introduce for_each_field_id_ascending function that iterates struct fields in ascending field ID order (1, 2, 3, ...) rather than declaration order. Motivation: This will used for json5 serialization in D94950111, where we want to have options to control field serialization order. Reviewed By: hchokshi Differential Revision: D94950110 fbshipit-source-id: a31d4c16d64fbae7c3aadc015112a9c264764f38

Add the ability to parse field name as "field-name (field-id)" (2): implementation Summary: With this diff, fields can now be specified as: - `"fieldName"` — lookup by name (existing behavior) - `"fieldName (id)"` — lookup by name with ID validation - `"(id)"` — lookup by field ID only - `"id"` — lookup by field ID only (bare integer string) This diff improved the mechanism used in SimpleJSONProtocol to convert "field-name" --> "field-id". Here is how it works today for SimpleJSONProtocol (1) We invoke `readFieldBegin(name, id, type)` to get field name (id will be `numeric_limits<int16_t>::min()`). (2) Use the following code to translate name --> id https://www.internalfb.com/code/fbsource/[c4e6c5b82e65bfcaa2b5e550728a3fd581b67ecf]/xplat/thrift/compiler/test/fixtures/basic/out/cpp2/gen-cpp2/module_types_custom_protocol.h?lines=239-241 which will invoke https://www.internalfb.com/code/fbsource/[c4e6c5b82e65bfcaa2b5e550728a3fd581b67ecf]/xplat/thrift/compiler/test/fixtures/basic/out/cpp2/gen-cpp2/module_types_serialization.cpp?lines=27 to actually translate field name to field id and type. ## Core changes This diff changed `translate_field_name` so that 1. In Json5ProtocolReader, the `readFieldBegin(name, id, type)` will now parse and set field-name and field-id. 2. In `translate_field_name` the logic changed to the following 2.1 If `name` is empty, translate field-id to field-type instead. 2.2 If both `name` and `id` are set, validate whether `id` matches schema, and throw exception on any mismatches. 2.3 If only `name` is set, the behavior is unchanged. 3. TableBasedSerializer is modified accordingly. # How do we know whether `id` is set if the type is just `std::int16_t`? We use `id != numeric_limits<int16_t>::min()` to determine whether id is set. Note: even though field id "-32768" might be valid for binary/compact protocol for lazy deserialization (https://fburl.com/code/tuve65w9), it will not be valid for other protocols as long as they don't support lazy deserialization: https://www.internalfb.com/code/fbsource/[2ccab6a0d0f391fe2b58e0d2535c372370cbb058]/fbcode/thrift/lib/cpp2/protocol/SimpleJSONProtocol.h?lines=54 In the unlikely event if we want to add lazy deserialization support to JSON protocol, we can just pick another sentry number and use it. Reviewed By: iahs Differential Revision: D100232165 fbshipit-source-id: 1b975bc1756c0dd3eeb78d74a55a34d335e66ec1

Add ThriftObjectModelLessThan Reviewed By: vitaut Differential Revision: D95846368 fbshipit-source-id: 93c82e384bb3619b51640700c7c336ec077681bf

Rename container patch single-element methods Summary: Rename container patch methods to make them more consistent and intuitive: | Current method name in C++ | New name | | --- | --- | | ListPatch::push_back | append | | ListPatch::appendMulti | appendMulti (unchanged) | | SetPatch::insert | add | | SetPatch::addMulti | addMulti (unchanged) | | SetPatch::erase | remove | | SetPatch::removeMulti | removeMulti (unchanged) | | MapPatch::insert_or_assign | put | | MapPatch::putMulti | putMulti (unchanged) | | N/A (no method to try_insert a single key-value) | tryPut | | MapPatch::tryPutMulti | tryPutMulti (unchanged) | | MapPatch::erase | remove | | MapPatch::removeMulti | removeMulti (unchanged) | Old method names are kept as deprecated aliases for backward compatibility. ___ overriding_review_checks_triggers_an_audit_and_retroactive_review Oncall Short Name: thrift_qna Differential Revision: D100479718 fbshipit-source-id: 74057188b1342175f4acaaf4eee3bff326fab2df