Merge branch 'reduxjs:master' into patch-1

Author: maruhgar

docs/api/createEntityAdapter.mdx

@@ -203,9 +203,11 @@ export interface EntityAdapter<T> extends EntityStateAdapter<T> {
 
 The primary content of an entity adapter is a set of generated reducer functions for adding, updating, and removing entity instances from an entity state object:
 
-- `addOne`: accepts a single entity, and adds it.
-- `addMany`: accepts an array of entities or an object in the shape of `Record<EntityId, T>`, and adds them.
-- `setAll`: accepts an array of entities or an object in the shape of `Record<EntityId, T>`, and replaces the existing entity contents with the values in the array.
+- `addOne`: accepts a single entity, and adds it if it's not already present.
+- `addMany`: accepts an array of entities or an object in the shape of `Record<EntityId, T>`, and adds them if not already present.
+- `setOne`: accepts a single entity and adds or replaces it
+- `setMany`: accepts an array of entities or an an object in the shape of `Record<EntityId, T>`, and adds or replaces them.
+- `setAll`: accepts an array of entities or an object in the shape of `Record<EntityId, T>`, and replaces all existing entities with the values in the array.
 - `removeOne`: accepts a single entity ID value, and removes the entity with that ID if it exists.
 - `removeMany`: accepts an array of entity ID values, and removes each entity with those IDs if they exist.
 - `removeAll`: removes all entities from the entity state object.
@@ -214,6 +216,17 @@ The primary content of an entity adapter is a set of generated reducer functions
 - `upsertOne`: accepts a single entity. If an entity with that ID exists, it will perform a shallow update and the specified fields will be merged into the existing entity, with any matching fields overwriting the existing values. If the entity does not exist, it will be added.
 - `upsertMany`: accepts an array of entities or an object in the shape of `Record<EntityId, T>` that will be shallowly upserted.
 
+:::info Should I add, set or upsert my entity?
+
+All three options will insert _new_ entities into the list. However they differ in how they handle entities that already exist. If an entity **already exists**:
+
+- `addOne` and `addMany` will do nothing with the new entity
+- `setOne` and `setMany` will completely replace the old entity with the new one. This will also get rid of any properties on the entity that are not present in the new version of said entity.
+- `upsertOne` and `upsertMany` will do a shallow copy to merge the old and new entities overwritng existing values, adding any that were not there and not touching properties not provided in the new entity.
+
+:::
+
+
 Each method has a signature that looks like:
 
 ```ts no-transpile

packages/toolkit/package.json

@@ -98,7 +98,7 @@
     "query"
   ],
   "dependencies": {
-    "immer": "^9.0.1",
+    "immer": "^9.0.6",
     "redux": "^4.1.0",
     "redux-thunk": "^2.3.0",
     "reselect": "^4.0.0"

packages/toolkit/scripts/build.ts

@@ -6,13 +6,10 @@ import rollup from 'rollup'
 import path from 'path'
 import fs from 'fs-extra'
 import ts from 'typescript'
-import { RawSourceMap, SourceMapConsumer } from 'source-map'
+import type { RawSourceMap } from 'source-map'
 import merge from 'merge-source-map'
-import {
-  Extractor,
-  ExtractorConfig,
-  ExtractorResult,
-} from '@microsoft/api-extractor'
+import type { ExtractorResult } from '@microsoft/api-extractor'
+import { Extractor, ExtractorConfig } from '@microsoft/api-extractor'
 import yargs from 'yargs/yargs'
 
 import { extractInlineSourcemap, removeInlineSourceMap } from './sourcemap'
@@ -201,6 +198,7 @@ async function bundle(options: BuildOptions & EntryPointOptions) {
     const origin = chunk.text
     const sourcemap = extractInlineSourcemap(origin)
     const result = ts.transpileModule(removeInlineSourceMap(origin), {
+      fileName: chunk.path.replace(/.js$/, '.ts'),
       compilerOptions: {
         sourceMap: true,
         module:
@@ -217,7 +215,11 @@ async function bundle(options: BuildOptions & EntryPointOptions) {
       const transformResult = await terser.minify(
         appendInlineSourceMap(code, mapping),
         {
-          sourceMap: { content: 'inline', asObject: true } as any,
+          sourceMap: {
+            content: 'inline',
+            asObject: true,
+            url: path.basename(chunk.path) + '.map',
+          } as any,
           output: {
             comments: false,
           },

packages/toolkit/src/createAsyncThunk.ts

@@ -177,7 +177,7 @@ type GetSerializedErrorType<ThunkApiConfig> = ThunkApiConfig extends {
   ? GetSerializedErrorType
   : SerializedError
 
-type MaybePromise<T> = T | Promise<T>
+type MaybePromise<T> = T | Promise<T> | (T extends any ? Promise<T> : never)
 
 /**
  * A type describing the return value of the `payloadCreator` argument to `createAsyncThunk`.

packages/toolkit/src/query/fetchBaseQuery.ts

@@ -236,15 +236,29 @@ export function fetchBaseQuery({
 
     meta.response = responseClone
 
-    let resultData
+    let resultData: any
+    let responseText: string = ''
     try {
-      resultData = await handleResponse(response, responseHandler)
+      let handleResponseError
+      await Promise.all([
+        handleResponse(response, responseHandler).then(
+          (r) => (resultData = r),
+          (e) => (handleResponseError = e)
+        ),
+        // see https://github.com/node-fetch/node-fetch/issues/665#issuecomment-538995182
+        // we *have* to "use up" both streams at the same time or they will stop running in node-fetch scenarios
+        responseClone.text().then(
+          (r) => (responseText = r),
+          () => {}
+        ),
+      ])
+      if (handleResponseError) throw handleResponseError
     } catch (e) {
       return {
         error: {
           status: 'PARSING_ERROR',
           originalStatus: response.status,
-          data: await responseClone.clone().text(),
+          data: responseText,
           error: String(e),
         },
         meta,

packages/toolkit/src/tests/createAsyncThunk.test.ts

@@ -818,7 +818,7 @@ test('`condition` will see state changes from a synchonously invoked asyncThunk'
   expect(onStart).toHaveBeenCalledTimes(2)
 })
 
-describe.only('meta', () => {
+describe('meta', () => {
   const getNewStore = () =>
     configureStore({
       reducer(actions = [], action) {

packages/toolkit/src/tests/createAsyncThunk.typetest.ts

@@ -137,6 +137,16 @@ const anyAction = { type: 'foo' } as AnyAction
   expectType<RejectValue>(unwrapResult(returned))
 })()
 
+/**
+ * regression #1156: union return values fall back to allowing only single member
+ */
+;(async () => {
+  const fn = createAsyncThunk('session/isAdmin', async () => {
+    const response: boolean = false
+    return response
+  })
+})()
+
 {
   interface Item {
     name: string

yarn.lock

@@ -5034,7 +5034,7 @@ __metadata:
     eslint-plugin-react: ^7.23.2
     eslint-plugin-react-hooks: ^4.2.0
     fs-extra: ^9.1.0
-    immer: ^9.0.1
+    immer: ^9.0.6
     invariant: ^2.2.4
     jest: ^26.6.3
     json-stringify-safe: ^5.0.1
@@ -13776,10 +13776,10 @@ fsevents@^1.2.7:
   languageName: node
   linkType: hard
 
-"immer@npm:^9.0.1":
-  version: 9.0.2
-  resolution: "immer@npm:9.0.2"
-  checksum: 71487285a890e6fb92ed8950ce3b5b0e2546321bb4dfe82a7395fbc3f24308b0481387b5939fd35681bac8e36161d903f2bcd99ac045acd25ed3a7f21c629bfd
+"immer@npm:^9.0.6":
+  version: 9.0.6
+  resolution: "immer@npm:9.0.6"
+  checksum: 48c9b673ee0f3a05f0651f26c8ccdcbc034a47502dd26e716bd7bb301bcede194d1c5e895d4d6ec8d1e7bfb6444dd1056095b3f10e6c5e08cc3e798497a96531
   languageName: node
   linkType: hard