refactor to remove intermediary function and shave some bytes, add more tests

Author: developit

src/index.js

@@ -18,7 +18,7 @@
  * @property {'get'|'post'|'put'|'patch'|'delete'|'options'|'head'|'GET'|'POST'|'PUT'|'PATCH'|'DELETE'|'OPTIONS'|'HEAD'} [method="get"] HTTP method, case-insensitive
  * @property {Headers} [headers] Request headers
  * @property {FormData|string|object} [body] a body, optionally encoded, to send
- * @property {'text'|'json'|'stream'|'blob'|'arrayBuffer'|'formData'|'stream'} [responseType="text"] An encoding to use for the response
+ * @property {'text'|'json'|'stream'|'blob'|'arrayBuffer'|'formData'|'stream'} [responseType="json"] An encoding to use for the response
  * @property {Record<string,any>|URLSearchParams} [params] querystring parameters
  * @property {(params: Options['params']) => string} [paramsSerializer] custom function to stringify querystring parameters
  * @property {boolean} [withCredentials] Send the request with credentials like cookies
@@ -135,19 +135,6 @@ export default (function create(/** @type {Options} */ defaults) {
 		return out;
 	}
 
-	/**
-	 * @private
-	 */
-	function transformResponse(data) {
-		if (typeof data === 'string') {
-			try {
-				data = JSON.parse(data);
-			}
-			catch (e) {}
-		}
-		return data;
-	}
-
 	/**
 	 * Issues a request.
 	 * @public
@@ -221,10 +208,15 @@ export default (function create(/** @type {Options} */ defaults) {
 				response.data = res.body;
 				return response;
 			}
-			return res[options.responseType || 'text']().then((data) => {
-				response.data = transformResponse(data);
-				return response;
-			});
+
+			return res[options.responseType || 'text']()
+				.then((data) => {
+					response.data = data;
+					// its okay if this fails: response.data will be the unparsed value:
+					response.data = JSON.parse(data);
+				})
+				.catch(Object)
+				.then(() => response);
 		});
 	}
 
@@ -234,6 +226,12 @@ export default (function create(/** @type {Options} */ defaults) {
 	 */
 	redaxios.CancelToken = /** @type {any} */ (typeof AbortController == 'function' ? AbortController : Object);
 
+	/**
+	 * @public
+	 * @type {Options}
+	 */
+	redaxios.defaults = defaults;
+
 	/**
 	 * @public
 	 */

test/index.test.js

@@ -40,15 +40,33 @@ describe('redaxios', () => {
 		expect(res.data).toEqual('some example content');
 	});
 
-	it('should request JSON', async () => {
-		const req = axios.get(jsonExample, {
-			responseType: 'json'
+	describe('responseType', () => {
+		it('should default to JSON', async () => {
+			const res = await axios.get(jsonExample);
+			expect(res.data).toEqual({ hello: 'world' });
+		});
+
+		it('should force JSON for responseType:json', async () => {
+			const res = await axios.get(jsonExample, {
+				responseType: 'json'
+			});
+			expect(res.data).toEqual({ hello: 'world' });
+		});
+
+		it('should fall back to null for failed JSON parse', async () => {
+			const res = await axios.get(textExample, {
+				responseType: 'json'
+			});
+			expect(res.data).toEqual(undefined);
+		});
+
+		it('should still parse JSON when responseType:text', async () => {
+			// this is just how axios works
+			const res = await axios.get(jsonExample, {
+				responseType: 'text'
+			});
+			expect(res.data).toEqual({ hello: 'world' });
 		});
-		expect(req).toBeInstanceOf(Promise);
-		const res = await req;
-		expect(res).toBeInstanceOf(Object);
-		expect(res.status).toEqual(200);
-		expect(res.data).toEqual({ hello: 'world' });
 	});
 
 	it('response should be parsed json', async () => {
@@ -227,7 +245,7 @@ describe('redaxios', () => {
 		const res = await req;
 		expect(res).toBeInstanceOf(Object);
 		expect(res.status).toEqual(200);
-		expect(JSON.parse(res.data)).toEqual({ hello: 'world' });
+		expect(res.data).toEqual({ hello: 'world' });
 	});
 
 	it('should support params and paramsSerializer options', async () => {