@coveo/headless 3.28.3-pre.467a471c62 → 3.28.3-pre.4fca7600f7

package/dist/cjs/case-assist/headless.cjs

@@ -800,7 +800,7 @@ var import_bueno5 = require("@coveo/bueno");
 var import_toolkit7 = require("@reduxjs/toolkit");
 
 // src/utils/version.ts
-var VERSION = "3.28.3-pre.467a471c62";
+var VERSION = "3.28.3-pre.4fca7600f7";
 var COVEO_FRAMEWORK = ["@coveo/atomic", "@coveo/quantic"];
 
 // src/features/configuration/configuration-actions.ts

package/dist/cjs/commerce/headless.cjs

@@ -1148,7 +1148,7 @@ var import_bueno6 = require("@coveo/bueno");
 var import_toolkit4 = require("@reduxjs/toolkit");
 
 // src/utils/version.ts
-var VERSION = "3.28.3-pre.467a471c62";
+var VERSION = "3.28.3-pre.4fca7600f7";
 var COVEO_FRAMEWORK = ["@coveo/atomic", "@coveo/quantic"];
 
 // src/features/configuration/configuration-actions.ts

package/dist/cjs/headless.cjs

@@ -1374,7 +1374,7 @@ var import_toolkit2 = require("@reduxjs/toolkit");
 var import_toolkit = require("@reduxjs/toolkit");
 
 // src/utils/version.ts
-var VERSION = "3.28.3-pre.467a471c62";
+var VERSION = "3.28.3-pre.4fca7600f7";
 var COVEO_FRAMEWORK = ["@coveo/atomic", "@coveo/quantic"];
 
 // src/api/analytics/analytics-selectors.ts

package/dist/cjs/insight/headless.cjs

@@ -1278,7 +1278,7 @@ var import_toolkit2 = require("@reduxjs/toolkit");
 var import_toolkit = require("@reduxjs/toolkit");
 
 // src/utils/version.ts
-var VERSION = "3.28.3-pre.467a471c62";
+var VERSION = "3.28.3-pre.4fca7600f7";
 var COVEO_FRAMEWORK = ["@coveo/atomic", "@coveo/quantic"];
 
 // src/api/analytics/analytics-selectors.ts

package/dist/cjs/recommendation/headless.cjs

@@ -881,7 +881,7 @@ var validateObject = (engine, schema, obj, validationMessage, errorMessage) => {
 };
 
 // src/utils/version.ts
-var VERSION = "3.28.3-pre.467a471c62";
+var VERSION = "3.28.3-pre.4fca7600f7";
 var COVEO_FRAMEWORK = ["@coveo/atomic", "@coveo/quantic"];
 
 // src/features/configuration/configuration-actions.ts

package/dist/cjs/ssr/headless.cjs

@@ -1306,7 +1306,7 @@ var import_toolkit2 = require("@reduxjs/toolkit");
 var import_toolkit = require("@reduxjs/toolkit");
 
 // src/utils/version.ts
-var VERSION = "3.28.3-pre.467a471c62";
+var VERSION = "3.28.3-pre.4fca7600f7";
 var COVEO_FRAMEWORK = ["@coveo/atomic", "@coveo/quantic"];
 
 // src/api/analytics/analytics-selectors.ts

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

@@ -468,7 +468,7 @@ var import_bueno8 = require("@coveo/bueno");
 var import_toolkit3 = require("@reduxjs/toolkit");
 
 // src/utils/version.ts
-var VERSION = "3.28.3-pre.467a471c62";
+var VERSION = "3.28.3-pre.4fca7600f7";
 var COVEO_FRAMEWORK = ["@coveo/atomic", "@coveo/quantic"];
 
 // src/features/configuration/configuration-actions.ts

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

@@ -468,7 +468,7 @@ var import_bueno8 = require("@coveo/bueno");
 var import_toolkit3 = require("@reduxjs/toolkit");
 
 // src/utils/version.ts
-var VERSION = "3.28.3-pre.467a471c62";
+var VERSION = "3.28.3-pre.4fca7600f7";
 var COVEO_FRAMEWORK = ["@coveo/atomic", "@coveo/quantic"];
 
 // src/features/configuration/configuration-actions.ts

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

