Skip to content

Update EnvironmentValueArrayDecoder to emit empty values when present #133

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Adobels wants to merge 6 commits into
base: main
Choose a base branch
from
+57 −4
Open

Update EnvironmentValueArrayDecoder to emit empty values when present #133

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
71dcf04
Update split method to keep empty substrings
Adobels Dec 22, 2025
ce8c009
Update Tests for arrays with empty string and with space string
Adobels Dec 22, 2025
73337f8
Add tests for int and double arrays values
Adobels Dec 22, 2025
ae5cf01
Move NSString components to String split API
Adobels Dec 22, 2025
43d66f1
Add positive test cases in tests of int and double arrays values
Adobels Dec 23, 2025
2116aa3
fix format linter warnings
Adobels Dec 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .swift-version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
6.1.3
Copy link
Contributor

@czechboy0 czechboy0 Dec 23, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please remove the file, we don't normally check these in for library packages

2 changes: 1 addition & 1 deletion Sources/Configuration/Providers/CLI/CLIArgumentParser.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ internal struct CLIArgumentParser {
if value.isEmpty {
return [""]
}
return value.components(separatedBy: ",")
return value.split(separator: ",", omittingEmptySubsequences: false).map(String.init)
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion Sources/Configuration/Providers/EnvironmentVariables/EnvironmentVariablesProvider.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,7 +345,7 @@ internal struct EnvironmentValueArrayDecoder {
/// - Parameter string: The source string to parse.
/// - Returns: The parsed array.
func decode(_ string: String) -> [String] {
string.split(separator: separator).map { $0.trimmed() }
string.split(separator: separator, omittingEmptySubsequences: false).map { $0.trimmed() }
}
}

Expand Down
56 changes: 54 additions & 2 deletions Tests/ConfigurationTests/EnvironmentVariablesProviderTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,11 +99,12 @@ struct EnvironmentVariablesProviderTests {
"BOOL_NO": "NO",
"BOOL_THROWS_ERROR_EMPTY": "",
"BOOL_THROWS_ERROR_NOT_BOOL_STRING": "2",
"BOOLY_ARRAY_TRUE": "true,1,,YES",
"BOOLY_ARRAY_TRUE": "true,1,YES",
"BOOLY_ARRAY_FALSE": "false,0,NO",
"BOOLY_ARRAY_THROWS_1": "true,1,YESS",
"BOOLY_ARRAY_THROWS_2": "false,00,no",
"BOOLY_ARRAY_THROWS_3": "false, ,no",
"BOOLY_ARRAY_THROWS_3": " ,",
"BOOLY_ARRAY_THROWS_4": ",",
])
#expect(try sut.value(forKey: "BOOL_TRUE", type: .bool).value == true)
#expect(try sut.value(forKey: "BOOL_FALSE", type: .bool).value == false)
Expand All @@ -124,6 +125,57 @@ struct EnvironmentVariablesProviderTests {
#expect(throws: ConfigError.self) { try sut.value(forKey: "BOOLY_ARRAY_THROWS_1", type: .boolArray) }
#expect(throws: ConfigError.self) { try sut.value(forKey: "BOOLY_ARRAY_THROWS_2", type: .boolArray) }
#expect(throws: ConfigError.self) { try sut.value(forKey: "BOOLY_ARRAY_THROWS_3", type: .boolArray) }
#expect(throws: ConfigError.self) { try sut.value(forKey: "BOOLY_ARRAY_THROWS_4", type: .boolArray) }
}

@available(Configuration 1.0, *)
@Test func valueForKeyOfIntArrayTypes() throws {
let sut = EnvironmentVariablesProvider(
environmentVariables: [
"INTLY_ARRAY_1": "-1,0,1",
"INTLY_ARRAY_2": " -1 , 0 ,1",
"INTLY_ARRAY_THROWS_1": "",
"INTLY_ARRAY_THROWS_2": " ",
"INTLY_ARRAY_THROWS_3": ",",
"INTLY_ARRAY_THROWS_4": " ,",
"INTLY_ARRAY_THROWS_5": "1,,2",
"INTLY_ARRAY_THROWS_6": "1, ,2",
])
#expect(try sut.value(forKey: "INTLY_ARRAY_1", type: .intArray).value == .init([-1, 0, 1], isSecret: false))
#expect(try sut.value(forKey: "INTLY_ARRAY_2", type: .intArray).value == .init([-1, 0, 1], isSecret: false))
#expect(throws: ConfigError.self) { try sut.value(forKey: "INTLY_ARRAY_THROWS_1", type: .intArray) }
#expect(throws: ConfigError.self) { try sut.value(forKey: "INTLY_ARRAY_THROWS_2", type: .intArray) }
#expect(throws: ConfigError.self) { try sut.value(forKey: "INTLY_ARRAY_THROWS_3", type: .intArray) }
#expect(throws: ConfigError.self) { try sut.value(forKey: "INTLY_ARRAY_THROWS_4", type: .intArray) }
#expect(throws: ConfigError.self) { try sut.value(forKey: "INTLY_ARRAY_THROWS_5", type: .intArray) }
#expect(throws: ConfigError.self) { try sut.value(forKey: "INTLY_ARRAY_THROWS_6", type: .intArray) }
}

@available(Configuration 1.0, *)
@Test func valueForKeyOfDoubleArrayTypes() throws {
let sut = EnvironmentVariablesProvider(
environmentVariables: [
"DOUBLY_ARRAY_1": "-1.1,0,1.1",
"DOUBLY_ARRAY_2": " -1.1 , 0 ,1.1",
"DOUBLY_ARRAY_THROWS_1": "",
"DOUBLY_ARRAY_THROWS_2": " ",
"DOUBLY_ARRAY_THROWS_3": ",",
"DOUBLY_ARRAY_THROWS_4": " ,",
"DOUBLY_ARRAY_THROWS_5": "1.1,,2.1",
"DOUBLY_ARRAY_THROWS_6": "1.1, ,2.1",
])
#expect(
try sut.value(forKey: "DOUBLY_ARRAY_1", type: .doubleArray).value == .init([-1.1, 0, 1.1], isSecret: false)
)
#expect(
try sut.value(forKey: "DOUBLY_ARRAY_2", type: .doubleArray).value == .init([-1.1, 0, 1.1], isSecret: false)
)
#expect(throws: ConfigError.self) { try sut.value(forKey: "DOUBLY_ARRAY_THROWS_1", type: .doubleArray) }
#expect(throws: ConfigError.self) { try sut.value(forKey: "DOUBLY_ARRAY_THROWS_2", type: .doubleArray) }
#expect(throws: ConfigError.self) { try sut.value(forKey: "DOUBLY_ARRAY_THROWS_3", type: .doubleArray) }
#expect(throws: ConfigError.self) { try sut.value(forKey: "DOUBLY_ARRAY_THROWS_4", type: .doubleArray) }
#expect(throws: ConfigError.self) { try sut.value(forKey: "DOUBLY_ARRAY_THROWS_5", type: .doubleArray) }
#expect(throws: ConfigError.self) { try sut.value(forKey: "DOUBLY_ARRAY_THROWS_6", type: .doubleArray) }
}

@available(Configuration 1.0, *)
Expand Down
Loading