improve JSONValue

Author: swhitty

FlyingFox/Sources/JSON/JSONValue.swift

@@ -31,16 +31,20 @@
 
 import Foundation
 
-public indirect enum JSONValue: @unchecked Sendable, Equatable {
+public indirect enum JSONValue: Sendable, Hashable {
     case object([String: JSONValue])
     case array([JSONValue])
     case string(String)
     case number(Double)
     case boolean(Bool)
     case null
 
-    public func getValue(for path: String) throws -> JSONValue {
-        try getValue(for: JSONPath(parsing: path))
+    public subscript(jsonPath: String) -> JSONValue? {
+        get { try? getValue(for: jsonPath) }
+    }
+
+    public func getValue(for jsonPath: String) throws -> JSONValue {
+        try getValue(for: JSONPath(parsing: jsonPath))
     }
 
     public func getValue(for path: JSONPath) throws -> JSONValue {
@@ -197,34 +201,26 @@ public extension JSONValue {
     }
 }
 
-public func == (lhs: JSONValue, rhs: String) -> Bool {
-    lhs == JSONValue.string(rhs)
-}
-
-public func != (lhs: JSONValue, rhs: String) -> Bool {
-    !(lhs == rhs)
-}
-
-public func == (lhs: JSONValue, rhs: Double) -> Bool {
-    lhs == JSONValue.number(rhs)
-}
-
-public func != (lhs: JSONValue, rhs: Double) -> Bool {
-    !(lhs == rhs)
-}
-
-public func == (lhs: JSONValue, rhs: Bool) -> Bool {
-    lhs == JSONValue.boolean(rhs)
+extension JSONValue: ExpressibleByStringLiteral {
+    public init(stringLiteral value: String) {
+        self = .string(value)
+    }
 }
 
-public func != (lhs: JSONValue, rhs: Bool) -> Bool {
-    !(lhs == rhs)
+extension JSONValue: ExpressibleByBooleanLiteral {
+    public init(booleanLiteral value: Bool) {
+        self = .boolean(value)
+    }
 }
 
-public func == (lhs: JSONValue, rhs: some BinaryInteger) -> Bool {
-    lhs == JSONValue.number(Double(rhs))
+extension JSONValue: ExpressibleByIntegerLiteral {
+    public init(integerLiteral value: Int) {
+        self = .number(Double(value))
+    }
 }
 
-public func != (lhs: JSONValue, rhs: some BinaryInteger) -> Bool {
-    !(lhs == rhs)
+extension JSONValue: ExpressibleByFloatLiteral {
+    public init(floatLiteral value: Double) {
+        self = .number(value)
+    }
 }

FlyingFox/Tests/JSON/JSONBodyPatternTests.swift

@@ -38,7 +38,7 @@ struct JSONBodyPatternTests {
     @Test
     func pattern_MatchesJSONPath() async throws {
         // given
-        let pattern = JSONBodyPattern { try $0.getValue(for: "$.name") == "fish" }
+        let pattern = JSONBodyPattern { $0["$.name"] == "fish" }
 
         // when then
         #expect(pattern.evaluate(json: #"{"name": "fish"}"#))
@@ -53,7 +53,7 @@ struct JSONBodyPatternTests {
         // given
         let route = HTTPRoute(
             "POST /fish",
-            jsonBody: { try $0.getValue(for: "$.food") == "chips"  }
+            jsonBody: { $0["$.food"] == "chips"  }
         )
 
         // when

FlyingFox/Tests/JSON/JSONValueTests.swift

@@ -38,7 +38,7 @@ struct JSONValueTests {
     @Test
     func json_string() throws {
         // given
-        let val = try JSONValue("fish")
+        let val = try JSONValue("fish" as Any)
 
         // then
         #expect(val == "fish")
@@ -48,7 +48,7 @@ struct JSONValueTests {
     @Test
     func json_int() throws {
         // given
-        let val = try JSONValue(Int(10))
+        let val = try JSONValue(Int(10) as Any)
 
         // then
         #expect(val == 10)
@@ -58,7 +58,7 @@ struct JSONValueTests {
     @Test
     func json_double() throws {
         // given
-        let val = try JSONValue(10.5)
+        let val = try JSONValue(10.5 as Any)
 
         // then
         #expect(val == 10.5)
@@ -68,7 +68,7 @@ struct JSONValueTests {
     @Test
     func json_bool() throws {
         // given
-        let val = try JSONValue(true)
+        let val = try JSONValue(true as Any)
 
         // then
         #expect(val == true)
@@ -78,7 +78,7 @@ struct JSONValueTests {
     @Test
     func json_nsnull() throws {
         // given
-        let val = try JSONValue(NSNull())
+        let val = try JSONValue(NSNull() as Any)
 
         // then
         #expect(val == .null)