tinybase 5.0.0-beta.5 → 5.0.0-beta.6

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

@@ -16,8 +16,6 @@ const arrayShift = (array) => array.shift();
 const object = Object;
 const getPrototypeOf = (obj) => object.getPrototypeOf(obj);
 const objEntries = object.entries;
-const objIds = object.keys;
-const objFreeze = object.freeze;
 const isObject = (obj) =>
   !isUndefined(obj) &&
   ifNotUndefined(
@@ -28,6 +26,8 @@ const isObject = (obj) =>
     /* istanbul ignore next */
     () => true,
   );
+const objIds = object.keys;
+const objFreeze = object.freeze;
 const objGet = (obj, id) => ifNotUndefined(obj, (obj2) => obj2[id]);
 const objHas = (obj, id) => id in obj;
 const objDel = (obj, id) => {
@@ -63,7 +63,6 @@ const mapEnsure = (map, key, getDefaultValue, hadExistingValue) => {
 
 const scheduleRunning = mapNew();
 const scheduleActions = mapNew();
-const isMergeable = (contentOrChanges) => isString(contentOrChanges?.[0]);
 const getStoreFunctions = (supportsMergeableStore, store) =>
   !supportsMergeableStore || isUndefined(store.getMergeableContent)
     ? [
@@ -88,16 +87,15 @@ const createCustomPersister = (
   delPersisterListener,
   onIgnoredError,
   supportsMergeableStore,
-  [getThing, thing] = [],
+  extra = {},
   scheduleId = [],
 ) => {
-  let listenerId;
   let loadSave = 0;
   let loads = 0;
   let saves = 0;
-  let listening = 0;
   let action;
-  let listeningHandle;
+  let autoLoadHandle;
+  let autoSaveListenerId;
   mapEnsure(scheduleRunning, scheduleId, () => 0);
   mapEnsure(scheduleActions, scheduleId, () => []);
   const [isMergeableStore, getContent, getChanges, hasChanges] =
@@ -133,55 +131,51 @@ const createCustomPersister = (
     }
     return persister;
   };
+  const setContentOrChanges = (contentOrChanges) => {
+    (isMergeableStore && isString(contentOrChanges?.[0])
+      ? contentOrChanges?.[1][2] === 1
+        ? store.applyMergeableChanges
+        : store.setMergeableContent
+      : contentOrChanges?.[2] === 1
+        ? store.applyChanges
+        : store.setContent)(contentOrChanges);
+  };
   const persister = {
     load: async (initialTables, initialValues) =>
       await loadLock(async () => {
         try {
-          const content = await getPersisted();
-          (isMergeableStore && isMergeable(content)
-            ? store.setMergeableContent
-            : store.setContent)(content);
-        } catch {
+          setContentOrChanges(await getPersisted());
+        } catch (error) {
+          onIgnoredError?.(error);
           store.setContent([initialTables, initialValues]);
         }
       }),
     startAutoLoad: async (initialTables = {}, initialValues = {}) => {
-      persister.stopAutoLoad();
-      await persister.load(initialTables, initialValues);
-      listening = 1;
-      listeningHandle = addPersisterListener(
+      await persister.stopAutoLoad().load(initialTables, initialValues);
+      autoLoadHandle = addPersisterListener(
         async (getContent2, getChanges2) => {
-          if (getChanges2) {
-            const changes = getChanges2();
-            await loadLock(async () =>
-              (isMergeableStore && isMergeable(changes)
-                ? store.applyMergeableChanges
-                : store.applyChanges)(changes),
-            );
-          } else {
-            await loadLock(async () => {
-              try {
-                const content = getContent2?.() ?? (await getPersisted());
-                (isMergeableStore && isMergeable(content)
-                  ? store.setMergeableContent
-                  : store.setContent)(content);
-              } catch (error) {
-                onIgnoredError?.(error);
-              }
-            });
-          }
+          const changes = getChanges2?.();
+          await loadLock(async () => {
+            try {
+              setContentOrChanges(
+                changes ?? getContent2?.() ?? (await getPersisted()),
+              );
+            } catch (error) {
+              onIgnoredError?.(error);
+            }
+          });
         },
       );
       return persister;
     },
     stopAutoLoad: () => {
-      if (listening) {
-        delPersisterListener(listeningHandle);
-        listeningHandle = void 0;
-        listening = 0;
+      if (autoLoadHandle) {
+        delPersisterListener(autoLoadHandle);
+        autoLoadHandle = void 0;
       }
       return persister;
     },
+    isAutoLoading: () => !isUndefined(autoLoadHandle),
     save: async (getChanges2) => {
       /* istanbul ignore else */
       if (loadSave != 1) {
@@ -203,7 +197,7 @@ const createCustomPersister = (
     },
     startAutoSave: async () => {
       await persister.stopAutoSave().save();
-      listenerId = store.addDidFinishTransactionListener(() => {
+      autoSaveListenerId = store.addDidFinishTransactionListener(() => {
         const changes = getChanges();
         if (hasChanges(changes)) {
           persister.save(() => changes);
@@ -212,10 +206,11 @@ const createCustomPersister = (
       return persister;
     },
     stopAutoSave: () => {
-      ifNotUndefined(listenerId, store.delListener);
-      listenerId = void 0;
+      ifNotUndefined(autoSaveListenerId, store.delListener);
+      autoSaveListenerId = void 0;
       return persister;
     },
+    isAutoSaving: () => !isUndefined(autoSaveListenerId),
     schedule: async (...actions) => {
       arrayPush(mapGet(scheduleActions, scheduleId), ...actions);
       await run();
@@ -224,10 +219,8 @@ const createCustomPersister = (
     getStore: () => store,
     destroy: () => persister.stopAutoLoad().stopAutoSave(),
     getStats: () => ({loads, saves}),
+    ...extra,
   };
-  if (getThing) {
-    persister[getThing] = () => thing;
-  }
   return objFreeze(persister);
 };
 
@@ -357,7 +350,7 @@ const createAutomergePersister = (
     delPersisterListener,
     onIgnoredError,
     false,
-    ['getDocHandle', docHandle],
+    {getDocHandle: () => docHandle},
   );
 };
 

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

@@ -14,8 +14,6 @@ const arrayShift = (array) => array.shift();
 
 const object = Object;
 const getPrototypeOf = (obj) => object.getPrototypeOf(obj);
-const objIds = object.keys;
-const objFreeze = object.freeze;
 const isObject = (obj) =>
   !isUndefined(obj) &&
   ifNotUndefined(
@@ -26,6 +24,8 @@ const isObject = (obj) =>
     /* istanbul ignore next */
     () => true,
   );
+const objIds = object.keys;
+const objFreeze = object.freeze;
 const objSize = (obj) => size(objIds(obj));
 const objIsEmpty = (obj) => isObject(obj) && objSize(obj) == 0;
 
@@ -53,7 +53,6 @@ const mapEnsure = (map, key, getDefaultValue, hadExistingValue) => {
 
 const scheduleRunning = mapNew();
 const scheduleActions = mapNew();
-const isMergeable = (contentOrChanges) => isString(contentOrChanges?.[0]);
 const getStoreFunctions = (supportsMergeableStore, store) =>
   !supportsMergeableStore || isUndefined(store.getMergeableContent)
     ? [
@@ -78,16 +77,15 @@ const createCustomPersister = (
   delPersisterListener,
   onIgnoredError,
   supportsMergeableStore,
-  [getThing, thing] = [],
+  extra = {},
   scheduleId = [],
 ) => {
-  let listenerId;
   let loadSave = 0;
   let loads = 0;
   let saves = 0;
-  let listening = 0;
   let action;
-  let listeningHandle;
+  let autoLoadHandle;
+  let autoSaveListenerId;
   mapEnsure(scheduleRunning, scheduleId, () => 0);
   mapEnsure(scheduleActions, scheduleId, () => []);
   const [isMergeableStore, getContent, getChanges, hasChanges] =
@@ -123,55 +121,51 @@ const createCustomPersister = (
     }
     return persister;
   };
+  const setContentOrChanges = (contentOrChanges) => {
+    (isMergeableStore && isString(contentOrChanges?.[0])
+      ? contentOrChanges?.[1][2] === 1
+        ? store.applyMergeableChanges
+        : store.setMergeableContent
+      : contentOrChanges?.[2] === 1
+        ? store.applyChanges
+        : store.setContent)(contentOrChanges);
+  };
   const persister = {
     load: async (initialTables, initialValues) =>
       await loadLock(async () => {
         try {
-          const content = await getPersisted();
-          (isMergeableStore && isMergeable(content)
-            ? store.setMergeableContent
-            : store.setContent)(content);
-        } catch {
+          setContentOrChanges(await getPersisted());
+        } catch (error) {
+          onIgnoredError?.(error);
           store.setContent([initialTables, initialValues]);
         }
       }),
     startAutoLoad: async (initialTables = {}, initialValues = {}) => {
-      persister.stopAutoLoad();
-      await persister.load(initialTables, initialValues);
-      listening = 1;
-      listeningHandle = addPersisterListener(
+      await persister.stopAutoLoad().load(initialTables, initialValues);
+      autoLoadHandle = addPersisterListener(
         async (getContent2, getChanges2) => {
-          if (getChanges2) {
-            const changes = getChanges2();
-            await loadLock(async () =>
-              (isMergeableStore && isMergeable(changes)
-                ? store.applyMergeableChanges
-                : store.applyChanges)(changes),
-            );
-          } else {
-            await loadLock(async () => {
-              try {
-                const content = getContent2?.() ?? (await getPersisted());
-                (isMergeableStore && isMergeable(content)
-                  ? store.setMergeableContent
-                  : store.setContent)(content);
-              } catch (error) {
-                onIgnoredError?.(error);
-              }
-            });
-          }
+          const changes = getChanges2?.();
+          await loadLock(async () => {
+            try {
+              setContentOrChanges(
+                changes ?? getContent2?.() ?? (await getPersisted()),
+              );
+            } catch (error) {
+              onIgnoredError?.(error);
+            }
+          });
         },
       );
       return persister;
     },
     stopAutoLoad: () => {
-      if (listening) {
-        delPersisterListener(listeningHandle);
-        listeningHandle = void 0;
-        listening = 0;
+      if (autoLoadHandle) {
+        delPersisterListener(autoLoadHandle);
+        autoLoadHandle = void 0;
       }
       return persister;
     },
+    isAutoLoading: () => !isUndefined(autoLoadHandle),
     save: async (getChanges2) => {
       /* istanbul ignore else */
       if (loadSave != 1) {
@@ -193,7 +187,7 @@ const createCustomPersister = (
     },
     startAutoSave: async () => {
       await persister.stopAutoSave().save();
-      listenerId = store.addDidFinishTransactionListener(() => {
+      autoSaveListenerId = store.addDidFinishTransactionListener(() => {
         const changes = getChanges();
         if (hasChanges(changes)) {
           persister.save(() => changes);
@@ -202,10 +196,11 @@ const createCustomPersister = (
       return persister;
     },
     stopAutoSave: () => {
-      ifNotUndefined(listenerId, store.delListener);
-      listenerId = void 0;
+      ifNotUndefined(autoSaveListenerId, store.delListener);
+      autoSaveListenerId = void 0;
       return persister;
     },
+    isAutoSaving: () => !isUndefined(autoSaveListenerId),
     schedule: async (...actions) => {
       arrayPush(mapGet(scheduleActions, scheduleId), ...actions);
       await run();
@@ -214,10 +209,8 @@ const createCustomPersister = (
     getStore: () => store,
     destroy: () => persister.stopAutoLoad().stopAutoSave(),
     getStats: () => ({loads, saves}),
+    ...extra,
   };
-  if (getThing) {
-    persister[getThing] = () => thing;
-  }
   return objFreeze(persister);
 };
 
@@ -251,7 +244,7 @@ const createStoragePersister = (
     delPersisterListener,
     onIgnoredError,
     true,
-    ['getStorageName', storageName],
+    {getStorageName: () => storageName},
   );
 };
 const createLocalPersister = (store, storageName, onIgnoredError) =>

package/lib/debug/persisters/persister-cr-sqlite-wasm.js

@@ -41,8 +41,6 @@ const collDel = (coll, keyOrValue) => coll?.delete(keyOrValue);
 const object = Object;
 const getPrototypeOf = (obj) => object.getPrototypeOf(obj);
 const objEntries = object.entries;
-const objIds = object.keys;
-const objFreeze = object.freeze;
 const isObject = (obj) =>
   !isUndefined(obj) &&
   ifNotUndefined(
@@ -53,6 +51,8 @@ const isObject = (obj) =>
     /* istanbul ignore next */
     () => true,
   );
+const objIds = object.keys;
+const objFreeze = object.freeze;
 const objNew = (entries = []) => object.fromEntries(entries);
 const objMerge = (...objs) => object.assign({}, ...objs);
 const objHas = (obj, id) => id in obj;
@@ -97,6 +97,9 @@ const setNew = (entryOrEntries) =>
   );
 const setAdd = (set, value) => set?.add(value);
 
+const TABLE = 'TABLE';
+const ALTER_TABLE = 'ALTER ' + TABLE;
+const DELETE_FROM = 'DELETE FROM';
 const SELECT_STAR_FROM = SELECT + '*FROM';
 const FROM_PRAGMA_TABLE = 'FROM pragma_table_';
 const WHERE = 'WHERE';
@@ -191,15 +194,20 @@ const getCommandFunctions = (
       arrayIsEmpty(tableColumnNames) &&
       collHas(schemaMap, tableName)
     ) {
-      await cmd('DROP TABLE' + escapeId(tableName));
+      await cmd('DROP ' + TABLE + escapeId(tableName));
       mapSet(schemaMap, tableName);
       return;
     }
     if (!arrayIsEmpty(tableColumnNames) && !collHas(schemaMap, tableName)) {
       await cmd(
-        `CREATE TABLE${escapeId(tableName)}(${escapeId(rowIdColumnName)} PRIMARY KEY ON CONFLICT REPLACE${arrayJoin(
-          arrayMap(tableColumnNames, (cellId) => COMMA + escapeId(cellId)),
-        )});`,
+        `CREATE ` +
+          TABLE +
+          escapeId(tableName) +
+          '(' +
+          escapeId(rowIdColumnName) +
+          ` PRIMARY KEY ON CONFLICT REPLACE${arrayJoin(
+            arrayMap(tableColumnNames, (cellId) => COMMA + escapeId(cellId)),
+          )});`,
       );
       mapSet(
         schemaMap,
@@ -219,7 +227,7 @@ const getCommandFunctions = (
         ...arrayMap(tableColumnNames, async (columnName) => {
           if (!collDel(columnNamesAccountedFor, columnName)) {
             await cmd(
-              `ALTER TABLE${escapeId(tableName)}ADD${escapeId(columnName)}`,
+              ALTER_TABLE + escapeId(tableName) + 'ADD' + escapeId(columnName),
             );
             mapSet(tableSchemaMap, columnName, EMPTY_STRING);
           }
@@ -230,9 +238,10 @@ const getCommandFunctions = (
               async (columnName) => {
                 if (columnName != rowIdColumnName) {
                   await cmd(
-                    `ALTER TABLE${escapeId(tableName)}DROP${escapeId(
-                      columnName,
-                    )}`,
+                    ALTER_TABLE +
+                      escapeId(tableName) +
+                      'DROP' +
+                      escapeId(columnName),
                   );
                   mapSet(tableSchemaMap, columnName);
                 }
@@ -243,13 +252,13 @@ const getCommandFunctions = (
     }
     if (partial) {
       if (isUndefined(content)) {
-        await cmd('DELETE FROM' + escapeId(tableName) + 'WHERE 1');
+        await cmd(DELETE_FROM + escapeId(tableName) + WHERE + ' 1');
       } else {
         await promiseAll(
           objToArray(content, async (row, rowId) => {
             if (isUndefined(row)) {
               await cmd(
-                'DELETE FROM' +
+                DELETE_FROM +
                   escapeId(tableName) +
                   WHERE +
                   escapeId(rowIdColumnName) +
@@ -291,9 +300,10 @@ const getCommandFunctions = (
           rowIdColumnName,
           changingColumnNames,
           args,
+          useOnConflict,
         );
         await cmd(
-          'DELETE FROM' +
+          DELETE_FROM +
             escapeId(tableName) +
             WHERE +
             escapeId(rowIdColumnName) +
@@ -303,7 +313,7 @@ const getCommandFunctions = (
           deleteRowIds,
         );
       } else if (collHas(schemaMap, tableName)) {
-        await cmd('DELETE FROM' + escapeId(tableName) + 'WHERE 1');
+        await cmd(DELETE_FROM + escapeId(tableName) + WHERE + ' 1');
       }
     }
   };
@@ -378,7 +388,6 @@ const jsonParse = JSON.parse;
 
 const scheduleRunning = mapNew();
 const scheduleActions = mapNew();
-const isMergeable = (contentOrChanges) => isString(contentOrChanges?.[0]);
 const getStoreFunctions = (supportsMergeableStore, store) =>
   !supportsMergeableStore || isUndefined(store.getMergeableContent)
     ? [
@@ -403,16 +412,15 @@ const createCustomPersister = (
   delPersisterListener,
   onIgnoredError,
   supportsMergeableStore,
-  [getThing, thing] = [],
+  extra = {},
   scheduleId = [],
 ) => {
-  let listenerId;
   let loadSave = 0;
   let loads = 0;
   let saves = 0;
-  let listening = 0;
   let action;
-  let listeningHandle;
+  let autoLoadHandle;
+  let autoSaveListenerId;
   mapEnsure(scheduleRunning, scheduleId, () => 0);
   mapEnsure(scheduleActions, scheduleId, () => []);
   const [isMergeableStore, getContent, getChanges, hasChanges] =
@@ -448,55 +456,51 @@ const createCustomPersister = (
     }
     return persister;
   };
+  const setContentOrChanges = (contentOrChanges) => {
+    (isMergeableStore && isString(contentOrChanges?.[0])
+      ? contentOrChanges?.[1][2] === 1
+        ? store.applyMergeableChanges
+        : store.setMergeableContent
+      : contentOrChanges?.[2] === 1
+        ? store.applyChanges
+        : store.setContent)(contentOrChanges);
+  };
   const persister = {
     load: async (initialTables, initialValues) =>
       await loadLock(async () => {
         try {
-          const content = await getPersisted();
-          (isMergeableStore && isMergeable(content)
-            ? store.setMergeableContent
-            : store.setContent)(content);
-        } catch {
+          setContentOrChanges(await getPersisted());
+        } catch (error) {
+          onIgnoredError?.(error);
           store.setContent([initialTables, initialValues]);
         }
       }),
     startAutoLoad: async (initialTables = {}, initialValues = {}) => {
-      persister.stopAutoLoad();
-      await persister.load(initialTables, initialValues);
-      listening = 1;
-      listeningHandle = addPersisterListener(
+      await persister.stopAutoLoad().load(initialTables, initialValues);
+      autoLoadHandle = addPersisterListener(
         async (getContent2, getChanges2) => {
-          if (getChanges2) {
-            const changes = getChanges2();
-            await loadLock(async () =>
-              (isMergeableStore && isMergeable(changes)
-                ? store.applyMergeableChanges
-                : store.applyChanges)(changes),
-            );
-          } else {
-            await loadLock(async () => {
-              try {
-                const content = getContent2?.() ?? (await getPersisted());
-                (isMergeableStore && isMergeable(content)
-                  ? store.setMergeableContent
-                  : store.setContent)(content);
-              } catch (error) {
-                onIgnoredError?.(error);
-              }
-            });
-          }
+          const changes = getChanges2?.();
+          await loadLock(async () => {
+            try {
+              setContentOrChanges(
+                changes ?? getContent2?.() ?? (await getPersisted()),
+              );
+            } catch (error) {
+              onIgnoredError?.(error);
+            }
+          });
         },
       );
       return persister;
     },
     stopAutoLoad: () => {
-      if (listening) {
-        delPersisterListener(listeningHandle);
-        listeningHandle = void 0;
-        listening = 0;
+      if (autoLoadHandle) {
+        delPersisterListener(autoLoadHandle);
+        autoLoadHandle = void 0;
       }
       return persister;
     },
+    isAutoLoading: () => !isUndefined(autoLoadHandle),
     save: async (getChanges2) => {
       /* istanbul ignore else */
       if (loadSave != 1) {
@@ -518,7 +522,7 @@ const createCustomPersister = (
     },
     startAutoSave: async () => {
       await persister.stopAutoSave().save();
-      listenerId = store.addDidFinishTransactionListener(() => {
+      autoSaveListenerId = store.addDidFinishTransactionListener(() => {
         const changes = getChanges();
         if (hasChanges(changes)) {
           persister.save(() => changes);
@@ -527,10 +531,11 @@ const createCustomPersister = (
       return persister;
     },
     stopAutoSave: () => {
-      ifNotUndefined(listenerId, store.delListener);
-      listenerId = void 0;
+      ifNotUndefined(autoSaveListenerId, store.delListener);
+      autoSaveListenerId = void 0;
       return persister;
     },
+    isAutoSaving: () => !isUndefined(autoSaveListenerId),
     schedule: async (...actions) => {
       arrayPush(mapGet(scheduleActions, scheduleId), ...actions);
       await run();
@@ -539,10 +544,8 @@ const createCustomPersister = (
     getStore: () => store,
     destroy: () => persister.stopAutoLoad().stopAutoSave(),
     getStats: () => ({loads, saves}),
+    ...extra,
   };
-  if (getThing) {
-    persister[getThing] = () => thing;
-  }
   return objFreeze(persister);
 };
 
@@ -557,9 +560,10 @@ const createJsonSqlitePersister = (
   managedTableNames,
   db,
   getThing,
+  useOnConflict,
 ) => {
   const [refreshSchema, loadTable, saveTable, transaction] =
-    getCommandFunctions(cmd, managedTableNames, onIgnoredError);
+    getCommandFunctions(cmd, managedTableNames, onIgnoredError, useOnConflict);
   const getPersisted = async () =>
     await transaction(async () => {
       await refreshSchema();
@@ -590,7 +594,7 @@ const createJsonSqlitePersister = (
     delPersisterListener,
     onIgnoredError,
     false,
-    [getThing, db],
+    {[getThing]: () => db},
     db,
   );
   return persister;
@@ -697,7 +701,7 @@ const createTabularSqlitePersister = (
     delPersisterListener,
     onIgnoredError,
     false,
-    [getThing, db],
+    {[getThing]: () => db},
     db,
   );
   return persister;