fix: always call fallback function

pmndrs · Oct 26, 2023 · 3744b21 · 3744b21
1 parent 04a880b
commit 3744b21
Showing 1 changed file with 6 additions and 10 deletions.
diff --git a/src/vanilla/utils/unwrap.ts b/src/vanilla/utils/unwrap.ts
@@ -37,7 +37,7 @@ export function unwrap<Value, Args extends unknown[], Result, PendingValue>(
     () => {
       type PromiseAndValue = { readonly p?: Promise<unknown> } & (
         | { readonly v: Awaited<Value> }
-        | { readonly f: PendingValue }
+        | { readonly f: PendingValue; readonly v?: Awaited<Value> }
       )
       const promiseErrorCache = new WeakMap<Promise<unknown>, unknown>()
       const promiseResultCache = new WeakMap<Promise<unknown>, Awaited<Value>>()
@@ -76,12 +76,8 @@ export function unwrap<Value, Args extends unknown[], Result, PendingValue>(
               )
               .finally(setSelf)
           }
-          if (prev) {
-            if ('v' in prev) {
-              return { p: promise, f: fallback(prev.v) }
-            } else if ('f' in prev) {
-              return { p: promise, f: prev.f }
-            }
+          if (prev && 'v' in prev) {
+            return { p: promise, f: fallback(prev.v), v: prev.v }
           }
           return { p: promise, f: fallback() }
         },
@@ -99,10 +95,10 @@ export function unwrap<Value, Args extends unknown[], Result, PendingValue>(
       return atom(
         (get) => {
           const state = get(promiseAndValueAtom)
-          if ('v' in state) {
-            return state.v
+          if ('f' in state) {
+            return state.f
           }
-          return state.f
+          return state.v
         },
         (_get, set, ...args) =>
           set(anAtom as WritableAtom<Value, unknown[], unknown>, ...args)