@sanity/sdk 2.9.0 → 2.11.0

package/src/document/documentStore.test.ts

@@ -67,7 +67,7 @@ let instance: SanityInstance
 let instance1: SanityInstance
 let instance2: SanityInstance
 
-const source = {projectId: 'p', dataset: 'd'}
+const resource = {projectId: 'p', dataset: 'd'}
 const source1 = {projectId: 'p', dataset: 'd1'}
 const source2 = {projectId: 'p', dataset: 'd2'}
 
@@ -99,7 +99,7 @@ it('creates, edits, and publishes a document', async () => {
   // Create a new document
   const {appeared} = await applyDocumentActions(instance, {
     actions: [createDocument(doc)],
-    source,
+    resource,
   })
   expect(appeared).toContain(getDraftId(documentId))
 
@@ -109,7 +109,7 @@ it('creates, edits, and publishes a document', async () => {
   // Edit the document – add a title
   await applyDocumentActions(instance, {
     actions: [editDocument(doc, {set: {title: 'My First Article'}})],
-    source,
+    resource,
   })
   currentDoc = documentState.getCurrent()
   expect(currentDoc?.title).toEqual('My First Article')
@@ -117,7 +117,7 @@ it('creates, edits, and publishes a document', async () => {
   // Publish the document; the resulting transactionId is used as the new _rev
   const {transactionId, submitted} = await applyDocumentActions(instance, {
     actions: [publishDocument(doc)],
-    source,
+    resource,
   })
   await submitted()
   currentDoc = documentState.getCurrent()
@@ -144,7 +144,7 @@ it('creates a document with initial values', async () => {
         count: 42,
       }),
     ],
-    source,
+    resource,
   })
   expect(appeared).toContain(getDraftId(documentId))
 
@@ -177,7 +177,7 @@ it('edits existing documents', async () => {
 
   await applyDocumentActions(instance, {
     actions: [editDocument(doc, {set: {title: 'updated title'}})],
-    source,
+    resource,
   })
   expect(state.getCurrent()).toMatchObject({
     _id: getDraftId(documentId),
@@ -208,11 +208,11 @@ it('sets optimistic changes synchronously', async () => {
 
   // then the actions are synchronous
   expect(state1.getCurrent()).toBeNull()
-  applyDocumentActions(instance1, {actions: [createDocument(doc1)], source: source1})
+  applyDocumentActions(instance1, {actions: [createDocument(doc1)], resource: source1})
   expect(state1.getCurrent()).toMatchObject({_id: getDraftId(doc1.documentId)})
   const actionResult1Promise = applyDocumentActions(instance1, {
     actions: [editDocument(doc1, {set: {title: 'initial title'}})],
-    source: source1,
+    resource: source1,
   })
   expect(state1.getCurrent()?.title).toBe('initial title')
 
@@ -233,7 +233,7 @@ it('sets optimistic changes synchronously', async () => {
   // synchronous for state 2
   const actionResult2Promise = applyDocumentActions(instance2, {
     actions: [editDocument(doc2, {set: {title: 'updated title'}})],
-    source: source2,
+    resource: source2,
   })
   expect(state2.getCurrent()?.title).toBe('updated title')
   // async for state 1
@@ -256,7 +256,7 @@ it('propagates changes between two instances', async () => {
   const state2Unsubscribe = state2.subscribe()
 
   // Create the document from instance1.
-  await applyDocumentActions(instance1, {actions: [createDocument(doc)], source: source1}).then(
+  await applyDocumentActions(instance1, {actions: [createDocument(doc)], resource: source1}).then(
     (r) => r.submitted(),
   )
 
@@ -268,7 +268,7 @@ it('propagates changes between two instances', async () => {
   // Now, edit the document from instance2.
   await applyDocumentActions(instance2, {
     actions: [editDocument(doc, {set: {title: 'Hello world!'}})],
-    source: source2,
+    resource: source2,
   }).then((r) => r.submitted())
 
   const updated1 = state1.getCurrent()
@@ -296,19 +296,19 @@ it('handles concurrent edits and resolves conflicts', async () => {
       createDocument(doc),
       editDocument(doc, {set: {title: 'The quick brown fox jumps over the lazy dog'}}),
     ],
-    source,
+    resource,
   }).then((res) => res.submitted())
 
   // Both instances now issue an edit simultaneously.
   const p1 = applyDocumentActions(instance1, {
     actions: [editDocument(doc, {set: {title: 'The quick brown fox jumps over the lazy cat'}})],
-    source: source1,
+    resource: source1,
   }).then((r) => r.submitted())
   const p2 = applyDocumentActions(instance2, {
     actions: [
       editDocument(doc, {set: {title: 'The quick brown elephant jumps over the lazy dog'}}),
     ],
-    source: source2,
+    resource: source2,
   }).then((r) => r.submitted())
 
   // Wait for both actions to complete (or reject).
@@ -331,10 +331,10 @@ it('unpublishes and discards a document', async () => {
   const unsubscribe = documentState.subscribe()
 
   // Create and publish the document.
-  await applyDocumentActions(instance, {actions: [createDocument(doc)], source})
+  await applyDocumentActions(instance, {actions: [createDocument(doc)], resource})
   const afterPublish = await applyDocumentActions(instance, {
     actions: [publishDocument(doc)],
-    source,
+    resource,
   })
   const publishedDoc = documentState.getCurrent()
   expect(publishedDoc).toMatchObject({
@@ -343,13 +343,13 @@ it('unpublishes and discards a document', async () => {
   })
 
   // Unpublish the document (which should delete the published version and create a draft).
-  await applyDocumentActions(instance, {actions: [unpublishDocument(doc)], source})
+  await applyDocumentActions(instance, {actions: [unpublishDocument(doc)], resource})
   const afterUnpublish = documentState.getCurrent()
   // In our mock implementation the _id remains the same but the published copy is removed.
   expect(afterUnpublish?._id).toEqual(getDraftId(documentId))
 
   // Discard the draft (which deletes the draft version).
-  await applyDocumentActions(instance, {actions: [discardDocument(doc)], source})
+  await applyDocumentActions(instance, {actions: [discardDocument(doc)], resource})
   const afterDiscard = documentState.getCurrent()
   expect(afterDiscard).toBeNull()
 
@@ -365,13 +365,13 @@ it('deletes a document', async () => {
 
   await applyDocumentActions(instance, {
     actions: [createDocument(doc), publishDocument(doc)],
-    source,
+    resource,
   })
   const docValue = documentState.getCurrent()
   expect(docValue).toBeDefined()
 
   // Delete the document.
-  await applyDocumentActions(instance, {actions: [deleteDocument(doc)], source})
+  await applyDocumentActions(instance, {actions: [deleteDocument(doc)], resource})
   const afterDelete = documentState.getCurrent()
   expect(afterDelete).toBeNull()
 
@@ -387,7 +387,7 @@ it('cleans up document state when there are no subscribers', async () => {
   const unsubscribe = documentState.subscribe()
 
   // Create a document.
-  await applyDocumentActions(instance, {actions: [createDocument(doc)], source})
+  await applyDocumentActions(instance, {actions: [createDocument(doc)], resource})
   expect(documentState.getCurrent()).toBeDefined()
 
   // Unsubscribe from the document.
@@ -414,7 +414,7 @@ it('fetches documents if there are no active subscriptions for the actions appli
   // transaction for this action has been accepted by the server
   const setNewTitle = applyDocumentActions(instance, {
     actions: [editDocument(doc, {set: {title: 'new title'}})],
-    source,
+    resource,
   })
   expect(getCurrent()?.title).toBeUndefined()
   expect(getDocumentSyncStatus(instance, doc).getCurrent()).toBe(false)
@@ -425,12 +425,12 @@ it('fetches documents if there are no active subscriptions for the actions appli
   // there is an active subscriber now so the edits are synchronous
   applyDocumentActions(instance, {
     actions: [editDocument(doc, {set: {title: 'updated title'}})],
-    source,
+    resource,
   })
   expect(getCurrent()?.title).toBe('updated title')
   applyDocumentActions(instance, {
     actions: [editDocument(doc, {set: {title: 'updated title!'}})],
-    source,
+    resource,
   })
   expect(getCurrent()?.title).toBe('updated title!')
 
@@ -439,7 +439,7 @@ it('fetches documents if there are no active subscriptions for the actions appli
   // await submitted in order to test that there is no subscriptions
   const result = await applyDocumentActions(instance, {
     actions: [editDocument(doc, {set: {title: 'updated title'}})],
-    source,
+    resource,
   })
   await result.submitted()
 
@@ -448,7 +448,7 @@ it('fetches documents if there are no active subscriptions for the actions appli
 
   const setNewNewTitle = applyDocumentActions(instance, {
     actions: [editDocument(doc, {set: {title: 'new new title'}})],
-    source,
+    resource,
   })
   // now we'll have to await again
   expect(getCurrent()?.title).toBe(undefined)
@@ -463,15 +463,18 @@ it('batches edit transaction into one outgoing transaction', async () => {
   const unsubscribe = getDocumentState(instance, doc).subscribe()
 
   // this creates its own transaction
-  applyDocumentActions(instance, {actions: [createDocument(doc)], source})
+  applyDocumentActions(instance, {actions: [createDocument(doc)], resource})
 
   // these get batched into one
-  applyDocumentActions(instance, {actions: [editDocument(doc, {set: {title: 'name!'}})], source})
-  applyDocumentActions(instance, {actions: [editDocument(doc, {set: {title: 'name!!'}})], source})
-  applyDocumentActions(instance, {actions: [editDocument(doc, {set: {title: 'name!!!'}})], source})
+  applyDocumentActions(instance, {actions: [editDocument(doc, {set: {title: 'name!'}})], resource})
+  applyDocumentActions(instance, {actions: [editDocument(doc, {set: {title: 'name!!'}})], resource})
+  applyDocumentActions(instance, {
+    actions: [editDocument(doc, {set: {title: 'name!!!'}})],
+    resource,
+  })
   const res = await applyDocumentActions(instance, {
     actions: [editDocument(doc, {set: {title: 'name!!!!'}})],
-    source,
+    resource,
   })
   await res.submitted()
 
@@ -503,7 +506,7 @@ it('submits liveEdit document edits through observable.mutate', async () => {
 
   const result = await applyDocumentActions(instance, {
     actions: [editDocument(liveDoc, {set: {title: 'patched via mutate'}})],
-    source,
+    resource,
   })
   await result.submitted()
 
@@ -539,7 +542,7 @@ it('provides the consistency status via `getDocumentSyncStatus`', async () => {
   const unsubscribe = syncStatus.subscribe()
   expect(syncStatus.getCurrent()).toBe(true)
 
-  const applied = applyDocumentActions(instance, {actions: [createDocument(doc)], source})
+  const applied = applyDocumentActions(instance, {actions: [createDocument(doc)], resource})
   expect(syncStatus.getCurrent()).toBe(false)
 
   const createResult = await applied
@@ -550,15 +553,15 @@ it('provides the consistency status via `getDocumentSyncStatus`', async () => {
 
   applyDocumentActions(instance, {
     actions: [editDocument(doc, {set: {title: 'initial name'}})],
-    source,
+    resource,
   })
   expect(syncStatus.getCurrent()).toBe(false)
 
   applyDocumentActions(instance, {
     actions: [editDocument(doc, {set: {title: 'updated name'}})],
-    source,
+    resource,
   })
-  const publishResult = applyDocumentActions(instance, {actions: [publishDocument(doc)], source})
+  const publishResult = applyDocumentActions(instance, {actions: [publishDocument(doc)], resource})
   expect(syncStatus.getCurrent()).toBe(false)
   await publishResult.then((res) => res.submitted())
   expect(syncStatus.getCurrent()).toBe(true)
@@ -576,7 +579,7 @@ it('reverts failed outgoing transaction locally', async () => {
 
   const revertedEventPromise = new Promise<TransactionRevertedEvent>((resolve) => {
     const unsubscribe = subscribeDocumentEvents(instance, {
-      source,
+      resource,
       eventHandler: (e) => {
         if (e.type === 'reverted') {
           resolve(e)
@@ -592,11 +595,11 @@ it('reverts failed outgoing transaction locally', async () => {
   const {getCurrent, subscribe} = getDocumentState(instance, doc)
   const unsubscribe = subscribe()
 
-  await applyDocumentActions(instance, {actions: [createDocument(doc)], source})
-  applyDocumentActions(instance, {actions: [editDocument(doc, {set: {title: 'the'}})], source})
+  await applyDocumentActions(instance, {actions: [createDocument(doc)], resource})
+  applyDocumentActions(instance, {actions: [editDocument(doc, {set: {title: 'the'}})], resource})
   applyDocumentActions(instance, {
     actions: [editDocument(doc, {set: {title: 'the quick'}})],
-    source,
+    resource,
   })
 
   // this edit action is simulated to fail from the backend and will be reverted
@@ -604,16 +607,16 @@ it('reverts failed outgoing transaction locally', async () => {
     actions: [editDocument(doc, {set: {title: 'the quick brown'}})],
     transactionId: 'force-revert',
     disableBatching: true,
-    source,
+    resource,
   })
 
   applyDocumentActions(instance, {
     actions: [editDocument(doc, {set: {title: 'the quick brown fox'}})],
-    source,
+    resource,
   })
   await applyDocumentActions(instance, {
     actions: [editDocument(doc, {set: {title: 'the quick brown fox jumps'}})],
-    source,
+    resource,
   }).then((e) => e.submitted())
 
   await expect(revertedEventPromise).resolves.toMatchObject({
@@ -633,7 +636,7 @@ it('reverts failed outgoing transaction locally', async () => {
   // check that we can still edit after recovering from the error
   applyDocumentActions(instance, {
     actions: [editDocument(doc, {set: {title: 'TEST the quick fox jumps'}})],
-    source,
+    resource,
   })
   expect(getCurrent()?.title).toBe('TEST the quick fox jumps')
 
@@ -644,7 +647,7 @@ it('reverts failed outgoing transaction locally', async () => {
 it('removes a queued transaction if it fails to apply', async () => {
   const actionErrorEventPromise = new Promise<ActionErrorEvent>((resolve) => {
     const unsubscribe = subscribeDocumentEvents(instance, {
-      source,
+      resource,
       eventHandler: (e) => {
         if (e.type === 'error') {
           resolve(e)
@@ -661,7 +664,7 @@ it('removes a queued transaction if it fails to apply', async () => {
   await expect(
     applyDocumentActions(instance, {
       actions: [editDocument(doc, {set: {title: "can't set"}})],
-      source,
+      resource,
     }),
   ).rejects.toThrowError(/Cannot edit document/)
 
@@ -672,8 +675,11 @@ it('removes a queued transaction if it fails to apply', async () => {
   })
 
   // editing should still work after though (no crashing)
-  await applyDocumentActions(instance, {actions: [createDocument(doc)], source})
-  applyDocumentActions(instance, {actions: [editDocument(doc, {set: {title: 'can set!'}})], source})
+  await applyDocumentActions(instance, {actions: [createDocument(doc)], resource})
+  applyDocumentActions(instance, {
+    actions: [editDocument(doc, {set: {title: 'can set!'}})],
+    resource,
+  })
 
   expect(state.getCurrent()?.title).toBe('can set!')
 
@@ -693,7 +699,7 @@ it('returns allowed true when no permission errors occur', async () => {
   })
   const state = getDocumentState(instance, doc)
   const unsubscribe = state.subscribe()
-  await applyDocumentActions(instance, {actions: [createDocument(doc)], source}).then((r) =>
+  await applyDocumentActions(instance, {actions: [createDocument(doc)], resource}).then((r) =>
     r.submitted(),
   )
 
@@ -718,7 +724,7 @@ it("should reject applying the action if a precondition isn't met", async () =>
   const doc = createDocumentHandle({documentId: 'does-not-exist', documentType: 'article'})
 
   await expect(
-    applyDocumentActions(instance, {actions: [deleteDocument(doc)], source}),
+    applyDocumentActions(instance, {actions: [deleteDocument(doc)], resource}),
   ).rejects.toThrow('The document you are trying to delete does not exist.')
 })
 
@@ -729,7 +735,7 @@ it("should reject applying the action if a permission isn't met", async () => {
   vi.mocked(client.request).mockResolvedValue(datasetAcl)
 
   await expect(
-    applyDocumentActions(instance, {actions: [createDocument(doc)], source}),
+    applyDocumentActions(instance, {actions: [createDocument(doc)], resource}),
   ).rejects.toThrow('You do not have permission to create a draft for document "does-not-exist".')
 })
 
@@ -768,11 +774,11 @@ it('fetches dataset ACL and updates grants in the document store state', async (
   })
 })
 
-it('fetches ACL for MediaLibrarySource', async () => {
+it('fetches ACL for MediaLibraryResource', async () => {
   const mediaLibraryInstance = createSanityInstance({
     projectId: 'p',
     dataset: 'd',
-    sources: {
+    resources: {
       'media-library': {mediaLibraryId: 'test-media-library'},
     },
   })
@@ -785,18 +791,18 @@ it('fetches ACL for MediaLibrarySource', async () => {
 
   const result = await resolvePermissions(mediaLibraryInstance, {
     actions: [createDocument(doc)],
-    source: mediaLibrarySource,
+    resource: mediaLibrarySource,
   })
 
   expect(result).toEqual({allowed: true})
   mediaLibraryInstance.dispose()
 })
 
-it('fetches ACL for CanvasSource', async () => {
+it('fetches ACL for CanvasResource', async () => {
   const canvasInstance = createSanityInstance({
     projectId: 'p',
     dataset: 'd',
-    sources: {
+    resources: {
       canvas: {canvasId: 'test-canvas'},
     },
   })
@@ -809,7 +815,7 @@ it('fetches ACL for CanvasSource', async () => {
 
   const result = await resolvePermissions(canvasInstance, {
     actions: [createDocument(doc)],
-    source: canvasSource,
+    resource: canvasSource,
   })
 
   expect(result).toEqual({allowed: true})
@@ -826,7 +832,7 @@ it('returns a promise that resolves when a document has been loaded in the store
   const oneOffInstance = createSanityInstance({projectId: 'p', dataset: 'd'})
   const result = await applyDocumentActions(oneOffInstance, {
     actions: [createDocument(doc), editDocument(doc, {set: {title: 'initial title'}})],
-    source,
+    resource,
   })
   await result.submitted() // wait till submitted to server before resolving
 
@@ -840,7 +846,7 @@ it('returns a promise that resolves when a document has been loaded in the store
 
 it('emits an event for each action after an outgoing transaction has been accepted', async () => {
   const handler = vi.fn()
-  const unsubscribe = subscribeDocumentEvents(instance, {source, eventHandler: handler})
+  const unsubscribe = subscribeDocumentEvents(instance, {resource, eventHandler: handler})
 
   const documentId = DocumentId(crypto.randomUUID())
   const doc = createDocumentHandle({documentId, documentType: 'article'})
@@ -852,7 +858,7 @@ it('emits an event for each action after an outgoing transaction has been accept
       editDocument(doc, {set: {title: 'new name'}}),
       publishDocument(doc),
     ],
-    source,
+    resource,
   }).then((e) => e.submitted())
   expect(handler).toHaveBeenCalledTimes(4)
 
@@ -863,7 +869,7 @@ it('emits an event for each action after an outgoing transaction has been accept
       editDocument(doc, {set: {title: 'updated name'}}),
       discardDocument(doc),
     ],
-    source,
+    resource,
   }).then((e) => e.submitted())
   expect(handler).toHaveBeenCalledTimes(9)
 
@@ -879,7 +885,7 @@ it('emits an event for each action after an outgoing transaction has been accept
     [{type: 'accepted', outgoing: {transactionId: tnx2.transactionId}}],
   ])
 
-  await applyDocumentActions(instance, {actions: [deleteDocument(doc)], source})
+  await applyDocumentActions(instance, {actions: [deleteDocument(doc)], resource})
 
   unsubscribe()
 })

package/src/document/documentStore.ts

@@ -29,15 +29,15 @@ import {
 import {type ClientOptions, getClientState} from '../client/clientStore'
 import {
   type DocumentHandle,
-  type DocumentSource,
-  isCanvasSource,
-  isDatasetSource,
-  isMediaLibrarySource,
+  type DocumentResource,
+  isCanvasResource,
+  isDatasetResource,
+  isMediaLibraryResource,
 } from '../config/sanityConfig'
 import {isReleasePerspective} from '../releases/utils/isReleasePerspective'
 import {
-  bindActionBySource,
-  type BoundSourceKey,
+  bindActionByResource,
+  type BoundResourceKey,
   type StoreAction,
 } from '../store/createActionBinder'
 import {type SanityInstance} from '../store/createSanityInstance'
@@ -122,15 +122,15 @@ export interface DocumentState {
   unverifiedRevisions?: {[TTransactionId in string]?: UnverifiedDocumentRevision}
 }
 
-export const documentStore = defineStore<DocumentStoreState, BoundSourceKey>({
+export const documentStore = defineStore<DocumentStoreState, BoundResourceKey>({
   name: 'Document',
-  getInitialState: (instance, {source}) => ({
+  getInitialState: (instance, {resource}) => ({
     documentStates: {},
     // these can be emptied on refetch
     queued: [],
     applied: [],
-    sharedListener: createSharedListener(instance, source),
-    fetchDocument: createFetchDocument(instance, source),
+    sharedListener: createSharedListener(instance, resource),
+    fetchDocument: createFetchDocument(instance, resource),
     events: new Subject(),
   }),
   initialize(context) {
@@ -198,7 +198,7 @@ export function getDocumentState(
   return _getDocumentState(...args)
 }
 
-const _getDocumentState = bindActionBySource(
+const _getDocumentState = bindActionByResource(
   documentStore,
   createStateSourceAction({
     selector: ({state: {error, documentStates}}, options: DocumentOptions<string | undefined>) => {
@@ -255,7 +255,7 @@ export function resolveDocument(
 ): Promise<SanityDocument | null> {
   return _resolveDocument(...args)
 }
-const _resolveDocument = bindActionBySource(
+const _resolveDocument = bindActionByResource(
   documentStore,
   ({instance}, docHandle: DocumentHandle<string, string, string>) => {
     return firstValueFrom(
@@ -268,7 +268,7 @@ const _resolveDocument = bindActionBySource(
 )
 
 /** @beta */
-export const getDocumentSyncStatus = bindActionBySource(
+export const getDocumentSyncStatus = bindActionByResource(
   documentStore,
   createStateSourceAction({
     selector: (
@@ -300,12 +300,12 @@ export const getDocumentSyncStatus = bindActionBySource(
 )
 
 type PermissionsStateOptions = {
-  source?: DocumentSource
+  resource?: DocumentResource
   actions: DocumentAction[]
 }
 
 /** @beta */
-export const getPermissionsState = bindActionBySource(
+export const getPermissionsState = bindActionByResource(
   documentStore,
   createStateSourceAction({
     selector: calculatePermissions,
@@ -320,7 +320,7 @@ export const getPermissionsState = bindActionBySource(
 )
 
 /** @beta */
-export const resolvePermissions = bindActionBySource(
+export const resolvePermissions = bindActionByResource(
   documentStore,
   ({instance}, options: PermissionsStateOptions) => {
     return firstValueFrom(
@@ -330,9 +330,9 @@ export const resolvePermissions = bindActionBySource(
 )
 
 /** @beta */
-export const subscribeDocumentEvents = bindActionBySource(
+export const subscribeDocumentEvents = bindActionByResource(
   documentStore,
-  ({state}, options: {source?: DocumentSource; eventHandler: (e: DocumentEvent) => void}) => {
+  ({state}, options: {resource?: DocumentResource; eventHandler: (e: DocumentEvent) => void}) => {
     const {events} = state.get()
     const subscription = events.subscribe(options.eventHandler)
     return () => subscription.unsubscribe()
@@ -341,7 +341,7 @@ export const subscribeDocumentEvents = bindActionBySource(
 
 const subscribeToQueuedAndApplyNextTransaction = ({
   state,
-}: StoreContext<DocumentStoreState, BoundSourceKey>) => {
+}: StoreContext<DocumentStoreState, BoundResourceKey>) => {
   const {events} = state.get()
   return state.observable
     .pipe(
@@ -372,8 +372,8 @@ const subscribeToQueuedAndApplyNextTransaction = ({
 const subscribeToAppliedAndSubmitNextTransaction = ({
   state,
   instance,
-  key: {source},
-}: StoreContext<DocumentStoreState, BoundSourceKey>) => {
+  key: {resource},
+}: StoreContext<DocumentStoreState, BoundResourceKey>) => {
   const {events} = state.get()
 
   return state.observable
@@ -396,8 +396,7 @@ const subscribeToAppliedAndSubmitNextTransaction = ({
       withLatestFrom(
         getClientState(instance, {
           apiVersion: API_VERSION,
-          // TODO: remove in v3 when we're ready for everything to be queried via source
-          source: source && !isDatasetSource(source) ? source : undefined,
+          resource,
         }).observable,
       ),
       concatMap(([outgoing, client]) => {
@@ -450,7 +449,7 @@ const subscribeToAppliedAndSubmitNextTransaction = ({
 }
 
 const subscribeToSubscriptionsAndListenToDocuments = (
-  context: StoreContext<DocumentStoreState, BoundSourceKey>,
+  context: StoreContext<DocumentStoreState, BoundResourceKey>,
 ) => {
   const {state} = context
   const {events} = state.get()
@@ -518,23 +517,19 @@ const subscribeToSubscriptionsAndListenToDocuments = (
 const subscribeToClientAndFetchDatasetAcl = ({
   instance,
   state,
-  key: {source},
-}: StoreContext<DocumentStoreState, BoundSourceKey>) => {
-  const clientOptions: ClientOptions = {apiVersion: API_VERSION}
-  // TODO: remove in v3 when we're ready for everything to be queried via source
-  if (source && !isDatasetSource(source)) {
-    clientOptions.source = source
-  }
+  key: {resource},
+}: StoreContext<DocumentStoreState, BoundResourceKey>) => {
+  const clientOptions: ClientOptions = {apiVersion: API_VERSION, resource}
 
   let uri: string
-  if (source && isDatasetSource(source)) {
-    uri = `/projects/${source.projectId}/datasets/${source.dataset}/acl`
-  } else if (source && isMediaLibrarySource(source)) {
-    uri = `/media-libraries/${source.mediaLibraryId}/acl`
-  } else if (source && isCanvasSource(source)) {
-    uri = `/canvases/${source.canvasId}/acl`
+  if (resource && isDatasetResource(resource)) {
+    uri = `/projects/${resource.projectId}/datasets/${resource.dataset}/acl`
+  } else if (resource && isMediaLibraryResource(resource)) {
+    uri = `/media-libraries/${resource.mediaLibraryId}/acl`
+  } else if (resource && isCanvasResource(resource)) {
+    uri = `/canvases/${resource.canvasId}/acl`
   } else {
-    throw new Error(`Received invalid source: ${JSON.stringify(source)}`)
+    throw new Error(`Received invalid resource: ${JSON.stringify(resource)}`)
   }
 
   return getClientState(instance, clientOptions)

package/src/document/processActions.ts

@@ -7,9 +7,9 @@ import {
   type SanityDocument,
 } from '@sanity/types'
 import {evaluateSync, type ExprNode} from 'groq-js'
-import {isEqual} from 'lodash-es'
 
 import {isReleasePerspective} from '../releases/utils/isReleasePerspective'
+import {isDeepEqual} from '../utils/object'
 import {type DocumentAction} from './actions'
 import {type Grant} from './permissions'
 import {type DocumentSet, getId, processMutations} from './processMutations'
@@ -568,7 +568,7 @@ export function processActions({
 
         // Before proceeding, verify that the working draft is identical to the base draft.
         // TODO: is it enough just to check for the _rev or nah?
-        if (!isEqual(workingDraft, baseDraft)) {
+        if (!isDeepEqual(workingDraft, baseDraft)) {
           throw new ActionError({
             documentId,
             transactionId,