react-instantsearch-core 7.5.1 → 7.5.3

package/dist/cjs/server/getServerState.js

@@ -85,9 +85,9 @@ function execute(_ref3) {
       throw new Error("Unable to retrieve InstantSearch's server state in `getServerState()`. Did you mount the <InstantSearch> component?");
     }
     return (0, _server.waitForResults)(searchRef.current);
-  }).then(function () {
+  }).then(function (requestParamsList) {
     return {
-      initialResults: (0, _server.getInitialResults)(searchRef.current.mainIndex)
+      initialResults: (0, _server.getInitialResults)(searchRef.current.mainIndex, requestParamsList)
     };
   });
 }

package/dist/cjs/version.js

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

package/dist/es/server/getServerState.js

@@ -78,9 +78,9 @@ function execute(_ref3) {
       throw new Error("Unable to retrieve InstantSearch's server state in `getServerState()`. Did you mount the <InstantSearch> component?");
     }
     return waitForResults(searchRef.current);
-  }).then(function () {
+  }).then(function (requestParamsList) {
     return {
-      initialResults: getInitialResults(searchRef.current.mainIndex)
+      initialResults: getInitialResults(searchRef.current.mainIndex, requestParamsList)
     };
   });
 }

package/dist/es/version.d.ts

@@ -1,2 +1,2 @@
-declare const _default: "7.5.1";
+declare const _default: "7.5.3";
 export default _default;

package/dist/es/version.js

@@ -1 +1 @@
-export default '7.5.1';
+export default '7.5.3';

package/dist/umd/ReactInstantSearchCore.js

@@ -7,7 +7,7 @@
 
   var React__default = 'default' in React ? React['default'] : React;
 
-  var version = '7.5.1';
+  var version = '7.5.3';
 
   // Copyright Joyent, Inc. and other Node contributors.
   //
@@ -772,9 +772,12 @@
         .sort()
         .forEach(function (facetName) {
           var facetValues = facetsRefinements[facetName] || [];
-          facetValues.sort().forEach(function (facetValue) {
-            facetFilters.push(facetName + ':' + facetValue);
-          });
+          facetValues
+            .slice()
+            .sort()
+            .forEach(function (facetValue) {
+              facetFilters.push(facetName + ':' + facetValue);
+            });
         });
 
       var facetsExcludes = state.facetsExcludes || {};
@@ -797,9 +800,12 @@
           }
           var orFilters = [];
 
-          facetValues.sort().forEach(function (facetValue) {
-            orFilters.push(facetName + ':' + facetValue);
-          });
+          facetValues
+            .slice()
+            .sort()
+            .forEach(function (facetValue) {
+              orFilters.push(facetName + ':' + facetValue);
+            });
 
           facetFilters.push(orFilters);
         });
@@ -1465,7 +1471,7 @@
       numbers.numericRefinements = numericRefinements;
     }
 
