@sanity/sdk 2.4.0 → 2.5.0

package/src/presence/presenceStore.ts

@@ -4,7 +4,7 @@ import {combineLatest, distinctUntilChanged, filter, map, of, Subscription, swit
 
 import {getTokenState} from '../auth/authStore'
 import {getClient} from '../client/clientStore'
-import {bindActionByDataset} from '../store/createActionBinder'
+import {bindActionByDataset, type BoundDatasetKey} from '../store/createActionBinder'
 import {createStateSourceAction, type SelectorContext} from '../store/createStateSourceAction'
 import {defineStore, type StoreContext} from '../store/defineStore'
 import {type SanityUser} from '../users/types'
@@ -23,15 +23,21 @@ const getInitialState = (): PresenceStoreState => ({
 })
 
 /** @public */
-export const presenceStore = defineStore<PresenceStoreState>({
+export const presenceStore = defineStore<PresenceStoreState, BoundDatasetKey>({
   name: 'presence',
   getInitialState,
-  initialize: (context: StoreContext<PresenceStoreState>) => {
-    const {instance, state} = context
+  initialize: (context: StoreContext<PresenceStoreState, BoundDatasetKey>) => {
+    const {
+      instance,
+      state,
+      key: {projectId, dataset},
+    } = context
     const sessionId = crypto.randomUUID()
 
     const client = getClient(instance, {
       apiVersion: '2022-06-30',
+      projectId,
+      dataset,
     })
 
     const token$ = getTokenState(instance).observable.pipe(distinctUntilChanged())
@@ -112,9 +118,9 @@ const selectPresence = createSelector(
 export const getPresence = bindActionByDataset(
   presenceStore,
   createStateSourceAction({
-    selector: (context: SelectorContext<PresenceStoreState>): UserPresence[] =>
+    selector: (context: SelectorContext<PresenceStoreState>, _?): UserPresence[] =>
       selectPresence(context.state),
-    onSubscribe: (context) => {
+    onSubscribe: (context: StoreContext<PresenceStoreState, BoundDatasetKey>, _?) => {
       const userIds$ = context.state.observable.pipe(
         map((state) =>
           Array.from(state.locations.values())
@@ -134,7 +140,7 @@ export const getPresence = bindActionByDataset(
               getUserState(context.instance, {
                 userId,
                 resourceType: 'project',
-                projectId: context.instance.config.projectId,
+                projectId: context.key.projectId,
               }).pipe(filter((v): v is NonNullable<typeof v> => !!v)),
             )
             return combineLatest(userObservables)

package/src/preview/previewStore.test.ts

@@ -18,9 +18,17 @@ describe('previewStore', () => {
 
     const instance = createSanityInstance({projectId: 'p', dataset: 'd'})
 
-    const {state, dispose} = createStoreInstance(instance, previewStore)
+    const {state, dispose} = createStoreInstance(
+      instance,
+      {name: 'p.d', projectId: 'p', dataset: 'd'},
+      previewStore,
+    )
 
-    expect(subscribeToStateAndFetchBatches).toHaveBeenCalledWith({instance, state})
+    expect(subscribeToStateAndFetchBatches).toHaveBeenCalledWith({
+      instance,
+      state,
+      key: {name: 'p.d', projectId: 'p', dataset: 'd'},
+    })
 
     dispose()
     instance.dispose()

package/src/preview/previewStore.ts

@@ -1,3 +1,4 @@
+import {type BoundDatasetKey} from '../store/createActionBinder'
 import {defineStore} from '../store/defineStore'
 import {subscribeToStateAndFetchBatches} from './subscribeToStateAndFetchBatches'
 
@@ -79,7 +80,7 @@ export interface PreviewStoreState {
   subscriptions: {[TDocumentId in string]?: {[TSubscriptionId in string]?: true}}
 }
 
-export const previewStore = defineStore<PreviewStoreState>({
+export const previewStore = defineStore<PreviewStoreState, BoundDatasetKey>({
   name: 'Preview',
   getInitialState() {
     return {

package/src/preview/subscribeToStateAndFetchBatches.test.ts

@@ -2,6 +2,7 @@ import {NEVER, Observable, type Observer} from 'rxjs'
 import {describe, expect, it, vi} from 'vitest'
 
 import {getQueryState, resolveQuery} from '../query/queryStore'
+import {type BoundDatasetKey} from '../store/createActionBinder'
 import {createSanityInstance, type SanityInstance} from '../store/createSanityInstance'
 import {type StateSource} from '../store/createStateSourceAction'
 import {createStoreState, type StoreState} from '../store/createStoreState'
@@ -14,6 +15,7 @@ vi.mock('../query/queryStore')
 describe('subscribeToStateAndFetchBatches', () => {
   let instance: SanityInstance
   let state: StoreState<PreviewStoreState>
+  let key: BoundDatasetKey
 
   beforeEach(() => {
     vi.clearAllMocks()
@@ -22,6 +24,7 @@ describe('subscribeToStateAndFetchBatches', () => {
       subscriptions: {},
       values: {},
     })
+    key = {name: 'test.test', projectId: 'test', dataset: 'test'}
 
     vi.mocked(getQueryState).mockReturnValue({
       getCurrent: () => undefined,
@@ -36,7 +39,7 @@ describe('subscribeToStateAndFetchBatches', () => {
   })
 
   it('batches rapid subscription changes into single requests', async () => {
-    const subscription = subscribeToStateAndFetchBatches({instance, state})
+    const subscription = subscribeToStateAndFetchBatches({instance, state, key})
 
     // Add multiple subscriptions rapidly
     state.set('addSubscription1', {
@@ -77,7 +80,7 @@ describe('subscribeToStateAndFetchBatches', () => {
       observable: new Observable(subscriber),
     } as StateSource<PreviewQueryResult[] | undefined>)
 
-    const subscription = subscribeToStateAndFetchBatches({instance, state})
+    const subscription = subscribeToStateAndFetchBatches({instance, state, key})
 
     expect(subscriber).not.toHaveBeenCalled()
 
@@ -126,7 +129,7 @@ describe('subscribeToStateAndFetchBatches', () => {
       subscriptions: {doc1: {sub1: true}},
     })
 
-    const subscription = subscribeToStateAndFetchBatches({instance, state})
+    const subscription = subscribeToStateAndFetchBatches({instance, state, key})
 
     // Add a subscription for a document already in the batch
     state.set('addSubscriptionAlreadyInBatch', (prev) => ({
@@ -152,7 +155,7 @@ describe('subscribeToStateAndFetchBatches', () => {
 
   it('cancels and restarts fetches when subscription set changes', async () => {
     const abortSpy = vi.spyOn(AbortController.prototype, 'abort')
-    const subscription = subscribeToStateAndFetchBatches({instance, state})
+    const subscription = subscribeToStateAndFetchBatches({instance, state, key})
 
     // Add initial subscription
     state.set('addSubscription1', {
@@ -182,7 +185,7 @@ describe('subscribeToStateAndFetchBatches', () => {
       observable: new Observable(subscriber),
     } as StateSource<PreviewQueryResult[] | undefined>)
 
-    const subscription = subscribeToStateAndFetchBatches({instance, state})
+    const subscription = subscribeToStateAndFetchBatches({instance, state, key})
 
     // Add a subscription
     state.set('addSubscription', {

package/src/preview/subscribeToStateAndFetchBatches.ts

@@ -15,6 +15,7 @@ import {
 } from 'rxjs'
 
 import {getQueryState, resolveQuery} from '../query/queryStore'
+import {type BoundDatasetKey} from '../store/createActionBinder'
 import {type StoreContext} from '../store/defineStore'
 import {createPreviewQuery, processPreviewQuery} from './previewQuery'
 import {type PreviewQueryResult, type PreviewStoreState} from './previewStore'
@@ -28,7 +29,8 @@ const isSetEqual = <T>(a: Set<T>, b: Set<T>) =>
 export const subscribeToStateAndFetchBatches = ({
   state,
   instance,
-}: StoreContext<PreviewStoreState>): Subscription => {
+  key: {projectId, dataset},
+}: StoreContext<PreviewStoreState, BoundDatasetKey>): Subscription => {
   const newSubscriberIds$ = state.observable.pipe(
     map(({subscriptions}) => new Set(Object.keys(subscriptions))),
     distinctUntilChanged(isSetEqual),
@@ -64,6 +66,8 @@ export const subscribeToStateAndFetchBatches = ({
             params,
             tag: PREVIEW_TAG,
             perspective: PREVIEW_PERSPECTIVE,
+            projectId,
+            dataset,
           })
           const source$ = defer(() => {
             if (getCurrent() === undefined) {
@@ -74,6 +78,8 @@ export const subscribeToStateAndFetchBatches = ({
                   tag: PREVIEW_TAG,
                   perspective: PREVIEW_PERSPECTIVE,
                   signal: controller.signal,
+                  projectId,
+                  dataset,
                 }),
               ).pipe(switchMap(() => observable))
             }
@@ -91,8 +97,8 @@ export const subscribeToStateAndFetchBatches = ({
       }),
       map(({ids, data}) => ({
         values: processPreviewQuery({
-          projectId: instance.config.projectId!,
-          dataset: instance.config.dataset!,
+          projectId,
+          dataset,
           ids,
           results: data,
         }),

package/src/projection/projectionStore.test.ts

@@ -26,10 +26,26 @@ describe('projectionStore', () => {
 
     const instance = createSanityInstance({projectId: 'p', dataset: 'd'})
 
-    const {state, dispose} = createStoreInstance(instance, projectionStore)
+    const {state, dispose} = createStoreInstance(
+      instance,
+      {
+        name: 'p.d',
+        projectId: 'p',
+        dataset: 'd',
+      },
+      projectionStore,
+    )
 
     expect(subscribeToStateAndFetchBatches).toHaveBeenCalledOnce()
-    expect(subscribeToStateAndFetchBatches).toHaveBeenCalledWith({instance, state})
+    expect(subscribeToStateAndFetchBatches).toHaveBeenCalledWith({
+      instance,
+      state,
+      key: {
+        name: 'p.d',
+        projectId: 'p',
+        dataset: 'd',
+      },
+    })
 
     dispose()
     instance.dispose()

package/src/projection/projectionStore.ts

@@ -1,8 +1,9 @@
+import {type BoundDatasetKey} from '../store/createActionBinder'
 import {defineStore} from '../store/defineStore'
 import {subscribeToStateAndFetchBatches} from './subscribeToStateAndFetchBatches'
 import {type ProjectionStoreState} from './types'
 
-export const projectionStore = defineStore<ProjectionStoreState>({
+export const projectionStore = defineStore<ProjectionStoreState, BoundDatasetKey>({
   name: 'Projection',
   getInitialState() {
     return {

package/src/projection/subscribeToStateAndFetchBatches.test.ts

@@ -15,6 +15,7 @@ vi.mock('../query/queryStore')
 describe('subscribeToStateAndFetchBatches', () => {
   let instance: SanityInstance
   let state: StoreState<ProjectionStoreState>
+  const key = {name: 'test.test', projectId: 'test', dataset: 'test'}
 
   beforeEach(() => {
     vi.clearAllMocks()
@@ -38,7 +39,7 @@ describe('subscribeToStateAndFetchBatches', () => {
   })
 
   it('batches rapid subscription changes into single requests', async () => {
-    const subscription = subscribeToStateAndFetchBatches({instance, state})
+    const subscription = subscribeToStateAndFetchBatches({instance, state, key})
     const projection = '{title, description}'
     const projectionHash = hashString(projection)
 
@@ -95,7 +96,7 @@ describe('subscribeToStateAndFetchBatches', () => {
       observable: new Observable(subscriber),
     } as StateSource<ProjectionQueryResult[] | undefined>)
 
-    const subscription = subscribeToStateAndFetchBatches({instance, state})
+    const subscription = subscribeToStateAndFetchBatches({instance, state, key})
     const projection = '{title}'
     const projectionHash = hashString(projection)
 
@@ -166,7 +167,7 @@ describe('subscribeToStateAndFetchBatches', () => {
       subscriptions: {doc1: {[projectionHash]: {sub1: true}}},
     })
 
-    const subscription = subscribeToStateAndFetchBatches({instance, state})
+    const subscription = subscribeToStateAndFetchBatches({instance, state, key})
 
     // Add another subscription for doc1 (same hash)
     state.set('addSubscriptionAlreadyInBatch', (prev) => ({
@@ -218,7 +219,7 @@ describe('subscribeToStateAndFetchBatches', () => {
 
   it('cancels and restarts fetches when subscription set changes', async () => {
     const abortSpy = vi.spyOn(AbortController.prototype, 'abort')
-    const subscription = subscribeToStateAndFetchBatches({instance, state})
+    const subscription = subscribeToStateAndFetchBatches({instance, state, key})
     const projection = '{title, description}'
     const projectionHash = hashString(projection)
     const projection2 = '{_id}' // Different projection
@@ -266,7 +267,7 @@ describe('subscribeToStateAndFetchBatches', () => {
       observable: new Observable(subscriber),
     } as StateSource<ProjectionQueryResult[] | undefined>)
 
-    const subscription = subscribeToStateAndFetchBatches({instance, state})
+    const subscription = subscribeToStateAndFetchBatches({instance, state, key})
     const projection = '{title, description}'
     const projectionHash = hashString(projection)
 

package/src/projection/subscribeToStateAndFetchBatches.ts

@@ -17,6 +17,7 @@ import {
 } from 'rxjs'
 
 import {getQueryState, resolveQuery} from '../query/queryStore'
+import {type BoundDatasetKey} from '../store/createActionBinder'
 import {type StoreContext} from '../store/defineStore'
 import {
   createProjectionQuery,
@@ -34,7 +35,8 @@ const isSetEqual = <T>(a: Set<T>, b: Set<T>) =>
 export const subscribeToStateAndFetchBatches = ({
   state,
   instance,
-}: StoreContext<ProjectionStoreState>): Subscription => {
+  key: {projectId, dataset},
+}: StoreContext<ProjectionStoreState, BoundDatasetKey>): Subscription => {
   const documentProjections$ = state.observable.pipe(
     map((s) => s.documentProjections),
     distinctUntilChanged(isEqual),
@@ -94,6 +96,8 @@ export const subscribeToStateAndFetchBatches = ({
           const {getCurrent, observable} = getQueryState<ProjectionQueryResult[]>(instance, {
             query,
             params,
+            projectId,
+            dataset,
             tag: PROJECTION_TAG,
             perspective: PROJECTION_PERSPECTIVE,
           })
@@ -104,6 +108,8 @@ export const subscribeToStateAndFetchBatches = ({
                 resolveQuery<ProjectionQueryResult[]>(instance, {
                   query,
                   params,
+                  projectId,
+                  dataset,
                   tag: PROJECTION_TAG,
                   perspective: PROJECTION_PERSPECTIVE,
                   signal: controller.signal,
@@ -125,8 +131,8 @@ export const subscribeToStateAndFetchBatches = ({
       }),
       map(({ids, data}) =>
         processProjectionQuery({
-          projectId: instance.config.projectId!,
-          dataset: instance.config.dataset!,
+          projectId,
+          dataset,
           ids,
           results: data,
         }),

package/src/releases/getPerspectiveState.ts

@@ -17,13 +17,13 @@ const DEFAULT_PERSPECTIVE = 'drafts'
 // Cache for options
 const optionsCache = new Map<string, Map<string, PerspectiveHandle>>()
 
-const selectInstancePerspective = (context: SelectorContext<ReleasesStoreState>) =>
+const selectInstancePerspective = (context: SelectorContext<ReleasesStoreState>, _?: unknown) =>
   context.instance.config.perspective
 const selectActiveReleases = (context: SelectorContext<ReleasesStoreState>) =>
   context.state.activeReleases
 const selectOptions = (
   _context: SelectorContext<ReleasesStoreState>,
-  options?: PerspectiveHandle,
+  options: PerspectiveHandle & {projectId?: string; dataset?: string},
 ) => options
 
 const memoizedOptionsSelector = createSelector(

package/src/releases/releasesStore.ts

@@ -3,7 +3,7 @@ import {type SanityDocument} from '@sanity/types'
 import {catchError, EMPTY, retry, switchMap, timer} from 'rxjs'
 
 import {getClientState} from '../client/clientStore'
-import {bindActionByDataset} from '../store/createActionBinder'
+import {bindActionByDataset, type BoundDatasetKey} from '../store/createActionBinder'
 import {createStateSourceAction} from '../store/createStateSourceAction'
 import {defineStore, type StoreContext} from '../store/defineStore'
 import {listenQuery} from '../utils/listenQuery'
@@ -32,7 +32,7 @@ export interface ReleasesStoreState {
   error?: unknown
 }
 
-export const releasesStore = defineStore<ReleasesStoreState>({
+export const releasesStore = defineStore<ReleasesStoreState, BoundDatasetKey>({
   name: 'Releases',
   getInitialState: (): ReleasesStoreState => ({
     activeReleases: undefined,
@@ -50,17 +50,23 @@ export const releasesStore = defineStore<ReleasesStoreState>({
 export const getActiveReleasesState = bindActionByDataset(
   releasesStore,
   createStateSourceAction({
-    selector: ({state}) => state.activeReleases,
+    selector: ({state}, _?) => state.activeReleases,
   }),
 )
 
 const RELEASES_QUERY = 'releases::all()'
 const QUERY_PARAMS = {}
 
-const subscribeToReleases = ({instance, state}: StoreContext<ReleasesStoreState>) => {
+const subscribeToReleases = ({
+  instance,
+  state,
+  key: {projectId, dataset},
+}: StoreContext<ReleasesStoreState, BoundDatasetKey>) => {
   return getClientState(instance, {
     apiVersion: '2025-04-10',
     perspective: 'raw',
+    projectId,
+    dataset,
   })
     .observable.pipe(
       switchMap((client: SanityClient) =>

package/src/store/createActionBinder.test.ts

@@ -12,7 +12,7 @@ beforeEach(() => vi.mocked(createStoreInstance).mockClear())
 
 describe('createActionBinder', () => {
   it('should bind an action and call it with correct context and parameters, using caching', () => {
-    const binder = createActionBinder(() => '')
+    const binder = createActionBinder((..._rest) => ({name: ''}))
     const storeDefinition = {
       name: 'TestStore',
       getInitialState: () => ({counter: 0}),
@@ -37,7 +37,9 @@ describe('createActionBinder', () => {
   })
 
   it('should create separate store instances for different composite keys', () => {
-    const binder = createActionBinder(({projectId, dataset}) => `${projectId}.${dataset}`)
+    const binder = createActionBinder(({config: {projectId, dataset}}, ..._rest) => ({
+      name: `${projectId}.${dataset}`,
+    }))
     const storeDefinition = {
       name: 'TestStore',
       getInitialState: () => ({counter: 0}),
@@ -59,7 +61,7 @@ describe('createActionBinder', () => {
   })
 
   it('should dispose the store instance when the last instance is disposed', () => {
-    const binder = createActionBinder(() => '')
+    const binder = createActionBinder((..._rest) => ({name: ''}))
     const storeDefinition = {
       name: 'TestStore',
       getInitialState: () => ({counter: 0}),
@@ -93,10 +95,10 @@ describe('bindActionByDataset', () => {
       name: 'DSStore',
       getInitialState: () => ({counter: 0}),
     }
-    const action = vi.fn((_context, value: string) => value)
+    const action = vi.fn((_context, {value}: {value: string}) => value)
     const boundAction = bindActionByDataset(storeDefinition, action)
     const instance = createSanityInstance({projectId: 'proj1', dataset: 'ds1'})
-    const result = boundAction(instance, 'hello')
+    const result = boundAction(instance, {value: 'hello'})
     expect(result).toBe('hello')
   })
 
@@ -105,7 +107,7 @@ describe('bindActionByDataset', () => {
       name: 'DSStore',
       getInitialState: () => ({counter: 0}),
     }
-    const action = vi.fn((_context) => 'fail')
+    const action = vi.fn((_context, _?) => 'fail')
     const boundAction = bindActionByDataset(storeDefinition, action)
     // Instance with missing dataset
     const instance = createSanityInstance({projectId: 'proj1', dataset: ''})

package/src/store/createActionBinder.ts

@@ -1,14 +1,20 @@
-import {type DocumentSource, type SanityConfig, SOURCE_ID} from '../config/sanityConfig'
+import {type DocumentSource, SOURCE_ID} from '../config/sanityConfig'
 import {type SanityInstance} from './createSanityInstance'
 import {createStoreInstance, type StoreInstance} from './createStoreInstance'
 import {type StoreState} from './createStoreState'
 import {type StoreContext, type StoreDefinition} from './defineStore'
 
+export type BoundDatasetKey = {
+  name: string
+  projectId: string
+  dataset: string
+}
+
 /**
  * Defines a store action that operates on a specific state type
  */
-export type StoreAction<TState, TParams extends unknown[], TReturn> = (
-  context: StoreContext<TState>,
+export type StoreAction<TState, TParams extends unknown[], TReturn, TKey = unknown> = (
+  context: StoreContext<TState, TKey>,
   ...params: TParams
 ) => TReturn
 
@@ -43,9 +49,10 @@ export type BoundStoreAction<_TState, TParams extends unknown[], TReturn> = (
  * )
  * ```
  */
-export function createActionBinder<TKeyParams extends unknown[]>(
-  keyFn: (config: SanityConfig, ...params: TKeyParams) => string,
-) {
+export function createActionBinder<
+  TKey extends {name: string},
+  TKeyParams extends unknown[] = unknown[],
+>(keyFn: (instance: SanityInstance, ...params: TKeyParams) => TKey) {
   const instanceRegistry = new Map<string, Set<string>>()
   const storeRegistry = new Map<string, StoreInstance<unknown>>()
 
@@ -57,12 +64,12 @@ export function createActionBinder<TKeyParams extends unknown[]>(
    * @returns A function that executes the action with a Sanity instance
    */
   return function bindAction<TState, TParams extends TKeyParams, TReturn>(
-    storeDefinition: StoreDefinition<TState>,
-    action: StoreAction<TState, TParams, TReturn>,
+    storeDefinition: StoreDefinition<TState, TKey>,
+    action: StoreAction<TState, TParams, TReturn, TKey>,
   ): BoundStoreAction<TState, TParams, TReturn> {
     return function boundAction(instance: SanityInstance, ...params: TParams) {
-      const keySuffix = keyFn(instance.config, ...params)
-      const compositeKey = storeDefinition.name + (keySuffix ? `:${keySuffix}` : '')
+      const key = keyFn(instance, ...params)
+      const compositeKey = storeDefinition.name + (key.name ? `:${key.name}` : '')
 
       // Get or create instance set for this composite key
       let instances = instanceRegistry.get(compositeKey)
@@ -89,12 +96,12 @@ export function createActionBinder<TKeyParams extends unknown[]>(
       // Get or create store instance
       let storeInstance = storeRegistry.get(compositeKey)
       if (!storeInstance) {
-        storeInstance = createStoreInstance(instance, storeDefinition)
+        storeInstance = createStoreInstance(instance, key, storeDefinition)
         storeRegistry.set(compositeKey, storeInstance)
       }
 
       // Execute action with store context
-      return action({instance, state: storeInstance.state as StoreState<TState>}, ...params)
+      return action({instance, state: storeInstance.state as StoreState<TState>, key}, ...params)
     }
   }
 }
@@ -130,31 +137,39 @@ export function createActionBinder<TKeyParams extends unknown[]>(
  * fetchDocument(sanityInstance, 'doc123')
  * ```
  */
-export const bindActionByDataset = createActionBinder<unknown[]>(({projectId, dataset}) => {
+export const bindActionByDataset = createActionBinder<
+  BoundDatasetKey,
+  [(object & {projectId?: string; dataset?: string})?, ...unknown[]]
+>((instance, options) => {
+  const projectId = options?.projectId ?? instance.config.projectId
+  const dataset = options?.dataset ?? instance.config.dataset
   if (!projectId || !dataset) {
     throw new Error('This API requires a project ID and dataset configured.')
   }
-  return `${projectId}.${dataset}`
+  return {name: `${projectId}.${dataset}`, projectId, dataset}
 })
 
 /**
  * Binds an action to a store that's scoped to a specific document source.
  **/
-export const bindActionBySource = createActionBinder<[{source?: DocumentSource}, ...unknown[]]>(
-  ({projectId, dataset}, {source}) => {
-    if (source) {
-      const id = source[SOURCE_ID]
-      if (!id) throw new Error('Invalid source (missing ID information)')
-      if (Array.isArray(id)) return id.join(':')
-      return `${id.projectId}.${id.dataset}`
-    }
+export const bindActionBySource = createActionBinder<
+  {name: string},
+  [{source?: DocumentSource}, ...unknown[]]
+>((instance, {source}) => {
+  if (source) {
+    const id = source[SOURCE_ID]
+    if (!id) throw new Error('Invalid source (missing ID information)')
+    if (Array.isArray(id)) return {name: id.join(':')}
+    return {name: `${id.projectId}.${id.dataset}`}
+  }
 
-    if (!projectId || !dataset) {
-      throw new Error('This API requires a project ID and dataset configured.')
-    }
-    return `${projectId}.${dataset}`
-  },
-)
+  const {projectId, dataset} = instance.config
+
+  if (!projectId || !dataset) {
+    throw new Error('This API requires a project ID and dataset configured.')
+  }
+  return {name: `${projectId}.${dataset}`}
+})
 
 /**
  * Binds an action to a global store that's shared across all Sanity instances
@@ -194,4 +209,4 @@ export const bindActionBySource = createActionBinder<[{source?: DocumentSource},
  * getCurrentUser(sanityInstance)
  * ```
  */
-export const bindActionGlobally = createActionBinder<unknown[]>(() => 'global')
+export const bindActionGlobally = createActionBinder((..._rest) => ({name: 'global'}))