Веб-сайт самохостера Lotigara

summaryrefslogtreecommitdiff
path: root/source/core
diff options
context:
space:
mode:
Diffstat (limited to 'source/core')
-rw-r--r--source/core/CMakeLists.txt5
-rw-r--r--source/core/StarJson.cpp30
-rw-r--r--source/core/StarJson.hpp8
-rw-r--r--source/core/StarJsonPatch.cpp146
-rw-r--r--source/core/StarJsonPatch.hpp5
5 files changed, 170 insertions, 24 deletions
diff --git a/source/core/CMakeLists.txt b/source/core/CMakeLists.txt
index ce35500..687b9c5 100644
--- a/source/core/CMakeLists.txt
+++ b/source/core/CMakeLists.txt
@@ -214,7 +214,10 @@ ELSEIF (STAR_SYSTEM_FAMILY_WINDOWS)
ENDIF ()
ADD_LIBRARY (star_core OBJECT ${star_core_SOURCES} ${star_core_HEADERS})
-TARGET_PRECOMPILE_HEADERS (star_core PUBLIC StarPch.hpp)
+
+IF(STAR_PRECOMPILED_HEADERS)
+ TARGET_PRECOMPILE_HEADERS (star_core PUBLIC StarPch.hpp)
+ENDIF()
IF(STAR_USE_JEMALLOC AND JEMALLOC_IS_PREFIXED)
SET_SOURCE_FILES_PROPERTIES(StarMemory.cpp PROPERTIES
diff --git a/source/core/StarJson.cpp b/source/core/StarJson.cpp
index 3feaf37..3502996 100644
--- a/source/core/StarJson.cpp
+++ b/source/core/StarJson.cpp
@@ -1035,4 +1035,34 @@ Json jsonMerge(Json const& base, Json const& merger) {
}
}
+bool jsonPartialMatch(Json const& base, Json const& compare) {
+ if (base == compare) {
+ return true;
+ } else {
+ if (base.type() == Json::Type::Object && compare.type() == Json::Type::Object) {
+ for (auto const& c : compare.toObject()) {
+ if (!base.contains(c.first) || !jsonPartialMatch(base.get(c.first), c.second))
+ return false;
+ }
+ return true;
+ }
+ if (base.type() == Json::Type::Array && compare.type() == Json::Type::Array) {
+ for (auto const& c : compare.toArray()) {
+ bool similar = false;
+ for (auto const& b : base.toArray()) {
+ if (jsonPartialMatch(c, b)) {
+ similar = true;
+ break;
+ }
+ }
+ if (!similar)
+ return false;
+ }
+ return true;
+ }
+
+ return false;
+ }
+}
+
} \ No newline at end of file
diff --git a/source/core/StarJson.hpp b/source/core/StarJson.hpp
index 4aa6f7b..085fd9f 100644
--- a/source/core/StarJson.hpp
+++ b/source/core/StarJson.hpp
@@ -355,6 +355,14 @@ Json jsonMergeQueryDef(String const& key, Json def, Json const& first, T const&.
return def;
}
+// Compares two JSON values to see if the second is a subset of the first.
+// For objects, each key in the second object must exist in the first
+// object and the values are recursively compared the same way. For arrays,
+// each element in the second array must successfully compare with some
+// element of the first array, regardless of order or duplication.
+// For all other types, the values must be equal.
+bool jsonPartialMatch(Json const& base, Json const& compare);
+
}
template <> struct fmt::formatter<Star::Json> : ostream_formatter {};
diff --git a/source/core/StarJsonPatch.cpp b/source/core/StarJsonPatch.cpp
index 49b6749..14505e5 100644
--- a/source/core/StarJsonPatch.cpp
+++ b/source/core/StarJsonPatch.cpp
@@ -16,6 +16,22 @@ Json jsonPatch(Json const& base, JsonArray const& patch) {
}
}
+
+// Returns 0 if not found, index + 1 if found.
+size_t findJsonMatch(Json const& searchable, Json const& value, JsonPath::Pointer& pointer) {
+ if (searchable.isType(Json::Type::Array)) {
+ auto array = searchable.toArray();
+ for (size_t i = 0; i != array.size(); ++i) {
+ if (jsonPartialMatch(array[i], value))
+ return i + 1;
+ }
+ } else {
+ throw JsonPatchException(strf("Search operation failure, value at '{}' is not an array.", pointer.path()));
+ }
+ return 0;
+}
+
+
namespace JsonPatching {
static const StringMap<std::function<Json(Json, Json)>> functionMap = StringMap<std::function<Json(Json, Json)>>{
@@ -25,6 +41,7 @@ namespace JsonPatching {
{"replace", std::bind(applyReplaceOperation, _1, _2)},
{"move", std::bind(applyMoveOperation, _1, _2)},
{"copy", std::bind(applyCopyOperation, _1, _2)},
+ {"merge", std::bind(applyMergeOperation, _1, _2)},
};
Json applyOperation(Json const& base, Json const& op, Maybe<Json> const& external) {
@@ -39,25 +56,34 @@ namespace JsonPatching {
}
Json applyTestOperation(Json const& base, Json const& op) {
- auto path = op.getString("path");
- auto value = op.opt("value");
- auto inverseTest = op.getBool("inverse", false);
-
+ String path = op.getString("path");
auto pointer = JsonPath::Pointer(path);
+ auto inverseTest = op.getBool("inverse", false);
try {
- auto testValue = pointer.get(base);
- if (!value) {
- if (inverseTest)
- throw JsonPatchTestFail(strf("Test operation failure, expected {} to be missing.", op.getString("path")));
+ if (op.contains("search")) {
+ auto searchable = pointer.get(base);
+ auto searchValue = op.get("search");
+ bool found = findJsonMatch(searchable, searchValue, pointer);
+ if (found && inverseTest)
+ throw JsonPatchTestFail(strf("Test operation failure, expected {} to be missing.", searchValue));
+ else if (!found && !inverseTest)
+ throw JsonPatchTestFail(strf("Test operation failure, could not find {}.", searchValue));
return base;
+ } 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.", path));
+ return base;
+ }
+
+ if ((value && (testValue == *value)) ^ inverseTest)
+ return base;
+ else
+ throw JsonPatchTestFail(strf("Test operation failure, expected {} found {}.", value, testValue));
}
-
- if ((value && (testValue == *value)) ^ inverseTest) {
- return base;
- }
-
- throw JsonPatchTestFail(strf("Test operation failure, expected {} found {}.", value, testValue));
} catch (JsonPath::TraversalException& e) {
if (inverseTest)
return base;
@@ -66,31 +92,107 @@ namespace JsonPatching {
}
Json applyRemoveOperation(Json const& base, Json const& op) {
- return JsonPath::Pointer(op.getString("path")).remove(base);
+ String path = op.getString("path");
+ auto pointer = JsonPath::Pointer(path);
+
+ if (op.contains("search")) {
+ auto searchable = pointer.get(base);
+ auto searchValue = op.get("search");
+ if (size_t index = findJsonMatch(searchable, searchValue, pointer))
+ return pointer.add(pointer.remove(base), searchable.eraseIndex(index - 1));
+ else
+ return base;
+ } else {
+ return pointer.remove(base);
+ }
}
Json applyAddOperation(Json const& base, Json const& op) {
- return JsonPath::Pointer(op.getString("path")).add(base, op.get("value"));
+ String path = op.getString("path");
+ auto value = op.get("value");
+ auto pointer = JsonPath::Pointer(path);
+
+ if (op.contains("search")) {
+ auto searchable = pointer.get(base);
+ auto searchValue = op.get("search");
+ if (size_t index = findJsonMatch(searchable, searchValue, pointer))
+ return pointer.add(pointer.remove(base), searchable.insert(index - 1, value));
+ else
+ return base;
+ } else {
+ return pointer.add(base, value);
+ }
}
Json applyReplaceOperation(Json const& base, Json const& op) {
+ String path = op.getString("path");
+ auto value = op.get("value");
auto pointer = JsonPath::Pointer(op.getString("path"));
- return pointer.add(pointer.remove(base), op.get("value"));
+
+ if (op.contains("search")) {
+ auto searchable = pointer.get(base);
+ auto searchValue = op.get("search");
+ if (size_t index = findJsonMatch(searchable, searchValue, pointer))
+ return pointer.add(pointer.remove(base), searchable.set(index - 1, value));
+ else
+ return base;
+ } else {
+ return pointer.add(pointer.remove(base), value);
+ }
}
Json applyMoveOperation(Json const& base, Json const& op) {
+ String path = op.getString("path");
+ auto toPointer = JsonPath::Pointer(path);
auto fromPointer = JsonPath::Pointer(op.getString("from"));
- auto toPointer = JsonPath::Pointer(op.getString("path"));
- Json value = fromPointer.get(base);
- return toPointer.add(fromPointer.remove(base), value);
+ if (op.contains("search")) {
+ auto searchable = fromPointer.get(base);
+ auto searchValue = op.get("search");
+ if (size_t index = findJsonMatch(searchable, searchValue, fromPointer)) {
+ auto result = toPointer.add(base, searchable.get(index - 1));
+ return fromPointer.add(result, searchable.eraseIndex(index - 1));
+ }
+ else
+ return base;
+ } else {
+ Json value = fromPointer.get(base);
+ return toPointer.add(fromPointer.remove(base), value);
+ }
}
Json applyCopyOperation(Json const& base, Json const& op) {
+ String path = op.getString("path");
+ auto toPointer = JsonPath::Pointer(path);
auto fromPointer = JsonPath::Pointer(op.getString("from"));
- auto toPointer = JsonPath::Pointer(op.getString("path"));
- return toPointer.add(base, fromPointer.get(base));
+ if (op.contains("search")) {
+ auto searchable = fromPointer.get(base);
+ auto searchValue = op.get("search");
+ if (size_t index = findJsonMatch(searchable, searchValue, fromPointer))
+ return toPointer.add(base, searchable.get(index - 1));
+ else
+ return base;
+ } else {
+ Json value = fromPointer.get(base);
+ return toPointer.add(base, value);
+ }
+ }
+
+ Json applyMergeOperation(Json const& base, Json const& op) {
+ String path = op.getString("path");
+ auto pointer = JsonPath::Pointer(path);
+
+ if (op.contains("search")) {
+ auto searchable = pointer.get(base);
+ auto searchValue = op.get("search");
+ if (size_t index = findJsonMatch(searchable, searchValue, pointer))
+ return pointer.add(pointer.remove(base), searchable.set(index - 1, jsonMerge(searchable.get(index - 1), op.get("value"))));
+ else
+ return base;
+ } else {
+ return pointer.add(pointer.remove(base), jsonMerge(pointer.get(base), op.get("value")));
+ }
}
}
diff --git a/source/core/StarJsonPatch.hpp b/source/core/StarJsonPatch.hpp
index 5610cc6..9832543 100644
--- a/source/core/StarJsonPatch.hpp
+++ b/source/core/StarJsonPatch.hpp
@@ -33,6 +33,9 @@ namespace JsonPatching {
// Copies "from" to "path"
Json applyCopyOperation(Json const& base, Json const& op);
-}
+
+ // Merges "value" at "path"
+ Json applyMergeOperation(Json const& base, Json const& op);
+ }
}
generated by cgit v1.2.3 (git 2.39.1) at 2025-07-12 11:45:01 +0000