Skip to content

Commit

Permalink
fix(client-core): ResultSet series returns a series with no data
Browse files Browse the repository at this point in the history 
Fixes #38
  • Loading branch information
@paveltiunov
paveltiunov committed May 31, 2019
1 parent c5e5337 commit 715e170
Show file tree
Hide file tree
Showing 5 changed files with 116 additions and 104 deletions.
59 changes: 31 additions & 28 deletions packages/cubejs-client-core/dist/cubejs-client-core.esm.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@ import fetch from 'cross-fetch';
import 'core-js/modules/es6.number.constructor';
import 'core-js/modules/es6.number.parse-float';
import _objectSpread from '@babel/runtime/helpers/objectSpread';
import 'core-js/modules/web.dom.iterable';
import 'core-js/modules/es6.array.iterator';
import 'core-js/modules/es6.object.keys';
import _slicedToArray from '@babel/runtime/helpers/slicedToArray';
import _defineProperty from '@babel/runtime/helpers/defineProperty';
import 'core-js/modules/es6.array.reduce';
Expand All @@ -21,9 +24,6 @@ import 'core-js/modules/es6.array.map';
import { pipe, map, filter, reduce, minBy, maxBy, groupBy, equals, unnest, toPairs, uniq, dropLast, fromPairs } from 'ramda';
import Moment from 'moment';
import momentRange from 'moment-range';
import 'core-js/modules/web.dom.iterable';
import 'core-js/modules/es6.array.iterator';
import 'core-js/modules/es6.object.keys';
import 'core-js/modules/es6.array.is-array';
import 'core-js/modules/es6.regexp.split';
import 'core-js/modules/es6.function.name';
Expand Down Expand Up @@ -251,28 +251,31 @@ function () {
xValuesString = _ref7[0],
rows = _ref7[1];

return unnest(rows.map(function (_ref8) {
return unnest(rows.filter(function (_ref8) {
var row = _ref8.row;
return Object.keys(row).length > 0;
}).map(function (_ref9) {
var row = _ref9.row;
return _this2.axisValues(pivotConfig.y)(row);
}));
}), unnest, uniq)(xGrouped); // eslint-disable-next-line no-unused-vars

return xGrouped.map(function (_ref9) {
var _ref10 = _slicedToArray(_ref9, 2),
xValuesString = _ref10[0],
rows = _ref10[1];
return xGrouped.map(function (_ref10) {
var _ref11 = _slicedToArray(_ref10, 2),
xValuesString = _ref11[0],
rows = _ref11[1];

var xValues = rows[0].xValues;
var yGrouped = pipe(map(function (_ref11) {
var row = _ref11.row;
var yGrouped = pipe(map(function (_ref12) {
var row = _ref12.row;
return _this2.axisValues(pivotConfig.y)(row).map(function (yValues) {
return {
yValues: yValues,
row: row
};
});
}), unnest, groupBy(function (_ref12) {
var yValues = _ref12.yValues;
}), unnest, groupBy(function (_ref13) {
var yValues = _ref13.yValues;
return _this2.axisValuesString(yValues);
}))(rows);
return {
Expand All @@ -283,8 +286,8 @@ function () {
}) ? ResultSet.measureFromAxis(xValues) : ResultSet.measureFromAxis(yValues);
return (yGrouped[_this2.axisValuesString(yValues)] || [{
row: {}
}]).map(function (_ref13) {
var row = _ref13.row;
}]).map(function (_ref14) {
var row = _ref14.row;
return [yValues, measureValue(row, measure, xValues)];
});
}))
Expand All @@ -302,17 +305,17 @@ function () {
value: function chartPivot(pivotConfig) {
var _this3 = this;

return this.pivot(pivotConfig).map(function (_ref14) {
var xValues = _ref14.xValues,
yValuesArray = _ref14.yValuesArray;
return this.pivot(pivotConfig).map(function (_ref15) {
var xValues = _ref15.xValues,
yValuesArray = _ref15.yValuesArray;
return _objectSpread({
category: _this3.axisValuesString(xValues, ', '),
// TODO deprecated
x: _this3.axisValuesString(xValues, ', ')
}, yValuesArray.map(function (_ref15) {
var _ref16 = _slicedToArray(_ref15, 2),
yValues = _ref16[0],
m = _ref16[1];
}, yValuesArray.map(function (_ref16) {
var _ref17 = _slicedToArray(_ref16, 2),
yValues = _ref17[0],
m = _ref17[1];

return _defineProperty({}, _this3.axisValuesString(yValues, ', '), m && Number.parseFloat(m));
}).reduce(function (a, b) {
Expand All @@ -331,13 +334,13 @@ function () {
};
};

return this.pivot(normalizedPivotConfig).map(function (_ref19) {
var xValues = _ref19.xValues,
yValuesArray = _ref19.yValuesArray;
return yValuesArray.map(function (_ref20) {
var _ref21 = _slicedToArray(_ref20, 2),
yValues = _ref21[0],
m = _ref21[1];
return this.pivot(normalizedPivotConfig).map(function (_ref20) {
var xValues = _ref20.xValues,
yValuesArray = _ref20.yValuesArray;
return yValuesArray.map(function (_ref21) {
var _ref22 = _slicedToArray(_ref21, 2),
yValues = _ref22[0],
m = _ref22[1];

return normalizedPivotConfig.x.map(valueToObject(xValues, m)).concat(normalizedPivotConfig.y.map(valueToObject(yValues, m))).reduce(function (a, b) {
return Object.assign(a, b);
Expand Down
59 changes: 31 additions & 28 deletions packages/cubejs-client-core/dist/cubejs-client-core.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@ var fetch = _interopDefault(require('cross-fetch'));
require('core-js/modules/es6.number.constructor');
require('core-js/modules/es6.number.parse-float');
var _objectSpread = _interopDefault(require('@babel/runtime/helpers/objectSpread'));
require('core-js/modules/web.dom.iterable');
require('core-js/modules/es6.array.iterator');
require('core-js/modules/es6.object.keys');
var _slicedToArray = _interopDefault(require('@babel/runtime/helpers/slicedToArray'));
var _defineProperty = _interopDefault(require('@babel/runtime/helpers/defineProperty'));
require('core-js/modules/es6.array.reduce');
Expand All @@ -25,9 +28,6 @@ require('core-js/modules/es6.array.map');
var ramda = require('ramda');
var Moment = _interopDefault(require('moment'));
var momentRange = _interopDefault(require('moment-range'));
require('core-js/modules/web.dom.iterable');
require('core-js/modules/es6.array.iterator');
require('core-js/modules/es6.object.keys');
require('core-js/modules/es6.array.is-array');
require('core-js/modules/es6.regexp.split');
require('core-js/modules/es6.function.name');
Expand Down Expand Up @@ -255,28 +255,31 @@ function () {
xValuesString = _ref7[0],
rows = _ref7[1];

return ramda.unnest(rows.map(function (_ref8) {
return ramda.unnest(rows.filter(function (_ref8) {
var row = _ref8.row;
return Object.keys(row).length > 0;
}).map(function (_ref9) {
var row = _ref9.row;
return _this2.axisValues(pivotConfig.y)(row);
}));
}), ramda.unnest, ramda.uniq)(xGrouped); // eslint-disable-next-line no-unused-vars

return xGrouped.map(function (_ref9) {
var _ref10 = _slicedToArray(_ref9, 2),
xValuesString = _ref10[0],
rows = _ref10[1];
return xGrouped.map(function (_ref10) {
var _ref11 = _slicedToArray(_ref10, 2),
xValuesString = _ref11[0],
rows = _ref11[1];

var xValues = rows[0].xValues;
var yGrouped = ramda.pipe(ramda.map(function (_ref11) {
var row = _ref11.row;
var yGrouped = ramda.pipe(ramda.map(function (_ref12) {
var row = _ref12.row;
return _this2.axisValues(pivotConfig.y)(row).map(function (yValues) {
return {
yValues: yValues,
row: row
};
});
}), ramda.unnest, ramda.groupBy(function (_ref12) {
var yValues = _ref12.yValues;
}), ramda.unnest, ramda.groupBy(function (_ref13) {
var yValues = _ref13.yValues;
return _this2.axisValuesString(yValues);
}))(rows);
return {
Expand All @@ -287,8 +290,8 @@ function () {
}) ? ResultSet.measureFromAxis(xValues) : ResultSet.measureFromAxis(yValues);
return (yGrouped[_this2.axisValuesString(yValues)] || [{
row: {}
}]).map(function (_ref13) {
var row = _ref13.row;
}]).map(function (_ref14) {
var row = _ref14.row;
return [yValues, measureValue(row, measure, xValues)];
});
}))
Expand All @@ -306,17 +309,17 @@ function () {
value: function chartPivot(pivotConfig) {
var _this3 = this;

return this.pivot(pivotConfig).map(function (_ref14) {
var xValues = _ref14.xValues,
yValuesArray = _ref14.yValuesArray;
return this.pivot(pivotConfig).map(function (_ref15) {
var xValues = _ref15.xValues,
yValuesArray = _ref15.yValuesArray;
return _objectSpread({
category: _this3.axisValuesString(xValues, ', '),
// TODO deprecated
x: _this3.axisValuesString(xValues, ', ')
}, yValuesArray.map(function (_ref15) {
var _ref16 = _slicedToArray(_ref15, 2),
yValues = _ref16[0],
m = _ref16[1];
}, yValuesArray.map(function (_ref16) {
var _ref17 = _slicedToArray(_ref16, 2),
yValues = _ref17[0],
m = _ref17[1];

return _defineProperty({}, _this3.axisValuesString(yValues, ', '), m && Number.parseFloat(m));
}).reduce(function (a, b) {
Expand All @@ -335,13 +338,13 @@ function () {
};
};

return this.pivot(normalizedPivotConfig).map(function (_ref19) {
var xValues = _ref19.xValues,
yValuesArray = _ref19.yValuesArray;
return yValuesArray.map(function (_ref20) {
var _ref21 = _slicedToArray(_ref20, 2),
yValues = _ref21[0],
m = _ref21[1];
return this.pivot(normalizedPivotConfig).map(function (_ref20) {
var xValues = _ref20.xValues,
yValuesArray = _ref20.yValuesArray;
return yValuesArray.map(function (_ref21) {
var _ref22 = _slicedToArray(_ref21, 2),
yValues = _ref22[0],
m = _ref22[1];

return normalizedPivotConfig.x.map(valueToObject(xValues, m)).concat(normalizedPivotConfig.y.map(valueToObject(yValues, m))).reduce(function (a, b) {
return Object.assign(a, b);
Expand Down
95 changes: 49 additions & 46 deletions packages/cubejs-client-core/dist/cubejs-client-core.umd.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4392,6 +4392,27 @@
// 20.1.2.12 Number.parseFloat(string)
_export(_export.S + _export.F * (Number.parseFloat != _parseFloat), 'Number', { parseFloat: _parseFloat });

// most Object methods by ES6 should accept primitives



var _objectSap = function (KEY, exec) {
var fn = (_core.Object || {})[KEY] || Object[KEY];
var exp = {};
exp[KEY] = exec(fn);
_export(_export.S + _export.F * _fails(function () { fn(1); }), 'Object', exp);
};

// 19.1.2.14 Object.keys(O)



_objectSap('keys', function () {
return function keys(it) {
return _objectKeys(_toObject(it));
};
});

var _arrayReduce = function (that, callbackfn, aLen, memo, isRight) {
_aFunction(callbackfn);
var O = _toObject(that);
Expand Down Expand Up @@ -5246,27 +5267,6 @@
return new XMap(f, xf);
});

// most Object methods by ES6 should accept primitives



var _objectSap = function (KEY, exec) {
var fn = (_core.Object || {})[KEY] || Object[KEY];
var exp = {};
exp[KEY] = exec(fn);
_export(_export.S + _export.F * _fails(function () { fn(1); }), 'Object', exp);
};

// 19.1.2.14 Object.keys(O)



_objectSap('keys', function () {
return function keys(it) {
return _objectKeys(_toObject(it));
};
});

function _has$1(prop, obj) {
return Object.prototype.hasOwnProperty.call(obj, prop);
}
Expand Down Expand Up @@ -14225,28 +14225,31 @@
xValuesString = _ref7[0],
rows = _ref7[1];

return unnest(rows.map(function (_ref8) {
return unnest(rows.filter(function (_ref8) {
var row = _ref8.row;
return Object.keys(row).length > 0;
}).map(function (_ref9) {
var row = _ref9.row;
return _this2.axisValues(pivotConfig.y)(row);
}));
}), unnest, uniq)(xGrouped); // eslint-disable-next-line no-unused-vars

return xGrouped.map(function (_ref9) {
var _ref10 = _slicedToArray(_ref9, 2),
xValuesString = _ref10[0],
rows = _ref10[1];
return xGrouped.map(function (_ref10) {
var _ref11 = _slicedToArray(_ref10, 2),
xValuesString = _ref11[0],
rows = _ref11[1];

var xValues = rows[0].xValues;
var yGrouped = pipe(map(function (_ref11) {
var row = _ref11.row;
var yGrouped = pipe(map(function (_ref12) {
var row = _ref12.row;
return _this2.axisValues(pivotConfig.y)(row).map(function (yValues) {
return {
yValues: yValues,
row: row
};
});
}), unnest, groupBy(function (_ref12) {
var yValues = _ref12.yValues;
}), unnest, groupBy(function (_ref13) {
var yValues = _ref13.yValues;
return _this2.axisValuesString(yValues);
}))(rows);
return {
Expand All @@ -14257,8 +14260,8 @@
}) ? ResultSet.measureFromAxis(xValues) : ResultSet.measureFromAxis(yValues);
return (yGrouped[_this2.axisValuesString(yValues)] || [{
row: {}
}]).map(function (_ref13) {
var row = _ref13.row;
}]).map(function (_ref14) {
var row = _ref14.row;
return [yValues, measureValue(row, measure, xValues)];
});
}))
Expand All @@ -14276,17 +14279,17 @@
value: function chartPivot(pivotConfig) {
var _this3 = this;

return this.pivot(pivotConfig).map(function (_ref14) {
var xValues = _ref14.xValues,
yValuesArray = _ref14.yValuesArray;
return this.pivot(pivotConfig).map(function (_ref15) {
var xValues = _ref15.xValues,
yValuesArray = _ref15.yValuesArray;
return _objectSpread({
category: _this3.axisValuesString(xValues, ', '),
// TODO deprecated
x: _this3.axisValuesString(xValues, ', ')
}, yValuesArray.map(function (_ref15) {
var _ref16 = _slicedToArray(_ref15, 2),
yValues = _ref16[0],
m = _ref16[1];
}, yValuesArray.map(function (_ref16) {
var _ref17 = _slicedToArray(_ref16, 2),
yValues = _ref17[0],
m = _ref17[1];

return _defineProperty({}, _this3.axisValuesString(yValues, ', '), m && Number.parseFloat(m));
}).reduce(function (a, b) {
Expand All @@ -14305,13 +14308,13 @@
};
};

return this.pivot(normalizedPivotConfig).map(function (_ref19) {
var xValues = _ref19.xValues,
yValuesArray = _ref19.yValuesArray;
return yValuesArray.map(function (_ref20) {
var _ref21 = _slicedToArray(_ref20, 2),
yValues = _ref21[0],
m = _ref21[1];
return this.pivot(normalizedPivotConfig).map(function (_ref20) {
var xValues = _ref20.xValues,
yValuesArray = _ref20.yValuesArray;
return yValuesArray.map(function (_ref21) {
var _ref22 = _slicedToArray(_ref21, 2),
yValues = _ref22[0],
m = _ref22[1];

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

0 comments on commit 715e170

Please sign in to comment.