tinybase 5.0.4 → 5.1.0-beta.1

package/cjs/es6/with-schemas/index.cjs

@@ -1262,14 +1262,14 @@ var __async$1 = (__this, __arguments, generator) => {
   });
 };
 const Persists = {
-  StoreOnly: 1,
-  MergeableStoreOnly: 2,
-  StoreOrMergeableStore: 3,
+  StoreOnly: 1 /* StoreOnly */,
+  MergeableStoreOnly: 2 /* MergeableStoreOnly */,
+  StoreOrMergeableStore: 3 /* StoreOrMergeableStore */,
 };
 const scheduleRunning = mapNew();
 const scheduleActions = mapNew();
-const getStoreFunctions = (persist = Persists.StoreOnly, store) =>
-  persist != Persists.StoreOnly && store.isMergeable()
+const getStoreFunctions = (persist = 1 /* StoreOnly */, store) =>
+  persist != 1 /* StoreOnly */ && store.isMergeable()
     ? [
         1,
         store.getMergeableContent,
@@ -1278,7 +1278,7 @@ const getStoreFunctions = (persist = Persists.StoreOnly, store) =>
           !objIsEmpty(changedTables) || !objIsEmpty(changedValues),
         store.setDefaultContent,
       ]
-    : persist != Persists.MergeableStoreOnly
+    : persist != 2 /* MergeableStoreOnly */
       ? [
           0,
           store.getContent,
@@ -1369,21 +1369,26 @@ const createCustomPersister = (
   const startAutoLoad = (initialContent) =>
     __async$1(void 0, null, function* () {
       yield stopAutoLoad().load(initialContent);
-      autoLoadHandle = addPersisterListener((content, changes) =>
-        __async$1(void 0, null, function* () {
-          if (changes || content) {
-            /* istanbul ignore else */
-            if (loadSave != 2) {
-              loadSave = 1;
-              loads++;
-              setContentOrChanges(changes != null ? changes : content);
-              loadSave = 0;
+      try {
+        autoLoadHandle = addPersisterListener((content, changes) =>
+          __async$1(void 0, null, function* () {
+            if (changes || content) {
+              /* istanbul ignore else */
+              if (loadSave != 2) {
+                loadSave = 1;
+                loads++;
+                setContentOrChanges(changes != null ? changes : content);
+                loadSave = 0;
+              }
+            } else {
+              yield load();
             }
-          } else {
-            yield load();
-          }
-        }),
-      );
+          }),
+        );
+      } catch (error) {
+        /* istanbul ignore next */
+        onIgnoredError == null ? void 0 : onIgnoredError(error);
+      }
       return persister;
     });
   const stopAutoLoad = () => {
@@ -1438,7 +1443,10 @@ const createCustomPersister = (
       return persister;
     });
   const getStore = () => store;
-  const destroy = () => stopAutoLoad().stopAutoSave();
+  const destroy = () => {
+    arrayClear(mapGet(scheduleActions, scheduleId));
+    return stopAutoLoad().stopAutoSave();
+  };
   const getStats = () => ({loads, saves});
   const persister = __spreadValues$1(
     {
@@ -1557,14 +1565,14 @@ var __async = (__this, __arguments, generator) => {
   });
 };
 const Message = {
-  Response: 0,
-  GetContentHashes: 1,
-  ContentHashes: 2,
-  ContentDiff: 3,
-  GetTableDiff: 4,
-  GetRowDiff: 5,
-  GetCellDiff: 6,
-  GetValueDiff: 7,
+  Response: 0 /* Response */,
+  GetContentHashes: 1 /* GetContentHashes */,
+  ContentHashes: 2 /* ContentHashes */,
+  ContentDiff: 3 /* ContentDiff */,
+  GetTableDiff: 4 /* GetTableDiff */,
+  GetRowDiff: 5 /* GetRowDiff */,
+  GetCellDiff: 6 /* GetCellDiff */,
+  GetValueDiff: 7 /* GetValueDiff */,
 };
 const createCustomSynchronizer = (
   store,
@@ -1572,6 +1580,8 @@ const createCustomSynchronizer = (
   registerReceive,
   destroyImpl,
   requestTimeoutSeconds,
+  onSend,
+  onReceive,
   onIgnoredError,
   extra = {},
 ) => {
@@ -1579,43 +1589,11 @@ const createCustomSynchronizer = (
   let sends = 0;
   let receives = 0;
   const pendingRequests = mapNew();
-  registerReceive((fromClientId, requestId, message, body) => {
-    receives++;
-    if (message == Message.Response) {
-      ifNotUndefined(
-        mapGet(pendingRequests, requestId),
-        ([toClientId, handleResponse]) =>
-          isUndefined(toClientId) || toClientId == fromClientId
-            ? handleResponse(body, fromClientId)
-            : /* istanbul ignore next */
-              0,
-      );
-    } else if (message == Message.ContentHashes && persister.isAutoLoading()) {
-      getChangesFromOtherStore(fromClientId, body).then((changes) => {
-        persisterListener == null ? void 0 : persisterListener(void 0, changes);
-      });
-    } else if (message == Message.ContentDiff && persister.isAutoLoading()) {
-      persisterListener == null ? void 0 : persisterListener(void 0, body);
-    } else {
-      ifNotUndefined(
-        message == Message.GetContentHashes && persister.isAutoSaving()
-          ? store.getMergeableContentHashes()
-          : 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, Message.Response, response);
-        },
-      );
-    }
-  });
+  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,
@@ -1626,7 +1604,8 @@ const createCustomSynchronizer = (
           const timeout = setTimeout(() => {
             collDel(pendingRequests, requestId);
             reject(
-              `No response from ${toClientId != null ? toClientId : 'anyone'} to '${message}'`,
+              `No response from ${toClientId != null ? toClientId : 'anyone'} to ${requestId}, ` +
+                message,
             );
           }, requestTimeoutSeconds * 1e3);
           mapSet(pendingRequests, requestId, [
@@ -1637,8 +1616,7 @@ const createCustomSynchronizer = (
               resolve([response, fromClientId]);
             },
           ]);
-          sends++;
-          send(toClientId, requestId, message, body);
+          sendImpl(toClientId, requestId, message, body);
         });
       },
     );
@@ -1663,7 +1641,7 @@ const createCustomSynchronizer = (
       if (isUndefined(otherContentHashes)) {
         [otherContentHashes, otherClientId] = yield request(
           otherClientId,
-          Message.GetContentHashes,
+          1 /* GetContentHashes */,
         );
       }
       const [otherTablesHash, otherValuesHash] = otherContentHashes;
@@ -1672,21 +1650,21 @@ const createCustomSynchronizer = (
       if (tablesHash != otherTablesHash) {
         const [newTables, differentTableHashes] = (yield request(
           otherClientId,
-          Message.GetTableDiff,
+          4 /* GetTableDiff */,
           store.getMergeableTableHashes(),
         ))[0];
         tablesChanges = newTables;
         if (!objIsEmpty(differentTableHashes)) {
           const [newRows, differentRowHashes] = (yield request(
             otherClientId,
-            Message.GetRowDiff,
+            5 /* GetRowDiff */,
             store.getMergeableRowHashes(differentTableHashes),
           ))[0];
           mergeTablesStamps(tablesChanges, newRows);
           if (!objIsEmpty(differentRowHashes)) {
             const newCells = (yield request(
               otherClientId,
-              Message.GetCellDiff,
+              6 /* GetCellDiff */,
               store.getMergeableCellHashes(differentRowHashes),
             ))[0];
             mergeTablesStamps(tablesChanges, newCells);
@@ -1699,7 +1677,7 @@ const createCustomSynchronizer = (
           ? stampNewObj()
           : (yield request(
               otherClientId,
-              Message.GetValueDiff,
+              7 /* GetValueDiff */,
               store.getMergeableValueHashes(),
             ))[0],
         1,
@@ -1714,17 +1692,14 @@ const createCustomSynchronizer = (
     });
   const setPersisted = (_getContent, changes) =>
     __async(void 0, null, function* () {
-      sends++;
-      if (changes) {
-        send(null, null, Message.ContentDiff, changes);
-      } else {
-        send(
-          null,
-          null,
-          Message.ContentHashes,
-          store.getMergeableContentHashes(),
-        );
-      }
+      return changes
+        ? sendImpl(null, null, 3 /* ContentDiff */, changes)
+        : sendImpl(
+            null,
+            null,
+            2 /* ContentHashes */,
+            store.getMergeableContentHashes(),
+          );
     });
   const addPersisterListener = (listener) => (persisterListener = listener);
   const delPersisterListener = () => (persisterListener = void 0);
@@ -1747,9 +1722,49 @@ const createCustomSynchronizer = (
     addPersisterListener,
     delPersisterListener,
     onIgnoredError,
-    Persists.MergeableStoreOnly,
+    2,
+    // MergeableStoreOnly
     __spreadValues({startSync, stopSync, destroy, getSynchronizerStats}, extra),
   );
+  registerReceive((fromClientId, requestId, message, body) => {
+    receives++;
+    onReceive == null
+      ? void 0
+      : onReceive(fromClientId, requestId, message, body);
+    if (message == 0 /* Response */) {
+      ifNotUndefined(
+        mapGet(pendingRequests, requestId),
+        ([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()) {
+      persisterListener == null ? void 0 : persisterListener(void 0, body);
+    } else {
+      ifNotUndefined(
+        message == 1 /* GetContentHashes */ && persister.isAutoSaving()
+          ? store.getMergeableContentHashes()
+          : message == 4 /* GetTableDiff */
+            ? store.getMergeableTableDiff(body)
+            : message == 5 /* GetRowDiff */
+              ? store.getMergeableRowDiff(body)
+              : message == 6 /* GetCellDiff */
+                ? store.getMergeableCellDiff(body)
+                : message == 7 /* GetValueDiff */
+                  ? store.getMergeableValueDiff(body)
+                  : void 0,
+        (response) => {
+          sendImpl(fromClientId, requestId, 0 /* Response */, response);
+        },
+      );
+    }
+  });
   return persister;
 };
 

package/cjs/index.cjs

@@ -404,7 +404,7 @@ const getDefinableFunctions = (
 const getRowCellFunction = (getRowCell, defaultCellValue) =>
   isString(getRowCell)
     ? (getCell) => getCell(getRowCell)
-    : getRowCell ?? (() => defaultCellValue ?? EMPTY_STRING);
+    : (getRowCell ?? (() => defaultCellValue ?? EMPTY_STRING));
 const getCreateFunction = (getFunction, initFunction) => {
   const thingsByStore = /* @__PURE__ */ new WeakMap();
   return (store) => {
@@ -1084,8 +1084,8 @@ const createMetrics = getCreateFunction((store) => {
   ) => {
     const aggregators = isFunction(aggregate)
       ? [aggregate, aggregateAdd, aggregateRemove, aggregateReplace]
-      : mapGet(numericAggregators, aggregate) ??
-        mapGet(numericAggregators, SUM);
+      : (mapGet(numericAggregators, aggregate) ??
+        mapGet(numericAggregators, SUM));
     setDefinitionAndListen(
       metricId,
       tableId,
@@ -1146,14 +1146,14 @@ const createMetrics = getCreateFunction((store) => {
 });
 
 const Persists = {
-  StoreOnly: 1,
-  MergeableStoreOnly: 2,
-  StoreOrMergeableStore: 3,
+  StoreOnly: 1 /* StoreOnly */,
+  MergeableStoreOnly: 2 /* MergeableStoreOnly */,
+  StoreOrMergeableStore: 3 /* StoreOrMergeableStore */,
 };
 const scheduleRunning = mapNew();
 const scheduleActions = mapNew();
-const getStoreFunctions = (persist = Persists.StoreOnly, store) =>
-  persist != Persists.StoreOnly && store.isMergeable()
+const getStoreFunctions = (persist = 1 /* StoreOnly */, store) =>
+  persist != 1 /* StoreOnly */ && store.isMergeable()
     ? [
         1,
         store.getMergeableContent,
@@ -1162,7 +1162,7 @@ const getStoreFunctions = (persist = Persists.StoreOnly, store) =>
           !objIsEmpty(changedTables) || !objIsEmpty(changedValues),
         store.setDefaultContent,
       ]
-    : persist != Persists.MergeableStoreOnly
+    : persist != 2 /* MergeableStoreOnly */
       ? [
           0,
           store.getContent,
@@ -1245,19 +1245,24 @@ const createCustomPersister = (
   };
   const startAutoLoad = async (initialContent) => {
     await stopAutoLoad().load(initialContent);
-    autoLoadHandle = addPersisterListener(async (content, changes) => {
-      if (changes || content) {
-        /* istanbul ignore else */
-        if (loadSave != 2) {
-          loadSave = 1;
-          loads++;
-          setContentOrChanges(changes ?? content);
-          loadSave = 0;
+    try {
+      autoLoadHandle = addPersisterListener(async (content, changes) => {
+        if (changes || content) {
+          /* istanbul ignore else */
+          if (loadSave != 2) {
+            loadSave = 1;
+            loads++;
+            setContentOrChanges(changes ?? content);
+            loadSave = 0;
+          }
+        } else {
+          await load();
         }
-      } else {
-        await load();
-      }
-    });
+      });
+    } catch (error) {
+      /* istanbul ignore next */
+      onIgnoredError?.(error);
+    }
     return persister;
   };
   const stopAutoLoad = () => {
@@ -1307,7 +1312,10 @@ const createCustomPersister = (
     return persister;
   };
   const getStore = () => store;
-  const destroy = () => stopAutoLoad().stopAutoSave();
+  const destroy = () => {
+    arrayClear(mapGet(scheduleActions, scheduleId));
+    return stopAutoLoad().stopAutoSave();
+  };
   const getStats = () => ({loads, saves});
   const persister = {
     load,
@@ -1372,14 +1380,14 @@ const stampValidate = (stamp, validateThing) =>
   validateThing(stamp[0]);
 
 const Message = {
-  Response: 0,
-  GetContentHashes: 1,
-  ContentHashes: 2,
-  ContentDiff: 3,
-  GetTableDiff: 4,
-  GetRowDiff: 5,
-  GetCellDiff: 6,
-  GetValueDiff: 7,
+  Response: 0 /* Response */,
+  GetContentHashes: 1 /* GetContentHashes */,
+  ContentHashes: 2 /* ContentHashes */,
+  ContentDiff: 3 /* ContentDiff */,
+  GetTableDiff: 4 /* GetTableDiff */,
+  GetRowDiff: 5 /* GetRowDiff */,
+  GetCellDiff: 6 /* GetCellDiff */,
+  GetValueDiff: 7 /* GetValueDiff */,
 };
 const createCustomSynchronizer = (
   store,
@@ -1387,6 +1395,8 @@ const createCustomSynchronizer = (
   registerReceive,
   destroyImpl,
   requestTimeoutSeconds,
+  onSend,
+  onReceive,
   onIgnoredError,
   extra = {},
 ) => {
@@ -1394,49 +1404,20 @@ const createCustomSynchronizer = (
   let sends = 0;
   let receives = 0;
   const pendingRequests = mapNew();
-  registerReceive((fromClientId, requestId, message, body) => {
-    receives++;
-    if (message == Message.Response) {
-      ifNotUndefined(
-        mapGet(pendingRequests, requestId),
-        ([toClientId, handleResponse]) =>
-          isUndefined(toClientId) || toClientId == fromClientId
-            ? handleResponse(body, fromClientId)
-            : /* istanbul ignore next */
-              0,
-      );
-    } else if (message == Message.ContentHashes && persister.isAutoLoading()) {
-      getChangesFromOtherStore(fromClientId, body).then((changes) => {
-        persisterListener?.(void 0, changes);
-      });
-    } else if (message == Message.ContentDiff && persister.isAutoLoading()) {
-      persisterListener?.(void 0, body);
-    } else {
-      ifNotUndefined(
-        message == Message.GetContentHashes && persister.isAutoSaving()
-          ? store.getMergeableContentHashes()
-          : 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, Message.Response, response);
-        },
-      );
-    }
-  });
+  const sendImpl = (toClientId, requestId, message, body) => {
+    sends++;
+    onSend?.(toClientId, requestId, message, body);
+    send(toClientId, requestId, message, body);
+  };
   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 '${message}'`);
+        reject(
+          `No response from ${toClientId ?? 'anyone'} to ${requestId}, ` +
+            message,
+        );
       }, requestTimeoutSeconds * 1e3);
       mapSet(pendingRequests, requestId, [
         toClientId,
@@ -1446,8 +1427,7 @@ const createCustomSynchronizer = (
           resolve([response, fromClientId]);
         },
       ]);
-      sends++;
-      send(toClientId, requestId, message, body);
+      sendImpl(toClientId, requestId, message, body);
     });
   const mergeTablesStamps = (tablesStamp, [tableStamps2, tablesTime2]) => {
     objForEach(tableStamps2, ([rowStamps2, tableTime2], tableId) => {
@@ -1472,7 +1452,7 @@ const createCustomSynchronizer = (
     if (isUndefined(otherContentHashes)) {
       [otherContentHashes, otherClientId] = await request(
         otherClientId,
-        Message.GetContentHashes,
+        1 /* GetContentHashes */,
       );
     }
     const [otherTablesHash, otherValuesHash] = otherContentHashes;
@@ -1482,7 +1462,7 @@ const createCustomSynchronizer = (
       const [newTables, differentTableHashes] = (
         await request(
           otherClientId,
-          Message.GetTableDiff,
+          4 /* GetTableDiff */,
           store.getMergeableTableHashes(),
         )
       )[0];
@@ -1491,7 +1471,7 @@ const createCustomSynchronizer = (
         const [newRows, differentRowHashes] = (
           await request(
             otherClientId,
-            Message.GetRowDiff,
+            5 /* GetRowDiff */,
             store.getMergeableRowHashes(differentTableHashes),
           )
         )[0];
@@ -1500,7 +1480,7 @@ const createCustomSynchronizer = (
           const newCells = (
             await request(
               otherClientId,
-              Message.GetCellDiff,
+              6 /* GetCellDiff */,
               store.getMergeableCellHashes(differentRowHashes),
             )
           )[0];
@@ -1515,7 +1495,7 @@ const createCustomSynchronizer = (
         : (
             await request(
               otherClientId,
-              Message.GetValueDiff,
+              7 /* GetValueDiff */,
               store.getMergeableValueHashes(),
             )
           )[0],
@@ -1528,19 +1508,15 @@ const createCustomSynchronizer = (
       ? changes
       : void 0;
   };
-  const setPersisted = async (_getContent, changes) => {
-    sends++;
-    if (changes) {
-      send(null, null, Message.ContentDiff, changes);
-    } else {
-      send(
-        null,
-        null,
-        Message.ContentHashes,
-        store.getMergeableContentHashes(),
-      );
-    }
-  };
+  const setPersisted = async (_getContent, changes) =>
+    changes
+      ? sendImpl(null, null, 3 /* ContentDiff */, changes)
+      : sendImpl(
+          null,
+          null,
+          2 /* ContentHashes */,
+          store.getMergeableContentHashes(),
+        );
   const addPersisterListener = (listener) => (persisterListener = listener);
   const delPersisterListener = () => (persisterListener = void 0);
   const startSync = async (initialContent) =>
@@ -1558,9 +1534,47 @@ const createCustomSynchronizer = (
     addPersisterListener,
     delPersisterListener,
     onIgnoredError,
-    Persists.MergeableStoreOnly,
+    2,
+    // MergeableStoreOnly
     {startSync, stopSync, destroy, getSynchronizerStats, ...extra},
   );
+  registerReceive((fromClientId, requestId, message, body) => {
+    receives++;
+    onReceive?.(fromClientId, requestId, message, body);
+    if (message == 0 /* Response */) {
+      ifNotUndefined(
+        mapGet(pendingRequests, requestId),
+        ([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?.(void 0, changes);
+      });
+    } else if (message == 3 /* ContentDiff */ && persister.isAutoLoading()) {
+      persisterListener?.(void 0, body);
+    } else {
+      ifNotUndefined(
+        message == 1 /* GetContentHashes */ && persister.isAutoSaving()
+          ? store.getMergeableContentHashes()
+          : message == 4 /* GetTableDiff */
+            ? store.getMergeableTableDiff(body)
+            : message == 5 /* GetRowDiff */
+              ? store.getMergeableRowDiff(body)
+              : message == 6 /* GetCellDiff */
+                ? store.getMergeableCellDiff(body)
+                : message == 7 /* GetValueDiff */
+                  ? store.getMergeableValueDiff(body)
+                  : void 0,
+        (response) => {
+          sendImpl(fromClientId, requestId, 0 /* Response */, response);
+        },
+      );
+    }
+  });
   return persister;
 };
 
@@ -1687,9 +1701,9 @@ const createQueries = getCreateFunction((store) => {
           selectedCellId,
           isFunction(aggregate)
             ? [aggregate, aggregateAdd, aggregateRemove, aggregateReplace]
-            : mapGet(numericAggregators, aggregate) ?? [
+            : (mapGet(numericAggregators, aggregate) ?? [
                 (_cells, length) => length,
-              ],
+              ]),
         ],
       ];
       arrayPush(groupEntries, groupEntry);

package/cjs/indexes/index.cjs

@@ -249,7 +249,7 @@ const getDefinableFunctions = (
 const getRowCellFunction = (getRowCell, defaultCellValue) =>
   isString(getRowCell)
     ? (getCell) => getCell(getRowCell)
-    : getRowCell ?? (() => defaultCellValue ?? EMPTY_STRING);
+    : (getRowCell ?? (() => defaultCellValue ?? EMPTY_STRING));
 const getCreateFunction = (getFunction, initFunction) => {
   const thingsByStore = /* @__PURE__ */ new WeakMap();
   return (store) => {

package/cjs/indexes/with-schemas/index.cjs

@@ -249,7 +249,7 @@ const getDefinableFunctions = (
 const getRowCellFunction = (getRowCell, defaultCellValue) =>
   isString(getRowCell)
     ? (getCell) => getCell(getRowCell)
-    : getRowCell ?? (() => defaultCellValue ?? EMPTY_STRING);
+    : (getRowCell ?? (() => defaultCellValue ?? EMPTY_STRING));
 const getCreateFunction = (getFunction, initFunction) => {
   const thingsByStore = /* @__PURE__ */ new WeakMap();
   return (store) => {

package/cjs/metrics/index.cjs

@@ -321,7 +321,7 @@ const getDefinableFunctions = (
 const getRowCellFunction = (getRowCell, defaultCellValue) =>
   isString(getRowCell)
     ? (getCell) => getCell(getRowCell)
-    : getRowCell ?? (() => defaultCellValue ?? EMPTY_STRING);
+    : (getRowCell ?? (() => defaultCellValue ?? EMPTY_STRING));
 const getCreateFunction = (getFunction, initFunction) => {
   const thingsByStore = /* @__PURE__ */ new WeakMap();
   return (store) => {
@@ -460,8 +460,8 @@ const createMetrics = getCreateFunction((store) => {
   ) => {
     const aggregators = isFunction(aggregate)
       ? [aggregate, aggregateAdd, aggregateRemove, aggregateReplace]
-      : mapGet(numericAggregators, aggregate) ??
-        mapGet(numericAggregators, SUM);
+      : (mapGet(numericAggregators, aggregate) ??
+        mapGet(numericAggregators, SUM));
     setDefinitionAndListen(
       metricId,
       tableId,