@depict-ai/ui 1.1.4 → 1.2.0

package/dist/server/main.cjs

@@ -43,7 +43,7 @@ $parcel$export(module.exports, "defaultGridSpacing", () => $a3280f0aad997933$exp
 $parcel$export(module.exports, "defaultColsAtSize", () => $a3280f0aad997933$export$c3834fa86c616831);
 $parcel$export(module.exports, "defaultCategoryTitlePlugin", () => $a3280f0aad997933$export$7bf543b9d9be2c22);
 $parcel$export(module.exports, "version", () => $b757f75811f3261f$export$83d89fbfd8236492);
-/*! Depict.ai search and product listing SDK */ const $b757f75811f3261f$export$83d89fbfd8236492 = "1.1.4";
+/*! Depict.ai search and product listing SDK */ const $b757f75811f3261f$export$83d89fbfd8236492 = "1.2.0";
 
 
 
@@ -228,26 +228,77 @@ class $e1d6c0f3d89d531c$export$e015ed2f2950f2e3 {
     #get_metadata;
     #get_user_id;
     #get_session_id;
-    constructor({ get_metadata: get_metadata , get_user_id: get_user_id , get_session_id: get_session_id  } = {}){
-        this.#get_metadata = get_metadata;
-        this.#get_user_id = get_user_id;
-        this.#get_session_id = get_session_id;
+    #guard_url_creator_length(expected, received) {
+        if (expected.length !== received.length) {
+            const e = new Error("Page URL creator returned wrong number of page URLs, got " + received.length + ", expected " + expected.length);
+            queueMicrotask(()=>{
+                throw e;
+            });
+            throw e;
+        }
     }
-    async suggest(input_req) {
-        const request = this.#add_ids_to_request(input_req);
-        const url = (0, $diwD4$depictaiutilishared.make_url_with_query_params)($e1d6c0f3d89d531c$var$search_base_url + "suggestions", request);
-        const results = await (0, $diwD4$depictaiutilishared.fetch_retry)((0, $diwD4$depictaiutilishared.add_version_query_params)(url));
-        attempt_to_return_api_response: {
-            if (!results) break attempt_to_return_api_response;
-            const decoded_json = await results.json();
-            if (!Array.isArray(decoded_json?.suggestions)) break attempt_to_return_api_response;
-            return decoded_json;
+    async #run_url_creator_for_suggest(merchant, market, response) {
+        if (!this.page_url_creator) return response;
+        // find category suggestions, run thing with them, and then replace them
+        const category_suggestions = response.suggestions.filter((suggestion)=>suggestion.type === "category");
+        const page_urls = await this.page_url_creator({
+            type: "categories",
+            market: market,
+            merchant: merchant,
+            data: [
+                ...category_suggestions
+            ]
+        });
+        this.#guard_url_creator_length(category_suggestions, page_urls);
+        while(page_urls.length)Object.assign(category_suggestions.pop(), page_urls.pop());
+        return response;
+    }
+    async #run_url_creator_for_rest(merchant1, market1, input_data) {
+        if (!this.page_url_creator) return input_data;
+        const displays = input_data.displays;
+        const breadcrumb = input_data.breadcrumb;
+        const quick_links = input_data.quick_links;
+        if (displays) {
+            const page_urls = await this.page_url_creator({
+                type: "products",
+                merchant: merchant1,
+                market: market1,
+                displays: [
+                    ...input_data.displays
+                ]
+            });
+            this.#guard_url_creator_length(displays, page_urls);
+            for(let i = 0; i < displays.length; i++){
+                const new_display_or_page_url = page_urls[i];
+                const old_display = displays[i];
+                if ("page_url" in new_display_or_page_url && Object.keys(new_display_or_page_url).length === 1) {
+                    // they only returned page_url, let's put it into the display
+                    const old_display_was_modern = "variant_index" in old_display;
+                    if (old_display_was_modern) {
+                        const variant_displays = old_display.variant_displays;
+                        for(let i = 0; i < variant_displays.length; i++)variant_displays[i].page_url = new_display_or_page_url.page_url;
+                    } else old_display.page_url = new_display_or_page_url.page_url;
+                } else // We got a whole new display, let's replace it
+                displays[i] = new_display_or_page_url;
+            }
         }
-        return {
-            "suggestions_request_id": "error",
-            "suggestions": [],
-            failed: true
-        };
+        for (const category_display_array of [
+            breadcrumb,
+            quick_links
+        ]){
+            if (!category_display_array) continue;
+            const page_urls = await this.page_url_creator({
+                type: "categories",
+                merchant: merchant1,
+                market: market1,
+                data: [
+                    ...category_display_array
+                ]
+            });
+            this.#guard_url_creator_length(category_display_array, page_urls);
+            for(let i = 0; i < category_display_array.length; i++)Object.assign(category_display_array[i], page_urls[i]);
+        }
+        return input_data;
     }
     async #cached_post_request(endpoint1, input_req, fallback_response) {
         const cache_obj = this.#get_cache_obj_for_endpoint(endpoint1);
@@ -264,66 +315,101 @@ class $e1d6c0f3d89d531c$export$e015ed2f2950f2e3 {
         let resolve_in_progress;
         cache_obj.in_progress_[body] = new Promise((r)=>resolve_in_progress = r);
         try {
-            let search_results = await (0, $diwD4$depictaiutilishared.fetch_retry)((0, $diwD4$depictaiutilishared.add_version_query_params)(endpoint1), {
+            let api_response = await (0, $diwD4$depictaiutilishared.fetch_retry)((0, $diwD4$depictaiutilishared.add_version_query_params)(endpoint1), {
                 method: "POST",
                 body: body
             });
             if ("query_id" in request && request.type === "collection") // FIXME: Remove. Backwards compatibility layer
             // This will retry the request without the collection type if the first request fails
             {
-                if (!search_results || search_results?.status === 404) {
+                if (!api_response || api_response?.status === 404) {
                     (0, $diwD4$depictaiutilishared.dlog)("Fallback request for collections due to failure");
                     const fallback_body = JSON.parse(body);
                     delete fallback_body.type;
-                    search_results = await (0, $diwD4$depictaiutilishared.fetch_retry)((0, $diwD4$depictaiutilishared.add_version_query_params)(endpoint1), {
+                    api_response = await (0, $diwD4$depictaiutilishared.fetch_retry)((0, $diwD4$depictaiutilishared.add_version_query_params)(endpoint1), {
                         method: "POST",
                         body: JSON.stringify(fallback_body)
                     });
                 }
             }
-            if (!search_results || search_results.status !== 200) {
-                const retval = fallback_response(input_req);
-                resolve_in_progress(retval);
-                return retval;
+            return_successfully: {
+                if (!api_response || api_response.status !== 200) break return_successfully;
+                let result;
+                try {
+                    const unmodified_result = await api_response.json();
+                    result = await this.#run_url_creator_for_rest(input_req.tenant, input_req.market, unmodified_result);
+                } catch (e) {
+                    (0, $diwD4$depictaiutilishared.dwarn)("URL creator or json decoding failed", e);
+                    break return_successfully;
+                }
+                cache_obj.cache_[body] = new WeakRef(result);
+                resolve_in_progress(result);
+                setTimeout((0, $diwD4$depictaiutilishared.catchify)(()=>{
+                    if (this.#supports_finalization_registry) cache_obj.finalization_registry_.register(result, body); // delete key from cache when value (WeakRefs) are collected
+                    else // delete things from cache after 5 minutes, so it doesn't get too heavy
+                    setTimeout((0, $diwD4$depictaiutilishared.catchify)(()=>delete cache_obj.cache_[body]), 300000);
+                }), 60000 // cache values for at least 60 seconds
+                );
+                return result;
             }
-            const result = await search_results.json();
-            cache_obj.cache_[body] = new WeakRef(result);
-            resolve_in_progress(result);
-            setTimeout((0, $diwD4$depictaiutilishared.catchify)(()=>{
-                if (this.#supports_finalization_registry) cache_obj.finalization_registry_.register(result, body); // delete key from cache when value (WeakRefs) are collected
-                else // delete things from cache after 5 minutes, so it doesn't get too heavy
-                setTimeout((0, $diwD4$depictaiutilishared.catchify)(()=>delete cache_obj.cache_[body]), 300000);
-            }), 30000 // cache values for at least 30 seconds
-            );
-            return result;
+            // If we get here, the request failed
+            const retval = fallback_response(input_req);
+            resolve_in_progress(retval);
+            return retval;
         } finally{
             delete cache_obj.in_progress_[body];
         }
     }
+    constructor(options){
+        const { get_metadata: get_metadata , get_user_id: get_user_id , get_session_id: get_session_id , page_url_creator: page_url_creator  } = options ?? {};
+        this.#get_metadata = get_metadata;
+        this.#get_user_id = get_user_id;
+        this.#get_session_id = get_session_id;
+        this.page_url_creator = page_url_creator;
+    }
+    async suggest(input_req) {
+        const request = this.#add_ids_to_request(input_req);
+        const url = (0, $diwD4$depictaiutilishared.make_url_with_query_params)($e1d6c0f3d89d531c$var$search_base_url + "suggestions", request);
+        const results = await (0, $diwD4$depictaiutilishared.fetch_retry)((0, $diwD4$depictaiutilishared.add_version_query_params)(url));
+        attempt_to_return_api_response: {
+            if (!results) break attempt_to_return_api_response;
+            const decoded_json = await results.json();
+            if (!Array.isArray(decoded_json?.suggestions)) break attempt_to_return_api_response;
+            try {
+                return await this.#run_url_creator_for_suggest(input_req.tenant, input_req.market, decoded_json);
+            } catch (e) {
+                (0, $diwD4$depictaiutilishared.dwarn)("URL creator failed", e);
+            }
+        }
+        return {
+            "suggestions_request_id": "error",
+            "suggestions": [],
+            failed: true
+        };
+    }
     async query(input_req) {
-        return await this.#cached_post_request($e1d6c0f3d89d531c$var$search_base_url + "results", input_req, (request)=>({
+        return await this.#cached_post_request($e1d6c0f3d89d531c$var$search_base_url + "results", input_req, ()=>({
                 "n_hits": 0,
-                "page": request.page ?? 1,
                 "displays": [],
-                "facets": [],
-                "suggestions": [],
+                "sorts": [],
+                "filters": [],
                 "search_request_id": "error",
                 failed: true
             }));
     }
     async list(input_req) {
-        return await this.#cached_post_request($e1d6c0f3d89d531c$var$v2_base_url + "product-listing", input_req, (request)=>({
+        return await this.#cached_post_request($e1d6c0f3d89d531c$var$v2_base_url + "product-listing", input_req, ()=>({
                 "n_hits": 0,
-                "page": request.page ?? 1,
                 "displays": [],
-                "facets": [],
-                "suggestions": [],
+                "sorts": [],
+                "filters": [],
+                "breadcrumb": [],
+                "quick_links": [],
                 "product_listing_request_id": "error",
                 failed: true
             }));
     }
     async get_recommended(input_req) {
-        // @ts-ignore ModernDisplay doesn't have arbitrary string access, and we'd like it to stay that way
         return await this.#cached_post_request($e1d6c0f3d89d531c$var$search_base_url + "related", input_req, ()=>({
                 displays: []
             }));
@@ -947,6 +1033,7 @@ function $ac167f6af6a48fc3$export$a1fd619a4743ca08({ plp_results_: plp_results_
             const record = records[i];
             const { target: target , intersectionRatio: intersectionRatio  } = record;
             const index_of_target = target_to_index_map.get(target);
+            if (index_of_target == undefined) return; // It seems like it can happen that we get IntersectionObserverEntries after the onCleanup function for a recommendation card has run, in Firefox. Probably a bug in Firefox? If I understood the bug correctly, this is a workaround.
             const is_in_set = currently_intersecting.has(index_of_target);
             if (intersectionRatio > 0) {
                 if (!is_in_set) currently_intersecting.add(index_of_target);
@@ -4346,23 +4433,30 @@ function $276380e4607fb9fb$export$6e49da55e449af7c({ scroll_restoration_data_: [
         ]); // get rid of old data the browser saves the old state and will restore it later on
     };
     (0, $diwD4$solidjs.createComputed)((0, $diwD4$depictaiutilishared.catchify)(()=>{
-        const r = get_last_result_in_viewport_();
-        if (r == undefined || r <= 0 || r == Infinity) return;
+        const last_result = get_last_result_in_viewport_();
+        if (last_result == undefined || last_result <= 0 || last_result == Infinity) return;
+        if (isNaN(last_result)) {
+            // if last_result is NaN there's an issue somewhere, but if we store something here that's not a number the for loop further down will break, and we won't be able to load results at all, so let's just continue
+            (0, $diwD4$depictaiutilishared.report)(new Error("last_result is NaN, this should not happen"), "error", {
+                last_result: last_result
+            });
+            return;
+        }
         // We can push to history.state max 100 times per 30 seconds (Safari) so we have to debounce/cap this at 300ms for aggressive scrolling.
         // Pushing to history.state right before we leave the page (onunload etc.) is unreliable, as it has to occur *before* the next page is pushed to history.
-        // Instead we delay our push with a timeout set to the next acceptable interval to the previous one, when necessary
+        // Instead, we delay our push with a timeout set to the next acceptable interval to the previous one, when necessary
         const now = +new Date();
         const time_since_last_ran = now - last_time_history_changed;
         if (time_since_last_ran > $276380e4607fb9fb$var$max_history_change_frequency) {
             // If the interval to the previous push is already long enough, it's fine to push the next value directly.
-            set_min_results_loaded(r);
+            set_min_results_loaded(last_result);
             last_time_history_changed = now;
             // Even though the interval has passed, there could still be a delayed push timeout in flight (browser can delay timeouts at will).
             // We've already written the guaranteed-to-be-freshest value so we can just cancel it.
             clearTimeout(timeout);
             return;
         }
-        set_to_later = r;
+        set_to_later = last_result;
         // If a delayed push timeout is already running, just changing the value that will be pushed is sufficient
         if (timeout) return;
         timeout = setTimeout((0, $diwD4$depictaiutilishared.catchify)(()=>{
@@ -5264,7 +5358,7 @@ class $48567ac5b39bac56$export$f34314aa9505732e {
     set on_navigation(new_function) {
         this.#router.on_navigation_ = new_function;
     }
-    constructor({ api: api , on_navigation: on_navigation , ...props_on_class }){
+    constructor({ api: api , on_navigation: on_navigation , page_url_creator: page_url_creator , ...props_on_class }){
         const owner = (0, $diwD4$solidjs.getOwner)() || (0, $diwD4$solidjs.createRoot)(()=>(0, $diwD4$solidjs.getOwner)()); // we might have an owner, if so, pass it on. Otherwise, create one so solid doesn't print warnings to the console
         (0, $diwD4$solidjs.runWithOwner)(owner, ()=>{
             if ($48567ac5b39bac56$export$f34314aa9505732e.#has_been_constructed && !(0, $diwD4$solidjsweb.isServer)) // on the server we can't write stuff to history.state anyway so can have multiple
@@ -5292,7 +5386,9 @@ class $48567ac5b39bac56$export$f34314aa9505732e {
                 quicklinks_signal_: (0, $diwD4$solidjs.createSignal)(),
                 i18n_: i18n_,
                 reset_history_state_: reset_history_state_,
-                depict_api_: api ?? new (0, $e1d6c0f3d89d531c$export$e015ed2f2950f2e3)(),
+                depict_api_: api ?? new (0, $e1d6c0f3d89d531c$export$e015ed2f2950f2e3)({
+                    page_url_creator: page_url_creator
+                }),
                 router_: this.#router,
                 selected_filters_: selected_filters_,
                 current_sorting_: current_sorting_,
@@ -7429,7 +7525,7 @@ class $2c61e4cd8229c49a$export$ac6237957a15b3f0 {
     #modal_open_signal = (0, $diwD4$solidjs.createSignal)(false);
     static #has_been_constructed = false;
     #router = new (0, $e96dd13889871fc0$export$7e1297a3a19f10d8)("hard_navigation");
-    constructor({ search_query_url_param_name: search_query_url_param_name_ = "query" , url_transformer: url_transformer , on_navigation: on_navigation , enable_category_suggestions: enable_category_suggestions = true , disable_scrolling_during_modal: // Stuff needed for non-standard customer deployments that we shouldn't actually expose
+    constructor({ search_query_url_param_name: search_query_url_param_name_ = "query" , url_transformer: url_transformer , on_navigation: on_navigation , enable_category_suggestions: enable_category_suggestions = true , page_url_creator: page_url_creator , disable_scrolling_during_modal: // Stuff needed for non-standard customer deployments that we shouldn't actually expose
     disable_scrolling_during_modal = true , api: api , bottom_distance_under_modal: bottom_distance_under_modal , render_instant_card: render_instant_card , ...props_on_class }){
         const owner = (0, $diwD4$solidjs.getOwner)() || (0, $diwD4$solidjs.createRoot)(()=>(0, $diwD4$solidjs.getOwner)()); // we might have an owner, if so, pass it on. Otherwise, create one so solid doesn't print warnings to the console
         (0, $diwD4$solidjs.runWithOwner)(owner, ()=>{
@@ -7458,7 +7554,9 @@ class $2c61e4cd8229c49a$export$ac6237957a15b3f0 {
                 if (get_search_query_updating_blocked()) return previous_value;
                 else return raw_search_query_accessor();
             });
-            const depict_api_ = api ?? new (0, $e1d6c0f3d89d531c$export$e015ed2f2950f2e3)();
+            const depict_api_ = api ?? new (0, $e1d6c0f3d89d531c$export$e015ed2f2950f2e3)({
+                page_url_creator: page_url_creator
+            });
             const previous_searches = (0, $2b7a005a65221045$export$84bba84a7b837187)(get_search_query_);
             const [, set_search_showing_recommendation_rows] = state_.search_showing_recommendation_rows;
             const after_submit_ = ()=>set_search_showing_recommendation_rows((0, $fb29c6201c369e39$export$1c8c715550dc689d)); // do this every time after we have submitted a new query - otherwise there might already be a saved number of rows in the state

package/dist/server/module.js

@@ -1,8 +1,8 @@
-import {add_to_version_info as $cV3wj$add_to_version_info, observer as $cV3wj$observer, catchify as $cV3wj$catchify, fetch_recs as $cV3wj$fetch_recs, snakeCasifyObject as $cV3wj$snakeCasifyObject, instant_exec_on_suspect_history_change as $cV3wj$instant_exec_on_suspect_history_change, base_url as $cV3wj$base_url, dlog as $cV3wj$dlog, get_depict_id as $cV3wj$get_depict_id, get_user_id as $cV3wj$get_user_id, get_session_id as $cV3wj$get_session_id, make_url_with_query_params as $cV3wj$make_url_with_query_params, fetch_retry as $cV3wj$fetch_retry, add_version_query_params as $cV3wj$add_version_query_params, sort_obj as $cV3wj$sort_obj, report as $cV3wj$report, javascript_media_query as $cV3wj$javascript_media_query, standard_price_format as $cV3wj$standard_price_format, make_random_classname as $cV3wj$make_random_classname, n_col_styling_with_dist as $cV3wj$n_col_styling_with_dist, useExpandingContainer as $cV3wj$useExpandingContainer, Amazing_Slider as $cV3wj$Amazing_Slider, slider_snap_css as $cV3wj$slider_snap_css, slider_fading_factory as $cV3wj$slider_fading_factory, hsl_to_rgb as $cV3wj$hsl_to_rgb, relative_luminance_from_rgb as $cV3wj$relative_luminance_from_rgb, base64_encode_unicode as $cV3wj$base64_encode_unicode, base64_decode_unicode as $cV3wj$base64_decode_unicode, queueMacroTask as $cV3wj$queueMacroTask, dwarn as $cV3wj$dwarn, Layout as $cV3wj$Layout, async_iterable_ipns as $cV3wj$async_iterable_ipns, make_asyncIterable_exiter as $cV3wj$make_asyncIterable_exiter, href_change_ipns as $cV3wj$href_change_ipns, ContainedImage as $cV3wj$ContainedImage, deparallelize_no_drop as $cV3wj$deparallelize_no_drop, insert_surfaces as $cV3wj$insert_surfaces} from "@depict-ai/utilishared";
+import {add_to_version_info as $cV3wj$add_to_version_info, observer as $cV3wj$observer, catchify as $cV3wj$catchify, fetch_recs as $cV3wj$fetch_recs, snakeCasifyObject as $cV3wj$snakeCasifyObject, instant_exec_on_suspect_history_change as $cV3wj$instant_exec_on_suspect_history_change, base_url as $cV3wj$base_url, dlog as $cV3wj$dlog, get_depict_id as $cV3wj$get_depict_id, get_user_id as $cV3wj$get_user_id, get_session_id as $cV3wj$get_session_id, sort_obj as $cV3wj$sort_obj, fetch_retry as $cV3wj$fetch_retry, add_version_query_params as $cV3wj$add_version_query_params, dwarn as $cV3wj$dwarn, make_url_with_query_params as $cV3wj$make_url_with_query_params, report as $cV3wj$report, javascript_media_query as $cV3wj$javascript_media_query, standard_price_format as $cV3wj$standard_price_format, make_random_classname as $cV3wj$make_random_classname, n_col_styling_with_dist as $cV3wj$n_col_styling_with_dist, useExpandingContainer as $cV3wj$useExpandingContainer, Amazing_Slider as $cV3wj$Amazing_Slider, slider_snap_css as $cV3wj$slider_snap_css, slider_fading_factory as $cV3wj$slider_fading_factory, hsl_to_rgb as $cV3wj$hsl_to_rgb, relative_luminance_from_rgb as $cV3wj$relative_luminance_from_rgb, base64_encode_unicode as $cV3wj$base64_encode_unicode, base64_decode_unicode as $cV3wj$base64_decode_unicode, queueMacroTask as $cV3wj$queueMacroTask, Layout as $cV3wj$Layout, async_iterable_ipns as $cV3wj$async_iterable_ipns, make_asyncIterable_exiter as $cV3wj$make_asyncIterable_exiter, href_change_ipns as $cV3wj$href_change_ipns, ContainedImage as $cV3wj$ContainedImage, deparallelize_no_drop as $cV3wj$deparallelize_no_drop, insert_surfaces as $cV3wj$insert_surfaces} from "@depict-ai/utilishared";
 import {createRoot as $cV3wj$createRoot, createSignal as $cV3wj$createSignal, getOwner as $cV3wj$getOwner, runWithOwner as $cV3wj$runWithOwner, onCleanup as $cV3wj$onCleanup, createComputed as $cV3wj$createComputed, createRenderEffect as $cV3wj$createRenderEffect, createEffect as $cV3wj$createEffect, untrack as $cV3wj$untrack, batch as $cV3wj$batch, createResource as $cV3wj$createResource, createMemo as $cV3wj$createMemo, Show as $cV3wj$Show, createReaction as $cV3wj$createReaction, Suspense as $cV3wj$Suspense, on as $cV3wj$on, ErrorBoundary as $cV3wj$ErrorBoundary, For as $cV3wj$For, Index as $cV3wj$Index} from "solid-js";
 import {ssrElement as $cV3wj$ssrElement, ssr as $cV3wj$ssr, ssrHydrationKey as $cV3wj$ssrHydrationKey, ssrAttribute as $cV3wj$ssrAttribute, escape as $cV3wj$escape, isServer as $cV3wj$isServer, createComponent as $cV3wj$createComponent, ssrClassList as $cV3wj$ssrClassList, insert as $cV3wj$insert, ssrStyle as $cV3wj$ssrStyle, Dynamic as $cV3wj$Dynamic, mergeProps as $cV3wj$mergeProps} from "solid-js/web";
 
-/*! Depict.ai search and product listing SDK */ const $ec291e0010116877$export$83d89fbfd8236492 = "1.1.4";
+/*! Depict.ai search and product listing SDK */ const $ec291e0010116877$export$83d89fbfd8236492 = "1.2.0";
 
 
 
@@ -187,26 +187,77 @@ class $7fa23e2a0079eca4$export$e015ed2f2950f2e3 {
     #get_metadata;
     #get_user_id;
     #get_session_id;
-    constructor({ get_metadata: get_metadata , get_user_id: get_user_id , get_session_id: get_session_id  } = {}){
-        this.#get_metadata = get_metadata;
-        this.#get_user_id = get_user_id;
-        this.#get_session_id = get_session_id;
+    #guard_url_creator_length(expected, received) {
+        if (expected.length !== received.length) {
+            const e = new Error("Page URL creator returned wrong number of page URLs, got " + received.length + ", expected " + expected.length);
+            queueMicrotask(()=>{
+                throw e;
+            });
+            throw e;
+        }
     }
-    async suggest(input_req) {
-        const request = this.#add_ids_to_request(input_req);
-        const url = (0, $cV3wj$make_url_with_query_params)($7fa23e2a0079eca4$var$search_base_url + "suggestions", request);
-        const results = await (0, $cV3wj$fetch_retry)((0, $cV3wj$add_version_query_params)(url));
-        attempt_to_return_api_response: {
-            if (!results) break attempt_to_return_api_response;
-            const decoded_json = await results.json();
-            if (!Array.isArray(decoded_json?.suggestions)) break attempt_to_return_api_response;
-            return decoded_json;
+    async #run_url_creator_for_suggest(merchant, market, response) {
+        if (!this.page_url_creator) return response;
+        // find category suggestions, run thing with them, and then replace them
+        const category_suggestions = response.suggestions.filter((suggestion)=>suggestion.type === "category");
+        const page_urls = await this.page_url_creator({
+            type: "categories",
+            market: market,
+            merchant: merchant,
+            data: [
+                ...category_suggestions
+            ]
+        });
+        this.#guard_url_creator_length(category_suggestions, page_urls);
+        while(page_urls.length)Object.assign(category_suggestions.pop(), page_urls.pop());
+        return response;
+    }
+    async #run_url_creator_for_rest(merchant1, market1, input_data) {
+        if (!this.page_url_creator) return input_data;
+        const displays = input_data.displays;
+        const breadcrumb = input_data.breadcrumb;
+        const quick_links = input_data.quick_links;
+        if (displays) {
+            const page_urls = await this.page_url_creator({
+                type: "products",
+                merchant: merchant1,
+                market: market1,
+                displays: [
+                    ...input_data.displays
+                ]
+            });
+            this.#guard_url_creator_length(displays, page_urls);
+            for(let i = 0; i < displays.length; i++){
+                const new_display_or_page_url = page_urls[i];
+                const old_display = displays[i];
+                if ("page_url" in new_display_or_page_url && Object.keys(new_display_or_page_url).length === 1) {
+                    // they only returned page_url, let's put it into the display
+                    const old_display_was_modern = "variant_index" in old_display;
+                    if (old_display_was_modern) {
+                        const variant_displays = old_display.variant_displays;
+                        for(let i = 0; i < variant_displays.length; i++)variant_displays[i].page_url = new_display_or_page_url.page_url;
+                    } else old_display.page_url = new_display_or_page_url.page_url;
+                } else // We got a whole new display, let's replace it
+                displays[i] = new_display_or_page_url;
+            }
         }
-        return {
-            "suggestions_request_id": "error",
-            "suggestions": [],
-            failed: true
-        };
+        for (const category_display_array of [
+            breadcrumb,
+            quick_links
+        ]){
+            if (!category_display_array) continue;
+            const page_urls = await this.page_url_creator({
+                type: "categories",
+                merchant: merchant1,
+                market: market1,
+                data: [
+                    ...category_display_array
+                ]
+            });
+            this.#guard_url_creator_length(category_display_array, page_urls);
+            for(let i = 0; i < category_display_array.length; i++)Object.assign(category_display_array[i], page_urls[i]);
+        }
+        return input_data;
     }
     async #cached_post_request(endpoint1, input_req, fallback_response) {
         const cache_obj = this.#get_cache_obj_for_endpoint(endpoint1);
@@ -223,66 +274,101 @@ class $7fa23e2a0079eca4$export$e015ed2f2950f2e3 {
         let resolve_in_progress;
         cache_obj.in_progress_[body] = new Promise((r)=>resolve_in_progress = r);
         try {
-            let search_results = await (0, $cV3wj$fetch_retry)((0, $cV3wj$add_version_query_params)(endpoint1), {
+            let api_response = await (0, $cV3wj$fetch_retry)((0, $cV3wj$add_version_query_params)(endpoint1), {
                 method: "POST",
                 body: body
             });
             if ("query_id" in request && request.type === "collection") // FIXME: Remove. Backwards compatibility layer
             // This will retry the request without the collection type if the first request fails
             {
-                if (!search_results || search_results?.status === 404) {
+                if (!api_response || api_response?.status === 404) {
                     (0, $cV3wj$dlog)("Fallback request for collections due to failure");
                     const fallback_body = JSON.parse(body);
                     delete fallback_body.type;
-                    search_results = await (0, $cV3wj$fetch_retry)((0, $cV3wj$add_version_query_params)(endpoint1), {
+                    api_response = await (0, $cV3wj$fetch_retry)((0, $cV3wj$add_version_query_params)(endpoint1), {
                         method: "POST",
                         body: JSON.stringify(fallback_body)
                     });
                 }
             }
-            if (!search_results || search_results.status !== 200) {
-                const retval = fallback_response(input_req);
-                resolve_in_progress(retval);
-                return retval;
+            return_successfully: {
+                if (!api_response || api_response.status !== 200) break return_successfully;
+                let result;
+                try {
+                    const unmodified_result = await api_response.json();
+                    result = await this.#run_url_creator_for_rest(input_req.tenant, input_req.market, unmodified_result);
+                } catch (e) {
+                    (0, $cV3wj$dwarn)("URL creator or json decoding failed", e);
+                    break return_successfully;
+                }
+                cache_obj.cache_[body] = new WeakRef(result);
+                resolve_in_progress(result);
+                setTimeout((0, $cV3wj$catchify)(()=>{
+                    if (this.#supports_finalization_registry) cache_obj.finalization_registry_.register(result, body); // delete key from cache when value (WeakRefs) are collected
+                    else // delete things from cache after 5 minutes, so it doesn't get too heavy
+                    setTimeout((0, $cV3wj$catchify)(()=>delete cache_obj.cache_[body]), 300000);
+                }), 60000 // cache values for at least 60 seconds
+                );
+                return result;
             }
-            const result = await search_results.json();
-            cache_obj.cache_[body] = new WeakRef(result);
-            resolve_in_progress(result);
-            setTimeout((0, $cV3wj$catchify)(()=>{
-                if (this.#supports_finalization_registry) cache_obj.finalization_registry_.register(result, body); // delete key from cache when value (WeakRefs) are collected
-                else // delete things from cache after 5 minutes, so it doesn't get too heavy
-                setTimeout((0, $cV3wj$catchify)(()=>delete cache_obj.cache_[body]), 300000);
-            }), 30000 // cache values for at least 30 seconds
-            );
-            return result;
+            // If we get here, the request failed
+            const retval = fallback_response(input_req);
+            resolve_in_progress(retval);
+            return retval;
         } finally{
             delete cache_obj.in_progress_[body];
         }
     }
+    constructor(options){
+        const { get_metadata: get_metadata , get_user_id: get_user_id , get_session_id: get_session_id , page_url_creator: page_url_creator  } = options ?? {};
+        this.#get_metadata = get_metadata;
+        this.#get_user_id = get_user_id;
+        this.#get_session_id = get_session_id;
+        this.page_url_creator = page_url_creator;
+    }
+    async suggest(input_req) {
+        const request = this.#add_ids_to_request(input_req);
+        const url = (0, $cV3wj$make_url_with_query_params)($7fa23e2a0079eca4$var$search_base_url + "suggestions", request);
+        const results = await (0, $cV3wj$fetch_retry)((0, $cV3wj$add_version_query_params)(url));
+        attempt_to_return_api_response: {
+            if (!results) break attempt_to_return_api_response;
+            const decoded_json = await results.json();
+            if (!Array.isArray(decoded_json?.suggestions)) break attempt_to_return_api_response;
+            try {
+                return await this.#run_url_creator_for_suggest(input_req.tenant, input_req.market, decoded_json);
+            } catch (e) {
+                (0, $cV3wj$dwarn)("URL creator failed", e);
+            }
+        }
+        return {
+            "suggestions_request_id": "error",
+            "suggestions": [],
+            failed: true
+        };
+    }
     async query(input_req) {
-        return await this.#cached_post_request($7fa23e2a0079eca4$var$search_base_url + "results", input_req, (request)=>({
+        return await this.#cached_post_request($7fa23e2a0079eca4$var$search_base_url + "results", input_req, ()=>({
                 "n_hits": 0,
-                "page": request.page ?? 1,
                 "displays": [],
-                "facets": [],
-                "suggestions": [],
+                "sorts": [],
+                "filters": [],
                 "search_request_id": "error",
                 failed: true
             }));
     }
     async list(input_req) {
-        return await this.#cached_post_request($7fa23e2a0079eca4$var$v2_base_url + "product-listing", input_req, (request)=>({
+        return await this.#cached_post_request($7fa23e2a0079eca4$var$v2_base_url + "product-listing", input_req, ()=>({
                 "n_hits": 0,
-                "page": request.page ?? 1,
                 "displays": [],
-                "facets": [],
-                "suggestions": [],
+                "sorts": [],
+                "filters": [],
+                "breadcrumb": [],
+                "quick_links": [],
                 "product_listing_request_id": "error",
                 failed: true
             }));
     }
     async get_recommended(input_req) {
-        // @ts-ignore ModernDisplay doesn't have arbitrary string access, and we'd like it to stay that way
         return await this.#cached_post_request($7fa23e2a0079eca4$var$search_base_url + "related", input_req, ()=>({
                 displays: []
             }));
@@ -906,6 +992,7 @@ function $0449e7d49398c077$export$a1fd619a4743ca08({ plp_results_: plp_results_
             const record = records[i];
             const { target: target , intersectionRatio: intersectionRatio  } = record;
             const index_of_target = target_to_index_map.get(target);
+            if (index_of_target == undefined) return; // It seems like it can happen that we get IntersectionObserverEntries after the onCleanup function for a recommendation card has run, in Firefox. Probably a bug in Firefox? If I understood the bug correctly, this is a workaround.
             const is_in_set = currently_intersecting.has(index_of_target);
             if (intersectionRatio > 0) {
                 if (!is_in_set) currently_intersecting.add(index_of_target);
@@ -4305,23 +4392,30 @@ function $641bba2917fe862b$export$6e49da55e449af7c({ scroll_restoration_data_: [
         ]); // get rid of old data the browser saves the old state and will restore it later on
     };
     (0, $cV3wj$createComputed)((0, $cV3wj$catchify)(()=>{
-        const r = get_last_result_in_viewport_();
-        if (r == undefined || r <= 0 || r == Infinity) return;
+        const last_result = get_last_result_in_viewport_();
+        if (last_result == undefined || last_result <= 0 || last_result == Infinity) return;
+        if (isNaN(last_result)) {
+            // if last_result is NaN there's an issue somewhere, but if we store something here that's not a number the for loop further down will break, and we won't be able to load results at all, so let's just continue
+            (0, $cV3wj$report)(new Error("last_result is NaN, this should not happen"), "error", {
+                last_result: last_result
+            });
+            return;
+        }
         // We can push to history.state max 100 times per 30 seconds (Safari) so we have to debounce/cap this at 300ms for aggressive scrolling.
         // Pushing to history.state right before we leave the page (onunload etc.) is unreliable, as it has to occur *before* the next page is pushed to history.
-        // Instead we delay our push with a timeout set to the next acceptable interval to the previous one, when necessary
+        // Instead, we delay our push with a timeout set to the next acceptable interval to the previous one, when necessary
         const now = +new Date();
         const time_since_last_ran = now - last_time_history_changed;
         if (time_since_last_ran > $641bba2917fe862b$var$max_history_change_frequency) {
             // If the interval to the previous push is already long enough, it's fine to push the next value directly.
-            set_min_results_loaded(r);
+            set_min_results_loaded(last_result);
             last_time_history_changed = now;
             // Even though the interval has passed, there could still be a delayed push timeout in flight (browser can delay timeouts at will).
             // We've already written the guaranteed-to-be-freshest value so we can just cancel it.
             clearTimeout(timeout);
             return;
         }
-        set_to_later = r;
+        set_to_later = last_result;
         // If a delayed push timeout is already running, just changing the value that will be pushed is sufficient
         if (timeout) return;
         timeout = setTimeout((0, $cV3wj$catchify)(()=>{
@@ -5223,7 +5317,7 @@ class $961b5c64bef4662f$export$f34314aa9505732e {
     set on_navigation(new_function) {
         this.#router.on_navigation_ = new_function;
     }
-    constructor({ api: api , on_navigation: on_navigation , ...props_on_class }){
+    constructor({ api: api , on_navigation: on_navigation , page_url_creator: page_url_creator , ...props_on_class }){
         const owner = (0, $cV3wj$getOwner)() || (0, $cV3wj$createRoot)(()=>(0, $cV3wj$getOwner)()); // we might have an owner, if so, pass it on. Otherwise, create one so solid doesn't print warnings to the console
         (0, $cV3wj$runWithOwner)(owner, ()=>{
             if ($961b5c64bef4662f$export$f34314aa9505732e.#has_been_constructed && !(0, $cV3wj$isServer)) // on the server we can't write stuff to history.state anyway so can have multiple
@@ -5251,7 +5345,9 @@ class $961b5c64bef4662f$export$f34314aa9505732e {
                 quicklinks_signal_: (0, $cV3wj$createSignal)(),
                 i18n_: i18n_,
                 reset_history_state_: reset_history_state_,
-                depict_api_: api ?? new (0, $7fa23e2a0079eca4$export$e015ed2f2950f2e3)(),
+                depict_api_: api ?? new (0, $7fa23e2a0079eca4$export$e015ed2f2950f2e3)({
+                    page_url_creator: page_url_creator
+                }),
                 router_: this.#router,
                 selected_filters_: selected_filters_,
                 current_sorting_: current_sorting_,
@@ -7388,7 +7484,7 @@ class $806c97b931758897$export$ac6237957a15b3f0 {
     #modal_open_signal = (0, $cV3wj$createSignal)(false);
     static #has_been_constructed = false;
     #router = new (0, $4fd2ba03703a7d92$export$7e1297a3a19f10d8)("hard_navigation");
-    constructor({ search_query_url_param_name: search_query_url_param_name_ = "query" , url_transformer: url_transformer , on_navigation: on_navigation , enable_category_suggestions: enable_category_suggestions = true , disable_scrolling_during_modal: // Stuff needed for non-standard customer deployments that we shouldn't actually expose
+    constructor({ search_query_url_param_name: search_query_url_param_name_ = "query" , url_transformer: url_transformer , on_navigation: on_navigation , enable_category_suggestions: enable_category_suggestions = true , page_url_creator: page_url_creator , disable_scrolling_during_modal: // Stuff needed for non-standard customer deployments that we shouldn't actually expose
     disable_scrolling_during_modal = true , api: api , bottom_distance_under_modal: bottom_distance_under_modal , render_instant_card: render_instant_card , ...props_on_class }){
         const owner = (0, $cV3wj$getOwner)() || (0, $cV3wj$createRoot)(()=>(0, $cV3wj$getOwner)()); // we might have an owner, if so, pass it on. Otherwise, create one so solid doesn't print warnings to the console
         (0, $cV3wj$runWithOwner)(owner, ()=>{
@@ -7417,7 +7513,9 @@ class $806c97b931758897$export$ac6237957a15b3f0 {
                 if (get_search_query_updating_blocked()) return previous_value;
                 else return raw_search_query_accessor();
             });
-            const depict_api_ = api ?? new (0, $7fa23e2a0079eca4$export$e015ed2f2950f2e3)();
+            const depict_api_ = api ?? new (0, $7fa23e2a0079eca4$export$e015ed2f2950f2e3)({
+                page_url_creator: page_url_creator
+            });
             const previous_searches = (0, $21f51c14cb3f586f$export$84bba84a7b837187)(get_search_query_);
             const [, set_search_showing_recommendation_rows] = state_.search_showing_recommendation_rows;
             const after_submit_ = ()=>set_search_showing_recommendation_rows((0, $172e1b898d457050$export$1c8c715550dc689d)); // do this every time after we have submitted a new query - otherwise there might already be a saved number of rows in the state