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

package/dist/es/index.js

@@ -23,20 +23,18 @@ import 'appbase-js';
 import 'url-search-params-polyfill';
 export { default as ReactiveBase } from './ReactiveBase.js';
 import 'hotkeys-js';
-export { D as DataSearch } from './DataSearch-77325036.js';
+export { default as DataSearch } from './DataSearch.js';
 import './CancelSvg-c2c03a35.js';
-import './Input-10b1d62d.js';
+import './Input-08bb1bcf.js';
 import 'compute-scroll-into-view';
 import './Container-18b03fde.js';
 import 'vue-highlight-words';
-import { i as install } from './install-432674ef.js';
-export { S as SearchBox, i as install } from './install-432674ef.js';
 import '@appbaseio/reactivecore/lib/utils/suggestions';
 import './FormControlList-704f8dee.js';
 import './utils-64a2e5f0.js';
 export { default as SingleList } from './SingleList.js';
 export { default as MultiList } from './MultiList.js';
-import './DropDown-0dd8f2a3.js';
+import './DropDown-60a426a2.js';
 export { default as SingleDropdownList } from './SingleDropdownList.js';
 export { default as MultiDropdownList } from './MultiDropdownList.js';
 export { default as ToggleButton } from './ToggleButton.js';
@@ -63,6 +61,8 @@ export { default as initReactivesearch } from './initReactivesearch.js';
 import version from './version.js';
 export { default as version } from './version.js';
 export { default as RangeInput } from './RangeInput.js';
+import install from './install.js';
+export { default as install } from './install.js';
 
 // Add polyfills to support in IE
 

package/dist/es/initReactivesearch.js

@@ -1,7 +1,7 @@
 import { a as _extends, b as _objectWithoutPropertiesLoose } from './_rollupPluginBabelHelpers-0f24d612.js';
 import { validProps, componentTypes } from '@appbaseio/reactivecore/lib/utils/constants';
-import { pushToAndClause, buildQuery } from '@appbaseio/reactivecore/lib/utils/helper';
-import { getRSQuery, extractPropsFromState, getDependentQueries } from '@appbaseio/reactivecore/lib/utils/transform';
+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';
@@ -12,10 +12,10 @@ import dependencyTreeReducer from '@appbaseio/reactivecore/lib/reducers/dependen
 import fetchGraphQL from '@appbaseio/reactivecore/lib/utils/graphQL';
 import { isPropertyDefined } from '@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 = [componentTypes.dataSearch, componentTypes.categorySearch];
-var componentsWithOptions = [componentTypes.reactiveList, componentTypes.reactiveMap, componentTypes.singleList, componentTypes.multiList, componentTypes.tagCloud].concat(componentsWithHighlightQuery);
 var componentsWithoutFilters = [componentTypes.numberBox, componentTypes.ratingsFilter];
 var resultComponents = [componentTypes.reactiveList, componentTypes.reactiveMap];
 
