revert changes, just change return type of single-argument `fulfillWi…

…thValue` signature
reduxjs · Nov 10, 2022 · 73cd603 · 73cd603
1 parent 8909f10
commit 73cd603
Showing 1 changed file with 24 additions and 21 deletions.
diff --git a/packages/toolkit/src/createAsyncThunk.ts b/packages/toolkit/src/createAsyncThunk.ts
@@ -35,9 +35,7 @@ export type BaseThunkAPI<
   >
   fulfillWithValue: IsUnknown<
     FulfilledMeta,
-    <FulfilledValue>(
-      value: FulfilledValue
-    ) => FulfillWithMeta<FulfilledValue, FulfilledMeta>,
+    <FulfilledValue>(value: FulfilledValue) => FulfilledValue,
     <FulfilledValue>(
       value: FulfilledValue,
       meta: FulfilledMeta
@@ -405,18 +403,16 @@ export type AsyncThunk<
   Returned,
   ThunkArg,
   ThunkApiConfig extends AsyncThunkConfig
-> = [Returned] extends [FulfillWithMeta<infer P, infer M>]
-  ? AsyncThunk<P, ThunkArg, ThunkApiConfig & { fulfilledMeta: M }>
-  : AsyncThunkActionCreator<Returned, ThunkArg, ThunkApiConfig> & {
-      pending: AsyncThunkPendingActionCreator<ThunkArg, ThunkApiConfig>
-      rejected: AsyncThunkRejectedActionCreator<ThunkArg, ThunkApiConfig>
-      fulfilled: AsyncThunkFulfilledActionCreator<
-        Returned,
-        ThunkArg,
-        ThunkApiConfig
-      >
-      typePrefix: string
-    }
+> = AsyncThunkActionCreator<Returned, ThunkArg, ThunkApiConfig> & {
+  pending: AsyncThunkPendingActionCreator<ThunkArg, ThunkApiConfig>
+  rejected: AsyncThunkRejectedActionCreator<ThunkArg, ThunkApiConfig>
+  fulfilled: AsyncThunkFulfilledActionCreator<
+    Returned,
+    ThunkArg,
+    ThunkApiConfig
+  >
+  typePrefix: string
+}
 
 type OverrideThunkApiConfigs<OldConfig, NewConfig> = Id<
   NewConfig & Omit<OldConfig, keyof NewConfig>
@@ -696,12 +692,19 @@ If you want to use the AbortController to react to \`abort\` events, please cons
       }
     }
 
-    return Object.assign(actionCreator as any, {
-      pending,
-      rejected,
-      fulfilled,
-      typePrefix,
-    })
+    return Object.assign(
+      actionCreator as AsyncThunkActionCreator<
+        Returned,
+        ThunkArg,
+        ThunkApiConfig
+      >,
+      {
+        pending,
+        rejected,
+        fulfilled,
+        typePrefix,
+      }
+    )
   }
   createAsyncThunk.withTypes = () => createAsyncThunk