@appbaseio/reactivesearch-vue 1.27.0-gamma.2 → 1.28.0

package/dist/cjs/index.js

@@ -27,19 +27,18 @@ require('appbase-js');
 require('url-search-params-polyfill');
 var ReactiveBase = require('./ReactiveBase.js');
 require('hotkeys-js');
-var DataSearch = require('./DataSearch-37dfdf39.js');
+var DataSearch = require('./DataSearch.js');
 require('./CancelSvg-4aa35935.js');
-require('./Input-a9ee53ed.js');
+require('./Input-3cc3fa59.js');
 require('compute-scroll-into-view');
 require('./Container-526efa6a.js');
 require('vue-highlight-words');
-var install = require('./install-d95c7185.js');
 require('@appbaseio/reactivecore/lib/utils/suggestions');
 require('./FormControlList-808dbcef.js');
 require('./utils-1219e1fe.js');
 var SingleList = require('./SingleList.js');
 var MultiList = require('./MultiList.js');
-require('./DropDown-0076babc.js');
+require('./DropDown-7aa3d0d2.js');
 var SingleDropdownList = require('./SingleDropdownList.js');
 var MultiDropdownList = require('./MultiDropdownList.js');
 var ToggleButton = require('./ToggleButton.js');
@@ -65,22 +64,21 @@ require('@appbaseio/reactivecore/lib/actions/utils');
 var initReactivesearch = require('./initReactivesearch.js');
 var version = require('./version.js');
 var RangeInput = require('./RangeInput.js');
+var install = require('./install.js');
 
 // Add polyfills to support in IE
 
 if (typeof window !== 'undefined' && window.Vue) {
-  install.install(window.Vue);
+  install.default(window.Vue);
 }
 var index = {
   version: version.default,
-  install: install.install
+  install: install.default
 };
 
 exports.ReactiveList = ReactiveList.default;
 exports.ReactiveBase = ReactiveBase.default;
-exports.DataSearch = DataSearch.DataSearch;
-exports.SearchBox = install.SearchBox;
-exports.install = install.install;
+exports.DataSearch = DataSearch.default;
 exports.SingleList = SingleList.default;
 exports.MultiList = MultiList.default;
 exports.SingleDropdownList = SingleDropdownList.default;
@@ -98,4 +96,5 @@ exports.StateProvider = StateProvider.default;
 exports.initReactivesearch = initReactivesearch.default;
 exports.version = version.default;
 exports.RangeInput = RangeInput.default;
+exports.install = install.default;
 exports.default = index;

package/dist/cjs/initReactivesearch.js

@@ -18,10 +18,10 @@ var dependencyTreeReducer = _interopDefault(require('@appbaseio/reactivecore/lib
 var fetchGraphQL = _interopDefault(require('@appbaseio/reactivecore/lib/utils/graphQL'));
 var utils = require('@appbaseio/reactivecore/lib/actions/utils');
 
-var _excluded = ["aggs", "size"];
+var _excluded = ["aggs", "size"],
+    _excluded2 = ["query"],
+    _excluded3 = ["query"];
 var X_SEARCH_CLIENT = 'ReactiveSearch Vue';
-var componentsWithHighlightQuery = [constants.componentTypes.dataSearch, constants.componentTypes.categorySearch];
-var componentsWithOptions = [constants.componentTypes.reactiveList, constants.componentTypes.reactiveMap, constants.componentTypes.singleList, constants.componentTypes.multiList, constants.componentTypes.tagCloud].concat(componentsWithHighlightQuery);
 var componentsWithoutFilters = [constants.componentTypes.numberBox, constants.componentTypes.ratingsFilter];
 var resultComponents = [constants.componentTypes.reactiveList, constants.componentTypes.reactiveMap];
 
@@ -55,23 +55,40 @@ function parseValue(value, component) {
   }
 
   return value;
-}
+} // Returns query DSL with query property and other options
+
+
+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 _rollupPluginBabelHelpers._extends({
+      query: helper.extractQueryFromCustomQuery(defaultQuery)
+    }, helper.getOptionsForCustomQuery(defaultQuery));
+  }
 
-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
+  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 _rollupPluginBabelHelpers._extends({
+      query: helper.extractQueryFromCustomQuery(customQuery)
+    }, helper.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) {
@@ -126,6 +143,11 @@ function initReactivesearch(componentCollection, searchState, settings) {
         }
       });
       var isInternalComponentPresent = false;
