@sanity/client 5.0.0-esm.1 → 5.0.0-esm.3

package/src/users/UsersClient.ts

@@ -1,46 +1,55 @@
-import {type Observable} from 'rxjs'
+import {type Observable, lastValueFrom} from 'rxjs'
 
+import {_request} from '../data/dataMethods'
 import type {ObservableSanityClient, SanityClient} from '../SanityClient'
-import type {CurrentSanityUser, SanityUser} from '../types'
+import type {CurrentSanityUser, HttpRequest, SanityUser} from '../types'
 
-export class BaseUsersClient {
-  client: SanityClient | ObservableSanityClient
+export class ObservableUsersClient {
+  #client: ObservableSanityClient
+  #httpRequest: HttpRequest
+  constructor(client: ObservableSanityClient, httpRequest: HttpRequest) {
+    this.#client = client
+    this.#httpRequest = httpRequest
+  }
 
   /**
    * Fetch a user by user ID
    *
    * @param id - User ID of the user to fetch. If `me` is provided, a minimal response including the users role is returned.
    */
-  getById<T extends 'me' | string>(
-    this: UsersClient,
-    id: T
-  ): Promise<T extends 'me' ? CurrentSanityUser : SanityUser>
-  getById<T extends 'me' | string>(
-    this: ObservableUsersClient,
-    id: T
-  ): Observable<T extends 'me' ? CurrentSanityUser : SanityUser>
+
   getById<T extends 'me' | string>(
     id: T
-  ):
-    | Promise<T extends 'me' ? CurrentSanityUser : SanityUser>
-    | Observable<T extends 'me' ? CurrentSanityUser : SanityUser> {
-    return this.client.request({uri: `/users/${id}`})
+  ): Observable<T extends 'me' ? CurrentSanityUser : SanityUser> {
+    return _request<T extends 'me' ? CurrentSanityUser : SanityUser>(
+      this.#client,
+      this.#httpRequest,
+      {uri: `/users/${id}`}
+    )
   }
 }
 
-export class ObservableUsersClient extends BaseUsersClient {
-  client: ObservableSanityClient
-
-  constructor(client: ObservableSanityClient) {
-    super()
-    this.client = client
+export class UsersClient {
+  #client: SanityClient
+  #httpRequest: HttpRequest
+  constructor(client: SanityClient, httpRequest: HttpRequest) {
+    this.#client = client
+    this.#httpRequest = httpRequest
   }
-}
 
-export class UsersClient extends BaseUsersClient {
-  client: SanityClient
-  constructor(client: SanityClient) {
-    super()
-    this.client = client
+  /**
+   * Fetch a user by user ID
+   *
+   * @param id - User ID of the user to fetch. If `me` is provided, a minimal response including the users role is returned.
+   */
+
+  getById<T extends 'me' | string>(
+    id: T
+  ): Promise<T extends 'me' ? CurrentSanityUser : SanityUser> {
+    return lastValueFrom(
+      _request<T extends 'me' ? CurrentSanityUser : SanityUser>(this.#client, this.#httpRequest, {
+        uri: `/users/${id}`,
+      })
+    )
   }
 }