Merge f378055 into d14e27a

.travis.yml

@@ -5,3 +5,7 @@ node_js:
   - "stable"
 after_script:
   - "cat ./coverage/lcov.info | yarn coveralls"
+branches:
+  only:
+    - master
+    - /^v\d+\.\d+\.\d+/

src/interfaces.ts

@@ -36,7 +36,7 @@ export interface Cancellation<Kind extends string = string> {
 export type Complete<Result> = (result: Result) => void;
 
 export type RaceCancellation = <Result>(
-  task: Task<Result>
+  task: Task<Result> | PromiseLike<Result>
 ) => Promise<Result | Cancellation>;
 
 export type NewCancellation = () => Cancellation;

src/newRaceCancellation.ts

@@ -25,12 +25,14 @@ export default function newRaceCancellation(
 
 function raceCancellation<Result>(
   cancellation: Oneshot<unknown>,
-  task: Task<Result>,
+  task: Task<Result> | PromiseLike<Result>,
   intoCancellation: IntoCancellation
 ): Promise<Result | Cancellation> {
-  return cancellation[hasCompleted]
-    ? cancellation().then(intoCancellation)
-    : Promise.race([task(), cancellation().then(intoCancellation)]);
+  return typeof task === "function"
+    ? cancellation[hasCompleted]
+      ? cancellation().then(intoCancellation)
+      : Promise.race([task(), cancellation().then(intoCancellation)])
+    : Promise.race([task, cancellation().then(intoCancellation)]);
 }
 
 function newIntoCancellation(

src/noopRaceCancellation.ts

@@ -5,7 +5,10 @@ import { RaceCancellation, Task } from "./interfaces";
  * in a backwards compatible way by using this as the default.
  */
 const noopRaceCancellation: RaceCancellation = <Result>(
-  task: Task<Result>
-): Promise<Result> => Promise.resolve().then(task);
+  task: Task<Result> | PromiseLike<Result>
+): Promise<Result> =>
+  typeof task === "function"
+    ? Promise.resolve().then(task)
+    : Promise.resolve(task);
 
 export default noopRaceCancellation;

tests/cancellableRaceTest.js

@@ -0,0 +1,18 @@
+const { cancellableRace } = require("race-cancellation");
+
+QUnit.module("cancellableRace", () => {
+  QUnit.test("cancel before race already rejected promise", async assert => {
+    assert.expect(1);
+
+    const [raceCancellation, cancel] = cancellableRace();
+
+    cancel();
+    const task = Promise.reject(new Error("failed task"));
+
+    try {
+      await raceCancellation(task);
+    } catch (e) {
+      assert.equal(e.message, "failed task");
+    }
+  });
+});

tests/combineRaceCancellationTest.js

@@ -2,6 +2,7 @@ const {
   combineRaceCancellation,
   cancellableRace,
   throwIfCancelled,
+  noopRaceCancellation,
 } = require("race-cancellation");
 
 QUnit.module("combineRaceCancellation", () => {
@@ -14,7 +15,7 @@ QUnit.module("combineRaceCancellation", () => {
 
   QUnit.test("calling combine with b as undefined", async assert => {
     const raceCancellation = combineRaceCancellation(
-      task => Promise.resolve().then(task),
+      noopRaceCancellation,
       undefined
     );
     const expected = new Date();
@@ -23,8 +24,9 @@ QUnit.module("combineRaceCancellation", () => {
   });
 
   QUnit.test("calling combine with a as undefined", async assert => {
-    const raceCancellation = combineRaceCancellation(undefined, task =>
-      Promise.resolve().then(task)
+    const raceCancellation = combineRaceCancellation(
+      undefined,
+      noopRaceCancellation
     );
     const expected = new Date();
     const actual = await raceCancellation(() => Promise.resolve(expected));

tests/noopRaceCancellationTest.js

@@ -6,4 +6,10 @@ QUnit.module("noopRaceCancellation", () => {
     const actual = await noopRaceCancellation(() => Promise.resolve(expected));
     assert.equal(actual, expected);
   });
+
+  QUnit.test("it just resolves the promise", async assert => {
+    const expected = new Date();
+    const actual = await noopRaceCancellation(Promise.resolve(expected));
+    assert.equal(actual, expected);
+  });
 });