Merge branch 'main' into hd-sco-0002

Author: czechboy0

Package.swift

@@ -9,12 +9,6 @@ import Foundation
 
 let defaultTraits: Set<String> = [
     "JSONSupport"
-
-    // Disabled due to a bug in SwiftPM with traits that pull in an external dependency.
-    // Once that's fixed in Swift 6.2.x, we can enable these traits by default.
-    // Open fix: https://github.com/swiftlang/swift-package-manager/pull/9136
-    // "LoggingSupport",
-    // "ReloadingSupport",
 ]
 
 var traits: Set<Trait> = [
@@ -146,9 +140,6 @@ let package = Package(
                 "ConfigReaderTests/ConfigSnapshotReaderMethodTestsGet1.swift.gyb",
                 "ConfigReaderTests/ConfigSnapshotReaderMethodTestsGet2.swift.gyb",
                 "ConfigReaderTests/ConfigSnapshotReaderMethodTestsGet3.swift.gyb",
-            ],
-            resources: [
-                .copy("Resources")
             ]
         ),
 
@@ -188,7 +179,11 @@ for target in package.targets {
     // https://docs.swift.org/compiler/documentation/diagnostics/nonisolated-nonsending-by-default/
     settings.append(.enableUpcomingFeature("NonisolatedNonsendingByDefault"))
 
-    settings.append(.enableExperimentalFeature("AvailabilityMacro=Configuration 1.0:macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0"))
+    settings.append(
+        .enableExperimentalFeature(
+            "AvailabilityMacro=Configuration 1.0:macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0"
+        )
+    )
 
     if enableAllCIFlags {
         // Ensure all public types are explicitly annotated as Sendable or not Sendable.

Sources/Configuration/ConfigKey.swift

@@ -20,6 +20,7 @@
 ///
 /// Keys can include additional context information that some providers use to
 /// refine value lookups or provide more specific results.
+@available(Configuration 1.0, *)
 public struct ConfigKey: Sendable {
 
     /// The hierarchical components that make up this configuration key.
@@ -42,10 +43,23 @@ public struct ConfigKey: Sendable {
         self.components = components
         self.context = context
     }
+
+    /// Creates a new configuration key.
+    /// - Parameters:
+    ///   - string: The string represenation of the key path, for example `"http.timeout"`.
+    ///   - context: Additional context information for the key.
+    public init(_ string: String, context: [String: ConfigContextValue] = [:]) {
+        self = DotSeparatorKeyDecoder.decode(string, context: context)
+    }
 }
 
+@available(Configuration 1.0, *)
 extension ConfigKey: Equatable {}
+
+@available(Configuration 1.0, *)
 extension ConfigKey: Hashable {}
+
+@available(Configuration 1.0, *)
 extension ConfigKey: Comparable {
     // swift-format-ignore: AllPublicDeclarationsHaveDocumentation
     public static func < (lhs: ConfigKey, rhs: ConfigKey) -> Bool {
@@ -67,6 +81,7 @@ extension ConfigKey: Comparable {
     }
 }
 
+@available(Configuration 1.0, *)
 extension ConfigKey: CustomStringConvertible {
     // swift-format-ignore: AllPublicDeclarationsHaveDocumentation
     public var description: String {
@@ -79,6 +94,15 @@ extension ConfigKey: CustomStringConvertible {
     }
 }
 
+@available(Configuration 1.0, *)
+extension ConfigKey: ExpressibleByStringLiteral {
+    // swift-format-ignore: AllPublicDeclarationsHaveDocumentation
+    public init(stringLiteral value: String) {
+        self = DotSeparatorKeyDecoder.decode(value, context: [:])
+    }
+}
+
+@available(Configuration 1.0, *)
 extension ConfigKey: ExpressibleByArrayLiteral {
     // swift-format-ignore: AllPublicDeclarationsHaveDocumentation
     public init(arrayLiteral elements: String...) {
@@ -94,6 +118,7 @@ extension ConfigKey: ExpressibleByArrayLiteral {
 ///
 /// Like relative keys, absolute keys consist of hierarchical components and
 /// optional context information.
+@available(Configuration 1.0, *)
 public struct AbsoluteConfigKey: Sendable {
 
     /// The hierarchical components that make up this absolute configuration key.
@@ -118,8 +143,13 @@ public struct AbsoluteConfigKey: Sendable {
     }
 }
 
+@available(Configuration 1.0, *)
 extension AbsoluteConfigKey: Equatable {}
+
+@available(Configuration 1.0, *)
 extension AbsoluteConfigKey: Hashable {}
+
+@available(Configuration 1.0, *)
 extension AbsoluteConfigKey: Comparable {
     // swift-format-ignore: AllPublicDeclarationsHaveDocumentation
     public static func < (lhs: AbsoluteConfigKey, rhs: AbsoluteConfigKey) -> Bool {
@@ -141,6 +171,7 @@ extension AbsoluteConfigKey: Comparable {
     }
 }
 
+@available(Configuration 1.0, *)
 extension AbsoluteConfigKey: CustomStringConvertible {
     // swift-format-ignore: AllPublicDeclarationsHaveDocumentation
     public var description: String {
@@ -153,6 +184,7 @@ extension AbsoluteConfigKey: CustomStringConvertible {
     }
 }
 
+@available(Configuration 1.0, *)
 extension AbsoluteConfigKey {
 
     /// Creates a new absolute configuration key from a relative key.
@@ -162,6 +194,7 @@ extension AbsoluteConfigKey {
     }
 }
 
+@available(Configuration 1.0, *)
 extension AbsoluteConfigKey? {
     /// Returns a new absolute configuration key by appending the given relative key.
     /// - Parameter relative: The relative configuration key to append to this key.
@@ -178,6 +211,7 @@ extension AbsoluteConfigKey? {
     }
 }
 
+@available(Configuration 1.0, *)
 extension AbsoluteConfigKey {
     /// Returns a new absolute configuration key by prepending the given relative key.
     /// - Parameter prefix: The relative configuration key to prepend to this key.
@@ -201,6 +235,15 @@ extension AbsoluteConfigKey {
     }
 }
 
+@available(Configuration 1.0, *)
+extension AbsoluteConfigKey: ExpressibleByStringLiteral {
+    // swift-format-ignore: AllPublicDeclarationsHaveDocumentation
+    public init(stringLiteral value: String) {
+        self = .init(DotSeparatorKeyDecoder.decode(value, context: [:]))
+    }
+}
+
+@available(Configuration 1.0, *)
 extension AbsoluteConfigKey: ExpressibleByArrayLiteral {
     // swift-format-ignore: AllPublicDeclarationsHaveDocumentation
     public init(arrayLiteral elements: String...) {

Sources/Configuration/ConfigProvider.swift

@@ -97,7 +97,7 @@ public protocol ConfigProvider: Sendable {
     ///   - updatesHandler: The closure that processes the async sequence of value updates.
     /// - Throws: Provider-specific errors or errors thrown by the handler closure.
     /// - Returns: The value returned by the closure.
-    func watchValue<Return>(
+    func watchValue<Return: ~Copyable>(
         forKey key: AbsoluteConfigKey,
         type: ConfigType,
         updatesHandler: (
@@ -128,7 +128,7 @@ public protocol ConfigProvider: Sendable {
     /// - Parameter updatesHandler: The closure that processes the asynchronous sequence of snapshot updates.
     /// - Throws: Provider-specific errors or errors thrown by the handler closure.
     /// - Returns: The value returned by the closure.
-    func watchSnapshot<Return>(
+    func watchSnapshot<Return: ~Copyable>(
         updatesHandler: (ConfigUpdatesAsyncSequence<any ConfigSnapshot, Never>) async throws -> Return
     ) async throws -> Return
 }

Sources/Configuration/ConfigProviderHelpers.swift

@@ -43,7 +43,7 @@ extension ConfigProvider {
     /// - Returns: The value returned by the handler closure.
     /// - Throws: Provider-specific errors or errors thrown by the handler.
     nonisolated(nonsending)
-        public func watchValueFromValue<Return>(
+        public func watchValueFromValue<Return: ~Copyable>(
             forKey key: AbsoluteConfigKey,
             type: ConfigType,
             updatesHandler: (
@@ -85,7 +85,7 @@ extension ConfigProvider {
     /// - Parameter updatesHandler: The closure that processes the async sequence of snapshot updates.
     /// - Returns: The value returned by the handler closure.
     /// - Throws: Provider-specific errors or errors thrown by the handler.
-    nonisolated(nonsending) public func watchSnapshotFromSnapshot<Return>(
+    nonisolated(nonsending) public func watchSnapshotFromSnapshot<Return: ~Copyable>(
         updatesHandler: (ConfigUpdatesAsyncSequence<any ConfigSnapshot, Never>) async throws -> Return
     ) async throws -> Return {
         let (stream, continuation) = AsyncStream<any ConfigSnapshot>

Sources/Configuration/ConfigReader+internalHelpers.swift

@@ -637,7 +637,7 @@ extension ConfigReader {
     ///   - updatesHandler: A closure that handles the stream of updates, emits `nil` when no value is found.
     /// - Throws: An error if the watch operation fails.
     /// - Returns: The value returned by the updates handler.
-    internal func watchValue<Value: Sendable, Return>(
+    internal func watchValue<Value: Sendable, Return: ~Copyable>(
         forKey key: ConfigKey,
         type: ConfigType,
         isSecret: Bool,
@@ -713,7 +713,7 @@ extension ConfigReader {
     ///   - updatesHandler: A closure that handles the stream of updates, emits the default when no value is found.
     /// - Throws: An error if the watch operation fails.
     /// - Returns: The value returned by the updates handler.
-    internal func watchValue<Value: Sendable, Return>(
+    internal func watchValue<Value: Sendable, Return: ~Copyable>(
         forKey key: ConfigKey,
         type: ConfigType,
         isSecret: Bool,
@@ -790,7 +790,7 @@ extension ConfigReader {
     ///     or the value cannot be unwrapped.
     /// - Throws: An error if the watch operation fails.
     /// - Returns: The value returned by the updates handler.
-    internal func watchRequiredValue<Value: Sendable, Return>(
+    internal func watchRequiredValue<Value: Sendable, Return: ~Copyable>(
         forKey key: ConfigKey,
         type: ConfigType,
         isSecret: Bool,