tinybase 4.0.2 → 4.0.4

package/lib/debug/persisters/persister-sqlite3.js

@@ -84,7 +84,7 @@ const escapeId = (str) => `"${str.replace(/"/g, '""')}"`;
 const SELECT_STAR_FROM = 'SELECT*FROM';
 const FROM_PRAGMA_TABLE = 'FROM pragma_table_';
 const WHERE = 'WHERE';
-const getCommandFunctions = (cmd, managedTableNames) => {
+const getCommandFunctions = (cmd, managedTableNames, onIgnoredError) => {
   const schemaMap = mapNew();
   const canSelect = (tableName, rowIdColumnName) =>
     !isUndefined(mapGet(mapGet(schemaMap, tableName), rowIdColumnName));
@@ -282,7 +282,18 @@ const getCommandFunctions = (cmd, managedTableNames) => {
       }
     }
   };
-  return [refreshSchema, loadTable, saveTable];
+  const transaction = async (actions) => {
+    let result;
+    await cmd('BEGIN');
+    try {
+      result = await actions();
+    } catch (error) {
+      onIgnoredError?.(error);
+    }
+    await cmd('END');
+    return result;
+  };
+  return [refreshSchema, loadTable, saveTable, transaction];
 };
 const upsert = async (
   cmd,
@@ -332,32 +343,41 @@ const jsonString = (obj) =>
   );
 const jsonParse = JSON.parse;
 
