boolean logic added

Author: Pascal Post

README.md

@@ -22,9 +22,9 @@ The validator currently uses C++ regex implementation for pattern matching, requ
 - [ ] draft-07 tests
   - [x] additionalItems.json
   - [x] additionalProperties.json
-  - [ ] allOf.json
-  - [ ] anyOf.json
-  - [ ] boolean_schema.json
+  - [x] allOf.json
+  - [x] anyOf.json
+  - [x] boolean_schema.json
   - [x] const.json
   - [ ] contains.json
   - [ ] default.json
@@ -46,8 +46,8 @@ The validator currently uses C++ regex implementation for pattern matching, requ
   - [x] minProperties.json
   - [x] minimum.json
   - [x] multipleOf.json
-  - [ ] not.json
-  - [ ] oneOf.json
+  - [x] not.json
+  - [x] oneOf.json
   - [x] pattern.json
   - [x] patternProperties.json
   - [x] properties.json

src/boolean_logic.zig

@@ -23,5 +23,72 @@ pub fn checks(node: std.json.ObjectMap, data: std.json.Value, stack: *Stack, col
         }
     }
 
+    if (node.get("anyOf")) |anyOf| {
+        std.debug.assert(anyOf == .array);
+
+        try stack.pushPath("anyOf");
+        defer stack.pop();
+
+        var valid = false;
+        for (anyOf.array.items, 0..) |item, idx| {
+            try stack.pushIndex(idx);
+            defer stack.pop();
+
+            if (try schema.checks(item, data, stack, null)) {
+                valid = true;
+                break;
+            }
+        }
+
+        if (!valid) {
+            if (collect_errors) |errors| {
+                try errors.append(.{ .path = try stack.constructPath(errors.arena.allocator()), .msg = "None of anyOf valid." });
+            } else return false;
+        }
+    }
+
+    if (node.get("oneOf")) |oneOf| {
+        std.debug.assert(oneOf == .array);
+
+        try stack.pushPath("oneOf");
+        defer stack.pop();
+
+        var valid_idx: ?usize = null;
+        for (oneOf.array.items, 0..) |item, idx| {
+            try stack.pushIndex(idx);
+            defer stack.pop();
+
+            if (try schema.checks(item, data, stack, null)) {
+                if (valid_idx) |first_valid_idx| {
+                    if (collect_errors) |errors| {
+                        const msg = try std.fmt.allocPrint(errors.arena.allocator(), "oneOf valid for more than one schemas: stopped checking after valid schemas ({}, {}).", .{ first_valid_idx, idx });
+                        try errors.append(.{ .path = try stack.constructPath(errors.arena.allocator()), .msg = msg });
+                    } else return false;
+                }
+
+                valid_idx = idx;
+            }
+        }
+
+        if (valid_idx == null) {
+            if (collect_errors) |errors| {
+                try errors.append(.{ .path = try stack.constructPath(errors.arena.allocator()), .msg = "None of oneOf valid." });
+            } else return false;
+        }
+    }
+
+    if (node.get("not")) |not| {
+        std.debug.assert(not == .object or not == .bool);
+
+        try stack.pushPath("not");
+        defer stack.pop();
+
+        if (try schema.checks(not, data, stack, null)) {
+            if (collect_errors) |errors| {
+                try errors.append(.{ .path = try stack.constructPath(errors.arena.allocator()), .msg = "Failed required unsuccessfull validation against schema specified as \"not\"." });
+            } else return false;
+        }
+    }
+
     return if (collect_errors) |errors| errors.empty() else true;
 }

src/test_suite.zig

@@ -57,7 +57,11 @@ test "run test suite" {
         "properties.json",
         "enum.json",
         "uniqueItems.json",
-        // "allOf.json",
+        "anyOf.json",
+        "boolean_schema.json",
+        "oneOf.json",
+        "allOf.json",
+        "not.json",
         // "ref.json",
         // "WIP.json",
     };