Skip to content

Preserve JSON null when indexing into an array #4

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
rayokota merged 1 commit into from
May 24, 2026
Merged

Preserve JSON null when indexing into an array #4

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
23 changes: 15 additions & 8 deletions src/jsonata/Jsonata.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1868,6 +1868,9 @@ std::any Jsonata::evaluateFilter(std::shared_ptr<Parser::Symbol> predicate,
if (inputSequence.tupleStream) {
results.tupleStream = true;
}
} else if (!input.has_value()) {
// undefined input yields undefined output; skip filtering entirely
inputSequence = Utils::createSequence();
} else if (!Utils::isArray(input)) {
inputSequence = Utils::createSequence(input);
} else {
Expand All @@ -1893,14 +1896,18 @@ std::any Jsonata::evaluateFilter(std::shared_ptr<Parser::Symbol> predicate,
// ((List)input).get(index) : null;
if (index >= 0 && index < static_cast<int64_t>(inputSequence.size())) {
auto item = inputSequence[index];
// Follow Java exactly: only add if item != null
if (item.has_value()) {
// Java reference line 505: if(item instanceof List)
if (Utils::isArray(item)) {
results = Utils::arrayify(item);
} else {
results.push_back(item);
}
// Preserve JSON null at this index (vs. out-of-bounds, which is
// undefined). An empty std::any here means the element was a
// JSON null; promote it to NULL_VALUE so downstream
// has_value() filtering keeps it.
if (!item.has_value()) {
item = Utils::NULL_VALUE;
}
// Java reference line 505: if(item instanceof List)
if (Utils::isArray(item)) {
results = Utils::arrayify(item);
} else {
results.push_back(item);
}
}
} catch (const std::bad_any_cast&) {
Expand Down
10 changes: 10 additions & 0 deletions test/NullSafetyTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,16 @@ TEST_F(NullSafetyTest, testSingleNull) {
EXPECT_EQ(result.get<int>(), 1);
}

TEST_F(NullSafetyTest, testArrayIndexPreservesNull) {
// Indexing into an array element that is JSON null must yield null,
// not be filtered out as if it were undefined.
auto data = nlohmann::ordered_json::parse(
R"({"data": [[1, null, 3], [2, null, 4], [3, null, 5]]})");
auto result = Jsonata("[$map(data, function($row) { $row[1] })]").evaluate(data);
auto expected = nlohmann::ordered_json::parse("[null, null, null]");
EXPECT_EQ(result, expected);
}

TEST_F(NullSafetyTest, testFilterNullLookup) {
nlohmann::ordered_json arrayData = nlohmann::ordered_json::array({
nlohmann::ordered_json::object({{"content", "some"}}),
Expand Down
Loading