tinybase 5.0.0-beta.1 → 5.0.0-beta.3

package/lib/debug/persisters/persister-partykit-client.js

@@ -75,6 +75,7 @@ const createCustomPersister = (
   addPersisterListener,
   delPersisterListener,
   onIgnoredError,
+  supportsMergeableStore,
   [getThing, thing] = [],
   scheduleId = [],
 ) => {
@@ -87,6 +88,10 @@ const createCustomPersister = (
   let listeningHandle;
   mapEnsure(scheduleRunning, scheduleId, () => 0);
   mapEnsure(scheduleActions, scheduleId, () => []);
+  const getContent =
+    (supportsMergeableStore ? store.getMergeableContent : null) ??
+    store.getContent;
+  const getChanges = store.getTransactionChanges;
   const run = async () => {
     /* istanbul ignore else */
     if (!mapGet(scheduleRunning, scheduleId)) {
@@ -122,7 +127,10 @@ const createCustomPersister = (
     load: async (initialTables, initialValues) =>
       await loadLock(async () => {
         try {
-          store.setContent(await getPersisted());
+          const content = await getPersisted();
+          (supportsMergeableStore && isString(content[0])
+            ? store.applyMergeableChanges
+            : store.setContent)(content);
         } catch {
           store.setContent([initialTables, initialValues]);
         }
@@ -132,16 +140,14 @@ const createCustomPersister = (
       await persister.load(initialTables, initialValues);
       listening = 1;
       listeningHandle = addPersisterListener(
-        async (getContent, getTransactionChanges) => {
-          if (getTransactionChanges) {
-            const transactionChanges = getTransactionChanges();
-            await loadLock(async () =>
-              store.setTransactionChanges(transactionChanges),
-            );
+        async (getContent2, getChanges2) => {
+          if (getChanges2) {
+            const changes = getChanges2();
+            await loadLock(async () => store.applyChanges(changes));
           } else {
             await loadLock(async () => {
               try {
-                store.setContent(getContent?.() ?? (await getPersisted()));
+                store.setContent(getContent2?.() ?? (await getPersisted()));
               } catch (error) {
                 onIgnoredError?.(error);
               }
@@ -159,7 +165,7 @@ const createCustomPersister = (
       }
       return persister;
     },
-    save: async (getTransactionChanges) => {
+    save: async (getChanges2) => {
       /* istanbul ignore else */
       if (loadSave != 1) {
         loadSave = 2;
@@ -168,7 +174,7 @@ const createCustomPersister = (
         }
         await persister.schedule(async () => {
           try {
-            await setPersisted(store.getContent, getTransactionChanges);
+            await setPersisted(getContent, getChanges2);
           } catch (error) {
             /* istanbul ignore next */
             onIgnoredError?.(error);
@@ -180,14 +186,12 @@ const createCustomPersister = (
     },
     startAutoSave: async () => {
       await persister.stopAutoSave().save();
-      listenerId = store.addDidFinishTransactionListener(
-        (_store, getTransactionChanges) => {
-          const [tableChanges, valueChanges] = getTransactionChanges();
-          if (!objIsEmpty(tableChanges) || !objIsEmpty(valueChanges)) {
-            persister.save(() => [tableChanges, valueChanges]);
-          }
-        },
-      );
+      listenerId = store.addDidFinishTransactionListener(() => {
+        const [tableChanges, valueChanges] = getChanges();
+        if (!objIsEmpty(tableChanges) || !objIsEmpty(valueChanges)) {
+          persister.save(() => [tableChanges, valueChanges]);
+        }
+      });
       return persister;
     },
     stopAutoSave: () => {
@@ -245,11 +249,9 @@ const createPartyKitPersister = (
       })
     ).json();
   const getPersisted = async () => await getOrSetStore();
-  const setPersisted = async (getContent, getTransactionChanges) => {
-    if (getTransactionChanges) {
-      connection.send(
-        construct(messagePrefix, SET_CHANGES, getTransactionChanges()),
-      );
+  const setPersisted = async (getContent, getChanges) => {
+    if (getChanges) {
+      connection.send(construct(messagePrefix, SET_CHANGES, getChanges()));
     } else {
       await getOrSetStore(getContent());
     }
@@ -277,6 +279,7 @@ const createPartyKitPersister = (
     addPersisterListener,
     delPersisterListener,
     onIgnoredError,
+    false,
     ['getConnection', connection],
   );
 };

package/lib/debug/persisters/persister-partykit-server.js

@@ -24,9 +24,8 @@ const arrayUnshift = (array, ...values) => array.unshift(...values);
 const object = Object;
 const objEntries = object.entries;
 const objNew = (entries = []) => object.fromEntries(entries);
-const objGet = (obj, id) => ifNotUndefined(obj, (obj2) => obj2[id]);
-const objHas = (obj, id) => !isUndefined(objGet(obj, id));
-const objMap = (obj, cb) =>
+const objHas = (obj, id) => id in obj;
+const objToArray = (obj, cb) =>
   arrayMap(objEntries(obj), ([id, value]) => cb(value, id));
 const objEnsure = (obj, id, getDefaultValue) => {
   if (!objHas(obj, id)) {
@@ -86,21 +85,12 @@ const loadStoreFromStorage = async (storage, storagePrefix = EMPTY_STRING) => {
   );
   return [tables, values];
 };
-const broadcastTransactionChanges = async (
-  server,
-  transactionChanges,
-  without,
-) =>
+const broadcastChanges = async (server, changes, without) =>
   server.party.broadcast(
-    construct(server.config.messagePrefix, SET_CHANGES, transactionChanges),
+    construct(server.config.messagePrefix, SET_CHANGES, changes),
     without,
   );
-const saveStore = async (
-  that,
-  transactionChanges,
-  initialSave,
-  requestOrConnection,
-) => {
+const saveStore = async (that, changes, initialSave, requestOrConnection) => {
   const storage = that.party.storage;
   const storagePrefix = that.config.storagePrefix;
   const keysToSet = {
@@ -109,7 +99,7 @@ const saveStore = async (
   const keysToDel = [];
   const keyPrefixesToDel = [];
   await promiseAll(
-    objMap(transactionChanges[0], async (table, tableId) =>
+    objToArray(changes[0], async (table, tableId) =>
       isUndefined(table)
         ? !initialSave &&
           (await that.canDelTable(tableId, requestOrConnection)) &&
@@ -119,7 +109,7 @@ const saveStore = async (
           )
         : (await that.canSetTable(tableId, initialSave, requestOrConnection)) &&
           (await promiseAll(
-            objMap(table, async (row, rowId) =>
+            objToArray(table, async (row, rowId) =>
               isUndefined(row)
                 ? !initialSave &&
                   (await that.canDelRow(tableId, rowId, requestOrConnection)) &&
@@ -134,7 +124,7 @@ const saveStore = async (
                     requestOrConnection,
                   )) &&
                   (await promiseAll(
-                    objMap(row, async (cell, cellId) => {
+                    objToArray(row, async (cell, cellId) => {
                       const ids = [tableId, rowId, cellId];
                       const key = constructStorageKey(storagePrefix, T, ...ids);
                       isUndefined(cell)
@@ -158,7 +148,7 @@ const saveStore = async (
     ),
   );
   await promiseAll(
-    objMap(transactionChanges[1], async (value, valueId) => {
+    objToArray(changes[1], async (value, valueId) => {
       const key = storagePrefix + V + valueId;
       isUndefined(value)
         ? !initialSave &&
@@ -239,7 +229,7 @@ class TinyBasePartyKitServer {
           (await hasStoreInStorage(this.party.storage, storagePrefix))
         ) {
           await saveStore(this, payload, false, connection);
-          broadcastTransactionChanges(this, payload, [connection.id]);
+          broadcastChanges(this, payload, [connection.id]);
         }
       },
     );
@@ -286,7 +276,7 @@ class TinyBasePartyKitServer {
 
 export {
   TinyBasePartyKitServer,
-  broadcastTransactionChanges,
+  broadcastChanges,
   hasStoreInStorage,
   loadStoreFromStorage,
 };

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

@@ -1,3 +1,7 @@
+const getTypeOf = (thing) => typeof thing;
+const EMPTY_STRING = '';
+const STRING = getTypeOf(EMPTY_STRING);
+
 const startInterval = (callback, sec, immediate) => {
   immediate && callback();
   return setInterval(callback, sec * 1e3);
@@ -7,6 +11,7 @@ const isInstanceOf = (thing, cls) => thing instanceof cls;
 const isUndefined = (thing) => thing == void 0;
 const ifNotUndefined = (value, then, otherwise) =>
   isUndefined(value) ? otherwise?.() : then(value);
+const isString = (thing) => getTypeOf(thing) == STRING;
 const size = (arrayOrString) => arrayOrString.length;
 
 const arrayPush = (array, ...values) => array.push(...values);
@@ -58,6 +63,7 @@ const createCustomPersister = (
   addPersisterListener,
   delPersisterListener,
   onIgnoredError,
+  supportsMergeableStore,
   [getThing, thing] = [],
   scheduleId = [],
 ) => {
@@ -70,6 +76,10 @@ const createCustomPersister = (
   let listeningHandle;
   mapEnsure(scheduleRunning, scheduleId, () => 0);
   mapEnsure(scheduleActions, scheduleId, () => []);
+  const getContent =
+    (supportsMergeableStore ? store.getMergeableContent : null) ??
+    store.getContent;
+  const getChanges = store.getTransactionChanges;
   const run = async () => {
     /* istanbul ignore else */
     if (!mapGet(scheduleRunning, scheduleId)) {
@@ -105,7 +115,10 @@ const createCustomPersister = (
     load: async (initialTables, initialValues) =>
       await loadLock(async () => {
         try {
-          store.setContent(await getPersisted());
+          const content = await getPersisted();
+          (supportsMergeableStore && isString(content[0])
+            ? store.applyMergeableChanges
+            : store.setContent)(content);
         } catch {
           store.setContent([initialTables, initialValues]);
         }
@@ -115,16 +128,14 @@ const createCustomPersister = (
       await persister.load(initialTables, initialValues);
       listening = 1;
       listeningHandle = addPersisterListener(
-        async (getContent, getTransactionChanges) => {
-          if (getTransactionChanges) {
-            const transactionChanges = getTransactionChanges();
-            await loadLock(async () =>
-              store.setTransactionChanges(transactionChanges),
-            );
+        async (getContent2, getChanges2) => {
+          if (getChanges2) {
+            const changes = getChanges2();
+            await loadLock(async () => store.applyChanges(changes));
           } else {
             await loadLock(async () => {
               try {
-                store.setContent(getContent?.() ?? (await getPersisted()));
+                store.setContent(getContent2?.() ?? (await getPersisted()));
               } catch (error) {
                 onIgnoredError?.(error);
               }
@@ -142,7 +153,7 @@ const createCustomPersister = (
       }
       return persister;
     },
-    save: async (getTransactionChanges) => {
+    save: async (getChanges2) => {
       /* istanbul ignore else */
       if (loadSave != 1) {
         loadSave = 2;
@@ -151,7 +162,7 @@ const createCustomPersister = (
         }
         await persister.schedule(async () => {
           try {
-            await setPersisted(store.getContent, getTransactionChanges);
+            await setPersisted(getContent, getChanges2);
           } catch (error) {
             /* istanbul ignore next */
             onIgnoredError?.(error);
@@ -163,14 +174,12 @@ const createCustomPersister = (
     },
     startAutoSave: async () => {
       await persister.stopAutoSave().save();
-      listenerId = store.addDidFinishTransactionListener(
-        (_store, getTransactionChanges) => {
-          const [tableChanges, valueChanges] = getTransactionChanges();
-          if (!objIsEmpty(tableChanges) || !objIsEmpty(valueChanges)) {
-            persister.save(() => [tableChanges, valueChanges]);
-          }
-        },
-      );
+      listenerId = store.addDidFinishTransactionListener(() => {
+        const [tableChanges, valueChanges] = getChanges();
+        if (!objIsEmpty(tableChanges) || !objIsEmpty(valueChanges)) {
+          persister.save(() => [tableChanges, valueChanges]);
+        }
+      });
       return persister;
     },
     stopAutoSave: () => {
@@ -234,6 +243,7 @@ const createRemotePersister = (
     addPersisterListener,
     delPersisterListener,
     onIgnoredError,
+    false,
     ['getUrls', [loadUrl, saveUrl]],
   );
 };

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

@@ -55,13 +55,12 @@ const isObject = (obj) =>
   );
 const objNew = (entries = []) => object.fromEntries(entries);
 const objMerge = (...objs) => object.assign({}, ...objs);
-const objGet = (obj, id) => ifNotUndefined(obj, (obj2) => obj2[id]);
-const objHas = (obj, id) => !isUndefined(objGet(obj, id));
+const objHas = (obj, id) => id in obj;
 const objDel = (obj, id) => {
   delete obj[id];
   return obj;
 };
-const objMap = (obj, cb) =>
+const objToArray = (obj, cb) =>
   arrayMap(objEntries(obj), ([id, value]) => cb(value, id));
 const objValues = (obj) => object.values(obj);
 const objSize = (obj) => size(objIds(obj));
@@ -83,7 +82,7 @@ const mapEnsure = (map, key, getDefaultValue) => {
   return mapGet(map, key);
 };
 const mapMatch = (map, obj, set, del = mapSet) => {
-  objMap(obj, (value, id) => set(map, id, value));
+  objToArray(obj, (value, id) => set(map, id, value));
   mapForEach(map, (id) => (objHas(obj, id) ? 0 : del(map, id)));
   return map;
 };
@@ -99,7 +98,12 @@ const setAdd = (set, value) => set?.add(value);
 const SELECT_STAR_FROM = SELECT + '*FROM';
 const FROM_PRAGMA_TABLE = 'FROM pragma_table_';
 const WHERE = 'WHERE';
-const getCommandFunctions = (cmd, managedTableNames, onIgnoredError) => {
+const getCommandFunctions = (
+  cmd,
+  managedTableNames,
+  onIgnoredError,
+  useOnConflict,
+) => {
   const schemaMap = mapNew();
   const canSelect = (tableName, rowIdColumnName) =>
     !isUndefined(mapGet(mapGet(schemaMap, tableName), rowIdColumnName));
@@ -112,7 +116,7 @@ const getCommandFunctions = (cmd, managedTableNames, onIgnoredError) => {
             await cmd(
               'SELECT name ' +
                 FROM_PRAGMA_TABLE +
-                `list WHERE schema='main'AND type='table'AND name IN(` +
+                `list WHERE schema='main'AND(type='table'OR type='view')AND name IN(` +
                 getPlaceholders(managedTableNames) +
                 `)ORDER BY name`,
               managedTableNames,
@@ -167,16 +171,18 @@ const getCommandFunctions = (cmd, managedTableNames, onIgnoredError) => {
   const saveTable = async (
     tableName,
     rowIdColumnName,
-    table,
+    content,
     deleteEmptyColumns,
     deleteEmptyTable,
     partial = false,
   ) => {
-    const tableCellIds = setNew();
-    objMap(table ?? {}, (row) =>
-      arrayMap(objIds(row ?? {}), (cellId) => setAdd(tableCellIds, cellId)),
+    const tableCellOrValueIds = setNew();
+    objToArray(content ?? {}, (contentRow) =>
+      arrayMap(objIds(contentRow ?? {}), (cellOrValueId) =>
+        setAdd(tableCellOrValueIds, cellOrValueId),
+      ),
     );
-    const tableColumnNames = collValues(tableCellIds);
+    const tableColumnNames = collValues(tableCellOrValueIds);
     if (
       !partial &&
       deleteEmptyTable &&
@@ -234,11 +240,11 @@ const getCommandFunctions = (cmd, managedTableNames, onIgnoredError) => {
       ]);
     }
     if (partial) {
-      if (isUndefined(table)) {
+      if (isUndefined(content)) {
         await cmd('DELETE FROM' + escapeId(tableName) + 'WHERE 1');
       } else {
         await promiseAll(
-          objMap(table, async (row, rowId) => {
+          objToArray(content, async (row, rowId) => {
             if (isUndefined(row)) {
               await cmd(
                 'DELETE FROM' +
@@ -249,10 +255,14 @@ const getCommandFunctions = (cmd, managedTableNames, onIgnoredError) => {
                 [rowId],
               );
             } else if (!arrayIsEmpty(tableColumnNames)) {
-              await upsert(cmd, tableName, rowIdColumnName, objIds(row), [
-                rowId,
-                ...objValues(row),
-              ]);
+              await upsert(
+                cmd,
+                tableName,
+                rowIdColumnName,
+                objIds(row),
+                [rowId, ...objValues(row)],
+                useOnConflict,
+              );
             }
           }),
         );
@@ -265,7 +275,7 @@ const getCommandFunctions = (cmd, managedTableNames, onIgnoredError) => {
         );
         const args = [];
         const deleteRowIds = [];
-        objMap(table ?? {}, (row, rowId) => {
+        objToArray(content ?? {}, (row, rowId) => {
           arrayPush(
             args,
             rowId,
@@ -314,9 +324,12 @@ const upsert = async (
   rowIdColumnName,
   changingColumnNames,
   args,
+  useOnConflict = true,
 ) =>
   await cmd(
-    'INSERT INTO' +
+    'INSERT ' +
+      (useOnConflict ? EMPTY_STRING : 'OR REPLACE ') +
+      'INTO' +
       escapeId(tableName) +
       '(' +
       escapeId(rowIdColumnName) +
@@ -334,18 +347,20 @@ const upsert = async (
         ),
         1,
       ) +
-      'ON CONFLICT(' +
-      escapeId(rowIdColumnName) +
-      ')DO UPDATE SET' +
-      arrayJoin(
-        arrayMap(
-          changingColumnNames,
-          (columnName) =>
-            escapeId(columnName) + '=excluded.' + escapeId(columnName),
-        ),
-        COMMA,
-      ),
-    args,
+      (useOnConflict
+        ? 'ON CONFLICT(' +
+          escapeId(rowIdColumnName) +
+          ')DO UPDATE SET' +
+          arrayJoin(
+            arrayMap(
+              changingColumnNames,
+              (columnName) =>
+                escapeId(columnName) + '=excluded.' + escapeId(columnName),
+            ),
+            COMMA,
+          )
+        : EMPTY_STRING),
+    arrayMap(args, (arg) => arg ?? null),
   );
 const getPlaceholders = (array) =>
   arrayJoin(
@@ -368,6 +383,7 @@ const createCustomPersister = (
   addPersisterListener,
   delPersisterListener,
   onIgnoredError,
+  supportsMergeableStore,
   [getThing, thing] = [],
   scheduleId = [],
 ) => {
@@ -380,6 +396,10 @@ const createCustomPersister = (
   let listeningHandle;
   mapEnsure(scheduleRunning, scheduleId, () => 0);
   mapEnsure(scheduleActions, scheduleId, () => []);
+  const getContent =
+    (supportsMergeableStore ? store.getMergeableContent : null) ??
+    store.getContent;
+  const getChanges = store.getTransactionChanges;
   const run = async () => {
     /* istanbul ignore else */
     if (!mapGet(scheduleRunning, scheduleId)) {
@@ -415,7 +435,10 @@ const createCustomPersister = (
     load: async (initialTables, initialValues) =>
       await loadLock(async () => {
         try {
-          store.setContent(await getPersisted());
+          const content = await getPersisted();
+          (supportsMergeableStore && isString(content[0])
+            ? store.applyMergeableChanges
+            : store.setContent)(content);
         } catch {
           store.setContent([initialTables, initialValues]);
         }
@@ -425,16 +448,14 @@ const createCustomPersister = (
       await persister.load(initialTables, initialValues);
       listening = 1;
       listeningHandle = addPersisterListener(
-        async (getContent, getTransactionChanges) => {
-          if (getTransactionChanges) {
-            const transactionChanges = getTransactionChanges();
-            await loadLock(async () =>
-              store.setTransactionChanges(transactionChanges),
-            );
+        async (getContent2, getChanges2) => {
+          if (getChanges2) {
+            const changes = getChanges2();
+            await loadLock(async () => store.applyChanges(changes));
           } else {
             await loadLock(async () => {
               try {
-                store.setContent(getContent?.() ?? (await getPersisted()));
+                store.setContent(getContent2?.() ?? (await getPersisted()));
               } catch (error) {
                 onIgnoredError?.(error);
               }
@@ -452,7 +473,7 @@ const createCustomPersister = (
       }
       return persister;
     },
-    save: async (getTransactionChanges) => {
+    save: async (getChanges2) => {
       /* istanbul ignore else */
       if (loadSave != 1) {
         loadSave = 2;
@@ -461,7 +482,7 @@ const createCustomPersister = (
         }
         await persister.schedule(async () => {
           try {
-            await setPersisted(store.getContent, getTransactionChanges);
+            await setPersisted(getContent, getChanges2);
           } catch (error) {
             /* istanbul ignore next */
             onIgnoredError?.(error);
@@ -473,14 +494,12 @@ const createCustomPersister = (
     },
     startAutoSave: async () => {
       await persister.stopAutoSave().save();
-      listenerId = store.addDidFinishTransactionListener(
-        (_store, getTransactionChanges) => {
-          const [tableChanges, valueChanges] = getTransactionChanges();
-          if (!objIsEmpty(tableChanges) || !objIsEmpty(valueChanges)) {
-            persister.save(() => [tableChanges, valueChanges]);
-          }
-        },
-      );
+      listenerId = store.addDidFinishTransactionListener(() => {
+        const [tableChanges, valueChanges] = getChanges();
+        if (!objIsEmpty(tableChanges) || !objIsEmpty(valueChanges)) {
+          persister.save(() => [tableChanges, valueChanges]);
+        }
+      });
       return persister;
     },
     stopAutoSave: () => {
@@ -546,6 +565,7 @@ const createJsonSqlitePersister = (
     addPersisterListener,
     delPersisterListener,
     onIgnoredError,
+    false,
     [getThing, db],
     db,
   );
@@ -566,9 +586,10 @@ const createTabularSqlitePersister = (
   managedTableNames,
   db,
   getThing,
+  useOnConflict,
 ) => {
   const [refreshSchema, loadTable, saveTable, transaction] =
-    getCommandFunctions(cmd, managedTableNames, onIgnoredError);
+    getCommandFunctions(cmd, managedTableNames, onIgnoredError, useOnConflict);
   const saveTables = async (tables, partial) =>
     await promiseAll(
       mapMap(
@@ -577,12 +598,11 @@ const createTabularSqlitePersister = (
           [tableName, rowIdColumnName, deleteEmptyColumns, deleteEmptyTable],
           tableId,
         ) => {
-          const table = tables[tableId];
-          if (!partial || table !== void 0) {
+          if (!partial || objHas(tables, tableId)) {
             await saveTable(
               tableName,
               rowIdColumnName,
-              table,
+              tables[tableId],
               deleteEmptyColumns,
               deleteEmptyTable,
               partial,
@@ -632,11 +652,11 @@ const createTabularSqlitePersister = (
         ? [tables, values]
         : void 0;
     });
-  const setPersisted = async (getContent, getTransactionChanges) =>
+  const setPersisted = async (getContent, getChanges) =>
     await transaction(async () => {
       await refreshSchema();
-      if (!isUndefined(getTransactionChanges)) {
-        const [tableChanges, valueChanges] = getTransactionChanges();
+      if (!isUndefined(getChanges)) {
+        const [tableChanges, valueChanges] = getChanges();
         await saveTables(tableChanges, true);
         await saveValues(valueChanges, true);
       } else {
@@ -652,6 +672,7 @@ const createTabularSqlitePersister = (
     addPersisterListener,
     delPersisterListener,
     onIgnoredError,
+    false,
     [getThing, db],
     db,
   );
@@ -689,7 +710,7 @@ const getDefaultedTabularConfigMap = (
   filter,
 ) => {
   const configMap = mapNew();
-  objMap(configsObj, (configObj, id) => {
+  objToArray(configsObj, (configObj, id) => {
     const defaultedConfig = slice(
       objValues(
         objMerge(
@@ -764,6 +785,7 @@ const createSqlitePersister = (
   onIgnoredError,
   db,
   getThing = 'getDb',
+  useOnConflict,
 ) => {
   let dataVersion;
   let schemaVersion;
@@ -826,6 +848,7 @@ const createSqlitePersister = (
     collValues(managedTableNamesSet),
     db,
     getThing,
+    useOnConflict,
   );
 };