@sanity/client 6.29.0-generate.2 → 6.29.0-generate.3

package/src/agent/actions/AgentActionsClient.ts

@@ -2,19 +2,9 @@ import {lastValueFrom, type Observable} from 'rxjs'
 
 import type {ObservableSanityClient, SanityClient} from '../../SanityClient'
 import type {Any, HttpRequest, IdentifiedSanityDocumentStub, TranslateDocument} from '../../types'
-import {
-  _generate,
-  type GenerateAsyncInstruction,
-  type GenerateInstruction,
-  type GenerateSyncInstruction,
-} from './generate'
-import {
-  _transform,
-  type TransformDocument,
-  type TransformDocumentAsync,
-  type TransformDocumentSync,
-} from './transform'
-import {_translate, type TranslateDocumentAsync, type TranslateDocumentSync} from './translate'
+import {_generate, type GenerateInstruction} from './generate'
+import {_transform, type TransformDocument} from './transform'
+import {_translate} from './translate'
 
 /** @public */
 export class ObservableAgentsActionClient {
@@ -25,59 +15,44 @@ export class ObservableAgentsActionClient {
     this.#httpRequest = httpRequest
   }
 
-  generate(request: GenerateAsyncInstruction): Observable<{_id: string}>
-
-  generate<DocumentShape extends Record<string, Any>>(
-    request: GenerateSyncInstruction<DocumentShape>,
-  ): Observable<IdentifiedSanityDocumentStub & DocumentShape>
-
   /**
    * Run an instruction to generate content in a target document.
    * @param request instruction request
    */
-  generate<
-    DocumentShape extends Record<string, Any>,
-    Req extends GenerateInstruction<DocumentShape>,
-  >(
-    request: Req,
+  generate<DocumentShape extends Record<string, Any>>(
+    request: GenerateInstruction<DocumentShape>,
   ): Observable<
-    Req['async'] extends true ? {_id: string} : IdentifiedSanityDocumentStub & DocumentShape
+    (typeof request)['async'] extends true
+      ? {_id: string}
+      : IdentifiedSanityDocumentStub & DocumentShape
   > {
     return _generate(this.#client, this.#httpRequest, request)
   }
 
-  transform(request: TransformDocumentAsync): Observable<{_id: string}>
-
-  transform<DocumentShape extends Record<string, Any>>(
-    request: TransformDocumentSync,
-  ): Observable<IdentifiedSanityDocumentStub & DocumentShape>
-
   /**
    * Transform a target document based on a source.
    * @param request translation request
    */
-  transform<DocumentShape extends Record<string, Any>, Req extends TransformDocument>(
-    request: Req,
+  transform<DocumentShape extends Record<string, Any>>(
+    request: TransformDocument<DocumentShape>,
   ): Observable<
-    Req['async'] extends true ? {_id: string} : IdentifiedSanityDocumentStub & DocumentShape
+    (typeof request)['async'] extends true
+      ? {_id: string}
+      : IdentifiedSanityDocumentStub & DocumentShape
   > {
     return _transform(this.#client, this.#httpRequest, request)
   }
 
-  translate(request: TranslateDocumentAsync): Observable<{_id: string}>
-
-  translate<DocumentShape extends Record<string, Any>>(
-    request: TranslateDocumentSync,
-  ): Observable<IdentifiedSanityDocumentStub & DocumentShape>
-
   /**
    * Translate a target document based on a source.
    * @param request translation request
    */
-  translate<DocumentShape extends Record<string, Any>, Req extends TranslateDocument>(
-    request: Req,
+  translate<DocumentShape extends Record<string, Any>>(
+    request: TranslateDocument<DocumentShape>,
   ): Observable<
-    Req['async'] extends true ? {_id: string} : IdentifiedSanityDocumentStub & DocumentShape
+    (typeof request)['async'] extends true
+      ? {_id: string}
+      : IdentifiedSanityDocumentStub & DocumentShape
   > {
     return _translate(this.#client, this.#httpRequest, request)
   }
@@ -92,59 +67,44 @@ export class AgentActionsClient {
     this.#httpRequest = httpRequest
   }
 
-  generate(request: GenerateAsyncInstruction): Promise<{_id: string}>
-
-  generate<DocumentShape extends Record<string, Any>>(
-    request: GenerateSyncInstruction<DocumentShape>,
-  ): Promise<IdentifiedSanityDocumentStub & DocumentShape>
-
   /**
    * Run an instruction to generate content in a target document.
    * @param request instruction request
    */
-  generate<
-    DocumentShape extends Record<string, Any>,
-    Req extends GenerateInstruction<DocumentShape>,
-  >(
-    request: Req,
+  generate<DocumentShape extends Record<string, Any>>(
+    request: GenerateInstruction<DocumentShape>,
   ): Promise<
-    Req['async'] extends true ? {_id: string} : IdentifiedSanityDocumentStub & DocumentShape
+    (typeof request)['async'] extends true
+      ? {_id: string}
+      : IdentifiedSanityDocumentStub & DocumentShape
   > {
     return lastValueFrom(_generate(this.#client, this.#httpRequest, request))
   }
 
-  transform(request: TransformDocumentAsync): Promise<{_id: string}>
-
-  transform<DocumentShape extends Record<string, Any>>(
-    request: TransformDocumentSync,
-  ): Promise<IdentifiedSanityDocumentStub & DocumentShape>
-
   /**
    * Transform a target document based on a source.
    * @param request translation request
    */
-  transform<DocumentShape extends Record<string, Any>, Req extends TransformDocument>(
-    request: Req,
+  transform<DocumentShape extends Record<string, Any>>(
+    request: TransformDocument<DocumentShape>,
   ): Promise<
-    Req['async'] extends true ? {_id: string} : IdentifiedSanityDocumentStub & DocumentShape
+    (typeof request)['async'] extends true
+      ? {_id: string}
+      : IdentifiedSanityDocumentStub & DocumentShape
   > {
     return lastValueFrom(_transform(this.#client, this.#httpRequest, request))
   }
 
-  translate(request: TranslateDocumentAsync): Promise<{_id: string}>
-
-  translate<DocumentShape extends Record<string, Any>>(
-    request: TranslateDocumentSync,
-  ): Promise<IdentifiedSanityDocumentStub & DocumentShape>
-
   /**
    * Translate a target document based on a source.
    * @param request translation request
    */
-  translate<DocumentShape extends Record<string, Any>, Req extends TranslateDocument>(
-    request: Req,
+  translate<DocumentShape extends Record<string, Any>>(
+    request: TranslateDocument<DocumentShape>,
   ): Promise<
-    Req['async'] extends true ? {_id: string} : IdentifiedSanityDocumentStub & DocumentShape
+    (typeof request)['async'] extends true
+      ? {_id: string}
+      : IdentifiedSanityDocumentStub & DocumentShape
   > {
     return lastValueFrom(_translate(this.#client, this.#httpRequest, request))
   }

package/src/agent/actions/generate.ts

@@ -156,15 +156,14 @@ export type GenerateInstruction<T extends Record<string, Any> = Record<string, A
   | GenerateSyncInstruction<T>
   | GenerateAsyncInstruction<T>
 
-export function _generate<
-  DocumentShape extends Record<string, Any>,
-  Req extends GenerateInstruction<DocumentShape>,
->(
+export function _generate<DocumentShape extends Record<string, Any>>(
   client: SanityClient | ObservableSanityClient,
   httpRequest: HttpRequest,
-  request: Req,
+  request: GenerateInstruction<DocumentShape>,
 ): Observable<
-  Req['async'] extends true ? {_id: string} : IdentifiedSanityDocumentStub & DocumentShape
+  (typeof request)['async'] extends true
+    ? {_id: string}
+    : IdentifiedSanityDocumentStub & DocumentShape
 > {
   const dataset = hasDataset(client.config())
   return _request(client, httpRequest, {

package/src/agent/actions/transform.ts

@@ -80,23 +80,27 @@ export interface TransformTarget extends AgentActionTarget {
 }
 
 /** @beta */
-export type TransformDocumentSync = TransformRequestBase & AgentActionSync
+// need the generics to hold optional call-site response generics
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+export type TransformDocumentSync<T extends Record<string, Any> = Record<string, Any>> =
+  TransformRequestBase & AgentActionSync
 
 /** @beta */
 export type TransformDocumentAsync = TransformRequestBase & AgentActionAsync
 
 /** @beta */
-export type TransformDocument = TransformDocumentSync | TransformDocumentAsync
+export type TransformDocument<T extends Record<string, Any> = Record<string, Any>> =
+  | TransformDocumentSync<T>
+  | TransformDocumentAsync
 
-export function _transform<
-  DocumentShape extends Record<string, Any>,
-  Req extends TransformDocument,
->(
+export function _transform<DocumentShape extends Record<string, Any>>(
   client: SanityClient | ObservableSanityClient,
   httpRequest: HttpRequest,
-  request: Req,
+  request: TransformDocument<DocumentShape>,
 ): Observable<
-  Req['async'] extends true ? {_id: string} : IdentifiedSanityDocumentStub & DocumentShape
+  (typeof request)['async'] extends true
+    ? {_id: string}
+    : IdentifiedSanityDocumentStub & DocumentShape
 > {
   const dataset = hasDataset(client.config())
   return _request(client, httpRequest, {

package/src/agent/actions/translate.ts

@@ -93,23 +93,27 @@ export interface TranslateTarget extends AgentActionTarget {
 }
 
 /** @beta */
-export type TranslateDocumentSync = TranslateRequestBase & AgentActionSync
+// need the generics to hold optional call-site response generics
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+export type TranslateDocumentSync<T extends Record<string, Any> = Record<string, Any>> =
+  TranslateRequestBase & AgentActionSync
 
 /** @beta */
 export type TranslateDocumentAsync = TranslateRequestBase & AgentActionAsync
 
 /** @beta */
-export type TranslateDocument = TranslateDocumentSync | TranslateDocumentAsync
+export type TranslateDocument<T extends Record<string, Any> = Record<string, Any>> =
+  | TranslateDocumentSync<T>
+  | TranslateDocumentAsync
 
-export function _translate<
-  DocumentShape extends Record<string, Any>,
-  Req extends TranslateDocument,
->(
+export function _translate<DocumentShape extends Record<string, Any>>(
   client: SanityClient | ObservableSanityClient,
   httpRequest: HttpRequest,
-  request: Req,
+  request: TranslateDocument<DocumentShape>,
 ): Observable<
-  Req['async'] extends true ? {_id: string} : IdentifiedSanityDocumentStub & DocumentShape
+  (typeof request)['async'] extends true
+    ? {_id: string}
+    : IdentifiedSanityDocumentStub & DocumentShape
 > {
   const dataset = hasDataset(client.config())
   return _request(client, httpRequest, {