@sanity/sdk 2.4.0 → 2.6.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sanity/sdk",
-  "version": "2.4.0",
+  "version": "2.6.0",
   "private": false,
   "description": "Sanity SDK",
   "keywords": [
@@ -18,7 +18,8 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+ssh://git@github.com/sanity-io/sdk.git"
+    "url": "git+https://github.com/sanity-io/sdk.git",
+    "directory": "packages/core"
   },
   "license": "MIT",
   "author": "Sanity <developers@sanity.io>",
@@ -48,9 +49,9 @@
     "@sanity/diff-match-patch": "^3.2.0",
     "@sanity/diff-patch": "^6.0.0",
     "@sanity/json-match": "^1.0.5",
-    "@sanity/message-protocol": "^0.12.0",
+    "@sanity/message-protocol": "^0.18.0",
     "@sanity/mutate": "^0.12.4",
-    "@sanity/types": "^3.83.0",
+    "@sanity/types": "^5.2.0",
     "groq": "3.88.1-typegen-experimental.0",
     "groq-js": "^1.19.0",
     "lodash-es": "^4.17.21",
@@ -60,7 +61,7 @@
   },
   "devDependencies": {
     "@sanity/browserslist-config": "^1.0.5",
-    "@sanity/pkg-utils": "^7.9.6",
+    "@sanity/pkg-utils": "^8.1.29",
     "@sanity/prettier-config": "^1.0.6",
     "@types/lodash-es": "^4.17.12",
     "@vitest/coverage-v8": "3.2.4",
@@ -70,14 +71,14 @@
     "typescript": "^5.8.3",
     "vite": "^6.3.4",
     "vitest": "^3.2.4",
-    "@repo/config-test": "0.0.1",
-    "@repo/package.bundle": "3.82.0",
     "@repo/config-eslint": "0.0.0",
+    "@repo/package.bundle": "3.82.0",
     "@repo/tsconfig": "0.0.1",
-    "@repo/package.config": "0.0.1"
+    "@repo/package.config": "0.0.1",
+    "@repo/config-test": "0.0.1"
   },
   "engines": {
-    "node": ">=20.0.0"
+    "node": ">=20.19"
   },
   "publishConfig": {
     "access": "public"

package/src/_exports/index.ts

@@ -76,13 +76,25 @@ export {
   createProjectHandle,
 } from '../config/handles'
 export {
-  canvasSource,
+  configureLogging,
+  type InstanceContext,
+  type LogContext,
+  type Logger,
+  type LoggerConfig,
+  type LogLevel,
+  type LogNamespace,
+} from '../config/loggingConfig'
+export {
+  type CanvasSource,
   type DatasetHandle,
-  datasetSource,
+  type DatasetSource,
   type DocumentHandle,
   type DocumentSource,
   type DocumentTypeHandle,
-  mediaLibrarySource,
+  isCanvasSource,
+  isDatasetSource,
+  isMediaLibrarySource,
+  type MediaLibrarySource,
   type PerspectiveHandle,
   type ProjectHandle,
   type ReleasePerspective,

package/src/auth/authStore.test.ts

@@ -92,7 +92,7 @@ describe('authStore', () => {
         },
       })
 
-      const {options, dashboardContext} = authStore.getInitialState(instance)
+      const {options, dashboardContext} = authStore.getInitialState(instance, null)
 
       expect(options.apiHost).toBe(apiHost)
       expect(options.callbackUrl).toBe(callbackUrl)
@@ -114,7 +114,7 @@ describe('authStore', () => {
         auth: {initialLocationHref},
       })
 
-      const {dashboardContext, authState} = authStore.getInitialState(instance)
+      const {dashboardContext, authState} = authStore.getInitialState(instance, null)
       expect(dashboardContext).toEqual(context)
       expect(authState.type).toBe(AuthStateType.LOGGED_OUT)
     })
@@ -129,7 +129,7 @@ describe('authStore', () => {
         auth: {initialLocationHref},
       })
 
-      const {dashboardContext, authState} = authStore.getInitialState(instance)
+      const {dashboardContext, authState} = authStore.getInitialState(instance, null)
       expect(dashboardContext).toEqual(expectedContext)
       expect(authState.type).toBe(AuthStateType.LOGGED_OUT)
     })
