react-instantsearch 7.13.8 → 7.13.10

package/dist/umd/ReactInstantSearch.js

@@ -7,7 +7,7 @@
 
   var React__default = 'default' in React ? React['default'] : React;
 
-  var version = '7.13.8';
+  var version = '7.13.10';
 
   // Copyright Joyent, Inc. and other Node contributors.
   //
@@ -1176,7 +1176,7 @@
 
       mod[attribute] = facetRefinement;
 
-      return defaultsPure({}, mod, refinementList);
+      return defaultsPure(mod, refinementList);
     },
     /**
      * Removes refinement(s) for an attribute:
@@ -2510,7 +2510,6 @@
 
       return this.setQueryParameters({
         hierarchicalFacetsRefinements: defaultsPure(
-          {},
           mod,
           this.hierarchicalFacetsRefinements
         ),
@@ -2538,7 +2537,6 @@
       mod[facet] = [path];
       return this.setQueryParameters({
         hierarchicalFacetsRefinements: defaultsPure(
-          {},
           mod,
           this.hierarchicalFacetsRefinements
         ),
@@ -2559,7 +2557,6 @@
       mod[facet] = [];
       return this.setQueryParameters({
         hierarchicalFacetsRefinements: defaultsPure(
-          {},
           mod,
           this.hierarchicalFacetsRefinements
         ),
@@ -3557,12 +3554,9 @@
     });
 
     // Make every key of the result options reachable from the instance
-    var opts = merge_1(
-      {
-        persistHierarchicalRootCount: false,
-      },
-      options
-    );
+    var opts = defaultsPure(options, {
+      persistHierarchicalRootCount: false,
+    });
     Object.keys(opts).forEach(function (key) {
       self[key] = opts[key];
     });
@@ -3829,11 +3823,16 @@
             return;
           }
 
-          self.hierarchicalFacets[position][attributeIndex].data = merge_1(
-            {},
-            self.hierarchicalFacets[position][attributeIndex].data,
-            facetResults
-          );
+          self.hierarchicalFacets[position][attributeIndex].data =
+            self.persistHierarchicalRootCount
+              ? defaultsPure(
+                  self.hierarchicalFacets[position][attributeIndex].data,
+                  facetResults
+                )
+              : defaultsPure(
+                  facetResults,
+                  self.hierarchicalFacets[position][attributeIndex].data
+                );
         } else {
           position = disjunctiveFacetsIndices[dfacet];
 
@@ -3842,7 +3841,7 @@
 
           self.disjunctiveFacets[position] = {
             name: dfacet,
-            data: defaultsPure({}, facetResults, dataFromMainRequest),
+            data: defaultsPure(dataFromMainRequest, facetResults),
             exhaustive: result.exhaustiveFacetsCount,
           };
           assignFacetStats(
@@ -4240,7 +4239,7 @@
       return undefined;
     }
 
-    var options = defaultsPure({}, opts, {
+    var options = defaultsPure(opts, {
       sortBy: SearchResults.DEFAULT_SORT,
       // if no sortBy is given, attempt to sort based on facetOrdering
       // if it is given, we still allow to sort via facet ordering first
@@ -4531,7 +4530,7 @@
 
   var sortAndMergeRecommendations_1 = sortAndMergeRecommendations;
 
-  var version$1 = '3.22.5';
+  var version$1 = '3.22.6';
 
   var escapeFacetValue$3 = escapeFacetValue_1.escapeFacetValue;
 
@@ -7801,7 +7800,10 @@
 
   // typed as any, since it accepts the _real_ js clients, not the interface we otherwise expect
   function getAppIdAndApiKey(searchClient) {
-    if (searchClient.transporter) {
+    if (searchClient.appId && searchClient.apiKey) {
+      // searchClient v5
+      return [searchClient.appId, searchClient.apiKey];
+    } else if (searchClient.transporter) {
       // searchClient v4 or v5
       var transporter = searchClient.transporter;
       var headers = transporter.headers || transporter.baseHeaders;
@@ -7902,8 +7904,9 @@
     }
     return res;
   }
-  function getRefinements(results, state) {
+  function getRefinements(_results, state) {
     var includesQuery = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
+    var results = _results || {};
     var refinements = [];
     var _state$facetsRefineme = state.facetsRefinements,
       facetsRefinements = _state$facetsRefineme === void 0 ? {} : _state$facetsRefineme,
@@ -10184,7 +10187,6 @@
       // TODO: emit "change" event when events for Recommend are implemented
     }
   }
-
   function getLocalWidgetsUiState(widgets, widgetStateOptions) {
     var initialUiState = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
     return widgets.reduce(function (uiState, widget) {
@@ -11205,7 +11207,6 @@
       $$internal = _props$$$internal === void 0 ? false : _props$$$internal,
       _props$$$automatic = props.$$automatic,
       $$automatic = _props$$$automatic === void 0 ? false : _props$$$automatic;
-    var currentTokenType;
     var potentialInsightsClient = _insightsClient;
     if (!_insightsClient && _insightsClient !== null) {
       safelyRunOnBrowser(function (_ref) {
@@ -11251,9 +11252,7 @@
         apiKey = _getAppIdAndApiKey2[1];
       var queuedInitParams = undefined;
       var queuedUserToken = undefined;
-      var queuedAuthenticatedUserToken = undefined;
       var userTokenBeforeInit = undefined;
-      var authenticatedUserTokenBeforeInit = undefined;
       var queue = insightsClient.queue;
       if (Array.isArray(queue)) {
         // Context: The umd build of search-insights is asynchronously loaded by the snippet.
@@ -11266,7 +11265,7 @@
         // 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 _map = ['setUserToken', 'setAuthenticatedUserToken', 'init'].map(function (key) {
+        var _map = ['setUserToken', 'init'].map(function (key) {
           var _ref3 = find$1(queue.slice().reverse(), function (_ref5) {
               var _ref6 = _slicedToArray$7(_ref5, 1),
                 method = _ref6[0];
@@ -11276,23 +11275,18 @@
             value = _ref4[1];
           return value;
         });
-        var _map2 = _slicedToArray$7(_map, 3);
+        var _map2 = _slicedToArray$7(_map, 2);
         queuedUserToken = _map2[0];
-        queuedAuthenticatedUserToken = _map2[1];
-        queuedInitParams = _map2[2];
+        queuedInitParams = _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.
+      // If user called `aa('setUserToken')` 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) {
         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.
@@ -11332,7 +11326,7 @@
           helper = instantSearchInstance.mainHelper;
           var queueAtStart = insightsClient.queue;
           if (Array.isArray(queueAtStart)) {
-            var _map3 = ['setUserToken', 'setAuthenticatedUserToken', 'init'].map(function (key) {
+            var _map3 = ['setUserToken', 'init'].map(function (key) {
               var _ref7 = find$1(queueAtStart.slice().reverse(), function (_ref9) {
                   var _ref10 = _slicedToArray$7(_ref9, 1),
                     method = _ref10[0];
@@ -11342,15 +11336,11 @@
                 value = _ref8[1];
               return value;
             });
-            var _map4 = _slicedToArray$7(_map3, 3);
+            var _map4 = _slicedToArray$7(_map3, 2);
             queuedUserToken = _map4[0];
-            queuedAuthenticatedUserToken = _map4[1];
-            queuedInitParams = _map4[2];
+            queuedInitParams = _map4[1];
           }
-          initialParameters = {
-            userToken: helper.state.userToken,
-            clickAnalytics: helper.state.clickAnalytics
-          };
+          initialParameters = getInitialParameters(instantSearchInstance);
 
           // We don't want to force clickAnalytics when the insights is enabled from the search response.
           // This means we don't enable insights for indices that don't opt in
@@ -11362,9 +11352,8 @@
           if (!$$internal) {
             instantSearchInstance.scheduleSearch();
           }
-          var setUserTokenToSearch = function setUserTokenToSearch(userToken, tokenType) {
-            var immediate = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
-            var unsetAuthenticatedUserToken = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
+          var setUserTokenToSearch = function setUserTokenToSearch(userToken) {
+            var immediate = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
             var normalizedUserToken = normalizeUserToken(userToken);
             if (!normalizedUserToken) {
               return;
@@ -11377,13 +11366,6 @@
               if (existingToken && existingToken !== userToken) {
                 instantSearchInstance.scheduleSearch();
               }
-              currentTokenType = tokenType;
-            }
-
-            // the authenticated user token cannot be overridden by a user or anonymous token
-            // for instant search query requests
-            if (currentTokenType && currentTokenType === 'authenticated' && tokenType === 'default' && !unsetAuthenticatedUserToken) {
-              return;
             }
 
             // Delay the token application to the next render cycle
@@ -11393,14 +11375,9 @@
               applyToken();
             }
           };
-          function setUserToken(token, userToken, authenticatedUserToken) {
-            setUserTokenToSearch(token, authenticatedUserToken ? 'authenticated' : 'default', true);
-            if (userToken) {
-              insightsClient('setUserToken', userToken);
-            }
-            if (authenticatedUserToken) {
-              insightsClient('setAuthenticatedUserToken', authenticatedUserToken);
-            }
+          function setUserToken(token) {
+            setUserTokenToSearch(token, true);
+            insightsClient('setUserToken', token);
           }
           var anonymousUserToken = undefined;
           var anonymousTokenFromInsights = getInsightsAnonymousUserTokenInternal();
@@ -11414,7 +11391,6 @@
             var token = "anonymous-".concat(createUUID());
             anonymousUserToken = token;
           }
-          var authenticatedUserTokenFromInit;
           var userTokenFromInit;
 
           // With SSR, the token could be be set on the state. We make sure
@@ -11422,36 +11398,25 @@
           // insights lib on the server.
           var tokenFromSearchParameters = initialParameters.userToken;
 
-          // When the first query is sent, the token is possibly not yet be set by
+          // When the first query is sent, the token is possibly not yet set by
           // the insights onChange callbacks (if insights isn't yet loaded).
           // It is explicitly being set here so that the first query has the
           // initial tokens set and ensure a second query isn't automatically
           // made when the onChange callback actually changes the state.
-          if (insightsInitParams) {
-            if (insightsInitParams.authenticatedUserToken) {
-              authenticatedUserTokenFromInit = insightsInitParams.authenticatedUserToken;
-            } else if (insightsInitParams.userToken) {
-              userTokenFromInit = insightsInitParams.userToken;
-            }
+          if (insightsInitParams !== null && insightsInitParams !== void 0 && insightsInitParams.userToken) {
+            userTokenFromInit = insightsInitParams.userToken;
           }
-
-          // We consider the `userToken` or `authenticatedUserToken` before an
-          // `init` call of higher importance than one from the queue and ones set
-          // from the init props to be higher than that.
-          var tokenFromInit = authenticatedUserTokenFromInit || userTokenFromInit;
-          var tokenBeforeInit = authenticatedUserTokenBeforeInit || userTokenBeforeInit;
-          var tokenFromQueue = queuedAuthenticatedUserToken || queuedUserToken;
-          if (tokenFromInit) {
-            setUserToken(tokenFromInit, userTokenFromInit, authenticatedUserTokenFromInit);
+          if (userTokenFromInit) {
+            setUserToken(userTokenFromInit);
           } else if (tokenFromSearchParameters) {
-            setUserToken(tokenFromSearchParameters, tokenFromSearchParameters, undefined);
-          } else if (tokenBeforeInit) {
-            setUserToken(tokenBeforeInit, userTokenBeforeInit, authenticatedUserTokenBeforeInit);
-          } else if (tokenFromQueue) {
-            setUserToken(tokenFromQueue, queuedUserToken, queuedAuthenticatedUserToken);
+            setUserToken(tokenFromSearchParameters);
+          } else if (userTokenBeforeInit) {
+            setUserToken(userTokenBeforeInit);
+          } else if (queuedUserToken) {
+            setUserToken(queuedUserToken);
           } else if (anonymousUserToken) {
             var _queuedInitParams;
-            setUserToken(anonymousUserToken, anonymousUserToken, undefined);
+            setUserToken(anonymousUserToken);
             if (insightsInitParams !== null && insightsInitParams !== void 0 && insightsInitParams.useCookie || (_queuedInitParams = queuedInitParams) !== null && _queuedInitParams !== void 0 && _queuedInitParams.useCookie) {
               var _queuedInitParams2;
               saveTokenAsCookie(anonymousUserToken, (insightsInitParams === null || insightsInitParams === void 0 ? void 0 : insightsInitParams.cookieDuration) || ((_queuedInitParams2 = queuedInitParams) === null || _queuedInitParams2 === void 0 ? void 0 : _queuedInitParams2.cookieDuration));
@@ -11460,20 +11425,7 @@
 
           // This updates userToken which is set explicitly by `aa('setUserToken', userToken)`
           insightsClient('onUserTokenChange', function (token) {
-            return setUserTokenToSearch(token, 'default', true);
-          }, {
-            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, 'default', true, true);
-              });
-            }
-            setUserTokenToSearch(authenticatedUserToken, 'authenticated', true);
+            return setUserTokenToSearch(token, true);
           }, {
             immediate: true
           });
@@ -11495,7 +11447,7 @@
           var lastQueryId;
           instantSearchInstance.mainHelper.derivedHelpers[0].on('result', function (_ref11) {
             var results = _ref11.results;
-            if (!results.queryID || results.queryID !== lastQueryId) {
+            if (results && (!results.queryID || results.queryID !== lastQueryId)) {
               lastQueryId = results.queryID;
               viewedObjectIDs.clear();
             }
@@ -11532,7 +11484,6 @@
         },
         unsubscribe: function unsubscribe() {
           insightsClient('onUserTokenChange', undefined);
-          insightsClient('onAuthenticatedUserTokenChange', undefined);
           instantSearchInstance.sendEventToInsights = noop$1;
           if (helper && initialParameters) {
             helper.overrideStateWithoutTriggeringChangeEvent(_objectSpread$g(_objectSpread$g({}, helper.state), initialParameters));
@@ -11542,6 +11493,16 @@
       };
     };
   }
+  function getInitialParameters(instantSearchInstance) {
+    var _instantSearchInstanc, _instantSearchInstanc2;
+    // in SSR, the initial state we use in this domain is set on the main index
+    var stateFromInitialResults = ((_instantSearchInstanc = instantSearchInstance._initialResults) === null || _instantSearchInstanc === void 0 ? void 0 : (_instantSearchInstanc2 = _instantSearchInstanc[instantSearchInstance.indexName]) === null || _instantSearchInstanc2 === void 0 ? void 0 : _instantSearchInstanc2.state) || {};
+    var stateFromHelper = instantSearchInstance.mainHelper.state;
+    return {
+      userToken: stateFromInitialResults.userToken || stateFromHelper.userToken,
+      clickAnalytics: stateFromInitialResults.clickAnalytics || stateFromHelper.clickAnalytics
+    };
+  }
   function saveTokenAsCookie(token, cookieDuration) {
     var MONTH = 30 * 24 * 60 * 60 * 1000;
     var d = new Date();
@@ -13207,7 +13168,7 @@
     };
   }
 
-  var version$3 = '4.75.5';
+  var version$3 = '4.75.7';
 
   function _typeof$q(obj) {
     "@babel/helpers - typeof";
@@ -13367,9 +13328,11 @@
   // this purposely breaks typescript's type inference to ensure it's not used
   // as it's used for a default parameter for example
   // source: https://github.com/Microsoft/TypeScript/issues/14829#issuecomment-504042546
+
   /**
    * Global options for an InstantSearch instance.
    */
