@@ -5,16 +5,15 @@ import type { Response, SuperAgent, SuperAgentRequest } from 'superagent';
55import type { SuperTest } from 'supertest' ;
66import { URL } from 'url' ;
77import { pipe } from 'fp-ts/function' ;
8- import { HttpResponseCodes } from '@bitgo/io-ts-http' ;
98
109type SuccessfulResponses < Route extends h . HttpRoute > = {
11- [ Status in h . KnownResponses < Route [ 'response' ] > ] : {
10+ [ Status in h . KnownHttpStatusCodes < Route [ 'response' ] > ] : {
1211 status : Status ;
1312 error ?: undefined ;
1413 body : t . TypeOf < Route [ 'response' ] [ Status ] > ;
1514 original : Response ;
1615 } ;
17- } [ h . KnownResponses < Route [ 'response' ] > ] ;
16+ } [ h . KnownHttpStatusCodes < Route [ 'response' ] > ] ;
1817
1918type DecodedResponse < Route extends h . HttpRoute > =
2019 | SuccessfulResponses < Route >
@@ -29,15 +28,15 @@ const decodedResponse = <Route extends h.HttpRoute>(res: DecodedResponse<Route>)
2928
3029type ExpectedDecodedResponse <
3130 Route extends h . HttpRoute ,
32- Status extends h . KnownResponses < Route [ 'response' ] > ,
31+ Status extends h . KnownHttpStatusCodes < Route [ 'response' ] > ,
3332> = {
3433 body : t . TypeOf < Route [ 'response' ] [ Status ] > ;
3534 original : Response ;
3635} ;
3736
3837type PatchedRequest < Req extends SuperAgentRequest , Route extends h . HttpRoute > = Req & {
3938 decode : ( ) => Promise < DecodedResponse < Route > > ;
40- decodeExpecting : < Status extends h . KnownResponses < Route [ 'response' ] > > (
39+ decodeExpecting : < Status extends h . KnownHttpStatusCodes < Route [ 'response' ] > > (
4140 status : Status ,
4241 ) => Promise < ExpectedDecodedResponse < Route , Status > > ;
4342} ;
@@ -97,7 +96,7 @@ const patchRequest = <Req extends SuperAgentRequest, Route extends h.HttpRoute>(
9796
9897 let status : string | undefined ;
9998 // DISCUSS: Should we have this as a preprocessed const in io-ts-http?
100- for ( const [ name , code ] of Object . entries ( HttpResponseCodes ) ) {
99+ for ( const [ name , code ] of Object . entries ( h . HttpResponseCodes ) ) {
101100 if ( statusCode === code ) {
102101 status = name ;
103102 break ;
@@ -125,7 +124,7 @@ const patchRequest = <Req extends SuperAgentRequest, Route extends h.HttpRoute>(
125124 route . response [ status ] . decode ( res . body ) ,
126125 E . map ( ( body ) =>
127126 decodedResponse < Route > ( {
128- status : status as h . KnownResponses < Route [ 'response' ] > ,
127+ status : statusCode ,
129128 body,
130129 original : res ,
131130 } ) ,
@@ -142,7 +141,9 @@ const patchRequest = <Req extends SuperAgentRequest, Route extends h.HttpRoute>(
142141 ) ;
143142 } ) ;
144143
145- patchedReq . decodeExpecting = < Status extends h . KnownResponses < Route [ 'response' ] > > (
144+ patchedReq . decodeExpecting = <
145+ Status extends h . KnownHttpStatusCodes < Route [ 'response' ] > ,
146+ > (
146147 status : Status ,
147148 ) =>
148149 patchedReq . decode ( ) . then ( ( res ) => {
0 commit comments