@cubejs-client/core 1.5.10 → 1.5.12

package/dist/cubejs-client-core.cjs.js

@@ -619,9 +619,9 @@ function defaultHeuristics(newState, oldQuery, options) {
       });
     }
     if ((newChartType === 'pie' || newChartType === 'table' || newChartType === 'number') && (oldQuery.timeDimensions || []).length === 1 && oldQuery.timeDimensions[0].granularity) {
-      var _ref10 = oldQuery.timeDimensions,
-        _ref11 = _slicedToArray__default['default'](_ref10, 1),
-        _td2 = _ref11[0];
+      var _ref0 = oldQuery.timeDimensions,
+        _ref1 = _slicedToArray__default['default'](_ref0, 1),
+        _td2 = _ref1[0];
       return _objectSpread$3(_objectSpread$3({}, state), {}, {
         pivotConfig: null,
         shouldApplyHeuristicOrder: true,
@@ -708,10 +708,10 @@ function getOrderMembersFromOrder(orderMembers, order) {
   var indexedOrderMembers = ramda.indexBy(ramda.prop('id'), orderMembers);
   var entries = Array.isArray(order) ? order : Object.entries(order || {});
   var nextOrderMembers = [];
-  entries.forEach(function (_ref12) {
-    var _ref13 = _slicedToArray__default['default'](_ref12, 2),
-      memberId = _ref13[0],
-      currentOrder = _ref13[1];
+  entries.forEach(function (_ref10) {
+    var _ref11 = _slicedToArray__default['default'](_ref10, 2),
+      memberId = _ref11[0],
+      currentOrder = _ref11[1];
     if (currentOrder !== 'none' && indexedOrderMembers[memberId]) {
       ids.add(memberId);
       nextOrderMembers.push(_objectSpread$3(_objectSpread$3({}, indexedOrderMembers[memberId]), {}, {
@@ -1017,9 +1017,9 @@ var ResultSet = /*#__PURE__*/function () {
           title: title,
           shortTitle: shortTitle,
           key: key,
-          series: _this.chartPivot(pivotConfig).map(function (_ref10) {
-            var x = _ref10.x,
-              obj = _objectWithoutProperties__default['default'](_ref10, _excluded$1);
+          series: _this.chartPivot(pivotConfig).map(function (_ref0) {
+            var x = _ref0.x,
+              obj = _objectWithoutProperties__default['default'](_ref0, _excluded$1);
             return {
               value: obj[key],
               x: x
@@ -1162,8 +1162,8 @@ var ResultSet = /*#__PURE__*/function () {
       var query = this.loadResponse.pivotQuery;
       var pivotImpl = function pivotImpl() {
         var resultIndex = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 0;
-        var groupByXAxis = groupByToPairs(function (_ref11) {
-          var xValues = _ref11.xValues;
+        var groupByXAxis = groupByToPairs(function (_ref1) {
+          var xValues = _ref1.xValues;
           return _this2.axisValuesString(xValues);
         });
         var measureValue = function measureValue(row, measure) {
@@ -1180,8 +1180,8 @@ var ResultSet = /*#__PURE__*/function () {
           if (series[0]) {
             groupByXAxis = function groupByXAxis(rows) {
               var _series$resultIndex$m, _series$resultIndex;
-              var byXValues = ramda.groupBy(function (_ref12) {
-                var xValues = _ref12.xValues;
+              var byXValues = ramda.groupBy(function (_ref10) {
+                var xValues = _ref10.xValues;
                 return xValues[0];
               }, rows);
               return (_series$resultIndex$m = (_series$resultIndex = series[resultIndex]) === null || _series$resultIndex === void 0 ? void 0 : _series$resultIndex.map(function (d) {
@@ -1202,11 +1202,11 @@ var ResultSet = /*#__PURE__*/function () {
           });
         }), unnest, groupByXAxis)(_this2.timeDimensionBackwardCompatibleData(resultIndex));
         var yValuesMap = {};
-        xGrouped.forEach(function (_ref13) {
-          var _ref14 = _slicedToArray__default['default'](_ref13, 2),
-            rows = _ref14[1];
-          rows.forEach(function (_ref15) {
-            var row = _ref15.row;
+        xGrouped.forEach(function (_ref11) {
+          var _ref12 = _slicedToArray__default['default'](_ref11, 2),
+            rows = _ref12[1];
+          rows.forEach(function (_ref13) {
+            var row = _ref13.row;
             _this2.axisValues(normalizedPivotConfig.y, resultIndex)(row).forEach(function (values) {
               if (Object.keys(row).length > 0) {
                 yValuesMap[values.join()] = values;
@@ -1218,13 +1218,13 @@ var ResultSet = /*#__PURE__*/function () {
         var measureOnX = Boolean(normalizedPivotConfig.x.find(function (d) {
           return d === 'measures';
         }));
-        return xGrouped.map(function (_ref16) {
-          var _ref17 = _slicedToArray__default['default'](_ref16, 2),
-            rows = _ref17[1];
+        return xGrouped.map(function (_ref14) {
+          var _ref15 = _slicedToArray__default['default'](_ref14, 2),
+            rows = _ref15[1];
           var xValues = rows[0].xValues;
           var yGrouped = {};
-          rows.forEach(function (_ref18) {
-            var row = _ref18.row;
+          rows.forEach(function (_ref16) {
+            var row = _ref16.row;
             var arr = _this2.axisValues(normalizedPivotConfig.y, resultIndex)(row).map(function (yValues) {
               return {
                 yValues: yValues,
@@ -1366,9 +1366,9 @@ var ResultSet = /*#__PURE__*/function () {
       };
       var duplicateMeasures = new Set();
       if (this.queryType === QUERY_TYPE.BLENDING_QUERY) {
-        var allMeasures = ramda.flatten(this.loadResponses.map(function (_ref19) {
+        var allMeasures = ramda.flatten(this.loadResponses.map(function (_ref17) {
           var _query$measures;
-          var query = _ref19.query;
+          var query = _ref17.query;
           return (_query$measures = query.measures) !== null && _query$measures !== void 0 ? _query$measures : [];
         }));
         allMeasures.filter(function (e, i, a) {
@@ -1377,14 +1377,14 @@ var ResultSet = /*#__PURE__*/function () {
           return duplicateMeasures.add(m);
         });
       }
-      return this.pivot(pivotConfig).map(function (_ref20) {
-        var xValues = _ref20.xValues,
-          yValuesArray = _ref20.yValuesArray;
+      return this.pivot(pivotConfig).map(function (_ref18) {
+        var xValues = _ref18.xValues,
+          yValuesArray = _ref18.yValuesArray;
         var yValuesMap = {};
-        yValuesArray.forEach(function (_ref21, i) {
-          var _ref22 = _slicedToArray__default['default'](_ref21, 2),
-            yValues = _ref22[0],
-            m = _ref22[1];
+        yValuesArray.forEach(function (_ref19, i) {
+          var _ref20 = _slicedToArray__default['default'](_ref19, 2),
+            yValues = _ref20[0],
+            m = _ref20[1];
           yValuesMap[_this3.axisValuesString(aliasSeries(yValues, i, pivotConfig, duplicateMeasures), ',')] = m && validate(m);
         });
         return _objectSpread$2({
@@ -1426,15 +1426,15 @@ var ResultSet = /*#__PURE__*/function () {
     value: function tablePivot(pivotConfig) {
       var normalizedPivotConfig = this.normalizePivotConfig(pivotConfig || {});
       var isMeasuresPresent = normalizedPivotConfig.x.concat(normalizedPivotConfig.y).includes('measures');
-      return this.pivot(normalizedPivotConfig).map(function (_ref23) {
-        var xValues = _ref23.xValues,
-          yValuesArray = _ref23.yValuesArray;
+      return this.pivot(normalizedPivotConfig).map(function (_ref21) {
+        var xValues = _ref21.xValues,
+          yValuesArray = _ref21.yValuesArray;
         return ramda.fromPairs([].concat(_toConsumableArray__default['default'](normalizedPivotConfig.x.map(function (key, index) {
           return [key, xValues[index]];
-        })), _toConsumableArray__default['default'](isMeasuresPresent ? yValuesArray.map(function (_ref24) {
-          var _ref25 = _slicedToArray__default['default'](_ref24, 2),
-            yValues = _ref25[0],
-            measure = _ref25[1];
+        })), _toConsumableArray__default['default'](isMeasuresPresent ? yValuesArray.map(function (_ref22) {
+          var _ref23 = _slicedToArray__default['default'](_ref22, 2),
+            yValues = _ref23[0],
+            measure = _ref23[1];
           return [yValues.length ? yValues.join() : 'value', measure];
         }) : [])));
       });
@@ -1554,12 +1554,12 @@ var ResultSet = /*#__PURE__*/function () {
       }, {});
       var schema = {};
       var extractFields = function extractFields(key) {
-        var _ref26 = flatMeta[key] || {},
-          title = _ref26.title,
-          shortTitle = _ref26.shortTitle,
-          type = _ref26.type,
-          format = _ref26.format,
-          meta = _ref26.meta;
+        var _ref24 = flatMeta[key] || {},
+          title = _ref24.title,
+          shortTitle = _ref24.shortTitle,
+          type = _ref24.type,
+          format = _ref24.format,
+          meta = _ref24.meta;
         return {
           key: key,
           title: title,
@@ -1570,9 +1570,9 @@ var ResultSet = /*#__PURE__*/function () {
         };
       };
       var pivot = this.pivot(normalizedPivotConfig);
-      (((_pivot$ = pivot[0]) === null || _pivot$ === void 0 ? void 0 : _pivot$.yValuesArray) || []).forEach(function (_ref27) {
-        var _ref28 = _slicedToArray__default['default'](_ref27, 1),
-          yValues = _ref28[0];
+      (((_pivot$ = pivot[0]) === null || _pivot$ === void 0 ? void 0 : _pivot$.yValuesArray) || []).forEach(function (_ref25) {
+        var _ref26 = _slicedToArray__default['default'](_ref25, 1),
+          yValues = _ref26[0];
         if (yValues.length > 0) {
           var currentItem = schema;
           yValues.forEach(function (value, index) {
@@ -1592,9 +1592,9 @@ var ResultSet = /*#__PURE__*/function () {
         if (Object.keys(item).length === 0) {
           return [];
         }
-        return Object.values(item).map(function (_ref29) {
-          var key = _ref29.key,
-            currentItem = _objectWithoutProperties__default['default'](_ref29, _excluded2);
+        return Object.values(item).map(function (_ref27) {
+          var key = _ref27.key,
+            currentItem = _objectWithoutProperties__default['default'](_ref27, _excluded2);
           var children = _toColumns(currentItem.children, [].concat(_toConsumableArray__default['default'](path), [key]));
           var _extractFields = extractFields(currentItem.memberId),
             title = _extractFields.title,
@@ -1702,9 +1702,9 @@ var ResultSet = /*#__PURE__*/function () {
       }));
       var duplicateMeasures = new Set();
       if (this.queryType === QUERY_TYPE.BLENDING_QUERY) {
-        var allMeasures = ramda.flatten(this.loadResponses.map(function (_ref30) {
+        var allMeasures = ramda.flatten(this.loadResponses.map(function (_ref28) {
           var _query$measures2;
-          var query = _ref30.query;
+          var query = _ref28.query;
           return (_query$measures2 = query.measures) !== null && _query$measures2 !== void 0 ? _query$measures2 : [];
         }));
         allMeasures.filter(function (e, i, a) {
@@ -1866,11 +1866,11 @@ var ResultSet = /*#__PURE__*/function () {
         fillMissingDates: true,
         joinDateRange: false
       };
-      var _ref31 = query || {},
-        _ref31$measures = _ref31.measures,
-        measures = _ref31$measures === void 0 ? [] : _ref31$measures,
-        _ref31$dimensions = _ref31.dimensions,
-        dimensions = _ref31$dimensions === void 0 ? [] : _ref31$dimensions;
+      var _ref29 = query || {},
+        _ref29$measures = _ref29.measures,
+        measures = _ref29$measures === void 0 ? [] : _ref29$measures,
+        _ref29$dimensions = _ref29.dimensions,
+        dimensions = _ref29$dimensions === void 0 ? [] : _ref29$dimensions;
       var timeDimensions = ((query === null || query === void 0 ? void 0 : query.timeDimensions) || []).filter(function (td) {
         return !!td.granularity;
       });
@@ -2223,117 +2223,117 @@ function responseChunks(_x) {
 }
 function _responseChunks() {
   _responseChunks = _wrapAsyncGenerator__default['default'](/*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee(res) {
-    var body, reader, _yield$_awaitAsyncGen, done, value, _reader$releaseLock, _iteratorAbruptCompletion, _didIteratorError, _iteratorError, _iterator, _step, chunk;
-    return _regeneratorRuntime__default['default'].wrap(function _callee$(_context) {
+    var body, reader, _yield$_awaitAsyncGen, done, value, _reader$releaseLock, _iteratorAbruptCompletion, _didIteratorError, _iteratorError, _iterator, _step, chunk, _t;
+    return _regeneratorRuntime__default['default'].wrap(function (_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
           // eslint-disable-next-line prefer-destructuring
           body = res.body;
           if (!(body && typeof body.getReader === 'function')) {
-            _context.next = 21;
+            _context.next = 8;
             break;
           }
           reader = body.getReader(); // Browser / Node native fetch
-          _context.prev = 3;
-        case 4:
-          _context.next = 7;
+          _context.prev = 1;
+        case 2:
+          _context.next = 3;
           return _awaitAsyncGenerator__default['default'](reader.read());
-        case 7:
+        case 3:
           _yield$_awaitAsyncGen = _context.sent;
           done = _yield$_awaitAsyncGen.done;
           value = _yield$_awaitAsyncGen.value;
           if (!done) {
-            _context.next = 12;
+            _context.next = 4;
             break;
           }
-          return _context.abrupt("break", 17);
-        case 12:
+          return _context.abrupt("continue", 6);
+        case 4:
           if (!value) {
-            _context.next = 15;
+            _context.next = 5;
             break;
           }
-          _context.next = 15;
+          _context.next = 5;
           return value;
-        case 15:
-          _context.next = 4;
+        case 5:
+          _context.next = 2;
           break;
-        case 17:
-          _context.prev = 17;
+        case 6:
+          _context.prev = 6;
           (_reader$releaseLock = reader.releaseLock) === null || _reader$releaseLock === void 0 || _reader$releaseLock.call(reader);
-          return _context.finish(17);
-        case 20:
+          return _context.finish(6);
+        case 7:
           return _context.abrupt("return");
-        case 21:
+        case 8:
           if (!(body && Symbol.asyncIterator in body)) {
-            _context.next = 57;
+            _context.next = 23;
             break;
           }
           _iteratorAbruptCompletion = false;
           _didIteratorError = false;
-          _context.prev = 24;
+          _context.prev = 9;
           _iterator = _asyncIterator$1(body);
-        case 26:
-          _context.next = 28;
+        case 10:
+          _context.next = 11;
           return _awaitAsyncGenerator__default['default'](_iterator.next());
-        case 28:
+        case 11:
           if (!(_iteratorAbruptCompletion = !(_step = _context.sent).done)) {
-            _context.next = 40;
+            _context.next = 15;
             break;
           }
           chunk = _step.value;
           if (!(typeof chunk === 'string')) {
-            _context.next = 35;
+            _context.next = 13;
             break;
           }
-          _context.next = 33;
+          _context.next = 12;
           return new TextEncoder().encode(chunk);
-        case 33:
-          _context.next = 37;
+        case 12:
+          _context.next = 14;
           break;
-        case 35:
-          _context.next = 37;
+        case 13:
+          _context.next = 14;
           return new Uint8Array(chunk);
-        case 37:
+        case 14:
           _iteratorAbruptCompletion = false;
-          _context.next = 26;
+          _context.next = 10;
           break;
-        case 40:
-          _context.next = 46;
+        case 15:
+          _context.next = 17;
           break;
-        case 42:
-          _context.prev = 42;
-          _context.t0 = _context["catch"](24);
+        case 16:
+          _context.prev = 16;
+          _t = _context["catch"](9);
           _didIteratorError = true;
-          _iteratorError = _context.t0;
-        case 46:
-          _context.prev = 46;
-          _context.prev = 47;
+          _iteratorError = _t;
+        case 17:
+          _context.prev = 17;
+          _context.prev = 18;
           if (!(_iteratorAbruptCompletion && _iterator["return"] != null)) {
-            _context.next = 51;
+            _context.next = 19;
             break;
           }
-          _context.next = 51;
+          _context.next = 19;
           return _awaitAsyncGenerator__default['default'](_iterator["return"]());
-        case 51:
-          _context.prev = 51;
+        case 19:
+          _context.prev = 19;
           if (!_didIteratorError) {
-            _context.next = 54;
+            _context.next = 20;
             break;
           }
           throw _iteratorError;
-        case 54:
-          return _context.finish(51);
-        case 55:
-          return _context.finish(46);
-        case 56:
+        case 20:
+          return _context.finish(19);
+        case 21:
+          return _context.finish(17);
+        case 22:
           return _context.abrupt("return");
-        case 57:
+        case 23:
           throw new Error('Unsupported response body type for streaming');
-        case 58:
+        case 24:
         case "end":
           return _context.stop();
       }
-    }, _callee, null, [[3,, 17, 20], [24, 42, 46, 56], [47,, 51, 55]]);
+    }, _callee, null, [[1,, 6, 7], [9, 16, 17, 22], [18,, 19, 21]]);
   }));
   return _responseChunks.apply(this, arguments);
 }
@@ -2413,23 +2413,23 @@ var HttpTransport = /*#__PURE__*/function () {
         /* eslint no-unsafe-finally: off */subscribe: function subscribe(callback) {
           var _this2 = this;
           return _asyncToGenerator__default['default'](/*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee() {
-            var result, errorMessage, _actualSignal$reason, _result;
-            return _regeneratorRuntime__default['default'].wrap(function _callee$(_context) {
+            var result, errorMessage, _actualSignal$reason, _result, _t;
+            return _regeneratorRuntime__default['default'].wrap(function (_context) {
               while (1) switch (_context.prev = _context.next) {
                 case 0:
                   _context.prev = 0;
-                  _context.next = 3;
+                  _context.next = 1;
                   return runRequest();
-                case 3:
+                case 1:
                   result = _context.sent;
                   return _context.abrupt("return", callback(result, function () {
                     return _this2.subscribe(callback);
                   }));
-                case 7:
-                  _context.prev = 7;
-                  _context.t0 = _context["catch"](0);
+                case 2:
+                  _context.prev = 2;
+                  _t = _context["catch"](0);
                   errorMessage = 'network Error';
-                  if (_context.t0.name === 'AbortError') {
+                  if (_t.name === 'AbortError') {
                     if ((actualSignal === null || actualSignal === void 0 ? void 0 : actualSignal.reason) === 'TimeoutError' || (actualSignal === null || actualSignal === void 0 || (_actualSignal$reason = actualSignal.reason) === null || _actualSignal$reason === void 0 ? void 0 : _actualSignal$reason.name) === 'TimeoutError') {
                       errorMessage = 'timeout';
                     } else {
@@ -2442,11 +2442,11 @@ var HttpTransport = /*#__PURE__*/function () {
                   return _context.abrupt("return", callback(_result, function () {
                     return _this2.subscribe(callback);
                   }));
-                case 13:
+                case 3:
                 case "end":
                   return _context.stop();
               }
-            }, _callee, null, [[0, 7]]);
+            }, _callee, null, [[0, 2]]);
           }))();
         }
       };
@@ -2494,10 +2494,10 @@ var HttpTransport = /*#__PURE__*/function () {
         stream: function () {
           var _stream = _asyncToGenerator__default['default'](/*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee2() {
             var response;
-            return _regeneratorRuntime__default['default'].wrap(function _callee2$(_context2) {
+            return _regeneratorRuntime__default['default'].wrap(function (_context2) {
               while (1) switch (_context2.prev = _context2.next) {
                 case 0:
-                  _context2.next = 2;
+                  _context2.next = 1;
                   return fetch__default['default'](url, {
                     method: requestMethod,
                     headers: _objectSpread$1({
@@ -2508,22 +2508,22 @@ var HttpTransport = /*#__PURE__*/function () {
                     body: requestMethod === 'POST' ? JSON.stringify(params || {}) : null,
                     signal: actualSignal
                   });
-                case 2:
+                case 1:
                   response = _context2.sent;
                   if (response.ok) {
-                    _context2.next = 5;
+                    _context2.next = 2;
                     break;
                   }
                   throw new Error("HTTP ".concat(response.status, ": ").concat(response.statusText));
-                case 5:
+                case 2:
                   if (response.body) {
-                    _context2.next = 7;
+                    _context2.next = 3;
                     break;
                   }
                   throw new Error('No response body available for streaming');
-                case 7:
+                case 3:
                   return _context2.abrupt("return", responseChunks(response));
-                case 8:
+                case 4:
                 case "end":
                   return _context2.stop();
               }
@@ -2536,7 +2536,7 @@ var HttpTransport = /*#__PURE__*/function () {
         }(),
         unsubscribe: function () {
           var _unsubscribe = _asyncToGenerator__default['default'](/*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee3() {
-            return _regeneratorRuntime__default['default'].wrap(function _callee3$(_context3) {
+            return _regeneratorRuntime__default['default'].wrap(function (_context3) {
               while (1) switch (_context3.prev = _context3.next) {
                 case 0:
                   if (controller) {
@@ -2668,9 +2668,9 @@ var CubeApi = /*#__PURE__*/function () {
   return _createClass__default['default'](CubeApi, [{
     key: "request",
     value: function request(method, params) {
-      return this.transport.request(method, _objectSpread({
-        baseRequestId: uuid.v4()
-      }, params));
+      return this.transport.request(method, _objectSpread(_objectSpread({}, params), {}, {
+        baseRequestId: (params === null || params === void 0 ? void 0 : params.baseRequestId) || uuid.v4()
+      }));
     }
   }, {
     key: "loadMethod",
@@ -2694,27 +2694,27 @@ var CubeApi = /*#__PURE__*/function () {
       var checkMutex = /*#__PURE__*/function () {
         var _ref = _asyncToGenerator__default['default'](/*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee() {
           var requestInstance;
-          return _regeneratorRuntime__default['default'].wrap(function _callee$(_context) {
+          return _regeneratorRuntime__default['default'].wrap(function (_context) {
             while (1) switch (_context.prev = _context.next) {
               case 0:
-                _context.next = 2;
+                _context.next = 1;
                 return requestPromise;
-              case 2:
+              case 1:
                 requestInstance = _context.sent;
                 if (!(options && options.mutexObj && options.mutexObj[mutexKey] !== mutexValue)) {
-                  _context.next = 9;
+                  _context.next = 3;
                   break;
                 }
                 unsubscribed = true;
                 if (!requestInstance.unsubscribe) {
-                  _context.next = 8;
+                  _context.next = 2;
                   break;
                 }
-                _context.next = 8;
+                _context.next = 2;
                 return requestInstance.unsubscribe();
-              case 8:
+              case 2:
                 throw MUTEX_ERROR;
-              case 9:
+              case 3:
               case "end":
                 return _context.stop();
             }
@@ -2729,40 +2729,40 @@ var CubeApi = /*#__PURE__*/function () {
         var _ref2 = _asyncToGenerator__default['default'](/*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee4(response, next) {
           var _options2, _response$error, _options5;
           var requestInstance, subscribeNext, continueWait, body, text, _options3, _options4, _error, result;
-          return _regeneratorRuntime__default['default'].wrap(function _callee4$(_context4) {
+          return _regeneratorRuntime__default['default'].wrap(function (_context4) {
             while (1) switch (_context4.prev = _context4.next) {
               case 0:
-                _context4.next = 2;
+                _context4.next = 1;
                 return requestPromise;
-              case 2:
+              case 1:
                 requestInstance = _context4.sent;
                 subscribeNext = /*#__PURE__*/function () {
                   var _ref3 = _asyncToGenerator__default['default'](/*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee2() {
                     var _options;
-                    return _regeneratorRuntime__default['default'].wrap(function _callee2$(_context2) {
+                    return _regeneratorRuntime__default['default'].wrap(function (_context2) {
                       while (1) switch (_context2.prev = _context2.next) {
                         case 0:
                           if (!((_options = options) !== null && _options !== void 0 && _options.subscribe && !unsubscribed)) {
-                            _context2.next = 8;
+                            _context2.next = 3;
                             break;
                           }
                           if (!requestInstance.unsubscribe) {
-                            _context2.next = 5;
+                            _context2.next = 1;
                             break;
                           }
                           return _context2.abrupt("return", next());
-                        case 5:
-                          _context2.next = 7;
+                        case 1:
+                          _context2.next = 2;
                           return new Promise(function (resolve) {
                             return setTimeout(function () {
                               return resolve();
                             }, _this2.pollInterval * 1000);
                           });
-                        case 7:
+                        case 2:
                           return _context2.abrupt("return", next());
-                        case 8:
+                        case 3:
                           return _context2.abrupt("return", null);
-                        case 9:
+                        case 4:
                         case "end":
                           return _context2.stop();
                       }
@@ -2776,29 +2776,29 @@ var CubeApi = /*#__PURE__*/function () {
                   var _ref4 = _asyncToGenerator__default['default'](/*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee3() {
                     var wait,
                       _args3 = arguments;
-                    return _regeneratorRuntime__default['default'].wrap(function _callee3$(_context3) {
+                    return _regeneratorRuntime__default['default'].wrap(function (_context3) {
                       while (1) switch (_context3.prev = _context3.next) {
                         case 0:
                           wait = _args3.length > 0 && _args3[0] !== undefined ? _args3[0] : false;
                           if (unsubscribed) {
-                            _context3.next = 6;
+                            _context3.next = 2;
                             break;
                           }
                           if (!wait) {
-                            _context3.next = 5;
+                            _context3.next = 1;
                             break;
                           }
-                          _context3.next = 5;
+                          _context3.next = 1;
                           return new Promise(function (resolve) {
                             return setTimeout(function () {
                               return resolve();
                             }, _this2.pollInterval * 1000);
                           });
-                        case 5:
+                        case 1:
                           return _context3.abrupt("return", next());
-                        case 6:
+                        case 2:
                           return _context3.abrupt("return", null);
-                        case 7:
+                        case 3:
                         case "end":
                           return _context3.stop();
                       }
@@ -2809,105 +2809,105 @@ var CubeApi = /*#__PURE__*/function () {
                   };
                 }();
                 if (!((_options2 = options) !== null && _options2 !== void 0 && _options2.subscribe && !skipAuthorizationUpdate)) {
-                  _context4.next = 8;
+                  _context4.next = 2;
                   break;
                 }
-                _context4.next = 8;
+                _context4.next = 2;
                 return _this2.updateTransportAuthorization();
-              case 8:
+              case 2:
                 skipAuthorizationUpdate = false;
                 if (!('status' in response && response.status === 502 || 'error' in response && ((_response$error = response.error) === null || _response$error === void 0 ? void 0 : _response$error.toLowerCase()) === 'network error' && --networkRetries >= 0)) {
-                  _context4.next = 13;
+                  _context4.next = 4;
                   break;
                 }
-                _context4.next = 12;
+                _context4.next = 3;
                 return checkMutex();
-              case 12:
+              case 3:
                 return _context4.abrupt("return", continueWait(true));
-              case 13:
+              case 4:
                 // From here we're sure that response is only fetch Response
                 response = response;
                 body = {};
                 text = '';
-                _context4.prev = 16;
-                _context4.next = 19;
+                _context4.prev = 5;
+                _context4.next = 6;
                 return response.text();
-              case 19:
+              case 6:
                 text = _context4.sent;
                 body = JSON.parse(text);
-                _context4.next = 26;
+                _context4.next = 8;
                 break;
-              case 23:
-                _context4.prev = 23;
-                _context4.t0 = _context4["catch"](16);
+              case 7:
+                _context4.prev = 7;
+                _context4["catch"](5);
                 body.error = text;
-              case 26:
+              case 8:
                 if (!(body.error === 'Continue wait')) {
-                  _context4.next = 31;
+                  _context4.next = 10;
                   break;
                 }
-                _context4.next = 29;
+                _context4.next = 9;
                 return checkMutex();
-              case 29:
+              case 9:
                 if ((_options3 = options) !== null && _options3 !== void 0 && _options3.progressCallback) {
                   options.progressCallback(new ProgressResult(body));
                 }
                 return _context4.abrupt("return", continueWait());
-              case 31:
+              case 10:
                 if (!(response.status !== 200)) {
-                  _context4.next = 44;
+                  _context4.next = 15;
                   break;
                 }
-                _context4.next = 34;
+                _context4.next = 11;
                 return checkMutex();
-              case 34:
+              case 11:
                 if (!(!((_options4 = options) !== null && _options4 !== void 0 && _options4.subscribe) && requestInstance.unsubscribe)) {
-                  _context4.next = 37;
+                  _context4.next = 12;
                   break;
                 }
-                _context4.next = 37;
+                _context4.next = 12;
                 return requestInstance.unsubscribe();
-              case 37:
+              case 12:
                 _error = new RequestError(body.error || response.error || '', body, response.status);
                 if (!callback) {
-                  _context4.next = 42;
+                  _context4.next = 13;
                   break;
                 }
                 callback(_error);
-                _context4.next = 43;
+                _context4.next = 14;
                 break;
-              case 42:
+              case 13:
                 throw _error;
-              case 43:
+              case 14:
                 return _context4.abrupt("return", subscribeNext());
-              case 44:
-                _context4.next = 46;
+              case 15:
+                _context4.next = 16;
                 return checkMutex();
-              case 46:
+              case 16:
                 if (!(!((_options5 = options) !== null && _options5 !== void 0 && _options5.subscribe) && requestInstance.unsubscribe)) {
-                  _context4.next = 49;
+                  _context4.next = 17;
                   break;
                 }
-                _context4.next = 49;
+                _context4.next = 17;
                 return requestInstance.unsubscribe();
-              case 49:
+              case 17:
                 result = toResult(body);
                 if (!callback) {
-                  _context4.next = 54;
+                  _context4.next = 18;
                   break;
                 }
                 callback(null, result);
-                _context4.next = 55;
+                _context4.next = 19;
                 break;
-              case 54:
+              case 18:
                 return _context4.abrupt("return", result);
-              case 55:
+              case 19:
                 return _context4.abrupt("return", subscribeNext());
-              case 56:
+              case 20:
               case "end":
                 return _context4.stop();
             }
-          }, _callee4, null, [[16, 23]]);
+          }, _callee4, null, [[5, 7]]);
         }));
         return function loadImpl(_x, _x2) {
           return _ref2.apply(this, arguments);
@@ -2921,22 +2921,22 @@ var CubeApi = /*#__PURE__*/function () {
           unsubscribe: function () {
             var _unsubscribe = _asyncToGenerator__default['default'](/*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee5() {
               var requestInstance;
-              return _regeneratorRuntime__default['default'].wrap(function _callee5$(_context5) {
+              return _regeneratorRuntime__default['default'].wrap(function (_context5) {
                 while (1) switch (_context5.prev = _context5.next) {
                   case 0:
-                    _context5.next = 2;
+                    _context5.next = 1;
                     return requestPromise;
-                  case 2:
+                  case 1:
                     requestInstance = _context5.sent;
                     unsubscribed = true;
                     if (!requestInstance.unsubscribe) {
-                      _context5.next = 6;
+                      _context5.next = 2;
                       break;
                     }
                     return _context5.abrupt("return", requestInstance.unsubscribe());
-                  case 6:
+                  case 2:
                     return _context5.abrupt("return", null);
-                  case 7:
+                  case 3:
                   case "end":
                     return _context5.stop();
                 }
@@ -2958,50 +2958,50 @@ var CubeApi = /*#__PURE__*/function () {
       var _updateTransportAuthorization = _asyncToGenerator__default['default'](/*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee7() {
         var _this3 = this;
         var tokenFetcher, promise;
-        return _regeneratorRuntime__default['default'].wrap(function _callee7$(_context7) {
+        return _regeneratorRuntime__default['default'].wrap(function (_context7) {
           while (1) switch (_context7.prev = _context7.next) {
             case 0:
               if (!this.updateAuthorizationPromise) {
-                _context7.next = 4;
+                _context7.next = 2;
                 break;
               }
-              _context7.next = 3;
+              _context7.next = 1;
               return this.updateAuthorizationPromise;
-            case 3:
+            case 1:
               return _context7.abrupt("return");
-            case 4:
+            case 2:
               tokenFetcher = this.apiToken;
               if (!(typeof tokenFetcher === 'function')) {
-                _context7.next = 10;
+                _context7.next = 3;
                 break;
               }
               promise = _asyncToGenerator__default['default'](/*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee6() {
                 var token;
-                return _regeneratorRuntime__default['default'].wrap(function _callee6$(_context6) {
+                return _regeneratorRuntime__default['default'].wrap(function (_context6) {
                   while (1) switch (_context6.prev = _context6.next) {
                     case 0:
                       _context6.prev = 0;
-                      _context6.next = 3;
+                      _context6.next = 1;
                       return tokenFetcher();
-                    case 3:
+                    case 1:
                       token = _context6.sent;
                       if (_this3.transport.authorization !== token) {
                         _this3.transport.authorization = token;
                       }
-                    case 5:
-                      _context6.prev = 5;
+                    case 2:
+                      _context6.prev = 2;
                       _this3.updateAuthorizationPromise = null;
-                      return _context6.finish(5);
-                    case 8:
+                      return _context6.finish(2);
+                    case 3:
                     case "end":
                       return _context6.stop();
                   }
-                }, _callee6, null, [[0,, 5, 8]]);
+                }, _callee6, null, [[0,, 2, 3]]);
               }))();
               this.updateAuthorizationPromise = promise;
-              _context7.next = 10;
+              _context7.next = 3;
               return promise;
-            case 10:
+            case 3:
             case "end":
               return _context7.stop();
           }
@@ -3116,11 +3116,12 @@ var CubeApi = /*#__PURE__*/function () {
       query = _this$prepareQueryOpt2[0];
       options = _this$prepareQueryOpt2[1];
       return this.loadMethod(function () {
-        var _options6;
+        var _options6, _options7;
         return _this4.request('load', {
           query: query,
           queryType: 'multi',
-          signal: (_options6 = options) === null || _options6 === void 0 ? void 0 : _options6.signal
+          signal: (_options6 = options) === null || _options6 === void 0 ? void 0 : _options6.signal,
+          baseRequestId: (_options7 = options) === null || _options7 === void 0 ? void 0 : _options7.baseRequestId
         });
       }, function (response) {
         return _this4.loadResponseInternal(response, options);
@@ -3186,11 +3187,12 @@ var CubeApi = /*#__PURE__*/function () {
       query = _this$prepareQueryOpt4[0];
       options = _this$prepareQueryOpt4[1];
       return this.loadMethod(function () {
-        var _options7;
+        var _options8, _options9;
         return _this6.request('subscribe', {
           query: query,
           queryType: 'multi',
-          signal: (_options7 = options) === null || _options7 === void 0 ? void 0 : _options7.signal
+          signal: (_options8 = options) === null || _options8 === void 0 ? void 0 : _options8.signal,
+          baseRequestId: (_options9 = options) === null || _options9 === void 0 ? void 0 : _options9.baseRequestId
         });
       }, function (response) {
         return _this6.loadResponseInternal(response, options);
@@ -3209,7 +3211,8 @@ var CubeApi = /*#__PURE__*/function () {
       return this.loadMethod(function () {
         return _this7.request('sql', {
           query: query,
-          signal: options === null || options === void 0 ? void 0 : options.signal
+          signal: options === null || options === void 0 ? void 0 : options.signal,
+          baseRequestId: options === null || options === void 0 ? void 0 : options.baseRequestId
         });
       }, function (response) {
         return Array.isArray(response) ? response.map(function (body) {
@@ -3227,7 +3230,8 @@ var CubeApi = /*#__PURE__*/function () {
       var _this8 = this;
       return this.loadMethod(function () {
         return _this8.request('meta', {
-          signal: options === null || options === void 0 ? void 0 : options.signal
+          signal: options === null || options === void 0 ? void 0 : options.signal,
+          baseRequestId: options === null || options === void 0 ? void 0 : options.baseRequestId
         });
       }, function (body) {
         return new Meta(body);
@@ -3244,7 +3248,8 @@ var CubeApi = /*#__PURE__*/function () {
       return this.loadMethod(function () {
         return _this9.request('dry-run', {
           query: query,
-          signal: options === null || options === void 0 ? void 0 : options.signal
+          signal: options === null || options === void 0 ? void 0 : options.signal,
+          baseRequestId: options === null || options === void 0 ? void 0 : options.baseRequestId
         });
       }, function (response) {
         return response;
@@ -3257,14 +3262,15 @@ var CubeApi = /*#__PURE__*/function () {
      * Execute a Cube SQL query against Cube SQL interface and return the results.
      */
     function cubeSql(sqlQuery, options, callback) {
-      var _this10 = this;
+      var _this0 = this;
       return this.loadMethod(function () {
-        var request = _this10.request('cubesql', {
+        var request = _this0.request('cubesql', {
           query: sqlQuery,
           cache: options === null || options === void 0 ? void 0 : options.cache,
           method: 'POST',
           signal: options === null || options === void 0 ? void 0 : options.signal,
-          fetchTimeout: options === null || options === void 0 ? void 0 : options.timeout
+          fetchTimeout: options === null || options === void 0 ? void 0 : options.timeout,
+          baseRequestId: options === null || options === void 0 ? void 0 : options.baseRequestId
         });
         return request;
       }, function (response) {
@@ -3284,7 +3290,7 @@ var CubeApi = /*#__PURE__*/function () {
         var _response$error$split = response.error.split('\n'),
           _response$error$split2 = _toArray__default['default'](_response$error$split),
           schema = _response$error$split2[0],
-          data = _response$error$split2.slice(1);
+          data = _arrayLikeToArray(_response$error$split2).slice(1);
         try {
           return {
             schema: JSON.parse(schema).schema,
@@ -3311,16 +3317,16 @@ var CubeApi = /*#__PURE__*/function () {
     value: function cubeSqlStream(sqlQuery, options) {
       var _this = this;
       return _wrapAsyncGenerator__default['default'](/*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee8() {
-        var streamResponse, decoder, buffer, stream, _iteratorAbruptCompletion, _didIteratorError, _iteratorError, _iterator, _step, chunk, lines, _iterator2, _step2, line, parsed, _parsed;
-        return _regeneratorRuntime__default['default'].wrap(function _callee8$(_context8) {
+        var streamResponse, decoder, buffer, stream, _iteratorAbruptCompletion, _didIteratorError, _iteratorError, _iterator, _step, chunk, lines, _iterator2, _step2, line, parsed, _parsed, _t3, _t4, _t6;
+        return _regeneratorRuntime__default['default'].wrap(function (_context8) {
           while (1) switch (_context8.prev = _context8.next) {
             case 0:
               if (_this.transport.requestStream) {
-                _context8.next = 2;
+                _context8.next = 1;
                 break;
               }
               throw new Error('Transport does not support streaming');
-            case 2:
+            case 1:
               streamResponse = _this.transport.requestStream('cubesql', {
                 method: 'POST',
                 signal: options === null || options === void 0 ? void 0 : options.signal,
@@ -3333,21 +3339,21 @@ var CubeApi = /*#__PURE__*/function () {
               });
               decoder = new TextDecoder();
               buffer = '';
-              _context8.prev = 5;
-              _context8.next = 8;
+              _context8.prev = 2;
+              _context8.next = 3;
               return _awaitAsyncGenerator__default['default'](streamResponse.stream());
-            case 8:
+            case 3:
               stream = _context8.sent;
               _iteratorAbruptCompletion = false;
               _didIteratorError = false;
-              _context8.prev = 11;
+              _context8.prev = 4;
               _iterator = _asyncIterator(stream);
-            case 13:
-              _context8.next = 15;
+            case 5:
+              _context8.next = 6;
               return _awaitAsyncGenerator__default['default'](_iterator.next());
-            case 15:
+            case 6:
               if (!(_iteratorAbruptCompletion = !(_step = _context8.sent).done)) {
-                _context8.next = 60;
+                _context8.next = 21;
                 break;
               }
               chunk = _step.value;
@@ -3357,193 +3363,193 @@ var CubeApi = /*#__PURE__*/function () {
               lines = buffer.split('\n');
               buffer = lines.pop() || '';
               _iterator2 = _createForOfIteratorHelper(lines);
-              _context8.prev = 21;
+              _context8.prev = 7;
               _iterator2.s();
-            case 23:
+            case 8:
               if ((_step2 = _iterator2.n()).done) {
-                _context8.next = 49;
+                _context8.next = 17;
                 break;
               }
               line = _step2.value;
               if (!line.trim()) {
-                _context8.next = 47;
+                _context8.next = 16;
                 break;
               }
-              _context8.prev = 26;
+              _context8.prev = 9;
               parsed = JSON.parse(line);
               if (!parsed.schema) {
-                _context8.next = 33;
+                _context8.next = 11;
                 break;
               }
-              _context8.next = 31;
+              _context8.next = 10;
               return {
                 type: 'schema',
                 schema: parsed.schema
               };
-            case 31:
-              _context8.next = 41;
+            case 10:
+              _context8.next = 14;
               break;
-            case 33:
+            case 11:
               if (!parsed.data) {
-                _context8.next = 38;
+                _context8.next = 13;
                 break;
               }
-              _context8.next = 36;
+              _context8.next = 12;
               return {
                 type: 'data',
                 data: parsed.data
               };
-            case 36:
-              _context8.next = 41;
+            case 12:
+              _context8.next = 14;
               break;
-            case 38:
+            case 13:
               if (!parsed.error) {
-                _context8.next = 41;
+                _context8.next = 14;
                 break;
               }
-              _context8.next = 41;
+              _context8.next = 14;
               return {
                 type: 'error',
                 error: parsed.error
               };
-            case 41:
-              _context8.next = 47;
+            case 14:
+              _context8.next = 16;
               break;
-            case 43:
-              _context8.prev = 43;
-              _context8.t0 = _context8["catch"](26);
-              _context8.next = 47;
+            case 15:
+              _context8.prev = 15;
+              _context8["catch"](9);
+              _context8.next = 16;
               return {
                 type: 'error',
                 error: "Failed to parse JSON line: ".concat(line)
               };
-            case 47:
-              _context8.next = 23;
+            case 16:
+              _context8.next = 8;
               break;
-            case 49:
-              _context8.next = 54;
+            case 17:
+              _context8.next = 19;
               break;
-            case 51:
-              _context8.prev = 51;
-              _context8.t1 = _context8["catch"](21);
-              _iterator2.e(_context8.t1);
-            case 54:
-              _context8.prev = 54;
+            case 18:
+              _context8.prev = 18;
+              _t3 = _context8["catch"](7);
+              _iterator2.e(_t3);
+            case 19:
+              _context8.prev = 19;
               _iterator2.f();
-              return _context8.finish(54);
-            case 57:
+              return _context8.finish(19);
+            case 20:
               _iteratorAbruptCompletion = false;
-              _context8.next = 13;
+              _context8.next = 5;
               break;
-            case 60:
-              _context8.next = 66;
+            case 21:
+              _context8.next = 23;
               break;
-            case 62:
-              _context8.prev = 62;
-              _context8.t2 = _context8["catch"](11);
+            case 22:
+              _context8.prev = 22;
+              _t4 = _context8["catch"](4);
               _didIteratorError = true;
-              _iteratorError = _context8.t2;
-            case 66:
-              _context8.prev = 66;
-              _context8.prev = 67;
+              _iteratorError = _t4;
+            case 23:
+              _context8.prev = 23;
+              _context8.prev = 24;
               if (!(_iteratorAbruptCompletion && _iterator["return"] != null)) {
-                _context8.next = 71;
+                _context8.next = 25;
                 break;
               }
-              _context8.next = 71;
+              _context8.next = 25;
               return _awaitAsyncGenerator__default['default'](_iterator["return"]());
-            case 71:
-              _context8.prev = 71;
+            case 25:
+              _context8.prev = 25;
               if (!_didIteratorError) {
-                _context8.next = 74;
+                _context8.next = 26;
                 break;
               }
               throw _iteratorError;
-            case 74:
-              return _context8.finish(71);
-            case 75:
-              return _context8.finish(66);
-            case 76:
+            case 26:
+              return _context8.finish(25);
+            case 27:
+              return _context8.finish(23);
+            case 28:
               if (!buffer.trim()) {
-                _context8.next = 98;
+                _context8.next = 36;
                 break;
               }
-              _context8.prev = 77;
+              _context8.prev = 29;
               _parsed = JSON.parse(buffer);
               if (!_parsed.schema) {
-                _context8.next = 84;
+                _context8.next = 31;
                 break;
               }
-              _context8.next = 82;
+              _context8.next = 30;
               return {
                 type: 'schema',
                 schema: _parsed.schema
               };
-            case 82:
-              _context8.next = 92;
+            case 30:
+              _context8.next = 34;
               break;
-            case 84:
+            case 31:
               if (!_parsed.data) {
-                _context8.next = 89;
+                _context8.next = 33;
                 break;
               }
-              _context8.next = 87;
+              _context8.next = 32;
               return {
                 type: 'data',
                 data: _parsed.data
               };
-            case 87:
-              _context8.next = 92;
+            case 32:
+              _context8.next = 34;
               break;
-            case 89:
+            case 33:
               if (!_parsed.error) {
-                _context8.next = 92;
+                _context8.next = 34;
                 break;
               }
-              _context8.next = 92;
+              _context8.next = 34;
               return {
                 type: 'error',
                 error: _parsed.error
               };
-            case 92:
-              _context8.next = 98;
+            case 34:
+              _context8.next = 36;
               break;
-            case 94:
-              _context8.prev = 94;
-              _context8.t3 = _context8["catch"](77);
-              _context8.next = 98;
+            case 35:
+              _context8.prev = 35;
+              _context8["catch"](29);
+              _context8.next = 36;
               return {
                 type: 'error',
                 error: "Failed to parse remaining JSON: ".concat(buffer)
               };
-            case 98:
-              _context8.next = 105;
+            case 36:
+              _context8.next = 39;
               break;
-            case 100:
-              _context8.prev = 100;
-              _context8.t4 = _context8["catch"](5);
-              if (!(_context8.t4.name === 'AbortError')) {
-                _context8.next = 104;
+            case 37:
+              _context8.prev = 37;
+              _t6 = _context8["catch"](2);
+              if (!(_t6.name === 'AbortError')) {
+                _context8.next = 38;
                 break;
               }
               throw new Error('aborted');
-            case 104:
-              throw _context8.t4;
-            case 105:
-              _context8.prev = 105;
+            case 38:
+              throw _t6;
+            case 39:
+              _context8.prev = 39;
               if (!streamResponse.unsubscribe) {
-                _context8.next = 109;
+                _context8.next = 40;
                 break;
               }
-              _context8.next = 109;
+              _context8.next = 40;
               return _awaitAsyncGenerator__default['default'](streamResponse.unsubscribe());
-            case 109:
-              return _context8.finish(105);
-            case 110:
+            case 40:
+              return _context8.finish(39);
+            case 41:
             case "end":
               return _context8.stop();
           }
-        }, _callee8, null, [[5, 100, 105, 110], [11, 62, 66, 76], [21, 51, 54, 57], [26, 43], [67,, 71, 75], [77, 94]]);
+        }, _callee8, null, [[2, 37, 39, 41], [4, 22, 23, 28], [7, 18, 19, 20], [9, 15], [24,, 25, 27], [29, 35]]);
       }))();
     }
   }]);