@appbaseio/reactivesearch-vue 1.16.0-alpha.6 → 1.16.0-alpha.62

package/dist/es/initReactivesearch.js

@@ -1,35 +1,46 @@
-import { b as _objectWithoutPropertiesLoose, a as _extends } from './_rollupPluginBabelHelpers-ecf6c03c.js';
+import { a as _extends, b as _objectWithoutPropertiesLoose } from './_rollupPluginBabelHelpers-76660dab.js';
 import { validProps, componentTypes } from '@appbaseio/reactivecore/lib/utils/constants';
-import { getRSQuery, extractPropsFromState, getDependentQueries } from '@appbaseio/reactivecore/lib/utils/transform';
-import { pushToAndClause, buildQuery } from '@appbaseio/reactivecore/lib/utils/helper';
+import { pushToAndClause, buildQuery, extractQueryFromCustomQuery, getOptionsForCustomQuery } from '@appbaseio/reactivecore/lib/utils/helper';
+import { isSearchComponent, getRSQuery, extractPropsFromState, getDependentQueries } from '@appbaseio/reactivecore/lib/utils/transform';
 import Appbase from 'appbase-js';
 import valueReducer from '@appbaseio/reactivecore/lib/reducers/valueReducer';
 import queryReducer from '@appbaseio/reactivecore/lib/reducers/queryReducer';
 import queryOptionsReducer from '@appbaseio/reactivecore/lib/reducers/queryOptionsReducer';
+import compositeAggsReducer from '@appbaseio/reactivecore/lib/reducers/compositeAggsReducer';
+import { UPDATE_COMPOSITE_AGGS } from '@appbaseio/reactivecore/lib/constants';
 import dependencyTreeReducer from '@appbaseio/reactivecore/lib/reducers/dependencyTreeReducer';
 import fetchGraphQL from '@appbaseio/reactivecore/lib/utils/graphQL';
 import { isPropertyDefined } from '@appbaseio/reactivecore/lib/actions/utils';
 
-var componentsWithHighlightQuery = [componentTypes.dataSearch, componentTypes.categorySearch];
-var componentsWithOptions = [componentTypes.reactiveList, componentTypes.reactiveMap, componentTypes.singleList, componentTypes.multiList, componentTypes.tagCloud].concat(componentsWithHighlightQuery);
+var _excluded = ["aggs", "size"],
+    _excluded2 = ["query"],
+    _excluded3 = ["query"];
+var X_SEARCH_CLIENT = 'ReactiveSearch Vue';
 var componentsWithoutFilters = [componentTypes.numberBox, componentTypes.ratingsFilter];
 var resultComponents = [componentTypes.reactiveList, componentTypes.reactiveMap];
 
 function getValue(state, id, defaultValue) {
-  if (!state) return defaultValue;
-
-  if (state[id]) {
+  if (state && state[id]) {
     try {
       // parsing for next.js - since it uses extra set of quotes to wrap params
       var parsedValue = JSON.parse(state[id]);
-      return parsedValue;
+      return {
+        value: parsedValue,
+        reference: 'URL'
+      };
     } catch (error) {
       // using react-dom-server for ssr
-      return state[id] || defaultValue;
+      return {
+        value: state[id],
+        reference: 'URL'
+      };
     }
   }
 
-  return defaultValue;
+  return {
+    value: defaultValue,
+    reference: 'DEFAULT'
+  };
 }
 
 function parseValue(value, component) {
@@ -38,28 +49,53 @@ function parseValue(value, component) {
   }
 
   return value;
-}
+} // Returns query DSL with query property and other options
 
