add conditionals

Author: pascalPost

README.md

@@ -34,7 +34,7 @@ The validator currently uses C++ regex implementation for pattern matching, requ
   - [x] exclusiveMaximum.json
   - [x] exclusiveMinimum.json
   - [ ] format.json
-  - [ ] if-then-else.json
+  - [x] if-then-else.json
   - [ ] infinite-loop-detection.json
   - [x] items.json
   - [x] maxItems.json

src/conditional.zig

@@ -0,0 +1,32 @@
+const std = @import("std");
+const Stack = @import("stack.zig").Stack;
+const Errors = @import("errors.zig").Errors;
+const schema = @import("schema.zig");
+
+pub fn checks(node: std.json.ObjectMap, data: std.json.Value, stack: *Stack, collect_errors: ?*Errors) !bool {
+    if (node.get("if")) |if_schema| {
+        if (try schema.checks(if_schema, data, stack, null)) {
+            if (node.get("then")) |then_schema| {
+                if (!try schema.checks(then_schema, data, stack, null)) {
+                    if (collect_errors) |errors| {
+                        try stack.pushPath("then");
+                        defer stack.pop();
+                        try errors.append(.{ .path = try stack.constructPath(errors.arena.allocator()), .msg = "Invalid for \"then\" condition." });
+                    } else return false;
+                }
+            }
+        } else {
+            if (node.get("else")) |else_schema| {
+                if (!try schema.checks(else_schema, data, stack, null)) {
+                    if (collect_errors) |errors| {
+                        try stack.pushPath("else");
+                        defer stack.pop();
+                        try errors.append(.{ .path = try stack.constructPath(errors.arena.allocator()), .msg = "Invalid for \"else\" condition" });
+                    } else return false;
+                }
+            }
+        }
+    }
+
+    return true;
+}

src/schema.zig

@@ -8,27 +8,28 @@ const string = @import("string.zig");
 const array = @import("array.zig");
 const json_pointer = @import("json_pointer.zig");
 const boolean_logic = @import("boolean_logic.zig");
+const conditional = @import("conditional.zig");
 
 pub const ErrorSet = std.mem.Allocator.Error || std.fmt.ParseIntError || json_pointer.Error;
 
 pub fn checksFromObject(schema: std.json.ObjectMap, data: std.json.Value, stack: *Stack, collect_errors: ?*Errors) ErrorSet!bool {
-    var valid = try generic.checks(schema, data, stack, collect_errors);
-    if (!valid and collect_errors == null) return false;
+    if (!try generic.checks(schema, data, stack, collect_errors) and collect_errors == null) return false;
 
-    valid = switch (data) {
+    if (!switch (data) {
         .integer => |i| try numeric.checks(i64, schema, i, stack, collect_errors),
         .float => |f| try numeric.checks(f64, schema, f, stack, collect_errors),
         .number_string => unreachable,
         .string => |str| try string.checks(schema, str, stack, collect_errors),
         .object => try object.checks(schema, data, stack, collect_errors),
         .array => try array.checks(schema, data, stack, collect_errors),
         else => true,
-    } and valid;
-    if (!valid and collect_errors == null) return false;
+    } and collect_errors == null) return false;
 
-    valid = try boolean_logic.checks(schema, data, stack, collect_errors) and valid;
+    if (!try conditional.checks(schema, data, stack, collect_errors) and collect_errors == null) return false;
 
-    return valid;
+    if (!try boolean_logic.checks(schema, data, stack, collect_errors) and collect_errors == null) return false;
+
+    return if (collect_errors) |errors| errors.empty() else true;
 }
 
 pub fn checks(schema: std.json.Value, data: std.json.Value, stack: *Stack, collect_errors: ?*Errors) ErrorSet!bool {

src/test_suite.zig

@@ -62,6 +62,7 @@ test "run test suite" {
         "oneOf.json",
         "allOf.json",
         "not.json",
+        "if-then-else.json",
         // "ref.json",
         // "WIP.json",
     };