@cubejs-client/react 1.6.17 → 1.6.18

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

@@ -69,21 +69,21 @@ var _typeof__default = /*#__PURE__*/_interopDefaultLegacy(_typeof);
 
 var CubeContext = /*#__PURE__*/React.createContext(null);
 
-function ownKeys$6(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; }
-function _objectSpread$6(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$6(Object(t), !0).forEach(function (r) { _defineProperty__default['default'](e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$6(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-function _callSuper$1(t, o, e) { return o = _getPrototypeOf__default['default'](o), _possibleConstructorReturn__default['default'](t, _isNativeReflectConstruct$1() ? Reflect.construct(o, e || [], _getPrototypeOf__default['default'](t).constructor) : o.apply(t, e)); }
+function ownKeys$7(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; }
+function _objectSpread$7(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$7(Object(t), !0).forEach(function (r) { _defineProperty__default["default"](e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$7(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _callSuper$1(t, o, e) { return o = _getPrototypeOf__default["default"](o), _possibleConstructorReturn__default["default"](t, _isNativeReflectConstruct$1() ? Reflect.construct(o, e || [], _getPrototypeOf__default["default"](t).constructor) : o.apply(t, e)); }
 function _isNativeReflectConstruct$1() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct$1 = function _isNativeReflectConstruct() { return !!t; })(); }
 var QueryRenderer = /*#__PURE__*/function (_React$Component) {
   function QueryRenderer(props) {
     var _this;
-    _classCallCheck__default['default'](this, QueryRenderer);
+    _classCallCheck__default["default"](this, QueryRenderer);
     _this = _callSuper$1(this, QueryRenderer, [props]);
     _this.state = {};
     _this.mutexObj = {};
     return _this;
   }
-  _inherits__default['default'](QueryRenderer, _React$Component);
-  return _createClass__default['default'](QueryRenderer, [{
+  _inherits__default["default"](QueryRenderer, _React$Component);
+  return _createClass__default["default"](QueryRenderer, [{
     key: "componentDidMount",
     value: function componentDidMount() {
       var _this$props = this.props,
@@ -134,8 +134,10 @@ var QueryRenderer = /*#__PURE__*/function (_React$Component) {
     key: "load",
     value: function load(query) {
       var _this2 = this;
-      var resetResultSetOnChange = this.props.resetResultSetOnChange;
-      this.setState(_objectSpread$6({
+      var _this$props4 = this.props,
+        resetResultSetOnChange = _this$props4.resetResultSetOnChange,
+        cache = _this$props4.cache;
+      this.setState(_objectSpread$7({
         isLoading: true,
         error: null,
         sqlQuery: null
@@ -144,6 +146,12 @@ var QueryRenderer = /*#__PURE__*/function (_React$Component) {
       } : {}));
       var loadSql = this.props.loadSql;
       var cubeApi = this.cubeApi();
+      var loadOptions = _objectSpread$7({
+        mutexObj: this.mutexObj,
+        mutexKey: 'query'
+      }, cache ? {
+        cache: cache
+      } : {});
       if (query && core.isQueryPresent(query)) {
         if (loadSql === 'only') {
           cubeApi.sql(query, {
@@ -156,7 +164,7 @@ var QueryRenderer = /*#__PURE__*/function (_React$Component) {
               isLoading: false
             });
           })["catch"](function (error) {
-            return _this2.setState(_objectSpread$6(_objectSpread$6({}, resetResultSetOnChange ? {
+            return _this2.setState(_objectSpread$7(_objectSpread$7({}, resetResultSetOnChange ? {
               resultSet: null
             } : {}), {}, {
               error: error,
@@ -167,11 +175,8 @@ var QueryRenderer = /*#__PURE__*/function (_React$Component) {
           Promise.all([cubeApi.sql(query, {
             mutexObj: this.mutexObj,
             mutexKey: 'sql'
-          }), cubeApi.load(query, {
-            mutexObj: this.mutexObj,
-            mutexKey: 'query'
-          })]).then(function (_ref) {
-            var _ref2 = _slicedToArray__default['default'](_ref, 2),
+          }), cubeApi.load(query, loadOptions)]).then(function (_ref) {
+            var _ref2 = _slicedToArray__default["default"](_ref, 2),
               sqlQuery = _ref2[0],
               resultSet = _ref2[1];
             return _this2.setState({
@@ -181,7 +186,7 @@ var QueryRenderer = /*#__PURE__*/function (_React$Component) {
               isLoading: false
             });
           })["catch"](function (error) {
-            return _this2.setState(_objectSpread$6(_objectSpread$6({}, resetResultSetOnChange ? {
+            return _this2.setState(_objectSpread$7(_objectSpread$7({}, resetResultSetOnChange ? {
               resultSet: null
             } : {}), {}, {
               error: error,
@@ -189,17 +194,14 @@ var QueryRenderer = /*#__PURE__*/function (_React$Component) {
             }));
           });
         } else {
-          cubeApi.load(query, {
-            mutexObj: this.mutexObj,
-            mutexKey: 'query'
-          }).then(function (resultSet) {
+          cubeApi.load(query, loadOptions).then(function (resultSet) {
             return _this2.setState({
               resultSet: resultSet,
               error: null,
               isLoading: false
             });
           })["catch"](function (error) {
-            return _this2.setState(_objectSpread$6(_objectSpread$6({}, resetResultSetOnChange ? {
+            return _this2.setState(_objectSpread$7(_objectSpread$7({}, resetResultSetOnChange ? {
               resultSet: null
             } : {}), {}, {
               error: error,
@@ -214,8 +216,10 @@ var QueryRenderer = /*#__PURE__*/function (_React$Component) {
     value: function loadQueries(queries) {
       var _this3 = this;
       var cubeApi = this.cubeApi();
-      var resetResultSetOnChange = this.props.resetResultSetOnChange;
-      this.setState(_objectSpread$6(_objectSpread$6({
+      var _this$props5 = this.props,
+        resetResultSetOnChange = _this$props5.resetResultSetOnChange,
+        cache = _this$props5.cache;
+      this.setState(_objectSpread$7(_objectSpread$7({
         isLoading: true
       }, resetResultSetOnChange ? {
         resultSet: null
@@ -223,13 +227,15 @@ var QueryRenderer = /*#__PURE__*/function (_React$Component) {
         error: null
       }));
       var resultPromises = Promise.all(ramda.toPairs(queries).map(function (_ref3) {
-        var _ref4 = _slicedToArray__default['default'](_ref3, 2),
+        var _ref4 = _slicedToArray__default["default"](_ref3, 2),
           name = _ref4[0],
           query = _ref4[1];
-        return cubeApi.load(query, {
+        return cubeApi.load(query, _objectSpread$7({
           mutexObj: _this3.mutexObj,
           mutexKey: name
-        }).then(function (r) {
+        }, cache ? {
+          cache: cache
+        } : {})).then(function (r) {
           return [name, r];
         });
       }));
@@ -240,7 +246,7 @@ var QueryRenderer = /*#__PURE__*/function (_React$Component) {
           isLoading: false
         });
       })["catch"](function (error) {
-        return _this3.setState(_objectSpread$6(_objectSpread$6({}, resetResultSetOnChange ? {
+        return _this3.setState(_objectSpread$7(_objectSpread$7({}, resetResultSetOnChange ? {
           resultSet: null
         } : {}), {}, {
           error: error,
@@ -280,30 +286,31 @@ var QueryRenderer = /*#__PURE__*/function (_React$Component) {
       return core.isQueryPresent(query);
     }
   }]);
-}(React__default['default'].Component);
-_defineProperty__default['default'](QueryRenderer, "contextType", CubeContext);
-_defineProperty__default['default'](QueryRenderer, "defaultProps", {
+}(React__default["default"].Component);
+_defineProperty__default["default"](QueryRenderer, "contextType", CubeContext);
+_defineProperty__default["default"](QueryRenderer, "defaultProps", {
   cubeApi: null,
   query: null,
   render: null,
   queries: null,
   loadSql: null,
   updateOnlyOnStateChange: false,
-  resetResultSetOnChange: true
+  resetResultSetOnChange: true,
+  cache: null
 });
 
 var _excluded$1 = ["query"];
-function ownKeys$5(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; }
-function _objectSpread$5(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$5(Object(t), !0).forEach(function (r) { _defineProperty__default['default'](e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$5(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function ownKeys$6(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; }
+function _objectSpread$6(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$6(Object(t), !0).forEach(function (r) { _defineProperty__default["default"](e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$6(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var QueryRendererWithTotals = function QueryRendererWithTotals(_ref) {
   var query = _ref.query,
-    restProps = _objectWithoutProperties__default['default'](_ref, _excluded$1);
-  return /*#__PURE__*/React__default['default'].createElement(QueryRenderer, _extends__default['default']({
+    restProps = _objectWithoutProperties__default["default"](_ref, _excluded$1);
+  return /*#__PURE__*/React__default["default"].createElement(QueryRenderer, _extends__default["default"]({
     queries: {
-      totals: _objectSpread$5(_objectSpread$5({}, query), {}, {
+      totals: _objectSpread$6(_objectSpread$6({}, query), {}, {
         dimensions: [],
         timeDimensions: query.timeDimensions ? query.timeDimensions.map(function (td) {
-          return _objectSpread$5(_objectSpread$5({}, td), {}, {
+          return _objectSpread$6(_objectSpread$6({}, td), {}, {
             granularity: null
           });
         }) : undefined
@@ -314,27 +321,27 @@ var QueryRendererWithTotals = function QueryRendererWithTotals(_ref) {
 };
 
 function removeEmpty(obj) {
-  if (Array.isArray(obj) || _typeof__default['default'](obj) !== 'object') {
+  if (Array.isArray(obj) || _typeof__default["default"](obj) !== 'object') {
     return obj;
   }
   return Object.fromEntries(Object.entries(obj).filter(function (_ref) {
-    var _ref2 = _slicedToArray__default['default'](_ref, 2),
+    var _ref2 = _slicedToArray__default["default"](_ref, 2),
       v = _ref2[1];
     return v != null;
   }).map(function (_ref3) {
-    var _ref4 = _slicedToArray__default['default'](_ref3, 2),
+    var _ref4 = _slicedToArray__default["default"](_ref3, 2),
       k = _ref4[0],
       v = _ref4[1];
     if (Array.isArray(v)) {
       return [k, v.map(removeEmpty)];
     }
-    return [k, _typeof__default['default'](v) === 'object' ? removeEmpty(v) : v];
+    return [k, _typeof__default["default"](v) === 'object' ? removeEmpty(v) : v];
   }));
 }
 
-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; }
-function _objectSpread$4(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$4(Object(t), !0).forEach(function (r) { _defineProperty__default['default'](e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$4(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-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)); }
+function ownKeys$5(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; }
+function _objectSpread$5(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$5(Object(t), !0).forEach(function (r) { _defineProperty__default["default"](e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$5(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+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)); }
 function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
 var granularities = [{
   name: undefined,
@@ -367,11 +374,11 @@ var granularities = [{
 var QueryBuilder = /*#__PURE__*/function (_React$Component) {
   function QueryBuilder(props) {
     var _this;
-    _classCallCheck__default['default'](this, QueryBuilder);
+    _classCallCheck__default["default"](this, QueryBuilder);
     _this = _callSuper(this, QueryBuilder, [props]);
-    _defineProperty__default['default'](_this, "fetchMeta", /*#__PURE__*/_asyncToGenerator__default['default'](/*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee() {
+    _defineProperty__default["default"](_this, "fetchMeta", /*#__PURE__*/_asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee() {
       var meta, metaError, richMetaError, metaErrorStack, _error$response, _error$response2, _t;
-      return _regeneratorRuntime__default['default'].wrap(function (_context) {
+      return _regeneratorRuntime__default["default"].wrap(function (_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             if (_this.cubeApi()) {
@@ -417,7 +424,7 @@ var QueryBuilder = /*#__PURE__*/function (_React$Component) {
         }
       }, _callee, null, [[2, 4]]);
     })));
-    _this.state = _objectSpread$4(_objectSpread$4({
+    _this.state = _objectSpread$5(_objectSpread$5({
       query: props.defaultQuery || props.query,
       chartType: props.defaultChartType,
       validatedQuery: props.query,
@@ -431,12 +438,12 @@ var QueryBuilder = /*#__PURE__*/function (_React$Component) {
     _this.orderMembersOrderKeys = [];
     return _this;
   }
-  _inherits__default['default'](QueryBuilder, _React$Component);
-  return _createClass__default['default'](QueryBuilder, [{
+  _inherits__default["default"](QueryBuilder, _React$Component);
+  return _createClass__default["default"](QueryBuilder, [{
     key: "componentDidMount",
     value: function () {
-      var _componentDidMount = _asyncToGenerator__default['default'](/*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee2() {
-        return _regeneratorRuntime__default['default'].wrap(function (_context2) {
+      var _componentDidMount = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee2() {
+        return _regeneratorRuntime__default["default"].wrap(function (_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
               this.prevContext = this.context;
@@ -456,12 +463,12 @@ var QueryBuilder = /*#__PURE__*/function (_React$Component) {
   }, {
     key: "componentDidUpdate",
     value: function () {
-      var _componentDidUpdate = _asyncToGenerator__default['default'](/*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee4(prevProps) {
+      var _componentDidUpdate = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee4(prevProps) {
         var _this$prevContext,
           _this$context,
           _this2 = this;
         var _this$props, schemaVersion, onSchemaChange, meta, newMeta, _t2;
-        return _regeneratorRuntime__default['default'].wrap(function (_context4) {
+        return _regeneratorRuntime__default["default"].wrap(function (_context4) {
           while (1) switch (_context4.prev = _context4.next) {
             case 0:
               _this$props = this.props, schemaVersion = _this$props.schemaVersion, onSchemaChange = _this$props.onSchemaChange;
@@ -487,8 +494,8 @@ var QueryBuilder = /*#__PURE__*/function (_React$Component) {
                 onSchemaChange({
                   schemaVersion: schemaVersion,
                   refresh: function () {
-                    var _refresh = _asyncToGenerator__default['default'](/*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee3() {
-                      return _regeneratorRuntime__default['default'].wrap(function (_context3) {
+                    var _refresh = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee3() {
+                      return _regeneratorRuntime__default["default"].wrap(function (_context3) {
                         while (1) switch (_context3.prev = _context3.next) {
                           case 0:
                             _context3.next = 1;
@@ -566,14 +573,14 @@ var QueryBuilder = /*#__PURE__*/function (_React$Component) {
         } : {
           dateRange: member.dateRange
         };
-        return removeEmpty(_objectSpread$4({
+        return removeEmpty(_objectSpread$5({
           dimension: member.dimension.name,
           granularity: member.granularity
         }, rangeSelection));
       };
       var toFilter = function toFilter(member) {
         var _member$member, _member$dimension;
-        return _objectSpread$4({
+        return _objectSpread$5({
           member: ((_member$member = member.member) === null || _member$member === void 0 ? void 0 : _member$member.name) || ((_member$dimension = member.dimension) === null || _member$dimension === void 0 ? void 0 : _member$dimension.name),
           operator: member.operator
         }, ['set', 'notSet'].includes(member.operator) ? {} : {
@@ -585,11 +592,11 @@ var QueryBuilder = /*#__PURE__*/function (_React$Component) {
         return {
           add: function add(member) {
             var query = _this3.state.query;
-            _this3.updateQuery(_defineProperty__default['default']({}, memberType, (query[memberType] || []).concat(toQuery(member))));
+            _this3.updateQuery(_defineProperty__default["default"]({}, memberType, (query[memberType] || []).concat(toQuery(member))));
           },
           remove: function remove(member) {
             var query = _this3.state.query;
-            return _this3.updateQuery(_defineProperty__default['default']({}, memberType, (query[memberType] || []).filter(function (_, index) {
+            return _this3.updateQuery(_defineProperty__default["default"]({}, memberType, (query[memberType] || []).filter(function (_, index) {
               return index !== member.index;
             })));
           },
@@ -597,7 +604,7 @@ var QueryBuilder = /*#__PURE__*/function (_React$Component) {
             var query = _this3.state.query;
             var members = (query[memberType] || []).concat([]);
             members.splice(member.index, 1, toQuery(updateWith));
-            return _this3.updateQuery(_defineProperty__default['default']({}, memberType, members));
+            return _this3.updateQuery(_defineProperty__default["default"]({}, memberType, members));
           }
         };
       };
@@ -617,12 +624,12 @@ var QueryBuilder = /*#__PURE__*/function (_React$Component) {
       var flatFilters = ramda.uniqBy(function (filter) {
         return "".concat(ramda.prop('member', filter)).concat(ramda.prop('operator', filter));
       }, core.flattenFilters(meta && query.filters || []).map(function (filter) {
-        return _objectSpread$4(_objectSpread$4({}, filter), {}, {
+        return _objectSpread$5(_objectSpread$5({}, filter), {}, {
           member: filter.member || filter.dimension
         });
       }));
       var filters = flatFilters.map(function (m, i) {
-        return _objectSpread$4(_objectSpread$4({}, m), {}, {
+        return _objectSpread$5(_objectSpread$5({}, m), {}, {
           dimension: meta.resolveMember(m.member || m.dimension, ['dimensions', 'measures']),
           operators: meta.filterOperatorsForMember(m.member || m.dimension, ['dimensions', 'measures']),
           index: i
@@ -632,7 +639,7 @@ var QueryBuilder = /*#__PURE__*/function (_React$Component) {
       var dimensions = QueryBuilder.resolveMember('dimensions', this.state);
       var timeDimensions = QueryBuilder.resolveMember('timeDimensions', this.state);
       var segments = (meta && query.segments || []).map(function (m, i) {
-        return _objectSpread$4({
+        return _objectSpread$5({
           index: i
         }, meta.resolveMember(m, 'segments'));
       });
@@ -652,23 +659,23 @@ var QueryBuilder = /*#__PURE__*/function (_React$Component) {
         availableSegments = meta.membersForQuery(query, 'segments');
         var indexedMeasures = ramda.indexBy(ramda.prop('cubeName'), availableMembers.measures);
         var indexedDimensions = ramda.indexBy(ramda.prop('cubeName'), availableMembers.dimensions);
-        var cubeNames = ramda.uniq([].concat(_toConsumableArray__default['default'](Object.keys(indexedMeasures)), _toConsumableArray__default['default'](Object.keys(indexedDimensions)))).sort();
+        var cubeNames = ramda.uniq([].concat(_toConsumableArray__default["default"](Object.keys(indexedMeasures)), _toConsumableArray__default["default"](Object.keys(indexedDimensions)))).sort();
         availableFilterMembers = cubeNames.map(function (name) {
           var _indexedMeasures$name, _indexedDimensions$na;
           var cube = indexedMeasures[name] || indexedDimensions[name];
-          return _objectSpread$4(_objectSpread$4({}, cube), {}, {
-            members: [].concat(_toConsumableArray__default['default']((_indexedMeasures$name = indexedMeasures[name]) === null || _indexedMeasures$name === void 0 ? void 0 : _indexedMeasures$name.members), _toConsumableArray__default['default']((_indexedDimensions$na = indexedDimensions[name]) === null || _indexedDimensions$na === void 0 ? void 0 : _indexedDimensions$na.members)).sort(function (a, b) {
+          return _objectSpread$5(_objectSpread$5({}, cube), {}, {
+            members: [].concat(_toConsumableArray__default["default"]((_indexedMeasures$name = indexedMeasures[name]) === null || _indexedMeasures$name === void 0 ? void 0 : _indexedMeasures$name.members), _toConsumableArray__default["default"]((_indexedDimensions$na = indexedDimensions[name]) === null || _indexedDimensions$na === void 0 ? void 0 : _indexedDimensions$na.members)).sort(function (a, b) {
               return a.shortTitle > b.shortTitle ? 1 : -1;
             })
           });
         });
       }
       var activeOrder = Array.isArray(query.order) ? Object.fromEntries(query.order) : query.order;
-      var members = [].concat(_toConsumableArray__default['default'](measures), _toConsumableArray__default['default'](dimensions), _toConsumableArray__default['default'](timeDimensions.map(function (_ref2) {
+      var members = [].concat(_toConsumableArray__default["default"](measures), _toConsumableArray__default["default"](dimensions), _toConsumableArray__default["default"](timeDimensions.map(function (_ref2) {
         var dimension = _ref2.dimension;
         return dimension;
       })));
-      var orderMembers = ramda.uniqBy(ramda.prop('id'), _toConsumableArray__default['default'](members.map(function (_ref3) {
+      var orderMembers = ramda.uniqBy(ramda.prop('id'), _toConsumableArray__default["default"](members.map(function (_ref3) {
         var name = _ref3.name,
           title = _ref3.title;
         return {
@@ -692,7 +699,7 @@ var QueryBuilder = /*#__PURE__*/function (_React$Component) {
           });
         }).filter(Boolean);
       }
-      return _objectSpread$4({
+      return _objectSpread$5({
         meta: meta,
         metaError: metaError,
         richMetaError: richMetaError,
@@ -735,13 +742,13 @@ var QueryBuilder = /*#__PURE__*/function (_React$Component) {
             var newOrder = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'asc';
             _this3.updateQuery({
               order: orderMembers.map(function (orderMember) {
-                return _objectSpread$4(_objectSpread$4({}, orderMember), {}, {
+                return _objectSpread$5(_objectSpread$5({}, orderMember), {}, {
                   order: orderMember.id === memberId ? newOrder : orderMember.order
                 });
               }).reduce(function (acc, _ref5) {
                 var id = _ref5.id,
                   order = _ref5.order;
-                return order !== 'none' ? [].concat(_toConsumableArray__default['default'](acc), [[id, order]]) : acc;
+                return order !== 'none' ? [].concat(_toConsumableArray__default["default"](acc), [[id, order]]) : acc;
               }, [])
             });
           },
@@ -763,7 +770,7 @@ var QueryBuilder = /*#__PURE__*/function (_React$Component) {
               order: nextArray.reduce(function (acc, _ref7) {
                 var id = _ref7.id,
                   order = _ref7.order;
-                return order !== 'none' ? [].concat(_toConsumableArray__default['default'](acc), [[id, order]]) : acc;
+                return order !== 'none' ? [].concat(_toConsumableArray__default["default"](acc), [[id, order]]) : acc;
               }, [])
             });
           }
@@ -781,10 +788,10 @@ var QueryBuilder = /*#__PURE__*/function (_React$Component) {
           },
           update: function update(config) {
             var limit = config.limit;
-            _this3.updateVizState(_objectSpread$4({
-              pivotConfig: _objectSpread$4(_objectSpread$4({}, pivotConfig), config)
+            _this3.updateVizState(_objectSpread$5({
+              pivotConfig: _objectSpread$5(_objectSpread$5({}, pivotConfig), config)
             }, limit ? {
-              query: _objectSpread$4(_objectSpread$4({}, query), {}, {
+              query: _objectSpread$5(_objectSpread$5({}, query), {}, {
                 limit: limit
               })
             } : null));
@@ -801,23 +808,23 @@ var QueryBuilder = /*#__PURE__*/function (_React$Component) {
     value: function updateQuery(queryUpdate) {
       var query = this.state.query;
       this.updateVizState({
-        query: core.removeEmptyQueryFields(_objectSpread$4(_objectSpread$4({}, query), queryUpdate))
+        query: core.removeEmptyQueryFields(_objectSpread$5(_objectSpread$5({}, query), queryUpdate))
       });
     }
   }, {
     key: "updateVizState",
     value: function () {
-      var _updateVizState = _asyncToGenerator__default['default'](/*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee5(state) {
+      var _updateVizState = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee5(state) {
         var _this4 = this;
         var _this$props2, setQuery, setVizState, _this$state2, stateQuery, statePivotConfig, chartType, meta, finalState, vizStateSent, handleVizStateChange, runSetters, shouldFetchDryRun, response, _error$response3, _t3;
-        return _regeneratorRuntime__default['default'].wrap(function (_context5) {
+        return _regeneratorRuntime__default["default"].wrap(function (_context5) {
           while (1) switch (_context5.prev = _context5.next) {
             case 0:
               _this$props2 = this.props, setQuery = _this$props2.setQuery, setVizState = _this$props2.setVizState;
               _this$state2 = this.state, stateQuery = _this$state2.query, statePivotConfig = _this$state2.pivotConfig, chartType = _this$state2.chartType, meta = _this$state2.meta;
               finalState = this.applyStateChangeHeuristics(state);
               if (!finalState.query) {
-                finalState.query = _objectSpread$4({}, stateQuery);
+                finalState.query = _objectSpread$5({}, stateQuery);
               }
               vizStateSent = null;
               handleVizStateChange = function handleVizStateChange(currentState) {
@@ -848,12 +855,12 @@ var QueryBuilder = /*#__PURE__*/function (_React$Component) {
               finalState.chartType = finalState.chartType || state.chartType || chartType;
 
               // deprecated
-              runSetters(_objectSpread$4(_objectSpread$4({}, state), {}, {
+              runSetters(_objectSpread$5(_objectSpread$5({}, state), {}, {
                 query: finalState.query
               }));
 
               // Update optimistically so that UI does not stutter
-              this.setState(_objectSpread$4(_objectSpread$4({}, finalState), {}, {
+              this.setState(_objectSpread$5(_objectSpread$5({}, finalState), {}, {
                 queryError: null
               }));
               handleVizStateChange(finalState);
@@ -871,7 +878,7 @@ var QueryBuilder = /*#__PURE__*/function (_React$Component) {
               response = _context5.sent;
               if (finalState.shouldApplyHeuristicOrder) {
                 finalState.query.order = (response.queryOrder || []).reduce(function (memo, current) {
-                  return _objectSpread$4(_objectSpread$4({}, memo), current);
+                  return _objectSpread$5(_objectSpread$5({}, memo), current);
                 }, {});
               }
               finalState.pivotConfig = core.ResultSet.getNormalizedPivotConfig(response.pivotQuery, finalState.pivotConfig);
@@ -880,7 +887,7 @@ var QueryBuilder = /*#__PURE__*/function (_React$Component) {
 
               // deprecated
               if (core.isQueryPresent(stateQuery)) {
-                runSetters(_objectSpread$4(_objectSpread$4({}, this.state), finalState));
+                runSetters(_objectSpread$5(_objectSpread$5({}, this.state), finalState));
               }
               _context5.next = 4;
               break;
@@ -946,7 +953,7 @@ var QueryBuilder = /*#__PURE__*/function (_React$Component) {
         _render = _this$props4.render,
         wrapWithQueryRenderer = _this$props4.wrapWithQueryRenderer;
       if (wrapWithQueryRenderer) {
-        return /*#__PURE__*/React__default['default'].createElement(QueryRenderer, {
+        return /*#__PURE__*/React__default["default"].createElement(QueryRenderer, {
           query: query,
           cubeApi: cubeApi,
           resetResultSetOnChange: false,
@@ -971,12 +978,12 @@ var QueryBuilder = /*#__PURE__*/function (_React$Component) {
     // https://reactjs.org/blog/2018/06/07/you-probably-dont-need-derived-state.html#anti-pattern-unconditionally-copying-props-to-state
     function getDerivedStateFromProps(props, state) {
       if (props.query || props.vizState) {
-        var nextState = _objectSpread$4(_objectSpread$4({}, state), props.vizState || {});
+        var nextState = _objectSpread$5(_objectSpread$5({}, state), props.vizState || {});
         if (Array.isArray(props.query)) {
           throw new Error('Array of queries is not supported.');
         }
-        return _objectSpread$4(_objectSpread$4({}, nextState), {}, {
-          query: _objectSpread$4(_objectSpread$4({}, nextState.query), props.query || {})
+        return _objectSpread$5(_objectSpread$5({}, nextState), {}, {
+          query: _objectSpread$5(_objectSpread$5({}, nextState.query), props.query || {})
         });
       }
       return null;
@@ -999,8 +1006,8 @@ var QueryBuilder = /*#__PURE__*/function (_React$Component) {
       }
       if (type === 'timeDimensions') {
         return (query.timeDimensions || []).map(function (m, index) {
-          return _objectSpread$4(_objectSpread$4({}, m), {}, {
-            dimension: _objectSpread$4(_objectSpread$4({}, meta.resolveMember(m.dimension, 'dimensions')), {}, {
+          return _objectSpread$5(_objectSpread$5({}, m), {}, {
+            dimension: _objectSpread$5(_objectSpread$5({}, meta.resolveMember(m.dimension, 'dimensions')), {}, {
               granularities: granularities
             }),
             index: index
@@ -1008,15 +1015,15 @@ var QueryBuilder = /*#__PURE__*/function (_React$Component) {
         });
       }
       return (query[type] || []).map(function (m, index) {
-        return _objectSpread$4({
+        return _objectSpread$5({
           index: index
         }, meta.resolveMember(m, type));
       });
     }
   }]);
-}(React__default['default'].Component);
-_defineProperty__default['default'](QueryBuilder, "contextType", CubeContext);
-_defineProperty__default['default'](QueryBuilder, "defaultProps", {
+}(React__default["default"].Component);
+_defineProperty__default["default"](QueryBuilder, "contextType", CubeContext);
+_defineProperty__default["default"](QueryBuilder, "defaultProps", {
   cubeApi: null,
   stateChangeHeuristics: null,
   disableHeuristics: false,
@@ -1038,7 +1045,7 @@ function CubeProvider(_ref) {
     children = _ref.children,
     _ref$options = _ref.options,
     options = _ref$options === void 0 ? {} : _ref$options;
-  return /*#__PURE__*/React__default['default'].createElement(CubeContext.Provider, {
+  return /*#__PURE__*/React__default["default"].createElement(CubeContext.Provider, {
     value: {
       cubeApi: cubeApi,
       options: options
@@ -1054,8 +1061,8 @@ function useDeepCompareMemoize(value) {
   return ref.current;
 }
 
-function ownKeys$3(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; }
-function _objectSpread$3(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$3(Object(t), !0).forEach(function (r) { _defineProperty__default['default'](e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$3(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+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; }
+function _objectSpread$4(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$4(Object(t), !0).forEach(function (r) { _defineProperty__default["default"](e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$4(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function useCubeFetch(method) {
   var _options$query;
   var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
@@ -1065,11 +1072,11 @@ function useCubeFetch(method) {
       isLoading: false,
       response: null
     }),
-    _useState2 = _slicedToArray__default['default'](_useState, 2),
+    _useState2 = _slicedToArray__default["default"](_useState, 2),
     response = _useState2[0],
     setResponse = _useState2[1];
   var _useState3 = React.useState(null),
-    _useState4 = _slicedToArray__default['default'](_useState3, 2),
+    _useState4 = _slicedToArray__default["default"](_useState3, 2),
     error = _useState4[0],
     setError = _useState4[1];
   var _options$skip = options.skip,
@@ -1078,7 +1085,7 @@ function useCubeFetch(method) {
     return _load.apply(this, arguments);
   }
   function _load() {
-    _load = _asyncToGenerator__default['default'](/*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee() {
+    _load = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee() {
       var loadOptions,
         ignoreSkip,
         cubeApi,
@@ -1089,7 +1096,7 @@ function useCubeFetch(method) {
         _response,
         _args = arguments,
         _t;
-      return _regeneratorRuntime__default['default'].wrap(function (_context) {
+      return _regeneratorRuntime__default["default"].wrap(function (_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             loadOptions = _args.length > 0 && _args[0] !== undefined ? _args[0] : {};
@@ -1106,7 +1113,7 @@ function useCubeFetch(method) {
               isLoading: true,
               response: null
             });
-            coreOptions = _objectSpread$3({
+            coreOptions = _objectSpread$4({
               mutexObj: mutexRef.current,
               mutexKey: method
             }, options.baseRequestId ? {
@@ -1143,7 +1150,7 @@ function useCubeFetch(method) {
   React.useEffect(function () {
     load();
   }, useDeepCompareMemoize([Object.keys(((_options$query = options.query) === null || _options$query === void 0 ? void 0 : _options$query.order) || {}), options, context]));
-  return _objectSpread$3(_objectSpread$3({}, response), {}, {
+  return _objectSpread$4(_objectSpread$4({}, response), {}, {
     error: error,
     refetch: function refetch(options) {
       return load(options, true);
@@ -1151,59 +1158,61 @@ function useCubeFetch(method) {
   });
 }
 
-function ownKeys$2(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; }
-function _objectSpread$2(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$2(Object(t), !0).forEach(function (r) { _defineProperty__default['default'](e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$2(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function ownKeys$3(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; }
+function _objectSpread$3(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$3(Object(t), !0).forEach(function (r) { _defineProperty__default["default"](e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$3(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function useCubeSql(query) {
   var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-  return useCubeFetch('sql', _objectSpread$2(_objectSpread$2({}, options), {}, {
+  return useCubeFetch('sql', _objectSpread$3(_objectSpread$3({}, options), {}, {
     query: query
   }));
 }
 
-function ownKeys$1(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; }
-function _objectSpread$1(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$1(Object(t), !0).forEach(function (r) { _defineProperty__default['default'](e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$1(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function ownKeys$2(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; }
+function _objectSpread$2(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$2(Object(t), !0).forEach(function (r) { _defineProperty__default["default"](e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$2(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function useDryRun(query) {
   var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-  return useCubeFetch('dryRun', _objectSpread$1(_objectSpread$1({}, options), {}, {
+  return useCubeFetch('dryRun', _objectSpread$2(_objectSpread$2({}, options), {}, {
     query: query
   }));
 }
 
 var _excluded = ["refetch"];
-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; }
-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; }
+function ownKeys$1(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; }
+function _objectSpread$1(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$1(Object(t), !0).forEach(function (r) { _defineProperty__default["default"](e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$1(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function useLazyDryRun(query) {
   var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-  var _useCubeFetch = useCubeFetch('dryRun', _objectSpread(_objectSpread({}, options), {}, {
+  var _useCubeFetch = useCubeFetch('dryRun', _objectSpread$1(_objectSpread$1({}, options), {}, {
       query: query,
       skip: true
     })),
     refetch = _useCubeFetch.refetch,
-    result = _objectWithoutProperties__default['default'](_useCubeFetch, _excluded);
+    result = _objectWithoutProperties__default["default"](_useCubeFetch, _excluded);
   return [refetch, result];
 }
 
+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; }
+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; }
 function useCubeQuery(query) {
   var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
   var mutexRef = React.useRef({});
   var _useState = React.useState(null),
-    _useState2 = _slicedToArray__default['default'](_useState, 2),
+    _useState2 = _slicedToArray__default["default"](_useState, 2),
     currentQuery = _useState2[0],
     setCurrentQuery = _useState2[1];
   var _useState3 = React.useState(!options.skip),
-    _useState4 = _slicedToArray__default['default'](_useState3, 2),
+    _useState4 = _slicedToArray__default["default"](_useState3, 2),
     isLoading = _useState4[0],
     setLoading = _useState4[1];
   var _useState5 = React.useState(null),
-    _useState6 = _slicedToArray__default['default'](_useState5, 2),
+    _useState6 = _slicedToArray__default["default"](_useState5, 2),
     resultSet = _useState6[0],
     setResultSet = _useState6[1];
   var _useState7 = React.useState(null),
-    _useState8 = _slicedToArray__default['default'](_useState7, 2),
+    _useState8 = _slicedToArray__default["default"](_useState7, 2),
     progress = _useState8[0],
     setProgress = _useState8[1];
   var _useState9 = React.useState(null),
-    _useState0 = _slicedToArray__default['default'](_useState9, 2),
+    _useState0 = _slicedToArray__default["default"](_useState9, 2),
     error = _useState0[0],
     setError = _useState0[1];
   var context = React.useContext(CubeContext);
@@ -1216,9 +1225,9 @@ function useCubeQuery(query) {
     return _fetch.apply(this, arguments);
   }
   function _fetch() {
-    _fetch = _asyncToGenerator__default['default'](/*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee2() {
+    _fetch = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee2() {
       var resetResultSetOnChange, cubeApi, _context$options, response, _t2;
-      return _regeneratorRuntime__default['default'].wrap(function (_context2) {
+      return _regeneratorRuntime__default["default"].wrap(function (_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
             resetResultSetOnChange = options.resetResultSetOnChange;
@@ -1236,12 +1245,14 @@ function useCubeQuery(query) {
             setLoading(true);
             _context2.prev = 2;
             _context2.next = 3;
-            return cubeApi.load(query, {
+            return cubeApi.load(query, _objectSpread({
               mutexObj: mutexRef.current,
               mutexKey: 'query',
               progressCallback: progressCallback,
               castNumerics: Boolean(typeof options.castNumerics === 'boolean' ? options.castNumerics : context === null || context === void 0 || (_context$options = context.options) === null || _context$options === void 0 ? void 0 : _context$options.castNumerics)
-            });
+            }, options.cache ? {
+              cache: options.cache
+            } : {}));
           case 3:
             response = _context2.sent;
             setResultSet(response);
@@ -1276,9 +1287,9 @@ function useCubeQuery(query) {
       return _loadQuery.apply(this, arguments);
     }
     function _loadQuery() {
-      _loadQuery = _asyncToGenerator__default['default'](/*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee() {
+      _loadQuery = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee() {
         var _t;
-        return _regeneratorRuntime__default['default'].wrap(function (_context) {
+        return _regeneratorRuntime__default["default"].wrap(function (_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
               if (!(!skip && core.isQueryPresent(query))) {
@@ -1307,11 +1318,13 @@ function useCubeQuery(query) {
                 _context.next = 4;
                 break;
               }
-              subscribeRequest = cubeApi.subscribe(query, {
+              subscribeRequest = cubeApi.subscribe(query, _objectSpread({
                 mutexObj: mutexRef.current,
                 mutexKey: 'query',
                 progressCallback: progressCallback
-              }, function (e, result) {
+              }, options.cache ? {
+                cache: options.cache
+              } : {}), function (e, result) {
                 if (e) {
                   setError(e);
                 } else {