BOM handling

Topolyte · Nov 16, 2023 · e7193c9 · e7193c9
1 parent ebea401
commit e7193c9
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 7 deletions.
diff --git a/Sources/CSVaquita/BufferedStream.swift b/Sources/CSVaquita/BufferedStream.swift
@@ -73,7 +73,7 @@ public final class BufferedStream {
         let available = min(n, end - pos)
         if available > 0 {
             pos += available
-            return Array(buf[pos..<(pos + available)])
+            return Array(buf[(pos - available)..<pos])
         }
         return []
     }

diff --git a/Tests/CSVaquitaTests/CSVReaderTests.swift b/Tests/CSVaquitaTests/CSVReaderTests.swift
@@ -319,14 +319,20 @@ final class csvaquitaTests: XCTestCase {
 
         XCTAssertEqual(expected, rows)
     }
+
+    func testBOM() throws {
+        let s = "\u{FEFF}abc"
+        let reader = try CSVReader(makeStream(s), header: .none)
+        if let row = try reader.readRow() {
+            XCTAssertEqual("abc", row[0])
+        } else {
+            XCTFail("No rows read")
+        }
+    }
 
     func testAdHoc() throws {
-        let s = """
-        one,two
-        "abc",xyz
-        """
-
-        let rdr = try CSVReader(makeStream(s))
+        let s = "\u{FEFF}abc"
+        let rdr = try CSVReader(makeStream(s), header: .none)
         while let row = try rdr.readRow() {
             print("\(row)")
         }