Fix Effect.throttle (#654)

* Fix Effect.throttle

Fixes #540.

* Simplify

* Publicize

Author: mluisbrown

.swiftpm/xcode/xcshareddata/xcschemes/ComposableArchitecture.xcscheme

@@ -26,7 +26,8 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES">
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      codeCoverageEnabled = "YES">
       <Testables>
          <TestableReference
             skipped = "NO">

Sources/ComposableArchitecture/Debugging/ReducerDebugging.swift

@@ -6,24 +6,24 @@ import Dispatch
 public enum ActionFormat {
   /// Prints the action in a single line by only specifying the labels of the associated values:
   ///
-  ///    ```swift
-  ///     Action.screenA(.row(index:, action: .textChanged(query:)))
-  ///    ```
+  /// ```swift
+  /// Action.screenA(.row(index:, action: .textChanged(query:)))
+  /// ```
   ///
   case labelsOnly
   /// Prints the action in a multiline, pretty-printed format, including all the labels of
   /// any associated values, as well as the data held in the associated values:
   ///
-  ///    ```swift
-  ///     Action.screenA(
-  ///       ScreenA.row(
-  ///         index: 1,
-  ///         action: RowAction.textChanged(
-  ///           query: "Hi"
-  ///         )
-  ///       )
+  /// ```swift
+  /// Action.screenA(
+  ///   ScreenA.row(
+  ///     index: 1,
+  ///     action: RowAction.textChanged(
+  ///       query: "Hi"
   ///     )
-  ///    ```
+  ///   )
+  /// )
+  /// ```
   ///
   case prettyPrint
 }

Sources/ComposableArchitecture/Internal/Throttling.swift renamed to Sources/ComposableArchitecture/Effects/Throttling.swift

@@ -3,7 +3,7 @@ import Foundation
 import ReactiveSwift
 
 extension Effect {
-  /// Turns an effect into one that can be throttled.
+  /// Throttles an effect so that it only publishes one output per given interval.
   ///
   /// - Parameters:
   ///   - id: The effect's identifier.
@@ -14,7 +14,11 @@ extension Effect {
   ///     `false`, the producer emits the first element received during the interval.
   /// - Returns: An effect that emits either the most-recent or first element received during the
   ///   specified interval.
+<<<<<<< ours:Sources/ComposableArchitecture/Internal/Throttling.swift
   func throttle(
+=======
+  public func throttle<S>(
+>>>>>>> theirs:Sources/ComposableArchitecture/Effects/Throttling.swift
     id: AnyHashable,
     interval: TimeInterval,
     on scheduler: DateScheduler,
@@ -27,23 +31,41 @@ extension Effect {
         return Effect(value: value)
       }
 
+<<<<<<< ours:Sources/ComposableArchitecture/Internal/Throttling.swift
       guard
         scheduler.currentDate.timeIntervalSince1970 - throttleTime.timeIntervalSince1970 < interval
       else {
         throttleTimes[id] = scheduler.currentDate
+=======
+      let value = latest ? value : (throttleValues[id] as! Output? ?? value)
+      throttleValues[id] = value
+
+      guard throttleTime.distance(to: scheduler.now) < interval else {
+        throttleTimes[id] = scheduler.now
+>>>>>>> theirs:Sources/ComposableArchitecture/Effects/Throttling.swift
         throttleValues[id] = nil
         return Effect(value: value)
       }
 
+<<<<<<< ours:Sources/ComposableArchitecture/Internal/Throttling.swift
       let value = latest ? value : (throttleValues[id] as! Value? ?? value)
       throttleValues[id] = value
 
       return Effect(value: value)
+=======
+      return Just(value)
+>>>>>>> theirs:Sources/ComposableArchitecture/Effects/Throttling.swift
         .delay(
           throttleTime.addingTimeInterval(interval).timeIntervalSince1970
             - scheduler.currentDate.timeIntervalSince1970,
           on: scheduler
         )
+<<<<<<< ours:Sources/ComposableArchitecture/Internal/Throttling.swift
+=======
+        .handleEvents(receiveOutput: { _ in throttleTimes[id] = scheduler.now })
+        .setFailureType(to: Failure.self)
+        .eraseToAnyPublisher()
+>>>>>>> theirs:Sources/ComposableArchitecture/Effects/Throttling.swift
     }
     .cancellable(id: id, cancelInFlight: true)
   }

Tests/ComposableArchitectureTests/Internal/EffectThrottleTests.swift renamed to Tests/ComposableArchitectureTests/EffectThrottleTests.swift

@@ -125,4 +125,40 @@ final class EffectThrottleTests: XCTestCase {
     // A second value is emitted right away.
     XCTAssertEqual(values, [1, 2])
   }
+
+  func testThrottleEmitsFirstValueOnce() {
+    var values: [Int] = []
+    var effectRuns = 0
+
+    func runThrottledEffect(value: Int) {
+      struct CancelToken: Hashable {}
+
+      Deferred { () -> Just<Int> in
+        effectRuns += 1
+        return Just(value)
+      }
+      .eraseToEffect()
+      .throttle(
+        id: CancelToken(), for: 1, scheduler: scheduler.eraseToAnyScheduler(), latest: false
+      )
+      .sink { values.append($0) }
+      .store(in: &self.cancellables)
+    }
+
+    runThrottledEffect(value: 1)
+
+    // A value emits right away.
+    XCTAssertEqual(values, [1])
+
+    scheduler.advance(by: 0.5)
+
+    runThrottledEffect(value: 2)
+
+    scheduler.advance(by: 0.5)
+
+    runThrottledEffect(value: 3)
+
+    // A second value is emitted right away.
+    XCTAssertEqual(values, [1, 2])
+  }
 }