@@ -49,23 +49,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 _extends({
+      query: extractQueryFromCustomQuery(defaultQuery)
+    }, 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 _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) {
@@ -120,6 +137,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;
@@ -151,74 +173,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 = _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 = _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 = _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
 
-            var mainQueryOptions = _extends({}, otherQueryOptions, highlightQuery, {
-              size: size
-            });
 
-            if (isInternalComponentPresent) {
-              mainQueryOptions = _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 = _extends({}, otherQueryOptions, highlightQuery, {
+            size: size
+          });
 
-              if (selectedValues[component.componentId] && selectedValues[component.componentId].value) {
-                currentPage = selectedValues[component.componentId].value - 1 || 0;
-              }
+          if (isInternalComponentPresent) {
+            mainQueryOptions = _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 = _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: _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
 
@@ -236,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, value, 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;
@@ -277,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;
@@ -294,7 +326,7 @@ function initReactivesearch(componentCollection, searchState, settings) {
 
         var currentQuery = _extends({
           query: _extends({}, queryObj)
-        }, options, queryOptions[component.componentId]);
+        }, componentQueryOptions, queryOptions[component.componentId]);
 
         queryLog = _extends({}, queryLog, (_extends2 = {}, _extends2[component.componentId] = currentQuery, _extends2));
 

package/dist/es/install.js

@@ -8,7 +8,7 @@ import '@appbaseio/vue-emotion';
 import 'polished';
 import './Button-91561391.js';
 import './vueTypes-687b2304.js';
-import './ReactiveList.js';
+import ReactiveList from './ReactiveList.js';
 import '@appbaseio/reactivecore/lib/utils/transform';
 import 'redux';
 import './index-78920565.js';
@@ -21,33 +21,42 @@ import './Flex-8770345d.js';
 import '@appbaseio/reactivecore/lib/actions/analytics';
 import 'appbase-js';
 import 'url-search-params-polyfill';
-import './ReactiveBase.js';
+import ReactiveBase from './ReactiveBase.js';
 import 'hotkeys-js';
-import './DataSearch-77325036.js';
+import DataSearch from './DataSearch.js';
 import './CancelSvg-c2c03a35.js';
-import './Input-10b1d62d.js';
+import './Input-08bb1bcf.js';
 import 'compute-scroll-into-view';
 import './Container-18b03fde.js';
 import 'vue-highlight-words';
-export { i as default } from './install-432674ef.js';
 import '@appbaseio/reactivecore/lib/utils/suggestions';
 import './FormControlList-704f8dee.js';
 import './utils-64a2e5f0.js';
-import './SingleList.js';
-import './MultiList.js';
-import './DropDown-0dd8f2a3.js';
-import './SingleDropdownList.js';
-import './MultiDropdownList.js';
-import './ToggleButton.js';
-import './ReactiveComponent.js';
-import './SelectedFilters.js';
-import './SingleRange.js';
-import './MultiRange.js';
-import './ResultCard.js';
-import './ResultList.js';
+import SingleList from './SingleList.js';
+import MultiList from './MultiList.js';
+import './DropDown-60a426a2.js';
+import SingleDropdownList from './SingleDropdownList.js';
+import MultiDropdownList from './MultiDropdownList.js';
+import ToggleButton from './ToggleButton.js';
+import ReactiveComponent from './ReactiveComponent.js';
+import SelectedFilters from './SelectedFilters.js';
+import SingleRange from './SingleRange.js';
+import MultiRange from './MultiRange.js';
+import ResultCard from './ResultCard.js';
+import ResultList from './ResultList.js';
 import 'vue-no-ssr';
 import './ssr-a41dfea9.js';
-import './RangeSlider.js';
-import './DynamicRangeSlider.js';
-import './StateProvider.js';
-import './RangeInput.js';
+import RangeSlider from './RangeSlider.js';
+import DynamicRangeSlider from './DynamicRangeSlider.js';
+import StateProvider from './StateProvider.js';
+import RangeInput from './RangeInput.js';
+
+var components = [ReactiveList, ResultCard, ResultList, ReactiveBase, DataSearch, SingleList, MultiList, SingleRange, MultiRange, RangeSlider, DynamicRangeSlider, ReactiveComponent, SelectedFilters, ToggleButton, SingleDropdownList, MultiDropdownList, StateProvider, RangeInput];
+function install (Vue) {
+  components.map(function (component) {
+    Vue.use(component);
+    return null;
+  });
+}
+
+export default install;

package/dist/es/version.js

@@ -1,3 +1,3 @@
-var version = "1.27.0-gamma.2";
+var version = "1.28.0";
 
 export default version;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@appbaseio/reactivesearch-vue",
-	"version": "1.27.0-gamma.2",
+	"version": "1.28.0",
 	"private": false,
 	"main": "dist/cjs/index.js",
 	"jsnext:main": "dist/es/index.js",
@@ -34,7 +34,7 @@
 	],
 	"sideEffects": false,
 	"dependencies": {
-		"@appbaseio/reactivecore": "9.14.0",
+		"@appbaseio/reactivecore": "9.14.4",
 		"@appbaseio/vue-emotion": "0.4.4",
 		"@vue/babel-helper-vue-jsx-merge-props": "^1.0.0",
 		"appbase-js": "^5.0.0",
@@ -62,10 +62,10 @@
 		"@babel/preset-env": "^7.5.5",
 		"@babel/preset-stage-2": "^7.0.0",
 		"@vue/babel-preset-jsx": "^1.1.0",
-		"eslint": "^4.12.0",
 		"eslint-config-airbnb-base": "^13.1.0",
 		"eslint-config-prettier": "^3.1.0",
 		"eslint-plugin-vue": "^4.7.1",
+		"eslint": "^4.12.0",
 		"nps": "^5.9.3",
 		"nps-utils": "^1.7.0",
 		"rollup": "^1.20.3",