move "development" TS version to TS3.9, use @ts-expect-error in CI whenever possible (#811)

Author: phryneas

.travis.yml

@@ -4,11 +4,46 @@ env:
   - TYPESCRIPT_VERSION=next
   - TYPESCRIPT_VERSION=4.0
   - TYPESCRIPT_VERSION=3.9
-  - TYPESCRIPT_VERSION=3.8
-  - TYPESCRIPT_VERSION=3.7
-  - TYPESCRIPT_VERSION=3.6
-  - TYPESCRIPT_VERSION=3.5
 install:
   - npm ci --ignore-scripts
   - npm install typescript@$TYPESCRIPT_VERSION
 script: npm run prepare
+
+jobs:
+  include:
+    - env:
+        - TYPESCRIPT_VERSION=3.8
+      install:
+        - npm ci --ignore-scripts
+        - npm install typescript@$TYPESCRIPT_VERSION
+        - sed -i -e 's/"cd type-tests.*"/"true"/' package.json
+        - sed -i -e 's/@ts-expect-error/typings:expect-error/' type-tests/files/*
+        - mv type-tests/types.test.disabled.ts type-tests/types.test.ts
+      script: npm run prepare
+    - env:
+        - TYPESCRIPT_VERSION=3.7
+      install:
+        - npm ci --ignore-scripts
+        - npm install typescript@$TYPESCRIPT_VERSION
+        - sed -i -e 's/"cd type-tests.*"/"true"/' package.json
+        - sed -i -e 's/@ts-expect-error/typings:expect-error/' type-tests/files/*
+        - mv type-tests/types.test.disabled.ts type-tests/types.test.ts
+      script: npm run prepare
+    - env:
+        - TYPESCRIPT_VERSION=3.6
+      install:
+        - npm ci --ignore-scripts
+        - npm install typescript@$TYPESCRIPT_VERSION
+        - sed -i -e 's/"cd type-tests.*"/"true"/' package.json
+        - sed -i -e 's/@ts-expect-error/typings:expect-error/' type-tests/files/*
+        - mv type-tests/types.test.disabled.ts type-tests/types.test.ts
+      script: npm run prepare
+    - env:
+        - TYPESCRIPT_VERSION=3.5
+      install:
+        - npm ci --ignore-scripts
+        - npm install typescript@$TYPESCRIPT_VERSION
+        - sed -i -e 's/"cd type-tests.*"/"true"/' package.json
+        - sed -i -e 's/@ts-expect-error/typings:expect-error/' type-tests/files/*
+        - mv type-tests/types.test.disabled.ts type-tests/types.test.ts
+      script: npm run prepare

package-lock.json

@@ -40,7 +40,7 @@
     "rollup-plugin-strip-code": "^0.2.6",
     "tsdx": "^0.11.0",
     "tslib": "^1.10.0",
-    "typescript": "^3.8.2",
+    "typescript": "^3.9.7",
     "typings-tester": "^0.3.2"
   },
   "scripts": {
@@ -50,8 +50,9 @@
     "format": "prettier --write \"src/**/*.ts\" \"**/*.md\"",
     "format:check": "prettier --list-different \"src/**/*.ts\" \"docs/*/**.md\"",
     "lint": "tsdx lint src",
-    "prepare": "npm run lint && npm run format:check && npm test && npm run build-ci",
-    "test": "tsdx test"
+    "prepare": "npm run lint && npm run format:check && npm test && npm run type-tests && npm run build-ci",
+    "test": "tsdx test",
+    "type-tests": "cd type-tests/files && tsc"
   },
   "files": [
     "dist/*.js",

package.json

@@ -12,7 +12,7 @@ import {
   ActionReducerMapBuilder,
   executeReducerBuilderCallback
 } from './mapBuilders'
-import { Omit, NoInfer } from './tsHelpers'
+import { NoInfer } from './tsHelpers'
 
 /**
  * An action creator attached to a slice.

src/createSlice.ts

@@ -100,10 +100,9 @@ describe('Entity State Selectors', () => {
     })
 
     it('should type single entity from Dictionary as entity type or undefined', () => {
-      const singleEntity: Selector<
-        EntityState<BookModel>,
-        BookModel | undefined
-      > = createSelector(selectors.selectEntities, entities => entities[0])
+      expectType<Selector<EntityState<BookModel>, BookModel | undefined>>(
+        createSelector(selectors.selectEntities, entities => entities[0])
+      )
     })
 
     it('should create a selector for selecting the list of models', () => {
@@ -126,3 +125,7 @@ describe('Entity State Selectors', () => {
     })
   })
 })
+
+function expectType<T>(t: T) {
+  return t
+}

src/entities/state_selectors.test.ts

@@ -124,7 +124,7 @@ describe('Unsorted State Adapter', () => {
   })
 
   it('should let you add remove an entity from the state', () => {
-    const withOneEntity = adapter.addOne(state, TheGreatGatsby)
+    /* const withOneEntity = */ adapter.addOne(state, TheGreatGatsby)
 
     const withoutOne = adapter.removeOne(state, TheGreatGatsby.id)
 

src/entities/unsorted_state_adapter.test.ts

@@ -17,15 +17,15 @@ describe('Entity utils', () => {
     it('should not warn when key does exist', () => {
       const spy = spyOn(console, 'warn')
 
-      const key = selectIdValue(AClockworkOrange, book => book.id)
+      selectIdValue(AClockworkOrange, book => book.id)
 
       expect(spy).not.toHaveBeenCalled()
     })
 
     it('should warn when key does not exist in dev mode', () => {
       const spy = spyOn(console, 'warn')
 
-      const key = selectIdValue(AClockworkOrange, (book: any) => book.foo)
+      selectIdValue(AClockworkOrange, (book: any) => book.foo)
 
       expect(spy).toHaveBeenCalled()
     })
@@ -34,10 +34,7 @@ describe('Entity utils', () => {
       const spy = spyOn(console, 'warn')
 
       const undefinedAClockworkOrange = { ...AClockworkOrange, id: undefined }
-      const key = selectIdValue(
-        undefinedAClockworkOrange,
-        (book: any) => book.id
-      )
+      selectIdValue(undefinedAClockworkOrange, (book: any) => book.id)
 
       expect(spy).toHaveBeenCalled()
     })
@@ -46,7 +43,7 @@ describe('Entity utils', () => {
       process.env.NODE_ENV = 'production'
       const spy = spyOn(console, 'warn')
 
-      const key = selectIdValue(AClockworkOrange, (book: any) => book.foo)
+      selectIdValue(AClockworkOrange, (book: any) => book.foo)
 
       expect(spy).not.toHaveBeenCalled()
     })
@@ -56,10 +53,7 @@ describe('Entity utils', () => {
       const spy = spyOn(console, 'warn')
 
       const undefinedAClockworkOrange = { ...AClockworkOrange, id: undefined }
-      const key = selectIdValue(
-        undefinedAClockworkOrange,
-        (book: any) => book.id
-      )
+      selectIdValue(undefinedAClockworkOrange, (book: any) => book.id)
 
       expect(spy).not.toHaveBeenCalled()
     })

src/entities/utils.spec.ts

@@ -98,5 +98,3 @@ type UnionToIntersection<U> = (U extends any
  * @internal
  */
 export type NoInfer<T> = [T][T extends any ? 0 : never]
-
-export type Omit<T, K extends keyof any> = Pick<T, Exclude<keyof T, K>>