Skip to content

Stop using Foundation on platforms with FoundationEssentials #108

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

Merged
merged 2 commits into from
Oct 21, 2025
Merged

Stop using Foundation on platforms with FoundationEssentials #108

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c227182
Stop using Foundation on platforms with FoundationEssentials
guoye-zhang Oct 20, 2025
1f98b21
Fix test
guoye-zhang Oct 20, 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
18 changes: 8 additions & 10 deletions Sources/HTTPTypes/HTTPRequest+URL.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,12 @@

#if canImport(FoundationEssentials)
import FoundationEssentials
#else
#else // canImport(FoundationEssentials)
import Foundation
#endif

#if canImport(CoreFoundation)
import Foundation
import CoreFoundation
#endif // canImport(CoreFoundation)
#endif // canImport(FoundationEssentials)

extension HTTPRequest {
/// The URL of the request synthesized from the scheme, authority, and path pseudo header
Expand Down Expand Up @@ -92,7 +90,7 @@ extension URL {
buffer.append(contentsOf: authority)
buffer.append(contentsOf: path)

#if canImport(CoreFoundation)
#if !canImport(FoundationEssentials) && canImport(CoreFoundation)
if let url = buffer.withUnsafeBytes({ buffer in
CFURLCreateAbsoluteURLWithBytes(
kCFAllocatorDefault,
Expand All @@ -107,14 +105,14 @@ extension URL {
} else {
return nil
}
#else // canImport(CoreFoundation)
#else // !canImport(FoundationEssentials) && canImport(CoreFoundation)
// This initializer does not preserve WHATWG URLs
self.init(string: String(decoding: buffer, as: UTF8.self))
#endif // canImport(CoreFoundation)
#endif // !canImport(FoundationEssentials) && canImport(CoreFoundation)
}

fileprivate var httpRequestComponents: (scheme: [UInt8], authority: [UInt8]?, path: [UInt8]) {
#if canImport(CoreFoundation)
#if !canImport(FoundationEssentials) && canImport(CoreFoundation)
// CFURL parser based on byte ranges does not unnecessarily percent-encode WHATWG URL
let url = unsafeBitCast(self.absoluteURL as NSURL, to: CFURL.self)
let length = CFURLGetBytes(url, nil, 0)
Expand Down Expand Up @@ -167,7 +165,7 @@ extension URL {
}
return (scheme, authority, path)
}
#else // canImport(CoreFoundation)
#else // !canImport(FoundationEssentials) && canImport(CoreFoundation)
guard let components = URLComponents(url: self, resolvingAgainstBaseURL: true),
let urlString = components.string
else {
Expand Down Expand Up @@ -213,6 +211,6 @@ extension URL {
}
}
return (scheme, authority, path)
#endif // canImport(CoreFoundation)
#endif // !canImport(FoundationEssentials) && canImport(CoreFoundation)
}
}
6 changes: 3 additions & 3 deletions Tests/HTTPTypesTests/HTTPTypesURLTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,11 +50,11 @@ final class HTTPTypesURLTests: XCTestCase {
let request5 = HTTPRequest(url: URL(string: "data:,Hello%2C%20World%21")!)
XCTAssertEqual(request5.scheme, "data")
XCTAssertNil(request5.authority)
#if canImport(CoreFoundation)
#if !canImport(FoundationEssentials)
XCTAssertEqual(request5.path, "/")
#else // canImport(CoreFoundation)
#else // !canImport(FoundationEssentials)
XCTAssertEqual(request5.path, ",Hello%2C%20World%21")
#endif // canImport(CoreFoundation)
#endif // !canImport(FoundationEssentials)
XCTAssertNil(request5.url)
}

Expand Down