+const scheduleRunning = mapNew();
+const scheduleActions = mapNew();
 const createCustomPersister = (
   store,
   getPersisted,
   setPersisted,
   addPersisterListener,
   delPersisterListener,
+  onIgnoredError,
+  scheduleId = [],
 ) => {
   let listenerId;
   let loadSave = 0;
   let loads = 0;
   let saves = 0;
-  let running = 0;
   let listening = 0;
   let action;
   let listeningHandle;
-  const scheduledActions = [];
+  mapEnsure(scheduleRunning, scheduleId, () => 0);
+  mapEnsure(scheduleActions, scheduleId, () => []);
   const run = async () => {
     /* istanbul ignore else */
-    if (!running) {
-      running = 1;
-      while (!isUndefined((action = arrayShift(scheduledActions)))) {
+    if (!mapGet(scheduleRunning, scheduleId)) {
+      mapSet(scheduleRunning, scheduleId, 1);
+      while (
+        !isUndefined((action = arrayShift(mapGet(scheduleActions, scheduleId))))
+      ) {
         try {
           await action();
-        } catch {}
+        } catch (error) {
+          /* istanbul ignore next */
+          onIgnoredError?.(error);
+        }
       }
-      running = 0;
+      mapSet(scheduleRunning, scheduleId, 0);
     }
   };
   const loadLock = async (actions) => {
@@ -388,16 +408,22 @@ const createCustomPersister = (
       await persister.load(initialTables, initialValues);
       listening = 1;
       listeningHandle = addPersisterListener(
-        async (getContent, getTransactionChanges) =>
-          await loadLock(async () => {
-            if (getTransactionChanges) {
-              store.setTransactionChanges(getTransactionChanges());
-            } else {
+        async (getContent, getTransactionChanges) => {
+          if (getTransactionChanges) {
+            const transactionChanges = getTransactionChanges();
+            await loadLock(async () =>
+              store.setTransactionChanges(transactionChanges),
+            );
+          } else {
+            await loadLock(async () => {
               try {
                 store.setContent(getContent?.() ?? (await getPersisted()));
-              } catch {}
-            }
-          }),
+              } catch (error) {
+                onIgnoredError?.(error);
+              }
+            });
+          }
+        },
       );
       return persister;
     },
@@ -419,7 +445,10 @@ const createCustomPersister = (
         await persister.schedule(async () => {
           try {
             await setPersisted(store.getContent, getTransactionChanges);
-          } catch {}
+          } catch (error) {
+            /* istanbul ignore next */
+            onIgnoredError?.(error);
+          }
           loadSave = 0;
         });
       }
@@ -442,7 +471,7 @@ const createCustomPersister = (
       return persister;
     },
     schedule: async (...actions) => {
-      arrayPush(scheduledActions, ...actions);
+      arrayPush(mapGet(scheduleActions, scheduleId), ...actions);
       await run();
       return persister;
     },
@@ -459,28 +488,30 @@ const createJsonSqlitePersister = (
   cmd,
   addPersisterListener,
   delPersisterListener,
+  onIgnoredError,
   [storeTableName],
   managedTableNames,
+  scheduleId,
 ) => {
-  const [refreshSchema, loadTable, saveTable] = getCommandFunctions(
-    cmd,
-    managedTableNames,
-  );
-  const getPersisted = async () => {
-    await refreshSchema();
-    return jsonParse(
-      (await loadTable(storeTableName, DEFAULT_ROW_ID_COLUMN_NAME))[
-        SINGLE_ROW_ID
-      ]?.[STORE_COLUMN],
-    );
-  };
+  const [refreshSchema, loadTable, saveTable, transaction] =
+    getCommandFunctions(cmd, managedTableNames, onIgnoredError);
+  const getPersisted = async () =>
+    await transaction(async () => {
+      await refreshSchema();
+      return jsonParse(
+        (await loadTable(storeTableName, DEFAULT_ROW_ID_COLUMN_NAME))[
+          SINGLE_ROW_ID
+        ]?.[STORE_COLUMN] ?? 'null',
+      );
+    });
   const setPersisted = async (getContent) =>
-    persister.schedule(refreshSchema, async () => {
+    await transaction(async () => {
+      await refreshSchema();
       await saveTable(
         storeTableName,
         DEFAULT_ROW_ID_COLUMN_NAME,
         {
-          [SINGLE_ROW_ID]: {[STORE_COLUMN]: jsonString(getContent())},
+          [SINGLE_ROW_ID]: {[STORE_COLUMN]: jsonString(getContent() ?? null)},
         },
         true,
         true,
@@ -492,6 +523,8 @@ const createJsonSqlitePersister = (
     setPersisted,
     addPersisterListener,
     delPersisterListener,
+    onIgnoredError,
+    scheduleId,
   );
   return persister;
 };
@@ -501,17 +534,17 @@ const createTabularSqlitePersister = (
   cmd,
   addPersisterListener,
   delPersisterListener,
+  onIgnoredError,
   [
     tablesLoadConfig,
     tablesSaveConfig,
     [valuesLoad, valuesSave, valuesTableName],
   ],
   managedTableNames,
+  scheduleId,
 ) => {
-  const [refreshSchema, loadTable, saveTable] = getCommandFunctions(
-    cmd,
-    managedTableNames,
-  );
+  const [refreshSchema, loadTable, saveTable, transaction] =
+    getCommandFunctions(cmd, managedTableNames, onIgnoredError);
   const saveTables = async (tables, partial) =>
     await promiseAll(
       mapMap(
@@ -566,32 +599,36 @@ const createTabularSqlitePersister = (
           SINGLE_ROW_ID
         ]
       : {};
-  const getPersisted = async () => {
-    await refreshSchema();
-    const tables = await loadTables();
-    const values = await loadValues();
-    return !objIsEmpty(tables) || !isUndefined(values)
-      ? [tables, values]
-      : void 0;
-  };
-  const setPersisted = async (getContent, getTransactionChanges) => {
-    await refreshSchema();
-    if (!isUndefined(getTransactionChanges)) {
-      const [tableChanges, valueChanges] = getTransactionChanges();
-      await saveTables(tableChanges, true);
-      await saveValues(valueChanges, true);
-    } else {
-      const [tables, values] = getContent();
-      await saveTables(tables);
-      await saveValues(values);
-    }
-  };
+  const getPersisted = async () =>
+    await transaction(async () => {
+      await refreshSchema();
+      const tables = await loadTables();
+      const values = await loadValues();
+      return !objIsEmpty(tables) || !isUndefined(values)
+        ? [tables, values]
+        : void 0;
+    });
+  const setPersisted = async (getContent, getTransactionChanges) =>
+    await transaction(async () => {
+      await refreshSchema();
+      if (!isUndefined(getTransactionChanges)) {
+        const [tableChanges, valueChanges] = getTransactionChanges();
+        await saveTables(tableChanges, true);
+        await saveValues(valueChanges, true);
+      } else {
+        const [tables, values] = getContent();
+        await saveTables(tables);
+        await saveValues(values);
+      }
+    });
   const persister = createCustomPersister(
     store,
     getPersisted,
     setPersisted,
     addPersisterListener,
     delPersisterListener,
+    onIgnoredError,
+    scheduleId,
   );
   return persister;
 };
@@ -698,7 +735,9 @@ const createSqlitePersister = (
   cmd,
   addUpdateListener,
   delUpdateListener,
-  logSql,
+  onSqlCommand,
+  onIgnoredError,
+  scheduleId,
 ) => {
   let dataVersion;
   let schemaVersion;
@@ -738,26 +777,34 @@ const createSqlitePersister = (
   };
   return (isJson ? createJsonSqlitePersister : createTabularSqlitePersister)(
     store,
-    logSql
+    onSqlCommand
       ? async (sql, args) => {
-          logSql(sql, args);
+          onSqlCommand(sql, args);
           return await cmd(sql, args);
         }
       : cmd,
     addPersisterListener,
     delPersisterListener,
+    onIgnoredError,
     defaultedConfig,
     collValues(managedTableNamesSet),
+    scheduleId,
   );
 };
 
 const CHANGE = 'change';
-const createSqlite3Persister = (store, db, configOrStoreTableName, logSql) =>
+const createSqlite3Persister = (
+  store,
+  db,
+  configOrStoreTableName,
+  onSqlCommand,
+  onIgnoredError,
+) =>
   createSqlitePersister(
     store,
     configOrStoreTableName,
-    (sql, args = []) =>
-      promiseNew((resolve, reject) =>
+    async (sql, args = []) =>
+      await promiseNew((resolve, reject) =>
         db.all(sql, args, (error, rows) =>
           error ? reject(error) : resolve(rows.map((row) => ({...row}))),
         ),
@@ -768,7 +815,9 @@ const createSqlite3Persister = (store, db, configOrStoreTableName, logSql) =>
       return observer;
     },
     (observer) => db.off(CHANGE, observer),
-    logSql,
+    onSqlCommand,
+    onIgnoredError,
+    db,
   );
 
 export {createSqlite3Persister};

package/lib/debug/persisters/persister-yjs.js

@@ -1,4 +1,4 @@
-import {Map} from 'yjs';
+import {Map as Map$1} from 'yjs';
 
 const TINYBASE = 'tinybase';
 
@@ -33,32 +33,58 @@ const objEnsure = (obj, id, getDefaultValue) => {
   return obj[id];
 };
 
+const collHas = (coll, keyOrValue) => coll?.has(keyOrValue) ?? false;
+const collForEach = (coll, cb) => coll?.forEach(cb);
+const collDel = (coll, keyOrValue) => coll?.delete(keyOrValue);
+
+const mapNew = (entries) => new Map(entries);
+const mapGet = (map, key) => map?.get(key);
+const mapForEach = (map, cb) =>
+  collForEach(map, (value, key) => cb(key, value));
+const mapSet = (map, key, value) =>
+  isUndefined(value) ? (collDel(map, key), map) : map?.set(key, value);
+const mapEnsure = (map, key, getDefaultValue) => {
+  if (!collHas(map, key)) {
+    mapSet(map, key, getDefaultValue());
+  }
+  return mapGet(map, key);
+};
+
+const scheduleRunning = mapNew();
+const scheduleActions = mapNew();
 const createCustomPersister = (
   store,
   getPersisted,
   setPersisted,
   addPersisterListener,
   delPersisterListener,
+  onIgnoredError,
+  scheduleId = [],
 ) => {
   let listenerId;
   let loadSave = 0;
   let loads = 0;
   let saves = 0;
-  let running = 0;
   let listening = 0;
   let action;
   let listeningHandle;
-  const scheduledActions = [];
+  mapEnsure(scheduleRunning, scheduleId, () => 0);
+  mapEnsure(scheduleActions, scheduleId, () => []);
   const run = async () => {
     /* istanbul ignore else */
-    if (!running) {
-      running = 1;
-      while (!isUndefined((action = arrayShift(scheduledActions)))) {
+    if (!mapGet(scheduleRunning, scheduleId)) {
+      mapSet(scheduleRunning, scheduleId, 1);
+      while (
+        !isUndefined((action = arrayShift(mapGet(scheduleActions, scheduleId))))
+      ) {
         try {
           await action();
-        } catch {}
+        } catch (error) {
+          /* istanbul ignore next */
+          onIgnoredError?.(error);
+        }
       }
-      running = 0;
+      mapSet(scheduleRunning, scheduleId, 0);
     }
   };
   const loadLock = async (actions) => {
@@ -89,16 +115,22 @@ const createCustomPersister = (
       await persister.load(initialTables, initialValues);
       listening = 1;
       listeningHandle = addPersisterListener(
-        async (getContent, getTransactionChanges) =>
-          await loadLock(async () => {
-            if (getTransactionChanges) {
-              store.setTransactionChanges(getTransactionChanges());
-            } else {
+        async (getContent, getTransactionChanges) => {
+          if (getTransactionChanges) {
+            const transactionChanges = getTransactionChanges();
+            await loadLock(async () =>
+              store.setTransactionChanges(transactionChanges),
+            );
+          } else {
+            await loadLock(async () => {
               try {
                 store.setContent(getContent?.() ?? (await getPersisted()));
-              } catch {}
-            }
-          }),
+              } catch (error) {
+                onIgnoredError?.(error);
+              }
+            });
+          }
+        },
       );
       return persister;
     },
@@ -120,7 +152,10 @@ const createCustomPersister = (
         await persister.schedule(async () => {
           try {
             await setPersisted(store.getContent, getTransactionChanges);
-          } catch {}
+          } catch (error) {
+            /* istanbul ignore next */
+            onIgnoredError?.(error);
+          }
           loadSave = 0;
         });
       }
@@ -143,7 +178,7 @@ const createCustomPersister = (
       return persister;
     },
     schedule: async (...actions) => {
-      arrayPush(scheduledActions, ...actions);
+      arrayPush(mapGet(scheduleActions, scheduleId), ...actions);
       await run();
       return persister;
     },
@@ -154,18 +189,13 @@ const createCustomPersister = (
   return objFreeze(persister);
 };
 
-const collForEach = (coll, cb) => coll?.forEach(cb);
-
-const mapForEach = (map, cb) =>
-  collForEach(map, (value, key) => cb(key, value));
-
 const tablesKey = 't';
 const valuesKey = 'v';
 const DELETE = 'delete';
 const ensureYContent = (yContent) => {
   if (!yContent.size) {
-    yContent.set(tablesKey, new Map());
-    yContent.set(valuesKey, new Map());
+    yContent.set(tablesKey, new Map$1());
+    yContent.set(valuesKey, new Map$1());
   }
 };
 const getYContent = (yContent) => [
@@ -292,7 +322,7 @@ const setTransactionChangesToYDoc = (
 const yMapMatch = (yMapOrParent, idInParent, obj, set) => {
   const yMap = isUndefined(idInParent)
     ? yMapOrParent
-    : yMapOrParent.get(idInParent) ?? yMapOrParent.set(idInParent, new Map());
+    : yMapOrParent.get(idInParent) ?? yMapOrParent.set(idInParent, new Map$1());
   let changed;
   objMap(obj, (value, id) => {
     if (set(yMap, id, value)) {
@@ -310,7 +340,12 @@ const yMapMatch = (yMapOrParent, idInParent, obj, set) => {
   }
   return changed;
 };
-const createYjsPersister = (store, yDoc, yMapName = TINYBASE) => {
+const createYjsPersister = (
+  store,
+  yDoc,
+  yMapName = TINYBASE,
+  onIgnoredError,
+) => {
   const yContent = yDoc.getMap(yMapName);
   const getPersisted = async () =>
     yContent.size
@@ -335,6 +370,7 @@ const createYjsPersister = (store, yDoc, yMapName = TINYBASE) => {
     setPersisted,
     addPersisterListener,
     delPersisterListener,
+    onIgnoredError,
   );
 };
 

package/lib/debug/persisters.js

@@ -15,32 +15,55 @@ const isObject = (obj) =>
 const objSize = (obj) => arrayLength(objIds(obj));
 const objIsEmpty = (obj) => isObject(obj) && objSize(obj) == 0;
 
+const collHas = (coll, keyOrValue) => coll?.has(keyOrValue) ?? false;
+const collDel = (coll, keyOrValue) => coll?.delete(keyOrValue);
+
+const mapNew = (entries) => new Map(entries);
+const mapGet = (map, key) => map?.get(key);
+const mapSet = (map, key, value) =>
+  isUndefined(value) ? (collDel(map, key), map) : map?.set(key, value);
+const mapEnsure = (map, key, getDefaultValue) => {
+  if (!collHas(map, key)) {
+    mapSet(map, key, getDefaultValue());
+  }
+  return mapGet(map, key);
+};
+
+const scheduleRunning = mapNew();
+const scheduleActions = mapNew();
 const createCustomPersister = (
   store,
   getPersisted,
   setPersisted,
   addPersisterListener,
   delPersisterListener,
+  onIgnoredError,
+  scheduleId = [],
 ) => {
   let listenerId;
   let loadSave = 0;
   let loads = 0;
   let saves = 0;
-  let running = 0;
   let listening = 0;
   let action;
   let listeningHandle;
-  const scheduledActions = [];
+  mapEnsure(scheduleRunning, scheduleId, () => 0);
+  mapEnsure(scheduleActions, scheduleId, () => []);
   const run = async () => {
     /* istanbul ignore else */
-    if (!running) {
-      running = 1;
-      while (!isUndefined((action = arrayShift(scheduledActions)))) {
+    if (!mapGet(scheduleRunning, scheduleId)) {
+      mapSet(scheduleRunning, scheduleId, 1);
+      while (
+        !isUndefined((action = arrayShift(mapGet(scheduleActions, scheduleId))))
+      ) {
         try {
           await action();
-        } catch {}
+        } catch (error) {
+          /* istanbul ignore next */
+          onIgnoredError?.(error);
+        }
       }
-      running = 0;
+      mapSet(scheduleRunning, scheduleId, 0);
     }
   };
   const loadLock = async (actions) => {
@@ -71,16 +94,22 @@ const createCustomPersister = (
       await persister.load(initialTables, initialValues);
       listening = 1;
       listeningHandle = addPersisterListener(
-        async (getContent, getTransactionChanges) =>
-          await loadLock(async () => {
-            if (getTransactionChanges) {
-              store.setTransactionChanges(getTransactionChanges());
-            } else {
+        async (getContent, getTransactionChanges) => {
+          if (getTransactionChanges) {
+            const transactionChanges = getTransactionChanges();
+            await loadLock(async () =>
+              store.setTransactionChanges(transactionChanges),
+            );
+          } else {
+            await loadLock(async () => {
               try {
                 store.setContent(getContent?.() ?? (await getPersisted()));
-              } catch {}
-            }
-          }),
+              } catch (error) {
+                onIgnoredError?.(error);
+              }
+            });
+          }
+        },
       );
       return persister;
     },
@@ -102,7 +131,10 @@ const createCustomPersister = (
         await persister.schedule(async () => {
           try {
             await setPersisted(store.getContent, getTransactionChanges);
-          } catch {}
+          } catch (error) {
+            /* istanbul ignore next */
+            onIgnoredError?.(error);
+          }
           loadSave = 0;
         });
       }
@@ -125,7 +157,7 @@ const createCustomPersister = (
       return persister;
     },
     schedule: async (...actions) => {
-      arrayPush(scheduledActions, ...actions);
+      arrayPush(mapGet(scheduleActions, scheduleId), ...actions);
       await run();
       return persister;
     },