handle undefined data properly, fixes #138

IdoPesok · Jun 22, 2024 · 388c36b · 388c36b
1 parent 0ba650d
commit 388c36b
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 5 deletions.
diff --git a/.changeset/bright-apples-breathe.md b/.changeset/bright-apples-breathe.md
@@ -0,0 +1,5 @@
+---
+"zsa-react": patch
+---
+
+Fix isSuccess with undefined data
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -35,3 +35,6 @@ jobs:
 
       - name: Test
         run: npm run test
+
+      - name: Typecheck
+        run: npm run typecheck
diff --git a/packages/zsa-react/src/index.ts b/packages/zsa-react/src/index.ts
@@ -142,7 +142,12 @@ export const useServerAction = <
         if (oldResult.status === "filled") {
           setResult(oldResult.result)
         } else {
-          setResult({ error: err, isError: true, data: undefined })
+          setResult({
+            error: err,
+            isError: true,
+            data: undefined,
+            isSuccess: false,
+          })
         }
 
         // clear the old data
@@ -162,6 +167,7 @@ export const useServerAction = <
         isError: false,
         error: undefined,
         data: data ?? undefined,
+        isSuccess: true,
       }
 
       setResult(res)
@@ -234,6 +240,7 @@ export const useServerAction = <
         isError: false,
         error: undefined,
         data: data ?? undefined,
+        isSuccess: true,
       })
     },
     [execute]

diff --git a/packages/zsa-react/src/results.ts b/packages/zsa-react/src/results.ts
@@ -9,6 +9,7 @@ import {
  */
 export type TInnerResult<TServerAction extends TAnyZodSafeFunctionHandler> = {
   isError: boolean
+  isSuccess: boolean
   error: undefined | inferServerActionError<TServerAction>
   data: undefined | inferServerActionReturnData<TServerAction>
 }
@@ -101,22 +102,22 @@ export const calculateResultFromState = <
       isSuccess: false,
       status: "pending",
     }
-  } else if (isPending && oldResult.status === "filled" && result.data) {
+  } else if (isPending && oldResult.status === "filled" && result.isSuccess) {
     return {
       isPending: true,
       isOptimistic: true,
-      data: result.data,
+      data: result.data as any,
       isError: false,
       error: undefined,
       isSuccess: false,
       status: "pending",
     }
-  } else if (!result.isError && result.data) {
+  } else if (result.isSuccess) {
     // success state
     return {
       isPending: false,
       isOptimistic: false,
-      data: result.data,
+      data: result.data as any,
       isError: false,
       error: undefined,
       isSuccess: true,
@@ -156,12 +157,14 @@ export const getEmptyResult = <
     ? // if there is no initial data
       {
         isError: false,
+        isSuccess: false,
         error: undefined,
         data: undefined,
       }
     : {
         // if there is initial data
         isError: false,
+        isSuccess: true,
         error: undefined,
         data: initialData,
       }