Merge pull request #55 from ReactiveDB/chore/upgrade-ts

chore(dependency): upgrade `typescript` to 2.8

Author: Brooooooklyn

package.json

@@ -89,7 +89,7 @@
     "tslint": "^5.9.1",
     "tslint-eslint-rules": "^5.1.0",
     "tslint-loader": "^3.6.0",
-    "typescript": "^2.7.2",
+    "typescript": "^2.8.3",
     "webpack": "^4.1.1",
     "webpack-cli": "^2.0.10",
     "webpack-dev-server": "^3.1.0"

src/storage/Database.ts

@@ -15,7 +15,7 @@ import Version from '../version'
 import { Traversable } from '../shared'
 import { Mutation, Selector, QueryToken, PredicateProvider } from './modules'
 import { dispose, contextTableName, fieldIdentifier, hiddenColName } from './symbols'
-import { forEach, clone, contains, tryCatch, hasOwn, getType, assert, identity, warn } from '../utils'
+import { forEach, clone, contains, tryCatch, hasOwn, getType, assert, assertValue, warn, isNonNullable } from '../utils'
 import { createPredicate, createPkClause, mergeTransactionResult, predicatableQuery, lfFactory } from './helper'
 import { Relationship, RDBType, DataStoreType, LeafType, StatementType, JoinMode } from '../interface/enum'
 import { SchemaDef, ColumnDef, ParsedSchema, Association, ScopedHandler } from '../interface'
