tinybase 6.1.0-beta.5 → 6.1.1

package/store/index.js

@@ -986,6 +986,27 @@ const createStore = () => {
     transaction(() => actions(...arrayMap(args, id)));
     return store;
   };
+  const addSortedRowIdsListenerImpl = (
+    tableId,
+    cellId,
+    otherArgs,
+    listener,
+    mutator,
+  ) => {
+    let sortedRowIds = getSortedRowIds(tableId, cellId, ...otherArgs);
+    return addListener(
+      () => {
+        const newSortedRowIds = getSortedRowIds(tableId, cellId, ...otherArgs);
+        if (!arrayIsEqual(newSortedRowIds, sortedRowIds)) {
+          sortedRowIds = newSortedRowIds;
+          listener(store, tableId, cellId, ...otherArgs, sortedRowIds);
+        }
+      },
+      sortedRowIdsListeners[mutator ? 1 : 0],
+      [tableId, cellId],
+      [getTableIds],
+    );
+  };
   const getContent = () => [getTables(), getValues()];
   const getTables = () => mapToObj3(tablesMap);
   const getTableIds = () => mapKeys(tablesMap);
@@ -994,22 +1015,36 @@ const createStore = () => {
     mapKeys(mapGet(tableCellIds, id(tableId)));
   const getRowCount = (tableId) => collSize(mapGet(tablesMap, id(tableId)));
   const getRowIds = (tableId) => mapKeys(mapGet(tablesMap, id(tableId)));
-  const getSortedRowIds = (tableId, cellId, descending, offset = 0, limit) =>
-    arrayMap(
-      slice(
-        arraySort(
-          mapMap(mapGet(tablesMap, id(tableId)), (row, rowId) => [
-            isUndefined(cellId) ? rowId : mapGet(row, id(cellId)),
-            rowId,
-          ]),
-          ([cell1], [cell2]) =>
-            defaultSorter(cell1, cell2) * (descending ? -1 : 1),
-        ),
-        offset,
-        isUndefined(limit) ? limit : offset + limit,
-      ),
-      ([, rowId]) => rowId,
-    );
+  const getSortedRowIds = (
+    tableIdOrArgs,
+    cellId,
+    descending,
+    offset = 0,
+    limit,
+  ) =>
+    isObject(tableIdOrArgs)
+      ? getSortedRowIds(
+          tableIdOrArgs.tableId,
+          tableIdOrArgs.cellId,
+          tableIdOrArgs.descending,
+          tableIdOrArgs.offset,
+          tableIdOrArgs.limit,
+        )
+      : arrayMap(
+          slice(
+            arraySort(
+              mapMap(mapGet(tablesMap, id(tableIdOrArgs)), (row, rowId) => [
+                isUndefined(cellId) ? rowId : mapGet(row, id(cellId)),
+                rowId,
+              ]),
+              ([cell1], [cell2]) =>
+                defaultSorter(cell1, cell2) * (descending ? -1 : 1),
+            ),
+            offset,
+            isUndefined(limit) ? limit : offset + limit,
+          ),
+          ([, rowId]) => rowId,
+        );
   const getRow = (tableId, rowId) =>
     mapToObj(mapGet(mapGet(tablesMap, id(tableId)), id(rowId)));
   const getCellIds = (tableId, rowId) =>
@@ -1401,48 +1436,33 @@ const createStore = () => {
     mapForEach(mapGet(mapGet(tablesMap, id(tableId)), id(rowId)), cellCallback);
   const forEachValue = (valueCallback) => mapForEach(valuesMap, valueCallback);
   const addSortedRowIdsListener = (
-    tableId,
-    cellId,
-    descending,
+    tableIdOrArgs,
+    cellIdOrListener,
+    descendingOrMutator,
     offset,
     limit,
     listener,
     mutator,
-  ) => {
-    let sortedRowIds = getSortedRowIds(
-      tableId,
-      cellId,
-      descending,
-      offset,
-      limit,
-    );
-    return addListener(
-      () => {
-        const newSortedRowIds = getSortedRowIds(
-          tableId,
-          cellId,
-          descending,
-          offset,
-          limit,
+  ) =>
+    isObject(tableIdOrArgs)
+      ? addSortedRowIdsListenerImpl(
+          tableIdOrArgs.tableId,
+          tableIdOrArgs.cellId,
+          [
+            tableIdOrArgs.descending ?? false,
+            tableIdOrArgs.offset ?? 0,
+            tableIdOrArgs.limit,
+          ],
+          cellIdOrListener,
+          descendingOrMutator,
+        )
+      : addSortedRowIdsListenerImpl(
+          tableIdOrArgs,
+          cellIdOrListener,
+          [descendingOrMutator, offset, limit],
+          listener,
+          mutator,
         );
-        if (!arrayIsEqual(newSortedRowIds, sortedRowIds)) {
-          sortedRowIds = newSortedRowIds;
-          listener(
-            store,
-            tableId,
-            cellId,
-            descending,
-            offset,
-            limit,
-            sortedRowIds,
-          );
-        }
-      },
-      sortedRowIdsListeners[mutator ? 1 : 0],
-      [tableId, cellId],
-      [getTableIds],
-    );
-  };
   const addStartTransactionListener = (listener) =>
     addListener(listener, startTransactionListeners);
   const addWillFinishTransactionListener = (listener) =>

package/store/with-schemas/index.js

@@ -986,6 +986,27 @@ const createStore = () => {
     transaction(() => actions(...arrayMap(args, id)));
     return store;
   };
+  const addSortedRowIdsListenerImpl = (
+    tableId,
+    cellId,
+    otherArgs,
+    listener,
+    mutator,
+  ) => {
+    let sortedRowIds = getSortedRowIds(tableId, cellId, ...otherArgs);
+    return addListener(
+      () => {
+        const newSortedRowIds = getSortedRowIds(tableId, cellId, ...otherArgs);
+        if (!arrayIsEqual(newSortedRowIds, sortedRowIds)) {
+          sortedRowIds = newSortedRowIds;
+          listener(store, tableId, cellId, ...otherArgs, sortedRowIds);
+        }
+      },
+      sortedRowIdsListeners[mutator ? 1 : 0],
+      [tableId, cellId],
+      [getTableIds],
+    );
+  };
   const getContent = () => [getTables(), getValues()];
   const getTables = () => mapToObj3(tablesMap);
   const getTableIds = () => mapKeys(tablesMap);
@@ -994,22 +1015,36 @@ const createStore = () => {
     mapKeys(mapGet(tableCellIds, id(tableId)));
   const getRowCount = (tableId) => collSize(mapGet(tablesMap, id(tableId)));
   const getRowIds = (tableId) => mapKeys(mapGet(tablesMap, id(tableId)));
-  const getSortedRowIds = (tableId, cellId, descending, offset = 0, limit) =>
-    arrayMap(
-      slice(
-        arraySort(
-          mapMap(mapGet(tablesMap, id(tableId)), (row, rowId) => [
-            isUndefined(cellId) ? rowId : mapGet(row, id(cellId)),
-            rowId,
-          ]),
-          ([cell1], [cell2]) =>
-            defaultSorter(cell1, cell2) * (descending ? -1 : 1),
-        ),
-        offset,
-        isUndefined(limit) ? limit : offset + limit,
-      ),
-      ([, rowId]) => rowId,
-    );
+  const getSortedRowIds = (
+    tableIdOrArgs,
+    cellId,
+    descending,
+    offset = 0,
+    limit,
+  ) =>
+    isObject(tableIdOrArgs)
+      ? getSortedRowIds(
+          tableIdOrArgs.tableId,
+          tableIdOrArgs.cellId,
+          tableIdOrArgs.descending,
+          tableIdOrArgs.offset,
+          tableIdOrArgs.limit,
+        )
+      : arrayMap(
+          slice(
+            arraySort(
+              mapMap(mapGet(tablesMap, id(tableIdOrArgs)), (row, rowId) => [
+                isUndefined(cellId) ? rowId : mapGet(row, id(cellId)),
+                rowId,
+              ]),
+              ([cell1], [cell2]) =>
+                defaultSorter(cell1, cell2) * (descending ? -1 : 1),
+            ),
+            offset,
+            isUndefined(limit) ? limit : offset + limit,
+          ),
+          ([, rowId]) => rowId,
+        );
   const getRow = (tableId, rowId) =>
     mapToObj(mapGet(mapGet(tablesMap, id(tableId)), id(rowId)));
   const getCellIds = (tableId, rowId) =>
@@ -1401,48 +1436,33 @@ const createStore = () => {
     mapForEach(mapGet(mapGet(tablesMap, id(tableId)), id(rowId)), cellCallback);
   const forEachValue = (valueCallback) => mapForEach(valuesMap, valueCallback);
   const addSortedRowIdsListener = (
-    tableId,
-    cellId,
-    descending,
+    tableIdOrArgs,
+    cellIdOrListener,
+    descendingOrMutator,
     offset,
     limit,
     listener,
     mutator,
-  ) => {
-    let sortedRowIds = getSortedRowIds(
-      tableId,
-      cellId,
-      descending,
-      offset,
-      limit,
-    );
-    return addListener(
-      () => {
-        const newSortedRowIds = getSortedRowIds(
-          tableId,
-          cellId,
-          descending,
-          offset,
-          limit,
+  ) =>
+    isObject(tableIdOrArgs)
+      ? addSortedRowIdsListenerImpl(
+          tableIdOrArgs.tableId,
+          tableIdOrArgs.cellId,
+          [
+            tableIdOrArgs.descending ?? false,
+            tableIdOrArgs.offset ?? 0,
+            tableIdOrArgs.limit,
+          ],
+          cellIdOrListener,
+          descendingOrMutator,
+        )
+      : addSortedRowIdsListenerImpl(
+          tableIdOrArgs,
+          cellIdOrListener,
+          [descendingOrMutator, offset, limit],
+          listener,
+          mutator,
         );
-        if (!arrayIsEqual(newSortedRowIds, sortedRowIds)) {
-          sortedRowIds = newSortedRowIds;
-          listener(
-            store,
-            tableId,
-            cellId,
-            descending,
-            offset,
-            limit,
-            sortedRowIds,
-          );
-        }
-      },
-      sortedRowIdsListeners[mutator ? 1 : 0],
-      [tableId, cellId],
-      [getTableIds],
-    );
-  };
   const addStartTransactionListener = (listener) =>
     addListener(listener, startTransactionListeners);
   const addWillFinishTransactionListener = (listener) =>

package/synchronizers/index.js

@@ -1,4 +1,5 @@
 const EMPTY_STRING = '';
+const DOT = '.';
 const strSplit = (str, separator = EMPTY_STRING, limit) =>
   str.split(separator, limit);
 
@@ -399,6 +400,25 @@ const createCustomPersister = (
     return persister;
   };
   const isAutoSaving = () => !isUndefined(autoSaveListenerId);
+  const startAutoPersisting = async (
+    initialContent,
+    startSaveFirst = false,
+  ) => {
+    const [call1, call2] = startSaveFirst
+      ? [startAutoSave, startAutoLoad]
+      : [startAutoLoad, startAutoSave];
+    await call1(initialContent);
+    await call2(initialContent);
+    return persister;
+  };
+  const stopAutoPersisting = async (stopSaveFirst = false) => {
+    const [call1, call2] = stopSaveFirst
+      ? [stopAutoSave, stopAutoLoad]
+      : [stopAutoLoad, stopAutoSave];
+    await call1();
+    await call2();
+    return persister;
+  };
   const getStatus = () => status;
   const addStatusListener = (listener) =>
     addListener(listener, statusListeners);
@@ -412,10 +432,9 @@ const createCustomPersister = (
     return persister;
   };
   const getStore = () => store;
-  const destroy = async () => {
+  const destroy = () => {
     arrayClear(mapGet(scheduleActions, scheduleId));
-    await persister.stopAutoLoad();
-    return await persister.stopAutoSave();
+    return stopAutoPersisting();
   };
   const getStats = () => ({loads, saves});
   const persister = {
@@ -427,6 +446,8 @@ const createCustomPersister = (
     startAutoSave,
     stopAutoSave,
     isAutoSaving,
+    startAutoPersisting,
+    stopAutoPersisting,
     getStatus,
     addStatusListener,
     delListener,
@@ -473,7 +494,7 @@ const createCustomSynchronizer = (
   };
   const request = async (toClientId, message, body, transactionId) =>
     promiseNew((resolve, reject) => {
-      const requestId = transactionId + '.' + getUniqueId(4);
+      const requestId = transactionId + DOT + getUniqueId(4);
       const timeout = startTimeout(() => {
         collDel(pendingRequests, requestId);
         reject(
@@ -591,14 +612,11 @@ const createCustomSynchronizer = (
   const delPersisterListener = () => (persisterListener = void 0);
   const startSync = async (initialContent) => {
     syncing = 1;
-    return await (
-      await persister.startAutoLoad(initialContent)
-    ).startAutoSave();
+    return await persister.startAutoPersisting(initialContent);
   };
   const stopSync = async () => {
     syncing = 0;
-    await persister.stopAutoLoad();
-    await persister.stopAutoSave();
+    await persister.stopAutoPersisting();
     return persister;
   };
   const destroy = async () => {

package/synchronizers/synchronizer-broadcast-channel/index.js

@@ -1,4 +1,5 @@
 const EMPTY_STRING = '';
+const DOT = '.';
 const strSplit = (str, separator = EMPTY_STRING, limit) =>
   str.split(separator, limit);
 
@@ -399,6 +400,25 @@ const createCustomPersister = (
     return persister;
   };
   const isAutoSaving = () => !isUndefined(autoSaveListenerId);
+  const startAutoPersisting = async (
+    initialContent,
+    startSaveFirst = false,
+  ) => {
+    const [call1, call2] = startSaveFirst
+      ? [startAutoSave, startAutoLoad]
+      : [startAutoLoad, startAutoSave];
+    await call1(initialContent);
+    await call2(initialContent);
+    return persister;
+  };
+  const stopAutoPersisting = async (stopSaveFirst = false) => {
+    const [call1, call2] = stopSaveFirst
+      ? [stopAutoSave, stopAutoLoad]
+      : [stopAutoLoad, stopAutoSave];
+    await call1();
+    await call2();
+    return persister;
+  };
   const getStatus = () => status;
   const addStatusListener = (listener) =>
     addListener(listener, statusListeners);
@@ -412,10 +432,9 @@ const createCustomPersister = (
     return persister;
   };
   const getStore = () => store;
-  const destroy = async () => {
+  const destroy = () => {
     arrayClear(mapGet(scheduleActions, scheduleId));
-    await persister.stopAutoLoad();
-    return await persister.stopAutoSave();
+    return stopAutoPersisting();
   };
   const getStats = () => ({loads, saves});
   const persister = {
@@ -427,6 +446,8 @@ const createCustomPersister = (
     startAutoSave,
     stopAutoSave,
     isAutoSaving,
+    startAutoPersisting,
+    stopAutoPersisting,
     getStatus,
     addStatusListener,
     delListener,
@@ -463,7 +484,7 @@ const createCustomSynchronizer = (
   };
   const request = async (toClientId, message, body, transactionId) =>
     promiseNew((resolve, reject) => {
-      const requestId = transactionId + '.' + getUniqueId(4);
+      const requestId = transactionId + DOT + getUniqueId(4);
       const timeout = startTimeout(() => {
         collDel(pendingRequests, requestId);
         reject(
@@ -581,14 +602,11 @@ const createCustomSynchronizer = (
   const delPersisterListener = () => (persisterListener = void 0);
   const startSync = async (initialContent) => {
     syncing = 1;
-    return await (
-      await persister.startAutoLoad(initialContent)
-    ).startAutoSave();
+    return await persister.startAutoPersisting(initialContent);
   };
   const stopSync = async () => {
     syncing = 0;
-    await persister.stopAutoLoad();
-    await persister.stopAutoSave();
+    await persister.stopAutoPersisting();
     return persister;
   };
   const destroy = async () => {

package/synchronizers/synchronizer-broadcast-channel/with-schemas/index.js

@@ -1,4 +1,5 @@
 const EMPTY_STRING = '';
+const DOT = '.';
 const strSplit = (str, separator = EMPTY_STRING, limit) =>
   str.split(separator, limit);
 
@@ -399,6 +400,25 @@ const createCustomPersister = (
     return persister;
   };
   const isAutoSaving = () => !isUndefined(autoSaveListenerId);
+  const startAutoPersisting = async (
+    initialContent,
+    startSaveFirst = false,
+  ) => {
+    const [call1, call2] = startSaveFirst
+      ? [startAutoSave, startAutoLoad]
+      : [startAutoLoad, startAutoSave];
+    await call1(initialContent);
+    await call2(initialContent);
+    return persister;
+  };
+  const stopAutoPersisting = async (stopSaveFirst = false) => {
+    const [call1, call2] = stopSaveFirst
+      ? [stopAutoSave, stopAutoLoad]
+      : [stopAutoLoad, stopAutoSave];
+    await call1();
+    await call2();
+    return persister;
+  };
   const getStatus = () => status;
   const addStatusListener = (listener) =>
     addListener(listener, statusListeners);
@@ -412,10 +432,9 @@ const createCustomPersister = (
     return persister;
   };
   const getStore = () => store;
-  const destroy = async () => {
+  const destroy = () => {
     arrayClear(mapGet(scheduleActions, scheduleId));
-    await persister.stopAutoLoad();
-    return await persister.stopAutoSave();
+    return stopAutoPersisting();
   };
   const getStats = () => ({loads, saves});
   const persister = {
@@ -427,6 +446,8 @@ const createCustomPersister = (
     startAutoSave,
     stopAutoSave,
     isAutoSaving,
+    startAutoPersisting,
+    stopAutoPersisting,
     getStatus,
     addStatusListener,
     delListener,
@@ -463,7 +484,7 @@ const createCustomSynchronizer = (
   };
   const request = async (toClientId, message, body, transactionId) =>
     promiseNew((resolve, reject) => {
-      const requestId = transactionId + '.' + getUniqueId(4);
+      const requestId = transactionId + DOT + getUniqueId(4);
       const timeout = startTimeout(() => {
         collDel(pendingRequests, requestId);
         reject(
@@ -581,14 +602,11 @@ const createCustomSynchronizer = (
   const delPersisterListener = () => (persisterListener = void 0);
   const startSync = async (initialContent) => {
     syncing = 1;
-    return await (
-      await persister.startAutoLoad(initialContent)
-    ).startAutoSave();
+    return await persister.startAutoPersisting(initialContent);
   };
   const stopSync = async () => {
     syncing = 0;
-    await persister.stopAutoLoad();
-    await persister.stopAutoSave();
+    await persister.stopAutoPersisting();
     return persister;
   };
   const destroy = async () => {

package/synchronizers/synchronizer-local/index.js

@@ -1,4 +1,5 @@
 const EMPTY_STRING = '';
+const DOT = '.';
 const strSplit = (str, separator = EMPTY_STRING, limit) =>
   str.split(separator, limit);
 
@@ -401,6 +402,25 @@ const createCustomPersister = (
     return persister;
   };
   const isAutoSaving = () => !isUndefined(autoSaveListenerId);
+  const startAutoPersisting = async (
+    initialContent,
+    startSaveFirst = false,
+  ) => {
+    const [call1, call2] = startSaveFirst
+      ? [startAutoSave, startAutoLoad]
+      : [startAutoLoad, startAutoSave];
+    await call1(initialContent);
+    await call2(initialContent);
+    return persister;
+  };
+  const stopAutoPersisting = async (stopSaveFirst = false) => {
+    const [call1, call2] = stopSaveFirst
+      ? [stopAutoSave, stopAutoLoad]
+      : [stopAutoLoad, stopAutoSave];
+    await call1();
+    await call2();
+    return persister;
+  };
   const getStatus = () => status;
   const addStatusListener = (listener) =>
     addListener(listener, statusListeners);
@@ -414,10 +434,9 @@ const createCustomPersister = (
     return persister;
   };
   const getStore = () => store;
-  const destroy = async () => {
+  const destroy = () => {
     arrayClear(mapGet(scheduleActions, scheduleId));
-    await persister.stopAutoLoad();
-    return await persister.stopAutoSave();
+    return stopAutoPersisting();
   };
   const getStats = () => ({loads, saves});
   const persister = {
@@ -429,6 +448,8 @@ const createCustomPersister = (
     startAutoSave,
     stopAutoSave,
     isAutoSaving,
+    startAutoPersisting,
+    stopAutoPersisting,
     getStatus,
     addStatusListener,
     delListener,
@@ -465,7 +486,7 @@ const createCustomSynchronizer = (
   };
   const request = async (toClientId, message, body, transactionId) =>
     promiseNew((resolve, reject) => {
-      const requestId = transactionId + '.' + getUniqueId(4);
+      const requestId = transactionId + DOT + getUniqueId(4);
       const timeout = startTimeout(() => {
         collDel(pendingRequests, requestId);
         reject(
@@ -583,14 +604,11 @@ const createCustomSynchronizer = (
   const delPersisterListener = () => (persisterListener = void 0);
   const startSync = async (initialContent) => {
     syncing = 1;
-    return await (
-      await persister.startAutoLoad(initialContent)
-    ).startAutoSave();
+    return await persister.startAutoPersisting(initialContent);
   };
   const stopSync = async () => {
     syncing = 0;
-    await persister.stopAutoLoad();
-    await persister.stopAutoSave();
+    await persister.stopAutoPersisting();
     return persister;
   };
   const destroy = async () => {

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

@@ -1,4 +1,5 @@
 const EMPTY_STRING = '';
+const DOT = '.';
 const strSplit = (str, separator = EMPTY_STRING, limit) =>
   str.split(separator, limit);
 
@@ -401,6 +402,25 @@ const createCustomPersister = (
     return persister;
   };
   const isAutoSaving = () => !isUndefined(autoSaveListenerId);
+  const startAutoPersisting = async (
+    initialContent,
+    startSaveFirst = false,
+  ) => {
+    const [call1, call2] = startSaveFirst
+      ? [startAutoSave, startAutoLoad]
+      : [startAutoLoad, startAutoSave];
+    await call1(initialContent);
+    await call2(initialContent);
+    return persister;
+  };
+  const stopAutoPersisting = async (stopSaveFirst = false) => {
+    const [call1, call2] = stopSaveFirst
+      ? [stopAutoSave, stopAutoLoad]
+      : [stopAutoLoad, stopAutoSave];
+    await call1();
+    await call2();
+    return persister;
+  };
   const getStatus = () => status;
   const addStatusListener = (listener) =>
     addListener(listener, statusListeners);
@@ -414,10 +434,9 @@ const createCustomPersister = (
     return persister;
   };
   const getStore = () => store;
-  const destroy = async () => {
+  const destroy = () => {
     arrayClear(mapGet(scheduleActions, scheduleId));
-    await persister.stopAutoLoad();
-    return await persister.stopAutoSave();
+    return stopAutoPersisting();
   };
   const getStats = () => ({loads, saves});
   const persister = {
@@ -429,6 +448,8 @@ const createCustomPersister = (
     startAutoSave,
     stopAutoSave,
     isAutoSaving,
+    startAutoPersisting,
+    stopAutoPersisting,
     getStatus,
     addStatusListener,
     delListener,
@@ -465,7 +486,7 @@ const createCustomSynchronizer = (
   };
   const request = async (toClientId, message, body, transactionId) =>
     promiseNew((resolve, reject) => {
-      const requestId = transactionId + '.' + getUniqueId(4);
+      const requestId = transactionId + DOT + getUniqueId(4);
       const timeout = startTimeout(() => {
         collDel(pendingRequests, requestId);
         reject(
@@ -583,14 +604,11 @@ const createCustomSynchronizer = (
   const delPersisterListener = () => (persisterListener = void 0);
   const startSync = async (initialContent) => {
     syncing = 1;
-    return await (
-      await persister.startAutoLoad(initialContent)
-    ).startAutoSave();
+    return await persister.startAutoPersisting(initialContent);
   };
   const stopSync = async () => {
     syncing = 0;
-    await persister.stopAutoLoad();
-    await persister.stopAutoSave();
+    await persister.stopAutoPersisting();
     return persister;
   };
   const destroy = async () => {