wassname/DefinitelyTyped
1
0
Fork 0
mirror of https://github.com/wassname/DefinitelyTyped.git synced 2026-08-26 11:12:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3955 from muhbaasu/master

Browse Source 
Fix axios definitions by removing enums and config generic
This commit is contained in:
Masahiro Wakame
2015-03-29 22:23:19 +09:00
parent 2979a4710a 1e6120577b
commit 24d1301b77
2 changed files with 23 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
axios/axios-tests.ts
+9 -14
View File
@@ -1,23 +1,18 @@
/// <reference path="axios.d.ts" />
interface InputBody {
random: number;
}
enum HttpMethod { GET, PUT, POST, DELETE, CONNECT, HEAD, OPTIONS, TRACE, PATCH }
enum ResponseType { arraybuffer, blob, document, json, text }
interface Repository {
id: number;
name: string;
}
function convenientGet () {
axios.get<Repository, InputBody>("https://api.github.com/repos/mzabriskie/axios")
.then(r => console.log(r.config.data.random));
}
axios.get<Repository>("https://api.github.com/repos/mzabriskie/axios")
.then(r => console.log(r.config.method));
function get() {
axios<Repository, any>({
url: "https://api.github.com/repos/mzabriskie/axios",
method: Axios.HTTPMethod.GET,
headers: {},
}).then(r => console.log("ID:" + r.data.id + " Name: " + r.data.name));
}
axios<Repository>({
url: "https://api.github.com/repos/mzabriskie/axios",
method: HttpMethod[HttpMethod.GET],
headers: {},
}).then(r => console.log("ID:" + r.data.id + " Name: " + r.data.name));
axios/axios.d.ts
Vendored
+14 -15
View File
@@ -6,8 +6,6 @@
/// <reference path="../es6-promise/es6-promise.d.ts"/>
declare module Axios {
export enum HTTPMethod { GET, PUT, POST, DELETE, CONNECT, HEAD, OPTIONS, TRACE, PATCH }
export enum ResponseType { arraybuffer, blob, document, json, text }
/**
* <T> - request body data type
@@ -46,7 +44,7 @@ declare module Axios {
* indicates the type of data that the server will respond with
* options are 'arraybuffer', 'blob', 'document', 'json', 'text'
*/
responseType?: Axios.ResponseType;
responseType?: string;
/**
* name of the cookie to use as a value for xsrf token
@@ -65,14 +63,15 @@ declare module Axios {
*/
interface AxiosXHRConfig<T> extends AxiosXHRConfigBase<T> {
/**
* server URL that will be used for the request
* server URL that will be used for the request, options are:
* GET, PUT, POST, DELETE, CONNECT, HEAD, OPTIONS, TRACE, PATCH
*/
url: string;
/**
* request method to be used when making the request
*/
method?: Axios.HTTPMethod;
method?: string;
/**
* data to be sent as the request body
@@ -86,7 +85,7 @@ declare module Axios {
* <T> - expected response type,
* <U> - request body data type
*/
interface AxiosXHR<T, U> {
interface AxiosXHR<T> {
/**
* Response that was provided by the server
*/
@@ -110,7 +109,7 @@ declare module Axios {
/**
* config that was provided to `axios` for the request
*/
config: AxiosXHRConfig<U>;
config: AxiosXHRConfig<T>;
}
/**
@@ -119,40 +118,40 @@ declare module Axios {
*/
interface AxiosStatic {
<T, U>(config: AxiosXHRConfig<U>): Promise<AxiosXHR<T, U>>;
<T>(config: AxiosXHRConfig<T>): Promise<AxiosXHR<T>>;
new <T, U>(config: AxiosXHRConfig<U>): Promise<AxiosXHR<T, U>>;
new <T>(config: AxiosXHRConfig<T>): Promise<AxiosXHR<T>>;
/**
* convenience alias, method = GET
*/
get<T, U>(url: string, config?: AxiosXHRConfigBase<U>): Promise<AxiosXHR<T, U>>;
get<T>(url: string, config?: AxiosXHRConfigBase<T>): Promise<AxiosXHR<T>>;
/**
* convenience alias, method = DELETE
*/
delete<T, U>(url: string, config?: AxiosXHRConfigBase<U>): Promise<AxiosXHR<T, U>>;
delete<T>(url: string, config?: AxiosXHRConfigBase<T>): Promise<AxiosXHR<T>>;
/**
* convenience alias, method = HEAD
*/
head<T, U>(url: string, config?: AxiosXHRConfigBase<U>): Promise<AxiosXHR<T, U>>;
head<T>(url: string, config?: AxiosXHRConfigBase<T>): Promise<AxiosXHR<T>>;
/**
* convenience alias, method = POST
*/
post<T, U>(url: string, data?: any, config?: AxiosXHRConfigBase<U>): Promise<AxiosXHR<T, U>>;
post<T>(url: string, data?: any, config?: AxiosXHRConfigBase<T>): Promise<AxiosXHR<T>>;
/**
* convenience alias, method = PUT
*/
put<T, U>(url: string, data?: any, config?: AxiosXHRConfigBase<U>): Promise<AxiosXHR<T, U>>;
put<T>(url: string, data?: any, config?: AxiosXHRConfigBase<T>): Promise<AxiosXHR<T>>;
/**
* convenience alias, method = PATCH
*/
patch<T, U>(url: string, data?: any, config?: AxiosXHRConfigBase<U>): Promise<AxiosXHR<T, U>>;
patch<T>(url: string, data?: any, config?: AxiosXHRConfigBase<T>): Promise<AxiosXHR<T>>;
}
}