@sanity/sdk 2.3.1 → 2.5.0

package/src/document/processActions.ts

@@ -140,6 +140,52 @@ export function processActions({
     switch (action.type) {
       case 'document.create': {
         const documentId = getId(action.documentId)
+
+        if (action.liveEdit) {
+          // For liveEdit documents, create directly without draft/published logic
+          if (working[documentId]) {
+            throw new ActionError({
+              documentId,
+              transactionId,
+              message: `This document already exists.`,
+            })
+          }
+
+          const newDocBase = {_type: action.documentType, _id: documentId}
+          const newDocWorking = {_type: action.documentType, _id: documentId}
+          const mutations: Mutation[] = [{create: newDocWorking}]
+
+          base = processMutations({
+            documents: base,
+            transactionId,
+            mutations: [{create: newDocBase}],
+            timestamp,
+          })
+          working = processMutations({
+            documents: working,
+            transactionId,
+            mutations,
+            timestamp,
+          })
+
+          if (!checkGrant(grants.create, working[documentId] as SanityDocument)) {
+            throw new PermissionActionError({
+              documentId,
+              transactionId,
+              message: `You do not have permission to create document "${documentId}".`,
+            })
+          }
+
+          outgoingMutations.push(...mutations)
+          outgoingActions.push({
+            actionType: 'sanity.action.document.create',
+            publishedId: documentId,
+            attributes: newDocWorking,
+          })
+          continue
+        }
+
+        // Standard draft/published logic
         const draftId = getDraftId(documentId)
         const publishedId = getPublishedId(documentId)
 
@@ -152,8 +198,18 @@ export function processActions({
         }
 
         // Spread the (possibly undefined) published version directly.
-        const newDocBase = {...base[publishedId], _type: action.documentType, _id: draftId}
-        const newDocWorking = {...working[publishedId], _type: action.documentType, _id: draftId}
+        const newDocBase = {
+          ...base[publishedId],
+          _type: action.documentType,
+          _id: draftId,
+          ...action.initialValue,
+        }
+        const newDocWorking = {
+          ...working[publishedId],
+          _type: action.documentType,
+          _id: draftId,
+          ...action.initialValue,
+        }
         const mutations: Mutation[] = [{create: newDocWorking}]
 
         base = processMutations({
@@ -188,6 +244,39 @@ export function processActions({
 
       case 'document.delete': {
         const documentId = action.documentId
+
+        if (action.liveEdit) {
+          // For liveEdit documents, delete directly
+          if (!working[documentId]) {
+            throw new ActionError({
+              documentId,
+              transactionId,
+              message: 'The document you are trying to delete does not exist.',
+            })
+          }
+
+          if (!checkGrant(grants.update, working[documentId])) {
+            throw new PermissionActionError({
+              documentId,
+              transactionId,
+              message: `You do not have permission to delete this document.`,
+            })
+          }
+
+          const mutations: Mutation[] = [{delete: {id: documentId}}]
+
+          base = processMutations({documents: base, transactionId, mutations, timestamp})
+          working = processMutations({documents: working, transactionId, mutations, timestamp})
+
+          outgoingMutations.push(...mutations)
+          outgoingActions.push({
+            actionType: 'sanity.action.document.delete',
+            publishedId: documentId,
+          })
+          continue
+        }
+
+        // Standard draft/published logic
         const draftId = getDraftId(documentId)
         const publishedId = getPublishedId(documentId)
 
@@ -230,6 +319,16 @@ export function processActions({
 
       case 'document.discard': {
         const documentId = getId(action.documentId)
+
+        if (action.liveEdit) {
+          throw new ActionError({
+            documentId,
+            transactionId,
+            message: `Cannot discard changes for liveEdit document "${documentId}". LiveEdit documents do not support drafts.`,
+          })
+        }
+
+        // Standard draft/published logic
         const draftId = getDraftId(documentId)
         const mutations: Mutation[] = [{delete: {id: draftId}}]
 
@@ -262,6 +361,70 @@ export function processActions({
 
       case 'document.edit': {
         const documentId = getId(action.documentId)
+
+        if (action.liveEdit) {
+          // For liveEdit documents, edit directly without draft logic
+          const userPatches = action.patches?.map((patch) => ({patch: {id: documentId, ...patch}}))
+
+          // skip this action if there are no associated patches
+          if (!userPatches?.length) continue
+
+          if (!working[documentId] || !base[documentId]) {
+            throw new ActionError({
+              documentId,
+              transactionId,
+              message: `Cannot edit document because it does not exist.`,
+            })
+          }
+
+          const baseBefore = base[documentId] as SanityDocument
+          if (userPatches) {
+            base = processMutations({
+              documents: base,
+              transactionId,
+              mutations: userPatches,
+              timestamp,
+            })
+          }
+
+          const baseAfter = base[documentId] as SanityDocument
+          const patches = diffValue(baseBefore, baseAfter)
+
+          const workingBefore = working[documentId] as SanityDocument
+          if (!checkGrant(grants.update, workingBefore)) {
+            throw new PermissionActionError({
+              documentId,
+              transactionId,
+              message: `You do not have permission to edit document "${documentId}".`,
+            })
+          }
+
+          const workingMutations = patches.map((patch) => ({patch: {id: documentId, ...patch}}))
+
+          working = processMutations({
+            documents: working,
+            transactionId,
+            mutations: workingMutations,
+            timestamp,
+          })
+
+          outgoingMutations.push(...workingMutations)
+          outgoingActions.push(
+            ...patches.map(
+              (patch): HttpAction => ({
+                actionType: 'sanity.action.document.edit',
+                // Server requires draftId to have drafts. prefix for validation, even for liveEdit
+                draftId: getDraftId(documentId),
+                publishedId: documentId,
+                patch: patch as PatchOperations,
+              }),
+            ),
+          )
+
+          continue
+        }
+
+        // Standard draft/published logic
         const draftId = getDraftId(documentId)
         const publishedId = getPublishedId(documentId)
         const userPatches = action.patches?.map((patch) => ({patch: {id: draftId, ...patch}}))
@@ -352,6 +515,16 @@ export function processActions({
 
       case 'document.publish': {
         const documentId = getId(action.documentId)
+
+        if (action.liveEdit) {
+          throw new ActionError({
+            documentId,
+            transactionId,
+            message: `Cannot publish liveEdit document "${documentId}". LiveEdit documents do not support drafts or publishing.`,
+          })
+        }
+
+        // Standard draft/published logic
         const draftId = getDraftId(documentId)
         const publishedId = getPublishedId(documentId)
 
@@ -418,6 +591,16 @@ export function processActions({
 
       case 'document.unpublish': {
         const documentId = getId(action.documentId)
+
+        if (action.liveEdit) {
+          throw new ActionError({
+            documentId,
+            transactionId,
+            message: `Cannot unpublish liveEdit document "${documentId}". LiveEdit documents do not support drafts or publishing.`,
+          })
+        }
+
+        // Standard draft/published logic
         const draftId = getDraftId(documentId)
         const publishedId = getPublishedId(documentId)
 

package/src/document/reducers.ts

@@ -20,6 +20,7 @@ export type SyncTransactionState = Pick<
 
 type ActionMap = {
   create: 'sanity.action.document.version.create'
+  createLiveEdit: 'sanity.action.document.create'
   discard: 'sanity.action.document.version.discard'
   unpublish: 'sanity.action.document.unpublish'
   delete: 'sanity.action.document.delete'
@@ -34,6 +35,7 @@ type OptimisticLock = {
 
 export type HttpAction =
   | {actionType: ActionMap['create']; publishedId: string; attributes: SanityDocumentLike}
+  | {actionType: ActionMap['createLiveEdit']; publishedId: string; attributes: SanityDocumentLike}
   | {actionType: ActionMap['discard']; versionId: string; purge?: boolean}
   | {actionType: ActionMap['unpublish']; draftId: string; publishedId: string}
   | {actionType: ActionMap['delete']; publishedId: string; includeDrafts?: string[]}
@@ -550,13 +552,19 @@ export function removeSubscriptionIdFromDocument(
 export function manageSubscriberIds(
   {state}: StoreContext<SyncTransactionState>,
   documentId: string | string[],
+  options?: {expandDraftPublished?: boolean},
 ): () => void {
+  const expandDraftPublished = options?.expandDraftPublished ?? true
   const documentIds = Array.from(
     new Set(
-      (Array.isArray(documentId) ? documentId : [documentId]).flatMap((id) => [
-        getPublishedId(id),
-        getDraftId(id),
-      ]),
+      expandDraftPublished
+        ? (Array.isArray(documentId) ? documentId : [documentId]).flatMap((id) => [
+            getPublishedId(id),
+            getDraftId(id),
+          ])
+        : Array.isArray(documentId)
+          ? documentId
+          : [documentId],
     ),
   )
   const subscriptionId = insecureRandomId()
@@ -579,8 +587,7 @@ export function manageSubscriberIds(
   }
 }
 
-export function getDocumentIdsFromActions(action: DocumentAction | DocumentAction[]): string[] {
-  const actions = Array.isArray(action) ? action : [action]
+export function getDocumentIdsFromActions(actions: DocumentAction[]): string[] {
   return Array.from(
     new Set(
       actions

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/query/queryStore.ts

@@ -23,9 +23,9 @@ import {
 } from 'rxjs'
 
 import {getClientState} from '../client/clientStore'
-import {type DatasetHandle} from '../config/sanityConfig'
+import {type DatasetHandle, type DocumentSource} from '../config/sanityConfig'
 import {getPerspectiveState} from '../releases/getPerspectiveState'
-import {bindActionByDataset} from '../store/createActionBinder'
+import {bindActionBySource} from '../store/createActionBinder'
 import {type SanityInstance} from '../store/createSanityInstance'
 import {
   createStateSourceAction,
@@ -62,6 +62,7 @@ export interface QueryOptions<
     DatasetHandle<TDataset, TProjectId> {
   query: TQuery
   params?: Record<string, unknown>
+  source?: DocumentSource
 }
 
 /**
@@ -160,6 +161,7 @@ const listenForNewSubscribersAndFetch = ({state, instance}: StoreContext<QuerySt
               projectId,
               dataset,
               tag,
+              source,
               perspective: perspectiveFromOptions,
               ...restOptions
             } = parseQueryKey(group$.key)
@@ -172,6 +174,7 @@ const listenForNewSubscribersAndFetch = ({state, instance}: StoreContext<QuerySt
               apiVersion: QUERY_STORE_API_VERSION,
               projectId,
               dataset,
+              source,
             }).observable
 
             return combineLatest([lastLiveEventId$, client$, perspective$]).pipe(
@@ -290,7 +293,7 @@ export function getQueryState(
 ): ReturnType<typeof _getQueryState> {
   return _getQueryState(...args)
 }
-const _getQueryState = bindActionByDataset(
+const _getQueryState = bindActionBySource(
   queryStore,
   createStateSourceAction({
     selector: ({state, instance}: SelectorContext<QueryStoreState>, options: QueryOptions) => {
@@ -349,7 +352,7 @@ export function resolveQuery<TData>(
 export function resolveQuery(...args: Parameters<typeof _resolveQuery>): Promise<unknown> {
   return _resolveQuery(...args)
 }
-const _resolveQuery = bindActionByDataset(
+const _resolveQuery = bindActionBySource(
   queryStore,
   ({state, instance}, {signal, ...options}: ResolveQueryOptions) => {
     const normalized = normalizeOptionsWithPerspective(instance, options)