Skip to content

Commit 715e170

Browse files
paveltiunovpaveltiunov
committed
fix(client-core): ResultSet series returns a series with no data
Fixes #38
1 parent c5e5337 commit 715e170

File tree

5 files changed

+116
-104
lines changed

5 files changed

+116
-104
lines changed

‎packages/cubejs-client-core/dist/cubejs-client-core.esm.js

Lines changed: 31 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@ import fetch from 'cross-fetch';
99
import 'core-js/modules/es6.number.constructor';
1010
import 'core-js/modules/es6.number.parse-float';
1111
import _objectSpread from '@babel/runtime/helpers/objectSpread';
12+
import 'core-js/modules/web.dom.iterable';
13+
import 'core-js/modules/es6.array.iterator';
14+
import 'core-js/modules/es6.object.keys';
1215
import _slicedToArray from '@babel/runtime/helpers/slicedToArray';
1316
import _defineProperty from '@babel/runtime/helpers/defineProperty';
1417
import 'core-js/modules/es6.array.reduce';
@@ -21,9 +24,6 @@ import 'core-js/modules/es6.array.map';
2124
import { pipe, map, filter, reduce, minBy, maxBy, groupBy, equals, unnest, toPairs, uniq, dropLast, fromPairs } from 'ramda';
2225
import Moment from 'moment';
2326
import momentRange from 'moment-range';
24-
import 'core-js/modules/web.dom.iterable';
25-
import 'core-js/modules/es6.array.iterator';
26-
import 'core-js/modules/es6.object.keys';
2727
import 'core-js/modules/es6.array.is-array';
2828
import 'core-js/modules/es6.regexp.split';
2929
import 'core-js/modules/es6.function.name';
@@ -251,28 +251,31 @@ function () {
251251
xValuesString = _ref7[0],
252252
rows = _ref7[1];
253253

254-
return unnest(rows.map(function (_ref8) {
254+
return unnest(rows.filter(function (_ref8) {
255255
var row = _ref8.row;
256+
return Object.keys(row).length > 0;
257+
}).map(function (_ref9) {
258+
var row = _ref9.row;
256259
return _this2.axisValues(pivotConfig.y)(row);
257260
}));
258261
}), unnest, uniq)(xGrouped); // eslint-disable-next-line no-unused-vars
259262

260-
return xGrouped.map(function (_ref9) {
261-
var _ref10 = _slicedToArray(_ref9, 2),
262-
xValuesString = _ref10[0],
263-
rows = _ref10[1];
263+
return xGrouped.map(function (_ref10) {
264+
var _ref11 = _slicedToArray(_ref10, 2),
265+
xValuesString = _ref11[0],
266+
rows = _ref11[1];
264267

265268
var xValues = rows[0].xValues;
266-
var yGrouped = pipe(map(function (_ref11) {
267-
var row = _ref11.row;
269+
var yGrouped = pipe(map(function (_ref12) {
270+
var row = _ref12.row;
268271
return _this2.axisValues(pivotConfig.y)(row).map(function (yValues) {
269272
return {
270273
yValues: yValues,
271274
row: row
272275
};
273276
});
274-
}), unnest, groupBy(function (_ref12) {
275-
var yValues = _ref12.yValues;
277+
}), unnest, groupBy(function (_ref13) {
278+
var yValues = _ref13.yValues;
276279
return _this2.axisValuesString(yValues);
277280
}))(rows);
278281
return {
@@ -283,8 +286,8 @@ function () {
283286
}) ? ResultSet.measureFromAxis(xValues) : ResultSet.measureFromAxis(yValues);
284287
return (yGrouped[_this2.axisValuesString(yValues)] || [{
285288
row: {}
286-
}]).map(function (_ref13) {
287-
var row = _ref13.row;
289+
}]).map(function (_ref14) {
290+
var row = _ref14.row;
288291
return [yValues, measureValue(row, measure, xValues)];
289292
});
290293
}))
@@ -302,17 +305,17 @@ function () {
302305
value: function chartPivot(pivotConfig) {
303306
var _this3 = this;
304307

305-
return this.pivot(pivotConfig).map(function (_ref14) {
306-
var xValues = _ref14.xValues,
307-
yValuesArray = _ref14.yValuesArray;
308+
return this.pivot(pivotConfig).map(function (_ref15) {
309+
var xValues = _ref15.xValues,
310+
yValuesArray = _ref15.yValuesArray;
308311
return _objectSpread({
309312
category: _this3.axisValuesString(xValues, ', '),
310313
// TODO deprecated
311314
x: _this3.axisValuesString(xValues, ', ')
312-
}, yValuesArray.map(function (_ref15) {
313-
var _ref16 = _slicedToArray(_ref15, 2),
314-
yValues = _ref16[0],
315-
m = _ref16[1];
315+
}, yValuesArray.map(function (_ref16) {
316+
var _ref17 = _slicedToArray(_ref16, 2),
317+
yValues = _ref17[0],
318+
m = _ref17[1];
316319

317320
return _defineProperty({}, _this3.axisValuesString(yValues, ', '), m && Number.parseFloat(m));
318321
}).reduce(function (a, b) {
@@ -331,13 +334,13 @@ function () {
331334
};
332335
};
333336

334-
return this.pivot(normalizedPivotConfig).map(function (_ref19) {
335-
var xValues = _ref19.xValues,
336-
yValuesArray = _ref19.yValuesArray;
337-
return yValuesArray.map(function (_ref20) {
338-
var _ref21 = _slicedToArray(_ref20, 2),
339-
yValues = _ref21[0],
340-
m = _ref21[1];
337+
return this.pivot(normalizedPivotConfig).map(function (_ref20) {
338+
var xValues = _ref20.xValues,
339+
yValuesArray = _ref20.yValuesArray;
340+
return yValuesArray.map(function (_ref21) {
341+
var _ref22 = _slicedToArray(_ref21, 2),
342+
yValues = _ref22[0],
343+
m = _ref22[1];
341344

342345
return normalizedPivotConfig.x.map(valueToObject(xValues, m)).concat(normalizedPivotConfig.y.map(valueToObject(yValues, m))).reduce(function (a, b) {
343346
return Object.assign(a, b);

‎packages/cubejs-client-core/dist/cubejs-client-core.js

Lines changed: 31 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@ var fetch = _interopDefault(require('cross-fetch'));
1313
require('core-js/modules/es6.number.constructor');
1414
require('core-js/modules/es6.number.parse-float');
1515
var _objectSpread = _interopDefault(require('@babel/runtime/helpers/objectSpread'));
16+
require('core-js/modules/web.dom.iterable');
17+
require('core-js/modules/es6.array.iterator');
18+
require('core-js/modules/es6.object.keys');
1619
var _slicedToArray = _interopDefault(require('@babel/runtime/helpers/slicedToArray'));
1720
var _defineProperty = _interopDefault(require('@babel/runtime/helpers/defineProperty'));
1821
require('core-js/modules/es6.array.reduce');
@@ -25,9 +28,6 @@ require('core-js/modules/es6.array.map');
2528
var ramda = require('ramda');
2629
var Moment = _interopDefault(require('moment'));
2730
var momentRange = _interopDefault(require('moment-range'));
28-
require('core-js/modules/web.dom.iterable');
29-
require('core-js/modules/es6.array.iterator');
30-
require('core-js/modules/es6.object.keys');
3131
require('core-js/modules/es6.array.is-array');
3232
require('core-js/modules/es6.regexp.split');
3333
require('core-js/modules/es6.function.name');
@@ -255,28 +255,31 @@ function () {
255255
xValuesString = _ref7[0],
256256
rows = _ref7[1];
257257

258-
return ramda.unnest(rows.map(function (_ref8) {
258+
return ramda.unnest(rows.filter(function (_ref8) {
259259
var row = _ref8.row;
260+
return Object.keys(row).length > 0;
261+
}).map(function (_ref9) {
262+
var row = _ref9.row;
260263
return _this2.axisValues(pivotConfig.y)(row);
261264
}));
262265
}), ramda.unnest, ramda.uniq)(xGrouped); // eslint-disable-next-line no-unused-vars
263266

264-
return xGrouped.map(function (_ref9) {
265-
var _ref10 = _slicedToArray(_ref9, 2),
266-
xValuesString = _ref10[0],
267-
rows = _ref10[1];
267+
return xGrouped.map(function (_ref10) {
268+
var _ref11 = _slicedToArray(_ref10, 2),
269+
xValuesString = _ref11[0],
270+
rows = _ref11[1];
268271

269272
var xValues = rows[0].xValues;
270-
var yGrouped = ramda.pipe(ramda.map(function (_ref11) {
271-
var row = _ref11.row;
273+
var yGrouped = ramda.pipe(ramda.map(function (_ref12) {
274+
var row = _ref12.row;
272275
return _this2.axisValues(pivotConfig.y)(row).map(function (yValues) {
273276
return {
274277
yValues: yValues,
275278
row: row
276279
};
277280
});
278-
}), ramda.unnest, ramda.groupBy(function (_ref12) {
279-
var yValues = _ref12.yValues;
281+
}), ramda.unnest, ramda.groupBy(function (_ref13) {
282+
var yValues = _ref13.yValues;
280283
return _this2.axisValuesString(yValues);
281284
}))(rows);
282285
return {
@@ -287,8 +290,8 @@ function () {
287290
}) ? ResultSet.measureFromAxis(xValues) : ResultSet.measureFromAxis(yValues);
288291
return (yGrouped[_this2.axisValuesString(yValues)] || [{
289292
row: {}
290-
}]).map(function (_ref13) {
291-
var row = _ref13.row;
293+
}]).map(function (_ref14) {
294+
var row = _ref14.row;
292295
return [yValues, measureValue(row, measure, xValues)];
293296
});
294297
}))
@@ -306,17 +309,17 @@ function () {
306309
value: function chartPivot(pivotConfig) {
307310
var _this3 = this;
308311

309-
return this.pivot(pivotConfig).map(function (_ref14) {
310-
var xValues = _ref14.xValues,
311-
yValuesArray = _ref14.yValuesArray;
312+
return this.pivot(pivotConfig).map(function (_ref15) {
313+
var xValues = _ref15.xValues,
314+
yValuesArray = _ref15.yValuesArray;
312315
return _objectSpread({
313316
category: _this3.axisValuesString(xValues, ', '),
314317
// TODO deprecated
315318
x: _this3.axisValuesString(xValues, ', ')
316-
}, yValuesArray.map(function (_ref15) {
317-
var _ref16 = _slicedToArray(_ref15, 2),
318-
yValues = _ref16[0],
319-
m = _ref16[1];
319+
}, yValuesArray.map(function (_ref16) {
320+
var _ref17 = _slicedToArray(_ref16, 2),
321+
yValues = _ref17[0],
322+
m = _ref17[1];
320323

321324
return _defineProperty({}, _this3.axisValuesString(yValues, ', '), m && Number.parseFloat(m));
322325
}).reduce(function (a, b) {
@@ -335,13 +338,13 @@ function () {
335338
};
336339
};
337340

338-
return this.pivot(normalizedPivotConfig).map(function (_ref19) {
339-
var xValues = _ref19.xValues,
340-
yValuesArray = _ref19.yValuesArray;
341-
return yValuesArray.map(function (_ref20) {
342-
var _ref21 = _slicedToArray(_ref20, 2),
343-
yValues = _ref21[0],
344-
m = _ref21[1];
341+
return this.pivot(normalizedPivotConfig).map(function (_ref20) {
342+
var xValues = _ref20.xValues,
343+
yValuesArray = _ref20.yValuesArray;
344+
return yValuesArray.map(function (_ref21) {
345+
var _ref22 = _slicedToArray(_ref21, 2),
346+
yValues = _ref22[0],
347+
m = _ref22[1];
345348

346349
return normalizedPivotConfig.x.map(valueToObject(xValues, m)).concat(normalizedPivotConfig.y.map(valueToObject(yValues, m))).reduce(function (a, b) {
347350
return Object.assign(a, b);

‎packages/cubejs-client-core/dist/cubejs-client-core.umd.js

Lines changed: 49 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -4392,6 +4392,27 @@
43924392
// 20.1.2.12 Number.parseFloat(string)
43934393
_export(_export.S + _export.F * (Number.parseFloat != _parseFloat), 'Number', { parseFloat: _parseFloat });
43944394

4395+
// most Object methods by ES6 should accept primitives
4396+
4397+
4398+
4399+
var _objectSap = function (KEY, exec) {
4400+
var fn = (_core.Object || {})[KEY] || Object[KEY];
4401+
var exp = {};
4402+
exp[KEY] = exec(fn);
4403+
_export(_export.S + _export.F * _fails(function () { fn(1); }), 'Object', exp);
4404+
};
4405+
4406+
// 19.1.2.14 Object.keys(O)
4407+
4408+
4409+
4410+
_objectSap('keys', function () {
4411+
return function keys(it) {
4412+
return _objectKeys(_toObject(it));
4413+
};
4414+
});
4415+
43954416
var _arrayReduce = function (that, callbackfn, aLen, memo, isRight) {
43964417
_aFunction(callbackfn);
43974418
var O = _toObject(that);
@@ -5246,27 +5267,6 @@
52465267
return new XMap(f, xf);
52475268
});
52485269

5249-
// most Object methods by ES6 should accept primitives
5250-
5251-
5252-
5253-
var _objectSap = function (KEY, exec) {
5254-
var fn = (_core.Object || {})[KEY] || Object[KEY];
5255-
var exp = {};
5256-
exp[KEY] = exec(fn);
5257-
_export(_export.S + _export.F * _fails(function () { fn(1); }), 'Object', exp);
5258-
};
5259-
5260-
// 19.1.2.14 Object.keys(O)
5261-
5262-
5263-
5264-
_objectSap('keys', function () {
5265-
return function keys(it) {
5266-
return _objectKeys(_toObject(it));
5267-
};
5268-
});
5269-
52705270
function _has$1(prop, obj) {
52715271
return Object.prototype.hasOwnProperty.call(obj, prop);
52725272
}
@@ -14225,28 +14225,31 @@
1422514225
xValuesString = _ref7[0],
1422614226
rows = _ref7[1];
1422714227

14228-
return unnest(rows.map(function (_ref8) {
14228+
return unnest(rows.filter(function (_ref8) {
1422914229
var row = _ref8.row;
14230+
return Object.keys(row).length > 0;
14231+
}).map(function (_ref9) {
14232+
var row = _ref9.row;
1423014233
return _this2.axisValues(pivotConfig.y)(row);
1423114234
}));
1423214235
}), unnest, uniq)(xGrouped); // eslint-disable-next-line no-unused-vars
1423314236

14234-
return xGrouped.map(function (_ref9) {
14235-
var _ref10 = _slicedToArray(_ref9, 2),
14236-
xValuesString = _ref10[0],
14237-
rows = _ref10[1];
14237+
return xGrouped.map(function (_ref10) {
14238+
var _ref11 = _slicedToArray(_ref10, 2),
14239+
xValuesString = _ref11[0],
14240+
rows = _ref11[1];
1423814241

1423914242
var xValues = rows[0].xValues;
14240-
var yGrouped = pipe(map(function (_ref11) {
14241-
var row = _ref11.row;
14243+
var yGrouped = pipe(map(function (_ref12) {
14244+
var row = _ref12.row;
1424214245
return _this2.axisValues(pivotConfig.y)(row).map(function (yValues) {
1424314246
return {
1424414247
yValues: yValues,
1424514248
row: row
1424614249
};
1424714250
});
14248-
}), unnest, groupBy(function (_ref12) {
14249-
var yValues = _ref12.yValues;
14251+
}), unnest, groupBy(function (_ref13) {
14252+
var yValues = _ref13.yValues;
1425014253
return _this2.axisValuesString(yValues);
1425114254
}))(rows);
1425214255
return {
@@ -14257,8 +14260,8 @@
1425714260
}) ? ResultSet.measureFromAxis(xValues) : ResultSet.measureFromAxis(yValues);
1425814261
return (yGrouped[_this2.axisValuesString(yValues)] || [{
1425914262
row: {}
14260-
}]).map(function (_ref13) {
14261-
var row = _ref13.row;
14263+
}]).map(function (_ref14) {
14264+
var row = _ref14.row;
1426214265
return [yValues, measureValue(row, measure, xValues)];
1426314266
});
1426414267
}))
@@ -14276,17 +14279,17 @@
1427614279
value: function chartPivot(pivotConfig) {
1427714280
var _this3 = this;
1427814281

14279-
return this.pivot(pivotConfig).map(function (_ref14) {
14280-
var xValues = _ref14.xValues,
14281-
yValuesArray = _ref14.yValuesArray;
14282+
return this.pivot(pivotConfig).map(function (_ref15) {
14283+
var xValues = _ref15.xValues,
14284+
yValuesArray = _ref15.yValuesArray;
1428214285
return _objectSpread({
1428314286
category: _this3.axisValuesString(xValues, ', '),
1428414287
// TODO deprecated
1428514288
x: _this3.axisValuesString(xValues, ', ')
14286-
}, yValuesArray.map(function (_ref15) {
14287-
var _ref16 = _slicedToArray(_ref15, 2),
14288-
yValues = _ref16[0],
14289-
m = _ref16[1];
14289+
}, yValuesArray.map(function (_ref16) {
14290+
var _ref17 = _slicedToArray(_ref16, 2),
14291+
yValues = _ref17[0],
14292+
m = _ref17[1];
1429014293

1429114294
return _defineProperty({}, _this3.axisValuesString(yValues, ', '), m && Number.parseFloat(m));
1429214295
}).reduce(function (a, b) {
@@ -14305,13 +14308,13 @@
1430514308
};
1430614309
};
1430714310

14308-
return this.pivot(normalizedPivotConfig).map(function (_ref19) {
14309-
var xValues = _ref19.xValues,
14310-
yValuesArray = _ref19.yValuesArray;
14311-
return yValuesArray.map(function (_ref20) {
14312-
var _ref21 = _slicedToArray(_ref20, 2),
14313-
yValues = _ref21[0],
14314-
m = _ref21[1];
14311+
return this.pivot(normalizedPivotConfig).map(function (_ref20) {
14312+
var xValues = _ref20.xValues,
14313+
yValuesArray = _ref20.yValuesArray;
14314+
return yValuesArray.map(function (_ref21) {
14315+
var _ref22 = _slicedToArray(_ref21, 2),
14316+
yValues = _ref22[0],
14317+
m = _ref22[1];
1431514318

1431614319
return normalizedPivotConfig.x.map(valueToObject(xValues, m)).concat(normalizedPivotConfig.y.map(valueToObject(yValues, m))).reduce(function (a, b) {
1431714320
return Object.assign(a, b);

0 commit comments

Comments
 (0)