Fixed empty lines at end of dotEnv parsing (#192)

hummingbird-project · May 2, 2023 · a2b45b9 · a2b45b9
1 parent 8d84d77
commit a2b45b9
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/Sources/Hummingbird/Environment.swift b/Sources/Hummingbird/Environment.swift
@@ -162,6 +162,9 @@ public struct HBEnvironment: Sendable, Decodable, ExpressibleByDictionaryLiteral
 
                 switch state {
                 case .readingKey:
+                    // handle empty lines at the end
+                    guard !parser.reachedEnd() else { break }
+
                     // check for comment
                     let c = parser.current()
                     if c == "#" {

diff --git a/Tests/HummingbirdTests/EnvironmentTests.swift b/Tests/HummingbirdTests/EnvironmentTests.swift
@@ -119,6 +119,17 @@ final class EnvironmentTests: XCTestCase {
         FOO=BAR
         #BAZ=
 
+
+        """
+        let result = try HBEnvironment.parseDotEnv(dotenv)
+        XCTAssertEqual(result["foo"], "BAR")
+        XCTAssertEqual(result.count, 1)
+    }
+
+    func testEmptyLineAtEnd() throws {
+        let dotenv = """
+        FOO=BAR
+
         """
         let result = try HBEnvironment.parseDotEnv(dotenv)
         XCTAssertEqual(result["foo"], "BAR")