tinybase 5.0.0-beta.25 → 5.0.0-beta.27

package/umd/synchronizers/synchronizer-local/with-schemas/index.js

@@ -77,17 +77,15 @@
     return mapGet(map, key);
   };
 
-  new GLOBAL.TextEncoder();
-
-  const newStamp = (value, time) => (time ? [value, time] : [value]);
-  const getLatestTime = (time1, time2) =>
-    ((time1 ?? '') > (time2 ?? '') ? time1 : time2) ?? '';
-  const stampNewObj = (time = EMPTY_STRING) => newStamp(objNew(), time);
-
+  const Persists = {
+    StoreOnly: 1,
+    MergeableStoreOnly: 2,
+    StoreOrMergeableStore: 3,
+  };
   const scheduleRunning = mapNew();
   const scheduleActions = mapNew();
-  const getStoreFunctions = (supportedStoreType = 1, store) =>
-    supportedStoreType > 1 && store.isMergeable()
+  const getStoreFunctions = (persist = Persists.StoreOnly, store) =>
+    persist != Persists.StoreOnly && store.isMergeable()
       ? [
           1,
           store.getMergeableContent,
@@ -96,7 +94,7 @@
             !objIsEmpty(changedTables) || !objIsEmpty(changedValues),
           store.setDefaultContent,
         ]
