Fixed initial value persistence in storage

smikhalevski · Jun 17, 2024 · 315c91e · 315c91e
1 parent 1c6dff6
commit 315c91e
Show file tree

Hide file tree

Showing 2 changed files with 44 additions and 4 deletions.
diff --git a/src/main/plugin/synchronizeStorage.ts b/src/main/plugin/synchronizeStorage.ts
@@ -114,7 +114,9 @@ export default function synchronizeStorage<Value = any>(
       }
     };
 
-    receiveState(storage.getItem(executorStorageKey));
+    if (executor.task === null) {
+      receiveState(storage.getItem(executorStorageKey));
+    }
 
     executor.subscribe(event => {
       switch (event.type) {
@@ -129,16 +131,19 @@ export default function synchronizeStorage<Value = any>(
         case 'fulfilled':
         case 'rejected':
         case 'invalidated':
-          if (!executor.isActive) {
-            break;
-          }
           const stateStr = serializer.stringify(executor.toJSON());
 
           if (latestStateStr !== stateStr) {
             storage.setItem(executorStorageKey, stateStr);
           }
           break;
 
+        case 'aborted':
+          if (!executor.isSettled) {
+            receiveState(storage.getItem(executorStorageKey));
+          }
+          break;
+
         case 'deactivated':
           if (typeof window !== 'undefined') {
             window.removeEventListener('storage', handleStorage);

diff --git a/src/test/plugin/synchronizeStorage.test.ts b/src/test/plugin/synchronizeStorage.test.ts
@@ -148,6 +148,41 @@ describe('synchronizeStorage', () => {
     );
   });
 
+  test('sets storage item to the initial value', () => {
+    const executor = manager.getOrCreate('xxx', 'aaa', [synchronizeStorage(localStorage)]);
+
+    expect(executor.value).toBe('aaa');
+    expect(localStorage.getItem('"xxx"')).toBe(
+      '{"key":"xxx","isFulfilled":true,"value":"aaa","annotations":{},"settledAt":50,"invalidatedAt":0}'
+    );
+  });
+
+  test('does not resolve the executor if initial task is provided', async () => {
+    const executor = manager.getOrCreate('xxx', () => 'aaa', [synchronizeStorage(localStorage)]);
+
+    expect(executor.value).toBeUndefined();
+
+    await executor.getOrAwait();
+
+    expect(executor.value).toBe('aaa');
+
+    expect(localStorage.getItem('"xxx"')).toBe(
+      '{"key":"xxx","isFulfilled":true,"value":"aaa","annotations":{},"settledAt":50,"invalidatedAt":0}'
+    );
+  });
+
+  test('resolves executor if initial task was aborted', () => {
+    localStorage.setItem('"xxx"', '{"key":"xxx","isFulfilled":true,"value":"aaa","settledAt":30,"invalidatedAt":0}');
+
+    const executor = manager.getOrCreate('xxx', () => 'bbb', [synchronizeStorage(localStorage)]);
+    executor.abort();
+
+    expect(executor.value).toBe('aaa');
+    expect(localStorage.getItem('"xxx"')).toBe(
+      '{"key":"xxx","isFulfilled":true,"value":"aaa","annotations":{},"settledAt":30,"invalidatedAt":0}'
+    );
+  });
+
   test('does not set storage item or resolve an executor if an executor is pending', async () => {
     const executor = manager.getOrCreate('xxx', undefined, [
       executor => {