@sanity/sdk 2.10.0 → 2.11.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sanity/sdk",
-  "version": "2.10.0",
+  "version": "2.11.1",
   "private": false,
   "description": "Sanity SDK",
   "keywords": [
@@ -48,43 +48,41 @@
   "browserslist": "extends @sanity/browserslist-config",
   "prettier": "@sanity/prettier-config",
   "dependencies": {
-    "@sanity/bifur-client": "^0.4.1",
+    "@sanity/bifur-client": "^1.0.0",
     "@sanity/client": "^7.22.0",
-    "@sanity/comlink": "^3.1.1",
+    "@sanity/comlink": "^4.0.1",
     "@sanity/diff-match-patch": "^3.2.0",
     "@sanity/diff-patch": "^6.0.0",
     "@sanity/id-utils": "^1.0.0",
-    "@sanity/image-url": "^2.0.3",
+    "@sanity/image-url": "^2.1.1",
     "@sanity/json-match": "^1.0.5",
     "@sanity/message-protocol": "^0.23.0",
     "@sanity/mutate": "^0.16.1",
     "@sanity/telemetry": "^1.1.0",
-    "@sanity/types": "^5.2.0",
+    "@sanity/types": "^5.24.0",
     "groq": "3.88.1-typegen-experimental.0",
-    "groq-js": "^1.19.0",
+    "groq-js": "^1.30.1",
     "reselect": "^5.1.1",
     "rxjs": "^7.8.2",
-    "zustand": "^5.0.12"
+    "zustand": "^5.0.13"
   },
   "devDependencies": {
     "@sanity/browserslist-config": "^1.0.5",
     "@sanity/pkg-utils": "^8.1.29",
     "@sanity/prettier-config": "^1.0.6",
-    "@vitest/coverage-v8": "3.2.4",
-    "eslint": "^9.22.0",
-    "prettier": "^3.7.3",
+    "@types/node": "^24.12.3",
+    "@vitest/coverage-v8": "4.1.5",
+    "eslint": "^9.39.4",
+    "prettier": "^3.8.3",
     "rollup-plugin-visualizer": "^5.14.0",
-    "typescript": "^5.8.3",
-    "vite": "^7.0.0",
-    "vitest": "^3.2.4",
+    "typescript": "^5.9.3",
+    "vite": "^7.3.3",
+    "vitest": "^4.1.5",
     "@repo/config-eslint": "0.0.0",
-    "@repo/tsconfig": "0.0.1",
     "@repo/package.bundle": "3.82.0",
+    "@repo/config-test": "0.0.1",
     "@repo/package.config": "0.0.1",
-    "@repo/config-test": "0.0.1"
-  },
-  "engines": {
-    "node": ">=20.19"
+    "@repo/tsconfig": "0.0.1"
   },
   "publishConfig": {
     "access": "public"

package/src/_exports/_internal.ts

@@ -12,3 +12,4 @@ export {getQueryKey, parseQueryKey} from '../query/queryStore' // only used for
 export {getTelemetryManager, initTelemetry, trackHookMounted} from '../telemetry/initTelemetry'
 export {getUsersKey, parseUsersKey} from '../users/reducers' // only used for memoizing in React, not needed for actual functionality
 export {createGroqSearchFilter} from '../utils/createGroqSearchFilter'
+export {isDeepEqual, pickProperties} from '../utils/object'

package/src/_exports/index.ts

@@ -157,6 +157,20 @@ export {type JsonMatch} from '../document/patchOperations'
 export {type DocumentPermissionsResult, type PermissionDeniedReason} from '../document/permissions'
 export type {FavoriteStatusResponse} from '../favorites/favorites'
 export {getFavoritesState, resolveFavoritesState} from '../favorites/favorites'
+export {
+  getOrganizationState,
+  type Organization,
+  type OrganizationBase,
+  type OrganizationMember,
+  type OrganizationOptions,
+  resolveOrganization,
+} from '../organization/organization'
+export {
+  getOrganizationsState,
+  type Organizations,
+  type OrganizationsOptions,
+  resolveOrganizations,
+} from '../organizations/organizations'
 export {getPresence} from '../presence/presenceStore'
 export type {
   DisconnectEvent,
@@ -178,11 +192,20 @@ export type {
   ValuePending,
 } from '../preview/types'
 export {type OrgVerificationResult} from '../project/organizationVerification'
-export {getProjectState, resolveProject} from '../project/project'
+export {
+  getProjectState,
+  type Project,
+  type ProjectBase,
+  type ProjectMember,
+  type ProjectMemberRole,
+  type ProjectMetadata,
+  type ProjectOptions,
+  resolveProject,
+} from '../project/project'
 export {getProjectionState} from '../projection/getProjectionState'
 export {resolveProjection} from '../projection/resolveProjection'
 export {type ProjectionValuePending, type ValidProjection} from '../projection/types'
-export {getProjectsState, resolveProjects} from '../projects/projects'
+export {getProjectsState, type ProjectsOptions, resolveProjects} from '../projects/projects'
 export {
   getQueryKey,
   getQueryState,

package/src/agent/agentActions.ts

@@ -2,6 +2,7 @@ import {type SanityClient} from '@sanity/client'
 import {from, Observable, switchMap} from 'rxjs'
 
 import {getClientState} from '../client/clientStore'
+import {type DocumentResource} from '../config/sanityConfig'
 import {type SanityInstance} from '../store/createSanityInstance'
 
 const API_VERSION = 'vX'
@@ -58,12 +59,11 @@ export type AgentPatchResult = Awaited<ReturnType<SanityClient['agent']['action'
 export function agentGenerate(
   instance: SanityInstance,
   options: AgentGenerateOptions,
+  resource?: DocumentResource,
 ): AgentGenerateResult {
-  return getClientState(instance, {
-    apiVersion: API_VERSION,
-    projectId: instance.config.projectId,
-    dataset: instance.config.dataset,
-  }).observable.pipe(switchMap((client) => client.observable.agent.action.generate(options)))
+  return getClientState(instance, {apiVersion: API_VERSION, resource}).observable.pipe(
+    switchMap((client) => client.observable.agent.action.generate(options)),
+  )
 }
 
 /**
@@ -76,12 +76,11 @@ export function agentGenerate(
 export function agentTransform(
   instance: SanityInstance,
   options: AgentTransformOptions,
+  resource?: DocumentResource,
 ): AgentTransformResult {
-  return getClientState(instance, {
-    apiVersion: API_VERSION,
-    projectId: instance.config.projectId,
-    dataset: instance.config.dataset,
-  }).observable.pipe(switchMap((client) => client.observable.agent.action.transform(options)))
+  return getClientState(instance, {apiVersion: API_VERSION, resource}).observable.pipe(
+    switchMap((client) => client.observable.agent.action.transform(options)),
+  )
 }
 
 /**
@@ -94,12 +93,11 @@ export function agentTransform(
 export function agentTranslate(
   instance: SanityInstance,
   options: AgentTranslateOptions,
+  resource?: DocumentResource,
 ): AgentTranslateResult {
-  return getClientState(instance, {
-    apiVersion: API_VERSION,
-    projectId: instance.config.projectId,
-    dataset: instance.config.dataset,
-  }).observable.pipe(switchMap((client) => client.observable.agent.action.translate(options)))
+  return getClientState(instance, {apiVersion: API_VERSION, resource}).observable.pipe(
+    switchMap((client) => client.observable.agent.action.translate(options)),
+  )
 }
 
 /**
@@ -112,12 +110,11 @@ export function agentTranslate(
 export function agentPrompt(
   instance: SanityInstance,
   options: AgentPromptOptions,
+  resource?: DocumentResource,
 ): Observable<AgentPromptResult> {
-  return getClientState(instance, {
-    apiVersion: API_VERSION,
-    projectId: instance.config.projectId,
-    dataset: instance.config.dataset,
-  }).observable.pipe(switchMap((client) => from(client.agent.action.prompt(options))))
+  return getClientState(instance, {apiVersion: API_VERSION, resource}).observable.pipe(
+    switchMap((client) => from(client.agent.action.prompt(options))),
+  )
 }
 
 /**
@@ -130,10 +127,9 @@ export function agentPrompt(
 export function agentPatch(
   instance: SanityInstance,
   options: AgentPatchOptions,
+  resource?: DocumentResource,
 ): Observable<AgentPatchResult> {
-  return getClientState(instance, {
-    apiVersion: API_VERSION,
-    projectId: instance.config.projectId,
-    dataset: instance.config.dataset,
-  }).observable.pipe(switchMap((client) => from(client.agent.action.patch(options))))
+  return getClientState(instance, {apiVersion: API_VERSION, resource}).observable.pipe(
+    switchMap((client) => from(client.agent.action.patch(options))),
+  )
 }

package/src/auth/refreshStampedToken.test.ts

@@ -59,8 +59,8 @@ describe('refreshStampedToken', () => {
       request: vi.fn(
         async (
           _name: string,
-          _options: LockOptions | LockGrantedCallback,
-          callback?: LockGrantedCallback,
+          _options: LockOptions | LockGrantedCallback<unknown>,
+          callback?: LockGrantedCallback<unknown>,
         ) => {
           const actualCallback = typeof _options === 'function' ? _options : callback
           if (!actualCallback) return false

package/src/auth/subscribeToStateAndFetchCurrentUser.test.ts

@@ -112,4 +112,120 @@ describe('subscribeToStateAndFetchCurrentUser', () => {
 
     subscription.unsubscribe()
   })
+
+  it('recovers from a fetch error when a new token is set', () => {
+    const error = new Error('Unauthorized')
+    const mockUser = {id: 'recovered-user'} as CurrentUser
+    const mockRequest = vi
+      .fn()
+      .mockReturnValueOnce(throwError(() => error))
+      .mockReturnValueOnce(of(mockUser))
+    const mockClient = {observable: {request: mockRequest}}
+    const clientFactory = vi.fn().mockReturnValue(mockClient)
+    const instance = createSanityInstance({projectId: 'p', dataset: 'd', auth: {clientFactory}})
+
+    const state = createStoreState(authStore.getInitialState(instance, null))
+    const subscription = subscribeToStateAndFetchCurrentUser({state, instance, key: null})
+
+    // First token causes a 401 — state should transition to ERROR
+    state.set('setLoggedIn', {
+      authState: {type: AuthStateType.LOGGED_IN, token: 'expired-token', currentUser: null},
+    })
+    expect(state.get()).toMatchObject({authState: {type: AuthStateType.ERROR, error}})
+
+    // Simulate comlink providing a fresh token (setAuthToken sets LOGGED_IN with new token)
+    state.set('setNewToken', {
+      authState: {type: AuthStateType.LOGGED_IN, token: 'fresh-token', currentUser: null},
+    })
+
+    // Subscription should still be alive — re-fetches /users/me with the new token
+    expect(state.get()).toMatchObject({
+      authState: {type: AuthStateType.LOGGED_IN, token: 'fresh-token', currentUser: mockUser},
+    })
+    expect(mockRequest).toHaveBeenCalledTimes(2)
+
+    subscription.unsubscribe()
+  })
+
+  it('recovers from multiple consecutive fetch errors', () => {
+    const error1 = new Error('Unauthorized')
+    const error2 = new Error('Unauthorized again')
+    const mockUser = {id: 'finally-recovered'} as CurrentUser
+    const mockRequest = vi
+      .fn()
+      .mockReturnValueOnce(throwError(() => error1))
+      .mockReturnValueOnce(throwError(() => error2))
+      .mockReturnValueOnce(of(mockUser))
+    const mockClient = {observable: {request: mockRequest}}
+    const clientFactory = vi.fn().mockReturnValue(mockClient)
+    const instance = createSanityInstance({projectId: 'p', dataset: 'd', auth: {clientFactory}})
+
+    const state = createStoreState(authStore.getInitialState(instance, null))
+    const subscription = subscribeToStateAndFetchCurrentUser({state, instance, key: null})
+
+    // First attempt fails
+    state.set('setLoggedIn', {
+      authState: {type: AuthStateType.LOGGED_IN, token: 'token-1', currentUser: null},
+    })
+    expect(state.get()).toMatchObject({authState: {type: AuthStateType.ERROR, error: error1}})
+
+    // Second attempt also fails
+    state.set('setNewToken', {
+      authState: {type: AuthStateType.LOGGED_IN, token: 'token-2', currentUser: null},
+    })
+    expect(state.get()).toMatchObject({authState: {type: AuthStateType.ERROR, error: error2}})
+
+    // Third attempt succeeds
+    state.set('setNewToken', {
+      authState: {type: AuthStateType.LOGGED_IN, token: 'token-3', currentUser: null},
+    })
+    expect(state.get()).toMatchObject({
+      authState: {type: AuthStateType.LOGGED_IN, token: 'token-3', currentUser: mockUser},
+    })
+    expect(mockRequest).toHaveBeenCalledTimes(3)
+
+    subscription.unsubscribe()
+  })
+
+  it('does not re-fetch with the same token but recovers with a different token', () => {
+    const error = new Error('Unauthorized')
+    const mockUser = {id: 'recovered-user'} as CurrentUser
+    const mockRequest = vi
+      .fn()
+      .mockReturnValueOnce(throwError(() => error))
+      .mockReturnValueOnce(of(mockUser))
+    const mockClient = {observable: {request: mockRequest}}
+    const clientFactory = vi.fn().mockReturnValue(mockClient)
+    const instance = createSanityInstance({projectId: 'p', dataset: 'd', auth: {clientFactory}})
+
+    const state = createStoreState(authStore.getInitialState(instance, null))
+    const subscription = subscribeToStateAndFetchCurrentUser({state, instance, key: null})
+
+    // First attempt fails
+    state.set('setLoggedIn', {
+      authState: {type: AuthStateType.LOGGED_IN, token: 'same-token', currentUser: null},
+    })
+    expect(state.get()).toMatchObject({authState: {type: AuthStateType.ERROR, error}})
+
+    // Same token should be blocked by distinctUntilChanged — no re-fetch
+    state.set('setNewToken', {
+      authState: {type: AuthStateType.LOGGED_IN, token: 'same-token', currentUser: null},
+    })
+    expect(mockRequest).toHaveBeenCalledTimes(1)
+
+    // A different token should pass distinctUntilChanged and trigger recovery
+    state.set('setNewToken', {
+      authState: {type: AuthStateType.LOGGED_IN, token: 'different-token', currentUser: null},
+    })
+    expect(state.get()).toMatchObject({
+      authState: {
+        type: AuthStateType.LOGGED_IN,
+        token: 'different-token',
+        currentUser: mockUser,
+      },
+    })
+    expect(mockRequest).toHaveBeenCalledTimes(2)
+
+    subscription.unsubscribe()
+  })
 })

package/src/auth/subscribeToStateAndFetchCurrentUser.ts

@@ -1,5 +1,13 @@
 import {type CurrentUser} from '@sanity/types'
-import {distinctUntilChanged, filter, map, type Subscription, switchMap} from 'rxjs'
+import {
+  catchError,
+  distinctUntilChanged,
+  EMPTY,
+  filter,
+  map,
+  type Subscription,
+  switchMap,
+} from 'rxjs'
 
 import {type StoreContext} from '../store/defineStore'
 import {DEFAULT_API_VERSION, REQUEST_TAG_PREFIX} from './authConstants'
@@ -60,11 +68,24 @@ export const subscribeToStateAndFetchCurrentUser = (
         }),
       ),
       switchMap((client) =>
-        client.observable.request<CurrentUser>({
-          uri: '/users/me',
-          method: 'GET',
-          tag: 'users.get-current',
-        }),
+        client.observable
+          .request<CurrentUser>({
+            uri: '/users/me',
+            method: 'GET',
+            tag: 'users.get-current',
+          })
+          .pipe(
+            /**
+             * Catch inside switchMap so the outer subscription survives.
+             * Without this, a 401 terminates the subscription permanently
+             * and subsequent token refreshes via comlink never re-fetch /users/me.
+             * @see SDK-1409
+             */
+            catchError((error) => {
+              state.set('setError', {authState: {type: AuthStateType.ERROR, error}})
+              return EMPTY
+            }),
+          ),
       ),
     )
 
@@ -77,8 +98,5 @@ export const subscribeToStateAndFetchCurrentUser = (
             : prev.authState,
       }))
     },
