@goldfishjs/requester
Advanced tools
Comparing version 0.0.2 to 0.0.3
@@ -1,10 +0,4 @@ | ||
import _defineProperty from "@babel/runtime/helpers/defineProperty"; | ||
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; } | ||
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; } | ||
export default function httpRequest(options) { | ||
return new Promise(function (resolve, reject) { | ||
(my.request || my.httpRequest).call(my, _objectSpread({}, options, { | ||
(my.request || my.httpRequest).call(my, Object.assign(Object.assign({}, options), { | ||
fail: reject, | ||
@@ -11,0 +5,0 @@ success: function success(res) { |
import _observable from "@goldfishjs/reactive-connect/lib/decorators/observable"; | ||
import _state from "@goldfishjs/reactive-connect/lib/decorators/state"; | ||
import _regeneratorRuntime from "@babel/runtime/regenerator"; | ||
import _defineProperty from "@babel/runtime/helpers/defineProperty"; | ||
import _classCallCheck from "@babel/runtime/helpers/classCallCheck"; | ||
@@ -9,6 +8,2 @@ import _createClass from "@babel/runtime/helpers/createClass"; | ||
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; } | ||
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; } | ||
var __decorate = this && this.__decorate || function (decorators, target, key, desc) { | ||
@@ -24,2 +19,34 @@ var c = arguments.length, | ||
var __awaiter = this && this.__awaiter || function (thisArg, _arguments, P, generator) { | ||
function adopt(value) { | ||
return value instanceof P ? value : new P(function (resolve) { | ||
resolve(value); | ||
}); | ||
} | ||
return new (P || (P = Promise))(function (resolve, reject) { | ||
function fulfilled(value) { | ||
try { | ||
step(generator.next(value)); | ||
} catch (e) { | ||
reject(e); | ||
} | ||
} | ||
function rejected(value) { | ||
try { | ||
step(generator["throw"](value)); | ||
} catch (e) { | ||
reject(e); | ||
} | ||
} | ||
function step(result) { | ||
result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); | ||
} | ||
step((generator = generator.apply(thisArg, _arguments || [])).next()); | ||
}); | ||
}; | ||
import httpRequest from './httpRequest'; | ||
@@ -39,3 +66,3 @@ | ||
}; | ||
this.defaultOptions = _objectSpread({}, this.defaultOptions, {}, options); | ||
this.defaultOptions = Object.assign(Object.assign({}, this.defaultOptions), options); | ||
} | ||
@@ -46,89 +73,93 @@ | ||
value: function send(fetchFn, options) { | ||
var _this = this; | ||
return __awaiter(this, void 0, void 0, | ||
/*#__PURE__*/ | ||
_regeneratorRuntime.mark(function _callee() { | ||
var _this = this; | ||
var realOptions, result, delay, cancel; | ||
return _regeneratorRuntime.async(function send$(_context) { | ||
while (1) { | ||
switch (_context.prev = _context.next) { | ||
case 0: | ||
realOptions = _objectSpread({}, this.defaultOptions, {}, options); | ||
var realOptions, result, delay, cancel; | ||
return _regeneratorRuntime.wrap(function _callee$(_context) { | ||
while (1) { | ||
switch (_context.prev = _context.next) { | ||
case 0: | ||
realOptions = Object.assign(Object.assign({}, this.defaultOptions), options); | ||
if (realOptions.showLoading) { | ||
_context.next = 12; | ||
break; | ||
} | ||
if (realOptions.showLoading) { | ||
_context.next = 12; | ||
break; | ||
} | ||
_context.prev = 2; | ||
_context.next = 5; | ||
return _regeneratorRuntime.awrap(fetchFn()); | ||
_context.prev = 2; | ||
_context.next = 5; | ||
return fetchFn(); | ||
case 5: | ||
result = _context.sent; | ||
_context.next = 11; | ||
break; | ||
case 5: | ||
result = _context.sent; | ||
_context.next = 11; | ||
break; | ||
case 8: | ||
_context.prev = 8; | ||
_context.t0 = _context["catch"](2); | ||
throw _context.t0; | ||
case 8: | ||
_context.prev = 8; | ||
_context.t0 = _context["catch"](2); | ||
throw _context.t0; | ||
case 11: | ||
return _context.abrupt("return", result); | ||
case 11: | ||
return _context.abrupt("return", result); | ||
case 12: | ||
delay = realOptions.delay !== undefined ? realOptions.delay : 300; | ||
this.counter += 1; | ||
case 12: | ||
delay = realOptions.delay !== undefined ? realOptions.delay : 300; | ||
this.counter += 1; | ||
cancel = function () { | ||
var isIncreased = false; | ||
var timer; | ||
cancel = function () { | ||
var isIncreased = false; | ||
var timer; | ||
if (delay < 0) { | ||
_this.loadingCounter += 1; | ||
isIncreased = true; | ||
} else { | ||
timer = setTimeout(function () { | ||
if (delay < 0) { | ||
_this.loadingCounter += 1; | ||
isIncreased = true; | ||
}, delay); | ||
} | ||
return function () { | ||
if (isIncreased) { | ||
_this.loadingCounter -= 1; | ||
} else if (timer) { | ||
clearTimeout(timer); | ||
} else { | ||
timer = setTimeout(function () { | ||
_this.loadingCounter += 1; | ||
isIncreased = true; | ||
}, delay); | ||
} | ||
}; | ||
}(); | ||
_context.prev = 15; | ||
_context.next = 18; | ||
return _regeneratorRuntime.awrap(fetchFn()); | ||
return function () { | ||
if (isIncreased) { | ||
_this.loadingCounter -= 1; | ||
} else if (timer) { | ||
clearTimeout(timer); | ||
} | ||
}; | ||
}(); | ||
case 18: | ||
result = _context.sent; | ||
_context.next = 24; | ||
break; | ||
_context.prev = 15; | ||
_context.next = 18; | ||
return fetchFn(); | ||
case 21: | ||
_context.prev = 21; | ||
_context.t1 = _context["catch"](15); | ||
throw _context.t1; | ||
case 18: | ||
result = _context.sent; | ||
_context.next = 24; | ||
break; | ||
case 24: | ||
_context.prev = 24; | ||
this.counter -= 1; | ||
cancel(); | ||
return _context.finish(24); | ||
case 21: | ||
_context.prev = 21; | ||
_context.t1 = _context["catch"](15); | ||
throw _context.t1; | ||
case 28: | ||
return _context.abrupt("return", result); | ||
case 24: | ||
_context.prev = 24; | ||
this.counter -= 1; | ||
cancel(); | ||
return _context.finish(24); | ||
case 29: | ||
case "end": | ||
return _context.stop(); | ||
case 28: | ||
return _context.abrupt("return", result); | ||
case 29: | ||
case "end": | ||
return _context.stop(); | ||
} | ||
} | ||
} | ||
}, null, this, [[2, 8], [15, 21, 24, 28]]); | ||
}, _callee, this, [[2, 8], [15, 21, 24, 28]]); | ||
})); | ||
} | ||
@@ -139,3 +170,3 @@ }, { | ||
return this.send(function () { | ||
return httpRequest(_objectSpread({}, options, { | ||
return httpRequest(Object.assign(Object.assign({}, options), { | ||
url: url, | ||
@@ -142,0 +173,0 @@ data: data |
{ | ||
"name": "@goldfishjs/requester", | ||
"version": "0.0.2", | ||
"version": "0.0.3", | ||
"description": "goldfish-requester", | ||
@@ -28,4 +28,4 @@ "main": "lib/index.js", | ||
"dependencies": { | ||
"@goldfishjs/reactive-connect": "^0.0.2", | ||
"@goldfishjs/utils": "^0.0.2", | ||
"@goldfishjs/reactive-connect": "^0.0.3", | ||
"@goldfishjs/utils": "^0.0.3", | ||
"mini-types": "^0.0.4" | ||
@@ -32,0 +32,0 @@ }, |
239
10704
+ Added@goldfishjs/reactive@0.0.3(transitive)
+ Added@goldfishjs/reactive-connect@0.0.3(transitive)
+ Added@goldfishjs/utils@0.0.3(transitive)
- Removed@goldfishjs/reactive@0.0.2(transitive)
- Removed@goldfishjs/reactive-connect@0.0.2(transitive)
- Removed@goldfishjs/utils@0.0.2(transitive)
Updated@goldfishjs/utils@^0.0.3