From 124a048c12136c43f9f1c3a0e8fb8194c369024f Mon Sep 17 00:00:00 2001
From: Tetsuharu OHZEKI <saneyuki.snyk@gmail.com>
Date: Wed, 26 Oct 2016 04:51:15 +0900
Subject: [PATCH] refactor(Scheduler): clearify the signature which
 `Scheduler.schedule()` takes as `work`.

I think this would not be a breaking change by these reasons:

- There are no problem if we pass the function which does not has `this` specifying.
- There are no problem if we pass the function which has `this: any` or `this: Action<T>`.
  - This case is valid with the actual behavior.
- If we pass the function which has `this: SomeNonValidTypeWithAction<T>`,
  then, basically, its code would be wrong.
---
 spec/schedulers/VirtualTimeScheduler-spec.ts | 3 ++-
 src/Scheduler.ts                             | 2 +-
 src/scheduler/Action.ts                      | 2 +-
 src/scheduler/AnimationFrameAction.ts        | 2 +-
 src/scheduler/AsapAction.ts                  | 2 +-
 src/scheduler/AsyncAction.ts                 | 2 +-
 src/scheduler/QueueAction.ts                 | 2 +-
 src/scheduler/VirtualTimeScheduler.ts        | 2 +-
 8 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/spec/schedulers/VirtualTimeScheduler-spec.ts b/spec/schedulers/VirtualTimeScheduler-spec.ts
index 9c73ac84b1..6af1fe5e96 100644
--- a/spec/schedulers/VirtualTimeScheduler-spec.ts
+++ b/spec/schedulers/VirtualTimeScheduler-spec.ts
@@ -1,5 +1,6 @@
 import {expect} from 'chai';
 import * as Rx from '../../dist/cjs/Rx';
+import { VirtualAction } from '../../dist/cjs/scheduler/VirtualTimeScheduler';
 
 const VirtualTimeScheduler = Rx.VirtualTimeScheduler;
 
@@ -68,7 +69,7 @@ describe('VirtualTimeScheduler', () => {
     let count = 0;
     const expected = [100, 200, 300];
 
-    v.schedule(function(state) {
+    v.schedule<string>(function(this: VirtualAction<string>, state: string) {
       if (++count === 3) {
         return;
       }
diff --git a/src/Scheduler.ts b/src/Scheduler.ts
index d7ba496766..e1e27ec73f 100644
--- a/src/Scheduler.ts
+++ b/src/Scheduler.ts
@@ -53,7 +53,7 @@ export class Scheduler {
    * @return {Subscription} A subscription in order to be able to unsubscribe
    * the scheduled work.
    */
-  public schedule<T>(work: (state?: T) => void, delay: number = 0, state?: T): Subscription {
+  public schedule<T>(work: (this: Action<T>, state?: T) => void, delay: number = 0, state?: T): Subscription {
     return new this.SchedulerAction<T>(this, work).schedule(state, delay);
   }
 }
diff --git a/src/scheduler/Action.ts b/src/scheduler/Action.ts
index 57b3789bb6..1946b1b444 100644
--- a/src/scheduler/Action.ts
+++ b/src/scheduler/Action.ts
@@ -16,7 +16,7 @@ import { Subscription } from '../Subscription';
  * @class Action<T>
  */
 export class Action<T> extends Subscription {
-  constructor(scheduler: Scheduler, work: (state?: T) => void) {
+  constructor(scheduler: Scheduler, work: (this: Action<T>, state?: T) => void) {
     super();
   }
   /**
diff --git a/src/scheduler/AnimationFrameAction.ts b/src/scheduler/AnimationFrameAction.ts
index c9dfee0569..7bf440d5da 100644
--- a/src/scheduler/AnimationFrameAction.ts
+++ b/src/scheduler/AnimationFrameAction.ts
@@ -10,7 +10,7 @@ import { AnimationFrameScheduler } from './AnimationFrameScheduler';
 export class AnimationFrameAction<T> extends AsyncAction<T> {
 
   constructor(protected scheduler: AnimationFrameScheduler,
-              protected work: (state?: T) => void) {
+              protected work: (this: AnimationFrameAction<T>, state?: T) => void) {
     super(scheduler, work);
   }
 
diff --git a/src/scheduler/AsapAction.ts b/src/scheduler/AsapAction.ts
index ebfca01be9..fd0a8aec66 100644
--- a/src/scheduler/AsapAction.ts
+++ b/src/scheduler/AsapAction.ts
@@ -10,7 +10,7 @@ import { AsapScheduler } from './AsapScheduler';
 export class AsapAction<T> extends AsyncAction<T> {
 
   constructor(protected scheduler: AsapScheduler,
-              protected work: (state?: T) => void) {
+              protected work: (this: AsapAction<T>, state?: T) => void) {
     super(scheduler, work);
   }
 
diff --git a/src/scheduler/AsyncAction.ts b/src/scheduler/AsyncAction.ts
index 98b422d870..5610c1a537 100644
--- a/src/scheduler/AsyncAction.ts
+++ b/src/scheduler/AsyncAction.ts
@@ -16,7 +16,7 @@ export class AsyncAction<T> extends Action<T> {
   protected pending: boolean = false;
 
   constructor(protected scheduler: AsyncScheduler,
-              protected work: (state?: T) => void) {
+              protected work: (this: AsyncAction<T>, state?: T) => void) {
     super(scheduler, work);
   }
 
diff --git a/src/scheduler/QueueAction.ts b/src/scheduler/QueueAction.ts
index 8b870f1fe4..23203b90ab 100644
--- a/src/scheduler/QueueAction.ts
+++ b/src/scheduler/QueueAction.ts
@@ -10,7 +10,7 @@ import { QueueScheduler } from './QueueScheduler';
 export class QueueAction<T> extends AsyncAction<T> {
 
   constructor(protected scheduler: QueueScheduler,
-              protected work: (state?: T) => void) {
+              protected work: (this: QueueAction<T>, state?: T) => void) {
     super(scheduler, work);
   }
 
diff --git a/src/scheduler/VirtualTimeScheduler.ts b/src/scheduler/VirtualTimeScheduler.ts
index 9712c400e5..21279b9696 100644
--- a/src/scheduler/VirtualTimeScheduler.ts
+++ b/src/scheduler/VirtualTimeScheduler.ts
@@ -47,7 +47,7 @@ export class VirtualTimeScheduler extends AsyncScheduler {
 export class VirtualAction<T> extends AsyncAction<T> {
 
   constructor(protected scheduler: VirtualTimeScheduler,
-              protected work: (state?: T) => void,
+              protected work: (this: VirtualAction<T>, state?: T) => void,
               protected index: number = scheduler.index += 1) {
     super(scheduler, work);
     this.index = scheduler.index = index;