@@ -143,7 +143,7 @@ describe('authStore', () => {
         auth: {initialLocationHref},
       })
 
-      const {dashboardContext, authState} = authStore.getInitialState(instance)
+      const {dashboardContext, authState} = authStore.getInitialState(instance, null)
       expect(dashboardContext).toStrictEqual({})
       expect(authState.type).toBe(AuthStateType.LOGGED_OUT)
       expect(errorSpy).toHaveBeenCalledWith(
@@ -166,7 +166,7 @@ describe('authStore', () => {
         },
       })
 
-      const {authState, dashboardContext} = authStore.getInitialState(instance)
+      const {authState, dashboardContext} = authStore.getInitialState(instance, null)
       expect(authState).toMatchObject({type: AuthStateType.LOGGED_IN, token})
       expect(dashboardContext).toEqual(context)
     })
@@ -182,7 +182,7 @@ describe('authStore', () => {
 
       vi.mocked(getAuthCode).mockReturnValue('auth-code')
 
-      const {authState, dashboardContext} = authStore.getInitialState(instance)
+      const {authState, dashboardContext} = authStore.getInitialState(instance, null)
       expect(authState).toMatchObject({type: AuthStateType.LOGGING_IN})
       expect(dashboardContext).toEqual(context)
     })
@@ -197,7 +197,7 @@ describe('authStore', () => {
       vi.mocked(getAuthCode).mockReturnValue(null)
       vi.mocked(getTokenFromStorage).mockReturnValue(storageToken)
 
-      const {authState, dashboardContext} = authStore.getInitialState(instance)
+      const {authState, dashboardContext} = authStore.getInitialState(instance, null)
       expect(authState).toMatchObject({type: AuthStateType.LOGGED_IN, token: storageToken})
       expect(dashboardContext).toStrictEqual({})
     })
@@ -215,7 +215,7 @@ describe('authStore', () => {
       vi.mocked(getAuthCode).mockReturnValue(null)
       vi.mocked(getTokenFromStorage).mockReturnValue(storageToken)
 
-      const {authState, dashboardContext} = authStore.getInitialState(instance)
+      const {authState, dashboardContext} = authStore.getInitialState(instance, null)
       expect(authState).toMatchObject({type: AuthStateType.LOGGED_OUT})
       expect(dashboardContext).toEqual(context)
     })
@@ -229,7 +229,7 @@ describe('authStore', () => {
       vi.mocked(getAuthCode).mockReturnValue(null)
       vi.mocked(getTokenFromStorage).mockReturnValue(null)
 
-      const {authState, dashboardContext} = authStore.getInitialState(instance)
+      const {authState, dashboardContext} = authStore.getInitialState(instance, null)
       expect(authState).toMatchObject({type: AuthStateType.LOGGED_OUT})
       expect(dashboardContext).toStrictEqual({})
     })
@@ -252,7 +252,7 @@ describe('authStore', () => {
         auth: {storageArea: mockStorage}, // Provide mock storage
       })
 
-      const {authState, options} = authStore.getInitialState(instance)
+      const {authState, options} = authStore.getInitialState(instance, null)
       expect(getStudioTokenFromLocalStorage).toHaveBeenCalledWith(mockStorage, studioStorageKey)
       expect(authState).toMatchObject({type: AuthStateType.LOGGED_IN, token: studioToken})
       expect(options.authMethod).toBe('localstorage')
@@ -277,7 +277,7 @@ describe('authStore', () => {
       })
 
       // Verify initial state without async cookie probe
-      const {authState: initialAuthState} = authStore.getInitialState(instance)
+      const {authState: initialAuthState} = authStore.getInitialState(instance, null)
       expect(initialAuthState.type).toBe(AuthStateType.LOGGED_OUT)
       expect(getStudioTokenFromLocalStorage).toHaveBeenCalledWith(mockStorage, studioStorageKey)
 
@@ -296,7 +296,7 @@ describe('authStore', () => {
         dataset: 'd',
       })
 
-      const {authState, options} = authStore.getInitialState(instance)
+      const {authState, options} = authStore.getInitialState(instance, null)
       expect(getStudioTokenFromLocalStorage).not.toHaveBeenCalled()
       expect(checkForCookieAuth).not.toHaveBeenCalled()
       expect(getTokenFromStorage).toHaveBeenCalled()
