Merge branch 'main' into docc-options-list-update

Author: heckj

.github/workflows/pull_request.yml

@@ -26,6 +26,7 @@ jobs:
     with:
       windows_exclude_swift_versions: "[{\"swift_version\": \"5.9\"}]"
       enable_macos_checks: true
+      macos_exclude_xcode_versions: "[{\"xcode_version\": \"16.0\"}, {\"xcode_version\": \"16.1\"}]"
 
   cmake-build:
     name: CMake Build
@@ -50,6 +51,25 @@ jobs:
       - name: Build
         run: cmake --build .cmake-build
 
+  wasm-build:
+    name: Wasm Build
+    runs-on: ubuntu-latest
+    container:
+      image: swift:6.1-noble
+    steps:
+      - name: Checkout repo
+        uses: actions/checkout@v4
+      - name: Install Swift SDKs for WebAssembly
+        run: |
+          # TODO: We can replace these Swift SDKs with the swift.org one once it supports Foundation.
+          swift sdk install https://github.com/swiftwasm/swift/releases/download/swift-wasm-6.1-RELEASE/swift-wasm-6.1-RELEASE-wasm32-unknown-wasi.artifactbundle.zip --checksum 7550b4c77a55f4b637c376f5d192f297fe185607003a6212ad608276928db992
+          swift sdk install https://github.com/swiftwasm/swift/releases/download/swift-wasm-6.1-RELEASE/swift-wasm-6.1-RELEASE-wasm32-unknown-wasip1-threads.artifactbundle.zip --checksum 0dd273be28741f8e1eb00682c39bdc956361ed24b5572e183dd8a4e9d1c5f6ec
+          swift sdk list
+      - name: Build
+        run: |
+          swift build --swift-sdk wasm32-unknown-wasi --target ArgumentParser
+          swift build --swift-sdk wasm32-unknown-wasip1-threads --target ArgumentParser
+
   soundness:
     name: Soundness
     uses: swiftlang/github-workflows/.github/workflows/soundness.yml@main

CHANGELOG.md

@@ -8,6 +8,13 @@ Add new items at the end of the relevant section under **Unreleased**.
 
 ---
 
