tinybase 5.0.0-beta.1 → 5.0.0-beta.10

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

@@ -8,6 +8,7 @@ const isUndefined = (thing) => thing == void 0;
 const ifNotUndefined = (value, then, otherwise) =>
   isUndefined(value) ? otherwise?.() : then(value);
 const isString = (thing) => getTypeOf(thing) == STRING;
+const isArray = (thing) => Array.isArray(thing);
 const slice = (arrayOrString, start, end) => arrayOrString.slice(start, end);
 const size = (arrayOrString) => arrayOrString.length;
 
@@ -16,8 +17,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(
@@ -28,10 +27,12 @@ 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;
 
-const jsonString = (obj) =>
+const jsonStringWithMap = (obj) =>
   JSON.stringify(obj, (_key, value) =>
     isInstanceOf(value, Map) ? object.fromEntries([...value]) : value,
   );
@@ -41,7 +42,7 @@ const SET_CHANGES = 's';
 const STORE_PATH = '/store';
 const PUT = 'PUT';
 const construct = (prefix, type, payload) =>
-  prefix + type + (isString(payload) ? payload : jsonString(payload));
+  prefix + type + (isString(payload) ? payload : jsonStringWithMap(payload));
 const deconstruct = (prefix, message, stringified) => {
   const prefixSize = size(prefix);
   return strStartsWith(message, prefix)
@@ -59,15 +60,35 @@ 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 getStoreFunctions = (supportsMergeableStore, store) =>
+  !supportsMergeableStore || isUndefined(store.getMergeableContent)
+    ? [
+        0,
+        store.getContent,
+        store.getTransactionChanges,
+        ([changedTables, changedValues]) =>
+          !objIsEmpty(changedTables) || !objIsEmpty(changedValues),
+        store.setContent,
+      ]
+    : [
+        1,
+        store.getMergeableContent,
+        store.getTransactionMergeableChanges,
+        ([[changedTables], [changedValues]]) =>
+          !objIsEmpty(changedTables) || !objIsEmpty(changedValues),
+        store.setDefaultContent,
+      ];
 const createCustomPersister = (
   store,
   getPersisted,
@@ -75,18 +96,25 @@ const createCustomPersister = (
   addPersisterListener,
   delPersisterListener,
   onIgnoredError,
-  [getThing, thing] = [],
+  supportsMergeableStore,
+  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,
+    setDefaultContent,
+  ] = getStoreFunctions(supportsMergeableStore, store);
   const run = async () => {
     /* istanbul ignore else */
     if (!mapGet(scheduleRunning, scheduleId)) {
@@ -118,48 +146,54 @@ const createCustomPersister = (
     }
     return persister;
   };
+  const setContentOrChanges = (contentOrChanges) => {
+    (isMergeableStore && isArray(contentOrChanges?.[0])
+      ? contentOrChanges?.[2] === 1
+        ? store.applyMergeableChanges
+        : store.setMergeableContent
+      : contentOrChanges?.[2] === 1
+        ? store.applyChanges
+        : store.setContent)(contentOrChanges);
+  };
   const persister = {
-    load: async (initialTables, initialValues) =>
+    load: async (initialContent) =>
       await loadLock(async () => {
         try {
-          store.setContent(await getPersisted());
-        } catch {
-          store.setContent([initialTables, initialValues]);
+          setContentOrChanges(await getPersisted());
+        } catch (error) {
+          onIgnoredError?.(error);
+          if (initialContent) {
+            setDefaultContent(initialContent);
+          }
         }
       }),
-    startAutoLoad: async (initialTables = {}, initialValues = {}) => {
-      persister.stopAutoLoad();
-      await persister.load(initialTables, initialValues);
-      listening = 1;
-      listeningHandle = addPersisterListener(
-        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 (error) {
-                onIgnoredError?.(error);
-              }
-            });
-          }
+    startAutoLoad: async (initialContent) => {
+      await persister.stopAutoLoad().load(initialContent);
+      autoLoadHandle = addPersisterListener(
+        async (getContent2, getChanges2) => {
+          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;
     },
-    save: async (getTransactionChanges) => {
+    isAutoLoading: () => !isUndefined(autoLoadHandle),
+    save: async (getChanges2) => {
       /* istanbul ignore else */
       if (loadSave != 1) {
         loadSave = 2;
@@ -168,7 +202,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,21 +214,20 @@ 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]);
-          }
-        },
-      );
+      autoSaveListenerId = store.addDidFinishTransactionListener(() => {
+        const changes = getChanges();
+        if (hasChanges(changes)) {
+          persister.save(() => changes);
+        }
+      });
       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();
@@ -203,10 +236,8 @@ const createCustomPersister = (
     getStore: () => store,
     destroy: () => persister.stopAutoLoad().stopAutoSave(),
     getStats: () => ({loads, saves}),
+    ...extra,
   };
-  if (getThing) {
-    persister[getThing] = () => thing;
-  }
   return objFreeze(persister);
 };
 
@@ -239,17 +270,15 @@ const createPartyKitPersister = (
   const getOrSetStore = async (content) =>
     await (
       await fetch(storeUrl, {
-        ...(content ? {method: PUT, body: jsonString(content)} : {}),
+        ...(content ? {method: PUT, body: jsonStringWithMap(content)} : {}),
         mode: 'cors',
         cache: 'no-store',
       })
     ).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,7 +306,8 @@ const createPartyKitPersister = (
     addPersisterListener,
     delPersisterListener,
     onIgnoredError,
-    ['getConnection', connection],
+    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)) {
@@ -35,7 +34,7 @@ const objEnsure = (obj, id, getDefaultValue) => {
   return obj[id];
 };
 
-const jsonString = (obj) =>
+const jsonStringWithMap = (obj) =>
   JSON.stringify(obj, (_key, value) =>
     isInstanceOf(value, Map) ? object.fromEntries([...value]) : value,
   );
@@ -45,7 +44,7 @@ const SET_CHANGES = 's';
 const STORE_PATH = '/store';
 const PUT = 'PUT';
 const construct = (prefix, type, payload) =>
-  prefix + type + (isString(payload) ? payload : jsonString(payload));
+  prefix + type + (isString(payload) ? payload : jsonStringWithMap(payload));
 const deconstruct = (prefix, message, stringified) => {
   const prefixSize = size(prefix);
   return strStartsWith(message, prefix)
@@ -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 &&
@@ -187,7 +177,7 @@ const saveStore = async (
   await storage.put(keysToSet);
 };
 const constructStorageKey = (storagePrefix, type, ...ids) =>
-  construct(storagePrefix, type, slice(jsonString(ids), 1, -1));
+  construct(storagePrefix, type, slice(jsonStringWithMap(ids), 1, -1));
 const createResponse = async (that, status, body = null) =>
   new Response(body, {
     status,
@@ -221,7 +211,9 @@ class TinyBasePartyKitServer {
         this,
         200,
         hasExistingStore
-          ? jsonString(await loadStoreFromStorage(storage, storagePrefix))
+          ? jsonStringWithMap(
+              await loadStoreFromStorage(storage, storagePrefix),
+            )
           : EMPTY_STRING,
       );
     }
@@ -239,7 +231,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 +278,7 @@ class TinyBasePartyKitServer {
 
 export {
   TinyBasePartyKitServer,
-  broadcastTransactionChanges,
+  broadcastChanges,
   hasStoreInStorage,
   loadStoreFromStorage,
 };