dont track parentValues

square · Aug 16, 2023 · 852d7fb · 852d7fb
1 parent 1009d3d
commit 852d7fb
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 28 deletions.
diff --git a/src/async-stores/index.ts b/src/async-stores/index.ts
@@ -103,10 +103,8 @@ export const asyncWritable = <S extends Stores, T>(
     return currentLoadPromise as T;
   };
 
-  let parentValues: StoresValues<S>;
-
   let mostRecentLoadTracker: Record<string, never>;
-  const selfLoadThenSet = async () => {
+  const selfLoadThenSet = async (parentValues: StoresValues<S>) => {
     const thisLoadTracker = {};
     mostRecentLoadTracker = thisLoadTracker;
 
@@ -148,15 +146,14 @@ export const asyncWritable = <S extends Stores, T>(
   // called when store receives its first subscriber
   const onFirstSubscription: StartStopNotifier<T> = () => {
     setCurrentLoadPromise();
-    parentValues = getAll(stores);
     setState('LOADING');
 
     const initialLoad = async () => {
       try {
-        parentValues = await loadAll(stores);
+        const parentValues = await loadAll(stores);
         ready = true;
         changeReceived = false;
-        selfLoadThenSet();
+        selfLoadThenSet(parentValues);
       } catch (error) {
         ready = true;
         changeReceived = false;
@@ -173,10 +170,10 @@ export const asyncWritable = <S extends Stores, T>(
           setState('RELOADING');
         }
         ready = false;
-        parentValues = await loadAll(stores);
+        const parentValues = await loadAll(stores);
         // eslint-disable-next-line require-atomic-updates
         ready = true;
-        selfLoadThenSet();
+        selfLoadThenSet(parentValues);
       }
     };
 
@@ -216,7 +213,7 @@ export const asyncWritable = <S extends Stores, T>(
       try {
         const writeResponse = (await writePersistFunction(
           newValue,
-          parentValues,
+          getAll(stores),
           oldValue
         )) as T;
 
@@ -260,10 +257,10 @@ export const asyncWritable = <S extends Stores, T>(
 
     const visitMap = visitedMap ?? new WeakMap();
     try {
-      parentValues = await reloadAll(stores, visitMap);
+      const parentValues = await reloadAll(stores, visitMap);
       ready = true;
       if (changeReceived || reloadable || wasErrored) {
-        selfLoadThenSet();
+        selfLoadThenSet(parentValues);
       } else {
         resolveCurrentLoad(get(thisStore));
         setState('LOADED');

diff --git a/test/utils/index.test.ts b/test/utils/index.test.ts
@@ -1,7 +1,6 @@
 import {
   asyncReadable,
   Loadable,
-  readable,
   loadAll,
   rebounce,
   reloadAll,
@@ -16,7 +15,6 @@ describe('loadAll / reloadAll utils', () => {
   const myLoadable = asyncReadable(undefined, () => Promise.resolve('loaded'));
   const myReloadable = asyncReadable(undefined, mockReload, {
     reloadable: true,
-    debug: 'myReloadable:',
   });
   const badLoadable = {
     load: () => Promise.reject(new Error('E')),
@@ -62,28 +60,26 @@ describe('loadAll / reloadAll utils', () => {
     });
 
     it('reloads and resolves to values of all stores', async () => {
-      console.log('starting test');
       await loadAll([myLoadable, myReloadable]);
-      console.log('starting reload');
       expect(reloadAll([myLoadable, myReloadable])).resolves.toStrictEqual([
         'loaded',
         'second value',
       ]);
     });
 
-    // it('handles rejection', () => {
-    //   expect(reloadAll([myLoadable, badLoadable])).rejects.toStrictEqual(
-    //     new Error('F')
-    //   );
-    // });
-
-    // it('does not reload already visited store', () => {
-    //   const visitedMap = new WeakMap();
-    //   visitedMap.set(myReloadable, myReloadable.reload());
-    //   expect(reloadAll(myReloadable, visitedMap)).resolves.toStrictEqual(
-    //     'first value'
-    //   );
-    // });
+    it('handles rejection', () => {
+      expect(reloadAll([myLoadable, badLoadable])).rejects.toStrictEqual(
+        new Error('F')
+      );
+    });
+
+    it('does not reload already visited store', () => {
+      const visitedMap = new WeakMap();
+      visitedMap.set(myReloadable, myReloadable.reload());
+      expect(reloadAll(myReloadable, visitedMap)).resolves.toStrictEqual(
+        'first value'
+      );
+    });
   });
 
   describe('safeLoad function', () => {