@@ -1306,7 +1306,7 @@ var import_toolkit2 = require("@reduxjs/toolkit");
 var import_toolkit = require("@reduxjs/toolkit");
 
 // src/utils/version.ts
-var VERSION = "3.28.3-pre.467a471c62";
+var VERSION = "3.28.3-pre.4fca7600f7";
 var COVEO_FRAMEWORK = ["@coveo/atomic", "@coveo/quantic"];
 
 // src/api/analytics/analytics-selectors.ts

package/dist/definitions/ssr-next/commerce/engine/commerce-engine.ssr.d.ts

@@ -9,8 +9,7 @@ import type { CommerceEngineDefinition } from '../types/engine.js';
 /**
  * Initializes a Commerce engine definition in SSR with given controllers definitions and commerce engine config.
  * @param options - The commerce engine definition
- * @returns Three utility functions to fetch the initial state of the engine in SSR, hydrate the state in CSR,
- *  and a build function that can be used for edge cases requiring more control.
+ * @returns Engine definitions for different solution types that support per-call navigator context.
  *
  * @remarks
  * You can use the {@link InferStaticState} and {@link InferHydratedState} utility types with the returned engine definitions
@@ -18,9 +17,36 @@ import type { CommerceEngineDefinition } from '../types/engine.js';
  *
  * @example
  * ```ts
- * const engineDefinition = defineCommerceEngine(engineConfig);
- * type SearchStaticState = InferStaticState<typeof engineDefinition>;
- * type SearchHydratedState = InferHydratedState<typeof engineDefinition>;
+ * const { listingEngineDefinition } = defineCommerceEngine(engineConfig);
+ *
+ * // Pass navigator context directly to fetchStaticState
+ * const staticState = await listingEngineDefinition.fetchStaticState({
+ *   navigatorContext: {
+ *     forwardedFor: req.ip,
+ *     referrer: req.headers.referer,
+ *     userAgent: req.headers['user-agent'],
+ *     location: req.url,
+ *     clientId: 'unique-session-id'
+ *   }
+ * });
+ *
+ * // Framework examples:
+ * // Express.js
+ * app.get('/api/listing', async (req, res) => {
+ *   const state = await listingEngineDefinition.fetchStaticState({
+ *     navigatorContext: {
+ *       forwardedFor: req.ip,
+ *       referrer: req.get('Referer'),
+ *       userAgent: req.get('User-Agent'),
+ *       location: req.originalUrl,
+ *       clientId: req.sessionID
+ *     }
+ *   });
+ *   res.json(state);
+ * });
+ *
+ * type SearchStaticState = InferStaticState<typeof listingEngineDefinition>;
+ * type SearchHydratedState = InferHydratedState<typeof listingEngineDefinition>;
  * ```
  *
  * @group Engine

package/dist/definitions/ssr-next/commerce/types/engine.d.ts

@@ -1,7 +1,6 @@
 import type { UnknownAction } from '@reduxjs/toolkit';
 import type { CommerceEngineOptions } from '../../../app/commerce-engine/commerce-engine.js';
 import type { EngineConfiguration } from '../../../app/engine-configuration.js';
-import type { NavigatorContextProvider } from '../../../app/navigator-context-provider.js';
 import type { Controller } from '../../../controllers/controller/headless-controller.js';
 import type { ControllerStaticStateMap } from '../../common/types/controllers.js';
 import type { SSRCommerceEngine } from '../factories/build-factory.js';
@@ -33,13 +32,6 @@ export interface CommerceEngineDefinition<TControllers extends ControllerDefinit
      * Fetches the hydrated state on the client side using your engine definition and the static state.
      */
     hydrateStaticState: HydrateStaticState<InferControllersMapFromDefinition<TControllers, TSolutionType>, UnknownAction, InferControllerPropsMapFromDefinitions<TControllers>, TControllers, TSolutionType>;
-    /**
-     * Sets the navigator context provider.
-     * This provider is essential for retrieving navigation-related data such as referrer, userAgent, location, and clientId, which are crucial for handling both server-side and client-side API requests effectively.
-     *
-     * Note: The implementation specifics of the navigator context provider depend on the Node.js framework being utilized. It is the developer's responsibility to appropriately define and implement the navigator context provider to ensure accurate navigation context is available throughout the application. If the user fails to provide a navigator context provider, a warning will be logged either on the server or the browser console.
-     */
-    setNavigatorContextProvider: (navigatorContextProvider: NavigatorContextProvider) => void;
     /**
      * Returns the access token.
      */

