Upgrade rxbeach to rxjs7

.circleci/config.yml

@@ -45,7 +45,7 @@ jobs:
 
       - run:
           name: Line coverage
-          command: ./node_modules/.bin/nyc report --reporter=text-lcov | npx coveralls
+          command: yarn c8 report --reporter=text-lcov | npx coveralls
 
       - store_test_results:
           path: ~/reports

package.json

@@ -1,6 +1,6 @@
 {
   "name": "rxbeach",
-  "version": "0.10.3",
+  "version": "1.0.0-beta-1",
   "description": "Chill with streams at the RxBeach",
   "keywords": [
     "rxjs",
@@ -41,7 +41,8 @@
     "./dist"
   ],
   "scripts": {
-    "test": "yarn nyc ava",
+    "pretest": "yarn tsc",
+    "test": "yarn c8 ava",
     "test:watch": "yarn ava --watch",
     "lint": "yarn eslint --ext .ts src -c .eslintrc.js",
     "build": "rimraf dist && yarn tsc",
@@ -53,43 +54,44 @@
   },
   "devDependencies": {
     "@ardoq/shared-configs": "0.1.34",
-    "@ava/typescript": "2.0.0",
-    "@commitlint/cli": "13.1.0",
-    "@commitlint/config-conventional": "13.1.0",
-    "@testing-library/react-hooks": "^7.0.1",
-    "@types/react": "17.0.20",
-    "@types/sinon": "10.0.2",
-    "@typescript-eslint/eslint-plugin": "^4.14.2",
-    "@typescript-eslint/parser": "^4.14.2",
-    "ava": "3.15.0",
-    "conditional-type-checks": "1.0.5",
-    "eslint": "^7.32.0",
-    "eslint-config-prettier": "^8.3.0",
-    "eslint-plugin-import": "^2.22.0",
-    "eslint-plugin-prettier": "^4.0.0",
-    "eslint-plugin-react": "^7.20.6",
-    "eslint-plugin-react-hooks": "^4.1.0",
-    "eslint-plugin-sort-class-members": "^1.8.0",
-    "husky": "7.0.2",
-    "nyc": "15.1.0",
-    "pinst": "2.1.6",
-    "prettier": "^2.1.1",
-    "react": "17.0.2",
-    "react-test-renderer": "17.0.2",
+    "@ava/typescript": "3.0.1",
+    "@commitlint/cli": "17.0.3",
+    "@commitlint/config-conventional": "17.0.3",
+    "@types/react": "18.0.17",
+    "@types/react-test-renderer": "18.0.0",
+    "@types/sinon": "10.0.13",
+    "@typescript-eslint/eslint-plugin": "5.33.0",
+    "@typescript-eslint/parser": "5.33.0",
+    "ava": "4.3.1",
+    "c8": "7.12.0",
+    "conditional-type-checks": "1.0.6",
+    "eslint": "8.21.0",
+    "eslint-config-prettier": "8.5.0",
+    "eslint-plugin-import": "2.26.0",
+    "eslint-plugin-prettier": "3.3.1",
+    "eslint-plugin-react": "7.30.1",
+    "eslint-plugin-react-hooks": "4.6.0",
+    "eslint-plugin-sort-class-members": "1.14.1",
+    "husky": "8.0.1",
+    "pinst": "3.0.0",
+    "prettier": "2.7.1",
+    "react": "18.2.0",
+    "react-test-renderer": "18.2.0",
     "rimraf": "3.0.2",
-    "rxjs": "6.6.7",
-    "rxjs-marbles": "6.0.1",
-    "sinon": "11.1.2",
-    "standard-version": "9.3.1",
+    "rxjs": "7.5.6",
+    "rxjs-marbles": "7.0.1",
+    "sinon": "14.0.0",
+    "standard-version": "9.5.0",
     "tap-xunit": "2.4.1",
-    "typescript": "4.4.3"
+    "typescript": "4.7.4"
   },
   "dependencies": {
-    "rxjs-spy": "7.5.3"
+    "rxjs-interop": "2.0.0",
+    "rxjs-spy": "8.0.2"
   },
   "peerDependencies": {
-    "react": "^17.0.2",
-    "rxjs": "^6.6.7"
+    "react": "^18.2.0 || ^17.0.2",
+    "rxjs": "^7.5.6"
   },
   "ava": {
     "files": [
@@ -102,18 +104,6 @@
       "compile": false
     }
   },
-  "nyc": {
-    "all": true,
-    "sourceMap": true,
-    "produce-source-map": false,
-    "exclude-after-remap": false,
-    "include": [
-      "dist/**/*",
-      "!dist/**/index.js",
-      "!dist/**/*.tspec.js",
-      "!dist/**/*.spec.js"
-    ]
-  },
   "prettier": {
     "singleQuote": true,
     "printWidth": 80,

src/action$.spec.ts

@@ -3,11 +3,12 @@ import { incrementMocks } from './internal/testing/mock';
 import { action$, dispatchAction } from './action$';
 import { take } from 'rxjs/operators';
 import { _namespaceAction } from './namespace';
+import { ActionWithoutPayload } from './types/Action';
 
 const actions = incrementMocks.marbles.actions;
 
 test('dispatchAction makes action$ emit', (t) => {
-  let lastAction;
+  let lastAction: ActionWithoutPayload | undefined;
   const sub = action$.pipe(take(1)).subscribe((a) => (lastAction = a));
   t.teardown(() => sub.unsubscribe());
 
@@ -16,7 +17,7 @@ test('dispatchAction makes action$ emit', (t) => {
 });
 
 test('dispatchAction does not remove existing namespace', (t) => {
-  let lastAction;
+  let lastAction: ActionWithoutPayload | undefined;
   const sub = action$.pipe(take(1)).subscribe((a) => (lastAction = a));
   t.teardown(() => sub.unsubscribe());
 

src/derivedStream.ts

@@ -1,87 +1,94 @@
-import { Observable } from 'rxjs';
+import { Observable, ObservableInput } from 'rxjs';
 import { combineLatest } from './decoratedObservableCombiners';
 import { markName } from './internal/markers';
 
 export type DerivedStream = {
-  <A>(name: string, a: Observable<A>): Observable<[A]>;
-  <A, B>(name: string, a: Observable<A>, b: Observable<B>): Observable<[A, B]>;
+  <A>(name: string, a: ObservableInput<A>): Observable<[A]>;
+  <A, B>(
+    name: string,
+    a: ObservableInput<A>,
+    b: ObservableInput<B>
+  ): Observable<[A, B]>;
   <A, B, C>(
     name: string,
-    a: Observable<A>,
-    b: Observable<B>,
-    c: Observable<C>
+    a: ObservableInput<A>,
+    b: ObservableInput<B>,
+    c: ObservableInput<C>
   ): Observable<[A, B, C]>;
   <A, B, C, D>(
     name: string,
-    a: Observable<A>,
-    b: Observable<B>,
-    c: Observable<C>,
-    d: Observable<D>
+    a: ObservableInput<A>,
+    b: ObservableInput<B>,
+    c: ObservableInput<C>,
+    d: ObservableInput<D>
   ): Observable<[A, B, C, D]>;
   <A, B, C, D, E>(
     name: string,
-    a: Observable<A>,
-    b: Observable<B>,
-    c: Observable<C>,
-    d: Observable<D>,
-    e: Observable<E>
+    a: ObservableInput<A>,
+    b: ObservableInput<B>,
+    c: ObservableInput<C>,
+    d: ObservableInput<D>,
+    e: ObservableInput<E>
   ): Observable<[A, B, C, D, E]>;
   <A, B, C, D, E, F>(
     name: string,
-    a: Observable<A>,
-    b: Observable<B>,
-    c: Observable<C>,
-    d: Observable<D>,
-    e: Observable<E>,
-    f: Observable<F>
+    a: ObservableInput<A>,
+    b: ObservableInput<B>,
+    c: ObservableInput<C>,
+    d: ObservableInput<D>,
+    e: ObservableInput<E>,
+    f: ObservableInput<F>
   ): Observable<[A, B, C, D, E, F]>;
   <A, B, C, D, E, F, G>(
     name: string,
-    a: Observable<A>,
-    b: Observable<B>,
-    c: Observable<C>,
-    d: Observable<D>,
-    e: Observable<E>,
-    f: Observable<F>,
-    g: Observable<G>
+    a: ObservableInput<A>,
+    b: ObservableInput<B>,
+    c: ObservableInput<C>,
+    d: ObservableInput<D>,
+    e: ObservableInput<E>,
+    f: ObservableInput<F>,
+    g: ObservableInput<G>
   ): Observable<[A, B, C, D, E, F, G]>;
   <A, B, C, D, E, F, G, H>(
     name: string,
-    a: Observable<A>,
-    b: Observable<B>,
-    c: Observable<C>,
-    d: Observable<D>,
-    e: Observable<E>,
-    f: Observable<F>,
-    g: Observable<G>,
-    h: Observable<H>
+    a: ObservableInput<A>,
+    b: ObservableInput<B>,
+    c: ObservableInput<C>,
+    d: ObservableInput<D>,
+    e: ObservableInput<E>,
+    f: ObservableInput<F>,
+    g: ObservableInput<G>,
+    h: ObservableInput<H>
   ): Observable<[A, B, C, D, E, F, G, H]>;
   <A, B, C, D, E, F, G, H, I>(
     name: string,
-    a: Observable<A>,
-    b: Observable<B>,
-    c: Observable<C>,
-    d: Observable<D>,
-    e: Observable<E>,
-    f: Observable<F>,
-    g: Observable<G>,
-    h: Observable<H>,
-    i: Observable<I>
+    a: ObservableInput<A>,
+    b: ObservableInput<B>,
+    c: ObservableInput<C>,
+    d: ObservableInput<D>,
+    e: ObservableInput<E>,
+    f: ObservableInput<F>,
+    g: ObservableInput<G>,
+    h: ObservableInput<H>,
+    i: ObservableInput<I>
   ): Observable<[A, B, C, D, E, F, G, H, I]>;
   <A, B, C, D, E, F, G, H, I, J>(
     name: string,
-    a: Observable<A>,
-    b: Observable<B>,
-    c: Observable<C>,
-    d: Observable<D>,
-    e: Observable<E>,
-    f: Observable<F>,
-    g: Observable<G>,
-    h: Observable<H>,
-    i: Observable<I>,
-    j: Observable<J>
+    a: ObservableInput<A>,
+    b: ObservableInput<B>,
+    c: ObservableInput<C>,
+    d: ObservableInput<D>,
+    e: ObservableInput<E>,
+    f: ObservableInput<F>,
+    g: ObservableInput<G>,
+    h: ObservableInput<H>,
+    i: ObservableInput<I>,
+    j: ObservableInput<J>
   ): Observable<[A, B, C, D, E, F, G, H, I, J]>;
-  (name: string, ...dependencies: Observable<unknown>[]): Observable<unknown>;
+  (
+    name: string,
+    ...dependencies: ObservableInput<unknown>[]
+  ): Observable<unknown>;
 };
 
 /**
@@ -96,5 +103,5 @@ export type DerivedStream = {
  */
 export const derivedStream: DerivedStream = (
   name: string,
-  ...dependencies: Observable<unknown>[]
+  ...dependencies: ObservableInput<unknown>[]
 ): Observable<any> => combineLatest(...dependencies).pipe(markName(name));

src/index.ts

@@ -39,6 +39,6 @@ export { derivedStream } from './derivedStream';
 export { combineLatest, merge, zip } from './decoratedObservableCombiners';
 
 export { persistentReducedStream } from './persistentReducedStream';
-export { PersistentReducedStateStream } from './persistentReducedStateStream';
+export { ObservableState } from './observableState';
 
 export { stateStreamRegistry } from './stateStreamRegistry';

src/internal/markers.spec.ts

@@ -132,11 +132,11 @@ test('markDebounceTime includes source', (t) => {
   });
 });
 
-const findMarkerOver: Macro<[OperatorFunction<any, any>]> = (t, operator) =>
-  t.deepEqual(findMarker(source$.pipe(operator)), TOP_MARKER);
-findMarkerOver.title = (name) =>
-  `findMarker finds marker over ${name} operator`;
-
+const findMarkerOver: Macro<[OperatorFunction<any, any>]> = {
+  exec: (t, operator) =>
+    t.deepEqual(findMarker(source$.pipe(operator)), TOP_MARKER),
+  title: (name) => `findMarker finds marker over ${name} operator`,
+};
 const coop = () => true;
 const emop = () => empty();
 test('filter', findMarkerOver, filter(coop));

src/internal/markers.ts

@@ -1,4 +1,4 @@
-import { MonoTypeOperatorFunction, Observable } from 'rxjs';
+import { MonoTypeOperatorFunction, Observable, ObservableInput } from 'rxjs';
 
 export enum MarkerType {
   NAME,
@@ -192,11 +192,15 @@ export const markDebounceTime =
       time,
     });
 
-export const findMarker = (observable$: Observable<unknown>): Marker | null => {
+export const findMarker = (
+  observable$: ObservableInput<unknown>
+): Marker | null => {
   if (observable$ instanceof MarkedObservable) {
     return observable$.marker;
-  } else if (observable$.source instanceof Observable) {
-    return findMarker(observable$.source);
+  } else if (
+    (observable$ as Observable<unknown>).source instanceof Observable
+  ) {
+    return findMarker((observable$ as any).source);
   }
   return null;
 };

src/internal/rethrowErrorGlobally.spec.ts

@@ -1,8 +1,8 @@
-import untypedTest, { TestInterface } from 'ava';
+import untypedTest, { TestFn } from 'ava';
 import sinon from 'sinon';
 import { rethrowErrorGlobally } from '../internal/rethrowErrorGlobally';
 
-const test = untypedTest as TestInterface<{ clock: sinon.SinonFakeTimers }>;
+const test = untypedTest as TestFn<{ clock: sinon.SinonFakeTimers }>;
 
 test.before((t) => {
   t.context.clock = sinon.useFakeTimers();