@nuskin/react-search-sdk 1.0.0 → 1.0.1-code-cleanup.1

package/dist/index.mjs

@@ -120,21 +120,41 @@ async function fetchSearchPanelCopy(_options = {}) {
 
 // src/copy/loadSearchPanelCopy.ts
 var copyByLanguage = /* @__PURE__ */ new Map();
+var loadedByLanguage = /* @__PURE__ */ new Map();
+function cacheKey(language) {
+  return (language ?? "").toLowerCase();
+}
 function loadSearchPanelCopy(language) {
-  const key = (language ?? "").toLowerCase();
+  const key = cacheKey(language);
   const cached = copyByLanguage.get(key);
   if (cached) return cached;
   const pending = fetchSearchPanelCopy(language ? { } : {});
   copyByLanguage.set(key, pending);
-  pending.catch(() => copyByLanguage.delete(key));
+  pending.then(
+    (copy) => {
+      if (copyByLanguage.get(key) === pending) {
+        loadedByLanguage.set(key, copy);
+      }
+    },
+    () => {
+      if (copyByLanguage.get(key) === pending) {
+        copyByLanguage.delete(key);
+      }
+    }
+  );
   return pending;
 }
+function peekSearchPanelCopy(language) {
+  return loadedByLanguage.get(cacheKey(language));
+}
 
 // src/hooks/useSearchPanelCopy.ts
 function useSearchPanelCopy({
   language
 }) {
-  const [copy, setCopy] = useState(void 0);
+  const [copy, setCopy] = useState(
+    () => peekSearchPanelCopy(language)
+  );
   useEffect(() => {
     let isStale = false;
     loadSearchPanelCopy(language).then((next) => {
@@ -152,21 +172,7 @@ function useSearchPanelCopy({
   return copy;
 }
 
-// src/services/SearchApiService.ts
-function canUseStorage(storage) {
-  return Boolean(storage) && typeof storage.getItem === "function";
-}
-function getSessionStorage(providedStorage) {
-  if (providedStorage) return providedStorage;
-  if (typeof window !== "undefined") {
-    try {
-      return window.sessionStorage;
-    } catch {
-      return null;
-    }
-  }
-  return null;
-}
+// src/services/localeParts.ts
 function normalizeLocaleParts({
   country,
   language,
@@ -181,6 +187,102 @@ function normalizeLocaleParts({
     locale: normalizedLocale
   };
 }
+function toCatalogLocale(localeParts) {
+  const language = String(localeParts.language ?? "en").toLowerCase();
+  const country = String(localeParts.country ?? "US").toUpperCase();
+  return `${language}_${country}`;
+}
+
+// src/services/catalogRequest.ts
+function resolveApiGatewayPath(apiGatewayPath, apiName = STOREFRONT_SHOPPING_CONTEXT) {
+  const apiGateway = String(apiGatewayPath ?? "").trim();
+  if (!apiGateway) return "";
+  return apiGateway.replace(/\{api_name\}/gi, apiName).replace(/\/$/, "");
+}
+function resolveCatalogApiBaseUrl(marketConfig) {
+  return resolveApiGatewayPath(marketConfig?.api_gateway_path);
+}
+function resolveCatalogStoreId(marketConfig) {
+  return String(marketConfig?.store_id ?? "").trim();
+}
+function buildCatalogSuggestionsUrl(apiBaseUrl) {
+  const normalizedBase = String(apiBaseUrl ?? "").trim().replace(/\/$/, "");
+  if (!normalizedBase) return "";
+  const suggestionsPath = normalizedBase.endsWith(
+    `/${STOREFRONT_SHOPPING_CONTEXT}`
+  ) ? "/catalogs/search/suggestions" : CATALOG_SUGGESTIONS_PATH;
+  return `${normalizedBase}${suggestionsPath}`;
+}
+function buildSuggestionsRequestUrl({
+  suggestionsUrl,
+  searchTerm,
+  storeId,
+  localeParts
+}) {
+  const queryParams = new URLSearchParams({
+    searchTerm,
+    page: String(DEFAULT_SUGGESTION_PAGE),
+    size: String(DEFAULT_SUGGESTION_SIZE),
+    locale: toCatalogLocale(localeParts),
+    storeId
+  });
+  return `${suggestionsUrl}?${queryParams.toString()}`;
+}
+async function resolveCatalogRequestConfig({
+  locationLike,
+  country,
+  getMarketConfig
+}) {
+  const marketConfig = getMarketConfig ? await getMarketConfig({ locationLike, country }) ?? null : null;
+  return {
+    suggestionsUrl: buildCatalogSuggestionsUrl(
+      resolveCatalogApiBaseUrl(marketConfig)
+    ),
+    storeId: resolveCatalogStoreId(marketConfig)
+  };
+}
+function resolveCustomerTypeHeaders(getCustomerType) {
+  const customerType = getCustomerType?.()?.trim();
+  return customerType ? { "X-Customer-Type": customerType } : void 0;
+}
+var NO_RESULTS_ERROR_CODE = "SFOSER002";
+async function isNoResultsResponse(response) {
+  if (response.status !== 404) return false;
+  try {
+    const body = await response.json();
+    return body?.code === NO_RESULTS_ERROR_CODE;
+  } catch {
+    return false;
+  }
+}
+async function fetchJson(fetchImpl, requestUrl, requestHeaders = {}) {
+  const response = await fetchImpl(requestUrl, {
+    method: "GET",
+    credentials: "include",
+    headers: { Accept: "application/json", ...requestHeaders }
+  });
+  if (!response.ok) {
+    if (await isNoResultsResponse(response)) return null;
+    throw new Error(`Request failed with status ${response.status}`);
+  }
+  return response.json();
+}
+
+// src/services/recentSearches.ts
+function canUseStorage(storage) {
+  return Boolean(storage) && typeof storage.getItem === "function";
+}
+function getSessionStorage(providedStorage) {
+  if (providedStorage) return providedStorage;
+  if (typeof window !== "undefined") {
+    try {
+      return window.sessionStorage;
+    } catch {
+      return null;
+    }
+  }
+  return null;
+}
 function getRecentHeaderSearchesStorageKey(localeParts) {
   const { country, language, locale } = normalizeLocaleParts(localeParts);
   return `${RECENT_SEARCHES_PREFIX}:${locale}:${country}:${language}`;
@@ -236,63 +338,8 @@ function clearRecentHeaderSearches(localeParts, storage) {
   } catch {
   }
 }
-function getBrowserLocation(providedLocation) {
-  if (providedLocation) return providedLocation;
-  if (typeof window !== "undefined" && window.location)
-    return window.location;
-  return null;
-}
-function resolveApiGatewayPath(apiGatewayPath, apiName = STOREFRONT_SHOPPING_CONTEXT) {
-  const apiGateway = String(apiGatewayPath ?? "").trim();
-  if (!apiGateway) return "";
-  return apiGateway.replace(/\{api_name\}/gi, apiName).replace(/\/$/, "");
-}
-function resolveCatalogApiBaseUrl(marketConfig) {
-  return resolveApiGatewayPath(marketConfig?.api_gateway_path);
-}
-function resolveCatalogStoreId(marketConfig) {
-  return String(marketConfig?.store_id ?? "").trim();
-}
-function buildCatalogSuggestionsUrl(apiBaseUrl) {
-  const normalizedBase = String(apiBaseUrl ?? "").trim().replace(/\/$/, "");
-  if (!normalizedBase) return "";
-  const suggestionsPath = normalizedBase.endsWith(
-    `/${STOREFRONT_SHOPPING_CONTEXT}`
-  ) ? "/catalogs/search/suggestions" : CATALOG_SUGGESTIONS_PATH;
-  return `${normalizedBase}${suggestionsPath}`;
-}
-function resolveSuggestionsUrl(suggestionsApi, locationLike) {
-  const pathOrUrl = String(suggestionsApi ?? "").trim();
-  if (!pathOrUrl) return "";
-  if (pathOrUrl.startsWith("http://") || pathOrUrl.startsWith("https://")) {
-    return pathOrUrl;
-  }
-  const normalizedPath = pathOrUrl.startsWith("/") ? pathOrUrl : `/${pathOrUrl}`;
-  const origin = String(locationLike?.origin ?? "").trim();
-  return origin ? `${origin}${normalizedPath}` : normalizedPath;
-}
-async function resolveCatalogRequestConfig({
-  suggestionsApi,
-  storeIdOption,
-  locationLike,
-  country,
-  getMarketConfig
-}) {
-  const explicitStoreId = storeIdOption !== void 0 && storeIdOption !== null && String(storeIdOption).trim() !== "" ? String(storeIdOption).trim() : "";
-  const marketConfig = getMarketConfig ? await getMarketConfig({ locationLike, country }) ?? null : null;
-  const configuredApiBase = resolveCatalogApiBaseUrl(marketConfig);
-  const configuredStoreId = resolveCatalogStoreId(marketConfig);
-  const explicitSuggestionsApi = String(suggestionsApi ?? "").trim();
-  return {
-    suggestionsUrl: explicitSuggestionsApi ? resolveSuggestionsUrl(explicitSuggestionsApi, locationLike) : buildCatalogSuggestionsUrl(configuredApiBase),
-    storeId: explicitStoreId || configuredStoreId
-  };
-}
-function toCatalogLocale(localeParts) {
-  const language = String(localeParts.language ?? "en").toLowerCase();
-  const country = String(localeParts.country ?? "US").toUpperCase();
-  return `${language}_${country}`;
-}
+
+// src/services/searchPaths.ts
 function buildSearchResultsPath(query, localeParts) {
   const trimmedQuery = String(query ?? "").trim();
   const hyphenatedQuery = trimmedQuery.replace(/\s+/g, "-");
@@ -362,50 +409,52 @@ function resolveOptionHref(option, localeParts) {
   }
   return "";
 }
-function resolveCustomerTypeHeaders(getCustomerType) {
-  const customerType = getCustomerType?.()?.trim();
-  return customerType ? { "X-Customer-Type": customerType } : void 0;
+
+// src/services/suggestionsPayload.ts
+function emptySuggestions() {
+  return { suggestions: [], didYouMean: [], totalResultsCount: 0 };
 }
-var NO_RESULTS_ERROR_CODE = "SFOSER002";
-async function isNoResultsResponse(response) {
-  if (response.status !== 404) return false;
-  try {
-    const body = await response.json();
-    return body?.code === NO_RESULTS_ERROR_CODE;
-  } catch {
-    return false;
+function resolveTotalResultsCount(payload, fallback) {
+  if (typeof payload?.totalResultsCount === "number") {
+    return payload.totalResultsCount;
   }
+  const pageableTotal = Number(
+    payload?.pageableInfo?.totalCount ?? Number.NaN
+  );
+  return Number.isNaN(pageableTotal) ? fallback : pageableTotal;
 }
-async function fetchJsonFromCandidates(fetchImpl, requestUrls, requestHeaders = {}) {
-  let lastError;
-  for (const requestUrl of requestUrls) {
-    try {
-      const response = await fetchImpl(requestUrl, {
-        method: "GET",
-        credentials: "include",
-        headers: { Accept: "application/json", ...requestHeaders }
-      });
-      if (!response.ok) {
-        if (await isNoResultsResponse(response)) return null;
-        lastError = new Error(
-          `Request failed with status ${response.status}`
-        );
-        continue;
-      }
-      return await response.json();
-    } catch (error) {
-      lastError = error;
-    }
-  }
-  throw lastError ?? new Error("Unable to fetch header search data");
+function normalizeSuggestionsPayload(payload) {
+  const suggestions = Array.isArray(payload?.suggestions) ? payload.suggestions : [];
+  const products = Array.isArray(payload?.product) ? payload.product : null;
+  const rawDidYouMean = payload?.didYouMean ?? payload?.did_you_mean;
+  const didYouMean = Array.isArray(rawDidYouMean) ? rawDidYouMean : [];
+  return {
+    ...payload ?? {},
+    suggestions,
+    didYouMean,
+    totalResultsCount: resolveTotalResultsCount(
+      payload,
+      products?.length ?? suggestions.length
+    )
+  };
+}
+
+// src/services/SearchApiService.ts
+function getBrowserLocation(providedLocation) {
+  if (providedLocation) return providedLocation;
+  if (typeof window !== "undefined" && window.location)
+    return window.location;
+  return null;
+}
+function resolveFetch(fetchImplOption) {
+  if (fetchImplOption !== void 0) return fetchImplOption;
+  return typeof fetch === "function" ? fetch.bind(globalThis) : null;
 }
 function createSearchService(options = {}) {
   const {
     fetchImpl: fetchImplOption,
     location: providedLocation,
     storage: providedStorage,
-    suggestionsApi,
-    storeId: storeIdOption,
     country,
     language,
     locale,
@@ -413,7 +462,7 @@ function createSearchService(options = {}) {
     getCustomerType,
     minimumSearchLength = MINIMUM_SEARCH_CHAR_LENGTH
   } = options;
-  const fetchImpl = fetchImplOption !== void 0 ? fetchImplOption : typeof fetch === "function" ? fetch.bind(globalThis) : null;
+  const fetchImpl = resolveFetch(fetchImplOption);
   const locationLike = getBrowserLocation(providedLocation);
   const storage = getSessionStorage(providedStorage);
   const localeParts = normalizeLocaleParts({ country, language, locale });
@@ -421,8 +470,6 @@ function createSearchService(options = {}) {
   function loadCatalogRequestConfig() {
     if (!catalogRequestConfigPromise) {
       catalogRequestConfigPromise = resolveCatalogRequestConfig({
-        suggestionsApi,
-        storeIdOption,
         locationLike,
         country: localeParts.country,
         getMarketConfig
@@ -441,47 +488,21 @@ function createSearchService(options = {}) {
     async fetchSuggestions(searchTerm) {
       const trimmedSearchTerm = String(searchTerm ?? "").trim();
       if (!trimmedSearchTerm || trimmedSearchTerm.length < minimumSearchLength || !fetchImpl) {
-        return {
-          suggestions: [],
-          didYouMean: [],
-          totalResultsCount: 0
-        };
+        return emptySuggestions();
       }
       const { suggestionsUrl, storeId } = await loadCatalogRequestConfig();
-      if (!suggestionsUrl || !storeId) {
-        return {
-          suggestions: [],
-          didYouMean: [],
-          totalResultsCount: 0
-        };
-      }
-      const queryParams = new URLSearchParams({
-        searchTerm: trimmedSearchTerm,
-        page: String(DEFAULT_SUGGESTION_PAGE),
-        size: String(DEFAULT_SUGGESTION_SIZE),
-        locale: toCatalogLocale(localeParts),
-        storeId: String(storeId)
-      });
-      const requestUrls = [`${suggestionsUrl}?${queryParams.toString()}`];
-      const responsePayload = await fetchJsonFromCandidates(
+      if (!suggestionsUrl || !storeId) return emptySuggestions();
+      const responsePayload = await fetchJson(
         fetchImpl,
-        requestUrls,
+        buildSuggestionsRequestUrl({
+          suggestionsUrl,
+          searchTerm: trimmedSearchTerm,
+          storeId,
+          localeParts
+        }),
         resolveCustomerTypeHeaders(getCustomerType)
       );
-      const suggestionsField = Array.isArray(responsePayload?.suggestions) ? responsePayload?.suggestions : [];
-      const productField = Array.isArray(responsePayload?.product) ? responsePayload?.product : null;
-      const rawDidYouMean = responsePayload?.didYouMean ?? responsePayload?.did_you_mean;
-      const didYouMeanField = Array.isArray(rawDidYouMean) ? rawDidYouMean : [];
-      const pageableTotal = Number(
-        responsePayload?.pageableInfo?.totalCount ?? Number.NaN
-      );
-      const totalResultsCount = typeof responsePayload?.totalResultsCount === "number" ? responsePayload.totalResultsCount : !Number.isNaN(pageableTotal) ? pageableTotal : productField?.length ?? suggestionsField.length;
-      return {
-        ...responsePayload ?? {},
-        suggestions: suggestionsField,
-        didYouMean: didYouMeanField,
-        totalResultsCount
-      };
+      return normalizeSuggestionsPayload(responsePayload);
     },
     submitProductSearch(query, option) {
       const trimmedQuery = String(query ?? "").trim();
@@ -566,7 +587,90 @@ function getProductEnvironment() {
   }
 }
 
-// src/utils/catalogHelpers.ts
+// src/utils/nuiSearchGate.ts
+var NUI_SEARCH_FLAG = "enableNuiSearch";
+function parseFlagValue(raw) {
+  const value = raw?.trim().toLowerCase();
+  if (value === "true" || value === "1") return true;
+  if (value === "false" || value === "0") return false;
+  return void 0;
+}
+function readCookieFlag(cookie) {
+  for (const part of cookie.split(";")) {
+    const separator = part.indexOf("=");
+    if (separator < 0) continue;
+    if (part.slice(0, separator).trim() !== NUI_SEARCH_FLAG) continue;
+    try {
+      return parseFlagValue(
+        decodeURIComponent(part.slice(separator + 1))
+      );
+    } catch {
+      return void 0;
+    }
+  }
+  return void 0;
+}
+function resolveNuiSearchFlag(env = {}) {
+  const inBrowser = typeof window !== "undefined" && typeof document !== "undefined";
+  const search = env.search ?? (inBrowser ? window.location.search : "");
+  const cookie = env.cookie ?? (inBrowser ? document.cookie : "");
+  return parseFlagValue(new URLSearchParams(search).get(NUI_SEARCH_FLAG)) ?? readCookieFlag(cookie);
+}
+function isNuiSearchEnabled({
+  isAuthenticated,
+  flag,
+  allowGuests = false
+}) {
+  return flag === true && (isAuthenticated === true || allowGuests);
+}
+
+// src/hooks/useNuiAgentGate.ts
+function useNuiAgentGate({
+  hasAgent,
+  isOpen,
+  isAuthenticated,
+  allowGuestAgent
+}) {
+  const [flag, setFlag] = useState(void 0);
+  useEffect(() => {
+    if (isOpen) setFlag(resolveNuiSearchFlag());
+  }, [isOpen]);
+  return hasAgent && isNuiSearchEnabled({
+    isAuthenticated,
+    flag,
+    allowGuests: allowGuestAgent
+  });
+}
+function uniqueRecentSearches(queries) {
+  const seen = /* @__PURE__ */ new Set();
+  return queries.filter((query) => {
+    const key = query.trim().toLowerCase();
+    if (!key || seen.has(key)) return false;
+    seen.add(key);
+    return true;
+  });
+}
+function useRecentSearches({
+  service,
+  isOpen,
+  refreshKey
+}) {
+  const [recentSearches, setRecentSearches] = useState([]);
+  useEffect(() => {
+    if (isOpen) {
+      setRecentSearches(
+        uniqueRecentSearches(service.getRecentSearches())
+      );
+    }
+  }, [isOpen, service, refreshKey]);
+  const clearRecentSearches = useCallback(() => {
+    service.clearRecentSearches();
+    setRecentSearches([]);
+  }, [service]);
+  return { recentSearches, clearRecentSearches };
+}
+
+// src/utils/catalogStatus.ts
 var CART_DISABLED_PRODUCT_STATUSES = /* @__PURE__ */ new Set([
   "discontinued",
   "preview",
@@ -614,6 +718,8 @@ function isSuggestionDisabled(suggestionOption) {
     !suggestionOption || suggestionOption["out_of_stock"] || suggestionOption["outOfStock"]
   );
 }
+
+// src/utils/catalogHelpers.ts
 function getImageFromProperty(properties = {}) {
   let image = String(properties["primaryimage"] ?? "").trim() || String(properties["imageURL"] ?? "").trim();
   if (!image) {
@@ -851,6 +957,46 @@ function normalizeSuggestionsResponse(response) {
     didYouMean: normalizeDidYouMean(r.didYouMean)
   };
 }
+function resolveTotalResultsCount2(response, fallback) {
+  if (typeof response.totalResultsCount === "number") {
+    return response.totalResultsCount;
+  }
+  if (typeof response.pageableInfo?.totalCount === "number") {
+    return response.pageableInfo.totalCount;
+  }
+  return fallback;
+}
+var FETCH_FAILED = {
+  suggestions: [],
+  didYouMean: [],
+  hasMoreResults: false,
+  emptyFetched: true,
+  failed: true
+};
+function toSettledResults(response) {
+  const { suggestions: allSuggestions, didYouMean } = normalizeSuggestionsResponse(response);
+  if (didYouMean.length > 0) {
+    return {
+      suggestions: [],
+      didYouMean,
+      hasMoreResults: false,
+      emptyFetched: false,
+      failed: false
+    };
+  }
+  const total = Math.max(
+    resolveTotalResultsCount2(response, allSuggestions.length),
+    allSuggestions.length
+  );
+  const suggestions = allSuggestions.slice(0, MAX_VISIBLE_SUGGESTIONS);
+  return {
+    suggestions,
+    didYouMean,
+    hasMoreResults: total > MAX_VISIBLE_SUGGESTIONS,
+    emptyFetched: suggestions.length === 0,
+    failed: false
+  };
+}
 function useSearchSuggestions({
   service,
   enabled = true
@@ -862,7 +1008,6 @@ function useSearchSuggestions({
   const [emptyFetched, setEmptyFetched] = useState(false);
   const [suggestionFetchFailed, setSuggestionFetchFailed] = useState(false);
   const [hasMoreResults, setHasMoreResults] = useState(false);
-  const [totalResultsCount, setTotalResultsCount] = useState(0);
   const [settledQuery, setSettledQuery] = useState("");
   const fetchDebounced = useRef(null);
   const latestRequestId = useRef(0);
@@ -872,7 +1017,6 @@ function useSearchSuggestions({
     setEmptyFetched(false);
     setSuggestionFetchFailed(false);
     setHasMoreResults(false);
-    setTotalResultsCount(0);
     setSettledQuery("");
     setLoading(false);
   }, []);
@@ -890,6 +1034,14 @@ function useSearchSuggestions({
     resetSuggestionsState();
     setQuery("");
   }, [resetSuggestionsState]);
+  const settle = useCallback((results, term) => {
+    setDidYouMean(results.didYouMean);
+    setSuggestions(results.suggestions);
+    setHasMoreResults(results.hasMoreResults);
+    setSuggestionFetchFailed(results.failed);
+    setSettledQuery(term);
+    setEmptyFetched(results.emptyFetched);
+  }, []);
   const runFetch = useCallback(
     async (nextQuery) => {
       const trimmedQuery = nextQuery.trim();
@@ -901,51 +1053,20 @@ function useSearchSuggestions({
       setLoading(true);
       setEmptyFetched(false);
       setSuggestionFetchFailed(false);
+      let results;
       try {
-        const fetchedSuggestions = await service.fetchSuggestions(trimmedQuery);
-        if (requestId !== latestRequestId.current) {
-          return;
-        }
-        const {
-          suggestions: allSuggestions,
-          didYouMean: suggestedTerms
-        } = normalizeSuggestionsResponse(fetchedSuggestions);
-        const visibleSuggestions = allSuggestions.slice(
-          0,
-          MAX_VISIBLE_SUGGESTIONS
+        results = toSettledResults(
+          await service.fetchSuggestions(trimmedQuery)
         );
-        const hasDidYouMean = suggestedTerms.length > 0;
-        const normalizedTotal = typeof fetchedSuggestions.totalResultsCount === "number" ? fetchedSuggestions.totalResultsCount : typeof fetchedSuggestions.pageableInfo?.totalCount === "number" ? fetchedSuggestions.pageableInfo.totalCount : allSuggestions.length;
-        const effectiveTotal = hasDidYouMean ? suggestedTerms.length : Math.max(normalizedTotal, allSuggestions.length);
-        setDidYouMean(suggestedTerms);
-        setSuggestions(hasDidYouMean ? [] : visibleSuggestions);
-        setHasMoreResults(
-          !hasDidYouMean && effectiveTotal > MAX_VISIBLE_SUGGESTIONS
-        );
-        setTotalResultsCount(effectiveTotal);
-        setSuggestionFetchFailed(false);
-        setSettledQuery(trimmedQuery);
-        setEmptyFetched(
-          hasDidYouMean ? false : visibleSuggestions.length === 0 && suggestedTerms.length === 0
-        );
-      } catch {
-        if (requestId !== latestRequestId.current) {
-          return;
-        }
-        setSuggestions([]);
-        setDidYouMean([]);
-        setEmptyFetched(true);
-        setSuggestionFetchFailed(true);
-        setHasMoreResults(false);
-        setTotalResultsCount(0);
-        setSettledQuery(trimmedQuery);
-      } finally {
-        if (requestId === latestRequestId.current) {
-          setLoading(false);
-        }
+      } catch (error) {
+        console.warn("[search] Could not load suggestions:", error);
+        results = FETCH_FAILED;
       }
+      if (requestId !== latestRequestId.current) return;
+      settle(results, trimmedQuery);
+      setLoading(false);
     },
-    [enabled, service, resetSuggestionsState]
+    [enabled, service, resetSuggestionsState, settle]
   );
   useEffect(() => {
     if (!enabled) {
@@ -969,15 +1090,12 @@ function useSearchSuggestions({
     clearQuery,
     emptyFetched,
     hasMoreResults,
-    hasQuery: Boolean(query.trim()),
     didYouMean,
     loading,
     query,
     settledQuery,
-    setQuery,
     suggestionFetchFailed,
     suggestions,
-    totalResultsCount,
     updateQuery
   };
 }
@@ -1052,43 +1170,6 @@ function trackProductSearch(input) {
   });
 }
 
-// src/utils/nuiSearchGate.ts
-var NUI_SEARCH_FLAG = "enableNuiSearch";
-function parseFlagValue(raw) {
-  const value = raw?.trim().toLowerCase();
-  if (value === "true" || value === "1") return true;
-  if (value === "false" || value === "0") return false;
-  return void 0;
-}
-function readCookieFlag(cookie) {
-  for (const part of cookie.split(";")) {
-    const separator = part.indexOf("=");
-    if (separator < 0) continue;
-    if (part.slice(0, separator).trim() !== NUI_SEARCH_FLAG) continue;
-    try {
-      return parseFlagValue(
-        decodeURIComponent(part.slice(separator + 1))
-      );
-    } catch {
-      return void 0;
-    }
-  }
-  return void 0;
-}
-function resolveNuiSearchFlag(env = {}) {
-  const inBrowser = typeof window !== "undefined" && typeof document !== "undefined";
-  const search = env.search ?? (inBrowser ? window.location.search : "");
-  const cookie = env.cookie ?? (inBrowser ? document.cookie : "");
-  return parseFlagValue(new URLSearchParams(search).get(NUI_SEARCH_FLAG)) ?? readCookieFlag(cookie);
-}
-function isNuiSearchEnabled({
-  isAuthenticated,
-  flag,
-  allowGuests = false
-}) {
-  return flag === true && (isAuthenticated === true || allowGuests);
-}
-
 // src/utils/searchRouting.ts
 function decideSearchRoute({
   enabled,
@@ -1101,6 +1182,96 @@ function decideSearchRoute({
   return snapshot.suggestions.length > 0 ? "search" : "handoff";
 }
 
+// src/hooks/useSubmitRouting.ts
+var SUBMIT_WAIT_TIMEOUT_MS = 2e3;
+function useSubmitRouting({
+  enabled,
+  minimumSearchLength,
+  search,
+  gtmContext,
+  pendingTerm,
+  setPendingTerm,
+  onSearch,
+  onHandoff
+}) {
+  const {
+    didYouMean,
+    loading,
+    settledQuery,
+    suggestionFetchFailed,
+    suggestions
+  } = search;
+  const decide = useCallback(
+    (term) => decideSearchRoute({
+      enabled,
+      snapshot: {
+        query: term,
+        loading,
+        settledQuery,
+        suggestions,
+        suggestionFetchFailed
+      }
+    }),
+    [enabled, loading, settledQuery, suggestions, suggestionFetchFailed]
+  );
+  const act = useCallback(
+    (term, route) => {
+      setPendingTerm(null);
+      if (route === "handoff") {
+        trackChatEntryPoint(gtmContext ?? {});
+        onHandoff({
+          query: term,
+          didYouMean: didYouMean.map((item) => item.value)
+        });
+        return;
+      }
+      onSearch(term);
+    },
+    [didYouMean, gtmContext, onHandoff, onSearch, setPendingTerm]
+  );
+  const submit = useCallback(
+    (value) => {
+      const term = value.trim();
+      if (!term) return;
+      if (term.length < minimumSearchLength) {
+        onSearch(term);
+        return;
+      }
+      const route = decide(term);
+      if (route === "wait") {
+        setPendingTerm(term);
+        return;
+      }
+      act(term, route);
+    },
+    [act, decide, minimumSearchLength, onSearch, setPendingTerm]
+  );
+  const latest = useRef({ act, decide });
+  useEffect(() => {
+    latest.current = { act, decide };
+  });
+  useEffect(() => {
+    if (pendingTerm === null) return void 0;
+    const route = latest.current.decide(pendingTerm);
+    if (route !== "wait") {
+      latest.current.act(pendingTerm, route);
+      return void 0;
+    }
+    const timer = setTimeout(
+      () => latest.current.act(pendingTerm, "search"),
+      SUBMIT_WAIT_TIMEOUT_MS
+    );
+    return () => clearTimeout(timer);
+  }, [
+    pendingTerm,
+    loading,
+    settledQuery,
+    suggestions,
+    suggestionFetchFailed
+  ]);
+  return submit;
+}
+
 // src/utils/cachedProductClient.ts
 function withProductCache(client) {
   const lookups = /* @__PURE__ */ new Map();
@@ -1168,7 +1339,8 @@ var AgentErrorBoundary = class extends Component {
   static getDerivedStateFromError() {
     return { failed: true };
   }
-  componentDidCatch(_error, _info) {
+  componentDidCatch(error) {
+    console.warn("[search] The agent could not be shown:", error);
     this.props.onError();
   }
   render() {
@@ -1181,6 +1353,10 @@ function useHandoff({
   agentContext,
   onUnavailable
 }) {
+  const onUnavailableRef = useRef(onUnavailable);
+  useEffect(() => {
+    onUnavailableRef.current = onUnavailable;
+  });
   useEffect(() => {
     let cancelled = false;
     let timer;
@@ -1196,7 +1372,10 @@ function useHandoff({
         return;
       }
       if (Date.now() - startedAt >= HANDLE_TIMEOUT_MS) {
-        onUnavailable();
+        console.warn(
+          `[search] The agent did not start within ${HANDLE_TIMEOUT_MS / 1e3} seconds.`
+        );
+        onUnavailableRef.current();
         return;
       }
       timer = setTimeout(tryOpen, HANDLE_POLL_MS);
@@ -1238,16 +1417,6 @@ function NuiAgentPanel({
     }
   ) });
 }
-var SUBMIT_WAIT_TIMEOUT_MS = 2e3;
-function uniqueRecentSearches(queries) {
-  const seen = /* @__PURE__ */ new Set();
-  return queries.filter((query) => {
-    const key = query.trim().toLowerCase();
-    if (!key || seen.has(key)) return false;
-    seen.add(key);
-    return true;
-  });
-}
 function CommerceSearchView({
   copy,
   isOpen,
@@ -1262,11 +1431,9 @@ function CommerceSearchView({
   minimumSearchLength = MINIMUM_SEARCH_CHAR_LENGTH,
   gtmContext
 }) {
-  const [flag, setFlag] = useState(void 0);
   const [handoff, setHandoff] = useState(null);
   const agentQuery = handoff?.query ?? null;
   const [pendingTerm, setPendingTerm] = useState(null);
-  const [recentSearches, setRecentSearches] = useState([]);
   const search = useSearchSuggestions({
     service,
     enabled: isOpen && agentQuery === null
@@ -1278,31 +1445,25 @@ function CommerceSearchView({
     hasMoreResults,
     loading,
     query,
-    settledQuery,
-    suggestionFetchFailed,
     suggestions,
     updateQuery
   } = search;
-  const enabled = agent !== void 0 && isNuiSearchEnabled({
+  const agentEnabled = useNuiAgentGate({
+    hasAgent: agent !== void 0,
+    isOpen,
     isAuthenticated,
-    flag,
-    allowGuests: allowGuestAgent
+    allowGuestAgent
+  });
+  const { recentSearches, clearRecentSearches } = useRecentSearches({
+    service,
+    isOpen,
+    refreshKey: agentQuery
   });
   const items = getVisibleSuggestions({
     didYouMean,
     suggestions
   });
   const showDidYouMean = didYouMean.length > 0;
-  useEffect(() => {
-    if (isOpen) setFlag(resolveNuiSearchFlag());
-  }, [isOpen]);
-  useEffect(() => {
-    if (isOpen) {
-      setRecentSearches(
-        uniqueRecentSearches(service.getRecentSearches())
-      );
-    }
-  }, [isOpen, service, agentQuery]);
   const close = useCallback(() => {
     setHandoff(null);
     setPendingTerm(null);
@@ -1341,72 +1502,16 @@ function CommerceSearchView({
     },
     [items, navigateTo, service, trackSemantic]
   );
-  const decide = useCallback(
-    (term) => decideSearchRoute({
-      enabled,
-      snapshot: {
-        query: term,
-        loading,
-        settledQuery,
-        suggestions,
-        suggestionFetchFailed
-      }
-    }),
-    [enabled, loading, settledQuery, suggestions, suggestionFetchFailed]
-  );
-  const act = useCallback(
-    (term, route) => {
-      setPendingTerm(null);
-      if (route === "handoff") {
-        trackChatEntryPoint(gtmContext ?? {});
-        setHandoff({
-          query: term,
-          didYouMean: didYouMean.map((item) => item.value)
-        });
-        return;
-      }
-      runSearch(term);
-    },
-    [didYouMean, gtmContext, runSearch]
-  );
-  const handleSubmit = useCallback(
-    (value) => {
-      const term = value.trim();
-      if (!term) return;
-      if (term.length < minimumSearchLength) {
-        runSearch(term);
-        return;
-      }
-      const route = decide(term);
-      if (route === "wait") {
-        setPendingTerm(term);
-        return;
-      }
-      act(term, route);
-    },
-    [act, decide, minimumSearchLength, runSearch]
-  );
-  const latest = useRef({ act, decide });
-  latest.current = { act, decide };
-  useEffect(() => {
-    if (pendingTerm === null) return void 0;
-    const route = latest.current.decide(pendingTerm);
-    if (route !== "wait") {
-      latest.current.act(pendingTerm, route);
-      return void 0;
-    }
-    const timer = setTimeout(
-      () => latest.current.act(pendingTerm, "search"),
-      SUBMIT_WAIT_TIMEOUT_MS
-    );
-    return () => clearTimeout(timer);
-  }, [
+  const handleSubmit = useSubmitRouting({
+    enabled: agentEnabled,
+    minimumSearchLength,
+    search,
+    ...gtmContext ? { gtmContext } : {},
     pendingTerm,
-    loading,
-    settledQuery,
-    suggestions,
-    suggestionFetchFailed
-  ]);
+    setPendingTerm,
+    onSearch: runSearch,
+    onHandoff: setHandoff
+  });
   const handleSelect = useCallback(
     (option) => {
       if (isSuggestionDisabled(
@@ -1431,10 +1536,11 @@ function CommerceSearchView({
       )) {
         return;
       }
-      const result = service.activateSuggestionAction(
-        option
+      navigateTo(
+        service.activateSuggestionAction(
+          option
+        )
       );
-      void Promise.resolve(result).then(navigateTo).catch(() => void 0);
     },
     [navigateTo, service]
   );
@@ -1449,10 +1555,6 @@ function CommerceSearchView({
     },
     [navigateTo, service, trackSemantic]
   );
-  const handleClearRecent = useCallback(() => {
-    service.clearRecentSearches();
-    setRecentSearches([]);
-  }, [service]);
   const handleAgentUnavailable = useCallback(() => {
     if (agentQuery !== null)
       navigateTo(service.submitProductSearch(agentQuery));
@@ -1501,7 +1603,7 @@ function CommerceSearchView({
       recentSearches: {
         items: recentSearches,
         onSelect: handleRecentSelect,
-        onClear: handleClearRecent
+        onClear: clearRecentSearches
       },
       agentPanel
     }
@@ -1527,8 +1629,11 @@ function CommerceSearch({
     language,
     enabled: hasOpened
   });
-  const customerTypeRef = useRef(GUEST);
-  customerTypeRef.current = customer.isAuthenticated ? customer.accountType ?? GUEST : GUEST;
+  const customerType = customer.isAuthenticated ? customer.accountType ?? GUEST : GUEST;
+  const customerTypeRef = useRef(customerType);
+  useEffect(() => {
+    customerTypeRef.current = customerType;
+  }, [customerType]);
   const service = useMemo(
     () => createSearchService({
       country,