@sanity/client 7.25.0 → 7.26.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sanity/client",
-  "version": "7.25.0",
+  "version": "7.26.0",
   "description": "Client for retrieving, creating and patching data from Sanity.io",
   "keywords": [
     "sanity",

package/src/data/dataMethods.ts

@@ -13,6 +13,7 @@ import type {
   Any,
   BaseActionOptions,
   BaseMutationOptions,
+  ClientVariantConditions,
   CreateVersionAction,
   DiscardVersionAction,
   FirstDocumentIdMutationOptions,
@@ -703,31 +704,17 @@ export function _requestObservable<R>(
 
     const variantOption = options.variant || config.variant
 
-    if (typeof variantOption !== 'undefined') {
-      if (typeof variantOption === 'string') {
-        options.query = {
-          variant: variantOption,
-          ...options.query,
-        }
+    if (typeof variantOption === 'string') {
+      options.query = {
+        variant: variantOption,
+        ...options.query,
       }
+    }
 
-      if (typeof variantOption === 'object') {
-        const variantConditions = Object.entries(variantOption)
-        const searchParams = variantConditionPairsToSearchParams(variantConditions).slice(0, 1)
-
-        if (variantConditions.length > 1) {
-          const formatter = new Intl.ListFormat('en')
-
-          // eslint-disable-next-line no-console -- will be removed in an upcoming version; it's better this behaviour is noisy and obvious
-          console.warn(
-            `The Sanity client's beta \`variant\` option currently only supports one condition. Dropped: ${formatter.format(variantConditions.slice(1).map(([subject]) => JSON.stringify(subject)))}.`,
-          )
-        }
-
-        options.query = {
-          ...Object.fromEntries(searchParams),
-          ...options.query,
-        }
+    if (typeof variantOption === 'object') {
+      options.query = {
+        variantCondition: variantConditionsToQueryArray(variantOption),
+        ...options.query,
       }
     }
 
@@ -875,11 +862,10 @@ const resourceDataBase = (config: InitializedClientConfig): string => {
   }
 }
 
-function variantConditionPairsToSearchParams(
-  variantConditionPairs: string[][],
-): ['variantCondition', `${string}:${string}`][] {
-  return variantConditionPairs.map(([condition, value]) => [
-    'variantCondition',
-    `${condition}:${value}`,
-  ])
+function variantConditionsToQueryArray(
+  variantConditions: ClientVariantConditions,
+): `${string}:${string}`[] {
+  return Object.entries(variantConditions)
+    .map<`${string}:${string}`>(([condition, value]) => `${condition}:${value}`)
+    .toSorted()
 }

package/umd/sanityClient.js

@@ -3146,23 +3146,13 @@ ${selectionOpts}`);
       }, (Array.isArray(perspectiveOption) && perspectiveOption.length > 0 || // previewDrafts was renamed to drafts, but keep for backwards compat
       perspectiveOption === "previewDrafts" || perspectiveOption === "drafts") && useCdn && (useCdn = false, printCdnPreviewDraftsWarning()));
       const variantOption = options.variant || config.variant;
-      if (typeof variantOption < "u" && (typeof variantOption == "string" && (options.query = {
+      typeof variantOption == "string" && (options.query = {
         variant: variantOption,
         ...options.query
-      }), typeof variantOption == "object")) {
-        const variantConditions = Object.entries(variantOption), searchParams = variantConditionPairsToSearchParams(variantConditions).slice(0, 1);
-        if (variantConditions.length > 1) {
-          const formatter = new Intl.ListFormat("en");
-          console.warn(
-            `The Sanity client's beta \`variant\` option currently only supports one condition. Dropped: ${formatter.format(variantConditions.slice(1).map(([subject]) => JSON.stringify(subject)))}.`
-          );
-        }
-        options.query = {
-          ...Object.fromEntries(searchParams),
-          ...options.query
-        };
-      }
-      options.lastLiveEventId && (options.query = { ...options.query, lastLiveEventId: options.lastLiveEventId }), options.returnQuery === false && (options.query = { returnQuery: "false", ...options.query }), useCdn && options.cacheMode == "noStale" && (options.query = { cacheMode: "noStale", ...options.query });
+      }), typeof variantOption == "object" && (options.query = {
+        variantCondition: variantConditionsToQueryArray(variantOption),
+        ...options.query
+      }), options.lastLiveEventId && (options.query = { ...options.query, lastLiveEventId: options.lastLiveEventId }), options.returnQuery === false && (options.query = { returnQuery: "false", ...options.query }), useCdn && options.cacheMode == "noStale" && (options.query = { cacheMode: "noStale", ...options.query });
     }
     const reqOptions = requestOptions(
       config,
@@ -3237,11 +3227,8 @@ ${selectionOpts}`);
         throw new Error(`Unsupported resource type: ${type.toString()}`);
     }
   };
-  function variantConditionPairsToSearchParams(variantConditionPairs) {
-    return variantConditionPairs.map(([condition, value]) => [
-      "variantCondition",
-      `${condition}:${value}`
-    ]);
+  function variantConditionsToQueryArray(variantConditions) {
+    return Object.entries(variantConditions).map(([condition, value]) => `${condition}:${value}`).toSorted();
   }
   function _generate(client, httpRequest, request) {
     const dataset2 = hasDataset(client.config());