react-instantsearch-nextjs 0.2.4 → 0.3.0

package/dist/cjs/InitializePromise.js

@@ -1,6 +1,5 @@
 "use strict";
 
-function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -13,6 +12,12 @@ var _reactInstantsearchCore = require("react-instantsearch-core");
 var _htmlEscape = require("./htmlEscape");
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(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 _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 var _ref2 = /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null);
 function InitializePromise() {
   var _search = (0, _reactInstantsearchCore.useInstantSearchContext)();
@@ -24,7 +29,7 @@ function InitializePromise() {
   // Extract search parameters from the search client to use them
   // later during hydration.
   var requestParamsList;
-  _search.mainHelper.setClient({
+  _search.mainHelper.setClient(_objectSpread(_objectSpread({}, _search.mainHelper.getClient()), {}, {
     search: function search(queries) {
       requestParamsList = queries.map(function (_ref) {
         var params = _ref.params;
@@ -32,11 +37,23 @@ function InitializePromise() {
       });
       return _search.client.search(queries);
     }
-  });
+  }));
+  (0, _utils.resetWidgetId)();
   var waitForResults = function waitForResults() {
     return new Promise(function (resolve) {
-      _search.mainHelper.derivedHelpers[0].on('result', function () {
-        resolve();
+      var searchReceived = false;
+      var recommendReceived = false;
+      _search.mainHelper.derivedHelpers[0].once('result', function () {
+        searchReceived = true;
+        if (!_search._hasRecommendWidget || recommendReceived) {
+          resolve();
+        }
+      });
+      _search.mainHelper.derivedHelpers[0].once('recommend:result', function () {
+        recommendReceived = true;
+        if (!_search._hasSearchWidget || searchReceived) {
+          resolve();
+        }
       });
     });
   };

package/dist/cjs/TriggerSearch.js

@@ -10,8 +10,9 @@ function TriggerSearch() {
   var instantsearch = (0, _reactInstantsearchCore.useInstantSearchContext)();
   var waitForResultsRef = (0, _reactInstantsearchCore.useRSCContext)();
   if ((waitForResultsRef === null || waitForResultsRef === void 0 ? void 0 : (_waitForResultsRef$cu = waitForResultsRef.current) === null || _waitForResultsRef$cu === void 0 ? void 0 : _waitForResultsRef$cu.status) === 'pending') {
-    var _instantsearch$mainHe;
-    (_instantsearch$mainHe = instantsearch.mainHelper) === null || _instantsearch$mainHe === void 0 ? void 0 : _instantsearch$mainHe.searchOnlyWithDerivedHelpers();
+    var _instantsearch$mainHe, _instantsearch$mainHe2;
+    instantsearch._hasSearchWidget && ((_instantsearch$mainHe = instantsearch.mainHelper) === null || _instantsearch$mainHe === void 0 ? void 0 : _instantsearch$mainHe.searchOnlyWithDerivedHelpers());
+    instantsearch._hasRecommendWidget && ((_instantsearch$mainHe2 = instantsearch.mainHelper) === null || _instantsearch$mainHe2 === void 0 ? void 0 : _instantsearch$mainHe2.recommend());
   }
   return null;
 }

package/dist/es/InitializePromise.js

@@ -1,5 +1,11 @@
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 import { getInitialResults } from "instantsearch.js/es/lib/server.js";
-import { walkIndex } from "instantsearch.js/es/lib/utils/index.js";
+import { resetWidgetId, walkIndex } from "instantsearch.js/es/lib/utils/index.js";
 import { ServerInsertedHTMLContext } from "next/navigation.js";
 import React, { useContext } from 'react';
 import { useInstantSearchContext, useRSCContext, wrapPromiseWithState } from 'react-instantsearch-core';
@@ -15,7 +21,7 @@ export function InitializePromise() {
   // Extract search parameters from the search client to use them
   // later during hydration.
   var requestParamsList;
-  _search.mainHelper.setClient({
+  _search.mainHelper.setClient(_objectSpread(_objectSpread({}, _search.mainHelper.getClient()), {}, {
     search: function search(queries) {
       requestParamsList = queries.map(function (_ref) {
         var params = _ref.params;
@@ -23,11 +29,23 @@ export function InitializePromise() {
       });
       return _search.client.search(queries);
     }
-  });
+  }));
+  resetWidgetId();
   var waitForResults = function waitForResults() {
     return new Promise(function (resolve) {
-      _search.mainHelper.derivedHelpers[0].on('result', function () {
-        resolve();
+      var searchReceived = false;
+      var recommendReceived = false;
+      _search.mainHelper.derivedHelpers[0].once('result', function () {
+        searchReceived = true;
+        if (!_search._hasRecommendWidget || recommendReceived) {
+          resolve();
+        }
+      });
+      _search.mainHelper.derivedHelpers[0].once('recommend:result', function () {
+        recommendReceived = true;
+        if (!_search._hasSearchWidget || searchReceived) {
+          resolve();
+        }
       });
     });
   };

package/dist/es/TriggerSearch.js

@@ -4,8 +4,9 @@ export function TriggerSearch() {
   var instantsearch = useInstantSearchContext();
   var waitForResultsRef = useRSCContext();
   if ((waitForResultsRef === null || waitForResultsRef === void 0 ? void 0 : (_waitForResultsRef$cu = waitForResultsRef.current) === null || _waitForResultsRef$cu === void 0 ? void 0 : _waitForResultsRef$cu.status) === 'pending') {
-    var _instantsearch$mainHe;
-    (_instantsearch$mainHe = instantsearch.mainHelper) === null || _instantsearch$mainHe === void 0 ? void 0 : _instantsearch$mainHe.searchOnlyWithDerivedHelpers();
+    var _instantsearch$mainHe, _instantsearch$mainHe2;
+    instantsearch._hasSearchWidget && ((_instantsearch$mainHe = instantsearch.mainHelper) === null || _instantsearch$mainHe === void 0 ? void 0 : _instantsearch$mainHe.searchOnlyWithDerivedHelpers());
+    instantsearch._hasRecommendWidget && ((_instantsearch$mainHe2 = instantsearch.mainHelper) === null || _instantsearch$mainHe2 === void 0 ? void 0 : _instantsearch$mainHe2.recommend());
   }
   return null;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-instantsearch-nextjs",
-  "version": "0.2.4",
+  "version": "0.3.0",
   "description": "React InstantSearch SSR utilities for Next.js",
   "types": "dist/es/index.d.ts",
   "main": "dist/cjs/index.js",
@@ -49,13 +49,13 @@
     "watch:es": "yarn --silent build:es:base --watch"
   },
   "devDependencies": {
-    "instantsearch.js": "4.68.1",
+    "instantsearch.js": "4.70.0",
     "next": "13.5.1",
-    "react-instantsearch-core": "7.8.1"
+    "react-instantsearch-core": "7.10.0"
   },
   "peerDependencies": {
     "next": ">= 13.4 && < 15",
     "react-instantsearch": ">= 7.1.0 && < 8"
   },
-  "gitHead": "1984f6c5d141e72801e4875ed34723485cdc10bd"
+  "gitHead": "5bf02d0f65e6e1fc70265319dbad660696d8ba81"
 }