[request] fix DefaultUriUrlRequestApi

This commit is contained in:
e020873
2017-06-15 09:38:48 +02:00
parent dea10c7a6d
commit 8455c29f95
2 changed files with 79 additions and 11 deletions

View File

@@ -68,13 +68,42 @@ declare namespace request {
TUriUrlOptions> extends RequestAPI<TRequest, TOptions, TUriUrlOptions> {
defaults(options: TOptions): DefaultUriUrlRequestApi<TRequest, TOptions, OptionalUriUrl>;
(): TRequest;
get(): TRequest;
post(): TRequest;
put(): TRequest;
head(): TRequest;
patch(): TRequest;
del(): TRequest;
(callback?: RequestCallback): TRequest;
get(uri: string, options?: TOptions, callback?: RequestCallback): TRequest;
get(uri: string, callback?: RequestCallback): TRequest;
get(options: TUriUrlOptions & TOptions, callback?: RequestCallback): TRequest;
get(callback?: RequestCallback): TRequest;
post(uri: string, options?: TOptions, callback?: RequestCallback): TRequest;
post(uri: string, callback?: RequestCallback): TRequest;
post(options: TUriUrlOptions & TOptions, callback?: RequestCallback): TRequest;
post(callback?: RequestCallback): TRequest;
put(uri: string, options?: TOptions, callback?: RequestCallback): TRequest;
put(uri: string, callback?: RequestCallback): TRequest;
put(options: TUriUrlOptions & TOptions, callback?: RequestCallback): TRequest;
put(callback?: RequestCallback): TRequest;
head(uri: string, options?: TOptions, callback?: RequestCallback): TRequest;
head(uri: string, callback?: RequestCallback): TRequest;
head(options: TUriUrlOptions & TOptions, callback?: RequestCallback): TRequest;
head(callback?: RequestCallback): TRequest;
patch(uri: string, options?: TOptions, callback?: RequestCallback): TRequest;
patch(uri: string, callback?: RequestCallback): TRequest;
patch(options: TUriUrlOptions & TOptions, callback?: RequestCallback): TRequest;
patch(callback?: RequestCallback): TRequest;
del(uri: string, options?: TOptions, callback?: RequestCallback): TRequest;
del(uri: string, callback?: RequestCallback): TRequest;
del(options: TUriUrlOptions & TOptions, callback?: RequestCallback): TRequest;
del(callback?: RequestCallback): TRequest;
delete(uri: string, options?: TOptions, callback?: RequestCallback): TRequest;
delete(uri: string, callback?: RequestCallback): TRequest;
delete(options: TUriUrlOptions & TOptions, callback?: RequestCallback): TRequest;
delete(callback?: RequestCallback): TRequest;
}
interface CoreOptions {
@@ -130,10 +159,7 @@ declare namespace request {
}
export type RequiredUriUrl = UriOptions | UrlOptions;
interface OptionalUriUrl {
uri?: string | Url;
url?: string | Url;
}
export type OptionalUriUrl = RequiredUriUrl | {};
export type OptionsWithUri = UriOptions & CoreOptions;
export type OptionsWithUrl = UrlOptions & CoreOptions;

View File

@@ -693,3 +693,45 @@ request.get({
request.get({
uri: urlModule.parse('http://example.com')
});
var requestWithOptionalUri = request.defaults({ uri: 'http://example.com' });
requestWithOptionalUri();
requestWithOptionalUri({});
requestWithOptionalUri({ uri: 'http://example.com' });
requestWithOptionalUri({ uri: urlModule.parse('http://example.com') });
requestWithOptionalUri({ url: 'http://example.com' });
requestWithOptionalUri({ url: urlModule.parse('http://example.com') });
requestWithOptionalUri('http://example.com');
requestWithOptionalUri(function() {});
requestWithOptionalUri.get();
requestWithOptionalUri.get(function() {});
requestWithOptionalUri.get('http://example.com');
requestWithOptionalUri.get({});
requestWithOptionalUri.get({
url: 'http://example.com'
});
requestWithOptionalUri.get({
uri: 'http://example.com'
});
requestWithOptionalUri.get({
url: urlModule.parse('http://example.com')
});
requestWithOptionalUri.get({
uri: urlModule.parse('http://example.com')
});