conditionally import FoundationEssentials (#36)

* conditionally import FoundationEssentials

* add swift rules for amazon q

* do not use CharacterSet

* swift format

* [CI] separate build and test

Author: sebsto

.amazonq/rules/swift.md

@@ -63,7 +63,10 @@ struct AddingTwoNumbersTests {
 
 }
 ```
-When asked to write unit tests, always prefer the new Swift testing framework over XCTest.
+
+Always use standard Swift 6 tools by preference. For example, 
+when asked to write unit tests, always prefer the new Swift testing framework over XCTest.
+When asked to format files, use swift format instead of swift-format.
 
 In general, prefer the use of Swift Concurrency (async/await, 
 actors, etc.) over tools like Dispatch or Combine, but if the 

.github/workflows/pull_request.yml

@@ -8,7 +8,9 @@ jobs:
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
-      - name: Run tests
+      - name: Build
+        run: swift build --configuration release
+      - name: Tests
         run: swift test
 
   soundness:

Sources/BedrockModel.swift

@@ -13,7 +13,11 @@
 //
 //===----------------------------------------------------------------------===//
 
+#if canImport(FoundationEssentials)
+import FoundationEssentials
+#else
 import Foundation
+#endif
 
 public struct BedrockModel: Hashable, Sendable, Equatable, RawRepresentable {
     public var rawValue: String { id }

Sources/BedrockService.swift

@@ -17,9 +17,14 @@
 @preconcurrency import AWSBedrockRuntime
 import AWSClientRuntime
 import AwsCommonRuntimeKit
-import Foundation
 import Logging
 
+#if canImport(FoundationEssentials)
+import FoundationEssentials
+#else
+import Foundation
+#endif
+
 // for setenv and unsetenv functions
 #if os(Linux)
 import Glibc

Sources/BedrockServiceError.swift

@@ -13,7 +13,11 @@
 //
 //===----------------------------------------------------------------------===//
 
+#if canImport(FoundationEssentials)
+import FoundationEssentials
+#else
 import Foundation
+#endif
 
 //TODO: split in two structs : BedrockModelError and BedrockLibraryError
 public enum BedrockLibraryError: Error {

Sources/Converse/BedrockService+Converse.swift

@@ -15,7 +15,12 @@
 
 @preconcurrency import AWSBedrockRuntime
 import AwsCommonRuntimeKit
+
+#if canImport(FoundationEssentials)
+import FoundationEssentials
+#else
 import Foundation
+#endif
 
 extension BedrockService {
 

Sources/Converse/BedrockService+ConverseStreaming.swift

@@ -15,7 +15,12 @@
 
 @preconcurrency import AWSBedrockRuntime
 import AwsCommonRuntimeKit
+
+#if canImport(FoundationEssentials)
+import FoundationEssentials
+#else
 import Foundation
+#endif
 
 extension BedrockService {
 

Sources/Converse/ContentBlocks/Content.swift

@@ -14,7 +14,12 @@
 //===----------------------------------------------------------------------===//
 
 @preconcurrency import AWSBedrockRuntime
+
+#if canImport(FoundationEssentials)
+import FoundationEssentials
+#else
 import Foundation
+#endif
 
 public enum Content: Codable, CustomStringConvertible, Sendable {
     case text(String)

Sources/Converse/ContentBlocks/DocumentBlock.swift

@@ -14,7 +14,12 @@
 //===----------------------------------------------------------------------===//
 
 @preconcurrency import AWSBedrockRuntime
+
+#if canImport(FoundationEssentials)
+import FoundationEssentials
+#else
 import Foundation
+#endif
 
 public struct DocumentBlock: Codable, Sendable {
     public let name: String

Sources/Converse/ContentBlocks/DocumentToJSON.swift

@@ -13,9 +13,14 @@
 //
 //===----------------------------------------------------------------------===//
 
-import Foundation
 import Smithy
 
+#if canImport(FoundationEssentials)
+import FoundationEssentials
+#else
+import Foundation
+#endif
+
 // FIXME: avoid extensions on structs you do not control
 extension SmithyDocument {
     public func toJSON() throws -> JSON {