tinybase 5.0.0-beta.3 → 5.0.0-beta.5

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

@@ -59,15 +59,34 @@ 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) => {
+const mapEnsure = (map, key, getDefaultValue, hadExistingValue) => {
   if (!collHas(map, key)) {
     mapSet(map, key, getDefaultValue());
+  } else {
+    hadExistingValue?.(mapGet(map, key));
   }
   return mapGet(map, key);
 };
 
 const scheduleRunning = mapNew();
 const scheduleActions = mapNew();
+const isMergeable = (contentOrChanges) => isString(contentOrChanges?.[0]);
+const getStoreFunctions = (supportsMergeableStore, store) =>
+  !supportsMergeableStore || isUndefined(store.getMergeableContent)
+    ? [
+        0,
+        store.getContent,
+        store.getTransactionChanges,
+        ([changedTables, changedValues]) =>
+          !objIsEmpty(changedTables) || !objIsEmpty(changedValues),
+      ]
+    : [
+        1,
+        store.getMergeableContent,
+        store.getTransactionMergeableChanges,
+        ([, [[, changedTables], [, changedValues]]]) =>
+          !objIsEmpty(changedTables) || !objIsEmpty(changedValues),
+      ];
 const createCustomPersister = (
   store,
   getPersisted,
@@ -88,10 +107,8 @@ const createCustomPersister = (
   let listeningHandle;
   mapEnsure(scheduleRunning, scheduleId, () => 0);
   mapEnsure(scheduleActions, scheduleId, () => []);
-  const getContent =
-    (supportsMergeableStore ? store.getMergeableContent : null) ??
-    store.getContent;
-  const getChanges = store.getTransactionChanges;
+  const [isMergeableStore, getContent, getChanges, hasChanges] =
+    getStoreFunctions(supportsMergeableStore, store);
   const run = async () => {
     /* istanbul ignore else */
     if (!mapGet(scheduleRunning, scheduleId)) {
@@ -128,8 +145,8 @@ const createCustomPersister = (
       await loadLock(async () => {
         try {
           const content = await getPersisted();
-          (supportsMergeableStore && isString(content[0])
-            ? store.applyMergeableChanges
+          (isMergeableStore && isMergeable(content)
+            ? store.setMergeableContent
             : store.setContent)(content);
         } catch {
           store.setContent([initialTables, initialValues]);
@@ -143,11 +160,18 @@ const createCustomPersister = (
         async (getContent2, getChanges2) => {
           if (getChanges2) {
             const changes = getChanges2();
-            await loadLock(async () => store.applyChanges(changes));
+            await loadLock(async () =>
+              (isMergeableStore && isMergeable(changes)
+                ? store.applyMergeableChanges
+                : store.applyChanges)(changes),
+            );
           } else {
             await loadLock(async () => {
               try {
-                store.setContent(getContent2?.() ?? (await getPersisted()));
+                const content = getContent2?.() ?? (await getPersisted());
+                (isMergeableStore && isMergeable(content)
+                  ? store.setMergeableContent
+                  : store.setContent)(content);
               } catch (error) {
                 onIgnoredError?.(error);
               }
@@ -187,9 +211,9 @@ const createCustomPersister = (
     startAutoSave: async () => {
       await persister.stopAutoSave().save();
       listenerId = store.addDidFinishTransactionListener(() => {
-        const [tableChanges, valueChanges] = getChanges();
-        if (!objIsEmpty(tableChanges) || !objIsEmpty(valueChanges)) {
-          persister.save(() => [tableChanges, valueChanges]);
+        const changes = getChanges();
+        if (hasChanges(changes)) {
+          persister.save(() => changes);
         }
       });
       return persister;

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

@@ -47,15 +47,34 @@ 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) => {
+const mapEnsure = (map, key, getDefaultValue, hadExistingValue) => {
   if (!collHas(map, key)) {
     mapSet(map, key, getDefaultValue());
+  } else {
+    hadExistingValue?.(mapGet(map, key));
   }
   return mapGet(map, key);
 };
 
 const scheduleRunning = mapNew();
 const scheduleActions = mapNew();
+const isMergeable = (contentOrChanges) => isString(contentOrChanges?.[0]);
+const getStoreFunctions = (supportsMergeableStore, store) =>
+  !supportsMergeableStore || isUndefined(store.getMergeableContent)
+    ? [
+        0,
+        store.getContent,
+        store.getTransactionChanges,
+        ([changedTables, changedValues]) =>
+          !objIsEmpty(changedTables) || !objIsEmpty(changedValues),
+      ]
+    : [
+        1,
+        store.getMergeableContent,
+        store.getTransactionMergeableChanges,
+        ([, [[, changedTables], [, changedValues]]]) =>
+          !objIsEmpty(changedTables) || !objIsEmpty(changedValues),
+      ];
 const createCustomPersister = (
   store,
   getPersisted,
@@ -76,10 +95,8 @@ const createCustomPersister = (
   let listeningHandle;
   mapEnsure(scheduleRunning, scheduleId, () => 0);
   mapEnsure(scheduleActions, scheduleId, () => []);
-  const getContent =
-    (supportsMergeableStore ? store.getMergeableContent : null) ??
-    store.getContent;
-  const getChanges = store.getTransactionChanges;
+  const [isMergeableStore, getContent, getChanges, hasChanges] =
+    getStoreFunctions(supportsMergeableStore, store);
   const run = async () => {
     /* istanbul ignore else */
     if (!mapGet(scheduleRunning, scheduleId)) {
@@ -116,8 +133,8 @@ const createCustomPersister = (
       await loadLock(async () => {
         try {
           const content = await getPersisted();
-          (supportsMergeableStore && isString(content[0])
-            ? store.applyMergeableChanges
+          (isMergeableStore && isMergeable(content)
+            ? store.setMergeableContent
             : store.setContent)(content);
         } catch {
           store.setContent([initialTables, initialValues]);
@@ -131,11 +148,18 @@ const createCustomPersister = (
         async (getContent2, getChanges2) => {
           if (getChanges2) {
             const changes = getChanges2();
-            await loadLock(async () => store.applyChanges(changes));
+            await loadLock(async () =>
+              (isMergeableStore && isMergeable(changes)
+                ? store.applyMergeableChanges
+                : store.applyChanges)(changes),
+            );
           } else {
             await loadLock(async () => {
               try {
-                store.setContent(getContent2?.() ?? (await getPersisted()));
+                const content = getContent2?.() ?? (await getPersisted());
+                (isMergeableStore && isMergeable(content)
+                  ? store.setMergeableContent
+                  : store.setContent)(content);
               } catch (error) {
                 onIgnoredError?.(error);
               }
@@ -175,9 +199,9 @@ const createCustomPersister = (
     startAutoSave: async () => {
       await persister.stopAutoSave().save();
       listenerId = store.addDidFinishTransactionListener(() => {
-        const [tableChanges, valueChanges] = getChanges();
-        if (!objIsEmpty(tableChanges) || !objIsEmpty(valueChanges)) {
-          persister.save(() => [tableChanges, valueChanges]);
+        const changes = getChanges();
+        if (hasChanges(changes)) {
+          persister.save(() => changes);
         }
       });
       return persister;

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

@@ -75,9 +75,11 @@ const mapMap = (coll, cb) =>
   arrayMap([...(coll?.entries() ?? [])], ([key, value]) => cb(value, key));
 const mapSet = (map, key, value) =>
   isUndefined(value) ? (collDel(map, key), map) : map?.set(key, value);
-const mapEnsure = (map, key, getDefaultValue) => {
+const mapEnsure = (map, key, getDefaultValue, hadExistingValue) => {
   if (!collHas(map, key)) {
     mapSet(map, key, getDefaultValue());
+  } else {
+    hadExistingValue?.(mapGet(map, key));
   }
   return mapGet(map, key);
 };
@@ -376,6 +378,23 @@ const jsonParse = JSON.parse;
 
 const scheduleRunning = mapNew();
 const scheduleActions = mapNew();
+const isMergeable = (contentOrChanges) => isString(contentOrChanges?.[0]);
+const getStoreFunctions = (supportsMergeableStore, store) =>
+  !supportsMergeableStore || isUndefined(store.getMergeableContent)
+    ? [
+        0,
+        store.getContent,
+        store.getTransactionChanges,
+        ([changedTables, changedValues]) =>
+          !objIsEmpty(changedTables) || !objIsEmpty(changedValues),
+      ]
+    : [
+        1,
+        store.getMergeableContent,
+        store.getTransactionMergeableChanges,
+        ([, [[, changedTables], [, changedValues]]]) =>
+          !objIsEmpty(changedTables) || !objIsEmpty(changedValues),
+      ];
 const createCustomPersister = (
   store,
   getPersisted,
@@ -396,10 +415,8 @@ const createCustomPersister = (
   let listeningHandle;
   mapEnsure(scheduleRunning, scheduleId, () => 0);
   mapEnsure(scheduleActions, scheduleId, () => []);
-  const getContent =
-    (supportsMergeableStore ? store.getMergeableContent : null) ??
-    store.getContent;
-  const getChanges = store.getTransactionChanges;
+  const [isMergeableStore, getContent, getChanges, hasChanges] =
+    getStoreFunctions(supportsMergeableStore, store);
   const run = async () => {
     /* istanbul ignore else */
     if (!mapGet(scheduleRunning, scheduleId)) {
@@ -436,8 +453,8 @@ const createCustomPersister = (
       await loadLock(async () => {
         try {
           const content = await getPersisted();
-          (supportsMergeableStore && isString(content[0])
-            ? store.applyMergeableChanges
+          (isMergeableStore && isMergeable(content)
+            ? store.setMergeableContent
             : store.setContent)(content);
         } catch {
           store.setContent([initialTables, initialValues]);
@@ -451,11 +468,18 @@ const createCustomPersister = (
         async (getContent2, getChanges2) => {
           if (getChanges2) {
             const changes = getChanges2();
-            await loadLock(async () => store.applyChanges(changes));
+            await loadLock(async () =>
+              (isMergeableStore && isMergeable(changes)
+                ? store.applyMergeableChanges
+                : store.applyChanges)(changes),
+            );
           } else {
             await loadLock(async () => {
               try {
-                store.setContent(getContent2?.() ?? (await getPersisted()));
+                const content = getContent2?.() ?? (await getPersisted());
+                (isMergeableStore && isMergeable(content)
+                  ? store.setMergeableContent
+                  : store.setContent)(content);
               } catch (error) {
                 onIgnoredError?.(error);
               }
@@ -495,9 +519,9 @@ const createCustomPersister = (
     startAutoSave: async () => {
       await persister.stopAutoSave().save();
       listenerId = store.addDidFinishTransactionListener(() => {
-        const [tableChanges, valueChanges] = getChanges();
-        if (!objIsEmpty(tableChanges) || !objIsEmpty(valueChanges)) {
-          persister.save(() => [tableChanges, valueChanges]);
+        const changes = getChanges();
+        if (hasChanges(changes)) {
+          persister.save(() => changes);
         }
       });
       return persister;

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

@@ -76,9 +76,11 @@ const mapMap = (coll, cb) =>
   arrayMap([...(coll?.entries() ?? [])], ([key, value]) => cb(value, key));
 const mapSet = (map, key, value) =>
   isUndefined(value) ? (collDel(map, key), map) : map?.set(key, value);
-const mapEnsure = (map, key, getDefaultValue) => {
+const mapEnsure = (map, key, getDefaultValue, hadExistingValue) => {
   if (!collHas(map, key)) {
     mapSet(map, key, getDefaultValue());
+  } else {
+    hadExistingValue?.(mapGet(map, key));
   }
   return mapGet(map, key);
 };
@@ -377,6 +379,23 @@ const jsonParse = JSON.parse;
 
 const scheduleRunning = mapNew();
 const scheduleActions = mapNew();
+const isMergeable = (contentOrChanges) => isString(contentOrChanges?.[0]);
+const getStoreFunctions = (supportsMergeableStore, store) =>
+  !supportsMergeableStore || isUndefined(store.getMergeableContent)
+    ? [
+        0,
+        store.getContent,
+        store.getTransactionChanges,
+        ([changedTables, changedValues]) =>
+          !objIsEmpty(changedTables) || !objIsEmpty(changedValues),
+      ]
+    : [
+        1,
+        store.getMergeableContent,
+        store.getTransactionMergeableChanges,
+        ([, [[, changedTables], [, changedValues]]]) =>
+          !objIsEmpty(changedTables) || !objIsEmpty(changedValues),
+      ];
 const createCustomPersister = (
   store,
   getPersisted,
@@ -397,10 +416,8 @@ const createCustomPersister = (
   let listeningHandle;
   mapEnsure(scheduleRunning, scheduleId, () => 0);
   mapEnsure(scheduleActions, scheduleId, () => []);
-  const getContent =
-    (supportsMergeableStore ? store.getMergeableContent : null) ??
-    store.getContent;
-  const getChanges = store.getTransactionChanges;
+  const [isMergeableStore, getContent, getChanges, hasChanges] =
+    getStoreFunctions(supportsMergeableStore, store);
   const run = async () => {
     /* istanbul ignore else */
     if (!mapGet(scheduleRunning, scheduleId)) {
@@ -437,8 +454,8 @@ const createCustomPersister = (
       await loadLock(async () => {
         try {
           const content = await getPersisted();
-          (supportsMergeableStore && isString(content[0])
-            ? store.applyMergeableChanges
+          (isMergeableStore && isMergeable(content)
+            ? store.setMergeableContent
             : store.setContent)(content);
         } catch {
           store.setContent([initialTables, initialValues]);
@@ -452,11 +469,18 @@ const createCustomPersister = (
         async (getContent2, getChanges2) => {
           if (getChanges2) {
             const changes = getChanges2();
-            await loadLock(async () => store.applyChanges(changes));
+            await loadLock(async () =>
+              (isMergeableStore && isMergeable(changes)
+                ? store.applyMergeableChanges
+                : store.applyChanges)(changes),
+            );
           } else {
             await loadLock(async () => {
               try {
-                store.setContent(getContent2?.() ?? (await getPersisted()));
+                const content = getContent2?.() ?? (await getPersisted());
+                (isMergeableStore && isMergeable(content)
+                  ? store.setMergeableContent
+                  : store.setContent)(content);
               } catch (error) {
                 onIgnoredError?.(error);
               }
@@ -496,9 +520,9 @@ const createCustomPersister = (
     startAutoSave: async () => {
       await persister.stopAutoSave().save();
       listenerId = store.addDidFinishTransactionListener(() => {
-        const [tableChanges, valueChanges] = getChanges();
-        if (!objIsEmpty(tableChanges) || !objIsEmpty(valueChanges)) {
-          persister.save(() => [tableChanges, valueChanges]);
+        const changes = getChanges();
+        if (hasChanges(changes)) {
+          persister.save(() => changes);
         }
       });
       return persister;

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

@@ -57,15 +57,34 @@ 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) => {
+const mapEnsure = (map, key, getDefaultValue, hadExistingValue) => {
   if (!collHas(map, key)) {
     mapSet(map, key, getDefaultValue());
+  } else {
+    hadExistingValue?.(mapGet(map, key));
   }
   return mapGet(map, key);
 };
 
 const scheduleRunning = mapNew();
 const scheduleActions = mapNew();
+const isMergeable = (contentOrChanges) => isString(contentOrChanges?.[0]);
+const getStoreFunctions = (supportsMergeableStore, store) =>
+  !supportsMergeableStore || isUndefined(store.getMergeableContent)
+    ? [
+        0,
+        store.getContent,
+        store.getTransactionChanges,
+        ([changedTables, changedValues]) =>
+          !objIsEmpty(changedTables) || !objIsEmpty(changedValues),
+      ]
+    : [
+        1,
+        store.getMergeableContent,
+        store.getTransactionMergeableChanges,
+        ([, [[, changedTables], [, changedValues]]]) =>
+          !objIsEmpty(changedTables) || !objIsEmpty(changedValues),
+      ];
 const createCustomPersister = (
   store,
   getPersisted,
@@ -86,10 +105,8 @@ const createCustomPersister = (
   let listeningHandle;
   mapEnsure(scheduleRunning, scheduleId, () => 0);
   mapEnsure(scheduleActions, scheduleId, () => []);
-  const getContent =
-    (supportsMergeableStore ? store.getMergeableContent : null) ??
-    store.getContent;
-  const getChanges = store.getTransactionChanges;
+  const [isMergeableStore, getContent, getChanges, hasChanges] =
+    getStoreFunctions(supportsMergeableStore, store);
   const run = async () => {
     /* istanbul ignore else */
     if (!mapGet(scheduleRunning, scheduleId)) {
@@ -126,8 +143,8 @@ const createCustomPersister = (
       await loadLock(async () => {
         try {
           const content = await getPersisted();
-          (supportsMergeableStore && isString(content[0])
-            ? store.applyMergeableChanges
+          (isMergeableStore && isMergeable(content)
+            ? store.setMergeableContent
             : store.setContent)(content);
         } catch {
           store.setContent([initialTables, initialValues]);
@@ -141,11 +158,18 @@ const createCustomPersister = (
         async (getContent2, getChanges2) => {
           if (getChanges2) {
             const changes = getChanges2();
-            await loadLock(async () => store.applyChanges(changes));
+            await loadLock(async () =>
+              (isMergeableStore && isMergeable(changes)
+                ? store.applyMergeableChanges
+                : store.applyChanges)(changes),
+            );
           } else {
             await loadLock(async () => {
               try {
-                store.setContent(getContent2?.() ?? (await getPersisted()));
+                const content = getContent2?.() ?? (await getPersisted());
+                (isMergeableStore && isMergeable(content)
+                  ? store.setMergeableContent
+                  : store.setContent)(content);
               } catch (error) {
                 onIgnoredError?.(error);
               }
@@ -185,9 +209,9 @@ const createCustomPersister = (
     startAutoSave: async () => {
       await persister.stopAutoSave().save();
       listenerId = store.addDidFinishTransactionListener(() => {
-        const [tableChanges, valueChanges] = getChanges();
-        if (!objIsEmpty(tableChanges) || !objIsEmpty(valueChanges)) {
-          persister.save(() => [tableChanges, valueChanges]);
+        const changes = getChanges();
+        if (hasChanges(changes)) {
+          persister.save(() => changes);
         }
       });
       return persister;

package/lib/debug/persisters.js

@@ -35,15 +35,34 @@ 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) => {
+const mapEnsure = (map, key, getDefaultValue, hadExistingValue) => {
   if (!collHas(map, key)) {
     mapSet(map, key, getDefaultValue());
+  } else {
+    hadExistingValue?.(mapGet(map, key));
   }
   return mapGet(map, key);
 };
 
 const scheduleRunning = mapNew();
 const scheduleActions = mapNew();
+const isMergeable = (contentOrChanges) => isString(contentOrChanges?.[0]);
+const getStoreFunctions = (supportsMergeableStore, store) =>
+  !supportsMergeableStore || isUndefined(store.getMergeableContent)
+    ? [
+        0,
+        store.getContent,
+        store.getTransactionChanges,
+        ([changedTables, changedValues]) =>
+          !objIsEmpty(changedTables) || !objIsEmpty(changedValues),
+      ]
+    : [
+        1,
+        store.getMergeableContent,
+        store.getTransactionMergeableChanges,
+        ([, [[, changedTables], [, changedValues]]]) =>
+          !objIsEmpty(changedTables) || !objIsEmpty(changedValues),
+      ];
 const createCustomPersister = (
   store,
   getPersisted,
@@ -64,10 +83,8 @@ const createCustomPersister = (
   let listeningHandle;
   mapEnsure(scheduleRunning, scheduleId, () => 0);
   mapEnsure(scheduleActions, scheduleId, () => []);
-  const getContent =
-    (supportsMergeableStore ? store.getMergeableContent : null) ??
-    store.getContent;
-  const getChanges = store.getTransactionChanges;
+  const [isMergeableStore, getContent, getChanges, hasChanges] =
+    getStoreFunctions(supportsMergeableStore, store);
   const run = async () => {
     /* istanbul ignore else */
     if (!mapGet(scheduleRunning, scheduleId)) {
@@ -104,8 +121,8 @@ const createCustomPersister = (
       await loadLock(async () => {
         try {
           const content = await getPersisted();
-          (supportsMergeableStore && isString(content[0])
-            ? store.applyMergeableChanges
+          (isMergeableStore && isMergeable(content)
+            ? store.setMergeableContent
             : store.setContent)(content);
         } catch {
           store.setContent([initialTables, initialValues]);
@@ -119,11 +136,18 @@ const createCustomPersister = (
         async (getContent2, getChanges2) => {
           if (getChanges2) {
             const changes = getChanges2();
-            await loadLock(async () => store.applyChanges(changes));
+            await loadLock(async () =>
+              (isMergeableStore && isMergeable(changes)
+                ? store.applyMergeableChanges
+                : store.applyChanges)(changes),
+            );
           } else {
             await loadLock(async () => {
               try {
-                store.setContent(getContent2?.() ?? (await getPersisted()));
+                const content = getContent2?.() ?? (await getPersisted());
+                (isMergeableStore && isMergeable(content)
+                  ? store.setMergeableContent
+                  : store.setContent)(content);
               } catch (error) {
                 onIgnoredError?.(error);
               }
@@ -163,9 +187,9 @@ const createCustomPersister = (
     startAutoSave: async () => {
       await persister.stopAutoSave().save();
       listenerId = store.addDidFinishTransactionListener(() => {
-        const [tableChanges, valueChanges] = getChanges();
-        if (!objIsEmpty(tableChanges) || !objIsEmpty(valueChanges)) {
-          persister.save(() => [tableChanges, valueChanges]);
+        const changes = getChanges();
+        if (hasChanges(changes)) {
+          persister.save(() => changes);
         }
       });
       return persister;

package/lib/debug/queries.js

@@ -66,9 +66,11 @@ 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) => {
+const mapEnsure = (map, key, getDefaultValue, hadExistingValue) => {
   if (!collHas(map, key)) {
     mapSet(map, key, getDefaultValue());
+  } else {
+    hadExistingValue?.(mapGet(map, key));
   }
   return mapGet(map, key);
 };
@@ -171,9 +173,10 @@ const getAggregateValue = (
     : aggregateValue;
 };
 
-const getCellOrValueType = (cell) => {
-  const type = getTypeOf(cell);
-  return isTypeStringOrBoolean(type) || (type == NUMBER && isFiniteNumber(cell))
+const getCellOrValueType = (cellOrValue) => {
+  const type = getTypeOf(cellOrValue);
+  return isTypeStringOrBoolean(type) ||
+    (type == NUMBER && isFiniteNumber(cellOrValue))
     ? type
     : void 0;
 };

package/lib/debug/relationships.js

@@ -42,9 +42,11 @@ 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) => {
+const mapEnsure = (map, key, getDefaultValue, hadExistingValue) => {
   if (!collHas(map, key)) {
     mapSet(map, key, getDefaultValue());
+  } else {
+    hadExistingValue?.(mapGet(map, key));
   }
   return mapGet(map, key);
 };