@appbaseio/reactivesearch-vue 1.16.0-alpha.21 → 1.16.0-alpha.25

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

@@ -5521,7 +5521,7 @@
 	    }, size > 0 ? {
 	      numberOfPages: Math.ceil(total / size)
 	    } : null, {
-	      time: time,
+	      time: time || 0,
 	      hidden: hidden,
 	      promoted: promotedResults && promotedResults.length
 	    });
@@ -8640,7 +8640,7 @@
 	      componentList.forEach(function (component) {
 	        var componentProps = props[component];
 
-	        if (selectedValues[componentId] && selectedValues[componentId].reference !== 'URL' && [constants$1.componentTypes.reactiveList, constants$1.componentTypes.reactiveMap].includes(componentProps.componentType)) {
+	        if (selectedValues[componentId] && selectedValues[componentId].reference !== 'URL' && componentProps && [constants$1.componentTypes.reactiveList, constants$1.componentTypes.reactiveMap].includes(componentProps.componentType)) {
 	          dispatch((0, value.setValue)(component, null));
 	        }
 
@@ -8702,9 +8702,9 @@
 	                value$1 = internalValues[componentId] && internalValues[componentId].value;
 	              }
 
-	              var query = (0, transform.getRSQuery)(component, (0, transform.extractPropsFromState)(getState(), component, _extends({
+	              var query = (0, transform.getRSQuery)(component, (0, transform.extractPropsFromState)(getState(), component, _extends({}, value$1 ? {
 	                value: value$1
-	              }, metaOptions ? {
+	              } : null, metaOptions ? {
 	                from: metaOptions.from
 	              } : null)));
 
@@ -8725,8 +8725,9 @@
 	                }
 	              }
 	            } else {
+	              var preference = config && config.analyticsConfig && config.analyticsConfig.userId ? config.analyticsConfig.userId + '_' + component : component;
 	              finalQuery = [].concat(_toConsumableArray(finalQuery), [{
-	                preference: component
+	                preference: preference
 	              }, currentQuery]);
 	            }
 	          }
@@ -8931,8 +8932,9 @@
 	          appendToAggs: appendToAggs
 	        }));
 	      } else {
+	        var preference = store.config && store.config.analyticsConfig && store.config.analyticsConfig.userId ? store.config.analyticsConfig.userId + '_' + component : component;
 	        var _finalQuery = [{
-	          preference: component
+	          preference: preference
 	        }, currentQuery];
 	        dispatch(msearch(_finalQuery, [component], appendToHits, false, appendToAggs));
 	      }
@@ -12807,8 +12809,9 @@
 	    emptyQuery: VueTypes.bool,
 	    suggestionAnalytics: VueTypes.bool,
 	    userId: VueTypes.string,
-	    customEvents: VueTypes.object
-	  })
+	    customEvents: VueTypes.object,
+	    enableTelemetry: VueTypes.bool.def(true)
+	  }).def({})
 	};
 
 	var getClassName = lib_8.getClassName,
@@ -13123,6 +13126,7 @@
 	//   storeKey,
 	// });
 
