Add Codable conformance (#4)

Author: atdrendel

.github/workflows/ci.yml

@@ -3,14 +3,12 @@ name: CI
 on: push
 
 jobs:
-  library:
-    runs-on: macos-12
+  test:
+    runs-on: macos-13
 
     steps:
       - uses: actions/checkout@v3
-      - name: Select Xcode 14
-        run: sudo xcode-select -s /Applications/Xcode_14.1.app
-      - name: Build
-        run: swift build -v
+      - name: Select Xcode 15
+        run: sudo xcode-select -s /Applications/Xcode_15.0.app
       - name: Test
-        run: swift test -v
+        run: swift test

.swift-version

@@ -1,2 +1,2 @@
-5.7.0
+5.9.0
 

Package.swift

@@ -1,4 +1,4 @@
-// swift-tools-version: 5.7
+// swift-tools-version: 5.9
 
 import PackageDescription
 

Sources/JSON/JSON.swift

@@ -299,6 +299,55 @@ extension JSON: Equatable {
     }
 }
 
+extension JSON: Codable {
+    public init(from decoder: Decoder) throws {
+        let container = try decoder.singleValueContainer()
+
+        if container.decodeNil() {
+            self = .null
+        } else if let bool = try? container.decode(Bool.self) {
+            self = .boolean(bool)
+        } else if let double = try? container.decode(Double.self) {
+            self = .number(double)
+        } else if let string = try? container.decode(String.self) {
+            self = .string(string)
+        } else if let array = try? container.decode([JSON].self) {
+            self = .array(array)
+        } else if let dictionary = try? container.decode([String: JSON].self) {
+            self = .dictionary(dictionary)
+        } else {
+            throw DecodingError.dataCorruptedError(
+                in: container,
+                debugDescription: "Invalid JSON value."
+            )
+        }
+    }
+
+    public func encode(to encoder: Encoder) throws {
+        var container = encoder.singleValueContainer()
+
+        switch self {
+        case .null:
+            try container.encodeNil()
+
+        case let .boolean(bool):
+            try container.encode(bool)
+
+        case let .number(double):
+            try container.encode(double)
+
+        case let .string(string):
+            try container.encode(string)
+
+        case let .array(array):
+            try container.encode(array)
+
+        case let .dictionary(dictionary):
+            try container.encode(dictionary)
+        }
+    }
+}
+
 public extension JSON? {
     subscript(key: String) -> JSON? {
         get {

Tests/JSONTests/JSONTests.swift

@@ -259,6 +259,31 @@ final class JSONTests: XCTestCase {
         XCTAssertTrue(JSON.string("boom") as JSON? == "boom")
     }
 
+    func testCodable() throws {
+        let json: JSON = [
+            "one": 2,
+            "two_text": "two",
+            "pi": 3.14,
+            "yes": true,
+            "null": nil,
+            "object": [
+                "three": 3,
+                "four_text": "four",
+                "null": nil,
+                "inner_array": [
+                    "index_0",
+                    false,
+                    4.20,
+                ] as [Any?],
+            ] as [String: Any?],
+        ]
+
+        let encoded = try JSONEncoder().encode(json)
+        let decoded = try JSONDecoder().decode(JSON.self, from: encoded)
+
+        XCTAssertEqual(decoded, json)
+    }
+
     func testInitWithLiteralTypes() throws {
         XCTAssertEqual(
             JSON.array([.boolean(true), .number(3.14), .null]),

bin/format.sh

@@ -1,17 +1,25 @@
 #!/usr/bin/env bash
+# https://sharats.me/posts/shell-script-best-practices/
 
-set -e
+set -o errexit
+set -o nounset
+set -o pipefail
+if [[ "${TRACE-0}" == "1" ]]; then
+    set -o xtrace
+fi
 
-SELF=`realpath $0`
-DIR=`dirname $SELF`
-DEV_DIR=`echo ${DIR%/*}`
+if [[ "${1-}" =~ ^-*h(elp)?$ ]]; then
+    echo 'Usage: ./format.sh'
+    exit
+fi
 
-pushd "$DEV_DIR" &>/dev/null
+DIR=`dirname "$0"`
+pushd "$DIR/.." &>/dev/null
 
 if command -v swiftformat >/dev/null 2>&1; then
   swiftformat --quiet --config .swiftformat .
 else
-  echo "warning: Install swiftformat by running 'brew install swiftformat'"
+  echo "warning: Install swiftformat by running 'brew install swiftformat'" >&2
 fi
 
 popd &>/dev/null