wappsto-blanket
Advanced tools
Comparing version 2.4.0 to 2.4.1
@@ -20,2 +20,4 @@ "use strict"; | ||
var _useMounted = _interopRequireDefault(require("./useMounted")); | ||
var _util = require("../util"); | ||
@@ -67,3 +69,3 @@ | ||
var cancelFunc = (0, _react.useRef)(); | ||
var unmounted = (0, _react.useRef)(false); | ||
var isMounted = (0, _useMounted["default"])(); | ||
@@ -75,2 +77,5 @@ var setCurrentStatus = function setCurrentStatus(currentStatus) { | ||
(0, _react.useEffect)(function () { | ||
cache = {}; | ||
}, []); | ||
var getLogs = (0, _react.useCallback)( /*#__PURE__*/function () { | ||
@@ -120,3 +125,3 @@ var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(options) { | ||
if (!(cachedStatus.current === _util.STATUS.IDLE)) { | ||
_context.next = 48; | ||
_context.next = 50; | ||
break; | ||
@@ -133,4 +138,4 @@ } | ||
case 18: | ||
if (!(more && !isCanceled.current && (cacheId || !cacheId && !unmounted.current))) { | ||
_context.next = 33; | ||
if (!(more && !isCanceled.current && (cacheId || !cacheId && isMounted.current))) { | ||
_context.next = 35; | ||
break; | ||
@@ -146,3 +151,3 @@ } | ||
controller = new AbortController(); | ||
cancelFunc.current = controller.abort; | ||
cancelFunc.current = controller.abort.bind(controller); | ||
/* eslint-disable-next-line no-await-in-loop */ | ||
@@ -165,3 +170,3 @@ | ||
if (!(!result.ok || !result.json)) { | ||
if (!isCanceled.current) { | ||
_context.next = 29; | ||
@@ -171,5 +176,13 @@ break; | ||
return _context.abrupt("return"); | ||
case 29: | ||
if (!(!result.ok || !result.json)) { | ||
_context.next = 31; | ||
break; | ||
} | ||
throw new Error('error'); | ||
case 29: | ||
case 31: | ||
cachedData.current = cachedData.current.concat(result.json.data); | ||
@@ -180,3 +193,3 @@ more = result.json.more && (!cOptions.limit || result.json.length < cOptions.limit); | ||
case 33: | ||
case 35: | ||
if (cacheId) { | ||
@@ -190,4 +203,4 @@ cache[cacheId] = { | ||
if (!unmounted.current) { | ||
_context.next = 36; | ||
if (isMounted.current) { | ||
_context.next = 38; | ||
break; | ||
@@ -198,3 +211,3 @@ } | ||
case 36: | ||
case 38: | ||
if (!isCanceled.current) { | ||
@@ -205,7 +218,7 @@ setData(cachedData.current); | ||
setCurrentStatus(_util.STATUS.SUCCESS); | ||
_context.next = 48; | ||
_context.next = 50; | ||
break; | ||
case 40: | ||
_context.prev = 40; | ||
case 42: | ||
_context.prev = 42; | ||
_context.t0 = _context["catch"](17); | ||
@@ -222,4 +235,4 @@ cancelFunc.current = null; | ||
if (!unmounted.current) { | ||
_context.next = 46; | ||
if (isMounted.current) { | ||
_context.next = 48; | ||
break; | ||
@@ -230,3 +243,3 @@ } | ||
case 46: | ||
case 48: | ||
if (!isCanceled.current) { | ||
@@ -238,3 +251,3 @@ setData(cachedData.current); | ||
case 48: | ||
case 50: | ||
case "end": | ||
@@ -244,3 +257,3 @@ return _context.stop(); | ||
} | ||
}, _callee, null, [[17, 40]]); | ||
}, _callee, null, [[17, 42]]); | ||
})); | ||
@@ -251,8 +264,3 @@ | ||
}; | ||
}(), [cacheId, dispatch, sessionId, stateId]); | ||
(0, _react.useEffect)(function () { | ||
return function () { | ||
unmounted.current = true; | ||
}; | ||
}, []); | ||
}(), [cacheId, dispatch, sessionId, stateId, isMounted]); | ||
var cancel = (0, _react.useCallback)(function () { | ||
@@ -259,0 +267,0 @@ if (cancelFunc.current) { |
@@ -16,4 +16,8 @@ "use strict"; | ||
var _useMounted = _interopRequireDefault(require("./useMounted")); | ||
var _util = require("../util"); | ||
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; } | ||
function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return exports; }; var exports = {}, Op = Object.prototype, hasOwn = Op.hasOwnProperty, $Symbol = "function" == typeof Symbol ? Symbol : {}, iteratorSymbol = $Symbol.iterator || "@@iterator", asyncIteratorSymbol = $Symbol.asyncIterator || "@@asyncIterator", toStringTagSymbol = $Symbol.toStringTag || "@@toStringTag"; function define(obj, key, value) { return Object.defineProperty(obj, key, { value: value, enumerable: !0, configurable: !0, writable: !0 }), obj[key]; } try { define({}, ""); } catch (err) { define = function define(obj, key, value) { return obj[key] = value; }; } function wrap(innerFn, outerFn, self, tryLocsList) { var protoGenerator = outerFn && outerFn.prototype instanceof Generator ? outerFn : Generator, generator = Object.create(protoGenerator.prototype), context = new Context(tryLocsList || []); return generator._invoke = function (innerFn, self, context) { var state = "suspendedStart"; return function (method, arg) { if ("executing" === state) throw new Error("Generator is already running"); if ("completed" === state) { if ("throw" === method) throw arg; return doneResult(); } for (context.method = method, context.arg = arg;;) { var delegate = context.delegate; if (delegate) { var delegateResult = maybeInvokeDelegate(delegate, context); if (delegateResult) { if (delegateResult === ContinueSentinel) continue; return delegateResult; } } if ("next" === context.method) context.sent = context._sent = context.arg;else if ("throw" === context.method) { if ("suspendedStart" === state) throw state = "completed", context.arg; context.dispatchException(context.arg); } else "return" === context.method && context.abrupt("return", context.arg); state = "executing"; var record = tryCatch(innerFn, self, context); if ("normal" === record.type) { if (state = context.done ? "completed" : "suspendedYield", record.arg === ContinueSentinel) continue; return { value: record.arg, done: context.done }; } "throw" === record.type && (state = "completed", context.method = "throw", context.arg = record.arg); } }; }(innerFn, self, context), generator; } function tryCatch(fn, obj, arg) { try { return { type: "normal", arg: fn.call(obj, arg) }; } catch (err) { return { type: "throw", arg: err }; } } exports.wrap = wrap; var ContinueSentinel = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var IteratorPrototype = {}; define(IteratorPrototype, iteratorSymbol, function () { return this; }); var getProto = Object.getPrototypeOf, NativeIteratorPrototype = getProto && getProto(getProto(values([]))); NativeIteratorPrototype && NativeIteratorPrototype !== Op && hasOwn.call(NativeIteratorPrototype, iteratorSymbol) && (IteratorPrototype = NativeIteratorPrototype); var Gp = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(IteratorPrototype); function defineIteratorMethods(prototype) { ["next", "throw", "return"].forEach(function (method) { define(prototype, method, function (arg) { return this._invoke(method, arg); }); }); } function AsyncIterator(generator, PromiseImpl) { function invoke(method, arg, resolve, reject) { var record = tryCatch(generator[method], generator, arg); if ("throw" !== record.type) { var result = record.arg, value = result.value; return value && "object" == _typeof(value) && hasOwn.call(value, "__await") ? PromiseImpl.resolve(value.__await).then(function (value) { invoke("next", value, resolve, reject); }, function (err) { invoke("throw", err, resolve, reject); }) : PromiseImpl.resolve(value).then(function (unwrapped) { result.value = unwrapped, resolve(result); }, function (error) { return invoke("throw", error, resolve, reject); }); } reject(record.arg); } var previousPromise; this._invoke = function (method, arg) { function callInvokeWithMethodAndArg() { return new PromiseImpl(function (resolve, reject) { invoke(method, arg, resolve, reject); }); } return previousPromise = previousPromise ? previousPromise.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); }; } function maybeInvokeDelegate(delegate, context) { var method = delegate.iterator[context.method]; if (undefined === method) { if (context.delegate = null, "throw" === context.method) { if (delegate.iterator["return"] && (context.method = "return", context.arg = undefined, maybeInvokeDelegate(delegate, context), "throw" === context.method)) return ContinueSentinel; context.method = "throw", context.arg = new TypeError("The iterator does not provide a 'throw' method"); } return ContinueSentinel; } var record = tryCatch(method, delegate.iterator, context.arg); if ("throw" === record.type) return context.method = "throw", context.arg = record.arg, context.delegate = null, ContinueSentinel; var info = record.arg; return info ? info.done ? (context[delegate.resultName] = info.value, context.next = delegate.nextLoc, "return" !== context.method && (context.method = "next", context.arg = undefined), context.delegate = null, ContinueSentinel) : info : (context.method = "throw", context.arg = new TypeError("iterator result is not an object"), context.delegate = null, ContinueSentinel); } function pushTryEntry(locs) { var entry = { tryLoc: locs[0] }; 1 in locs && (entry.catchLoc = locs[1]), 2 in locs && (entry.finallyLoc = locs[2], entry.afterLoc = locs[3]), this.tryEntries.push(entry); } function resetTryEntry(entry) { var record = entry.completion || {}; record.type = "normal", delete record.arg, entry.completion = record; } function Context(tryLocsList) { this.tryEntries = [{ tryLoc: "root" }], tryLocsList.forEach(pushTryEntry, this), this.reset(!0); } function values(iterable) { if (iterable) { var iteratorMethod = iterable[iteratorSymbol]; if (iteratorMethod) return iteratorMethod.call(iterable); if ("function" == typeof iterable.next) return iterable; if (!isNaN(iterable.length)) { var i = -1, next = function next() { for (; ++i < iterable.length;) { if (hasOwn.call(iterable, i)) return next.value = iterable[i], next.done = !1, next; } return next.value = undefined, next.done = !0, next; }; return next.next = next; } } return { next: doneResult }; } function doneResult() { return { value: undefined, done: !0 }; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, define(Gp, "constructor", GeneratorFunctionPrototype), define(GeneratorFunctionPrototype, "constructor", GeneratorFunction), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, toStringTagSymbol, "GeneratorFunction"), exports.isGeneratorFunction = function (genFun) { var ctor = "function" == typeof genFun && genFun.constructor; return !!ctor && (ctor === GeneratorFunction || "GeneratorFunction" === (ctor.displayName || ctor.name)); }, exports.mark = function (genFun) { return Object.setPrototypeOf ? Object.setPrototypeOf(genFun, GeneratorFunctionPrototype) : (genFun.__proto__ = GeneratorFunctionPrototype, define(genFun, toStringTagSymbol, "GeneratorFunction")), genFun.prototype = Object.create(Gp), genFun; }, exports.awrap = function (arg) { return { __await: arg }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, asyncIteratorSymbol, function () { return this; }), exports.AsyncIterator = AsyncIterator, exports.async = function (innerFn, outerFn, self, tryLocsList, PromiseImpl) { void 0 === PromiseImpl && (PromiseImpl = Promise); var iter = new AsyncIterator(wrap(innerFn, outerFn, self, tryLocsList), PromiseImpl); return exports.isGeneratorFunction(outerFn) ? iter : iter.next().then(function (result) { return result.done ? result.value : iter.next(); }); }, defineIteratorMethods(Gp), define(Gp, toStringTagSymbol, "Generator"), define(Gp, iteratorSymbol, function () { return this; }), define(Gp, "toString", function () { return "[object Generator]"; }), exports.keys = function (object) { var keys = []; for (var key in object) { keys.push(key); } return keys.reverse(), function next() { for (; keys.length;) { var key = keys.pop(); if (key in object) return next.value = key, next.done = !1, next; } return next.done = !0, next; }; }, exports.values = values, Context.prototype = { constructor: Context, reset: function reset(skipTempReset) { if (this.prev = 0, this.next = 0, this.sent = this._sent = undefined, this.done = !1, this.delegate = null, this.method = "next", this.arg = undefined, this.tryEntries.forEach(resetTryEntry), !skipTempReset) for (var name in this) { "t" === name.charAt(0) && hasOwn.call(this, name) && !isNaN(+name.slice(1)) && (this[name] = undefined); } }, stop: function stop() { this.done = !0; var rootRecord = this.tryEntries[0].completion; if ("throw" === rootRecord.type) throw rootRecord.arg; return this.rval; }, dispatchException: function dispatchException(exception) { if (this.done) throw exception; var context = this; function handle(loc, caught) { return record.type = "throw", record.arg = exception, context.next = loc, caught && (context.method = "next", context.arg = undefined), !!caught; } for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i], record = entry.completion; if ("root" === entry.tryLoc) return handle("end"); if (entry.tryLoc <= this.prev) { var hasCatch = hasOwn.call(entry, "catchLoc"), hasFinally = hasOwn.call(entry, "finallyLoc"); if (hasCatch && hasFinally) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } else if (hasCatch) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); } else { if (!hasFinally) throw new Error("try statement without catch or finally"); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } } } }, abrupt: function abrupt(type, arg) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc <= this.prev && hasOwn.call(entry, "finallyLoc") && this.prev < entry.finallyLoc) { var finallyEntry = entry; break; } } finallyEntry && ("break" === type || "continue" === type) && finallyEntry.tryLoc <= arg && arg <= finallyEntry.finallyLoc && (finallyEntry = null); var record = finallyEntry ? finallyEntry.completion : {}; return record.type = type, record.arg = arg, finallyEntry ? (this.method = "next", this.next = finallyEntry.finallyLoc, ContinueSentinel) : this.complete(record); }, complete: function complete(record, afterLoc) { if ("throw" === record.type) throw record.arg; return "break" === record.type || "continue" === record.type ? this.next = record.arg : "return" === record.type ? (this.rval = this.arg = record.arg, this.method = "return", this.next = "end") : "normal" === record.type && afterLoc && (this.next = afterLoc), ContinueSentinel; }, finish: function finish(finallyLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.finallyLoc === finallyLoc) return this.complete(entry.completion, entry.afterLoc), resetTryEntry(entry), ContinueSentinel; } }, "catch": function _catch(tryLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc === tryLoc) { var record = entry.completion; if ("throw" === record.type) { var thrown = record.arg; resetTryEntry(entry); } return thrown; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(iterable, resultName, nextLoc) { return this.delegate = { iterator: values(iterable), resultName: resultName, nextLoc: nextLoc }, "next" === this.method && (this.arg = undefined), ContinueSentinel; } }, exports; } | ||
@@ -60,3 +64,3 @@ | ||
var isCanceled = (0, _react.useRef)(false); | ||
var unmounted = (0, _react.useRef)(false); | ||
var isMounted = (0, _useMounted["default"])(); | ||
@@ -126,3 +130,3 @@ var setCurrentStatus = function setCurrentStatus(newStatus) { | ||
if (!unmounted.current) { | ||
if (isMounted.current) { | ||
_context.next = 21; | ||
@@ -157,3 +161,3 @@ break; | ||
if (!unmounted.current) { | ||
if (isMounted.current) { | ||
_context.next = 32; | ||
@@ -179,8 +183,3 @@ break; | ||
}; | ||
}(), [dispatch, itemName]); | ||
(0, _react.useEffect)(function () { | ||
return function () { | ||
unmounted.current = true; | ||
}; | ||
}, []); | ||
}(), [dispatch, itemName, isMounted]); | ||
var cancel = (0, _react.useCallback)(function () { | ||
@@ -187,0 +186,0 @@ if (cancelFunc.current) { |
@@ -18,2 +18,4 @@ "use strict"; | ||
var _useMounted = _interopRequireDefault(require("./useMounted")); | ||
var _util = require("../util"); | ||
@@ -64,10 +66,5 @@ | ||
var functionRef = (0, _react.useRef)({}); | ||
var isMountedRef = (0, _react.useRef)(true); | ||
var isMounted = (0, _useMounted["default"])(); | ||
var currentRef = (0, _react.useRef)(); | ||
var store = (0, _reactRedux.useStore)(); | ||
(0, _react.useEffect)(function () { | ||
return function () { | ||
return isMountedRef.current = false; | ||
}; | ||
}, []); | ||
@@ -93,3 +90,3 @@ var getFun = function getFun() { | ||
case 3: | ||
if (!(more && isMountedRef.current)) { | ||
if (!(more && isMounted.current)) { | ||
_context.next = 18; | ||
@@ -113,3 +110,3 @@ break; | ||
if (isMountedRef.current) { | ||
if (isMounted.current) { | ||
_context.next = 12; | ||
@@ -213,3 +210,3 @@ break; | ||
getData(query, initLimit).then(function (response) { | ||
if (isMountedRef.current && currentRef.current === current) { | ||
if (isMounted.current && currentRef.current === current) { | ||
cache[networkId] = response; | ||
@@ -222,3 +219,3 @@ setResult({ | ||
})["catch"](function () { | ||
if (isMountedRef.current) { | ||
if (isMounted.current) { | ||
setResult({ | ||
@@ -225,0 +222,0 @@ status: _util.STATUS.ERROR, |
{ | ||
"name": "wappsto-blanket", | ||
"version": "2.4.0", | ||
"version": "2.4.1", | ||
"description": "", | ||
@@ -5,0 +5,0 @@ "main": "dist/index.js", |
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
190713
2979