@cubejs-client/vue3 0.30.4 → 0.30.54

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

@@ -1478,11 +1478,11 @@
 	var $forEach = arrayIteration.forEach;
 
 
-	var STRICT_METHOD$5 = arrayMethodIsStrict('forEach');
+	var STRICT_METHOD$6 = arrayMethodIsStrict('forEach');
 
 	// `Array.prototype.forEach` method implementation
 	// https://tc39.es/ecma262/#sec-array.prototype.foreach
-	var arrayForEach = !STRICT_METHOD$5 ? function forEach(callbackfn /* , thisArg */) {
+	var arrayForEach = !STRICT_METHOD$6 ? function forEach(callbackfn /* , thisArg */) {
 	  return $forEach(this, callbackfn, arguments.length > 1 ? arguments[1] : undefined);
 	// eslint-disable-next-line es/no-array-prototype-foreach -- safe
 	} : [].forEach;
@@ -1702,11 +1702,11 @@
 	var $every = arrayIteration.every;
 
 
-	var STRICT_METHOD$4 = arrayMethodIsStrict('every');
+	var STRICT_METHOD$5 = arrayMethodIsStrict('every');
 
 	// `Array.prototype.every` method
 	// https://tc39.es/ecma262/#sec-array.prototype.every
-	_export({ target: 'Array', proto: true, forced: !STRICT_METHOD$4 }, {
+	_export({ target: 'Array', proto: true, forced: !STRICT_METHOD$5 }, {
 	  every: function every(callbackfn /* , thisArg */) {
 	    return $every(this, callbackfn, arguments.length > 1 ? arguments[1] : undefined);
 	  }
@@ -1817,14 +1817,14 @@
 
 
 
-	var STRICT_METHOD$3 = arrayMethodIsStrict('reduce');
+	var STRICT_METHOD$4 = arrayMethodIsStrict('reduce');
 	// Chrome 80-82 has a critical bug
 	// https://bugs.chromium.org/p/chromium/issues/detail?id=1049982
 	var CHROME_BUG = !engineIsNode && engineV8Version > 79 && engineV8Version < 83;
 
 	// `Array.prototype.reduce` method
 	// https://tc39.es/ecma262/#sec-array.prototype.reduce
-	_export({ target: 'Array', proto: true, forced: !STRICT_METHOD$3 || CHROME_BUG }, {
+	_export({ target: 'Array', proto: true, forced: !STRICT_METHOD$4 || CHROME_BUG }, {
 	  reduce: function reduce(callbackfn /* , initialValue */) {
 	    var length = arguments.length;
 	    return $reduce(this, callbackfn, length, length > 1 ? arguments[1] : undefined);
@@ -3363,11 +3363,11 @@
 	var un$Join = functionUncurryThis([].join);
 
 	var ES3_STRINGS = indexedObject != Object;
-	var STRICT_METHOD$2 = arrayMethodIsStrict('join', ',');
+	var STRICT_METHOD$3 = arrayMethodIsStrict('join', ',');
 
 	// `Array.prototype.join` method
 	// https://tc39.es/ecma262/#sec-array.prototype.join
-	_export({ target: 'Array', proto: true, forced: ES3_STRINGS || !STRICT_METHOD$2 }, {
+	_export({ target: 'Array', proto: true, forced: ES3_STRINGS || !STRICT_METHOD$3 }, {
 	  join: function join(separator) {
 	    return un$Join(toIndexedObject(this), separator === undefined ? ',' : separator);
 	  }
@@ -3611,11 +3611,11 @@
 	var un$IndexOf = functionUncurryThis([].indexOf);
 
 	var NEGATIVE_ZERO = !!un$IndexOf && 1 / un$IndexOf([1], 1, -0) < 0;
-	var STRICT_METHOD$1 = arrayMethodIsStrict('indexOf');
+	var STRICT_METHOD$2 = arrayMethodIsStrict('indexOf');
 
 	// `Array.prototype.indexOf` method
 	// https://tc39.es/ecma262/#sec-array.prototype.indexof
-	_export({ target: 'Array', proto: true, forced: NEGATIVE_ZERO || !STRICT_METHOD$1 }, {
+	_export({ target: 'Array', proto: true, forced: NEGATIVE_ZERO || !STRICT_METHOD$2 }, {
 	  indexOf: function indexOf(searchElement /* , fromIndex = 0 */) {
 	    var fromIndex = arguments.length > 1 ? arguments[1] : undefined;
 	    return NEGATIVE_ZERO
@@ -3743,7 +3743,7 @@
 	  test.sort(null);
 	});
 	// Old WebKit
-	var STRICT_METHOD = arrayMethodIsStrict('sort');
+	var STRICT_METHOD$1 = arrayMethodIsStrict('sort');
 
 	var STABLE_SORT = !fails(function () {
 	  // feature detection can be too slow, so check engines versions
@@ -3780,7 +3780,7 @@
 	  return result !== 'DGBEFHACIJK';
 	});
 
-	var FORCED$2 = FAILS_ON_UNDEFINED || !FAILS_ON_NULL || !STRICT_METHOD || !STABLE_SORT;
+	var FORCED$2 = FAILS_ON_UNDEFINED || !FAILS_ON_NULL || !STRICT_METHOD$1 || !STABLE_SORT;
 
 	var getSortCompare = function (comparefn) {
 	  return function (x, y) {
@@ -9024,7 +9024,7 @@
 
 	  return exports;
 
-	})({}));
+	}))({});
 	})(__self__);
 	__self__.fetch.ponyfill = true;
 	// Remove "polyfill" property added by whatwg-fetch
@@ -10920,6 +10920,19 @@
 	  }
 	};
 
+	var $some = arrayIteration.some;
+
+
+	var STRICT_METHOD = arrayMethodIsStrict('some');
+
+	// `Array.prototype.some` method
+	// https://tc39.es/ecma262/#sec-array.prototype.some
+	_export({ target: 'Array', proto: true, forced: !STRICT_METHOD }, {
+	  some: function some(callbackfn /* , thisArg */) {
+	    return $some(this, callbackfn, arguments.length > 1 ? arguments[1] : undefined);
+	  }
+	});
+
 	var HAS_SPECIES_SUPPORT = arrayMethodHasSpeciesSupport('slice');
 
 	var SPECIES = wellKnownSymbol('species');
@@ -10997,6 +11010,51 @@
 	  }, []);
 	};
 
+	var operators = ['and', 'or'];
+
+	var validateFilters = function validateFilters(filters) {
+	  return filters.reduce(function (acc, raw) {
+	    if (raw.operator) {
+	      return [].concat(_toConsumableArray(acc), [raw]);
+	    }
+
+	    var validBooleanFilter = operators.reduce(function (acc, operator) {
+	      var filters = raw[operator];
+	      var booleanFilters = validateFilters(filters || []);
+
+	      if (booleanFilters.length) {
+	        return _objectSpread(_objectSpread({}, acc), {}, _defineProperty({}, operator, booleanFilters));
+	      }
+
+	      return acc;
+	    }, {});
+
+	    if (operators.some(function (operator) {
+	      return validBooleanFilter[operator];
+	    })) {
+	      return [].concat(_toConsumableArray(acc), [validBooleanFilter]);
+	    }
+
+	    return acc;
+	  }, []);
+	};
+
+	var getDimensionOrMeasure = function getDimensionOrMeasure(meta, m) {
+	  var memberName = m.member || m.dimension;
+	  return memberName && meta.resolveMember(memberName, ['dimensions', 'measures']);
+	};
+
+	var resolveMembers = function resolveMembers(meta, arr) {
+	  return arr && arr.map(function (e, index) {
+	    return _objectSpread(_objectSpread({}, e), {}, {
+	      member: getDimensionOrMeasure(meta, e),
+	      index: index,
+	      and: resolveMembers(meta, e.and),
+	      or: resolveMembers(meta, e.or)
+	    });
+	  });
+	};
+
 	var QueryBuilder = {
 	  components: {
 	    QueryRenderer: QueryRenderer
@@ -11117,7 +11175,6 @@
 	        order: order,
 	        orderMembers: orderMembers,
 	        setOrder: this.setOrder,
-	        setQuery: this.setQuery,
 	        pivotConfig: this.pivotConfig,
 	        updateOrder: {
 	          set: function set(memberId, newOrder) {
@@ -11218,7 +11275,7 @@
 
 	      var validatedQuery = {};
 
-	      var toQuery = function toQuery(member) {
+	      var _toQuery = function toQuery(member) {
 	        return member.name;
 	      }; // TODO: implement timezone
 
@@ -11226,7 +11283,7 @@
 	      var hasElements = false;
 	      QUERY_ELEMENTS.forEach(function (element) {
 	        if (element === 'timeDimensions') {
-	          toQuery = function toQuery(member) {
+	          _toQuery = function toQuery(member) {
 	            return {
 	              dimension: member.dimension.name,
 	              granularity: member.granularity,
@@ -11234,27 +11291,27 @@
 	            };
 	          };
 	        } else if (element === 'filters') {
-	          toQuery = function toQuery(member) {
+	          _toQuery = function toQuery(member) {
 	            return {
-	              member: member.member.name,
+	              member: member.member && member.member.name,
 	              operator: member.operator,
-	              values: member.values
+	              values: member.values,
+	              and: member.and && member.and.map(_toQuery),
+	              or: member.or && member.or.map(_toQuery)
 	            };
 	          };
 	        }
 
 	        if (_this2[element].length > 0) {
 	          validatedQuery[element] = _this2[element].map(function (x) {
-	            return toQuery(x);
+	            return _toQuery(x);
 	          });
 	          hasElements = true;
 	        }
 	      });
 
 	      if (validatedQuery.filters) {
-	        validatedQuery.filters = validatedQuery.filters.filter(function (f) {
-	          return f.operator;
-	        });
+	        validatedQuery.filters = validateFilters(validatedQuery.filters);
 	      } // only set limit and offset if there are elements otherwise an invalid request with just limit/offset
 	      // gets sent when the component is first mounted, but before the actual query is constructed.
 
@@ -11391,10 +11448,14 @@
 	          index: index
 	        });
 	      });
+	      var memberTypes = ['dimensions', 'measures'];
 	      this.filters = filters.map(function (m, index) {
+	        var memberName = m.member || m.dimension;
 	        return _objectSpread(_objectSpread({}, m), {}, {
-	          member: _this4.meta.resolveMember(m.member || m.dimension, ['dimensions', 'measures']),
-	          operators: _this4.meta.filterOperatorsForMember(m.member || m.dimension, ['dimensions', 'measures']),
+	          member: memberName && _this4.meta.resolveMember(memberName, memberTypes),
+	          operators: memberName && _this4.meta.filterOperatorsForMember(memberName, memberTypes),
+	          and: resolveMembers(_this4.meta, m.and),
+	          or: resolveMembers(_this4.meta, m.or),
 	          index: index
 	        });
 	      });
@@ -11431,10 +11492,10 @@
 	          });
 	        }
 	      } else if (element === 'filters') {
-	        var filterMember = _objectSpread({}, this.meta.resolveMember(member.member || member.dimension, ['dimensions', 'measures']));
-
 	        mem = _objectSpread(_objectSpread({}, member), {}, {
-	          member: filterMember
+	          and: resolveMembers(this.meta, member.and),
+	          or: resolveMembers(this.meta, member.or),
+	          member: getDimensionOrMeasure(this.meta, member)
 	        });
 	      } else {
 	        mem = this["available".concat(name)].find(function (m) {
@@ -11498,11 +11559,10 @@
 	        index = this[element].findIndex(function (x) {
 	          return x.dimension === old;
 	        });
-
-	        var filterMember = _objectSpread({}, this.meta.resolveMember(member.member || member.dimension, ['dimensions', 'measures']));
-
 	        mem = _objectSpread(_objectSpread({}, member), {}, {
-	          member: filterMember
+	          and: resolveMembers(this.meta, member.and),
+	          or: resolveMembers(this.meta, member.or),
+	          member: getDimensionOrMeasure(this.meta, member)
 	        });
 	      } else {
 	        index = this[element].findIndex(function (x) {
@@ -11542,10 +11602,10 @@
 	            });
 	          }
 	        } else if (element === 'filters') {
-	          var member = _objectSpread({}, _this5.meta.resolveMember(m.member || m.dimension, ['dimensions', 'measures']));
-
 	          mem = _objectSpread(_objectSpread({}, m), {}, {
-	            member: member
+	            and: resolveMembers(_this5.meta, m.and),
+	            or: resolveMembers(_this5.meta, m.or),
+	            member: getDimensionOrMeasure(_this5.meta, m)
 	          });
 	        } else {
 	          mem = _this5["available".concat(name)].find(function (x) {
@@ -11568,6 +11628,9 @@
 	    setOffset: function setOffset(offset) {
 	      this.offset = offset;
 	    },
+	    removeOffset: function removeOffset() {
+	      this.offset = null;
+	    },
 	    updateChart: function updateChart(chartType) {
 	      this.chartType = chartType;
 	    },