@sanity/client 6.28.3-instruct.1 → 6.28.3-resources.1

package/src/SanityClient.ts

@@ -1,6 +1,5 @@
 import {lastValueFrom, Observable} from 'rxjs'
 
-import {AiClient, ObservableAiClient} from './ai/AiClient'
 import {AssetsClient, ObservableAssetsClient} from './assets/AssetsClient'
 import {defaultConfig, initConfig} from './config'
 import * as dataMethods from './data/dataMethods'
@@ -66,7 +65,7 @@ export class ObservableSanityClient {
   live: LiveClient
   projects: ObservableProjectsClient
   users: ObservableUsersClient
-  ai: ObservableAiClient
+
   /**
    * Private properties
    */
@@ -88,7 +87,6 @@ export class ObservableSanityClient {
     this.live = new LiveClient(this)
     this.projects = new ObservableProjectsClient(this, this.#httpRequest)
     this.users = new ObservableUsersClient(this, this.#httpRequest)
-    this.ai = new ObservableAiClient(this, this.#httpRequest)
   }
 
   /**
@@ -735,7 +733,6 @@ export class SanityClient {
   live: LiveClient
   projects: ProjectsClient
   users: UsersClient
-  ai: AiClient
 
   /**
    * Observable version of the Sanity client, with the same configuration as the promise-based one
@@ -763,7 +760,6 @@ export class SanityClient {
     this.live = new LiveClient(this)
     this.projects = new ProjectsClient(this, this.#httpRequest)
     this.users = new UsersClient(this, this.#httpRequest)
-    this.ai = new AiClient(this, this.#httpRequest)
 
     this.observable = new ObservableSanityClient(httpRequest, config)
   }

package/src/assets/AssetsClient.ts

@@ -7,6 +7,7 @@ import type {
   Any,
   HttpRequest,
   HttpRequestEvent,
+  InitializedClientConfig,
   ResponseEvent,
   SanityAssetDocument,
   SanityImageAssetDocument,
@@ -149,8 +150,7 @@ function _upload(
     meta = ['none']
   }
 
-  const dataset = validators.hasDataset(client.config())
-  const assetEndpoint = assetType === 'image' ? 'images' : 'files'
+  const config = client.config()
   const options = optionsFromFile(opts, body)
   const {tag, label, title, description, creditLine, filename, source} = options
   const query: Any = {
@@ -166,17 +166,29 @@ function _upload(
     query.sourceName = source.name
     query.sourceUrl = source.url
   }
+
   return _requestObservable(client, httpRequest, {
     tag,
     method: 'POST',
     timeout: options.timeout || 0,
-    uri: `/assets/${assetEndpoint}/${dataset}`,
+    uri: buildAssetUploadUrl(config, assetType),
     headers: options.contentType ? {'Content-Type': options.contentType} : {},
     query,
     body,
   })
 }
 
+function buildAssetUploadUrl(config: InitializedClientConfig, assetType: 'image' | 'file'): string {
+  const assetTypeEndpoint = assetType === 'image' ? 'images' : 'files'
+
+  if (config['~experimental_resource']) {
+    return `${config['~experimental_resource'].type}/${config['~experimental_resource'].id}/assets/${assetTypeEndpoint}`
+  }
+
+  const dataset = validators.hasDataset(config)
+  return `assets/${assetTypeEndpoint}/${dataset}`
+}
+
 function optionsFromFile(opts: Record<string, Any>, file: Any) {
   if (typeof File === 'undefined' || !(file instanceof File)) {
     return opts

package/src/config.ts

@@ -63,7 +63,7 @@ export const initConfig = (
     ...defaultConfig,
     ...specifiedConfig,
   } as InitializedClientConfig
-  const projectBased = newConfig.useProjectHostname
+  const projectBased = newConfig.useProjectHostname && !newConfig['~experimental_resource']
 
   if (typeof Promise === 'undefined') {
     const helpUrl = generateHelpUrl('js-client-promise-polyfill')
@@ -74,6 +74,10 @@ export const initConfig = (
     throw new Error('Configuration must contain `projectId`')
   }
 
+  if (newConfig['~experimental_resource']) {
+    validate.resourceBase(newConfig)
+  }
+
   if (typeof newConfig.perspective !== 'undefined') {
     validateApiPerspective(newConfig.perspective)
   }
@@ -151,7 +155,7 @@ export const initConfig = (
   const host = hostParts[1]
   const cdnHost = newConfig.isDefaultApi ? defaultCdnHost : host
 
-  if (newConfig.useProjectHostname) {
+  if (projectBased) {
     newConfig.url = `${protocol}://${newConfig.projectId}.${host}/v${newConfig.apiVersion}`
     newConfig.cdnUrl = `${protocol}://${newConfig.projectId}.${cdnHost}/v${newConfig.apiVersion}`
   } else {

package/src/data/dataMethods.ts

@@ -12,6 +12,7 @@ import type {
   Any,
   BaseActionOptions,
   BaseMutationOptions,
+  ClientConfig,
   FirstDocumentIdMutationOptions,
   FirstDocumentMutationOptions,
   HttpRequest,
@@ -366,6 +367,41 @@ export function _create<R extends Record<string, Any>>(
   const opts = Object.assign({returnFirst: true, returnDocuments: true}, options)
   return _dataRequest(client, httpRequest, 'mutate', {mutations: [mutation]}, opts)
 }
+const resourceDatasetRegex = /^\/projects\/([^/]+)\/datasets\/([^/]+)\/([^/^?]+)\/?/
+const isResourceDataEndpoint = (config: ClientConfig, uri: string, endpoint: string) => {
+  if (!config['~experimental_resource']) {
+    return false
+  }
+  if (
+    uri.startsWith(
+      `/${config['~experimental_resource'].type}/${config['~experimental_resource'].id}/${endpoint}`,
+    )
+  ) {
+    return true
+  }
+  const match = uri.match(resourceDatasetRegex)
+  if (!match) {
+    return false
+  }
+  return match[3] === endpoint
+}
+const isQuery = (config: ClientConfig, uri: string) =>
+  uri.startsWith('/data/query/') || isResourceDataEndpoint(config, uri, 'query')
+const isMutate = (config: ClientConfig, uri: string) =>
+  uri.startsWith('/data/mutate/') || isResourceDataEndpoint(config, uri, 'mutate')
+const isDoc = (config: ClientConfig, uri: string) =>
+  uri.startsWith('/data/doc/') || isResourceDataEndpoint(config, uri, 'doc')
+const isListener = (config: ClientConfig, uri: string) =>
+  uri.startsWith('/data/listen/') || isResourceDataEndpoint(config, uri, 'listen')
+const isHistory = (config: ClientConfig, uri: string) =>
+  uri.startsWith('/data/history/') || isResourceDataEndpoint(config, uri, 'history')
+const isData = (config: ClientConfig, uri: string) =>
+  uri.startsWith('/data/') ||
+  isQuery(config, uri) ||
+  isMutate(config, uri) ||
+  isDoc(config, uri) ||
+  isListener(config, uri) ||
+  isHistory(config, uri)
 
 /**
  * @internal
@@ -382,7 +418,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 && uri.indexOf('/data/') === 0
+      ? ['GET', 'HEAD'].indexOf(options.method || 'GET') >= 0 && isData(config, uri)
       : options.canUseCdn
 
   let useCdn = (options.useCdn ?? config.useCdn) && canUseCdn
@@ -397,10 +433,7 @@ export function _requestObservable<R>(
   }
 
   // GROQ query-only parameters
-  if (
-    ['GET', 'HEAD', 'POST'].indexOf(options.method || 'GET') >= 0 &&
-    uri.indexOf('/data/query/') === 0
-  ) {
+  if (['GET', 'HEAD', 'POST'].indexOf(options.method || 'GET') >= 0 && isQuery(config, uri)) {
     const resultSourceMap = options.resultSourceMap ?? config.resultSourceMap
     if (resultSourceMap !== undefined && resultSourceMap !== false) {
       options.query = {resultSourceMap, ...options.query}
@@ -482,6 +515,11 @@ export function _getDataUrl(
   path?: string,
 ): string {
   const config = client.config()
+  if (config['~experimental_resource']) {
+    const resourceBase = validators.resourceBase(config)
+    const uri = path ? `${operation}/${path}` : operation
+    return `${resourceBase}/${uri}`.replace(/\/($|\?)/, '$1')
+  }
   const catalog = validators.hasDataset(config)
   const baseUri = `/${operation}/${catalog}`
   const uri = path ? `${baseUri}/${path}` : baseUri

package/src/data/live.ts

@@ -12,6 +12,7 @@ import type {
   SyncTag,
 } from '../types'
 import {shareReplayLatest} from '../util/shareReplayLatest'
+import * as validate from '../validators'
 import {_getDataUrl} from './dataMethods'
 import {connectEventSource} from './eventsource'
 import {eventSourcePolyfill} from './eventsourcePolyfill'
@@ -43,6 +44,7 @@ export class LiveClient {
      */
     tag?: string
   } = {}): Observable<LiveEvent> {
+    validate.resourceGuard('live', this.#client.config())
     const {
       projectId,
       apiVersion: _apiVersion,

package/src/datasets/DatasetsClient.ts

@@ -70,6 +70,7 @@ export class DatasetsClient {
    * @param options - Options for the dataset
    */
   create(name: string, options?: {aclMode?: DatasetAclMode}): Promise<DatasetResponse> {
+    validate.resourceGuard('dataset', this.#client.config())
     return lastValueFrom(
       _modify<DatasetResponse>(this.#client, this.#httpRequest, 'PUT', name, options),
     )
@@ -82,6 +83,7 @@ export class DatasetsClient {
    * @param options - New options for the dataset
    */
   edit(name: string, options?: {aclMode?: DatasetAclMode}): Promise<DatasetResponse> {
+    validate.resourceGuard('dataset', this.#client.config())
     return lastValueFrom(
       _modify<DatasetResponse>(this.#client, this.#httpRequest, 'PATCH', name, options),
     )
@@ -93,6 +95,7 @@ export class DatasetsClient {
    * @param name - Name of the dataset to delete
    */
   delete(name: string): Promise<{deleted: true}> {
+    validate.resourceGuard('dataset', this.#client.config())
     return lastValueFrom(_modify<{deleted: true}>(this.#client, this.#httpRequest, 'DELETE', name))
   }
 
@@ -100,6 +103,7 @@ export class DatasetsClient {
    * Fetch a list of datasets for the configured project
    */
   list(): Promise<DatasetsResponse> {
+    validate.resourceGuard('dataset', this.#client.config())
     return lastValueFrom(
       _request<DatasetsResponse>(this.#client, this.#httpRequest, {uri: '/datasets', tag: null}),
     )
@@ -113,6 +117,7 @@ function _modify<R = unknown>(
   name: string,
   options?: {aclMode?: DatasetAclMode},
 ) {
+  validate.resourceGuard('dataset', client.config())
   validate.dataset(name)
   return _request<R>(client, httpRequest, {
     method,

package/src/projects/ProjectsClient.ts

@@ -3,6 +3,7 @@ import {lastValueFrom, type Observable} from 'rxjs'
 import {_request} from '../data/dataMethods'
 import type {ObservableSanityClient, SanityClient} from '../SanityClient'
 import type {HttpRequest, SanityProject} from '../types'
+import * as validate from '../validators'
 
 /** @internal */
 export class ObservableProjectsClient {
@@ -24,6 +25,7 @@ export class ObservableProjectsClient {
   list(options?: {
     includeMembers?: boolean
   }): Observable<SanityProject[] | Omit<SanityProject, 'members'>[]> {
+    validate.resourceGuard('projects', this.#client.config())
     const uri = options?.includeMembers === false ? '/projects?includeMembers=false' : '/projects'
     return _request<SanityProject[]>(this.#client, this.#httpRequest, {uri})
   }
@@ -34,6 +36,7 @@ export class ObservableProjectsClient {
    * @param projectId - ID of the project to fetch
    */
   getById(projectId: string): Observable<SanityProject> {
+    validate.resourceGuard('projects', this.#client.config())
     return _request<SanityProject>(this.#client, this.#httpRequest, {uri: `/projects/${projectId}`})
   }
 }
@@ -56,6 +59,7 @@ export class ProjectsClient {
   list(options?: {includeMembers?: true}): Promise<SanityProject[]>
   list(options?: {includeMembers?: false}): Promise<Omit<SanityProject, 'members'>[]>
   list(options?: {includeMembers?: boolean}): Promise<SanityProject[]> {
+    validate.resourceGuard('projects', this.#client.config())
     const uri = options?.includeMembers === false ? '/projects?includeMembers=false' : '/projects'
     return lastValueFrom(_request<SanityProject[]>(this.#client, this.#httpRequest, {uri}))
   }
@@ -66,6 +70,7 @@ export class ProjectsClient {
    * @param projectId - ID of the project to fetch
    */
   getById(projectId: string): Promise<SanityProject> {
+    validate.resourceGuard('projects', this.#client.config())
     return lastValueFrom(
       _request<SanityProject>(this.#client, this.#httpRequest, {uri: `/projects/${projectId}`}),
     )

package/src/types.ts

@@ -53,6 +53,11 @@ export type ClientPerspective =
   | 'raw'
   | StackablePerspective[]
 
+type ClientConfigResource = {
+  type: string
+  id: string
+}
+
 /** @public */
 export interface ClientConfig {
   projectId?: string
@@ -61,6 +66,9 @@ export interface ClientConfig {
   useCdn?: boolean
   token?: string
 
+  /** @internal */
+  '~experimental_resource'?: ClientConfigResource
+
   /**
    * What perspective to use for the client. See {@link https://www.sanity.io/docs/perspectives|perspective documentation}
    * @remarks
@@ -1336,16 +1344,6 @@ export type ClientReturn<
   Fallback = Any,
 > = GroqString extends keyof SanityQueries ? SanityQueries[GroqString] : Fallback
 
-export type {
-  InstructAsyncInstruction,
-  InstructConstantInstructionParam,
-  InstructFieldInstructionParam,
-  InstructGroqInstructionParam,
-  InstructInstruction,
-  InstructInstructionParam,
-  InstructInstructionParams,
-  InstructSyncInstruction,
-} from './ai/types'
 export type {
   ContentSourceMapParsedPath,
   ContentSourceMapParsedPathKeyedSegment,

package/src/validators.ts

@@ -76,3 +76,26 @@ export const requestTag = (tag: string) => {
 
   return tag
 }
+
+export const resourceBase = (config: InitializedClientConfig): string => {
+  if (!config['~experimental_resource']) {
+    throw new Error('`resource` must be provided to perform queries')
+  }
+  const resourceConfig = config['~experimental_resource']
+
+  if (resourceConfig.type === 'dataset') {
+    const segments = resourceConfig.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]}`
+  }
+
+  return `/${resourceConfig.type}/${resourceConfig.id}`
+}
+
+export const resourceGuard = (service: string, config: InitializedClientConfig): void => {
+  if (config['~experimental_resource']) {
+    throw new Error(`\`${service}\` does not support resource-based operations`)
+  }
+}

package/umd/sanityClient.js

@@ -2015,8 +2015,8 @@
   }
   function shouldRetry(err, attempt, options) {
     if (options.maxRetries === 0) return false;
-    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 ? true : P.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 ? true : P.shouldRetry(err, attempt, options);
   }
   const BASE_URL = "https://www.sanity.io/help/";
   function generateHelpUrl(slug) {
@@ -2063,6 +2063,20 @@
         "Tag can only contain alphanumeric characters, underscores, dashes and dots, and be between one and 75 characters long."
       );
     return tag;
+  }, resourceBase = (config) => {
+    if (!config["~experimental_resource"])
+      throw new Error("`resource` must be provided to perform queries");
+    const resourceConfig = config["~experimental_resource"];
+    if (resourceConfig.type === "dataset") {
+      const segments = resourceConfig.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]}`;
+    }
+    return `/${resourceConfig.type}/${resourceConfig.id}`;
+  }, resourceGuard = (service, config) => {
+    if (config["~experimental_resource"])
+      throw new Error(`\`${service}\` does not support resource-based operations`);
   };
   function once(fn) {
     let didCall = false, returnValue;
@@ -2128,14 +2142,14 @@
     const newConfig = {
       ...defaultConfig,
       ...specifiedConfig
-    }, projectBased = newConfig.useProjectHostname;
+    }, projectBased = newConfig.useProjectHostname && !newConfig["~experimental_resource"];
     if (typeof Promise > "u") {
       const helpUrl = generateHelpUrl("js-client-promise-polyfill");
       throw new Error(`No native Promise-implementation found, polyfill needed - see ${helpUrl}`);
     }
     if (projectBased && !newConfig.projectId)
       throw new Error("Configuration must contain `projectId`");
-    if (typeof newConfig.perspective < "u" && validateApiPerspective(newConfig.perspective), "encodeSourceMap" in newConfig)
+    if (newConfig["~experimental_resource"] && resourceBase(newConfig), typeof newConfig.perspective < "u" && validateApiPerspective(newConfig.perspective), "encodeSourceMap" in newConfig)
       throw new Error(
         "It looks like you're using options meant for '@sanity/preview-kit/client'. 'encodeSourceMap' is not supported in '@sanity/client'. Did you mean 'stega.enabled'?"
       );
@@ -2154,7 +2168,7 @@
     const isBrowser = typeof window < "u" && window.location && window.location.hostname, isLocalhost = isBrowser && isLocal(window.location.hostname), hasToken = !!newConfig.token;
     newConfig.withCredentials && hasToken && (printCredentialedTokenWarning(), newConfig.withCredentials = false), isBrowser && isLocalhost && hasToken && 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(/\.+$/, "") : void 0), 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;
-    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;
+    return projectBased ? (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";
@@ -2722,7 +2736,7 @@ ${selectionOpts}`);
     );
   }
   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: true,
@@ -2737,7 +2751,7 @@ ${selectionOpts}`);
       resultSourceMap: options.resultSourceMap,
       lastLiveEventId: Array.isArray(lastLiveEventId) ? lastLiveEventId[0] : lastLiveEventId,
       cacheMode,
-      canUseCdn: isQuery,
+      canUseCdn: isQuery2,
       signal: options.signal,
       fetch: options.fetch,
       useAbortSignal: options.useAbortSignal,
@@ -2765,11 +2779,21 @@ ${selectionOpts}`);
     const mutation = { [op]: doc }, opts = Object.assign({ returnFirst: true, returnDocuments: true }, options);
     return _dataRequest(client, httpRequest, "mutate", { mutations: [mutation] }, opts);
   }
+  const resourceDatasetRegex = /^\/projects\/([^/]+)\/datasets\/([^/]+)\/([^/^?]+)\/?/, isResourceDataEndpoint = (config, uri, endpoint) => {
+    if (!config["~experimental_resource"])
+      return false;
+    if (uri.startsWith(
+      `/${config["~experimental_resource"].type}/${config["~experimental_resource"].id}/${endpoint}`
+    ))
+      return true;
+    const match = uri.match(resourceDatasetRegex);
+    return match ? match[3] === endpoint : false;
+  }, isQuery = (config, uri) => uri.startsWith("/data/query/") || isResourceDataEndpoint(config, uri, "query"), isMutate = (config, uri) => uri.startsWith("/data/mutate/") || isResourceDataEndpoint(config, uri, "mutate"), isDoc = (config, uri) => uri.startsWith("/data/doc/") || isResourceDataEndpoint(config, uri, "doc"), isListener = (config, uri) => uri.startsWith("/data/listen/") || isResourceDataEndpoint(config, uri, "listen"), isHistory = (config, uri) => uri.startsWith("/data/history/") || isResourceDataEndpoint(config, uri, "history"), isData = (config, uri) => uri.startsWith("/data/") || isQuery(config, uri) || isMutate(config, uri) || isDoc(config, uri) || isListener(config, uri) || isHistory(config, 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 && uri.indexOf("/data/") === 0 : options.canUseCdn;
+    const uri = options.url || options.uri, config = client.config(), canUseCdn = typeof options.canUseCdn > "u" ? ["GET", "HEAD"].indexOf(options.method || "GET") >= 0 && isData(config, 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 && uri.indexOf("/data/query/") === 0) {
+    if (tag && options.tag !== null && (options.query = { tag: requestTag(tag), ...options.query }), ["GET", "HEAD", "POST"].indexOf(options.method || "GET") >= 0 && isQuery(config, uri)) {
       const resultSourceMap = options.resultSourceMap ?? config.resultSourceMap;
       resultSourceMap !== void 0 && resultSourceMap !== false && (options.query = { resultSourceMap, ...options.query });
       const perspectiveOption = options.perspective || config.perspective;
@@ -2796,7 +2820,12 @@ ${selectionOpts}`);
     );
   }
   function _getDataUrl(client, operation, path) {
-    const config = client.config(), catalog = hasDataset(config), baseUri = `/${operation}/${catalog}`;
+    const config = client.config();
+    if (config["~experimental_resource"]) {
+      const resourceBase$1 = resourceBase(config), uri2 = path ? `${operation}/${path}` : operation;
+      return `${resourceBase$1}/${uri2}`.replace(/\/($|\?)/, "$1");
+    }
+    const catalog = hasDataset(config), baseUri = `/${operation}/${catalog}`;
     return `/data${path ? `${baseUri}/${path}` : baseUri}`.replace(/\/($|\?)/, "$1");
   }
   function _getUrl(client, uri, canUseCdn = false) {
@@ -2823,42 +2852,6 @@ ${selectionOpts}`);
     const error = new Error(signal?.reason ?? "The operation was aborted.");
     return error.name = "AbortError", error;
   }
-  function _instruct(client, httpRequest, request) {
-    const dataset2 = hasDataset(client.config());
-    return _request(client, httpRequest, {
-      method: "POST",
-      uri: `/assist/tasks/instruct/${dataset2}`,
-      body: request
-    });
-  }
-  class ObservableAiClient {
-    #client;
-    #httpRequest;
-    constructor(client, httpRequest) {
-      this.#client = client, this.#httpRequest = httpRequest;
-    }
-    /**
-     * Run an ad-hoc instruction for a target document.
-     * @param request instruction request
-     */
-    instruct(request) {
-      return _instruct(this.#client, this.#httpRequest, request);
-    }
-  }
-  class AiClient {
-    #client;
-    #httpRequest;
-    constructor(client, httpRequest) {
-      this.#client = client, this.#httpRequest = httpRequest;
-    }
-    /**
-     * Run an ad-hoc instruction for a target document.
-     * @param request instruction request
-     */
-    instruct(request) {
-      return lastValueFrom(_instruct(this.#client, this.#httpRequest, request));
-    }
-  }
   class ObservableAssetsClient {
     #client;
     #httpRequest;
@@ -2891,7 +2884,7 @@ ${selectionOpts}`);
     validateAssetType(assetType);
     let meta = opts.extract || void 0;
     meta && !meta.length && (meta = ["none"]);
-    const dataset2 = hasDataset(client.config()), assetEndpoint = assetType === "image" ? "images" : "files", options = optionsFromFile(opts, body), { tag, label, title, description, creditLine, filename, source } = options, query = {
+    const config = client.config(), options = optionsFromFile(opts, body), { tag, label, title, description, creditLine, filename, source } = options, query = {
       label,
       title,
       description,
@@ -2903,12 +2896,19 @@ ${selectionOpts}`);
       tag,
       method: "POST",
       timeout: options.timeout || 0,
-      uri: `/assets/${assetEndpoint}/${dataset2}`,
+      uri: buildAssetUploadUrl(config, assetType),
       headers: options.contentType ? { "Content-Type": options.contentType } : {},
       query,
       body
     });
   }
+  function buildAssetUploadUrl(config, assetType) {
+    const assetTypeEndpoint = assetType === "image" ? "images" : "files";
+    if (config["~experimental_resource"])
+      return `${config["~experimental_resource"].type}/${config["~experimental_resource"].id}/assets/${assetTypeEndpoint}`;
+    const dataset2 = hasDataset(config);
+    return `assets/${assetTypeEndpoint}/${dataset2}`;
+  }
   function optionsFromFile(opts, file) {
     return typeof File > "u" || !(file instanceof File) ? opts : Object.assign(
       {
@@ -3000,6 +3000,7 @@ ${selectionOpts}`);
       includeDrafts = false,
       tag: _tag
     } = {}) {
+      resourceGuard("live", this.#client.config());
       const {
         projectId: projectId2,
         apiVersion: _apiVersion,
@@ -3129,7 +3130,7 @@ ${selectionOpts}`);
      * @param options - Options for the dataset
      */
     create(name, options) {
-      return lastValueFrom(
+      return resourceGuard("dataset", this.#client.config()), lastValueFrom(
         _modify(this.#client, this.#httpRequest, "PUT", name, options)
       );
     }
@@ -3140,7 +3141,7 @@ ${selectionOpts}`);
      * @param options - New options for the dataset
      */
     edit(name, options) {
-      return lastValueFrom(
+      return resourceGuard("dataset", this.#client.config()), lastValueFrom(
         _modify(this.#client, this.#httpRequest, "PATCH", name, options)
       );
     }
@@ -3150,19 +3151,19 @@ ${selectionOpts}`);
      * @param name - Name of the dataset to delete
      */
     delete(name) {
-      return lastValueFrom(_modify(this.#client, this.#httpRequest, "DELETE", name));
+      return resourceGuard("dataset", this.#client.config()), lastValueFrom(_modify(this.#client, this.#httpRequest, "DELETE", name));
     }
     /**
      * Fetch a list of datasets for the configured project
      */
     list() {
-      return lastValueFrom(
+      return resourceGuard("dataset", this.#client.config()), lastValueFrom(
         _request(this.#client, this.#httpRequest, { uri: "/datasets", tag: null })
       );
     }
   }
   function _modify(client, httpRequest, method, name, options) {
-    return dataset(name), _request(client, httpRequest, {
+    return resourceGuard("dataset", client.config()), dataset(name), _request(client, httpRequest, {
       method,
       uri: `/datasets/${name}`,
       body: options,
@@ -3176,6 +3177,7 @@ ${selectionOpts}`);
       this.#client = client, this.#httpRequest = httpRequest;
     }
     list(options) {
+      resourceGuard("projects", this.#client.config());
       const uri = options?.includeMembers === false ? "/projects?includeMembers=false" : "/projects";
       return _request(this.#client, this.#httpRequest, { uri });
     }
@@ -3185,7 +3187,7 @@ ${selectionOpts}`);
      * @param projectId - ID of the project to fetch
      */
     getById(projectId2) {
-      return _request(this.#client, this.#httpRequest, { uri: `/projects/${projectId2}` });
+      return resourceGuard("projects", this.#client.config()), _request(this.#client, this.#httpRequest, { uri: `/projects/${projectId2}` });
     }
   }
   class ProjectsClient {
@@ -3195,6 +3197,7 @@ ${selectionOpts}`);
       this.#client = client, this.#httpRequest = httpRequest;
     }
     list(options) {
+      resourceGuard("projects", this.#client.config());
       const uri = options?.includeMembers === false ? "/projects?includeMembers=false" : "/projects";
       return lastValueFrom(_request(this.#client, this.#httpRequest, { uri }));
     }
@@ -3204,7 +3207,7 @@ ${selectionOpts}`);
      * @param projectId - ID of the project to fetch
      */
     getById(projectId2) {
-      return lastValueFrom(
+      return resourceGuard("projects", this.#client.config()), lastValueFrom(
         _request(this.#client, this.#httpRequest, { uri: `/projects/${projectId2}` })
       );
     }
@@ -3253,7 +3256,6 @@ ${selectionOpts}`);
     live;
     projects;
     users;
-    ai;
     /**
      * Private properties
      */
@@ -3264,7 +3266,7 @@ ${selectionOpts}`);
      */
     listen = _listen;
     constructor(httpRequest, config = defaultConfig) {
-      this.config(config), this.#httpRequest = httpRequest, this.assets = new ObservableAssetsClient(this, this.#httpRequest), this.datasets = new ObservableDatasetsClient(this, this.#httpRequest), this.live = new LiveClient(this), this.projects = new ObservableProjectsClient(this, this.#httpRequest), this.users = new ObservableUsersClient(this, this.#httpRequest), this.ai = new ObservableAiClient(this, this.#httpRequest);
+      this.config(config), this.#httpRequest = httpRequest, this.assets = new ObservableAssetsClient(this, this.#httpRequest), this.datasets = new ObservableDatasetsClient(this, this.#httpRequest), this.live = new LiveClient(this), this.projects = new ObservableProjectsClient(this, this.#httpRequest), this.users = new ObservableUsersClient(this, this.#httpRequest);
     }
     /**
      * Clone the client - returns a new instance
@@ -3403,7 +3405,6 @@ ${selectionOpts}`);
     live;
     projects;
     users;
-    ai;
     /**
      * Observable version of the Sanity client, with the same configuration as the promise-based one
      */
@@ -3418,7 +3419,7 @@ ${selectionOpts}`);
      */
     listen = _listen;
     constructor(httpRequest, config = defaultConfig) {
-      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.ai = new AiClient(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