chore: deps upgrade & remove all static method from Observable

Author: Brooooooklyn

package.json

@@ -60,48 +60,48 @@
   },
   "license": "MIT",
   "devDependencies": {
-    "@types/chai": "^4.0.10",
-    "@types/node": "^9.3.0",
-    "@types/shelljs": "^0.7.7",
-    "@types/sinon": "^4.1.2",
+    "@types/chai": "^4.1.2",
+    "@types/node": "^9.4.6",
+    "@types/shelljs": "^0.7.8",
+    "@types/sinon": "^4.1.3",
     "@types/sinon-chai": "^2.7.29",
     "awesome-typescript-loader": "^3.4.1",
     "chai": "^4.1.2",
     "coveralls": "^3.0.0",
-    "css-loader": "^0.28.7",
+    "css-loader": "^0.28.10",
     "extract-text-webpack-plugin": "^3.0.2",
-    "happypack": "^4.0.0",
+    "happypack": "^4.0.1",
     "html-webpack-plugin": "^2.30.1",
-    "madge": "^3.0.0",
-    "moment": "^2.19.4",
-    "node-watch": "^0.5.5",
+    "madge": "^3.0.1",
+    "moment": "^2.20.1",
+    "node-watch": "^0.5.7",
     "npm-run-all": "^4.1.2",
-    "nyc": "^11.3.0",
+    "nyc": "^11.4.1",
     "raw-loader": "^0.5.1",
     "rxjs": "^5.5.6",
-    "shelljs": "^0.8.0",
+    "shelljs": "^0.8.1",
     "shx": "^0.2.2",
-    "sinon": "^4.1.3",
+    "sinon": "^4.4.0",
     "sinon-chai": "^2.14.0",
     "source-map-loader": "^0.2.3",
-    "style-loader": "^0.20.0",
-    "tman": "^1.7.3",
+    "style-loader": "^0.20.2",
+    "tman": "^1.7.4",
     "ts-node": "^5.0.0",
-    "tslint": "^5.8.0",
+    "tslint": "^5.9.1",
     "tslint-eslint-rules": "^5.0.0",
     "tslint-loader": "^3.5.3",
-    "typescript": "^2.6.2",
-    "webpack": "^3.10.0",
-    "webpack-dev-server": "^2.9.7"
+    "typescript": "^2.7.2",
+    "webpack": "^3.11.0",
+    "webpack-dev-server": "^2.11.1"
   },
   "dependencies": {
     "@types/lovefield": "^2.1.1",
     "lovefield": "2.1.12",
-    "nesthydrationjs": "^1.0.2"
+    "nesthydrationjs": "^1.0.3"
   },
   "peerDependencies": {
     "rxjs": "^5.3.0",
-    "tslib": "^1.7.0"
+    "tslib": "^1.9.0"
   },
   "typings": "./index.d.ts"
 }

src/index.ts

@@ -1,4 +1,3 @@
-import './operators'
 import './global'
 import 'tslib'
 

src/operators.ts

@@ -1,6 +1,9 @@
 import { Observable } from 'rxjs/Observable'
 import { ErrorObservable } from 'rxjs/observable/ErrorObservable'
 import { Subscription } from 'rxjs/Subscription'
+import { from } from 'rxjs/observable/from'
+import { fromPromise } from 'rxjs/observable/fromPromise'
+import { of as just } from 'rxjs/observable/of'
 import { ConnectableObservable } from 'rxjs/observable/ConnectableObservable'
 import { concatMap } from 'rxjs/operators/concatMap'
 import { map } from 'rxjs/operators/map'
@@ -40,7 +43,7 @@ export class Database {
   private connected = false
   // note thin cache will be unreliable in some eage case
   private storedIds = new Set<string>()
-  private subscription: Subscription
+  private subscription: Subscription | null = null
 
   private findPrimaryKey = (name: string) => {
     return this.findSchema(name)!.pk
@@ -257,7 +260,7 @@ export class Database {
         return this.executor(db, [query]).pipe(tap(onError))
       }
 
-      return Observable.fromPromise(prefetch.exec())
+      return fromPromise(prefetch.exec())
         .pipe(concatMap(deleteByScopedIds))
     }
 
@@ -289,7 +292,7 @@ export class Database {
 
         return this.executor(db, queries).pipe(tap(onError))
       } else {
-        return Observable.of({ result: false, insert: 0, update: 0, delete: 0, select: 0 })
+        return just({ result: false, insert: 0, update: 0, delete: 0, select: 0 })
       }
     }
     return this.database$.pipe(concatMap(upsert))
@@ -342,7 +345,7 @@ export class Database {
       }
 
       const prefetch = predicatableQuery(db, table, predicate!, StatementType.Select)
-      return Observable.fromPromise(prefetch.exec()).pipe(
+      return fromPromise(prefetch.exec()).pipe(
         concatMap(removeByRootEntities)
       )
     }
@@ -363,7 +366,7 @@ export class Database {
           this.schemas.clear()
           this.storedIds.clear()
           this.schemaBuilder = null
-          this.subscription.unsubscribe()
+          this.subscription!.unsubscribe()
         })
       )
     }
