tinybase 9.1.0-beta.0 → 9.1.0-beta.1

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

@@ -467,13 +467,25 @@ const useSortedRowIdsImpl = (
   descending,
   offset,
   limit,
+  sorter,
   storeOrStoreId,
 ) =>
   useListenable(
     SORTED_ROW_IDS,
     useStoreOrStoreById(storeOrStoreId),
     1 /* Array */,
-    [tableId, cellId, descending, offset, limit],
+    isUndefined(sorter)
+      ? [tableId, cellId, descending, offset, limit]
+      : [
+          () => ({
+            tableId: getThing(tableId),
+            cellId: getThing(cellId),
+            descending: getThing(descending) ?? false,
+            offset: getThing(offset) ?? 0,
+            limit: getThing(limit),
+            sorter: getThing(sorter),
+          }),
+        ],
   );
 const useSortedRowIdsListenerImpl = (
   tableId,
@@ -481,6 +493,7 @@ const useSortedRowIdsListenerImpl = (
   descending,
   offset,
   limit,
+  sorter,
   listener,
   mutator,
   storeOrStoreId,
@@ -489,7 +502,18 @@ const useSortedRowIdsListenerImpl = (
     SORTED_ROW_IDS,
     useStoreOrStoreById(storeOrStoreId),
     listener,
-    [tableId, cellId, descending, offset, limit],
+    isUndefined(sorter)
+      ? [tableId, cellId, descending, offset, limit]
+      : [
+          () => ({
+            tableId: getThing(tableId),
+            cellId: getThing(cellId),
+            descending: getThing(descending),
+            offset: getThing(offset),
+            limit: getThing(limit),
+            sorter: getThing(sorter),
+          }),
+        ],
     mutator,
   );
 const useCreateStore = (create) => {
@@ -565,6 +589,7 @@ const useSortedRowIds = (
   descending,
   offset,
   limit,
+  sorter,
   storeOrStoreId,
 ) =>
   isObject(tableIdOrArgs)
@@ -574,6 +599,7 @@ const useSortedRowIds = (
         tableIdOrArgs.descending ?? false,
         tableIdOrArgs.offset ?? 0,
         tableIdOrArgs.limit,
+        () => tableIdOrArgs.sorter,
         cellIdOrStoreOrStoreId,
       )
     : useSortedRowIdsImpl(
@@ -582,6 +608,7 @@ const useSortedRowIds = (
         descending,
         offset,
         limit,
+        isUndefined(sorter) ? void 0 : () => sorter,
         storeOrStoreId,
       );
 const useHasRow = (tableId, rowId, storeOrStoreId) =>
@@ -830,6 +857,7 @@ const useSortedRowIdsListener = (
         tableIdOrArgs.descending ?? false,
         tableIdOrArgs.offset ?? 0,
         tableIdOrArgs.limit,
+        () => tableIdOrArgs.sorter,
         cellIdOrListener,
         descendingOrMutator,
         offsetOrStoreOrStoreId,
@@ -840,6 +868,7 @@ const useSortedRowIdsListener = (
         descendingOrMutator ?? false,
         offsetOrStoreOrStoreId ?? 0,
         limit,
+        void 0,
         listener,
         mutator,
         storeOrStoreId,
@@ -1985,6 +2014,7 @@ const SortedTableView = (props) =>
       () => props.descending,
       () => props.offset,
       () => props.limit,
+      void 0,
       () => props.store,
     ),
   );

package/ui-solid-dom/index.js

@@ -300,13 +300,25 @@ const useSortedRowIdsImpl = (
   descending,
   offset,
   limit,
+  sorter,
   storeOrStoreId,
 ) =>
   useListenable(
     SORTED_ROW_IDS,
     useStoreOrStoreById(storeOrStoreId),
     1 /* Array */,
-    [tableId, cellId, descending, offset, limit],
+    isUndefined(sorter)
+      ? [tableId, cellId, descending, offset, limit]
+      : [
+          () => ({
+            tableId: getThing(tableId),
+            cellId: getThing(cellId),
+            descending: getThing(descending) ?? false,
+            offset: getThing(offset) ?? 0,
+            limit: getThing(limit),
+            sorter: getThing(sorter),
+          }),
+        ],
   );
 const useStoreOrStoreById = (storeOrStoreId) =>
   useThingOrThingById(storeOrStoreId, OFFSET_STORE);
@@ -334,6 +346,7 @@ const useSortedRowIds = (
   descending,
   offset,
   limit,
+  sorter,
   storeOrStoreId,
 ) =>
   isObject(tableIdOrArgs)
@@ -343,6 +356,7 @@ const useSortedRowIds = (
         tableIdOrArgs.descending ?? false,
         tableIdOrArgs.offset ?? 0,
         tableIdOrArgs.limit,
+        () => tableIdOrArgs.sorter,
         cellIdOrStoreOrStoreId,
       )
     : useSortedRowIdsImpl(
@@ -351,6 +365,7 @@ const useSortedRowIds = (
         descending,
         offset,
         limit,
+        isUndefined(sorter) ? void 0 : () => sorter,
         storeOrStoreId,
       );
 const useCell = (tableId, rowId, cellId, storeOrStoreId) =>
@@ -1420,6 +1435,7 @@ const SortedTableInHtmlTable = (props) => {
         () => sortAndOffset()[1],
         () => sortAndOffset()[2],
         () => props.limit,
+        void 0,
         () => props.store,
       ),
       props.extraCellsBefore,

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

@@ -300,13 +300,25 @@ const useSortedRowIdsImpl = (
   descending,
   offset,
   limit,
+  sorter,
   storeOrStoreId,
 ) =>
   useListenable(
     SORTED_ROW_IDS,
     useStoreOrStoreById(storeOrStoreId),
     1 /* Array */,
-    [tableId, cellId, descending, offset, limit],
+    isUndefined(sorter)
+      ? [tableId, cellId, descending, offset, limit]
+      : [
+          () => ({
+            tableId: getThing(tableId),
+            cellId: getThing(cellId),
+            descending: getThing(descending) ?? false,
+            offset: getThing(offset) ?? 0,
+            limit: getThing(limit),
+            sorter: getThing(sorter),
+          }),
+        ],
   );
 const useStoreOrStoreById = (storeOrStoreId) =>
   useThingOrThingById(storeOrStoreId, OFFSET_STORE);
@@ -334,6 +346,7 @@ const useSortedRowIds = (
   descending,
   offset,
   limit,
+  sorter,
   storeOrStoreId,
 ) =>
   isObject(tableIdOrArgs)
@@ -343,6 +356,7 @@ const useSortedRowIds = (
         tableIdOrArgs.descending ?? false,
         tableIdOrArgs.offset ?? 0,
         tableIdOrArgs.limit,
+        () => tableIdOrArgs.sorter,
         cellIdOrStoreOrStoreId,
       )
     : useSortedRowIdsImpl(
@@ -351,6 +365,7 @@ const useSortedRowIds = (
         descending,
         offset,
         limit,
+        isUndefined(sorter) ? void 0 : () => sorter,
         storeOrStoreId,
       );
 const useCell = (tableId, rowId, cellId, storeOrStoreId) =>
@@ -1420,6 +1435,7 @@ const SortedTableInHtmlTable = (props) => {
         () => sortAndOffset()[1],
         () => sortAndOffset()[2],
         () => props.limit,
+        void 0,
         () => props.store,
       ),
       props.extraCellsBefore,

package/ui-solid-inspector/index.js

@@ -2176,13 +2176,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],
@@ -2236,6 +2259,7 @@ const createStore = () => {
     descending,
     offset = 0,
     limit,
+    sorter = defaultSorter,
   ) =>
     isObject(tableIdOrArgs)
       ? getSortedRowIds(
@@ -2244,16 +2268,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,
@@ -2731,6 +2758,7 @@ const createStore = () => {
             tableIdOrArgs.descending ?? false,
             tableIdOrArgs.offset ?? 0,
             tableIdOrArgs.limit,
+            tableIdOrArgs.sorter,
           ],
           cellIdOrListener,
           descendingOrMutator,
@@ -2738,7 +2766,7 @@ const createStore = () => {
       : addSortedRowIdsListenerImpl(
           tableIdOrArgs,
           cellIdOrListener,
-          [descendingOrMutator, offset, limit],
+          [descendingOrMutator, offset, limit, void 0],
           listener,
           mutator,
         );
@@ -3145,13 +3173,25 @@ const useSortedRowIdsImpl = (
   descending,
   offset,
   limit,
+  sorter,
   storeOrStoreId,
 ) =>
   useListenable(
     SORTED_ROW_IDS,
     useStoreOrStoreById(storeOrStoreId),
     1 /* Array */,
-    [tableId, cellId, descending, offset, limit],
+    isUndefined(sorter)
+      ? [tableId, cellId, descending, offset, limit]
+      : [
+          () => ({
+            tableId: getThing(tableId),
+            cellId: getThing(cellId),
+            descending: getThing(descending) ?? false,
+            offset: getThing(offset) ?? 0,
+            limit: getThing(limit),
+            sorter: getThing(sorter),
+          }),
+        ],
   );
 const useStoreOrStoreById = (storeOrStoreId) =>
   useThingOrThingById(storeOrStoreId, OFFSET_STORE);
@@ -3179,6 +3219,7 @@ const useSortedRowIds = (
   descending,
   offset,
   limit,
+  sorter,
   storeOrStoreId,
 ) =>
   isObject(tableIdOrArgs)
@@ -3188,6 +3229,7 @@ const useSortedRowIds = (
         tableIdOrArgs.descending ?? false,
         tableIdOrArgs.offset ?? 0,
         tableIdOrArgs.limit,
+        () => tableIdOrArgs.sorter,
         cellIdOrStoreOrStoreId,
       )
     : useSortedRowIdsImpl(
@@ -3196,6 +3238,7 @@ const useSortedRowIds = (
         descending,
         offset,
         limit,
+        isUndefined(sorter) ? void 0 : () => sorter,
         storeOrStoreId,
       );
 const useCell = (tableId, rowId, cellId, storeOrStoreId) =>
@@ -4197,6 +4240,7 @@ const SortedTableInHtmlTable = (props) => {
         () => sortAndOffset()[1],
         () => sortAndOffset()[2],
         () => props.limit,
+        void 0,
         () => props.store,
       ),
       props.extraCellsBefore,

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

@@ -2176,13 +2176,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],
@@ -2236,6 +2259,7 @@ const createStore = () => {
     descending,
     offset = 0,
     limit,
+    sorter = defaultSorter,
   ) =>
     isObject(tableIdOrArgs)
       ? getSortedRowIds(
@@ -2244,16 +2268,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,
@@ -2731,6 +2758,7 @@ const createStore = () => {
             tableIdOrArgs.descending ?? false,
             tableIdOrArgs.offset ?? 0,
             tableIdOrArgs.limit,
+            tableIdOrArgs.sorter,
           ],
           cellIdOrListener,
           descendingOrMutator,
@@ -2738,7 +2766,7 @@ const createStore = () => {
       : addSortedRowIdsListenerImpl(
           tableIdOrArgs,
           cellIdOrListener,
-          [descendingOrMutator, offset, limit],
+          [descendingOrMutator, offset, limit, void 0],
           listener,
           mutator,
         );
@@ -3145,13 +3173,25 @@ const useSortedRowIdsImpl = (
   descending,
   offset,
   limit,
+  sorter,
   storeOrStoreId,
 ) =>
   useListenable(
     SORTED_ROW_IDS,
     useStoreOrStoreById(storeOrStoreId),
     1 /* Array */,
-    [tableId, cellId, descending, offset, limit],
+    isUndefined(sorter)
+      ? [tableId, cellId, descending, offset, limit]
+      : [
+          () => ({
+            tableId: getThing(tableId),
+            cellId: getThing(cellId),
+            descending: getThing(descending) ?? false,
+            offset: getThing(offset) ?? 0,
+            limit: getThing(limit),
+            sorter: getThing(sorter),
+          }),
+        ],
   );
 const useStoreOrStoreById = (storeOrStoreId) =>
   useThingOrThingById(storeOrStoreId, OFFSET_STORE);
@@ -3179,6 +3219,7 @@ const useSortedRowIds = (
   descending,
   offset,
   limit,
+  sorter,
   storeOrStoreId,
 ) =>
   isObject(tableIdOrArgs)
@@ -3188,6 +3229,7 @@ const useSortedRowIds = (
         tableIdOrArgs.descending ?? false,
         tableIdOrArgs.offset ?? 0,
         tableIdOrArgs.limit,
+        () => tableIdOrArgs.sorter,
         cellIdOrStoreOrStoreId,
       )
     : useSortedRowIdsImpl(
@@ -3196,6 +3238,7 @@ const useSortedRowIds = (
         descending,
         offset,
         limit,
+        isUndefined(sorter) ? void 0 : () => sorter,
         storeOrStoreId,
       );
 const useCell = (tableId, rowId, cellId, storeOrStoreId) =>
@@ -4197,6 +4240,7 @@ const SortedTableInHtmlTable = (props) => {
         () => sortAndOffset()[1],
         () => sortAndOffset()[2],
         () => props.limit,
+        void 0,
         () => props.store,
       ),
       props.extraCellsBefore,

package/ui-svelte/index.js

@@ -49,12 +49,25 @@ const GLOBAL = globalThis;
 const isNullish = (thing) => thing == null;
 const isUndefined = (thing) => thing === void 0;
 const hasWindow = () => !isUndefined(GLOBAL.window);
+const ifNotNullish = getIfNotFunction(isNullish);
 const ifNotUndefined = getIfNotFunction(isUndefined);
 const isString = (thing) => getTypeOf(thing) == STRING;
 const isFunction = (thing) => getTypeOf(thing) == FUNCTION;
 const noop = () => {};
 
 const object = Object;
+const getPrototypeOf = (obj) => object.getPrototypeOf(obj);
+const isObject = (obj) =>
+  !isNullish(obj) &&
+  ifNotNullish(
+    getPrototypeOf(obj),
+    (objPrototype) =>
+      objPrototype == object.prototype ||
+      isNullish(getPrototypeOf(objPrototype)),
+
+    /* istanbul ignore next */
+    () => true,
+  );
 const objIds = object.keys;
 const objGet = (obj, id) => ifNotUndefined(obj, (obj2) => obj2[id]);
 
@@ -250,25 +263,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 hasRow = (tableId, rowId, storeOrStoreId) =>
   createListenable(
@@ -820,28 +853,36 @@ const onRowIds = (tableId, listener, mutator, storeOrStoreId) =>
   );
 
 const onSortedRowIds = (
-  tableId,
-  cellId,
-  descending,
-  offset,
+  tableIdOrArgs,
+  cellIdOrListener,
+  descendingOrMutator,
+  offsetOrStoreOrStoreId,
   limit,
   listener,
   mutator,
   storeOrStoreId,
 ) =>
-  addListenerEffect(
-    resolveStore(storeOrStoreId),
-    SORTED_ROW_IDS,
-    listener,
-    () => [
-      maybeGet(tableId),
-      maybeGet(cellId),
-      maybeGet(descending),
-      maybeGet(offset),
-      maybeGet(limit),
-    ],
-    mutator,
-  );
+  isObject(tableIdOrArgs)
+    ? addListenerEffect(
+        resolveStore(offsetOrStoreOrStoreId),
+        SORTED_ROW_IDS,
+        cellIdOrListener,
+        () => [tableIdOrArgs],
+        descendingOrMutator,
+      )
+    : addListenerEffect(
+        resolveStore(storeOrStoreId),
+        SORTED_ROW_IDS,
+        listener,
+        () => [
+          maybeGet(tableIdOrArgs),
+          maybeGet(cellIdOrListener),
+          maybeGet(descendingOrMutator),
+          maybeGet(offsetOrStoreOrStoreId),
+          maybeGet(limit),
+        ],
+        mutator,
+      );
 
 const onHasRow = (tableId, rowId, listener, mutator, storeOrStoreId) =>
   addListenerEffect(
@@ -2263,6 +2304,7 @@ function SortedTableView($$anchor, $$props) {
     () => $$props.descending ?? false,
     () => $$props.offset ?? 0,
     () => $$props.limit,
+    undefined,
     () => $$props.store,
   );