tinybase 6.1.0-beta.5 → 6.1.1

package/ui-react/with-schemas/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,

package/ui-react-dom/index.js

@@ -26,6 +26,7 @@ import {
 
 const getTypeOf = (thing) => typeof thing;
 const EMPTY_STRING = '';
+const DOT = '.';
 const STRING = getTypeOf(EMPTY_STRING);
 const BOOLEAN = getTypeOf(true);
 const NUMBER = getTypeOf(0);
@@ -90,7 +91,6 @@ const getIndexStoreTableId = (indexes, indexId) => [
   indexes?.getTableId(indexId),
 ];
 
-const DOT = '.';
 const EDITABLE = 'editable';
 const LEFT_ARROW = '\u2190';
 const UP_ARROW = '\u2191';

package/ui-react-dom/with-schemas/index.js

@@ -26,6 +26,7 @@ import {
 
 const getTypeOf = (thing) => typeof thing;
 const EMPTY_STRING = '';
+const DOT = '.';
 const STRING = getTypeOf(EMPTY_STRING);
 const BOOLEAN = getTypeOf(true);
 const NUMBER = getTypeOf(0);
@@ -90,7 +91,6 @@ const getIndexStoreTableId = (indexes, indexId) => [
   indexes?.getTableId(indexId),
 ];
 
-const DOT = '.';
 const EDITABLE = 'editable';
 const LEFT_ARROW = '\u2190';
 const UP_ARROW = '\u2191';

package/ui-react-inspector/index.js

@@ -45,6 +45,7 @@ import {
 
 const getTypeOf = (thing) => typeof thing;
 const EMPTY_STRING = '';
+const DOT = '.';
 const STRING = getTypeOf(EMPTY_STRING);
 const BOOLEAN = getTypeOf(true);
 const NUMBER = getTypeOf(0);
@@ -539,6 +540,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);
@@ -552,10 +572,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 = {
@@ -567,6 +586,8 @@ const createCustomPersister = (
     startAutoSave,
     stopAutoSave,
     isAutoSaving,
+    startAutoPersisting,
+    stopAutoPersisting,
     getStatus,
     addStatusListener,
     delListener,
@@ -1309,6 +1330,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);
@@ -1317,22 +1359,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) =>
@@ -1724,48 +1780,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) =>
@@ -2034,7 +2075,6 @@ const Nub = ({s}) => {
       });
 };
 
-const DOT = '.';
 const EDITABLE = 'editable';
 const LEFT_ARROW = '\u2190';
 const UP_ARROW = '\u2191';

package/ui-react-inspector/with-schemas/index.js

@@ -45,6 +45,7 @@ import {
 
 const getTypeOf = (thing) => typeof thing;
 const EMPTY_STRING = '';
+const DOT = '.';
 const STRING = getTypeOf(EMPTY_STRING);
 const BOOLEAN = getTypeOf(true);
 const NUMBER = getTypeOf(0);
@@ -539,6 +540,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);
@@ -552,10 +572,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 = {
@@ -567,6 +586,8 @@ const createCustomPersister = (
     startAutoSave,
     stopAutoSave,
     isAutoSaving,
+    startAutoPersisting,
+    stopAutoPersisting,
     getStatus,
     addStatusListener,
     delListener,
@@ -1309,6 +1330,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);
@@ -1317,22 +1359,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) =>
@@ -1724,48 +1780,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) =>
@@ -2034,7 +2075,6 @@ const Nub = ({s}) => {
       });
 };
 
-const DOT = '.';
 const EDITABLE = 'editable';
 const LEFT_ARROW = '\u2190';
 const UP_ARROW = '\u2191';