Merge branch 'master' into feature/query-token-traces

Author: Saviio

.circleci/config.yml

@@ -1,7 +1,7 @@
 defaults: &defaults
   working_directory: ~/ReactiveDB
   docker:
-    - image: circleci/node:10
+    - image: circleci/node:16
 
 version: 2
 jobs:
@@ -41,7 +41,7 @@ jobs:
       - run: npm run test_O1
       - run:
           name: test-coverage
-          command: cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js
+          command: npx codecov -f coverage/*.json
 
   deploy:
     <<: *defaults

.github/FUNDING.yml

@@ -0,0 +1,4 @@
+# These are supported funding model platforms
+
+github: [brooooooklyn]
+

example/package.json

@@ -22,11 +22,11 @@
   },
   "homepage": "https://github.com/teambition/ReactiveDB#readme",
   "dependencies": {
-    "antd": "^2.7.3",
-    "react": "^15.4.2",
-    "react-dom": "^15.4.2"
+    "antd": "^4.0.0",
+    "react": "^17.0.0",
+    "react-dom": "^17.0.0"
   },
   "devDependencies": {
-    "typescript": "^2.2.1"
+    "typescript": "^4.0.0"
   }
 }

package.json

@@ -11,19 +11,19 @@
     "clean_dist_cjs": "rm -rf ./dist/cjs",
     "clean_dist_es": "rm -rf ./dist/es",
     "check_circular_dependencies": "madge ./dist/cjs --circular",
-    "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",
-    "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",
+    "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 --skipLibCheck --noImplicitReturns --noUnusedLocals --noUnusedParameters --strict --suppressImplicitAnyIndexErrors --moduleResolution node --noEmitHelpers --importHelpers --lib es5,es2015,es2016,es2017",
+    "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 --skipLibCheck --noImplicitReturns --noUnusedLocals --noUnusedParameters --strict --suppressImplicitAnyIndexErrors --moduleResolution node --noEmitHelpers --importHelpers --lib es5,es2015,es2016,es2017",
     "copy_src_cjs": "shx mkdir -p ./dist/cjs/src && shx cp -r ./src/* ./dist/cjs/src",
     "copy_src_es": "shx mkdir -p ./dist/es/src && shx cp -r ./src/* ./dist/es/src",
-    "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",
+    "cover": "rm -rf ./.nyc_output ./coverage && cross-env 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",
     "lint": "tslint -c tslint.json src/*.ts --project ./tsconfig.json \"src/**/*.ts\" \"./test/**/*.ts\" -e \"./test/e2e/*.ts\"",
     "publish_all": "ts-node ./tools/publish.ts",
     "start": "webpack-dev-server --inline --colors --progress --port 3000",
     "start-demo": "webpack-dev-server --config ./example/webpack.config.js --inline --colors --progress --port 3001 --open",
     "test": "npm run lint && NODE_ENV=test tman --mocha spec-js/test/run.js",
     "test_O1": "npm run lint && NODE_ENV=test optimize=true tman --mocha spec-js/test/run.js",
     "version": "ts-node tools/version.ts && git add .",
-    "watch": "NODE_ENV=test ts-node ./tools/watch.ts & npm run watch_test",
+    "watch": "cross-env NODE_ENV=test ts-node ./tools/watch.ts & npm run watch_test",
     "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",
     "watch_test": "tsc -p test/tsconfig.json -w --diagnostics --pretty"
   },
