first pass on making aexprs iterable

SQUASHED: AUTO-COMMIT-src-client-reactive-active-expression-active-expression.js,AUTO-COMMIT-src-client-reactive-test-active-expression-utility-methods.spec.js,

Author: onsetsu

src/client/reactive/active-expression/active-expression.js

@@ -488,33 +488,16 @@ export class BaseActiveExpression {
   }
 
   values() {
-    
-    const disposed = new Promise(resolve => {
-      if (this.isDisposed()) {
-        resolve()
-      } else {
-        this.on('')
-      }
-    });
-    
-    Promise.race([
-      this.nextValue().then(v => ({ value: v, done: false })),
-    ])
-    
-    function newResult(v, done) {
-      
-    }
-    
+    const me = this;
     return {
       [Symbol.asyncIterator]() {
         return {
-          i: 0,
           next() {
-            if (this.i < 3) {
-              return Promise.resolve({ value: ++this.i, done: false });
-            }
-
-            return Promise.resolve({ done: true });
+            console.log("NEXT", me.getCurrentValue())
+            return Promise.race([
+              me.nextValue().then(v => ({ value: v, done: false })),
+              me.gotDisposed().then(() => ({ done: true }))
+            ]);
           }
         };
       }

src/client/reactive/test/active-expression/utility-methods.spec.js

@@ -55,25 +55,81 @@ describe('Iterators and Utility Methods for Active Expressions', () => {
       const ae = aexpr(() => val);
 
       (async () => {
-        lively.sleep(10);
+
+        console.log("START ASYNC");
+
+        await lively.sleep(10);
+        console.log("SET VAL", ae.getCurrentValue());
         val++;
-        lively.sleep(10);
+
+        await lively.sleep(10);
+        console.log("SET VAL", ae.getCurrentValue());
         val++;
-        lively.sleep(10);
+
+        await lively.sleep(10);
+        console.log("SET VAL", ae.getCurrentValue());
         val++;
 
-        lively.sleep(10);
+        await lively.sleep(10);
+        console.log("DISPOSE", ae.getCurrentValue());
         ae.dispose();
 
-        lively.sleep(10);
+        await lively.sleep(10);
+        console.log("SET VAL", ae.getCurrentValue());
         val++;
       })();
-      
+
+      let j = 0;
+      console.log("BEFORE LOOP", val, j);
+      for await (let v of ae.values()) {
+        j++;
+        console.log("IN LOOP", val, v, j);
+        expect(v).to.equal(j);
+      }
+      console.log("AFTER LOOP", val, j);
+      expect(j).to.equal(3);
+    });
+
+    // #TODO: next: introduce a queue of changed-expressions-results
+    xit(".values can deal with multiple changes in a synchronous execution", async () => {
+      let val = 0,
+          spy = sinon.spy();
+
+      const ae = aexpr(() => val);
+
+      (async () => {
+
+        console.log("START ASYNC");
+
+        await lively.sleep(10);
+        console.log("SET VAL", ae.getCurrentValue());
+        val++;
+
+        await lively.sleep(10);
+        console.log("SET VAL", ae.getCurrentValue());
+        val++;
+
+        await lively.sleep(10);
+        console.log("SET VAL", ae.getCurrentValue());
+        val++;
+
+        await lively.sleep(10);
+        console.log("DISPOSE", ae.getCurrentValue());
+        ae.dispose();
+
+        await lively.sleep(10);
+        console.log("SET VAL", ae.getCurrentValue());
+        val++;
+      })();
+
       let j = 0;
+      console.log("BEFORE LOOP", val, j);
       for await (let v of ae.values()) {
         j++;
+        console.log("IN LOOP", val, v, j);
         expect(v).to.equal(j);
       }
+      console.log("AFTER LOOP", val, j);
       expect(j).to.equal(3);
     });