@cubejs-client/core 1.6.1 → 1.6.2

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

@@ -140,6 +140,14 @@ dayjs__default['default'].extend(quarterOfYear__default['default']);
 dayjs__default['default'].extend(duration__default['default']);
 dayjs__default['default'].extend(isoWeek__default['default']);
 
+// A custom locale for internal use that doesn't affect the global dayjs instance
+var cubeInternalLocale = 'cube-internal-en';
+var customLocale = _objectSpread$4(_objectSpread$4({}, en__default['default']), {}, {
+  name: cubeInternalLocale,
+  weekStart: 1
+});
+dayjs__default['default'].Ls[cubeInternalLocale] = customLocale;
+
 // TODO: Define a better type as unitOfTime.DurationConstructor in moment.js
 
 var GRANULARITIES = [{
@@ -175,9 +183,7 @@ var DEFAULT_GRANULARITY = 'day';
 // When granularity is week, weekStart Value must be 1. However, since the client can change it globally
 // (https://day.js.org/docs/en/i18n/changing-locale) So the function below has been added.
 var internalDayjs = function internalDayjs() {
-  return dayjs__default['default'].apply(void 0, arguments).locale(_objectSpread$4(_objectSpread$4({}, en__default['default']), {}, {
-    weekStart: 1
-  }));
+  return dayjs__default['default'].apply(void 0, arguments).locale(cubeInternalLocale);
 };
 var TIME_SERIES = {
   day: function day(range) {
@@ -1167,7 +1173,8 @@ var ResultSet = /*#__PURE__*/function () {
           return _this2.axisValuesString(xValues);
         });
         var measureValue = function measureValue(row, measure) {
-          return row[measure] || normalizedPivotConfig.fillWithValue || 0;
+          var _ref10, _row$measure;
+          return (_ref10 = (_row$measure = row[measure]) !== null && _row$measure !== void 0 ? _row$measure : normalizedPivotConfig.fillWithValue) !== null && _ref10 !== void 0 ? _ref10 : 0;
         };
         if (normalizedPivotConfig.fillMissingDates && normalizedPivotConfig.x.length === 1 && ramda.equals(normalizedPivotConfig.x, (query.timeDimensions || []).filter(function (td) {
           return Boolean(td.granularity);
@@ -1180,8 +1187,8 @@ var ResultSet = /*#__PURE__*/function () {
           if (series[0]) {
             groupByXAxis = function groupByXAxis(rows) {
               var _series$resultIndex$m, _series$resultIndex;
-              var byXValues = ramda.groupBy(function (_ref10) {
-                var xValues = _ref10.xValues;
+              var byXValues = ramda.groupBy(function (_ref11) {
+                var xValues = _ref11.xValues;
                 return xValues[0];
               }, rows);
               return (_series$resultIndex$m = (_series$resultIndex = series[resultIndex]) === null || _series$resultIndex === void 0 ? void 0 : _series$resultIndex.map(function (d) {
@@ -1202,11 +1209,11 @@ var ResultSet = /*#__PURE__*/function () {
           });
         }), unnest, groupByXAxis)(_this2.timeDimensionBackwardCompatibleData(resultIndex));
         var yValuesMap = {};
-        xGrouped.forEach(function (_ref11) {
-          var _ref12 = _slicedToArray__default['default'](_ref11, 2),
-            rows = _ref12[1];
-          rows.forEach(function (_ref13) {
-            var row = _ref13.row;
+        xGrouped.forEach(function (_ref12) {
+          var _ref13 = _slicedToArray__default['default'](_ref12, 2),
+            rows = _ref13[1];
+          rows.forEach(function (_ref14) {
+            var row = _ref14.row;
             _this2.axisValues(normalizedPivotConfig.y, resultIndex)(row).forEach(function (values) {
               if (Object.keys(row).length > 0) {
                 yValuesMap[values.join()] = values;
@@ -1218,13 +1225,13 @@ var ResultSet = /*#__PURE__*/function () {
         var measureOnX = Boolean(normalizedPivotConfig.x.find(function (d) {
           return d === 'measures';
         }));
-        return xGrouped.map(function (_ref14) {
-          var _ref15 = _slicedToArray__default['default'](_ref14, 2),
-            rows = _ref15[1];
+        return xGrouped.map(function (_ref15) {
+          var _ref16 = _slicedToArray__default['default'](_ref15, 2),
+            rows = _ref16[1];
           var xValues = rows[0].xValues;
           var yGrouped = {};
-          rows.forEach(function (_ref16) {
-            var row = _ref16.row;
+          rows.forEach(function (_ref17) {
+            var row = _ref17.row;
             var arr = _this2.axisValues(normalizedPivotConfig.y, resultIndex)(row).map(function (yValues) {
               return {
                 yValues: yValues,
@@ -1366,9 +1373,9 @@ var ResultSet = /*#__PURE__*/function () {
       };
       var duplicateMeasures = new Set();
       if (this.queryType === QUERY_TYPE.BLENDING_QUERY) {
-        var allMeasures = ramda.flatten(this.loadResponses.map(function (_ref17) {
+        var allMeasures = ramda.flatten(this.loadResponses.map(function (_ref18) {
           var _query$measures;
-          var query = _ref17.query;
+          var query = _ref18.query;
           return (_query$measures = query.measures) !== null && _query$measures !== void 0 ? _query$measures : [];
         }));
         allMeasures.filter(function (e, i, a) {
@@ -1377,14 +1384,14 @@ var ResultSet = /*#__PURE__*/function () {
           return duplicateMeasures.add(m);
         });
       }
-      return this.pivot(pivotConfig).map(function (_ref18) {
-        var xValues = _ref18.xValues,
-          yValuesArray = _ref18.yValuesArray;
+      return this.pivot(pivotConfig).map(function (_ref19) {
+        var xValues = _ref19.xValues,
+          yValuesArray = _ref19.yValuesArray;
         var yValuesMap = {};
-        yValuesArray.forEach(function (_ref19, i) {
-          var _ref20 = _slicedToArray__default['default'](_ref19, 2),
-            yValues = _ref20[0],
-            m = _ref20[1];
+        yValuesArray.forEach(function (_ref20, i) {
+          var _ref21 = _slicedToArray__default['default'](_ref20, 2),
+            yValues = _ref21[0],
+            m = _ref21[1];
           yValuesMap[_this3.axisValuesString(aliasSeries(yValues, i, pivotConfig, duplicateMeasures), ',')] = m && validate(m);
         });
         return _objectSpread$2({
@@ -1426,15 +1433,15 @@ var ResultSet = /*#__PURE__*/function () {
     value: function tablePivot(pivotConfig) {
       var normalizedPivotConfig = this.normalizePivotConfig(pivotConfig || {});
       var isMeasuresPresent = normalizedPivotConfig.x.concat(normalizedPivotConfig.y).includes('measures');
-      return this.pivot(normalizedPivotConfig).map(function (_ref21) {
-        var xValues = _ref21.xValues,
-          yValuesArray = _ref21.yValuesArray;
+      return this.pivot(normalizedPivotConfig).map(function (_ref22) {
+        var xValues = _ref22.xValues,
+          yValuesArray = _ref22.yValuesArray;
         return ramda.fromPairs([].concat(_toConsumableArray__default['default'](normalizedPivotConfig.x.map(function (key, index) {
           return [key, xValues[index]];
-        })), _toConsumableArray__default['default'](isMeasuresPresent ? yValuesArray.map(function (_ref22) {
-          var _ref23 = _slicedToArray__default['default'](_ref22, 2),
-            yValues = _ref23[0],
-            measure = _ref23[1];
+        })), _toConsumableArray__default['default'](isMeasuresPresent ? yValuesArray.map(function (_ref23) {
+          var _ref24 = _slicedToArray__default['default'](_ref23, 2),
+            yValues = _ref24[0],
+            measure = _ref24[1];
           return [yValues.length ? yValues.join() : 'value', measure];
         }) : [])));
       });
@@ -1554,12 +1561,12 @@ var ResultSet = /*#__PURE__*/function () {
       }, {});
       var schema = {};
       var extractFields = function extractFields(key) {
-        var _ref24 = flatMeta[key] || {},
-          title = _ref24.title,
-          shortTitle = _ref24.shortTitle,
-          type = _ref24.type,
-          format = _ref24.format,
-          meta = _ref24.meta;
+        var _ref25 = flatMeta[key] || {},
+          title = _ref25.title,
+          shortTitle = _ref25.shortTitle,
+          type = _ref25.type,
+          format = _ref25.format,
+          meta = _ref25.meta;
         return {
           key: key,
           title: title,
@@ -1570,9 +1577,9 @@ var ResultSet = /*#__PURE__*/function () {
         };
       };
       var pivot = this.pivot(normalizedPivotConfig);
-      (((_pivot$ = pivot[0]) === null || _pivot$ === void 0 ? void 0 : _pivot$.yValuesArray) || []).forEach(function (_ref25) {
-        var _ref26 = _slicedToArray__default['default'](_ref25, 1),
-          yValues = _ref26[0];
+      (((_pivot$ = pivot[0]) === null || _pivot$ === void 0 ? void 0 : _pivot$.yValuesArray) || []).forEach(function (_ref26) {
+        var _ref27 = _slicedToArray__default['default'](_ref26, 1),
+          yValues = _ref27[0];
         if (yValues.length > 0) {
           var currentItem = schema;
           yValues.forEach(function (value, index) {
@@ -1592,9 +1599,9 @@ var ResultSet = /*#__PURE__*/function () {
         if (Object.keys(item).length === 0) {
           return [];
         }
-        return Object.values(item).map(function (_ref27) {
-          var key = _ref27.key,
-            currentItem = _objectWithoutProperties__default['default'](_ref27, _excluded2);
+        return Object.values(item).map(function (_ref28) {
+          var key = _ref28.key,
+            currentItem = _objectWithoutProperties__default['default'](_ref28, _excluded2);
           var children = _toColumns(currentItem.children, [].concat(_toConsumableArray__default['default'](path), [key]));
           var _extractFields = extractFields(currentItem.memberId),
             title = _extractFields.title,
@@ -1702,9 +1709,9 @@ var ResultSet = /*#__PURE__*/function () {
       }));
       var duplicateMeasures = new Set();
       if (this.queryType === QUERY_TYPE.BLENDING_QUERY) {
-        var allMeasures = ramda.flatten(this.loadResponses.map(function (_ref28) {
+        var allMeasures = ramda.flatten(this.loadResponses.map(function (_ref29) {
           var _query$measures2;
-          var query = _ref28.query;
+          var query = _ref29.query;
           return (_query$measures2 = query.measures) !== null && _query$measures2 !== void 0 ? _query$measures2 : [];
         }));
         allMeasures.filter(function (e, i, a) {
@@ -1866,11 +1873,11 @@ var ResultSet = /*#__PURE__*/function () {
         fillMissingDates: true,
         joinDateRange: false
       };
-      var _ref29 = query || {},
-        _ref29$measures = _ref29.measures,
-        measures = _ref29$measures === void 0 ? [] : _ref29$measures,
-        _ref29$dimensions = _ref29.dimensions,
-        dimensions = _ref29$dimensions === void 0 ? [] : _ref29$dimensions;
+      var _ref30 = query || {},
+        _ref30$measures = _ref30.measures,
+        measures = _ref30$measures === void 0 ? [] : _ref30$measures,
+        _ref30$dimensions = _ref30.dimensions,
+        dimensions = _ref30$dimensions === void 0 ? [] : _ref30$dimensions;
       var timeDimensions = ((query === null || query === void 0 ? void 0 : query.timeDimensions) || []).filter(function (td) {
         return !!td.granularity;
       });