@sanity/client 6.27.2-resources.2 → 6.27.2

package/dist/stega.browser.d.cts

@@ -382,13 +382,6 @@ export declare interface ClientConfig {
    * Options for how, if enabled, Content Source Maps are encoded into query results using steganography
    */
   stega?: StegaConfig | boolean
-  /**
-   * @deprecated Don't use
-   */
-  experimental_resource?: {
-    id: string
-    type: string
-  }
 }
 
 /** @public */

package/dist/stega.browser.d.ts

@@ -382,13 +382,6 @@ export declare interface ClientConfig {
    * Options for how, if enabled, Content Source Maps are encoded into query results using steganography
    */
   stega?: StegaConfig | boolean
-  /**
-   * @deprecated Don't use
-   */
-  experimental_resource?: {
-    id: string
-    type: string
-  }
 }
 
 /** @public */

package/dist/stega.d.cts

@@ -382,13 +382,6 @@ export declare interface ClientConfig {
    * Options for how, if enabled, Content Source Maps are encoded into query results using steganography
    */
   stega?: StegaConfig | boolean
-  /**
-   * @deprecated Don't use
-   */
-  experimental_resource?: {
-    id: string
-    type: string
-  }
 }
 
 /** @public */

package/dist/stega.d.ts

@@ -382,13 +382,6 @@ export declare interface ClientConfig {
    * Options for how, if enabled, Content Source Maps are encoded into query results using steganography
    */
   stega?: StegaConfig | boolean
-  /**
-   * @deprecated Don't use
-   */
-  experimental_resource?: {
-    id: string
-    type: string
-  }
 }
 
 /** @public */

package/package.json

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

package/src/SanityClient.ts

@@ -7,11 +7,7 @@ import {_listen} from './data/listen'
 import {LiveClient} from './data/live'
 import {ObservablePatch, Patch} from './data/patch'
 import {ObservableTransaction, Transaction} from './data/transaction'
