Skip to content

Commit b18e9cb

Browse files
vvakamevvakame
committed
Merge pull request DefinitelyTyped#4015 from gruppe-adler/restify-fix-httperrors
fix restify error classes
2 parents 8cdf507 + 08f99d4 commit b18e9cb

File tree

2 files changed

+173
-36
lines changed

2 files changed

+173
-36
lines changed

‎restify/restify-tests.ts

Lines changed: 111 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -99,23 +99,117 @@ server.del( /(.*)/, send);
9999
server.get( /(.*)/, send);
100100
server.head(/(.*)/, send);
101101

102-
new restify.ConflictError("test");
103-
new restify.InvalidArgumentError("message");
104-
new restify.RestError("message");
105-
new restify.BadDigestError("message");
106-
new restify.BadMethodError("message");
107-
new restify.BadRequestError('test');
108-
new restify.InternalError("message");
109-
new restify.InvalidContentError("message");
110-
new restify.InvalidCredentialsError("message");
111-
new restify.InvalidHeaderError("message");
112-
new restify.InvalidVersionError("message");
113-
new restify.MissingParameterError("message");
114-
new restify.NotAuthorizedError("message");
115-
new restify.RequestExpiredError("jjmessage");
116-
new restify.RequestThrottledError("message");
117-
new restify.ResourceNotFoundError("message");
118-
new restify.WrongAcceptError("message");
102+
103+
new restify.BadRequestError();
104+
new restify.UnauthorizedError();
105+
new restify.PaymentRequiredError();
106+
new restify.ForbiddenError();
107+
new restify.NotFoundError();
108+
new restify.MethodNotAllowedError();
109+
new restify.NotAcceptableError();
110+
new restify.ProxyAuthenticationRequiredError();
111+
new restify.RequestTimeoutError();
112+
new restify.ConflictError();
113+
new restify.GoneError();
114+
new restify.LengthRequiredError();
115+
new restify.RequestEntityTooLargeError();
116+
new restify.RequesturiTooLargeError();
117+
new restify.UnsupportedMediaTypeError();
118+
new restify.RequestedRangeNotSatisfiableError();
119+
new restify.ExpectationFailedError();
120+
new restify.ImATeapotError();
121+
new restify.UnprocessableEntityError();
122+
new restify.LockedError();
123+
new restify.FailedDependencyError();
124+
new restify.UnorderedCollectionError();
125+
new restify.UpgradeRequiredError();
126+
new restify.PreconditionRequiredError();
127+
new restify.TooManyRequestsError();
128+
new restify.RequestHeaderFieldsTooLargeError();
129+
new restify.InternalServerError();
130+
new restify.NotImplementedError();
131+
new restify.BadGatewayError();
132+
new restify.ServiceUnavailableError();
133+
new restify.GatewayTimeoutError();
134+
new restify.HttpVersionNotSupportedError();
135+
new restify.VariantAlsoNegotiatesError();
136+
new restify.InsufficientStorageError();
137+
new restify.BandwidthLimitExceededError();
138+
new restify.NotExtendedError();
139+
new restify.NetworkAuthenticationRequiredError();
140+
new restify.RestError();
141+
142+
new restify.BadRequestError(new Error(), 'foo');
143+
new restify.UnauthorizedError(new Error(), 'foo');
144+
new restify.PaymentRequiredError(new Error(), 'foo');
145+
new restify.ForbiddenError(new Error(), 'foo');
146+
new restify.NotFoundError(new Error(), 'foo');
147+
new restify.MethodNotAllowedError(new Error(), 'foo');
148+
new restify.NotAcceptableError(new Error(), 'foo');
149+
new restify.ProxyAuthenticationRequiredError(new Error(), 'foo');
150+
new restify.RequestTimeoutError(new Error(), 'foo');
151+
new restify.ConflictError(new Error(), 'foo');
152+
new restify.GoneError(new Error(), 'foo');
153+
new restify.LengthRequiredError(new Error(), 'foo');
154+
new restify.RequestEntityTooLargeError(new Error(), 'foo');
155+
new restify.RequesturiTooLargeError(new Error(), 'foo');
156+
new restify.UnsupportedMediaTypeError(new Error(), 'foo');
157+
new restify.RequestedRangeNotSatisfiableError(new Error(), 'foo');
158+
new restify.ExpectationFailedError(new Error(), 'foo');
159+
new restify.ImATeapotError(new Error(), 'foo');
160+
new restify.UnprocessableEntityError(new Error(), 'foo');
161+
new restify.LockedError(new Error(), 'foo');
162+
new restify.FailedDependencyError(new Error(), 'foo');
163+
new restify.UnorderedCollectionError(new Error(), 'foo');
164+
new restify.UpgradeRequiredError(new Error(), 'foo');
165+
new restify.PreconditionRequiredError(new Error(), 'foo');
166+
new restify.TooManyRequestsError(new Error(), 'foo');
167+
new restify.RequestHeaderFieldsTooLargeError(new Error(), 'foo');
168+
new restify.InternalServerError(new Error(), 'foo');
169+
new restify.NotImplementedError(new Error(), 'foo');
170+
new restify.BadGatewayError(new Error(), 'foo');
171+
new restify.ServiceUnavailableError(new Error(), 'foo');
172+
new restify.GatewayTimeoutError(new Error(), 'foo');
173+
new restify.HttpVersionNotSupportedError(new Error(), 'foo');
174+
new restify.VariantAlsoNegotiatesError(new Error(), 'foo');
175+
new restify.InsufficientStorageError(new Error(), 'foo');
176+
new restify.BandwidthLimitExceededError(new Error(), 'foo');
177+
new restify.NotExtendedError(new Error(), 'foo');
178+
new restify.NetworkAuthenticationRequiredError(new Error(), 'foo');
179+
new restify.RestError(new Error(), 'foo');
180+
181+
new restify.PreconditionFailedError(new Error(), 'foo');
182+
new restify.BadDigestError(new Error(), 'foo');
183+
new restify.BadMethodError(new Error(), 'foo');
184+
new restify.InternalError(new Error(), 'foo');
185+
new restify.InvalidArgumentError(new Error(), 'foo');
186+
new restify.InvalidContentError(new Error(), 'foo');
187+
new restify.InvalidCredentialsError(new Error(), 'foo');
188+
new restify.InvalidHeaderError(new Error(), 'foo');
189+
new restify.InvalidVersionError(new Error(), 'foo');
190+
new restify.MissingParameterError(new Error(), 'foo');
191+
new restify.NotAuthorizedError(new Error(), 'foo');
192+
new restify.RequestExpiredError(new Error(), 'foo');
193+
new restify.RequestThrottledError(new Error(), 'foo');
194+
new restify.ResourceNotFoundError(new Error(), 'foo');
195+
new restify.WrongAcceptError(new Error(), 'foo');
196+
197+
new restify.PreconditionFailedError();
198+
new restify.BadDigestError();
199+
new restify.BadMethodError();
200+
new restify.InternalError();
201+
new restify.InvalidArgumentError();
202+
new restify.InvalidContentError();
203+
new restify.InvalidCredentialsError();
204+
new restify.InvalidHeaderError();
205+
new restify.InvalidVersionError();
206+
new restify.MissingParameterError();
207+
new restify.NotAuthorizedError();
208+
new restify.RequestExpiredError();
209+
new restify.RequestThrottledError();
210+
new restify.ResourceNotFoundError();
211+
new restify.WrongAcceptError();
212+
119213

