tinybase 9.0.0 → 9.1.0-beta.1

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

@@ -206,25 +206,45 @@ const getRowIds = (tableId, storeOrStoreId) =>
   ]);
 
 const getSortedRowIds = (
-  tableId,
-  cellId,
+  tableIdOrArgs,
+  cellIdOrStoreOrStoreId,
   descending = false,
   offset = 0,
   limit,
+  sorter,
   storeOrStoreId,
 ) =>
-  createListenable(
-    resolveStore(storeOrStoreId),
-    SORTED_ROW_IDS,
-    EMPTY_ARR,
-    () => [
-      maybeGet(tableId),
-      maybeGet(cellId),
-      maybeGet(descending),
-      maybeGet(offset),
-      maybeGet(limit),
-    ],
-  );
+  isObject(tableIdOrArgs)
+    ? createListenable(
+        resolveStore(cellIdOrStoreOrStoreId),
+        SORTED_ROW_IDS,
+        EMPTY_ARR,
+        () => [tableIdOrArgs],
+      )
+    : createListenable(
+        resolveStore(storeOrStoreId),
+        SORTED_ROW_IDS,
+        EMPTY_ARR,
+        () =>
+          isUndefined(sorter)
+            ? [
+                maybeGet(tableIdOrArgs),
+                maybeGet(cellIdOrStoreOrStoreId),
+                maybeGet(descending),
+                maybeGet(offset),
+                maybeGet(limit),
+              ]
+            : [
+                {
+                  tableId: maybeGet(tableIdOrArgs),
+                  cellId: maybeGet(cellIdOrStoreOrStoreId),
+                  descending: maybeGet(descending) ?? false,
+                  offset: maybeGet(offset) ?? 0,
+                  limit: maybeGet(limit),
+                  sorter,
+                },
+              ],
+      );
 
 const getCell = (tableId, rowId, cellId, storeOrStoreId) => {
   const getStore2 = resolveStore(storeOrStoreId);
@@ -2042,6 +2062,7 @@ function SortedTableInHtmlTable($$anchor, $$props) {
     () => sorting.sortAndOffset[1],
     () => sorting.sortAndOffset[2],
     () => $$props.limit,
+    undefined,
     () => $$props.store,
   );
   const defaultCellComponent = $.derived(() =>

package/ui-svelte-inspector/index.js

@@ -2094,13 +2094,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],
@@ -2154,6 +2177,7 @@ const createStore = () => {
     descending,
     offset = 0,
     limit,
+    sorter = defaultSorter,
   ) =>
     isObject(tableIdOrArgs)
       ? getSortedRowIds(
@@ -2162,16 +2186,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,
@@ -2649,6 +2676,7 @@ const createStore = () => {
             tableIdOrArgs.descending ?? false,
             tableIdOrArgs.offset ?? 0,
             tableIdOrArgs.limit,
+            tableIdOrArgs.sorter,
           ],
           cellIdOrListener,
           descendingOrMutator,
@@ -2656,7 +2684,7 @@ const createStore = () => {
       : addSortedRowIdsListenerImpl(
           tableIdOrArgs,
           cellIdOrListener,
-          [descendingOrMutator, offset, limit],
+          [descendingOrMutator, offset, limit, void 0],
           listener,
           mutator,
         );
@@ -3037,25 +3065,45 @@ const getRowIds = (tableId, storeOrStoreId) =>
   ]);
 
 const getSortedRowIds = (
-  tableId,
-  cellId,
+  tableIdOrArgs,
+  cellIdOrStoreOrStoreId,
   descending = false,
   offset = 0,
   limit,
+  sorter,
   storeOrStoreId,
 ) =>
-  createListenable(
-    resolveStore(storeOrStoreId),
-    SORTED_ROW_IDS,
-    EMPTY_ARR,
-    () => [
-      maybeGet$1(tableId),
-      maybeGet$1(cellId),
-      maybeGet$1(descending),
-      maybeGet$1(offset),
-      maybeGet$1(limit),
-    ],
-  );
+  isObject(tableIdOrArgs)
+    ? createListenable(
+        resolveStore(cellIdOrStoreOrStoreId),
+        SORTED_ROW_IDS,
+        EMPTY_ARR,
+        () => [tableIdOrArgs],
+      )
+    : createListenable(
+        resolveStore(storeOrStoreId),
+        SORTED_ROW_IDS,
+        EMPTY_ARR,
+        () =>
+          isUndefined(sorter)
+            ? [
+                maybeGet$1(tableIdOrArgs),
+                maybeGet$1(cellIdOrStoreOrStoreId),
+                maybeGet$1(descending),
+                maybeGet$1(offset),
+                maybeGet$1(limit),
+              ]
+            : [
+                {
+                  tableId: maybeGet$1(tableIdOrArgs),
+                  cellId: maybeGet$1(cellIdOrStoreOrStoreId),
+                  descending: maybeGet$1(descending) ?? false,
+                  offset: maybeGet$1(offset) ?? 0,
+                  limit: maybeGet$1(limit),
+                  sorter,
+                },
+              ],
+      );
 const getCellIds = (tableId, rowId, storeOrStoreId) =>
   createListenable(resolveStore(storeOrStoreId), CELL_IDS, EMPTY_ARR, () => [
     maybeGet$1(tableId),
@@ -5045,6 +5093,7 @@ function SortedTableInHtmlTable($$anchor, $$props) {
     () => sorting.sortAndOffset[1],
     () => sorting.sortAndOffset[2],
     () => $$props.limit,
+    undefined,
     () => $$props.store,
   );
   const defaultCellComponent = $.derived(() =>

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

@@ -2094,13 +2094,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],
@@ -2154,6 +2177,7 @@ const createStore = () => {
     descending,
     offset = 0,
     limit,
+    sorter = defaultSorter,
   ) =>
     isObject(tableIdOrArgs)
       ? getSortedRowIds(
@@ -2162,16 +2186,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,
@@ -2649,6 +2676,7 @@ const createStore = () => {
             tableIdOrArgs.descending ?? false,
             tableIdOrArgs.offset ?? 0,
             tableIdOrArgs.limit,
+            tableIdOrArgs.sorter,
           ],
           cellIdOrListener,
           descendingOrMutator,
@@ -2656,7 +2684,7 @@ const createStore = () => {
       : addSortedRowIdsListenerImpl(
           tableIdOrArgs,
           cellIdOrListener,
-          [descendingOrMutator, offset, limit],
+          [descendingOrMutator, offset, limit, void 0],
           listener,
           mutator,
         );
@@ -3037,25 +3065,45 @@ const getRowIds = (tableId, storeOrStoreId) =>
   ]);
 
 const getSortedRowIds = (
-  tableId,
-  cellId,
+  tableIdOrArgs,
+  cellIdOrStoreOrStoreId,
   descending = false,
   offset = 0,
   limit,
+  sorter,
   storeOrStoreId,
 ) =>
-  createListenable(
-    resolveStore(storeOrStoreId),
-    SORTED_ROW_IDS,
-    EMPTY_ARR,
-    () => [
-      maybeGet$1(tableId),
-      maybeGet$1(cellId),
-      maybeGet$1(descending),
-      maybeGet$1(offset),
-      maybeGet$1(limit),
-    ],
-  );
+  isObject(tableIdOrArgs)
+    ? createListenable(
+        resolveStore(cellIdOrStoreOrStoreId),
+        SORTED_ROW_IDS,
+        EMPTY_ARR,
+        () => [tableIdOrArgs],
+      )
+    : createListenable(
+        resolveStore(storeOrStoreId),
+        SORTED_ROW_IDS,
+        EMPTY_ARR,
+        () =>
+          isUndefined(sorter)
+            ? [
+                maybeGet$1(tableIdOrArgs),
+                maybeGet$1(cellIdOrStoreOrStoreId),
+                maybeGet$1(descending),
+                maybeGet$1(offset),
+                maybeGet$1(limit),
+              ]
+            : [
+                {
+                  tableId: maybeGet$1(tableIdOrArgs),
+                  cellId: maybeGet$1(cellIdOrStoreOrStoreId),
+                  descending: maybeGet$1(descending) ?? false,
+                  offset: maybeGet$1(offset) ?? 0,
+                  limit: maybeGet$1(limit),
+                  sorter,
+                },
+              ],
+      );
 const getCellIds = (tableId, rowId, storeOrStoreId) =>
   createListenable(resolveStore(storeOrStoreId), CELL_IDS, EMPTY_ARR, () => [
     maybeGet$1(tableId),
@@ -5045,6 +5093,7 @@ function SortedTableInHtmlTable($$anchor, $$props) {
     () => sorting.sortAndOffset[1],
     () => sorting.sortAndOffset[2],
     () => $$props.limit,
+    undefined,
     () => $$props.store,
   );
   const defaultCellComponent = $.derived(() =>

package/with-schemas/index.js

@@ -2153,13 +2153,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],
@@ -2213,6 +2236,7 @@ const createStore = () => {
     descending,
     offset = 0,
     limit,
+    sorter = defaultSorter,
   ) =>
     isObject(tableIdOrArgs)
       ? getSortedRowIds(
@@ -2221,16 +2245,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,
@@ -2708,6 +2735,7 @@ const createStore = () => {
             tableIdOrArgs.descending ?? false,
             tableIdOrArgs.offset ?? 0,
             tableIdOrArgs.limit,
+            tableIdOrArgs.sorter,
           ],
           cellIdOrListener,
           descendingOrMutator,
@@ -2715,7 +2743,7 @@ const createStore = () => {
       : addSortedRowIdsListenerImpl(
           tableIdOrArgs,
           cellIdOrListener,
-          [descendingOrMutator, offset, limit],
+          [descendingOrMutator, offset, limit, void 0],
           listener,
           mutator,
         );