@@ -314,7 +314,7 @@ describe('authStore', () => {
       vi.mocked(getAuthCode).mockReturnValue(null)
       vi.mocked(getTokenFromLocation).mockReturnValue('hash-token')
 
-      const {authState} = authStore.getInitialState(instance)
+      const {authState} = authStore.getInitialState(instance, null)
       expect(authState).toMatchObject({
         type: AuthStateType.LOGGING_IN,
         isExchangingToken: false,

package/src/auth/refreshStampedToken.test.ts

@@ -122,7 +122,7 @@ describe('refreshStampedToken', () => {
         dataset: 'd',
         auth: {clientFactory: mockClientFactory, storageArea: mockStorage},
       })
-      const initialState = authStore.getInitialState(instance)
+      const initialState = authStore.getInitialState(instance, null)
       initialState.authState = {
         type: AuthStateType.LOGGED_IN,
         token: 'sk-initial-token-st123',
@@ -131,7 +131,7 @@ describe('refreshStampedToken', () => {
       initialState.dashboardContext = {mode: 'test'}
       const state = createStoreState(initialState)
 
-      const subscription = refreshStampedToken({state, instance})
+      const subscription = refreshStampedToken({state, instance, key: null})
       subscriptions.push(subscription)
 
       await vi.advanceTimersToNextTimerAsync()
@@ -168,7 +168,7 @@ describe('refreshStampedToken', () => {
         dataset: 'd',
         auth: {clientFactory: mockClientFactory, storageArea: mockStorage},
       })
-      const initialState = authStore.getInitialState(instance)
+      const initialState = authStore.getInitialState(instance, null)
       initialState.authState = {
         type: AuthStateType.LOGGED_IN,
         token: 'sk-initial-token-st123',
@@ -177,7 +177,7 @@ describe('refreshStampedToken', () => {
       initialState.dashboardContext = {mode: 'test'}
       const state = createStoreState(initialState)
 
-      const subscription = refreshStampedToken({state, instance})
+      const subscription = refreshStampedToken({state, instance, key: null})
       subscriptions.push(subscription)
 
       await vi.advanceTimersToNextTimerAsync()
@@ -202,7 +202,7 @@ describe('refreshStampedToken', () => {
         dataset: 'd',
         auth: {clientFactory: mockClientFactory, storageArea: mockStorage},
       })
-      const initialState = authStore.getInitialState(instance)
+      const initialState = authStore.getInitialState(instance, null)
       initialState.authState = {
         type: AuthStateType.LOGGED_IN,
         token: 'sk-initial-token-st123',
@@ -213,7 +213,7 @@ describe('refreshStampedToken', () => {
       let subscription: Subscription | undefined
       // We expect this NOT to throw, but accept we can't easily test the lock call or outcome
       expect(() => {
-        subscription = refreshStampedToken({state, instance})
+        subscription = refreshStampedToken({state, instance, key: null})
         subscriptions.push(subscription!)
       }).not.toThrow()
 
@@ -253,7 +253,7 @@ describe('refreshStampedToken', () => {
           dataset: 'd',
           auth: {clientFactory: mockClientFactory, storageArea: mockStorage},
         })
-        const initialState = authStore.getInitialState(instance)
+        const initialState = authStore.getInitialState(instance, null)
         initialState.authState = {
           type: AuthStateType.LOGGED_IN,
           token: 'sk-initial-token-st123',
@@ -261,7 +261,7 @@ describe('refreshStampedToken', () => {
         }
         const state = createStoreState(initialState)
 
-        const subscription = refreshStampedToken({state, instance})
+        const subscription = refreshStampedToken({state, instance, key: null})
         subscriptions.push(subscription)
 
         // DO NOT advance timers or yield here - focus on immediate observable logic
@@ -303,7 +303,7 @@ describe('refreshStampedToken', () => {
           dataset: 'd',
           auth: {clientFactory: mockClientFactory, storageArea: mockStorage},
         })
-        const initialState = authStore.getInitialState(instance)
+        const initialState = authStore.getInitialState(instance, null)
         initialState.authState = {
           type: AuthStateType.LOGGED_IN,
           token: 'sk-initial-token-st123',
@@ -311,7 +311,7 @@ describe('refreshStampedToken', () => {
         }
         const state = createStoreState(initialState)
 
-        const subscription = refreshStampedToken({state, instance})
+        const subscription = refreshStampedToken({state, instance, key: null})
         subscriptions.push(subscription)
 
         // Advance timers to allow the async `performRefresh` to execute
@@ -349,7 +349,7 @@ describe('refreshStampedToken', () => {
       dataset: 'd',
       auth: {clientFactory: mockClientFactory, storageArea: mockStorage},
     })
-    const initialState = authStore.getInitialState(instance)
+    const initialState = authStore.getInitialState(instance, null)
     initialState.authState = {
       type: AuthStateType.LOGGED_IN,
       token: 'sk-initial-token-st123',
@@ -358,7 +358,7 @@ describe('refreshStampedToken', () => {
     initialState.dashboardContext = {mode: 'test'}
     const state = createStoreState(initialState)
 
-    const subscription = refreshStampedToken({state, instance})
+    const subscription = refreshStampedToken({state, instance, key: null})
     subscriptions.push(subscription)
 
     await vi.advanceTimersToNextTimerAsync()
@@ -378,14 +378,14 @@ describe('refreshStampedToken', () => {
       dataset: 'd',
       auth: {clientFactory: mockClientFactory, storageArea: mockStorage},
     })
-    const initialState = authStore.getInitialState(instance)
+    const initialState = authStore.getInitialState(instance, null)
     initialState.authState = {
       type: AuthStateType.LOGGED_OUT,
       isDestroyingSession: false,
     } as AuthState
     const state = createStoreState(initialState)
 
-    const subscription = refreshStampedToken({state, instance})
+    const subscription = refreshStampedToken({state, instance, key: null})
     subscriptions.push(subscription)
 
     await vi.advanceTimersByTimeAsync(0)
@@ -404,7 +404,7 @@ describe('refreshStampedToken', () => {
       dataset: 'd',
       auth: {clientFactory: mockClientFactory, storageArea: mockStorage},
     })
-    const initialState = authStore.getInitialState(instance)
+    const initialState = authStore.getInitialState(instance, null)
     initialState.authState = {
       type: AuthStateType.LOGGED_IN,
       token: 'sk-nonstamped-token',
@@ -412,7 +412,7 @@ describe('refreshStampedToken', () => {
     }
     const state = createStoreState(initialState)
 
-    const subscription = refreshStampedToken({state, instance})
+    const subscription = refreshStampedToken({state, instance, key: null})
     subscriptions.push(subscription)
 
     await vi.advanceTimersByTimeAsync(0)

package/src/auth/subscribeToStateAndFetchCurrentUser.test.ts

@@ -20,8 +20,8 @@ describe('subscribeToStateAndFetchCurrentUser', () => {
     const clientFactory = vi.fn().mockReturnValue(mockClient)
     const instance = createSanityInstance({projectId: 'p', dataset: 'd', auth: {clientFactory}})
 
-    const state = createStoreState(authStore.getInitialState(instance))
-    const subscription = subscribeToStateAndFetchCurrentUser({state, instance})
+    const state = createStoreState(authStore.getInitialState(instance, null))
+    const subscription = subscribeToStateAndFetchCurrentUser({state, instance, key: null})
 
     expect(state.get()).toMatchObject({authState: {type: AuthStateType.LOGGED_OUT}})
 
@@ -52,8 +52,8 @@ describe('subscribeToStateAndFetchCurrentUser', () => {
     const clientFactory = vi.fn().mockReturnValue(mockClient)
     const instance = createSanityInstance({projectId: 'p', dataset: 'd', auth: {clientFactory}})
 
-    const state = createStoreState(authStore.getInitialState(instance))
-    const subscription = subscribeToStateAndFetchCurrentUser({state, instance})
+    const state = createStoreState(authStore.getInitialState(instance, null))
+    const subscription = subscribeToStateAndFetchCurrentUser({state, instance, key: null})
 
     expect(state.get()).toMatchObject({authState: {type: AuthStateType.LOGGED_OUT}})
 
@@ -88,8 +88,8 @@ describe('subscribeToStateAndFetchCurrentUser', () => {
     const clientFactory = vi.fn().mockReturnValue(mockClient)
     const instance = createSanityInstance({projectId: 'p', dataset: 'd', auth: {clientFactory}})
 
-    const state = createStoreState(authStore.getInitialState(instance))
-    const subscription = subscribeToStateAndFetchCurrentUser({state, instance})
+    const state = createStoreState(authStore.getInitialState(instance, null))
+    const subscription = subscribeToStateAndFetchCurrentUser({state, instance, key: null})
 
     expect(state.get()).toMatchObject({authState: {type: AuthStateType.LOGGED_OUT}})
 

package/src/auth/subscribeToStorageEventsAndSetToken.test.ts

@@ -34,9 +34,9 @@ describe('subscribeToStorageEventsAndSetToken', () => {
   })
 
   it('sets the state to logged in when a matching storage event returns a token', () => {
-    const state = createStoreState(authStore.getInitialState(instance))
+    const state = createStoreState(authStore.getInitialState(instance, null))
     const {storageKey} = state.get().options
-    const subscription = subscribeToStorageEventsAndSetToken({state, instance})
+    const subscription = subscribeToStorageEventsAndSetToken({state, instance, key: null})
 
     expect(state.get()).toMatchObject({
       authState: {type: AuthStateType.LOGGED_OUT, isDestroyingSession: false},
@@ -54,10 +54,10 @@ describe('subscribeToStorageEventsAndSetToken', () => {
 
   it('sets the state to logged in when a matching storage event returns null', () => {
     vi.mocked(getTokenFromStorage).mockReturnValue('existing-token')
-    const state = createStoreState(authStore.getInitialState(instance))
+    const state = createStoreState(authStore.getInitialState(instance, null))
     const {storageKey} = state.get().options
 
-    const subscription = subscribeToStorageEventsAndSetToken({state, instance})
+    const subscription = subscribeToStorageEventsAndSetToken({state, instance, key: null})
 
     expect(state.get()).toMatchObject({
       authState: {type: AuthStateType.LOGGED_IN, token: 'existing-token', currentUser: null},

package/src/client/clientStore.test.ts

@@ -3,7 +3,6 @@ import {Subject} from 'rxjs'
 import {beforeEach, describe, expect, it, vi} from 'vitest'
 
 import {getAuthMethodState, getTokenState} from '../auth/authStore'
-import {canvasSource, datasetSource, mediaLibrarySource} from '../config/sanityConfig'
 import {createSanityInstance, type SanityInstance} from '../store/createSanityInstance'
 import {getClient, getClientState} from './clientStore'
 
@@ -34,7 +33,10 @@ beforeEach(() => {
   vi.mocked(createClient).mockImplementation(
     (clientConfig) => ({config: () => clientConfig}) as SanityClient,
   )
-  instance = createSanityInstance({projectId: 'test-project', dataset: 'test-dataset'})
+  instance = createSanityInstance({
+    projectId: 'test-project',
+    dataset: 'test-dataset',
+  })
 })
 
 afterEach(() => {
@@ -176,18 +178,15 @@ describe('clientStore', () => {
 
   describe('source handling', () => {
     it('should create client when source is provided', () => {
-      const source = datasetSource('source-project', 'source-dataset')
-      const client = getClient(instance, {apiVersion: '2024-11-12', source})
+      const client = getClient(instance, {
+        apiVersion: '2024-11-12',
+        source: {projectId: 'source-project', dataset: 'source-dataset'},
+      })
 
       expect(vi.mocked(createClient)).toHaveBeenCalledWith(
         expect.objectContaining({
-          apiVersion: '2024-11-12',
-          source: expect.objectContaining({
-            __sanity_internal_sourceId: {
-              projectId: 'source-project',
-              dataset: 'source-dataset',
-            },
-          }),
+          'apiVersion': '2024-11-12',
+          '~experimental_resource': {type: 'dataset', id: 'source-project.source-dataset'},
         }),
       )
       // Client should be projectless - no projectId/dataset in config
@@ -195,19 +194,16 @@ describe('clientStore', () => {
       expect(client.config()).not.toHaveProperty('dataset')
       expect(client.config()).toEqual(
         expect.objectContaining({
-          source: expect.objectContaining({
-            __sanity_internal_sourceId: {
-              projectId: 'source-project',
-              dataset: 'source-dataset',
-            },
-          }),
+          '~experimental_resource': {type: 'dataset', id: 'source-project.source-dataset'},
         }),
       )
     })
 
     it('should create resource when source has array sourceId and be projectless', () => {
-      const source = mediaLibrarySource('media-lib-123')
-      const client = getClient(instance, {apiVersion: '2024-11-12', source})
+      const client = getClient(instance, {
+        apiVersion: '2024-11-12',
+        source: {mediaLibraryId: 'media-lib-123'},
+      })
 
       expect(vi.mocked(createClient)).toHaveBeenCalledWith(
         expect.objectContaining({
@@ -226,8 +222,10 @@ describe('clientStore', () => {
     })
 
     it('should create resource when canvas source is provided and be projectless', () => {
-      const source = canvasSource('canvas-123')
-      const client = getClient(instance, {apiVersion: '2024-11-12', source})
+      const client = getClient(instance, {
+        apiVersion: '2024-11-12',
+        source: {canvasId: 'canvas-123'},
+      })
 
       expect(vi.mocked(createClient)).toHaveBeenCalledWith(
         expect.objectContaining({
@@ -246,30 +244,26 @@ describe('clientStore', () => {
     })
 
     it('should create projectless client when source is provided, ignoring instance config', () => {
-      const source = datasetSource('source-project', 'source-dataset')
-      const client = getClient(instance, {apiVersion: '2024-11-12', source})
+      const client = getClient(instance, {
+        apiVersion: '2024-11-12',
+        source: {projectId: 'source-project', dataset: 'source-dataset'},
+      })
 
       // Client should be projectless - source takes precedence, instance config is ignored
       expect(client.config()).not.toHaveProperty('projectId')
       expect(client.config()).not.toHaveProperty('dataset')
       expect(client.config()).toEqual(
         expect.objectContaining({
-          source: expect.objectContaining({
-            __sanity_internal_sourceId: {
-              projectId: 'source-project',
-              dataset: 'source-dataset',
-            },
-          }),
+          '~experimental_resource': {type: 'dataset', id: 'source-project.source-dataset'},
         }),
       )
     })
 
     it('should warn when both source and explicit projectId/dataset are provided', () => {
       const consoleSpy = vi.spyOn(console, 'warn').mockImplementation(() => {})
-      const source = datasetSource('source-project', 'source-dataset')
       const client = getClient(instance, {
         apiVersion: '2024-11-12',
-        source,
+        source: {projectId: 'source-project', dataset: 'source-dataset'},
         projectId: 'explicit-project',
         dataset: 'explicit-dataset',
       })
@@ -284,13 +278,18 @@ describe('clientStore', () => {
     })
 
     it('should create different clients for different sources', () => {
-      const source1 = datasetSource('project-1', 'dataset-1')
-      const source2 = datasetSource('project-2', 'dataset-2')
-      const source3 = mediaLibrarySource('media-lib-1')
-
-      const client1 = getClient(instance, {apiVersion: '2024-11-12', source: source1})
-      const client2 = getClient(instance, {apiVersion: '2024-11-12', source: source2})
-      const client3 = getClient(instance, {apiVersion: '2024-11-12', source: source3})
+      const client1 = getClient(instance, {
+        apiVersion: '2024-11-12',
+        source: {projectId: 'source-project', dataset: 'source-dataset'},
+      })
+      const client2 = getClient(instance, {
+        apiVersion: '2024-11-12',
+        source: {mediaLibraryId: 'media-lib-123'},
+      })
+      const client3 = getClient(instance, {
+        apiVersion: '2024-11-12',
+        source: {canvasId: 'canvas-123'},
+      })
 
       expect(client1).not.toBe(client2)
       expect(client2).not.toBe(client3)
@@ -299,11 +298,14 @@ describe('clientStore', () => {
     })
 
     it('should reuse clients with identical source configurations', () => {
-      const source = datasetSource('same-project', 'same-dataset')
-      const options = {apiVersion: '2024-11-12', source}
-
-      const client1 = getClient(instance, options)
-      const client2 = getClient(instance, options)
+      const client1 = getClient(instance, {
+        apiVersion: '2024-11-12',
+        source: {projectId: 'source-project', dataset: 'source-dataset'},
+      })
+      const client2 = getClient(instance, {
+        apiVersion: '2024-11-12',
+        source: {projectId: 'source-project', dataset: 'source-dataset'},
+      })
 
       expect(client1).toBe(client2)
       expect(vi.mocked(createClient)).toHaveBeenCalledTimes(1)

package/src/client/clientStore.ts

@@ -2,7 +2,12 @@ import {type ClientConfig, createClient, type SanityClient} from '@sanity/client
 import {pick} from 'lodash-es'
 
 import {getAuthMethodState, getTokenState} from '../auth/authStore'
-import {type DocumentSource, SOURCE_ID} from '../config/sanityConfig'
+import {
+  type DocumentSource,
+  isCanvasSource,
+  isDatasetSource,
+  isMediaLibrarySource,
+} from '../config/sanityConfig'
 import {bindActionGlobally} from '../store/createActionBinder'
 import {createStateSourceAction} from '../store/createStateSourceAction'
 import {defineStore, type StoreContext} from '../store/defineStore'
@@ -61,6 +66,11 @@ export interface ClientStoreState {
   authMethod?: 'localstorage' | 'cookie'
 }
 
+interface ClientResource {
+  type: 'dataset' | 'media-library' | 'canvas'
+  id: string
+}
+
 /**
  * Options used when retrieving a client instance from the client store.
  *
@@ -170,13 +180,17 @@ export const getClient = bindActionGlobally(
 
     const tokenFromState = state.get().token
     const {clients, authMethod} = state.get()
-    const hasSource = !!options.source
-    let sourceId = options.source?.[SOURCE_ID]
 
-    let resource
-    if (Array.isArray(sourceId)) {
-      resource = {type: sourceId[0], id: sourceId[1]}
-      sourceId = undefined
+    let resource: ClientResource | undefined
+
+    if (options.source) {
+      if (isDatasetSource(options.source)) {
+        resource = {type: 'dataset', id: `${options.source.projectId}.${options.source.dataset}`}
+      } else if (isMediaLibrarySource(options.source)) {
+        resource = {type: 'media-library', id: options.source.mediaLibraryId}
+      } else if (isCanvasSource(options.source)) {
+        resource = {type: 'canvas', id: options.source.canvasId}
+      }
     }
 
     const projectId = options.projectId ?? instance.config.projectId
@@ -185,7 +199,7 @@ export const getClient = bindActionGlobally(
 
     const effectiveOptions: ClientOptions = {
       ...DEFAULT_CLIENT_CONFIG,
-      ...((options.scope === 'global' || !projectId || hasSource) && {useProjectHostname: false}),
+      ...((options.scope === 'global' || !projectId || resource) && {useProjectHostname: false}),
       token: authMethod === 'cookie' ? undefined : (tokenFromState ?? undefined),
       ...options,
       ...(projectId && {projectId}),
@@ -197,7 +211,7 @@ export const getClient = bindActionGlobally(
     // When a source is provided, don't use projectId/dataset - the client should be "projectless"
     // The client code itself will ignore the non-source 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 (hasSource) {
+    if (resource) {
       if (options.projectId || options.dataset) {
         // eslint-disable-next-line no-console
         console.warn(

package/src/comlink/controller/actions/destroyController.test.ts

@@ -39,7 +39,7 @@ describe('destroyController', () => {
     })
 
     // Execute action
-    destroyController({state, instance})
+    destroyController({state, instance, key: null})
 
     // Verify controller was destroyed and state was cleared
     expect(mockController.destroy).toHaveBeenCalled()
@@ -49,7 +49,7 @@ describe('destroyController', () => {
 
   it('should do nothing if no controller exists', () => {
     // State already has null controller, so just execute action
-    expect(() => destroyController({state, instance})).not.toThrow()
+    expect(() => destroyController({state, instance, key: null})).not.toThrow()
 
     // State should remain unchanged
     expect(state.get().controller).toBeNull()