Everything under one target (#44)

Author: fabianfett

IntegrationTests/tests_04_performance/test_01_resources/run-nio-alloc-counter-tests.sh

@@ -39,7 +39,7 @@ fi
 
 "$here/../../allocation-counter-tests-framework/run-allocation-counter.sh" \
     -p "$here/../../.." \
-    -m PureSwiftJSONCoding -m PureSwiftJSONParsing \
+    -m PureSwiftJSON \
     -s "$here/shared.swift" \
     -t "$tmp_dir" \
     "${tests_to_run[@]}"

IntegrationTests/tests_04_performance/test_01_resources/test_jsonvalue_to_bytes.swift

@@ -1,4 +1,4 @@
-import PureSwiftJSONParsing
+import PureSwiftJSON
 
 func run(identifier: String) {
     let sampleString = SampleStructure.sampleJSON

Package.swift

@@ -6,37 +6,15 @@ import PackageDescription
 var package = Package(
     name: "pure-swift-json",
     products: [
-        .library(
-            name: "PureSwiftJSONCoding",
-            targets: ["PureSwiftJSONCoding"]
-        ),
-        .library(
-            name: "PureSwiftJSONParsing",
-            targets: ["PureSwiftJSONParsing"]
-        ),
-    ],
-    dependencies: [
+        .library(name: "PureSwiftJSON", targets: ["PureSwiftJSON"]),
     ],
     targets: [
-        .target(
-            name: "PureSwiftJSONCoding",
-            dependencies: ["PureSwiftJSONParsing"]
-        ),
-        .target(
-            name: "PureSwiftJSONParsing",
-            dependencies: []
-        ),
-        .testTarget(
-            name: "JSONCodingTests",
-            dependencies: ["PureSwiftJSONCoding"]
-        ),
-        .testTarget(
-            name: "JSONParsingTests",
-            dependencies: ["PureSwiftJSONParsing"]
-        ),
-        .testTarget(
-            name: "LearningTests",
-            dependencies: ["PureSwiftJSONParsing"]
-        ),
+        .target(name: "PureSwiftJSON"),
+        .testTarget(name: "PureSwiftJSONTests", dependencies: [
+            .byName(name: "PureSwiftJSON"),
+        ]),
+        .testTarget(name: "LearningTests", dependencies: [
+            .byName(name: "PureSwiftJSON"),
+        ]),
     ]
 )

PerfTests/Package.swift

@@ -15,7 +15,12 @@ var package = Package(
     targets: [
         .target(
             name: "CodingPerfTests",
-            dependencies: ["PureSwiftJSONCoding", "PureSwiftJSONParsing", "NIO", "NIOFoundationCompat", "IkigaJSON"]
+            dependencies: [
+                .product(name: "PureSwiftJSON", package: "pure-swift-json"),
+                .product(name: "NIO", package: "swift-nio"),
+                .product(name: "NIOFoundationCompat", package: "swift-nio"),
+                .product(name: "IkigaJSON", package: "IkigaJSON"),
+            ]
         ),
     ]
 )

PerfTests/Sources/CodingPerfTests/main.swift

@@ -1,6 +1,5 @@
 import Foundation
-import PureSwiftJSONCoding
-import PureSwiftJSONParsing
+import PureSwiftJSON
 #if os(macOS)
     import SwiftyJSON
 #endif
@@ -21,7 +20,7 @@ func timing(name: String, execute: () throws -> Void) rethrows -> TimeInterval {
 
 let sampleString = SampleStructure.sampleJSON
 let sampleBytes = [UInt8](sampleString.utf8)
-let sampleStruct = try PureSwiftJSONCoding.JSONDecoder().decode([SampleStructure].self, from: sampleBytes)
+let sampleStruct = try PureSwiftJSON.JSONDecoder().decode([SampleStructure].self, from: sampleBytes)
 let sampleJSON = try JSONParser().parse(bytes: sampleBytes)
 
 print("Number of invocations: \(runs)")
@@ -54,7 +53,7 @@ let ikigaEncoding = try timing(name: "Ikiga                        ") {
     }
 }
 
-let pureEncoder = PureSwiftJSONCoding.JSONEncoder()
+let pureEncoder = PureSwiftJSON.JSONEncoder()
 let pureEncoding = try timing(name: "PureSwift                    ") {
     for _ in 1 ... runs {
         _ = try pureEncoder.encode(sampleStruct)
@@ -166,7 +165,7 @@ let ikigaDecodingBuffer = try timing(name: "IkigaJSON on NIO.ByteBuffer  ") {
     }
 }
 
-let pureDecoder = PureSwiftJSONCoding.JSONDecoder()
+let pureDecoder = PureSwiftJSON.JSONDecoder()
 let pureDecoding = try timing(name: "PureSwift on [UInt8]         ") {
     for _ in 1 ... runs {
         _ = try pureDecoder.decode([SampleStructure].self, from: sampleBytes)

README.md

@@ -39,20 +39,20 @@ Add `pure-swift-json` as dependency to your `Package.swift`:
   ],
 ```
 
-Add `PureSwiftJSONCoding` to the target you want to use it in.
+Add `PureSwiftJSON` to the target you want to use it in.
 
 ```swift
   targets: [
     .target(name: "MyFancyTarget", dependencies: [
-      .product(name: "PureSwiftJSONCoding", package: "pure-swift-json"),
+      .product(name: "PureSwiftJSON", package: "pure-swift-json"),
     ])
   ]
 ```
 
 Use it as you would use the Foundation encoder and decoder.
 
 ```swift
-import PureSwiftJSONCoding
+import PureSwiftJSON
 
 let bytesArray  = try JSONEncoder().encode(myEncodable)
 let myDecodable = try JSONDecoder().decode(MyDecodable.self, from: bytes)
@@ -81,9 +81,9 @@ Increase the performance of your Vapor 4 API by using `pure-swift-json` instead
 
 ```swift
 import Vapor
-import PureSwiftJSONCoding
+import PureSwiftJSON
 
-extension PureSwiftJSONCoding.JSONEncoder: ContentEncoder {
+extension PureSwiftJSON.JSONEncoder: ContentEncoder {
   public func encode<E: Encodable>(
     _ encodable: E,
     to body: inout ByteBuffer,
@@ -96,7 +96,7 @@ extension PureSwiftJSONCoding.JSONEncoder: ContentEncoder {
   }
 }
 
-extension PureSwiftJSONCoding.JSONDecoder: ContentDecoder {
+extension PureSwiftJSON.JSONDecoder: ContentDecoder {
   public func decode<D: Decodable>(
     _ decodable: D.Type,
     from body: ByteBuffer,
@@ -114,10 +114,10 @@ extension PureSwiftJSONCoding.JSONDecoder: ContentDecoder {
 Next, register the encoder and decoder for use in Vapor:
 
 ```swift
-let decoder = PureSwiftJSONCoding.JSONDecoder()
+let decoder = PureSwiftJSON.JSONDecoder()
 ContentConfiguration.global.use(decoder: decoder, for: .json)
 
-let encoder = PureSwiftJSONCoding.JSONEncoder()
+let encoder = PureSwiftJSON.JSONEncoder()
 ContentConfiguration.global.use(encoder: encoder, for: .json)
 ```
 

Sources/PureSwiftJSONCoding/ArrayKey.swift renamed to Sources/PureSwiftJSON/ArrayKey.swift

@@ -1,4 +1,4 @@
-import PureSwiftJSONParsing
+import PureSwiftJSON
 
 public struct JSONDecoder {
     @usableFromInline var userInfo: [CodingUserInfoKey: Any] = [:]

Sources/PureSwiftJSONCoding/Decoding/JSONDecoder.swift renamed to Sources/PureSwiftJSON/Decoding/JSONDecoder.swift

@@ -1,5 +1,3 @@
-import PureSwiftJSONParsing
-
 struct JSONKeyedDecodingContainer<K: CodingKey>: KeyedDecodingContainerProtocol {
     typealias Key = K
 

Sources/PureSwiftJSONCoding/Decoding/JSONKeyedDecodingContainer.swift renamed to Sources/PureSwiftJSON/Decoding/JSONKeyedDecodingContainer.swift

@@ -1,4 +1,3 @@
-import PureSwiftJSONParsing
 
 struct JSONSingleValueDecodingContainter: SingleValueDecodingContainer {
     let impl: JSONDecoderImpl