@gastonyte/cycle-fetch-driver
Advanced tools
Comparing version 5.1.0 to 5.1.1
@@ -15,6 +15,2 @@ 'use strict'; | ||
var _isFunction = require('lodash/isFunction'); | ||
var _isFunction2 = _interopRequireDefault(_isFunction); | ||
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } | ||
@@ -30,22 +26,19 @@ | ||
var coerceRequest = function coerceRequest(input) { | ||
console.log('coerceRequest', input); | ||
var normalizeRequest = function normalizeRequest(input) { | ||
var request = typeof input === 'string' ? { url: input } : _extends({}, input); | ||
if (!request.key) request.key = getUrl(request); | ||
if (!request.key) { | ||
request.key = getUrl(request); | ||
} | ||
return request; | ||
}; | ||
var filterByKey = function filterByKey(response$, key) { | ||
return response$.filter(function (response) { | ||
return response.request.key === key; | ||
var byKey = function byKey(response$$, key) { | ||
return response$$.filter(function (response$) { | ||
return response$.request.key === key; | ||
}); | ||
}; | ||
// .remember(); | ||
var filterByUrl = function filterByUrl(response$, url) { | ||
return response$.filter(function (response) { | ||
return getUrl(response.request) === url; | ||
var byUrl = function byUrl(response$$, url) { | ||
return response$$.filter(function (response$) { | ||
return getUrl(response$.request) === url; | ||
}); | ||
@@ -59,3 +52,3 @@ }; | ||
fetch = _ref2$fetch === undefined ? global.fetch : _ref2$fetch, | ||
defaultHeaders = _ref2.headers, | ||
headers = _ref2.headers, | ||
defaultOptions = _objectWithoutProperties(_ref2, ['fetch', 'headers']); | ||
@@ -65,80 +58,10 @@ | ||
var response$ = _xstream2.default.createWithMemory({ | ||
start: function start(listener) { | ||
request$.map(coerceRequest).addListener({ | ||
next: function next(request) { | ||
var input = request.input, | ||
url = request.url; | ||
var _request$options = request.options, | ||
options = _request$options === undefined ? {} : _request$options; | ||
options = _extends({}, defaultOptions, options, { | ||
headers: _extends({}, defaultHeaders, options.headers || {}) | ||
}); | ||
console.log('FETCH', options); | ||
fetch(input || url, options).then(function (response) { | ||
response.request = request; | ||
listener.next(response); | ||
}).catch(function (err) { | ||
listener.error(err); | ||
}); | ||
} | ||
}); | ||
}, | ||
stop: function stop() {} | ||
}); | ||
response$.filterByKey = filterByKey.bind(null, response$); | ||
response$.filterByUrl = filterByUrl.bind(null, response$); | ||
return response$; | ||
}; | ||
}; | ||
function normalizeRequest(input) { | ||
var request = typeof input === 'string' ? { url: input } : _extends({}, input); | ||
if (!request.key) { | ||
request.key = getUrl(request); | ||
} | ||
return request; | ||
} | ||
function byKey(response$$, key) { | ||
return response$$.filter(function (response$) { | ||
return response$.request.key === key; | ||
}); | ||
} | ||
function byUrl(response$$, url) { | ||
return response$$.filter(function (response$) { | ||
return getUrl(response$.request) === url; | ||
}); | ||
} | ||
// scheduler option is for testing because Reactive-Extensions/RxJS#976 | ||
var FetchDriver2 = function FetchDriver2() { | ||
var _ref3 = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {}; | ||
var _ref3$fetch = _ref3.fetch, | ||
fetch = _ref3$fetch === undefined ? global.fetch : _ref3$fetch, | ||
headers = _ref3.headers, | ||
defaultOptions = _objectWithoutProperties(_ref3, ['fetch', 'headers']); | ||
return function fetchDriver(request$) { | ||
var response$$ = _xstream2.default.createWithMemory(); | ||
console.log('FetchDriver2()'); | ||
request$.map(normalizeRequest).addListener({ | ||
next: function next(request) { | ||
// const {input, url, init} = request | ||
var input = request.input, | ||
url = request.url; | ||
var _request$options2 = request.options, | ||
options = _request$options2 === undefined ? {} : _request$options2; | ||
var _request$options = request.options, | ||
options = _request$options === undefined ? {} : _request$options; | ||
@@ -149,2 +72,3 @@ | ||
}))); | ||
response$.request = request; | ||
@@ -156,4 +80,6 @@ response$$.shamefullySendNext(response$); | ||
}); | ||
response$$.byKey = byKey.bind(null, response$$); | ||
response$$.byUrl = byUrl.bind(null, response$$); | ||
return response$$; | ||
@@ -163,3 +89,2 @@ }; | ||
// export default FetchDriver; | ||
exports.default = FetchDriver2; | ||
exports.default = FetchDriver; |
{ | ||
"name": "@gastonyte/cycle-fetch-driver", | ||
"version": "5.1.0", | ||
"version": "5.1.1", | ||
"description": "A Cycle.js Driver for making HTTP requests through fetch", | ||
@@ -5,0 +5,0 @@ "main": "lib/driver.js", |
Sorry, the diff of this file is not supported yet
2
174817
111