@cubejs-client/core 1.3.4 → 1.3.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -2,12 +2,6 @@
2
2
 
3
3
  Object.defineProperty(exports, '__esModule', { value: true });
4
4
 
5
- require('core-js/modules/es.object.keys.js');
6
- require('core-js/modules/es.symbol.js');
7
- require('core-js/modules/es.object.get-own-property-descriptor.js');
8
- require('core-js/modules/es.object.get-own-property-descriptors.js');
9
- require('core-js/modules/es.object.define-properties.js');
10
- require('core-js/modules/es.object.define-property.js');
11
5
  var _slicedToArray = require('@babel/runtime/helpers/slicedToArray');
12
6
  var _defineProperty = require('@babel/runtime/helpers/defineProperty');
13
7
  var _typeof = require('@babel/runtime/helpers/typeof');
@@ -15,61 +9,69 @@ var _classCallCheck = require('@babel/runtime/helpers/classCallCheck');
15
9
  var _createClass = require('@babel/runtime/helpers/createClass');
16
10
  var _asyncToGenerator = require('@babel/runtime/helpers/asyncToGenerator');
17
11
  var _regeneratorRuntime = require('@babel/runtime/regenerator');
18
- require('core-js/modules/es.object.to-string.js');
19
- require('core-js/modules/es.promise.js');
20
- require('core-js/modules/es.array.is-array.js');
21
- require('core-js/modules/web.timers.js');
22
- require('core-js/modules/es.array.for-each.js');
23
- require('core-js/modules/web.dom-collections.for-each.js');
24
12
  require('core-js/modules/es.array.filter.js');
13
+ require('core-js/modules/es.array.for-each.js');
14
+ require('core-js/modules/es.symbol.js');
15
+ require('core-js/modules/es.array.is-array.js');
25
16
  require('core-js/modules/es.array.map.js');
26
- require('core-js/modules/es.object.entries.js');
27
17
  require('core-js/modules/es.number.constructor.js');
18
+ require('core-js/modules/es.object.entries.js');
19
+ require('core-js/modules/es.object.keys.js');
20
+ require('core-js/modules/es.object.to-string.js');
21
+ require('core-js/modules/es.object.define-properties.js');
22
+ require('core-js/modules/es.object.define-property.js');
23
+ require('core-js/modules/es.object.get-own-property-descriptor.js');
24
+ require('core-js/modules/es.object.get-own-property-descriptors.js');
25
+ require('core-js/modules/es.promise.js');
26
+ require('core-js/modules/web.dom-collections.for-each.js');
27
+ require('core-js/modules/web.timers.js');
28
28
  var uuid = require('uuid');
29
+ require('@babel/runtime/helpers/readOnlyError');
29
30
  var _objectWithoutProperties = require('@babel/runtime/helpers/objectWithoutProperties');
30
31
  var _toConsumableArray = require('@babel/runtime/helpers/toConsumableArray');
31
- require('core-js/modules/es.array.iterator.js');
32
- require('core-js/modules/es.map.js');
33
- require('core-js/modules/es.string.iterator.js');
34
- require('core-js/modules/web.dom-collections.iterator.js');
32
+ require('core-js/modules/es.array.concat.js');
33
+ require('core-js/modules/es.array.find.js');
35
34
  require('core-js/modules/es.array.from.js');
36
35
  require('core-js/modules/es.array.includes.js');
37
- require('core-js/modules/es.string.includes.js');
38
- require('core-js/modules/es.object.values.js');
39
- require('core-js/modules/es.array.find.js');
40
- require('core-js/modules/es.array.concat.js');
41
- require('core-js/modules/es.regexp.exec.js');
42
- require('core-js/modules/es.string.split.js');
36
+ require('core-js/modules/es.array.index-of.js');
37
+ require('core-js/modules/es.array.iterator.js');
43
38
  require('core-js/modules/es.array.join.js');
44
- require('core-js/modules/es.date.to-string.js');
45
- require('core-js/modules/es.regexp.to-string.js');
46
- require('core-js/modules/es.string.match.js');
47
39
  require('core-js/modules/es.array.reduce.js');
40
+ require('core-js/modules/es.date.to-string.js');
41
+ require('core-js/modules/es.map.js');
48
42
  require('core-js/modules/es.number.is-nan.js');
49
43
  require('core-js/modules/es.number.parse-float.js');
44
+ require('core-js/modules/es.object.values.js');
45
+ require('core-js/modules/es.regexp.exec.js');
46
+ require('core-js/modules/es.regexp.to-string.js');
50
47
  require('core-js/modules/es.set.js');
51
- require('core-js/modules/es.array.index-of.js');
48
+ require('core-js/modules/es.string.includes.js');
49
+ require('core-js/modules/es.string.iterator.js');
50
+ require('core-js/modules/es.string.match.js');
52
51
  require('core-js/modules/es.string.trim.js');
52
+ require('core-js/modules/web.dom-collections.iterator.js');
53
53
  var dayjs = require('dayjs');
54
54
  var ramda = require('ramda');
55
55
  require('core-js/modules/es.array.every.js');
56
56
  require('core-js/modules/es.array.splice.js');
57
+ require('core-js/modules/es.array.slice.js');
57
58
  require('core-js/modules/es.parse-int.js');
58
59
  require('core-js/modules/es.string.ends-with.js');
59
- require('core-js/modules/es.array.slice.js');
60
+ require('core-js/modules/es.string.split.js');
60
61
  var quarterOfYear = require('dayjs/plugin/quarterOfYear');
61
62
  var duration = require('dayjs/plugin/duration');
