@sanity/sdk 3.0.0-rc.2 → 3.1.0

package/src/favorites/favorites.ts

@@ -5,12 +5,12 @@ import {
   SDK_NODE_NAME,
   type StudioResource,
 } from '@sanity/message-protocol'
-import {catchError, filter, from, map, Observable, of, shareReplay, switchMap} from 'rxjs'
+import {catchError, first, from, map, type Observable, of, switchMap} from 'rxjs'
 
 import {getNodeState} from '../comlink/node/getNodeState'
 import {type DocumentHandle} from '../config/sanityConfig'
 import {type SanityInstance} from '../store/createSanityInstance'
-import {createFetcherStore} from '../utils/createFetcherStore'
+import {defineFetcher, defineMutation} from '../store/fetcherStore'
 
 /**
  * @public
@@ -22,7 +22,7 @@ export interface FavoriteStatusResponse {
 /**
  * @public
  */
-interface FavoriteDocumentContext extends DocumentHandle {
+export interface FavoriteDocumentContext extends DocumentHandle {
   resourceId: string
   resourceType: StudioResource['type'] | MediaResource['type'] | CanvasResource['type']
   schemaName?: string
@@ -35,12 +35,19 @@ function createFavoriteKey(context: FavoriteDocumentContext): string {
   }`
 }
 
-const favorites = createFetcherStore<[FavoriteDocumentContext], FavoriteStatusResponse>({
-  name: 'Favorites',
-  getKey: (_instance: SanityInstance, context: FavoriteDocumentContext) => {
-    return createFavoriteKey(context)
-  },
-  fetcher: (instance: SanityInstance) => {
+/**
+ * Fetcher for a document's favorite status, read from the dashboard over
+ * comlink, on the shared fetcher cache.
+ *
+ * @internal
+ */
+export const favorites = defineFetcher<[context: FavoriteDocumentContext], FavoriteStatusResponse>({
+  name: 'favorites',
+  getKey: (_instance: SanityInstance, context: FavoriteDocumentContext) =>
+    createFavoriteKey(context),
+  // Tag each entry with its key so `setFavorite` can invalidate exactly it.
+  tags: (_data, context) => [{type: 'favorite', id: createFavoriteKey(context)}],
+  fetch: (instance) => {
     return (context: FavoriteDocumentContext): Observable<FavoriteStatusResponse> => {
       const nodeStateSource = getNodeState(instance, {
         name: SDK_NODE_NAME,
@@ -59,8 +66,8 @@ const favorites = createFetcherStore<[FavoriteDocumentContext], FavoriteStatusRe
       }
 
       return nodeStateSource.observable.pipe(
-        filter((nodeState) => !!nodeState), // Only proceed when connected
-        shareReplay(1),
+        // Wait until connected, then complete after the single fetch settles.
+        first((nodeState) => !!nodeState),
         switchMap((nodeState) => {
           const node = nodeState!.node
           return from(
@@ -84,19 +91,63 @@ const favorites = createFetcherStore<[FavoriteDocumentContext], FavoriteStatusRe
 })
 
 /**
- * Gets a StateSource for the favorite status of a document.
- * @param instance - The Sanity instance.
- * @param context - The document context including ID, type, and resource information.
- * @returns A StateSource emitting `{ isFavorited: boolean }`.
+ * Input for {@link setFavorite}: the document context plus the desired state.
+ *
  * @public
  */
-export const getFavoritesState = favorites.getState
+export type SetFavoriteInput = FavoriteDocumentContext & {
+  /** The favorite state to move to: `true` to favorite, `false` to unfavorite. */
+  isFavorited: boolean
+}
 
 /**
- * Resolves the favorite status for a document.
- * @param instance - The Sanity instance.
- * @param context - The document context including ID, type, and resource information.
- * @returns A Promise resolving to `{ isFavorited: boolean }`.
- * @public
+ * Sets a document's favorite state over comlink, then invalidates the cached
+ * {@link favorites} status for that document so active readers reconverge on
+ * server truth. The write-side counterpart to {@link favorites}.
+ *
+ * @internal
  */
-export const resolveFavoritesState = favorites.resolveState
+export const setFavorite = defineMutation<SetFavoriteInput, FavoriteStatusResponse>({
+  name: 'setFavorite',
+  mutationFn: (instance) => {
+    return ({isFavorited, ...context}: SetFavoriteInput): Observable<FavoriteStatusResponse> => {
+      const nodeStateSource = getNodeState(instance, {
+        name: SDK_NODE_NAME,
+        connectTo: SDK_CHANNEL_NAME,
+      })
+      const payload = {
+        eventType: isFavorited ? 'added' : 'removed',
+        document: {
+          id: context.documentId,
+          type: context.documentType,
+          resource: {
+            id: context.resourceId,
+            type: context.resourceType,
+            ...(context.schemaName ? {schemaName: context.schemaName} : {}),
+          },
+        },
+      }
+
+      return nodeStateSource.observable.pipe(
+        // Wait until connected, then complete after the single mutation settles.
+        first((nodeState) => !!nodeState),
+        switchMap((nodeState) => {
+          const node = nodeState!.node
+          return from(
+            node.fetch(
+              // @ts-expect-error -- getOrCreateNode should be refactored to take type arguments
+              'dashboard/v1/events/favorite/mutate',
+              payload,
+            ) as Promise<{success: boolean}>,
+          ).pipe(
+            map((response) => {
+              if (!response.success) throw new Error('Failed to update favorite status')
+              return {isFavorited}
+            }),
+          )
+        }),
+      )
+    }
+  },
+  invalidates: (_result, input) => [{type: 'favorite', id: createFavoriteKey(input)}],
+})

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)
     })
   })
 })

package/src/presence/presenceStore.ts

@@ -38,6 +38,7 @@ import {
 import {defineStore, type StoreContext} from '../store/defineStore'
 import {type SanityUser} from '../users/types'
 import {getUserState} from '../users/usersStore'
+import {randomId} from '../utils/ids'
 import {createLogger} from '../utils/logger'
 import {createBifurTransport} from './bifurTransport'
 import {startsWithPath} from './paths'
@@ -198,7 +199,7 @@ export const presenceStore = defineStore<PresenceStoreState, BoundResourceKey>({
     // storage (`window.open`, or a same-origin iframe), making two live clients
     // filter each other out as self. Stale sessions are handled by the
     // disconnect on unload, with the expiry sweep above as the backstop.
-    const sessionId = crypto.randomUUID()
+    const sessionId = randomId(16)
 
     // Dataset resources must use the project hostname so the socket URL is project-specific.
     // Canvas resources use the global API endpoint via the resource config.
@@ -411,7 +412,7 @@ export const presenceStore = defineStore<PresenceStoreState, BoundResourceKey>({
       subscription.add(
         globalClient.observable
           .request<{organizationId: string}>({
-            uri: `/canvases/${resource.canvasId}`,
+            url: `/canvases/${resource.canvasId}`,
             tag: 'canvases.get',
           })
           .subscribe({

package/src/project/project.test.ts

@@ -36,7 +36,7 @@ describe('project', () => {
     const result = await project.resolveState(instance, {projectId: 'a'})
     expect(result).toEqual(detail)
     expect(request).toHaveBeenCalledWith({
-      uri: '/projects/a',
+      url: '/projects/a',
       query: {includeMembers: 'true', includeFeatures: 'true'},
       tag: 'projects.get',
     })
@@ -59,7 +59,7 @@ describe('project', () => {
     })
 
     expect(request).toHaveBeenCalledWith({
-      uri: '/projects/a',
+      url: '/projects/a',
       query: {
         includeMembers: 'false',
         includeFeatures: 'false',
@@ -80,7 +80,7 @@ describe('project', () => {
 
     await project.resolveState(instance)
     expect(request).toHaveBeenCalledWith({
-      uri: '/projects/p',
+      url: '/projects/p',
       query: {includeMembers: 'true', includeFeatures: 'true'},
       tag: 'projects.get',
     })

package/src/project/project.ts

@@ -130,7 +130,7 @@ export const project = defineFetcher<
     getClientState(instance, {apiVersion: API_VERSION, scope: 'global'}).observable.pipe(
       switchMap((client) =>
         client.observable.request<Project<boolean, boolean>>({
-          uri: `/projects/${resolveProjectId(instance, options)}`,
+          url: `/projects/${resolveProjectId(instance, options)}`,
           query: buildQuery(normalizeProjectOptions(options)),
           tag: 'projects.get',
         }),

package/src/projection/getProjectionState.test.ts

@@ -4,7 +4,7 @@ import {afterEach, beforeEach, describe, expect, it, vi} from 'vitest'
 import {createSanityInstance, type SanityInstance} from '../store/createSanityInstance'
 import {type StoreState} from '../store/createStoreState'
 import {hashString} from '../utils/hashString'
-import {insecureRandomId} from '../utils/ids'
+import {randomId} from '../utils/ids'
 import {getProjectionState} from './getProjectionState'
 import {subscribeToStateAndFetchBatches} from './subscribeToStateAndFetchBatches'
 import {type ProjectionStoreState} from './types'
@@ -19,7 +19,7 @@ vi.mock('../utils/ids', async (importOriginal) => {
   // Mock implementation uses the external counter
   return {
     ...util,
-    insecureRandomId: vi.fn(() => {
+    randomId: vi.fn(() => {
       const id = `testSubId_${++mockIdCounter}`
       return id
     }),
@@ -39,8 +39,7 @@ describe('getProjectionState', () => {
   let state: StoreState<ProjectionStoreState & {extra?: unknown}>
 
   beforeEach(() => {
-    mockIdCounter = 0
-    vi.mocked(insecureRandomId).mockClear()
+    vi.mocked(randomId).mockClear()
 
     // Capture state
     vi.mocked(subscribeToStateAndFetchBatches).mockImplementation((context) => {
@@ -49,6 +48,9 @@ describe('getProjectionState', () => {
     })
 
     instance = createSanityInstance({projectId: 'exampleProject', dataset: 'exampleDataset'})
+    // Reset after instance creation: the instanceId also comes from randomId,
+    // but the test ids should only count subscription-related calls
+    mockIdCounter = 0
     vi.useFakeTimers() // Enable fake timers for each test
   })
 

package/src/projection/getProjectionState.ts

@@ -10,7 +10,7 @@ import {
   type StateSource,
 } from '../store/createStateSourceAction'
 import {hashString} from '../utils/hashString'
-import {insecureRandomId} from '../utils/ids'
+import {randomId} from '../utils/ids'
 import {omitProperty} from '../utils/object'
 import {setCleanupTimeout} from '../utils/setCleanupTimeout'
 import {projectionStore} from './projectionStore'
@@ -85,7 +85,7 @@ export const _getProjectionState = bindActionByResourceAndPerspective(
     },
     onSubscribe: ({state}, options: ProjectionOptions<string, string, string, string>) => {
       const {projection, ...docHandle} = options
-      const subscriptionId = insecureRandomId()
+      const subscriptionId = randomId(16)
       const documentId = getPublishedId(DocumentId(docHandle.documentId))
       const validProjection = validateProjection(projection)
       const projectionHash = hashString(validProjection)

package/src/projects/projects.test.ts

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

package/src/projects/projects.ts

@@ -58,7 +58,7 @@ export const projects = defineFetcher<
     getClientState(instance, {apiVersion: API_VERSION, scope: 'global'}).observable.pipe(
       switchMap((client) =>
         client.observable.request<Project<boolean, boolean>[]>({
-          uri: '/projects',
+          url: '/projects',
           query: buildQuery(normalizeProjectsOptions(options)),
           tag: 'projects.list',
         }),

package/src/query/queryStore.ts

@@ -36,7 +36,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 {
   QUERY_STATE_CLEAR_DELAY,
@@ -309,7 +309,7 @@ const _getQueryState = bindActionByResource(
       return queryState?.result
     },
     onSubscribe: ({state, instance}, options: QueryOptions) => {
-      const subscriptionId = insecureRandomId()
+      const subscriptionId = randomId(16)
       const key = getQueryKey(instance, options)
 
       state.set('addSubscriber', addSubscriber(key, subscriptionId))
@@ -370,7 +370,7 @@ const _resolveQuery = bindActionByResource(
     // while a component is suspended leaves a subscriber-less key behind — the
     // component never commits, so no other subscriber exists — and its stored
     // error would be rethrown on every future mount without ever refetching.
-    const subscriptionId = insecureRandomId()
+    const subscriptionId = randomId(16)
     state.set('addSubscriber', addSubscriber(key, subscriptionId))
 
     const aborted$ = signal

package/src/store/createSanityInstance.test.ts

@@ -6,7 +6,7 @@ import {createSanityInstance} from './createSanityInstance'
 describe('createSanityInstance', () => {
   it('should create an instance with a unique instanceId and given config', () => {
     const instance = createSanityInstance({projectId: 'proj1', dataset: 'ds1'})
-    expect(typeof instance.instanceId).toBe('string')
+    expect(instance.instanceId).toMatch(/^[a-zA-Z0-9]{16}$/)
     expect(instance.config).toEqual({projectId: 'proj1', dataset: 'ds1'})
     expect(instance.isDisposed()).toBe(false)
   })

package/src/store/createSanityInstance.ts

@@ -1,5 +1,5 @@
 import {type SanityConfig} from '../config/sanityConfig'
-import {insecureRandomId} from '../utils/ids'
+import {randomId} from '../utils/ids'
 import {createLogger, type InstanceContext} from '../utils/logger'
 
 /**
@@ -10,7 +10,7 @@ import {createLogger, type InstanceContext} from '../utils/logger'
 export interface SanityInstance {
   /**
    * Unique identifier for this instance
-   * @remarks Generated using crypto.randomUUID()
+   * @remarks Generated as a random 16-character alphanumeric ID
    */
   readonly instanceId: string
 
@@ -47,7 +47,7 @@ export interface SanityInstance {
  * @public
  */
 export function createSanityInstance(config: SanityConfig = {}): SanityInstance {
-  const instanceId = crypto.randomUUID()
+  const instanceId = randomId(16)
   const disposeListeners = new Map<string, () => void>()
   const disposed = {current: false}
 
@@ -99,7 +99,7 @@ export function createSanityInstance(config: SanityConfig = {}): SanityInstance
       logger.info('Instance disposed')
     },
     onDispose: (cb) => {
-      const listenerId = insecureRandomId()
+      const listenerId = randomId(16)
       disposeListeners.set(listenerId, cb)
       return () => {
         disposeListeners.delete(listenerId)

package/src/store/createStoreInstance.test.ts

@@ -8,11 +8,6 @@ describe('createStoreInstance', () => {
   let instance: ReturnType<typeof createSanityInstance>
 
   beforeEach(() => {
-    // Mock crypto for predictable instance IDs
-    vi.stubGlobal('crypto', {
-      randomUUID: () => 'test-uuid-1234',
-    })
-
     instance = createSanityInstance({projectId: 'test', dataset: 'test'})
   })
 

package/src/store/fetcherStore.test.ts

@@ -1,4 +1,4 @@
-import {NEVER, of, startWith, Subject, throwError} from 'rxjs'
+import {concatWith, NEVER, of, startWith, Subject, throwError} from 'rxjs'
 import {afterEach, beforeEach, describe, expect, it, vi} from 'vitest'
 
 import {createSanityInstance, type SanityInstance} from './createSanityInstance'
@@ -65,6 +65,28 @@ describe('fetcherStore', () => {
     unsub3()
   })
 
+  it('revalidates a stale entry on re-subscribe when the fetch source does not complete', async () => {
+    let n = 0
+    const fetchSpy = vi.fn(() => of(++n).pipe(concatWith(NEVER)))
+    const fetcher = defineFetcher<[], number>({
+      name: 'swr-non-completing',
+      staleTime: 0,
+      getKey: () => 'k',
+      fetch: () => fetchSpy,
+    })
+
+    const first = fetcher.getState(instance)
+    const unsub1 = first.subscribe()
+    await vi.waitFor(() => expect(first.getCurrent().data).toBe(1))
+    unsub1()
+
+    const second = fetcher.getState(instance)
+    const unsub2 = second.subscribe()
+    await vi.waitFor(() => expect(fetchSpy).toHaveBeenCalledTimes(2))
+    expect(second.getCurrent().data).toBe(2)
+    unsub2()
+  })
+
   it('invalidate refetches an actively-subscribed entry', async () => {
     let n = 0
     const fetcher = defineFetcher<[], number>({

package/src/store/fetcherStore.ts

@@ -1,4 +1,4 @@
-import {filter, firstValueFrom, map, type Observable, Subscription} from 'rxjs'
+import {filter, firstValueFrom, map, type Observable, Subscription, take} from 'rxjs'
 
 import {setCleanupInterval, setCleanupTimeout} from '../utils/setCleanupTimeout'
 import {bindActionGlobally} from './createActionBinder'
@@ -490,6 +490,7 @@ const startFetch = (
   sub.add(
     def
       .fetch(instance)(...params)
+      .pipe(take(1))
       .subscribe({
         next: (data) => {
           const current = state.get().entries[key]
@@ -659,8 +660,7 @@ export function defineFetcher<TParams extends unknown[], TData>(
         }))
         startInterval(state, def, instance, params, key)
 
-        // Defer the fetch decision off the subscribe call stack (see the
-        // `delay(0)` precedent in the legacy fetcher store) to avoid a
+        // Defer the fetch decision off the subscribe call stack to avoid a
         // re-entrant cache write during subscription setup.
         queueMicrotask(() => {
           const entry = state.get().entries[key]

package/src/telemetry/telemetryManager.test.ts

@@ -280,7 +280,7 @@ describe('createTelemetryManager', () => {
       const result = await manager.checkConsent()
       expect(result).toBe(true)
       expect(mockClient.request).toHaveBeenCalledWith(
-        expect.objectContaining({uri: '/intake/telemetry-status'}),
+        expect.objectContaining({url: '/intake/telemetry-status'}),
       )
     })
 

package/src/telemetry/telemetryManager.ts

@@ -86,7 +86,7 @@ export function createTelemetryManager(options: TelemetryManagerOptions): Teleme
     try {
       const client = getClient()
       const result = await client.request<{status: ConsentStatus}>({
-        uri: '/intake/telemetry-status',
+        url: '/intake/telemetry-status',
         tag: CONSENT_TAG,
       })
       cachedConsent = result
@@ -120,7 +120,7 @@ export function createTelemetryManager(options: TelemetryManagerOptions): Teleme
     const client = getClient()
     log.debug('sending event batch', {batchSize: batch.length, environment})
     return client.request({
-      uri: '/intake/batch',
+      url: '/intake/batch',
       method: 'POST',
       body: {projectId, batch: enrichBatch(batch)},
       tag: BATCH_TAG,

package/src/users/usersStore.test.ts

@@ -450,7 +450,7 @@ describe('usersStore', () => {
       )
       expect(specificRequest).toHaveBeenCalledWith({
         method: 'GET',
-        uri: `/users/${projectUserId}`,
+        url: `/users/${projectUserId}`,
         tag: 'users.get',
       })