V1 ... Dejavu

.haxerc

@@ -1,4 +1,4 @@
 {
-  "version": "4.2.0",
+  "version": "4.2.3",
   "resolveLibs": "scoped"
 }

bench/Bench.hx

@@ -11,20 +11,21 @@ class Bench {
         });
       return todos;
     }
-    measure('create 10000 todos', () -> makeTodos(1000), 100);
+    var count = 1000;
+    measure('creating ${count} todos', () -> makeTodos(count), 100);
 
-    var todos = makeTodos(1000);
-    for (mode in ['direct', 'batched', 'atomic'])
-      measure('toggle 1000 todos [$mode]', () -> {
+    var todos = makeTodos(count);
+    for (mode in ['direct', 'batched', 'atomic']) {
+      var unfinishedTodoCount = Observable.auto(() -> {
+        var sum = 0;
+        for (t in todos)
+          if (!t.done.value) sum++;
+        sum;
+      });
 
-        var unfinishedTodoCount = Observable.auto(() -> {
-          var sum = 0;
-          for (t in todos)
-            if (!t.done.value) sum++;
-          sum;
-        });
+      var watch = unfinishedTodoCount.bind(_ -> {}, if (mode == 'batched') null else Scheduler.direct);
 
-        var watch = unfinishedTodoCount.bind(_ -> {}, if (mode == 'batched') null else Scheduler.direct);
+      measure('toggling ${todos.length} todos [$mode]', () -> {
 
         function update()
           for (t in todos)
@@ -38,13 +39,15 @@ class Bench {
         if (mode == 'batched')
           Observable.updateAll();
 
-        watch.cancel();
 
       }, switch mode {
         case 'atomic': 1000;
         case 'batched': 1000;
         default: 10;
       });
+
+      watch.cancel();
+    }
   }
 
   static function measure(name, f:()->Void, ?repeat = 1) {

bench/mobx-bench.js

@@ -18,7 +18,8 @@ function measure(name, task, repeat = 1) {
   console.log(`${name} took ${(Date.now() - start) / repeat}ms (avg. of ${repeat} runs)`);
 }
 
-measure('create 10000 todos', () => createTodos(1000), 100);
+let count = 1000;
+measure(`creating ${count} todos`, () => createTodos(count), 100);
 
 {
   let todos = createTodos(1000);
@@ -40,24 +41,26 @@ measure('create 10000 todos', () => createTodos(1000), 100);
   }
 
   ['direct', 'batched', 'atomic'].forEach(mode => {
-    measure(`create 1000 todos, finish all [${mode}]`, () => {
-      let unfinishedTodoCount = computed(() => {
-        return todos.reduce((count, { done }) => done ? count : count + 1, 0);
-      });
+    let unfinishedTodoCount = computed(() => {
+      return todos.reduce((count, { done }) => done ? count : count + 1, 0);
+    });
 
-      let dispose =
-        (mode == 'batched')
-        ? autorun(() => unfinishedTodoCount.get(), {
-            scheduler: scheduler()
-          })
-        : unfinishedTodoCount.observe(x => {});
+    let dispose =
+      (mode == 'batched')
+      ? autorun(() => unfinishedTodoCount.get(), {
+          scheduler: scheduler()
+        })
+      : unfinishedTodoCount.observe(x => {});
+
+    measure(`toggling ${todos.length} todos [${mode}]`, () => {
 
       let update = (mode == 'atomic') ? transaction : f => f();
       update(() => {
         for (let item of todos)
           item.done = !item.done;
       });
-      dispose();
     }, { atomic: 1000, batched: 1000, direct: 10 }[mode]);
+
+    dispose();
   });
 }

haxe_libraries/tink_core.hxml

@@ -1,3 +1,3 @@
-# @install: lix --silent download "gh://github.com/haxetink/tink_core#e0ed6c33f6f396fb83397a590bee4c3d48ab2e17" into tink_core/2.0.2/github/e0ed6c33f6f396fb83397a590bee4c3d48ab2e17
--cp ${HAXE_LIBCACHE}/tink_core/2.0.2/github/e0ed6c33f6f396fb83397a590bee4c3d48ab2e17/src
--D tink_core=2.0.2
+# @install: lix --silent download "haxelib:/tink_core#2.1.1" into tink_core/2.1.1/haxelib
+-cp ${HAXE_LIBCACHE}/tink_core/2.1.1/haxelib/src
+-D tink_core=2.1.1

haxe_libraries/tink_streams.hxml

@@ -1,6 +1,4 @@
-# @install: lix --silent download "gh://github.com/haxetink/tink_streams#5066a96c4a8b483479b6a8df8893eaf8922d3bea" into tink_streams/0.4.0/github/5066a96c4a8b483479b6a8df8893eaf8922d3bea
+# @install: lix --silent download "gh://github.com/haxetink/tink_streams#f4478825ef0a30df1187f02a354ec61176b47b8b" into tink_streams/0.3.3/github/f4478825ef0a30df1187f02a354ec61176b47b8b
 -lib tink_core
--cp ${HAXE_LIBCACHE}/tink_streams/0.4.0/github/5066a96c4a8b483479b6a8df8893eaf8922d3bea/src
--D tink_streams=0.4.0
-# temp for development, delete this file when pure branch merged
--D pure
+-cp ${HAXE_LIBCACHE}/tink_streams/0.3.3/github/f4478825ef0a30df1187f02a354ec61176b47b8b/src
+-D tink_streams=0.3.3

haxe_libraries/tink_testrunner.hxml

@@ -1,7 +1,6 @@
-# @install: lix --silent download "gh://github.com/haxetink/tink_testrunner#45f704215ae28c3d864755036dc2ee63f7c44e8a" into tink_testrunner/0.9.0/github/45f704215ae28c3d864755036dc2ee63f7c44e8a
+# @install: lix --silent download "gh://github.com/haxetink/tink_testrunner#866de8b991be89b969825b0c0f5565d51f96a6f7" into tink_testrunner/0.8.0/github/866de8b991be89b969825b0c0f5565d51f96a6f7
 -lib ansi
 -lib tink_macro
 -lib tink_streams
--cp ${HAXE_LIBCACHE}/tink_testrunner/0.9.0/github/45f704215ae28c3d864755036dc2ee63f7c44e8a/src
--D tink_testrunner=0.9.0
---macro addGlobalMetadata('ANSI.Attribute', "@:native('ANSIAttribute')", false)
+-cp ${HAXE_LIBCACHE}/tink_testrunner/0.8.0/github/866de8b991be89b969825b0c0f5565d51f96a6f7/src
+-D tink_testrunner=0.8.0

src/tink/state/Observable.hx

@@ -1,17 +1,5 @@
 package tink.state;
 
-private typedef BindingOptions<T> = Deprecated<{
-  ?direct:Bool,
-  ?comparator:T->T->Bool,
-}>;
-
-@:forward
-abstract Deprecated<T>(T) {
-  @:deprecated
-  @:from static function of<X>(v:X):Deprecated<X>
-    return cast v;
-}
-
 /**
   Common representation of a piece of observable state. It can be read using the `value` property
   and bound to listen for changes using the `bind` method.
@@ -56,16 +44,7 @@ abstract Observable<T>(ObservableObject<T>) from ObservableObject<T> to Observab
     You can customize this behaviour by passing a different `scheduler` and `comparator` instances
     to this function.
   **/
-  public function bind(
-    #if tink_state.legacy_binding_options ?options:BindingOptions<T>, #end
-    callback:Callback<T>, ?comparator:Comparator<T>, ?scheduler:Scheduler
-  ):CallbackLink {
-    #if tink_state.legacy_binding_options
-      if (options != null) {
-        comparator = options.comparator;
-        if (options.direct) scheduler = Scheduler.direct;
-      }
-    #end
+  public function bind(callback:Callback<T>, ?comparator:Comparator<T>, ?scheduler:Scheduler):CallbackLink {
     if (scheduler == null)
       scheduler = Observable.scheduler;
     return Binding.create(this, callback, scheduler, comparator);
@@ -121,18 +100,6 @@ abstract Observable<T>(ObservableObject<T>) from ObservableObject<T> to Observab
   public function mapAsync<R>(f:Transform<T, Promise<R>>):Observable<Promised<R>>
     return Observable.auto(() -> f.apply(this.getValue()));
 
-  @:deprecated('use auto instead')
-  public function switchSync<R>(cases:Array<{ when: T->Bool, then: Lazy<Observable<R>> } > , dfault:Lazy<Observable<R>>):Observable<R>
-    return Observable.auto(() -> {
-      var v = value;
-      for (c in cases)
-        if (c.when(v)) {
-          dfault = c.then;
-          break;
-        }
-      return dfault.get().value;
-    });
-
   static var scheduler:Scheduler =
     #if macro
       Scheduler.direct;
@@ -172,12 +139,28 @@ abstract Observable<T>(ObservableObject<T>) from ObservableObject<T> to Observab
 
     Returned `CallbackLink` object can be used to cancel the binding.
   **/
-  static public function autorun(callback:()->Void, ?scheduler):CallbackLink {
+  static public function autorun(callback:Callback<CallbackLink>, ?scheduler):CallbackLink {
     var i = 0;
-    return auto(() -> {
-      callback();
+    var link:CallbackLink = null,
+        cancelled = false;
+
+    var cancel:CallbackLink = () -> {
+      cancelled = true;
+      link.cancel();
+    }
+
+    link = auto(() -> {
+      if (cancelled) return 0;
+      callback.invoke(cancel);
       i++;
     }).bind(ignore, null, scheduler);
+
+    return
+      if (cancelled) {
+        link.cancel();
+        null;
+      }
+      else link;
   }
 
   @:deprecated
@@ -195,8 +178,8 @@ abstract Observable<T>(ObservableObject<T>) from ObservableObject<T> to Observab
     will take place and the type of the observable value will become `tink.state.Promised` or `tink.State.Promised.Predicted`
     respectively. The future/promise will be automatically handled to update the value of this Observable.
   **/
-  @:noUsing static public inline function auto<T>(compute, ?comparator #if tink_state.debug , ?toString, ?pos:haxe.PosInfos #end):Observable<T>
-    return new AutoObservable<T>(compute, comparator #if tink_state.debug , toString, pos #end);
+  @:noUsing static public inline function auto<Result>(compute, ?comparator #if tink_state.debug , ?toString, ?pos:haxe.PosInfos #end):Observable<Result>
+    return new AutoObservable<Result>(compute, comparator #if tink_state.debug , toString, pos #end);
 
   /**
     Create a constant Observable object from a value. Const observables are lightweight objects
@@ -263,7 +246,7 @@ private class ConstObservable<T> implements ObservableObject<T> {
     return revision;
 
   public function canFire()
-    return true;
+    return false;
 
   public function new(value, ?toString:()->String #if tink_state.debug , ?pos:haxe.PosInfos #end) {
     this.value = value;
@@ -276,6 +259,9 @@ private class ConstObservable<T> implements ObservableObject<T> {
     #end
   }
 
+  function retain() {}
+  function release() {}
+
   public function getValue()
     return value;
 
@@ -297,18 +283,18 @@ private class ConstObservable<T> implements ObservableObject<T> {
     return EmptyIterator.DEPENDENCIES;
   #end
 
-  public function onInvalidate(i:Invalidatable):CallbackLink
-    return null;
+  public function subscribe(i:Observer) {}
+  public function unsubscribe(i:Observer) {}
 }
 
-private class SimpleObservable<T> extends Invalidator implements ObservableObject<T> {
+private class SimpleObservable<T> extends Dispatcher implements ObservableObject<T> {
 
   var _poll:Void->Measurement<T>;
   var _cache:Measurement<T> = null;
   var comparator:Comparator<T>;
 
   public function new(poll, ?comparator #if tink_state.debug , ?toString, ?pos #end) {
-    super(#if tink_state.debug toString, pos #end);
+    super(null #if tink_state.debug , toString, pos #end);
     this._poll = poll;
     this.comparator = comparator;
   }
@@ -321,7 +307,7 @@ private class SimpleObservable<T> extends Invalidator implements ObservableObjec
 
   function reset(_) {
     _cache = null;
-    fire();
+    fire(this);
   }
 
   function poll() {