@appbaseio/reactivesearch-vue 1.16.0-alpha.40 → 1.16.0-alpha.43

package/dist/@appbaseio/reactivesearch-vue.umd.js

@@ -4882,6 +4882,7 @@
 	  };
 
 	  exports.isEqual = isEqual;
+	  exports.compareQueries = compareQueries;
 	  exports.debounce = debounce;
 	  exports.getQueryOptions = getQueryOptions;
 	  exports.buildQuery = buildQuery;
@@ -4976,6 +4977,14 @@
 	    return true;
 	  }
 
+	  function compareQueries(x, y) {
+	    try {
+	      return isEqual(JSON.parse(JSON.stringify(x)), JSON.parse(JSON.stringify(y)));
+	    } catch (e) {
+	      return false;
+	    }
+	  }
+
 	  function debounce(callback, wait) {
 	    var context = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : this;
 	    var timeout = null;
@@ -5782,18 +5791,19 @@
 	var helper_20 = helper.updateDefaultQuery;
 	var helper_21 = helper.updateCustomQuery;
 	var helper_22 = helper.isEqual;
-	var helper_23 = helper.debounce;
-	var helper_24 = helper.getQueryOptions;
-	var helper_25 = helper.buildQuery;
-	var helper_26 = helper.pushToAndClause;
-	var helper_27 = helper.checkValueChange;
-	var helper_28 = helper.getAggsOrder;
-	var helper_29 = helper.formatDate;
-	var helper_30 = helper.getResultStats;
-	var helper_31 = helper.extractFieldsFromSource;
-	var helper_32 = helper.normalizeDataField;
-	var helper_33 = helper.handleOnSuggestions;
-	var helper_34 = helper.isValidDateRangeQueryFormat;
+	var helper_23 = helper.compareQueries;
+	var helper_24 = helper.debounce;
+	var helper_25 = helper.getQueryOptions;
+	var helper_26 = helper.buildQuery;
+	var helper_27 = helper.pushToAndClause;
+	var helper_28 = helper.checkValueChange;
+	var helper_29 = helper.getAggsOrder;
+	var helper_30 = helper.formatDate;
+	var helper_31 = helper.getResultStats;
+	var helper_32 = helper.extractFieldsFromSource;
+	var helper_33 = helper.normalizeDataField;
+	var helper_34 = helper.handleOnSuggestions;
+	var helper_35 = helper.isValidDateRangeQueryFormat;
 
 	var value = createCommonjsModule(function (module, exports) {
 	  Object.defineProperty(exports, "__esModule", {
@@ -8873,10 +8883,8 @@
 	          }, options, queryOptions[component]);
 
 	          var oldQuery = queryLog[component];
-	          console.log('OLD QUERY', component, JSON.stringify(oldQuery));
-	          console.log('NEW QUERY', component, JSON.stringify(currentQuery));
 
-	          if (mustExecuteMapQuery || !(0, helper.isEqual)(currentQuery, oldQuery)) {
+	          if (mustExecuteMapQuery || !(0, helper.compareQueries)(currentQuery, oldQuery, false)) {
 	            orderOfQueries = [].concat(_toConsumableArray(orderOfQueries), [component]);
 	            dispatch((0, misc.logQuery)(component, queryToLog));
 	            var isMapComponent = Object.keys(mapData).includes(component);
@@ -8896,7 +8904,7 @@
 	              var _getState5 = getState(),
 	                  combinedLog = _getState5.combinedLog;
 
-	              if ((0, helper.isEqual)(combinedLog[component], currentQuery)) return;
+	              if ((0, helper.compareQueries)(combinedLog[component], currentQuery)) return;
 	              dispatch((0, misc.logCombinedQuery)(component, currentQuery));
 	            }
 
@@ -9113,7 +9121,7 @@
 	        query: _extends({}, queryObj)
 	      }, options);
 
-	      if ((0, helper.isEqual)(queryLog[component], currentQuery)) return;
+	      if ((0, helper.compareQueries)(queryLog[component], currentQuery)) return;
 	      dispatch((0, misc.logQuery)(component, currentQuery));
 
 	      if (store.config && store.config.enableAppbase) {
@@ -19756,7 +19764,7 @@
 	    // returns size and aggs property
 	    getBasicQueryOptions: function getBasicQueryOptions() {
 	      var aggregationField = this.$props.aggregationField;
-	      var queryOptions = helper_24(this.$props);
+	      var queryOptions = helper_25(this.$props);
 
 	      if (aggregationField) {
 	        queryOptions.aggs = getCompositeAggsQuery$1({
@@ -23546,33 +23554,25 @@
 	      var options = _ref.options,
 	          obj = _objectWithoutPropertiesLoose(_ref, _excluded);
 
-	      if (options) {
-	        _this.setQueryOptions(props.componentId, _extends({}, options, _this.getAggsQuery()), false);
-	      }
-
 	      var queryToBeSet = obj.query; // when enableAppbase is true, Backend throws error because of repeated query in request body
 
-	      if (obj && obj.query && obj.query.query) {
-	        queryToBeSet = obj.query.query;
+	      if (queryToBeSet && queryToBeSet.query) {
+	        queryToBeSet = queryToBeSet.query;
 	      }
 
-	      var customQueryCalc = _extends({}, options); // Update customQuery field for RS API
+	      var customQueryCalc = _extends({}, options, {
+	        query: extractQueryFromCustomQuery$6(queryToBeSet)
+	      }); // Update customQuery field for RS API
 
 
-	      if (queryToBeSet || options) {
-	        if (queryToBeSet.query) {
-	          if (queryToBeSet.id) {
-	            customQueryCalc = queryToBeSet;
-	          } else {
-	            customQueryCalc.query = queryToBeSet;
-	          }
-	        }
+	      _this.setCustomQuery(props.componentId, customQueryCalc);
 
-	        _this.setCustomQuery(props.componentId, customQueryCalc);
+	      if (options) {
+	        _this.setQueryOptions(props.componentId, _extends({}, _this.getAggsQuery(), options), false);
 	      }
 
 	      _this.updateQuery(_extends({}, obj, {
-	        query: customQueryCalc,
+	        query: customQueryCalc.query,
 	        componentId: props.componentId,
 	        label: props.filterLabel,
 	        showFilter: props.showFilter,
@@ -23583,12 +23583,13 @@
 	    if (props.defaultQuery) {
 	      this.internalComponent = props.componentId + "__internal";
 	    }
-	  },
-	  beforeMount: function beforeMount() {
+
 	    if (this.internalComponent && this.$props.defaultQuery) {
 	      updateDefaultQuery(this.componentId, this.setDefaultQuery, this.$props, this.selectedValue);
 	      this.$defaultQuery = this.$props.defaultQuery(this.selectedValue, this.$props);
-	      var query = extractQueryFromCustomQuery$6(this.$defaultQuery);
+
+	      var _query = extractQueryFromCustomQuery$6(this.$defaultQuery);
+
 	      var queryOptions = getOptionsForCustomQuery$6(this.$defaultQuery);
 
 	      if (queryOptions) {
@@ -23597,7 +23598,7 @@
 
 	      this.updateQuery({
 	        componentId: this.internalComponent,
-	        query: query
+	        query: _query
 	      });
 	    }
 	  },
@@ -32495,7 +32496,8 @@
 
 	var _excluded$5 = ["aggs", "size"],
 	    _excluded2 = ["query"],
-	    _excluded3 = ["aggs", "size"];
+	    _excluded3 = ["query"],
+	    _excluded4 = ["aggs", "size"];
 	var X_SEARCH_CLIENT$1 = 'ReactiveSearch Vue';
 	var componentsWithoutFilters = [constants_1$1.numberBox, constants_1$1.ratingsFilter];
 	var resultComponents = [constants_1$1.reactiveList, constants_1$1.reactiveMap];
@@ -32555,10 +32557,15 @@
 	  var currentValue = parseValue(value, component);
 
 	  if (component.customQuery) {
-	    return helper_11(component.customQuery(currentValue, component));
+	    var customQuery = component.customQuery(currentValue, component);
+	    return _extends({
+	      query: helper_11(customQuery)
+	    }, helper_12(customQuery));
 	  }
 
-	  return component.source.defaultQuery ? component.source.defaultQuery(currentValue, component) : null;
+	  return component.source.defaultQuery ? {
+	    query: component.source.defaultQuery(currentValue, component)
+	  } : null;
 	}
 
 	function initReactivesearch(componentCollection, searchState, settings) {
@@ -32657,7 +32664,6 @@
 	        componentQueryOptions = _extends({}, componentQueryOptions, component.source.generateQueryOptions(component));
 	      }
 
-	      console.log('QUERY LOG componentQueryOptions', component.componentId, componentQueryOptions);
 	      var highlightQuery = {};
 
 	      if (component.source.highlightQuery) {
@@ -32718,7 +32724,7 @@
 	        var react = component.react;
 
 	        if (isInternalComponentPresent || isResultComponent) {
-	          react = helper_26(react, internalComponent);
+	          react = helper_27(react, internalComponent);
 	        }
 
 	        dependencyTree = dependencyTreeReducer(dependencyTree, {
@@ -32747,7 +32753,11 @@
 	        });
 	      }
 
-	      var customQuery = getCustomQuery(component, value); // set custom query for main component
+	      var _ref3 = getCustomQuery(component, value) || {},
+	          query = _ref3.query,
+	          options = _objectWithoutPropertiesLoose(_ref3, _excluded3);
+
+	      var customQuery = query; // set custom query for main component
 
 	      queryList = queryReducer(queryList, {
 	        type: 'SET_QUERY',
@@ -32757,7 +32767,7 @@
 	      queryOptions = queryOptionsReducer(queryOptions, {
 	        type: 'SET_QUERY_OPTIONS',
 	        component: component.componentId,
-	        options: _extends({}, componentQueryOptions)
+	        options: _extends({}, componentQueryOptions, options)
 	      }); // Set component type in component props
 
 	      compProps.componentType = componentType;
@@ -32777,20 +32787,19 @@
 
 	    componentCollection.forEach(function (component) {
 	      // eslint-disable-next-line
-	      var _buildQuery = helper_25(component.componentId, dependencyTree, queryList, queryOptions),
+	      var _buildQuery = helper_26(component.componentId, dependencyTree, queryList, queryOptions),
 	          queryObj = _buildQuery.queryObj,
 	          options = _buildQuery.options;
 
 	      var componentQueryOptions = options;
 	      var componentType = component.source.componentType;
-	      console.log('COMPONENT TYPE', componentType);
 
 	      if (componentType !== constants_1$1.reactiveComponent) {
 	        // don't merge aggs, size
-	        var _ref3 = options || {},
-	            aggs = _ref3.aggs,
-	            size = _ref3.size,
-	            rest = _objectWithoutPropertiesLoose(_ref3, _excluded3);
+	        var _ref4 = options || {},
+	            aggs = _ref4.aggs,
+	            size = _ref4.size,
+	            rest = _objectWithoutPropertiesLoose(_ref4, _excluded4);
 
 	        componentQueryOptions = rest;
 	      }
@@ -32814,10 +32823,6 @@
 	          query: _extends({}, queryObj)
 	        }, componentQueryOptions, queryOptions[component.componentId]);
 
-	        console.log('QUERY LOG build QUERY', component.componentId, queryObj);
-	        console.log('QUERY LOG build OPTIONS', component.componentId, componentQueryOptions);
-	        console.log('QUERY LOG OPTIONS (component)', component.componentId, queryOptions[component.componentId]);
-	        console.log('QUERY LOG', component.componentId, currentQuery);
 	        queryLog = _extends({}, queryLog, (_extends2 = {}, _extends2[component.componentId] = currentQuery, _extends2));
 
 	        if (settings.enableAppbase) {
@@ -33004,7 +33009,7 @@
 	  });
 	}
 
-	var version = "1.16.0-alpha.40";
+	var version = "1.16.0-alpha.43";
 
 	var _templateObject$o, _templateObject2$b;