62
63
  var isoWeek = require('dayjs/plugin/isoWeek');
63
64
  var en = require('dayjs/locale/en');
64
- require('core-js/modules/es.function.name.js');
65
65
  require('core-js/modules/es.array.sort.js');
66
+ require('core-js/modules/es.function.name.js');
67
+ require('core-js/modules/es.date.to-json.js');
66
68
  require('core-js/modules/web.url-search-params.js');
67
69
  var fetch = require('cross-fetch');
68
70
  require('url-search-params-polyfill');
69
71
  require('core-js/modules/es.reflect.construct.js');
70
- var _inherits = require('@babel/runtime/helpers/inherits');
71
72
  var _possibleConstructorReturn = require('@babel/runtime/helpers/possibleConstructorReturn');
72
73
  var _getPrototypeOf = require('@babel/runtime/helpers/getPrototypeOf');
74
+ var _inherits = require('@babel/runtime/helpers/inherits');
73
75
  var _wrapNativeSuper = require('@babel/runtime/helpers/wrapNativeSuper');
74
76
 
75
77
  function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
@@ -89,9 +91,9 @@ var duration__default = /*#__PURE__*/_interopDefaultLegacy(duration);
89
91
  var isoWeek__default = /*#__PURE__*/_interopDefaultLegacy(isoWeek);
90
92
  var en__default = /*#__PURE__*/_interopDefaultLegacy(en);
91
93
  var fetch__default = /*#__PURE__*/_interopDefaultLegacy(fetch);
92
- var _inherits__default = /*#__PURE__*/_interopDefaultLegacy(_inherits);
93
94
  var _possibleConstructorReturn__default = /*#__PURE__*/_interopDefaultLegacy(_possibleConstructorReturn);
94
95
  var _getPrototypeOf__default = /*#__PURE__*/_interopDefaultLegacy(_getPrototypeOf);
96
+ var _inherits__default = /*#__PURE__*/_interopDefaultLegacy(_inherits);
95
97
  var _wrapNativeSuper__default = /*#__PURE__*/_interopDefaultLegacy(_wrapNativeSuper);
96
98
 
97
99
  function ownKeys$4(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
@@ -183,7 +185,7 @@ var isPredefinedGranularity = function isPredefinedGranularity(granularity) {
183
185
  };
184
186
  var DateRegex = /^\d\d\d\d-\d\d-\d\d$/;
185
187
  var LocalDateRegex = /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}.\d{3}Z?$/;
