tinybase 6.1.0-beta.4 → 6.1.0-beta.5

package/persisters/persister-indexed-db/with-schemas/index.js

@@ -21,6 +21,14 @@ const promiseAll = async (promises) => promise.all(promises);
 const errorNew = (message) => {
   throw new Error(message);
 };
+const tryCatch = async (action, then1, then2) => {
+  try {
+    return await action();
+  } catch (error) {
+    /* istanbul ignore next */
+    then1?.(error);
+  }
+};
 
 const arrayForEach = (array, cb) => array.forEach(cb);
 const arrayMap = (array, cb) => array.map(cb);
@@ -255,12 +263,7 @@ const createCustomPersister = (
       while (
         !isUndefined((action = arrayShift(mapGet(scheduleActions, scheduleId))))
       ) {
-        try {
-          await action();
-        } catch (error) {
-          /* istanbul ignore next */
-          onIgnoredError?.(error);
-        }
+        await tryCatch(action, onIgnoredError);
       }
       mapSet(scheduleRunning, scheduleId, 0);
     }
@@ -280,21 +283,23 @@ const createCustomPersister = (
       setStatus(1 /* Loading */);
       loads++;
       await schedule(async () => {
-        try {
-          const content = await getPersisted();
-          if (isArray(content)) {
-            setContentOrChanges(content);
-          } else if (initialContent) {
-            setDefaultContent(initialContent);
-          } else {
-            errorNew(`Content is not an array: ${content}`);
-          }
-        } catch (error) {
-          onIgnoredError?.(error);
-          if (initialContent) {
-            setDefaultContent(initialContent);
-          }
-        }
+        await tryCatch(
+          async () => {
+            const content = await getPersisted();
+            if (isArray(content)) {
+              setContentOrChanges(content);
+            } else if (initialContent) {
+              setDefaultContent(initialContent);
+            } else {
+              errorNew(`Content is not an array: ${content}`);
+            }
+          },
+          () => {
+            if (initialContent) {
+              setDefaultContent(initialContent);
+            }
+          },
+        );
         setStatus(0 /* Idle */);
       });
     }
@@ -303,29 +308,33 @@ const createCustomPersister = (
   const startAutoLoad = async (initialContent) => {
     stopAutoLoad();
     await load(initialContent);
-    try {
-      autoLoadHandle = await addPersisterListener(async (content, changes) => {
-        if (changes || content) {
-          /* istanbul ignore else */
-          if (status != 2 /* Saving */) {
-            setStatus(1 /* Loading */);
-            loads++;
-            setContentOrChanges(changes ?? content);
-            setStatus(0 /* Idle */);
-          }
-        } else {
-          await load();
-        }
-      });
-    } catch (error) {
-      /* istanbul ignore next */
-      onIgnoredError?.(error);
-    }
+    await tryCatch(
+      async () =>
+        (autoLoadHandle = await addPersisterListener(
+          async (content, changes) => {
+            if (changes || content) {
+              /* istanbul ignore else */
+              if (status != 2 /* Saving */) {
+                setStatus(1 /* Loading */);
+                loads++;
+                setContentOrChanges(changes ?? content);
+                setStatus(0 /* Idle */);
+              }
+            } else {
+              await load();
+            }
+          },
+        )),
+      onIgnoredError,
+    );
     return persister;
   };
-  const stopAutoLoad = () => {
+  const stopAutoLoad = async () => {
     if (autoLoadHandle) {
-      delPersisterListener(autoLoadHandle);
+      await tryCatch(
+        () => delPersisterListener(autoLoadHandle),
+        onIgnoredError,
+      );
       autoLoadHandle = void 0;
     }
     return persister;
@@ -337,12 +346,7 @@ const createCustomPersister = (
       setStatus(2 /* Saving */);
       saves++;
       await schedule(async () => {
-        try {
-          await setPersisted(getContent, changes);
-        } catch (error) {
-          /* istanbul ignore next */
-          onIgnoredError?.(error);
-        }
+        await tryCatch(() => setPersisted(getContent, changes), onIgnoredError);
         setStatus(0 /* Idle */);
       });
     }
@@ -359,7 +363,7 @@ const createCustomPersister = (
     });
     return persister;
   };
-  const stopAutoSave = () => {
+  const stopAutoSave = async () => {
     if (autoSaveListenerId) {
       store.delListener(autoSaveListenerId);
       autoSaveListenerId = void 0;
@@ -380,9 +384,10 @@ const createCustomPersister = (
     return persister;
   };
   const getStore = () => store;
-  const destroy = () => {
+  const destroy = async () => {
     arrayClear(mapGet(scheduleActions, scheduleId));
-    return stopAutoLoad().stopAutoSave();
+    await persister.stopAutoLoad();
+    return await persister.stopAutoSave();
   };
   const getStats = () => ({loads, saves});
   const persister = {
@@ -439,34 +444,34 @@ const createIndexedDbPersister = (
       );
       request.onupgradeneeded = () =>
         create &&
-        arrayMap(OBJECT_STORE_NAMES, (objectStoreName) => {
-          try {
-            request.result.createObjectStore(objectStoreName, KEY_PATH);
-          } catch {}
-        });
-      request.onsuccess = async () => {
-        try {
-          const transaction = request.result.transaction(
-            OBJECT_STORE_NAMES,
-            'readwrite',
-          );
-          const result = await promiseAll(
-            arrayMap(
+        arrayMap(OBJECT_STORE_NAMES, (objectStoreName) =>
+          tryCatch(() =>
+            request.result.createObjectStore(objectStoreName, KEY_PATH),
+          ),
+        );
+      request.onsuccess = () =>
+        tryCatch(
+          async () => {
+            const transaction = request.result.transaction(
               OBJECT_STORE_NAMES,
-              async (objectStoreName, index) =>
-                await forObjectStore(
+              'readwrite',
+            );
+            const result = await promiseAll(
+              arrayMap(OBJECT_STORE_NAMES, (objectStoreName, index) =>
+                forObjectStore(
                   transaction.objectStore(objectStoreName),
                   params[index],
                 ),
-            ),
-          );
-          request.result.close();
-          resolve(result);
-        } catch (e) {
-          request.result.close();
-          reject(e);
-        }
-      };
+              ),
+            );
+            request.result.close();
+            resolve(result);
+          },
+          (error) => {
+            request.result.close();
+            reject(error);
+          },
+        );
       request.onerror = () => reject('indexedDB.open error');
     });
   const getPersisted = async () =>
@@ -478,10 +483,9 @@ const createIndexedDbPersister = (
         ]),
       ),
     );
-  const setPersisted = async (getContent) =>
-    await forObjectStores(
-      async (objectStore, content) =>
-        await objectStoreMatch(objectStore, content),
+  const setPersisted = (getContent) =>
+    forObjectStores(
+      (objectStore, content) => objectStoreMatch(objectStore, content),
       getContent(),
       1,
     );