@sanity/client 6.28.3-instruct.0 → 6.28.3-instruct.2

package/dist/index.browser.d.ts

@@ -122,110 +122,6 @@ export declare class AssetsClient {
   ): Promise<SanityAssetDocument | SanityImageAssetDocument>
 }
 
-/** @beta */
-export declare type AssistAsyncInstruction<
-  T extends Record<string, Any_2> = Record<string, Any_2>,
-> = (ExistingDocumentRequest | CreateDocumentRequest<T>) & AssistRequestBase & Async
-
-/** @public */
-declare class AssistClient {
-  #private
-  constructor(client: SanityClient, httpRequest: HttpRequest)
-  instruct(request: AssistAsyncInstruction): Promise<{
-    _id: string
-  }>
-  instruct<DocumentShape extends Record<string, Any>>(
-    request: AssistSyncInstruction<DocumentShape>,
-  ): Promise<IdentifiedSanityDocumentStub & DocumentShape>
-}
-
-/** @beta */
-export declare type AssistInstruction<T extends Record<string, Any_2> = Record<string, Any_2>> =
-  | AssistSyncInstruction<T>
-  | AssistAsyncInstruction<T>
-
-declare interface AssistRequestBase {
-  /** schemaId as reported by sanity deploy / sanity schema store */
-  schemaId: string
-  /** string template using $variable – more on this below under "Dynamic instruction" */
-  instruction: string
-  /** param values for the string template, keys are the variable name, ie if the template has "$variable", one key must be "variable" */
-  instructionParams?: InstructionParams
-  /**
-   *  Optional document path output target for the instruction.
-   *  When provided, the instruction will apply to this path in the document and its children.
-   *
-   *  ## Examples
-   *  - `path: 'title'` will output to the title field in the document
-   * - `path: 'array[_key="xx"]'` will output to the item with `_key: 'xx'` in the array field
-   */
-  path?: string
-  /**
-   * Controls sub-paths in the document that can be output to.
-   *
-   * The string-paths are relative to the `path` param
-   *
-   * Note: these path strings are less strictly validated than the `path` param itself:
-   * if an relative-path does not exist or is invalid, it will be silently ignored.
-   *
-   * @see AssistRequestBase#conditionalPaths
-   * @see AssistRequestBase#outputTypes
-   */
-  relativeOutputPaths?:
-    | {
-        include: string[]
-      }
-    | {
-        exclude: string[]
-      }
-  /**
-   * Controls which types the instruction is allowed to output to.
-   *
-   * @see AssistRequestBase#relativeOutputPaths
-   * @see AssistRequestBase#conditionalPaths
-   */
-  outputTypes?:
-    | {
-        include: string[]
-      }
-    | {
-        exclude: string[]
-      }
-  /**
-   * When a type or field in the schema has a function set for `hidden` or `readOnly`, it is conditional.
-   *
-   * By default, AI Assist will not output to conditional `readOnly` and `hidden` fields,
-   * ie, they are considered to resolve to `readOnly: true` / `hidden: true`.
-   *
-   * `conditionalPaths` param allows setting the default conditional value for
-   * `hidden` and `readOnly` to false,
-   * or individually set `hidden` and `readOnly` state for individual document paths.
-   *
-   *
-   * Note: fields and types with explicit readOnly: true or hidden: true in the schema, are not available to AI Assist,
-   * and cannot be changed via conditionalPaths.
-   *
-   * conditionalPaths state only apply to fields and types that have conditional `hidden` or `readOnly` in their schema definition.
-   *
-   * @see AssistRequestBase#relativeOutputPaths
-   * @see AssistRequestBase#outputTypes
-   */
-  conditionalPaths?: {
-    defaultReadOnly?: boolean
-    defaultHidden?: boolean
-    paths?: {
-      /** path here is not a relative path: it must be the full document path, regardless of `path` param on the request itself */
-      path: string
-      readOnly: boolean
-      hidden: boolean
-    }[]
-  }
-}
-
-/** @beta */
-export declare type AssistSyncInstruction<T extends Record<string, Any_2> = Record<string, Any_2>> =
-  (ExistingDocumentRequest | CreateDocumentRequest<T>) & AssistRequestBase & Sync
-
 declare interface Async {
   /**
    * When async: true, requests responds with status 201 and {_id} as response body as soon as the request is validated.
@@ -577,12 +473,6 @@ export declare class ConnectionFailedError extends Error {
   readonly name = 'ConnectionFailedError'
 }
 
-/** @beta */
-export declare interface ConstantInstructionParam {
-  type: 'constant'
-  value: string
-}
-
 /** @public */
 export declare interface ContentSourceMap {
   mappings: ContentSourceMapMappings
@@ -928,23 +818,6 @@ declare interface ExistingDocumentRequest {
   documentId: string
 }
 
-/**
- *
- * Includes a LLM-friendly version of the field value in the instruction
- * @beta
- * */
-export declare interface FieldInstructionParam {
-  type: 'field'
-  /**
-   * Examples: 'title', 'array[_key=="key"].field
-   */
-  path: string
-  /**
-   * If omitted, implicitly uses the documentId of the instruction target
-   */
-  documentId?: string
-}
-
 /** @public */
 export declare type FilterDefault = (props: {
   /**
@@ -1011,13 +884,6 @@ export declare type FirstDocumentMutationOptions = BaseMutationOptions & {
   returnDocuments?: true
 }
 
-/** @beta */
-export declare interface GroqInstructionParam {
-  type: 'groq'
-  query: string
-  params?: Record<string, string>
-}
-
 /** @public */
 export declare type HttpRequest = {
   (options: RequestOptions, requester: Requester): ReturnType<Requester>
@@ -1079,15 +945,141 @@ export declare type InsertPatch =
     }
 
 /** @beta */
-export declare type InstructionParam =
+export declare type InstructAsyncInstruction<
+  T extends Record<string, Any_2> = Record<string, Any_2>,
+> = (ExistingDocumentRequest | CreateDocumentRequest<T>) & InstructRequestBase & Async
+
+/** @beta */
+export declare interface InstructConstantInstructionParam {
+  type: 'constant'
+  value: string
+}
+
+/**
+ *
+ * Includes a LLM-friendly version of the field value in the instruction
+ * @beta
+ * */
+export declare interface InstructFieldInstructionParam {
+  type: 'field'
+  /**
+   * Examples: 'title', 'array[_key=="key"].field'
+   */
+  path: string
+  /**
+   * If omitted, implicitly uses the documentId of the instruction target
+   */
+  documentId?: string
+}
+
+/**
+ * Includes a LLM-friendly version of GROQ query result in the instruction
+ * @beta
+ * */
+export declare interface InstructGroqInstructionParam {
+  type: 'groq'
+  query: string
+  params?: Record<string, string>
+}
+
+/** @beta */
+export declare type InstructInstruction<T extends Record<string, Any_2> = Record<string, Any_2>> =
+  | InstructSyncInstruction<T>
+  | InstructAsyncInstruction<T>
+
+/** @beta */
+export declare type InstructInstructionParam =
   | string
-  | ConstantInstructionParam
-  | FieldInstructionParam
+  | InstructConstantInstructionParam
+  | InstructFieldInstructionParam
   | DocumentInstructionParam
-  | GroqInstructionParam
+  | InstructGroqInstructionParam
 
 /** @beta */
-export declare type InstructionParams = Record<string, InstructionParam>
+export declare type InstructInstructionParams = Record<string, InstructInstructionParam>
+
+declare interface InstructRequestBase {
+  /** schemaId as reported by sanity deploy / sanity schema store */
+  schemaId: string
+  /** string template using $variable – more on this below under "Dynamic instruction" */
+  instruction: string
+  /** param values for the string template, keys are the variable name, ie if the template has "$variable", one key must be "variable" */
+  instructionParams?: InstructInstructionParams
+  /**
+   *  Optional document path output target for the instruction.
+   *  When provided, the instruction will apply to this path in the document and its children.
+   *
+   *  ## Examples
+   *  - `path: 'title'` will output to the title field in the document
+   * - `path: 'array[_key="xx"]'` will output to the item with `_key: 'xx'` in the array field
+   */
+  path?: string
+  /**
+   * Controls sub-paths in the document that can be output to.
+   *
+   * The string-paths are relative to the `path` param
+   *
+   * Note: these path strings are less strictly validated than the `path` param itself:
+   * if an relative-path does not exist or is invalid, it will be silently ignored.
+   *
+   * @see InstructRequestBase#conditionalPaths
+   * @see InstructRequestBase#outputTypes
+   */
+  relativeOutputPaths?:
+    | {
+        include: string[]
+      }
+    | {
+        exclude: string[]
+      }
+  /**
+   * Controls which types the instruction is allowed to output to.
+   *
+   * @see InstructRequestBase#relativeOutputPaths
+   * @see InstructRequestBase#conditionalPaths
+   */
+  outputTypes?:
+    | {
+        include: string[]
+      }
+    | {
+        exclude: string[]
+      }
+  /**
+   * When a type or field in the schema has a function set for `hidden` or `readOnly`, it is conditional.
+   *
+   * By default, AI Instruct will not output to conditional `readOnly` and `hidden` fields,
+   * ie, they are considered to resolve to `readOnly: true` / `hidden: true`.
+   *
+   * `conditionalPaths` param allows setting the default conditional value for
+   * `hidden` and `readOnly` to false,
+   * or individually set `hidden` and `readOnly` state for individual document paths.
+   *
+   *
+   * Note: fields and types with explicit readOnly: true or hidden: true in the schema, are not available to AI Instruct,
+   * and cannot be changed via conditionalPaths.
+   *
+   * conditionalPaths state only apply to fields and types that have conditional `hidden` or `readOnly` in their schema definition.
+   *
+   * @see InstructRequestBase#relativeOutputPaths
+   * @see InstructRequestBase#outputTypes
+   */
+  conditionalPaths?: {
+    defaultReadOnly?: boolean
+    defaultHidden?: boolean
+    paths?: {
+      /** path here is not a relative path: it must be the full document path, regardless of `path` param on the request itself */
+      path: string
+      readOnly: boolean
+      hidden: boolean
+    }[]
+  }
+}
+
+/** @beta */
+export declare type InstructSyncInstruction<
+  T extends Record<string, Any_2> = Record<string, Any_2>,
+> = (ExistingDocumentRequest | CreateDocumentRequest<T>) & InstructRequestBase & Sync
 
 /**
  * Set up a listener that will be notified when mutations occur on documents matching the provided query/filter.
@@ -1503,18 +1495,6 @@ export declare class ObservableAssetsClient {
   >
 }
 
-/** @public */
-declare class ObservableAssistClient {
-  #private
-  constructor(client: ObservableSanityClient, httpRequest: HttpRequest)
-  instruct(request: AssistAsyncInstruction): Observable<{
-    _id: string
-  }>
-  instruct<DocumentShape extends Record<string, Any>>(
-    request: AssistSyncInstruction<DocumentShape>,
-  ): Observable<IdentifiedSanityDocumentStub & DocumentShape>
-}
-
 /** @internal */
 export declare class ObservableDatasetsClient {
   #private
@@ -1638,7 +1618,6 @@ export declare class ObservableSanityClient {
   live: LiveClient
   projects: ObservableProjectsClient
   users: ObservableUsersClient
-  assist: ObservableAssistClient
   /**
    * Instance properties
    */
@@ -2133,6 +2112,12 @@ export declare class ObservableSanityClient {
    * @param path - Path to append after the operation
    */
   getDataUrl(operation: string, path?: string): string
+  instruct(request: InstructAsyncInstruction): Observable<{
+    _id: string
+  }>
+  instruct<DocumentShape extends Record<string, Any>>(
+    request: InstructSyncInstruction<DocumentShape>,
+  ): Observable<IdentifiedSanityDocumentStub & DocumentShape>
 }
 
 /** @public */
@@ -2558,7 +2543,6 @@ export declare class SanityClient {
   live: LiveClient
   projects: ProjectsClient
   users: UsersClient
-  assist: AssistClient
   /**
    * Observable version of the Sanity client, with the same configuration as the promise-based one
    */
@@ -3073,6 +3057,12 @@ export declare class SanityClient {
    * @param path - Path to append after the operation
    */
   getDataUrl(operation: string, path?: string): string
+  instruct(request: InstructAsyncInstruction): Promise<{
+    _id: string
+  }>
+  instruct<DocumentShape extends Record<string, Any>>(
+    request: InstructSyncInstruction<DocumentShape>,
+  ): Promise<IdentifiedSanityDocumentStub & DocumentShape>
 }
 
 /** @internal */

package/dist/index.browser.js

@@ -180,6 +180,9 @@ const createWarningPrinter = (message) => (
   `See ${generateHelpUrl(
     "js-client-browser-token"
   )} for more information and how to hide this warning.`
+]), printCredentialedTokenWarning = createWarningPrinter([
+  "You have configured Sanity client to use a token, but also provided `withCredentials: true`.",
+  "This is no longer supported - only token will be used - remove `withCredentials: true`."
 ]), printNoApiVersionSpecifiedWarning = createWarningPrinter([
   "Using the Sanity client without specifying an API version is deprecated.",
   `See ${generateHelpUrl("js-client-api-version")}`
@@ -198,21 +201,11 @@ function validateApiVersion(apiVersion) {
   if (!(/^\d{4}-\d{2}-\d{2}$/.test(apiVersion) && apiDate instanceof Date && apiDate.getTime() > 0))
     throw new Error("Invalid API version string, expected `1` or date in format `YYYY-MM-DD`");
 }
-const VALID_PERSPECTIVE = /^[a-z0-9_]+$/i;
 function validateApiPerspective(perspective) {
-  if (Array.isArray(perspective) && perspective.includes("raw"))
+  if (Array.isArray(perspective) && perspective.length > 1 && perspective.includes("raw"))
     throw new TypeError(
       'Invalid API perspective value: "raw". The raw-perspective can not be combined with other perspectives'
     );
-  const invalid = (Array.isArray(perspective) ? perspective : [perspective]).filter(
-    (perspectiveName) => typeof perspectiveName != "string" || !VALID_PERSPECTIVE.test(perspectiveName)
-  );
-  if (invalid.length > 0) {
-    const formatted = invalid.map((v) => JSON.stringify(v));
-    throw new TypeError(
-      `Invalid API perspective value${invalid.length === 1 ? "" : "s"}: ${formatted.join(", ")}, expected \`published\`, \`drafts\`, \`raw\` or a release identifier string`
-    );
-  }
 }
 const initConfig = (config, prevConfig) => {
   const specifiedConfig = {
@@ -250,8 +243,8 @@ const initConfig = (config, prevConfig) => {
     throw new Error(
       `stega.studioUrl must be a string or a function, received ${newConfig.stega.studioUrl}`
     );
-  const isBrowser = typeof window < "u" && window.location && window.location.hostname, isLocalhost = isBrowser && isLocal(window.location.hostname);
-  isBrowser && isLocalhost && newConfig.token && newConfig.ignoreBrowserTokenWarning !== !0 ? 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 === !0 && newConfig.withCredentials && printCdnAndWithCredentialsWarning(), newConfig.useCdn = newConfig.useCdn !== !1 && !newConfig.withCredentials, validateApiVersion(newConfig.apiVersion);
+  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 = !1), isBrowser && isLocalhost && hasToken && newConfig.ignoreBrowserTokenWarning !== !0 ? 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 === !0 && newConfig.withCredentials && printCdnAndWithCredentialsWarning(), newConfig.useCdn = newConfig.useCdn !== !1 && !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;
 };
@@ -699,7 +692,7 @@ const projectHeader = "X-Sanity-Project-ID";
 function requestOptions(config, overrides = {}) {
   const headers = {}, token = overrides.token || config.token;
   token && (headers.Authorization = `Bearer ${token}`), !overrides.useGlobalApi && !config.useProjectHostname && config.projectId && (headers[projectHeader] = config.projectId);
-  const withCredentials = !!(typeof overrides.withCredentials > "u" ? config.token || config.withCredentials : overrides.withCredentials), timeout = typeof overrides.timeout > "u" ? config.timeout : overrides.timeout;
+  const withCredentials = !!(typeof overrides.withCredentials > "u" ? config.withCredentials : overrides.withCredentials), timeout = typeof overrides.timeout > "u" ? config.timeout : overrides.timeout;
   return Object.assign({}, overrides, {
     headers: Object.assign({}, headers, overrides.headers || {}),
     timeout: typeof timeout > "u" ? 5 * 60 * 1e3 : timeout,
@@ -981,42 +974,6 @@ function optionsFromFile(opts, file) {
     opts
   );
 }
-function _instruct(client, httpRequest, request) {
-  const dataset2 = hasDataset(client.config());
-  return _request(client, httpRequest, {
-    method: "POST",
-    uri: `/assist/tasks/instruct/${dataset2}`,
-    body: request
-  });
-}
-class ObservableAssistClient {
-  #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 AssistClient {
-  #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));
-  }
-}
 var defaults = (obj, defaults2) => Object.keys(defaults2).concat(Object.keys(obj)).reduce((target, prop) => (target[prop] = typeof obj[prop] > "u" ? defaults2[prop] : obj[prop], target), {});
 const pick = (obj, props) => props.reduce((selection, prop) => (typeof obj[prop] > "u" || (selection[prop] = obj[prop]), selection), {}), eventSourcePolyfill = defer(() => import("@sanity/eventsource")).pipe(
   map(({ default: EventSource2 }) => EventSource2),
@@ -1045,7 +1002,7 @@ function _listen(query, params, opts = {}) {
   if (uri.length > MAX_URL_LENGTH)
     return throwError(() => new Error("Query too large for listener"));
   const listenFor = options.events ? options.events : ["mutation"], esOptions = {};
-  return (token || withCredentials) && (esOptions.withCredentials = !0), token && (esOptions.headers = {
+  return withCredentials && (esOptions.withCredentials = !0), token && (esOptions.headers = {
     Authorization: `Bearer ${token}`
   }), connectEventSource(() => (
     // use polyfill if there is no global EventSource or if we need to set headers
@@ -1268,6 +1225,14 @@ function _modify(client, httpRequest, method, name, options) {
     tag: null
   });
 }
+function _instruct(client, httpRequest, request) {
+  const dataset2 = hasDataset(client.config());
+  return _request(client, httpRequest, {
+    method: "POST",
+    uri: `/assist/tasks/instruct/${dataset2}`,
+    body: request
+  });
+}
 class ObservableProjectsClient {
   #client;
   #httpRequest;
@@ -1352,7 +1317,6 @@ class ObservableSanityClient {
   live;
   projects;
   users;
-  assist;
   /**
    * Private properties
    */
@@ -1363,7 +1327,7 @@ class ObservableSanityClient {
    */
   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.assist = new ObservableAssistClient(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
@@ -1495,6 +1459,13 @@ class ObservableSanityClient {
   getDataUrl(operation, path) {
     return _getDataUrl(this, operation, path);
   }
+  /**
+   * Run an ad-hoc instruction for a target document.
+   * @param request instruction request
+   */
+  instruct(request) {
+    return _instruct(this, this.#httpRequest, request);
+  }
 }
 class SanityClient {
   assets;
@@ -1502,7 +1473,6 @@ class SanityClient {
   live;
   projects;
   users;
-  assist;
   /**
    * Observable version of the Sanity client, with the same configuration as the promise-based one
    */
@@ -1517,7 +1487,7 @@ class SanityClient {
    */
   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.assist = new AssistClient(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
@@ -1673,6 +1643,13 @@ class SanityClient {
   getDataUrl(operation, path) {
     return _getDataUrl(this, operation, path);
   }
+  /**
+   * Run an ad-hoc instruction for a target document.
+   * @param request instruction request
+   */
+  instruct(request) {
+    return lastValueFrom(_instruct(this, this.#httpRequest, request));
+  }
 }
 function defineCreateClientExports(envMiddleware2, ClassConstructor) {
   return { requester: defineHttpRequest(envMiddleware2), createClient: (config) => {