@sanity/client 6.28.4 → 6.28.5-goaway.0

package/dist/index.cjs

@@ -123,8 +123,8 @@ function defineHttpRequest(envMiddleware) {
 }
 function shouldRetry(err, attempt, options) {
   if (options.maxRetries === 0) return !1;
-  const isSafe = options.method === "GET" || options.method === "HEAD", isQuery = (options.uri || options.url).startsWith("/data/query"), isRetriableResponse = err.response && (err.response.statusCode === 429 || err.response.statusCode === 502 || err.response.statusCode === 503);
-  return (isSafe || isQuery) && isRetriableResponse ? !0 : middleware$1.retry.shouldRetry(err, attempt, options);
+  const isSafe = options.method === "GET" || options.method === "HEAD", isQuery2 = (options.uri || options.url).startsWith("/data/query"), isRetriableResponse = err.response && (err.response.statusCode === 429 || err.response.statusCode === 502 || err.response.statusCode === 503);
+  return (isSafe || isQuery2) && isRetriableResponse ? !0 : middleware$1.retry.shouldRetry(err, attempt, options);
 }
 class ConnectionFailedError extends Error {
   name = "ConnectionFailedError";
@@ -694,7 +694,7 @@ function _action(client, httpRequest, actions, options) {
   );
 }
 function _dataRequest(client, httpRequest, endpoint, body, options = {}) {
-  const isMutation = endpoint === "mutate", isAction = endpoint === "actions", isQuery = 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 = {
+  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,
     json: !0,
@@ -709,7 +709,7 @@ function _dataRequest(client, httpRequest, endpoint, body, options = {}) {
     resultSourceMap: options.resultSourceMap,
     lastLiveEventId: Array.isArray(lastLiveEventId) ? lastLiveEventId[0] : lastLiveEventId,
     cacheMode,
-    canUseCdn: isQuery,
+    canUseCdn: isQuery2,
     signal: options.signal,
     fetch: options.fetch,
     useAbortSignal: options.useAbortSignal,
@@ -737,11 +737,12 @@ function _create(client, httpRequest, doc, op, options = {}) {
   const mutation = { [op]: doc }, opts = Object.assign({ returnFirst: !0, returnDocuments: !0 }, options);
   return _dataRequest(client, httpRequest, "mutate", { mutations: [mutation] }, opts);
 }
+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$1 = client.config(), canUseCdn = typeof options.canUseCdn > "u" ? ["GET", "HEAD"].indexOf(options.method || "GET") >= 0 && uri.indexOf("/data/") === 0 : options.canUseCdn;
+  const uri = options.url || options.uri, config$1 = client.config(), canUseCdn = typeof options.canUseCdn > "u" ? ["GET", "HEAD"].indexOf(options.method || "GET") >= 0 && isData(client, uri) : options.canUseCdn;
   let useCdn = (options.useCdn ?? config$1.useCdn) && canUseCdn;
   const tag = options.tag && config$1.requestTagPrefix ? [config$1.requestTagPrefix, options.tag].join(".") : options.tag || config$1.requestTagPrefix;
-  if (tag && options.tag !== null && (options.query = { tag: config.requestTag(tag), ...options.query }), ["GET", "HEAD", "POST"].indexOf(options.method || "GET") >= 0 && uri.indexOf("/data/query/") === 0) {
+  if (tag && options.tag !== null && (options.query = { tag: config.requestTag(tag), ...options.query }), ["GET", "HEAD", "POST"].indexOf(options.method || "GET") >= 0 && isQuery(client, uri)) {
     const resultSourceMap = options.resultSourceMap ?? config$1.resultSourceMap;
     resultSourceMap !== void 0 && resultSourceMap !== !1 && (options.query = { resultSourceMap, ...options.query });
     const perspectiveOption = options.perspective || config$1.perspective;
@@ -768,8 +769,14 @@ function _request(client, httpRequest, options) {
   );
 }
 function _getDataUrl(client, operation, path) {
-  const config$1 = client.config(), catalog = config.hasDataset(config$1), baseUri = `/${operation}/${catalog}`;
-  return `/data${path ? `${baseUri}/${path}` : baseUri}`.replace(/\/($|\?)/, "$1");
+  const config$1 = client.config();
+  if (config$1["~experimental_resource"]) {
+    config.resourceConfig(config$1);
+    const resourceBase = resourceDataBase(config$1), uri2 = path !== void 0 ? `${operation}/${path}` : operation;
+    return `${resourceBase}/${uri2}`.replace(/\/($|\?)/, "$1");
+  }
+  const catalog = config.hasDataset(config$1), baseUri = `/${operation}/${catalog}`;
+  return `/data${path !== void 0 ? `${baseUri}/${path}` : baseUri}`.replace(/\/($|\?)/, "$1");
 }
 function _getUrl(client, uri, canUseCdn = !1) {
   const { url, cdnUrl } = client.config();
@@ -795,6 +802,27 @@ function _createAbortError(signal) {
   const error = new Error(signal?.reason ?? "The operation was aborted.");
   return error.name = "AbortError", error;
 }
+const resourceDataBase = (config2) => {
+  if (!config2["~experimental_resource"])
+    throw new Error("`resource` must be provided to perform resource queries");
+  const { type, id } = config2["~experimental_resource"];
+  switch (type) {
+    case "dataset": {
+      const segments = id.split(".");
+      if (segments.length !== 2)
+        throw new Error('Dataset ID must be in the format "project.dataset"');
+      return `/projects/${segments[0]}/datasets/${segments[1]}`;
+    }
+    case "canvas":
+      return `/canvases/${id}`;
+    case "media-library":
+      return `/media-libraries/${id}`;
+    case "dashboard":
+      return `/dashboards/${id}`;
+    default:
+      throw new Error(`Unsupported resource type: ${type.toString()}`);
+  }
+};
 class ObservableAssetsClient {
   #client;
   #httpRequest;
@@ -827,7 +855,7 @@ function _upload(client, httpRequest, assetType, body, opts = {}) {
   config.validateAssetType(assetType);
   let meta = opts.extract || void 0;
   meta && !meta.length && (meta = ["none"]);
-  const dataset = config.hasDataset(client.config()), assetEndpoint = assetType === "image" ? "images" : "files", options = optionsFromFile(opts, body), { tag, label, title, description, creditLine, filename, source } = options, query = {
+  const config$1 = client.config(), options = optionsFromFile(opts, body), { tag, label, title, description, creditLine, filename, source } = options, query = {
     label,
     title,
     description,
@@ -839,12 +867,34 @@ function _upload(client, httpRequest, assetType, body, opts = {}) {
     tag,
     method: "POST",
     timeout: options.timeout || 0,
-    uri: `/assets/${assetEndpoint}/${dataset}`,
+    uri: buildAssetUploadUrl(config$1, assetType),
     headers: options.contentType ? { "Content-Type": options.contentType } : {},
     query,
     body
   });
 }
+function buildAssetUploadUrl(config$1, assetType) {
+  const assetTypeEndpoint = assetType === "image" ? "images" : "files";
+  if (config$1["~experimental_resource"]) {
+    const { type, id } = config$1["~experimental_resource"];
+    switch (type) {
+      case "dataset":
+        throw new Error(
+          "Assets are not supported for dataset resources, yet. Configure the client with `{projectId: <projectId>, dataset: <datasetId>}` instead."
+        );
+      case "canvas":
+        return `/canvases/${id}/assets/${assetTypeEndpoint}`;
+      case "media-library":
+        return `/media-libraries/${id}/upload`;
+      case "dashboard":
+        return `/dashboards/${id}/assets/${assetTypeEndpoint}`;
+      default:
+        throw new Error(`Unsupported resource type: ${type.toString()}`);
+    }
+  }
+  const dataset = config.hasDataset(config$1);
+  return `assets/${assetTypeEndpoint}/${dataset}`;
+}
 function optionsFromFile(opts, file) {
   return typeof File > "u" || !(file instanceof File) ? opts : Object.assign(
     {
@@ -936,6 +986,7 @@ class LiveClient {
     includeDrafts = !1,
     tag: _tag
   } = {}) {
+    config.resourceGuard("live", this.#client.config());
     const {
       projectId,
       apiVersion: _apiVersion,
@@ -967,7 +1018,8 @@ class LiveClient {
       "message",
       "restart",
       "welcome",
-      "reconnect"
+      "reconnect",
+      "goaway"
     ]).pipe(
       reconnectOnConnectionFailure(),
       operators.map((event) => {
@@ -1065,7 +1117,7 @@ class DatasetsClient {
    * @param options - Options for the dataset
    */
   create(name2, options) {
-    return rxjs.lastValueFrom(
+    return config.resourceGuard("dataset", this.#client.config()), rxjs.lastValueFrom(
       _modify(this.#client, this.#httpRequest, "PUT", name2, options)
     );
   }
@@ -1076,7 +1128,7 @@ class DatasetsClient {
    * @param options - New options for the dataset
    */
   edit(name2, options) {
-    return rxjs.lastValueFrom(
+    return config.resourceGuard("dataset", this.#client.config()), rxjs.lastValueFrom(
       _modify(this.#client, this.#httpRequest, "PATCH", name2, options)
     );
   }
@@ -1086,19 +1138,19 @@ class DatasetsClient {
    * @param name - Name of the dataset to delete
    */
   delete(name2) {
-    return rxjs.lastValueFrom(_modify(this.#client, this.#httpRequest, "DELETE", name2));
+    return config.resourceGuard("dataset", this.#client.config()), rxjs.lastValueFrom(_modify(this.#client, this.#httpRequest, "DELETE", name2));
   }
   /**
    * Fetch a list of datasets for the configured project
    */
   list() {
-    return rxjs.lastValueFrom(
+    return config.resourceGuard("dataset", this.#client.config()), rxjs.lastValueFrom(
       _request(this.#client, this.#httpRequest, { uri: "/datasets", tag: null })
     );
   }
 }
 function _modify(client, httpRequest, method, name2, options) {
-  return config.dataset(name2), _request(client, httpRequest, {
+  return config.resourceGuard("dataset", client.config()), config.dataset(name2), _request(client, httpRequest, {
     method,
     uri: `/datasets/${name2}`,
     body: options,
@@ -1112,6 +1164,7 @@ class ObservableProjectsClient {
     this.#client = client, this.#httpRequest = httpRequest;
   }
   list(options) {
+    config.resourceGuard("projects", this.#client.config());
     const uri = options?.includeMembers === !1 ? "/projects?includeMembers=false" : "/projects";
     return _request(this.#client, this.#httpRequest, { uri });
   }
@@ -1121,7 +1174,7 @@ class ObservableProjectsClient {
    * @param projectId - ID of the project to fetch
    */
   getById(projectId) {
-    return _request(this.#client, this.#httpRequest, { uri: `/projects/${projectId}` });
+    return config.resourceGuard("projects", this.#client.config()), _request(this.#client, this.#httpRequest, { uri: `/projects/${projectId}` });
   }
 }
 class ProjectsClient {
@@ -1131,6 +1184,7 @@ class ProjectsClient {
     this.#client = client, this.#httpRequest = httpRequest;
   }
   list(options) {
+    config.resourceGuard("projects", this.#client.config());
     const uri = options?.includeMembers === !1 ? "/projects?includeMembers=false" : "/projects";
     return rxjs.lastValueFrom(_request(this.#client, this.#httpRequest, { uri }));
   }
@@ -1140,7 +1194,7 @@ class ProjectsClient {
    * @param projectId - ID of the project to fetch
    */
   getById(projectId) {
-    return rxjs.lastValueFrom(
+    return config.resourceGuard("projects", this.#client.config()), rxjs.lastValueFrom(
       _request(this.#client, this.#httpRequest, { uri: `/projects/${projectId}` })
     );
   }
@@ -1528,7 +1582,7 @@ function defineDeprecatedCreateClient(createClient2) {
     return config.printNoDefaultExport(), createClient2(config$1);
   };
 }
-var name = "@sanity/client", version = "6.28.4";
+var name = "@sanity/client", version = "6.28.5-goaway.0";
 const middleware = [
   middleware$1.debug({ verbose: !0, namespace: "sanity:client" }),
   middleware$1.headers({ "User-Agent": `${name} ${version}` }),