-    return merge_1({}, partialState, numbers);
+    return merge_1(partialState, numbers);
   };
 
   /**
@@ -4337,7 +4343,7 @@
 
   var SearchResults_1 = SearchResults;
 
-  var version$1 = '3.16.1';
+  var version$1 = '3.16.2';
 
   var escapeFacetValue$3 = escapeFacetValue_1.escapeFacetValue;
 
@@ -7425,13 +7431,16 @@
       return;
     }
     var cachedRequest = Object.keys(results).map(function (key) {
-      return results[key].results.map(function (result) {
-        return {
-          indexName: result.index,
-          // We normalize the params received from the server as they can
-          // be serialized differently depending on the engine.
-          params: serializeQueryParameters(deserializeQueryParameters(result.params))
-        };
+      var _results$key = results[key],
+        state = _results$key.state,
+        requestParams = _results$key.requestParams,
+        serverResults = _results$key.results;
+      return serverResults.map(function (result) {
+        return _objectSpread$5({
+          indexName: state.index || result.index
+        }, requestParams || result.params ? {
+          params: serializeQueryParameters(requestParams || deserializeQueryParameters(result.params))
+        } : {});
       });
     });
     var cachedResults = Object.keys(results).reduce(function (acc, key) {
@@ -9843,8 +9852,11 @@
         appId = _getAppIdAndApiKey2[0],
         apiKey = _getAppIdAndApiKey2[1];
       var queuedUserToken = undefined;
+      var queuedAuthenticatedUserToken = undefined;
       var userTokenBeforeInit = undefined;
-      if (Array.isArray(insightsClient.queue)) {
+      var authenticatedUserTokenBeforeInit = undefined;
+      var queue = insightsClient.queue;
+      if (Array.isArray(queue)) {
         // Context: The umd build of search-insights is asynchronously loaded by the snippet.
         //
         // When user calls `aa('setUserToken', 'my-user-token')` before `search-insights` is loaded,
@@ -9855,22 +9867,32 @@
         // At this point, even though `search-insights` is not loaded yet,
         // we still want to read the token from the queue.
         // Otherwise, the first search call will be fired without the token.
-        var _ref3 = find$1(insightsClient.queue.slice().reverse(), function (_ref5) {
-          var _ref6 = _slicedToArray$5(_ref5, 1),
-            method = _ref6[0];
-          return method === 'setUserToken';
-        }) || [];
-        var _ref4 = _slicedToArray$5(_ref3, 2);
-        queuedUserToken = _ref4[1];
+        var _map = ['setUserToken', 'setAuthenticatedUserToken'].map(function (key) {
+          var _ref3 = find$1(queue.slice().reverse(), function (_ref5) {
+              var _ref6 = _slicedToArray$5(_ref5, 1),
+                method = _ref6[0];
+              return method === key;
+            }) || [],
+            _ref4 = _slicedToArray$5(_ref3, 2),
+            value = _ref4[1];
+          return value;
+        });
+        var _map2 = _slicedToArray$5(_map, 2);
+        queuedUserToken = _map2[0];
+        queuedAuthenticatedUserToken = _map2[1];
       }
+
+      // If user called `aa('setUserToken')` or `aa('setAuthenticatedUserToken')`
+      // before creating the Insights middleware, we temporarily store the token
+      // and set it later on.
+      //
+      // Otherwise, the `init` call might override them with anonymous user token.
       insightsClient('getUserToken', null, function (_error, userToken) {
-        // If user has called `aa('setUserToken', 'my-user-token')` before creating
-        // the `insights` middleware, we store them temporarily and
-        // set it later on.
-        //
-        // Otherwise, the `init` call might override it with anonymous user token.
         userTokenBeforeInit = normalizeUserToken(userToken);
       });
+      insightsClient('getAuthenticatedUserToken', null, function (_error, userToken) {
+        authenticatedUserTokenBeforeInit = normalizeUserToken(userToken);
+      });
 
       // Only `init` if the `insightsInitParams` option is passed or
       // if the `insightsClient` version doesn't supports optional `init` calling.
@@ -9952,21 +9974,43 @@
             // We can set it as userToken.
             setUserTokenToSearch(anonymousUserToken, true);
           }
+          function setUserToken(token, userToken, authenticatedUserToken) {
+            setUserTokenToSearch(token, true);
+            if (userToken) {
+              insightsClient('setUserToken', userToken);
+            }
+            if (authenticatedUserToken) {
+              insightsClient('setAuthenticatedUserToken', authenticatedUserToken);
+            }
+          }
 
-          // We consider the `userToken` coming from a `init` call to have a higher
-          // importance than the one coming from the queue.
-          if (userTokenBeforeInit) {
-            setUserTokenToSearch(userTokenBeforeInit, true);
-            insightsClient('setUserToken', userTokenBeforeInit);
-          } else if (queuedUserToken) {
-            setUserTokenToSearch(queuedUserToken, true);
-            insightsClient('setUserToken', queuedUserToken);
+          // We consider the `userToken` or `authenticatedUserToken` before an
+          // `init` call of higher importance than one from the queue.
+          var tokenBeforeInit = authenticatedUserTokenBeforeInit || userTokenBeforeInit;
+          var queuedToken = queuedAuthenticatedUserToken || queuedUserToken;
+          if (tokenBeforeInit) {
+            setUserToken(tokenBeforeInit, userTokenBeforeInit, authenticatedUserTokenBeforeInit);
+          } else if (queuedToken) {
+            setUserToken(queuedToken, queuedUserToken, queuedAuthenticatedUserToken);
           }
 
           // This updates userToken which is set explicitly by `aa('setUserToken', userToken)`
           insightsClient('onUserTokenChange', setUserTokenToSearch, {
             immediate: true
           });
+
+          // This updates userToken which is set explicitly by `aa('setAuthenticatedtUserToken', authenticatedUserToken)`
+          insightsClient('onAuthenticatedUserTokenChange', function (authenticatedUserToken) {
+            // If we're unsetting the `authenticatedUserToken`, we revert to the `userToken`
+            if (!authenticatedUserToken) {
+              insightsClient('getUserToken', null, function (_, userToken) {
+                setUserTokenToSearch(userToken);
+              });
+            }
+            setUserTokenToSearch(authenticatedUserToken);
+          }, {
+            immediate: true
+          });
           var insightsClientWithLocalCredentials = insightsClient;
           if (isModernInsightsClient(insightsClient)) {
             insightsClientWithLocalCredentials = function insightsClientWithLocalCredentials(method, payload) {
@@ -9999,6 +10043,7 @@
         },
         unsubscribe: function unsubscribe() {
           insightsClient('onUserTokenChange', undefined);
+          insightsClient('onAuthenticatedUserTokenChange', undefined);
           instantSearchInstance.sendEventToInsights = noop;
           if (helper && initialParameters) {
             helper.overrideStateWithoutTriggeringChangeEvent(_objectSpread$b(_objectSpread$b({}, helper.state), initialParameters));
@@ -11661,7 +11706,7 @@
     };
   }
 
-  var version$2 = '4.63.1';
+  var version$2 = '4.64.1';
 
   function _typeof$k(obj) {
     "@babel/helpers - typeof";
@@ -12129,9 +12174,7 @@
 
       /**
        * Ends the initialization of InstantSearch.js and triggers the
-       * first search. This method should be called after all widgets have been added
-       * to the instance of InstantSearch.js. InstantSearch.js also supports adding and removing
-       * widgets after the start as an **EXPERIMENTAL** feature.
+       * first search.
        */
     }, {
       key: "start",
@@ -12282,9 +12325,7 @@
       }
 
       /**
-       * Removes all widgets without triggering a search afterwards. This is an **EXPERIMENTAL** feature,
-       * if you find an issue with it, please
-       * [open an issue](https://github.com/algolia/instantsearch/issues/new?title=Problem%20with%20dispose).
+       * Removes all widgets without triggering a search afterwards.
        * @return {undefined} This method does not return anything
        */
     }, {
@@ -15328,7 +15369,7 @@
         dispose: function dispose(_ref4) {
           var state = _ref4.state;
           unmountFn();
-          return state.clearRefinements(attribute);
+          return state.removeNumericRefinement(attribute);
         },
         getWidgetUiState: function getWidgetUiState(uiState, _ref5) {
           var searchParameters = _ref5.searchParameters;
@@ -15348,11 +15389,11 @@
         getWidgetSearchParameters: function getWidgetSearchParameters(searchParameters, _ref6) {
           var uiState = _ref6.uiState;
           var value = uiState.numericMenu && uiState.numericMenu[attribute];
-          var withoutRefinements = searchParameters.clearRefinements(attribute);
+          var withoutRefinements = searchParameters.setQueryParameters({
+            numericRefinements: _objectSpread$p(_objectSpread$p({}, searchParameters.numericRefinements), {}, _defineProperty$r({}, attribute, {}))
+          });
           if (!value) {
-            return withoutRefinements.setQueryParameters({
-              numericRefinements: _objectSpread$p(_objectSpread$p({}, withoutRefinements.numericRefinements), {}, _defineProperty$r({}, attribute, {}))
-            });
+            return withoutRefinements;
           }
           var isExact = value.indexOf(':') === -1;
           if (isExact) {
@@ -16790,8 +16831,7 @@
             return searchParameters;
           }
           var values = uiState.refinementList && uiState.refinementList[attribute];
-          var withoutRefinements = searchParameters.clearRefinements(attribute);
-          var withFacetConfiguration = isDisjunctive ? withoutRefinements.addDisjunctiveFacet(attribute) : withoutRefinements.addFacet(attribute);
+          var withFacetConfiguration = isDisjunctive ? searchParameters.addDisjunctiveFacet(attribute).removeDisjunctiveFacetRefinement(attribute) : searchParameters.addFacet(attribute).removeFacetRefinement(attribute);
           var currentMaxValuesPerFacet = withFacetConfiguration.maxValuesPerFacet || 0;
           var nextMaxValuesPerFacet = Math.max(currentMaxValuesPerFacet, showMore ? showMoreLimit : limit);
           var withMaxValuesPerFacet = withFacetConfiguration.setQueryParameter('maxValuesPerFacet', nextMaxValuesPerFacet);
@@ -17640,7 +17680,7 @@
           if (searchParameters.isHierarchicalFacet(attribute) || searchParameters.isConjunctiveFacet(attribute)) {
             return searchParameters;
           }
-          var withFacetConfiguration = searchParameters.clearRefinements(attribute).addDisjunctiveFacet(attribute);
+          var withFacetConfiguration = searchParameters.addDisjunctiveFacet(attribute).removeDisjunctiveFacetRefinement(attribute);
           var isRefined = Boolean(uiState.toggle && uiState.toggle[attribute]);
           if (isRefined) {
             if (on) {
@@ -17892,12 +17932,26 @@
    */
   function waitForResults(search) {
     var helper = search.mainHelper;
+
+    // Extract search parameters from the search client to use them
+    // later during hydration.
+    var requestParamsList;
+    var client = helper.getClient();
+    helper.setClient({
+      search: function search(queries) {
+        requestParamsList = queries.map(function (_ref) {
+          var params = _ref.params;
+          return params;
+        });
+        return client.search(queries);
+      }
+    });
     helper.searchOnlyWithDerivedHelpers();
     return new Promise(function (resolve, reject) {
       // All derived helpers resolve in the same tick so we're safe only relying
       // on the first one.
       helper.derivedHelpers[0].on('result', function () {
-        resolve();
+        resolve(requestParamsList);
       });
 
       // However, we listen to errors that can happen on any derived helper because
@@ -17919,17 +17973,26 @@
   /**
    * Walks the InstantSearch root index to construct the initial results.
    */
-  function getInitialResults(rootIndex) {
+  function getInitialResults(rootIndex,
+  /**
+   * Search parameters sent to the search client,
+   * returned by `waitForResults()`.
+   */
+  requestParamsList) {
     var initialResults = {};
+    var requestParamsIndex = 0;
     walkIndex(rootIndex, function (widget) {
       var searchResults = widget.getResults();
       if (searchResults) {
-        initialResults[widget.getIndexId()] = {
+        var requestParams = requestParamsList === null || requestParamsList === void 0 ? void 0 : requestParamsList[requestParamsIndex++];
+        initialResults[widget.getIndexId()] = _objectSpread$y({
           // We convert the Helper state to a plain object to pass parsable data
           // structures from server to client.
           state: _objectSpread$y({}, searchResults._state),
           results: searchResults._rawResults
-        };
+        }, requestParams && {
+          requestParams: requestParams
+        });
       }
     });
     if (Object.keys(initialResults).length === 0) {
@@ -18014,9 +18077,9 @@
         throw new Error("Unable to retrieve InstantSearch's server state in `getServerState()`. Did you mount the <InstantSearch> component?");
       }
       return waitForResults(searchRef.current);
-    }).then(function () {
+    }).then(function (requestParamsList) {
       return {
-        initialResults: getInitialResults(searchRef.current.mainIndex)
+        initialResults: getInitialResults(searchRef.current.mainIndex, requestParamsList)
       };
     });
   }