From e2365bb00ae8a2c3612a1867e77a7177bee9feb9 Mon Sep 17 00:00:00 2001 From: Jaco Greeff Date: Tue, 7 Aug 2018 17:30:18 +0200 Subject: [PATCH] RxJS 6 (#123) * RxJS 6 * Don't log observable promise.catch to console * Extra space --- lerna.json | 2 +- packages/api-format/package.json | 2 +- packages/api-provider/package.json | 2 +- packages/api-rx/package.json | 8 ++++---- packages/api-rx/src/api/connected.ts | 2 +- packages/api-rx/src/api/index.ts | 2 +- packages/api-rx/src/observable/cached.ts | 2 +- packages/api-rx/src/observable/index.ts | 12 +++++------- packages/api-rx/src/observable/subject.ts | 4 +--- packages/api-rx/src/types.d.ts | 3 +-- packages/api/package.json | 6 +++--- yarn.lock | 14 +++++--------- 12 files changed, 25 insertions(+), 34 deletions(-) diff --git a/lerna.json b/lerna.json index ff2e09042e..da3cf9d1ad 100644 --- a/lerna.json +++ b/lerna.json @@ -10,5 +10,5 @@ "packages": [ "packages/*" ], - "version": "0.14.31" + "version": "0.15.0" } diff --git a/packages/api-format/package.json b/packages/api-format/package.json index 8cd4b33f50..a46941d1c0 100644 --- a/packages/api-format/package.json +++ b/packages/api-format/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/api-format", - "version": "0.14.31", + "version": "0.15.0", "description": "Input/Output formatters for JsonRPC exchange", "main": "index.js", "keywords": [ diff --git a/packages/api-provider/package.json b/packages/api-provider/package.json index 72c13faa2a..ba938b6539 100644 --- a/packages/api-provider/package.json +++ b/packages/api-provider/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/api-provider", - "version": "0.14.31", + "version": "0.15.0", "description": "Transport providers for the API", "main": "index.js", "keywords": [ diff --git a/packages/api-rx/package.json b/packages/api-rx/package.json index 0a507c1267..8cafe1f2c7 100644 --- a/packages/api-rx/package.json +++ b/packages/api-rx/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/api-rx", - "version": "0.14.31", + "version": "0.15.0", "description": "An RxJs wrapper around the Polkadot JS API", "main": "index.js", "keywords": [ @@ -35,9 +35,9 @@ }, "dependencies": { "@babel/runtime": "^7.0.0-beta.51", - "@polkadot/api": "^0.14.31", - "@polkadot/api-provider": "^0.14.31", + "@polkadot/api": "^0.15.0", + "@polkadot/api-provider": "^0.15.0", "@types/rx": "^4.1.1", - "rxjs": "^5.5.10" + "rxjs": "^6.2.2" } } diff --git a/packages/api-rx/src/api/connected.ts b/packages/api-rx/src/api/connected.ts index 47a2437586..78300ee174 100644 --- a/packages/api-rx/src/api/connected.ts +++ b/packages/api-rx/src/api/connected.ts @@ -4,7 +4,7 @@ import { ProviderInterface } from '@polkadot/api-provider/types'; -import { BehaviorSubject } from 'rxjs/BehaviorSubject'; +import { BehaviorSubject } from 'rxjs'; export default function connected (provider: ProviderInterface): BehaviorSubject { const subject = new BehaviorSubject(provider.isConnected()); diff --git a/packages/api-rx/src/api/index.ts b/packages/api-rx/src/api/index.ts index e63ed97c00..2f86fb944c 100644 --- a/packages/api-rx/src/api/index.ts +++ b/packages/api-rx/src/api/index.ts @@ -5,7 +5,7 @@ import { ProviderInterface } from '@polkadot/api-provider/types'; import { RxApiInterface } from '../types'; -import { BehaviorSubject } from 'rxjs/BehaviorSubject'; +import { BehaviorSubject } from 'rxjs'; import createConnected from './connected'; diff --git a/packages/api-rx/src/observable/cached.ts b/packages/api-rx/src/observable/cached.ts index 45cd60dc75..40427cbcf7 100644 --- a/packages/api-rx/src/observable/cached.ts +++ b/packages/api-rx/src/observable/cached.ts @@ -4,7 +4,7 @@ import { ApiInterface$Section } from '@polkadot/api/types'; -import { BehaviorSubject } from 'rxjs/BehaviorSubject'; +import { BehaviorSubject } from 'rxjs'; type CachedMap = { [index: string]: { diff --git a/packages/api-rx/src/observable/index.ts b/packages/api-rx/src/observable/index.ts index 361a93e788..dc78c5f926 100644 --- a/packages/api-rx/src/observable/index.ts +++ b/packages/api-rx/src/observable/index.ts @@ -4,9 +4,7 @@ import { ApiInterface$Section } from '@polkadot/api/types'; -import { BehaviorSubject } from 'rxjs/BehaviorSubject'; -import { Observable } from 'rxjs/Observable'; -import { fromPromise } from 'rxjs/observable/fromPromise'; +import { BehaviorSubject, Observable, from } from 'rxjs'; import isFunction from '@polkadot/util/is/function'; import cached from './cached'; @@ -17,9 +15,9 @@ export default function observable (subName: string, name: string, section: ApiI } return (...params: Array): Observable => - fromPromise( - section[name].apply(null, params).catch((error: Error) => - console.error(error) - ) + from( + section[name].apply(null, params).catch(() => { + // swallow error - mostly storage failures, undefined as result + }) ); } diff --git a/packages/api-rx/src/observable/subject.ts b/packages/api-rx/src/observable/subject.ts index b96d652cfb..1c12e9d411 100644 --- a/packages/api-rx/src/observable/subject.ts +++ b/packages/api-rx/src/observable/subject.ts @@ -4,9 +4,7 @@ import { ApiInterface$Section } from '@polkadot/api/types'; -import { BehaviorSubject } from 'rxjs/BehaviorSubject'; -import { Observable } from 'rxjs/Observable'; -import { Subscriber } from 'rxjs/Subscriber'; +import { BehaviorSubject, Observable, Subscriber } from 'rxjs'; export default function subscription (name: string, params: Array, section: ApiInterface$Section, unsubCallback?: () => void): BehaviorSubject { const subject = new BehaviorSubject(undefined); diff --git a/packages/api-rx/src/types.d.ts b/packages/api-rx/src/types.d.ts index 7ffe803083..3054f22e71 100644 --- a/packages/api-rx/src/types.d.ts +++ b/packages/api-rx/src/types.d.ts @@ -3,8 +3,7 @@ // of the ISC license. See the LICENSE file for details. import { Interfaces } from '@polkadot/jsonrpc/types'; -import { BehaviorSubject } from 'rxjs/BehaviorSubject'; -import { Observable } from 'rxjs/Observable'; +import { BehaviorSubject, Observable } from 'rxjs'; import { Interface$Sections } from '@polkadot/jsonrpc/types'; export type RxApiInterface$Method = (...params: Array) => Observable | BehaviorSubject; diff --git a/packages/api/package.json b/packages/api/package.json index 0eab6ae0e2..91b7f422dd 100644 --- a/packages/api/package.json +++ b/packages/api/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/api", - "version": "0.14.31", + "version": "0.15.0", "description": "A JavaScript wrapper for the Polkadot JsonRPC interface", "main": "index.js", "keywords": [ @@ -35,8 +35,8 @@ }, "dependencies": { "@babel/runtime": "^7.0.0-beta.51", - "@polkadot/api-format": "^0.14.31", - "@polkadot/api-provider": "^0.14.31", + "@polkadot/api-format": "^0.15.0", + "@polkadot/api-provider": "^0.15.0", "@polkadot/jsonrpc": "^0.27.9", "@polkadot/params": "^0.27.9", "@polkadot/util": "^0.27.9" diff --git a/yarn.lock b/yarn.lock index 0aee7adaee..36b6a280a5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5247,11 +5247,11 @@ rx-lite@*, rx-lite@^4.0.8: version "4.0.8" resolved "https://registry.yarnpkg.com/rx-lite/-/rx-lite-4.0.8.tgz#0b1e11af8bc44836f04a6407e92da42467b79444" -rxjs@^5.5.10: - version "5.5.11" - resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-5.5.11.tgz#f733027ca43e3bec6b994473be4ab98ad43ced87" +rxjs@^6.2.2: + version "6.2.2" + resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.2.2.tgz#eb75fa3c186ff5289907d06483a77884586e1cf9" dependencies: - symbol-observable "1.0.1" + tslib "^1.9.0" safe-buffer@^5.0.1, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1: version "5.1.2" @@ -5612,10 +5612,6 @@ supports-color@^5.3.0: dependencies: has-flag "^3.0.0" -symbol-observable@1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.0.1.tgz#8340fc4702c3122df5d22288f88283f513d3fdd4" - symbol-observable@1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.0.4.tgz#29bf615d4aa7121bdd898b22d4b3f9bc4e2aa03d" @@ -5789,7 +5785,7 @@ tslib@1.9.0: version "1.9.0" resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.0.tgz#e37a86fda8cbbaf23a057f473c9f4dc64e5fc2e8" -tslib@^1.0.0, tslib@^1.7.1, tslib@^1.8.0, tslib@^1.8.1: +tslib@^1.0.0, tslib@^1.7.1, tslib@^1.8.0, tslib@^1.8.1, tslib@^1.9.0: version "1.9.3" resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.3.tgz#d7e4dd79245d85428c4d7e4822a79917954ca286"