package/dist/definitions/ssr-next/commerce/types/fetch-static-state.d.ts

@@ -1,13 +1,47 @@
 import type { UnknownAction } from '@reduxjs/toolkit';
+import type { NavigatorContext, NavigatorContextProvider } from '../../../app/navigator-context-provider.js';
 import type { Controller } from '../../../controllers/controller/headless-controller.js';
 import type { ControllerStaticStateMap, ControllersPropsMap } from '../../common/types/controllers.js';
 import type { SolutionType } from './controller-constants.js';
 import type { ControllerDefinitionsMap, EngineDefinitionControllersPropsOption, OptionsTuple } from './controller-definitions.js';
 import type { EngineStaticState } from './engine.js';
-export type FetchStaticStateOptions = {};
+export interface FetchStaticStateOptions {
+    /**
+     * Navigator context for this request. Used to set headers like x-forwarded-for during SSR.
+     *
+     * @example
+     * ```ts
+     * // In your server route handler
+     * const staticState = await listingEngineDefinition.fetchStaticState({
+     *   navigatorContext: {
+     *     forwardedFor: req.ip,
+     *     referrer: req.headers.referer || null,
+     *     userAgent: req.headers['user-agent'] || null,
+     *     location: req.url,
+     *     clientId: req.sessionID || 'anonymous'
+     *   }
+     * });
+     * ```
+     */
+    navigatorContext?: NavigatorContext | NavigatorContextProvider;
+}
 /**
  * Executes only the initial search for a given configuration, then returns a resumable snapshot of engine state along with the state of the controllers.
  *
  * Useful for static generation and server-side rendering.
+ *
+ * @example
+ * ```ts
+ * // Pass navigator context directly in the options
+ * const staticState = await engineDefinition.fetchStaticState({
+ *   navigatorContext: {
+ *     forwardedFor: request.ip,
+ *     referrer: request.headers.referer,
+ *     userAgent: request.headers['user-agent'],
+ *     location: request.url,
+ *     clientId: 'session-123'
+ *   }
+ * });
+ * ```
  */
 export type FetchStaticState<TSearchAction extends UnknownAction, TControllersStaticState extends ControllerStaticStateMap, TControllersProps extends ControllersPropsMap, TControllersDefinitionsMap extends ControllerDefinitionsMap<Controller>, TSolutionType extends SolutionType> = (...params: OptionsTuple<FetchStaticStateOptions & EngineDefinitionControllersPropsOption<TControllersDefinitionsMap, TControllersProps, TSolutionType>>) => Promise<EngineStaticState<TSearchAction, TControllersStaticState>>;

package/dist/definitions/ssr-next/common/types/engine.d.ts

@@ -1,7 +1,6 @@
 import type { AnyAction, UnknownAction } from '@reduxjs/toolkit';
 import type { CoreEngine, CoreEngineNext } from '../../../app/engine.js';
 import type { EngineConfiguration } from '../../../app/engine-configuration.js';
-import type { NavigatorContextProvider } from '../../../app/navigator-context-provider.js';
 import type { Controller } from '../../../controllers/controller/headless-controller.js';
 import type { Build } from './build.js';
 import type { ControllerDefinitionsMap, ControllerStaticStateMap, ControllersMap, ControllersPropsMap } from './controllers.js';
@@ -27,13 +26,6 @@ export interface EngineDefinition<TEngine extends CoreEngine | CoreEngineNext, T
      * Fetches the hydrated state on the client side using your engine definition and the static state.
      */
     hydrateStaticState: HydrateStaticState<TEngine, InferControllersMapFromDefinition<TControllers>, AnyAction, InferControllerPropsMapFromDefinitions<TControllers>>;
