TS dep updates (#386)

* Update createEntityAdapter type reference

* Update TypeScript and Prettier to latest

* Prettier reformatting

Author: markerikson

docs/api/createEntityAdapter.md

@@ -99,25 +99,26 @@ If not provided, the `state.ids` array will not be sorted, and no guarantees are
 
 A "entity adapter" instance. An entity adapter is a plain JS object (not a class) containing the generated reducer functions, the original provided `selectId` and `sortComparer` callbacks, a method to generate an initial "entity state" value, and functions to generate a set of globalized and non-globalized memoized selector functions for this entity type.
 
-The adapter instance will include the following methods (some TypeScript overloads removed for space):
+The adapter instance will include the following methods (additional referenced TypeScript types included):
 
 ```ts
 export type EntityId = number | string
 
-export type Comparer<T> = (a: T, b: T) => EntityId
+export type Comparer<T> = (a: T, b: T) => number
+
 export type IdSelector<T> = (model: T) => EntityId
 
 export interface DictionaryNum<T> {
   [id: number]: T | undefined
 }
-export abstract class Dictionary<T> implements DictionaryNum<T> {
+
+export interface Dictionary<T> extends DictionaryNum<T> {
   [id: string]: T | undefined
 }
 
 export type Update<T> = { id: EntityId; changes: Partial<T> }
-export type EntityMap<T> = (entity: T) => T
 
-export type TypeOrPayloadAction<T> = T | PayloadAction<T>
+export type EntityMap<T> = (entity: T) => T
 
 export interface EntityState<T> {
   ids: EntityId[]
@@ -130,54 +131,49 @@ export interface EntityDefinition<T> {
 }
 
 export interface EntityStateAdapter<T> {
-  addOne<S extends EntityState<T>>(state: S, entity: TypeOrPayloadAction<T>): S
+  addOne<S extends EntityState<T>>(state: S, entity: T): S
+  addOne<S extends EntityState<T>>(state: S, action: PayloadAction<T>): S
 
-  addMany<S extends EntityState<T>>(
-    state: S,
-    entities: TypeOrPayloadAction<T[]>
-  ): S
+  addMany<S extends EntityState<T>>(state: S, entities: T[]): S
+  addMany<S extends EntityState<T>>(state: S, entities: PayloadAction<T[]>): S
 
-  setAll<S extends EntityState<T>>(
-    state: S,
-    entities: TypeOrPayloadAction<T[]>
-  ): S
+  setAll<S extends EntityState<T>>(state: S, entities: T[]): S
+  setAll<S extends EntityState<T>>(state: S, entities: PayloadAction<T[]>): S
 
-  removeOne<S extends EntityState<T>>(
-    state: S,
-    key: TypeOrPayloadAction<EntityId>
-  ): S
+  removeOne<S extends EntityState<T>>(state: S, key: EntityId): S
+  removeOne<S extends EntityState<T>>(state: S, key: PayloadAction<EntityId>): S
 
+  removeMany<S extends EntityState<T>>(state: S, keys: EntityId[]): S
   removeMany<S extends EntityState<T>>(
     state: S,
-    keys: TypeOrPayloadAction<EntityId[]>
+    keys: PayloadAction<EntityId[]>
   ): S
 
   removeAll<S extends EntityState<T>>(state: S): S
 
+  updateOne<S extends EntityState<T>>(state: S, update: Update<T>): S
   updateOne<S extends EntityState<T>>(
     state: S,
-    update: TypeOrPayloadAction<Update<T>>
+    update: PayloadAction<Update<T>>
   ): S
 
+  updateMany<S extends EntityState<T>>(state: S, updates: Update<T>[]): S
   updateMany<S extends EntityState<T>>(
     state: S,
-    updates: TypeOrPayloadAction<Update<T>[]>
+    updates: PayloadAction<Update<T>[]>
   ): S
 
-  upsertOne<S extends EntityState<T>>(
-    state: S,
-    entity: TypeOrPayloadAction<T>
-  ): S
+  upsertOne<S extends EntityState<T>>(state: S, entity: T): S
+  upsertOne<S extends EntityState<T>>(state: S, entity: PayloadAction<T>): S
 
+  upsertMany<S extends EntityState<T>>(state: S, entities: T[]): S
   upsertMany<S extends EntityState<T>>(
     state: S,
-    entities: TypeOrPayloadAction<T[]>
+    entities: PayloadAction<T[]>
   ): S
 
-  map<S extends EntityState<T>>(
-    state: S,
-    map: TypeOrPayloadAction<EntityMap<T>>
-  ): S
+  map<S extends EntityState<T>>(state: S, map: EntityMap<T>): S
+  map<S extends EntityState<T>>(state: S, map: PayloadAction<EntityMap<T>>): S
 }
 
 export interface EntitySelectors<T, V> {
@@ -369,7 +365,10 @@ console.log(store.getState().books)
 // {ids: ["a"], entities: {a: {id: "a", title: "First (altered)"}}, loading: 'pending' }
 
 store.dispatch(
-  booksReceived([{ id: 'b', title: 'Book 3' }, { id: 'c', title: 'Book 2' }])
+  booksReceived([
+    { id: 'b', title: 'Book 3' },
+    { id: 'c', title: 'Book 2' }
+  ])
 )
 
 console.log(booksSelectors.selectIds(store.getState()))

docs/tutorials/intermediate-tutorial.md

@@ -430,10 +430,7 @@ const AddTodo = ({ addTodo }) => {
   )
 }
 
-export default connect(
-  null,
-  mapDispatch
-)(AddTodo)
+export default connect(null, mapDispatch)(AddTodo)
 ```
 
 We start by importing the correct `addTodo` action creator from our todos slice.

package-lock.json

@@ -32,20 +32,20 @@
     "eslint-config-react-app": "^5.0.1",
     "invariant": "^2.2.4",
     "json-stringify-safe": "^5.0.1",
-    "prettier": "^1.18.2",
+    "prettier": "^1.19.1",
     "react": "^16.8.6",
     "rollup-plugin-strip-code": "^0.2.6",
     "tsdx": "^0.11.0",
     "tslib": "^1.10.0",
-    "typescript": "^3.6.3",
+    "typescript": "^3.8.2",
     "typings-tester": "^0.3.2"
   },
   "scripts": {
     "build-ci": "tsdx build --format cjs,esm,umd --name redux-toolkit && api-extractor run",
     "build": "tsdx build --format cjs,esm,umd --name redux-toolkit && api-extractor run --local",
     "dev": "tsdx watch  --format cjs,esm,umd",
-    "format": "prettier --write \"src/*.ts\" \"**/*.md\"",
-    "format:check": "prettier --list-different \"src/*.ts\" \"docs/*/**.md\"",
+    "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"

package.json

@@ -96,10 +96,7 @@ describe('Entity State Selectors', () => {
       const singleEntity: Selector<
         EntityState<BookModel>,
         BookModel | undefined
-      > = createSelector(
-        selectors.selectEntities,
-        entities => entities[0]
-      )
+      > = createSelector(selectors.selectEntities, entities => entities[0])
     })
 
     it('should create a selector for selecting the list of models', () => {

src/entities/state_selectors.test.ts

@@ -18,10 +18,7 @@ export function createSelectorsFactory<T>() {
         ids.map((id: any) => (entities as any)[id])
     )
 
-    const selectTotal = createSelector(
-      selectIds,
-      ids => ids.length
-    )
+    const selectTotal = createSelector(selectIds, ids => ids.length)
 
     if (!selectState) {
       return {
@@ -33,22 +30,10 @@ export function createSelectorsFactory<T>() {
     }
 
     return {
-      selectIds: createSelector(
-        selectState,
-        selectIds
-      ),
-      selectEntities: createSelector(
-        selectState,
-        selectEntities
-      ),
-      selectAll: createSelector(
-        selectState,
-        selectAll
-      ),
-      selectTotal: createSelector(
-        selectState,
-        selectTotal
-      )
+      selectIds: createSelector(selectState, selectIds),
+      selectEntities: createSelector(selectState, selectEntities),
+      selectAll: createSelector(selectState, selectAll),
+      selectTotal: createSelector(selectState, selectTotal)
     }
   }
 

src/entities/state_selectors.ts

@@ -85,8 +85,8 @@ export type DispatchForMiddlewares<M> = M extends ReadonlyArray<any>
  * Convert a Union type `(A|B)` to and intersecion type `(A&B)`
  */
 type UnionToIntersection<U> = (U extends any
-  ? (k: U) => void
-  : never) extends ((k: infer I) => void)
+? (k: U) => void
+: never) extends (k: infer I) => void
   ? I
   : never