@sanity/sdk 3.0.0 → 3.1.0

package/src/auth/subscribeToStateAndFetchCurrentUser.test.ts

@@ -57,7 +57,7 @@ describe('subscribeToStateAndFetchCurrentUser', () => {
     })
     expect(mockRequest).toHaveBeenCalledWith({
       method: 'GET',
-      uri: '/users/me',
+      url: '/users/me',
       tag: 'users.get-current',
     })
 
@@ -97,7 +97,7 @@ describe('subscribeToStateAndFetchCurrentUser', () => {
     })
     expect(mockRequest).toHaveBeenCalledWith({
       method: 'GET',
-      uri: '/users/me',
+      url: '/users/me',
       tag: 'users.get-current',
     })
 

package/src/auth/subscribeToStateAndFetchCurrentUser.ts

@@ -73,7 +73,7 @@ export const subscribeToStateAndFetchCurrentUser = (
       switchMap((client) =>
         client.observable
           .request<CurrentUser>({
-            uri: '/users/me',
+            url: '/users/me',
             method: 'GET',
             tag: 'users.get-current',
           })

package/src/comments/addonDatasetStore.test.ts

@@ -59,7 +59,7 @@ describe('getAddonDatasetState', () => {
     )
 
     expect(observableRequest).toHaveBeenCalledWith({
-      uri: '/projects/p/datasets?datasetProfile=comments&addonFor=d',
+      url: '/projects/p/datasets?datasetProfile=comments&addonFor=d',
       tag: 'comments.addon-dataset.list',
     })
   })
@@ -139,7 +139,7 @@ describe('provisionAddonDataset', () => {
 
     await expect(provisionAddonDataset(instance, {})).resolves.toBe('d-comments')
     expect(request).toHaveBeenCalledWith({
-      uri: '/comments/d/setup',
+      url: '/comments/d/setup',
       method: 'POST',
       tag: 'comments.addon-dataset.setup',
     })

package/src/comments/addonDatasetStore.ts

@@ -67,7 +67,7 @@ function requestAddonDataset(
 ): Observable<string | undefined> {
   return client.observable
     .request<{name: string}[] | undefined>({
-      uri: `/projects/${projectId}/datasets?datasetProfile=${ADDON_DATASET_PROFILE}&addonFor=${dataset}`,
+      url: `/projects/${projectId}/datasets?datasetProfile=${ADDON_DATASET_PROFILE}&addonFor=${dataset}`,
       tag: 'comments.addon-dataset.list',
     })
     .pipe(map((datasets) => datasets?.[0]?.name))
@@ -182,7 +182,7 @@ export const provisionAddonDataset: (
       })
 
       const response = await client.request<{datasetName?: string} | undefined>({
-        uri: `/comments/${resource.dataset}/setup`,
+        url: `/comments/${resource.dataset}/setup`,
         method: 'POST',
         tag: 'comments.addon-dataset.setup',
       })

package/src/comments/commentActions.ts

@@ -16,6 +16,7 @@ import {bindActionByResource, type BoundResourceKey} from '../store/createAction
 import {type SanityInstance} from '../store/createSanityInstance'
 import {type StoreState} from '../store/createStoreState'
 import {type StoreContext} from '../store/defineStore'
+import {randomUuid} from '../utils/ids'
 import {
   assertDatasetResource,
   getAddonDatasetState,
@@ -326,7 +327,7 @@ export const createComment: (
       options,
       buildCommentPayload({
         authorId: requireCurrentUserId(instance),
-        commentId: options.commentId ?? crypto.randomUUID(),
+        commentId: options.commentId ?? randomUuid(),
         contentSnapshot: options.contentSnapshot,
         context: options.context,
         documentRevisionId: options.documentRevisionId,
@@ -336,7 +337,7 @@ export const createComment: (
         fieldPath,
         selection: options.selection,
         status: options.status ?? 'open',
-        threadId: options.threadId ?? crypto.randomUUID(),
+        threadId: options.threadId ?? randomUuid(),
         ...(isReleasePerspective(perspective) ? {documentVersionId: perspective.releaseName} : {}),
       }),
     )
@@ -386,7 +387,7 @@ export const replyToComment: (
       options,
       buildCommentPayload({
         authorId: requireCurrentUserId(instance),
-        commentId: options.commentId ?? crypto.randomUUID(),
+        commentId: options.commentId ?? randomUuid(),
         handle: options,
         message: options.message,
         // Replies to a reply belong to the thread's first comment, matching how
@@ -420,7 +421,7 @@ export const updateComment: (
     {commentId, message}: UpdateCommentOptions,
   ) => {
     const lastEditedAt = new Date().toISOString()
-    const transactionId = crypto.randomUUID()
+    const transactionId = randomUuid()
     const previous = findCommentById(state, commentId)
 
     if (previous) {
@@ -468,7 +469,7 @@ export const setCommentStatus: (
     {state, instance, key}: StoreContext<CommentsStoreState, BoundResourceKey>,
     {commentId, status}: SetCommentStatusOptions,
   ) => {
-    const transactionId = crypto.randomUUID()
+    const transactionId = randomUuid()
     const previousComments: StoredComment[] = []
 
     for (const entry of Object.values(state.get().entries)) {

package/src/comments/commentsStore.ts

@@ -29,7 +29,7 @@ import {
 } from '../store/createStateSourceAction'
 import {type StoreState} from '../store/createStoreState'
 import {defineStore, type StoreContext} from '../store/defineStore'
-import {insecureRandomId} from '../utils/ids'
+import {randomId} from '../utils/ids'
 import {setCleanupTimeout} from '../utils/setCleanupTimeout'
 import {observeAddonDatasetClient} from './addonDatasetStore'
 import {buildCommentThreads} from './buildCommentThreads'
@@ -360,7 +360,7 @@ export const getCommentsState: (
     selector: selectComments,
     onSubscribe: ({state, instance}, options: CommentsOptions) => {
       const key = getCommentsKey(toCommentsKeyParts(instance, options))
-      const subscriptionId = insecureRandomId()
+      const subscriptionId = randomId(16)
       state.set('addSubscriber', addSubscriber(key, subscriptionId))
 
       return () => {
@@ -390,7 +390,7 @@ export const getCommentThreadsState: (
     selector: selectCommentThreads,
     onSubscribe: ({state, instance}, options: CommentsOptions) => {
       const key = getCommentsKey(toCommentsKeyParts(instance, options))
-      const subscriptionId = insecureRandomId()
+      const subscriptionId = randomId(16)
       state.set('addSubscriber', addSubscriber(key, subscriptionId))
 
       return () => {
@@ -452,7 +452,7 @@ function resolveList<T>(
   // fetch and this promise would never settle. Holding it only for the duration
   // of the resolve also means a component that suspends and then errors before
   // mounting does not leave a subscriber-less entry behind holding its error.
-  const subscriptionId = insecureRandomId()
+  const subscriptionId = randomId(16)
   state.set('addSubscriber', addSubscriber(key, subscriptionId))
 
   const release = () => state.set('removeSubscriber', removeSubscriber(key, subscriptionId))

package/src/document/applyDocumentActions.ts

@@ -5,6 +5,7 @@ import {type DocumentResource} from '../config/sanityConfig'
 import {bindActionByResource} from '../store/createActionBinder'
 import {type SanityInstance} from '../store/createSanityInstance'
 import {type StoreContext} from '../store/defineStore'
+import {randomUuid} from '../utils/ids'
 import {type Action} from './actions'
 import {documentStore, type DocumentStoreState} from './documentStore'
 import {type DocumentTransactionSubmissionResult} from './events'
@@ -74,12 +75,7 @@ const boundApplyDocumentActions = bindActionByResource(documentStore, _applyDocu
 /** @internal */
 async function _applyDocumentActions(
   {state}: StoreContext<DocumentStoreState>,
-  {
-    actions,
-    resource,
-    transactionId = crypto.randomUUID(),
-    disableBatching,
-  }: ApplyDocumentActionsOptions,
+  {actions, resource, transactionId = randomUuid(), disableBatching}: ApplyDocumentActionsOptions,
 ): Promise<ActionsResult> {
   const {events} = state.get()
 

package/src/document/documentStore.concurrency.test.ts

@@ -44,6 +44,7 @@ import {afterEach, beforeEach, describe, expect, it, vi} from 'vitest'
 import {getClientState} from '../client/clientStore'
 import {createSanityInstance, type SanityInstance} from '../store/createSanityInstance'
 import {type StateSource} from '../store/createStateSourceAction'
+import {randomUuid} from '../utils/ids'
 import {editDocument, publishDocument} from './actions'
 import {applyDocumentActions} from './applyDocumentActions'
 import {getDocumentState, getDocumentSyncStatus} from './documentStore'
@@ -273,7 +274,7 @@ function createMockClient(server: MockContentLake): SanityClient {
 
   const action = vi.fn(async (input: HttpAction | HttpAction[], options?: BaseActionOptions) => {
     const actions = Array.isArray(input) ? input : [input]
-    return server.submitActions(actions, options?.transactionId ?? crypto.randomUUID())
+    return server.submitActions(actions, options?.transactionId ?? randomUuid())
   })
 
   const request = vi.fn(async () => {

package/src/document/documentStore.test.ts

@@ -36,6 +36,7 @@ import {getClientState} from '../client/clientStore'
 import {createDocumentHandle} from '../config/handles'
 import {createSanityInstance, type SanityInstance} from '../store/createSanityInstance'
 import {type StateSource} from '../store/createStateSourceAction'
+import {randomUuid} from '../utils/ids'
 import {
   createDocument,
   deleteDocument,
@@ -369,7 +370,7 @@ it('labels an echo that arrives after the last subscriber left as its own', asyn
   // and out of band, which is the ordering the real API produces
   const clientActionMockImplementation = vi.mocked(client.action).getMockImplementation()!
   vi.mocked(client.action).mockImplementation(
-    async (_input, {transactionId = crypto.randomUUID()} = {}) => ({transactionId}),
+    async (_input, {transactionId = randomUuid()} = {}) => ({transactionId}),
   )
 
   const patchEvents: DocumentRemotePatchesEvent[] = []
@@ -671,7 +672,7 @@ it('fetches documents if there are no active subscriptions for the actions appli
 })
 
 it('batches edit transaction into one outgoing transaction', async () => {
-  const doc = createDocumentHandle({documentId: crypto.randomUUID(), documentType: 'article'})
+  const doc = createDocumentHandle({documentId: randomUuid(), documentType: 'article'})
 
   const unsubscribe = getDocumentState(instance, doc).subscribe()
 
@@ -747,7 +748,7 @@ it('submits liveEdit document edits through observable.mutate', async () => {
 })
 
 it('provides the consistency status via `getDocumentSyncStatus`', async () => {
-  const doc = createDocumentHandle({documentId: crypto.randomUUID(), documentType: 'article'})
+  const doc = createDocumentHandle({documentId: randomUuid(), documentType: 'article'})
 
   const syncStatus = getDocumentSyncStatus(instance, doc)
   expect(syncStatus.getCurrent()).toBeUndefined()
@@ -802,7 +803,7 @@ it('reverts failed outgoing transaction locally', async () => {
     })
   })
 
-  const documentId = DocumentId(crypto.randomUUID())
+  const documentId = DocumentId(randomUuid())
   const doc = createDocumentHandle({documentId, documentType: 'article'})
 
   const {getCurrent, subscribe} = getDocumentState(instance, doc)
@@ -870,7 +871,7 @@ it('removes a queued transaction if it fails to apply', async () => {
     })
   })
 
-  const doc = createDocumentHandle({documentId: crypto.randomUUID(), documentType: 'article'})
+  const doc = createDocumentHandle({documentId: randomUuid(), documentType: 'article'})
   const state = getDocumentState(instance, doc)
   const unsubscribe = state.subscribe()
 
@@ -975,8 +976,8 @@ it('fetches dataset ACL and updates grants in the document store state', async (
   ]
   vi.mocked(client.request).mockResolvedValue(datasetAcl)
 
-  const book = createDocumentHandle({documentId: crypto.randomUUID(), documentType: 'book'})
-  const author = createDocumentHandle({documentId: crypto.randomUUID(), documentType: 'author'})
+  const book = createDocumentHandle({documentId: randomUuid(), documentType: 'book'})
+  const author = createDocumentHandle({documentId: randomUuid(), documentType: 'author'})
 
   expect(await resolvePermissions(instance, {actions: [createDocument(book)]})).toEqual({
     allowed: true,
@@ -988,12 +989,12 @@ it('fetches dataset ACL and updates grants in the document store state', async (
 })
 
 it('does not send credentials with the dataset ACL request', async () => {
-  const doc = createDocumentHandle({documentId: crypto.randomUUID(), documentType: 'article'})
+  const doc = createDocumentHandle({documentId: randomUuid(), documentType: 'article'})
   await resolvePermissions(instance, {actions: [createDocument(doc)]})
 
   const aclCall = vi
     .mocked(client.request)
-    .mock.calls.find(([options]) => options.uri?.endsWith('/acl'))
+    .mock.calls.find(([options]) => options.url?.endsWith('/acl'))
   expect(aclCall).toBeDefined()
   expect(aclCall![0]).not.toHaveProperty('withCredentials')
 })
@@ -1011,7 +1012,7 @@ it('retries transient dataset ACL fetch failures instead of failing fatally', as
     }),
   )
 
-  const doc = createDocumentHandle({documentId: crypto.randomUUID(), documentType: 'article'})
+  const doc = createDocumentHandle({documentId: randomUuid(), documentType: 'article'})
   const result = await resolvePermissions(instance, {actions: [createDocument(doc)]})
 
   expect(result).toEqual({allowed: true})
@@ -1037,7 +1038,7 @@ it('does not retry dataset ACL fetch failures caused by 4xx client errors', asyn
     }),
   )
 
-  const doc = createDocumentHandle({documentId: crypto.randomUUID(), documentType: 'article'})
+  const doc = createDocumentHandle({documentId: randomUuid(), documentType: 'article'})
   const documentState = getDocumentState(instance, doc)
   const unsubscribe = documentState.subscribe()
 
@@ -1070,7 +1071,7 @@ it('retries dataset ACL fetch failures caused by 429 rate-limit errors', async (
     }),
   )
 
-  const doc = createDocumentHandle({documentId: crypto.randomUUID(), documentType: 'article'})
+  const doc = createDocumentHandle({documentId: randomUuid(), documentType: 'article'})
   const result = await resolvePermissions(instance, {actions: [createDocument(doc)]})
 
   expect(result).toEqual({allowed: true})
@@ -1087,7 +1088,7 @@ it('fetches ACL for MediaLibraryResource', async () => {
   const datasetAcl = [{filter: 'true', permissions: ['read', 'update', 'create', 'history']}]
   vi.mocked(client.request).mockResolvedValue(datasetAcl)
 
-  const doc = createDocumentHandle({documentId: crypto.randomUUID(), documentType: 'article'})
+  const doc = createDocumentHandle({documentId: randomUuid(), documentType: 'article'})
   const mediaLibraryResource = {mediaLibraryId: 'test-media-library'}
 
   const result = await resolvePermissions(mediaLibraryInstance, {
@@ -1105,7 +1106,7 @@ it('fetches ACL for CanvasResource', async () => {
   const datasetAcl = [{filter: 'true', permissions: ['read', 'update', 'create', 'history']}]
   vi.mocked(client.request).mockResolvedValue(datasetAcl)
 
-  const doc = createDocumentHandle({documentId: crypto.randomUUID(), documentType: 'article'})
+  const doc = createDocumentHandle({documentId: randomUuid(), documentType: 'article'})
   const canvasResource = {canvasId: 'test-canvas'}
 
   const result = await resolvePermissions(canvasInstance, {
@@ -1118,7 +1119,7 @@ it('fetches ACL for CanvasResource', async () => {
 })
 
 it('returns a promise that resolves when a document has been loaded in the store (useful for suspense)', async () => {
-  const documentId = DocumentId(crypto.randomUUID())
+  const documentId = DocumentId(randomUuid())
   const doc = createDocumentHandle({documentId, documentType: 'article'})
 
   expect(await resolveDocument(instance, doc)).toBe(null)
@@ -1143,7 +1144,7 @@ it('emits an event for each action after an outgoing transaction has been accept
   const handler = vi.fn()
   const unsubscribe = subscribeDocumentEvents(instance, {resource, eventHandler: handler})
 
-  const documentId = DocumentId(crypto.randomUUID())
+  const documentId = DocumentId(randomUuid())
   const doc = createDocumentHandle({documentId, documentType: 'article'})
   expect(handler).toHaveBeenCalledTimes(0)
 
@@ -1574,7 +1575,7 @@ beforeEach(() => {
       mutations: Mutation[],
       options: BaseMutationOptions = {},
     ): Promise<MultipleMutationResult> => {
-      const transactionId = options.transactionId ?? crypto.randomUUID()
+      const transactionId = options.transactionId ?? randomUuid()
       const timestamp = new Date().toISOString()
       const prior = {...documents}
       let next = {...documents}
@@ -1647,7 +1648,7 @@ beforeEach(() => {
   const action = vi.fn(
     async (
       input: HttpAction | HttpAction[],
-      {transactionId = crypto.randomUUID(), dryRun}: BaseActionOptions,
+      {transactionId = randomUuid(), dryRun}: BaseActionOptions,
     ): Promise<SingleActionResult | MultipleActionResult> => {
       const actions = Array.isArray(input) ? input : [input]
       let next: DocumentSet = {...documents}

package/src/document/documentStore.ts

@@ -550,13 +550,13 @@ const subscribeToClientAndFetchDatasetAcl = ({
 }: StoreContext<DocumentStoreState, BoundResourceKey>) => {
   const clientOptions: ClientOptions = {apiVersion: API_VERSION, resource}
 
-  let uri: string
+  let url: string
   if (resource && isDatasetResource(resource)) {
-    uri = `/projects/${resource.projectId}/datasets/${resource.dataset}/acl`
+    url = `/projects/${resource.projectId}/datasets/${resource.dataset}/acl`
   } else if (resource && isMediaLibraryResource(resource)) {
-    uri = `/media-libraries/${resource.mediaLibraryId}/acl`
+    url = `/media-libraries/${resource.mediaLibraryId}/acl`
   } else if (resource && isCanvasResource(resource)) {
-    uri = `/canvases/${resource.canvasId}/acl`
+    url = `/canvases/${resource.canvasId}/acl`
   } else {
     throw new Error(`Received invalid resource: ${JSON.stringify(resource)}`)
   }
@@ -566,7 +566,7 @@ const subscribeToClientAndFetchDatasetAcl = ({
       switchMap((client) =>
         client.observable
           .request<DatasetAcl>({
-            uri,
+            url,
             tag: 'acl.get',
           })
           .pipe(

package/src/document/permissions.ts

@@ -5,6 +5,7 @@ import {createSelector} from 'reselect'
 
 import {isReleasePerspective} from '../releases/utils/isReleasePerspective'
 import {type SelectorContext} from '../store/createStateSourceAction'
+import {randomId} from '../utils/ids'
 import {MultiKeyWeakMap} from '../utils/MultiKeyWeakMap'
 import {type DocumentAction} from './actions'
 import {ActionError, PermissionActionError, processActions} from './processActions/processActions'
@@ -190,7 +191,7 @@ const _calculatePermissions = createSelector(
     try {
       processActions({
         actions,
-        transactionId: crypto.randomUUID(),
+        transactionId: randomId(16),
         working: documents,
         base: documents,
         timestamp,

package/src/document/processActions.test.ts

@@ -2,6 +2,7 @@ import {type CreateMutation, type Reference, type SanityDocument} from '@sanity/
 import {parse} from 'groq-js'
 import {describe, expect, it} from 'vitest'
 
+import {randomUuid} from '../utils/ids'
 import {type Action, type DocumentAction} from './actions'
 import {ActionError, processActions} from './processActions/processActions'
 import {type DocumentSet, processMutations} from './processMutations'
@@ -973,7 +974,7 @@ describe('processActions', () => {
     })
 
     it('should strengthen `_strengthenOnPublish` references', () => {
-      const _ref = crypto.randomUUID()
+      const _ref = randomUuid()
       const referenceToStrength: Reference = {
         _ref,
         _type: 'reference',

package/src/document/processMutations.ts

@@ -5,6 +5,7 @@ import {
   type SanityDocument,
 } from '@sanity/types'
 
+import {randomUuid} from '../utils/ids'
 import {
   dec,
   diffMatchPatch,
@@ -63,8 +64,8 @@ const patchOperations = {
  * [- source](https://www.sanity.io/docs/http-mutations#c732f27330a4)
  */
 export function getId(id?: string): string {
-  if (!id || typeof id !== 'string') return crypto.randomUUID()
-  if (id.endsWith('.')) return `${id}${crypto.randomUUID()}`
+  if (!id || typeof id !== 'string') return randomUuid()
+  if (id.endsWith('.')) return `${id}${randomUuid()}`
   return id
 }
 

package/src/document/reducers.ts

@@ -4,7 +4,7 @@ import {type Mutation, type PatchOperations, type SanityDocumentLike} from '@san
 import {type DocumentHandle} from '../config/sanityConfig'
 import {isReleasePerspective} from '../releases/utils/isReleasePerspective'
 import {type StoreContext} from '../store/defineStore'
-import {insecureRandomId} from '../utils/ids'
+import {randomId} from '../utils/ids'
 import {isDeepEqual, omitProperty} from '../utils/object'
 import {setCleanupTimeout} from '../utils/setCleanupTimeout'
 import {type Action} from './actions'
@@ -790,7 +790,7 @@ export function manageSubscriberIds(
 ): () => void {
   const documentIds = getDocumentIdsFromHandleLikes(handles)
 
-  const subscriptionId = insecureRandomId()
+  const subscriptionId = randomId(16)
   state.set('addSubscribers', (prev) =>
     documentIds.reduce(
       (acc, id) => addSubscriptionIdToDocument(acc, id, subscriptionId),

package/src/installations/installations.test.ts

@@ -40,7 +40,7 @@ describe('installations', () => {
       scope: 'global',
     })
     expect(request).toHaveBeenCalledWith({
-      uri: '/installations',
+      url: '/installations',
       query: {organizationId: 'org1', include: 'interfaces'},
       tag: 'installations.list',
     })
@@ -54,7 +54,7 @@ describe('installations', () => {
 
     expect(result).toEqual(inst)
     expect(request).toHaveBeenCalledWith({
-      uri: '/installations/inst1',
+      url: '/installations/inst1',
       query: {},
       tag: 'installations.get',
     })

package/src/installations/installations.ts

@@ -160,7 +160,7 @@ export const installations = defineFetcher<
     getClientState(instance, {apiVersion: API_VERSION, scope: 'global'}).observable.pipe(
       switchMap((client) =>
         client.observable.request<InstallationsResponse<InstallationInclude>>({
-          uri: '/installations',
+          url: '/installations',
           query: buildQuery({
             organizationId: options.organizationId,
             include: serializeInclude(options.include),
@@ -196,7 +196,7 @@ export const installation = defineFetcher<
     getClientState(instance, {apiVersion: API_VERSION, scope: 'global'}).observable.pipe(
       switchMap((client) =>
         client.observable.request<Installation<InstallationInclude>>({
-          uri: `/installations/${installationId}`,
+          url: `/installations/${installationId}`,
           query: buildQuery({include: serializeInclude(options?.include)}),
           tag: 'installations.get',
         }),

package/src/organization/organization.test.ts

@@ -35,7 +35,7 @@ describe('organization', () => {
     const result = await organization.resolveState(instance, {organizationId: 'org_1'})
     expect(result).toEqual(detail)
     expect(request).toHaveBeenCalledWith({
-      uri: '/organizations/org_1',
+      url: '/organizations/org_1',
       query: {includeMembers: 'false', includeFeatures: 'false'},
       tag: 'organizations.get',
     })
@@ -58,7 +58,7 @@ describe('organization', () => {
     })
 
     expect(request).toHaveBeenCalledWith({
-      uri: '/organizations/org_1',
+      url: '/organizations/org_1',
       query: {
         includeMembers: 'true',
         includeFeatures: 'true',

package/src/organization/organization.ts

@@ -128,7 +128,7 @@ export const organization = defineFetcher<
     getClientState(instance, {apiVersion: API_VERSION, scope: 'global'}).observable.pipe(
       switchMap((client) =>
         client.observable.request<Organization<boolean, boolean>>({
-          uri: `/organizations/${resolveOrganizationId(options)}`,
+          url: `/organizations/${resolveOrganizationId(options)}`,
           query: buildQuery(normalizeOrganizationOptions(options)),
           tag: 'organizations.get',
         }),

package/src/organizations/organizations.test.ts

@@ -35,7 +35,7 @@ describe('organizations', () => {
     const result = await organizations.resolveState(instance)
     expect(result).toEqual(list)
     expect(request).toHaveBeenCalledWith({
-      uri: '/organizations',
+      url: '/organizations',
       query: {
         includeImplicitMemberships: 'false',
         includeMembers: 'false',
@@ -62,7 +62,7 @@ describe('organizations', () => {
     })
 
     expect(request).toHaveBeenCalledWith({
-      uri: '/organizations',
+      url: '/organizations',
       query: {
         includeImplicitMemberships: 'true',
         includeMembers: 'true',

package/src/organizations/organizations.ts

@@ -94,7 +94,7 @@ export const organizations = defineFetcher<
     getClientState(instance, {apiVersion: API_VERSION, scope: 'global'}).observable.pipe(
       switchMap((client) =>
         client.observable.request<Organizations<boolean, boolean>>({
-          uri: '/organizations',
+          url: '/organizations',
           query: buildQuery(normalizeOrganizationsOptions(options)),
           tag: 'organizations.list',
         }),

package/src/presence/presenceStore.test.ts

@@ -24,6 +24,12 @@ vi.mock('../client/clientStore')
 vi.mock('../users/usersStore')
 vi.mock('./bifurTransport')
 
+function lastTransportSessionId(): string {
+  const call = vi.mocked(createBifurTransport).mock.calls.at(-1)
+  if (!call) throw new Error('createBifurTransport was not called')
+  return call[0].sessionId
+}
+
 describe('presenceStore', () => {
   let instance: SanityInstance
   let mockClient: SanityClient
@@ -49,13 +55,6 @@ describe('presenceStore', () => {
   beforeEach(() => {
     vi.clearAllMocks()
 
-    // Mock crypto.randomUUID
-    Object.defineProperty(global, 'crypto', {
-      value: {
-        randomUUID: vi.fn(() => 'test-session-id'),
-      },
-    })
-
     mockClient = {
       withConfig: vi.fn().mockReturnThis(),
       observable: {
@@ -103,7 +102,7 @@ describe('presenceStore', () => {
       expect(createBifurTransport).toHaveBeenCalledWith({
         client: mockClient,
         token$: expect.any(Object),
-        sessionId: 'test-session-id',
+        sessionId: expect.stringMatching(/^[a-zA-Z0-9]{16}$/),
       })
     })
 
@@ -164,7 +163,7 @@ describe('presenceStore', () => {
       mockIncomingEvents.next({
         type: 'state',
         userId: 'user-1',
-        sessionId: 'test-session-id', // Same as our session
+        sessionId: lastTransportSessionId(), // Same as our session
         timestamp: '2023-01-01T12:00:00Z',
         locations: [],
       })
@@ -314,7 +313,7 @@ describe('presenceStore', () => {
       getPresence(instance, {resource: canvasResource})
 
       expect(mockClient.observable.request).toHaveBeenCalledWith({
-        uri: '/canvases/canvas123',
+        url: '/canvases/canvas123',
         tag: 'canvases.get',
       })
     })
@@ -1050,7 +1049,7 @@ describe('presenceStore', () => {
         mockIncomingEvents.next({
           type: 'rollCall',
           userId: 'user-1',
-          sessionId: 'test-session-id',
+          sessionId: lastTransportSessionId(),
         })
         await flush()
 
@@ -1139,25 +1138,19 @@ describe('presenceStore', () => {
   })
 
   describe('session id', () => {
-    afterEach(() => {
-      vi.unstubAllGlobals()
-    })
-
     it('gives each store its own id, so nothing can collide across tabs', () => {
       // Ids are deliberately not persisted: a tab that inherits another's
       // session storage would otherwise reuse the id and the two live clients
       // would filter each other out as their own session.
-      let counter = 0
-      vi.stubGlobal('crypto', {randomUUID: vi.fn(() => `session-${++counter}`)})
-
       getPresence(instance, {resource: {projectId: 'p1', dataset: 'd1'}}).subscribe(() => {})
-      const first = vi.mocked(createBifurTransport).mock.calls.at(-1)?.[0].sessionId
+      const first = lastTransportSessionId()
 
       getPresence(instance, {resource: {projectId: 'p2', dataset: 'd2'}}).subscribe(() => {})
-      const second = vi.mocked(createBifurTransport).mock.calls.at(-1)?.[0].sessionId
+      const second = lastTransportSessionId()
 
-      expect(first).toBe('session-1')
-      expect(second).toBe('session-2')
+      expect(first).toMatch(/^[a-zA-Z0-9]{16}$/)
+      expect(second).toMatch(/^[a-zA-Z0-9]{16}$/)
+      expect(first).not.toBe(second)
     })
   })
 })