Merge development into main

sbertix · Apr 7, 2021 · 434947b · 434947b
2 parents 283fcd7 + 5be6df1
commit 434947b
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 4 deletions.
diff --git a/Package.swift b/Package.swift
@@ -13,11 +13,11 @@ let package = Package(
                 .tvOS(.v9),
                 .watchOS(.v2)],
     // Exposed libraries.
-    products: [.library(name: "ComposableRequest",
+    products: [.library(name: "Requests",
                         targets: ["ComposableRequest"]),
-               .library(name: "ComposableStorage",
+               .library(name: "Storage",
                         targets: ["ComposableStorage"]),
-               .library(name: "ComposableStorageCrypto",
+               .library(name: "StorageCrypto",
                         targets: ["ComposableStorageCrypto"])],
     // Package dependencies.
     dependencies: [.package(url: "https://github.com/cx-org/CombineX",

diff --git a/Sources/ComposableRequest/Wrapper/Wrapped.swift b/Sources/ComposableRequest/Wrapper/Wrapped.swift
@@ -19,6 +19,18 @@ public protocol Wrapped: Codable, Wrappable {
     init(wrapper: @escaping () -> Wrapper)
 }
 
+extension Wrapper: Wrapped {
+    /// A closure escaping `self`.
+    public var wrapper: () -> Wrapper { { self } }
+
+    /// Init.
+    ///
+    /// - parameter wrapper: A closure returning `Wrapper`.
+    public init(wrapper: @escaping () -> Wrapper) {
+        self = wrapper()
+    }
+}
+
 public extension Wrapped {
     // MARK: Lifecycle
 

diff --git a/Sources/ComposableStorageCrypto/KeychainStorage.swift b/Sources/ComposableStorageCrypto/KeychainStorage.swift
@@ -7,7 +7,7 @@
 
 import Foundation
 
-import ComposableStorage
+@_exported import ComposableStorage
 import Swiftchain
 
 /// A `struct` defining a `Storage` caching `Item`s **safely** inside the user's **Keychain**.