Merge pull request #79 from ReactiveDB/upgrade-deps

chore: deps upgrade

Author: chuan6

.circleci/config.yml

@@ -1,7 +1,7 @@
 defaults: &defaults
   working_directory: ~/ReactiveDB
   docker:
-    - image: circleci/node:6
+    - image: circleci/node:10
 
 version: 2
 jobs:
@@ -10,6 +10,8 @@ jobs:
     steps:
       - checkout
       - run: echo 'export PATH=${PATH}:${HOME}/${CIRCLE_PROJECT_REPONAME}/node_modules/.bin' >> $BASH_ENV
+      - run: curl --compressed -o- -L https://yarnpkg.com/install.sh | bash
+      - run: sudo ln -sf ~/.yarn/bin/yarn /usr/local/bin/yarn
       - restore_cache:
           key: dependency-cache-{{ checksum "package.json" }}
       - run:

package.json

@@ -17,7 +17,6 @@
     "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",
     "lint": "tslint -c tslint.json src/*.ts --project ./tsconfig.json \"src/**/*.ts\" \"./test/**/*.ts\" -e \"./test/e2e/*.ts\"",
-    "precommit": "lint-staged",
     "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",
@@ -61,47 +60,48 @@
   },
   "license": "MIT",
   "devDependencies": {
-    "@types/chai": "^4.1.2",
+    "@types/chai": "^4.1.7",
     "@types/chai-string": "^1.4.1",
-    "@types/node": "^10.5.5",
+    "@types/node": "^10.12.9",
     "@types/shelljs": "^0.8.0",
-    "@types/sinon": "^5.0.0",
-    "@types/sinon-chai": "^3.2.0",
-    "chai": "^4.1.2",
-    "chai-string": "^1.4.0",
-    "coveralls": "^3.0.0",
-    "css-loader": "^1.0.0",
+    "@types/sinon": "^5.0.6",
+    "@types/sinon-chai": "^3.2.1",
+    "chai": "^4.2.0",
+    "chai-string": "^1.5.0",
+    "coveralls": "^3.0.2",
+    "css-loader": "^1.0.1",
     "extract-text-webpack-plugin": "^4.0.0-beta.0",
-    "html-webpack-plugin": "^3.0.6",
-    "husky": "^1.0.0",
-    "lint-staged": "^7.2.0",
-    "madge": "^3.0.1",
-    "moment": "^2.21.0",
+    "html-webpack-plugin": "^3.2.0",
+    "husky": "^1.1.4",
+    "lint-staged": "^8.0.5",
+    "madge": "^3.3.0",
+    "moment": "^2.22.2",
     "node-watch": "^0.5.8",
-    "npm-run-all": "^4.1.2",
-    "nyc": "^12.0.1",
-    "prettier": "^1.14.0",
+    "npm-run-all": "^4.1.3",
+    "nyc": "^13.1.0",
+    "prettier": "^1.15.2",
     "raw-loader": "^0.5.1",
-    "rxjs": "^6.2.2",
-    "shelljs": "^0.8.1",
-    "shx": "^0.3.0",
-    "sinon": "^6.1.4",
-    "sinon-chai": "^3.0.0",
-    "source-map-loader": "^0.2.3",
-    "style-loader": "^0.23.0",
-    "tman": "^1.7.4",
-    "ts-loader": "^4.0.1",
-    "ts-node": "^7.0.0",
-    "tslint": "^5.9.1",
-    "tslint-eslint-rules": "^5.1.0",
+    "rxjs": "^6.3.3",
+    "shelljs": "^0.8.3",
+    "shx": "^0.3.2",
+    "sinon": "^7.1.1",
+    "sinon-chai": "^3.2.0",
+    "source-map-loader": "^0.2.4",
+    "style-loader": "^0.23.1",
+    "tman": "^1.8.1",
+    "ts-loader": "^5.3.0",
+    "ts-node": "^7.0.1",
+    "tslint": "^5.11.0",
+    "tslint-config-prettier": "^1.16.0",
+    "tslint-eslint-rules": "^5.4.0",
     "tslint-loader": "^3.6.0",
-    "typescript": "^3.0.1",
-    "webpack": "^4.1.1",
-    "webpack-cli": "^3.1.0",
-    "webpack-dev-server": "^3.1.0"
+    "typescript": "^3.1.6",
+    "webpack": "^4.25.1",
+    "webpack-cli": "^3.1.2",
+    "webpack-dev-server": "^3.1.10"
   },
   "dependencies": {
-    "@types/lovefield": "^2.1.1",
+    "@types/lovefield": "^2.1.2",
     "lovefield": "2.1.12",
     "nesthydrationjs": "^1.0.5"
   },
@@ -124,5 +124,10 @@
       "tslint -c tslint.json -p tsconfig.json --fix",
       "git add"
     ]
+  },
+  "husky": {
+    "hooks": {
+      "pre-commit": "lint-staged"
+    }
   }
 }

