Merge pull request #86 from dolittle/fix-cancellation-instanceof

Fix cancellation instanceof

Author: jakhog

Source/resilience/Cancellation.ts

@@ -7,9 +7,16 @@ import { Observable, NEVER } from 'rxjs';
  * Represents a possible cancellation.
  */
 export class Cancellation extends Observable<void> {
+    /**
+     * Creates a new instance of the {@link Cancellation} class.
+     * @param {Observable<void>} source - The source observable that indicates when a cancellation has occured.
+     */
+    constructor(source: Observable<void>) {
+        super(source.subscribe);
+    }
 
     /**
      * Default cancellation, which is never.
      */
-    static default: Cancellation = NEVER;
+    static default: Cancellation = new Cancellation(NEVER);
 }

Source/resilience/CancellationSource.ts

@@ -8,7 +8,7 @@ import { Cancellation } from './Cancellation';
  * Represents the source of a {@link Cancellation}.
  */
 export class CancellationSource {
-    private _subject: Subject<void>;
+    private readonly _subject: Subject<void>;
 
     /**
      * Initializes a new instance of {@link CancellationSource}.
@@ -19,6 +19,7 @@ export class CancellationSource {
         for (const source of sources) {
             source.subscribe(this._subject);
         }
+        this.cancellation = new Cancellation(this._subject);
     }
 
     /**
@@ -31,9 +32,7 @@ export class CancellationSource {
     /**
      * Gets the cancellation subject.
      */
-    get cancellation(): Cancellation {
-        return this._subject;
-    }
+    readonly cancellation: Cancellation;
 
     /**
      * Get whether or not the {@link CancellationSource} is cancelled.

Source/resilience/for_Cancellation/when_checking_if_instanceof_cancellation/a_new_cancellation.ts

@@ -0,0 +1,12 @@
+// Copyright (c) Dolittle. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+import { describeThis } from '@dolittle/typescript.testing';
+import { Subject } from 'rxjs';
+import { Cancellation } from '../../index';
+
+describeThis(__filename, () => {
+    const result = new Cancellation(new Subject()) instanceof Cancellation;
+
+    it('should be', () => result.should.be.true);
+});

Source/resilience/for_Cancellation/when_checking_if_instanceof_cancellation/and_is_default_cancellation.ts

@@ -0,0 +1,11 @@
+// Copyright (c) Dolittle. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+import { describeThis } from '@dolittle/typescript.testing';
+import { Cancellation } from '../../index';
+
+describeThis(__filename, () => {
+    const result = Cancellation.default instanceof Cancellation;
+
+    it('should be', () => result.should.be.true);
+});

Source/resilience/for_CancellationSource/when_checking_if_instanceof_cancellation/from_a_new_source.ts

@@ -0,0 +1,11 @@
+// Copyright (c) Dolittle. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+import { describeThis } from '@dolittle/typescript.testing';
+import { Cancellation, CancellationSource } from '../../index';
+
+describeThis(__filename, () => {
+    const result = new CancellationSource().cancellation instanceof Cancellation;
+
+    it('should be', () => result.should.be.true);
+});