Skip to content

Commit 9ae2a64

Browse files
BrooooooklynBrooooooklyn
committed
chore: upgrade all dependencies, especially rxjs
1 parent bd7abbc commit 9ae2a64

24 files changed

+885
-2748
lines changed

‎package.json

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
"clean_dist_cjs": "rm -rf ./dist/cjs",
1212
"clean_dist_es": "rm -rf ./dist/es",
1313
"check_circular_dependencies": "madge ./dist/cjs --circular",
14-
"compile_cjs": " tsc dist/cjs/src/index.ts dist/cjs/src/proxy/index.ts -m commonjs --outDir dist/cjs --sourcemap --target ES5 -d --diagnostics --pretty --strict --noImplicitReturns --noUnusedLocals --noUnusedParameters --suppressImplicitAnyIndexErrors --moduleResolution node --noEmitHelpers --importHelpers --lib es5,es2015.iterable,es2015.collection,es2015.promise,dom",
15-
"compile_module_es": "tsc dist/es/src/index.ts dist/es/src/proxy/index.ts -m ES2015 --outDir dist/es --sourcemap --target ES5 -d --diagnostics --pretty --strict --noImplicitReturns --noUnusedLocals --noUnusedParameters --suppressImplicitAnyIndexErrors --moduleResolution node --noEmitHelpers --importHelpers --lib es5,es2015.iterable,es2015.collection,es2015.promise,dom",
14+
"compile_cjs": " tsc dist/cjs/src/index.ts dist/cjs/src/proxy/index.ts -m commonjs --outDir dist/cjs --sourcemap --target ES5 -d --diagnostics --pretty --strict --noImplicitReturns --noUnusedLocals --noUnusedParameters --strict --suppressImplicitAnyIndexErrors --moduleResolution node --noEmitHelpers --importHelpers --lib es5,es2015,es2016,es2017",
15+
"compile_module_es": "tsc dist/es/src/index.ts dist/es/src/proxy/index.ts -m ES2015 --outDir dist/es --sourcemap --target ES5 -d --diagnostics --pretty --strict --noImplicitReturns --noUnusedLocals --noUnusedParameters --strict --suppressImplicitAnyIndexErrors --moduleResolution node --noEmitHelpers --importHelpers --lib es5,es2015,es2016,es2017",
1616
"copy_src_cjs": "shx mkdir -p ./dist/cjs/src && shx cp -r ./src/* ./dist/cjs/src",
1717
"copy_src_es": "shx mkdir -p ./dist/es/src && shx cp -r ./src/* ./dist/es/src",
1818
"cover": "rm -rf ./.nyc_output ./coverage && NODE_ENV=test nyc --reporter=html --reporter=lcov --exclude=node_modules --exclude=spec-js/test --exclude=spec-js/src/storage/lovefield.js --exclude=spec-js/src/shared/Logger.js --exclude=spec-js/src/utils/option.js --exclude=spec-js/src/utils/valid.js --exclude=spec-js/src/addons/aggresive-optimizer.js tman --mocha spec-js/test/run.js && nyc report",
@@ -24,7 +24,7 @@
2424
"test_O1": "npm run lint && NODE_ENV=test optimize=true tman --mocha spec-js/test/run.js",
2525
"version": "ts-node tools/version.ts && git add .",
2626
"watch": "NODE_ENV=test ts-node ./tools/watch.ts & npm run watch_test",
27-
"watch_cjs": "tsc src/index.ts -m commonjs --outDir dist --sourcemap --target ES5 -d --diagnostics --pretty --strict --noImplicitReturns --suppressImplicitAnyIndexErrors --moduleResolution node --noEmitHelpers --lib es5,es2015.iterable,es2015.collection,es2015.promise,dom -w",
27+
"watch_cjs": "tsc src/index.ts -m commonjs --outDir dist --sourcemap --target ES5 -d --diagnostics --pretty --strict --noImplicitReturns --suppressImplicitAnyIndexErrors --moduleResolution node --noEmitHelpers --lib es5,es2015,es2016,es2017 -w",
2828
"watch_test": "tsc -p test/tsconfig.json -w --diagnostics --pretty"
2929
},
3030
"keywords": [
@@ -61,13 +61,13 @@
6161
"license": "MIT",
6262
"devDependencies": {
6363
"@types/chai": "^4.1.2",
64-
"@types/node": "^9.4.7",
64+
"@types/node": "^10.5.5",
6565
"@types/shelljs": "^0.8.0",
6666
"@types/sinon": "^5.0.0",
67-
"@types/sinon-chai": "^2.7.29",
67+
"@types/sinon-chai": "^3.2.0",
6868
"chai": "^4.1.2",
6969
"coveralls": "^3.0.0",
70-
"css-loader": "^0.28.10",
70+
"css-loader": "^1.0.0",
7171
"extract-text-webpack-plugin": "^4.0.0-beta.0",
7272
"html-webpack-plugin": "^3.0.6",
7373
"madge": "^3.0.1",
@@ -76,22 +76,22 @@
7676
"npm-run-all": "^4.1.2",
7777
"nyc": "^12.0.1",
7878
"raw-loader": "^0.5.1",
79-
"rxjs": "^5.5.6",
79+
"rxjs": "^6.2.2",
8080
"shelljs": "^0.8.1",
8181
"shx": "^0.3.0",
82-
"sinon": "^5.0.0",
82+
"sinon": "^6.1.4",
8383
"sinon-chai": "^3.0.0",
8484
"source-map-loader": "^0.2.3",
8585
"style-loader": "^0.21.0",
8686
"tman": "^1.7.4",
8787
"ts-loader": "^4.0.1",
88-
"ts-node": "^6.0.0",
88+
"ts-node": "^7.0.0",
8989
"tslint": "^5.9.1",
9090
"tslint-eslint-rules": "^5.1.0",
9191
"tslint-loader": "^3.6.0",
9292
"typescript": "^3.0.1",
9393
"webpack": "^4.1.1",
94-
"webpack-cli": "^2.0.10",
94+
"webpack-cli": "^3.1.0",
9595
"webpack-dev-server": "^3.1.0"
9696
},
9797
"dependencies": {
@@ -100,7 +100,7 @@
100100
"nesthydrationjs": "^1.0.5"
101101
},
102102
"peerDependencies": {
103-
"rxjs": "^5.3.0",
103+
"rxjs": "^5.5.0",
104104
"tslib": "^1.9.0"
105105
},
106106
"typings": "./index.d.ts"

‎src/interface/index.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
import { Observable } from 'rxjs/Observable'
2-
import { PartialObserver } from 'rxjs/Observer'
1+
import { Observable, PartialObserver } from 'rxjs'
32
import { RDBType, Relationship, LeafType, StatementType, JoinMode, DataStoreType } from './enum'
43

54
export type DeepPartial<T> = {

‎src/storage/Database.ts

Lines changed: 14 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,6 @@
1-
import { Observable } from 'rxjs/Observable'
2-
import { ErrorObservable } from 'rxjs/observable/ErrorObservable'
3-
import { Subscription } from 'rxjs/Subscription'
4-
import { from } from 'rxjs/observable/from'
5-
import { fromPromise } from 'rxjs/observable/fromPromise'
6-
import { of as just } from 'rxjs/observable/of'
7-
import { ConnectableObservable } from 'rxjs/observable/ConnectableObservable'
8-
import { concatMap } from 'rxjs/operators/concatMap'
9-
import { map } from 'rxjs/operators/map'
10-
import { tap } from 'rxjs/operators/tap'
1+
2+
import { throwError, ConnectableObservable, Observable, Subscription, from, of as just } from 'rxjs'
3+
import { concatMap, map, tap } from 'rxjs/operators'
114
import * as lf from 'lovefield'
125
import * as Exception from '../exception'
136
import * as typeDefinition from './helper/definition'
@@ -181,12 +174,12 @@ export class Database {
181174
update<T>(tableName: string, clause: Predicate<T>, raw: Partial<T>): Observable<ExecutorResult> {
182175
const type = getType(raw)
183176
if (type !== 'Object') {
184-
return Observable.throw(Exception.InvalidType(['Object', type]))
177+
return throwError(Exception.InvalidType(['Object', type]))
185178
}
186179

187180
const [ schema, err ] = tryCatch<ParsedSchema>(this.findSchema)(tableName)
188181
if (err) {
189-
return Observable.throw(err)
182+
return throwError(err)
190183
}
191184

192185
const update = (db: lf.Database) => {
@@ -229,7 +222,7 @@ export class Database {
229222
delete<T>(tableName: string, clause: Predicate<T> = {}): Observable<ExecutorResult> {
230223
const [ pk, err ] = tryCatch<string>(this.findPrimaryKey)(tableName)
231224
if (err) {
232-
return Observable.throw(err)
225+
return throwError(err)
233226
}
234227

235228
const deletion = (db: lf.Database): Observable<ExecutorResult> => {
@@ -259,7 +252,7 @@ export class Database {
259252
return this.executor(db, [query]).pipe(tap(onError))
260253
}
261254

262-
return fromPromise(prefetch.exec())
255+
return from(prefetch.exec())
263256
.pipe(concatMap(deleteByScopedIds))
264257
}
265258

@@ -300,7 +293,7 @@ export class Database {
300293
remove<T>(tableName: string, clause: Clause<T> = {}): Observable<ExecutorResult> {
301294
const [schema, err] = tryCatch<ParsedSchema>(this.findSchema)(tableName)
302295
if (err) {
303-
return Observable.throw(err)
296+
return throwError(err)
304297
}
305298
const disposeHandler = schema!.dispose
306299

@@ -344,17 +337,17 @@ export class Database {
344337
}
345338

346339
const prefetch = predicatableQuery(db, table, predicate!, StatementType.Select)
347-
return fromPromise(prefetch.exec()).pipe(
340+
return from(prefetch.exec()).pipe(
348341
concatMap(removeByRootEntities)
349342
)
350343
}
351344

352345
return this.database$.pipe(concatMap(remove))
353346
}
354347

355-
dispose(): ErrorObservable | Observable<ExecutorResult> {
348+
dispose(): Observable<never> | Observable<ExecutorResult> {
356349
if (!this.connected) {
357-
return Observable.throw(Exception.NotConnected())
350+
return throwError(Exception.NotConnected())
358351
}
359352

360353
const cleanUp = (db: lf.Database) => {
@@ -380,7 +373,7 @@ export class Database {
380373
executor(db: lf.Database, queries: lf.query.Builder[]) {
381374
const tx = db.createTransaction()
382375

383-
return fromPromise(tx.exec(queries)).pipe(
376+
return from(tx.exec(queries)).pipe(
384377
tap(transactionErrorHandler),
385378
map((ret) => {
386379
return {
@@ -864,11 +857,11 @@ export class Database {
864857
const [ table ] = Database.getTables(db, tableName)
865858
const [ predicate, err ] = tryCatch(createPredicate)(table, where)
866859
if (err) {
867-
return Observable.throw(err)
860+
return throwError(err)
868861
}
869862
const query = predicatableQuery(db, table, predicate!, StatementType.Select)
870863

871-
return fromPromise<T[]>(query.exec() as any)
864+
return from<T[]>(query.exec() as any)
872865
}
873866

874867
return [get, remove]

‎src/storage/helper/db-factory.ts

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
import * as lf from 'lovefield'
2-
import { Observable } from 'rxjs/Observable'
3-
import { ConnectableObservable } from 'rxjs/observable/ConnectableObservable'
4-
import { ReplaySubject } from 'rxjs/ReplaySubject'
5-
import { Observer } from 'rxjs/Observer'
2+
import { Observable, ConnectableObservable, ReplaySubject, Observer } from 'rxjs'
3+
import { publishReplay } from 'rxjs/operators'
64
import { LfFactoryInit } from '../../interface'
75

86
export const rawDb$ = new ReplaySubject<lf.raw.BackStore>(1)
@@ -26,6 +24,5 @@ export const lfFactory = (schemaBuilder: lf.schema.Builder, config: LfFactoryIni
2624
observer.complete()
2725
})
2826
.catch(e => observer.error(e))
29-
})
30-
.publishReplay(1)
27+
}).pipe(publishReplay(1))
3128
}

‎src/storage/modules/ProxySelector.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
import { Observable } from 'rxjs/Observable'
2-
import { OperatorFunction } from 'rxjs/interfaces'
3-
import { map } from 'rxjs/operators/map'
1+
import { Observable, OperatorFunction } from 'rxjs'
2+
import { map } from 'rxjs/operators'
43
import { Query } from '../../interface'
54
import { mapFn } from './mapFn'
65

‎src/storage/modules/QueryToken.ts

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
import { Observable } from 'rxjs/Observable'
2-
import { OperatorFunction } from 'rxjs/interfaces'
3-
import { from } from 'rxjs/observable/from'
4-
import { combineAll } from 'rxjs/operators/combineAll'
5-
import { map } from 'rxjs/operators/map'
6-
import { publishReplay } from 'rxjs/operators/publishReplay'
7-
import { refCount } from 'rxjs/operators/refCount'
8-
import { skipWhile } from 'rxjs/operators/skipWhile'
9-
import { switchMap } from 'rxjs/operators/switchMap'
10-
import { take } from 'rxjs/operators/take'
11-
import { tap } from 'rxjs/operators/tap'
1+
import { Observable, OperatorFunction, from } from 'rxjs'
2+
import {
3+
combineAll,
4+
map,
5+
publishReplay,
6+
refCount,
7+
skipWhile,
8+
switchMap,
9+
take,
10+
tap,
11+
} from 'rxjs/operators'
1212
import { Selector } from './Selector'
1313
import { ProxySelector } from './ProxySelector'
1414
import { assert } from '../../utils/assert'
@@ -61,7 +61,7 @@ export class QueryToken<T> {
6161
tokens.unshift(this)
6262
const newSelector$ = from(tokens).pipe(
6363
map(token => token.selector$.pipe(skipWhileProxySelector)),
64-
combineAll<Observable<Selector<T>>, Selector<T>[]>(),
64+
combineAll<Selector<T>>(),
6565
map((r) => {
6666
const first = r.shift()
6767
return first!.concat(...r)
@@ -74,7 +74,7 @@ export class QueryToken<T> {
7474
tokens.unshift(this)
7575
const newSelector$ = from(tokens).pipe(
7676
map(token => token.selector$.pipe(skipWhileProxySelector)),
77-
combineAll<Observable<Selector<T>>, Selector<T>[]>(),
77+
combineAll<Selector<T>>(),
7878
map((r) => {
7979
const first = r.shift()
8080
return first!.combine(...r)

‎src/storage/modules/Selector.ts

Lines changed: 23 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,22 @@
1-
import { Observer } from 'rxjs/Observer'
2-
import { Observable } from 'rxjs/Observable'
3-
import { OperatorFunction } from 'rxjs/interfaces'
4-
import { filter } from 'rxjs/operators/filter'
5-
import { from } from 'rxjs/observable/from'
6-
import { fromPromise } from 'rxjs/observable/fromPromise'
7-
import { combineAll } from 'rxjs/operators/combineAll'
8-
import { debounceTime } from 'rxjs/operators/debounceTime'
9-
import { map } from 'rxjs/operators/map'
10-
import { mergeMap } from 'rxjs/operators/mergeMap'
11-
import { publishReplay } from 'rxjs/operators/publishReplay'
12-
import { reduce } from 'rxjs/operators/reduce'
13-
import { refCount } from 'rxjs/operators/refCount'
14-
import { scan } from 'rxjs/operators/scan'
15-
import { switchMap } from 'rxjs/operators/switchMap'
16-
import { async } from 'rxjs/scheduler/async'
1+
import {
2+
Observable,
3+
Observer,
4+
OperatorFunction,
5+
from,
6+
asyncScheduler,
7+
} from 'rxjs'
8+
import {
9+
filter,
10+
combineAll,
11+
debounceTime,
12+
map,
13+
mergeMap,
14+
publishReplay,
15+
reduce,
16+
refCount,
17+
scan,
18+
switchMap,
19+
} from 'rxjs/operators'
1720
import * as lf from 'lovefield'
1821
import * as Exception from '../../exception'
1922
import { predicatableQuery, graph } from '../helper'
@@ -53,9 +56,9 @@ export class Selector <T> {
5356
const dist = new Selector<U>(originalToken.db, fakeQuery as any, { } as any)
5457
dist.change$ = from(metaDatas).pipe(
5558
map(metas => metas.mapFn(metas.change$)),
56-
combineAll<Observable<U[]>, U[][]>(),
59+
combineAll<U[]>(),
5760
map(r => r.reduce((acc, val) => acc.concat(val))),
58-
debounceTime(0, async),
61+
debounceTime(0, asyncScheduler),
5962
publishReplay(1),
6063
refCount()
6164
)
@@ -206,9 +209,9 @@ export class Selector <T> {
206209
const p = this.rangeQuery.exec()
207210
.then(r => r.map(v => v[this.shape.pk.name]))
208211
.then(pks => this.getValue(this.getQuery(this.inPKs(pks))))
209-
return this.mapFn(fromPromise(p))
212+
return this.mapFn(from(p))
210213
} else {
211-
return this.mapFn(fromPromise(this.getValue(this.getQuery()) as Promise<T[]>))
214+
return this.mapFn(from(this.getValue(this.getQuery()) as Promise<T[]>))
212215
}
213216
}
214217

‎src/storage/modules/mapFn.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { Observable } from 'rxjs/Observable'
1+
import { Observable } from 'rxjs'
22

33
export const mapFn = <U>(dist$: Observable<U[]>) => dist$
44

‎src/utils/valid.ts

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
1-
import { Observable } from 'rxjs/Observable'
2-
import { empty } from 'rxjs/observable/empty'
3-
import { skip } from 'rxjs/operators/skip'
4-
import { ErrorObservable } from 'rxjs/observable/ErrorObservable'
1+
2+
import { throwError, Observable, EMPTY } from 'rxjs'
3+
import { skip } from 'rxjs/operators'
54

65
// think it as asynchronous assert
7-
export function valid<T>(condition: any, error: Error): ErrorObservable | Observable<T> {
6+
export function valid<T>(condition: any, error: Error): Observable<never> | Observable<T> {
87
if (!condition) {
9-
return Observable.throw(error)
8+
return throwError(error)
109
}
1110

12-
return empty<T>().pipe(skip(1))
11+
return EMPTY.pipe(skip(1))
1312
}

0 commit comments

Comments
 (0)