@sanity/client 7.26.1 → 8.0.0

package/src/mediaLibrary/MediaLibraryVideoClient.ts

@@ -1,6 +1,6 @@
-import {lastValueFrom, type Observable} from 'rxjs'
+import {type Observable} from 'rxjs'
 
-import {_request} from '../data/dataMethods'
+import {_request, _requestObservable} from '../data/dataMethods'
 import type {ObservableSanityClient, SanityClient} from '../SanityClient'
 import type {
   HttpRequest,
@@ -42,12 +42,12 @@ export class ObservableMediaLibraryVideoClient {
       )
     }
 
-    const uri = buildVideoPlaybackInfoUrl(instanceId, effectiveLibraryId)
+    const url = buildVideoPlaybackInfoUrl(instanceId, effectiveLibraryId)
     const queryParams = buildQueryParams(options)
 
-    return _request<VideoPlaybackInfo>(this.#client, this.#httpRequest, {
+    return _requestObservable<VideoPlaybackInfo>(this.#client, this.#httpRequest, {
       method: 'GET',
-      uri,
+      url,
       query: queryParams,
     })
   }
@@ -72,12 +72,27 @@ export class MediaLibraryVideoClient {
     assetIdentifier: MediaLibraryAssetInstanceIdentifier,
     options: MediaLibraryPlaybackInfoOptions = {},
   ): Promise<VideoPlaybackInfo> {
-    return lastValueFrom(
-      new ObservableMediaLibraryVideoClient(
-        this.#client.observable,
-        this.#httpRequest,
-      ).getPlaybackInfo(assetIdentifier, options),
-    )
+    const config = this.#client.config()
+    const resource = config.resource || config['~experimental_resource']
+    const configMediaLibraryId = resource?.id
+
+    const {instanceId, libraryId} = parseAssetInstanceId(assetIdentifier)
+    const effectiveLibraryId = libraryId || configMediaLibraryId
+
+    if (!effectiveLibraryId) {
+      throw new Error(
+        'Could not determine Media Library ID - you need to provide a valid Media Library ID in the client config or a Media Library GDR',
+      )
+    }
+
+    const url = buildVideoPlaybackInfoUrl(instanceId, effectiveLibraryId)
+    const queryParams = buildQueryParams(options)
+
+    return _request<VideoPlaybackInfo>(this.#client, this.#httpRequest, {
+      method: 'GET',
+      url,
+      query: queryParams,
+    })
   }
 }
 

package/src/projects/ProjectsClient.ts

@@ -1,6 +1,6 @@
-import {lastValueFrom, type Observable} from 'rxjs'
+import {type Observable} from 'rxjs'
 
-import {_request} from '../data/dataMethods'
+import {_request, _requestObservable} from '../data/dataMethods'
 import type {ObservableSanityClient, SanityClient} from '../SanityClient'
 import type {HttpRequest, SanityProject} from '../types'
 
@@ -37,7 +37,7 @@ export class ObservableProjectsClient {
     options?: T,
   ): Observable<Omit<SanityProject, OmittedProjectFields<T>>[]> {
     const query: Record<string, string> = {}
-    const uri = '/projects'
+    const url = '/projects'
     if (options?.includeMembers === false) {
       query.includeMembers = 'false'
     }
@@ -51,9 +51,10 @@ export class ObservableProjectsClient {
       query.onlyExplicitMembership = 'true'
     }
 
-    return _request<SanityProject[]>(this.#client, this.#httpRequest, {uri, query}) as Observable<
-      Omit<SanityProject, OmittedProjectFields<T>>[]
-    >
+    return _requestObservable<SanityProject[]>(this.#client, this.#httpRequest, {
+      url,
+      query,
+    }) as Observable<Omit<SanityProject, OmittedProjectFields<T>>[]>
   }
 
   /**
@@ -62,7 +63,9 @@ export class ObservableProjectsClient {
    * @param projectId - ID of the project to fetch
    */
   getById(projectId: string): Observable<SanityProject> {
-    return _request<SanityProject>(this.#client, this.#httpRequest, {uri: `/projects/${projectId}`})
+    return _requestObservable<SanityProject>(this.#client, this.#httpRequest, {
+      url: `/projects/${projectId}`,
+    })
   }
 }
 