-import {
-  DatasetsClient,
-  ObservableDatasetsClient,
-  ThrowingDatasetsClient,
-} from './datasets/DatasetsClient'
+import {DatasetsClient, ObservableDatasetsClient} from './datasets/DatasetsClient'
 import {ObservableProjectsClient, ProjectsClient} from './projects/ProjectsClient'
 import type {
   Action,
@@ -760,10 +756,7 @@ export class SanityClient {
     this.#httpRequest = httpRequest
 
     this.assets = new AssetsClient(this, this.#httpRequest)
-    this.datasets = this.#clientConfig.experimental_resource
-      ? new ThrowingDatasetsClient(this, this.#httpRequest)
-      : new DatasetsClient(this, this.#httpRequest)
-
+    this.datasets = new DatasetsClient(this, this.#httpRequest)
     this.live = new LiveClient(this)
     this.projects = new ProjectsClient(this, this.#httpRequest)
     this.users = new UsersClient(this, this.#httpRequest)

package/src/assets/AssetsClient.ts

@@ -149,8 +149,7 @@ function _upload(
     meta = ['none']
   }
 
-  const config = client.config()
-  const dataset = config.experimental_resource ? undefined : validators.hasDataset(config)
+  const dataset = validators.hasDataset(client.config())
   const assetEndpoint = assetType === 'image' ? 'images' : 'files'
   const options = optionsFromFile(opts, body)
   const {tag, label, title, description, creditLine, filename, source} = options
@@ -171,7 +170,7 @@ function _upload(
     tag,
     method: 'POST',
     timeout: options.timeout || 0,
-    uri: dataset ? `/assets/${assetEndpoint}/${dataset}` : `/assets/${assetEndpoint}`,
+    uri: `/assets/${assetEndpoint}/${dataset}`,
     headers: options.contentType ? {'Content-Type': options.contentType} : {},
     query,
     body,

package/src/config.ts

@@ -90,23 +90,6 @@ export const initConfig = (
     ...defaultConfig,
     ...specifiedConfig,
   } as InitializedClientConfig
-
-  const projectId = newConfig.projectId
-  if (projectId?.startsWith('resource.')) {
-    const [, resourceType, resourceId] = projectId.split('.')
-    if (resourceType && resourceId) {
-      newConfig.experimental_resource = {
-        type: resourceType,
-        id: resourceId,
-      }
-    }
-  }
-  // resource oriented clients should not use project hostname in base url
-  const experimentalResource = newConfig.experimental_resource
-  if (experimentalResource) {
-    newConfig.useProjectHostname = false
-  }
-
   const projectBased = newConfig.useProjectHostname
 
   if (typeof Promise === 'undefined') {
@@ -197,11 +180,5 @@ export const initConfig = (
     newConfig.cdnUrl = newConfig.url
   }
 
-  if (experimentalResource) {
-    const resourceSuffix = `${experimentalResource.type}/${experimentalResource.id}`
-    newConfig.url = `${newConfig.url}/${resourceSuffix}`
-    newConfig.cdnUrl = `${newConfig.cdnUrl}/${resourceSuffix}`
-  }
-
   return newConfig
 }

package/src/data/dataMethods.ts

@@ -12,7 +12,6 @@ import type {
   Any,
   BaseActionOptions,
   BaseMutationOptions,
-  ClientConfig,
   FirstDocumentIdMutationOptions,
   FirstDocumentMutationOptions,
   HttpRequest,
@@ -39,8 +38,6 @@ import {encodeQueryString} from './encodeQueryString'
 import {ObservablePatch, Patch} from './patch'
 import {ObservableTransaction, Transaction} from './transaction'
 
-type ExperimentalResourceConfig = Exclude<ClientConfig['experimental_resource'], undefined>
-
 const excludeFalsey = (param: Any, defValue: Any) => {
   const value = typeof param === 'undefined' ? defValue : param
   return param === false ? undefined : value
@@ -370,24 +367,6 @@ export function _create<R extends Record<string, Any>>(
   return _dataRequest(client, httpRequest, 'mutate', {mutations: [mutation]}, opts)
 }
 
-function _resourceBase(resource: ExperimentalResourceConfig) {
-  return `/${resource.type}/${resource.id}`
-}
-
-function isDataRequestUri(uri: string, resource?: ExperimentalResourceConfig) {
-  if (resource) {
-    return uri.indexOf(`/${_resourceBase(resource)}/data/`) === 0
-  }
-  return uri.indexOf('/data/') === 0
-}
-
-function isDataQueryRequestUri(uri: string, resource?: ExperimentalResourceConfig) {
-  if (resource) {
-    return uri.indexOf(`/${_resourceBase(resource)}/data/query`) === 0
-  }
-  return uri.indexOf('/data/query') === 0
-}
-
 /**
  * @internal
  */
@@ -403,8 +382,7 @@ export function _requestObservable<R>(
   // Only the /data endpoint is currently available through API-CDN.
   const canUseCdn =
     typeof options.canUseCdn === 'undefined'
-      ? ['GET', 'HEAD'].indexOf(options.method || 'GET') >= 0 &&
-        isDataRequestUri(uri, config.experimental_resource)
+      ? ['GET', 'HEAD'].indexOf(options.method || 'GET') >= 0 && uri.indexOf('/data/') === 0
       : options.canUseCdn
 
   let useCdn = (options.useCdn ?? config.useCdn) && canUseCdn
@@ -421,7 +399,7 @@ export function _requestObservable<R>(
   // GROQ query-only parameters
   if (
     ['GET', 'HEAD', 'POST'].indexOf(options.method || 'GET') >= 0 &&
-    isDataQueryRequestUri(uri, config.experimental_resource)
+    uri.indexOf('/data/query/') === 0
   ) {
     const resultSourceMap = options.resultSourceMap ?? config.resultSourceMap
     if (resultSourceMap !== undefined && resultSourceMap !== false) {
@@ -495,12 +473,6 @@ export function _getDataUrl(
   path?: string,
 ): string {
   const config = client.config()
-
-  if (config.experimental_resource) {
-    const baseUri = `/${operation}`
-    const uri = path ? `${baseUri}/${path}` : baseUri
-    return uri.replace(/\/($|\?)/, '$1')
-  }
   const catalog = validators.hasDataset(config)
   const baseUri = `/${operation}/${catalog}`
   const uri = path ? `${baseUri}/${path}` : baseUri
@@ -515,15 +487,8 @@ export function _getUrl(
   uri: string,
   canUseCdn = false,
 ): string {
-  const {url, cdnUrl, experimental_resource} = client.config()
-  let base = canUseCdn ? cdnUrl : url
-
-  if (experimental_resource) {
-    if (uri.indexOf('/users') !== -1) {
-      base = base.replace(_resourceBase(experimental_resource), '')
-    }
-  }
-
+  const {url, cdnUrl} = client.config()
+  const base = canUseCdn ? cdnUrl : url
   return `${base}/${uri.replace(/^\//, '')}`
 }
 

package/src/data/eventsource.ts

@@ -131,8 +131,6 @@ function connectWithESInstance<EventTypeName extends string>(
     // EventSource will emit a regular Event if it fails to connect, however the API may also emit an `error` MessageEvent
     // So we need to handle both cases
     function onError(evt: MessageEvent | Event) {
-      // eslint-disable-next-line no-console
-      console.log('Eventsource onError', evt, es.url)
       // If the event has a `data` property, then it`s a MessageEvent emitted by the API and we should forward the error
       if ('data' in evt) {
         const [parseError, event] = parseEvent(evt as MessageEvent)

package/src/datasets/DatasetsClient.ts

@@ -106,28 +106,6 @@ export class DatasetsClient {
   }
 }
 
-export class ThrowingDatasetsClient extends DatasetsClient {
-  constructor(client: SanityClient, httpRequest: HttpRequest) {
-    super(client, httpRequest)
-  }
-
-  create(): Promise<DatasetResponse> {
-    throw new Error('cannot create dataset with the current client configuration')
-  }
-
-  edit(): Promise<DatasetResponse> {
-    throw new Error('cannot edit dataset with the current client configuration')
-  }
-
-  delete(): Promise<{deleted: true}> {
-    throw new Error('cannot delete dataset with the current client configuration')
-  }
-
-  list(): Promise<DatasetsResponse> {
-    throw new Error('cannot list dataset with the current client configuration')
-  }
-}
-
 function _modify<R = unknown>(
   client: SanityClient | ObservableSanityClient,
   httpRequest: HttpRequest,

package/src/types.ts

@@ -104,14 +104,6 @@ export interface ClientConfig {
    * Options for how, if enabled, Content Source Maps are encoded into query results using steganography
    */
   stega?: StegaConfig | boolean
-
-  /**
-   * @deprecated Don't use
-   */
-  experimental_resource?: {
-    id: string
-    type: string
-  }
 }
 
 /** @public */

package/umd/sanityClient.js

@@ -2073,17 +2073,7 @@
     const newConfig = {
       ...defaultConfig,
       ...specifiedConfig
-    }, projectId$1 = newConfig.projectId;
-    if (projectId$1?.startsWith("resource.")) {
-      const [, resourceType, resourceId] = projectId$1.split(".");
-      resourceType && resourceId && (newConfig.experimental_resource = {
-        type: resourceType,
-        id: resourceId
-      });
-    }
-    const experimentalResource = newConfig.experimental_resource;
-    experimentalResource && (newConfig.useProjectHostname = false);
-    const projectBased = newConfig.useProjectHostname;
+    }, projectBased = newConfig.useProjectHostname;
     if (typeof Promise > "u") {
       const helpUrl = generateHelpUrl("js-client-promise-polyfill");
       throw new Error(`No native Promise-implementation found, polyfill needed - see ${helpUrl}`);
@@ -2109,11 +2099,7 @@
     const isBrowser = typeof window < "u" && window.location && window.location.hostname, isLocalhost = isBrowser && isLocal(window.location.hostname);
     isBrowser && isLocalhost && newConfig.token && newConfig.ignoreBrowserTokenWarning !== true ? printBrowserTokenWarning() : typeof newConfig.useCdn > "u" && printCdnWarning(), projectBased && projectId(newConfig.projectId), newConfig.dataset && dataset(newConfig.dataset), "requestTagPrefix" in newConfig && (newConfig.requestTagPrefix = newConfig.requestTagPrefix ? requestTag(newConfig.requestTagPrefix).replace(/\.+$/, "") : undefined), newConfig.apiVersion = `${newConfig.apiVersion}`.replace(/^v/, ""), newConfig.isDefaultApi = newConfig.apiHost === defaultConfig.apiHost, newConfig.useCdn === true && newConfig.withCredentials && printCdnAndWithCredentialsWarning(), newConfig.useCdn = newConfig.useCdn !== false && !newConfig.withCredentials, validateApiVersion(newConfig.apiVersion);
     const hostParts = newConfig.apiHost.split("://", 2), protocol = hostParts[0], host = hostParts[1], cdnHost = newConfig.isDefaultApi ? defaultCdnHost : host;
-    if (newConfig.useProjectHostname ? (newConfig.url = `${protocol}://${newConfig.projectId}.${host}/v${newConfig.apiVersion}`, newConfig.cdnUrl = `${protocol}://${newConfig.projectId}.${cdnHost}/v${newConfig.apiVersion}`) : (newConfig.url = `${newConfig.apiHost}/v${newConfig.apiVersion}`, newConfig.cdnUrl = newConfig.url), experimentalResource) {
-      const resourceSuffix = `${experimentalResource.type}/${experimentalResource.id}`;
-      newConfig.url = `${newConfig.url}/${resourceSuffix}`, newConfig.cdnUrl = `${newConfig.cdnUrl}/${resourceSuffix}`;
-    }
-    return newConfig;
+    return newConfig.useProjectHostname ? (newConfig.url = `${protocol}://${newConfig.projectId}.${host}/v${newConfig.apiVersion}`, newConfig.cdnUrl = `${protocol}://${newConfig.projectId}.${cdnHost}/v${newConfig.apiVersion}`) : (newConfig.url = `${newConfig.apiHost}/v${newConfig.apiVersion}`, newConfig.cdnUrl = newConfig.url), newConfig;
   };
   class ConnectionFailedError extends Error {
     name = "ConnectionFailedError";
@@ -2153,7 +2139,7 @@
     return new Observable((observer) => {
       const emitOpen = events.includes("open"), emitReconnect = events.includes("reconnect");
       function onError(evt) {
-        if (console.log("Eventsource onError", evt, es.url), "data" in evt) {
+        if ("data" in evt) {
           const [parseError, event] = parseEvent(evt);
           observer.error(
             parseError ? new MessageParseError("Unable to parse EventSource error message", { cause: event }) : new MessageError((event?.data).message, event)
@@ -2724,20 +2710,11 @@ ${selectionOpts}`);
     const mutation = { [op]: doc }, opts = Object.assign({ returnFirst: true, returnDocuments: true }, options);
     return _dataRequest(client, httpRequest, "mutate", { mutations: [mutation] }, opts);
   }
-  function _resourceBase(resource) {
-    return `/${resource.type}/${resource.id}`;
-  }
-  function isDataRequestUri(uri, resource) {
-    return resource ? uri.indexOf(`/${_resourceBase(resource)}/data/`) === 0 : uri.indexOf("/data/") === 0;
-  }
-  function isDataQueryRequestUri(uri, resource) {
-    return resource ? uri.indexOf(`/${_resourceBase(resource)}/data/query`) === 0 : uri.indexOf("/data/query") === 0;
-  }
   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 && isDataRequestUri(uri, config.experimental_resource) : options.canUseCdn;
+    const uri = options.url || options.uri, config = client.config(), canUseCdn = typeof options.canUseCdn > "u" ? ["GET", "HEAD"].indexOf(options.method || "GET") >= 0 && uri.indexOf("/data/") === 0 : 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 && isDataQueryRequestUri(uri, config.experimental_resource)) {
+    if (tag && options.tag !== null && (options.query = { tag: requestTag(tag), ...options.query }), ["GET", "HEAD", "POST"].indexOf(options.method || "GET") >= 0 && uri.indexOf("/data/query/") === 0) {
       const resultSourceMap = options.resultSourceMap ?? config.resultSourceMap;
       resultSourceMap !== undefined && resultSourceMap !== false && (options.query = { resultSourceMap, ...options.query });
       const perspectiveOption = options.perspective || config.perspective;
@@ -2763,18 +2740,12 @@ ${selectionOpts}`);
     );
   }
   function _getDataUrl(client, operation, path) {
-    const config = client.config();
-    if (config.experimental_resource) {
-      const baseUri2 = `/${operation}`;
-      return (path ? `${baseUri2}/${path}` : baseUri2).replace(/\/($|\?)/, "$1");
-    }
-    const catalog = hasDataset(config), baseUri = `/${operation}/${catalog}`;
+    const config = client.config(), catalog = hasDataset(config), baseUri = `/${operation}/${catalog}`;
     return `/data${path ? `${baseUri}/${path}` : baseUri}`.replace(/\/($|\?)/, "$1");
   }
   function _getUrl(client, uri, canUseCdn = false) {
-    const { url, cdnUrl, experimental_resource } = client.config();
-    let base = canUseCdn ? cdnUrl : url;
-    return experimental_resource && uri.indexOf("/users") !== -1 && (base = base.replace(_resourceBase(experimental_resource), "")), `${base}/${uri.replace(/^\//, "")}`;
+    const { url, cdnUrl } = client.config();
+    return `${canUseCdn ? cdnUrl : url}/${uri.replace(/^\//, "")}`;
   }
   function _withAbortSignal(signal) {
     return (input) => new Observable((observer) => {
@@ -2828,7 +2799,7 @@ ${selectionOpts}`);
     validateAssetType(assetType);
     let meta = opts.extract || undefined;
     meta && !meta.length && (meta = ["none"]);
-    const config = client.config(), dataset2 = config.experimental_resource ? undefined : hasDataset(config), assetEndpoint = assetType === "image" ? "images" : "files", options = optionsFromFile(opts, body), { tag, label, title, description, creditLine, filename, source } = options, query = {
+    const dataset2 = hasDataset(client.config()), assetEndpoint = assetType === "image" ? "images" : "files", options = optionsFromFile(opts, body), { tag, label, title, description, creditLine, filename, source } = options, query = {
       label,
       title,
       description,
@@ -2840,7 +2811,7 @@ ${selectionOpts}`);
       tag,
       method: "POST",
       timeout: options.timeout || 0,
-      uri: dataset2 ? `/assets/${assetEndpoint}/${dataset2}` : `/assets/${assetEndpoint}`,
+      uri: `/assets/${assetEndpoint}/${dataset2}`,
       headers: options.contentType ? { "Content-Type": options.contentType } : {},
       query,
       body
@@ -3063,23 +3034,6 @@ ${selectionOpts}`);
       );
     }
   }
-  class ThrowingDatasetsClient extends DatasetsClient {
-    constructor(client, httpRequest) {
-      super(client, httpRequest);
-    }
-    create() {
-      throw new Error("cannot create dataset with the current client configuration");
-    }
-    edit() {
-      throw new Error("cannot edit dataset with the current client configuration");
-    }
-    delete() {
-      throw new Error("cannot delete dataset with the current client configuration");
-    }
-    list() {
-      throw new Error("cannot list dataset with the current client configuration");
-    }
-  }
   function _modify(client, httpRequest, method, name, options) {
     return dataset(name), _request(client, httpRequest, {
       method,
@@ -3335,7 +3289,7 @@ ${selectionOpts}`);
      */
     listen = _listen;
     constructor(httpRequest, config = defaultConfig) {
-      this.config(config), this.#httpRequest = httpRequest, this.assets = new AssetsClient(this, this.#httpRequest), this.datasets = this.#clientConfig.experimental_resource ? new ThrowingDatasetsClient(this, this.#httpRequest) : new DatasetsClient(this, this.#httpRequest), this.live = new LiveClient(this), this.projects = new ProjectsClient(this, this.#httpRequest), this.users = new UsersClient(this, this.#httpRequest), this.observable = new ObservableSanityClient(httpRequest, config);
+      this.config(config), this.#httpRequest = httpRequest, this.assets = new AssetsClient(this, this.#httpRequest), this.datasets = new DatasetsClient(this, this.#httpRequest), this.live = new LiveClient(this), this.projects = new ProjectsClient(this, this.#httpRequest), this.users = new UsersClient(this, this.#httpRequest), this.observable = new ObservableSanityClient(httpRequest, config);
     }
     /**
      * Clone the client - returns a new instance