@@ -51,8 +51,7 @@ export class Database {
 
   private findSchema = (name: string): ParsedSchema => {
     const schema = this.schemas.get(name)
-    assert(schema, Exception.NonExistentTable(name))
-    return schema!
+    return assertValue(schema, Exception.NonExistentTable(name))
   }
 
   /**
@@ -500,7 +499,7 @@ export class Database {
           indexes.push(key)
         }
 
-        const isNullable = ![def.primaryKey, def.index, def.unique].some(identity)
+        const isNullable = ![def.primaryKey, def.index, def.unique].some(isNonNullable)
         if (isNullable) {
           nullable.push(key)
         }

src/storage/modules/Mutation.ts

@@ -1,16 +1,16 @@
 import * as lf from 'lovefield'
 
-import { forEach, assert, warn } from '../../utils'
+import { forEach, assertValue, warn } from '../../utils'
 import { fieldIdentifier } from '../symbols'
 import * as Exception from '../../exception'
 
 export class Mutation {
 
   private params: Object
-  private meta!: {
+  private meta: {
     key: string,
     val: any
-  }
+  } | undefined
 
   constructor(
     private db: lf.Database,
@@ -67,10 +67,9 @@ export class Mutation {
   }
 
   private toUpdater() {
-    assert(this.meta, Exception.PrimaryKeyNotProvided())
-
+    const meta = assertValue(this.meta, Exception.PrimaryKeyNotProvided())
     const query = this.db.update(this.table)
-    query.where(this.table[this.meta.key].eq(this.meta.val))
+    query.where(this.table[meta.key].eq(meta.val))
 
     forEach(this.params, (val, key) => {
       const column = this.table[key]
@@ -85,12 +84,11 @@ export class Mutation {
   }
 
   private toRow() {
-    assert(this.meta, Exception.PrimaryKeyNotProvided())
-
+    const meta = assertValue(this.meta, Exception.PrimaryKeyNotProvided())
     return {
       table: this.table,
       row: this.table.createRow({
-        [this.meta.key]: this.meta.val,
+        [meta.key]: meta.val,
         ...this.params
       })
     }

src/storage/modules/Selector.ts

@@ -1,6 +1,7 @@
 import { Observer } from 'rxjs/Observer'
 import { Observable } from 'rxjs/Observable'
 import { OperatorFunction } from 'rxjs/interfaces'
+import { filter } from 'rxjs/operators/filter'
 import { from } from 'rxjs/observable/from'
 import { fromPromise } from 'rxjs/observable/fromPromise'
 import { combineAll } from 'rxjs/operators/combineAll'
@@ -10,12 +11,13 @@ import { mergeMap } from 'rxjs/operators/mergeMap'
 import { publishReplay } from 'rxjs/operators/publishReplay'
 import { reduce } from 'rxjs/operators/reduce'
 import { refCount } from 'rxjs/operators/refCount'
+import { scan } from 'rxjs/operators/scan'
 import { switchMap } from 'rxjs/operators/switchMap'
 import { async } from 'rxjs/scheduler/async'
 import * as lf from 'lovefield'
 import * as Exception from '../../exception'
 import { predicatableQuery, graph } from '../helper'
-import { identity, forEach, assert, warn } from '../../utils'
+import { identity, forEach, assert, warn, isNonNullable } from '../../utils'
 import { PredicateProvider } from './PredicateProvider'
 import { ShapeMatcher, OrderInfo, StatementType } from '../../interface'
 import { mapFn } from './mapFn'
@@ -120,9 +122,10 @@ export class Selector <T> {
       )
       : observeOn(this.getQuery())
 
-    return lfIssueFix(changesOnQuery)
-      .publishReplay(1)
-      .refCount()
+    return lfIssueFix(changesOnQuery).pipe(
+      publishReplay(1),
+      refCount()
+    )
   }
 
   private set change$ (dist$: Observable<T[]>) {
@@ -315,5 +318,8 @@ const lfIssueFix = <T>(changes: Observable<T[]>) => {
       ? null
       : curr
 
-  return (changes as any).scan(doKeep, null).filter(Boolean)
+  return changes.pipe(
+    scan(doKeep, null),
+    filter(isNonNullable)
+  )
 }

src/utils/assert.ts

@@ -1,11 +1,24 @@
-export function assert(condition: any, error: Error | string) {
-  if (condition) {
-    return
+import { Truthy } from './truthy'
+
+export function assert(condition: boolean, error: Error | string): void {
+  truthyOrThrow(condition, error)
+}
+
+export function assertValue<T>(
+  value: T,
+  error: Error | string
+): Truthy<T> | never {
+  return truthyOrThrow(value, error)
+}
+
+function truthyOrThrow<T>(x: T, error: Error | string): Truthy<T> | never {
+  if (x) {
+    return x as Truthy<T>
   }
 
   if (error instanceof Error) {
     throw error
-  } else if (typeof error === 'string') {
+  } else {
     throw new Error(error)
   }
 }

src/utils/index.ts

@@ -8,5 +8,6 @@ export * from './contains'
 export * from './for-each'
 export * from './identity'
 export * from './get-type'
+export * from './truthy'
 export * from './try-catch'
 export { warn } from './warn'

src/utils/truthy.ts

@@ -0,0 +1,5 @@
+export function isNonNullable<T = any>(x: T): x is NonNullable<T> {
+  return x != null
+}
+
+export type Truthy<T> = Exclude<T, undefined | null | false | 0 | ''>

yarn.lock

@@ -7335,9 +7335,9 @@ typescript@^2.4.2, typescript@^2.6.1:
   version "2.6.2"
   resolved "https://registry.npmjs.org/typescript/-/typescript-2.6.2.tgz#3c5b6fd7f6de0914269027f03c0946758f7673a4"
 
-typescript@^2.7.2:
-  version "2.7.2"
-  resolved "https://registry.npmjs.org/typescript/-/typescript-2.7.2.tgz#2d615a1ef4aee4f574425cdff7026edf81919836"
+typescript@^2.8.3:
+  version "2.8.3"
+  resolved "https://registry.npmjs.org/typescript/-/typescript-2.8.3.tgz#5d817f9b6f31bb871835f4edf0089f21abe6c170"
 
 uglify-es@^3.3.4:
   version "3.3.9"