react-instantsearch-core 6.26.0 → 6.29.0

package/dist/cjs/core/version.js

@@ -4,5 +4,5 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _default = '6.26.0';
+var _default = '6.29.0';
 exports.default = _default;

package/dist/cjs/widgets/DynamicWidgets.js

@@ -21,21 +21,25 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof3(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
-function getAttribute(component) {
-  if ((0, _typeof2.default)(component) !== 'object') {
+function isReactElement(element) {
+  return (0, _typeof2.default)(element) === 'object' && element.props;
+}
+
+function getAttribute(element) {
+  if (!isReactElement(element)) {
     return undefined;
   }
 
-  if (component.props.attribute) {
-    return component.props.attribute;
+  if (element.props.attribute) {
+    return element.props.attribute;
   }
 
-  if (Array.isArray(component.props.attributes)) {
-    return component.props.attributes[0];
+  if (Array.isArray(element.props.attributes)) {
+    return element.props.attributes[0];
   }
 
-  if (component.props.children) {
-    return getAttribute(_react.default.Children.only(component.props.children));
+  if (element.props.children) {
+    return getAttribute(_react.default.Children.only(element.props.children));
   }
 
   return undefined;

package/dist/es/core/version.js

@@ -1 +1 @@
-export default '6.26.0';
+export default '6.29.0';

package/dist/es/widgets/DynamicWidgets.js

@@ -3,21 +3,25 @@ import React, { Fragment } from 'react';
 import { getDisplayName } from "../core/utils.js";
 import connectDynamicWidgets from "../connectors/connectDynamicWidgets.js";
 
-function getAttribute(component) {
-  if (_typeof(component) !== 'object') {
+function isReactElement(element) {
+  return _typeof(element) === 'object' && element.props;
+}
+
+function getAttribute(element) {
+  if (!isReactElement(element)) {
     return undefined;
   }
 
-  if (component.props.attribute) {
-    return component.props.attribute;
+  if (element.props.attribute) {
+    return element.props.attribute;
   }
 
-  if (Array.isArray(component.props.attributes)) {
-    return component.props.attributes[0];
+  if (Array.isArray(element.props.attributes)) {
+    return element.props.attributes[0];
   }
 
-  if (component.props.children) {
-    return getAttribute(React.Children.only(component.props.children));
+  if (element.props.children) {
+    return getAttribute(React.Children.only(element.props.children));
   }
 
   return undefined;

package/dist/umd/ReactInstantSearchCore.js

@@ -1,4 +1,4 @@
-/*! React InstantSearchCore 6.26.0 | © Algolia, inc. | https://github.com/algolia/react-instantsearch */
+/*! React InstantSearchCore 6.29.0 | © Algolia, inc. | https://github.com/algolia/react-instantsearch */
 (function (global, factory) {
   typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('react')) :
   typeof define === 'function' && define.amd ? define(['exports', 'react'], factory) :
@@ -848,7 +848,7 @@
     });
   }
 
-  var version = '6.26.0';
+  var version = '6.29.0';
 
   function _createSuper$1(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct$1(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
 
@@ -3242,20 +3242,24 @@
   /**
    * Replaces a leading - with \-
    * @private
-   * @param {string} value the facet value to replace
-   * @returns string
+   * @param {any} value the facet value to replace
+   * @returns any
    */
   function escapeFacetValue(value) {
-    return value.replace(/^-/, '\\-');
+    if (typeof value !== 'string') return value;
+
+    return String(value).replace(/^-/, '\\-');
   }
 
   /**
    * Replaces a leading \- with -
    * @private
-   * @param {string} value the escaped facet value
-   * @returns string
+   * @param {any} value the escaped facet value
+   * @returns any
    */
   function unescapeFacetValue$1(value) {
+    if (typeof value !== 'string') return value;
+
     return value.replace(/^\\-/, '-');
   }
 
@@ -3980,7 +3984,7 @@
       nextDisjunctiveResult++;
     });
 
-    // if we have some root level values for hierarchical facets, merge them
+    // if we have some parent level values for hierarchical facets, merge them
     state.getRefinedHierarchicalFacets().forEach(function(refinedFacet) {
       var hierarchicalFacet = state.getHierarchicalFacetByName(refinedFacet);
       var separator = state._getHierarchicalFacetSeparator(hierarchicalFacet);
@@ -3992,47 +3996,49 @@
         return;
       }
 
-      var result = results[nextDisjunctiveResult];
-      var facets = result && result.facets
-        ? result.facets
-        : {};
-      Object.keys(facets).forEach(function(dfacet) {
-        var facetResults = facets[dfacet];
-        var position = findIndex(state.hierarchicalFacets, function(f) {
-          return f.name === hierarchicalFacet.name;
-        });
-        var attributeIndex = findIndex(self.hierarchicalFacets[position], function(f) {
-          return f.attribute === dfacet;
-        });
+      results.slice(nextDisjunctiveResult).forEach(function(result) {
+        var facets = result && result.facets
+          ? result.facets
+          : {};
 
-        // previous refinements and no results so not able to find it
-        if (attributeIndex === -1) {
-          return;
-        }
+        Object.keys(facets).forEach(function(dfacet) {
+          var facetResults = facets[dfacet];
+          var position = findIndex(state.hierarchicalFacets, function(f) {
+            return f.name === hierarchicalFacet.name;
+          });
+          var attributeIndex = findIndex(self.hierarchicalFacets[position], function(f) {
+            return f.attribute === dfacet;
+          });
 
-        // when we always get root levels, if the hits refinement is `beers > IPA` (count: 5),
-        // then the disjunctive values will be `beers` (count: 100),
-        // but we do not want to display
-        //   | beers (100)
-        //     > IPA (5)
-        // We want
-        //   | beers (5)
-        //     > IPA (5)
-        var defaultData = {};
-
-        if (currentRefinement.length > 0) {
-          var root = currentRefinement[0].split(separator)[0];
-          defaultData[root] = self.hierarchicalFacets[position][attributeIndex].data[root];
-        }
+          // previous refinements and no results so not able to find it
+          if (attributeIndex === -1) {
+            return;
+          }
 
-        self.hierarchicalFacets[position][attributeIndex].data = defaultsPure(
-          defaultData,
-          facetResults,
-          self.hierarchicalFacets[position][attributeIndex].data
-        );
-      });
+          // when we always get root levels, if the hits refinement is `beers > IPA` (count: 5),
+          // then the disjunctive values will be `beers` (count: 100),
+          // but we do not want to display
+          //   | beers (100)
+          //     > IPA (5)
+          // We want
+          //   | beers (5)
+          //     > IPA (5)
+          var defaultData = {};
+
+          if (currentRefinement.length > 0) {
+            var root = currentRefinement[0].split(separator)[0];
+            defaultData[root] = self.hierarchicalFacets[position][attributeIndex].data[root];
+          }
 
-      nextDisjunctiveResult++;
+          self.hierarchicalFacets[position][attributeIndex].data = defaultsPure(
+            defaultData,
+            facetResults,
+            self.hierarchicalFacets[position][attributeIndex].data
+          );
+        });
+
+        nextDisjunctiveResult++;
+      });
     });
 
     // add the excludes
@@ -4836,6 +4842,17 @@
 
   var DerivedHelper_1 = DerivedHelper;
 
+  function sortObject(obj) {
+    return Object.keys(obj)
+      .sort(function(a, b) {
+        return a.localeCompare(b);
+      })
+      .reduce(function(acc, curr) {
+        acc[curr] = obj[curr];
+        return acc;
+      }, {});
+  }
+
   var requestBuilder = {
     /**
      * Get all the queries to send to the client, those queries can used directly
@@ -4860,18 +4877,38 @@
         });
       });
 
-      // maybe more to get the root level of hierarchical facets when activated
+      // More to get the parent levels of the hierarchical facets when refined
       state.getRefinedHierarchicalFacets().forEach(function(refinedFacet) {
         var hierarchicalFacet = state.getHierarchicalFacetByName(refinedFacet);
-
         var currentRefinement = state.getHierarchicalRefinement(refinedFacet);
-        // if we are deeper than level 0 (starting from `beer > IPA`)
-        // we want to get the root values
         var separator = state._getHierarchicalFacetSeparator(hierarchicalFacet);
+
+        // If we are deeper than level 0 (starting from `beer > IPA`)
+        // we want to get all parent values
         if (currentRefinement.length > 0 && currentRefinement[0].split(separator).length > 1) {
-          queries.push({
-            indexName: index,
-            params: requestBuilder._getDisjunctiveFacetSearchParams(state, refinedFacet, true)
+          // We generate a map of the filters we will use for our facet values queries
+          var filtersMap = currentRefinement[0].split(separator).slice(0, -1).reduce(
+            function createFiltersMap(map, segment, level) {
+              return map.concat({
+                attribute: hierarchicalFacet.attributes[level],
+                value: level === 0
+                  ? segment
+                  : [map[map.length - 1].value, segment].join(separator)
+              });
+            }
+          , []);
+
+          filtersMap.forEach(function(filter, level) {
+            var params = requestBuilder._getDisjunctiveFacetSearchParams(
+              state,
+              filter.attribute,
+              level === 0
+            );
+
+            var parent = filtersMap[level - 1];
+            params.facetFilters = level > 0 ? [parent.attribute + ':' + parent.value] : undefined;
+
+            queries.push({indexName: index, params: params});
           });
         }
       });
@@ -4906,7 +4943,7 @@
         additionalParams.numericFilters = numericFilters;
       }
 
-      return merge_1({}, state.getQueryParams(), additionalParams);
+      return sortObject(merge_1({}, state.getQueryParams(), additionalParams));
     },
 
     /**
@@ -4951,7 +4988,7 @@
         additionalParams.facetFilters = facetFilters;
       }
 
-      return merge_1({}, state.getQueryParams(), additionalParams);
+      return sortObject(merge_1({}, state.getQueryParams(), additionalParams));
     },
 
     /**
@@ -5144,17 +5181,17 @@
       if (typeof maxFacetHits === 'number') {
         searchForFacetSearchParameters.maxFacetHits = maxFacetHits;
       }
-      return merge_1(
+      return sortObject(merge_1(
         {},
         requestBuilder._getHitsSearchParams(stateForSearchForFacetValues),
         searchForFacetSearchParameters
-      );
+      ));
     }
   };
 
   var requestBuilder_1 = requestBuilder;
 
-  var version$1 = '3.8.0';
+  var version$1 = '3.9.0';
 
   var escapeFacetValue$3 = escapeFacetValue_1.escapeFacetValue;
 
@@ -5474,20 +5511,51 @@
    */
   AlgoliaSearchHelper.prototype.searchForFacetValues = function(facet, query, maxFacetHits, userState) {
     var clientHasSFFV = typeof this.client.searchForFacetValues === 'function';
+    var clientHasInitIndex = typeof this.client.initIndex === 'function';
     if (
       !clientHasSFFV &&
-      typeof this.client.initIndex !== 'function'
+      !clientHasInitIndex &&
+      typeof this.client.search !== 'function'
     ) {
       throw new Error(
         'search for facet values (searchable) was called, but this client does not have a function client.searchForFacetValues or client.initIndex(index).searchForFacetValues'
       );
     }
+
     var state = this.state.setQueryParameters(userState || {});
     var isDisjunctive = state.isDisjunctiveFacet(facet);
     var algoliaQuery = requestBuilder_1.getSearchForFacetQuery(facet, query, maxFacetHits, state);
 
     this._currentNbQueries++;
     var self = this;
+    var searchForFacetValuesPromise;
+    // newer algoliasearch ^3.27.1 - ~4.0.0
+    if (clientHasSFFV) {
+      searchForFacetValuesPromise = this.client.searchForFacetValues([
+        {indexName: state.index, params: algoliaQuery}
+      ]);
+      // algoliasearch < 3.27.1
+    } else if (clientHasInitIndex) {
+      searchForFacetValuesPromise = this.client
+        .initIndex(state.index)
+        .searchForFacetValues(algoliaQuery);
+      // algoliasearch ~5.0.0
+    } else {
+      // @MAJOR only use client.search
+      delete algoliaQuery.facetName;
+      searchForFacetValuesPromise = this.client
+        .search([
+          {
+            type: 'facet',
+            facet: facet,
+            indexName: state.index,
+            params: algoliaQuery
+          }
+        ])
+        .then(function processResponse(response) {
+          return response.results[0];
+        });
+    }
 
     this.emit('searchForFacetValues', {
       state: state,
@@ -5495,10 +5563,6 @@
       query: query
     });
 
-    var searchForFacetValuesPromise = clientHasSFFV
-      ? this.client.searchForFacetValues([{indexName: state.index, params: algoliaQuery}])
-      : this.client.initIndex(state.index).searchForFacetValues(algoliaQuery);
-
     return searchForFacetValuesPromise.then(function addIsRefined(content) {
       self._currentNbQueries--;
       if (self._currentNbQueries === 0) self.emit('searchQueueEmpty');
@@ -7050,21 +7114,25 @@
     }
   });
 
-  function getAttribute(component) {
-    if (_typeof(component) !== 'object') {
+  function isReactElement(element) {
+    return _typeof(element) === 'object' && element.props;
+  }
+
+  function getAttribute(element) {
+    if (!isReactElement(element)) {
       return undefined;
     }
 
-    if (component.props.attribute) {
-      return component.props.attribute;
+    if (element.props.attribute) {
+      return element.props.attribute;
     }
 
-    if (Array.isArray(component.props.attributes)) {
-      return component.props.attributes[0];
+    if (Array.isArray(element.props.attributes)) {
+      return element.props.attributes[0];
     }
 
-    if (component.props.children) {
-      return getAttribute(React__default.Children.only(component.props.children));
+    if (element.props.children) {
+      return getAttribute(React__default.Children.only(element.props.children));
     }
 
     return undefined;