@@ -60,54 +60,55 @@
   },
   "license": "MIT",
   "devDependencies": {
-    "@types/chai": "^4.1.7",
-    "@types/chai-string": "^1.4.1",
-    "@types/node": "^12.0.0",
-    "@types/shelljs": "^0.8.2",
-    "@types/sinon": "^7.0.5",
-    "@types/sinon-chai": "^3.2.2",
-    "chai": "^4.2.0",
+    "@types/chai": "^4.2.21",
+    "@types/chai-string": "^1.4.2",
+    "@types/node": "^16.4.13",
+    "@types/shelljs": "^0.8.9",
+    "@types/sinon": "^10.0.2",
+    "@types/sinon-chai": "^3.2.5",
+    "chai": "^4.3.4",
     "chai-string": "^1.5.0",
-    "coveralls": "^3.0.2",
-    "css-loader": "^3.0.0",
+    "codecov": "^3.8.3",
+    "cross-env": "^7.0.3",
+    "css-loader": "^6.2.0",
     "extract-text-webpack-plugin": "^4.0.0-beta.0",
-    "html-webpack-plugin": "^3.2.0",
-    "husky": "^3.0.1",
-    "lint-staged": "^9.0.0",
-    "madge": "^3.4.3",
-    "moment": "^2.24.0",
-    "node-watch": "^0.6.0",
+    "html-webpack-plugin": "^5.3.2",
+    "husky": "^8.0.0",
+    "lint-staged": "^11.1.2",
+    "madge": "^5.0.1",
+    "moment": "^2.29.1",
+    "node-watch": "^0.7.1",
     "npm-run-all": "^4.1.5",
-    "nyc": "^13.1.0",
-    "prettier": "^1.16.3",
-    "raw-loader": "^3.0.0",
-    "rxjs": "^6.4.0",
-    "shelljs": "^0.8.3",
-    "shx": "^0.3.2",
-    "sinon": "^7.2.3",
-    "sinon-chai": "^3.3.0",
-    "source-map-loader": "^0.2.4",
-    "style-loader": "^0.23.1",
-    "tman": "^1.8.1",
-    "ts-loader": "^5.3.3",
-    "ts-node": "^8.0.2",
-    "tslint": "^5.12.1",
-    "tslint-config-prettier": "^1.17.0",
+    "nyc": "^15.1.0",
+    "prettier": "^2.3.2",
+    "raw-loader": "^4.0.2",
+    "rxjs": "^7.3.0",
+    "shelljs": "^0.8.4",
+    "shx": "^0.3.3",
+    "sinon": "^12.0.0",
+    "sinon-chai": "^3.7.0",
+    "source-map-loader": "^3.0.0",
+    "style-loader": "^3.2.1",
+    "tman": "^1.10.0",
+    "ts-loader": "^9.2.5",
+    "ts-node": "^10.2.0",
+    "tslint": "^6.1.3",
+    "tslint-config-prettier": "^1.18.0",
     "tslint-eslint-rules": "^5.4.0",
     "tslint-loader": "^3.6.0",
-    "typescript": "^3.3.1",
-    "webpack": "^4.29.0",
-    "webpack-cli": "^3.2.1",
-    "webpack-dev-server": "^3.1.14"
+    "typescript": "^4.3.5",
+    "webpack": "^5.50.0",
+    "webpack-cli": "^4.7.2",
+    "webpack-dev-server": "^4.0.0"
   },
   "dependencies": {
-    "@types/lovefield": "^2.1.2",
+    "@types/lovefield": "^2.1.4",
     "lovefield": "2.1.12",
-    "nesthydrationjs": "^1.0.5"
+    "nesthydrationjs": "^2.0.0"
   },
   "peerDependencies": {
-    "rxjs": "^6.0.0",
-    "tslib": "^1.9.0"
+    "rxjs": "^7.3.0",
+    "tslib": "^2.3.0"
   },
   "typings": "./index.d.ts",
   "prettier": {

renovate.json

@@ -0,0 +1,15 @@
+{
+  "extends": ["config:base", ":preserveSemverRanges"],
+  "packageRules": [
+    {
+      "automerge": true,
+      "matchUpdateTypes": ["minor", "patch", "pin", "digest"]
+    }
+  ],
+  "lockFileMaintenance": {
+    "enabled": true,
+    "extends": [
+      "schedule:monthly"
+    ]
+  }
+}

src/storage/Database.ts

@@ -62,7 +62,8 @@ export class Database {
 
   private findSchema = (name: string): ParsedSchema => {
     const schema = this.schemas.get(name)
-    return assertValue(schema, Exception.NonExistentTable, name)
+    assertValue(schema, Exception.NonExistentTable, name)
+    return schema
   }
   private tryCatchFindPrimaryKey = tryCatch((name: string) => {
     return this.findSchema(name).pk

src/storage/modules/Mutation.ts

@@ -71,9 +71,9 @@ export class Mutation {
   }
 
   private toUpdater() {
-    const meta = assertValue(this.meta, Exception.PrimaryKeyNotProvided)
+    assertValue(this.meta, Exception.PrimaryKeyNotProvided)
     const query = this.db.update(this.table)
-    query.where(this.table[meta.key].eq(meta.val))
+    query.where(this.table[this.meta.key].eq(this.meta.val))
 
     forEach(this.params, (val, key) => {
       const column = this.table[key]
@@ -88,11 +88,11 @@ export class Mutation {
   }
 
   private toRow() {
-    const meta = assertValue(this.meta, Exception.PrimaryKeyNotProvided)
+    assertValue(this.meta, Exception.PrimaryKeyNotProvided)
     return {
       table: this.table,
       row: this.table.createRow({
-        [meta.key]: meta.val,
+        [this.meta.key]: this.meta.val,
         ...this.params,
       }),
     }

src/storage/modules/PredicateProvider.ts

@@ -93,7 +93,7 @@ export class PredicateProvider<T> {
 
     const predicates: lf.Predicate[] = []
 
-    forEach(meta, (val, key) => {
+    forEach(meta, (val: Partial<PredicateMeta<T>> | ValueLiteral, key) => {
       let nestedPreds: lf.Predicate[]
       let resultPred: lf.Predicate
 
@@ -127,9 +127,9 @@ export class PredicateProvider<T> {
     return typeof compoundPredicateFactory[methodName] === 'function'
   }
 
-  private checkPredicate(val: Partial<PredicateMeta<T>> | ValueLiteral) {
+  private checkPredicate(val: Partial<PredicateMeta<T>> | ValueLiteral): boolean {
     return (
-      val &&
+      !!val &&
       typeof val === 'object' &&
       !(val instanceof Array) &&
       !(val instanceof RegExp) &&

src/storage/modules/Selector.ts

@@ -117,21 +117,15 @@ export class Selector<T> {
       // 下面的语句针对两个 lovefield issue 做了特殊调整：
       // issue#209: 确保 db.observe 之后立即执行一次查询；
       // issue#215: 确保 db.observe “不正确地”立即调用回调的行为，不会给消费方造成初始的重复推送。
-      return observeQuery(db, query).pipe(
-        startWith(void 0),
-        switchMap(queryOnce),
-      )
+      return observeQuery(db, query).pipe(startWith(void 0), switchMap(queryOnce))
     }
 
     const changesOnQuery =
       limit || skip
         ? this.buildPrefetchingObserve().pipe(switchMap((pks) => observeOn(this.getQuery(this.inPKs(pks)))))
         : observeOn(this.getQuery())
 
-    return changesOnQuery.pipe(
-      publishReplay(1),
-      refCount(),
-    )
+    return changesOnQuery.pipe(publishReplay(1), refCount())
   }
 
   private set change$(dist$: Observable<T[]>) {

src/utils/assert.ts

@@ -1,5 +1,3 @@
-import { Truthy } from './truthy'
-
 type FailureHandler<U extends any[]> = (...args: U) => Error
 
 export function assert(condition: boolean, failureMsg: string): void
@@ -12,29 +10,29 @@ export function assert<U extends any[]>(
   truthyOrThrow(condition, failure, ...failureArgs)
 }
 
-export function assertValue<T>(value: T, falsyValueMsg: string): Truthy<T> | never
+type Maybe<T> = T | null | undefined
+
+export function assertValue<T>(value: Maybe<T>, falsyValueMsg: string): asserts value is T
 export function assertValue<T, U extends any[]>(
-  value: T,
+  value: Maybe<T>,
   failure: FailureHandler<U>,
   ...failureArgs: U
-): Truthy<T> | never
+): asserts value is T
 export function assertValue<T, U extends any[]>(
-  value: T,
+  value: Maybe<T>,
   failure: FailureHandler<U> | string,
   ...failureArgs: U
-): Truthy<T> | never {
-  return truthyOrThrow(value, failure, ...failureArgs)
+): asserts value is T {
+  truthyOrThrow(value, failure, ...failureArgs)
 }
 
 function truthyOrThrow<T, U extends any[]>(
-  x: T,
+  x: Maybe<T>,
   failure: FailureHandler<U> | string,
   ...failureArgs: U
-): Truthy<T> | never {
-  if (x) {
-    return x as Truthy<T>
+): asserts x is T {
+  if ((x as Maybe<unknown>) === false || x == null) {
+    const error = typeof failure === 'string' ? new Error(failure) : failure(...failureArgs)
+    throw error
   }
-
-  const error = typeof failure === 'string' ? new Error(failure) : failure(...failureArgs)
-  throw error
 }