Merge pull request #85 from gene-pavlovsky/make-nexttime-condition-op…

…tional

Make nextTime's condition optional

src/tink/state/Observable.hx

@@ -77,8 +77,11 @@ abstract Observable<T>(ObservableObject<T>) from ObservableObject<T> to Observab
   public function combine<A, R>(that:Observable<A>, f:T->A->R):Observable<R>
     return Observable.auto(() -> f(value, that.value));
 
-  public function nextTime(?options:{ ?butNotNow: Bool, ?hires:Bool }, check:T->Bool):Future<T>
-    return getNext(options, v -> if (check(v)) Some(v) else None);
+  public function nextTime(?options:{ ?butNotNow: Bool, ?hires:Bool }, ?condition:T->Bool):Future<T>
+    return getNext(options,
+      if (condition == null) Some
+      else v -> if (condition(v)) Some(v) else None
+    );
 
   public function getNext<R>(?options:{ ?butNotNow: Bool, ?hires:Bool }, select:T->Option<R>):Future<R> {
     var ret = Future.trigger(),
@@ -360,4 +363,4 @@ class ObservableTools {
   static public function flatten<T>(o:Observable<Observable<T>>)
     return Observable.auto(() -> Observable.lift(o).value.value);
 
-}
+}

tests.hxml

@@ -1,6 +1,7 @@
+-cp src
 -cp tests
 -D no-deprecation-warnings
 -lib tink_unittest
 -main RunTests
 
--lib deep_equal
+-lib deep_equal

tests/TestBasic.hx

@@ -1,7 +1,7 @@
 package;
 
-import tink.state.Scheduler.direct;
 import tink.state.*;
+import tink.state.Scheduler.direct;
 
 using tink.CoreApi;
 
@@ -126,6 +126,11 @@ class TestBasic {
 
     asserts.assert(fired == 4);
 
+    await(o.nextTime({ hires: true, }));
+    set(0);
+
+    asserts.assert(fired == 5);
+
     return asserts.done();
   }
 
@@ -152,7 +157,7 @@ class TestBasic {
 
     return asserts.done();
   }
-  
+
   public function mapAsync() {
     final s = new State(0);
     final o:Observable<Int> = s;