@sanity/client 7.20.0 → 7.22.0

package/dist/index.cjs

@@ -99,6 +99,7 @@ class ClientError extends Error {
   response;
   statusCode = 400;
   responseBody;
+  traceId;
   details;
   constructor(res, context) {
     const props = extractErrorProps(res, context);
@@ -109,6 +110,7 @@ class ServerError extends Error {
   response;
   statusCode = 500;
   responseBody;
+  traceId;
   details;
   constructor(res) {
     const props = extractErrorProps(res);
@@ -120,29 +122,30 @@ function extractErrorProps(res, context) {
     response: res,
     statusCode: res.statusCode,
     responseBody: stringifyBody(body, res),
+    traceId: extractTraceId(res),
     message: "",
     details: void 0
   };
   if (!isRecord.isRecord(body))
-    return props.message = httpErrorMessage(res, body), props;
+    return props.message = `${httpErrorMessage(res, body)}${formatTraceId(props.traceId)}`, props;
   const error = body.error;
   if (typeof error == "string" && typeof body.message == "string")
-    return props.message = `${error} - ${body.message}`, props;
+    return props.message = `${error} - ${body.message}${formatTraceId(props.traceId)}`, props;
   if (typeof error != "object" || error === null)
-    return typeof error == "string" ? props.message = error : typeof body.message == "string" ? props.message = body.message : props.message = httpErrorMessage(res, body), props;
+    return typeof error == "string" ? props.message = `${error}${formatTraceId(props.traceId)}` : typeof body.message == "string" ? props.message = `${body.message}${formatTraceId(props.traceId)}` : props.message = `${httpErrorMessage(res, body)}${formatTraceId(props.traceId)}`, props;
   if (isMutationError(error) || isActionError(error)) {
     const allItems = error.items || [], items = allItems.slice(0, MAX_ITEMS_IN_ERROR_MESSAGE).map((item) => item.error?.description).filter(Boolean);
     let itemsStr = items.length ? `:
 - ${items.join(`
 - `)}` : "";
     return allItems.length > MAX_ITEMS_IN_ERROR_MESSAGE && (itemsStr += `
-...and ${allItems.length - MAX_ITEMS_IN_ERROR_MESSAGE} more`), props.message = `${error.description}${itemsStr}`, props.details = body.error, props;
+...and ${allItems.length - MAX_ITEMS_IN_ERROR_MESSAGE} more`), props.message = `${error.description}${formatTraceId(props.traceId)}${itemsStr}`, props.details = body.error, props;
   }
   if (isQueryParseError(error)) {
     const tag = context?.options?.query?.tag;
-    return props.message = formatQueryParseError(error, tag), props.details = body.error, props;
+    return props.message = formatQueryParseError(error, tag, props.traceId), props.details = body.error, props;
   }
-  return "description" in error && typeof error.description == "string" ? (props.message = error.description, props.details = error, props) : (props.message = httpErrorMessage(res, body), props);
+  return "description" in error && typeof error.description == "string" ? (props.message = `${error.description}${formatTraceId(props.traceId)}`, props.details = error, props) : (props.message = `${httpErrorMessage(res, body)}${formatTraceId(props.traceId)}`, props);
 }
 function isMutationError(error) {
   return "type" in error && error.type === "mutationError" && "description" in error && typeof error.description == "string";
@@ -153,23 +156,32 @@ function isActionError(error) {
 function isQueryParseError(error) {
   return isRecord.isRecord(error) && error.type === "queryParseError" && typeof error.query == "string" && typeof error.start == "number" && typeof error.end == "number";
 }
-function formatQueryParseError(error, tag) {
-  const { query, start, end, description } = error;
+function formatQueryParseError(error, tag, traceId) {
+  const { query, start, end, description } = error, withTraceId = traceId ? `
+(traceId: ${traceId})` : "";
   if (!query || typeof start > "u")
-    return `GROQ query parse error: ${description}`;
+    return `GROQ query parse error: ${description}${withTraceId}`;
   const withTag = tag ? `
 
 Tag: ${tag}` : "";
   return `GROQ query parse error:
-${codeFrame(query, { start, end }, description)}${withTag}`;
+${codeFrame(query, { start, end }, description)}${withTag}${withTraceId}`;
 }
 function httpErrorMessage(res, body) {
   const details = typeof body == "string" ? ` (${sliceWithEllipsis(body, 100)})` : "", statusMessage = res.statusMessage ? ` ${res.statusMessage}` : "";
   return `${res.method}-request to ${res.url} resulted in HTTP ${res.statusCode}${statusMessage}${details}`;
 }
+function extractTraceId(res) {
+  const traceparent = res?.headers?.traceparent;
+  if (traceparent)
+    return traceparent.split("-")[1];
+}
 function stringifyBody(body, res) {
   return (res.headers["content-type"] || "").toLowerCase().indexOf("application/json") !== -1 ? JSON.stringify(body, null, 2) : body;
 }
+function formatTraceId(traceId) {
+  return traceId ? ` (traceId: ${traceId})` : "";
+}
 function sliceWithEllipsis(str, max) {
   return str.length > max ? `${str.slice(0, max)}\u2026` : str;
 }
@@ -1283,7 +1295,8 @@ class LiveClient {
    */
   events({
     includeDrafts = !1,
-    tag: _tag
+    tag: _tag,
+    waitFor
   } = {}) {
     const {
       projectId,
@@ -1302,7 +1315,7 @@ class LiveClient {
         "The live events API requires a token or withCredentials when 'includeDrafts: true'. Please update your client configuration. The token should have the lowest possible access role."
       );
     const path = _getDataUrl(this.#client, "live/events"), url = new URL(this.#client.getUrl(path, !1)), tag = _tag && requestTagPrefix ? [requestTagPrefix, _tag].join(".") : _tag;
-    tag && url.searchParams.set("tag", tag), includeDrafts && url.searchParams.set("includeDrafts", "true");
+    tag && url.searchParams.set("tag", tag), includeDrafts && url.searchParams.set("includeDrafts", "true"), waitFor && url.searchParams.set("waitFor", waitFor);
     const esOptions = {};
     includeDrafts && withCredentials && (esOptions.withCredentials = !0), (includeDrafts && token || configHeaders) && (esOptions.headers = {}, includeDrafts && token && (esOptions.headers.Authorization = `Bearer ${token}`), configHeaders && Object.assign(esOptions.headers, configHeaders));
     const key = `${url.href}::${JSON.stringify(esOptions)}`, existing = eventsCache.get(key);
@@ -2200,13 +2213,22 @@ class ObservableSanityClient {
    * Private properties
    */
   #clientConfig;
+  #originalHttpRequest;
   #httpRequest;
   /**
    * Instance properties
    */
   listen = _listen;
   constructor(httpRequest, config$1 = config.defaultConfig) {
-    this.config(config$1), this.#httpRequest = httpRequest, this.assets = new ObservableAssetsClient(this, this.#httpRequest), this.datasets = new ObservableDatasetsClient(this, this.#httpRequest), this.live = new LiveClient(this), this.mediaLibrary = {
+    this.config(config$1), this.#originalHttpRequest = httpRequest;
+    const requestHandler = config$1._requestHandler;
+    this.#httpRequest = requestHandler ? /* @__PURE__ */ (() => {
+      let bareClient;
+      return (options, requester2) => {
+        const opts = options;
+        return bareClient || (bareClient = new SanityClient(httpRequest, { ...config$1, _requestHandler: void 0 })), requestHandler(opts, (o) => httpRequest(o, requester2), bareClient);
+      };
+    })() : httpRequest, this.assets = new ObservableAssetsClient(this, this.#httpRequest), this.datasets = new ObservableDatasetsClient(this, this.#httpRequest), this.live = new LiveClient(this), this.mediaLibrary = {
       video: new ObservableMediaLibraryVideoClient(this, this.#httpRequest)
     }, this.projects = new ObservableProjectsClient(this, this.#httpRequest), this.users = new ObservableUsersClient(this, this.#httpRequest), this.agent = {
       action: new ObservableAgentsActionClient(this, this.#httpRequest)
@@ -2216,7 +2238,7 @@ class ObservableSanityClient {
    * Clone the client - returns a new instance
    */
   clone() {
-    return new ObservableSanityClient(this.#httpRequest, this.config());
+    return new ObservableSanityClient(this.#originalHttpRequest, this.config());
   }
   config(newConfig) {
     if (newConfig === void 0)
@@ -2234,7 +2256,7 @@ class ObservableSanityClient {
    */
   withConfig(newConfig) {
     const thisConfig = this.config();
-    return new ObservableSanityClient(this.#httpRequest, {
+    return new ObservableSanityClient(this.#originalHttpRequest, {
       ...thisConfig,
       ...newConfig,
       stega: {
@@ -2464,13 +2486,22 @@ class SanityClient {
    * Private properties
    */
   #clientConfig;
+  #originalHttpRequest;
   #httpRequest;
   /**
    * Instance properties
    */
   listen = _listen;
   constructor(httpRequest, config$1 = config.defaultConfig) {
-    this.config(config$1), this.#httpRequest = httpRequest, this.assets = new AssetsClient(this, this.#httpRequest), this.datasets = new DatasetsClient(this, this.#httpRequest), this.live = new LiveClient(this), this.mediaLibrary = {
+    this.config(config$1), this.#originalHttpRequest = httpRequest;
+    const requestHandler = config$1._requestHandler;
+    this.#httpRequest = requestHandler ? /* @__PURE__ */ (() => {
+      let bareClient;
+      return (options, requester2) => {
+        const opts = options;
+        return bareClient || (bareClient = new SanityClient(httpRequest, { ...config$1, _requestHandler: void 0 })), requestHandler(opts, (o) => httpRequest(o, requester2), bareClient);
+      };
+    })() : httpRequest, this.assets = new AssetsClient(this, this.#httpRequest), this.datasets = new DatasetsClient(this, this.#httpRequest), this.live = new LiveClient(this), this.mediaLibrary = {
       video: new MediaLibraryVideoClient(this, this.#httpRequest)
     }, this.projects = new ProjectsClient(this, this.#httpRequest), this.users = new UsersClient(this, this.#httpRequest), this.agent = {
       action: new AgentActionsClient(this, this.#httpRequest)
@@ -2480,7 +2511,7 @@ class SanityClient {
    * Clone the client - returns a new instance
    */
   clone() {
-    return new SanityClient(this.#httpRequest, this.config());
+    return new SanityClient(this.#originalHttpRequest, this.config());
   }
   config(newConfig) {
     if (newConfig === void 0)
@@ -2498,7 +2529,7 @@ class SanityClient {
    */
   withConfig(newConfig) {
     const thisConfig = this.config();
-    return new SanityClient(this.#httpRequest, {
+    return new SanityClient(this.#originalHttpRequest, {
       ...thisConfig,
       ...newConfig,
       stega: {
@@ -2769,7 +2800,7 @@ function defineDeprecatedCreateClient(createClient2) {
     return config.printNoDefaultExport(), createClient2(config$1);
   };
 }
-var name = "@sanity/client", version = "7.20.0";
+var name = "@sanity/client", version = "7.22.0";
 const middleware = [
   middleware$1.debug({ verbose: !0, namespace: "sanity:client" }),
   middleware$1.headers({ "User-Agent": `${name} ${version}` }),