🎨 Remove map operator #122

YutoMizutani · Nov 26, 2018 · 7043159 · 7043159
1 parent b4776f6
commit 7043159
Showing 1 changed file with 12 additions and 5 deletions.
diff --git a/Sources/Application/Extensions/ObservableType+.swift b/Sources/Application/Extensions/ObservableType+.swift
@@ -22,18 +22,22 @@ public extension ObservableType {
     }
 
     func store(startWith: Self.E) -> Observable<(newValue: E, oldValue: E)> {
-        return Observable.zip(self, self.startWith(startWith)).map { (newValue: $0.0, oldValue: $0.1) }
+        return Observable.zip(self, self.startWith(startWith)) { a, b in
+            (newValue: a, oldValue: b)
+        }
     }
 
     func store() -> Observable<(newValue: E, oldValue: E?)> {
-        return Observable.zip(self, self.map(Optional.init).startWith(nil)).map { (newValue: $0.0, oldValue: $0.1) }
+        return Observable.zip(self, self.map(Optional.init).startWith(nil)) { a, b in
+            (newValue: a, oldValue: b)
+        }
     }
 }
 
 public extension ObservableType {
     /// Count up
     func count() -> Observable<Int> {
-        return reduce(0) { n, _ in n + 1 }
+        return flatMap { _ in self.reduce(0) { n, _ in n + 1 } }
     }
 
     /// Get time
@@ -43,7 +47,10 @@ public extension ObservableType {
 
     /// Response entity
     func response(_ timer: TimerUseCase) -> Observable<ResponseEntity> {
-        return Observable.zip(count(), getTime(timer))
-            .map { ResponseEntity($0.0, $0.1) }
+        return flatMap { _ in
+            return Observable.zip(self.count(), self.getTime(timer)) { a, b in
+                ResponseEntity(a, b)
+            }
+        }
     }
 }