Update when-resolved, when-rejected to instantiated-resolved, instantiated-rejected.

packages/coreutils/src/poll.ts

@@ -58,7 +58,7 @@ export class Poll<T = any, U = any> implements IDisposable {
         this._resolve(this._tick, {
           interval: this.interval,
           payload: null,
-          phase: 'when-resolved',
+          phase: 'instantiated-resolved',
           timestamp: new Date().getTime()
         });
       })
@@ -72,7 +72,7 @@ export class Poll<T = any, U = any> implements IDisposable {
         this._resolve(this._tick, {
           interval: this.interval,
           payload: null,
-          phase: 'when-rejected',
+          phase: 'instantiated-rejected',
           timestamp: new Date().getTime()
         });
 
@@ -338,15 +338,15 @@ export namespace Poll {
    */
   export type Phase =
     | 'instantiated'
+    | 'instantiated-rejected'
+    | 'instantiated-resolved'
     | 'reconnected'
     | 'refreshed'
     | 'rejected'
     | 'resolved'
     | 'standby'
     | 'started'
-    | 'stopped'
-    | 'when-rejected'
-    | 'when-resolved';
+    | 'stopped';
 
   /**
    * Definition of poll state at any given tick.

tests/test-coreutils/src/poll.spec.ts

@@ -32,7 +32,7 @@ describe('Poll', () => {
 
       expect(poll.state.phase).to.equal('instantiated');
       await promise;
-      expect(poll.state.phase).to.equal('when-resolved');
+      expect(poll.state.phase).to.equal('instantiated-resolved');
       poll.dispose();
     });
 
@@ -47,7 +47,7 @@ describe('Poll', () => {
 
       expect(poll.state.phase).to.equal('instantiated');
       await promise.catch(() => undefined);
-      expect(poll.state.phase).to.equal('when-rejected');
+      expect(poll.state.phase).to.equal('instantiated-rejected');
       poll.dispose();
     });
   });
@@ -200,7 +200,7 @@ describe('Poll', () => {
         factory: () => Promise.resolve(),
         variance: 0
       });
-      const expected = 'when-resolved resolved';
+      const expected = 'instantiated-resolved resolved';
       const ticker: Poll.Phase[] = [];
       const tock = (poll: Poll) => {
         ticker.push(poll.state.phase);
@@ -222,7 +222,7 @@ describe('Poll', () => {
         factory: () => Promise.resolve(),
         variance: 0
       });
-      const expected = 'when-resolved resolved';
+      const expected = 'instantiated-resolved resolved';
       const ticker: Poll.Phase[] = [];
 
       poll.ticked.connect(() => {
@@ -242,7 +242,7 @@ describe('Poll', () => {
         variance: 0,
         when: promise
       });
-      const expected = 'when-rejected resolved';
+      const expected = 'instantiated-rejected resolved';
       const ticker: Poll.Phase[] = [];
 
       poll.ticked.connect(() => {