-function getQuery(component, value, componentType) {
-  // get default query of result components
-  if (resultComponents.includes(componentType)) {
-    return component.defaultQuery ? component.defaultQuery() : {};
-  } // get custom or default query of sensor components
 
+function getDefaultQuery(component, value) {
+  // get custom or default query of sensor components
+  var currentValue = parseValue(value, component); // get default query of result components
+
+  if (component.defaultQuery) {
+    var defaultQuery = component.defaultQuery(currentValue, component);
+    return _extends({
+      query: extractQueryFromCustomQuery(defaultQuery)
+    }, getOptionsForCustomQuery(defaultQuery));
+  }
+
+  return component.source.defaultQuery ? {
+    query: component.source.defaultQuery(currentValue, component)
+  } : {};
+} // Only results the query part
 
+
+function getCustomQuery(component, value) {
+  // get custom or default query of sensor components
   var currentValue = parseValue(value, component);
 
   if (component.customQuery) {
     var customQuery = component.customQuery(currentValue, component);
-    return customQuery && customQuery.query;
+    return _extends({
+      query: extractQueryFromCustomQuery(customQuery)
+    }, getOptionsForCustomQuery(customQuery));
   }
 
-  return component.source.defaultQuery ? component.source.defaultQuery(currentValue, component) : {};
+  return component.source.defaultQuery ? {
+    query: component.source.defaultQuery(currentValue, component)
+  } : null;
 }
 
 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
+    }, 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,
@@ -68,7 +104,7 @@ function initReactivesearch(componentCollection, searchState, settings) {
       type: settings.type ? settings.type : '*',
       transformResponse: settings.transformResponse || null,
       graphQLUrl: settings.graphQLUrl || '',
-      headers: settings.headers || {},
+      headers: headers,
       analyticsConfig: settings.appbaseConfig || null
     };
     var appbaseRef = Appbase(config);
@@ -85,6 +121,7 @@ function initReactivesearch(componentCollection, searchState, settings) {
     var orderOfQueries = [];
     var hits = {};
     var aggregations = {};
+    var compositeAggregations = {};
     var state = {};
     var customQueries = {};
     var defaultQueries = {};
@@ -99,20 +136,20 @@ function initReactivesearch(componentCollection, searchState, settings) {
           compProps[key] = component[key];
         }
       });
-      var isInternalComponentPresent = false; // Set custom and default queries
+      var isInternalComponentPresent = false;
 
-      if (component.customQuery && typeof component.customQuery === 'function') {
-        customQueries[component.componentId] = component.customQuery(component.value, compProps);
-      }
-
-      if (component.defaultQuery && typeof component.defaultQuery === 'function') {
-        defaultQueries[component.componentId] = component.defaultQuery(component.value, compProps);
+      if (component.source.hasInternalComponent) {
+        isInternalComponentPresent = component.source.hasInternalComponent(component);
       }
 
       var isResultComponent = resultComponents.includes(componentType);
       var internalComponent = component.componentId + "__internal";
       var label = component.filterLabel || component.componentId;
-      var value = getValue(searchState, component.componentId, component.value || component.defaultValue); // [1] set selected values
+
+      var _getValue = getValue(searchState, component.componentId, component.value || component.defaultValue),
+          value = _getValue.value,
+          reference = _getValue.reference; // [1] set selected values
+
 
       var showFilter = component.showFilter !== undefined ? component.showFilter : true;
 
@@ -125,75 +162,77 @@ function initReactivesearch(componentCollection, searchState, settings) {
         component: component.componentId,
         label: label,
         value: value,
+        reference: reference,
         showFilter: showFilter,
         URLParams: component.URLParams || false
-      }); // [2] set query options - main component query (valid for result components)
+      }); // Set custom and default queries
 
