@coveo/headless 4.0.0-pre.c6ea281e26 → 4.0.0-pre.d5bddfb706

package/dist/cjs/ssr-next/headless.cjs

@@ -46,9 +46,9 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
 
-// src/ssr.index.ts
-var ssr_index_exports = {};
-__export(ssr_index_exports, {
+// src/ssr-next.index.ts
+var ssr_next_index_exports = {};
+__export(ssr_next_index_exports, {
   DefaultFieldsToInclude: () => DefaultFieldsToInclude,
   EcommerceDefaultFieldsToInclude: () => EcommerceDefaultFieldsToInclude,
   MinimumFieldsToInclude: () => MinimumFieldsToInclude,
@@ -162,7 +162,7 @@ __export(ssr_index_exports, {
   parseCriterionExpression: () => parseCriterionExpression,
   validateRelativeDate: () => validateRelativeDate
 });
-module.exports = __toCommonJS(ssr_index_exports);
+module.exports = __toCommonJS(ssr_next_index_exports);
 
 // src/utils/fetch-event-source/parse.ts
 async function getBytes(stream, onChunk) {
@@ -1306,7 +1306,7 @@ var import_toolkit2 = require("@reduxjs/toolkit");
 var import_toolkit = require("@reduxjs/toolkit");
 
 // src/utils/version.ts
-var VERSION = "4.0.0-pre.c6ea281e26";
+var VERSION = "4.0.0-pre.d5bddfb706";
 var COVEO_FRAMEWORK = ["@coveo/atomic", "@coveo/quantic"];
 
 // src/api/analytics/analytics-selectors.ts
@@ -11169,7 +11169,7 @@ function loadBreadcrumbManagerReducers(engine) {
   return true;
 }
 
-// src/ssr/search/controllers/breadcrumb-manager/headless-breadcrumb-manager.ssr.ts
+// src/ssr-next/search/controllers/breadcrumb-manager/headless-breadcrumb-manager.ssr.ts
 function defineBreadcrumbManager() {
   return {
     build: (engine) => buildBreadcrumbManager(engine)
@@ -11317,13 +11317,7 @@ function buildContext(engine, props) {
   return buildCoreContext(engine, props);
 }
 
-// src/ssr/commerce/types/controller-constants.ts
-var recommendationOptionKey = "recommendation-internal-options";
-var recommendationInternalOptionKey = Symbol.for(
-  recommendationOptionKey
-);
-
-// src/ssr/common/errors.ts
+// src/ssr-next/common/errors.ts
 var MissingControllerProps = class extends Error {
   constructor(controller) {
     super();
@@ -11332,7 +11326,7 @@ var MissingControllerProps = class extends Error {
   }
 };
 
-// src/ssr/search/controllers/context/headless-context.ssr.ts
+// src/ssr-next/search/controllers/context/headless-context.ssr.ts
 function defineContext() {
   return {
     buildWithProps: (engine, props) => {
@@ -11439,7 +11433,7 @@ function loadReducers(engine) {
   return true;
 }
 
-// src/ssr/search/controllers/dictionary-field-context/headless-dictionary-field-context.ssr.ts
+// src/ssr-next/search/controllers/dictionary-field-context/headless-dictionary-field-context.ssr.ts
 function defineDictionaryFieldContext() {
   return {
     build: (engine) => buildDictionaryFieldContext(engine)
@@ -11587,7 +11581,7 @@ function buildDidYouMean(engine, props = {}) {
   };
 }
 
-// src/ssr/search/controllers/did-you-mean/headless-did-you-mean.ssr.ts
+// src/ssr-next/search/controllers/did-you-mean/headless-did-you-mean.ssr.ts
 function defineDidYouMean() {
   return {
     build: (engine) => buildDidYouMean(engine)
@@ -11677,7 +11671,7 @@ function buildFacetManager(engine) {
   return buildCoreFacetManager(engine);
 }
 
-// src/ssr/search/controllers/facet-manager/headless-facet-manager.ssr.ts
+// src/ssr-next/search/controllers/facet-manager/headless-facet-manager.ssr.ts
 function defineFacetManager() {
   return {
     build: (engine) => buildFacetManager(engine)
@@ -11896,7 +11890,7 @@ function loadAutomaticFacetGeneratorReducers(engine) {
   return true;
 }
 
-// src/ssr/search/controllers/facets/automatic-facet-generator/headless-automatic-facet-generator.ssr.ts
+// src/ssr-next/search/controllers/facets/automatic-facet-generator/headless-automatic-facet-generator.ssr.ts
 function defineAutomaticFacetGenerator(props) {
   return {
     build: (engine) => buildAutomaticFacetGenerator(engine, props)
@@ -13568,7 +13562,7 @@ function getToggleSelectAnalyticsAction(selection) {
   return isSelected ? facetDeselect() : facetSelect();
 }
 
-// src/ssr/search/controllers/facets/category-facet/headless-category-facet.ssr.ts
+// src/ssr-next/search/controllers/facets/category-facet/headless-category-facet.ssr.ts
 function defineCategoryFacet(props) {
   return {
     build: (engine) => buildCategoryFacet(engine, props)
@@ -14138,7 +14132,7 @@ function loadFacetReducers2(engine) {
   return true;
 }
 
-// src/ssr/search/controllers/facets/facet/headless-facet.ssr.ts
+// src/ssr-next/search/controllers/facets/facet/headless-facet.ssr.ts
 function defineFacet(props) {
   return {
     build: (engine) => buildFacet(engine, props)
@@ -14431,7 +14425,7 @@ function buildDateFacet(engine, props) {
   };
 }
 
-// src/ssr/search/controllers/facets/range-facet/date-facet/headless-date-facet.ssr.ts
+// src/ssr-next/search/controllers/facets/range-facet/date-facet/headless-date-facet.ssr.ts
 function defineDateFacet(props) {
   return {
     build: (engine) => buildDateFacet(engine, props)
@@ -14563,7 +14557,7 @@ function loadDateFilterReducer2(engine) {
   return true;
 }
 
-// src/ssr/search/controllers/facets/range-facet/date-facet/headless-date-filter.ssr.ts
+// src/ssr-next/search/controllers/facets/range-facet/date-facet/headless-date-filter.ssr.ts
 function defineDateFilter(props) {
   return {
     build: (engine) => buildDateFilter(engine, props)
@@ -14739,7 +14733,7 @@ function loadNumericFacetReducers2(engine) {
   return true;
 }
 
-// src/ssr/search/controllers/facets/range-facet/numeric-facet/headless-numeric-facet.ssr.ts
+// src/ssr-next/search/controllers/facets/range-facet/numeric-facet/headless-numeric-facet.ssr.ts
 function defineNumericFacet(props) {
   return {
     build: (engine) => buildNumericFacet(engine, props)
@@ -14871,7 +14865,7 @@ function loadNumericFilterReducer2(engine) {
   return true;
 }
 
-// src/ssr/search/controllers/facets/range-facet/numeric-facet/headless-numeric-filter.ssr.ts
+// src/ssr-next/search/controllers/facets/range-facet/numeric-facet/headless-numeric-filter.ssr.ts
 function defineNumericFilter(props) {
   return {
     build: (engine) => buildNumericFilter(engine, props)
@@ -14930,7 +14924,7 @@ function loadCategoryFieldSuggestionsReducers(engine) {
   return true;
 }
 
-// src/ssr/search/controllers/field-suggestions/category-facet/headless-category-field-suggestions.ssr.ts
+// src/ssr-next/search/controllers/field-suggestions/category-facet/headless-category-field-suggestions.ssr.ts
 function defineCategoryFieldSuggestions(props) {
   return {
     build: (engine) => buildCategoryFieldSuggestions(engine, props)
@@ -15003,7 +14997,7 @@ function loadFieldSuggestionsReducers(engine) {
   return true;
 }
 
-// src/ssr/search/controllers/field-suggestions/facet/headless-field-suggestions.ssr.ts
+// src/ssr-next/search/controllers/field-suggestions/facet/headless-field-suggestions.ssr.ts
 function defineFieldSuggestions(props) {
   return {
     build: (engine) => buildFieldSuggestions(engine, props)
@@ -15667,7 +15661,7 @@ function buildFoldedResultList(engine, props = {}) {
   };
 }
 
-// src/ssr/search/controllers/folded-result-list/headless-folded-result-list.ssr.ts
+// src/ssr-next/search/controllers/folded-result-list/headless-folded-result-list.ssr.ts
 function defineFoldedResultList(props) {
   return {
     build: (engine) => buildFoldedResultList(engine, props)
@@ -16065,7 +16059,7 @@ function loadHistoryManagerReducers(engine) {
   return true;
 }
 
-// src/ssr/search/controllers/history-manager/headless-history-manager.ssr.ts
+// src/ssr-next/search/controllers/history-manager/headless-history-manager.ssr.ts
 function defineHistoryManager() {
   return {
     build: (engine) => buildHistoryManager(engine)
@@ -16285,7 +16279,7 @@ function loadInstantResultsReducers(engine) {
   return true;
 }
 
-// src/ssr/search/controllers/instant-results/instant-results.ssr.ts
+// src/ssr-next/search/controllers/instant-results/instant-results.ssr.ts
 function defineInstantResults(props) {
   return {
     build: (engine) => buildInstantResults(engine, props)
@@ -16582,7 +16576,7 @@ function buildPager(engine, props = {}) {
   };
 }
 
-// src/ssr/search/controllers/pager/headless-pager.ssr.ts
+// src/ssr-next/search/controllers/pager/headless-pager.ssr.ts
 function definePager(props) {
   return {
     build: (engine) => buildPager(engine, props)
@@ -16616,7 +16610,7 @@ function buildQueryError(engine) {
   return buildCoreQueryError(engine);
 }
 
-// src/ssr/search/controllers/query-error/headless-query-error.ssr.ts
+// src/ssr-next/search/controllers/query-error/headless-query-error.ssr.ts
 function defineQueryError() {
   return {
     build: (engine) => buildQueryError(engine)
@@ -16662,7 +16656,7 @@ function buildQuerySummary(engine) {
   return buildCoreQuerySummary(engine);
 }
 
-// src/ssr/search/controllers/query-summary/headless-query-summary.ssr.ts
+// src/ssr-next/search/controllers/query-summary/headless-query-summary.ssr.ts
 function defineQuerySummary() {
   return {
     build: (engine) => buildQuerySummary(engine)
@@ -16948,7 +16942,7 @@ function loadSearchQuickviewReducers(engine) {
   return true;
 }
 
-// src/ssr/search/controllers/quickview/headless-quickview.ssr.ts
+// src/ssr-next/search/controllers/quickview/headless-quickview.ssr.ts
 function defineQuickview(props) {
   return {
     build: (engine) => buildQuickview(engine, props)
@@ -17145,7 +17139,7 @@ function loadRecentQueriesListReducer(engine) {
   return true;
 }
 
-// src/ssr/search/controllers/recent-queries-list/headless-recent-queries-list.ssr.ts
+// src/ssr-next/search/controllers/recent-queries-list/headless-recent-queries-list.ssr.ts
 function defineRecentQueriesList(props) {
   return {
     build: (engine) => buildRecentQueriesList(engine, props)
@@ -17284,7 +17278,7 @@ function loadRecentResultsListReducer(engine) {
   return true;
 }
 
-// src/ssr/search/controllers/recent-results-list/headless-recent-results-list.ssr.ts
+// src/ssr-next/search/controllers/recent-results-list/headless-recent-results-list.ssr.ts
 function defineRecentResultsList(props) {
   return {
     build: (engine) => buildRecentResultsList(engine, props)
@@ -17500,7 +17494,7 @@ function loadRelevanceInspectorReducers(engine) {
   return true;
 }
 
-// src/ssr/search/controllers/relevance-inspector/headless-relevance-inspector.ssr.ts
+// src/ssr-next/search/controllers/relevance-inspector/headless-relevance-inspector.ssr.ts
 function defineRelevanceInspector(props) {
   return {
     build: (engine) => buildRelevanceInspector(engine, props)
@@ -17515,7 +17509,7 @@ function buildResultList(engine, props) {
   });
 }
 
-// src/ssr/search/controllers/result-list/headless-result-list.ssr.ts
+// src/ssr-next/search/controllers/result-list/headless-result-list.ssr.ts
 function defineResultList(props) {
   return {
     build: (engine) => buildResultList(engine, props)
@@ -17589,7 +17583,7 @@ function loadResultsPerPageReducers2(engine) {
   return true;
 }
 
-// src/ssr/search/controllers/results-per-page/headless-results-per-page.ssr.ts
+// src/ssr-next/search/controllers/results-per-page/headless-results-per-page.ssr.ts
 function defineResultsPerPage(props) {
   return {
     build: (engine) => buildResultsPerPage(engine, props)
@@ -18040,7 +18034,7 @@ function buildSearchBox(engine, props = {}) {
   };
 }
 
-// src/ssr/search/controllers/search-box/headless-search-box.ssr.ts
+// src/ssr-next/search/controllers/search-box/headless-search-box.ssr.ts
 function defineSearchBox(props) {
   return {
     build: (engine) => buildSearchBox(engine, props)
@@ -18780,7 +18774,7 @@ function activateTabIfIdExists(state, id) {
   });
 }
 
-// src/ssr/search/controllers/search-parameter-manager/headless-search-parameter-manager.ssr.ts
+// src/ssr-next/search/controllers/search-parameter-manager/headless-search-parameter-manager.ssr.ts
 function defineSearchParameterManager() {
   return {
     buildWithProps: (engine, props) => {
@@ -18821,7 +18815,7 @@ function buildSearchStatus(engine) {
   return buildCoreStatus(engine);
 }
 
-// src/ssr/search/controllers/search-status/headless-search-status.ssr.ts
+// src/ssr-next/search/controllers/search-status/headless-search-status.ssr.ts
 function defineSearchStatus() {
   return {
     build: (engine) => buildSearchStatus(engine)
@@ -19628,7 +19622,7 @@ function buildSmartSnippet(engine, props) {
   };
 }
 
-// src/ssr/search/controllers/smart-snippet/headless-smart-snippet.ssr.ts
+// src/ssr-next/search/controllers/smart-snippet/headless-smart-snippet.ssr.ts
 function defineSmartSnippet(props) {
   return {
     build: (engine) => buildSmartSnippet(engine, props)
@@ -19804,7 +19798,7 @@ function buildSmartSnippetQuestionsList(engine, props) {
   };
 }
 
-// src/ssr/search/controllers/smart-snippet-questions-list/headless-smart-snippet-questions-list.ssr.ts
+// src/ssr-next/search/controllers/smart-snippet-questions-list/headless-smart-snippet-questions-list.ssr.ts
 function defineSmartSnippetQuestionsList(props) {
   return {
     build: (engine) => buildSmartSnippetQuestionsList(engine, props)
@@ -19885,7 +19879,7 @@ function buildSort(engine, props = {}) {
   };
 }
 
-// src/ssr/search/controllers/sort/headless-sort.ssr.ts
+// src/ssr-next/search/controllers/sort/headless-sort.ssr.ts
 function defineSort(props) {
   return {
     build: (engine) => buildSort(engine, props)
@@ -20184,7 +20178,7 @@ function loadStandaloneSearchBoxReducers(engine) {
   return true;
 }
 
-// src/ssr/search/controllers/standalone-search-box/headless-standalone-search-box.ssr.ts
+// src/ssr-next/search/controllers/standalone-search-box/headless-standalone-search-box.ssr.ts
 function defineStandaloneSearchBox(props) {
   return {
     build: (engine) => buildStandaloneSearchBox(engine, props)
@@ -20295,7 +20289,7 @@ function getLegacyAnalyticsActionForToggledValue(id, value) {
   });
 }
 
-// src/ssr/search/controllers/static-filter/headless-static-filter.ssr.ts
+// src/ssr-next/search/controllers/static-filter/headless-static-filter.ssr.ts
 function defineStaticFilter(props) {
   return {
     build: (engine) => buildStaticFilter(engine, props)
@@ -20391,7 +20385,7 @@ function buildTab(engine, props) {
   };
 }
 
-// src/ssr/search/controllers/tab/headless-tab.ssr.ts
+// src/ssr-next/search/controllers/tab/headless-tab.ssr.ts
 function defineTab(props) {
   return {
     build: (engine) => buildTab(engine, props)
@@ -20435,7 +20429,7 @@ function buildTabManager(engine) {
   };
 }
 
-// src/ssr/search/controllers/tab-manager/headless-tab-manager.ssr.ts
+// src/ssr-next/search/controllers/tab-manager/headless-tab-manager.ssr.ts
 function defineTabManager() {
   return {
     build: (engine) => buildTabManager(engine)
@@ -20557,7 +20551,7 @@ function loadExecuteTriggerReducers(engine) {
   return true;
 }
 
-// src/ssr/search/controllers/triggers/headless-execute-trigger.ssr.ts
+// src/ssr-next/search/controllers/triggers/headless-execute-trigger.ssr.ts
 function defineExecuteTrigger() {
   return {
     build: (engine) => buildExecuteTrigger(engine)
@@ -20612,7 +20606,7 @@ function buildNotifyTrigger(engine) {
   });
 }
 
-// src/ssr/search/controllers/triggers/headless-notify-trigger.ssr.ts
+// src/ssr-next/search/controllers/triggers/headless-notify-trigger.ssr.ts
 function defineNotifyTrigger() {
   return {
     build: (engine) => buildNotifyTrigger(engine)
@@ -20656,7 +20650,7 @@ function loadQueryTriggerReducers(engine) {
   return true;
 }
 
-// src/ssr/search/controllers/triggers/headless-query-trigger.ssr.ts
+// src/ssr-next/search/controllers/triggers/headless-query-trigger.ssr.ts
 function defineQueryTrigger() {
   return {
     build: (engine) => buildQueryTrigger(engine)
@@ -20698,7 +20692,7 @@ function loadRedirectionReducers(engine) {
   return true;
 }
 
-// src/ssr/search/controllers/triggers/headless-redirection-trigger.ssr.ts
+// src/ssr-next/search/controllers/triggers/headless-redirection-trigger.ssr.ts
 function defineRedirectionTrigger() {
   return {
     build: (engine) => buildRedirectionTrigger(engine)
@@ -21020,7 +21014,7 @@ function loadUrlManagerReducers(engine) {
   return true;
 }
 
-// src/ssr/search/controllers/url-manager/headless-url-manager.ssr.ts
+// src/ssr-next/search/controllers/url-manager/headless-url-manager.ssr.ts
 var defineUrlManager = () => ({
   buildWithProps: (engine, props) => {
     if (props === void 0) {
@@ -21035,7 +21029,7 @@ function isBrowser2() {
   return typeof window !== "undefined" && typeof document !== "undefined";
 }
 
-// src/ssr/common/augment-preprocess-request.ts
+// src/ssr-next/common/augment-preprocess-request.ts
 function augmentPreprocessRequestWithForwardedFor(options) {
   const originalPreprocessRequest = options.preprocessRequest;
   return async (request, clientOrigin, metadata) => {
@@ -21059,48 +21053,109 @@ function augmentPreprocessRequestWithForwardedFor(options) {
   };
 }
 
-// src/ssr/common/controller-utils.ts
-function buildControllerFromDefinition({
-  definition: definition4,
-  engine,
-  props
-}) {
-  return "build" in definition4 ? definition4.build(engine) : definition4.buildWithProps(engine, props);
+// src/ssr-next/common/builders/controller-builder.ts
+var ControllerBuilder = class {
+  constructor(definition4, engine, props) {
+    __publicField(this, "_definition");
+    __publicField(this, "_engine");
+    __publicField(this, "_props");
+    __publicField(this, "_additionalArgs", []);
+    this._definition = definition4;
+    this._engine = engine;
+    this._props = props;
+  }
+  withAdditionalArgs(additionalArgs = []) {
+    this._additionalArgs = additionalArgs;
+    return this;
+  }
+  build() {
+    if ("build" in this._definition && typeof this._definition.build === "function") {
+      return this.buildWithoutProps();
+    }
+    if ("buildWithProps" in this._definition && typeof this._definition.buildWithProps === "function") {
+      return this.buildWithProps();
+    }
+    throw new Error(
+      "Controller definition must have a build or buildWithProps method."
+    );
+  }
+  buildWithoutProps() {
+    const buildFn = this._definition.build;
+    return buildFn(this._engine, ...this._additionalArgs);
+  }
+  buildWithProps() {
+    const buildWithPropsFn = this._definition.buildWithProps;
+    const controller = buildWithPropsFn(
+      this._engine,
+      this._props,
+      ...this._additionalArgs
+    );
+    return { ...controller, initialState: controller.state };
+  }
+};
+
+// src/ssr-next/common/builders/static-controller-builder.ts
+var StaticControllerBuilder = class {
+  constructor() {
+    __publicField(this, "_state");
+    __publicField(this, "_initialState");
+  }
+  withState(state) {
+    this._state = clone(state);
+    return this;
+  }
+  withInitialState(initialState) {
+    this._initialState = clone(initialState);
+    return this;
+  }
+  /**
+   * Builds and returns the static controller state object
+   */
+  build() {
+    const result = {
+      state: this._state
+    };
+    if (this._initialState) {
+      result.initialState = this._initialState;
+    }
+    return result;
+  }
+};
+function createStaticControllerBuilder(controller) {
+  const builder = new StaticControllerBuilder().withState(controller.state);
+  if ("initialState" in controller) {
+    builder.withInitialState(
+      controller.initialState
+    );
+  }
+  return builder;
 }
+
+// src/ssr-next/search/controller-utils.ts
 function buildControllerDefinitions({
   definitionsMap,
   engine,
   propsMap
 }) {
-  return mapObject(
-    definitionsMap,
-    (definition4, key) => buildControllerFromDefinition({
-      definition: definition4,
-      engine,
-      props: propsMap?.[key]
-    })
-  );
+  return mapObject(definitionsMap, (definition4, key) => {
+    const props = propsMap?.[key];
+    return new ControllerBuilder(definition4, engine, props).build();
+  });
 }
 function createStaticState({
-  searchAction,
+  searchActions,
   controllers
 }) {
   return {
-    controllers: mapObject(controllers, (controller) => ({
-      state: clone(controller.state)
-    })),
-    searchAction: clone(searchAction)
+    controllers: mapObject(
+      controllers,
+      (controller) => createStaticControllerBuilder(controller).build()
+    ),
+    searchActions: clone(searchActions)
   };
 }
-function composeFunction(parentFunction, children) {
-  const newFunction = (...params) => parentFunction(...params);
-  for (const [key, value] of Object.entries(children)) {
-    newFunction[key] = value;
-  }
-  return newFunction;
-}
 
-// src/ssr/search/engine/search-engine.ssr.ts
+// src/ssr-next/search/engine/search-engine.ssr.ts
 function isSearchCompletedAction(action) {
   return /^search\/executeSearch\/(fulfilled|rejected)$/.test(
     action.type
@@ -21139,9 +21194,7 @@ function defineSearchEngine(options) {
         "[WARNING] Missing navigator context in server-side code. Make sure to set it with `setNavigatorContextProvider` before calling fetchStaticState()"
       );
     }
-    const engine = buildSSRSearchEngine(
-      buildOptions2?.extend ? await buildOptions2.extend(getOptions()) : getOptions()
-    );
+    const engine = buildSSRSearchEngine(getOptions());
     const controllers = buildControllerDefinitions({
       definitionsMap: controllerDefinitions ?? {},
       engine,
@@ -21152,59 +21205,29 @@ function defineSearchEngine(options) {
       controllers
     };
   };
-  const fetchStaticState = composeFunction(
-    async (...params) => {
-      const buildResult = await build(...params);
-      const staticState = await fetchStaticState.fromBuildResult({
-        buildResult
-      });
-      options.configuration.preprocessRequest = augmentPreprocessRequestWithForwardedFor({
-        preprocessRequest: options.configuration.preprocessRequest,
-        navigatorContextProvider: options.navigatorContextProvider,
-        loggerOptions: options.loggerOptions
-      });
-      return staticState;
-    },
-    {
-      fromBuildResult: async (...params) => {
-        const [
-          {
-            buildResult: { engine, controllers }
-          }
-        ] = params;
-        engine.executeFirstSearch();
-        return createStaticState({
-          searchAction: await engine.waitForSearchCompletedAction(),
-          controllers
-        });
-      }
-    }
-  );
-  const hydrateStaticState = composeFunction(
-    async (...params) => {
-      const buildResult = await build(...params);
-      const staticState = await hydrateStaticState.fromBuildResult({
-        buildResult,
-        searchAction: params[0].searchAction
-      });
-      return staticState;
-    },
-    {
-      fromBuildResult: async (...params) => {
-        const [
-          {
-            buildResult: { engine, controllers },
-            searchAction
-          }
-        ] = params;
-        engine.dispatch(searchAction);
-        await engine.waitForSearchCompletedAction();
-        return { engine, controllers };
-      }
-    }
-  );
+  const fetchStaticState = async (...params) => {
+    const { engine, controllers } = await build(...params);
+    options.configuration.preprocessRequest = augmentPreprocessRequestWithForwardedFor({
+      preprocessRequest: options.configuration.preprocessRequest,
+      navigatorContextProvider: options.navigatorContextProvider,
+      loggerOptions: options.loggerOptions
+    });
+    engine.executeFirstSearch();
+    const staticState = createStaticState({
+      searchActions: [await engine.waitForSearchCompletedAction()],
+      controllers
+    });
+    return staticState;
+  };
+  const hydrateStaticState = async (...params) => {
+    const { engine, controllers } = await build(...params);
+    params[0].searchActions.forEach((action) => {
+      engine.dispatch(action);
+    });
+    await engine.waitForSearchCompletedAction();
+    return { engine, controllers };
+  };
   return {
-    build,
     fetchStaticState,
     hydrateStaticState,
     setNavigatorContextProvider