src/storage/helper/db-factory.ts

@@ -16,7 +16,7 @@ export const lfFactory = (
   config: LfFactoryInit,
 ): ConnectableObservable<lf.Database> => {
   return Observable.create((observer: Observer<lf.Database>) => {
-    (config as any).onUpgrade = onUpgrade
+    ;(config as any).onUpgrade = onUpgrade
     if (config.storeType >= 3) {
       config.storeType = config.storeType + 1
     }

src/storage/modules/QueryToken.ts

@@ -32,7 +32,10 @@ export class QueryToken<T> {
     assert(!this.consumed, TokenConsumed)
 
     this.consumed = true
-    return this.selector$.pipe(switchMap((s) => s.values()), take(1))
+    return this.selector$.pipe(
+      switchMap((s) => s.values()),
+      take(1),
+    )
   }
 
   changes(): Observable<T[]> {

src/utils/for-each.ts

@@ -17,7 +17,7 @@ export function forEach(target: any, eachFunc: (val: any, key: any) => any, inve
   let handler = eachFunc
   if (target instanceof Set || target instanceof Map) {
     // since we cannot use [[Set/Map]].entries() directly
-    (target as any).forEach((value: any, key: any) => {
+    ;(target as any).forEach((value: any, key: any) => {
       if (handler(value, key) === false) {
         handler = noop
       }

test/specs/storage/modules/Mutation.spec.ts

@@ -51,12 +51,13 @@ export default describe('Mutation Testcase: ', () => {
         const mut = new Mutation(database, table, { foo: 666, bar: 233 })
         mut.withId('id', 42)
 
-        sinon.stub(Mutation, 'aggregate').callsFake((_: any, [m]: any[], __: any[]) => {
-          const meta = { key: 'id', val: 42 }
-          expect(m.meta).to.deep.equal(meta)
-        })
+        const stub = sinon.stub(Mutation, 'aggregate')
 
         Mutation.aggregate(database, [mut], [])
+
+        const [m] = stub.args[0][1]
+        const meta = { key: 'id', val: 42 }
+        expect(m['meta']).to.deep.equal(meta)
       })
     })
 

test/specs/storage/modules/Selector.spec.ts

@@ -185,11 +185,13 @@ export default describe('Selector test', () => {
     yield selector.values().pipe(
       tap((result) => {
         expect(result).to.have.lengthOf(950)
-        const expectResult = storeData.filter((r) => r.time >= 50).sort((a, b) => {
-          const higherPriority = Math.sign(a.priority - b.priority)
-          const earlier = -Math.sign(a.time - b.time)
-          return higherPriority * 10 + earlier
-        })
+        const expectResult = storeData
+          .filter((r) => r.time >= 50)
+          .sort((a, b) => {
+            const higherPriority = Math.sign(a.priority - b.priority)
+            const earlier = -Math.sign(a.time - b.time)
+            return higherPriority * 10 + earlier
+          })
 
         expect(result).to.deep.equal(expectResult)
       }),

tsconfig.json

@@ -25,7 +25,9 @@
     "tools/build",
     "dist",
     "coverage",
-    "example"
+    "example",
+    "spec-js",
+    "./webpack.config.js"
   ],
   "compileOnSave": false,
   "awesomeTypescriptLoaderOptions": {

tslint.json

@@ -1,14 +1,8 @@
 {
-  "extends": ["tslint-eslint-rules"],
+  "extends": ["tslint-eslint-rules", "tslint-config-prettier"],
   "rules": {
     "curly": true,
-    "eofline": true,
-    "align": [true, "parameters"],
     "class-name": true,
-    "indent": [true, "spaces", 2],
-    "max-line-length": [true, 150],
-    "no-consecutive-blank-lines": true,
-    "no-trailing-whitespace": true,
     "no-duplicate-variable": true,
     "no-console": [true, "log", "trace"],
     "no-construct": true,
@@ -19,31 +13,9 @@
     "no-var-requires": false,
     "no-require-imports": false,
     "no-shadowed-variable": true,
-    "object-curly-spacing": true,
-    "one-line": [true,
-      "check-else",
-      "check-whitespace",
-      "check-open-brace"],
     "prefer-const": true,
-    "quotemark": [true,
-      "single",
-      "avoid-escape"],
-    "semicolon": [true, "never"],
     "ter-prefer-arrow-callback": true,
-    "typedef-whitespace": [true, {
-      "call-signature": "nospace",
-      "index-signature": "nospace",
-      "parameter": "nospace",
-      "property-declaration": "nospace",
-      "variable-declaration": "nospace"
-    }],
     "use-isnan": true,
-    "whitespace": [true,
-      "check-branch",
-      "check-decl",
-      "check-operator",
-      "check-separator",
-      "check-type"],
     "comment-format": [true, "check-space", "check-lowercase"]
   }
 }