Merge pull request #123 from nickuraltsev/master

Make axios instantiable

axios.d.ts

@@ -6,18 +6,26 @@
 declare var axios: axios.AxiosStatic
 
 declare module axios {
-  interface AxiosStatic {
-    (options: axios.RequestOptions): axios.Promise;
+  interface AxiosRequestMethods {
     get(url: string, config?: any): axios.Promise;
     delete(url: string, config?: any): axios.Promise;
     head(url: string, config?: any): axios.Promise;
     post(url: string, data: any, config?: any): axios.Promise;
     put(url: string, data: any, config?: any): axios.Promise;
     patch(url: string, data: any, config?: any): axios.Promise;
+  }
+
+  interface AxiosStatic extends AxiosRequestMethods {
+    (options: axios.RequestOptions): axios.Promise;
+    create(defaultOptions?: axios.InstanceOptions): AxiosInstance;
     all(iterable: any): axios.Promise;
     spread(callback: any): axios.Promise;
   }
-  
+
+  interface AxiosInstance extends AxiosRequestMethods  {
+    request(options: axios.RequestOptions): axios.Promise;
+  }
+
   interface Response {
     data?: any;
     status?: number;
@@ -31,18 +39,23 @@ declare module axios {
     catch(onRejected:(response: axios.Response) => void): axios.Promise;
   }
 
-  interface RequestOptions {
-    url: string;
-    method?: string;
+  interface InstanceOptions {
     transformRequest?: (data: any) => any;
+    transformResponse?: (data: any) => any;
     headers?: any;
-    params?: any;
-    data?: any;
+    timeout?: number;
     withCredentials?: boolean;
     responseType?: string;
     xsrfCookieName?: string;
     xsrfHeaderName?: string;
   }
+
+  interface RequestOptions extends InstanceOptions {
+    url: string;
+    method?: string;
+    params?: any;
+    data?: any;
+  }
 }
 
 declare module "axios" {

lib/axios.js

@@ -5,7 +5,21 @@ var utils = require('./utils');
 var dispatchRequest = require('./core/dispatchRequest');
 var InterceptorManager = require('./core/InterceptorManager');
 
-var axios = module.exports = function (config) {
+function Axios (defaultConfig) {
+  this.defaultConfig = utils.merge({
+    headers: {},
+    timeout: defaults.timeout,
+    transformRequest: defaults.transformRequest,
+    transformResponse: defaults.transformResponse
+  }, defaultConfig);
+
+  this.interceptors = {
+    request: new InterceptorManager(),
+    response: new InterceptorManager()
+  };
+}
+
+Axios.prototype.request = function (config) {
   // Allow for axios('example/url'[, config]) a la fetch API
   if (typeof config === 'string') {
     config = utils.merge({
@@ -13,13 +27,7 @@ var axios = module.exports = function (config) {
     }, arguments[1]);
   }
 
-  config = utils.merge({
-    method: 'get',
-    headers: {},
-    timeout: defaults.timeout,
-    transformRequest: defaults.transformRequest,
-    transformResponse: defaults.transformResponse
-  }, config);
+  config = utils.merge(this.defaultConfig, { method: 'get' }, config);
 
   // Don't allow overriding defaults.withCredentials
   config.withCredentials = config.withCredentials || defaults.withCredentials;
@@ -28,11 +36,11 @@ var axios = module.exports = function (config) {
   var chain = [dispatchRequest, undefined];
   var promise = Promise.resolve(config);
 
-  axios.interceptors.request.forEach(function (interceptor) {
+  this.interceptors.request.forEach(function (interceptor) {
     chain.unshift(interceptor.fulfilled, interceptor.rejected);
   });
 
-  axios.interceptors.response.forEach(function (interceptor) {
+  this.interceptors.response.forEach(function (interceptor) {
     chain.push(interceptor.fulfilled, interceptor.rejected);
   });
 
@@ -43,6 +51,14 @@ var axios = module.exports = function (config) {
   return promise;
 };
 
+var defaultInstance = new Axios();
+
+var axios = module.exports = bind(Axios.prototype.request, defaultInstance);
+
+axios.create = function (defaultConfig) {
+  return new Axios(defaultConfig);
+};
+
 // Expose defaults
 axios.defaults = defaults;
 
@@ -53,36 +69,42 @@ axios.all = function (promises) {
 axios.spread = require('./helpers/spread');
 
 // Expose interceptors
-axios.interceptors = {
-  request: new InterceptorManager(),
-  response: new InterceptorManager()
-};
+axios.interceptors = defaultInstance.interceptors;
 
 // Provide aliases for supported request methods
 (function () {
   function createShortMethods() {
     utils.forEach(arguments, function (method) {
-      axios[method] = function (url, config) {
-        return axios(utils.merge(config || {}, {
+      Axios.prototype[method] = function (url, config) {
+        return this.request(utils.merge(config || {}, {
           method: method,
           url: url
         }));
       };
+      axios[method] = bind(Axios.prototype[method], defaultInstance);
     });
   }
 
   function createShortMethodsWithData() {
     utils.forEach(arguments, function (method) {
-      axios[method] = function (url, data, config) {
-        return axios(utils.merge(config || {}, {
+      Axios.prototype[method] = function (url, data, config) {
+        return this.request(utils.merge(config || {}, {
           method: method,
           url: url,
           data: data
         }));
       };
+      axios[method] = bind(Axios.prototype[method], defaultInstance);
     });
   }
 
   createShortMethods('delete', 'get', 'head');
   createShortMethodsWithData('post', 'put', 'patch');
 })();
+
+// Helpers
+function bind (fn, thisArg) {
+  return function () {
+    return fn.apply(thisArg, Array.prototype.slice.call(arguments));
+  };
+}

test/specs/api.spec.js

 var axios = require('../../index');
 
-describe('api', function () {
+describe('static api', function () {
   it('should have request method helpers', function () {
     expect(typeof axios.get).toEqual('function');
     expect(typeof axios.head).toEqual('function');
@@ -22,8 +22,36 @@ describe('api', function () {
     expect(typeof axios.defaults.headers).toEqual('object');
   });
 
+  it('should have interceptors', function () {
+    expect(typeof axios.interceptors.request).toEqual('object');
+    expect(typeof axios.interceptors.response).toEqual('object');
+  });
+
   it('should have all/spread helpers', function () {
     expect(typeof axios.all).toEqual('function');
     expect(typeof axios.spread).toEqual('function');
   });
+
+  it('should have factory method', function () {
+    expect(typeof axios.create).toEqual('function');
+  });
+});
+
+describe('instance api', function () {
+  var instance = axios.create();
+
+  it('should have request methods', function () {
+    expect(typeof instance.request).toEqual('function');
+    expect(typeof instance.get).toEqual('function');
+    expect(typeof instance.head).toEqual('function');
+    expect(typeof instance.delete).toEqual('function');
+    expect(typeof instance.post).toEqual('function');
+    expect(typeof instance.put).toEqual('function');
+    expect(typeof instance.patch).toEqual('function');
+  });
+
+  it('should have interceptors', function () {
+    expect(typeof instance.interceptors.request).toEqual('object');
+    expect(typeof instance.interceptors.response).toEqual('object');
+  });
 });

test/specs/instance.spec.js

+var axios = require('../../index');
+
+describe('instance', function () {
+  beforeEach(function () {
+    jasmine.Ajax.install();
+  });
+
+  afterEach(function () {
+    jasmine.Ajax.uninstall();
+  });
+
+  it('should make an http request', function (done) {
+    var instance = axios.create();
+
+    instance.request({
+      url: '/foo'
+    });
+
+    setTimeout(function () {
+      request = jasmine.Ajax.requests.mostRecent();
+
+      expect(request.url).toBe('/foo');
+      done();
+    }, 0);
+  });
+
+  it('should use instance options', function (done) {
+    var instance = axios.create({ timeout: 1000 });
+
+    instance.request({
+      url: '/foo'
+    });
+
+    setTimeout(function () {
+      request = jasmine.Ajax.requests.mostRecent();
+
+      expect(request.timeout).toBe(1000);
+      done();
+    }, 0);
+  });
+});

test/typescript/axios.ts

@@ -4,11 +4,11 @@ import axios = require('axios');
 
 axios.get('/user?ID=12345')
   .then(function (response) {
-      console.log(response);
-    })
+    console.log(response);
+  })
   .catch(function (response) {
-      console.log(response);
-    });
+    console.log(response);
+  });
 
 axios.get('/user', {
     params: {
@@ -96,16 +96,64 @@ axios({
 });
 
 axios({
-    url: "hi",
-    headers: {'X-Requested-With': 'XMLHttpRequest'},
+  url: "hi",
+  headers: {'X-Requested-With': 'XMLHttpRequest'},
+  params: {
+    ID: 12345
+  },
+  data: {
+    firstName: 'Fred'
+  },
+  withCredentials: false, // default
+  responseType: 'json', // default
+  xsrfCookieName: 'XSRF-TOKEN', // default
+  xsrfHeaderName: 'X-XSRF-TOKEN' // default
+});
+
+var instance = axios.create();
+
+axios.create({
+  transformRequest: (data) => {
+    return data.doSomething();
+  },
+  transformResponse: (data) => {
+    return data.doSomethingElse();
+  },
+  headers: {'X-Requested-With': 'XMLHttpRequest'},
+  timeout: 1000,
+  withCredentials: false, // default
+  responseType: 'json', // default
+  xsrfCookieName: 'XSRF-TOKEN', // default
+  xsrfHeaderName: 'X-XSRF-TOKEN' // default
+});
+
+instance.request({
+    method: 'get',
+    url: '/user/12345'
+  })
+  .then(function (response) {
+    console.log(response);
+  })
+  .catch(function (response) {
+    console.log(response);
+  });
+
+instance.get('/user?ID=12345')
+  .then(function (response) {
+    console.log(response);
+  })
+  .catch(function (response) {
+    console.log(response);
+  });
+
+instance.get('/user', {
     params: {
       ID: 12345
-    },
-    data: {
-      firstName: 'Fred'
-    },
-    withCredentials: false, // default
-    responseType: 'json', // default
-    xsrfCookieName: 'XSRF-TOKEN', // default
-    xsrfHeaderName: 'X-XSRF-TOKEN' // default
-});
+    }
+  })
+  .then(function (response) {
+    console.log(response);
+  })
+  .catch(function (response) {
+    console.log(response);
+  });