-    error: (error) => {
-      state.set('setError', {authState: {type: AuthStateType.ERROR, error}})
-    },
   })
 }

package/src/client/clientStore.test.ts

@@ -191,29 +191,7 @@ describe('clientStore', () => {
   })
 
   describe('resource handling', () => {
-    it('should create client when resource is provided', () => {
-      const client = getClient(instance, {
-        apiVersion: '2024-11-12',
-        resource: {projectId: 'source-project', dataset: 'source-dataset'},
-      })
-
-      expect(vi.mocked(createClient)).toHaveBeenCalledWith(
-        expect.objectContaining({
-          apiVersion: '2024-11-12',
-          resource: {type: 'dataset', id: 'source-project.source-dataset'},
-        }),
-      )
-      // Client should be projectless - no projectId/dataset in config
-      expect(client.config()).not.toHaveProperty('projectId')
-      expect(client.config()).not.toHaveProperty('dataset')
-      expect(client.config()).toEqual(
-        expect.objectContaining({
-          resource: {type: 'dataset', id: 'source-project.source-dataset'},
-        }),
-      )
-    })
-
-    it('should create resource when resource has array resourceId and be projectless', () => {
+    it('should create resource when media library resource is provided and be projectless', () => {
       const client = getClient(instance, {
         apiVersion: '2024-11-12',
         resource: {mediaLibraryId: 'media-lib-123'},
@@ -257,38 +235,24 @@ describe('clientStore', () => {
       )
     })
 
-    it('should create projectless client when resource is provided, ignoring instance config', () => {
+    it('should transform dataset resource to project-based config for now', () => {
       const client = getClient(instance, {
         apiVersion: '2024-11-12',
         resource: {projectId: 'source-project', dataset: 'source-dataset'},
       })
 
-      // Client should be projectless - resource takes precedence, instance config is ignored
-      expect(client.config()).not.toHaveProperty('projectId')
-      expect(client.config()).not.toHaveProperty('dataset')
-      expect(client.config()).toEqual(
+      expect(vi.mocked(createClient)).toHaveBeenCalledWith(
         expect.objectContaining({
-          resource: {type: 'dataset', id: 'source-project.source-dataset'},
+          projectId: 'source-project',
+          dataset: 'source-dataset',
         }),
       )
-    })
-
-    it('should warn when both resource and explicit projectId/dataset are provided', () => {
-      const consoleSpy = vi.spyOn(console, 'warn').mockImplementation(() => {})
-      const client = getClient(instance, {
-        apiVersion: '2024-11-12',
-        resource: {projectId: 'source-project', dataset: 'source-dataset'},
-        projectId: 'explicit-project',
-        dataset: 'explicit-dataset',
-      })
-
-      expect(consoleSpy).toHaveBeenCalledWith(
-        'Both resource and explicit projectId/dataset are provided. The resource will be used and projectId/dataset will be ignored.',
+      expect(client.config()).toEqual(
+        expect.objectContaining({
+          projectId: 'source-project',
+          dataset: 'source-dataset',
+        }),
       )
-      // Client should still be projectless despite explicit projectId/dataset
-      expect(client.config()).not.toHaveProperty('projectId')
-      expect(client.config()).not.toHaveProperty('dataset')
-      consoleSpy.mockRestore()
     })
 
     it('should create different clients for different resources', () => {

package/src/client/clientStore.ts

@@ -178,24 +178,23 @@ export const getClient = bindActionGlobally(
 
     const tokenFromState = state.get().token
     const {clients, authMethod} = state.get()
+    let projectId = options.projectId ?? instance.config.projectId
+    let dataset = options.dataset ?? instance.config.dataset
 
     let resource: ClientConfig['resource'] | undefined
 
     if (options.resource) {
-      if (isDatasetResource(options.resource)) {
-        resource = {
-          type: 'dataset',
-          id: `${options.resource.projectId}.${options.resource.dataset}`,
-        }
-      } else if (isMediaLibraryResource(options.resource)) {
+      if (isMediaLibraryResource(options.resource)) {
         resource = {type: 'media-library', id: options.resource.mediaLibraryId}
       } else if (isCanvasResource(options.resource)) {
         resource = {type: 'canvas', id: options.resource.canvasId}
+      } else if (isDatasetResource(options.resource)) {
+        // use project-based routes for datasets to avoid existing CORS and Studio auth cookie issues
+        projectId = options.resource.projectId
+        dataset = options.resource.dataset
       }
     }
 
-    const projectId = options.projectId ?? instance.config.projectId
-    const dataset = options.dataset ?? instance.config.dataset
     const apiHost = options.apiHost ?? instance.config.auth?.apiHost ?? getStagingApiHost()
 
     const effectiveOptions: ClientConfig & {apiVersion: string} = {
@@ -213,12 +212,6 @@ export const getClient = bindActionGlobally(
     // The client code itself will ignore the non-resource config, so we do this to prevent confusing the user.
     // (ref: https://github.com/sanity-io/client/blob/5c23f81f5ab93a53f5b22b39845c867988508d84/src/data/dataMethods.ts#L691)
     if (resource) {
-      if (options.projectId || options.dataset) {
-        // eslint-disable-next-line no-console
-        console.warn(
-          'Both resource and explicit projectId/dataset are provided. The resource will be used and projectId/dataset will be ignored.',
-        )
-      }
       delete effectiveOptions.projectId
       delete effectiveOptions.dataset
     }

package/src/comlink/node/actions/getOrCreateNode.test.ts

@@ -27,14 +27,17 @@ describe('getOrCreateNode', () => {
     dataset: 'test-dataset',
   })
   let state: ReturnType<typeof createStoreState<ComlinkNodeState>>
-  let mockNode: Partial<Node<WindowMessage, FrameMessage>> & {
+  let mockNode: {
     start: ReturnType<typeof vi.fn>
     stop: ReturnType<typeof vi.fn>
+    onStatus: ReturnType<typeof vi.fn>
   }
 
   beforeEach(() => {
     mockNode = {start: vi.fn(), stop: vi.fn(), onStatus: vi.fn()}
-    vi.mocked(comlink.createNode).mockReturnValue(mockNode as Node<WindowMessage, FrameMessage>)
+    vi.mocked(comlink.createNode).mockReturnValue(
+      mockNode as unknown as Node<WindowMessage, FrameMessage>,
+    )
     state = createStoreState<ComlinkNodeState>({nodes: new Map(), subscriptions: new Map()})
     vi.clearAllMocks()
   })

package/src/comlink/node/actions/releaseNode.test.ts

@@ -15,7 +15,7 @@ const nodeConfig = {
 describe('releaseNode', () => {
   let instance: SanityInstance
   let state: ReturnType<typeof createStoreState<ComlinkNodeState>>
-  let mockNode: Partial<Node<WindowMessage, FrameMessage>> & {
+  let mockNode: {
     start: ReturnType<typeof vi.fn>
     stop: ReturnType<typeof vi.fn>
     onStatus: ReturnType<typeof vi.fn>
@@ -39,7 +39,7 @@ describe('releaseNode', () => {
     // Set up a node in the state
     const nodes = new Map()
     nodes.set('test-node', {
-      node: mockNode as Node<WindowMessage, FrameMessage>,
+      node: mockNode as unknown as Node<WindowMessage, FrameMessage>,
       options: nodeConfig,
     })
     state.set('setup', {nodes})
@@ -58,7 +58,7 @@ describe('releaseNode', () => {
     const statusUnsub = vi.fn()
     const nodes = new Map()
     nodes.set('test-node', {
-      node: mockNode as Node<WindowMessage, FrameMessage>,
+      node: mockNode as unknown as Node<WindowMessage, FrameMessage>,
       options: nodeConfig,
       statusUnsub,
     })

package/src/config/sanityConfig.ts

@@ -125,7 +125,6 @@ export interface DocumentHandle<
 export interface SanityConfig extends DatasetHandle, PerspectiveHandle {
   /**
    * Authentication configuration for the instance
-   * @remarks Merged with parent configurations when using createChild
    */
   auth?: AuthConfig
   /**

package/src/document/documentStore.ts

@@ -59,7 +59,7 @@ import {
   type DocumentPermissionsResult,
   type Grant,
 } from './permissions'
-import {ActionError} from './processActions'
+import {ActionError} from './processActions/processActions'
 import {
   type AppliedTransaction,
   applyFirstQueuedTransaction,
@@ -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 resource
-          resource: resource && !isDatasetResource(resource) ? resource : undefined,
+          resource,
         }).observable,
       ),
       concatMap(([outgoing, client]) => {
@@ -520,11 +519,7 @@ const subscribeToClientAndFetchDatasetAcl = ({
   state,
   key: {resource},
 }: StoreContext<DocumentStoreState, BoundResourceKey>) => {
-  const clientOptions: ClientOptions = {apiVersion: API_VERSION}
-  // TODO: remove in v3 when we're ready for everything to be queried via resource
-  if (resource && !isDatasetResource(resource)) {
-    clientOptions.resource = resource
-  }
+  const clientOptions: ClientOptions = {apiVersion: API_VERSION, resource}
 
   let uri: string
   if (resource && isDatasetResource(resource)) {

package/src/document/permissions.ts

@@ -7,7 +7,7 @@ import {isReleasePerspective} from '../releases/utils/isReleasePerspective'
 import {type SelectorContext} from '../store/createStateSourceAction'
 import {MultiKeyWeakMap} from '../utils/MultiKeyWeakMap'
 import {type DocumentAction} from './actions'
-import {ActionError, PermissionActionError, processActions} from './processActions'
+import {ActionError, PermissionActionError, processActions} from './processActions/processActions'
 import {type DocumentSet} from './processMutations'
 import {type SyncTransactionState} from './reducers'