120214
server.name = "";
121215
server.version = "";

‎restify/restify.d.ts

Lines changed: 62 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -179,25 +179,68 @@ declare module "restify" {
179179
export function createStringClient(options?: ClientOptions): Client;
180180
export function createClient(options?: ClientOptions): HttpClient;
181181

182-
export class ConflictError { constructor(message?: any); }
183-
export class InvalidArgumentError { constructor(message?: any); }
184-
export class RestError { constructor(message?: any); }
185-
export class BadDigestError { constructor(message: any); }
186-
export class BadMethodError { constructor(message: any); }
187-
export class BadRequestError { constructor(message: any); }
188-
export class InternalError { constructor(message: any); }
189-
export class InvalidContentError { constructor(message: any); }
190-
export class InvalidCredentialsError { constructor(message: any); }
191-
export class InvalidHeaderError { constructor(message: any); }
192-
export class InvalidVersionError { constructor(message: any); }
193-
export class MissingParameterError { constructor(message: any); }
194-
export class NotAuthorizedError { constructor(message: any); }
195-
export class RequestExpiredError { constructor(message: any); }
196-
export class RequestThrottledError { constructor(message: any); }
197-
export class ResourceNotFoundError { constructor(message: any); }
198-
export class WrongAcceptError { constructor(message: any); }
199-
export class UnsupportedMediaTypeError { constructor(message: any); }
200-
export class RequestTimeoutError { constructor(message: any); }
182+
export class HttpError { constructor(cause: any, message?: any); }
183+
184+
class DefiniteHttpError {
185+
constructor(message?: any);
186+
constructor(cause: any, message?: any);
187+
}
188+
189+
export class BadRequestError extends DefiniteHttpError {}
190+
export class UnauthorizedError extends DefiniteHttpError {}
191+
export class PaymentRequiredError extends DefiniteHttpError {}
192+
export class ForbiddenError extends DefiniteHttpError {}
193+
export class NotFoundError extends DefiniteHttpError {}
194+
export class MethodNotAllowedError extends DefiniteHttpError {}
195+
export class NotAcceptableError extends DefiniteHttpError {}
196+
export class ProxyAuthenticationRequiredError extends DefiniteHttpError {}
197+
export class RequestTimeoutError extends DefiniteHttpError {}
198+
export class ConflictError extends DefiniteHttpError {}
199+
export class GoneError extends DefiniteHttpError {}
200+
export class LengthRequiredError extends DefiniteHttpError {}
201+
export class RequestEntityTooLargeError extends DefiniteHttpError {}
202+
export class RequesturiTooLargeError extends DefiniteHttpError {}
203+
export class UnsupportedMediaTypeError extends DefiniteHttpError {}
204+
export class RequestedRangeNotSatisfiableError extends DefiniteHttpError {}
205+
export class ExpectationFailedError extends DefiniteHttpError {}
206+
export class ImATeapotError extends DefiniteHttpError {}
207+
export class UnprocessableEntityError extends DefiniteHttpError {}
208+
export class LockedError extends DefiniteHttpError {}
209+
export class FailedDependencyError extends DefiniteHttpError {}
210+
export class UnorderedCollectionError extends DefiniteHttpError {}
211+
export class UpgradeRequiredError extends DefiniteHttpError {}
212+
export class PreconditionRequiredError extends DefiniteHttpError {}
213+
export class TooManyRequestsError extends DefiniteHttpError {}
214+
export class RequestHeaderFieldsTooLargeError extends DefiniteHttpError {}
215+
export class InternalServerError extends DefiniteHttpError {}
216+
export class NotImplementedError extends DefiniteHttpError {}
217+
export class BadGatewayError extends DefiniteHttpError {}
218+
export class ServiceUnavailableError extends DefiniteHttpError {}
219+
export class GatewayTimeoutError extends DefiniteHttpError {}
220+
export class HttpVersionNotSupportedError extends DefiniteHttpError {}
221+
export class VariantAlsoNegotiatesError extends DefiniteHttpError {}
222+
export class InsufficientStorageError extends DefiniteHttpError {}
223+
export class BandwidthLimitExceededError extends DefiniteHttpError {}
224+
export class NotExtendedError extends DefiniteHttpError {}
225+
export class NetworkAuthenticationRequiredError extends DefiniteHttpError {}
226+
export class RestError extends DefiniteHttpError {}
227+
228+
export class PreconditionFailedError extends RestError {}
229+
export class BadDigestError extends RestError {}
230+
export class BadMethodError extends RestError {}
231+
export class InternalError extends RestError {}
232+
export class InvalidArgumentError extends RestError {}
233+
export class InvalidContentError extends RestError {}
234+
export class InvalidCredentialsError extends RestError {}
235+
export class InvalidHeaderError extends RestError {}
236+
export class InvalidVersionError extends RestError {}
237+
export class MissingParameterError extends RestError {}
238+
export class NotAuthorizedError extends RestError {}
239+
export class RequestExpiredError extends RestError {}
240+
export class RequestThrottledError extends RestError {}
241+
export class ResourceNotFoundError extends RestError {}
242+
export class WrongAcceptError extends RestError {}
243+
201244

202245
export function acceptParser(parser: any): RequestHandler;
203246
export function authorizationParser(): RequestHandler;

0 commit comments

Comments
 (0)