-    /**
-     * Sets the navigator context provider.
-     * This provider is essential for retrieving navigation-related data such as referrer, userAgent, location, and clientId, which are crucial for handling both server-side and client-side API requests effectively.
-     *
-     * Note: The implementation specifics of the navigator context provider depend on the Node.js framework being utilized. It is the developer's responsibility to appropriately define and implement the navigator context provider to ensure accurate navigation context is available throughout the application. If the user fails to provide a navigator context provider, a warning will be logged either on the server or the browser console.
-     */
-    setNavigatorContextProvider: (navigatorContextProvider: NavigatorContextProvider) => void;
 }
 export interface EngineDefinitionBuildResult<TEngine extends CoreEngine | CoreEngineNext, TControllers extends ControllersMap> {
     engine: TEngine;

package/dist/definitions/ssr-next/common/types/fetch-static-state.d.ts

@@ -1,12 +1,29 @@
 import type { UnknownAction } from '@reduxjs/toolkit';
+import type { NavigatorContext, NavigatorContextProvider } from '../../../app/navigator-context-provider.js';
 import type { ControllerStaticStateMap, ControllersPropsMap } from './controllers.js';
 import type { EngineDefinitionControllersPropsOption, EngineStaticState } from './engine.js';
 import type { OptionsTuple } from './utilities.js';
-type FetchStaticStateOptions = {};
+type FetchStaticStateOptions = {
+    navigatorContext?: NavigatorContext | NavigatorContextProvider;
+};
 /**
  * Executes only the initial search for a given configuration, then returns a resumable snapshot of engine state along with the state of the controllers.
  *
  * Useful for static generation and server-side rendering.
+ *
+ * @example
+ * ```ts
+ * // Pass navigator context directly in the options
+ * const staticState = await engineDefinition.fetchStaticState({
+ *   navigatorContext: {
+ *     forwardedFor: request.ip,
+ *     referrer: request.headers.referer,
+ *     userAgent: request.headers['user-agent'],
+ *     location: request.url,
+ *     clientId: 'session-123'
+ *   }
+ * });
+ * ```
  */
 export type FetchStaticState<TSearchAction extends UnknownAction, TControllersStaticState extends ControllerStaticStateMap, TControllersProps extends ControllersPropsMap> = (...params: OptionsTuple<FetchStaticStateOptions & EngineDefinitionControllersPropsOption<TControllersProps>>) => Promise<EngineStaticState<TSearchAction, TControllersStaticState>>;
 export {};

package/dist/definitions/ssr-next/search/engine/search-engine.ssr.d.ts

@@ -1,40 +1,39 @@
-import type { NavigatorContextProvider } from '../../../app/navigator-context-provider.js';
 import { type SearchEngine, type SearchEngineOptions } from '../../../app/search-engine/search-engine.js';
 import type { Controller } from '../../../controllers/controller/headless-controller.js';
 import type { LegacySearchAction } from '../../../features/analytics/analytics-utils.js';
 import type { ControllerDefinitionsMap } from '../../common/types/controllers.js';
 import type { EngineDefinition, EngineDefinitionOptions } from '../../common/types/engine.js';
-import type { InferControllerPropsMapFromDefinitions, InferControllerStaticStateMapFromDefinitions } from '../../common/types/inference.js';
 /**
  * The SSR search engine.
- *
- * @group Engine
  */
 export interface SSRSearchEngine extends SearchEngine {
-    /**
-     * Waits for the search to be completed and returns a promise that resolves to a `SearchCompletedAction`.
-     */
     waitForSearchCompletedAction(): Promise<SearchCompletedAction>;
 }
-/**
- * The options to create a search engine definition in SSR.
- *
- * @group Engine
- */
 export type SearchEngineDefinitionOptions<TControllers extends ControllerDefinitionsMap<SSRSearchEngine, Controller>> = EngineDefinitionOptions<SearchEngineOptions, TControllers>;
 export type SearchCompletedAction = ReturnType<LegacySearchAction['fulfilled' | 'rejected']>;
 export type SearchEngineDefinition<TControllers extends ControllerDefinitionsMap<SSRSearchEngine, Controller>> = EngineDefinition<SSRSearchEngine, TControllers>;
 /**
- * Initializes a Search engine definition in SSR with given controllers definitions and search engine config.
+ * Initializes a Search engine definition in SSR with per-call navigator context support.
  *
  * @param options - The search engine definition
- * @returns Three utility functions to fetch the initial state of the engine in SSR, hydrate the state in CSR,
- *  and a build function that can be used for edge cases requiring more control.
+ * @returns Engine definition with support for per-call navigator context.
+ *
+ * @example
+ * ```ts
+ * const searchEngine = defineSearchEngine(config);
+ *
+ * // Pass navigator context directly to fetchStaticState
+ * const staticState = await searchEngine.fetchStaticState({
+ *   navigatorContext: {
+ *     forwardedFor: req.ip,
+ *     referrer: req.headers.referer,
+ *     userAgent: req.headers['user-agent'],
+ *     location: req.url,
+ *     clientId: 'abc123'
+ *   }
+ * });
+ * ```
  *
  * @group Engine
  */
-export declare function defineSearchEngine<TControllerDefinitions extends ControllerDefinitionsMap<SearchEngine, Controller>>(options: SearchEngineDefinitionOptions<TControllerDefinitions>): {
-    fetchStaticState: import("../../common/types/fetch-static-state.js").FetchStaticState<import("redux").AnyAction, InferControllerStaticStateMapFromDefinitions<TControllerDefinitions>, InferControllerPropsMapFromDefinitions<TControllerDefinitions>>;
-    hydrateStaticState: import("../../common/types/hydrate-static-state.js").HydrateStaticState<SSRSearchEngine, import("../../common/types/inference.js").InferControllersMapFromDefinition<TControllerDefinitions>, import("redux").AnyAction, InferControllerPropsMapFromDefinitions<TControllerDefinitions>>;
-    setNavigatorContextProvider: (navigatorContextProvider: NavigatorContextProvider) => void;
-};
+export declare function defineSearchEngine<TControllerDefinitions extends ControllerDefinitionsMap<SearchEngine, Controller>>(options: SearchEngineDefinitionOptions<TControllerDefinitions>): EngineDefinition<SSRSearchEngine, TControllerDefinitions>;

package/dist/esm/ssr-next/commerce/engine/commerce-engine.ssr.js

@@ -9,8 +9,7 @@ import { SolutionType } from '../types/controller-constants.js';
 /**
  * Initializes a Commerce engine definition in SSR with given controllers definitions and commerce engine config.
  * @param options - The commerce engine definition
- * @returns Three utility functions to fetch the initial state of the engine in SSR, hydrate the state in CSR,
- *  and a build function that can be used for edge cases requiring more control.
+ * @returns Engine definitions for different solution types that support per-call navigator context.
  *
  * @remarks
  * You can use the {@link InferStaticState} and {@link InferHydratedState} utility types with the returned engine definitions
@@ -18,29 +17,51 @@ import { SolutionType } from '../types/controller-constants.js';
  *
  * @example
  * ```ts
- * const engineDefinition = defineCommerceEngine(engineConfig);
- * type SearchStaticState = InferStaticState<typeof engineDefinition>;
- * type SearchHydratedState = InferHydratedState<typeof engineDefinition>;
+ * const { listingEngineDefinition } = defineCommerceEngine(engineConfig);
+ *
+ * // Pass navigator context directly to fetchStaticState
+ * const staticState = await listingEngineDefinition.fetchStaticState({
+ *   navigatorContext: {
+ *     forwardedFor: req.ip,
+ *     referrer: req.headers.referer,
+ *     userAgent: req.headers['user-agent'],
+ *     location: req.url,
+ *     clientId: 'unique-session-id'
+ *   }
+ * });
+ *
+ * // Framework examples:
+ * // Express.js
+ * app.get('/api/listing', async (req, res) => {
+ *   const state = await listingEngineDefinition.fetchStaticState({
+ *     navigatorContext: {
+ *       forwardedFor: req.ip,
+ *       referrer: req.get('Referer'),
+ *       userAgent: req.get('User-Agent'),
+ *       location: req.originalUrl,
+ *       clientId: req.sessionID
+ *     }
+ *   });
+ *   res.json(state);
+ * });
+ *
+ * type SearchStaticState = InferStaticState<typeof listingEngineDefinition>;
+ * type SearchHydratedState = InferHydratedState<typeof listingEngineDefinition>;
  * ```
  *
  * @group Engine
  */
 export function defineCommerceEngine(options) {
     const { controllers: controllerDefinitions, ...engineOptions } = options;
-    const getOptions = () => engineOptions;
-    const setNavigatorContextProvider = (navigatorContextProvider) => {
-        engineOptions.navigatorContextProvider = navigatorContextProvider;
-    };
     const getAccessToken = () => engineOptions.configuration.accessToken;
     const setAccessToken = (accessToken) => {
         engineOptions.configuration.accessToken = accessToken;
     };
-    const fetchStaticState = fetchStaticStateFactory(controllerDefinitions, getOptions());
-    const hydrateStaticState = hydratedStaticStateFactory(controllerDefinitions, getOptions());
-    const fetchRecommendationStaticState = fetchRecommendationStaticStateFactory(controllerDefinitions, getOptions());
-    const hydrateRecommendationStaticState = hydratedRecommendationStaticStateFactory(controllerDefinitions, getOptions());
+    const fetchStaticState = fetchStaticStateFactory(controllerDefinitions, engineOptions);
+    const hydrateStaticState = hydratedStaticStateFactory(controllerDefinitions, engineOptions);
+    const fetchRecommendationStaticState = fetchRecommendationStaticStateFactory(controllerDefinitions, engineOptions);
+    const hydrateRecommendationStaticState = hydratedRecommendationStaticStateFactory(controllerDefinitions, engineOptions);
     const commonMethods = {
-        setNavigatorContextProvider,
         getAccessToken,
         setAccessToken,
     };

package/dist/esm/ssr-next/commerce/factories/static-state-factory.js

@@ -6,16 +6,30 @@ import { SolutionType } from '../types/controller-constants.js';
 import { buildFactory, } from './build-factory.js';
 export function fetchStaticStateFactory(controllerDefinitions, options) {
     return (solutionType) => async (...params) => {
-        const solutionTypeBuild = await buildFactory(controllerDefinitions, {
+        const [callOptions] = params;
+        // Convert per-call navigator context to provider function
+        const navigatorContextProvider = callOptions?.navigatorContext
+            ? typeof callOptions.navigatorContext === 'function'
+                ? callOptions.navigatorContext
+                : () => callOptions.navigatorContext
+            : undefined;
+        // Create options for this call with navigator context
+        const callSpecificOptions = {
             ...options,
-        })(solutionType);
+            navigatorContextProvider,
+            configuration: {
+                ...options.configuration,
+                preprocessRequest: navigatorContextProvider
+                    ? augmentPreprocessRequestWithForwardedFor({
+                        preprocessRequest: options.configuration.preprocessRequest,
+                        navigatorContextProvider,
+                        loggerOptions: options.loggerOptions,
+                    })
+                    : options.configuration.preprocessRequest,
+            },
+        };
+        const solutionTypeBuild = await buildFactory(controllerDefinitions, callSpecificOptions)(solutionType);
         const { engine, controllers } = await solutionTypeBuild(...params);
-        options.configuration.preprocessRequest =
-            augmentPreprocessRequestWithForwardedFor({
-                preprocessRequest: options.configuration.preprocessRequest,
-                navigatorContextProvider: options.navigatorContextProvider,
-                loggerOptions: options.loggerOptions,
-            });
         switch (solutionType) {
             case SolutionType.listing:
                 buildProductListing(engine).executeFirstRequest();

package/dist/esm/ssr-next/search/engine/search-engine.ssr.js

@@ -1,4 +1,3 @@
-import { buildLogger } from '../../../app/logger.js';
 import { buildSearchEngine, } from '../../../app/search-engine/search-engine.js';
 import { createWaitForActionMiddleware } from '../../../utils/utils.js';
 import { augmentPreprocessRequestWithForwardedFor } from '../../common/augment-preprocess-request.js';
@@ -23,50 +22,76 @@ function buildSSRSearchEngine(options) {
     };
 }
 /**
- * Initializes a Search engine definition in SSR with given controllers definitions and search engine config.
+ * Initializes a Search engine definition in SSR with per-call navigator context support.
  *
  * @param options - The search engine definition
- * @returns Three utility functions to fetch the initial state of the engine in SSR, hydrate the state in CSR,
- *  and a build function that can be used for edge cases requiring more control.
+ * @returns Engine definition with support for per-call navigator context.
+ *
+ * @example
+ * ```ts
+ * const searchEngine = defineSearchEngine(config);
+ *
+ * // Pass navigator context directly to fetchStaticState
+ * const staticState = await searchEngine.fetchStaticState({
+ *   navigatorContext: {
+ *     forwardedFor: req.ip,
+ *     referrer: req.headers.referer,
+ *     userAgent: req.headers['user-agent'],
+ *     location: req.url,
+ *     clientId: 'abc123'
+ *   }
+ * });
+ * ```
  *
  * @group Engine
  */
 export function defineSearchEngine(options) {
     const { controllers: controllerDefinitions, ...engineOptions } = options;
-    const getOptions = () => {
-        return engineOptions;
-    };
-    const setNavigatorContextProvider = (navigatorContextProvider) => {
-        engineOptions.navigatorContextProvider = navigatorContextProvider;
-    };
-    const build = async (...[buildOptions]) => {
-        const logger = buildLogger(options.loggerOptions);
-        if (!getOptions().navigatorContextProvider) {
-            logger.warn('[WARNING] Missing navigator context in server-side code. Make sure to set it with `setNavigatorContextProvider` before calling fetchStaticState()');
-        }
-        const engine = buildSSRSearchEngine(buildOptions?.extend
-            ? await buildOptions.extend(getOptions())
-            : getOptions());
+    // biome-ignore lint/suspicious/noExplicitAny: Complex parameter typing would require extensive refactoring
+    const hydrateStaticState = async (...params) => {
+        const engine = buildSSRSearchEngine(engineOptions);
         const controllers = buildControllerDefinitions({
             definitionsMap: (controllerDefinitions ?? {}),
             engine,
-            propsMap: (buildOptions && 'controllers' in buildOptions
-                ? buildOptions.controllers
-                : {}),
+            propsMap: {},
         });
-        return {
-            engine,
-            controllers,
-        };
+        const [staticState] = params;
+        engine.dispatch(staticState.searchAction);
+        await engine.waitForSearchCompletedAction();
+        return { engine, controllers };
     };
+    // biome-ignore lint/suspicious/noExplicitAny: Parameter typing matches the interface contract
     const fetchStaticState = async (...params) => {
-        const { engine, controllers } = await build(...params);
-        options.configuration.preprocessRequest =
-            augmentPreprocessRequestWithForwardedFor({
-                preprocessRequest: options.configuration.preprocessRequest,
-                navigatorContextProvider: options.navigatorContextProvider,
-                loggerOptions: options.loggerOptions,
-            });
+        const [callOptions] = params;
+        // Convert per-call navigator context to provider function
+        const navigatorContextProvider = callOptions?.navigatorContext
+            ? typeof callOptions.navigatorContext === 'function'
+                ? callOptions.navigatorContext
+                : () => callOptions.navigatorContext
+            : undefined;
+        // Create options for this call with navigator context
+        const callSpecificOptions = {
+            ...options,
+            navigatorContextProvider,
+            configuration: {
+                ...options.configuration,
+                preprocessRequest: navigatorContextProvider
+                    ? augmentPreprocessRequestWithForwardedFor({
+                        preprocessRequest: options.configuration.preprocessRequest,
+                        navigatorContextProvider,
+                        loggerOptions: options.loggerOptions,
+                    })
+                    : options.configuration.preprocessRequest,
+            },
+        };
+        const engine = buildSSRSearchEngine(callSpecificOptions);
+        const controllers = buildControllerDefinitions({
+            definitionsMap: (controllerDefinitions ?? {}),
+            engine,
+            propsMap: (callOptions && 'controllers' in callOptions
+                ? callOptions.controllers
+                : {}),
+        });
         engine.executeFirstSearch();
         const staticState = createStaticState({
             searchAction: await engine.waitForSearchCompletedAction(),
@@ -74,15 +99,8 @@ export function defineSearchEngine(options) {
         });
         return staticState;
     };
-    const hydrateStaticState = async (...params) => {
-        const { engine, controllers } = await build(...params);
-        engine.dispatch(params[0].searchAction);
-        await engine.waitForSearchCompletedAction();
-        return { engine, controllers };
-    };
     return {
         fetchStaticState,
         hydrateStaticState,
-        setNavigatorContextProvider,
     };
 }

package/dist/esm/utils/version.js

@@ -1,2 +1,2 @@
-export const VERSION = "3.28.3-pre.467a471c62" || 'Test version';
+export const VERSION = "3.28.3-pre.4fca7600f7" || 'Test version';
 export const COVEO_FRAMEWORK = ['@coveo/atomic', '@coveo/quantic'];