@@ -378,7 +381,7 @@ export class Database {
   executor(db: lf.Database, queries: lf.query.Builder[]) {
     const tx = db.createTransaction()
 
-    return Observable.fromPromise(tx.exec(queries)).pipe(
+    return fromPromise(tx.exec(queries)).pipe(
       tap(transactionErrorHandler),
       map((ret) => {
         return {
@@ -409,7 +412,7 @@ export class Database {
           get() {
             return (_: lf.Database, queries: lf.query.Builder[]) => {
               transactionQueries.push(...queries)
-              return Observable.of(null)
+              return just(null)
             }
           }
         },
@@ -424,7 +427,7 @@ export class Database {
         commit: () => {
           return effects.reduce((acc, curr) => {
             return acc.pipe(tap(curr))
-          }, Observable.from(tx.exec(transactionQueries))).pipe(
+          }, from(tx.exec(transactionQueries))).pipe(
             map((r) => {
               return {
                 result: true,
@@ -866,7 +869,7 @@ export class Database {
         }
         const query = predicatableQuery(db, table, predicate!, StatementType.Select)
 
-        return Observable.fromPromise<T[]>(query.exec() as any)
+        return fromPromise<T[]>(query.exec() as any)
       }
 
       return [get, remove]

src/storage/Database.ts

@@ -7,7 +7,7 @@ import * as Exception from '../../exception'
 export class Mutation {
 
   private params: Object
-  private meta: {
+  private meta!: {
     key: string,
     val: any
   }

src/storage/modules/Mutation.ts

@@ -1,5 +1,6 @@
 import { Observable } from 'rxjs/Observable'
 import { OperatorFunction } from 'rxjs/interfaces'
+import { from } from 'rxjs/observable/from'
 import { combineAll } from 'rxjs/operators/combineAll'
 import { map } from 'rxjs/operators/map'
 import { publishReplay } from 'rxjs/operators/publishReplay'
@@ -58,7 +59,7 @@ export class QueryToken<T> {
 
   concat(...tokens: QueryToken<T>[]) {
     tokens.unshift(this)
-    const newSelector$ = Observable.from(tokens).pipe(
+    const newSelector$ = from(tokens).pipe(
       map(token => token.selector$.pipe(skipWhileProxySelector)),
       combineAll<Observable<Selector<T>>, Selector<T>[]>(),
       map((r) => {
@@ -71,7 +72,7 @@ export class QueryToken<T> {
 
   combine(...tokens: QueryToken<any>[]) {
     tokens.unshift(this)
-    const newSelector$ = Observable.from(tokens).pipe(
+    const newSelector$ = from(tokens).pipe(
       map(token => token.selector$.pipe(skipWhileProxySelector)),
       combineAll<Observable<Selector<T>>, Selector<T>[]>(),
       map((r) => {

src/storage/modules/QueryToken.ts

@@ -1,6 +1,8 @@
 import { Observer } from 'rxjs/Observer'
 import { Observable } from 'rxjs/Observable'
 import { OperatorFunction } from 'rxjs/interfaces'
+import { from } from 'rxjs/observable/from'
+import { fromPromise } from 'rxjs/observable/fromPromise'
 import { combineAll } from 'rxjs/operators/combineAll'
 import { debounceTime } from 'rxjs/operators/debounceTime'
 import { map } from 'rxjs/operators/map'
@@ -47,7 +49,7 @@ export class Selector <T> {
     const fakeQuery = { toSql: identity }
     // 初始化一个空的 QuerySelector，然后在初始化以后替换它上面的属性和方法
     const dist = new Selector<U>(originalToken.db, fakeQuery as any, { } as any)
-    dist.change$ = Observable.from(metaDatas).pipe(
+    dist.change$ = from(metaDatas).pipe(
       map(metas => metas.mapFn(metas.change$)),
       combineAll<Observable<U[]>, U[][]>(),
       map(r => r.reduce((acc, val) => acc.concat(val))),
@@ -58,7 +60,7 @@ export class Selector <T> {
     dist.values = () => {
       assert(!dist.consumed, Exception.TokenConsumed())
       dist.consumed = true
-      return Observable.from(metaDatas).pipe(
+      return from(metaDatas).pipe(
         mergeMap(metaData => metaData.values()),
         reduce((acc, val) => acc.concat(val))
       )
@@ -201,9 +203,9 @@ export class Selector <T> {
       const p = this.rangeQuery.exec()
         .then(r => r.map(v => v[this.shape.pk.name]))
         .then(pks => this.getValue(this.getQuery(this.inPKs(pks))))
-      return this.mapFn(Observable.fromPromise(p))
+      return this.mapFn(fromPromise(p))
     } else {
-      return this.mapFn(Observable.fromPromise(this.getValue(this.getQuery()) as Promise<T[]>))
+      return this.mapFn(fromPromise(this.getValue(this.getQuery()) as Promise<T[]>))
     }
   }
 

src/storage/modules/Selector.ts

@@ -1,4 +1,5 @@
 import { Observable } from 'rxjs/Observable'
+import { empty } from 'rxjs/observable/empty'
 import { skip } from 'rxjs/operators/skip'
 import { ErrorObservable } from 'rxjs/observable/ErrorObservable'
 
@@ -8,5 +9,5 @@ export function valid<T>(condition: any, error: Error): ErrorObservable | Observ
     return Observable.throw(error)
   }
 
-  return Observable.empty<T>().pipe(skip(1))
+  return empty<T>().pipe(skip(1))
 }