@open-mercato/shared 0.6.8-develop.6878.1.ab817e58ac → 0.6.8-develop.6879.1.9883cf6265

package/dist/lib/crud/factory.js

@@ -54,10 +54,11 @@ import { registerOptimisticLockReaderIfAbsent } from "./optimistic-lock-store.js
 import { createLogger } from "../logger/index.js";
 import { isTransientDbError } from "../db/pg-errors.js";
 const logger = createLogger("shared").child({ component: "crud" });
-function resolveSortParams(queryParams) {
-  const rawSortField = queryParams.sortField ?? queryParams.sort ?? "id";
-  const rawSortDir = queryParams.sortDir ?? queryParams.order ?? "asc";
-  const sortField = typeof rawSortField === "string" && rawSortField.trim().length > 0 ? rawSortField.trim() : "id";
+function resolveSortParams(queryParams, defaultSort) {
+  const rawSortField = queryParams.sortField ?? queryParams.sort;
+  const requestedSortField = typeof rawSortField === "string" && rawSortField.trim().length > 0 ? rawSortField.trim() : null;
+  const sortField = requestedSortField ?? defaultSort?.field ?? "id";
+  const rawSortDir = queryParams.sortDir ?? queryParams.order ?? (requestedSortField ? "asc" : defaultSort?.dir ?? "asc");
   const normalizedDir = typeof rawSortDir === "string" ? rawSortDir.trim().toLowerCase() : "asc";
   const sortDir = normalizedDir === "desc" ? SortDir.Desc : SortDir.Asc;
   return { sortField, sortDir };
@@ -1167,10 +1168,21 @@ function makeCrudRoute(opts) {
         profiler.mark("query_engine_prepare");
         const qe = ctx.container.resolve("queryEngine");
         profiler.mark("query_engine_resolved");
-        const { sortField: sortFieldRaw, sortDir: sortDirRaw } = resolveSortParams(queryParams);
-        const mappedSortField = opts.list.sortFieldMap && opts.list.sortFieldMap[sortFieldRaw] || sortFieldRaw;
-        const sortField = typeof mappedSortField === "string" ? normalizeSortFieldSelector(mappedSortField) : mappedSortField;
+        const sortFieldMap = opts.list.sortFieldMap;
+        const resolveSortSelector = (field) => {
+          const mapped = sortFieldMap && sortFieldMap[field] || field;
+          return typeof mapped === "string" ? normalizeSortFieldSelector(mapped) : mapped;
+        };
+        const { sortField: sortFieldRaw, sortDir: sortDirRaw } = resolveSortParams(
+          queryParams,
+          opts.list.defaultSort
+        );
+        const sortField = resolveSortSelector(sortFieldRaw);
         const sort = [{ field: sortField, dir: sortDirRaw }];
+        if (opts.list.tiebreakSortField) {
+          const tiebreakField = resolveSortSelector(opts.list.tiebreakSortField);
+          if (tiebreakField !== sortField) sort.push({ field: tiebreakField, dir: SortDir.Asc });
+        }
         const page = exportRequested ? { page: 1, pageSize: exportPageSize } : { page: requestedPage, pageSize: requestedPageSize };
         const baseFilters = exportFullRequested ? {} : opts.list.buildFilters ? await opts.list.buildFilters(validated, ctx) : {};
         const filters = exportFullRequested ? baseFilters : mergeAdvancedFilters(baseFilters, validated);