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

package/ui-react-inspector/index.js

@@ -93,6 +93,14 @@ const test = (regex, subject) => regex.test(subject);
 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 arrayHas = (array, value) => array.includes(value);
 const arrayEvery = (array, cb) => array.every(cb);
@@ -423,9 +431,7 @@ const createCustomPersister = (
       while (
         !isUndefined((action = arrayShift(mapGet(scheduleActions, scheduleId))))
       ) {
-        try {
-          await action();
-        } catch (error) {}
+        await tryCatch(action, onIgnoredError);
       }
       mapSet(scheduleRunning, scheduleId, 0);
     }
@@ -445,20 +451,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) {
-          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 */);
       });
     }
@@ -467,26 +476,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) {}
+    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;
@@ -498,9 +514,7 @@ const createCustomPersister = (
       setStatus(2 /* Saving */);
       saves++;
       await schedule(async () => {
-        try {
-          await setPersisted(getContent, changes);
-        } catch (error) {}
+        await tryCatch(() => setPersisted(getContent, changes), onIgnoredError);
         setStatus(0 /* Idle */);
       });
     }
@@ -517,7 +531,7 @@ const createCustomPersister = (
     });
     return persister;
   };
-  const stopAutoSave = () => {
+  const stopAutoSave = async () => {
     if (autoSaveListenerId) {
       store.delListener(autoSaveListenerId);
       autoSaveListenerId = void 0;
@@ -538,9 +552,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 = {
@@ -578,11 +593,7 @@ const createStoragePersister = (
   const addPersisterListener = (listener) => {
     const storageListener = (event) => {
       if (event.storageArea === storage && event.key === storageName) {
-        try {
-          listener(jsonParse(event.newValue));
-        } catch {
-          listener();
-        }
+        tryCatch(() => listener(jsonParse(event.newValue)), listener);
       }
     };
     WINDOW.addEventListener(STORAGE, storageListener);
@@ -1466,27 +1477,24 @@ const createStore = () => {
       );
     });
   const setTablesJson = (tablesJson) => {
-    try {
-      setOrDelTables(jsonParse(tablesJson));
-    } catch {}
+    tryCatch(() => setOrDelTables(jsonParse(tablesJson)));
     return store;
   };
   const setValuesJson = (valuesJson) => {
-    try {
-      setOrDelValues(jsonParse(valuesJson));
-    } catch {}
+    tryCatch(() => setOrDelValues(jsonParse(valuesJson)));
     return store;
   };
   const setJson = (tablesAndValuesJson) =>
-    fluentTransaction(() => {
-      try {
-        const [tables, values] = jsonParse(tablesAndValuesJson);
-        setOrDelTables(tables);
-        setOrDelValues(values);
-      } catch {
-        setTablesJson(tablesAndValuesJson);
-      }
-    });
+    fluentTransaction(() =>
+      tryCatch(
+        () => {
+          const [tables, values] = jsonParse(tablesAndValuesJson);
+          setOrDelTables(tables);
+          setOrDelValues(values);
+        },
+        () => setTablesJson(tablesAndValuesJson),
+      ),
+    );
   const setTablesSchema = (tablesSchema) =>
     fluentTransaction(() => {
       if ((hasTablesSchema = validateTablesSchema(tablesSchema))) {

package/ui-react-inspector/with-schemas/index.js

@@ -93,6 +93,14 @@ const test = (regex, subject) => regex.test(subject);
 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 arrayHas = (array, value) => array.includes(value);
 const arrayEvery = (array, cb) => array.every(cb);
@@ -423,9 +431,7 @@ const createCustomPersister = (
       while (
         !isUndefined((action = arrayShift(mapGet(scheduleActions, scheduleId))))
       ) {
-        try {
-          await action();
-        } catch (error) {}
+        await tryCatch(action, onIgnoredError);
       }
       mapSet(scheduleRunning, scheduleId, 0);
     }
@@ -445,20 +451,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) {
-          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 */);
       });
     }
@@ -467,26 +476,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) {}
+    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;
@@ -498,9 +514,7 @@ const createCustomPersister = (
       setStatus(2 /* Saving */);
       saves++;
       await schedule(async () => {
-        try {
-          await setPersisted(getContent, changes);
-        } catch (error) {}
+        await tryCatch(() => setPersisted(getContent, changes), onIgnoredError);
         setStatus(0 /* Idle */);
       });
     }
@@ -517,7 +531,7 @@ const createCustomPersister = (
     });
     return persister;
   };
