@cubejs-client/react 0.34.60 → 0.35.23

package/dist/cubejs-client-react.js

@@ -70,41 +70,30 @@ var _typeof__default = /*#__PURE__*/_interopDefaultLegacy(_typeof);
 
 var CubeContext = /*#__PURE__*/React.createContext(null);
 
-function ownKeys$6(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-
-function _objectSpread$6(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys$6(Object(source), !0).forEach(function (key) { _defineProperty__default['default'](target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys$6(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-
+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 _createSuper$1(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct$1(); return function _createSuperInternal() { var Super = _getPrototypeOf__default['default'](Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf__default['default'](this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn__default['default'](this, result); }; }
-
-function _isNativeReflectConstruct$1() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
-
+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) {
   _inherits__default['default'](QueryRenderer, _React$Component);
-
   var _super = _createSuper$1(QueryRenderer);
-
   function QueryRenderer(props) {
     var _this;
-
     _classCallCheck__default['default'](this, QueryRenderer);
-
     _this = _super.call(this, props);
     _this.state = {};
     _this.mutexObj = {};
     return _this;
   }
-
   _createClass__default['default'](QueryRenderer, [{
     key: "componentDidMount",
     value: function componentDidMount() {
       var _this$props = this.props,
-          query = _this$props.query,
-          queries = _this$props.queries;
-
+        query = _this$props.query,
+        queries = _this$props.queries;
       if (query) {
         this.load(query);
       }
-
       if (queries) {
         this.loadQueries(queries);
       }
@@ -113,45 +102,40 @@ var QueryRenderer = /*#__PURE__*/function (_React$Component) {
     key: "shouldComponentUpdate",
     value: function shouldComponentUpdate(nextProps, nextState) {
       var _this$props2 = this.props,
-          query = _this$props2.query,
-          queries = _this$props2.queries,
-          render = _this$props2.render,
-          cubejsApi = _this$props2.cubejsApi,
-          loadSql = _this$props2.loadSql,
-          updateOnlyOnStateChange = _this$props2.updateOnlyOnStateChange;
-
+        query = _this$props2.query,
+        queries = _this$props2.queries,
+        render = _this$props2.render,
+        cubeApi = _this$props2.cubeApi,
+        loadSql = _this$props2.loadSql,
+        updateOnlyOnStateChange = _this$props2.updateOnlyOnStateChange;
       if (!updateOnlyOnStateChange) {
         return true;
       }
-
-      return !ramda.equals(nextProps.query, query) || !ramda.equals(nextProps.queries, queries) || (nextProps.render == null || render == null) && nextProps.render !== render || nextProps.cubejsApi !== cubejsApi || nextProps.loadSql !== loadSql || !ramda.equals(nextState, this.state) || nextProps.updateOnlyOnStateChange !== updateOnlyOnStateChange;
+      return !ramda.equals(nextProps.query, query) || !ramda.equals(nextProps.queries, queries) || (nextProps.render == null || render == null) && nextProps.render !== render || nextProps.cubeApi !== cubeApi || nextProps.loadSql !== loadSql || !ramda.equals(nextState, this.state) || nextProps.updateOnlyOnStateChange !== updateOnlyOnStateChange;
     }
   }, {
     key: "componentDidUpdate",
     value: function componentDidUpdate(prevProps) {
       var _this$props3 = this.props,
-          query = _this$props3.query,
-          queries = _this$props3.queries;
-
+        query = _this$props3.query,
+        queries = _this$props3.queries;
       if (!ramda.equals(prevProps.query, query)) {
         this.load(query);
       }
-
       if (!ramda.equals(prevProps.queries, queries)) {
         this.loadQueries(queries);
       }
     }
   }, {
-    key: "cubejsApi",
-    value: function cubejsApi() {
+    key: "cubeApi",
+    value: function cubeApi() {
       // eslint-disable-next-line react/destructuring-assignment
-      return this.props.cubejsApi || this.context && this.context.cubejsApi;
+      return this.props.cubeApi || this.context && this.context.cubeApi;
     }
   }, {
     key: "load",
     value: function load(query) {
       var _this2 = this;
-
       var resetResultSetOnChange = this.props.resetResultSetOnChange;
       this.setState(_objectSpread$6({
         isLoading: true,
@@ -161,11 +145,10 @@ var QueryRenderer = /*#__PURE__*/function (_React$Component) {
         resultSet: null
       } : {}));
       var loadSql = this.props.loadSql;
-      var cubejsApi = this.cubejsApi();
-
+      var cubeApi = this.cubeApi();
       if (query && core.isQueryPresent(query)) {
         if (loadSql === 'only') {
-          cubejsApi.sql(query, {
+          cubeApi.sql(query, {
             mutexObj: this.mutexObj,
             mutexKey: 'sql'
           }).then(function (sqlQuery) {
@@ -183,17 +166,16 @@ var QueryRenderer = /*#__PURE__*/function (_React$Component) {
             }));
           });
         } else if (loadSql) {
-          Promise.all([cubejsApi.sql(query, {
+          Promise.all([cubeApi.sql(query, {
             mutexObj: this.mutexObj,
             mutexKey: 'sql'
-          }), cubejsApi.load(query, {
+          }), cubeApi.load(query, {
             mutexObj: this.mutexObj,
             mutexKey: 'query'
           })]).then(function (_ref) {
             var _ref2 = _slicedToArray__default['default'](_ref, 2),
-                sqlQuery = _ref2[0],
-                resultSet = _ref2[1];
-
+              sqlQuery = _ref2[0],
+              resultSet = _ref2[1];
             return _this2.setState({
               sqlQuery: sqlQuery,
               resultSet: resultSet,
@@ -209,7 +191,7 @@ var QueryRenderer = /*#__PURE__*/function (_React$Component) {
             }));
           });
         } else {
-          cubejsApi.load(query, {
+          cubeApi.load(query, {
             mutexObj: this.mutexObj,
             mutexKey: 'query'
           }).then(function (resultSet) {
@@ -233,8 +215,7 @@ var QueryRenderer = /*#__PURE__*/function (_React$Component) {
     key: "loadQueries",
     value: function loadQueries(queries) {
       var _this3 = this;
-
-      var cubejsApi = this.cubejsApi();
+      var cubeApi = this.cubeApi();
       var resetResultSetOnChange = this.props.resetResultSetOnChange;
       this.setState(_objectSpread$6(_objectSpread$6({
         isLoading: true
@@ -245,10 +226,9 @@ var QueryRenderer = /*#__PURE__*/function (_React$Component) {
       }));
       var resultPromises = Promise.all(ramda.toPairs(queries).map(function (_ref3) {
         var _ref4 = _slicedToArray__default['default'](_ref3, 2),
-            name = _ref4[0],
-            query = _ref4[1];
-
-        return cubejsApi.load(query, {
+          name = _ref4[0],
+          query = _ref4[1];
+        return cubeApi.load(query, {
           mutexObj: _this3.mutexObj,
           mutexKey: name
         }).then(function (r) {
@@ -274,13 +254,12 @@ var QueryRenderer = /*#__PURE__*/function (_React$Component) {
     key: "render",
     value: function render() {
       var _error$response;
-
       var _this$state = this.state,
-          error = _this$state.error,
-          queries = _this$state.queries,
-          resultSet = _this$state.resultSet,
-          isLoading = _this$state.isLoading,
-          sqlQuery = _this$state.sqlQuery;
+        error = _this$state.error,
+        queries = _this$state.queries,
+        resultSet = _this$state.resultSet,
+        isLoading = _this$state.isLoading,
+        sqlQuery = _this$state.sqlQuery;
       var render = this.props.render;
       var loadState = {
         error: error ? new Error(((_error$response = error.response) === null || _error$response === void 0 ? void 0 : _error$response.plainError) || error.message || error.toString()) : null,
@@ -290,28 +269,24 @@ var QueryRenderer = /*#__PURE__*/function (_React$Component) {
         },
         sqlQuery: sqlQuery
       };
-
       if (render) {
         return render(loadState);
       }
-
       return null;
     }
   }], [{
     key: "isQueryPresent",
-    value: // @deprecated use `isQueryPresent` from `@cubejs-client/core`
+    value:
+    // @deprecated use `isQueryPresent` from `@cubejs-client/core`
     function isQueryPresent(query) {
       return core.isQueryPresent(query);
     }
   }]);
-
   return QueryRenderer;
 }(React__default['default'].Component);
-
 _defineProperty__default['default'](QueryRenderer, "contextType", CubeContext);
-
 _defineProperty__default['default'](QueryRenderer, "defaultProps", {
-  cubejsApi: null,
+  cubeApi: null,
   query: null,
   render: null,
   queries: null,
@@ -321,15 +296,11 @@ _defineProperty__default['default'](QueryRenderer, "defaultProps", {
 });
 
 var _excluded$1 = ["query"];
-
-function ownKeys$5(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-
-function _objectSpread$5(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys$5(Object(source), !0).forEach(function (key) { _defineProperty__default['default'](target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys$5(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-
+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; }
 var QueryRendererWithTotals = function QueryRendererWithTotals(_ref) {
   var query = _ref.query,
-      restProps = _objectWithoutProperties__default['default'](_ref, _excluded$1);
-
+    restProps = _objectWithoutProperties__default['default'](_ref, _excluded$1);
   return /*#__PURE__*/React__default['default'].createElement(QueryRenderer, _extends__default['default']({
     queries: {
       totals: _objectSpread$5(_objectSpread$5({}, query), {}, {
@@ -349,32 +320,25 @@ function removeEmpty(obj) {
   if (_typeof__default['default'](obj) !== 'object') {
     return obj;
   }
-
   return Object.fromEntries(Object.entries(obj).filter(function (_ref) {
     var _ref2 = _slicedToArray__default['default'](_ref, 2),
-        v = _ref2[1];
-
+      v = _ref2[1];
     return v != null;
   }).map(function (_ref3) {
     var _ref4 = _slicedToArray__default['default'](_ref3, 2),
-        k = _ref4[0],
-        v = _ref4[1];
-
+      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];
   }));
 }
 
-function ownKeys$4(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-
-function _objectSpread$4(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys$4(Object(source), !0).forEach(function (key) { _defineProperty__default['default'](target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys$4(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-
+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 _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf__default['default'](Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf__default['default'](this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn__default['default'](this, result); }; }
-
-function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
+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,
   title: 'w/o grouping'
@@ -403,58 +367,44 @@ var granularities = [{
   name: 'year',
   title: 'Year'
 }];
-
 var QueryBuilder = /*#__PURE__*/function (_React$Component) {
   _inherits__default['default'](QueryBuilder, _React$Component);
-
   var _super = _createSuper(QueryBuilder);
-
   function QueryBuilder(props) {
     var _this;
-
     _classCallCheck__default['default'](this, QueryBuilder);
-
     _this = _super.call(this, props);
-
     _defineProperty__default['default'](_assertThisInitialized__default['default'](_this), "fetchMeta", /*#__PURE__*/_asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee() {
       var meta, metaError, richMetaError, metaErrorStack, _error$response, _error$response2, _error$response2$stac;
-
       return _regeneratorRuntime__default['default'].wrap(function _callee$(_context) {
         while (1) {
           switch (_context.prev = _context.next) {
             case 0:
-              if (_this.cubejsApi()) {
+              if (_this.cubeApi()) {
                 _context.next = 2;
                 break;
               }
-
               return _context.abrupt("return");
-
             case 2:
               metaError = null;
               richMetaError = null;
               metaErrorStack = null;
               _context.prev = 5;
-
               _this.setState({
                 isFetchingMeta: true
               });
-
               _context.next = 9;
-              return _this.cubejsApi().meta();
-
+              return _this.cubeApi().meta();
             case 9:
               meta = _context.sent;
               _context.next = 17;
               break;
-
             case 12:
               _context.prev = 12;
               _context.t0 = _context["catch"](5);
               metaError = ((_error$response = _context.t0.response) === null || _error$response === void 0 ? void 0 : _error$response.plainError) || _context.t0;
               richMetaError = _context.t0;
               metaErrorStack = ((_error$response2 = _context.t0.response) === null || _error$response2 === void 0 ? void 0 : (_error$response2$stac = _error$response2.stack) === null || _error$response2$stac === void 0 ? void 0 : _error$response2$stac.replace(_context.t0.message || '', '')) || '';
-
             case 17:
               _this.setState({
                 meta: meta,
@@ -467,7 +417,6 @@ var QueryBuilder = /*#__PURE__*/function (_React$Component) {
                 // This will catch any new missing members, and also validate the query against the new meta
                 _this.updateQuery({});
               });
-
             case 18:
             case "end":
               return _context.stop();
@@ -475,7 +424,6 @@ var QueryBuilder = /*#__PURE__*/function (_React$Component) {
         }
       }, _callee, null, [[5, 12]]);
     })));
-
     _this.state = _objectSpread$4(_objectSpread$4({
       query: props.defaultQuery || props.query,
       chartType: props.defaultChartType,
@@ -490,7 +438,6 @@ var QueryBuilder = /*#__PURE__*/function (_React$Component) {
     _this.orderMembersOrderKeys = [];
     return _this;
   }
-
   _createClass__default['default'](QueryBuilder, [{
     key: "componentDidMount",
     value: function () {
@@ -502,7 +449,6 @@ var QueryBuilder = /*#__PURE__*/function (_React$Component) {
                 this.prevContext = this.context;
                 _context2.next = 3;
                 return this.fetchMeta();
-
               case 3:
               case "end":
                 return _context2.stop();
@@ -510,11 +456,9 @@ var QueryBuilder = /*#__PURE__*/function (_React$Component) {
           }
         }, _callee2, this);
       }));
-
       function componentDidMount() {
         return _componentDidMount.apply(this, arguments);
       }
-
       return componentDidMount;
     }()
   }, {
@@ -522,40 +466,32 @@ var QueryBuilder = /*#__PURE__*/function (_React$Component) {
     value: function () {
       var _componentDidUpdate = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee4(prevProps) {
         var _this$prevContext,
-            _this$context,
-            _this2 = this;
-
+          _this$context,
+          _this2 = this;
         var _this$props, schemaVersion, onSchemaChange, meta, newMeta;
-
         return _regeneratorRuntime__default['default'].wrap(function _callee4$(_context4) {
           while (1) {
             switch (_context4.prev = _context4.next) {
               case 0:
                 _this$props = this.props, schemaVersion = _this$props.schemaVersion, onSchemaChange = _this$props.onSchemaChange;
                 meta = this.state.meta;
-
-                if (!(((_this$prevContext = this.prevContext) === null || _this$prevContext === void 0 ? void 0 : _this$prevContext.cubejsApi) !== ((_this$context = this.context) === null || _this$context === void 0 ? void 0 : _this$context.cubejsApi))) {
+                if (!(((_this$prevContext = this.prevContext) === null || _this$prevContext === void 0 ? void 0 : _this$prevContext.cubeApi) !== ((_this$context = this.context) === null || _this$context === void 0 ? void 0 : _this$context.cubeApi))) {
                   _context4.next = 6;
                   break;
                 }
-
                 this.prevContext = this.context;
                 _context4.next = 6;
                 return this.fetchMeta();
-
               case 6:
                 if (!(prevProps.schemaVersion !== schemaVersion)) {
                   _context4.next = 17;
                   break;
                 }
-
                 _context4.prev = 7;
                 _context4.next = 10;
-                return this.cubejsApi().meta();
-
+                return this.cubeApi().meta();
               case 10:
                 newMeta = _context4.sent;
-
                 if (!ramda.equals(newMeta, meta) && typeof onSchemaChange === 'function') {
                   onSchemaChange({
                     schemaVersion: schemaVersion,
@@ -567,7 +503,6 @@ var QueryBuilder = /*#__PURE__*/function (_React$Component) {
                               case 0:
                                 _context3.next = 2;
                                 return _this2.fetchMeta();
-
                               case 2:
                               case "end":
                                 return _context3.stop();
@@ -575,19 +510,15 @@ var QueryBuilder = /*#__PURE__*/function (_React$Component) {
                           }
                         }, _callee3);
                       }));
-
                       function refresh() {
                         return _refresh.apply(this, arguments);
                       }
-
                       return refresh;
                     }()
                   });
                 }
-
                 _context4.next = 17;
                 break;
-
               case 14:
                 _context4.prev = 14;
                 _context4.t0 = _context4["catch"](7);
@@ -595,7 +526,6 @@ var QueryBuilder = /*#__PURE__*/function (_React$Component) {
                 this.setState({
                   metaError: _context4.t0
                 });
-
               case 17:
               case "end":
                 return _context4.stop();
@@ -603,19 +533,17 @@ var QueryBuilder = /*#__PURE__*/function (_React$Component) {
           }
         }, _callee4, this, [[7, 14]]);
       }));
-
       function componentDidUpdate(_x) {
         return _componentDidUpdate.apply(this, arguments);
       }
-
       return componentDidUpdate;
     }()
   }, {
-    key: "cubejsApi",
-    value: function cubejsApi() {
-      var cubejsApi = this.props.cubejsApi; // eslint-disable-next-line react/destructuring-assignment
-
-      return cubejsApi || this.context && this.context.cubejsApi;
+    key: "cubeApi",
+    value: function cubeApi() {
+      var cubeApi = this.props.cubeApi;
+      // eslint-disable-next-line react/destructuring-assignment
+      return cubeApi || this.context && this.context.cubeApi;
     }
   }, {
     key: "getMissingMembers",
@@ -623,14 +551,11 @@ var QueryBuilder = /*#__PURE__*/function (_React$Component) {
       if (!meta) {
         return [];
       }
-
       return core.getQueryMembers(query).map(function (member) {
         var resolvedMember = meta.resolveMember(member, ['measures', 'dimensions', 'segments']);
-
         if (resolvedMember.error) {
           return member;
         }
-
         return false;
       }).filter(Boolean);
     }
@@ -644,11 +569,9 @@ var QueryBuilder = /*#__PURE__*/function (_React$Component) {
     key: "prepareRenderProps",
     value: function prepareRenderProps(queryRendererProps) {
       var _this3 = this;
-
       var getName = function getName(member) {
         return member.name;
       };
-
       var toTimeDimension = function toTimeDimension(member) {
         var rangeSelection = member.compareDateRange ? {
           compareDateRange: member.compareDateRange
@@ -660,10 +583,8 @@ var QueryBuilder = /*#__PURE__*/function (_React$Component) {
           granularity: member.granularity
         }, rangeSelection));
       };
-
       var toFilter = function toFilter(member) {
         var _member$member, _member$dimension;
-
         return _objectSpread$4({
           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
@@ -671,13 +592,11 @@ var QueryBuilder = /*#__PURE__*/function (_React$Component) {
           values: member.values
         });
       };
-
       var updateMethods = function updateMethods(memberType) {
         var toQuery = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : getName;
         return {
           add: function add(member) {
             var query = _this3.state.query;
-
             _this3.updateQuery(_defineProperty__default['default']({}, memberType, (query[memberType] || []).concat(toQuery(member))));
           },
           remove: function remove(member) {
@@ -694,20 +613,19 @@ var QueryBuilder = /*#__PURE__*/function (_React$Component) {
           }
         };
       };
-
       var _this$state = this.state,
-          meta = _this$state.meta,
-          metaError = _this$state.metaError,
-          richMetaError = _this$state.richMetaError,
-          query = _this$state.query,
-          queryError = _this$state.queryError,
-          chartType = _this$state.chartType,
-          pivotConfig = _this$state.pivotConfig,
-          validatedQuery = _this$state.validatedQuery,
-          missingMembers = _this$state.missingMembers,
-          isFetchingMeta = _this$state.isFetchingMeta,
-          dryRunResponse = _this$state.dryRunResponse,
-          metaErrorStack = _this$state.metaErrorStack;
+        meta = _this$state.meta,
+        metaError = _this$state.metaError,
+        richMetaError = _this$state.richMetaError,
+        query = _this$state.query,
+        queryError = _this$state.queryError,
+        chartType = _this$state.chartType,
+        pivotConfig = _this$state.pivotConfig,
+        validatedQuery = _this$state.validatedQuery,
+        missingMembers = _this$state.missingMembers,
+        isFetchingMeta = _this$state.isFetchingMeta,
+        dryRunResponse = _this$state.dryRunResponse,
+        metaErrorStack = _this$state.metaErrorStack;
       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) {
@@ -740,7 +658,6 @@ var QueryBuilder = /*#__PURE__*/function (_React$Component) {
         segments: [],
         timeDimensions: []
       };
-
       if (meta) {
         availableMeasures = meta.membersForQuery(query, 'measures');
         availableDimensions = meta.membersForQuery(query, 'dimensions');
@@ -750,7 +667,6 @@ var QueryBuilder = /*#__PURE__*/function (_React$Component) {
         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) {
@@ -759,7 +675,6 @@ var QueryBuilder = /*#__PURE__*/function (_React$Component) {
           });
         });
       }
-
       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 dimension = _ref2.dimension;
@@ -767,21 +682,19 @@ var QueryBuilder = /*#__PURE__*/function (_React$Component) {
       })));
       var orderMembers = ramda.uniqBy(ramda.prop('id'), _toConsumableArray__default['default'](members.map(function (_ref3) {
         var name = _ref3.name,
-            title = _ref3.title;
+          title = _ref3.title;
         return {
           id: name,
           title: title,
           order: (activeOrder === null || activeOrder === void 0 ? void 0 : activeOrder[name]) || 'none'
         };
       })));
-
       if (this.orderMembersOrderKeys.length !== orderMembers.length) {
         this.orderMembersOrderKeys = orderMembers.map(function (_ref4) {
           var id = _ref4.id;
           return id;
         });
       }
-
       if (this.orderMembersOrderKeys.length) {
         // Preserve order until the members change or manually re-ordered
         // This is needed so that when an order member becomes active, it doesn't jump to the top of the list
@@ -791,7 +704,6 @@ var QueryBuilder = /*#__PURE__*/function (_React$Component) {
           });
         }).filter(Boolean);
       }
-
       return _objectSpread$4({
         meta: meta,
         metaError: metaError,
@@ -833,7 +745,6 @@ var QueryBuilder = /*#__PURE__*/function (_React$Component) {
         updateOrder: {
           set: function set(memberId) {
             var newOrder = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'asc';
-
             _this3.updateQuery({
               order: orderMembers.map(function (orderMember) {
                 return _objectSpread$4(_objectSpread$4({}, orderMember), {}, {
@@ -841,7 +752,7 @@ var QueryBuilder = /*#__PURE__*/function (_React$Component) {
                 });
               }).reduce(function (acc, _ref5) {
                 var id = _ref5.id,
-                    order = _ref5.order;
+                  order = _ref5.order;
                 return order !== 'none' ? [].concat(_toConsumableArray__default['default'](acc), [[id, order]]) : acc;
               }, [])
             });
@@ -855,17 +766,15 @@ var QueryBuilder = /*#__PURE__*/function (_React$Component) {
             if (sourceIndex == null || destinationIndex == null) {
               return;
             }
-
             var nextArray = core.moveItemInArray(orderMembers, sourceIndex, destinationIndex);
             _this3.orderMembersOrderKeys = nextArray.map(function (_ref6) {
               var id = _ref6.id;
               return id;
             });
-
             _this3.updateQuery({
               order: nextArray.reduce(function (acc, _ref7) {
                 var id = _ref7.id,
-                    order = _ref7.order;
+                  order = _ref7.order;
                 return order !== 'none' ? [].concat(_toConsumableArray__default['default'](acc), [[id, order]]) : acc;
               }, [])
             });
@@ -875,17 +784,15 @@ var QueryBuilder = /*#__PURE__*/function (_React$Component) {
         updatePivotConfig: {
           moveItem: function moveItem(_ref8) {
             var sourceIndex = _ref8.sourceIndex,
-                destinationIndex = _ref8.destinationIndex,
-                sourceAxis = _ref8.sourceAxis,
-                destinationAxis = _ref8.destinationAxis;
-
+              destinationIndex = _ref8.destinationIndex,
+              sourceAxis = _ref8.sourceAxis,
+              destinationAxis = _ref8.destinationAxis;
             _this3.updateVizState({
               pivotConfig: core.movePivotItem(pivotConfig, sourceIndex, destinationIndex, sourceAxis, destinationAxis)
             });
           },
           update: function update(config) {
             var limit = config.limit;
-
             _this3.updateVizState(_objectSpread$4({
               pivotConfig: _objectSpread$4(_objectSpread$4({}, pivotConfig), config)
             }, limit ? {
@@ -914,9 +821,7 @@ var QueryBuilder = /*#__PURE__*/function (_React$Component) {
     value: function () {
       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;
-
         return _regeneratorRuntime__default['default'].wrap(function _callee5$(_context5) {
           while (1) {
             switch (_context5.prev = _context5.next) {
@@ -924,87 +829,74 @@ var QueryBuilder = /*#__PURE__*/function (_React$Component) {
                 _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);
                 }
-
                 vizStateSent = null;
-
                 handleVizStateChange = function handleVizStateChange(currentState) {
                   var onVizStateChanged = _this4.props.onVizStateChanged;
-
                   if (onVizStateChanged) {
-                    var newVizState = ramda.pick(['chartType', 'pivotConfig', 'query'], currentState); // Don't run callbacks more than once unless the viz state has changed since last time
-
+                    var newVizState = ramda.pick(['chartType', 'pivotConfig', 'query'], currentState);
+                    // Don't run callbacks more than once unless the viz state has changed since last time
                     if (!vizStateSent || !ramda.equals(vizStateSent, newVizState)) {
-                      onVizStateChanged(newVizState); // use clone to make sure we don't save object references
-
+                      onVizStateChanged(newVizState);
+                      // use clone to make sure we don't save object references
                       vizStateSent = ramda.clone(newVizState);
                     }
                   }
                 }; // deprecated, setters replaced by onVizStateChanged
-
-
                 runSetters = function runSetters(currentState) {
                   if (setVizState) {
                     setVizState(ramda.pick(['chartType', 'pivotConfig', 'query'], currentState));
                   }
-
                   if (currentState.query && setQuery) {
                     setQuery(currentState.query);
                   }
                 };
-
                 if (finalState.shouldApplyHeuristicOrder) {
                   finalState.query.order = core.defaultOrder(finalState.query);
                 }
-
                 finalState.pivotConfig = core.ResultSet.getNormalizedPivotConfig(finalState.query, finalState.pivotConfig !== undefined ? finalState.pivotConfig : statePivotConfig);
                 finalState.missingMembers = this.getMissingMembers(finalState.query, meta);
-                finalState.chartType = finalState.chartType || state.chartType || chartType; // deprecated
+                finalState.chartType = finalState.chartType || state.chartType || chartType;
 
+                // deprecated
                 runSetters(_objectSpread$4(_objectSpread$4({}, state), {}, {
                   query: finalState.query
-                })); // Update optimistically so that UI does not stutter
+                }));
 
+                // Update optimistically so that UI does not stutter
                 this.setState(_objectSpread$4(_objectSpread$4({}, finalState), {}, {
                   queryError: null
                 }));
                 handleVizStateChange(finalState);
                 shouldFetchDryRun = !ramda.equals(ramda.pick(['measures', 'dimensions', 'timeDimensions'], stateQuery), ramda.pick(['measures', 'dimensions', 'timeDimensions'], finalState.query));
-
                 if (!(shouldFetchDryRun && core.isQueryPresent(finalState.query) && finalState.missingMembers.length === 0)) {
                   _context5.next = 30;
                   break;
                 }
-
                 _context5.prev = 16;
                 _context5.next = 19;
-                return this.cubejsApi().dryRun(finalState.query, {
+                return this.cubeApi().dryRun(finalState.query, {
                   mutexObj: this.mutexObj
                 });
-
               case 19:
                 response = _context5.sent;
-
                 if (finalState.shouldApplyHeuristicOrder) {
                   finalState.query.order = (response.queryOrder || []).reduce(function (memo, current) {
                     return _objectSpread$4(_objectSpread$4({}, memo), current);
                   }, {});
                 }
-
                 finalState.pivotConfig = core.ResultSet.getNormalizedPivotConfig(response.pivotQuery, finalState.pivotConfig);
                 finalState.validatedQuery = this.validatedQuery(finalState);
-                finalState.dryRunResponse = response; // deprecated
+                finalState.dryRunResponse = response;
 
+                // deprecated
                 if (core.isQueryPresent(stateQuery)) {
                   runSetters(_objectSpread$4(_objectSpread$4({}, this.state), finalState));
                 }
-
                 _context5.next = 30;
                 break;
-
               case 27:
                 _context5.prev = 27;
                 _context5.t0 = _context5["catch"](16);
@@ -1012,12 +904,10 @@ var QueryBuilder = /*#__PURE__*/function (_React$Component) {
                   queryError: new Error(((_error$response3 = _context5.t0.response) === null || _error$response3 === void 0 ? void 0 : _error$response3.plainError) || _context5.t0.message),
                   richQueryError: new Error(_context5.t0.message || _context5.t0.toString())
                 });
-
               case 30:
                 this.setState(finalState, function () {
                   return handleVizStateChange(_this4.state);
                 });
-
               case 31:
               case "end":
                 return _context5.stop();
@@ -1025,28 +915,25 @@ var QueryBuilder = /*#__PURE__*/function (_React$Component) {
           }
         }, _callee5, this, [[16, 27]]);
       }));
-
       function updateVizState(_x2) {
         return _updateVizState.apply(this, arguments);
       }
-
       return updateVizState;
     }()
   }, {
     key: "validatedQuery",
     value: function validatedQuery(state) {
       var _ref9 = state || this.state,
-          query = _ref9.query;
-
+        query = _ref9.query;
       return core.validateQuery(query);
     }
   }, {
     key: "defaultHeuristics",
     value: function defaultHeuristics(newState) {
       var _this$state3 = this.state,
-          query = _this$state3.query,
-          sessionGranularity = _this$state3.sessionGranularity,
-          meta = _this$state3.meta;
+        query = _this$state3.query,
+        sessionGranularity = _this$state3.sessionGranularity,
+        meta = _this$state3.meta;
       return core.defaultHeuristics(newState, query, {
         meta: meta,
         sessionGranularity: sessionGranularity || 'day'
@@ -1056,36 +943,31 @@ var QueryBuilder = /*#__PURE__*/function (_React$Component) {
     key: "applyStateChangeHeuristics",
     value: function applyStateChangeHeuristics(newState) {
       var _this$props3 = this.props,
-          stateChangeHeuristics = _this$props3.stateChangeHeuristics,
-          disableHeuristics = _this$props3.disableHeuristics;
-
+        stateChangeHeuristics = _this$props3.stateChangeHeuristics,
+        disableHeuristics = _this$props3.disableHeuristics;
       if (disableHeuristics) {
         return newState;
       }
-
       return stateChangeHeuristics && stateChangeHeuristics(this.state, newState) || this.defaultHeuristics(newState);
     }
   }, {
     key: "render",
     value: function render() {
       var _this5 = this;
-
       var query = this.state.query;
       var _this$props4 = this.props,
-          cubejsApi = _this$props4.cubejsApi,
-          _render = _this$props4.render,
-          wrapWithQueryRenderer = _this$props4.wrapWithQueryRenderer;
-
+        cubeApi = _this$props4.cubeApi,
+        _render = _this$props4.render,
+        wrapWithQueryRenderer = _this$props4.wrapWithQueryRenderer;
       if (wrapWithQueryRenderer) {
         return /*#__PURE__*/React__default['default'].createElement(QueryRenderer, {
           query: query,
-          cubejsApi: cubejsApi,
+          cubeApi: cubeApi,
           resetResultSetOnChange: false,
           render: function render(queryRendererProps) {
             if (_render) {
               return _render(_this5.prepareRenderProps(queryRendererProps));
             }
-
             return null;
           }
         });
@@ -1093,39 +975,34 @@ var QueryBuilder = /*#__PURE__*/function (_React$Component) {
         if (_render) {
           return _render(this.prepareRenderProps());
         }
-
         return null;
       }
     }
   }], [{
     key: "getDerivedStateFromProps",
-    value: // This is an anti-pattern, only kept for backward compatibility
+    value:
+    // This is an anti-pattern, only kept for backward compatibility
     // 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 || {});
-
         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 null;
     }
   }, {
     key: "resolveMember",
     value: function resolveMember(type, _ref10) {
       var meta = _ref10.meta,
-          query = _ref10.query;
-
+        query = _ref10.query;
       if (!meta) {
         return [];
       }
-
       if (Array.isArray(query)) {
         return query.reduce(function (memo, currentQuery) {
           return memo.concat(QueryBuilder.resolveMember(type, {
@@ -1134,7 +1011,6 @@ var QueryBuilder = /*#__PURE__*/function (_React$Component) {
           }));
         }, []);
       }
-
       if (type === 'timeDimensions') {
         return (query.timeDimensions || []).map(function (m, index) {
           return _objectSpread$4(_objectSpread$4({}, m), {}, {
@@ -1145,7 +1021,6 @@ var QueryBuilder = /*#__PURE__*/function (_React$Component) {
           });
         });
       }
-
       return (query[type] || []).map(function (m, index) {
         return _objectSpread$4({
           index: index
@@ -1153,14 +1028,11 @@ var QueryBuilder = /*#__PURE__*/function (_React$Component) {
       });
     }
   }]);
-
   return QueryBuilder;
 }(React__default['default'].Component);
-
 _defineProperty__default['default'](QueryBuilder, "contextType", CubeContext);
-
 _defineProperty__default['default'](QueryBuilder, "defaultProps", {
-  cubejsApi: null,
+  cubeApi: null,
   stateChangeHeuristics: null,
   disableHeuristics: false,
   render: null,
@@ -1178,18 +1050,11 @@ _defineProperty__default['default'](QueryBuilder, "defaultProps", {
 
 function CubeProvider(_ref) {
   var cubeApi = _ref.cubeApi,
-      cubejsApi = _ref.cubejsApi,
-      children = _ref.children,
-      _ref$options = _ref.options,
-      options = _ref$options === void 0 ? {} : _ref$options;
-  React.useEffect(function () {
-    if (cubejsApi && !cubeApi) {
-      console.warn('"cubejsApi" is deprecated and will be removed in the following version. Use "cubeApi" instead.');
-    }
-  }, [cubeApi, cubejsApi]);
+    children = _ref.children,
+    _ref$options = _ref.options,
+    options = _ref$options === void 0 ? {} : _ref$options;
   return /*#__PURE__*/React__default['default'].createElement(CubeContext.Provider, {
     value: {
-      cubejsApi: cubejsApi,
       cubeApi: cubeApi,
       options: options
     }
@@ -1198,11 +1063,9 @@ function CubeProvider(_ref) {
 
 function useDeepCompareMemoize(value) {
   var ref = React.useRef([]);
-
   if (!ramda.equals(value, ref.current)) {
     ref.current = value;
   }
-
   return ref.current;
 }
 
@@ -1219,64 +1082,54 @@ function useIsMounted() {
   };
 }
 
-function ownKeys$3(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-
-function _objectSpread$3(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys$3(Object(source), !0).forEach(function (key) { _defineProperty__default['default'](target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys$3(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+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 useCubeFetch(method) {
   var _options$query;
-
   var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
   var isMounted = useIsMounted();
   var context = React.useContext(CubeContext);
   var mutexRef = React.useRef({});
-
   var _useState = React.useState({
-    isLoading: false,
-    response: null
-  }),
-      _useState2 = _slicedToArray__default['default'](_useState, 2),
-      response = _useState2[0],
-      setResponse = _useState2[1];
-
+      isLoading: false,
+      response: null
+    }),
+    _useState2 = _slicedToArray__default['default'](_useState, 2),
+    response = _useState2[0],
+    setResponse = _useState2[1];
   var _useState3 = React.useState(null),
-      _useState4 = _slicedToArray__default['default'](_useState3, 2),
-      error = _useState4[0],
-      setError = _useState4[1];
-
+    _useState4 = _slicedToArray__default['default'](_useState3, 2),
+    error = _useState4[0],
+    setError = _useState4[1];
   var _options$skip = options.skip,
-      skip = _options$skip === void 0 ? false : _options$skip;
-
+    skip = _options$skip === void 0 ? false : _options$skip;
   function load() {
     return _load.apply(this, arguments);
   }
-
   function _load() {
     _load = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee() {
       var loadOptions,
-          ignoreSkip,
-          cubeApi,
-          query,
-          queryCondition,
-          coreOptions,
-          args,
-          _response,
-          _args = arguments;
-
+        ignoreSkip,
+        cubeApi,
+        query,
+        queryCondition,
+        coreOptions,
+        args,
+        _response,
+        _args = arguments;
       return _regeneratorRuntime__default['default'].wrap(function _callee$(_context) {
         while (1) {
           switch (_context.prev = _context.next) {
             case 0:
               loadOptions = _args.length > 0 && _args[0] !== undefined ? _args[0] : {};
               ignoreSkip = _args.length > 1 && _args[1] !== undefined ? _args[1] : false;
-              cubeApi = options.cubeApi || options.cubejsApi || (context === null || context === void 0 ? void 0 : context.cubeApi) || (context === null || context === void 0 ? void 0 : context.cubejsApi);
+              cubeApi = options.cubeApi || (context === null || context === void 0 ? void 0 : context.cubeApi);
               query = loadOptions.query || options.query;
               queryCondition = method === 'meta' ? true : query && core.isQueryPresent(query);
-
               if (!(cubeApi && (ignoreSkip || !skip) && queryCondition)) {
                 _context.next = 20;
                 break;
               }
-
               setError(null);
               setResponse({
                 isLoading: true,
@@ -1290,24 +1143,19 @@ function useCubeFetch(method) {
               _context.prev = 10;
               _context.next = 13;
               return cubeApi[method].apply(cubeApi, args);
-
             case 13:
               _response = _context.sent;
-
               if (isMounted()) {
                 setResponse({
                   response: _response,
                   isLoading: false
                 });
               }
-
               _context.next = 20;
               break;
-
             case 17:
               _context.prev = 17;
               _context.t0 = _context["catch"](10);
-
               if (isMounted()) {
                 setError(_context.t0);
                 setResponse({
@@ -1315,7 +1163,6 @@ function useCubeFetch(method) {
                   response: null
                 });
               }
-
             case 20:
             case "end":
               return _context.stop();
@@ -1325,7 +1172,6 @@ function useCubeFetch(method) {
     }));
     return _load.apply(this, arguments);
   }
-
   React.useEffect(function () {
     load();
   }, useDeepCompareMemoize([Object.keys(((_options$query = options.query) === null || _options$query === void 0 ? void 0 : _options$query.order) || {}), options, context]));
@@ -1337,9 +1183,8 @@ function useCubeFetch(method) {
   });
 }
 
-function ownKeys$2(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-
-function _objectSpread$2(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys$2(Object(source), !0).forEach(function (key) { _defineProperty__default['default'](target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys$2(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+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 useCubeSql(query) {
   var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
   return useCubeFetch('sql', _objectSpread$2(_objectSpread$2({}, options), {}, {
@@ -1347,9 +1192,8 @@ function useCubeSql(query) {
   }));
 }
 
-function ownKeys$1(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-
-function _objectSpread$1(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys$1(Object(source), !0).forEach(function (key) { _defineProperty__default['default'](target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys$1(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+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 useDryRun(query) {
   var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
   return useCubeFetch('dryRun', _objectSpread$1(_objectSpread$1({}, options), {}, {
@@ -1358,20 +1202,16 @@ function useDryRun(query) {
 }
 
 var _excluded = ["refetch"];
-
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty__default['default'](target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+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 useLazyDryRun(query) {
   var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-
   var _useCubeFetch = useCubeFetch('dryRun', _objectSpread(_objectSpread({}, options), {}, {
-    query: query,
-    skip: true
-  })),
-      refetch = _useCubeFetch.refetch,
-      result = _objectWithoutProperties__default['default'](_useCubeFetch, _excluded);
-
+      query: query,
+      skip: true
+    })),
+    refetch = _useCubeFetch.refetch,
+    result = _objectWithoutProperties__default['default'](_useCubeFetch, _excluded);
   return [refetch, result];
 }
 
@@ -1379,73 +1219,53 @@ function useCubeQuery(query) {
   var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
   var mutexRef = React.useRef({});
   var isMounted = useIsMounted();
-
   var _useState = React.useState(null),
-      _useState2 = _slicedToArray__default['default'](_useState, 2),
-      currentQuery = _useState2[0],
-      setCurrentQuery = _useState2[1];
-
+    _useState2 = _slicedToArray__default['default'](_useState, 2),
+    currentQuery = _useState2[0],
+    setCurrentQuery = _useState2[1];
   var _useState3 = React.useState(false),
-      _useState4 = _slicedToArray__default['default'](_useState3, 2),
-      isLoading = _useState4[0],
-      setLoading = _useState4[1];
-
+    _useState4 = _slicedToArray__default['default'](_useState3, 2),
+    isLoading = _useState4[0],
+    setLoading = _useState4[1];
   var _useState5 = React.useState(null),
-      _useState6 = _slicedToArray__default['default'](_useState5, 2),
-      resultSet = _useState6[0],
-      setResultSet = _useState6[1];
-
+    _useState6 = _slicedToArray__default['default'](_useState5, 2),
+    resultSet = _useState6[0],
+    setResultSet = _useState6[1];
   var _useState7 = React.useState(null),
-      _useState8 = _slicedToArray__default['default'](_useState7, 2),
-      progress = _useState8[0],
-      setProgress = _useState8[1];
-
+    _useState8 = _slicedToArray__default['default'](_useState7, 2),
+    progress = _useState8[0],
+    setProgress = _useState8[1];
   var _useState9 = React.useState(null),
-      _useState10 = _slicedToArray__default['default'](_useState9, 2),
-      error = _useState10[0],
-      setError = _useState10[1];
-
+    _useState10 = _slicedToArray__default['default'](_useState9, 2),
+    error = _useState10[0],
+    setError = _useState10[1];
   var context = React.useContext(CubeContext);
   var subscribeRequest = null;
-
   var progressCallback = function progressCallback(_ref) {
     var progressResponse = _ref.progressResponse;
     return setProgress(progressResponse);
   };
-
-  React.useEffect(function () {
-    if (options.cubejsApi && !options.cubeApi) {
-      console.warn('"cubejsApi" is deprecated and will be removed in the following version. Use "cubeApi" instead.');
-    }
-  }, [options.cubeApi, options.cubejsApi]);
-
   function fetch() {
     return _fetch.apply(this, arguments);
   }
-
   function _fetch() {
     _fetch = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee2() {
       var resetResultSetOnChange, cubeApi, _context$options, response;
-
       return _regeneratorRuntime__default['default'].wrap(function _callee2$(_context2) {
         while (1) {
           switch (_context2.prev = _context2.next) {
             case 0:
               resetResultSetOnChange = options.resetResultSetOnChange;
-              cubeApi = options.cubeApi || options.cubejsApi || (context === null || context === void 0 ? void 0 : context.cubeApi) || (context === null || context === void 0 ? void 0 : context.cubejsApi);
-
+              cubeApi = options.cubeApi || (context === null || context === void 0 ? void 0 : context.cubeApi);
               if (cubeApi) {
                 _context2.next = 4;
                 break;
               }
-
               throw new Error('Cube API client is not provided');
-
             case 4:
               if (resetResultSetOnChange) {
                 setResultSet(null);
               }
-
               setError(null);
               setLoading(true);
               _context2.prev = 7;
@@ -1456,33 +1276,26 @@ function useCubeQuery(query) {
                 progressCallback: progressCallback,
                 castNumerics: Boolean(typeof options.castNumerics === 'boolean' ? options.castNumerics : context === null || context === void 0 ? void 0 : (_context$options = context.options) === null || _context$options === void 0 ? void 0 : _context$options.castNumerics)
               });
-
             case 10:
               response = _context2.sent;
-
               if (isMounted()) {
                 setResultSet(response);
                 setProgress(null);
               }
-
               _context2.next = 17;
               break;
-
             case 14:
               _context2.prev = 14;
               _context2.t0 = _context2["catch"](7);
-
               if (isMounted()) {
                 setError(_context2.t0);
                 setResultSet(null);
                 setProgress(null);
               }
-
             case 17:
               if (isMounted()) {
                 setLoading(false);
               }
-
             case 18:
             case "end":
               return _context2.stop();
@@ -1492,21 +1305,17 @@ function useCubeQuery(query) {
     }));
     return _fetch.apply(this, arguments);
   }
-
   React.useEffect(function () {
     var _options$skip = options.skip,
-        skip = _options$skip === void 0 ? false : _options$skip,
-        resetResultSetOnChange = options.resetResultSetOnChange;
-    var cubeApi = options.cubeApi || options.cubejsApi || (context === null || context === void 0 ? void 0 : context.cubeApi) || (context === null || context === void 0 ? void 0 : context.cubejsApi);
-
+      skip = _options$skip === void 0 ? false : _options$skip,
+      resetResultSetOnChange = options.resetResultSetOnChange;
+    var cubeApi = options.cubeApi || (context === null || context === void 0 ? void 0 : context.cubeApi);
     if (!cubeApi) {
       throw new Error('Cube API client is not provided');
     }
-
     function loadQuery() {
       return _loadQuery.apply(this, arguments);
     }
-
     function _loadQuery() {
       _loadQuery = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee() {
         return _regeneratorRuntime__default['default'].wrap(function _callee$(_context) {
@@ -1517,36 +1326,28 @@ function useCubeQuery(query) {
                   _context.next = 20;
                   break;
                 }
-
                 if (!core.areQueriesEqual(currentQuery, query)) {
                   if (resetResultSetOnChange == null || resetResultSetOnChange) {
                     setResultSet(null);
                   }
-
                   setCurrentQuery(query);
                 }
-
                 setError(null);
                 setLoading(true);
                 _context.prev = 4;
-
                 if (!subscribeRequest) {
                   _context.next = 9;
                   break;
                 }
-
                 _context.next = 8;
                 return subscribeRequest.unsubscribe();
-
               case 8:
                 subscribeRequest = null;
-
               case 9:
                 if (!options.subscribe) {
                   _context.next = 13;
                   break;
                 }
-
                 subscribeRequest = cubeApi.subscribe(query, {
                   mutexObj: mutexRef.current,
                   mutexKey: 'query',
@@ -1558,33 +1359,27 @@ function useCubeQuery(query) {
                     } else {
                       setResultSet(result);
                     }
-
                     setLoading(false);
                     setProgress(null);
                   }
                 });
                 _context.next = 15;
                 break;
-
               case 13:
                 _context.next = 15;
                 return fetch();
-
               case 15:
                 _context.next = 20;
                 break;
-
               case 17:
                 _context.prev = 17;
                 _context.t0 = _context["catch"](4);
-
                 if (isMounted()) {
                   setError(_context.t0);
                   setResultSet(null);
                   setLoading(false);
                   setProgress(null);
                 }
-
               case 20:
               case "end":
                 return _context.stop();
@@ -1594,7 +1389,6 @@ function useCubeQuery(query) {
       }));
       return _loadQuery.apply(this, arguments);
     }
-
     loadQuery();
     return function () {
       if (subscribeRequest) {