186
- var dayRange = function dayRange(from, to) {
188
+ var _dayRange = function dayRange(from, to) {
187
189
  return {
188
190
  by: function by(value) {
189
191
  var results = [];
@@ -196,23 +198,12 @@ var dayRange = function dayRange(from, to) {
196
198
  return results;
197
199
  },
198
200
  snapTo: function snapTo(value) {
199
- return dayRange(internalDayjs(from).startOf(value), internalDayjs(to).endOf(value));
201
+ return _dayRange(internalDayjs(from).startOf(value), internalDayjs(to).endOf(value));
200
202
  },
201
203
  start: internalDayjs(from),
202
204
  end: internalDayjs(to)
203
205
  };
204
206
  };
205
-
206
- /**
207
- * Parse PostgreSQL-like interval string into object
208
- * E.g. '2 years 15 months 100 weeks 99 hours 15 seconds'
209
- * Negative units are also supported
210
- * E.g. '-2 months 5 days -10 hours'
211
- *
212
- * TODO: It's copy/paste of parseSqlInterval from @cubejs-backend/shared [time.ts]
213
- * It's not referenced to omit imports of moment.js staff.
214
- * Probably one day we should choose one implementation and reuse it in other places.
215
- */
216
207
  function parseSqlInterval(intervalStr) {
217
208
  var interval = {};
218
209
  var parts = intervalStr.split(/\s+/);
@@ -707,7 +698,7 @@ var ResultSet = /*#__PURE__*/function () {
707
698
  this.options = options;
708
699
  this.backwardCompatibleData = [];
709
700
  }
710
- _createClass__default['default'](ResultSet, [{
701
+ return _createClass__default['default'](ResultSet, [{
711
702
  key: "drillDown",
712
703
  value: function drillDown(drillDownLocator, pivotConfig) {
713
704
  if (this.queryType === QUERY_TYPE.COMPARE_DATE_RANGE_QUERY) {
@@ -769,7 +760,7 @@ var ResultSet = /*#__PURE__*/function () {
769
760
  dimension = _member$split2[1],
770
761
  granularity = _member$split2[2];
771
762
  if (granularity !== undefined) {
772
- var range = dayRange(value, value).snapTo(granularity);
763
+ var range = _dayRange(value, value).snapTo(granularity);
773
764
  var originalTimeDimension = query.timeDimensions.find(function (td) {
774
765
  return td.dimension;
775
766
  });
@@ -903,7 +894,7 @@ var ResultSet = /*#__PURE__*/function () {
903
894
  _dateRange2 = _slicedToArray__default['default'](_dateRange, 2),
904
895
  start = _dateRange2[0],
905
896
  end = _dateRange2[1];
906
- var range = dayRange(start, end);
897
+ var range = _dayRange(start, end);
907
898
  if (isPredefinedGranularity(timeDimension.granularity)) {
908
899
  return TIME_SERIES[timeDimension.granularity](padToDay ? range.snapTo('d') : range);
909
900
  }
@@ -1131,7 +1122,7 @@ var ResultSet = /*#__PURE__*/function () {
1131
1122
  });
1132
1123
  }
1133
1124
  });
1134
- var toColumns = function toColumns() {
1125
+ var _toColumns = function toColumns() {
1135
1126
  var item = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
1136
1127
  var path = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
1137
1128
  if (Object.keys(item).length === 0) {
@@ -1140,7 +1131,7 @@ var ResultSet = /*#__PURE__*/function () {
1140
1131
  return Object.values(item).map(function (_ref29) {
1141
1132
  var key = _ref29.key,
1142
1133
  currentItem = _objectWithoutProperties__default['default'](_ref29, _excluded2);
1143
- var children = toColumns(currentItem.children, [].concat(_toConsumableArray__default['default'](path), [key]));
1134
+ var children = _toColumns(currentItem.children, [].concat(_toConsumableArray__default['default'](path), [key]));
1144
1135
  var _extractFields = extractFields(currentItem.memberId),
1145
1136
  title = _extractFields.title,
1146
1137
  shortTitle = _extractFields.shortTitle,
@@ -1194,7 +1185,7 @@ var ResultSet = /*#__PURE__*/function () {
1194
1185
  return _objectSpread$2(_objectSpread$2({}, extractFields(key)), {}, {
1195
1186
  dataIndex: key
1196
1187
  });
1197
- }).concat(toColumns(schema)).concat(otherColumns);
1188
+ }).concat(_toColumns(schema)).concat(otherColumns);
1198
1189
  }
1199
1190
  }, {
1200
1191
  key: "totalRow",
@@ -1413,7 +1404,6 @@ var ResultSet = /*#__PURE__*/function () {
1413
1404
  return pivotConfig;
1414
1405
  }
1415
1406
  }]);
1416
- return ResultSet;
1417
1407
  }();
1418
1408
 
1419
1409
  var SqlQuery = /*#__PURE__*/function () {
@@ -1421,7 +1411,7 @@ var SqlQuery = /*#__PURE__*/function () {
1421
1411
  _classCallCheck__default['default'](this, SqlQuery);
1422
1412
  this.sqlQuery = sqlQuery;
1423
1413
  }
1424
- _createClass__default['default'](SqlQuery, [{
1414
+ return _createClass__default['default'](SqlQuery, [{
1425
1415
  key: "rawQuery",
1426
1416
  value: function rawQuery() {
1427
1417
  return this.sqlQuery.sql;
@@ -1432,7 +1422,6 @@ var SqlQuery = /*#__PURE__*/function () {
1432
1422
  return this.rawQuery().sql[0];
1433
1423
  }
1434
1424
  }]);
1435
- return SqlQuery;
1436
1425
  }();
1437
1426
 
1438
1427
  var memberMap = function memberMap(memberArray) {
@@ -1541,7 +1530,7 @@ var Meta = /*#__PURE__*/function () {
1541
1530
  }];
1542
1531
  }));
1543
1532
  }
1544
- _createClass__default['default'](Meta, [{
1533
+ return _createClass__default['default'](Meta, [{
1545
1534
  key: "membersForQuery",
1546
1535
  value: function membersForQuery(query, memberType) {
1547
1536
  return ramda.unnest(this.cubes.map(function (c) {
@@ -1626,7 +1615,6 @@ var Meta = /*#__PURE__*/function () {
1626
1615
  return operators[member.type] || operators.string;
1627
1616
  }
1628
1617
  }]);
1629
- return Meta;
1630
1618
  }();
1631
1619
 
1632
1620
  var ProgressResult = /*#__PURE__*/function () {
@@ -1634,7 +1622,7 @@ var ProgressResult = /*#__PURE__*/function () {
1634
1622
  _classCallCheck__default['default'](this, ProgressResult);
1635
1623
  this.progressResponse = progressResponse;
1636
1624
  }
1637
- _createClass__default['default'](ProgressResult, [{
1625
+ return _createClass__default['default'](ProgressResult, [{
1638
1626
  key: "stage",
1639
1627
  value: function stage() {
1640
1628
  return this.progressResponse.stage;
@@ -1645,7 +1633,6 @@ var ProgressResult = /*#__PURE__*/function () {
1645
1633
  return this.progressResponse.timeElapsed;
1646
1634
  }
1647
1635
  }]);
1648
- return ProgressResult;
1649
1636
  }();
1650
1637
 
1651
1638
  var _excluded = ["baseRequestId"];
@@ -1668,7 +1655,7 @@ var HttpTransport = /*#__PURE__*/function () {
1668
1655
  this.credentials = credentials;
1669
1656
  this.fetchTimeout = fetchTimeout;
1670
1657
  }
1671
- _createClass__default['default'](HttpTransport, [{
1658
+ return _createClass__default['default'](HttpTransport, [{
1672
1659
  key: "request",
1673
1660
  value: function request(method, _ref2) {
1674
1661
  var _this = this;
@@ -1704,29 +1691,27 @@ var HttpTransport = /*#__PURE__*/function () {
1704
1691
  return {
1705
1692
  /* eslint no-unsafe-finally: off */subscribe: function subscribe(callback) {
1706
1693
  var _this2 = this;
1707
- return _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee() {
1694
+ return _asyncToGenerator__default['default'](/*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee() {
1708
1695
  var result;
1709
1696
  return _regeneratorRuntime__default['default'].wrap(function _callee$(_context) {
1710
- while (1) {
1711
- switch (_context.prev = _context.next) {
1712
- case 0:
1713
- result = {
1714
- error: 'network Error' // add default error message
1715
- };
1716
- _context.prev = 1;
1717
- _context.next = 4;
1718
- return runRequest();
1719
- case 4:
1720
- result = _context.sent;
1721
- case 5:
1722
- _context.prev = 5;
1723
- return _context.abrupt("return", callback(result, function () {
1724
- return _this2.subscribe(callback);
1725
- }));
1726
- case 8:
1727
- case "end":
1728
- return _context.stop();
1729
- }
1697
+ while (1) switch (_context.prev = _context.next) {
1698
+ case 0:
1699
+ result = {
1700
+ error: 'network Error' // add default error message
1701
+ };
1702
+ _context.prev = 1;
1703
+ _context.next = 4;
1704
+ return runRequest();
1705
+ case 4:
1706
+ result = _context.sent;
1707
+ case 5:
1708
+ _context.prev = 5;
1709
+ return _context.abrupt("return", callback(result, function () {
1710
+ return _this2.subscribe(callback);
1711
+ }));
1712
+ case 8:
1713
+ case "end":
1714
+ return _context.stop();
1730
1715
  }
1731
1716
  }, _callee, null, [[1,, 5, 8]]);
1732
1717
  }))();
@@ -1734,24 +1719,22 @@ var HttpTransport = /*#__PURE__*/function () {
1734
1719
  };
1735
1720
  }
1736
1721
  }]);
1737
- return HttpTransport;
1738
1722
  }();
1739
1723
 
1740
- function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf__default['default'](Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf__default['default'](this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn__default['default'](this, result); }; }
1724
+ function _callSuper(t, o, e) { return o = _getPrototypeOf__default['default'](o), _possibleConstructorReturn__default['default'](t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], _getPrototypeOf__default['default'](t).constructor) : o.apply(t, e)); }
1741
1725
  function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
1742
1726
  var RequestError = /*#__PURE__*/function (_Error) {
1743
- _inherits__default['default'](RequestError, _Error);
1744
- var _super = _createSuper(RequestError);
1745
1727
  function RequestError(message, response, status) {
1746
1728
  var _this;
1747
1729
  _classCallCheck__default['default'](this, RequestError);
1748
- _this = _super.call(this, message);
1730
+ _this = _callSuper(this, RequestError, [message]);
1749
1731
  _this.response = response;
1750
1732
  _this.status = status;
1751
1733
  return _this;
1752
1734
  }
1735
+ _inherits__default['default'](RequestError, _Error);
1753
1736
  return _createClass__default['default'](RequestError);
1754
- }( /*#__PURE__*/_wrapNativeSuper__default['default'](Error));
1737
+ }(/*#__PURE__*/_wrapNativeSuper__default['default'](Error));
1755
1738
 
1756
1739
  function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
1757
1740
  function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty__default['default'](e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
@@ -1766,31 +1749,29 @@ var ResultType = {
1766
1749
  COMPACT: 'compact'
1767
1750
  };
1768
1751
  function mutexPromise(promise) {
1769
- return new Promise( /*#__PURE__*/function () {
1770
- var _ref = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee(resolve, reject) {
1752
+ return new Promise(/*#__PURE__*/function () {
1753
+ var _ref = _asyncToGenerator__default['default'](/*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee(resolve, reject) {
1771
1754
  return _regeneratorRuntime__default['default'].wrap(function _callee$(_context) {
1772
- while (1) {
1773
- switch (_context.prev = _context.next) {
1774
- case 0:
1775
- _context.prev = 0;
1776
- _context.t0 = resolve;
1777
- _context.next = 4;
1778
- return promise;
1779
- case 4:
1780
- _context.t1 = _context.sent;
1781
- (0, _context.t0)(_context.t1);
1782
- _context.next = 11;
1783
- break;
1784
- case 8:
1785
- _context.prev = 8;
1786
- _context.t2 = _context["catch"](0);
1787
- if (_context.t2 !== MUTEX_ERROR) {
1788
- reject(_context.t2);
1789
- }
1790
- case 11:
1791
- case "end":
1792
- return _context.stop();
1793
- }
1755
+ while (1) switch (_context.prev = _context.next) {
1756
+ case 0:
1757
+ _context.prev = 0;
1758
+ _context.t0 = resolve;
1759
+ _context.next = 4;
1760
+ return promise;
1761
+ case 4:
1762
+ _context.t1 = _context.sent;
1763
+ (0, _context.t0)(_context.t1);
1764
+ _context.next = 11;
1765
+ break;
1766
+ case 8:
1767
+ _context.prev = 8;
1768
+ _context.t2 = _context["catch"](0);
1769
+ if (_context.t2 !== MUTEX_ERROR) {
1770
+ reject(_context.t2);
1771
+ }
1772
+ case 11:
1773
+ case "end":
1774
+ return _context.stop();
1794
1775
  }
1795
1776
  }, _callee, null, [[0, 8]]);
1796
1777
  }));
@@ -1828,7 +1809,7 @@ var CubeApi = /*#__PURE__*/function () {
1828
1809
  this.networkErrorRetries = options.networkErrorRetries || 0;
1829
1810
  this.updateAuthorizationPromise = null;
1830
1811
  }
1831
- _createClass__default['default'](CubeApi, [{
1812
+ return _createClass__default['default'](CubeApi, [{
1832
1813
  key: "request",
1833
1814
  value: function request(method, params) {
1834
1815
  return this.transport.request(method, _objectSpread({
@@ -1855,33 +1836,31 @@ var CubeApi = /*#__PURE__*/function () {
1855
1836
  var skipAuthorizationUpdate = true;
1856
1837
  var unsubscribed = false;
1857
1838
  var checkMutex = /*#__PURE__*/function () {
1858
- var _ref2 = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee2() {
1839
+ var _ref2 = _asyncToGenerator__default['default'](/*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee2() {
1859
1840
  var requestInstance;
1860
1841
  return _regeneratorRuntime__default['default'].wrap(function _callee2$(_context2) {
1861
- while (1) {
1862
- switch (_context2.prev = _context2.next) {
1863
- case 0:
1864
- _context2.next = 2;
1865
- return requestPromise;
1866
- case 2:
1867
- requestInstance = _context2.sent;
1868
- if (!(options.mutexObj && options.mutexObj[mutexKey] !== mutexValue)) {
1869
- _context2.next = 9;
1870
- break;
1871
- }
1872
- unsubscribed = true;
1873
- if (!requestInstance.unsubscribe) {
1874
- _context2.next = 8;
1875
- break;
1876
- }
1842
+ while (1) switch (_context2.prev = _context2.next) {
1843
+ case 0:
1844
+ _context2.next = 2;
1845
+ return requestPromise;
1846
+ case 2:
1847
+ requestInstance = _context2.sent;
1848
+ if (!(options.mutexObj && options.mutexObj[mutexKey] !== mutexValue)) {
1849
+ _context2.next = 9;
1850
+ break;
1851
+ }
1852
+ unsubscribed = true;
1853
+ if (!requestInstance.unsubscribe) {
1877
1854
  _context2.next = 8;
1878
- return requestInstance.unsubscribe();
1879
- case 8:
1880
- throw MUTEX_ERROR;
1881
- case 9:
1882
- case "end":
1883
- return _context2.stop();
1884
- }
1855
+ break;
1856
+ }
1857
+ _context2.next = 8;
1858
+ return requestInstance.unsubscribe();
1859
+ case 8:
1860
+ throw MUTEX_ERROR;
1861
+ case 9:
1862
+ case "end":
1863
+ return _context2.stop();
1885
1864
  }
1886
1865
  }, _callee2);
1887
1866
  }));
@@ -1891,185 +1870,179 @@ var CubeApi = /*#__PURE__*/function () {
1891
1870
  }();
1892
1871
  var networkRetries = this.networkErrorRetries;
1893
1872
  var loadImpl = /*#__PURE__*/function () {
1894
- var _ref3 = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee5(response, next) {
1873
+ var _ref3 = _asyncToGenerator__default['default'](/*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee5(response, next) {
1895
1874
  var requestInstance, subscribeNext, continueWait, body, text, error, result;
1896
1875
  return _regeneratorRuntime__default['default'].wrap(function _callee5$(_context5) {
1897
- while (1) {
1898
- switch (_context5.prev = _context5.next) {
1899
- case 0:
1900
- _context5.next = 2;
1901
- return requestPromise;
1902
- case 2:
1903
- requestInstance = _context5.sent;
1904
- subscribeNext = /*#__PURE__*/function () {
1905
- var _ref4 = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee3() {
1906
- return _regeneratorRuntime__default['default'].wrap(function _callee3$(_context3) {
1907
- while (1) {
1908
- switch (_context3.prev = _context3.next) {
1909
- case 0:
1910
- if (!(options.subscribe && !unsubscribed)) {
1911
- _context3.next = 8;
1912
- break;
1913
- }
1914
- if (!requestInstance.unsubscribe) {
1915
- _context3.next = 5;
1916
- break;
1917
- }
1918
- return _context3.abrupt("return", next());
1919
- case 5:
1920
- _context3.next = 7;
1921
- return new Promise(function (resolve) {
1922
- return setTimeout(function () {
1923
- return resolve();
1924
- }, _this.pollInterval * 1000);
1925
- });
1926
- case 7:
1927
- return _context3.abrupt("return", next());
1928
- case 8:
1929
- return _context3.abrupt("return", null);
1930
- case 9:
1931
- case "end":
1932
- return _context3.stop();
1876
+ while (1) switch (_context5.prev = _context5.next) {
1877
+ case 0:
1878
+ _context5.next = 2;
1879
+ return requestPromise;
1880
+ case 2:
1881
+ requestInstance = _context5.sent;
1882
+ subscribeNext = /*#__PURE__*/function () {
1883
+ var _ref4 = _asyncToGenerator__default['default'](/*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee3() {
1884
+ return _regeneratorRuntime__default['default'].wrap(function _callee3$(_context3) {
1885
+ while (1) switch (_context3.prev = _context3.next) {
1886
+ case 0:
1887
+ if (!(options.subscribe && !unsubscribed)) {
1888
+ _context3.next = 8;
1889
+ break;
1933
1890
  }
1934
- }
1935
- }, _callee3);
1936
- }));
1937
- return function subscribeNext() {
1938
- return _ref4.apply(this, arguments);
1939
- };
1940
- }();
1941
- continueWait = /*#__PURE__*/function () {
1942
- var _ref5 = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee4(wait) {
1943
- return _regeneratorRuntime__default['default'].wrap(function _callee4$(_context4) {
1944
- while (1) {
1945
- switch (_context4.prev = _context4.next) {
1946
- case 0:
1947
- if (unsubscribed) {
1948
- _context4.next = 5;
1949
- break;
1950
- }
1951
- if (!wait) {
1952
- _context4.next = 4;
1953
- break;
1954
- }
1955
- _context4.next = 4;
1956
- return new Promise(function (resolve) {
1957
- return setTimeout(function () {
1958
- return resolve();
1959
- }, _this.pollInterval * 1000);
1960
- });
1961
- case 4:
1962
- return _context4.abrupt("return", next());
1963
- case 5:
1964
- return _context4.abrupt("return", null);
1965
- case 6:
1966
- case "end":
1967
- return _context4.stop();
1891
+ if (!requestInstance.unsubscribe) {
1892
+ _context3.next = 5;
1893
+ break;
1968
1894
  }
1969
- }
1970
- }, _callee4);
1971
- }));
1972
- return function continueWait(_x5) {
1973
- return _ref5.apply(this, arguments);
1974
- };
1975
- }();
1976
- if (!(options.subscribe && !skipAuthorizationUpdate)) {
1977
- _context5.next = 8;
1978
- break;
1979
- }
1895
+ return _context3.abrupt("return", next());
1896
+ case 5:
1897
+ _context3.next = 7;
1898
+ return new Promise(function (resolve) {
1899
+ return setTimeout(function () {
1900
+ return resolve();
1901
+ }, _this.pollInterval * 1000);
1902
+ });
1903
+ case 7:
1904
+ return _context3.abrupt("return", next());
1905
+ case 8:
1906
+ return _context3.abrupt("return", null);
1907
+ case 9:
1908
+ case "end":
1909
+ return _context3.stop();
1910
+ }
1911
+ }, _callee3);
1912
+ }));
1913
+ return function subscribeNext() {
1914
+ return _ref4.apply(this, arguments);
1915
+ };
1916
+ }();
1917
+ continueWait = /*#__PURE__*/function () {
1918
+ var _ref5 = _asyncToGenerator__default['default'](/*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee4(wait) {
1919
+ return _regeneratorRuntime__default['default'].wrap(function _callee4$(_context4) {
1920
+ while (1) switch (_context4.prev = _context4.next) {
1921
+ case 0:
1922
+ if (unsubscribed) {
1923
+ _context4.next = 5;
1924
+ break;
1925
+ }
1926
+ if (!wait) {
1927
+ _context4.next = 4;
1928
+ break;
1929
+ }
1930
+ _context4.next = 4;
1931
+ return new Promise(function (resolve) {
1932
+ return setTimeout(function () {
1933
+ return resolve();
1934
+ }, _this.pollInterval * 1000);
1935
+ });
1936
+ case 4:
1937
+ return _context4.abrupt("return", next());
1938
+ case 5:
1939
+ return _context4.abrupt("return", null);
1940
+ case 6:
1941
+ case "end":
1942
+ return _context4.stop();
1943
+ }
1944
+ }, _callee4);
1945
+ }));
1946
+ return function continueWait(_x5) {
1947
+ return _ref5.apply(this, arguments);
1948
+ };
1949
+ }();
1950
+ if (!(options.subscribe && !skipAuthorizationUpdate)) {
1980
1951
  _context5.next = 8;
1981
- return _this.updateTransportAuthorization();
1982
- case 8:
1983
- skipAuthorizationUpdate = false;
1984
- if (!(response.status === 502 || response.error && response.error.toLowerCase() === 'network error' && --networkRetries >= 0)) {
1985
- _context5.next = 13;
1986
- break;
1987
- }
1988
- _context5.next = 12;
1989
- return checkMutex();
1990
- case 12:
1991
- return _context5.abrupt("return", continueWait(true));
1992
- case 13:
1993
- body = {};
1994
- text = '';
1995
- _context5.prev = 15;
1996
- _context5.next = 18;
1997
- return response.text();
1998
- case 18:
1999
- text = _context5.sent;
2000
- body = JSON.parse(text);
2001
- _context5.next = 25;
2002
1952
  break;
2003
- case 22:
2004
- _context5.prev = 22;
2005
- _context5.t0 = _context5["catch"](15);
2006
- body.error = text;
2007
- case 25:
2008
- if (!(body.error === 'Continue wait')) {
2009
- _context5.next = 30;
2010
- break;
2011
- }
2012
- _context5.next = 28;
2013
- return checkMutex();
2014
- case 28:
2015
- if (options.progressCallback) {
2016
- options.progressCallback(new ProgressResult(body));
2017
- }
2018
- return _context5.abrupt("return", continueWait());
2019
- case 30:
2020
- if (!(response.status !== 200)) {
2021
- _context5.next = 43;
2022
- break;
2023
- }
2024
- _context5.next = 33;
2025
- return checkMutex();
2026
- case 33:
2027
- if (!(!options.subscribe && requestInstance.unsubscribe)) {
2028
- _context5.next = 36;
2029
- break;
2030
- }
1953
+ }
1954
+ _context5.next = 8;
1955
+ return _this.updateTransportAuthorization();
1956
+ case 8:
1957
+ skipAuthorizationUpdate = false;
1958
+ if (!(response.status === 502 || response.error && response.error.toLowerCase() === 'network error' && --networkRetries >= 0)) {
1959
+ _context5.next = 13;
1960
+ break;
1961
+ }
1962
+ _context5.next = 12;
1963
+ return checkMutex();
1964
+ case 12:
1965
+ return _context5.abrupt("return", continueWait(true));
1966
+ case 13:
1967
+ body = {};
1968
+ text = '';
1969
+ _context5.prev = 15;
1970
+ _context5.next = 18;
1971
+ return response.text();
1972
+ case 18:
1973
+ text = _context5.sent;
1974
+ body = JSON.parse(text);
1975
+ _context5.next = 25;
1976
+ break;
1977
+ case 22:
1978
+ _context5.prev = 22;
1979
+ _context5.t0 = _context5["catch"](15);
1980
+ body.error = text;
1981
+ case 25:
1982
+ if (!(body.error === 'Continue wait')) {
1983
+ _context5.next = 30;
1984
+ break;
1985
+ }
1986
+ _context5.next = 28;
1987
+ return checkMutex();
1988
+ case 28:
1989
+ if (options.progressCallback) {
1990
+ options.progressCallback(new ProgressResult(body));
1991
+ }
1992
+ return _context5.abrupt("return", continueWait());
1993
+ case 30:
1994
+ if (!(response.status !== 200)) {
1995
+ _context5.next = 43;
1996
+ break;
1997
+ }
1998
+ _context5.next = 33;
1999
+ return checkMutex();
2000
+ case 33:
2001
+ if (!(!options.subscribe && requestInstance.unsubscribe)) {
2031
2002
  _context5.next = 36;
2032
- return requestInstance.unsubscribe();
2033
- case 36:
2034
- error = new RequestError(body.error, body, response.status); // TODO error class
2035
- if (!callback) {
2036
- _context5.next = 41;
2037
- break;
2038
- }
2039
- callback(error);
2040
- _context5.next = 42;
2041
2003
  break;
2042
- case 41:
2043
- throw error;
2044
- case 42:
2045
- return _context5.abrupt("return", subscribeNext());
2046
- case 43:
2047
- _context5.next = 45;
2048
- return checkMutex();
2049
- case 45:
2050
- if (!(!options.subscribe && requestInstance.unsubscribe)) {
2051
- _context5.next = 48;
2052
- break;
2053
- }
2004
+ }
2005
+ _context5.next = 36;
2006
+ return requestInstance.unsubscribe();
2007
+ case 36:
2008
+ error = new RequestError(body.error, body, response.status); // TODO error class
2009
+ if (!callback) {
2010
+ _context5.next = 41;
2011
+ break;
2012
+ }
2013
+ callback(error);
2014
+ _context5.next = 42;
2015
+ break;
2016
+ case 41:
2017
+ throw error;
2018
+ case 42:
2019
+ return _context5.abrupt("return", subscribeNext());
2020
+ case 43:
2021
+ _context5.next = 45;
2022
+ return checkMutex();
2023
+ case 45:
2024
+ if (!(!options.subscribe && requestInstance.unsubscribe)) {
2054
2025
  _context5.next = 48;
2055
- return requestInstance.unsubscribe();
2056
- case 48:
2057
- result = toResult(body);
2058
- if (!callback) {
2059
- _context5.next = 53;
2060
- break;
2061
- }
2062
- callback(null, result);
2063
- _context5.next = 54;
2064
2026
  break;
2065
- case 53:
2066
- return _context5.abrupt("return", result);
2067
- case 54:
2068
- return _context5.abrupt("return", subscribeNext());
2069
- case 55:
2070
- case "end":
2071
- return _context5.stop();
2072
- }
2027
+ }
2028
+ _context5.next = 48;
2029
+ return requestInstance.unsubscribe();
2030
+ case 48:
2031
+ result = toResult(body);
2032
+ if (!callback) {
2033
+ _context5.next = 53;
2034
+ break;
2035
+ }
2036
+ callback(null, result);
2037
+ _context5.next = 54;
2038
+ break;
2039
+ case 53:
2040
+ return _context5.abrupt("return", result);
2041
+ case 54:
2042
+ return _context5.abrupt("return", subscribeNext());
2043
+ case 55:
2044
+ case "end":
2045
+ return _context5.stop();
2073
2046
  }
2074
2047
  }, _callee5, null, [[15, 22]]);
2075
2048
  }));
@@ -2083,28 +2056,26 @@ var CubeApi = /*#__PURE__*/function () {
2083
2056
  if (callback) {
2084
2057
  return {
2085
2058
  unsubscribe: function () {
2086
- var _unsubscribe = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee6() {
2059
+ var _unsubscribe = _asyncToGenerator__default['default'](/*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee6() {
2087
2060
  var requestInstance;
2088
2061
  return _regeneratorRuntime__default['default'].wrap(function _callee6$(_context6) {
2089
- while (1) {
2090
- switch (_context6.prev = _context6.next) {
2091
- case 0:
2092
- _context6.next = 2;
2093
- return requestPromise;
2094
- case 2:
2095
- requestInstance = _context6.sent;
2096
- unsubscribed = true;
2097
- if (!requestInstance.unsubscribe) {
2098
- _context6.next = 6;
2099
- break;
2100
- }
2101
- return _context6.abrupt("return", requestInstance.unsubscribe());
2102
- case 6:
2103
- return _context6.abrupt("return", null);
2104
- case 7:
2105
- case "end":
2106
- return _context6.stop();
2107
- }
2062
+ while (1) switch (_context6.prev = _context6.next) {
2063
+ case 0:
2064
+ _context6.next = 2;
2065
+ return requestPromise;
2066
+ case 2:
2067
+ requestInstance = _context6.sent;
2068
+ unsubscribed = true;
2069
+ if (!requestInstance.unsubscribe) {
2070
+ _context6.next = 6;
2071
+ break;
2072
+ }
2073
+ return _context6.abrupt("return", requestInstance.unsubscribe());
2074
+ case 6:
2075
+ return _context6.abrupt("return", null);
2076
+ case 7:
2077
+ case "end":
2078
+ return _context6.stop();
2108
2079
  }
2109
2080
  }, _callee6);
2110
2081
  }));
@@ -2121,68 +2092,64 @@ var CubeApi = /*#__PURE__*/function () {
2121
2092
  }, {
2122
2093
  key: "updateTransportAuthorization",
2123
2094
  value: function () {
2124
- var _updateTransportAuthorization = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee8() {
2095
+ var _updateTransportAuthorization = _asyncToGenerator__default['default'](/*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee8() {
2125
2096
  var _this2 = this;
2126
2097
  return _regeneratorRuntime__default['default'].wrap(function _callee8$(_context8) {
2127
- while (1) {
2128
- switch (_context8.prev = _context8.next) {
2129
- case 0:
2130
- if (!this.updateAuthorizationPromise) {
2131
- _context8.next = 4;
2132
- break;
2133
- }
2134
- _context8.next = 3;
2135
- return this.updateAuthorizationPromise;
2136
- case 3:
2137
- return _context8.abrupt("return");
2138
- case 4:
2139
- if (!(typeof this.apiToken === 'function')) {
2140
- _context8.next = 8;
2141
- break;
2142
- }
2143
- this.updateAuthorizationPromise = new Promise( /*#__PURE__*/function () {
2144
- var _ref6 = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee7(resolve, reject) {
2145
- var token;
2146
- return _regeneratorRuntime__default['default'].wrap(function _callee7$(_context7) {
2147
- while (1) {
2148
- switch (_context7.prev = _context7.next) {
2149
- case 0:
2150
- _context7.prev = 0;
2151
- _context7.next = 3;
2152
- return _this2.apiToken();
2153
- case 3:
2154
- token = _context7.sent;
2155
- if (_this2.transport.authorization !== token) {
2156
- _this2.transport.authorization = token;
2157
- }
2158
- resolve();
2159
- _context7.next = 11;
2160
- break;
2161
- case 8:
2162
- _context7.prev = 8;
2163
- _context7.t0 = _context7["catch"](0);
2164
- reject(_context7.t0);
2165
- case 11:
2166
- _context7.prev = 11;
2167
- _this2.updateAuthorizationPromise = null;
2168
- return _context7.finish(11);
2169
- case 14:
2170
- case "end":
2171
- return _context7.stop();
2172
- }
2173
- }
2174
- }, _callee7, null, [[0, 8, 11, 14]]);
2175
- }));
2176
- return function (_x6, _x7) {
2177
- return _ref6.apply(this, arguments);
2178
- };
2179
- }());
2098
+ while (1) switch (_context8.prev = _context8.next) {
2099
+ case 0:
2100
+ if (!this.updateAuthorizationPromise) {
2101
+ _context8.next = 4;
2102
+ break;
2103
+ }
2104
+ _context8.next = 3;
2105
+ return this.updateAuthorizationPromise;
2106
+ case 3:
2107
+ return _context8.abrupt("return");
2108
+ case 4:
2109
+ if (!(typeof this.apiToken === 'function')) {
2180
2110
  _context8.next = 8;
2181
- return this.updateAuthorizationPromise;
2182
- case 8:
2183
- case "end":
2184
- return _context8.stop();
2185
- }
2111
+ break;
2112
+ }
2113
+ this.updateAuthorizationPromise = new Promise(/*#__PURE__*/function () {
2114
+ var _ref6 = _asyncToGenerator__default['default'](/*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee7(resolve, reject) {
2115
+ var token;
2116
+ return _regeneratorRuntime__default['default'].wrap(function _callee7$(_context7) {
2117
+ while (1) switch (_context7.prev = _context7.next) {
2118
+ case 0:
2119
+ _context7.prev = 0;
2120
+ _context7.next = 3;
2121
+ return _this2.apiToken();
2122
+ case 3:
2123
+ token = _context7.sent;
2124
+ if (_this2.transport.authorization !== token) {
2125
+ _this2.transport.authorization = token;
2126
+ }
2127
+ resolve();
2128
+ _context7.next = 11;
2129
+ break;
2130
+ case 8:
2131
+ _context7.prev = 8;
2132
+ _context7.t0 = _context7["catch"](0);
2133
+ reject(_context7.t0);
2134
+ case 11:
2135
+ _context7.prev = 11;
2136
+ _this2.updateAuthorizationPromise = null;
2137
+ return _context7.finish(11);
2138
+ case 14:
2139
+ case "end":
2140
+ return _context7.stop();
2141
+ }
2142
+ }, _callee7, null, [[0, 8, 11, 14]]);
2143
+ }));
2144
+ return function (_x6, _x7) {
2145
+ return _ref6.apply(this, arguments);
2146
+ };
2147
+ }());
2148
+ _context8.next = 8;
2149
+ return this.updateAuthorizationPromise;
2150
+ case 8:
2151
+ case "end":
2152
+ return _context8.stop();
2186
2153
  }
2187
2154
  }, _callee8, this);
2188
2155
  }));
@@ -2352,7 +2319,6 @@ var CubeApi = /*#__PURE__*/function () {
2352
2319
  }, options, callback);
2353
2320
  }
2354
2321
  }]);
2355
- return CubeApi;
2356
2322
  }();
2357
2323
  var index = (function (apiToken, options) {
2358
2324
  return new CubeApi(apiToken, options);
@@ -2371,7 +2337,7 @@ exports.TIME_SERIES = TIME_SERIES;
2371
2337
  exports.addInterval = addInterval;
2372
2338
  exports.aliasSeries = aliasSeries;
2373
2339
  exports.areQueriesEqual = areQueriesEqual;
2374
- exports.dayRange = dayRange;
2340
+ exports.dayRange = _dayRange;
2375
2341
  exports.default = index;
2376
2342
  exports.defaultHeuristics = defaultHeuristics;
2377
2343
  exports.defaultOrder = defaultOrder;