evert/osb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added the search operand to the find, replace, and remove operations

Browse Source
This commit is contained in:
JamesTheMaker 2024-03-07 12:31:48 -05:00
parent c808d207c9
commit 9b4ca69e0e
1 changed files with 85 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

99
source/core/StarJsonPatch.cpp
View File

@ -40,24 +40,49 @@ namespace JsonPatching {
Json applyTestOperation(Json const& base, Json const& op) { Json applyTestOperation(Json const& base, Json const& op) {
auto path = op.getString("path"); auto path = op.getString("path");
auto value = op.opt("value");
auto inverseTest = op.getBool("inverse", false); auto inverseTest = op.getBool("inverse", false);
auto pointer = JsonPath::Pointer(path); auto pointer = JsonPath::Pointer(path);
try { try {
auto testValue = pointer.get(base); if (op.contains("search")) {
if (!value) { Json searchArray = pointer.get(base);
if (inverseTest) Json searchValue = op.get("search");
throw JsonPatchTestFail(strf("Test operation failure, expected {} to be missing.", op.getString("path"))); if (searchArray.type() == Json::Type::Array) {
return base; bool found = false;
} for(auto& e : searchArray.toArray()) {
if (jsonCompare(e, searchValue)) {
found = true;
break;
}
}
if (found) {
if (inverseTest)
throw JsonPatchTestFail(strf("Test operation failure, expected {} to be missing.", searchValue));
return base;
} else {
if (!inverseTest)
throw JsonPatchTestFail(strf("Test operation failure, could not find {}.", searchValue));
return base;
}
} else {
throw JsonPatchException(strf("Search operation failure, value at '{}' is not an array.", path));
}
} else {
auto value = op.opt("value");
auto testValue = pointer.get(base);
if (!value) {
if (inverseTest)
throw JsonPatchTestFail(strf("Test operation failure, expected {} to be missing.", op.getString("path")));
return base;
}
if ((value && (testValue == *value)) ^ inverseTest) { if ((value && (testValue == *value)) ^ inverseTest) {
return base; return base;
} }
throw JsonPatchTestFail(strf("Test operation failure, expected {} found {}.", value, testValue)); throw JsonPatchTestFail(strf("Test operation failure, expected {} found {}.", value, testValue));
}
} catch (JsonPath::TraversalException& e) { } catch (JsonPath::TraversalException& e) {
if (inverseTest) if (inverseTest)
return base; return base;
@ -93,12 +118,58 @@ namespace JsonPatching {
} }
Json applyAddOperation(Json const& base, Json const& op) { Json applyAddOperation(Json const& base, Json const& op) {
return JsonPath::Pointer(op.getString("path")).add(base, op.get("value")); if (op.contains("search")) {
Json value = op.get("value");
String path = op.getString("path");
auto pointer = JsonPath::Pointer(path);
Json searchArray = pointer.get(base);
Json searchValue = op.get("search");
if (searchArray.type() == Json::Type::Array) {
bool found = false;
for (auto& e : searchArray.toArray()) {
if (jsonCompare(e, searchValue)) {
found = true;
break;
}
}
if (found)
searchArray = searchArray.append(value);
return pointer.add(pointer.remove(base), searchArray);
} else {
throw JsonPatchException(strf("Search operation failure, value at {} is not an array.", path));
}
} else {
return JsonPath::Pointer(op.getString("path")).add(base, op.get("value"));
}
} }
Json applyReplaceOperation(Json const& base, Json const& op) { Json applyReplaceOperation(Json const& base, Json const& op) {
auto pointer = JsonPath::Pointer(op.getString("path")); if (op.contains("search")) {
return pointer.add(pointer.remove(base), op.get("value")); Json value = op.get("value");
String path = op.getString("path");
auto pointer = JsonPath::Pointer(path);
Json searchArray = pointer.get(base);
Json searchValue = op.get("search");
if (searchArray.type() == Json::Type::Array) {
size_t index = 0;
bool found = false;
for (auto& e : searchArray.toArray()) {
if (jsonCompare(e, searchValue)) {
found = true;
break;
}
index++;
}
if (found)
searchArray = searchArray.set(index, value);
return pointer.add(pointer.remove(base), searchArray);
} else {
throw JsonPatchException(strf("Search operation failure, value at {} is not an array.", path));
}
} else {
auto pointer = JsonPath::Pointer(op.getString("path"));
return pointer.add(pointer.remove(base), op.get("value"));
}
} }
Json applyMoveOperation(Json const& base, Json const& op) { Json applyMoveOperation(Json const& base, Json const& op) {