-  const stopAutoSave = () => {
+  const stopAutoSave = async () => {
     if (autoSaveListenerId) {
       store.delListener(autoSaveListenerId);
       autoSaveListenerId = void 0;
@@ -538,9 +552,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 = {
@@ -578,11 +593,7 @@ const createStoragePersister = (
   const addPersisterListener = (listener) => {
     const storageListener = (event) => {
       if (event.storageArea === storage && event.key === storageName) {
-        try {
-          listener(jsonParse(event.newValue));
-        } catch {
-          listener();
-        }
+        tryCatch(() => listener(jsonParse(event.newValue)), listener);
       }
     };
     WINDOW.addEventListener(STORAGE, storageListener);
@@ -1466,27 +1477,24 @@ const createStore = () => {
       );
     });
   const setTablesJson = (tablesJson) => {
-    try {
-      setOrDelTables(jsonParse(tablesJson));
-    } catch {}
+    tryCatch(() => setOrDelTables(jsonParse(tablesJson)));
     return store;
   };
   const setValuesJson = (valuesJson) => {
-    try {
-      setOrDelValues(jsonParse(valuesJson));
-    } catch {}
+    tryCatch(() => setOrDelValues(jsonParse(valuesJson)));
     return store;
   };
   const setJson = (tablesAndValuesJson) =>
-    fluentTransaction(() => {
-      try {
-        const [tables, values] = jsonParse(tablesAndValuesJson);
-        setOrDelTables(tables);
-        setOrDelValues(values);
-      } catch {
-        setTablesJson(tablesAndValuesJson);
-      }
-    });
+    fluentTransaction(() =>
+      tryCatch(
+        () => {
+          const [tables, values] = jsonParse(tablesAndValuesJson);
+          setOrDelTables(tables);
+          setOrDelValues(values);
+        },
+        () => setTablesJson(tablesAndValuesJson),
+      ),
+    );
   const setTablesSchema = (tablesSchema) =>
     fluentTransaction(() => {
       if ((hasTablesSchema = validateTablesSchema(tablesSchema))) {

package/with-schemas/index.js

@@ -55,6 +55,15 @@ const slice = (arrayOrString, start, end) => arrayOrString.slice(start, end);
 const size = (arrayOrString) => arrayOrString.length;
 const test = (regex, subject) => regex.test(subject);
 const getUndefined = () => void 0;
+const noop = () => {};
+const tryCatch = async (action, then1, then2) => {
+  try {
+    return await action();
+  } catch (error) {
+    /* istanbul ignore next */
+    then1?.(error);
+  }
+};
 
 const arrayHas = (array, value) => array.includes(value);
 const arrayEvery = (array, cb) => array.every(cb);
@@ -1951,27 +1960,24 @@ const createStore = () => {
       );
     });
   const setTablesJson = (tablesJson) => {
-    try {
-      setOrDelTables(jsonParse(tablesJson));
-    } catch {}
+    tryCatch(() => setOrDelTables(jsonParse(tablesJson)));
     return store;
   };
   const setValuesJson = (valuesJson) => {
-    try {
-      setOrDelValues(jsonParse(valuesJson));
-    } catch {}
+    tryCatch(() => setOrDelValues(jsonParse(valuesJson)));
     return store;
   };
   const setJson = (tablesAndValuesJson) =>
-    fluentTransaction(() => {
-      try {
-        const [tables, values] = jsonParse(tablesAndValuesJson);
-        setOrDelTables(tables);
-        setOrDelValues(values);
-      } catch {
-        setTablesJson(tablesAndValuesJson);
-      }
-    });
+    fluentTransaction(() =>
+      tryCatch(
+        () => {
+          const [tables, values] = jsonParse(tablesAndValuesJson);
+          setOrDelTables(tables);
+          setOrDelValues(values);
+        },
+        () => setTablesJson(tablesAndValuesJson),
+      ),
+    );
   const setTablesSchema = (tablesSchema) =>
     fluentTransaction(() => {
       if ((hasTablesSchema = validateTablesSchema(tablesSchema))) {
@@ -2629,8 +2635,8 @@ const createMergeableStore = (uniqueId, getNow) => {
     stampUpdate(thingsStampMap, incomingThingsTime, thingsHash);
     return [thingsTime, oldThingsHash, thingsStampMap[2]];
   };
-  const preStartTransaction = () => {};
-  const preFinishTransaction = () => {};
+  const preStartTransaction = noop;
+  const preFinishTransaction = noop;
   const postFinishTransaction = () => {
     collClear(touchedCells);
     collClear(touchedValues);