0.2.3

calmm-js · Aug 10, 2018 · e6d9f77 · e6d9f77
1 parent 884f9c6
commit e6d9f77
Show file tree

Hide file tree

Showing 6 changed files with 60 additions and 9 deletions.
diff --git a/dist/karet.xhr.cjs.js b/dist/karet.xhr.cjs.js
@@ -110,7 +110,10 @@ var performPlain = /*#__PURE__*/(process.env.NODE_ENV === 'production' ? I.id :
       end(emit(state = L.set(EVENT, event, state)));
     });
     xhr.open(method, url, true, user, password);
-    if (responseType) xhr.responseType = responseType;
+    if (responseType) {
+      xhr.responseType = responseType;
+      if (responseType === 'json' && xhr.responseType !== 'json') state = L.set('parse', true, state);
+    }
     if (timeout) xhr.timeout = timeout;
     if (withCredentials) xhr.withCredentials = withCredentials;
     if (null != headers) {
@@ -144,6 +147,14 @@ function perform(argsIn) {
   return (isObservable(args) ? args.flatMapLatest(performPlain) : performPlain(args)).toProperty();
 }
 
+function tryParse(json) {
+  try {
+    return JSON.parse(json);
+  } catch (_) {
+    return null;
+  }
+}
+
 var isOneOf = /*#__PURE__*/I.curry(function (values, value) {
   return values.includes(value);
 });
@@ -195,7 +206,13 @@ var headersReceived = /*#__PURE__*/I.defineNameU( /*#__PURE__*/L.get([XHR, 'read
   return 2 <= state;
 }]), 'headersReceived');
 var isDone = /*#__PURE__*/I.defineNameU( /*#__PURE__*/L.get([EVENT, 'type', /*#__PURE__*/L.is('loadend')]), 'isDone');
-var response = /*#__PURE__*/setName( /*#__PURE__*/I.pipe2U( /*#__PURE__*/L.get([XHR, 'response']), /*#__PURE__*/skipDuplicates(I.acyclicEqualsU)), 'response');
+var response = /*#__PURE__*/setName( /*#__PURE__*/I.pipe2U( /*#__PURE__*/F.lift(function (_ref3) {
+  var xhr = _ref3.xhr,
+      parse = _ref3.parse;
+
+  var response = xhr.response;
+  return parse ? tryParse(response) : response;
+}), /*#__PURE__*/skipDuplicates(I.acyclicEqualsU)), 'response');
 var responseFull = /*#__PURE__*/setName( /*#__PURE__*/getAfter(isDone, response), 'responseFull');
 var responseType = /*#__PURE__*/setName( /*#__PURE__*/L.get([XHR, 'responseType']), 'responseType');
 var responseURL = /*#__PURE__*/setName( /*#__PURE__*/L.get([XHR, 'responseURL']), 'responseURL');

diff --git a/dist/karet.xhr.es.js b/dist/karet.xhr.es.js
@@ -106,7 +106,10 @@ var performPlain = /*#__PURE__*/(process.env.NODE_ENV === 'production' ? id : va
       end(emit(state = set(EVENT, event, state)));
     });
     xhr.open(method, url, true, user, password);
-    if (responseType) xhr.responseType = responseType;
+    if (responseType) {
+      xhr.responseType = responseType;
+      if (responseType === 'json' && xhr.responseType !== 'json') state = set('parse', true, state);
+    }
     if (timeout) xhr.timeout = timeout;
     if (withCredentials) xhr.withCredentials = withCredentials;
     if (null != headers) {
@@ -140,6 +143,14 @@ function perform(argsIn) {
   return (isObservable(args) ? args.flatMapLatest(performPlain) : performPlain(args)).toProperty();
 }
 
+function tryParse(json) {
+  try {
+    return JSON.parse(json);
+  } catch (_) {
+    return null;
+  }
+}
+
 var isOneOf = /*#__PURE__*/curry(function (values, value) {
   return values.includes(value);
 });
@@ -191,7 +202,13 @@ var headersReceived = /*#__PURE__*/defineNameU( /*#__PURE__*/get([XHR, 'readySta
   return 2 <= state;
 }]), 'headersReceived');
 var isDone = /*#__PURE__*/defineNameU( /*#__PURE__*/get([EVENT, 'type', /*#__PURE__*/is('loadend')]), 'isDone');
