Split Codable to its own module

Lukasa · Lukasa · commit 5aaca631daa7 · 2020-07-16T11:22:30.000+01:00
diff --git a/Package.swift b/Package.swift
@@ -20,16 +20,22 @@ let package = Package(
         .library(
             name: "StructuredHeaders",
             targets: ["StructuredHeaders"]),
+        .library(
+            name: "CodableStructuredHeaders",
+            targets: ["CodableStructuredHeaders"]),
     ],
     targets: [
         .target(
             name: "StructuredHeaders",
             dependencies: []),
+        .target(
+            name: "CodableStructuredHeaders",
+            dependencies: ["StructuredHeaders"]),
         .target(
             name: "sh-parser",
             dependencies: ["StructuredHeaders"]),
         .testTarget(
             name: "StructuredHeadersTests",
-            dependencies: ["StructuredHeaders"]),
+            dependencies: ["StructuredHeaders", "CodableStructuredHeaders"]),
     ]
 )
diff --git a/Sources/CodableStructuredHeaders/Decoder/BareInnerListDecoder.swift b/Sources/CodableStructuredHeaders/Decoder/BareInnerListDecoder.swift
@@ -11,6 +11,7 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 //===----------------------------------------------------------------------===//
+import StructuredHeaders
 
 struct BareInnerListDecoder<BaseData: RandomAccessCollection> where BaseData.Element == UInt8, BaseData.SubSequence: Hashable {
     private var list: BareInnerList<BaseData.SubSequence>
diff --git a/Sources/CodableStructuredHeaders/Decoder/BareItemDecoder.swift b/Sources/CodableStructuredHeaders/Decoder/BareItemDecoder.swift
@@ -11,6 +11,7 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 //===----------------------------------------------------------------------===//
+import StructuredHeaders
 
 struct BareItemDecoder<BaseData: RandomAccessCollection> where BaseData.Element == UInt8, BaseData.SubSequence == BaseData, BaseData: Hashable {
     private var item: BareItem<BaseData>
diff --git a/Sources/CodableStructuredHeaders/Decoder/DictionaryKeyedContainer.swift b/Sources/CodableStructuredHeaders/Decoder/DictionaryKeyedContainer.swift
@@ -11,6 +11,7 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 //===----------------------------------------------------------------------===//
+import StructuredHeaders
 
 struct DictionaryKeyedContainer<Key: CodingKey, BaseData: RandomAccessCollection> where BaseData.Element == UInt8, BaseData.SubSequence: Hashable {
     private var dictionary: OrderedMap<String, ItemOrInnerList<BaseData.SubSequence>>
diff --git a/Sources/CodableStructuredHeaders/Decoder/KeyedInnerListDecoder.swift b/Sources/CodableStructuredHeaders/Decoder/KeyedInnerListDecoder.swift
@@ -11,6 +11,7 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 //===----------------------------------------------------------------------===//
+import StructuredHeaders
 
 private let keyedInnerListDecoderSupportedKeys = ["items", "parameters"]
 
diff --git a/Sources/CodableStructuredHeaders/Decoder/KeyedItemDecoder.swift b/Sources/CodableStructuredHeaders/Decoder/KeyedItemDecoder.swift
@@ -11,6 +11,7 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 //===----------------------------------------------------------------------===//
+import StructuredHeaders
 
 private let keyedItemDecoderSupportedKeys = ["item", "parameters"]
 
diff --git a/Sources/CodableStructuredHeaders/Decoder/ParametersDecoder.swift b/Sources/CodableStructuredHeaders/Decoder/ParametersDecoder.swift
@@ -11,6 +11,7 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 //===----------------------------------------------------------------------===//
+import StructuredHeaders
 
 struct ParametersDecoder<Key: CodingKey, BaseData: RandomAccessCollection> where BaseData.Element == UInt8, BaseData.SubSequence: Hashable {
     private var parameters: OrderedMap<String, BareItem<BaseData.SubSequence>>
diff --git a/Sources/CodableStructuredHeaders/Decoder/StructuredFieldDecoder.swift b/Sources/CodableStructuredHeaders/Decoder/StructuredFieldDecoder.swift
@@ -11,6 +11,7 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 //===----------------------------------------------------------------------===//
+import StructuredHeaders
 
 public struct StructuredFieldDecoder {
     public var keyDecodingStrategy: KeyDecodingStrategy?
diff --git a/Sources/CodableStructuredHeaders/Decoder/StructuredHeaderCodingKey.swift b/Sources/CodableStructuredHeaders/Decoder/StructuredHeaderCodingKey.swift
@@ -11,6 +11,7 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 //===----------------------------------------------------------------------===//
+import StructuredHeaders
 
 struct _StructuredHeaderCodingKey : CodingKey {
     var stringValue: String
diff --git a/Sources/CodableStructuredHeaders/Decoder/TopLevelListDecoder.swift b/Sources/CodableStructuredHeaders/Decoder/TopLevelListDecoder.swift
@@ -11,6 +11,7 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 //===----------------------------------------------------------------------===//
+import StructuredHeaders
 
 struct TopLevelListDecoder<BaseData: RandomAccessCollection> where BaseData.Element == UInt8, BaseData.SubSequence: Hashable {
     private var list: [ItemOrInnerList<BaseData.SubSequence>]
diff --git a/Sources/CodableStructuredHeaders/Encoder/StructuredFieldEncoder.swift b/Sources/CodableStructuredHeaders/Encoder/StructuredFieldEncoder.swift
@@ -11,6 +11,7 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 //===----------------------------------------------------------------------===//
+import StructuredHeaders
 
 public struct StructuredFieldEncoder {
     public var keyEncodingStrategy: KeyEncodingStrategy?
@@ -167,7 +168,7 @@ extension _StructuredFieldEncoder: SingleValueEncodingContainer {
     }
 
     func encode(_ value: String) throws {
-        if value.isValidToken {
+        if value.structuredHeadersIsValidToken {
             try self.currentStackEntry.storage.insertBareItem(.token(value))
         } else {
             try self.currentStackEntry.storage.insertBareItem(.string(value))
@@ -308,7 +309,7 @@ extension _StructuredFieldEncoder {
     }
 
     func append(_ value: String) throws {
-        if value.isValidToken {
+        if value.structuredHeadersIsValidToken {
             try self.currentStackEntry.storage.appendBareItem(.token(value))
         } else {
             try self.currentStackEntry.storage.appendBareItem(.string(value))
@@ -444,7 +445,7 @@ extension _StructuredFieldEncoder {
 
     func encode(_ value: String, forKey key: String) throws {
         let key = self.sanitizeKey(key)
-        if value.isValidToken {
+        if value.structuredHeadersIsValidToken {
             try self.currentStackEntry.storage.insertBareItem(.token(value), atKey: key)
         } else {
             try self.currentStackEntry.storage.insertBareItem(.string(value), atKey: key)
@@ -809,7 +810,6 @@ extension _StructuredFieldEncoder {
 
 extension Item where BaseData == ArraySlice<UInt8> {
     fileprivate init(_ partialItem: _StructuredFieldEncoder.NodeType.PartialItem) {
-        self.bareItem = partialItem.bareItem!
-        self.parameters = partialItem.parameters
+        self.init(bareItem: partialItem.bareItem!, parameters: partialItem.parameters)
     }
 }
diff --git a/Sources/CodableStructuredHeaders/Encoder/StructuredFieldKeyedEncodingContainer.swift b/Sources/CodableStructuredHeaders/Encoder/StructuredFieldKeyedEncodingContainer.swift
@@ -11,6 +11,7 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 //===----------------------------------------------------------------------===//
+import StructuredHeaders
 
 /// This object translates between the keys used by the encoder and the keys used by the encoding object.
 ///
diff --git a/Sources/CodableStructuredHeaders/Encoder/StructuredFieldUnkeyedEncodingContainer.swift b/Sources/CodableStructuredHeaders/Encoder/StructuredFieldUnkeyedEncodingContainer.swift
@@ -11,6 +11,7 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 //===----------------------------------------------------------------------===//
+import StructuredHeaders
 
 /// This object translates between the unkeyed coding API and methods on the encoder.
 ///
diff --git a/Sources/StructuredHeaders/ComponentTypes.swift b/Sources/StructuredHeaders/ComponentTypes.swift
@@ -55,7 +55,7 @@ extension BareItem: ExpressibleByFloatLiteral {
 
 extension BareItem: ExpressibleByStringLiteral {
     public init(stringLiteral value: StringLiteralType) {
-        if value.isValidToken {
+        if value.structuredHeadersIsValidToken {
             self = .token(value)
         } else {
             self = .string(value)
@@ -161,7 +161,7 @@ public struct InnerList<BaseData: RandomAccessCollection>: Hashable where BaseDa
 }
 
 extension String {
-    var isValidToken: Bool {
+    public var structuredHeadersIsValidToken: Bool {
         let view = self.utf8
 
         switch view.first {
diff --git a/Sources/StructuredHeaders/FieldSerializer.swift b/Sources/StructuredHeaders/FieldSerializer.swift
@@ -174,7 +174,7 @@ extension StructuredFieldSerializer {
             }
             self.data.append(asciiDquote)
         case .token(let token):
-            guard token.isValidToken else {
+            guard token.structuredHeadersIsValidToken else {
                 throw StructuredHeaderError.invalidToken
             }
             self.data.append(contentsOf: token.utf8)
diff --git a/Tests/StructuredHeadersTests/StructuredFieldDecoderTests.swift b/Tests/StructuredHeadersTests/StructuredFieldDecoderTests.swift
@@ -14,6 +14,7 @@
 import Foundation
 import XCTest
 import StructuredHeaders
+import CodableStructuredHeaders
 
 struct ListyDictionaryFieldParameters: Codable, Equatable {
     var q: Double?
diff --git a/Tests/StructuredHeadersTests/StructuredFieldEncoderTests.swift b/Tests/StructuredHeadersTests/StructuredFieldEncoderTests.swift
@@ -14,6 +14,7 @@
 import Foundation
 import XCTest
 import StructuredHeaders
+import CodableStructuredHeaders
 
 final class StructuredFieldEncoderTests: XCTestCase {
     func testSimpleItemHeaderEncodeBareItem() throws {
