Update to latest RxJS version (#235)

* Update to latest RxJS version

* Update caniuse-lite to prevent warning logging

* Make parameter of fromObservable an Observable

Make parameter observable in fromObservable of type Observable instead of Subscribable as this causes issues with typing.

* Remove not needed typings

* Remove fromObservable typing from tutorial

* Undo changes as type is not correctly inferred

* Add RxJS version 7 to peerDepencies

* Use Subscription type instead of Subscribable

We claim compatibility with RxJS version 5 but in V5 the type Subscribable does not exist. This does not lead to an issue as the unsubscribe() method exists in Subscribable (V6+) and ISubscription (V5) but it is not very clean.

* Exclude dist folder from npm scripts

.vscode/settings.json

@@ -7,5 +7,6 @@
     "editor.codeActionsOnSave": {
         "source.fixAll": "explicit"
     },
-    "typescript.tsdk": "node_modules/typescript/lib"
+    "typescript.tsdk": "node_modules/typescript/lib",
+    "npm.exclude": "**/dist/**"
 }

extensions/sherlock-rxjs/package.json

@@ -39,6 +39,6 @@
     },
     "peerDependencies": {
         "@politie/sherlock": "0.0.0-PLACEHOLDER",
-        "rxjs": "^5.4.0 || ^6.0.0"
+        "rxjs": "^5.4.0 || ^6.0.0 || ^7.0.0 "
     }
 }

extensions/sherlock-rxjs/rxjs.test.ts

@@ -13,15 +13,21 @@ describe('rxjs/rxjs', () => {
             a$.setFinal('final value');
             let value = '';
             let complete = false;
-            toObservable(a$).subscribe(v => value = v, undefined, () => complete = true);
+            toObservable(a$).subscribe({
+                next: v => value = v,
+                complete: () => complete = true
+            });
             expect(value).toBe('final value');
             expect(complete).toBeTrue();
         });
 
         it('should complete the Observable when the derivable becomes final', () => {
             let value = '';
             let complete = false;
-            toObservable(a$).subscribe(v => value = v, undefined, () => complete = true);
+            toObservable(a$).subscribe({
+                next: v => value = v,
+                complete:  () => complete = true
+            });
             expect(value).toBe('a');
             expect(complete).toBeFalse();
 
@@ -33,7 +39,10 @@ describe('rxjs/rxjs', () => {
         it('should complete the Observable when until becomes true', () => {
             let complete = false;
             let value = '';
-            toObservable(a$, { until: d$ => d$.get().length > 2 }).subscribe(v => value = v, undefined, () => complete = true);
+            toObservable(a$, { until: d$ => d$.get().length > 2 }).subscribe({
+                next: v => value = v,
+                complete: () => complete = true
+            });
             expect(complete).toBe(false);
             expect(value).toBe('a');
 
@@ -49,7 +58,10 @@ describe('rxjs/rxjs', () => {
         it('should complete the Observable after one value when once is true', () => {
             let complete = false;
             const values: string[] = [];
-            toObservable(a$, { once: true }).subscribe(v => values.push(v), undefined, () => complete = true);
+            toObservable(a$, { once: true }).subscribe({
+                next: v => values.push(v),
+                complete: () => complete = true
+            });
             expect(complete).toBe(true);
             expect(values).toEqual(['a']);
 
@@ -60,7 +72,10 @@ describe('rxjs/rxjs', () => {
         it('should skip the first value if skipFirst is true', () => {
             let complete = false;
             const values: string[] = [];
-            toObservable(a$, { skipFirst: true, once: true }).subscribe(v => values.push(v), undefined, () => complete = true);
+            toObservable(a$, { skipFirst: true, once: true }).subscribe({
+                next: v => values.push(v),
+                complete:  () => complete = true
+            });
             expect(complete).toBe(false);
             expect(Object.keys(values)).toHaveLength(0);
 
@@ -107,7 +122,7 @@ describe('rxjs/rxjs', () => {
 
         it('should not complete on unsubscribe', () => {
             let complete = false;
-            toObservable(a$).subscribe(undefined, undefined, () => complete = true).unsubscribe();
+            toObservable(a$).subscribe({ complete: () => complete = true}).unsubscribe();
             expect(complete).toBe(false);
         });
     });

extensions/sherlock-rxjs/rxjs.ts

@@ -1,5 +1,5 @@
 import { _internal, atom, Derivable, ErrorWrapper, ReactorOptions } from '@politie/sherlock';
-import { Observable, Subscribable, Subscriber, Unsubscribable } from 'rxjs';
+import { Observable, Subscriber, Subscription } from 'rxjs';
 
 /**
  * Creates an RxJS Observable from a Derivable. Optionally accepts a `ReactorOptions` that governs RxJS emissions
@@ -17,17 +17,17 @@ export function toObservable<V>(derivable: Derivable<V>, options?: Partial<React
     });
 }
 
-export function fromObservable<V>(observable: Subscribable<V>): Derivable<V> {
+export function fromObservable<V>(observable: Observable<V>): Derivable<V> {
     const atom$ = atom.unresolved<V>();
 
-    let subscription: Unsubscribable | undefined;
+    let subscription: Subscription | undefined;
     atom$.connected$.react(() => {
         if (atom$.connected && !subscription) {
-            subscription = observable.subscribe(
-                value => atom$.set(value),
-                err => atom$.setFinal(new ErrorWrapper(err)),
-                () => atom$.setFinal(atom$.getState()),
-            );
+            subscription = observable.subscribe({
+                next: value => atom$.set(value),
+                error: err => atom$.setFinal(new ErrorWrapper(err)),
+                complete: () => atom$.setFinal(atom$.getState()),
+        });
         }
         // This is not chained with the previous as an `else` branch, because this can be true immediately after
         // the subscription occurs. Observables can complete synchronously on subscription.

package.json

@@ -67,7 +67,7 @@
         "rollup": "^2.50.5",
         "rollup-plugin-sourcemaps": "^0.6.3",
         "rollup-plugin-visualizer": "^5.5.0",
-        "rxjs": "^6.6.7",
+        "rxjs": "^7.8.1",
         "shelljs": "^0.8.5",
         "terser": "^5.14.2",
         "ts-jest": "^27.0.2",