quetch 0.32.2 → 0.33.0

package/dist/tools/comparatorFieldValues.js

@@ -10,17 +10,24 @@ import { sameField } from "./sameField.js";
 export function comparatorFieldValues({ pathField = "path", pathFieldSeparator = "/", pathFieldSeparatorEscape = "\\", } = EMPTY_OBJECT) {
     const fieldSeparatorRegexp = new RegExp(!pathFieldSeparatorEscape
         ? escapeRegex(pathFieldSeparator)
-        : `(?<!${escapeRegex(pathFieldSeparatorEscape)})${escapeRegex(pathFieldSeparator)}`, "g");
-    return (field, a, b) => {
+        : `(?<!(?:${escapeRegex(pathFieldSeparatorEscape)}{2})*${escapeRegex(pathFieldSeparatorEscape)})${escapeRegex(pathFieldSeparator)}`, "g");
+    return (field, descending, a, b) => {
         if (!sameField(field, pathField)) {
             return undefined;
         }
+        // Parents should always appear before their children, regardless of the order direction
+        if (a.startsWith(`${b}${pathFieldSeparator}`)) {
+            return 1;
+        }
+        if (b.startsWith(`${a}${pathFieldSeparator}`)) {
+            return -1;
+        }
         const normalizedA = a.replaceAll?.(fieldSeparatorRegexp, "\x00");
         const normalizedB = b.replaceAll?.(fieldSeparatorRegexp, "\x00");
         if (normalizedA > normalizedB) {
-            return 1;
+            return descending ? -1 : 1;
         }
-        return -1;
+        return descending ? 1 : -1;
     };
 }
 //# sourceMappingURL=comparatorFieldValues.js.map

package/dist/tools/comparatorFieldValues.js.map

