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

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

@@ -100,20 +100,6 @@
     return mapGet(map, key);
   };
 
-  new GLOBAL.TextEncoder();
-
-  const newStamp = (value, time) => (time ? [value, time] : [value]);
-  const getLatestTime = (time1, time2) => {
-    var _a;
-    return (_a =
-      (time1 != null ? time1 : '') > (time2 != null ? time2 : '')
-        ? time1
-        : time2) != null
-      ? _a
-      : '';
-  };
-  const stampNewObj = (time = EMPTY_STRING) => newStamp(objNew(), time);
-
   var __defProp$1 = Object.defineProperty;
   var __getOwnPropSymbols$1 = Object.getOwnPropertySymbols;
   var __hasOwnProp$1 = Object.prototype.hasOwnProperty;
@@ -159,10 +145,15 @@
       step((generator = generator.apply(__this, __arguments)).next());
     });
   };
+  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,
@@ -171,7 +162,7 @@
             !objIsEmpty(changedTables) || !objIsEmpty(changedValues),
           store.setDefaultContent,
         ]
-      : supportedStoreType != 2
+      : persist != Persists.MergeableStoreOnly
         ? [
             0,
             store.getContent,
@@ -188,7 +179,7 @@
     addPersisterListener,
     delPersisterListener,
     onIgnoredError,
-    supportedStoreType,
+    persist,
     extra = {},
     scheduleId = [],
   ) => {
@@ -206,7 +197,7 @@
       getChanges,
       hasChanges,
       setDefaultContent,
-    ] = getStoreFunctions(supportedStoreType, store);
+    ] = getStoreFunctions(persist, store);
     const run = () =>
       __async$2(void 0, null, function* () {
         /* istanbul ignore else */
@@ -353,6 +344,20 @@
     return objFreeze(persister);
   };
 
+  new GLOBAL.TextEncoder();
+
+  const newStamp = (value, time) => (time ? [value, time] : [value]);
+  const getLatestTime = (time1, time2) => {
+    var _a;
+    return (_a =
+      (time1 != null ? time1 : '') > (time2 != null ? time2 : '')
+        ? time1
+        : time2) != null
+      ? _a
+      : '';
+  };
+  const stampNewObj = (time = EMPTY_STRING) => newStamp(objNew(), time);
+
   const MASK6 = 63;
   const ENCODE =
     '-0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ_abcdefghijklmnopqrstuvwxyz'.split(
@@ -417,14 +422,16 @@
       step((generator = generator.apply(__this, __arguments)).next());
     });
   };
-  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,
@@ -438,43 +445,44 @@
     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 == null
             ? void 0
             : persisterListener(void 0, changes);
         });
-      } else if (messageType == CONTENT_DIFF && persister.isAutoLoading()) {
-        persisterListener == null
-          ? void 0
-          : persisterListener(void 0, messageBody);
+      } else if (message == Message.ContentDiff && persister.isAutoLoading()) {
+        persisterListener == null ? void 0 : 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);
           },
         );
       }
@@ -483,13 +491,13 @@
       __async$1(
         void 0,
         [_0, _1, ..._2],
-        function* (toClientId, messageType, messageBody = EMPTY_STRING) {
+        function* (toClientId, message, body = EMPTY_STRING) {
           return promiseNew((resolve, reject) => {
             const requestId = getUniqueId();
             const timeout = setTimeout(() => {
               collDel(pendingRequests, requestId);
               reject(
-                `No response from ${toClientId != null ? toClientId : 'anyone'} to '${messageType}'`,
+                `No response from ${toClientId != null ? toClientId : 'anyone'} to '${message}'`,
               );
             }, requestTimeoutSeconds * 1e3);
             mapSet(pendingRequests, requestId, [
@@ -501,7 +509,7 @@
               },
             ]);
             sends++;
-            send(toClientId, requestId, messageType, messageBody);
+            send(toClientId, requestId, message, body);
           });
         },
       );
