@cubejs-client/core 1.6.1 → 1.6.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/cubejs-client-core.cjs.js +58 -51
- package/dist/cubejs-client-core.cjs.js.map +1 -1
- package/dist/cubejs-client-core.umd.js +58 -51
- package/dist/cubejs-client-core.umd.js.map +1 -1
- package/dist/src/ResultSet.d.ts.map +1 -1
- package/dist/src/ResultSet.js +1 -1
- package/dist/src/time.d.ts.map +1 -1
- package/dist/src/time.js +9 -1
- package/dist/src/types.d.ts +2 -1
- package/dist/src/types.d.ts.map +1 -1
- package/dist/test/ResultSet.test.js +69 -0
- package/dist/test/dayjs-isolation.test.d.ts +2 -0
- package/dist/test/dayjs-isolation.test.d.ts.map +1 -0
- package/dist/test/dayjs-isolation.test.js +42 -0
- package/package.json +3 -3
|
@@ -35,6 +35,14 @@
|
|
|
35
35
|
dayjs__default['default'].extend(duration__default['default']);
|
|
36
36
|
dayjs__default['default'].extend(isoWeek__default['default']);
|
|
37
37
|
|
|
38
|
+
// A custom locale for internal use that doesn't affect the global dayjs instance
|
|
39
|
+
var cubeInternalLocale = 'cube-internal-en';
|
|
40
|
+
var customLocale = _objectSpread$4(_objectSpread$4({}, en__default['default']), {}, {
|
|
41
|
+
name: cubeInternalLocale,
|
|
42
|
+
weekStart: 1
|
|
43
|
+
});
|
|
44
|
+
dayjs__default['default'].Ls[cubeInternalLocale] = customLocale;
|
|
45
|
+
|
|
38
46
|
// TODO: Define a better type as unitOfTime.DurationConstructor in moment.js
|
|
39
47
|
|
|
40
48
|
var GRANULARITIES = [{
|
|
@@ -70,9 +78,7 @@
|
|
|
70
78
|
// When granularity is week, weekStart Value must be 1. However, since the client can change it globally
|
|
71
79
|
// (https://day.js.org/docs/en/i18n/changing-locale) So the function below has been added.
|
|
72
80
|
var internalDayjs = function internalDayjs() {
|
|
73
|
-
return dayjs__default['default'].apply(void 0, arguments).locale(
|
|
74
|
-
weekStart: 1
|
|
75
|
-
}));
|
|
81
|
+
return dayjs__default['default'].apply(void 0, arguments).locale(cubeInternalLocale);
|
|
76
82
|
};
|
|
77
83
|
var TIME_SERIES = {
|
|
78
84
|
day: function day(range) {
|
|
@@ -1062,7 +1068,8 @@
|
|
|
1062
1068
|
return _this2.axisValuesString(xValues);
|
|
1063
1069
|
});
|
|
1064
1070
|
var measureValue = function measureValue(row, measure) {
|
|
1065
|
-
|
|
1071
|
+
var _ref10, _row$measure;
|
|
1072
|
+
return (_ref10 = (_row$measure = row[measure]) !== null && _row$measure !== void 0 ? _row$measure : normalizedPivotConfig.fillWithValue) !== null && _ref10 !== void 0 ? _ref10 : 0;
|
|
1066
1073
|
};
|
|
1067
1074
|
if (normalizedPivotConfig.fillMissingDates && normalizedPivotConfig.x.length === 1 && ramda.equals(normalizedPivotConfig.x, (query.timeDimensions || []).filter(function (td) {
|
|
1068
1075
|
return Boolean(td.granularity);
|
|
@@ -1075,8 +1082,8 @@
|
|
|
1075
1082
|
if (series[0]) {
|
|
1076
1083
|
groupByXAxis = function groupByXAxis(rows) {
|
|
1077
1084
|
var _series$resultIndex$m, _series$resultIndex;
|
|
1078
|
-
var byXValues = ramda.groupBy(function (
|
|
1079
|
-
var xValues =
|
|
1085
|
+
var byXValues = ramda.groupBy(function (_ref11) {
|
|
1086
|
+
var xValues = _ref11.xValues;
|
|
1080
1087
|
return xValues[0];
|
|
1081
1088
|
}, rows);
|
|
1082
1089
|
return (_series$resultIndex$m = (_series$resultIndex = series[resultIndex]) === null || _series$resultIndex === void 0 ? void 0 : _series$resultIndex.map(function (d) {
|
|
@@ -1097,11 +1104,11 @@
|
|
|
1097
1104
|
});
|
|
1098
1105
|
}), unnest, groupByXAxis)(_this2.timeDimensionBackwardCompatibleData(resultIndex));
|
|
1099
1106
|
var yValuesMap = {};
|
|
1100
|
-
xGrouped.forEach(function (
|
|
1101
|
-
var
|
|
1102
|
-
rows =
|
|
1103
|
-
rows.forEach(function (
|
|
1104
|
-
var row =
|
|
1107
|
+
xGrouped.forEach(function (_ref12) {
|
|
1108
|
+
var _ref13 = _slicedToArray__default['default'](_ref12, 2),
|
|
1109
|
+
rows = _ref13[1];
|
|
1110
|
+
rows.forEach(function (_ref14) {
|
|
1111
|
+
var row = _ref14.row;
|
|
1105
1112
|
_this2.axisValues(normalizedPivotConfig.y, resultIndex)(row).forEach(function (values) {
|
|
1106
1113
|
if (Object.keys(row).length > 0) {
|
|
1107
1114
|
yValuesMap[values.join()] = values;
|
|
@@ -1113,13 +1120,13 @@
|
|
|
1113
1120
|
var measureOnX = Boolean(normalizedPivotConfig.x.find(function (d) {
|
|
1114
1121
|
return d === 'measures';
|
|
1115
1122
|
}));
|
|
1116
|
-
return xGrouped.map(function (
|
|
1117
|
-
var
|
|
1118
|
-
rows =
|
|
1123
|
+
return xGrouped.map(function (_ref15) {
|
|
1124
|
+
var _ref16 = _slicedToArray__default['default'](_ref15, 2),
|
|
1125
|
+
rows = _ref16[1];
|
|
1119
1126
|
var xValues = rows[0].xValues;
|
|
1120
1127
|
var yGrouped = {};
|
|
1121
|
-
rows.forEach(function (
|
|
1122
|
-
var row =
|
|
1128
|
+
rows.forEach(function (_ref17) {
|
|
1129
|
+
var row = _ref17.row;
|
|
1123
1130
|
var arr = _this2.axisValues(normalizedPivotConfig.y, resultIndex)(row).map(function (yValues) {
|
|
1124
1131
|
return {
|
|
1125
1132
|
yValues: yValues,
|
|
@@ -1261,9 +1268,9 @@
|
|
|
1261
1268
|
};
|
|
1262
1269
|
var duplicateMeasures = new Set();
|
|
1263
1270
|
if (this.queryType === QUERY_TYPE.BLENDING_QUERY) {
|
|
1264
|
-
var allMeasures = ramda.flatten(this.loadResponses.map(function (
|
|
1271
|
+
var allMeasures = ramda.flatten(this.loadResponses.map(function (_ref18) {
|
|
1265
1272
|
var _query$measures;
|
|
1266
|
-
var query =
|
|
1273
|
+
var query = _ref18.query;
|
|
1267
1274
|
return (_query$measures = query.measures) !== null && _query$measures !== void 0 ? _query$measures : [];
|
|
1268
1275
|
}));
|
|
1269
1276
|
allMeasures.filter(function (e, i, a) {
|
|
@@ -1272,14 +1279,14 @@
|
|
|
1272
1279
|
return duplicateMeasures.add(m);
|
|
1273
1280
|
});
|
|
1274
1281
|
}
|
|
1275
|
-
return this.pivot(pivotConfig).map(function (
|
|
1276
|
-
var xValues =
|
|
1277
|
-
yValuesArray =
|
|
1282
|
+
return this.pivot(pivotConfig).map(function (_ref19) {
|
|
1283
|
+
var xValues = _ref19.xValues,
|
|
1284
|
+
yValuesArray = _ref19.yValuesArray;
|
|
1278
1285
|
var yValuesMap = {};
|
|
1279
|
-
yValuesArray.forEach(function (
|
|
1280
|
-
var
|
|
1281
|
-
yValues =
|
|
1282
|
-
m =
|
|
1286
|
+
yValuesArray.forEach(function (_ref20, i) {
|
|
1287
|
+
var _ref21 = _slicedToArray__default['default'](_ref20, 2),
|
|
1288
|
+
yValues = _ref21[0],
|
|
1289
|
+
m = _ref21[1];
|
|
1283
1290
|
yValuesMap[_this3.axisValuesString(aliasSeries(yValues, i, pivotConfig, duplicateMeasures), ',')] = m && validate(m);
|
|
1284
1291
|
});
|
|
1285
1292
|
return _objectSpread$2({
|
|
@@ -1321,15 +1328,15 @@
|
|
|
1321
1328
|
value: function tablePivot(pivotConfig) {
|
|
1322
1329
|
var normalizedPivotConfig = this.normalizePivotConfig(pivotConfig || {});
|
|
1323
1330
|
var isMeasuresPresent = normalizedPivotConfig.x.concat(normalizedPivotConfig.y).includes('measures');
|
|
1324
|
-
return this.pivot(normalizedPivotConfig).map(function (
|
|
1325
|
-
var xValues =
|
|
1326
|
-
yValuesArray =
|
|
1331
|
+
return this.pivot(normalizedPivotConfig).map(function (_ref22) {
|
|
1332
|
+
var xValues = _ref22.xValues,
|
|
1333
|
+
yValuesArray = _ref22.yValuesArray;
|
|
1327
1334
|
return ramda.fromPairs([].concat(_toConsumableArray__default['default'](normalizedPivotConfig.x.map(function (key, index) {
|
|
1328
1335
|
return [key, xValues[index]];
|
|
1329
|
-
})), _toConsumableArray__default['default'](isMeasuresPresent ? yValuesArray.map(function (
|
|
1330
|
-
var
|
|
1331
|
-
yValues =
|
|
1332
|
-
measure =
|
|
1336
|
+
})), _toConsumableArray__default['default'](isMeasuresPresent ? yValuesArray.map(function (_ref23) {
|
|
1337
|
+
var _ref24 = _slicedToArray__default['default'](_ref23, 2),
|
|
1338
|
+
yValues = _ref24[0],
|
|
1339
|
+
measure = _ref24[1];
|
|
1333
1340
|
return [yValues.length ? yValues.join() : 'value', measure];
|
|
1334
1341
|
}) : [])));
|
|
1335
1342
|
});
|
|
@@ -1449,12 +1456,12 @@
|
|
|
1449
1456
|
}, {});
|
|
1450
1457
|
var schema = {};
|
|
1451
1458
|
var extractFields = function extractFields(key) {
|
|
1452
|
-
var
|
|
1453
|
-
title =
|
|
1454
|
-
shortTitle =
|
|
1455
|
-
type =
|
|
1456
|
-
format =
|
|
1457
|
-
meta =
|
|
1459
|
+
var _ref25 = flatMeta[key] || {},
|
|
1460
|
+
title = _ref25.title,
|
|
1461
|
+
shortTitle = _ref25.shortTitle,
|
|
1462
|
+
type = _ref25.type,
|
|
1463
|
+
format = _ref25.format,
|
|
1464
|
+
meta = _ref25.meta;
|
|
1458
1465
|
return {
|
|
1459
1466
|
key: key,
|
|
1460
1467
|
title: title,
|
|
@@ -1465,9 +1472,9 @@
|
|
|
1465
1472
|
};
|
|
1466
1473
|
};
|
|
1467
1474
|
var pivot = this.pivot(normalizedPivotConfig);
|
|
1468
|
-
(((_pivot$ = pivot[0]) === null || _pivot$ === void 0 ? void 0 : _pivot$.yValuesArray) || []).forEach(function (
|
|
1469
|
-
var
|
|
1470
|
-
yValues =
|
|
1475
|
+
(((_pivot$ = pivot[0]) === null || _pivot$ === void 0 ? void 0 : _pivot$.yValuesArray) || []).forEach(function (_ref26) {
|
|
1476
|
+
var _ref27 = _slicedToArray__default['default'](_ref26, 1),
|
|
1477
|
+
yValues = _ref27[0];
|
|
1471
1478
|
if (yValues.length > 0) {
|
|
1472
1479
|
var currentItem = schema;
|
|
1473
1480
|
yValues.forEach(function (value, index) {
|
|
@@ -1487,9 +1494,9 @@
|
|
|
1487
1494
|
if (Object.keys(item).length === 0) {
|
|
1488
1495
|
return [];
|
|
1489
1496
|
}
|
|
1490
|
-
return Object.values(item).map(function (
|
|
1491
|
-
var key =
|
|
1492
|
-
currentItem = _objectWithoutProperties__default['default'](
|
|
1497
|
+
return Object.values(item).map(function (_ref28) {
|
|
1498
|
+
var key = _ref28.key,
|
|
1499
|
+
currentItem = _objectWithoutProperties__default['default'](_ref28, _excluded2);
|
|
1493
1500
|
var children = _toColumns(currentItem.children, [].concat(_toConsumableArray__default['default'](path), [key]));
|
|
1494
1501
|
var _extractFields = extractFields(currentItem.memberId),
|
|
1495
1502
|
title = _extractFields.title,
|
|
@@ -1597,9 +1604,9 @@
|
|
|
1597
1604
|
}));
|
|
1598
1605
|
var duplicateMeasures = new Set();
|
|
1599
1606
|
if (this.queryType === QUERY_TYPE.BLENDING_QUERY) {
|
|
1600
|
-
var allMeasures = ramda.flatten(this.loadResponses.map(function (
|
|
1607
|
+
var allMeasures = ramda.flatten(this.loadResponses.map(function (_ref29) {
|
|
1601
1608
|
var _query$measures2;
|
|
1602
|
-
var query =
|
|
1609
|
+
var query = _ref29.query;
|
|
1603
1610
|
return (_query$measures2 = query.measures) !== null && _query$measures2 !== void 0 ? _query$measures2 : [];
|
|
1604
1611
|
}));
|
|
1605
1612
|
allMeasures.filter(function (e, i, a) {
|
|
@@ -1761,11 +1768,11 @@
|
|
|
1761
1768
|
fillMissingDates: true,
|
|
1762
1769
|
joinDateRange: false
|
|
1763
1770
|
};
|
|
1764
|
-
var
|
|
1765
|
-
|
|
1766
|
-
measures =
|
|
1767
|
-
|
|
1768
|
-
dimensions =
|
|
1771
|
+
var _ref30 = query || {},
|
|
1772
|
+
_ref30$measures = _ref30.measures,
|
|
1773
|
+
measures = _ref30$measures === void 0 ? [] : _ref30$measures,
|
|
1774
|
+
_ref30$dimensions = _ref30.dimensions,
|
|
1775
|
+
dimensions = _ref30$dimensions === void 0 ? [] : _ref30$dimensions;
|
|
1769
1776
|
var timeDimensions = ((query === null || query === void 0 ? void 0 : query.timeDimensions) || []).filter(function (td) {
|
|
1770
1777
|
return !!td.granularity;
|
|
1771
1778
|
});
|