@@ -1 +1 @@
-{"version":3,"file":"comparatorFieldValues.js","sourceRoot":"","sources":["../../lib/tools/comparatorFieldValues.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAQ5C,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAE3C;;;;;GAKG;AACH,MAAM,UAAU,qBAAqB,CAAI,EACvC,SAAS,GAAG,MAAkC,EAC9C,kBAAkB,GAAG,GAAG,EACxB,wBAAwB,GAAG,IAAI,MACG,YAAY;IAC9C,MAAM,oBAAoB,GAAG,IAAI,MAAM,CACrC,CAAC,wBAAwB;QACvB,CAAC,CAAC,WAAW,CAAC,kBAAkB,CAAC;QACjC,CAAC,CAAC,OAAO,WAAW,CAAC,wBAAwB,CAAC,IAAI,WAAW,CAAC,kBAAkB,CAAC,EAAE,EACrF,GAAG,CACJ,CAAC;IACF,OAAO,CAAC,KAAK,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE;QACrB,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,SAAS,CAAC,EAAE,CAAC;YACjC,OAAO,SAAS,CAAC;QACnB,CAAC;QACD,MAAM,WAAW,GAAI,CAAY,CAAC,UAAU,EAAE,CAC5C,oBAAoB,EACpB,MAAM,CACP,CAAC;QACF,MAAM,WAAW,GAAI,CAAY,CAAC,UAAU,EAAE,CAC5C,oBAAoB,EACpB,MAAM,CACP,CAAC;QACF,IAAI,WAAW,GAAG,WAAW,EAAE,CAAC;YAC9B,OAAO,CAAC,CAAC;QACX,CAAC;QACD,OAAO,CAAC,CAAC,CAAC;IACZ,CAAC,CAAC;AACJ,CAAC"}
+{"version":3,"file":"comparatorFieldValues.js","sourceRoot":"","sources":["../../lib/tools/comparatorFieldValues.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAQ5C,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAE3C;;;;;GAKG;AACH,MAAM,UAAU,qBAAqB,CAAI,EACvC,SAAS,GAAG,MAAkC,EAC9C,kBAAkB,GAAG,GAAG,EACxB,wBAAwB,GAAG,IAAI,MACG,YAAY;IAC9C,MAAM,oBAAoB,GAAG,IAAI,MAAM,CACrC,CAAC,wBAAwB;QACvB,CAAC,CAAC,WAAW,CAAC,kBAAkB,CAAC;QACjC,CAAC,CAAC,UAAU,WAAW,CAAC,wBAAwB,CAAC,QAAQ,WAAW,CAAC,wBAAwB,CAAC,IAAI,WAAW,CAAC,kBAAkB,CAAC,EAAE,EACrI,GAAG,CACJ,CAAC;IACF,OAAO,CAAC,KAAK,EAAE,UAAU,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE;QACjC,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,SAAS,CAAC,EAAE,CAAC;YACjC,OAAO,SAAS,CAAC;QACnB,CAAC;QACD,wFAAwF;QACxF,IAAK,CAAY,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,kBAAkB,EAAE,CAAC,EAAE,CAAC;YAC1D,OAAO,CAAC,CAAC;QACX,CAAC;QACD,IAAK,CAAY,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,kBAAkB,EAAE,CAAC,EAAE,CAAC;YAC1D,OAAO,CAAC,CAAC,CAAC;QACZ,CAAC;QACD,MAAM,WAAW,GAAI,CAAY,CAAC,UAAU,EAAE,CAC5C,oBAAoB,EACpB,MAAM,CACP,CAAC;QACF,MAAM,WAAW,GAAI,CAAY,CAAC,UAAU,EAAE,CAC5C,oBAAoB,EACpB,MAAM,CACP,CAAC;QACF,IAAI,WAAW,GAAG,WAAW,EAAE,CAAC;YAC9B,OAAO,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAC7B,CAAC;QACD,OAAO,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAC7B,CAAC,CAAC;AACJ,CAAC"}

package/dist/tools/normalizeOrder.js.map

@@ -1 +1 @@
-{"version":3,"file":"normalizeOrder.js","sourceRoot":"","sources":["../../lib/tools/normalizeOrder.ts"],"names":[],"mappings":"AAEA,MAAM,OAAO,GAAG,KAAK,CAAC,OAAkD,CAAC;AAEzE;;;;;GAKG;AACH,MAAM,UAAU,cAAc,CAAI,KAAe;IAI/C,IAAI,OAAO,CAAC,KAAK,CAAC,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QAChD,OAAO;YACL,KAAK,EAAE,KAAY;YACnB,UAAU,EAAE,KAAK;SAClB,CAAC;IACJ,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC"}
+{"version":3,"file":"normalizeOrder.js","sourceRoot":"","sources":["../../lib/tools/normalizeOrder.ts"],"names":[],"mappings":"AAEA,MAAM,OAAO,GAAG,KAAK,CAAC,OAAkD,CAAC;AAEzE;;;;;GAKG;AACH,MAAM,UAAU,cAAc,CAAI,KAAe;IAI/C,IAAI,OAAO,CAAC,KAAK,CAAC,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QAChD,OAAO;YACL,KAAK,EAAE,KAAY;YACnB,UAAU,EAAE,KAAK;SAClB,CAAC;IACJ,CAAC;IACD,OAAO,KAA6C,CAAC;AACvD,CAAC"}

package/dist/tools/sortItemList.js

@@ -17,7 +17,7 @@ export function sortItemList(orderList, value, settings) {
     const normalizedOrder = orderList.map(normalizeOrder);
     return value.toSorted((a, b) => {
         for (let index = 0; index < normalizedOrder.length; index++) {
-            const { field, descending } = normalizedOrder[index];
+            const { field, descending = false } = normalizedOrder[index];
             const valueA = get(a, field);
             const valueB = get(b, field);
             if (valueA === valueB) {
@@ -29,7 +29,7 @@ export function sortItemList(orderList, value, settings) {
             if (valueB == null) {
                 return descending ? -1 : 1;
             }
-            const comparison = compareFieldValues?.(field, valueA, valueB);
+            const comparison = compareFieldValues?.(field, descending, valueA, valueB);
             if (comparison === undefined) {
                 if (valueA > valueB) {
                     return descending ? -1 : 1;
@@ -39,7 +39,7 @@ export function sortItemList(orderList, value, settings) {
             if (comparison === 0) {
                 continue;
             }
-            return descending ? -comparison : comparison;
+            return comparison;
         }
         return 0;
     });

package/dist/tools/sortItemList.js.map

@@ -1 +1 @@
-{"version":3,"file":"sortItemList.js","sourceRoot":"","sources":["../../lib/tools/sortItemList.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAI5C,OAAO,EAAE,GAAG,EAAE,MAAM,UAAU,CAAC;AAC/B,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAErD;;;;;;;GAOG;AACH,MAAM,UAAU,YAAY,CAC1B,SAAmD,EACnD,KAAmB,EACnB,QAA2B;IAE3B,IAAI,SAAS,KAAK,SAAS,IAAI,SAAS,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACtD,OAAO,KAAK,CAAC;IACf,CAAC;IACD,MAAM,EAAE,kBAAkB,EAAE,GAAG,QAAQ,IAAI,YAAY,CAAC;IACxD,MAAM,eAAe,GAAG,SAAS,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;IACtD,OAAO,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;QAC7B,KAAK,IAAI,KAAK,GAAG,CAAC,EAAE,KAAK,GAAG,eAAe,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE,CAAC;YAC5D,MAAM,EAAE,KAAK,EAAE,UAAU,EAAE,GAAG,eAAe,CAAC,KAAK,CAAE,CAAC;YACtD,MAAM,MAAM,GAAG,GAAG,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC;YAC7B,MAAM,MAAM,GAAG,GAAG,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC;YAC7B,IAAI,MAAM,KAAK,MAAM,EAAE,CAAC;gBACtB,SAAS;YACX,CAAC;YACD,IAAI,MAAM,IAAI,IAAI,EAAE,CAAC;gBACnB,OAAO,MAAM,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YAClD,CAAC;YACD,IAAI,MAAM,IAAI,IAAI,EAAE,CAAC;gBACnB,OAAO,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YAC7B,CAAC;YACD,MAAM,UAAU,GAAG,kBAAkB,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;YAC/D,IAAI,UAAU,KAAK,SAAS,EAAE,CAAC;gBAC7B,IAAI,MAAM,GAAG,MAAM,EAAE,CAAC;oBACpB,OAAO,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;gBAC7B,CAAC;gBACD,OAAO,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YAC7B,CAAC;YACD,IAAI,UAAU,KAAK,CAAC,EAAE,CAAC;gBACrB,SAAS;YACX,CAAC;YACD,OAAO,UAAU,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,UAAU,CAAC;QAC/C,CAAC;QACD,OAAO,CAAC,CAAC;IACX,CAAC,CAAC,CAAC;AACL,CAAC"}
+{"version":3,"file":"sortItemList.js","sourceRoot":"","sources":["../../lib/tools/sortItemList.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAI5C,OAAO,EAAE,GAAG,EAAE,MAAM,UAAU,CAAC;AAC/B,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAErD;;;;;;;GAOG;AACH,MAAM,UAAU,YAAY,CAC1B,SAAmD,EACnD,KAAmB,EACnB,QAA2B;IAE3B,IAAI,SAAS,KAAK,SAAS,IAAI,SAAS,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACtD,OAAO,KAAK,CAAC;IACf,CAAC;IACD,MAAM,EAAE,kBAAkB,EAAE,GAAG,QAAQ,IAAI,YAAY,CAAC;IACxD,MAAM,eAAe,GAAG,SAAS,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;IACtD,OAAO,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;QAC7B,KAAK,IAAI,KAAK,GAAG,CAAC,EAAE,KAAK,GAAG,eAAe,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE,CAAC;YAC5D,MAAM,EAAE,KAAK,EAAE,UAAU,GAAG,KAAK,EAAE,GAAG,eAAe,CAAC,KAAK,CAAE,CAAC;YAC9D,MAAM,MAAM,GAAG,GAAG,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC;YAC7B,MAAM,MAAM,GAAG,GAAG,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC;YAC7B,IAAI,MAAM,KAAK,MAAM,EAAE,CAAC;gBACtB,SAAS;YACX,CAAC;YACD,IAAI,MAAM,IAAI,IAAI,EAAE,CAAC;gBACnB,OAAO,MAAM,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YAClD,CAAC;YACD,IAAI,MAAM,IAAI,IAAI,EAAE,CAAC;gBACnB,OAAO,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YAC7B,CAAC;YACD,MAAM,UAAU,GAAG,kBAAkB,EAAE,CACrC,KAAK,EACL,UAAU,EACV,MAAM,EACN,MAAM,CACP,CAAC;YACF,IAAI,UAAU,KAAK,SAAS,EAAE,CAAC;gBAC7B,IAAI,MAAM,GAAG,MAAM,EAAE,CAAC;oBACpB,OAAO,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;gBAC7B,CAAC;gBACD,OAAO,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YAC7B,CAAC;YACD,IAAI,UAAU,KAAK,CAAC,EAAE,CAAC;gBACrB,SAAS;YACX,CAAC;YACD,OAAO,UAAU,CAAC;QACpB,CAAC;QACD,OAAO,CAAC,CAAC;IACX,CAAC,CAAC,CAAC;AACL,CAAC"}

package/dist/types/FieldKey.d.ts

@@ -1,4 +1,4 @@
 import type { SELF } from "../constants/SELF.ts";
 import type { Key } from "./Key.ts";
 import type { Primitive } from "./Primitive";
-export type FieldKey<T> = T extends Primitive ? typeof SELF : [unknown] extends [T] ? Key : keyof T;
+export type FieldKey<T> = [unknown] extends [T] ? Key : T extends Primitive ? typeof SELF : keyof T;

package/dist/types/QuerySettings.d.ts

@@ -17,12 +17,13 @@ export type QuerySettings<T> = {
      *
      * This function is called only when both `a` and `b` are defined and different. If it returns `undefined`, the default comparison operators are used as a fallback.
      *
+     * @param field - The field for which the values are compared.
+     * @param descending - Whether the comparison is for a descending order.
      * @param a - The first value to compare.
      * @param b - The second value to compare.
-     * @param field - The field for which the values are compared.
      * @returns `-1` if `a` should be sorted before `b`, `1` if `a` should be sorted after `b`, `0` if they are considered equal, or `undefined` to use the default comparison operators.
      */
-    compareFieldValues?<T>(field: Field<T>, a: NonNullable<any>, b: NonNullable<any>): -1 | 0 | 1 | undefined;
+    compareFieldValues?<T>(field: Field<T>, descending: boolean, a: NonNullable<any>, b: NonNullable<any>): -1 | 0 | 1 | undefined;
     /**
      * Abort signal to abort the query.
      */

package/dist/types/ValueMap.d.ts

@@ -2,6 +2,6 @@ import type { Primitive } from "./Primitive";
 /**
  * Maps the properties of the provided value `T` to a specific value `V`.
  */
-export type ValueMap<T, V> = T extends Primitive ? V : T extends Array<infer P> ? Record<number, ValueMap<P, V>> : T extends object ? {
+export type ValueMap<T, V> = [unknown] extends [T] ? V : T extends Primitive ? V : T extends Array<infer P> ? Record<number, ValueMap<P, V>> : T extends object ? {
     [K in keyof T]?: ValueMap<T[K], V>;
 } : never;

package/lib/tools/comparatorFieldValues.ts

@@ -23,13 +23,20 @@ export function comparatorFieldValues<T>({
   const fieldSeparatorRegexp = new RegExp(
     !pathFieldSeparatorEscape
       ? escapeRegex(pathFieldSeparator)
-      : `(?<!${escapeRegex(pathFieldSeparatorEscape)})${escapeRegex(pathFieldSeparator)}`,
+      : `(?<!(?:${escapeRegex(pathFieldSeparatorEscape)}{2})*${escapeRegex(pathFieldSeparatorEscape)})${escapeRegex(pathFieldSeparator)}`,
     "g",
   );
-  return (field, a, b) => {
+  return (field, descending, a, b) => {
     if (!sameField(field, pathField)) {
       return undefined;
     }
+    // Parents should always appear before their children, regardless of the order direction
+    if ((a as string).startsWith(`${b}${pathFieldSeparator}`)) {
+      return 1;
+    }
+    if ((b as string).startsWith(`${a}${pathFieldSeparator}`)) {
+      return -1;
+    }
     const normalizedA = (a as string).replaceAll?.(
       fieldSeparatorRegexp,
       "\x00",
@@ -39,8 +46,8 @@ export function comparatorFieldValues<T>({
       "\x00",
     );
     if (normalizedA > normalizedB) {
-      return 1;
+      return descending ? -1 : 1;
     }
-    return -1;
+    return descending ? 1 : -1;
   };
 }

package/lib/tools/normalizeOrder.ts

@@ -18,5 +18,5 @@ export function normalizeOrder<T>(order: Order<T>): {
       descending: false,
     };
   }
-  return order;
+  return order as ReturnType<typeof normalizeOrder<T>>;
 }

package/lib/tools/sortItemList.test.ts

@@ -143,3 +143,61 @@ test("sorts items with separator setting", () => {
     { path: "a\\.b.c" },
   ]);
 });
+
+test("sorts trees appropriately", () => {
+  expect(
+    sortItemList(
+      [{ descending: false, field: "path" }],
+      [
+        { path: "a" },
+        { path: "a/b" },
+        { path: "a/c" },
+        { path: "a.b" },
+        { path: "a/b/c" },
+        { path: "a.b.c" },
+        { path: "a/b.c" },
+        { path: "a\\/b.c" },
+        { path: "a.b/c" },
+      ],
+      querySettings(),
+    ),
+  ).toEqual([
+    { path: "a" },
+    { path: "a/b" },
+    { path: "a/b/c" },
+    { path: "a/b.c" },
+    { path: "a/c" },
+    { path: "a.b" },
+    { path: "a.b/c" },
+    { path: "a.b.c" },
+    { path: "a\\/b.c" },
+  ]);
+
+  expect(
+    sortItemList(
+      [{ descending: true, field: "path" }],
+      [
+        { path: "a" },
+        { path: "a/c" },
+        { path: "a/b" },
+        { path: "a.b" },
+        { path: "a/b/c" },
+        { path: "a.b.c" },
+        { path: "a/b.c" },
+        { path: "a\\/b.c" },
+        { path: "a.b/c" },
+      ],
+      querySettings(),
+    ),
+  ).toEqual([
+    { path: "a\\/b.c" },
+    { path: "a.b.c" },
+    { path: "a.b" },
+    { path: "a.b/c" },
+    { path: "a" },
+    { path: "a/c" },
+    { path: "a/b.c" },
+    { path: "a/b" },
+    { path: "a/b/c" },
+  ]);
+});

package/lib/tools/sortItemList.ts

@@ -25,7 +25,7 @@ export function sortItemList<T>(
   const normalizedOrder = orderList.map(normalizeOrder);
   return value.toSorted((a, b) => {
     for (let index = 0; index < normalizedOrder.length; index++) {
-      const { field, descending } = normalizedOrder[index]!;
+      const { field, descending = false } = normalizedOrder[index]!;
       const valueA = get(a, field);
       const valueB = get(b, field);
       if (valueA === valueB) {
@@ -37,7 +37,12 @@ export function sortItemList<T>(
       if (valueB == null) {
         return descending ? -1 : 1;
       }
-      const comparison = compareFieldValues?.(field, valueA, valueB);
+      const comparison = compareFieldValues?.(
+        field,
+        descending,
+        valueA,
+        valueB,
+      );
       if (comparison === undefined) {
         if (valueA > valueB) {
           return descending ? -1 : 1;
@@ -47,7 +52,7 @@ export function sortItemList<T>(
       if (comparison === 0) {
         continue;
       }
-      return descending ? -comparison : comparison;
+      return comparison;
     }
     return 0;
   });

package/lib/types/FieldKey.ts

@@ -3,8 +3,8 @@ import type { SELF } from "../constants/SELF.ts";
 import type { Key } from "./Key.ts";
 import type { Primitive } from "./Primitive";
 
-export type FieldKey<T> = T extends Primitive
-  ? typeof SELF
-  : [unknown] extends [T]
-    ? Key
+export type FieldKey<T> = [unknown] extends [T]
+  ? Key
+  : T extends Primitive
+    ? typeof SELF
     : keyof T;

package/lib/types/QuerySettings.ts

@@ -18,13 +18,15 @@ export type QuerySettings<T> = {
    *
    * This function is called only when both `a` and `b` are defined and different. If it returns `undefined`, the default comparison operators are used as a fallback.
    *
+   * @param field - The field for which the values are compared.
+   * @param descending - Whether the comparison is for a descending order.
    * @param a - The first value to compare.
    * @param b - The second value to compare.
-   * @param field - The field for which the values are compared.
    * @returns `-1` if `a` should be sorted before `b`, `1` if `a` should be sorted after `b`, `0` if they are considered equal, or `undefined` to use the default comparison operators.
    */
   compareFieldValues?<T>(
     field: Field<T>,
+    descending: boolean,
     a: NonNullable<any>,
     b: NonNullable<any>,
   ): -1 | 0 | 1 | undefined;

package/lib/types/ValueMap.ts

@@ -3,12 +3,14 @@ import type { Primitive } from "./Primitive";
 /**
  * Maps the properties of the provided value `T` to a specific value `V`.
  */
-export type ValueMap<T, V> = T extends Primitive
+export type ValueMap<T, V> = [unknown] extends [T]
   ? V
-  : T extends Array<infer P>
-    ? Record<number, ValueMap<P, V>>
-    : T extends object
-      ? {
-          [K in keyof T]?: ValueMap<T[K], V>;
-        }
-      : never;
+  : T extends Primitive
+    ? V
+    : T extends Array<infer P>
+      ? Record<number, ValueMap<P, V>>
+      : T extends object
+        ? {
+            [K in keyof T]?: ValueMap<T[K], V>;
+          }
+        : never;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "quetch",
-  "version": "0.32.2",
+  "version": "0.33.0",
   "type": "module",
   "main": "./dist/main.js",
   "exports": {