@@ -88,7 +91,7 @@ export class ProjectsClient {
     options?: T,
   ): Promise<Omit<SanityProject, OmittedProjectFields<T>>[]> {
     const query: Record<string, string> = {}
-    const uri = '/projects'
+    const url = '/projects'
     if (options?.includeMembers === false) {
       query.includeMembers = 'false'
     }
@@ -101,11 +104,10 @@ export class ProjectsClient {
     if (options?.onlyExplicitMembership) {
       query.onlyExplicitMembership = 'true'
     }
-    return lastValueFrom(
-      _request<SanityProject[]>(this.#client, this.#httpRequest, {uri, query}) as Observable<
-        Omit<SanityProject, OmittedProjectFields<T>>[]
-      >,
-    )
+    return _request<SanityProject[]>(this.#client, this.#httpRequest, {
+      url,
+      query,
+    }) as Promise<Omit<SanityProject, OmittedProjectFields<T>>[]>
   }
 
   /**
@@ -114,8 +116,8 @@ export class ProjectsClient {
    * @param projectId - ID of the project to fetch
    */
   getById(projectId: string): Promise<SanityProject> {
-    return lastValueFrom(
-      _request<SanityProject>(this.#client, this.#httpRequest, {uri: `/projects/${projectId}`}),
-    )
+    return _request<SanityProject>(this.#client, this.#httpRequest, {
+      url: `/projects/${projectId}`,
+    })
   }
 }

package/src/releases/ReleasesClient.ts