@@ -529,7 +537,7 @@
         if (isUndefined(otherContentHashes)) {
           [otherContentHashes, otherClientId] = yield request(
             otherClientId,
-            GET_CONTENT_HASHES,
+            Message.GetContentHashes,
           );
         }
         const [otherTablesHash, otherValuesHash] = otherContentHashes;
@@ -538,21 +546,21 @@
         if (tablesHash != otherTablesHash) {
           const [newTables, differentTableHashes] = (yield request(
             otherClientId,
-            GET_TABLE_DIFF,
+            Message.GetTableDiff,
             store.getMergeableTableHashes(),
           ))[0];
           tablesChanges = newTables;
           if (!objIsEmpty(differentTableHashes)) {
             const [newRows, differentRowHashes] = (yield request(
               otherClientId,
-              GET_ROW_DIFF,
+              Message.GetRowDiff,
               store.getMergeableRowHashes(differentTableHashes),
             ))[0];
             mergeTablesStamps(tablesChanges, newRows);
             if (!objIsEmpty(differentRowHashes)) {
               const newCells = (yield request(
                 otherClientId,
-                GET_CELL_DIFF,
+                Message.GetCellDiff,
                 store.getMergeableCellHashes(differentRowHashes),
               ))[0];
               mergeTablesStamps(tablesChanges, newCells);
@@ -565,7 +573,7 @@
             ? stampNewObj()
             : (yield request(
                 otherClientId,
-                GET_VALUE_DIFF,
+                Message.GetValueDiff,
                 store.getMergeableValueHashes(),
               ))[0],
           1,
@@ -582,9 +590,14 @@
       __async$1(void 0, null, function* () {
         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);
@@ -608,7 +621,7 @@
       addPersisterListener,
       delPersisterListener,
       onIgnoredError,
-      2,
+      Persists.MergeableStoreOnly,
       __spreadValues(
         {startSync, stopSync, destroy, getSynchronizerStats},
         extra,

package/umd/es6/synchronizers/synchronizer-ws-client/with-schemas/index.js

@@ -100,20 +100,6 @@
     return mapGet(map, key);
   };
 
-  new GLOBAL.TextEncoder();
-
-  const newStamp = (value, time) => (time ? [value, time] : [value]);
-  const getLatestTime = (time1, time2) => {
-    var _a;
-    return (_a =
-      (time1 != null ? time1 : '') > (time2 != null ? time2 : '')
-        ? time1
-        : time2) != null
-      ? _a
-      : '';
-  };
-  const stampNewObj = (time = EMPTY_STRING) => newStamp(objNew(), time);
-
   var __defProp$1 = Object.defineProperty;
   var __getOwnPropSymbols$1 = Object.getOwnPropertySymbols;
   var __hasOwnProp$1 = Object.prototype.hasOwnProperty;
@@ -159,10 +145,15 @@
       step((generator = generator.apply(__this, __arguments)).next());
     });
   };
+  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,
@@ -171,7 +162,7 @@
             !objIsEmpty(changedTables) || !objIsEmpty(changedValues),
           store.setDefaultContent,
         ]
-      : supportedStoreType != 2
+      : persist != Persists.MergeableStoreOnly
         ? [
             0,
             store.getContent,
@@ -188,7 +179,7 @@
     addPersisterListener,
     delPersisterListener,
     onIgnoredError,
-    supportedStoreType,
+    persist,
     extra = {},
     scheduleId = [],
   ) => {
@@ -206,7 +197,7 @@
       getChanges,
       hasChanges,
       setDefaultContent,
-    ] = getStoreFunctions(supportedStoreType, store);
+    ] = getStoreFunctions(persist, store);
     const run = () =>
       __async$2(void 0, null, function* () {
         /* istanbul ignore else */
@@ -353,6 +344,20 @@
     return objFreeze(persister);
   };
 
+  new GLOBAL.TextEncoder();
+
+  const newStamp = (value, time) => (time ? [value, time] : [value]);
+  const getLatestTime = (time1, time2) => {
+    var _a;
+    return (_a =
+      (time1 != null ? time1 : '') > (time2 != null ? time2 : '')
+        ? time1
+        : time2) != null
+      ? _a
+      : '';
+  };
+  const stampNewObj = (time = EMPTY_STRING) => newStamp(objNew(), time);
+
   const MASK6 = 63;
   const ENCODE =
     '-0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ_abcdefghijklmnopqrstuvwxyz'.split(
@@ -417,14 +422,16 @@
       step((generator = generator.apply(__this, __arguments)).next());
     });
   };
