Fix #34 Throwing on ill formed headers/rows

Author: dehesa

.github/ISSUE_TEMPLATE/bug_report.md

@@ -19,8 +19,8 @@ Steps to reproduce the behavior:
 A clear and concise description of what you expected to happen.
 
 ## System
- - OS: [e.g. macOS 11, iOS 14, Ubuntu 20.04]
- - CodableCSV: [e.g. 0.6.5]
+ - OS: [e.g. macOS 11.2, iOS 14.4, Ubuntu 20.04]
+ - CodableCSV: [e.g. 0.6.6]
    You can check this in your SPM `Package.swift` file (or `Package.resolved` file). Alternatively, go to Xcode's Source Control Navigator (`⌘+2`) and click on `CodableCSV`.
 
 ## Additional context

.github/ISSUE_TEMPLATE/question.md

@@ -15,6 +15,6 @@ Add any other context about the question here (or delete this section if it is u
 
 ## System
 Delete section if not applicable
- - OS: [e.g. macOS 11, iOS 14, Ubuntu 20.04]
- - CodableCSV: [e.g. 0.6.5]
+ - OS: [e.g. macOS 11.2, iOS 14.4, Ubuntu 20.04]
+ - CodableCSV: [e.g. 0.6.6]
    You can check this in your SPM `Package.swift` file (or `Package.resolved` file). Alternatively, go to Xcode's Source Control Navigator (`⌘+2`) and click on `CodableCSV`.

CodableCSV.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "CodableCSV"
-  s.version      = "0.6.5"
+  s.version      = "0.6.6"
   s.summary      = "Read and write CSV files row-by-row or through Swift's Codable interface."
   s.description  = <<-DESC
     CodableCSV offers imperative and declarative ways to read and write CSV files. It is extensively configurable and is capable of reading multiple types of entries and write to many outputs.

README.md

@@ -37,7 +37,7 @@ You can choose to add the library through SPM or Cocoapods:
     let package = Package(
         /* Your package name, supported platforms, and generated products go here */
         dependencies: [
-            .package(url: "https://github.com/dehesa/CodableCSV.git", from: "0.6.5")
+            .package(url: "https://github.com/dehesa/CodableCSV.git", from: "0.6.6")
         ],
         targets: [
             .target(name: /* Your target name here */, dependencies: ["CodableCSV"])
@@ -48,7 +48,7 @@ You can choose to add the library through SPM or Cocoapods:
 -   [Cocoapods](https://cocoapods.org).
 
     ```
-    pod 'CodableCSV', '~> 0.6.5'
+    pod 'CodableCSV', '~> 0.6.6'
     ```
 
 </p></details>

sources/declarative/decodable/DecoderLazy.swift

@@ -35,8 +35,8 @@ extension CSVDecoder {
         }
 
         /// Ignores the subsequent row.
-        public func ignoreRow() {
-            guard !self._source.isRowAtEnd(index: self._currentIndex) else { return }
+        public func ignoreRow() throws {
+            guard try !self._source.isRowAtEnd(index: self._currentIndex) else { return }
             self._currentIndex += 1
         }
     }
@@ -45,7 +45,8 @@ extension CSVDecoder {
 extension CSVDecoder.Lazy {
     /// Advances to the next row and returns a `LazyDecoder.Row`, or `nil` if no next row exists.
     public func next() -> CSVDecoder.Lazy.Row? {
-        guard !self._source.isRowAtEnd(index: self._currentIndex) else { return nil }
+        let isAtEnd = (try? self._source.isRowAtEnd(index: self._currentIndex)) ?? false
+        guard !isAtEnd else { return nil }
 
         defer { self._currentIndex += 1 }
         let decoder = ShadowDecoder(source: .passUnretained(self._source), codingPath: [IndexKey(self._currentIndex)])

sources/declarative/decodable/containers/KeyedDecodingContainer.swift

@@ -281,7 +281,7 @@ private extension ShadowDecoder.KeyedContainer {
 
         switch self._focus {
         case .row(let rowIndex):
-            index = (rowIndex, try self._decoder.source._withUnsafeGuaranteedRef({ try $0.fieldIndex(forKey: key, codingPath: self.codingPath) }))
+            index = (rowIndex, try self._decoder.source._withUnsafeGuaranteedRef { try $0.fieldIndex(forKey: key, codingPath: self.codingPath) })
         case .file:
             guard let rowIndex = key.intValue else { throw CSVDecoder.Error._invalidRowKey(forKey: key, codingPath: codingPath) }
             // Values are only allowed to be decoded directly from a nested container in "file level" if the CSV rows have a single column.

sources/declarative/decodable/containers/SingleValueDecodingContainer.swift

@@ -265,7 +265,7 @@ private extension ShadowDecoder.SingleValueContainer {
                 return try transform(string) ?> CSVDecoder.Error._invalid(type: T.self, string: string, codingPath: self.codingPath + [IndexKey(0)])
             case .file:
                 // Values are only allowed to be decoded directly from a single value container in "file level" if the CSV file has a single row with a single column.
-                if $0.isRowAtEnd(index: 1), $0.numExpectedFields == 1 {
+                if try $0.isRowAtEnd(index: 1), $0.numExpectedFields == 1 {
                     let string = try $0.field(0, 0)
                     return try transform(string) ?> CSVDecoder.Error._invalid(type: T.self, string: string, codingPath: self.codingPath + [IndexKey(0), IndexKey(0)])
                 } else {

sources/declarative/decodable/containers/UnkeyedDecodingContainer.swift

@@ -57,7 +57,7 @@ extension ShadowDecoder {
         var isAtEnd: Bool {
             self._decoder.source._withUnsafeGuaranteedRef {
                 switch self._focus {
-                case .file: return $0.isRowAtEnd(index: self.currentIndex)
+                case .file: return (try? $0.isRowAtEnd(index: self.currentIndex)) ?? false
                 case .row: return $0.isFieldAtEnd(index: self.currentIndex)
                 }
             }

sources/declarative/decodable/internal/Source.swift

@@ -100,13 +100,13 @@ extension ShadowDecoder.Source {
 
     /// Boolean indicating whether the given row index is out of bounds (i.e. there are no more elements left to be decoded in the file).
     /// - parameter index: The row index being checked.
-    func isRowAtEnd(index: Int) -> Bool {
+    func isRowAtEnd(index: Int) throws -> Bool {
         var nextIndex = self._reader.rowIndex
         guard index >= nextIndex else { return false }
 
         var counter = index - (nextIndex - 1)
         while counter > 0 {
-            guard let row = try? self._reader.readRow() else { return true }
+            guard let row = try self._reader.readRow() else { return true }
             self._buffer.store(row, at: nextIndex)
             nextIndex += 1
             counter -= 1
@@ -164,9 +164,10 @@ extension ShadowDecoder.Source {
         if let index = key.intValue { return index }
 
         let name = key.stringValue
+        // If the header lookup is empty, build it for next times.
         if self._headerLookup.isEmpty {
             guard !self.headers.isEmpty else { throw CSVDecoder.Error._emptyHeader(forKey: key, codingPath: codingPath) }
-            self._headerLookup = try self.headers.lookupDictionary(onCollision: { CSVDecoder.Error._invalidHashableHeader() })
+            self._headerLookup = try self.headers.lookupDictionary(onCollision: CSVDecoder.Error._invalidHashableHeader)
         }
 
         guard let index = self._headerLookup[name.hashValue] else {

sources/declarative/encodable/internal/Sink.swift

@@ -159,7 +159,7 @@ extension ShadowEncoder.Sink {
         // 3. Get the header lookup dictionary (building it if it is the first time accessing it).
         if self._headerLookup.isEmpty {
             guard !self.configuration.headers.isEmpty else { throw CSVEncoder.Error._emptyHeader(forKey: key, codingPath: codingPath) }
-            self._headerLookup = try self.configuration.headers.lookupDictionary(onCollision: { CSVEncoder.Error._invalidHashableHeader() })
+            self._headerLookup = try self.configuration.headers.lookupDictionary(onCollision: CSVEncoder.Error._invalidHashableHeader)
         }
         // 4. Get the index from the header lookup up and the header name.
         guard let index = self._headerLookup[name.hashValue] else {