satelliteprogrammer 40a62947d3 support JSON Merge Patch (RFC 7396) diff creation (#4965) ...

* support JSON Merge Patch (RFC 7396) diff creation

The JSON merge patch document format describes the set of modifications
to a resource's content, that more closely mimics the syntax of the
resource being modified.

However, and in contrast to JSON Patch (RFC 6902), a JSON Merge Patch
cannot express certain modifications, e.g., changing an array element
at a specific index, or setting a specific object value to null.
The null value in a JSON Merge Patch is used to remove the key from the
object.

The diff algorithm is not part of the RFC 7396, but it was tested
against all examples provided, plus additional cases on how null values
are handled.

Signed-off-by: Luís Murta <luis@murta.dev>

* improve algorithm efficiency

Signed-off-by: Luís Murta <luis@murta.dev>

* fix inconsistent nulls and empty arrays

Also add CHECKs for the patch, documentation and run `make amalgamate`.

Signed-off-by: Luís Murta <luis@murta.dev>

* documentation cleanups

Signed-off-by: Luís Murta <luis@murta.dev>

* add an iterative fallback to merge_diff

Bound the recursion depth like diff() and merge_patch(), and test values
nested past the bound.

Signed-off-by: Luís Murta <luis@murta.dev>

* address the remaining review comments

Signed-off-by: Luís Murta <luis@murta.dev>

* move multi-line raw strings out of CHECK macros

GCC 4.8/5, ICPC and NVHPC mis-tokenize multi-line raw string literals
inside macro arguments, breaking the build or the parsed JSON.

Signed-off-by: Luís Murta <luis@murta.dev>

---------

Signed-off-by: Luís Murta <luis@murta.dev>

2026-10-12 09:33:43 +02:00

..

~basic_json.md

Review and extend the documentation, and check it in CI (#5638)

2026-10-02 11:32:15 +02:00

accept.md

Review and extend the documentation, and check it in CI (#5638)

2026-10-02 11:32:15 +02:00

array_t.md

Review and extend the documentation, and check it in CI (#5638)

2026-10-02 11:32:15 +02:00

array.md

📝 add more docs (#5231)

2026-07-04 11:13:25 +02:00

as_base_class.md

Add basic_json::as_base_class and document name conflicts with custom base classes (#5589)

2026-10-04 12:00:31 +02:00

at.md

Report one-character non-numeric array indices like longer ones (#5800)

2026-10-11 08:21:41 +02:00

back.md

📝 update documentation (#4723)

2025-04-05 18:54:35 +02:00

basic_json.md

Make cross-string-type basic_json conversion explicit without implicit conversions (#5591)

2026-10-04 11:46:52 +02:00

begin.md

Review and extend the documentation, and check it in CI (#5638)

2026-10-02 11:32:15 +02:00

binary_t.md

Use the with_*_t aliases in the remaining tests and docs (#5790)

2026-10-09 16:56:14 +02:00

binary.md

Review and extend the documentation, and check it in CI (#5638)

2026-10-02 11:32:15 +02:00

boolean_t.md

Review and extend the documentation, and check it in CI (#5638)

2026-10-02 11:32:15 +02:00

cbegin.md

Review and extend the documentation, and check it in CI (#5638)

2026-10-02 11:32:15 +02:00

cbor_tag_handler_t.md

Allow SAX parsing of tagged CBOR (#5740)

2026-10-07 07:38:24 +02:00

cend.md

Review and extend the documentation, and check it in CI (#5638)

2026-10-02 11:32:15 +02:00

clear.md

Review and extend the documentation, and check it in CI (#5638)

2026-10-02 11:32:15 +02:00

contains.md

Clean up non-code files (#5801)

2026-10-11 08:21:51 +02:00

count.md

Clean up non-code files (#5801)

2026-10-11 08:21:51 +02:00

crbegin.md

Review and extend the documentation, and check it in CI (#5638)

2026-10-02 11:32:15 +02:00

crend.md

Review and extend the documentation, and check it in CI (#5638)

2026-10-02 11:32:15 +02:00

default_object_comparator_t.md

Review and extend the documentation, and check it in CI (#5638)

2026-10-02 11:32:15 +02:00

diff.md

support JSON Merge Patch (RFC 7396) diff creation (#4965)

2026-10-12 09:33:43 +02:00

dump.md

Add an error_handler parameter for UTF-8 to the binary readers and writers (#5746)

2026-10-04 12:13:49 +02:00

emplace_back.md

Review and extend the documentation, and check it in CI (#5638)

2026-10-02 11:32:15 +02:00

emplace.md

Accept lvalues in ordered_map::emplace's value parameter (#5685)

2026-10-04 11:46:25 +02:00

empty.md

Review and extend the documentation, and check it in CI (#5638)

2026-10-02 11:32:15 +02:00

end_pos.md

Clean up and document project files (#4560)

2025-01-17 06:53:35 +01:00

end.md

Review and extend the documentation, and check it in CI (#5638)

2026-10-02 11:32:15 +02:00

erase.md

Fix key types convertible to std::string_view breaking lookups (#5689)

2026-10-04 11:46:32 +02:00

error_handler_t.md

Clean up non-code files (#5801)

2026-10-11 08:21:51 +02:00

exception.md

Overwork documentation (#4516)

2024-12-09 23:02:30 +01:00

find.md

Clean up non-code files (#5801)

2026-10-11 08:21:51 +02:00

flatten.md

Review and extend the documentation, and check it in CI (#5638)

2026-10-02 11:32:15 +02:00

format_as.md

Documentation review (#5257)

2026-07-09 17:24:19 +02:00

from_bjdata.md

Clean up non-code files (#5801)

2026-10-11 08:21:51 +02:00

from_bon8.md

Clean up non-code files (#5801)

2026-10-11 08:21:51 +02:00

from_bson.md

Clean up non-code files (#5801)

2026-10-11 08:21:51 +02:00

from_cbor.md

Clean up non-code files (#5801)

2026-10-11 08:21:51 +02:00

from_msgpack.md

Clean up non-code files (#5801)

2026-10-11 08:21:51 +02:00

from_ubjson.md

Clean up non-code files (#5801)

2026-10-11 08:21:51 +02:00

front.md

📝 update documentation (#4723)

2025-04-05 18:54:35 +02:00

get_allocator.md

Review and extend the documentation, and check it in CI (#5638)

2026-10-02 11:32:15 +02:00

get_binary.md

📝 fix docs (#5217)

2026-06-29 22:15:18 +02:00

get_ptr.md

Overwork documentation (#4516)

2024-12-09 23:02:30 +01:00

get_ref.md

Fix return value of get_ptr for unsigned integers (#4525)

2024-12-06 18:38:25 +01:00

get_to.md

Review and extend the documentation, and check it in CI (#5638)

2026-10-02 11:32:15 +02:00

get.md

Review and extend the documentation, and check it in CI (#5638)

2026-10-02 11:32:15 +02:00

index.md

support JSON Merge Patch (RFC 7396) diff creation (#4965)

2026-10-12 09:33:43 +02:00

input_format_t.md

Review and extend the documentation, and check it in CI (#5638)

2026-10-02 11:32:15 +02:00

insert.md

Review and extend the documentation, and check it in CI (#5638)

2026-10-02 11:32:15 +02:00

invalid_iterator.md

📝 fix docs (#5217)

2026-06-29 22:15:18 +02:00

is_array.md

Review and extend the documentation, and check it in CI (#5638)

2026-10-02 11:32:15 +02:00

is_binary.md

Review and extend the documentation, and check it in CI (#5638)

2026-10-02 11:32:15 +02:00

is_boolean.md

Review and extend the documentation, and check it in CI (#5638)

2026-10-02 11:32:15 +02:00

is_discarded.md

Review and extend the documentation, and check it in CI (#5638)

2026-10-02 11:32:15 +02:00

is_null.md

Review and extend the documentation, and check it in CI (#5638)

2026-10-02 11:32:15 +02:00

is_number_float.md

📝 update documentation (#4723)

2025-04-05 18:54:35 +02:00

is_number_integer.md

📝 update documentation (#4723)

2025-04-05 18:54:35 +02:00

is_number_unsigned.md

📝 update documentation (#4723)

2025-04-05 18:54:35 +02:00

is_number.md

📝 fix docs (#5217)

2026-06-29 22:15:18 +02:00

is_object.md

Review and extend the documentation, and check it in CI (#5638)

2026-10-02 11:32:15 +02:00

is_primitive.md

📝 update documentation (#4723)

2025-04-05 18:54:35 +02:00

is_string.md

Review and extend the documentation, and check it in CI (#5638)

2026-10-02 11:32:15 +02:00

is_structured.md

📝 update documentation (#4723)

2025-04-05 18:54:35 +02:00

items.md

Review and extend the documentation, and check it in CI (#5638)

2026-10-02 11:32:15 +02:00

json_base_class_t.md

Clean up non-code files (#5801)

2026-10-11 08:21:51 +02:00

json_serializer.md

Review and extend the documentation, and check it in CI (#5638)

2026-10-02 11:32:15 +02:00

max_size.md

Review and extend the documentation, and check it in CI (#5638)

2026-10-02 11:32:15 +02:00

merge_diff.md

support JSON Merge Patch (RFC 7396) diff creation (#4965)

2026-10-12 09:33:43 +02:00

merge_patch.md

support JSON Merge Patch (RFC 7396) diff creation (#4965)

2026-10-12 09:33:43 +02:00

meta.md

Deduplicate basic_json internals; make insert(pos, json&&) move (#5727)

2026-10-04 11:57:41 +02:00

number_float_t.md

Handle numbers that do not fit narrow number types in the binary readers (#5607)

2026-10-04 17:53:29 +02:00

number_integer_t.md

Handle numbers that do not fit narrow number types in the binary readers (#5607)

2026-10-04 17:53:29 +02:00

number_unsigned_t.md

Handle numbers that do not fit narrow number types in the binary readers (#5607)

2026-10-04 17:53:29 +02:00

object_comparator_t.md

Review and extend the documentation, and check it in CI (#5638)

2026-10-02 11:32:15 +02:00

object_t.md

Restore v3.12.0 support for custom object key types (#5795)

2026-10-11 08:24:31 +02:00

object.md

📝 add more docs (#5231)

2026-07-04 11:13:25 +02:00

operator_eq.md

Make comparisons with scalars noexcept only when the conversion is (#5751)

2026-10-02 17:25:17 +02:00

operator_ge.md

Make comparisons with scalars noexcept only when the conversion is (#5751)

2026-10-02 17:25:17 +02:00

operator_gt.md

Make comparisons with scalars noexcept only when the conversion is (#5751)

2026-10-02 17:25:17 +02:00

operator_le.md

Make comparisons with scalars noexcept only when the conversion is (#5751)

2026-10-02 17:25:17 +02:00

operator_lt.md

Make comparisons with scalars noexcept only when the conversion is (#5751)

2026-10-02 17:25:17 +02:00

operator_ne.md

Make comparisons with scalars noexcept only when the conversion is (#5751)

2026-10-02 17:25:17 +02:00

operator_spaceship.md

Make comparisons with scalars noexcept only when the conversion is (#5751)

2026-10-02 17:25:17 +02:00

operator_value_t.md

Review and extend the documentation, and check it in CI (#5638)

2026-10-02 11:32:15 +02:00

operator_ValueType.md

Review and extend the documentation, and check it in CI (#5638)

2026-10-02 11:32:15 +02:00

operator[].md

Report one-character non-numeric array indices like longer ones (#5800)

2026-10-11 08:21:41 +02:00

operator+=.md

Review and extend the documentation, and check it in CI (#5638)

2026-10-02 11:32:15 +02:00

operator=.md

📝 fix docs (#5217)

2026-06-29 22:15:18 +02:00

other_error.md

📝 fix docs (#5217)

2026-06-29 22:15:18 +02:00

out_of_range.md

📝 fix docs (#5217)

2026-06-29 22:15:18 +02:00

parse_error.md

Fix raw-TeX formulas and other documentation infrastructure debt (#5736)

2026-09-30 22:15:20 +02:00

parse_event_t.md

Review and extend the documentation, and check it in CI (#5638)

2026-10-02 11:32:15 +02:00

parse.md

Review and extend the documentation, and check it in CI (#5638)

2026-10-02 11:32:15 +02:00

parser_callback_t.md

Review and extend the documentation, and check it in CI (#5638)

2026-10-02 11:32:15 +02:00

patch_inplace.md

Report one-character non-numeric array indices like longer ones (#5800)

2026-10-11 08:21:41 +02:00

patch.md

Report one-character non-numeric array indices like longer ones (#5800)

2026-10-11 08:21:41 +02:00

push_back.md

Review and extend the documentation, and check it in CI (#5638)

2026-10-02 11:32:15 +02:00

rbegin.md

Review and extend the documentation, and check it in CI (#5638)

2026-10-02 11:32:15 +02:00

rend.md

Review and extend the documentation, and check it in CI (#5638)

2026-10-02 11:32:15 +02:00

sax_parse.md

Allow SAX parsing of tagged CBOR (#5740)

2026-10-07 07:38:24 +02:00

size.md

Review and extend the documentation, and check it in CI (#5638)

2026-10-02 11:32:15 +02:00

start_pos.md

Clean up and document project files (#4560)

2025-01-17 06:53:35 +01:00

std_formatter.md

Documentation review (#5257)

2026-07-09 17:24:19 +02:00

std_hash.md

Make std::hash<basic_json> consistent with operator== for numbers (#5772)

2026-10-07 19:18:51 +02:00

std_swap.md

📝 fix docs (#5217)

2026-06-29 22:15:18 +02:00

string_t.md

Review and extend the documentation, and check it in CI (#5638)

2026-10-02 11:32:15 +02:00

swap.md

Review and extend the documentation, and check it in CI (#5638)

2026-10-02 11:32:15 +02:00

to_bjdata.md

Throw type_error.321 when serializing discarded values to binary formats (#5761)

2026-10-06 07:33:34 +02:00

to_bon8.md

Throw type_error.321 for discarded values in to_bon8 (#5802)

2026-10-11 08:22:00 +02:00

to_bson.md

Throw type_error.321 when serializing discarded values to binary formats (#5761)

2026-10-06 07:33:34 +02:00

to_cbor.md

Throw type_error.321 when serializing discarded values to binary formats (#5761)

2026-10-06 07:33:34 +02:00

to_msgpack.md

Throw type_error.321 when serializing discarded values to binary formats (#5761)

2026-10-06 07:33:34 +02:00

to_string.md

Review and extend the documentation, and check it in CI (#5638)

2026-10-02 11:32:15 +02:00

to_ubjson.md

Throw type_error.321 when serializing discarded values to binary formats (#5761)

2026-10-06 07:33:34 +02:00

type_error.md

📝 fix docs (#5217)

2026-06-29 22:15:18 +02:00

type_name.md

Review and extend the documentation, and check it in CI (#5638)

2026-10-02 11:32:15 +02:00

type.md

Review and extend the documentation, and check it in CI (#5638)

2026-10-02 11:32:15 +02:00

unflatten.md

Report one-character non-numeric array indices like longer ones (#5800)

2026-10-11 08:21:41 +02:00

update.md

Review and extend the documentation, and check it in CI (#5638)

2026-10-02 11:32:15 +02:00

value_t.md

Review and extend the documentation, and check it in CI (#5638)

2026-10-02 11:32:15 +02:00

value.md

Point users to update(…, true), JSON Pointer defaults, and built-in std::optional (#5804)

2026-10-11 08:22:10 +02:00

with_t.md

Add with_*_t alias templates to create basic_json types with changed template parameters (#5758)

2026-10-06 22:33:29 +02:00