+
+      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;
@@ -157,74 +179,66 @@ function initReactivesearch(componentCollection, searchState, settings) {
 
       if (component.defaultQuery && typeof component.defaultQuery === 'function') {
         defaultQueries[component.componentId] = component.defaultQuery(value, compProps);
-      } // [2] set query options - main component query (valid for result components)
-
+      }
 
-      if (componentsWithOptions.includes(componentType)) {
-        var options = component.source.generateQueryOptions ? component.source.generateQueryOptions(component) : null;
-        var highlightQuery = {};
+      var componentQueryOptions = {}; // [2] set query options - main component query (valid for result components)
 
-        if (componentsWithHighlightQuery.includes(componentType) && component.highlight) {
-          highlightQuery = component.source.highlightQuery(component);
-        }
+      if (component && component.source.generateQueryOptions) {
+        componentQueryOptions = _rollupPluginBabelHelpers._extends({}, componentQueryOptions, component.source.generateQueryOptions(component));
+      }
 
-        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 = _rollupPluginBabelHelpers._objectWithoutPropertiesLoose(_ref, _excluded);
-
-          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 highlightQuery = {};
 
+      if (component.source.highlightQuery) {
+        highlightQuery = component.source.highlightQuery(component);
+      }
 
-          if (otherQueryOptions && Object.keys(otherQueryOptions).length || highlightQuery && Object.keys(highlightQuery).length) {
-            if (!otherQueryOptions) otherQueryOptions = {};
-            if (!highlightQuery) 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 = _rollupPluginBabelHelpers._objectWithoutPropertiesLoose(_ref, _excluded);
+
+        if (aggs && Object.keys(aggs).length) {
+          isInternalComponentPresent = true;
+          componentQueryOptions = _rollupPluginBabelHelpers._extends({}, componentQueryOptions, {
+            aggs: aggs,
+            size: typeof size === 'undefined' ? 100 : size
+          });
+        } // sort, highlight, size, from - query should be applied on the main component
 
-            var mainQueryOptions = _rollupPluginBabelHelpers._extends({}, otherQueryOptions, highlightQuery, {
-              size: size
-            });
 
-            if (isInternalComponentPresent) {
-              mainQueryOptions = _rollupPluginBabelHelpers._extends({}, otherQueryOptions, highlightQuery);
-            }
+        if (otherQueryOptions && Object.keys(otherQueryOptions).length || highlightQuery && Object.keys(highlightQuery).length) {
+          if (!otherQueryOptions) otherQueryOptions = {};
+          if (!highlightQuery) highlightQuery = {};
 
-            if (isResultComponent) {
-              var currentPage = component.currentPage ? component.currentPage - 1 : 0;
+          var mainQueryOptions = _rollupPluginBabelHelpers._extends({}, otherQueryOptions, highlightQuery, {
+            size: size
+          });
 
-              if (selectedValues[component.componentId] && selectedValues[component.componentId].value) {
-                currentPage = selectedValues[component.componentId].value - 1 || 0;
-              }
+          if (isInternalComponentPresent) {
+            mainQueryOptions = _rollupPluginBabelHelpers._extends({}, otherQueryOptions, highlightQuery);
+          }
 
-              var resultSize = component.size || 10;
-              var from = currentPage * resultSize; // Update props for RS API
+          if (isResultComponent) {
+            var currentPage = component.currentPage ? component.currentPage - 1 : 0;
 
-              compProps.from = from;
-              mainQueryOptions = _rollupPluginBabelHelpers._extends({}, mainQueryOptions, highlightQuery, {
-                size: resultSize,
-                from: from
-              });
+            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: _rollupPluginBabelHelpers._extends({}, mainQueryOptions)
+            var resultSize = component.size || 10;
+            var from = currentPage * resultSize; // Update props for RS API
+
+            compProps.from = from;
+            mainQueryOptions = _rollupPluginBabelHelpers._extends({}, mainQueryOptions, highlightQuery, {
+              size: resultSize,
+              from: from
             });
           }
+
+          componentQueryOptions = _rollupPluginBabelHelpers._extends({}, componentQueryOptions, mainQueryOptions);
         }
       } // [3] set dependency tree
 
@@ -242,25 +256,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, value, componentType),
-            query = _getQuery.query;
+      if (isInternalComponentPresent && !transform.isSearchComponent(component.componentType)) {
+        var _ref2 = getDefaultQuery(component, value) || {},
+            defaultQuery = _ref2.query,
+            defaultQueryOptions = _rollupPluginBabelHelpers._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: _rollupPluginBabelHelpers._extends({}, componentQueryOptions, defaultQueryOptions)
         });