@@ -1,6 +1,13 @@
-import {lastValueFrom, map, Observable} from 'rxjs'
-
-import {_action, _getDocument, _getReleaseDocuments} from '../data/dataMethods'
+import {map, Observable} from 'rxjs'
+
+import {
+  _action,
+  _actionObservable,
+  _getDocument,
+  _getDocumentObservable,
+  _getReleaseDocuments,
+  _getReleaseDocumentsObservable,
+} from '../data/dataMethods'
 import type {ObservableSanityClient, SanityClient} from '../SanityClient'
 import type {
   ArchiveReleaseAction,
@@ -61,7 +68,7 @@ export class ObservableReleasesClient {
     {releaseId}: {releaseId: string},
     options?: {signal?: AbortSignal; tag?: string},
   ): Observable<ReleaseDocument | undefined> {
-    return _getDocument<ReleaseDocument>(
+    return _getDocumentObservable<ReleaseDocument>(
       this.#client,
       this.#httpRequest,
       `_.releases.${releaseId}`,
@@ -140,7 +147,7 @@ export class ObservableReleasesClient {
     const {action, options} = createRelease(releaseOrOptions, maybeOptions)
     const {releaseId, metadata} = action
 
-    return _action(this.#client, this.#httpRequest, action, options).pipe(
+    return _actionObservable(this.#client, this.#httpRequest, action, options).pipe(
       map((actionResult) => ({
         ...actionResult,
         releaseId,
@@ -172,7 +179,7 @@ export class ObservableReleasesClient {
       patch,
     }
 
-    return _action(this.#client, this.#httpRequest, editAction, options)
+    return _actionObservable(this.#client, this.#httpRequest, editAction, options)
   }
 
   /**
@@ -202,7 +209,7 @@ export class ObservableReleasesClient {
       releaseId,
     }
 
-    return _action(this.#client, this.#httpRequest, publishAction, options)
+    return _actionObservable(this.#client, this.#httpRequest, publishAction, options)
   }
 
   /**
@@ -229,7 +236,7 @@ export class ObservableReleasesClient {
       releaseId,
     }
 
-    return _action(this.#client, this.#httpRequest, archiveAction, options)
+    return _actionObservable(this.#client, this.#httpRequest, archiveAction, options)
   }
 
   /**
@@ -254,7 +261,7 @@ export class ObservableReleasesClient {
       releaseId,
     }
 
-    return _action(this.#client, this.#httpRequest, unarchiveAction, options)
+    return _actionObservable(this.#client, this.#httpRequest, unarchiveAction, options)
   }
 
   /**
@@ -283,7 +290,7 @@ export class ObservableReleasesClient {
       publishAt,
     }
 
-    return _action(this.#client, this.#httpRequest, scheduleAction, options)
+    return _actionObservable(this.#client, this.#httpRequest, scheduleAction, options)
   }
 
   /**
@@ -310,7 +317,7 @@ export class ObservableReleasesClient {
       releaseId,
     }
 
-    return _action(this.#client, this.#httpRequest, unscheduleAction, options)
+    return _actionObservable(this.#client, this.#httpRequest, unscheduleAction, options)
   }
 
   /**
@@ -335,7 +342,7 @@ export class ObservableReleasesClient {
       releaseId,
     }
 
-    return _action(this.#client, this.#httpRequest, deleteAction, options)
+    return _actionObservable(this.#client, this.#httpRequest, deleteAction, options)
   }
 
   /**
@@ -354,7 +361,7 @@ export class ObservableReleasesClient {
     {releaseId}: {releaseId: string},
     options?: BaseMutationOptions,
   ): Observable<RawQueryResponse<SanityDocument[]>> {
-    return _getReleaseDocuments(this.#client, this.#httpRequest, releaseId, options)
+    return _getReleaseDocumentsObservable(this.#client, this.#httpRequest, releaseId, options)
   }
 }
 
@@ -397,13 +404,11 @@ export class ReleasesClient {
     {releaseId}: {releaseId: string},
     options?: {signal?: AbortSignal; tag?: string},
   ): Promise<ReleaseDocument | undefined> {
-    return lastValueFrom(
-      _getDocument<ReleaseDocument>(
-        this.#client,
-        this.#httpRequest,
-        `_.releases.${releaseId}`,
-        options,
-      ),
+    return _getDocument<ReleaseDocument>(
+      this.#client,
+      this.#httpRequest,
+      `_.releases.${releaseId}`,
+      options,
     )
   }
 
@@ -470,9 +475,7 @@ export class ReleasesClient {
     const {action, options} = createRelease(releaseOrOptions, maybeOptions)
     const {releaseId, metadata} = action
 
-    const actionResult = await lastValueFrom(
-      _action(this.#client, this.#httpRequest, action, options),
-    )
+    const actionResult = await _action(this.#client, this.#httpRequest, action, options)
 
     return {...actionResult, releaseId, metadata}
   }
@@ -500,7 +503,7 @@ export class ReleasesClient {
       patch,
     }
 
-    return lastValueFrom(_action(this.#client, this.#httpRequest, editAction, options))
+    return _action(this.#client, this.#httpRequest, editAction, options)
   }
 
   /**
@@ -530,7 +533,7 @@ export class ReleasesClient {
       releaseId,
     }
 
-    return lastValueFrom(_action(this.#client, this.#httpRequest, publishAction, options))
+    return _action(this.#client, this.#httpRequest, publishAction, options)
   }
 
   /**
@@ -557,7 +560,7 @@ export class ReleasesClient {
       releaseId,
     }
 
-    return lastValueFrom(_action(this.#client, this.#httpRequest, archiveAction, options))
+    return _action(this.#client, this.#httpRequest, archiveAction, options)
   }
 
   /**
@@ -582,7 +585,7 @@ export class ReleasesClient {
       releaseId,
     }
 
-    return lastValueFrom(_action(this.#client, this.#httpRequest, unarchiveAction, options))
+    return _action(this.#client, this.#httpRequest, unarchiveAction, options)
   }
 
   /**
@@ -611,7 +614,7 @@ export class ReleasesClient {
       publishAt,
     }
 
-    return lastValueFrom(_action(this.#client, this.#httpRequest, scheduleAction, options))
+    return _action(this.#client, this.#httpRequest, scheduleAction, options)
   }
 
   /**
@@ -638,7 +641,7 @@ export class ReleasesClient {
       releaseId,
     }
 
-    return lastValueFrom(_action(this.#client, this.#httpRequest, unscheduleAction, options))
+    return _action(this.#client, this.#httpRequest, unscheduleAction, options)
   }
 
   /**
@@ -663,7 +666,7 @@ export class ReleasesClient {
       releaseId,
     }
 
-    return lastValueFrom(_action(this.#client, this.#httpRequest, deleteAction, options))
+    return _action(this.#client, this.#httpRequest, deleteAction, options)
   }
 
   /**
@@ -682,6 +685,6 @@ export class ReleasesClient {
     {releaseId}: {releaseId: string},
     options?: BaseMutationOptions,
   ): Promise<RawQueryResponse<SanityDocument[]>> {
-    return lastValueFrom(_getReleaseDocuments(this.#client, this.#httpRequest, releaseId, options))
+    return _getReleaseDocuments(this.#client, this.#httpRequest, releaseId, options)
   }
 }

package/src/stega/index.ts

@@ -6,10 +6,9 @@ import {
   SanityClient,
 } from '@sanity/client'
 
-export {encodeIntoResult} from './encodeIntoResult'
 export {type ClientReturnStega, stegaBrand, type StegaBranded, type StegaString} from './stegaBrand'
 export {stegaClean, type StegaCleaned, vercelStegaCleanAll} from './stegaClean'
-export {stegaEncodeSourceMap} from './stegaEncodeSourceMap'
+export {encodeIntoResult, stegaEncodeSourceMap} from './stegaEncodeSourceMap'
 export * from './types'
 
 /**

package/src/stega/stegaEncodeSourceMap.ts

@@ -5,6 +5,11 @@ import {jsonPathToStudioPath} from '../csm/jsonPath'
 import {resolveStudioBaseRoute} from '../csm/resolveEditInfo'
 import {reKeySegment, toString as studioPathToString} from '../csm/studioPath'
 import {encodeIntoResult} from './encodeIntoResult'
+// Re-export so `encodeIntoResult` is a genuine export of this module - which
+// forms its own output chunk via the dynamic import in `dataMethods`. Without
+// this, rolldown absorbs `encodeIntoResult` into the chunk but omits it from
+// the chunk's exports, breaking `@sanity/client/stega`'s re-export of it.
+export {encodeIntoResult} from './encodeIntoResult'
 import {filterDefault} from './filterDefault'
 import {
   type ContentSourceMap,

package/src/stega/types.ts

@@ -1,4 +1,3 @@
-/* eslint-disable @typescript-eslint/no-empty-object-type */
 import type {ClientConfig, InitializedClientConfig, RawQueryResponse} from '@sanity/client'
 import type {
   ContentSourceMap,