tinybase 5.4.0-beta.1 → 5.4.0-beta.3

package/umd/es6/synchronizers/synchronizer-ws-server-simple/index.js

@@ -11,6 +11,7 @@
 
   const EMPTY_STRING = '';
   const UTF8 = 'utf8';
+  const MESSAGE = 'message';
   const strMatch = (str, regex) => (str == null ? void 0 : str.match(regex));
 
   const isUndefined = (thing) => thing == void 0;
@@ -65,8 +66,8 @@
       then(slice(payload, 0, splitAt), slice(payload, splitAt + 1));
     }
   };
-  const createRawPayload = (toClientId, remainder) =>
-    toClientId + MESSAGE_SEPARATOR + remainder;
+  const createRawPayload = (clientId, remainder) =>
+    clientId + MESSAGE_SEPARATOR + remainder;
 
   var __async = (__this, __arguments, generator) => {
     return new Promise((resolve, reject) => {
@@ -94,21 +95,20 @@
   const PATH_REGEX = /\/([^?]*)/;
   const createWsServerSimple = (webSocketServer) => {
     const clientsByPath = mapNew();
-    webSocketServer.on('connection', (webSocket, request) =>
+    webSocketServer.on('connection', (client, request) =>
       ifNotUndefined(strMatch(request.url, PATH_REGEX), ([, pathId]) =>
         ifNotUndefined(request.headers['sec-websocket-key'], (clientId) =>
           __async(void 0, null, function* () {
             const clients = mapEnsure(clientsByPath, pathId, mapNew);
-            mapSet(clients, clientId, webSocket);
-            webSocket.on('message', (data) => {
-              const payload = data.toString(UTF8);
-              ifPayloadValid(payload, (toClientId, remainder) => {
+            mapSet(clients, clientId, client);
+            client.on(MESSAGE, (data) =>
+              ifPayloadValid(data.toString(UTF8), (toClientId, remainder) => {
                 var _a;
                 const forwardedPayload = createRawPayload(clientId, remainder);
                 if (toClientId === EMPTY_STRING) {
-                  mapForEach(clients, (otherClientId, otherWebSocket) =>
+                  mapForEach(clients, (otherClientId, otherClient) =>
                     otherClientId !== clientId
-                      ? otherWebSocket.send(forwardedPayload)
+                      ? otherClient.send(forwardedPayload)
                       : 0,
                   );
                 } else {
@@ -116,9 +116,9 @@
                     ? void 0
                     : _a.send(forwardedPayload);
                 }
-              });
-            });
-            webSocket.on('close', () => {
+              }),
+            );
+            client.on('close', () => {
               collDel(clients, clientId);
               if (collIsEmpty(clients)) {
                 collDel(clientsByPath, pathId);

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

@@ -11,6 +11,7 @@
 
   const EMPTY_STRING = '';
   const UTF8 = 'utf8';
+  const MESSAGE = 'message';
   const strMatch = (str, regex) => (str == null ? void 0 : str.match(regex));
 
   const isUndefined = (thing) => thing == void 0;
@@ -65,8 +66,8 @@
       then(slice(payload, 0, splitAt), slice(payload, splitAt + 1));
     }
   };
-  const createRawPayload = (toClientId, remainder) =>
-    toClientId + MESSAGE_SEPARATOR + remainder;
+  const createRawPayload = (clientId, remainder) =>
+    clientId + MESSAGE_SEPARATOR + remainder;
 
   var __async = (__this, __arguments, generator) => {
     return new Promise((resolve, reject) => {
@@ -94,21 +95,20 @@
   const PATH_REGEX = /\/([^?]*)/;
   const createWsServerSimple = (webSocketServer) => {
     const clientsByPath = mapNew();
-    webSocketServer.on('connection', (webSocket, request) =>
+    webSocketServer.on('connection', (client, request) =>
       ifNotUndefined(strMatch(request.url, PATH_REGEX), ([, pathId]) =>
         ifNotUndefined(request.headers['sec-websocket-key'], (clientId) =>
           __async(void 0, null, function* () {
             const clients = mapEnsure(clientsByPath, pathId, mapNew);
-            mapSet(clients, clientId, webSocket);
-            webSocket.on('message', (data) => {
-              const payload = data.toString(UTF8);
-              ifPayloadValid(payload, (toClientId, remainder) => {
+            mapSet(clients, clientId, client);
+            client.on(MESSAGE, (data) =>
+              ifPayloadValid(data.toString(UTF8), (toClientId, remainder) => {
                 var _a;
                 const forwardedPayload = createRawPayload(clientId, remainder);
                 if (toClientId === EMPTY_STRING) {
-                  mapForEach(clients, (otherClientId, otherWebSocket) =>
+                  mapForEach(clients, (otherClientId, otherClient) =>
                     otherClientId !== clientId
-                      ? otherWebSocket.send(forwardedPayload)
+                      ? otherClient.send(forwardedPayload)
                       : 0,
                   );
                 } else {
@@ -116,9 +116,9 @@
                     ? void 0
                     : _a.send(forwardedPayload);
                 }
-              });
-            });
-            webSocket.on('close', () => {
+              }),
+            );
+            client.on('close', () => {
               collDel(clients, clientId);
               if (collIsEmpty(clients)) {
                 collDel(clientsByPath, pathId);

package/umd/es6/synchronizers/with-schemas/index.js

@@ -15,6 +15,9 @@
 
   const promise = Promise;
   const GLOBAL = globalThis;
+  const THOUSAND = 1e3;
+  const startTimeout = (callback, sec = 0) =>
+    setTimeout(callback, sec * THOUSAND);
   const math = Math;
   const mathFloor = math.floor;
   const isUndefined = (thing) => thing == void 0;
@@ -121,7 +124,7 @@
       },
     );
 
-  const newStamp = (value, time) => (time ? [value, time] : [value]);
+  const stampNew = (value, time) => (time ? [value, time] : [value]);
   const getLatestTime = (time1, time2) => {
     var _a;
     return (
@@ -134,7 +137,7 @@
         : ''
     );
   };
-  const stampNewObj = (time = EMPTY_STRING) => newStamp(objNew(), time);
+  const stampNewObj = (time = EMPTY_STRING) => stampNew(objNew(), time);
 
   const setNew = (entryOrEntries) =>
     new Set(
@@ -303,12 +306,16 @@
   };
   const scheduleRunning = mapNew();
   const scheduleActions = mapNew();
-  const getStoreFunctions = (persist = 1 /* StoreOnly */, store) =>
+  const getStoreFunctions = (
+    persist = 1 /* StoreOnly */,
+    store,
+    isSynchronizer,
+  ) =>
     persist != 1 /* StoreOnly */ && store.isMergeable()
       ? [
           1,
           store.getMergeableContent,
-          store.getTransactionMergeableChanges,
+          () => store.getTransactionMergeableChanges(!isSynchronizer),
           ([[changedTables], [changedValues]]) =>
             !objIsEmpty(changedTables) || !objIsEmpty(changedValues),
           store.setDefaultContent,
@@ -332,6 +339,7 @@
     onIgnoredError,
     persist,
     extra = {},
+    isSynchronizer = 0,
     scheduleId = [],
   ) => {
     let status = 0; /* Idle */
@@ -349,7 +357,7 @@
       getChanges,
       hasChanges,
       setDefaultContent,
-    ] = getStoreFunctions(persist, store);
+    ] = getStoreFunctions(persist, store, isSynchronizer);
     const [addListener, callListeners, delListenerImpl] = getListenerFunctions(
       () => persister,
     );
@@ -404,7 +412,7 @@
                 } else if (initialContent) {
                   setDefaultContent(initialContent);
                 } else {
-                  errorNew(`Content is not an array ${content}`);
+                  errorNew(`Content is not an array: ${content}`);
                 }
               } catch (error) {
                 onIgnoredError == null ? void 0 : onIgnoredError(error);
@@ -420,7 +428,8 @@
       });
     const startAutoLoad = (initialContent) =>
       __async$1(void 0, null, function* () {
-        yield stopAutoLoad().load(initialContent);
+        stopAutoLoad();
+        yield load(initialContent);
         try {
           autoLoadHandle = yield addPersisterListener((content, changes) =>
             __async$1(void 0, null, function* () {
@@ -473,7 +482,8 @@
       });
     const startAutoSave = () =>
       __async$1(void 0, null, function* () {
-        yield stopAutoSave().save();
+        stopAutoSave();
+        yield save();
         autoSaveListenerId = store.addDidFinishTransactionListener(() => {
           const changes = getChanges();
           if (hasChanges(changes)) {
@@ -483,8 +493,10 @@
         return persister;
       });
     const stopAutoSave = () => {
-      ifNotUndefined(autoSaveListenerId, store.delListener);
-      autoSaveListenerId = void 0;
+      if (autoSaveListenerId) {
+        store.delListener(autoSaveListenerId);
+        autoSaveListenerId = void 0;
+      }
       return persister;
     };
     const isAutoSaving = () => !isUndefined(autoSaveListenerId);
@@ -613,41 +625,39 @@
     onIgnoredError,
     extra = {},
   ) => {
+    let syncing = 0;
     let persisterListener;
     let sends = 0;
     let receives = 0;
     const pendingRequests = mapNew();
+    const getTransactionId = () => getUniqueId(11);
     const sendImpl = (toClientId, requestId, message, body) => {
       sends++;
       onSend == null ? void 0 : onSend(toClientId, requestId, message, body);
       send(toClientId, requestId, message, body);
     };
-    const request = (_0, _1, ..._2) =>
-      __async(
-        void 0,
-        [_0, _1, ..._2],
-        function* (toClientId, message, body = EMPTY_STRING) {
-          return promiseNew((resolve, reject) => {
-            const requestId = getUniqueId();
-            const timeout = setTimeout(() => {
+    const request = (toClientId, message, body, transactionId) =>
+      __async(void 0, null, function* () {
+        return promiseNew((resolve, reject) => {
+          const requestId = transactionId + '.' + getUniqueId(4);
+          const timeout = startTimeout(() => {
+            collDel(pendingRequests, requestId);
+            reject(
+              `No response from ${toClientId != null ? toClientId : 'anyone'} to ${requestId}, ` +
+                message,
+            );
+          }, requestTimeoutSeconds);
+          mapSet(pendingRequests, requestId, [
+            toClientId,
+            (response, fromClientId) => {
+              clearTimeout(timeout);
               collDel(pendingRequests, requestId);
-              reject(
-                `No response from ${toClientId != null ? toClientId : 'anyone'} to ${requestId}, ` +
-                  message,
-              );
-            }, requestTimeoutSeconds * 1e3);
-            mapSet(pendingRequests, requestId, [
-              toClientId,
-              (response, fromClientId) => {
-                clearTimeout(timeout);
-                collDel(pendingRequests, requestId);
-                resolve([response, fromClientId]);
-              },
-            ]);
-            sendImpl(toClientId, requestId, message, body);
-          });
-        },
-      );
+              resolve([response, fromClientId, transactionId]);
+            },
+          ]);
+          sendImpl(toClientId, requestId, message, body);
+        });
+      });
     const mergeTablesStamps = (tablesStamp, [tableStamps2, tablesTime2]) => {
       objForEach(tableStamps2, ([rowStamps2, tableTime2], tableId) => {
         const tableStamp = objEnsure(tablesStamp[0], tableId, stampNewObj);
@@ -656,7 +666,7 @@
           objForEach(
             cellStamps2,
             ([cell2, cellTime2], cellId) =>
-              (rowStamp[0][cellId] = newStamp(cell2, cellTime2)),
+              (rowStamp[0][cellId] = stampNew(cell2, cellTime2)),
           );
           rowStamp[1] = getLatestTime(rowStamp[1], rowTime2);
         });
@@ -664,70 +674,87 @@
       });
       tablesStamp[1] = getLatestTime(tablesStamp[1], tablesTime2);
     };
-    const getChangesFromOtherStore = (
-      otherClientId = null,
-      otherContentHashes,
-    ) =>
-      __async(void 0, null, function* () {
-        if (isUndefined(otherContentHashes)) {
-          [otherContentHashes, otherClientId] = yield request(
-            otherClientId,
-            1 /* GetContentHashes */,
-          );
-        }
-        const [otherTablesHash, otherValuesHash] = otherContentHashes;
-        const [tablesHash, valuesHash] = store.getMergeableContentHashes();
-        let tablesChanges = stampNewObj();
-        if (tablesHash != otherTablesHash) {
-          const [newTables, differentTableHashes] = (yield request(
-            otherClientId,
-            4 /* GetTableDiff */,
-            store.getMergeableTableHashes(),
-          ))[0];
-          tablesChanges = newTables;
-          if (!objIsEmpty(differentTableHashes)) {
-            const [newRows, differentRowHashes] = (yield request(
-              otherClientId,
-              5 /* GetRowDiff */,
-              store.getMergeableRowHashes(differentTableHashes),
-            ))[0];
-            mergeTablesStamps(tablesChanges, newRows);
-            if (!objIsEmpty(differentRowHashes)) {
-              const newCells = (yield request(
+    const getChangesFromOtherStore = (..._0) =>
+      __async(
+        void 0,
+        [..._0],
+        function* (
+          otherClientId = null,
+          otherContentHashes,
+          transactionId = getTransactionId(),
+        ) {
+          try {
+            if (isUndefined(otherContentHashes)) {
+              [otherContentHashes, otherClientId, transactionId] =
+                yield request(
+                  null,
+                  1 /* GetContentHashes */,
+                  EMPTY_STRING,
+                  transactionId,
+                );
+            }
+            const [otherTablesHash, otherValuesHash] = otherContentHashes;
+            const [tablesHash, valuesHash] = store.getMergeableContentHashes();
+            let tablesChanges = stampNewObj();
+            if (tablesHash != otherTablesHash) {
+              const [newTables, differentTableHashes] = (yield request(
                 otherClientId,
-                6 /* GetCellDiff */,
-                store.getMergeableCellHashes(differentRowHashes),
+                4 /* GetTableDiff */,
+                store.getMergeableTableHashes(),
+                transactionId,
               ))[0];
-              mergeTablesStamps(tablesChanges, newCells);
+              tablesChanges = newTables;
+              if (!objIsEmpty(differentTableHashes)) {
+                const [newRows, differentRowHashes] = (yield request(
+                  otherClientId,
+                  5 /* GetRowDiff */,
+                  store.getMergeableRowHashes(differentTableHashes),
+                  transactionId,
+                ))[0];
+                mergeTablesStamps(tablesChanges, newRows);
+                if (!objIsEmpty(differentRowHashes)) {
+                  const newCells = (yield request(
+                    otherClientId,
+                    6 /* GetCellDiff */,
+                    store.getMergeableCellHashes(differentRowHashes),
+                    transactionId,
+                  ))[0];
+                  mergeTablesStamps(tablesChanges, newCells);
+                }
+              }
             }
+            return [
+              tablesChanges,
+              valuesHash == otherValuesHash
+                ? stampNewObj()
+                : (yield request(
+                    otherClientId,
+                    7 /* GetValueDiff */,
+                    store.getMergeableValueHashes(),
+                    transactionId,
+                  ))[0],
+              1,
+            ];
+          } catch (error) {
+            onIgnoredError == null ? void 0 : onIgnoredError(error);
           }
-        }
-        return [
-          tablesChanges,
-          valuesHash == otherValuesHash
-            ? stampNewObj()
-            : (yield request(
-                otherClientId,
-                7 /* GetValueDiff */,
-                store.getMergeableValueHashes(),
-              ))[0],
-          1,
-        ];
-      });
+        },
+      );
     const getPersisted = () =>
       __async(void 0, null, function* () {
         const changes = yield getChangesFromOtherStore();
-        return !objIsEmpty(changes[0][0]) || !objIsEmpty(changes[1][0])
+        return changes &&
+          (!objIsEmpty(changes[0][0]) || !objIsEmpty(changes[1][0]))
           ? changes
           : void 0;
       });
     const setPersisted = (_getContent, changes) =>
       __async(void 0, null, function* () {
         return changes
-          ? sendImpl(null, null, 3 /* ContentDiff */, changes)
+          ? sendImpl(null, getTransactionId(), 3 /* ContentDiff */, changes)
           : sendImpl(
               null,
-              null,
+              getTransactionId(),
               2 /* ContentHashes */,
               store.getMergeableContentHashes(),
             );
@@ -736,11 +763,15 @@
     const delPersisterListener = () => (persisterListener = void 0);
     const startSync = (initialContent) =>
       __async(void 0, null, function* () {
+        syncing = 1;
         return yield (yield persister.startAutoLoad(
           initialContent,
         )).startAutoSave();
       });
-    const stopSync = () => persister.stopAutoLoad().stopAutoSave();
+    const stopSync = () => {
+      syncing = 0;
+      return persister.stopAutoLoad().stopAutoSave();
+    };
     const destroy = () => {
       destroyImpl();
       return persister.stopSync();
@@ -759,35 +790,41 @@
         {startSync, stopSync, destroy, getSynchronizerStats},
         extra,
       ),
+      1,
     );
-    registerReceive((fromClientId, requestId, message, body) => {
+    registerReceive((fromClientId, transactionOrRequestId, message, body) => {
+      const isAutoLoading = syncing || persister.isAutoLoading();
       receives++;
       onReceive == null
         ? void 0
-        : onReceive(fromClientId, requestId, message, body);
+        : onReceive(fromClientId, transactionOrRequestId, message, body);
       if (message == 0 /* Response */) {
         ifNotUndefined(
-          mapGet(pendingRequests, requestId),
+          mapGet(pendingRequests, transactionOrRequestId),
           ([toClientId, handleResponse]) =>
             isUndefined(toClientId) || toClientId == fromClientId
               ? handleResponse(body, fromClientId)
               : /* istanbul ignore next */
                 0,
         );
-      } else if (
-        message == 2 /* ContentHashes */ &&
-        persister.isAutoLoading()
-      ) {
-        getChangesFromOtherStore(fromClientId, body).then((changes) => {
-          persisterListener == null
-            ? void 0
-            : persisterListener(void 0, changes);
-        });
-      } else if (message == 3 /* ContentDiff */ && persister.isAutoLoading()) {
+      } else if (message == 2 /* ContentHashes */ && isAutoLoading) {
+        getChangesFromOtherStore(
+          fromClientId,
+          body,
+          transactionOrRequestId != null ? transactionOrRequestId : void 0,
+        )
+          .then((changes) => {
+            persisterListener == null
+              ? void 0
+              : persisterListener(void 0, changes);
+          })
+          .catch(onIgnoredError);
+      } else if (message == 3 /* ContentDiff */ && isAutoLoading) {
         persisterListener == null ? void 0 : persisterListener(void 0, body);
       } else {
         ifNotUndefined(
-          message == 1 /* GetContentHashes */ && persister.isAutoSaving()
+          message == 1 /* GetContentHashes */ &&
+            (syncing || persister.isAutoSaving())
             ? store.getMergeableContentHashes()
             : message == 4 /* GetTableDiff */
               ? store.getMergeableTableDiff(body)
@@ -799,7 +836,12 @@
                     ? store.getMergeableValueDiff(body)
                     : void 0,
           (response) => {
-            sendImpl(fromClientId, requestId, 0 /* Response */, response);
+            sendImpl(
+              fromClientId,
+              transactionOrRequestId,
+              0 /* Response */,
+              response,
+            );
           },
         );
       }

package/umd/es6/ui-react-inspector/index.js

@@ -2034,12 +2034,16 @@
   };
   const scheduleRunning = mapNew();
   const scheduleActions = mapNew();
-  const getStoreFunctions = (persist = 1 /* StoreOnly */, store) =>
+  const getStoreFunctions = (
+    persist = 1 /* StoreOnly */,
+    store,
+    isSynchronizer,
+  ) =>
     persist != 1 /* StoreOnly */ && store.isMergeable()
       ? [
           1,
           store.getMergeableContent,
-          store.getTransactionMergeableChanges,
+          () => store.getTransactionMergeableChanges(!isSynchronizer),
           ([[changedTables], [changedValues]]) =>
             !objIsEmpty(changedTables) || !objIsEmpty(changedValues),
           store.setDefaultContent,
@@ -2063,6 +2067,7 @@
     onIgnoredError,
     persist,
     extra = {},
+    isSynchronizer = 0,
     scheduleId = [],
   ) => {
     let status = 0; /* Idle */
@@ -2080,7 +2085,7 @@
       getChanges,
       hasChanges,
       setDefaultContent,
-    ] = getStoreFunctions(persist, store);
+    ] = getStoreFunctions(persist, store, isSynchronizer);
     const [addListener, callListeners, delListenerImpl] = getListenerFunctions(
       () => persister,
     );
@@ -2132,7 +2137,7 @@
                 } else if (initialContent) {
                   setDefaultContent(initialContent);
                 } else {
-                  errorNew(`Content is not an array ${content}`);
+                  errorNew(`Content is not an array: ${content}`);
                 }
               } catch (error) {
                 if (initialContent) {
@@ -2147,7 +2152,8 @@
       });
     const startAutoLoad = (initialContent) =>
       __async$2(void 0, null, function* () {
-        yield stopAutoLoad().load(initialContent);
+        stopAutoLoad();
+        yield load(initialContent);
         try {
           autoLoadHandle = yield addPersisterListener((content, changes) =>
             __async$2(void 0, null, function* () {
@@ -2194,7 +2200,8 @@
       });
     const startAutoSave = () =>
       __async$2(void 0, null, function* () {
-        yield stopAutoSave().save();
+        stopAutoSave();
+        yield save();
         autoSaveListenerId = store.addDidFinishTransactionListener(() => {
           const changes = getChanges();
           if (hasChanges(changes)) {
@@ -2204,8 +2211,10 @@
         return persister;
       });
     const stopAutoSave = () => {
-      ifNotUndefined(autoSaveListenerId, store.delListener);
-      autoSaveListenerId = void 0;
+      if (autoSaveListenerId) {
+        store.delListener(autoSaveListenerId);
+        autoSaveListenerId = void 0;
+      }
       return persister;
     };
     const isAutoSaving = () => !isUndefined(autoSaveListenerId);
@@ -2646,11 +2655,11 @@
     };
     const getNewRowId = (tableId, reuse) => {
       const [getId] = mapGet(tablePoolFunctions, tableId);
-      const rowId = getId(reuse);
-      if (!collHas(mapGet(tablesMap, tableId), rowId)) {
-        return rowId;
-      }
-      return getNewRowId(tableId, reuse);
+      let rowId;
+      do {
+        rowId = getId(reuse);
+      } while (collHas(mapGet(tablesMap, tableId), rowId));
+      return rowId;
     };
     const getOrCreateTable = (tableId) => {
       var _a;