-      } // Set component type in component props
+      }
+
+      var _ref3 = getCustomQuery(component, value) || {},
+          query = _ref3.query,
+          options = _rollupPluginBabelHelpers._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: _rollupPluginBabelHelpers._extends({}, options)
+      }); // Set component type in component props
 
       compProps.componentType = componentType;
       componentProps[component.componentId] = compProps;
@@ -283,9 +314,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;
@@ -300,7 +332,7 @@ function initReactivesearch(componentCollection, searchState, settings) {
 
         var currentQuery = _rollupPluginBabelHelpers._extends({
           query: _rollupPluginBabelHelpers._extends({}, queryObj)
-        }, options, queryOptions[component.componentId]);
+        }, componentQueryOptions, queryOptions[component.componentId]);
 
         queryLog = _rollupPluginBabelHelpers._extends({}, queryLog, (_extends2 = {}, _extends2[component.componentId] = currentQuery, _extends2));
 

package/dist/cjs/install.js

@@ -12,7 +12,7 @@ require('@appbaseio/vue-emotion');
 require('polished');
 require('./Button-11307285.js');
 require('./vueTypes-57d01f18.js');
-require('./ReactiveList.js');
+var ReactiveList = require('./ReactiveList.js');
 require('@appbaseio/reactivecore/lib/utils/transform');
 require('redux');
 require('./index-4509aa45.js');
@@ -25,37 +25,42 @@ require('./Flex-f146cdad.js');
 require('@appbaseio/reactivecore/lib/actions/analytics');
 require('appbase-js');
 require('url-search-params-polyfill');
-require('./ReactiveBase.js');
+var ReactiveBase = require('./ReactiveBase.js');
 require('hotkeys-js');
-require('./DataSearch-37dfdf39.js');
+var DataSearch = require('./DataSearch.js');
 require('./CancelSvg-4aa35935.js');
-require('./Input-a9ee53ed.js');
+require('./Input-3cc3fa59.js');
 require('compute-scroll-into-view');
 require('./Container-526efa6a.js');
 require('vue-highlight-words');
-var install = require('./install-d95c7185.js');
 require('@appbaseio/reactivecore/lib/utils/suggestions');
 require('./FormControlList-808dbcef.js');
 require('./utils-1219e1fe.js');
-require('./SingleList.js');
-require('./MultiList.js');
-require('./DropDown-0076babc.js');
-require('./SingleDropdownList.js');
-require('./MultiDropdownList.js');
-require('./ToggleButton.js');
-require('./ReactiveComponent.js');
-require('./SelectedFilters.js');
-require('./SingleRange.js');
-require('./MultiRange.js');
-require('./ResultCard.js');
-require('./ResultList.js');
+var SingleList = require('./SingleList.js');
+var MultiList = require('./MultiList.js');
+require('./DropDown-7aa3d0d2.js');
+var SingleDropdownList = require('./SingleDropdownList.js');
+var MultiDropdownList = require('./MultiDropdownList.js');
+var ToggleButton = require('./ToggleButton.js');
+var ReactiveComponent = require('./ReactiveComponent.js');
+var SelectedFilters = require('./SelectedFilters.js');
+var SingleRange = require('./SingleRange.js');
+var MultiRange = require('./MultiRange.js');
+var ResultCard = require('./ResultCard.js');
+var ResultList = require('./ResultList.js');
 require('vue-no-ssr');
 require('./ssr-0ee35a09.js');
-require('./RangeSlider.js');
-require('./DynamicRangeSlider.js');
-require('./StateProvider.js');
-require('./RangeInput.js');
+var RangeSlider = require('./RangeSlider.js');
+var DynamicRangeSlider = require('./DynamicRangeSlider.js');
+var StateProvider = require('./StateProvider.js');
+var RangeInput = require('./RangeInput.js');
 
+var components = [ReactiveList.default, ResultCard.default, ResultList.default, ReactiveBase.default, DataSearch.default, SingleList.default, MultiList.default, SingleRange.default, MultiRange.default, RangeSlider.default, DynamicRangeSlider.default, ReactiveComponent.default, SelectedFilters.default, ToggleButton.default, SingleDropdownList.default, MultiDropdownList.default, StateProvider.default, RangeInput.default];
+function install (Vue) {
+  components.map(function (component) {
+    Vue.use(component);
+    return null;
+  });
+}
 
-
-exports.default = install.install;
+exports.default = install;

package/dist/cjs/version.js

@@ -2,6 +2,6 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var version = "1.27.0-gamma.2";
+var version = "1.28.0";
 
 exports.default = version;