+## [1.6.1] - 2025-07-01
+
+### Fixes
+
+- Resolves a source break for clients that have conditional conformances
+  to `ExpressibleByArgument` or `ParsableArguments`. ([#792])
+
 ## [1.6.0] - 2025-06-30
 
 ### Additions
@@ -953,7 +960,8 @@ This changelog's format is based on [Keep a Changelog](https://keepachangelog.co
 
 <!-- Link references for releases -->
 
-[Unreleased]: https://github.com/apple/swift-argument-parser/compare/1.6.0...HEAD
+[Unreleased]: https://github.com/apple/swift-argument-parser/compare/1.6.1...HEAD
+[1.6.1]: https://github.com/apple/swift-argument-parser/compare/1.6.0...1.6.1
 [1.6.0]: https://github.com/apple/swift-argument-parser/compare/1.5.1...1.6.0
 [1.5.1]: https://github.com/apple/swift-argument-parser/compare/1.5.0...1.5.1
 [1.5.0]: https://github.com/apple/swift-argument-parser/compare/1.4.0...1.5.0
@@ -1144,6 +1152,7 @@ This changelog's format is based on [Keep a Changelog](https://keepachangelog.co
 [#782]: https://github.com/apple/swift-argument-parser/pull/782
 [#783]: https://github.com/apple/swift-argument-parser/pull/783
 [#789]: https://github.com/apple/swift-argument-parser/pull/789
+[#792]: https://github.com/apple/swift-argument-parser/pull/792
 
 <!-- Link references for contributors -->
 

Sources/ArgumentParser/Parsable Properties/CompletionKind.swift

@@ -41,6 +41,9 @@ public struct CompletionKind {
     case directory
     case shellCommand(String)
     case custom(@Sendable ([String], Int, String) -> [String])
+    #if !canImport(Dispatch)
+    @available(*, unavailable, message: "DispatchSemaphore is unavailable")
+    #endif
     case customAsync(@Sendable ([String], Int, String) async -> [String])
     case customDeprecated(@Sendable ([String]) -> [String])
   }
@@ -181,11 +184,18 @@ public struct CompletionKind {
   ///
   /// The same as `custom(@Sendable @escaping ([String], Int, String) -> [String])`,
   /// except that the closure is asynchronous.
+  #if !canImport(Dispatch)
+  @available(*, unavailable, message: "DispatchSemaphore is unavailable")
+  #endif
   @available(macOS 10.15, macCatalyst 13, iOS 13, tvOS 13, watchOS 6, *)
   public static func custom(
     _ completion: @Sendable @escaping ([String], Int, String) async -> [String]
   ) -> CompletionKind {
+    #if !canImport(Dispatch)
+    fatalError("DispatchSemaphore is unavailable")
+    #else
     CompletionKind(kind: .customAsync(completion))
+    #endif
   }
 
   /// Deprecated; only kept for backwards compatibility.

Sources/ArgumentParser/Parsing/CommandParser.swift

@@ -10,11 +10,15 @@
 //===----------------------------------------------------------------------===//
 
 #if swift(>=6.0)
+#if canImport(Dispatch)
 @preconcurrency private import class Dispatch.DispatchSemaphore
+#endif
 internal import class Foundation.NSLock
 internal import class Foundation.ProcessInfo
 #else
+#if canImport(Dispatch)
 @preconcurrency import class Dispatch.DispatchSemaphore
+#endif
 import class Foundation.NSLock
 import class Foundation.ProcessInfo
 #endif
@@ -474,12 +478,16 @@ extension CommandParser {
         completingPrefix
       )
     case .customAsync(let complete):
+      #if canImport(Dispatch)
       if #available(macOS 10.15, macCatalyst 13, iOS 13, tvOS 13, watchOS 6, *)
       {
         completions = try asyncCustomCompletions(from: args, complete: complete)
       } else {
         throw ParserError.invalidState
       }
+      #else
+      throw ParserError.invalidState
+      #endif
     case .customDeprecated(let complete):
       completions = complete(args)
     default:
@@ -528,11 +536,17 @@ private func parseCustomCompletionArguments(
   return (Array(args), completingArgumentIndex, completingPrefix)
 }
 
+#if !canImport(Dispatch)
+@available(*, unavailable, message: "DispatchSemaphore is unavailable")
+#endif
 @available(macOS 10.15, macCatalyst 13, iOS 13, tvOS 13, watchOS 6, *)
 private func asyncCustomCompletions(
   from args: [String],
   complete: @escaping @Sendable ([String], Int, String) async -> [String]
 ) throws -> [String] {
+  #if !canImport(Dispatch)
+  throw ParserError.invalidState
+  #else
   let (args, completingArgumentIndex, completingPrefix) =
     try parseCustomCompletionArguments(from: args)
 
@@ -550,6 +564,7 @@ private func asyncCustomCompletions(
 
   semaphore.wait()
   return completionsBox.value
+  #endif
 }
 
 // Helper class to make values sendable across concurrency boundaries

Sources/ArgumentParser/Utilities/SwiftExtensions.swift

@@ -11,7 +11,7 @@
 
 #if compiler(>=6.2)
 /// Designates a type as having a sendable metatype.
-public protocol _SendableMetatype: SendableMetatype {}
+@_marker public protocol _SendableMetatype: SendableMetatype {}
 #else
-public protocol _SendableMetatype {}
+@_marker public protocol _SendableMetatype {}
 #endif

Tests/ArgumentParserEndToEndTests/PositionalEndToEndTests.swift

@@ -241,3 +241,33 @@ extension PositionalEndToEndTests {
     }
   }
 }
+
+// MARK: Conditional ExpressibleByArgument conformance
+
+// Note: This retroactive conformance is a compilation test
+extension Range<Int>: ArgumentParser.ExpressibleByArgument {
+  public init?(argument: String) {
+    guard let i = argument.firstIndex(of: ":"),
+      let low = Int(String(argument[..<i])),
+      let high = Int(String(argument[i...].dropFirst())),
+      low <= high
+    else { return nil }
+    self = low..<high
+  }
+}
+
+extension PositionalEndToEndTests {
+  struct HasRange: ParsableArguments {
+    @Argument var range: Range<Int>
+  }
+
+  func testParseCustomRangeConformance() throws {
+    AssertParse(HasRange.self, ["0:4"]) { args in
+      XCTAssertEqual(args.range, 0..<4)
+    }
+
+    XCTAssertThrowsError(try HasRange.parse([]))
+    XCTAssertThrowsError(try HasRange.parse(["1"]))
+    XCTAssertThrowsError(try HasRange.parse(["1:0"]))
+  }
+}