@cubejs-client/core 0.29.53 → 0.30.4

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

@@ -7909,6 +7909,39 @@
 	  return f(b) < f(a) ? b : a;
 	});
 
+	/**
+	 * Converts an object into an array of key, value arrays. Only the object's
+	 * own properties are used.
+	 * Note that the order of the output array is not guaranteed to be consistent
+	 * across different JS platforms.
+	 *
+	 * @func
+	 * @memberOf R
+	 * @since v0.4.0
+	 * @category Object
+	 * @sig {String: *} -> [[String,*]]
+	 * @param {Object} obj The object to extract from
+	 * @return {Array} An array of key, value arrays from the object's own properties.
+	 * @see R.fromPairs
+	 * @example
+	 *
+	 *      R.toPairs({a: 1, b: 2, c: 3}); //=> [['a', 1], ['b', 2], ['c', 3]]
+	 */
+
+	var toPairs =
+	/*#__PURE__*/
+	_curry1(function toPairs(obj) {
+	  var pairs = [];
+
+	  for (var prop in obj) {
+	    if (_has(prop, obj)) {
+	      pairs[pairs.length] = [prop, obj[prop]];
+	    }
+	  }
+
+	  return pairs;
+	});
+
 	/**
 	 * Shorthand for `R.chain(R.identity)`, which removes one level of nesting from
 	 * any [Chain](https://github.com/fantasyland/fantasy-land#chain).
@@ -8048,6 +8081,41 @@
 	  name: 'year',
 	  title: 'Year'
 	}];
+	function removeEmptyQueryFields(_query) {
+	  var query = _query || {};
+	  return fromPairs(toPairs(query).map(function (_ref) {
+	    var _ref2 = _slicedToArray(_ref, 2),
+	        key = _ref2[0],
+	        value = _ref2[1];
+
+	    if (['measures', 'dimensions', 'segments', 'timeDimensions', 'filters'].includes(key)) {
+	      if (Array.isArray(value) && value.length === 0) {
+	        return null;
+	      }
+	    }
+
+	    if (key === 'order' && value) {
+	      if (Array.isArray(value) && !value.length) {
+	        return null;
+	      } else if (!Object.keys(value).length) {
+	        return null;
+	      }
+	    }
+
+	    return [key, value];
+	  }).filter(Boolean));
+	}
+	function validateQuery(_query) {
+	  var query = _query || {};
+	  return removeEmptyQueryFields(_objectSpread$3(_objectSpread$3({}, query), {}, {
+	    filters: (query.filters || []).filter(function (f) {
+	      return f.operator;
+	    }),
+	    timeDimensions: (query.timeDimensions || []).filter(function (td) {
+	      return !(!td.dateRange && !td.granularity);
+	    })
+	  }));
+	}
 	function areQueriesEqual() {
 	  var query1 = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
 	  var query2 = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
@@ -8102,9 +8170,9 @@
 	    }
 
 	    if ((oldQuery.measures || []).length === 0 && (newQuery.measures || []).length > 0 || (oldQuery.measures || []).length === 1 && (newQuery.measures || []).length === 1 && oldQuery.measures[0] !== newQuery.measures[0]) {
-	      var _ref4 = newQuery.timeDimensions || [],
-	          _ref5 = _slicedToArray(_ref4, 1),
-	          td = _ref5[0];
+	      var _ref6 = newQuery.timeDimensions || [],
+	          _ref7 = _slicedToArray(_ref6, 1),
+	          td = _ref7[0];
 
 	      var defaultTimeDimension = meta.defaultTimeDimensionNameFor(newQuery.measures[0]);
 	      newQuery = _objectSpread$3(_objectSpread$3({}, newQuery), {}, {
@@ -8275,10 +8343,10 @@
 	  var indexedOrderMembers = indexBy(prop('id'), orderMembers);
 	  var entries = Array.isArray(order) ? order : Object.entries(order || {});
 	  var nextOrderMembers = [];
-	  entries.forEach(function (_ref6) {
-	    var _ref7 = _slicedToArray(_ref6, 2),
-	        memberId = _ref7[0],
-	        currentOrder = _ref7[1];
+	  entries.forEach(function (_ref8) {
+	    var _ref9 = _slicedToArray(_ref8, 2),
+	        memberId = _ref9[0],
+	        currentOrder = _ref9[1];
 
 	    if (currentOrder !== 'none' && indexedOrderMembers[memberId]) {
 	      ids.add(memberId);
@@ -11928,16 +11996,20 @@
 		CubejsApi: CubejsApi,
 		HttpTransport: HttpTransport,
 		ResultSet: ResultSet,
+		DEFAULT_GRANULARITY: DEFAULT_GRANULARITY,
+		GRANULARITIES: GRANULARITIES,
+		removeEmptyQueryFields: removeEmptyQueryFields,
+		validateQuery: validateQuery,
 		areQueriesEqual: areQueriesEqual,
+		defaultOrder: defaultOrder,
 		defaultHeuristics: defaultHeuristics,
-		movePivotItem: movePivotItem,
 		isQueryPresent: isQueryPresent,
+		movePivotItem: movePivotItem,
 		moveItemInArray: moveItemInArray,
-		defaultOrder: defaultOrder,
 		flattenFilters: flattenFilters,
 		getQueryMembers: getQueryMembers,
 		getOrderMembersFromOrder: getOrderMembersFromOrder,
-		GRANULARITIES: GRANULARITIES
+		aliasSeries: aliasSeries
 	});
 
 	Object.keys(clientCoreExports).forEach(function (key) {