Refactoring some import conditions

Author: iCharlesHu

Sources/FoundationEssentials/Calendar/Calendar_Cache.swift

@@ -10,11 +10,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-
 #if FOUNDATION_FRAMEWORK
 @_implementationOnly import _ForSwiftFoundation
 import CoreFoundation
-#else
 #endif
 
 /// Singleton which listens for notifications about preference changes for Calendar and holds cached singletons for the current locale, calendar, and time zone.
@@ -24,7 +22,7 @@ struct CalendarCache : Sendable {
 
     // _CalendarICU, if present
     static var calendarICUClass: _CalendarProtocol.Type = {
-#if FOUNDATION_FRAMEWORK
+#if FOUNDATION_FRAMEWORK && canImport(FoundationICU)
         _CalendarICU.self
 #else
         if let name = _typeByName("FoundationInternationalization._CalendarICU"), let t = name as? _CalendarProtocol.Type {

Sources/FoundationEssentials/Data/Data.swift

@@ -37,6 +37,12 @@ private func malloc_good_size(_ size: Int) -> Int {
     return size
 }
 
+#elseif canImport(C)
+
+private func malloc_good_size(_ size: Int) -> Int {
+    return size
+}
+
 #endif
 
 #if os(Windows)
@@ -46,6 +52,8 @@ import func WinSDK.UnmapViewOfFile
 internal func __DataInvokeDeallocatorUnmap(_ mem: UnsafeMutableRawPointer, _ length: Int) {
 #if os(Windows)
     _ = UnmapViewOfFile(mem)
+#elseif canImport(C)
+    free(mem)
 #else
     munmap(mem, length)
 #endif

Sources/FoundationEssentials/Data/DataProtocol.swift

@@ -210,7 +210,7 @@ extension DataProtocol {
 extension DataProtocol where Self : ContiguousBytes {
     public func copyBytes<DestinationType, R: RangeExpression>(to ptr: UnsafeMutableBufferPointer<DestinationType>, from range: R) where R.Bound == Index {
         precondition(ptr.baseAddress != nil)
-
+        
         let concreteRange = range.relative(to: self)
         withUnsafeBytes { fullBuffer in
             let adv = distance(from: startIndex, to: concreteRange.lowerBound)

Sources/FoundationEssentials/Date.swift

@@ -358,7 +358,7 @@ extension NSDate : _HasCustomAnyHashableRepresentation {
 #endif // FOUNDATION_FRAMEWORK
 
 // MARK: - Playground Support
-#if FOUNDATION_FRAMEWORK
+#if FOUNDATION_FRAMEWORK && !NO_FORMATTERS
 @available(macOS 10.10, iOS 8.0, watchOS 2.0, tvOS 9.0, *)
 extension Date : _CustomPlaygroundQuickLookable {
     var summary: String {

Sources/FoundationEssentials/ErrorCodes+POSIX.swift

@@ -9,27 +9,7 @@
  //
  //===----------------------------------------------------------------------===//
 
-
-#if FOUNDATION_FRAMEWORK
-/// Describes an error in the POSIX error domain.
-@available(macOS 10.10, iOS 8.0, watchOS 2.0, tvOS 9.0, *)
-public struct POSIXError : _BridgedStoredNSError {
-    public let _nsError: NSError
-
-    public init(_nsError error: NSError) {
-        precondition(error.domain == NSPOSIXErrorDomain)
-        self._nsError = error
-    }
-
-    public static var errorDomain: String { return NSPOSIXErrorDomain }
-
-    public var hashValue: Int {
-        return _nsError.hashValue
-    }
-
-    public typealias Code = POSIXErrorCode
-}
-#else
+#if !FOUNDATION_FRAMEWORK || canImport(C)
 // Define the POSIXErrorCode for all platforms here.
 public enum POSIXErrorCode : Int32 {
     /// Operation not permitted.
@@ -366,6 +346,28 @@ public enum POSIXErrorCode : Int32 {
 
 extension POSIXErrorCode : Equatable, Hashable, RawRepresentable {
 }
+#endif
+
+#if FOUNDATION_FRAMEWORK
+/// Describes an error in the POSIX error domain.
+@available(macOS 10.10, iOS 8.0, watchOS 2.0, tvOS 9.0, *)
+public struct POSIXError : _BridgedStoredNSError {
+    public let _nsError: NSError
+
+    public init(_nsError error: NSError) {
+        precondition(error.domain == NSPOSIXErrorDomain)
+        self._nsError = error
+    }
+
+    public static var errorDomain: String { return NSPOSIXErrorDomain }
+
+    public var hashValue: Int {
+        return _nsError.hashValue
+    }
+
+    public typealias Code = POSIXErrorCode
+}
+#else
 
 /// Describes an error in the POSIX error domain.
 @available(macOS 10.10, iOS 8.0, watchOS 2.0, tvOS 9.0, *)

Sources/FoundationEssentials/JSON/JSONDecoder.swift

@@ -62,7 +62,7 @@ open class JSONDecoder {
         /// Decode the `Date` as UNIX millisecond timestamp from a JSON number.
         case millisecondsSince1970
 
-#if FOUNDATION_FRAMEWORK
+#if FOUNDATION_FRAMEWORK && !NO_FORMATTERS
         // TODO: Reenable once DateFormatStyle has been moved: https://github.com/apple/swift-foundation/issues/46
         /// Decode the `Date` as an ISO-8601-formatted string (in RFC 3339 format).
         @available(macOS 10.12, iOS 10.0, watchOS 3.0, tvOS 10.0, *)
@@ -647,7 +647,8 @@ extension JSONDecoderImpl: Decoder {
         case .millisecondsSince1970:
             let double = try self.unwrapFloatingPoint(from: mapValue, as: Double.self, for: codingPathNode, additionalKey)
             return Date(timeIntervalSince1970: double / 1000.0)
-#if FOUNDATION_FRAMEWORK // TODO: Reenable once DateFormatStyle has been moved
+#if FOUNDATION_FRAMEWORK && !NO_FORMATTERS
+            // TODO: Reenable once DateFormatStyle has been moved
         case .iso8601:
             let string = try self.unwrapString(from: mapValue, for: codingPathNode, additionalKey)
             guard let date = try? Date.ISO8601FormatStyle().parse(string) else {

Sources/FoundationEssentials/JSON/JSONEncoder.swift

@@ -66,7 +66,7 @@ open class JSONEncoder {
         /// Encode the `Date` as UNIX millisecond timestamp (as a JSON number).
         case millisecondsSince1970
 
-#if FOUNDATION_FRAMEWORK
+#if FOUNDATION_FRAMEWORK && !NO_FORMATTERS
         // TODO: Reenable once DateFormatStyle has been ported: https://github.com/apple/swift-foundation/issues/46
         /// Encode the `Date` as an ISO-8601-formatted string (in RFC 3339 format).
         @available(macOS 10.12, iOS 10.0, watchOS 3.0, tvOS 10.0, *)
@@ -998,7 +998,7 @@ private extension __JSONEncoder {
         case .millisecondsSince1970:
             return try .number(from: 1000.0 * date.timeIntervalSince1970, with: .throw, for: codingPathNode, additionalKey)
 
-#if FOUNDATION_FRAMEWORK
+#if FOUNDATION_FRAMEWORK && !NO_FORMATTERS
         case .iso8601:
             return self.wrap(date.formatted(.iso8601))
 

Sources/FoundationEssentials/JSON/JSONWriter.swift

@@ -349,7 +349,7 @@ internal struct JSONWriter {
             pretty ? writer(" : ") : writer(":")
             try serializeJSON(value, depth: depth)
         }
-#if FOUNDATION_FRAMEWORK
+#if FOUNDATION_FRAMEWORK && !NO_LOCALIZATION
         if sortedKeys {
             // TODO: Until we have a solution for sorting like Locale.system in FoundationEssentials or with the help of FoundationLocalization, this comparison requires bridging back to NSString. To avoid the extreme overhead of bridging the strings on every comparison, we'll do it up front instead.
             let nsKeysAndValues = dict.map {

Sources/FoundationEssentials/Locale/Locale+Language.swift

@@ -59,7 +59,7 @@ extension Locale {
 
         /// Returns a list of system languages, includes the languages of all product localization for the current platform
         public static var systemLanguages: [Language] {
-#if FOUNDATION_FRAMEWORK
+#if FOUNDATION_FRAMEWORK && canImport(FoundationICU)
             NSLocale.systemLanguages().map {
                 let comp = Components(identifier: $0 as! String)
                 return Language(components: comp)

Sources/FoundationEssentials/Locale/Locale.swift

@@ -78,7 +78,7 @@ public struct Locale : Hashable, Equatable, Sendable {
         Locale(inner: LocaleCache.cache.system)
     }
 
-#if FOUNDATION_FRAMEWORK
+#if FOUNDATION_FRAMEWORK && canImport(FoundationICU)
     /// This returns an instance of `Locale` that's set up exactly like it would be if the user changed the current locale to that identifier, set the preferences keys in the overrides dictionary, then called `current`.
     internal static func localeAsIfCurrent(name: String?, cfOverrides: CFDictionary? = nil, disableBundleMatching: Bool = false) -> Locale {
         return LocaleCache.cache.localeAsIfCurrent(name: name, cfOverrides: cfOverrides, disableBundleMatching: disableBundleMatching)
@@ -483,7 +483,7 @@ public struct Locale : Hashable, Equatable, Sendable {
         _locale.forceMinDaysInFirstWeek(calendar)
     }
 
-#if FOUNDATION_FRAMEWORK
+#if FOUNDATION_FRAMEWORK && !NO_FORMATTERS
     // This is framework-only because Date.FormatStyle.DateStyle is Internationalization-only.
     package func customDateFormat(_ style: Date.FormatStyle.DateStyle) -> String? {
         _locale.customDateFormat(style)