-      : supportedStoreType != 2
+      : persist != Persists.MergeableStoreOnly
         ? [
             0,
             store.getContent,
@@ -113,7 +111,7 @@
     addPersisterListener,
     delPersisterListener,
     onIgnoredError,
-    supportedStoreType,
+    persist,
     extra = {},
     scheduleId = [],
   ) => {
@@ -131,7 +129,7 @@
       getChanges,
       hasChanges,
       setDefaultContent,
-    ] = getStoreFunctions(supportedStoreType, store);
+    ] = getStoreFunctions(persist, store);
     const run = async () => {
       /* istanbul ignore else */
       if (!mapGet(scheduleRunning, scheduleId)) {
@@ -263,6 +261,13 @@
     return objFreeze(persister);
   };
 
+  new GLOBAL.TextEncoder();
+
+  const newStamp = (value, time) => (time ? [value, time] : [value]);
+  const getLatestTime = (time1, time2) =>
+    ((time1 ?? '') > (time2 ?? '') ? time1 : time2) ?? '';
+  const stampNewObj = (time = EMPTY_STRING) => newStamp(objNew(), time);
+
   const MASK6 = 63;
   const ENCODE =
     '-0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ_abcdefghijklmnopqrstuvwxyz'.split(
@@ -282,14 +287,16 @@
       '',
     );
 
-  const RESPONSE = 0;
-  const GET_CONTENT_HASHES = 1;
-  const CONTENT_HASHES = 2;
-  const CONTENT_DIFF = 3;
-  const GET_TABLE_DIFF = 4;
-  const GET_ROW_DIFF = 5;
-  const GET_CELL_DIFF = 6;
-  const GET_VALUE_DIFF = 7;
+  const Message = {
+    Response: 0,
+    GetContentHashes: 1,
+    ContentHashes: 2,
+    ContentDiff: 3,
+    GetTableDiff: 4,
+    GetRowDiff: 5,
+    GetCellDiff: 6,
+    GetValueDiff: 7,
+  };
   const createCustomSynchronizer = (
     store,
     send,
@@ -303,55 +310,52 @@
     let sends = 0;
     let receives = 0;
     const pendingRequests = mapNew();
-    onReceive((fromClientId, requestId, messageType, messageBody) => {
+    onReceive((fromClientId, requestId, message, body) => {
       receives++;
-      if (messageType == RESPONSE) {
+      if (message == Message.Response) {
         ifNotUndefined(
           mapGet(pendingRequests, requestId),
           ([toClientId, handleResponse]) =>
             isUndefined(toClientId) || toClientId == fromClientId
-              ? handleResponse(messageBody, fromClientId)
+              ? handleResponse(body, fromClientId)
               : /* istanbul ignore next */
                 0,
         );
-      } else if (messageType == CONTENT_HASHES && persister.isAutoLoading()) {
-        getChangesFromOtherStore(fromClientId, messageBody).then((changes) => {
+      } else if (
+        message == Message.ContentHashes &&
+        persister.isAutoLoading()
+      ) {
+        getChangesFromOtherStore(fromClientId, body).then((changes) => {
           persisterListener?.(void 0, changes);
         });
-      } else if (messageType == CONTENT_DIFF && persister.isAutoLoading()) {
-        persisterListener?.(void 0, messageBody);
+      } else if (message == Message.ContentDiff && persister.isAutoLoading()) {
+        persisterListener?.(void 0, body);
       } else {
         ifNotUndefined(
-          messageType == GET_CONTENT_HASHES && persister.isAutoSaving()
+          message == Message.GetContentHashes && persister.isAutoSaving()
             ? store.getMergeableContentHashes()
-            : messageType == GET_TABLE_DIFF
-              ? store.getMergeableTableDiff(messageBody)
-              : messageType == GET_ROW_DIFF
-                ? store.getMergeableRowDiff(messageBody)
-                : messageType == GET_CELL_DIFF
-                  ? store.getMergeableCellDiff(messageBody)
-                  : messageType == GET_VALUE_DIFF
-                    ? store.getMergeableValueDiff(messageBody)
+            : message == Message.GetTableDiff
+              ? store.getMergeableTableDiff(body)
+              : message == Message.GetRowDiff
+                ? store.getMergeableRowDiff(body)
+                : message == Message.GetCellDiff
+                  ? store.getMergeableCellDiff(body)
+                  : message == Message.GetValueDiff
+                    ? store.getMergeableValueDiff(body)
                     : void 0,
           (response) => {
             sends++;
-            send(fromClientId, requestId, RESPONSE, response);
+            send(fromClientId, requestId, Message.Response, response);
           },
         );
       }
     });
-    const request = async (
-      toClientId,
-      messageType,
-      messageBody = EMPTY_STRING,
-    ) =>
+    const request = async (toClientId, message, body = EMPTY_STRING) =>
       promiseNew((resolve, reject) => {
         const requestId = getUniqueId();
         const timeout = setTimeout(() => {
           collDel(pendingRequests, requestId);
-          reject(
-            `No response from ${toClientId ?? 'anyone'} to '${messageType}'`,
-          );
+          reject(`No response from ${toClientId ?? 'anyone'} to '${message}'`);
         }, requestTimeoutSeconds * 1e3);
         mapSet(pendingRequests, requestId, [
           toClientId,
@@ -362,7 +366,7 @@
           },
         ]);
         sends++;
-        send(toClientId, requestId, messageType, messageBody);
+        send(toClientId, requestId, message, body);
       });
     const mergeTablesStamps = (tablesStamp, [tableStamps2, tablesTime2]) => {
       objForEach(tableStamps2, ([rowStamps2, tableTime2], tableId) => {
@@ -387,7 +391,7 @@
       if (isUndefined(otherContentHashes)) {
         [otherContentHashes, otherClientId] = await request(
           otherClientId,
-          GET_CONTENT_HASHES,
+          Message.GetContentHashes,
         );
       }
       const [otherTablesHash, otherValuesHash] = otherContentHashes;
@@ -397,7 +401,7 @@
         const [newTables, differentTableHashes] = (
           await request(
             otherClientId,
-            GET_TABLE_DIFF,
+            Message.GetTableDiff,
             store.getMergeableTableHashes(),
           )
         )[0];
@@ -406,7 +410,7 @@
           const [newRows, differentRowHashes] = (
             await request(
               otherClientId,
-              GET_ROW_DIFF,
+              Message.GetRowDiff,
               store.getMergeableRowHashes(differentTableHashes),
             )
           )[0];
@@ -415,7 +419,7 @@
             const newCells = (
               await request(
                 otherClientId,
-                GET_CELL_DIFF,
+                Message.GetCellDiff,
                 store.getMergeableCellHashes(differentRowHashes),
               )
             )[0];
@@ -430,7 +434,7 @@
           : (
               await request(
                 otherClientId,
-                GET_VALUE_DIFF,
+                Message.GetValueDiff,
                 store.getMergeableValueHashes(),
               )
             )[0],
@@ -446,9 +450,14 @@
     const setPersisted = async (_getContent, changes) => {
       sends++;
       if (changes) {
-        send(null, null, CONTENT_DIFF, changes);
+        send(null, null, Message.ContentDiff, changes);
       } else {
-        send(null, null, CONTENT_HASHES, store.getMergeableContentHashes());
+        send(
+          null,
+          null,
+          Message.ContentHashes,
+          store.getMergeableContentHashes(),
+        );
       }
     };
     const addPersisterListener = (listener) => (persisterListener = listener);
@@ -468,7 +477,7 @@
       addPersisterListener,
       delPersisterListener,
       onIgnoredError,
-      2,
+      Persists.MergeableStoreOnly,
       {startSync, stopSync, destroy, getSynchronizerStats, ...extra},
     );
     return persister;
@@ -477,21 +486,16 @@
   const clients = mapNew();
   const createLocalSynchronizer = (store, onIgnoredError) => {
     const clientId = getUniqueId();
-    const send = (toClientId, requestId, messageType, messageBody) => {
+    const send = (toClientId, requestId, message, body) => {
       setTimeout(
         () =>
           isUndefined(toClientId)
             ? mapForEach(clients, (otherClientId, receive) =>
                 otherClientId != clientId
-                  ? receive(clientId, requestId, messageType, messageBody)
+                  ? receive(clientId, requestId, message, body)
                   : 0,
               )
-            : mapGet(clients, toClientId)?.(
-                clientId,
-                requestId,
-                messageType,
-                messageBody,
-              ),
+            : mapGet(clients, toClientId)?.(clientId, requestId, message, body),
         0,
       );
     };

package/umd/synchronizers/synchronizer-ws-client/index.js

@@ -86,17 +86,15 @@
     return mapGet(map, key);
   };
 
-  new GLOBAL.TextEncoder();
-
-  const newStamp = (value, time) => (time ? [value, time] : [value]);
-  const getLatestTime = (time1, time2) =>
-    ((time1 ?? '') > (time2 ?? '') ? time1 : time2) ?? '';
-  const stampNewObj = (time = EMPTY_STRING) => newStamp(objNew(), time);
-
+  const Persists = {
+    StoreOnly: 1,
+    MergeableStoreOnly: 2,
+    StoreOrMergeableStore: 3,
+  };
   const scheduleRunning = mapNew();
   const scheduleActions = mapNew();
-  const getStoreFunctions = (supportedStoreType = 1, store) =>
-    supportedStoreType > 1 && store.isMergeable()
+  const getStoreFunctions = (persist = Persists.StoreOnly, store) =>
+    persist != Persists.StoreOnly && store.isMergeable()
       ? [
           1,
           store.getMergeableContent,
@@ -105,7 +103,7 @@
             !objIsEmpty(changedTables) || !objIsEmpty(changedValues),
           store.setDefaultContent,
         ]
-      : supportedStoreType != 2
+      : persist != Persists.MergeableStoreOnly
         ? [
             0,
             store.getContent,
@@ -122,7 +120,7 @@
     addPersisterListener,
     delPersisterListener,
     onIgnoredError,
-    supportedStoreType,
+    persist,
     extra = {},
     scheduleId = [],
   ) => {
@@ -140,7 +138,7 @@
       getChanges,
       hasChanges,
       setDefaultContent,
-    ] = getStoreFunctions(supportedStoreType, store);
+    ] = getStoreFunctions(persist, store);
     const run = async () => {
       /* istanbul ignore else */
       if (!mapGet(scheduleRunning, scheduleId)) {
@@ -272,6 +270,13 @@
     return objFreeze(persister);
   };
 
+  new GLOBAL.TextEncoder();
+
+  const newStamp = (value, time) => (time ? [value, time] : [value]);
+  const getLatestTime = (time1, time2) =>
+    ((time1 ?? '') > (time2 ?? '') ? time1 : time2) ?? '';
+  const stampNewObj = (time = EMPTY_STRING) => newStamp(objNew(), time);
+
   const MASK6 = 63;
   const ENCODE =
     '-0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ_abcdefghijklmnopqrstuvwxyz'.split(
@@ -291,14 +296,16 @@
       '',
     );
 
-  const RESPONSE = 0;
-  const GET_CONTENT_HASHES = 1;
-  const CONTENT_HASHES = 2;
-  const CONTENT_DIFF = 3;
-  const GET_TABLE_DIFF = 4;
-  const GET_ROW_DIFF = 5;
-  const GET_CELL_DIFF = 6;
-  const GET_VALUE_DIFF = 7;
+  const Message = {
+    Response: 0,
+    GetContentHashes: 1,
+    ContentHashes: 2,
+    ContentDiff: 3,
+    GetTableDiff: 4,
+    GetRowDiff: 5,
+    GetCellDiff: 6,
+    GetValueDiff: 7,
+  };
   const createCustomSynchronizer = (
     store,
     send,
@@ -312,55 +319,52 @@
     let sends = 0;
     let receives = 0;
     const pendingRequests = mapNew();
-    onReceive((fromClientId, requestId, messageType, messageBody) => {
+    onReceive((fromClientId, requestId, message, body) => {
       receives++;
-      if (messageType == RESPONSE) {
+      if (message == Message.Response) {
         ifNotUndefined(
           mapGet(pendingRequests, requestId),
           ([toClientId, handleResponse]) =>
             isUndefined(toClientId) || toClientId == fromClientId
-              ? handleResponse(messageBody, fromClientId)
+              ? handleResponse(body, fromClientId)
               : /* istanbul ignore next */
                 0,
         );
-      } else if (messageType == CONTENT_HASHES && persister.isAutoLoading()) {
-        getChangesFromOtherStore(fromClientId, messageBody).then((changes) => {
+      } else if (
+        message == Message.ContentHashes &&
+        persister.isAutoLoading()
+      ) {
+        getChangesFromOtherStore(fromClientId, body).then((changes) => {
           persisterListener?.(void 0, changes);
         });
-      } else if (messageType == CONTENT_DIFF && persister.isAutoLoading()) {
-        persisterListener?.(void 0, messageBody);
+      } else if (message == Message.ContentDiff && persister.isAutoLoading()) {
+        persisterListener?.(void 0, body);
       } else {
         ifNotUndefined(
-          messageType == GET_CONTENT_HASHES && persister.isAutoSaving()
+          message == Message.GetContentHashes && persister.isAutoSaving()
             ? store.getMergeableContentHashes()
-            : messageType == GET_TABLE_DIFF
-              ? store.getMergeableTableDiff(messageBody)
-              : messageType == GET_ROW_DIFF
-                ? store.getMergeableRowDiff(messageBody)
-                : messageType == GET_CELL_DIFF
-                  ? store.getMergeableCellDiff(messageBody)
-                  : messageType == GET_VALUE_DIFF
-                    ? store.getMergeableValueDiff(messageBody)
+            : message == Message.GetTableDiff
+              ? store.getMergeableTableDiff(body)
+              : message == Message.GetRowDiff
+                ? store.getMergeableRowDiff(body)
+                : message == Message.GetCellDiff
+                  ? store.getMergeableCellDiff(body)
+                  : message == Message.GetValueDiff
+                    ? store.getMergeableValueDiff(body)
                     : void 0,
           (response) => {
             sends++;
-            send(fromClientId, requestId, RESPONSE, response);
+            send(fromClientId, requestId, Message.Response, response);
           },
         );
       }
     });
-    const request = async (
-      toClientId,
-      messageType,
-      messageBody = EMPTY_STRING,
-    ) =>
+    const request = async (toClientId, message, body = EMPTY_STRING) =>
       promiseNew((resolve, reject) => {
         const requestId = getUniqueId();
         const timeout = setTimeout(() => {
           collDel(pendingRequests, requestId);
-          reject(
-            `No response from ${toClientId ?? 'anyone'} to '${messageType}'`,
-          );
+          reject(`No response from ${toClientId ?? 'anyone'} to '${message}'`);
         }, requestTimeoutSeconds * 1e3);
         mapSet(pendingRequests, requestId, [
           toClientId,
@@ -371,7 +375,7 @@
           },
         ]);
         sends++;
-        send(toClientId, requestId, messageType, messageBody);
+        send(toClientId, requestId, message, body);
       });
     const mergeTablesStamps = (tablesStamp, [tableStamps2, tablesTime2]) => {
       objForEach(tableStamps2, ([rowStamps2, tableTime2], tableId) => {
@@ -396,7 +400,7 @@
       if (isUndefined(otherContentHashes)) {
         [otherContentHashes, otherClientId] = await request(
           otherClientId,
-          GET_CONTENT_HASHES,
+          Message.GetContentHashes,
         );
       }
       const [otherTablesHash, otherValuesHash] = otherContentHashes;
@@ -406,7 +410,7 @@
         const [newTables, differentTableHashes] = (
           await request(
             otherClientId,
-            GET_TABLE_DIFF,
+            Message.GetTableDiff,
             store.getMergeableTableHashes(),
           )
         )[0];
@@ -415,7 +419,7 @@
           const [newRows, differentRowHashes] = (
             await request(
               otherClientId,
-              GET_ROW_DIFF,
+              Message.GetRowDiff,
               store.getMergeableRowHashes(differentTableHashes),
             )
           )[0];
@@ -424,7 +428,7 @@
             const newCells = (
               await request(
                 otherClientId,
-                GET_CELL_DIFF,
+                Message.GetCellDiff,
                 store.getMergeableCellHashes(differentRowHashes),
               )
             )[0];
@@ -439,7 +443,7 @@
           : (
               await request(
                 otherClientId,
-                GET_VALUE_DIFF,
+                Message.GetValueDiff,
                 store.getMergeableValueHashes(),
               )
             )[0],
@@ -455,9 +459,14 @@
     const setPersisted = async (_getContent, changes) => {
       sends++;
       if (changes) {
-        send(null, null, CONTENT_DIFF, changes);
+        send(null, null, Message.ContentDiff, changes);
       } else {
-        send(null, null, CONTENT_HASHES, store.getMergeableContentHashes());
+        send(
+          null,
+          null,
+          Message.ContentHashes,
+          store.getMergeableContentHashes(),
+        );
       }
     };
     const addPersisterListener = (listener) => (persisterListener = listener);
@@ -477,7 +486,7 @@
       addPersisterListener,
       delPersisterListener,
       onIgnoredError,
-      2,
+      Persists.MergeableStoreOnly,
       {startSync, stopSync, destroy, getSynchronizerStats, ...extra},
     );
     return persister;