tinybase 6.1.0-beta.5 → 6.2.0-beta.0

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

@@ -1,4 +1,5 @@
 const EMPTY_STRING = '';
+const DOT = '.';
 const UTF8 = 'utf8';
 const OPEN = 'open';
 const MESSAGE = 'message';
@@ -428,6 +429,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);
@@ -441,10 +461,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 = {
@@ -456,6 +475,8 @@ const createCustomPersister = (
     startAutoSave,
     stopAutoSave,
     isAutoSaving,
+    startAutoPersisting,
+    stopAutoPersisting,
     getStatus,
     addStatusListener,
     delListener,
@@ -492,7 +513,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(
@@ -610,14 +631,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-ws-client/with-schemas/index.js

@@ -1,4 +1,5 @@
 const EMPTY_STRING = '';
+const DOT = '.';
 const UTF8 = 'utf8';
 const OPEN = 'open';
 const MESSAGE = 'message';
@@ -428,6 +429,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);
@@ -441,10 +461,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 = {
@@ -456,6 +475,8 @@ const createCustomPersister = (
     startAutoSave,
     stopAutoSave,
     isAutoSaving,
+    startAutoPersisting,
+    stopAutoPersisting,
     getStatus,
     addStatusListener,
     delListener,
@@ -492,7 +513,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(
@@ -610,14 +631,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-ws-server/index.js

@@ -1,4 +1,5 @@
 const EMPTY_STRING = '';
+const DOT = '.';
 const UTF8 = 'utf8';
 const MESSAGE = 'message';
 const ERROR = 'error';
@@ -440,6 +441,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);
@@ -453,10 +473,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 = {
@@ -468,6 +487,8 @@ const createCustomPersister = (
     startAutoSave,
     stopAutoSave,
     isAutoSaving,
+    startAutoPersisting,
+    stopAutoPersisting,
     getStatus,
     addStatusListener,
     delListener,
@@ -503,7 +524,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(
@@ -621,14 +642,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-ws-server/with-schemas/index.js

@@ -1,4 +1,5 @@
 const EMPTY_STRING = '';
+const DOT = '.';
 const UTF8 = 'utf8';
 const MESSAGE = 'message';
 const ERROR = 'error';
@@ -440,6 +441,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);
@@ -453,10 +473,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 = {
@@ -468,6 +487,8 @@ const createCustomPersister = (
     startAutoSave,
     stopAutoSave,
     isAutoSaving,
+    startAutoPersisting,
+    stopAutoPersisting,
     getStatus,
     addStatusListener,
     delListener,
@@ -503,7 +524,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(
@@ -621,14 +642,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-ws-server-durable-object/index.js

@@ -1,6 +1,7 @@
 import {DurableObject} from 'cloudflare:workers';
 
 const EMPTY_STRING = '';
+const DOT = '.';
 const UNDEFINED = '\uFFFC';
 const strMatch = (str, regex) => str?.match(regex);
 const strSplit = (str, separator = EMPTY_STRING, limit) =>
@@ -430,6 +431,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);
@@ -443,10 +463,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 = {
@@ -458,6 +477,8 @@ const createCustomPersister = (
     startAutoSave,
     stopAutoSave,
     isAutoSaving,
+    startAutoPersisting,
+    stopAutoPersisting,
     getStatus,
     addStatusListener,
     delListener,
@@ -493,7 +514,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(
@@ -611,14 +632,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-ws-server-durable-object/with-schemas/index.js

@@ -1,6 +1,7 @@
 import {DurableObject} from 'cloudflare:workers';
 
 const EMPTY_STRING = '';
+const DOT = '.';
 const UNDEFINED = '\uFFFC';
 const strMatch = (str, regex) => str?.match(regex);
 const strSplit = (str, separator = EMPTY_STRING, limit) =>
@@ -430,6 +431,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);
@@ -443,10 +463,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 = {
@@ -458,6 +477,8 @@ const createCustomPersister = (
     startAutoSave,
     stopAutoSave,
     isAutoSaving,
+    startAutoPersisting,
+    stopAutoPersisting,
     getStatus,
     addStatusListener,
     delListener,
@@ -493,7 +514,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(
@@ -611,14 +632,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/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,
@@ -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/ui-react/index.js

@@ -294,6 +294,39 @@ const useCheckpointAction = (checkpointsOrCheckpointsId, action, arg) => {
     [checkpoints, action, arg],
   );
 };
+const useSortedRowIdsImpl = (
+  tableId,
+  cellId,
+  descending,
+  offset,
+  limit,
+  storeOrStoreId,
+) =>
+  useListenable(
+    SORTED_ROW_IDS,
+    useStoreOrStoreById(storeOrStoreId),
+    1 /* Array */,
+    [tableId, cellId, descending, offset, limit],
+  );
+const useSortedRowIdsListenerImpl = (
+  tableId,
+  cellId,
+  descending,
+  offset,
+  limit,
+  listener,
+  listenerDeps,
+  mutator,
+  storeOrStoreId,
+) =>
+  useListener(
+    SORTED_ROW_IDS,
+    useStoreOrStoreById(storeOrStoreId),
+    listener,
+    listenerDeps,
+    [tableId, cellId, descending, offset, limit],
+    mutator,
+  );
 const useCreateStore = (create, createDeps = EMPTY_ARRAY) =>
   useMemo(create, createDeps);
 const useStoreIds = () => useThingIds(Offsets.Store);
@@ -350,18 +383,31 @@ const useRowIds = (tableId, storeOrStoreId) =>
     tableId,
   ]);
 const useSortedRowIds = (
-  tableId,
-  cellId,
+  tableIdOrArgs,
+  cellIdOrStoreOrStoreId,
   descending,
-  offset = 0,
+  offset,
   limit,
   storeOrStoreId,
 ) =>
-  useListenable(
-    SORTED_ROW_IDS,
-    useStoreOrStoreById(storeOrStoreId),
-    1 /* Array */,
-    [tableId, cellId, descending, offset, limit],
+  useSortedRowIdsImpl(
+    ...(isObject(tableIdOrArgs)
+      ? [
+          tableIdOrArgs.tableId,
+          tableIdOrArgs.cellId,
+          tableIdOrArgs.descending ?? false,
+          tableIdOrArgs.offset ?? 0,
+          tableIdOrArgs.limit,
+          cellIdOrStoreOrStoreId,
+        ]
+      : [
+          tableIdOrArgs,
+          cellIdOrStoreOrStoreId,
+          descending,
+          offset,
+          limit,
+          storeOrStoreId,
+        ]),
   );
 const useHasRow = (tableId, rowId, storeOrStoreId) =>
   useListenable(ROW, useStoreOrStoreById(storeOrStoreId), 4 /* Boolean */, [
@@ -733,23 +779,40 @@ const useRowIdsListener = (
     mutator,
   );
 const useSortedRowIdsListener = (
-  tableId,
-  cellId,
-  descending,
-  offset,
-  limit,
+  tableIdOrArgs,
+  cellIdOrListener,
+  descendingOrListenerDeps,
+  offsetOrMutator,
+  limitOrStoreOrStoreId,
   listener,
   listenerDeps,
   mutator,
   storeOrStoreId,
 ) =>
-  useListener(
-    SORTED_ROW_IDS,
-    useStoreOrStoreById(storeOrStoreId),
-    listener,
-    listenerDeps,
-    [tableId, cellId, descending, offset, limit],
-    mutator,
+  useSortedRowIdsListenerImpl(
+    ...(isObject(tableIdOrArgs)
+      ? [
+          tableIdOrArgs.tableId,
+          tableIdOrArgs.cellId,
+          tableIdOrArgs.descending ?? false,
+          tableIdOrArgs.offset ?? 0,
+          tableIdOrArgs.limit,
+          cellIdOrListener,
+          descendingOrListenerDeps,
+          offsetOrMutator,
+          limitOrStoreOrStoreId,
+        ]
+      : [
+          tableIdOrArgs,
+          cellIdOrListener,
+          descendingOrListenerDeps,
+          offsetOrMutator,
+          limitOrStoreOrStoreId,
+          listener,
+          listenerDeps,
+          mutator,
+          storeOrStoreId,
+        ]),
   );
 const useHasRowListener = (
   tableId,
@@ -2231,6 +2294,7 @@ export {
   useSliceRowIdsListener,
   useSortedRowIds,
   useSortedRowIdsListener,
+  useSortedRowIdsListenerImpl,
   useStartTransactionListener,
   useStore,
   useStoreIds,