-      if (componentsWithOptions.includes(componentType)) {
-        var options = component.source.generateQueryOptions ? component.source.generateQueryOptions(component) : null;
-        var highlightQuery = {};
+      if (component.customQuery && typeof component.customQuery === 'function') {
+        customQueries[component.componentId] = component.customQuery(value, compProps);
+      }
 
-        if (componentsWithHighlightQuery.includes(componentType) && component.highlight) {
-          highlightQuery = component.source.highlightQuery(component);
-        }
+      if (component.defaultQuery && typeof component.defaultQuery === 'function') {
+        defaultQueries[component.componentId] = component.defaultQuery(value, compProps);
+      }
 
-        if (options && Object.keys(options).length || highlightQuery && Object.keys(highlightQuery).length) {
-          // eslint-disable-next-line
-          var _ref = options || {},
-              aggs = _ref.aggs,
-              size = _ref.size,
-              otherQueryOptions = _objectWithoutPropertiesLoose(_ref, ["aggs", "size"]);
-
-          if (aggs && Object.keys(aggs).length) {
-            isInternalComponentPresent = true; // query should be applied on the internal component
-            // to enable feeding the data to parent component
-
-            queryOptions = queryOptionsReducer(queryOptions, {
-              type: 'SET_QUERY_OPTIONS',
-              component: internalComponent,
-              options: {
-                aggs: aggs,
-                size: typeof size === 'undefined' ? 100 : size
-              }
-            });
-          } // sort, highlight, size, from - query should be applied on the main component
+      var componentQueryOptions = {}; // [2] set query options - main component query (valid for result components)
 
+      if (component && component.source.generateQueryOptions) {
+        componentQueryOptions = _extends({}, componentQueryOptions, component.source.generateQueryOptions(component));
+      }
 
-          if (otherQueryOptions && Object.keys(otherQueryOptions).length || highlightQuery && Object.keys(highlightQuery).length) {
-            if (!otherQueryOptions) otherQueryOptions = {};
-            if (!highlightQuery) highlightQuery = {};
+      var highlightQuery = {};
 
-            var mainQueryOptions = _extends(_extends(_extends({}, otherQueryOptions), highlightQuery), {}, {
-              size: size
-            });
+      if (component.source.highlightQuery) {
+        highlightQuery = component.source.highlightQuery(component);
+      }
 
-            if (isInternalComponentPresent) {
-              mainQueryOptions = _extends(_extends({}, otherQueryOptions), highlightQuery);
-            }
+      if (componentQueryOptions && Object.keys(componentQueryOptions).length || highlightQuery && Object.keys(highlightQuery).length) {
+        // eslint-disable-next-line
+        var _ref = componentQueryOptions || {},
+            aggs = _ref.aggs,
+            size = _ref.size,
+            otherQueryOptions = _objectWithoutPropertiesLoose(_ref, _excluded);
+
+        if (aggs && Object.keys(aggs).length) {
+          isInternalComponentPresent = true;
+          componentQueryOptions = _extends({}, componentQueryOptions, {
+            aggs: aggs,
+            size: typeof size === 'undefined' ? 100 : size
+          });
+        } // sort, highlight, size, from - query should be applied on the main component
 
-            if (isResultComponent) {
-              var currentPage = component.currentPage ? component.currentPage - 1 : 0;
 
-              if (selectedValues[component.componentId] && selectedValues[component.componentId].value) {
-                currentPage = selectedValues[component.componentId].value - 1 || 0;
-              }
+        if (otherQueryOptions && Object.keys(otherQueryOptions).length || highlightQuery && Object.keys(highlightQuery).length) {
+          if (!otherQueryOptions) otherQueryOptions = {};
+          if (!highlightQuery) highlightQuery = {};
 
-              var resultSize = component.size || 10;
-              var from = currentPage * resultSize; // Update props for RS API
+          var mainQueryOptions = _extends({}, otherQueryOptions, highlightQuery, {
+            size: size
+          });
 
-              compProps.from = from;
-              mainQueryOptions = _extends(_extends(_extends({}, mainQueryOptions), highlightQuery), {}, {
-                size: resultSize,
-                from: from
-              });
+          if (isInternalComponentPresent) {
+            mainQueryOptions = _extends({}, otherQueryOptions, highlightQuery);
+          }
+
+          if (isResultComponent) {
+            var currentPage = component.currentPage ? component.currentPage - 1 : 0;
+
+            if (selectedValues[component.componentId] && selectedValues[component.componentId].value) {
+              currentPage = selectedValues[component.componentId].value - 1 || 0;
             }
 
-            queryOptions = queryOptionsReducer(queryOptions, {
-              type: 'SET_QUERY_OPTIONS',
-              component: component.componentId,
-              options: _extends({}, mainQueryOptions)
+            var resultSize = component.size || 10;
+            var from = currentPage * resultSize; // Update props for RS API
+
+            compProps.from = from;
+            mainQueryOptions = _extends({}, mainQueryOptions, highlightQuery, {
+              size: resultSize,
+              from: from
             });
           }
+
+          componentQueryOptions = _extends({}, componentQueryOptions, mainQueryOptions);
         }
       } // [3] set dependency tree
 
@@ -211,25 +250,42 @@ function initReactivesearch(componentCollection, searchState, settings) {
           react: react
         });
       } // [4] set query list
+      // Do not set default query for suggestions
 
 
-      if (isResultComponent) {
-        var _getQuery = getQuery(component, null, componentType),
-            query = _getQuery.query;
+      if (isInternalComponentPresent && !isSearchComponent(component.componentType)) {
+        var _ref2 = getDefaultQuery(component, value) || {},
+            defaultQuery = _ref2.query,
+            defaultQueryOptions = _objectWithoutPropertiesLoose(_ref2, _excluded2);
 
         queryList = queryReducer(queryList, {
           type: 'SET_QUERY',
           component: internalComponent,
-          query: query
+          query: defaultQuery
         });
-      } else {
-        queryList = queryReducer(queryList, {
-          type: 'SET_QUERY',
-          component: component.componentId,
-          query: getQuery(component, value, componentType)
+        queryOptions = queryOptionsReducer(queryOptions, {
+          type: 'SET_QUERY_OPTIONS',
+          component: internalComponent,
+          options: _extends({}, componentQueryOptions, defaultQueryOptions)
         });
-      } // Set component type in component props
+      }
+
+      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',
+        component: component.componentId,
+        query: customQuery
+      });
+      queryOptions = queryOptionsReducer(queryOptions, {
+        type: 'SET_QUERY_OPTIONS',
+        component: component.componentId,
+        options: _extends({}, options)
+      }); // Set component type in component props
 
       compProps.componentType = componentType;
       componentProps[component.componentId] = compProps;
@@ -252,9 +308,10 @@ function initReactivesearch(componentCollection, searchState, settings) {
           queryObj = _buildQuery.queryObj,
           options = _buildQuery.options;
 
-      var validOptions = ['aggs', 'from', 'sort']; // check if query or options are valid - non-empty
+      var componentQueryOptions = options;
+      var validOptions = ['aggs', 'from', 'sort']; // check if query or componentQueryOptions are valid - non-empty
 
-      if (queryObj && !!Object.keys(queryObj).length || options && Object.keys(options).some(function (item) {
+      if (queryObj && !!Object.keys(queryObj).length || componentQueryOptions && Object.keys(componentQueryOptions).some(function (item) {
         return validOptions.includes(item);
       })) {
         var _extends2;
@@ -267,14 +324,14 @@ function initReactivesearch(componentCollection, searchState, settings) {
 
         orderOfQueries = [].concat(orderOfQueries, [component.componentId]);
 
-        var currentQuery = _extends(_extends({
+        var currentQuery = _extends({
           query: _extends({}, queryObj)
-        }, options), queryOptions[component.componentId]);
+        }, componentQueryOptions, queryOptions[component.componentId]);
 
-        queryLog = _extends(_extends({}, queryLog), {}, (_extends2 = {}, _extends2[component.componentId] = currentQuery, _extends2));
+        queryLog = _extends({}, queryLog, (_extends2 = {}, _extends2[component.componentId] = currentQuery, _extends2));
 
         if (settings.enableAppbase) {
-          var query = getRSQuery(component.componentId, extractPropsFromState(state, component.componentId, queryOptions && queryOptions[component.componentId] ? {
+          var query = getRSQuery(component.componentId, extractPropsFromState(state, component.componentId, queryOptions && Object.keys(queryOptions[component.componentId]).length ? {
             from: queryOptions[component.componentId].from
           } : null));
 
@@ -282,11 +339,12 @@ function initReactivesearch(componentCollection, searchState, settings) {
             var _extends3;
 
             // Apply dependent queries
-            appbaseQuery = _extends(_extends(_extends({}, appbaseQuery), (_extends3 = {}, _extends3[component.componentId] = query, _extends3)), getDependentQueries(state, component.componentId, orderOfQueries));
+            appbaseQuery = _extends({}, appbaseQuery, (_extends3 = {}, _extends3[component.componentId] = query, _extends3), getDependentQueries(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]);
         }
       }
@@ -312,10 +370,15 @@ function initReactivesearch(componentCollection, searchState, settings) {
             if (response.aggregations) {
               var _extends4;
 
-              aggregations = _extends(_extends({}, aggregations), {}, (_extends4 = {}, _extends4[component] = response.aggregations, _extends4));
+              aggregations = _extends({}, aggregations, (_extends4 = {}, _extends4[component] = response.aggregations, _extends4));
+              compositeAggregations = compositeAggsReducer(compositeAggregations, {
+                type: UPDATE_COMPOSITE_AGGS,
+                aggregations: response.aggregations,
+                append: false
+              });
             }
 
-            hits = _extends(_extends({}, hits), {}, (_extends5 = {}, _extends5[component] = {
+            hits = _extends({}, hits, (_extends5 = {}, _extends5[component] = {
               hits: response.hits.hits,
               total: typeof response.hits.total === 'object' ? response.hits.total.value : response.hits.total,
               time: response.took
@@ -327,7 +390,7 @@ function initReactivesearch(componentCollection, searchState, settings) {
         });
       });
       Promise.all(allPromises).then(function () {
-        state = _extends(_extends({}, state), {}, {
+        state = _extends({}, state, {
           hits: hits,
           aggregations: aggregations
         });
@@ -339,6 +402,8 @@ function initReactivesearch(componentCollection, searchState, settings) {
       var promotedResults = {};
       var rawData = {};
       var customData = {};
+      var settingsResponse = {};
+      var timestamp = {};
       var allPromises = orderOfQueries.map(function (component) {
         return new Promise(function (responseResolve, responseReject) {
           handleTransformResponse(res[component], component).then(function (response) {
@@ -347,7 +412,7 @@ function initReactivesearch(componentCollection, searchState, settings) {
 
               if (response.promoted) {
                 promotedResults[component] = response.promoted.map(function (promoted) {
-                  return _extends(_extends({}, promoted.doc), {}, {
+                  return _extends({}, promoted.doc, {
                     _position: promoted.position
                   });
                 });
@@ -357,15 +422,21 @@ function initReactivesearch(componentCollection, searchState, settings) {
 
               if (response.customData) {
                 customData[component] = response.customData;
+              } // Update settings
+
+
+              if (response.settings) {
+                settingsResponse[component] = response.settings;
               }
 
               if (response.aggregations) {
                 var _extends6;
 
-                aggregations = _extends(_extends({}, aggregations), {}, (_extends6 = {}, _extends6[component] = response.aggregations, _extends6));
+                aggregations = _extends({}, aggregations, (_extends6 = {}, _extends6[component] = response.aggregations, _extends6));
               }
 
-              hits = _extends(_extends({}, hits), {}, (_extends7 = {}, _extends7[component] = {
+              timestamp[component] = res._timestamp;
+              hits = _extends({}, hits, (_extends7 = {}, _extends7[component] = {
                 hits: response.hits.hits,
                 total: typeof response.hits.total === 'object' ? response.hits.total.value : response.hits.total,
                 time: response.took
@@ -378,10 +449,13 @@ function initReactivesearch(componentCollection, searchState, settings) {
         });
       });
       Promise.all(allPromises).then(function () {
-        state = _extends(_extends({}, state), {}, {
+        state = _extends({}, state, {
           hits: hits,
+          timestamp: timestamp,
           aggregations: aggregations,
+          compositeAggregations: compositeAggregations,
           promotedResults: promotedResults,
+          settings: settingsResponse,
           customData: customData,
           rawData: rawData
         });