+	var X_SEARCH_CLIENT = 'ReactiveSearch Vue';
 	var composeThemeObject = function composeThemeObject(ownTheme, userTheme) {
 	  if (ownTheme === void 0) {
 	    ownTheme = {};
@@ -13911,18 +13915,17 @@
 	    ResultCardsWrapper: ResultCardsWrapper
 	  },
 	  data: function data() {
-	    var props = this.$props;
 	    var currentPageState = 0;
+	    var defaultPage = this.defaultPage || -1;
 
-	    if (props.defaultPage >= 0) {
-	      currentPageState = props.defaultPage;
-	    } else if (props.currentPage) {
-	      currentPageState = Math.max(props.currentPage - 1, 0);
+	    if (defaultPage >= 0) {
+	      currentPageState = defaultPage;
+	    } else if (this.currentPage) {
+	      currentPageState = Math.max(this.currentPage - 1, 0);
 	    }
 
 	    this.__state = {
-	      from: currentPageState * props.size,
-	      isLoading: true,
+	      from: currentPageState * this.size,
 	      currentPageState: currentPageState
 	    };
 	    return this.__state;
@@ -13951,8 +13954,10 @@
 	      console.warn('Warning(ReactiveSearch): In order to use the `index` prop, the `enableAppbase` prop must be set to true in `ReactiveBase`.');
 	    }
 
-	    if (this.defaultPage >= 0) {
-	      this.currentPageState = this.defaultPage;
+	    var defaultPage = this.defaultPage || -1;
+
+	    if (defaultPage >= 0) {
+	      this.currentPageState = defaultPage;
 	      this.from = this.currentPageState * this.$props.size;
 	    }
 
@@ -14019,12 +14024,9 @@
 	      return this.$listeners && this.$listeners.resultStats;
 	    },
 	    stats: function stats() {
-	      var _this$getAllData = this.getAllData(),
-	          filteredResults = _this$getAllData.filteredResults;
-
 	      return _extends({}, getResultStats(this), {
 	        currentPage: this.currentPageState,
-	        displayedResults: filteredResults.length
+	        displayedResults: this.data.length
 	      });
 	    },
 	    hasCustomRender: function hasCustomRender() {
@@ -14033,6 +14035,27 @@
 	    showInfiniteScroll: function showInfiniteScroll() {
 	      // Pagination has higher priority then infinite scroll
 	      return this.infiniteScroll && !this.shouldRenderPagination;
+	    },
+	    data: function data() {
+	      var results = parseHits(this.hits) || [];
+	      var parsedPromotedResults = parseHits(this.promotedResults) || [];
+	      var filteredResults = results;
+
+	      if (parsedPromotedResults.length) {
+	        var ids = parsedPromotedResults.map(function (item) {
+	          return item._id;
+	        }).filter(Boolean);
+
+	        if (ids) {
+	          filteredResults = filteredResults.filter(function (item) {
+	            return !ids.includes(item._id);
+	          });
+	        }
+
+	        filteredResults = [].concat(parsedPromotedResults, filteredResults);
+	      }
+
+	      return helper_2(filteredResults);
 	    }
 	  },
 	  watch: {
@@ -14114,7 +14137,7 @@
 	      }
 	    },
 	    hits: function hits(newVal, oldVal) {
-	      this.$emit('data', this.getAllData());
+	      this.$emit('data', this.getData());
 
 	      if (this.shouldRenderPagination) {
 	        // called when page is changed
@@ -14299,13 +14322,10 @@
 
 	      var h = this.$createElement;
 	      var size = this.$props.size;
-	      var hits = this.$data.hits;
-	      var results = parseHits(hits) || [];
-	      var filteredResults = results;
 	      var renderItem = this.$scopedSlots.renderItem || this.$props.renderItem;
 	      var element = this.hasCustomRender ? this.getComponent() : h("div", {
 	        "class": this.$props.listClass + " " + getClassName$1(this.$props.innerClass, 'list')
-	      }, [[].concat(filteredResults).map(function (item, index) {
+	      }, [this.data.map(function (item, index) {
 	        return renderItem({
 	          item: item,
 	          triggerClickAnalytics: function triggerClickAnalytics() {
@@ -14316,7 +14336,7 @@
 
 	      return this.analytics ? h(ImpressionTracker$1, {
 	        "attrs": {
-	          "hits": filteredResults
+	          "hits": this.data
 	        }
 	      }, [element]) : element;
 	    },
@@ -14420,7 +14440,7 @@
 	      if (this.stats.numberOfResults) {
 	        return h("p", {
 	          "class": resultStats + " " + getClassName$1(this.$props.innerClass, 'resultStats')
-	        }, [this.stats.numberOfResults, " results found in ", this.stats.time, "ms"]);
+	        }, [this.stats.numberOfResults, " results found in ", this.stats.time || 0, "ms"]);
 	      }
 
 	      return null;
@@ -14496,8 +14516,8 @@
 	      })]);
 	    },
 	    withClickIds: function withClickIds(results) {
-	      var _this$getAllData2 = this.getAllData(),
-	          base = _this$getAllData2.base;
+	      var _this$getAllData = this.getAllData(),
+	          base = _this$getAllData.base;
 
 	      return results.map(function (result, index) {
 	        return _extends({}, result, {
@@ -14515,26 +14535,9 @@
 	          hits = this.hits;
 	      var results = parseHits(hits) || [];
 	      var parsedPromotedResults = parseHits(promotedResults) || [];
-	      var filteredResults = results;
 	      var base = currentPage * size;
-
-	      if (parsedPromotedResults.length) {
-	        var ids = parsedPromotedResults.map(function (item) {
-	          return item._id;
-	        }).filter(Boolean);
-
-	        if (ids) {
-	          filteredResults = filteredResults.filter(function (item) {
-	            return !ids.includes(item._id);
-	          });
-	        }
-
-	        filteredResults = [].concat(parsedPromotedResults, filteredResults);
-	      }
-
 	      return {
 	        results: results,
-	        filteredResults: filteredResults,
 	        customData: customData || {},
 	        promotedResults: parsedPromotedResults,
 	        aggregationData: aggregationData,
@@ -14544,16 +14547,15 @@
 	      };
 	    },
 	    getData: function getData() {
-	      var _this$getAllData3 = this.getAllData(),
-	          filteredResults = _this$getAllData3.filteredResults,
-	          promotedResults = _this$getAllData3.promotedResults,
-	          aggregationData = _this$getAllData3.aggregationData,
-	          customData = _this$getAllData3.customData;
+	      var _this$getAllData2 = this.getAllData(),
+	          promotedResults = _this$getAllData2.promotedResults,
+	          aggregationData = _this$getAllData2.aggregationData,
+	          customData = _this$getAllData2.customData;
 
 	      return {
-	        data: this.withClickIds(filteredResults),
+	        data: this.data,
 	        aggregationData: this.withClickIds(aggregationData || []),
-	        promotedData: this.withClickIds(promotedResults),
+	        promotedData: this.withClickIds(promotedResults || []),
 	        rawData: this.rawData,
 	        resultStats: this.stats,
 	        customData: customData
@@ -14565,7 +14567,7 @@
 
 	      var data = _extends({
 	        error: error,
-	        loading: isLoading,
+	        loading: isLoading || false,
 	        loadMore: this.loadMore,
 	        // TODO: Remove in v2
 	        triggerAnalytics: this.triggerClickAnalytics,
@@ -14580,13 +14582,13 @@
 
 	var mapStateToProps$1 = function mapStateToProps(state, props) {
 	  return {
-	    defaultPage: state.selectedValues[props.componentId] && state.selectedValues[props.componentId].value - 1 || -1,
+	    defaultPage: state.selectedValues[props.componentId] && state.selectedValues[props.componentId].value - 1,
 	    hits: state.hits[props.componentId] && state.hits[props.componentId].hits,
 	    rawData: state.rawData[props.componentId],
-	    aggregationData: state.compositeAggregations[props.componentId] || [],
-	    promotedResults: state.promotedResults[props.componentId] || [],
+	    aggregationData: state.compositeAggregations[props.componentId],
+	    promotedResults: state.promotedResults[props.componentId],
 	    customData: state.customData[props.componentId],
-	    time: state.hits[props.componentId] && state.hits[props.componentId].time || 0,
+	    time: state.hits[props.componentId] && state.hits[props.componentId].time,
 	    total: state.hits[props.componentId] && state.hits[props.componentId].total,
 	    hidden: state.hits[props.componentId] && state.hits[props.componentId].hidden,
 	    analytics: state.config && state.config.analytics,
@@ -14595,7 +14597,7 @@
 	    error: state.error[props.componentId],
 	    afterKey: state.aggregations[props.componentId] && state.aggregations[props.componentId][props.aggregationField] && state.aggregations[props.componentId][props.aggregationField].after_key,
 	    componentProps: state.props[props.componentId],
-	    isLoading: state.isLoading[props.componentId] || false
+	    isLoading: state.isLoading[props.componentId]
 	  };
 	};
 
@@ -15319,562 +15321,6 @@
 	  }
 	});
 
-	var at,
-	    // The index of the current character
-	ch,
-	    // The current character
-	escapee = {
-	  '"': '"',
-	  '\\': '\\',
-	  '/': '/',
-	  b: '\b',
-	  f: '\f',
-	  n: '\n',
-	  r: '\r',
-	  t: '\t'
-	},
-	    text,
-	    error = function error(m) {
-	  // Call error when something is wrong.
-	  throw {
-	    name: 'SyntaxError',
-	    message: m,
-	    at: at,
-	    text: text
-	  };
-	},
-	    next = function next(c) {
-	  // If a c parameter is provided, verify that it matches the current character.
-	  if (c && c !== ch) {
-	    error("Expected '" + c + "' instead of '" + ch + "'");
-	  } // Get the next character. When there are no more characters,
-	  // return the empty string.
-
-
-	  ch = text.charAt(at);
-	  at += 1;
-	  return ch;
-	},
-	    number = function number() {
-	  // Parse a number value.
-	  var number,
-	      string = '';
-
-	  if (ch === '-') {
-	    string = '-';
-	    next('-');
-	  }
-
-	  while (ch >= '0' && ch <= '9') {
-	    string += ch;
-	    next();
-	  }
-
-	  if (ch === '.') {
-	    string += '.';
-
-	    while (next() && ch >= '0' && ch <= '9') {
-	      string += ch;
-	    }
-	  }
-
-	  if (ch === 'e' || ch === 'E') {
-	    string += ch;
-	    next();
-
-	    if (ch === '-' || ch === '+') {
-	      string += ch;
-	      next();
-	    }
-
-	    while (ch >= '0' && ch <= '9') {
-	      string += ch;
-	      next();
-	    }
-	  }
-
-	  number = +string;
-
-	  if (!isFinite(number)) {
-	    error("Bad number");
-	  } else {
-	    return number;
-	  }
-	},
-	    string = function string() {
-	  // Parse a string value.
-	  var hex,
-	      i,
-	      string = '',
-	      uffff; // When parsing for string values, we must look for " and \ characters.
-
-	  if (ch === '"') {
-	    while (next()) {
-	      if (ch === '"') {
-	        next();
-	        return string;
-	      } else if (ch === '\\') {
-	        next();
-
-	        if (ch === 'u') {
-	          uffff = 0;
-
-	          for (i = 0; i < 4; i += 1) {
-	            hex = parseInt(next(), 16);
-
-	            if (!isFinite(hex)) {
-	              break;
-	            }
-
-	            uffff = uffff * 16 + hex;
-	          }
-
-	          string += String.fromCharCode(uffff);
-	        } else if (typeof escapee[ch] === 'string') {
-	          string += escapee[ch];
-	        } else {
-	          break;
-	        }
-	      } else {
-	        string += ch;
-	      }
-	    }
-	  }
-
-	  error("Bad string");
-	},
-	    white = function white() {
-	  // Skip whitespace.
-	  while (ch && ch <= ' ') {
-	    next();
-	  }
-	},
-	    word = function word() {
-	  // true, false, or null.
-	  switch (ch) {
-	    case 't':
-	      next('t');
-	      next('r');
-	      next('u');
-	      next('e');
-	      return true;
-
-	    case 'f':
-	      next('f');
-	      next('a');
-	      next('l');
-	      next('s');
-	      next('e');
-	      return false;
-
-	    case 'n':
-	      next('n');
-	      next('u');
-	      next('l');
-	      next('l');
-	      return null;
-	  }
-
-	  error("Unexpected '" + ch + "'");
-	},
-	    value$1,
-	    // Place holder for the value function.
-	array = function array() {
-	  // Parse an array value.
-	  var array = [];
-
-	  if (ch === '[') {
-	    next('[');
-	    white();
-
-	    if (ch === ']') {
-	      next(']');
-	      return array; // empty array
-	    }
-
-	    while (ch) {
-	      array.push(value$1());
-	      white();
-
-	      if (ch === ']') {
-	        next(']');
-	        return array;
-	      }
-
-	      next(',');
-	      white();
-	    }
-	  }
-
-	  error("Bad array");
-	},
-	    object = function object() {
-	  // Parse an object value.
-	  var key,
-	      object = {};
-
-	  if (ch === '{') {
-	    next('{');
-	    white();
-
-	    if (ch === '}') {
-	      next('}');
-	      return object; // empty object
-	    }
-
-	    while (ch) {
-	      key = string();
-	      white();
-	      next(':');
-
-	      if (Object.hasOwnProperty.call(object, key)) {
-	        error('Duplicate key "' + key + '"');
-	      }
-
-	      object[key] = value$1();
-	      white();
-
-	      if (ch === '}') {
-	        next('}');
-	        return object;
-	      }
-
-	      next(',');
-	      white();
-	    }
-	  }
-
-	  error("Bad object");
-	};
-
-	value$1 = function value() {
-	  // Parse a JSON value. It could be an object, an array, a string, a number,
-	  // or a word.
-	  white();
-
-	  switch (ch) {
-	    case '{':
-	      return object();
-
-	    case '[':
-	      return array();
-
-	    case '"':
-	      return string();
-
-	    case '-':
-	      return number();
-
-	    default:
-	      return ch >= '0' && ch <= '9' ? number() : word();
-	  }
-	}; // Return the json_parse function. It will have access to all of the above
-	// functions and variables.
-
-
-	var parse = function parse(source, reviver) {
-	  var result;
-	  text = source;
-	  at = 0;
-	  ch = ' ';
-	  result = value$1();
-	  white();
-
-	  if (ch) {
-	    error("Syntax error");
-	  } // If there is a reviver function, we recursively walk the new structure,
-	  // passing each name/value pair to the reviver function for possible
-	  // transformation, starting with a temporary root object that holds the result
-	  // in an empty key. If there is not a reviver function, we simply return the
-	  // result.
-
-
-	  return typeof reviver === 'function' ? function walk(holder, key) {
-	    var k,
-	        v,
-	        value = holder[key];
-
-	    if (value && typeof value === 'object') {
-	      for (k in value) {
-	        if (Object.prototype.hasOwnProperty.call(value, k)) {
-	          v = walk(value, k);
-
-	          if (v !== undefined) {
-	            value[k] = v;
-	          } else {
-	            delete value[k];
-	          }
-	        }
-	      }
-	    }
-
-	    return reviver.call(holder, key, value);
-	  }({
-	    '': result
-	  }, '') : result;
-	};
-
-	var escapable = /[\\\"\x00-\x1f\x7f-\x9f\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g,
-	    gap,
-	    indent,
-	    meta = {
-	  // table of character substitutions
-	  '\b': '\\b',
-	  '\t': '\\t',
-	  '\n': '\\n',
-	  '\f': '\\f',
-	  '\r': '\\r',
-	  '"': '\\"',
-	  '\\': '\\\\'
-	},
-	    rep;
-
-	function quote(string) {
-	  // If the string contains no control characters, no quote characters, and no
-	  // backslash characters, then we can safely slap some quotes around it.
-	  // Otherwise we must also replace the offending characters with safe escape
-	  // sequences.
-	  escapable.lastIndex = 0;
-	  return escapable.test(string) ? '"' + string.replace(escapable, function (a) {
-	    var c = meta[a];
-	    return typeof c === 'string' ? c : "\\u" + ('0000' + a.charCodeAt(0).toString(16)).slice(-4);
-	  }) + '"' : '"' + string + '"';
-	}
-
-	function str(key, holder) {
-	  // Produce a string from holder[key].
-	  var i,
-	      // The loop counter.
-	  k,
-	      // The member key.
-	  v,
-	      // The member value.
-	  length,
-	      mind = gap,
-	      partial,
-	      value = holder[key]; // If the value has a toJSON method, call it to obtain a replacement value.
-
-	  if (value && typeof value === 'object' && typeof value.toJSON === 'function') {
-	    value = value.toJSON(key);
-	  } // If we were called with a replacer function, then call the replacer to
-	  // obtain a replacement value.
-
-
-	  if (typeof rep === 'function') {
-	    value = rep.call(holder, key, value);
-	  } // What happens next depends on the value's type.
-
-
-	  switch (typeof value) {
-	    case 'string':
-	      return quote(value);
-
-	    case 'number':
-	      // JSON numbers must be finite. Encode non-finite numbers as null.
-	      return isFinite(value) ? String(value) : 'null';
-
-	    case 'boolean':
-	    case 'null':
-	      // If the value is a boolean or null, convert it to a string. Note:
-	      // typeof null does not produce 'null'. The case is included here in
-	      // the remote chance that this gets fixed someday.
-	      return String(value);
-
-	    case 'object':
-	      if (!value) return 'null';
-	      gap += indent;
-	      partial = []; // Array.isArray
-
-	      if (Object.prototype.toString.apply(value) === '[object Array]') {
-	        length = value.length;
-
-	        for (i = 0; i < length; i += 1) {
-	          partial[i] = str(i, value) || 'null';
-	        } // Join all of the elements together, separated with commas, and
-	        // wrap them in brackets.
-
-
-	        v = partial.length === 0 ? '[]' : gap ? '[\n' + gap + partial.join(',\n' + gap) + '\n' + mind + ']' : '[' + partial.join(',') + ']';
-	        gap = mind;
-	        return v;
-	      } // If the replacer is an array, use it to select the members to be
-	      // stringified.
-
-
-	      if (rep && typeof rep === 'object') {
-	        length = rep.length;
-
-	        for (i = 0; i < length; i += 1) {
-	          k = rep[i];
-
-	          if (typeof k === 'string') {
-	            v = str(k, value);
-
-	            if (v) {
-	              partial.push(quote(k) + (gap ? ': ' : ':') + v);
-	            }
-	          }
-	        }
-	      } else {
-	        // Otherwise, iterate through all of the keys in the object.
-	        for (k in value) {
-	          if (Object.prototype.hasOwnProperty.call(value, k)) {
-	            v = str(k, value);
-
-	            if (v) {
-	              partial.push(quote(k) + (gap ? ': ' : ':') + v);
-	            }
-	          }
-	        }
-	      } // Join all of the member texts together, separated with commas,
-	      // and wrap them in braces.
-
-
-	      v = partial.length === 0 ? '{}' : gap ? '{\n' + gap + partial.join(',\n' + gap) + '\n' + mind + '}' : '{' + partial.join(',') + '}';
-	      gap = mind;
-	      return v;
-	  }
-	}
-
-	var stringify = function stringify(value, replacer, space) {
-	  var i;
-	  gap = '';
-	  indent = ''; // If the space parameter is a number, make an indent string containing that
-	  // many spaces.
-
-	  if (typeof space === 'number') {
-	    for (i = 0; i < space; i += 1) {
-	      indent += ' ';
-	    }
-	  } // If the space parameter is a string, it will be used as the indent string.
-	  else if (typeof space === 'string') {
-	    indent = space;
-	  } // If there is a replacer, it must be a function or an array.
-	  // Otherwise, throw an error.
-
-
-	  rep = replacer;
-
-	  if (replacer && typeof replacer !== 'function' && (typeof replacer !== 'object' || typeof replacer.length !== 'number')) {
-	    throw new Error('JSON.stringify');
-	  } // Make a fake root object containing our value under the key of ''.
-	  // Return the result of stringifying the value.
-
-
-	  return str('', {
-	    '': value
-	  });
-	};
-
-	var parse$1 = parse;
-	var stringify$1 = stringify;
-	var jsonify = {
-	  parse: parse$1,
-	  stringify: stringify$1
-	};
-
-	var json = typeof JSON !== 'undefined' ? JSON : jsonify;
-
-	var jsonStableStringify = function jsonStableStringify(obj, opts) {
-	  if (!opts) opts = {};
-	  if (typeof opts === 'function') opts = {
-	    cmp: opts
-	  };
-	  var space = opts.space || '';
-	  if (typeof space === 'number') space = Array(space + 1).join(' ');
-	  var cycles = typeof opts.cycles === 'boolean' ? opts.cycles : false;
-
-	  var replacer = opts.replacer || function (key, value) {
-	    return value;
-	  };
-
-	  var cmp = opts.cmp && function (f) {
-	    return function (node) {
-	      return function (a, b) {
-	        var aobj = {
-	          key: a,
-	          value: node[a]
-	        };
-	        var bobj = {
-	          key: b,
-	          value: node[b]
-	        };
-	        return f(aobj, bobj);
-	      };
-	    };
-	  }(opts.cmp);
-
-	  var seen = [];
-	  return function stringify(parent, key, node, level) {
-	    var indent = space ? '\n' + new Array(level + 1).join(space) : '';
-	    var colonSeparator = space ? ': ' : ':';
-
-	    if (node && node.toJSON && typeof node.toJSON === 'function') {
-	      node = node.toJSON();
-	    }
-
-	    node = replacer.call(parent, key, node);
-
-	    if (node === undefined) {
-	      return;
-	    }
-
-	    if (typeof node !== 'object' || node === null) {
-	      return json.stringify(node);
-	    }
-
-	    if (isArray$1(node)) {
-	      var out = [];
-
-	      for (var i = 0; i < node.length; i++) {
-	        var item = stringify(node, i, node[i], level + 1) || json.stringify(null);
-	        out.push(indent + space + item);
-	      }
-
-	      return '[' + out.join(',') + indent + ']';
-	    } else {
-	      if (seen.indexOf(node) !== -1) {
-	        if (cycles) return json.stringify('__cycle__');
-	        throw new TypeError('Converting circular structure to JSON');
-	      } else seen.push(node);
-
-	      var keys = objectKeys(node).sort(cmp && cmp(node));
-	      var out = [];
-
-	      for (var i = 0; i < keys.length; i++) {
-	        var key = keys[i];
-	        var value = stringify(node, key, node[key], level + 1);
-	        if (!value) continue;
-	        var keyValue = json.stringify(key) + colonSeparator + value;
-	        out.push(indent + space + keyValue);
-	      }
-
-	      seen.splice(seen.indexOf(node), 1);
-	      return '{' + out.join(',') + indent + '}';
-	    }
-	  }({
-	    '': obj
-	  }, '', obj, 0);
-	};
-
-	var isArray$1 = Array.isArray || function (x) {
-	  return {}.toString.call(x) === '[object Array]';
-	};
-
-	var objectKeys = Object.keys || function (obj) {
-	  var has = Object.prototype.hasOwnProperty || function () {
-	    return true;
-	  };
-
-	  var keys = [];
-
-	  for (var key in obj) {
-	    if (has.call(obj, key)) keys.push(key);
-	  }
-
-	  return keys;
-	};
-
 	var _typeof$1 = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) {
 	  return typeof obj;
 	} : function (obj) {
@@ -15910,16 +15356,6 @@
 	  return output;
 	}
 
-	function uuidv4() {
-	  return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
-	    var r = Math.random() * 16 | 0; // eslint-disable-line no-bitwise
-
-	    var v = c === 'x' ? r : r & 0x3 | 0x8; // eslint-disable-line no-bitwise
-
-	    return v.toString(16);
-	  });
-	}
-
 	function validateRSQuery(query) {
 	  if (query && Object.prototype.toString.call(query) === '[object Array]') {
 	    for (var i = 0; i < query.length; i += 1) {
@@ -15982,24 +15418,6 @@
 
 	  return null;
 	}
-	/**
-	 * Send only when a connection is opened
-	 * @param {Object} socket
-	 * @param {Function} callback
-	 */
-
-
-	function waitForSocketConnection(socket, callback) {
-	  setTimeout(function () {
-	    if (socket.readyState === 1) {
-	      if (callback != null) {
-	        callback();
-	      }
-	    } else {
-	      waitForSocketConnection(socket, callback);
-	    }
-	  }, 5); // wait 5 ms for the connection...
-	}
 
 	function encodeHeaders() {
 	  var headers = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
@@ -16017,6 +15435,21 @@
 
 	  return encodedHeaders;
 	}
+
+	function getTelemetryHeaders(enableTelemetry) {
+	  var headers = {};
+	  Object.assign(headers, {
+	    'X-Search-Client': 'Appbase JS'
+	  });
+
+	  if (enableTelemetry === false) {
+	    Object.assign(headers, {
+	      'X-Enable-Telemetry': enableTelemetry
+	    });
+	  }
+
+	  return headers;
+	}
 	/**
 	 * Returns an instance of Appbase client
 	 * @param {Object} config To configure properties
@@ -16025,6 +15458,7 @@
 	 * @param {String} config.credentials
 	 * @param {String} config.username
 	 * @param {String} config.password
+	 * @param {Boolean} config.enableTelemetry
 	 * A callback function which will be invoked before a fetch request made
 	 */
 
@@ -16051,7 +15485,7 @@
 	  }
 
 	  if (typeof protocol !== 'string' || protocol === '') {
-	    throw new Error('Protocol is not present in url. URL should be of the form https://scalr.api.appbase.io');
+	    throw new Error('Protocol is not present in url. URL should be of the form https://appbase-demo-ansible-abxiydt-arc.searchbase.io');
 	  } // Parse url
 
 
@@ -16079,7 +15513,10 @@
 	  this.protocol = protocol;
 	  this.app = config.app;
 	  this.credentials = credentials;
-	  this.headers = {};
+
+	  if (typeof config.enableTelemetry === 'boolean') {
+	    this.enableTelemetry = config.enableTelemetry;
+	  }
 	}
 	/**
 	 * To perform fetch request
@@ -16088,6 +15525,7 @@
 	 * @param {String} args.path
 	 * @param {Object} args.params
 	 * @param {Object} args.body
+	 * @param {Object} args.headers
 	 * @param {boolean} args.isSuggestionsAPI
 	 */
 
@@ -16111,7 +15549,7 @@
 	      var headers = Object.assign({}, {
 	        Accept: 'application/json',
 	        'Content-Type': contentType
-	      }, _this.headers);
+	      }, args.headers, _this.headers);
 	      var timestamp = Date.now();
 
 	      if (_this.credentials) {
@@ -16151,259 +15589,90 @@
 	      var responseHeaders = {};
 	      var paramsString = '';
 
-	      if (params) {
-	        paramsString = '?' + querystring.stringify(params);
-	      }
-
-	      var finalURL = _this.protocol + '://' + _this.url + '/' + app + '/' + path + paramsString;
-	      return handleTransformRequest(Object.assign({}, {
-	        url: finalURL
-	      }, requestOptions)).then(function (ts) {
-	        var transformedRequest = Object.assign({}, ts);
-	        var url = transformedRequest.url;
-	        delete transformedRequest.url;
-	        return browserPonyfill$1(url || finalURL, transformedRequest).then(function (res) {
-	          if (res.status >= 500) {
-	            return reject(res);
-	          }
-
-	          responseHeaders = res.headers;
-	          return res.json().then(function (data) {
-	            if (res.status >= 400) {
-	              return reject(res);
-	            }
-
-	            if (data && data.error) {
-	              return reject(data);
-	            } // Handle error from RS API RESPONSE
-
-
-	            if (isRSAPI && data && Object.prototype.toString.call(data) === '[object Object]') {
-	              if (body && body.query && body.query instanceof Array) {
-	                var errorResponses = 0;
-	                var allResponses = body.query.filter(function (q) {
-	                  return q.execute || q.execute === undefined;
-	                }).length;
-
-	                if (data) {
-	                  Object.keys(data).forEach(function (key) {
-	                    if (data[key] && Object.prototype.hasOwnProperty.call(data[key], 'error')) {
-	                      errorResponses += 1;
-	                    }
-	                  });
-	                } // reject only when all responses has error
-
-
-	                if (errorResponses > 0 && allResponses === errorResponses) {
-	                  return reject(data);
-	                }
-	              }
-	            } // Handle error from _msearch response
-
-
-	            if (data && data.responses instanceof Array) {
-	              var _allResponses = data.responses.length;
-	              var _errorResponses = data.responses.filter(function (entry) {
-	                return Object.prototype.hasOwnProperty.call(entry, 'error');
-	              }).length; // reject only when all responses has error
-
-	              if (_allResponses === _errorResponses) {
-	                return reject(data);
-	              }
-	            }
-
-	            var response = Object.assign({}, data, {
-	              _timestamp: timestamp,
-	              _headers: responseHeaders
-	            });
-	            return resolve(response);
-	          })["catch"](function (e) {
-	            return reject(e);
-	          });
-	        })["catch"](function (e) {
-	          return reject(e);
-	        });
-	      })["catch"](function (err) {
-	        return reject(err);
-	      });
-	    } catch (e) {
-	      return reject(e);
-	    }
-	  });
-	}
-
-	var WebSocket = typeof window !== 'undefined' ? window.WebSocket : require('ws');
-	/**
-	 * To connect a web socket
-	 * @param {Object} args
-	 * @param {String} args.method
-	 * @param {String} args.path
-	 * @param {Object} args.params
-	 * @param {Object} args.body
-	 */
-
-	function wsRequest(args, onData, onError, onClose) {
-	  var _this = this;
-
-	  try {
-	    var parsedArgs = removeUndefined(args);
-	    var method = parsedArgs.method,
-	        path = parsedArgs.path,
-	        params = parsedArgs.params;
-	    var bodyCopy = args.body;
-
-	    if (!bodyCopy || (typeof bodyCopy === 'undefined' ? 'undefined' : _typeof$1(bodyCopy)) !== 'object') {
-	      bodyCopy = {};
-	    }
-
-	    var init = function init() {
-	      _this.ws = new WebSocket('wss://' + _this.url + '/' + _this.app);
-	      _this.id = uuidv4();
-	      _this.request = {
-	        id: _this.id,
-	        path: _this.app + '/' + path + '?' + querystring.stringify(params),
-	        method: method,
-	        body: bodyCopy
-	      };
-
-	      if (_this.credentials) {
-	        _this.request.authorization = 'Basic ' + btoa$1(_this.credentials);
-	      }
-
-	      _this.result = {};
-
-	      _this.closeHandler = function () {
-	        _this.wsClosed();
-	      };
-
-	      _this.errorHandler = function (err) {
-	        _this.processError.apply(_this, [err]);
-	      };
-
-	      _this.messageHandler = function (message) {
-	        var dataObj = JSON.parse(message.data);
-
-	        if (dataObj.body && dataObj.body.status >= 400) {
-	          _this.processError.apply(_this, [dataObj]);
-	        } else {
-	          _this.processMessage.apply(_this, [dataObj]);
-	        }
-	      };
-
-	      _this.send = function (request) {
-	        waitForSocketConnection(_this.ws, function () {
-	          try {
-	            _this.ws.send(JSON.stringify(request));
-	          } catch (e) {
-	            console.warn(e);
-	          }
-	        });
-	      };
-
-	      _this.ws.onmessage = _this.messageHandler;
-	      _this.ws.onerror = _this.errorHandler;
-	      _this.ws.onclose = _this.closeHandler;
-
-	      _this.send(_this.request);
-
-	      _this.result.stop = _this.stop;
-	      _this.result.reconnect = _this.reconnect;
-	      return _this.result;
-	    };
-
-	    this.wsClosed = function () {
-	      if (onClose) {
-	        onClose();
-	      }
-	    };
-
-	    this.stop = function () {
-	      _this.ws.onmessage = undefined;
-	      _this.ws.onclose = undefined;
-	      _this.ws.onerror = undefined;
-
-	      _this.wsClosed();
-
-	      var unsubRequest = JSON.parse(JSON.stringify(_this.request));
-	      unsubRequest.unsubscribe = true;
-
-	      if (_this.unsubscribed !== true) {
-	        _this.send(unsubRequest);
-	      }
-
-	      _this.unsubscribed = true;
-	    };
-
-	    this.reconnect = function () {
-	      _this.stop();
-
-	      return wsRequest(args, onData, onError, onClose);
-	    };
-
-	    this.processError = function (err) {
-	      if (onError) {
-	        onError(err);
-	      } else {
-	        console.warn(err);
+	      if (params) {
+	        paramsString = '?' + querystring.stringify(params);
 	      }
-	    };
 
-	    this.processMessage = function (origDataObj) {
-	      var dataObj = JSON.parse(JSON.stringify(origDataObj));
+	      var finalURL = _this.protocol + '://' + _this.url + '/' + app + '/' + path + paramsString;
+	      return handleTransformRequest(Object.assign({}, {
+	        url: finalURL
+	      }, requestOptions)).then(function (ts) {
+	        var transformedRequest = Object.assign({}, ts);
+	        var url = transformedRequest.url;
+	        delete transformedRequest.url;
+	        return browserPonyfill$1(url || finalURL, Object.assign({}, transformedRequest, {
+	          // apply timestamp header for RS API
+	          headers: isRSAPI ? Object.assign({}, transformedRequest.headers, {
+	            'x-timestamp': new Date().getTime()
+	          }) : transformedRequest.headers
+	        })).then(function (res) {
+	          if (res.status >= 500) {
+	            return reject(res);
+	          }
 
-	      if (!dataObj.id && dataObj.message) {
-	        if (onError) {
-	          onError(dataObj);
-	        }
+	          responseHeaders = res.headers;
+	          return res.json().then(function (data) {
+	            if (res.status >= 400) {
+	              return reject(res);
+	            }
 
-	        return;
-	      }
+	            if (data && data.error) {
+	              return reject(data);
+	            } // Handle error from RS API RESPONSE
 
-	      if (dataObj.id === _this.id) {
-	        if (dataObj.message) {
-	          delete dataObj.id;
 
-	          if (onError) {
-	            onError(dataObj);
-	          }
+	            if (isRSAPI && data && Object.prototype.toString.call(data) === '[object Object]') {
+	              if (body && body.query && body.query instanceof Array) {
+	                var errorResponses = 0;
+	                var allResponses = body.query.filter(function (q) {
+	                  return q.execute || q.execute === undefined;
+	                }).length;
 
-	          return;
-	        }
+	                if (data) {
+	                  Object.keys(data).forEach(function (key) {
+	                    if (data[key] && Object.prototype.hasOwnProperty.call(data[key], 'error')) {
+	                      errorResponses += 1;
+	                    }
+	                  });
+	                } // reject only when all responses has error
 
-	        if (dataObj.query_id) {
-	          _this.query_id = dataObj.query_id;
-	        }
 
-	        if (dataObj.channel) {
-	          _this.channel = dataObj.channel;
-	        }
+	                if (errorResponses > 0 && allResponses === errorResponses) {
+	                  return reject(data);
+	                }
+	              }
+	            } // Handle error from _msearch response
 
-	        if (dataObj.body && dataObj.body !== '') {
-	          if (onData) {
-	            onData(dataObj.body);
-	          }
-	        }
 
-	        return;
-	      }
+	            if (data && data.responses instanceof Array) {
+	              var _allResponses = data.responses.length;
+	              var _errorResponses = data.responses.filter(function (entry) {
+	                return Object.prototype.hasOwnProperty.call(entry, 'error');
+	              }).length; // reject only when all responses has error
 
-	      if (!dataObj.id && dataObj.channel && dataObj.channel === _this.channel) {
-	        if (onData) {
-	          onData(dataObj.event);
-	        }
-	      }
-	    };
+	              if (_allResponses === _errorResponses) {
+	                return reject(data);
+	              }
+	            }
 
-	    return init();
-	  } catch (e) {
-	    if (onError) {
-	      onError(e);
-	    } else {
-	      console.warn(e);
+	            var response = Object.assign({}, data, {
+	              _timestamp: timestamp,
+	              _headers: responseHeaders
+	            });
+	            return resolve(response);
+	          })["catch"](function (e) {
+	            return reject(e);
+	          });
+	        })["catch"](function (e) {
+	          return reject(e);
+	        });
+	      })["catch"](function (err) {
+	        return reject(err);
+	      });
+	    } catch (e) {
+	      return reject(e);
 	    }
-
-	    return null;
-	  }
+	  });
 	}
 	/**
 	 * Index Service
@@ -16685,7 +15954,7 @@
 	 */
 
 
-	function reactiveSearchv3Api(query, settings) {
+	function reactiveSearchApi(query, settings) {
 	  var parsedSettings = removeUndefined(settings); // Validate query
 
 	  var valid = validateRSQuery(query);
@@ -16700,251 +15969,42 @@
 	  };
 	  return this.performFetchRequest({
 	    method: 'POST',
-	    path: '_reactivesearch.v3',
+	    path: '_reactivesearch',
 	    body: body,
+	    headers: getTelemetryHeaders(this.enableTelemetry),
 	    isRSAPI: true
 	  });
 	}
 	/**
-	 * Stream Service
-	 * @param {Object} args
-	 * @param {String} args.type
-	 * @param {Boolean} args.stream
-	 * @param {String} args.id
-	 * @param {Function} onData
-	 * @param {Function} onError
-	 * @param {Function} onClose
-	 */
-
-
-	function getStream(args) {
-	  var parsedArgs = removeUndefined(args); // Validate arguments
-
-	  var valid = validate(parsedArgs, {
-	    type: 'string',
-	    id: 'string|number'
-	  });
-
-	  if (valid !== true) {
-	    throw valid;
-	  }
-
-	  var type = parsedArgs.type,
-	      id = parsedArgs.id;
-	  delete parsedArgs.type;
-	  delete parsedArgs.id;
-	  delete parsedArgs.stream;
-
-	  if (parsedArgs.stream === true) {
-	    parsedArgs.stream = 'true';
-	  } else {
-	    delete parsedArgs.stream;
-	    parsedArgs.streamonly = 'true';
-	  }
-
-	  for (var _len = arguments.length, rest = Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
-	    rest[_key - 1] = arguments[_key];
-	  }
-
-	  return this.performWsRequest.apply(this, [{
-	    method: 'GET',
-	    path: type + '/' + encodeURIComponent(id),
-	    params: parsedArgs
-	  }].concat(rest));
-	}
-	/**
-	 * Search Stream
-	 * @param {Object} args
-	 * @param {String} args.type
-	 * @param {Object} args.body
-	 * @param {Boolean} args.stream
-	 * @param {Function} onData
-	 * @param {Function} onError
-	 * @param {Function} onClose
-	 */
-
-
-	function searchStreamApi(args) {
-	  var parsedArgs = removeUndefined(args); // Validate arguments
-
-	  var valid = validate(parsedArgs, {
-	    body: 'object'
-	  });
-
-	  if (valid !== true) {
-	    throw valid;
-	  }
-
-	  if (parsedArgs.type === undefined || Array.isArray(parsedArgs.type) && parsedArgs.type.length === 0) {
-	    throw new Error('Missing fields: type');
-	  }
-
-	  var type = void 0;
-
-	  if (Array.isArray(parsedArgs.type)) {
-	    type = parsedArgs.type.join();
-	  } else {
-	    type = parsedArgs.type;
-	  }
-
-	  var body = parsedArgs.body;
-	  delete parsedArgs.type;
-	  delete parsedArgs.body;
-	  delete parsedArgs.stream;
-	  parsedArgs.streamonly = 'true';
-
-	  for (var _len = arguments.length, rest = Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
-	    rest[_key - 1] = arguments[_key];
-	  }
-
-	  return this.performWsRequest.apply(this, [{
-	    method: 'POST',
-	    path: type + '/_search',
-	    params: parsedArgs,
-	    body: body
-	  }].concat(rest));
-	}
-	/**
-	 * Webhook Service
-	 * @param {Object} args
-	 * @param {String} args.type
-	 * @param {Object} args.body
-	 * @param {Object} webhook
-	 * @param {Function} onData
-	 * @param {Function} onError
-	 * @param {Function} onClose
+	 * ReactiveSearch API Service for v3
+	 * @param {Array<Object>} query
+	 * @param {Object} settings
+	 * @param {boolean} settings.recordAnalytics
+	 * @param {boolean} settings.userId
+	 * @param {boolean} settings.enableQueryRules
+	 * @param {boolean} settings.customEvents
 	 */
 
 
-	function searchStreamToURLApi(args, webhook) {
-	  for (var _len = arguments.length, rest = Array(_len > 2 ? _len - 2 : 0), _key = 2; _key < _len; _key++) {
-	    rest[_key - 2] = arguments[_key];
-	  }
-
-	  var _this = this;
-
-	  var parsedArgs = removeUndefined(args);
-	  var bodyCopy = parsedArgs.body;
-	  var type = void 0;
-	  var typeString = void 0; // Validate arguments
-
-	  var valid = validate(parsedArgs, {
-	    body: 'object'
-	  });
-
-	  if (valid !== true) {
-	    throw valid;
-	  }
-
-	  if (parsedArgs.type === undefined || !(typeof parsedArgs.type === 'string' || Array.isArray(parsedArgs.type)) || parsedArgs.type === '' || parsedArgs.type.length === 0) {
-	    throw new Error('fields missing: type');
-	  }
+	function reactiveSearchv3Api(query, settings) {
+	  var parsedSettings = removeUndefined(settings); // Validate query
 
-	  valid = validate(parsedArgs.body, {
-	    query: 'object'
-	  });
+	  var valid = validateRSQuery(query);
 
 	  if (valid !== true) {
 	    throw valid;
 	  }
 
-	  if (Array.isArray(parsedArgs.type)) {
-	    type = parsedArgs.type;
-	    typeString = parsedArgs.type.join();
-	  } else {
-	    type = [parsedArgs.type];
-	    typeString = parsedArgs.type;
-	  }
-
-	  var webhooks = [];
-	  var _bodyCopy = bodyCopy,
-	      query = _bodyCopy.query;
-
-	  if (typeof webhook === 'string') {
-	    var webHookObj = {};
-	    webHookObj.url = webhook;
-	    webHookObj.method = 'GET';
-	    webhooks.push(webHookObj);
-	  } else if (webhook.constructor === Array) {
-	    webhooks = webhook;
-	  } else if (webhook === Object(webhook)) {
-	    webhooks.push(webhook);
-	  } else {
-	    throw new Error('fields missing: second argument(webhook) is necessary');
-	  }
-
-	  var populateBody = function populateBody() {
-	    bodyCopy = {};
-	    bodyCopy.webhooks = webhooks;
-	    bodyCopy.query = query;
-	    bodyCopy.type = type;
-	  };
-
-	  populateBody();
-	  var encode64 = btoa$1(jsonStableStringify(query));
-	  var path = '.percolator/webhooks-0-' + typeString + '-0-' + encode64;
-
-	  this.change = function () {
-	    webhooks = [];
-
-	    if (typeof parsedArgs === 'string') {
-	      var webhook2 = {};
-	      webhook2.url = parsedArgs;
-	      webhook2.method = 'POST';
-	      webhooks.push(webhook2);
-	    } else if (parsedArgs.constructor === Array) {
-	      webhooks = parsedArgs;
-	    } else if (parsedArgs === Object(parsedArgs)) {
-	      webhooks.push(parsedArgs);
-	    } else {
-	      throw new Error('fields missing: one of webhook or url fields is required');
-	    }
-
-	    populateBody();
-	    return _this.performRequest('POST');
-	  };
-
-	  this.stop = function () {
-	    bodyCopy = undefined;
-	    return _this.performRequest('DELETE');
-	  };
-
-	  this.performRequest = function (method) {
-	    var res = _this.performWsRequest.apply(_this, [{
-	      method: method,
-	      path: path,
-	      body: bodyCopy
-	    }].concat(rest));
-
-	    res.change = _this.change;
-	    res.stop = _this.stop;
-	    return res;
+	  var body = {
+	    settings: parsedSettings,
+	    query: query
 	  };
-
-	  return this.performRequest('POST');
-	}
-	/**
-	 * To get types
-	 */
-
-
-	function getTypesService() {
-	  var _this = this;
-
-	  return new Promise(function (resolve, reject) {
-	    try {
-	      return _this.performFetchRequest({
-	        method: 'GET',
-	        path: '_mapping'
-	      }).then(function (data) {
-	        var types = Object.keys(data[_this.app].mappings).filter(function (type) {
-	          return type !== '_default_';
-	        });
-	        return resolve(types);
-	      });
-	    } catch (e) {
-	      return reject(e);
-	    }
+	  return this.performFetchRequest({
+	    method: 'POST',
+	    path: '_reactivesearch.v3',
+	    body: body,
+	    headers: getTelemetryHeaders(this.enableTelemetry),
+	    isRSAPI: true
 	  });
 	}
 	/**
@@ -16986,15 +16046,15 @@
 	    method: 'POST',
 	    path: '_reactivesearch.v3',
 	    body: body,
+	    headers: getTelemetryHeaders(this.enableTelemetry),
 	    isRSAPI: true,
 	    isSuggestionsAPI: true
 	  });
 	}
 
-	function index$2(config) {
+	function appbasejs(config) {
 	  var client = new AppBase(config);
 	  AppBase.prototype.performFetchRequest = fetchRequest;
-	  AppBase.prototype.performWsRequest = wsRequest;
 	  AppBase.prototype.index = indexApi;
 	  AppBase.prototype.get = getApi;
 	  AppBase.prototype.update = updateApi;
@@ -17002,12 +16062,9 @@
 	  AppBase.prototype.bulk = bulkApi;
 	  AppBase.prototype.search = searchApi;
 	  AppBase.prototype.msearch = msearchApi;
+	  AppBase.prototype.reactiveSearch = reactiveSearchApi;
 	  AppBase.prototype.reactiveSearchv3 = reactiveSearchv3Api;
 	  AppBase.prototype.getQuerySuggestions = getSuggestionsv3Api;
-	  AppBase.prototype.getStream = getStream;
-	  AppBase.prototype.searchStream = searchStreamApi;
-	  AppBase.prototype.searchStreamToURL = searchStreamToURLApi;
-	  AppBase.prototype.getTypes = getTypesService;
 	  AppBase.prototype.getMappings = getMappings;
 
 	  AppBase.prototype.setHeaders = function setHeaders() {
@@ -17786,6 +16843,23 @@
 	      }
 	    }
 	  },
+	  computed: {
+	    getHeaders: function getHeaders() {
+	      var _this$$props = this.$props,
+	          enableAppbase = _this$$props.enableAppbase,
+	          headers = _this$$props.headers,
+	          appbaseConfig = _this$$props.appbaseConfig;
+
+	      var _ref = appbaseConfig || {},
+	          enableTelemetry = _ref.enableTelemetry;
+
+	      return _extends({}, enableAppbase && _extends({
+	        'X-Search-Client': X_SEARCH_CLIENT
+	      }, enableTelemetry === false && {
+	        'X-Enable-Telemetry': false
+	      }), headers);
+	    }
+	  },
 	  methods: {
 	    updateState: function updateState(props) {
 	      this.setStore(props);
@@ -17838,10 +16912,8 @@
 	        } catch (e) {// Do not add to selectedValues if JSON parsing fails.
 	        }
 	      });
-	      var _props$headers = props.headers,
-	          headers = _props$headers === void 0 ? {} : _props$headers,
-	          themePreset = props.themePreset;
-	      var appbaseRef = index$2(config);
+	      var themePreset = props.themePreset;
+	      var appbaseRef = appbasejs(config);
 
 	      if (this.$props.transformRequest) {
 	        appbaseRef.transformRequest = this.$props.transformRequest;
@@ -17861,7 +16933,7 @@
 	        appbaseRef: appbaseRef,
 	        selectedValues: selectedValues,
 	        urlValues: urlValues,
-	        headers: headers
+	        headers: this.getHeaders
 	      }, this.$props.initialState);
 
 	      this.store = configureStore(initialState);
@@ -17870,10 +16942,9 @@
 	  render: function render() {
 	    var h = arguments[0];
 	    var children = this.$slots["default"];
-	    var _this$$props = this.$props,
-	        headers = _this$$props.headers,
-	        style = _this$$props.style,
-	        className = _this$$props.className;
+	    var _this$$props2 = this.$props,
+	        style = _this$$props2.style,
+	        className = _this$$props2.className;
 	    return h(Provider, {
 	      "attrs": {
 	        "store": this.store
@@ -17881,7 +16952,7 @@
 	    }, [h(URLParamsProvider$1, {
 	      "attrs": {
 	        "as": this.$props.as,
-	        "headers": headers,
+	        "headers": this.getHeaders,
 	        "className": className,
 	        "getSearchParams": this.getSearchParams,
 	        "setSearchParams": this.setSearchParams
@@ -24458,9 +23529,15 @@
 	        this.setQueryOptions(componentId, _extends({}, customQueryOptions, this.getAggsQuery()), false);
 	      } else this.setQueryOptions(componentId, this.getAggsQuery(), false);
 
+	      var queryToSet = query || null;
+
+	      if (calcCustomQuery && calcCustomQuery.id) {
+	        queryToSet = calcCustomQuery;
+	      }
+
 	      this.updateQuery({
 	        componentId: componentId,
-	        query: query,
+	        queryToSet: queryToSet,
 	        value: this.selectedValue || null,
 	        label: filterLabel,
 	        showFilter: showFilter,
@@ -24474,6 +23551,12 @@
 
 	      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;
 	      } // Update customQuery field for RS API
 
 
@@ -24481,7 +23564,11 @@
 	        var customQueryCalc = _extends({}, options);
 
 	        if (obj && obj.query) {
-	          customQueryCalc.query = obj.query;
+	          if (obj.query.id) {
+	            customQueryCalc = queryToBeSet;
+	          } else {
+	            customQueryCalc.query = obj.query;
+	          }
 	        }
 
 	        _this.setCustomQuery(props.componentId, customQueryCalc);
@@ -24512,9 +23599,15 @@
 	        this.setQueryOptions(this.internalComponent, _extends({}, queryOptions, this.getAggsQuery()), false);
 	      } else this.setQueryOptions(this.internalComponent, this.getAggsQuery(), false);
 
+	      var queryToSet = query || null;
+
+	      if (!queryToSet && this.$defaultQuery && this.$defaultQuery.id) {
+	        queryToSet = this.$defaultQuery;
+	      }
+
 	      this.updateQuery({
 	        componentId: this.internalComponent,
-	        query: query || null
+	        query: queryToSet
 	      });
 	    }
 	  },
@@ -24573,9 +23666,15 @@
 
 
 	        updateDefaultQuery(this.componentId, this.setDefaultQuery, this.$props, undefined);
+	        var queryToSet = query || null;
+
+	        if (!queryToSet && this.$defaultQuery && this.$defaultQuery.id) {
+	          queryToSet = this.$defaultQuery;
+	        }
+
 	        this.updateQuery({
 	          componentId: this.internalComponent,
-	          query: query || null
+	          query: queryToSet
 	        });
 	      }
 	    },
@@ -24594,9 +23693,15 @@
 
 
 	        updateCustomQuery(this.componentId, this.setCustomQuery, this.$props, undefined);
+	        var queryToSet = query || null;
+
+	        if (this.$customQuery && this.$customQuery.id) {
+	          queryToSet = this.$customQuery;
+	        }
+
 	        this.updateQuery({
 	          componentId: componentId,
-	          query: query || null
+	          query: queryToSet
 	        });
 	      }
 	    }
@@ -25629,7 +24734,7 @@
 	 * Released under the MIT License.
 	 */
 
-	var index$3 = {
+	var index$2 = {
 	  name: 'NoSsr',
 	  functional: true,
 	  props: {
@@ -25669,7 +24774,7 @@
 	    }) : h(false);
 	  }
 	};
-	var vueNoSsr_common = index$3;
+	var vueNoSsr_common = index$2;
 
 	var _templateObject$m;
 	var Slider = index$1('div')(_templateObject$m || (_templateObject$m = _taggedTemplateLiteralLoose(["\n\tmargin-top: 30px;\n\tpadding: 10px;\n\n\t/* component style */\n\t.vue-slider-disabled {\n\t\topacity: 0.5;\n\t\tcursor: not-allowed;\n\t}\n\n\t/* rail style */\n\t.vue-slider-rail {\n\t\tbackground-color: #ccc;\n\t\tborder-radius: 15px;\n\t\theight: 4px;\n\t}\n\n\t/* process style */\n\t.vue-slider-process {\n\t\tbackground-color: #0b6aff;\n\t\tborder-radius: 15px;\n\t}\n\n\t/* mark style */\n\t.vue-slider-mark {\n\t\tz-index: 4;\n\t}\n\n\t.vue-slider-mark:first-child .vue-slider-mark-step,\n\t.vue-slider-mark:last-child .vue-slider-mark-step {\n\t\tdisplay: none;\n\t}\n\n\t.vue-slider-mark-step {\n\t\twidth: 100%;\n\t\theight: 100%;\n\t\tborder-radius: 50%;\n\t\tbackground-color: rgba(0, 0, 0, 0.16);\n\t}\n\n\t.vue-slider-mark-label {\n\t\tfont-size: 14px;\n\t\twhite-space: nowrap;\n\t}\n\n\t/* dot style */\n\t.vue-slider-dot{\n\t\tz-index: 2;\n\t}\n\n\t.vue-slider-dot-handle {\n\t\tcursor: pointer;\n\t\twidth: 100%;\n\t\theight: 100%;\n\t\tborder-radius: 50%;\n\t\tbackground-color: #fff;\n\t\tbox-sizing: border-box;\n\t\tborder: 1px solid #9a9a9a;\n\t\tz-index: 2;\n\t}\n\n\t.vue-slider-dot-handle-disabled {\n\t\tcursor: not-allowed;\n\t\tbackground-color: #ccc;\n\t}\n\n\t.vue-slider-dot-tooltip-inner {\n\t\tfont-size: 14px;\n\t\twhite-space: nowrap;\n\t\tpadding: 2px 5px;\n\t\tmin-width: 20px;\n\t\ttext-align: center;\n\t\tcolor: #fff;\n\t\tborder-radius: 5px;\n\t\tborder-color: #000;\n\t\tbackground-color: #000;\n\t\tbox-sizing: content-box;\n\t}\n\n\t.vue-slider-dot-tooltip-inner::after {\n\t\tcontent: \"\";\n\t\tposition: absolute;\n\t}\n\n\t.vue-slider-dot -tooltip-inner-top::after {\n\t\ttop: 100%;\n\t\tleft: 50%;\n\t\ttransform: translate(-50%, 0);\n\t\theight: 0;\n\t\twidth: 0;\n\t\tborder-color: transparent;\n\t\tborder-style: solid;\n\t\tborder-width: 5px;\n\t\tborder-top-color: inherit;\n\t}\n\n\t.vue-slider-dot-tooltip-inner-bottom::after {\n\t\tbottom: 100%;\n\t\tleft: 50%;\n\t\ttransform: translate(-50%, 0);\n\t\theight: 0;\n\t\twidth: 0;\n\t\tborder-color: transparent;\n\t\tborder-style: solid;\n\t\tborder-width: 5px;\n\t\tborder-bottom-color: inherit;\n\t}\n\n\t.vue-slider-dot-tooltip-inner-left::after {\n\t\tleft: 100%;\n\t\ttop: 50%;\n\t\ttransform: translate(0, -50%);\n\t\theight: 0;\n\t\twidth: 0;\n\t\tborder-color: transparent;\n\t\tborder-style: solid;\n\t\tborder-width: 5px;\n\t\tborder-left-color: inherit;\n\t}\n\n\t.vue-slider-dot-tooltip-inner-right::after {\n\t\tright: 100%;\n\t\ttop: 50%;\n\t\ttransform: translate(0, -50%);\n\t\theight: 0;\n\t\twidth: 0;\n\t\tborder-color: transparent;\n\t\tborder-style: solid;\n\t\tborder-width: 5px;\n\t\tborder-right-color: inherit;\n\t}\n\n\t.vue-slider-dot-tooltip-wrapper {\n\t\topacity: 0;\n\t\ttransition: all 0.3s;\n\t}\n\t.vue-slider-dot-tooltip-wrapper-show {\n\t\topacity: 1;\n\t}\n\n\t.label-container {\n\t\tmargin: 10px 0;\n\t\twidth: 100%;\n\t}\n\n\t.range-label-right {\n\t\tfloat: right;\n\t}\n"])));
@@ -26481,7 +25586,7 @@
 	  watch: {
 	    searchState: function searchState(newVal, oldVal) {
 	      if (this.isStateChanged(newVal, oldVal)) {
-	        this.$emit('change', newVal, oldVal);
+	        this.$emit('change', oldVal, newVal);
 	      }
 	    },
 	    selectedValues: function selectedValues(newVal, oldVal) {
@@ -33356,6 +32461,7 @@
 	ReactiveGoogleMap.componentType = constants_1$1.reactiveMap;
 
 	var _excluded$5 = ["aggs", "size"];
+	var X_SEARCH_CLIENT$1 = 'ReactiveSearch Vue';
 	var componentsWithHighlightQuery = [constants_1$1.dataSearch, constants_1$1.categorySearch];
 	var componentsWithOptions = [constants_1$1.reactiveList, constants_1$1.reactiveMap, constants_1$1.singleList, constants_1$1.multiList, constants_1$1.tagCloud].concat(componentsWithHighlightQuery);
 	var componentsWithoutFilters = [constants_1$1.numberBox, constants_1$1.ratingsFilter];
@@ -33413,6 +32519,14 @@
 	function initReactivesearch(componentCollection, searchState, settings) {
 	  return new Promise(function (resolve, reject) {
 	    var credentials = settings.url && settings.url.trim() !== '' && !settings.credentials ? null : settings.credentials;
+	    var enableTelemetry = settings.appbaseConfig && settings.appbaseConfig.enableTelemetry !== undefined ? settings.appbaseConfig.enableTelemetry : true;
+
+	    var headers = _extends({}, settings.enableAppbase && _extends({
+	      'X-Search-Client': X_SEARCH_CLIENT$1
+	    }, enableTelemetry === false && {
+	      'X-Enable-Telemetry': false
+	    }), settings.headers);
+
 	    var config = {
 	      url: settings.url && settings.url.trim() !== '' ? settings.url : 'https://scalr.api.appbase.io',
 	      app: settings.app,
@@ -33421,10 +32535,10 @@
 	      type: settings.type ? settings.type : '*',
 	      transformResponse: settings.transformResponse || null,
 	      graphQLUrl: settings.graphQLUrl || '',
-	      headers: settings.headers || {},
+	      headers: headers,
 	      analyticsConfig: settings.appbaseConfig || null
 	    };
-	    var appbaseRef = index$2(config);
+	    var appbaseRef = appbasejs(config);
 	    var components = [];
 	    var selectedValues = {};
 	    var internalValues = {};
@@ -33643,8 +32757,9 @@
 	            appbaseQuery = _extends({}, appbaseQuery, (_extends3 = {}, _extends3[component.componentId] = query, _extends3), transform_1(state, component.componentId, orderOfQueries));
 	          }
 	        } else {
+	          var preference = config && config.analyticsConfig && config.analyticsConfig.userId ? config.analyticsConfig.userId + "_" + component : component;
 	          finalQuery = [].concat(finalQuery, [{
-	            preference: component.componentId
+	            preference: preference
 	          }, currentQuery]);
 	        }
 	      }
@@ -33798,7 +32913,7 @@
 	  });
 	}
 
-	var version = "1.16.0-alpha.21";
+	var version = "1.16.0-alpha.25";
 
 	var _templateObject$o, _templateObject2$b;
 
@@ -34126,7 +33241,7 @@
 	if (typeof window !== 'undefined' && window.Vue) {
 	  install(window.Vue);
 	}
-	var index$4 = {
+	var index$3 = {
 	  version: version,
 	  install: install
 	};
@@ -34150,7 +33265,7 @@
 	exports.SingleRange = SingleRange;
 	exports.StateProvider = StateProvider;
 	exports.ToggleButton = ToggleButton;
-	exports.default = index$4;
+	exports.default = index$3;
 	exports.initReactivesearch = initReactivesearch;
 	exports.install = install;
 	exports.version = version;