-var response = /*#__PURE__*/setName( /*#__PURE__*/pipe2U( /*#__PURE__*/get([XHR, 'response']), /*#__PURE__*/skipDuplicates(acyclicEqualsU)), 'response');
+var response = /*#__PURE__*/setName( /*#__PURE__*/pipe2U( /*#__PURE__*/lift(function (_ref3) {
+  var xhr = _ref3.xhr,
+      parse = _ref3.parse;
+
+  var response = xhr.response;
+  return parse ? tryParse(response) : response;
+}), /*#__PURE__*/skipDuplicates(acyclicEqualsU)), 'response');
 var responseFull = /*#__PURE__*/setName( /*#__PURE__*/getAfter(isDone, response), 'responseFull');
 var responseType = /*#__PURE__*/setName( /*#__PURE__*/get([XHR, 'responseType']), 'responseType');
 var responseURL = /*#__PURE__*/setName( /*#__PURE__*/get([XHR, 'responseURL']), 'responseURL');

diff --git a/dist/karet.xhr.js b/dist/karet.xhr.js
@@ -102,7 +102,10 @@
         end(emit(state = L.set(EVENT, event, state)));
       });
       xhr.open(method, url, true, user, password);
-      if (responseType) xhr.responseType = responseType;
+      if (responseType) {
+        xhr.responseType = responseType;
+        if (responseType === 'json' && xhr.responseType !== 'json') state = L.set('parse', true, state);
+      }
       if (timeout) xhr.timeout = timeout;
       if (withCredentials) xhr.withCredentials = withCredentials;
       if (null != headers) {
@@ -136,6 +139,14 @@
     return (isObservable(args) ? args.flatMapLatest(performPlain) : performPlain(args)).toProperty();
   }
 
+  function tryParse(json) {
+    try {
+      return JSON.parse(json);
+    } catch (_) {
+      return null;
+    }
+  }
+
   var isOneOf = /*#__PURE__*/I.curry(function (values, value) {
     return values.includes(value);
   });
@@ -187,7 +198,13 @@
     return 2 <= state;
   }]), 'headersReceived');
   var isDone = /*#__PURE__*/I.defineNameU( /*#__PURE__*/L.get([EVENT, 'type', /*#__PURE__*/L.is('loadend')]), 'isDone');
-  var response = /*#__PURE__*/setName( /*#__PURE__*/I.pipe2U( /*#__PURE__*/L.get([XHR, 'response']), /*#__PURE__*/skipDuplicates(I.acyclicEqualsU)), 'response');
+  var response = /*#__PURE__*/setName( /*#__PURE__*/I.pipe2U( /*#__PURE__*/F.lift(function (_ref3) {
+    var xhr = _ref3.xhr,
+        parse = _ref3.parse;
+
+    var response = xhr.response;
+    return parse ? tryParse(response) : response;
+  }), /*#__PURE__*/skipDuplicates(I.acyclicEqualsU)), 'response');
   var responseFull = /*#__PURE__*/setName( /*#__PURE__*/getAfter(isDone, response), 'responseFull');
   var responseType = /*#__PURE__*/setName( /*#__PURE__*/L.get([XHR, 'responseType']), 'responseType');
   var responseURL = /*#__PURE__*/setName( /*#__PURE__*/L.get([XHR, 'responseURL']), 'responseURL');

diff --git a/dist/karet.xhr.min.js b/dist/karet.xhr.min.js
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "karet.xhr",
-  "version": "0.2.3-0",
+  "version": "0.2.3",
   "description": "An observable wrapper for XMLHttpRequest using Kefir",
   "module": "dist/karet.xhr.es.js",
   "main": "dist/karet.xhr.cjs.js",