@sanity/client 7.11.2-audience-decide.0 → 7.11.2-audience-decide.2

package/package.json

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

package/src/SanityClient.ts

@@ -225,6 +225,19 @@ export class ObservableSanityClient {
     params?: Q,
     options?: QueryOptions,
   ): Observable<RawQueryResponse<R> | R> {
+    // Log the public API call to track parameter flow
+    // eslint-disable-next-line no-console
+    console.log('ObservableSanityClient.fetch called with:', {
+      query: query.substring(0, 100) + (query.length > 100 ? '...' : ''),
+      params,
+      options: {
+        ...options,
+        decideParameters: options?.decideParameters,
+      },
+      clientConfig: {
+        decideParameters: this.#clientConfig.decideParameters,
+      },
+    })
     return dataMethods._fetch<R, Q>(
       this,
       this.#httpRequest,
@@ -1272,6 +1285,19 @@ export class SanityClient {
     params?: Q,
     options?: QueryOptions,
   ): Promise<RawQueryResponse<ClientReturn<G, R>> | ClientReturn<G, R>> {
+    // Log the public API call to track parameter flow
+    // eslint-disable-next-line no-console
+    console.log('SanityClient.fetch called with:', {
+      query: query.substring(0, 100) + (query.length > 100 ? '...' : ''),
+      params,
+      options: {
+        ...options,
+        decideParameters: options?.decideParameters,
+      },
+      clientConfig: {
+        decideParameters: this.#clientConfig.decideParameters,
+      },
+    })
     return lastValueFrom(
       dataMethods._fetch<ClientReturn<G, R>, Q>(
         this,

package/src/data/dataMethods.ts

@@ -87,6 +87,17 @@ export function _fetch<R, Q>(
   _params: Q = {} as Q,
   options: QueryOptions = {},
 ): Observable<RawQueryResponse<R> | R> {
+  // Entry logging to track all incoming parameters
+  // eslint-disable-next-line no-console
+  console.log('_fetch called with:', {
+    query: query.substring(0, 100) + (query.length > 100 ? '...' : ''),
+    params: _params,
+    options: {
+      ...options,
+      decideParameters: options.decideParameters,
+    },
+    stegaEnabled: _stega?.enabled,
+  })
   const stega =
     'stega' in options
       ? {
@@ -100,7 +111,17 @@ export function _fetch<R, Q>(
 
   // Helper function to apply decide processing to response data
   const processDecideResponse = (response: Any): Any => {
+    // eslint-disable-next-line no-console
+    console.log('inside processDecideResponse:', {
+      audience: options.decideParameters?.audience,
+      decideParameters: options.decideParameters?.audience,
+    })
     if (options.decideParameters && options.decideParameters.audience) {
+      // eslint-disable-next-line no-console
+      console.log('Processing response with decideParameters:', {
+        audience: options.decideParameters.audience,
+        decideParameters: options.decideParameters,
+      })
       const processedData = processDecideFields(response, options.decideParameters)
       return processedData
     }
@@ -489,6 +510,20 @@ export function _dataRequest(
   body: Any,
   options: Any = {},
 ): Any {
+  // Log dataRequest call to trace options preservation
+  // eslint-disable-next-line no-console
+  console.log('_dataRequest called with:', {
+    endpoint,
+    body: endpoint === 'query' ? {
+      query: body.query?.substring(0, 100) + (body.query?.length > 100 ? '...' : ''),
+      params: body.params,
+    } : body,
+    options: {
+      ...options,
+      decideParameters: options.decideParameters,
+      perspective: options.perspective,
+    },
+  })
   const isMutation = endpoint === 'mutate'
   const isAction = endpoint === 'actions'
   const isQuery = endpoint === 'query'
@@ -526,6 +561,22 @@ export function _dataRequest(
     useCdn: options.useCdn,
   }
 
+  // Log request options before calling _requestObservable
+  // eslint-disable-next-line no-console
+  console.log('_dataRequest calling _requestObservable with reqOptions:', {
+    ...reqOptions,
+    decideParameters: reqOptions.decideParameters,
+    perspective: reqOptions.perspective,
+    body: useGet
+      ? undefined
+      : endpoint === 'query'
+        ? {
+            query: body.query?.substring(0, 100) + (body.query?.length > 100 ? '...' : ''),
+            params: body.params,
+          }
+        : body,
+  })
+
   return _requestObservable(client, httpRequest, reqOptions).pipe(
     filter(isResponse),
     map(getBody),
@@ -609,6 +660,17 @@ export function _requestObservable<R>(
   const uri = options.url || (options.uri as string)
   const config = client.config()
 
+  // Log entry to _requestObservable to track parameter flow
+  // eslint-disable-next-line no-console
+  console.log('_requestObservable called with options:', {
+    uri,
+    method: options.method,
+    decideParameters: options.decideParameters,
+    perspective: options.perspective,
+    query: options.query,
+    configDecideParameters: config.decideParameters,
+  })
+
   // If the `canUseCdn`-option is not set we detect it automatically based on the method + URL.
   // Only the /data endpoint is currently available through API-CDN.
   const canUseCdn =
@@ -660,19 +722,44 @@ export function _requestObservable<R>(
 
     // Process decideParameters
     const decideParametersOption = options.decideParameters || config.decideParameters
+    // eslint-disable-next-line no-console
+    console.log('Processing decideParameters:', {
+      optionsDecideParameters: options.decideParameters,
+      configDecideParameters: config.decideParameters,
+      finalDecideParametersOption: decideParametersOption,
+    })
+
     if (decideParametersOption && typeof decideParametersOption === 'object') {
+      // eslint-disable-next-line no-console
+      console.log('DecideParameters received, transforming to query params:', decideParametersOption)
+
       // Add decide parameters to query string
+      const decideQueryParams = Object.keys(decideParametersOption).reduce(
+        (acc, key) => {
+          // Prefix decide parameters to avoid conflicts
+          acc[`decide.${key}`] = decideParametersOption[key]
+          return acc
+        },
+        {} as Record<string, unknown>,
+      )
+
+      // eslint-disable-next-line no-console
+      console.log('DecideParameters transformed to query params:', decideQueryParams)
+
+      const oldQuery = options.query
       options.query = {
         ...options.query,
-        ...Object.keys(decideParametersOption).reduce(
-          (acc, key) => {
-            // Prefix decide parameters to avoid conflicts
-            acc[`decide.${key}`] = decideParametersOption[key]
-            return acc
-          },
-          {} as Record<string, unknown>,
-        ),
+        ...decideQueryParams,
       }
+
+      // eslint-disable-next-line no-console
+      console.log('Updated query object:', {
+        oldQuery,
+        newQuery: options.query,
+      })
+    } else {
+      // eslint-disable-next-line no-console
+      console.log('No decideParameters to process or invalid format')
     }
 
     if (options.lastLiveEventId) {
@@ -688,12 +775,29 @@ export function _requestObservable<R>(
     }
   }
 
-  const reqOptions = requestOptions(
-    config,
-    Object.assign({}, options, {
-      url: _getUrl(client, uri, useCdn),
-    }),
-  ) as RequestOptions
+  const finalOptions = Object.assign({}, options, {
+    url: _getUrl(client, uri, useCdn),
+  })
+
+  // Log final options before calling requestOptions
+  // eslint-disable-next-line no-console
+  console.log('Final options before requestOptions call:', {
+    url: finalOptions.url,
+    decideParameters: finalOptions.decideParameters,
+    query: finalOptions.query,
+    method: finalOptions.method,
+  })
+
+  const reqOptions = requestOptions(config, finalOptions) as RequestOptions
+
+  // Log final reqOptions that will be used for HTTP request
+  // eslint-disable-next-line no-console
+  console.log('Final reqOptions from requestOptions:', {
+    method: reqOptions.method,
+    headers: reqOptions.headers,
+    query: reqOptions.query,
+    // Note: URL is handled separately in the HTTP request
+  })
 
   const request = new Observable<HttpRequestEvent<R>>((subscriber) =>
     httpRequest(reqOptions, config.requester!).subscribe(subscriber),

package/src/data/decideResponseProcessor.ts

@@ -100,6 +100,9 @@ export function processDecideFields(data: unknown, decideParameters: DecideParam
     return data
   }
 
+  // eslint-disable-next-line no-console
+  console.log('Starting decide field processing with parameters:', decideParameters)
+
   try {
     return processObjectRecursively(data, decideParameters)
   } catch (error) {

package/umd/sanityClient.js

@@ -2833,6 +2833,7 @@ ${selectionOpts}`);
   function processDecideFields(data, decideParameters) {
     if (!decideParameters || !decideParameters.audience)
       return data;
+    console.log("Starting decide field processing with parameters:", decideParameters);
     try {
       return processObjectRecursively(data, decideParameters);
     } catch (error) {
@@ -2860,10 +2861,25 @@ ${selectionOpts}`);
     skipCrossDatasetReferenceValidation: options.skipCrossDatasetReferenceValidation
   }), isResponse = (event) => event.type === "response", getBody = (event) => event.body, indexBy = (docs, attr) => docs.reduce((indexed, doc) => (indexed[attr(doc)] = doc, indexed), /* @__PURE__ */ Object.create(null)), getQuerySizeLimit = 11264;
   function _fetch(client, httpRequest, _stega, query, _params = {}, options = {}) {
+    console.log("_fetch called with:", {
+      query: query.substring(0, 100) + (query.length > 100 ? "..." : ""),
+      params: _params,
+      options: {
+        ...options,
+        decideParameters: options.decideParameters
+      },
+      stegaEnabled: _stega?.enabled
+    });
     const stega = "stega" in options ? {
       ..._stega || {},
       ...typeof options.stega == "boolean" ? { enabled: options.stega } : options.stega || {}
-    } : _stega, params = stega.enabled ? stegaClean(_params) : _params, mapResponse = options.filterResponse === false ? (res) => res : (res) => res.result, processDecideResponse = (response) => options.decideParameters && options.decideParameters.audience ? processDecideFields(response, options.decideParameters) : response, { cache, next, ...opts } = {
+    } : _stega, params = stega.enabled ? stegaClean(_params) : _params, mapResponse = options.filterResponse === false ? (res) => res : (res) => res.result, processDecideResponse = (response) => (console.log("inside processDecideResponse:", {
+      audience: options.decideParameters?.audience,
+      decideParameters: options.decideParameters?.audience
+    }), options.decideParameters && options.decideParameters.audience ? (console.log("Processing response with decideParameters:", {
+      audience: options.decideParameters.audience,
+      decideParameters: options.decideParameters
+    }), processDecideFields(response, options.decideParameters)) : response), { cache, next, ...opts } = {
       // Opt out of setting a `signal` on an internal `fetch` if one isn't provided.
       // This is necessary in React Server Components to avoid opting out of Request Memoization.
       useAbortSignal: typeof options.signal < "u",
@@ -3031,6 +3047,18 @@ ${selectionOpts}`);
     );
   }
   function _dataRequest(client, httpRequest, endpoint, body, options = {}) {
+    console.log("_dataRequest called with:", {
+      endpoint,
+      body: endpoint === "query" ? {
+        query: body.query?.substring(0, 100) + (body.query?.length > 100 ? "..." : ""),
+        params: body.params
+      } : body,
+      options: {
+        ...options,
+        decideParameters: options.decideParameters,
+        perspective: options.perspective
+      }
+    });
     const isMutation = endpoint === "mutate", isAction = endpoint === "actions", isQuery2 = endpoint === "query", strQuery = isMutation || isAction ? "" : encodeQueryString(body), useGet = !isMutation && !isAction && strQuery.length < getQuerySizeLimit, stringQuery = useGet ? strQuery : "", returnFirst = options.returnFirst, { timeout, token, tag, headers, returnQuery, lastLiveEventId, cacheMode } = options, uri = _getDataUrl(client, endpoint, stringQuery), reqOptions = {
       method: useGet ? "GET" : "POST",
       uri,
@@ -3053,7 +3081,15 @@ ${selectionOpts}`);
       useAbortSignal: options.useAbortSignal,
       useCdn: options.useCdn
     };
-    return _requestObservable(client, httpRequest, reqOptions).pipe(
+    return console.log("_dataRequest calling _requestObservable with reqOptions:", {
+      ...reqOptions,
+      decideParameters: reqOptions.decideParameters,
+      perspective: reqOptions.perspective,
+      body: useGet ? void 0 : endpoint === "query" ? {
+        query: body.query?.substring(0, 100) + (body.query?.length > 100 ? "..." : ""),
+        params: body.params
+      } : body
+    }), _requestObservable(client, httpRequest, reqOptions).pipe(
       filter(isResponse),
       map(getBody),
       map((res) => {
@@ -3077,7 +3113,16 @@ ${selectionOpts}`);
   }
   const hasDataConfig = (client) => client.config().dataset !== void 0 && client.config().projectId !== void 0 || client.config()["~experimental_resource"] !== void 0, isQuery = (client, uri) => hasDataConfig(client) && uri.startsWith(_getDataUrl(client, "query")), isMutate = (client, uri) => hasDataConfig(client) && uri.startsWith(_getDataUrl(client, "mutate")), isDoc = (client, uri) => hasDataConfig(client) && uri.startsWith(_getDataUrl(client, "doc", "")), isListener = (client, uri) => hasDataConfig(client) && uri.startsWith(_getDataUrl(client, "listen")), isHistory = (client, uri) => hasDataConfig(client) && uri.startsWith(_getDataUrl(client, "history", "")), isData = (client, uri) => uri.startsWith("/data/") || isQuery(client, uri) || isMutate(client, uri) || isDoc(client, uri) || isListener(client, uri) || isHistory(client, uri);
   function _requestObservable(client, httpRequest, options) {
-    const uri = options.url || options.uri, config = client.config(), canUseCdn = typeof options.canUseCdn > "u" ? ["GET", "HEAD"].indexOf(options.method || "GET") >= 0 && isData(client, uri) : options.canUseCdn;
+    const uri = options.url || options.uri, config = client.config();
+    console.log("_requestObservable called with options:", {
+      uri,
+      method: options.method,
+      decideParameters: options.decideParameters,
+      perspective: options.perspective,
+      query: options.query,
+      configDecideParameters: config.decideParameters
+    });
+    const canUseCdn = typeof options.canUseCdn > "u" ? ["GET", "HEAD"].indexOf(options.method || "GET") >= 0 && isData(client, uri) : options.canUseCdn;
     let useCdn = (options.useCdn ?? config.useCdn) && canUseCdn;
     const tag = options.tag && config.requestTagPrefix ? [config.requestTagPrefix, options.tag].join(".") : options.tag || config.requestTagPrefix;
     if (tag && options.tag !== null && (options.query = { tag: requestTag(tag), ...options.query }), ["GET", "HEAD", "POST"].indexOf(options.method || "GET") >= 0 && isQuery(client, uri)) {
@@ -3090,20 +3135,46 @@ ${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 decideParametersOption = options.decideParameters || config.decideParameters;
-      decideParametersOption && typeof decideParametersOption == "object" && (options.query = {
-        ...options.query,
-        ...Object.keys(decideParametersOption).reduce(
+      if (console.log("Processing decideParameters:", {
+        optionsDecideParameters: options.decideParameters,
+        configDecideParameters: config.decideParameters,
+        finalDecideParametersOption: decideParametersOption
+      }), decideParametersOption && typeof decideParametersOption == "object") {
+        console.log("DecideParameters received, transforming to query params:", decideParametersOption);
+        const decideQueryParams = Object.keys(decideParametersOption).reduce(
           (acc, key) => (acc[`decide.${key}`] = decideParametersOption[key], acc),
           {}
-        )
-      }), 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 });
+        );
+        console.log("DecideParameters transformed to query params:", decideQueryParams);
+        const oldQuery = options.query;
+        options.query = {
+          ...options.query,
+          ...decideQueryParams
+        }, console.log("Updated query object:", {
+          oldQuery,
+          newQuery: options.query
+        });
+      } else
+        console.log("No decideParameters to process or invalid format");
+      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,
-      Object.assign({}, options, {
-        url: _getUrl(client, uri, useCdn)
-      })
-    ), request = new Observable(
+    const finalOptions = Object.assign({}, options, {
+      url: _getUrl(client, uri, useCdn)
+    });
+    console.log("Final options before requestOptions call:", {
+      url: finalOptions.url,
+      decideParameters: finalOptions.decideParameters,
+      query: finalOptions.query,
+      method: finalOptions.method
+    });
+    const reqOptions = requestOptions(config, finalOptions);
+    console.log("Final reqOptions from requestOptions:", {
+      method: reqOptions.method,
+      headers: reqOptions.headers,
+      query: reqOptions.query
+      // Note: URL is handled separately in the HTTP request
+    });
+    const request = new Observable(
       (subscriber) => httpRequest(reqOptions, config.requester).subscribe(subscriber)
     );
     return options.signal ? request.pipe(_withAbortSignal(options.signal)) : request;
@@ -4323,7 +4394,17 @@ ${selectionOpts}`);
       });
     }
     fetch(query, params, options) {
-      return _fetch(
+      return console.log("ObservableSanityClient.fetch called with:", {
+        query: query.substring(0, 100) + (query.length > 100 ? "..." : ""),
+        params,
+        options: {
+          ...options,
+          decideParameters: options?.decideParameters
+        },
+        clientConfig: {
+          decideParameters: this.#clientConfig.decideParameters
+        }
+      }), _fetch(
         this,
         this.#httpRequest,
         this.#clientConfig.stega,
@@ -4587,7 +4668,17 @@ ${selectionOpts}`);
       });
     }
     fetch(query, params, options) {
-      return lastValueFrom(
+      return console.log("SanityClient.fetch called with:", {
+        query: query.substring(0, 100) + (query.length > 100 ? "..." : ""),
+        params,
+        options: {
+          ...options,
+          decideParameters: options?.decideParameters
+        },
+        clientConfig: {
+          decideParameters: this.#clientConfig.decideParameters
+        }
+      }), lastValueFrom(
         _fetch(
           this,
           this.#httpRequest,