sanity 5.17.0-next.21 → 5.17.0-next.23

package/lib/_chunks-dts/ActiveWorkspaceMatcherContext.d.ts

@@ -4701,6 +4701,17 @@ type SearchSort = {
   direction: SortDirection;
   field: string;
   mapWith?: string;
+  /**
+   * Controls whether null/undefined values appear first or last in the sort order.
+   *
+   * Defaults match PostgreSQL behavior:
+   * - `'desc'` direction → nulls first
+   * - `'asc'` direction → nulls last
+   *
+   * **Note:** Overriding the default may have performance implications for document types
+   * with lots of documents.
+   */
+  nulls?: 'first' | 'last';
 };
 /**
  * Get all defined document types from the schema that are searchable

package/lib/_chunks-es/version.js

@@ -1,4 +1,4 @@
-var version = "5.17.0-next.21+404c4559e9";
+var version = "5.17.0-next.23+3534755c28";
 let buildVersion;
 try {
   buildVersion = process.env.PKG_BUILD_VERSION;
@@ -7,7 +7,7 @@ try {
 try {
   buildVersion = buildVersion || // This is replaced by `@sanity/pkg-utils` at build time
   // and must always be references by its full static name, e.g. no optional chaining, no `if (process && process.env)` etc.
-  "5.17.0-next.21+404c4559e9";
+  "5.17.0-next.23+3534755c28";
 } catch {
 }
 const SANITY_VERSION = buildVersion || `${version}-dev`;

package/lib/index.js

@@ -18656,16 +18656,30 @@ function prefixLast(query) {
   const prefixedTokens = [...tokens];
   return prefixedTokens.splice(finalIncrementalTokenIndex, 1, `${finalIncrementalToken}*`), prefixedTokens.join(" ");
 }
+function getNullSortingPrefix(ordering) {
+  const {
+    direction,
+    nulls,
+    field
+  } = ordering;
+  if (!nulls) return;
+  const dirLower = (direction || "asc").toLowerCase();
+  if (dirLower === "desc" && nulls === "last" || dirLower === "asc" && nulls === "first")
+    return nulls === "last" ? `select(defined(${field}) => 0, 1)` : `select(defined(${field}) => 1, 0)`;
+}
+function wrapFieldWithFn(ordering) {
+  return ordering.mapWith ? `${ordering.mapWith}(${ordering.field})` : ordering.field;
+}
+function toOrderClause(orderBy2) {
+  return (orderBy2 || []).flatMap((ordering) => {
+    const nullPrefix = getNullSortingPrefix(ordering), fieldClause = [wrapFieldWithFn(ordering), (ordering.direction || "").toLowerCase()].map((str) => str.trim()).filter(Boolean).join(" ");
+    return nullPrefix ? [nullPrefix, fieldClause] : [fieldClause];
+  }).join(",");
+}
 const FINDABILITY_MVI$1 = 5, DEFAULT_LIMIT$1 = 1e3;
 function isSchemaType(maybeSchemaType) {
   return typeof maybeSchemaType < "u" && "name" in maybeSchemaType;
 }
-function toOrderClause$1(orderBy2) {
-  function wrapFieldWithFn(ordering) {
-    return ordering.mapWith ? `${ordering.mapWith}(${ordering.field})` : ordering.field;
-  }
-  return (orderBy2 || []).map((ordering) => [wrapFieldWithFn(ordering), (ordering.direction || "").toLowerCase()].map((str) => str.trim()).filter(Boolean).join(" ")).join(",");
-}
 function createSearchQuery$1(searchTerms, searchParams, {
   perspective,
   sort,
@@ -18709,7 +18723,7 @@ function createSearchQuery$1(searchTerms, searchParams, {
     cursor ?? []
   ].flat(), projection = sortOrder.map(({
     field
-  }) => field).concat("_type", "_id", "_originalId").join(", "), query = [`*[${filters.join(" && ")}]`, isScored ? ["|", `score(${score.join(", ")})`] : [], ["|", `order(${toOrderClause$1(sortOrder)})`], isScored ? "[_score > 0]" : [], "[0...$__limit]", `{${projection}}`].flat().join(" "), rawQuery = typeof searchParams == "string" ? searchParams : searchParams.query, finalParams = {
+  }) => field).concat("_type", "_id", "_originalId").join(", "), query = [`*[${filters.join(" && ")}]`, isScored ? ["|", `score(${score.join(", ")})`] : [], ["|", `order(${toOrderClause(sortOrder)})`], isScored ? "[_score > 0]" : [], "[0...$__limit]", `{${projection}}`].flat().join(" "), rawQuery = typeof searchParams == "string" ? searchParams : searchParams.query, finalParams = {
     __types: searchTerms.types.map((type) => isSchemaType(type) ? type.name : type.type),
     // Overfetch by 1 to determine whether there is another page to fetch.
     __limit: (limit2 ?? DEFAULT_LIMIT$1) + 1,
@@ -18859,12 +18873,6 @@ function extractTermsFromQuery(query) {
   const quotedQueries = [], unquotedQuery = query.replace(/("[^"]*")/g, (match) => words(match).length > 1 ? (quotedQueries.push(match), "") : match), quotedTerms = quotedQueries.map((str) => trim(toLower(str))), remainingTerms = uniq(compact(tokenize(toLower(unquotedQuery))));
   return [...quotedTerms, ...remainingTerms];
 }
-function toOrderClause(orderBy2) {
-  function wrapFieldWithFn(ordering) {
-    return ordering.mapWith ? `${ordering.mapWith}(${ordering.field})` : ordering.field;
-  }
-  return (orderBy2 || []).map((ordering) => [wrapFieldWithFn(ordering), (ordering.direction || "").toLowerCase()].map((str) => str.trim()).filter(Boolean).join(" ")).join(",");
-}
 function createSearchQuery(searchTerms, searchOpts = {}) {
   const {
     filter: filter2,