+
   var INSTANTSEARCH_FUTURE_DEFAULTS = {
     preserveSharedStateOnUnmount: false,
     persistHierarchicalRootCount: false
@@ -14130,7 +14093,6 @@
       // manually inject the routing middleware in this library, and not rely
       // on the provided `routing` prop.
     }
-
     var cleanupTimerRef = React.useRef(null);
     var store = shim_1(React.useCallback(function () {
       var search = searchRef.current;
@@ -14984,7 +14946,7 @@
           function getItems() {
             if (!results) {
               return transformItems(getRefinementsItems({
-                results: {},
+                results: null,
                 helper: helper,
                 indexId: helper.state.index,
                 includedAttributes: includedAttributes,
@@ -16606,7 +16568,7 @@
             sendEvent: sendEvent,
             bindEvent: bindEvent,
             banner: banner,
-            results: results,
+            results: results || undefined,
             showPrevious: showPrevious,
             showMore: showMore,
             isFirstPage: isFirstPage,
@@ -20390,12 +20352,15 @@
       var searchResults = widget.getResults();
       var recommendResults = (_widget$getHelper = widget.getHelper()) === null || _widget$getHelper === void 0 ? void 0 : _widget$getHelper.lastRecommendResults;
       if (searchResults || recommendResults) {
-        var _searchResults$_rawRe;
+        var _searchResults$_rawRe, _requestParams$, _requestParams$2;
         var resultsCount = (searchResults === null || searchResults === void 0 ? void 0 : (_searchResults$_rawRe = searchResults._rawResults) === null || _searchResults$_rawRe === void 0 ? void 0 : _searchResults$_rawRe.length) || 0;
         var requestParams = resultsCount ? requestParamsList === null || requestParamsList === void 0 ? void 0 : requestParamsList.slice(requestParamsIndex, requestParamsIndex + resultsCount) : [];
         requestParamsIndex += resultsCount;
         initialResults[widget.getIndexId()] = _objectSpread$J(_objectSpread$J(_objectSpread$J({}, searchResults && {
-          state: _objectSpread$J({}, searchResults._state),
+          state: _objectSpread$J(_objectSpread$J({}, searchResults._state), {}, {
+            clickAnalytics: requestParams === null || requestParams === void 0 ? void 0 : (_requestParams$ = requestParams[0]) === null || _requestParams$ === void 0 ? void 0 : _requestParams$.clickAnalytics,
+            userToken: requestParams === null || requestParams === void 0 ? void 0 : (_requestParams$2 = requestParams[0]) === null || _requestParams$2 === void 0 ? void 0 : _requestParams$2.userToken
+          }),
           results: searchResults._rawResults
         }), recommendResults && {
           recommendResults: {
@@ -20470,7 +20435,7 @@
       searchRef = _ref3.searchRef,
       skipRecommend = _ref3.skipRecommend;
     return Promise.resolve().then(function () {
-      renderToString( /*#__PURE__*/React__default.createElement(InstantSearchServerContext.Provider, {
+      renderToString(/*#__PURE__*/React__default.createElement(InstantSearchServerContext.Provider, {
         value: {
           notifyServer: notifyServer
         }