+5

.changeset/shy-geese-attack.md

reviewed

··· 1 1 + --- 2 2 + '@atcute/client': patch 3 3 + --- 4 4 + 5 5 + `ok()` shouldn't error on requests with `as: null`

+9 -4

packages/clients/client/lib/client.ts

reviewed

··· 141 141 /** represents a response returned by the client */ 142 142 export type ClientResponse<TDef, TInit> = SuccessClientResponse<TDef, TInit> | FailedClientResponse; 143 143 144 144 + type UnknownClientResponse = { status: number; headers: Headers } & ( 145 145 + | { ok: true; data: unknown } 146 146 + | { ok: false; data: XRPCErrorPayload } 147 147 + ); 148 148 + 144 149 // #endregion 145 150 146 151 // #region Client ··· 399 404 // #endregion 400 405 401 406 // #region Optimistic response helper 402 402 - type SuccessData<R> = R extends { ok: true; data: infer D } ? D : never; 407 407 + type ExtractSuccessData<R> = R extends { ok: true; data: infer D } ? D : never; 403 408 404 409 /** 405 410 * takes in the response returned by the client, and either returns the data if ··· 412 417 * // ^? ComAtprotoServerDescribeServer.Output 413 418 */ 414 419 export const ok: { 415 415 - <T extends Promise<ClientResponse<any, any>>>(promise: T): Promise<SuccessData<Awaited<T>>>; 416 416 - <T extends ClientResponse<any, any>>(response: T): SuccessData<T>; 417 417 - } = (input: Promise<ClientResponse<any, any>> | ClientResponse<any, any>): any => { 420 420 + <T extends Promise<UnknownClientResponse>>(promise: T): Promise<ExtractSuccessData<Awaited<T>>>; 421 421 + <T extends UnknownClientResponse>(response: T): ExtractSuccessData<T>; 422 422 + } = (input: Promise<UnknownClientResponse> | UnknownClientResponse): any => { 418 423 if (input instanceof Promise) { 419 424 return input.then(ok); 420 425 }