@cubejs-client/core 1.6.31 → 1.6.33

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

@@ -934,19 +934,23 @@
       value: function axisValues(axis) {
         var resultIndex = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
         var query = this.loadResponses[resultIndex].query;
+        var axisWithoutMeasures = axis.filter(function (d) {
+          return d !== 'measures';
+        });
+        var measures = axis.includes('measures') ? query.measures || [] : [];
         return function (row) {
           var value = function value(measure) {
-            return axis.filter(function (d) {
-              return d !== 'measures';
-            }).map(function (d) {
+            var result = axisWithoutMeasures.map(function (d) {
               var val = row[d];
               return val != null ? val : null;
-            }).concat(measure ? [measure] : []);
+            });
+            if (measure) {
+              result.push(measure);
+            }
+            return result;
           };
-          if (axis.find(function (d) {
-            return d === 'measures';
-          }) && (query.measures || []).length) {
-            return (query.measures || []).map(value);
+          if (measures.length > 0) {
+            return measures.map(value);
           }
           return [value()];
         };
@@ -1095,8 +1099,10 @@
               };
             }
           }
+          var xAxisValues = _this2.axisValues(normalizedPivotConfig.x, resultIndex);
+          var yAxisValues = _this2.axisValues(normalizedPivotConfig.y, resultIndex);
           var xGrouped = ramda.pipe(ramda.map(function (row) {
-            return _this2.axisValues(normalizedPivotConfig.x, resultIndex)(row).map(function (xValues) {
+            return xAxisValues(row).map(function (xValues) {
               return {
                 xValues: xValues,
                 row: row
@@ -1109,7 +1115,7 @@
               rows = _ref13[1];
             rows.forEach(function (_ref14) {
               var row = _ref14.row;
-              _this2.axisValues(normalizedPivotConfig.y, resultIndex)(row).forEach(function (values) {
+              yAxisValues(row).forEach(function (values) {
                 if (Object.keys(row).length > 0) {
                   yValuesMap[values.join()] = values;
                 }
@@ -1117,9 +1123,7 @@
             });
           });
           var allYValues = Object.values(yValuesMap);
-          var measureOnX = Boolean(normalizedPivotConfig.x.find(function (d) {
-            return d === 'measures';
-          }));
+          var measureOnX = normalizedPivotConfig.x.includes('measures');
           return xGrouped.map(function (_ref15) {
             var _ref16 = _slicedToArray__default["default"](_ref15, 2),
               rows = _ref16[1];
@@ -1127,7 +1131,7 @@
             var yGrouped = {};
             rows.forEach(function (_ref17) {
               var row = _ref17.row;
-              var arr = _this2.axisValues(normalizedPivotConfig.y, resultIndex)(row).map(function (yValues) {
+              var arr = yAxisValues(row).map(function (yValues) {
                 return {
                   yValues: yValues,
                   row: row
@@ -3477,6 +3481,8 @@
   var cube = (function (apiToken, options) {
     return new CubeApi(apiToken, options);
   });
+  // We don't export it for now, because size of builds for cjs/umd users will be affected
+  // export * from './format';
 
   var clientCoreExports = /*#__PURE__*/Object.freeze({
     __proto__: null,