@sanity/schema 6.10.1 → 6.10.2-next.18

package/lib/_internal.d.ts

@@ -56,8 +56,11 @@ type DescriptorRequestOptions = RequestOptions;
 /**
  * The transport seam. The client calls this for every request; the return value
  * is the parsed response body. Any requester with the shape
- * `<B>(options): Promise<B>` — such as a configured `get-it` instance — is
- * structurally assignable, so callers can bring their own transport.
+ * `<B>(options): Promise<B>` is structurally assignable, so callers can bring
+ * their own transport. Note that a configured get-it v9 instance does NOT
+ * qualify on its own — it resolves with the full response object, not the
+ * parsed body — so it must be wrapped the way {@link createGetItRequester}
+ * wraps it.
  *
  * @internal
  */

package/lib/_internal.js

@@ -4,8 +4,8 @@ import { isSpanSchemaType } from "@sanity/types";
 import isEqual from "lodash-es/isEqual.js";
 import isObject from "lodash-es/isObject.js";
 import cloneDeep from "lodash-es/cloneDeep.js";
-import { getIt } from "get-it";
-import { base, httpErrors, jsonRequest, jsonResponse, promise, retry } from "get-it/middleware";
+import { HttpError, createRequester } from "get-it";
+import { retry } from "get-it/middleware";
 import "@sanity/generate-help-url";
 import difference from "lodash-es/difference.js";
 import startCase from "lodash-es/startCase.js";
@@ -632,13 +632,26 @@ function processSchemaSynchronization(sync, response) {
 	return processSetSynchronization(sync, response);
 }
 /**
-* Retry on rate-limit (429) and server (5xx) responses.
+* Retry on rate-limit (429) and server (5xx) responses. get-it v9 throws a
+* `HttpError` (with the status on `err.status`) for non-2xx responses; network
+* and timeout failures are not `HttpError`s and are not retried, matching the
+* v8 behavior of reading `err.response.statusCode`.
 *
 * @internal
 */
 function defaultShouldRetry(err) {
-	let statusCode = err?.response?.statusCode;
-	return statusCode === 429 || typeof statusCode == "number" && statusCode >= 500;
+	return err instanceof HttpError ? err.status === 429 || err.status >= 500 : !1;
+}
+/**
+* Parse a response body the way get-it v8's `jsonResponse()` middleware did:
+* JSON only when the body is non-empty and the content type says so, the raw
+* text otherwise, `undefined` for empty bodies. get-it v9's `as: 'json'`
+* parses unconditionally and throws on empty bodies, which an endpoint
+* answering e.g. `204 No Content` would trip on.
+*/
+function parseBody(res) {
+	let text = res.text();
+	if (text) return (res.headers.get("content-type") ?? "").toLowerCase().includes("application/json") ? res.json() : text;
 }
 /**
 * Build the default get-it requester. Auth and headers are NOT applied here —
@@ -648,15 +661,13 @@ function defaultShouldRetry(err) {
 * @internal
 */
 function createGetItRequester(options) {
-	let requester = getIt([
-		base(options.baseUrl),
-		jsonResponse(),
-		jsonRequest(),
-		httpErrors(),
-		retry({ shouldRetry: defaultShouldRetry }),
-		promise({ onlyBody: !0 })
-	]);
-	return (opts) => requester(opts);
+	let requester = createRequester({
+		base: options.baseUrl,
+		headers: { Accept: "application/json" },
+		fetch: options.fetch,
+		middleware: [retry({ shouldRetry: defaultShouldRetry })]
+	});
+	return async (opts) => parseBody(await requester(opts));
 }
 const sharedConverter = new DescriptorConverter();
 /**