Refactor modules, added operators, updated docs

Author: minuscorp

Mini-Swift.podspec

@@ -65,26 +65,26 @@ Pod::Spec.new do |s|
     ss.tvos.source_files = 'Sources/TestMiddleware/*.swift'
   end
 
-  s.subspec('Task') do |ss|
+  s.subspec('MiniTasks') do |ss|
     ss.ios.dependency('Mini-Swift/Core')
-    ss.ios.source_files = 'Sources/Task/*.swift'
+    ss.ios.source_files = 'Sources/MiniTasks/*.swift'
 
     ss.osx.dependency('Mini-Swift/Core')
-    ss.osx.source_files = 'Sources/Task/*.swift'
+    ss.osx.source_files = 'Sources/MiniTasks/*.swift'
 
     ss.tvos.dependency('Mini-Swift/Core')
-    ss.tvos.source_files = 'Sources/Task/*.swift'
+    ss.tvos.source_files = 'Sources/MiniTasks/*.swift'
   end
 
-  s.subspec('Promise') do |ss|
+  s.subspec('MiniPromises') do |ss|
     ss.ios.dependency('Mini-Swift/Core')
-    ss.ios.source_files = 'Sources/Promise/*.swift'
+    ss.ios.source_files = 'Sources/MiniPromises/*.swift'
 
     ss.osx.dependency('Mini-Swift/Core')
-    ss.osx.source_files = 'Sources/Promise/*.swift'
+    ss.osx.source_files = 'Sources/MiniPromises/*.swift'
 
     ss.tvos.dependency('Mini-Swift/Core')
-    ss.tvos.source_files = 'Sources/Promise/*.swift'
+    ss.tvos.source_files = 'Sources/MiniPromises/*.swift'
   end
 
   s.preserve_paths = ['Templates/*.stencil']

Package.swift

@@ -26,11 +26,11 @@ let package = Package(
         ),
         .library(
             name: "MiniTask",
-            targets: ["Mini", "Task"]
+            targets: ["Mini", "MiniTasks"]
         ),
         .library(
             name: "MiniPromise",
-            targets: ["Mini", "Promise"]
+            targets: ["Mini", "MiniPromises"]
         ),
     ],
     dependencies: [
@@ -65,14 +65,14 @@ let package = Package(
             dependencies: ["Mini"]
         ),
         .target(
-            name: "Task",
+            name: "MiniTasks",
             dependencies: ["Mini"]
         ),
         .target(
-            name: "Promise",
+            name: "MiniPromises",
             dependencies: ["Mini"]
         ),
-        .testTarget(name: "MiniSwiftTests", dependencies: ["Mini", "Task", "Promise", "TestMiddleware", "NIOConcurrencyHelpers", "RxSwift", "Nimble", "RxTest", "RxBlocking"]), // dev
+        .testTarget(name: "MiniSwiftTests", dependencies: ["Mini", "MiniTasks", "MiniPromises", "TestMiddleware", "NIOConcurrencyHelpers", "RxSwift", "Nimble", "RxTest", "RxBlocking"]), // dev
     ],
     swiftLanguageVersions: [.version("4"), .version("4.2"), .version("5")]
 )

Rakefile

@@ -29,8 +29,8 @@ task(:pods) do
   sh('bundle exec pod lib lint --allow-warnings --fail-fast --subspec="Core"')
   sh('bundle exec pod lib lint --allow-warnings --fail-fast --subspec="Log"')
   sh('bundle exec pod lib lint --allow-warnings --fail-fast --subspec="Test"')
-  sh('bundle exec pod lib lint --allow-warnings --fail-fast --subspec="Promise"')
-  sh('bundle exec pod lib lint --allow-warnings --fail-fast --subspec="Task"')
+  sh('bundle exec pod lib lint --allow-warnings --fail-fast --subspec="MiniPromises"')
+  sh('bundle exec pod lib lint --allow-warnings --fail-fast --subspec="MiniTasks"')
 end
 
 task(:docs) do

Sources/Mini/Mini.swift

@@ -13,11 +13,3 @@
  See the License for the specific language governing permissions and
  limitations under the License.
  */
-
-#if canImport(MiniTask)
-    @_exported import MiniTask
-#endif
-
-#if canImport(MiniPromise)
-    @_exported import MiniPromise
-#endif

Sources/Mini/Store.swift

@@ -132,7 +132,7 @@ extension Store {
         return objectWillChange.asObservable()
     }
 
-    public func withStateChanges<T>(in stateComponent: @escaping @autoclosure () -> KeyPath<Element, T>) -> Observable<T> {
-        map(^stateComponent())
+    public func withStateChanges<T>(in stateComponent: KeyPath<Element, T>) -> Observable<T> {
+        map(stateComponent)
     }
 }

Sources/Mini/Utils/Foundation/OptionalType.swift

@@ -0,0 +1,29 @@
+/*
+ Copyright [2019] [BQ]
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ */
+
+import Foundation
+
+public protocol OptionalType {
+    associatedtype Wrapped
+    var value: Wrapped? { get }
+}
+
+extension Optional: OptionalType {
+    /// Cast `Optional<Wrapped>` to `Wrapped?`
+    public var value: Wrapped? {
+        return self
+    }
+}

Sources/Mini/Utils/RxSwift/ObservableType+Extensions.swift

@@ -43,13 +43,37 @@ extension ObservableType {
     public func skippingCurrent() -> Observable<Element> {
         skip(1)
     }
+
+    /**
+     Selects a property component from an `Element` filtering `nil` and emitting only distinct contiguous elements.
+     */
+    public func select<T: OptionalType>(_ keyPath: KeyPath<Element, T>) -> Observable<T.Wrapped> where T.Wrapped: Equatable {
+        map(keyPath)
+            .filterNil()
+            .distinctUntilChanged()
+    }
+}
+
+public extension ObservableType where Element: OptionalType {
+    /**
+     Unwraps and filters out `nil` elements.
+     - returns: `Observable` of source `Observable`'s elements, with `nil` elements filtered out.
+     */
+    func filterNil() -> Observable<Element.Wrapped> {
+        return flatMap { element -> Observable<Element.Wrapped> in
+            guard let value = element.value else {
+                return Observable<Element.Wrapped>.empty()
+            }
+            return Observable<Element.Wrapped>.just(value)
+        }
+    }
 }
 
 extension ObservableType where Element: StateType {
     /**
      Maps from a `StateType` property to create an `Observable` that contains the filtered property and all its changes.
      */
-    public func withStateChanges<T>(in stateComponent: @escaping @autoclosure () -> KeyPath<Element, T>, that componentProperty: @escaping @autoclosure () -> KeyPath<T, Bool>) -> Observable<T> {
-        return map(stateComponent()).filter(componentProperty())
+    public func withStateChanges<T>(in stateComponent: KeyPath<Element, T>, that componentProperty: KeyPath<T, Bool>) -> Observable<T> {
+        return map(stateComponent).filter(componentProperty)
     }
 }