Set expires at only when value is set

pixiebrix · Sep 25, 2024 · 1cd7433 · 1cd7433
1 parent 7ff7b32
commit 1cd7433
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/src/bricks/transformers/controlFlow/WithCache.ts b/src/bricks/transformers/controlFlow/WithCache.ts
@@ -317,7 +317,8 @@ export class WithCache extends TransformerABC {
       // Initialize the mod variable.
       await setModVariable({
         requestId,
-        expiresAt,
+        // Don't set expiresAt until the value is set
+        expiresAt: null,
         isLoading: true,
         isFetching: true,
         isSuccess: false,
@@ -332,7 +333,6 @@ export class WithCache extends TransformerABC {
         // the state could have been deleted since the getState call. Therefore, pass a full state object
         ...currentVariable,
         requestId,
-        expiresAt,
         isFetching: true,
         currentData: null,
       });
@@ -379,6 +379,7 @@ export class WithCache extends TransformerABC {
       data,
       requestId,
       error: null,
+      // Record expiresAt (if provided) when the value is set
       expiresAt,
     });