@sanity/sdk 3.0.0 → 3.2.0

package/src/document/processMutations.ts

@@ -5,6 +5,7 @@ import {
   type SanityDocument,
 } from '@sanity/types'
 
+import {randomUuid} from '../utils/ids'
 import {
   dec,
   diffMatchPatch,
@@ -17,10 +18,9 @@ import {
 } from './patchOperations'
 
 /**
- * Represents a set of document that will go into `applyMutations`. Before
- * applying a mutation, it's expected that all relevant documents that the
- * mutations affect are included, including those that do not exist yet.
- * Documents that don't exist have a `null` value.
+ * Maps document IDs to documents, using `null` for documents that do not exist.
+ *
+ * @beta
  */
 export type DocumentSet<TDocument extends SanityDocument = SanityDocument> = {
   [TDocumentId in string]?: TDocument | null
@@ -28,10 +28,29 @@ export type DocumentSet<TDocument extends SanityDocument = SanityDocument> = {
 
 type SupportedPatchOperation = Exclude<keyof PatchOperations, 'merge'>
 
-// > If multiple patches are included, then the order of execution is as follows:
-// > - set, setIfMissing, unset, inc, dec, insert.
-// > https://www.sanity.io/docs/http-mutations#5b4db1396e56
-const patchOperations = {
+/**
+ * Exposes the patch operations used by {@link processMutations}.
+ *
+ * @remarks
+ * Property order determines execution order in {@link processMutations}:
+ * `ifRevisionID`, `set`, `setIfMissing`, `unset`, `inc`, `dec`, `insert`,
+ * then `diffMatchPatch`. Reordering the properties changes mutation results.
+ * Freezes the collection to prevent callers from replacing the functions
+ * used by the SDK's mutation evaluator.
+ *
+ * @see https://www.sanity.io/docs/http-mutations#5b4db1396e56
+ *
+ * @example
+ * ```ts
+ * const document = {items: [{_key: 'a', title: 'Before'}]}
+ * const updated = patchOperations.set<typeof document>(document, {
+ *   'items[_key=="a"].title': 'After',
+ * })
+ * ```
+ *
+ * @internal
+ */
+export const patchOperations = Object.freeze({
   ifRevisionID,
   set,
   setIfMissing,
@@ -45,7 +64,7 @@ const patchOperations = {
     input: unknown,
     pathExpressions: NonNullable<PatchOperations[K]>,
   ) => unknown
-}
+})
 
 /**
  * Implements ID generation:
@@ -63,12 +82,17 @@ 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
 }
 
-interface ProcessMutationsOptions {
+/**
+ * Configures {@link processMutations}.
+ *
+ * @internal
+ */
+export interface ProcessMutationsOptions {
   /**
    * The transaction ID that will become the next `_rev` for documents mutated
    * by the given mutations.
@@ -83,8 +107,8 @@ interface ProcessMutationsOptions {
    */
   mutations: Mutation[]
   /**
-   * An optional timestamp that will be used for `_createdAt` and `_updatedAt`
-   * timestamp when applicable.
+   * Supplies the default `_createdAt` and `_updatedAt` timestamps.
+   * Uses the current time when omitted or empty.
    */
   timestamp?: string
 }
@@ -107,18 +131,31 @@ export function getDocumentIds(selection: MutationSelection): string[] {
 }
 
 /**
- * Applies the given mutation to the given document set. Note, it is expected
- * that all relevant documents that the mutations affect should be within the
- * given `document` set. If a document does not exist, it should have the value
- * `null`. If a document is deleted as a result of the mutations, it will still
- * have its document ID present in the returns documents, but it will have a
- * value of `null`.
+ * Applies mutations to an in-memory set of Sanity documents.
+ * Deleted documents remain in the returned set with a value of `null`.
+ *
+ * Include every document affected by `mutations` in `documents`, using `null`
+ * for documents that do not exist.
+ *
+ * Returns `documents` itself when `mutations` is empty. Otherwise, returns a
+ * shallow copy of that object. The result can reuse document objects and
+ * nested objects from `documents`. Mutating a reused object through the
+ * result also changes the input.
+ *
+ * Sets `_rev` to `transactionId` on created, replaced, and patched documents.
+ * Uses `timestamp` for timestamps unless the mutation preserves them.
+ * Ignores `merge` patches; `inc` and `dec` skip values that are not numbers.
+ * Generates document IDs when omitted or ending in `.`.
+ * Patch operations can generate missing array keys.
+ *
+ * Does not persist documents or run Content Lake's server validation.
  *
- * The given `transactionId` will be used as the resulting `_rev` for documents
- * affected by the given set of mutations.
+ * @throws If a selection uses a query, a `create` targets an existing document,
+ * or a `patch` targets a document that does not exist.
+ * @throws If a patch operation fails, including a revision check failure or
+ * `diffMatchPatch` applied to a value other than a string or `undefined`.
  *
- * If a `timestamp` is given, that will be used as for the relevant `_updatedAt`
- * and `_createdAt` timestamps.
+ * @internal
  */
 export function processMutations({
   documents,

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-d.ts

@@ -1,5 +1,6 @@
 import {expectTypeOf, test} from 'vitest'
 
+import {type ApplicationInterface} from '../applications/applications'
 import {type SanityInstance} from '../store/createSanityInstance'
 import {type StateSource} from '../store/createStateSourceAction'
 import {type FetcherSnapshot} from '../store/fetcherStore'
@@ -10,7 +11,6 @@ import {
   type InstallationActiveConfig,
   type InstallationBase,
   type InstallationInclude,
-  type InstallationInterface,
   installations,
   type InstallationsResponse,
 } from './installations'
@@ -40,7 +40,7 @@ test('Installation — each token adds its top-level field, required, others abs
     Extract<keyof Installation<'access'>, 'activeConfig' | 'interfaces'>
   >().toEqualTypeOf<never>()
 
-  expectTypeOf<Installation<'interfaces'>['interfaces']>().toEqualTypeOf<InstallationInterface[]>()
+  expectTypeOf<Installation<'interfaces'>['interfaces']>().toEqualTypeOf<ApplicationInterface[]>()
   expectTypeOf<
     Installation<'activeConfig'>['activeConfig']
   >().toEqualTypeOf<InstallationActiveConfig | null>()
@@ -49,7 +49,7 @@ test('Installation — each token adds its top-level field, required, others abs
 test('Installation — multiple tokens add each field', () => {
   type Both = Installation<'access' | 'interfaces'>
   expectTypeOf<Both['access']>().toEqualTypeOf<InstallationAccess[]>()
-  expectTypeOf<Both['interfaces']>().toEqualTypeOf<InstallationInterface[]>()
+  expectTypeOf<Both['interfaces']>().toEqualTypeOf<ApplicationInterface[]>()
   expectTypeOf<Extract<keyof Both, 'activeConfig'>>().toEqualTypeOf<never>()
 })
 

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

@@ -1,5 +1,6 @@
 import {switchMap} from 'rxjs'
 
+import {type ApplicationInterface} from '../applications/applications'
 import {getClientState} from '../client/clientStore'
 import {defineFetcher} from '../store/fetcherStore'
 import {buildQuery} from '../utils/buildQuery'
@@ -29,24 +30,6 @@ export interface InstallationAccess {
   resourceId: string
 }
 
-/**
- * An interface exposed by an installation, embedded when `interfaces` is
- * included.
- *
- * @see https://www.sanity.io/docs/http-reference/applications-api
- * @public
- */
-export interface InstallationInterface {
-  id: string
-  type: 'app' | 'worker' | 'asset_source' | 'panel'
-  name: string
-  title: string
-  version: string
-  /** Module federation module ID; resolved from the host mf-manifest at runtime */
-  moduleId: string
-  metadata: {group?: string; priority?: number} | null
-}
-
 /**
  * The active config of an installation, embedded when `activeConfig` is
  * included. `null` when nothing is deployed.
@@ -104,7 +87,7 @@ export type Installation<Include extends InstallationInclude = never> = Installa
     {activeConfig: InstallationActiveConfig | null}
   > &
   Included<InstallationInclude, 'access', Include, {access: InstallationAccess[]}> &
-  Included<InstallationInclude, 'interfaces', Include, {interfaces: InstallationInterface[]}>
+  Included<InstallationInclude, 'interfaces', Include, {interfaces: ApplicationInterface[]}>
 
 /**
  * Options for listing an organization's installations.
@@ -160,7 +143,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 +179,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

@@ -1,5 +1,4 @@
 import {DocumentId, getPublishedId} from '@sanity/id-utils'
-import {type SanityProjectionResult} from 'groq'
 
 import {type DocumentHandle} from '../config/sanityConfig'
 import {bindActionByResourceAndPerspective} from '../store/createActionBinder'
@@ -9,8 +8,9 @@ import {
   type SelectorContext,
   type StateSource,
 } from '../store/createStateSourceAction'
+import {type ResolveProjectionResult} from '../typegen/resolve'
 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'
@@ -39,7 +39,7 @@ export function getProjectionState<
   options: ProjectionOptions<TProjection, TDocumentType, TDataset, TProjectId>,
 ): StateSource<
   | ProjectionValuePending<
-      SanityProjectionResult<TProjection, TDocumentType, `${TProjectId}.${TDataset}`>
+      ResolveProjectionResult<TProjection, TDocumentType, `${TProjectId}.${TDataset}`>
     >
   | undefined
 >
@@ -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/projection/resolveProjection.ts

@@ -1,8 +1,8 @@
-import {type SanityProjectionResult} from 'groq'
 import {filter, firstValueFrom} from 'rxjs'
 
 import {bindActionByResourceAndPerspective} from '../store/createActionBinder'
 import {type SanityInstance} from '../store/createSanityInstance'
+import {type ResolveProjectionResult} from '../typegen/resolve'
 import {getProjectionState, type ProjectionOptions} from './getProjectionState'
 import {projectionStore} from './projectionStore'
 import {type ProjectionValuePending} from './types'
@@ -18,7 +18,7 @@ export function resolveProjection<
   options: ProjectionOptions<TProjection, TDocumentType, TDataset, TProjectId>,
 ): Promise<
   ProjectionValuePending<
-    SanityProjectionResult<TProjection, TDocumentType, `${TProjectId}.${TDataset}`>
+    ResolveProjectionResult<TProjection, TDocumentType, `${TProjectId}.${TDataset}`>
   >
 >
 

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

@@ -1,5 +1,4 @@
 import {type ResponseQueryOptions} from '@sanity/client'
-import {type SanityQueryResult} from 'groq'
 import {
   catchError,
   combineLatest,
@@ -36,7 +35,8 @@ import {
 } from '../store/createStateSourceAction'
 import {type StoreState} from '../store/createStoreState'
 import {defineStore, type StoreContext} from '../store/defineStore'
-import {insecureRandomId} from '../utils/ids'
+import {type ResolveQueryResult} from '../typegen/resolve'
+import {randomId} from '../utils/ids'
 import {setCleanupTimeout} from '../utils/setCleanupTimeout'
 import {
   QUERY_STATE_CLEAR_DELAY,
@@ -278,7 +278,7 @@ export function getQueryState<
 >(
   instance: SanityInstance,
   queryOptions: QueryOptions<TQuery, TDataset, TProjectId>,
-): StateSource<SanityQueryResult<TQuery, `${TProjectId}.${TDataset}`> | undefined>
+): StateSource<ResolveQueryResult<TQuery, `${TProjectId}.${TDataset}`> | undefined>
 
 /** @beta */
 export function getQueryState<TData>(
@@ -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))
@@ -347,7 +347,7 @@ export function resolveQuery<
 >(
   instance: SanityInstance,
   queryOptions: ResolveQueryOptions<TQuery, TDataset, TProjectId>,
-): Promise<SanityQueryResult<TQuery, `${TProjectId}.${TDataset}`>>
+): Promise<ResolveQueryResult<TQuery, `${TProjectId}.${TDataset}`>>
 
 /** @beta */
 export function resolveQuery<TData>(
@@ -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