-  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,
@@ -438,43 +445,44 @@
     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 == null
             ? void 0
             : persisterListener(void 0, changes);
         });
-      } else if (messageType == CONTENT_DIFF && persister.isAutoLoading()) {
-        persisterListener == null
-          ? void 0
-          : persisterListener(void 0, messageBody);
+      } else if (message == Message.ContentDiff && persister.isAutoLoading()) {
+        persisterListener == null ? void 0 : 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);
           },
         );
       }
@@ -483,13 +491,13 @@
       __async$1(
         void 0,
         [_0, _1, ..._2],
-        function* (toClientId, messageType, messageBody = EMPTY_STRING) {
+        function* (toClientId, message, body = EMPTY_STRING) {
           return promiseNew((resolve, reject) => {
             const requestId = getUniqueId();
             const timeout = setTimeout(() => {
               collDel(pendingRequests, requestId);
               reject(
-                `No response from ${toClientId != null ? toClientId : 'anyone'} to '${messageType}'`,
+                `No response from ${toClientId != null ? toClientId : 'anyone'} to '${message}'`,
               );
             }, requestTimeoutSeconds * 1e3);
             mapSet(pendingRequests, requestId, [
@@ -501,7 +509,7 @@
               },
             ]);
             sends++;
-            send(toClientId, requestId, messageType, messageBody);
+            send(toClientId, requestId, message, body);
           });
         },
       );
@@ -529,7 +537,7 @@
         if (isUndefined(otherContentHashes)) {
           [otherContentHashes, otherClientId] = yield request(
             otherClientId,
-            GET_CONTENT_HASHES,
+            Message.GetContentHashes,
           );
         }
         const [otherTablesHash, otherValuesHash] = otherContentHashes;
@@ -538,21 +546,21 @@
         if (tablesHash != otherTablesHash) {
           const [newTables, differentTableHashes] = (yield request(
             otherClientId,
-            GET_TABLE_DIFF,
+            Message.GetTableDiff,
             store.getMergeableTableHashes(),
           ))[0];
           tablesChanges = newTables;
           if (!objIsEmpty(differentTableHashes)) {
             const [newRows, differentRowHashes] = (yield request(
               otherClientId,
-              GET_ROW_DIFF,
+              Message.GetRowDiff,
               store.getMergeableRowHashes(differentTableHashes),
             ))[0];
             mergeTablesStamps(tablesChanges, newRows);
             if (!objIsEmpty(differentRowHashes)) {
               const newCells = (yield request(
                 otherClientId,
-                GET_CELL_DIFF,
+                Message.GetCellDiff,
                 store.getMergeableCellHashes(differentRowHashes),
               ))[0];
               mergeTablesStamps(tablesChanges, newCells);
@@ -565,7 +573,7 @@
             ? stampNewObj()
             : (yield request(
                 otherClientId,
-                GET_VALUE_DIFF,
+                Message.GetValueDiff,
                 store.getMergeableValueHashes(),
               ))[0],
           1,
@@ -582,9 +590,14 @@
       __async$1(void 0, null, function* () {
         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);
@@ -608,7 +621,7 @@
       addPersisterListener,
       delPersisterListener,
       onIgnoredError,
-      2,
+      Persists.MergeableStoreOnly,
       __spreadValues(
         {startSync, stopSync, destroy, getSynchronizerStats},
         extra,