tinybase 9.0.0 → 9.1.0-beta.1

package/store/index.js

@@ -1314,13 +1314,36 @@ const createStore = () => {
     listener,
     mutator,
   ) => {
-    let sortedRowIds = getSortedRowIds(tableId, cellId, ...otherArgs);
+    const [descending, offset, limit, sorter] = otherArgs;
+    let sortedRowIds = getSortedRowIds(
+      tableId,
+      cellId,
+      descending,
+      offset,
+      limit,
+      sorter,
+    );
     return addListener(
       () => {
-        const newSortedRowIds = getSortedRowIds(tableId, cellId, ...otherArgs);
+        const newSortedRowIds = getSortedRowIds(
+          tableId,
+          cellId,
+          descending,
+          offset,
+          limit,
+          sorter,
+        );
         if (!arrayIsEqual(newSortedRowIds, sortedRowIds)) {
           sortedRowIds = newSortedRowIds;
-          listener(store, tableId, cellId, ...otherArgs, sortedRowIds);
+          listener(
+            store,
+            tableId,
+            cellId,
+            descending,
+            offset,
+            limit,
+            sortedRowIds,
+          );
         }
       },
       sortedRowIdsListeners[mutator ? 1 : 0],
@@ -1374,6 +1397,7 @@ const createStore = () => {
     descending,
     offset = 0,
     limit,
+    sorter = defaultSorter,
   ) =>
     isObject(tableIdOrArgs)
       ? getSortedRowIds(
@@ -1382,16 +1406,19 @@ const createStore = () => {
           tableIdOrArgs.descending,
           tableIdOrArgs.offset,
           tableIdOrArgs.limit,
+          tableIdOrArgs.sorter,
         )
       : arrayMap(
           slice(
             arraySort(
               mapMap(mapGet(tablesMap, id(tableIdOrArgs)), (row, rowId) => [
-                isUndefined(cellId) ? rowId : mapGet(row, id(cellId)),
+                isUndefined(cellId)
+                  ? rowId
+                  : decodeIfJson(mapGet(row, id(cellId))),
                 rowId,
               ]),
               ([cell1], [cell2]) =>
-                defaultSorter(cell1, cell2) * (descending ? -1 : 1),
+                sorter(cell1, cell2) * (descending ? -1 : 1),
             ),
             offset,
             isUndefined(limit) ? limit : offset + limit,
@@ -1869,6 +1896,7 @@ const createStore = () => {
             tableIdOrArgs.descending ?? false,
             tableIdOrArgs.offset ?? 0,
             tableIdOrArgs.limit,
+            tableIdOrArgs.sorter,
           ],
           cellIdOrListener,
           descendingOrMutator,
@@ -1876,7 +1904,7 @@ const createStore = () => {
       : addSortedRowIdsListenerImpl(
           tableIdOrArgs,
           cellIdOrListener,
-          [descendingOrMutator, offset, limit],
+          [descendingOrMutator, offset, limit, void 0],
           listener,
           mutator,
         );

package/store/with-schemas/index.js

@@ -1314,13 +1314,36 @@ const createStore = () => {
     listener,
     mutator,
   ) => {
-    let sortedRowIds = getSortedRowIds(tableId, cellId, ...otherArgs);
+    const [descending, offset, limit, sorter] = otherArgs;
+    let sortedRowIds = getSortedRowIds(
+      tableId,
+      cellId,
+      descending,
+      offset,
+      limit,
+      sorter,
+    );
     return addListener(
       () => {
-        const newSortedRowIds = getSortedRowIds(tableId, cellId, ...otherArgs);
+        const newSortedRowIds = getSortedRowIds(
+          tableId,
+          cellId,
+          descending,
+          offset,
+          limit,
+          sorter,
+        );
         if (!arrayIsEqual(newSortedRowIds, sortedRowIds)) {
           sortedRowIds = newSortedRowIds;
-          listener(store, tableId, cellId, ...otherArgs, sortedRowIds);
+          listener(
+            store,
+            tableId,
+            cellId,
+            descending,
+            offset,
+            limit,
+            sortedRowIds,
+          );
         }
       },
       sortedRowIdsListeners[mutator ? 1 : 0],
@@ -1374,6 +1397,7 @@ const createStore = () => {
     descending,
     offset = 0,
     limit,
+    sorter = defaultSorter,
   ) =>
     isObject(tableIdOrArgs)
       ? getSortedRowIds(
@@ -1382,16 +1406,19 @@ const createStore = () => {
           tableIdOrArgs.descending,
           tableIdOrArgs.offset,
           tableIdOrArgs.limit,
+          tableIdOrArgs.sorter,
         )
       : arrayMap(
           slice(
             arraySort(
               mapMap(mapGet(tablesMap, id(tableIdOrArgs)), (row, rowId) => [
-                isUndefined(cellId) ? rowId : mapGet(row, id(cellId)),
+                isUndefined(cellId)
+                  ? rowId
+                  : decodeIfJson(mapGet(row, id(cellId))),
                 rowId,
               ]),
               ([cell1], [cell2]) =>
-                defaultSorter(cell1, cell2) * (descending ? -1 : 1),
+                sorter(cell1, cell2) * (descending ? -1 : 1),
             ),
             offset,
             isUndefined(limit) ? limit : offset + limit,
@@ -1869,6 +1896,7 @@ const createStore = () => {
             tableIdOrArgs.descending ?? false,
             tableIdOrArgs.offset ?? 0,
             tableIdOrArgs.limit,
+            tableIdOrArgs.sorter,
           ],
           cellIdOrListener,
           descendingOrMutator,
@@ -1876,7 +1904,7 @@ const createStore = () => {
       : addSortedRowIdsListenerImpl(
           tableIdOrArgs,
           cellIdOrListener,
-          [descendingOrMutator, offset, limit],
+          [descendingOrMutator, offset, limit, void 0],
           listener,
           mutator,
         );

package/ui-react/index.js

@@ -536,33 +536,56 @@ const useSortedRowIdsImpl = (
   descending,
   offset,
   limit,
+  sorter,
   storeOrStoreId,
-) =>
-  useListenable(
+) => {
+  const sortedRowIdsArgs = useMemo(
+    () => ({
+      tableId,
+      cellId,
+      descending: descending ?? false,
+      offset: offset ?? 0,
+      limit,
+      sorter,
+    }),
+    [tableId, cellId, descending, offset, limit, sorter],
+  );
+  return useListenable(
     SORTED_ROW_IDS,
     useStoreOrStoreById(storeOrStoreId),
     1 /* Array */,
-    [tableId, cellId, descending, offset, limit],
+    isUndefined(sorter)
+      ? [tableId, cellId, descending, offset, limit]
+      : [sortedRowIdsArgs],
   );
+};
 const useSortedRowIdsListenerImpl = (
   tableId,
   cellId,
   descending,
   offset,
   limit,
+  sorter,
   listener,
   listenerDeps,
   mutator,
   storeOrStoreId,
-) =>
+) => {
+  const sortedRowIdsArgs = useMemo(
+    () => ({tableId, cellId, descending, offset, limit, sorter}),
+    [tableId, cellId, descending, offset, limit, sorter],
+  );
   useListener(
     SORTED_ROW_IDS,
     useStoreOrStoreById(storeOrStoreId),
     listener,
     listenerDeps,
-    [tableId, cellId, descending, offset, limit],
+    isUndefined(sorter)
+      ? [tableId, cellId, descending, offset, limit]
+      : [sortedRowIdsArgs],
     mutator,
   );
+};
 const useCreateStore = (create, createDeps = EMPTY_ARRAY) =>
   useMemo(create, createDeps);
 const useStoreIds = () => useThingIds(OFFSET_STORE);
@@ -632,6 +655,7 @@ const useSortedRowIds = (
   descending,
   offset,
   limit,
+  sorterOrStoreOrStoreId,
   storeOrStoreId,
 ) =>
   useSortedRowIdsImpl(
@@ -642,6 +666,7 @@ const useSortedRowIds = (
           tableIdOrArgs.descending ?? false,
           tableIdOrArgs.offset ?? 0,
           tableIdOrArgs.limit,
+          tableIdOrArgs.sorter,
           cellIdOrStoreOrStoreId,
         ]
       : [
@@ -650,7 +675,10 @@ const useSortedRowIds = (
           descending,
           offset,
           limit,
-          storeOrStoreId,
+          isFunction(sorterOrStoreOrStoreId) ? sorterOrStoreOrStoreId : void 0,
+          isFunction(sorterOrStoreOrStoreId)
+            ? storeOrStoreId
+            : sorterOrStoreOrStoreId,
         ]),
   );
 const useHasRow = (tableId, rowId, storeOrStoreId) =>
@@ -1057,6 +1085,7 @@ const useSortedRowIdsListener = (
           tableIdOrArgs.descending ?? false,
           tableIdOrArgs.offset ?? 0,
           tableIdOrArgs.limit,
+          tableIdOrArgs.sorter,
           cellIdOrListener,
           descendingOrListenerDeps,
           offsetOrMutator,
@@ -1068,6 +1097,7 @@ const useSortedRowIdsListener = (
           descendingOrListenerDeps,
           offsetOrMutator,
           limitOrStoreOrStoreId,
+          void 0,
           listener,
           listenerDeps,
           mutator,

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

@@ -536,33 +536,56 @@ const useSortedRowIdsImpl = (
   descending,
   offset,
   limit,
+  sorter,
   storeOrStoreId,
-) =>
-  useListenable(
+) => {
+  const sortedRowIdsArgs = useMemo(
+    () => ({
+      tableId,
+      cellId,
+      descending: descending ?? false,
+      offset: offset ?? 0,
+      limit,
+      sorter,
+    }),
+    [tableId, cellId, descending, offset, limit, sorter],
+  );
+  return useListenable(
     SORTED_ROW_IDS,
     useStoreOrStoreById(storeOrStoreId),
     1 /* Array */,
-    [tableId, cellId, descending, offset, limit],
+    isUndefined(sorter)
+      ? [tableId, cellId, descending, offset, limit]
+      : [sortedRowIdsArgs],
   );
+};
 const useSortedRowIdsListenerImpl = (
   tableId,
   cellId,
   descending,
   offset,
   limit,
+  sorter,
   listener,
   listenerDeps,
   mutator,
   storeOrStoreId,
-) =>
+) => {
+  const sortedRowIdsArgs = useMemo(
+    () => ({tableId, cellId, descending, offset, limit, sorter}),
+    [tableId, cellId, descending, offset, limit, sorter],
+  );
   useListener(
     SORTED_ROW_IDS,
     useStoreOrStoreById(storeOrStoreId),
     listener,
     listenerDeps,
-    [tableId, cellId, descending, offset, limit],
+    isUndefined(sorter)
+      ? [tableId, cellId, descending, offset, limit]
+      : [sortedRowIdsArgs],
     mutator,
   );
+};
 const useCreateStore = (create, createDeps = EMPTY_ARRAY) =>
   useMemo(create, createDeps);
 const useStoreIds = () => useThingIds(OFFSET_STORE);
@@ -632,6 +655,7 @@ const useSortedRowIds = (
   descending,
   offset,
   limit,
+  sorterOrStoreOrStoreId,
   storeOrStoreId,
 ) =>
   useSortedRowIdsImpl(
@@ -642,6 +666,7 @@ const useSortedRowIds = (
           tableIdOrArgs.descending ?? false,
           tableIdOrArgs.offset ?? 0,
           tableIdOrArgs.limit,
+          tableIdOrArgs.sorter,
           cellIdOrStoreOrStoreId,
         ]
       : [
@@ -650,7 +675,10 @@ const useSortedRowIds = (
           descending,
           offset,
           limit,
-          storeOrStoreId,
+          isFunction(sorterOrStoreOrStoreId) ? sorterOrStoreOrStoreId : void 0,
+          isFunction(sorterOrStoreOrStoreId)
+            ? storeOrStoreId
+            : sorterOrStoreOrStoreId,
         ]),
   );
 const useHasRow = (tableId, rowId, storeOrStoreId) =>
@@ -1057,6 +1085,7 @@ const useSortedRowIdsListener = (
           tableIdOrArgs.descending ?? false,
           tableIdOrArgs.offset ?? 0,
           tableIdOrArgs.limit,
+          tableIdOrArgs.sorter,
           cellIdOrListener,
           descendingOrListenerDeps,
           offsetOrMutator,
@@ -1068,6 +1097,7 @@ const useSortedRowIdsListener = (
           descendingOrListenerDeps,
           offsetOrMutator,
           limitOrStoreOrStoreId,
+          void 0,
           listener,
           listenerDeps,
           mutator,

package/ui-react-dom/index.js

@@ -312,14 +312,29 @@ const useSortedRowIdsImpl = (
   descending,
   offset,
   limit,
+  sorter,
   storeOrStoreId,
-) =>
-  useListenable(
+) => {
+  const sortedRowIdsArgs = useMemo(
+    () => ({
+      tableId,
+      cellId,
+      descending: descending ?? false,
+      offset: offset ?? 0,
+      limit,
+      sorter,
+    }),
+    [tableId, cellId, descending, offset, limit, sorter],
+  );
+  return useListenable(
     SORTED_ROW_IDS,
     useStoreOrStoreById(storeOrStoreId),
     1 /* Array */,
-    [tableId, cellId, descending, offset, limit],
+    isUndefined(sorter)
+      ? [tableId, cellId, descending, offset, limit]
+      : [sortedRowIdsArgs],
   );
+};
 const useStoreOrStoreById = (storeOrStoreId) =>
   useThingOrThingById(storeOrStoreId, OFFSET_STORE);
 const useTableCellIds = (tableId, storeOrStoreId) =>
@@ -346,6 +361,7 @@ const useSortedRowIds = (
   descending,
   offset,
   limit,
+  sorterOrStoreOrStoreId,
   storeOrStoreId,
 ) =>
   useSortedRowIdsImpl(
@@ -356,6 +372,7 @@ const useSortedRowIds = (
           tableIdOrArgs.descending ?? false,
           tableIdOrArgs.offset ?? 0,
           tableIdOrArgs.limit,
+          tableIdOrArgs.sorter,
           cellIdOrStoreOrStoreId,
         ]
       : [
@@ -364,7 +381,10 @@ const useSortedRowIds = (
           descending,
           offset,
           limit,
-          storeOrStoreId,
+          isFunction(sorterOrStoreOrStoreId) ? sorterOrStoreOrStoreId : void 0,
+          isFunction(sorterOrStoreOrStoreId)
+            ? storeOrStoreId
+            : sorterOrStoreOrStoreId,
         ]),
   );
 const useCell = (tableId, rowId, cellId, storeOrStoreId) =>

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

@@ -312,14 +312,29 @@ const useSortedRowIdsImpl = (
   descending,
   offset,
   limit,
+  sorter,
   storeOrStoreId,
-) =>
-  useListenable(
+) => {
+  const sortedRowIdsArgs = useMemo(
+    () => ({
+      tableId,
+      cellId,
+      descending: descending ?? false,
+      offset: offset ?? 0,
+      limit,
+      sorter,
+    }),
+    [tableId, cellId, descending, offset, limit, sorter],
+  );
+  return useListenable(
     SORTED_ROW_IDS,
     useStoreOrStoreById(storeOrStoreId),
     1 /* Array */,
-    [tableId, cellId, descending, offset, limit],
+    isUndefined(sorter)
+      ? [tableId, cellId, descending, offset, limit]
+      : [sortedRowIdsArgs],
   );
+};
 const useStoreOrStoreById = (storeOrStoreId) =>
   useThingOrThingById(storeOrStoreId, OFFSET_STORE);
 const useTableCellIds = (tableId, storeOrStoreId) =>
@@ -346,6 +361,7 @@ const useSortedRowIds = (
   descending,
   offset,
   limit,
+  sorterOrStoreOrStoreId,
   storeOrStoreId,
 ) =>
   useSortedRowIdsImpl(
@@ -356,6 +372,7 @@ const useSortedRowIds = (
           tableIdOrArgs.descending ?? false,
           tableIdOrArgs.offset ?? 0,
           tableIdOrArgs.limit,
+          tableIdOrArgs.sorter,
           cellIdOrStoreOrStoreId,
         ]
       : [
@@ -364,7 +381,10 @@ const useSortedRowIds = (
           descending,
           offset,
           limit,
-          storeOrStoreId,
+          isFunction(sorterOrStoreOrStoreId) ? sorterOrStoreOrStoreId : void 0,
+          isFunction(sorterOrStoreOrStoreId)
+            ? storeOrStoreId
+            : sorterOrStoreOrStoreId,
         ]),
   );
 const useCell = (tableId, rowId, cellId, storeOrStoreId) =>

package/ui-react-dom-charts/index.js

@@ -917,14 +917,29 @@ const useSortedRowIdsImpl = (
   descending,
   offset,
   limit,
+  sorter,
   storeOrStoreId,
-) =>
-  useListenable(
+) => {
+  const sortedRowIdsArgs = useMemo(
+    () => ({
+      tableId,
+      cellId,
+      descending: descending ?? false,
+      offset: offset ?? 0,
+      limit,
+      sorter,
+    }),
+    [tableId, cellId, descending, offset, limit, sorter],
+  );
+  return useListenable(
     SORTED_ROW_IDS,
     useStoreOrStoreById(storeOrStoreId),
     1 /* Array */,
-    [tableId, cellId, descending, offset, limit],
+    isUndefined(sorter)
+      ? [tableId, cellId, descending, offset, limit]
+      : [sortedRowIdsArgs],
   );
+};
 const useStoreOrStoreById = (storeOrStoreId) =>
   useThingOrThingById(storeOrStoreId, OFFSET_STORE);
 const useSortedRowIds = (
@@ -933,6 +948,7 @@ const useSortedRowIds = (
   descending,
   offset,
   limit,
+  sorterOrStoreOrStoreId,
   storeOrStoreId,
 ) =>
   useSortedRowIdsImpl(
@@ -943,6 +959,7 @@ const useSortedRowIds = (
           tableIdOrArgs.descending ?? false,
           tableIdOrArgs.offset ?? 0,
           tableIdOrArgs.limit,
+          tableIdOrArgs.sorter,
           cellIdOrStoreOrStoreId,
         ]
       : [
@@ -951,7 +968,10 @@ const useSortedRowIds = (
           descending,
           offset,
           limit,
-          storeOrStoreId,
+          isFunction(sorterOrStoreOrStoreId) ? sorterOrStoreOrStoreId : void 0,
+          isFunction(sorterOrStoreOrStoreId)
+            ? storeOrStoreId
+            : sorterOrStoreOrStoreId,
         ]),
   );
 const useCellListener = (

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

@@ -917,14 +917,29 @@ const useSortedRowIdsImpl = (
   descending,
   offset,
   limit,
+  sorter,
   storeOrStoreId,
-) =>
-  useListenable(
+) => {
+  const sortedRowIdsArgs = useMemo(
+    () => ({
+      tableId,
+      cellId,
+      descending: descending ?? false,
+      offset: offset ?? 0,
+      limit,
+      sorter,
+    }),
+    [tableId, cellId, descending, offset, limit, sorter],
+  );
+  return useListenable(
     SORTED_ROW_IDS,
     useStoreOrStoreById(storeOrStoreId),
     1 /* Array */,
-    [tableId, cellId, descending, offset, limit],
+    isUndefined(sorter)
+      ? [tableId, cellId, descending, offset, limit]
+      : [sortedRowIdsArgs],
   );
+};
 const useStoreOrStoreById = (storeOrStoreId) =>
   useThingOrThingById(storeOrStoreId, OFFSET_STORE);
 const useSortedRowIds = (
@@ -933,6 +948,7 @@ const useSortedRowIds = (
   descending,
   offset,
   limit,
+  sorterOrStoreOrStoreId,
   storeOrStoreId,
 ) =>
   useSortedRowIdsImpl(
@@ -943,6 +959,7 @@ const useSortedRowIds = (
           tableIdOrArgs.descending ?? false,
           tableIdOrArgs.offset ?? 0,
           tableIdOrArgs.limit,
+          tableIdOrArgs.sorter,
           cellIdOrStoreOrStoreId,
         ]
       : [
@@ -951,7 +968,10 @@ const useSortedRowIds = (
           descending,
           offset,
           limit,
-          storeOrStoreId,
+          isFunction(sorterOrStoreOrStoreId) ? sorterOrStoreOrStoreId : void 0,
+          isFunction(sorterOrStoreOrStoreId)
+            ? storeOrStoreId
+            : sorterOrStoreOrStoreId,
         ]),
   );
 const useCellListener = (