@depict-ai/ui 3.0.3 → 3.0.5

package/server/latest/index.js

@@ -1,13 +1,13 @@
-import { add_to_version_info as $i7OB2$add_to_version_info, Amazing_Slider as $i7OB2$Amazing_Slider, slider_snap_css as $i7OB2$slider_snap_css, slider_fading_factory as $i7OB2$slider_fading_factory, get_session_id as $i7OB2$get_session_id, add_version_query_params as $i7OB2$add_version_query_params, base_url as $i7OB2$base_url, dwarn as $i7OB2$dwarn, catchify as $i7OB2$catchify1, observer as $i7OB2$observer, instant_exec_on_suspect_history_change as $i7OB2$instant_exec_on_suspect_history_change, report as $i7OB2$report, dlog as $i7OB2$dlog, ContainedImage as $i7OB2$ContainedImage, use_href_accessor as $i7OB2$use_href_accessor1, camelCasifyObject as $i7OB2$camelCasifyObject, make_random_classname as $i7OB2$make_random_classname, n_col_styling_with_dist as $i7OB2$n_col_styling_with_dist, layout_get_visible_recs_without_partial_rows as $i7OB2$layout_get_visible_recs_without_partial_rows, layout_get_total_rec_amount_for_row as $i7OB2$layout_get_total_rec_amount_for_row, layout_media_query_header as $i7OB2$layout_media_query_header, base64_encode_unicode as $i7OB2$base64_encode_unicode, base64_decode_unicode as $i7OB2$base64_decode_unicode, queueMacroTask as $i7OB2$queueMacroTask, is_safari as $i7OB2$is_safari, slider_fractional_factory as $i7OB2$slider_fractional_factory, useExpandingContainer as $i7OB2$useExpandingContainer, standard_price_format as $i7OB2$standard_price_format, hex_to_rgb as $i7OB2$hex_to_rgb, relative_luminance_from_rgb as $i7OB2$relative_luminance_from_rgb, snakeCasifyObject as $i7OB2$snakeCasifyObject, fetch_retry as $i7OB2$fetch_retry, sort_obj as $i7OB2$sort_obj, make_url_with_query_params as $i7OB2$make_url_with_query_params, edit_current_page_meta_tags as $i7OB2$edit_current_page_meta_tags, javascript_media_query as $i7OB2$javascript_media_query, make_asyncIterable_exiter as $i7OB2$make_asyncIterable_exiter, href_change_ipns as $i7OB2$href_change_ipns, deparallelize_no_drop as $i7OB2$deparallelize_no_drop, ListenableSet as $i7OB2$ListenableSet1, insert_surfaces as $i7OB2$insert_surfaces } from "@depict-ai/utilishared/latest";
+import { add_to_version_info as $i7OB2$add_to_version_info, Amazing_Slider as $i7OB2$Amazing_Slider, slider_snap_css as $i7OB2$slider_snap_css, slider_fading_factory as $i7OB2$slider_fading_factory, get_session_id as $i7OB2$get_session_id, add_version_query_params as $i7OB2$add_version_query_params, base_url as $i7OB2$base_url, dwarn as $i7OB2$dwarn, catchify as $i7OB2$catchify1, observer as $i7OB2$observer, instant_exec_on_suspect_history_change as $i7OB2$instant_exec_on_suspect_history_change, report as $i7OB2$report, dlog as $i7OB2$dlog, ContainedImage as $i7OB2$ContainedImage, use_href_accessor as $i7OB2$use_href_accessor1, camelCasifyObject as $i7OB2$camelCasifyObject, make_random_classname as $i7OB2$make_random_classname, n_col_styling_with_dist as $i7OB2$n_col_styling_with_dist, layout_get_visible_recs_without_partial_rows as $i7OB2$layout_get_visible_recs_without_partial_rows, layout_get_total_rec_amount_for_row as $i7OB2$layout_get_total_rec_amount_for_row, layout_media_query_header as $i7OB2$layout_media_query_header, base64_encode_unicode as $i7OB2$base64_encode_unicode, base64_decode_unicode as $i7OB2$base64_decode_unicode, queueMacroTask as $i7OB2$queueMacroTask, is_safari as $i7OB2$is_safari, slider_fractional_factory as $i7OB2$slider_fractional_factory, useExpandingContainer as $i7OB2$useExpandingContainer, standard_price_format as $i7OB2$standard_price_format, hex_to_rgb as $i7OB2$hex_to_rgb, relative_luminance_from_rgb as $i7OB2$relative_luminance_from_rgb, snakeCasifyObject as $i7OB2$snakeCasifyObject, fetch_retry as $i7OB2$fetch_retry, sort_obj as $i7OB2$sort_obj, make_url_with_query_params as $i7OB2$make_url_with_query_params, javascript_media_query as $i7OB2$javascript_media_query, make_asyncIterable_exiter as $i7OB2$make_asyncIterable_exiter, href_change_ipns as $i7OB2$href_change_ipns, deparallelize_no_drop as $i7OB2$deparallelize_no_drop, ListenableSet as $i7OB2$ListenableSet1, insert_surfaces as $i7OB2$insert_surfaces } from "@depict-ai/utilishared/latest";
 import { createComponent as $i7OB2$createComponent, mergeProps as $i7OB2$mergeProps, Dynamic as $i7OB2$Dynamic, ssr as $i7OB2$ssr, ssrHydrationKey as $i7OB2$ssrHydrationKey, escape as $i7OB2$escape, ssrAttribute as $i7OB2$ssrAttribute, insert as $i7OB2$insert, ssrElement as $i7OB2$ssrElement, ssrClassList as $i7OB2$ssrClassList, ssrStyle as $i7OB2$ssrStyle, isServer as $i7OB2$isServer, spread as $i7OB2$spread } from "solid-js/web";
 import { createContext as $i7OB2$createContext, useContext as $i7OB2$useContext, createSignal as $i7OB2$createSignal, createSelector as $i7OB2$createSelector, getOwner as $i7OB2$getOwner, runWithOwner as $i7OB2$runWithOwner, Index as $i7OB2$Index, createMemo as $i7OB2$createMemo, children as $i7OB2$children, onCleanup as $i7OB2$onCleanup, createEffect as $i7OB2$createEffect, untrack as $i7OB2$untrack, Show as $i7OB2$Show, createUniqueId as $i7OB2$createUniqueId, mergeProps as $i7OB2$mergeProps1, ErrorBoundary as $i7OB2$ErrorBoundary, createResource as $i7OB2$createResource, splitProps as $i7OB2$splitProps, createRoot as $i7OB2$createRoot, createRenderEffect as $i7OB2$createRenderEffect, batch as $i7OB2$batch, Suspense as $i7OB2$Suspense, on as $i7OB2$on, For as $i7OB2$For, createComputed as $i7OB2$createComputed, createReaction as $i7OB2$createReaction, mapArray as $i7OB2$mapArray } from "solid-js";
-import { ListenableSet as $i7OB2$ListenableSet, catchify as $i7OB2$catchify, use_href_accessor as $i7OB2$use_href_accessor } from "@depict-ai/utilishared/latest";
+import { ListenableSet as $i7OB2$ListenableSet, catchify as $i7OB2$catchify, use_href_accessor as $i7OB2$use_href_accessor, report as $i7OB2$report1 } from "@depict-ai/utilishared/latest";
 import { createStore as $i7OB2$createStore, reconcile as $i7OB2$reconcile } from "solid-js/store";
 
 /*! Depict.ai search and product listing SDK */
 import { register_es_version } from "../../multi_import_deduplicator.mjs";
 register_es_version("ui", "latest");
-const $ec291e0010116877$export$83d89fbfd8236492 = "3.0.3";
+const $ec291e0010116877$export$83d89fbfd8236492 = "3.0.5";
 const $fbbadcb080ad1d4a$var$_tmpl$ = ["<svg", ' xmlns="http://www.w3.org/2000/svg"', ' viewBox="0 0 14 26"><path d="M2 24.656c-.078 0-.156-.016-.234-.047s-.133-.066-.187-.129c-.117-.117-.176-.258-.176-.422s.059-.305.176-.422l10.371-10.371L1.578 2.883c-.117-.117-.176-.258-.176-.422s.059-.305.176-.422.258-.176.422-.176.305.059.422.176l10.805 10.793a.59.59 0 0 1 .176.434c0 .172-.059.305-.176.422L2.422 24.48a.42.42 0 0 1-.199.129.54.54 0 0 1-.223.047zm0 0" fill="#0f0f0f"></path></svg>'];
 function $fbbadcb080ad1d4a$export$8be2714ec7f169ee(props = {}) {
   return $i7OB2$ssr($fbbadcb080ad1d4a$var$_tmpl$, $i7OB2$ssrHydrationKey(), $i7OB2$ssrAttribute("width", $i7OB2$escape(props.width_, true) ?? 14, false) + $i7OB2$ssrAttribute("height", $i7OB2$escape(props.height_, true) ?? 26, false));
@@ -369,7 +369,7 @@ class $4fd2ba03703a7d92$export$7e1297a3a19f10d8 {
       event_: event_,
       force_spa_navigation_: force_spa_navigation_,
       is_replace_: is_replace_,
-      listing_id_: listing_id_,
+      listing_query_: listing_query_,
       scroll = true
     }) => {
       const new_url_ = raw_new_url instanceof URL ? raw_new_url : new URL(raw_new_url, location.origin);
@@ -390,10 +390,10 @@ class $4fd2ba03703a7d92$export$7e1297a3a19f10d8 {
       if (force_spa_navigation_ && wants_hard_navigation) {
         // Don't allow hard navigation if we're forcing SPA navigation, which we do for things where PageReplacer can be used for performance
         const new_state = history.state;
-        if (listing_id_) {
+        if (listing_query_) {
           // In JS-UI we need to know the listing_id of the current category, therefore push it into state
-          if (!this.listing_id_state_key) $i7OB2$report(new Error("listing_id_state_key is not set"), "error");
-          new_state[this.listing_id_state_key] = listing_id_;
+          if (!this.listing_query_state_key) $i7OB2$report(new Error("listing_query_state_key is not set"), "error");
+          new_state[this.listing_query_state_key] = listing_query_;
         }
         history[is_replace_ ? "replaceState" : "pushState"](new_state, "", new_url_);
       } else this.#throwing_on_navigation.call(this, {
@@ -404,8 +404,8 @@ class $4fd2ba03703a7d92$export$7e1297a3a19f10d8 {
       await promise;
     })
   };
-  constructor(on_navigation, listing_id_state_key) {
-    this.listing_id_state_key = listing_id_state_key;
+  constructor(on_navigation, listing_query_state_key) {
+    this.listing_query_state_key = listing_query_state_key;
     this.on_navigation_ = on_navigation;
   }
 }
@@ -824,27 +824,31 @@ function $29ec7cddbe1d3484$export$43f0fb951fcb0c54({
   });
 }
 // source: https://medium.com/@pancemarko/deep-equality-in-javascript-determining-if-two-objects-are-equal-bf98cf47e934
+// deeply diffs two objects
+// Modified by chatGPT to not be recursive, since stiga was getting a stack overflow just due to the size of their data
+// Modified futher to bias towards saying objects are equal non-primitive objects differ
 function $29ec7cddbe1d3484$var$deep_equal(obj1, obj2) {
-  if (obj1 === obj2) return true;
-  if (Array.isArray(obj1) && Array.isArray(obj2)) {
-    if (obj1.length !== obj2.length) return false;
-    return obj1.every((elem, index) => {
-      return $29ec7cddbe1d3484$var$deep_equal(elem, obj2[index]);
-    });
-  }
-  if (typeof obj1 === "object" && typeof obj2 === "object" && obj1 !== null && obj2 !== null) {
-    if (Array.isArray(obj1) || Array.isArray(obj2)) return false;
-    const keys1 = Object.keys(obj1);
-    const keys2 = Object.keys(obj2);
-    if (keys1.length !== keys2.length || !keys1.every(key => keys2.includes(key))) return false;
-    for (const key in obj1) {
-      if ($29ec7cddbe1d3484$var$result_ids.includes(key)) continue; // ignore keys changing with every request
-      const isEqual = $29ec7cddbe1d3484$var$deep_equal(obj1[key], obj2[key]);
-      if (!isEqual) return false;
-    }
-    return true;
+  const stack = [[obj1, obj2]];
+  while (stack.length > 0) {
+    const [currentObj1, currentObj2] = stack.pop();
+    if (currentObj1 === currentObj2) continue;
+    if (Array.isArray(currentObj1) && Array.isArray(currentObj2)) {
+      if (currentObj1.length !== currentObj2.length) return false;
+      for (let i = 0; i < currentObj1.length; i++) stack.push([currentObj1[i], currentObj2[i]]);
+    } else if (typeof currentObj1 === "object" && typeof currentObj2 === "object" && currentObj1 !== null && currentObj2 !== null) {
+      if (Array.isArray(currentObj1) || Array.isArray(currentObj2)) return false;
+      const keys1 = Object.keys(currentObj1);
+      const keys2 = Object.keys(currentObj2);
+      if (keys1.length !== keys2.length || !keys1.every(key => keys2.includes(key))) return false;
+      for (let key in currentObj1) {
+        if ($29ec7cddbe1d3484$var$result_ids.includes(key)) continue; // ignore comparing values for keys we know are changing with every request
+        stack.push([currentObj1[key], currentObj2[key]]);
+      }
+    } else if (typeof currentObj1 !== "function" && typeof currentObj2 !== "function")
+      // Claim that all functions are equal, since the only way a function ends up here is because someone added it in the displayTransformer and that shouldn't force us to re-render, right?
+      return false;
   }
-  return false;
+  return true;
 }
 const $c8d5ff4524619fcd$var$_tmpl$ = ["<div", ' class="', '">', "</div>"],
   $c8d5ff4524619fcd$var$_tmpl$2 = ["<style", ' type="text/css">', "</style>"];
@@ -4380,6 +4384,11 @@ function $e5014ccd0b76d9f4$export$967e966fca9515e(api_response) {
   }
   return api_response;
 }
+
+// Minifiable and tree-shakable enum
+// Why not use const enum? See https://gitlab.com/depict-ai/depict.ai/-/merge_requests/9223#note_1675965260
+const $c20599a0d81d953a$export$74ee7529ce0f8a00 = "listingId";
+const $c20599a0d81d953a$export$5aae649db1b959fc = "externalId";
 const $7fa23e2a0079eca4$var$v3_base_url = (0, $i7OB2$base_url) + "/v3/";
 const $7fa23e2a0079eca4$var$search_base_url = $7fa23e2a0079eca4$var$v3_base_url + "search/";
 class $7fa23e2a0079eca4$export$e015ed2f2950f2e3 {
@@ -4409,7 +4418,7 @@ class $7fa23e2a0079eca4$export$e015ed2f2950f2e3 {
     const category_transformer = this.display_transformers?.categories;
     if (!category_transformer) return response;
     // find category suggestions, run thing with them, and then replace them
-    const category_suggestions = response.suggestions.filter(suggestion => suggestion.type === "category");
+    const category_suggestions = response.suggestions.filter(suggestion => suggestion.type === "listing");
     const transformed_category_suggestions = await category_transformer({
       market: market,
       merchant: merchant,
@@ -4459,8 +4468,7 @@ class $7fa23e2a0079eca4$export$e015ed2f2950f2e3 {
     endpoint_: endpoint_,
     input_req_: input_req_,
     fallback_response_: fallback_response_,
-    method_ = "POST",
-    delete_key_before_sending_: delete_key_before_sending_ // only supported for GET requests
+    method_ = "POST"
   }) {
     const cache_obj = this.#get_cache_obj_for_endpoint(endpoint_);
     const with_ids = this.#add_ids_to_request(input_req_);
@@ -4478,7 +4486,6 @@ class $7fa23e2a0079eca4$export$e015ed2f2950f2e3 {
     cache_obj.in_progress_[body] = new Promise(r => resolve_in_progress = r);
     try {
       const is_post = method_ === "POST";
-      if (!is_post && delete_key_before_sending_) delete sorted_request[delete_key_before_sending_];
       const url_to_request = is_post ? endpoint_ : $i7OB2$make_url_with_query_params(endpoint_, sorted_request);
       const api_response = await $i7OB2$fetch_retry($i7OB2$add_version_query_params(url_to_request), {
         method: method_,
@@ -4566,9 +4573,13 @@ class $7fa23e2a0079eca4$export$e015ed2f2950f2e3 {
       })
     });
   }
-  async get_listing(input_req) {
+  async get_listing({
+    id_type_: id_type_,
+    id_to_query_for_: id_to_query_for_,
+    ...input_req
+  }) {
     return await this.#cached_request({
-      endpoint_: $7fa23e2a0079eca4$var$v3_base_url + "listings/" + encodeURIComponent(input_req.listing_id),
+      endpoint_: $7fa23e2a0079eca4$var$v3_base_url + "listings/" + (id_type_ === $c20599a0d81d953a$export$5aae649db1b959fc ? "external_id/" : "") + encodeURIComponent(id_to_query_for_),
       input_req_: input_req,
       fallback_response_: () => ({
         listing_id: "",
@@ -4582,20 +4593,17 @@ class $7fa23e2a0079eca4$export$e015ed2f2950f2e3 {
         "quick_links": [],
         failed: true
       }),
-      method_: "GET",
-      delete_key_before_sending_: "listing_id" // this goes into the path, but we still need to have it in the request object until the last second as we want to include it as a key when caching requests
+      method_: "GET"
     });
   }
-
-  async get_listing_products(input_req) {
-    const listing_id = input_req.listing_id; // listing_id goes into the path
-    const cloned_request = {
-      ...input_req
-    };
-    delete cloned_request["listing_id"];
+  async get_listing_products({
+    id_to_query_for_: id_to_query_for_,
+    id_type_: id_type_,
+    ...input_req_
+  }) {
     return await this.#cached_request({
-      endpoint_: $7fa23e2a0079eca4$var$v3_base_url + "listings/" + encodeURIComponent(listing_id) + "/products",
-      input_req_: input_req,
+      endpoint_: $7fa23e2a0079eca4$var$v3_base_url + "listings/" + (id_type_ === $c20599a0d81d953a$export$5aae649db1b959fc ? "external_id/" : "") + encodeURIComponent(id_to_query_for_) + "/products",
+      input_req_: input_req_,
       fallback_response_: () => ({
         "n_hits": 0,
         "displays": [],
@@ -4896,7 +4904,7 @@ function $056f6ac0a6caa919$export$5e4aed86c12acdd9({
     // After first load, always just load 20 since people might just be browsing the top ones still
     min_products_to_fetch_ : now - last_loaded < 10000 ? min_products_to_fetch_ * 5 : min_products_to_fetch_;
     // dlog("loading ", number_of_results_to_load, "products, because it was", now - last_loaded, "ms since last load");
-    const api_response = await depict_api_["listing_id" in base_part ? "get_listing_products" : "query"]({
+    const api_response = await depict_api_["query" in base_part ? "query" : "get_listing_products"]({
       cursor: get_last_cursor(),
       limit: number_of_results_to_load,
       ...base_part
@@ -6188,11 +6196,12 @@ const $06edf3aec9073663$var$_tmpl$ = ["<nav", ' class="quicklinks"', ">", "</nav
 function $06edf3aec9073663$export$466cdc317043f6cb({
   quicklinks_data_: quicklinks_data_,
   router_: router_,
-  current_listing_id_: current_listing_id_,
+  id_to_query_for_: id_to_query_for_,
   breadcrumb_data_: breadcrumb_data_,
   i18n_: i18n_,
   sorting_query_param_: sorting_query_param_,
-  filter_query_param_prefix_: filter_query_param_prefix_
+  filter_query_param_prefix_: filter_query_param_prefix_,
+  id_type_: id_type_
 }) {
   let scrolling_logic_ran_for_listing_id = false;
   let last_scroll_position;
@@ -6200,11 +6209,11 @@ function $06edf3aec9073663$export$466cdc317043f6cb({
   let last_was_placeholder = false;
   let sliding_element;
   $i7OB2$createComputed(() => {
-    current_listing_id_();
+    id_to_query_for_();
     scrolling_logic_ran_for_listing_id = false;
   });
   const place_holdey_quicklinks_data = $i7OB2$createMemo(() => quicklinks_data_() || [,,,]);
-  const selected_index = $i7OB2$createMemo(() => quicklinks_data_()?.findIndex(item => item.listing_id === current_listing_id_())); // this will be -1 when viewing child categories
+  const selected_index = $i7OB2$createMemo(() => quicklinks_data_()?.findIndex(item => item[id_type_() === $c20599a0d81d953a$export$5aae649db1b959fc ? "external_id" : "listing_id"] === id_to_query_for_())); // this will be -1 when viewing child categories
   const scrollpos_per_listing_id = {};
   const mutation_plugins = [function () {
     if (!scrolling_logic_ran_for_listing_id) return;
@@ -6213,7 +6222,7 @@ function $06edf3aec9073663$export$466cdc317043f6cb({
     } = this.insert_here;
     if (scrollLeft > 0) {
       last_scroll_position = scrollLeft;
-      const current_id = $i7OB2$untrack(current_listing_id_);
+      const current_id = $i7OB2$untrack(id_to_query_for_);
       // make sure to not save position where selected item isn't in viewport
       const current_selected_index = $i7OB2$untrack(selected_index);
       const intersecting_thing = this.intersecting_items_object[current_selected_index];
@@ -6275,7 +6284,7 @@ function $06edf3aec9073663$export$466cdc317043f6cb({
             equals: false
           }), new_data => {
             const quicklinks_data = quicklinks_data_(); // this signal should have updated by now since this is a createEffect
-            const current_id = current_listing_id_();
+            const current_id = id_to_query_for_();
             if (!new_data || !quicklinks_data || !current_id) return;
             const owner = $i7OB2$getOwner();
             queueMicrotask(() => {
@@ -6323,10 +6332,9 @@ function $06edf3aec9073663$export$466cdc317043f6cb({
               // Problem: When you don't open a link in a new tab, we don't display the filter cleared toast
               // Solution: instead of not adding the state to the url, add a flag to the link if it's a sibling and then display the toast on load if the flag is set
               const is_sibling = $i7OB2$createMemo(() => {
-                const current_id = current_listing_id_();
-                return quicklinks_data_()?.some(({
-                  listing_id: listing_id
-                }) => listing_id === current_id);
+                const current_id = id_to_query_for_();
+                const lookForId = id_type_() === $c20599a0d81d953a$export$5aae649db1b959fc ? "external_id" : "listing_id";
+                return quicklinks_data_()?.some(quickLink => quickLink[lookForId] === current_id);
               });
               const href = $i7OB2$createMemo(() =>
               // We don't want these links to delete the sort and filter state by default, only if `clear_filters_when_going_sideways` explicitly clears them
@@ -6534,13 +6542,14 @@ function $e9342fb3ac73a54a$export$8895d39404bd2bb1(props) {
 }
 function $e7fce80abe608e01$export$3945d6db2dfd3d12({
   crumb_data_: crumb_data_,
-  listing_id_: listing_id_,
+  id_to_query_for_: id_to_query_for_,
   i18n_: i18n_,
   selected_filters_: selected_filters_,
   local_filter_cache_: local_filter_cache_,
   expanded_hierarchical_filters_: expanded_hierarchical_filters_,
   plp_results_: plp_results_,
-  sideways_filter_clearing_flag_: sideways_filter_clearing_flag_
+  sideways_filter_clearing_flag_: sideways_filter_clearing_flag_,
+  id_type_: id_type_
 }) {
   // If we just got opened in a new tab, clear filters instantly and remove the flag
   $e7fce80abe608e01$var$clear_if_opened_new_tab_with_sideways_url_params_flag({
@@ -6551,17 +6560,21 @@ function $e7fce80abe608e01$export$3945d6db2dfd3d12({
     i18n_: i18n_,
     sideways_filter_clearing_flag_: sideways_filter_clearing_flag_
   });
-  // Code below is for when we're already open and the user navigates to a new category
+  // The code below is for when we're already open and the user navigates to a new category
   let previous_crumb_data = $i7OB2$untrack(crumb_data_);
-  let listing_id_when_we_got_previous_data = $i7OB2$untrack(listing_id_);
+  let id_when_we_got_previous_data = {
+    id_: $i7OB2$untrack(id_to_query_for_),
+    type_: $i7OB2$untrack(id_type_)
+  };
   let allow_filter_clearing = true; // set to false when going backwards/forwards
   // temporarily disable filter clearing when going backwards/forwards
   const handler = () => allow_filter_clearing = false;
   window.addEventListener("popstate", handler); // popstate only gets called when using back/forwards button of browser or the history navigate to achieve the same, but not on pushState or replaceState
   $i7OB2$onCleanup(() => window.removeEventListener("popstate", handler));
   $i7OB2$createEffect($i7OB2$on(crumb_data_, $i7OB2$catchify1(new_crumb_data => {
-    const listing_id_of_new_data = listing_id_();
-    if (allow_filter_clearing && previous_crumb_data && new_crumb_data && listing_id_of_new_data !== listing_id_when_we_got_previous_data) {
+    const id_of_new_data = id_to_query_for_();
+    const type_of_id_of_new_data = id_type_();
+    if (allow_filter_clearing && previous_crumb_data && new_crumb_data && (id_of_new_data !== id_when_we_got_previous_data.id_ || type_of_id_of_new_data !== id_when_we_got_previous_data.type_)) {
       const previous_length = previous_crumb_data.length;
       const new_length = new_crumb_data.length;
       const went_upwards = new_length < previous_length;
@@ -6584,7 +6597,10 @@ function $e7fce80abe608e01$export$3945d6db2dfd3d12({
         sideways_filter_clearing_flag_[1](false);
       }
     }
-    listing_id_when_we_got_previous_data = listing_id_of_new_data;
+    id_when_we_got_previous_data = {
+      id_: id_of_new_data,
+      type_: type_of_id_of_new_data
+    };
     previous_crumb_data = new_crumb_data;
     if (!allow_filter_clearing) allow_filter_clearing = true;
   })));
@@ -6647,8 +6663,8 @@ const $df5d81d0fe61ff21$var$_tmpl$ = ["<div", ' class="product-count"><!--$-->',
   $df5d81d0fe61ff21$var$_tmpl$4 = ["<div", ' class="depict plp category"><div class="listing-page"><!--$-->', "<!--/--><!--$-->", "<!--/--><!--$-->", "<!--/--><!--$-->", "<!--/--><!--$-->", "<!--/--><!--$-->", "<!--/--></div><!--$-->", "<!--/--><!--$-->", "<!--/--></div>"];
 function $df5d81d0fe61ff21$export$f7d2f673fc2f091d({
   depict_api_: depict_api_,
-  listing_id_: listing_id_,
-  meta_title_suffix_: meta_title_suffix_,
+  id_to_query_for_: id_to_query_for_,
+  id_type_: id_type_,
   current_sorting_: current_sorting_,
   min_products_to_fetch_: min_products_to_fetch_,
   category_filters_open_: category_filters_open_,
@@ -6701,7 +6717,8 @@ function $df5d81d0fe61ff21$export$f7d2f673fc2f091d({
       merchant: merchant_(),
       market: market_(),
       locale: backend_locale_(),
-      listing_id: listing_id_(),
+      id_to_query_for_: id_to_query_for_(),
+      id_type_: id_type_(),
       ...(f.length ? {
         filters: f
       } : {}),
@@ -6713,8 +6730,8 @@ function $df5d81d0fe61ff21$export$f7d2f673fc2f091d({
   // Make "Get products in listing" request to get products in listing
   const [plp_products_] = $i7OB2$createResource(products_query_base_,
   // only first page of results, unless the history state says we should load more (can't do that in load more thing, I tested, they need to be added at once for the browser to not give up scroll restoration)
-  $i7OB2$catchify1(base_query => $641bba2917fe862b$export$cc42dd29bf655ab6({
-    id_: $i7OB2$untrack(listing_id_),
+  $i7OB2$catchify(base_query => $641bba2917fe862b$export$cc42dd29bf655ab6({
+    id_: $i7OB2$untrack(id_to_query_for_),
     scroll_restoration_data_: scroll_restoration_data_,
     min_products_to_fetch_: min_products_to_fetch_,
     make_request_: (limit, cursor) => depict_api_.get_listing_products({
@@ -6729,10 +6746,11 @@ function $df5d81d0fe61ff21$export$f7d2f673fc2f091d({
     merchant: merchant_(),
     market: market_(),
     locale: backend_locale_(),
-    listing_id: listing_id_()
+    id_to_query_for_: id_to_query_for_(),
+    id_type_: id_type_()
   }));
   // Make "Get Listing" request to get quicklinks, breadcrumbs, title, etc
-  const [plp_meta] = $i7OB2$createResource(meta_query_base, $i7OB2$catchify1(query => depict_api_.get_listing(query)));
+  const [plp_meta] = $i7OB2$createResource(meta_query_base, $i7OB2$catchify(query => depict_api_.get_listing(query)));
   const available_sortings_ = $i7OB2$createMemo(() => plp_products_()?.sorts?.map(sort => ({
     ...sort,
     order: sort.order ?? "desc"
@@ -6741,13 +6759,6 @@ function $df5d81d0fe61ff21$export$f7d2f673fc2f091d({
   const title = $i7OB2$createMemo(() => plp_meta()?.title);
   const crumb_data_ = $df5d81d0fe61ff21$var$add_us_to_crumbs(plp_meta, title);
   const quicklinks_data_ = $i7OB2$createMemo(() => plp_meta()?.quick_links);
-  const meta_tag_data_ = $i7OB2$createMemo(() => {
-    if (plp_meta()?.replace_meta_tags) return {
-      title: plp_meta()?.title + (meta_title_suffix_() || ""),
-      description: plp_meta()?.description
-    };
-  });
-  $i7OB2$edit_current_page_meta_tags(meta_tag_data_);
   const [sort_or_filter_open_, set_sort_or_filter_open_] = $i7OB2$createSignal(false);
   const [desktop_filter_elements_, set_desktop_filter_elements] = $i7OB2$createSignal();
   const formatted_number_of_results_ = $511cc0abd9a64ce8$export$92f2da32c6e7e7ee({
@@ -6807,7 +6818,7 @@ function $df5d81d0fe61ff21$export$f7d2f673fc2f091d({
     }));
     results_for = make_product_count_();
   } else {
-    $i7OB2$report(new Error("Unrecognised category_title_type, UI will look messed up"), "error");
+    $i7OB2$report1(new Error("Unrecognised category_title_type, UI will look messed up"), "error");
     results_for = $i7OB2$ssr($df5d81d0fe61ff21$var$_tmpl$2, $i7OB2$ssrHydrationKey());
   }
   const filters_opener = $cdea4cf8c5c071ef$export$d7841e452f2e59a8({
@@ -6829,17 +6840,17 @@ function $df5d81d0fe61ff21$export$f7d2f673fc2f091d({
     number_of_rendered_selected_filters_items_: number_of_rendered_selected_filters_items_,
     ...extra_sort_and_filter_args_
   });
-  $i7OB2$catchify1((0, $641bba2917fe862b$export$6e49da55e449af7c))({
+  $i7OB2$catchify((0, $641bba2917fe862b$export$6e49da55e449af7c))({
     scroll_restoration_data_: scroll_restoration_data_,
     last_result_in_viewport_: last_result_in_viewport_,
-    id_: listing_id_,
+    id_: id_to_query_for_,
     can_write_scroll_restoration_: can_write_scroll_restoration_
   });
   on_filters_constructed_?.();
   $i7OB2$createComputed(() => {
     if (plp_products_.loading) set_can_write_scroll_restoration(false);else if (plp_products_()) set_can_write_scroll_restoration(true);
   });
-  $i7OB2$createRenderEffect($i7OB2$catchify1(async () => {
+  $i7OB2$createRenderEffect($i7OB2$catchify(async () => {
     const slim = is_slim_();
     const only_show_filters_opener = only_show_filters_opener_?.();
     const owner = $i7OB2$getOwner();
@@ -6852,14 +6863,15 @@ function $df5d81d0fe61ff21$export$f7d2f673fc2f091d({
     available_filters_: available_filters_
   });
   $e7fce80abe608e01$export$3945d6db2dfd3d12({
-    listing_id_: listing_id_,
+    id_to_query_for_: id_to_query_for_,
     crumb_data_: crumb_data_,
     i18n_: i18n_,
     selected_filters_: selected_filters_,
     local_filter_cache_: local_filter_cache_,
     expanded_hierarchical_filters_: expanded_hierarchical_filters_,
     plp_results_: plp_products_,
-    sideways_filter_clearing_flag_: sideways_filter_clearing_flag_
+    sideways_filter_clearing_flag_: sideways_filter_clearing_flag_,
+    id_type_: id_type_
   });
   get_breadcrumb_accessor_?.(crumb_data_);
   get_quicklinks_accessor_?.(quicklinks_data_);
@@ -6883,7 +6895,8 @@ function $df5d81d0fe61ff21$export$f7d2f673fc2f091d({
     get children() {
       return $i7OB2$createComponent((0, $06edf3aec9073663$export$466cdc317043f6cb), {
         quicklinks_data_: quicklinks_data_,
-        current_listing_id_: listing_id_,
+        id_to_query_for_: id_to_query_for_,
+        id_type_: id_type_,
         router_: router_,
         breadcrumb_data_: crumb_data_,
         i18n_: i18n_,
@@ -6933,7 +6946,7 @@ function $df5d81d0fe61ff21$export$f7d2f673fc2f091d({
             sort_or_filter_open_: sort_or_filter_open_,
             desktop_filter_elements_: desktop_filter_elements_,
             content_blocks_by_row_: content_blocks_by_row_,
-            id_currently_querying_for_: listing_id_,
+            id_currently_querying_for_: id_to_query_for_,
             no_results_options_: {
               selected_filters_: selected_filters_,
               expanded_hierarchical_filters_: expanded_hierarchical_filters_,
@@ -6974,7 +6987,7 @@ function $df5d81d0fe61ff21$export$f7d2f673fc2f091d({
  * Adds the current page as last breadcrumb to the breadcrumb trail
  */
 function $df5d81d0fe61ff21$var$add_us_to_crumbs(plp_meta, title) {
-  const href_accessor = $i7OB2$use_href_accessor1();
+  const href_accessor = $i7OB2$use_href_accessor();
   return $i7OB2$createMemo(() => {
     const api_value = plp_meta()?.breadcrumbs;
     if (!api_value) return api_value;
@@ -6990,6 +7003,12 @@ function $df5d81d0fe61ff21$var$add_us_to_crumbs(plp_meta, title) {
       },
       get slug() {
         return plp_meta().slug;
+      },
+      get listing_type() {
+        return plp_meta().listing_type;
+      },
+      get external_id() {
+        return plp_meta().external_id;
       }
     }];
   });
@@ -7157,8 +7176,7 @@ class $961b5c64bef4662f$export$f34314aa9505732e {
   #localization_signal = $i7OB2$createSignal();
   #merchant_signal = $i7OB2$createSignal();
   #market_signal = $i7OB2$createSignal();
-  #listing_id_signal = $i7OB2$createSignal("");
-  #meta_title_suffix_ = $i7OB2$createSignal();
+  #listing_query_signal = $i7OB2$createSignal({});
   #disable_override_listing_id = $i7OB2$createSignal();
   static #keys_constructed_with = /*@__PURE__*/new Set();
   get localization() {
@@ -7168,11 +7186,11 @@ class $961b5c64bef4662f$export$f34314aa9505732e {
   set localization(locale_obj) {
     this.#localization_signal[1](locale_obj);
   }
-  get listing_id() {
-    return this.#listing_id_signal[0]();
+  get listing_query() {
+    return this.#listing_query_signal[0]();
   }
-  set listing_id(id) {
-    this.#listing_id_signal[1](id);
+  set listing_query(query) {
+    this.#listing_query_signal[1](query);
   }
   get merchant() {
     return this.#merchant_signal[0]();
@@ -7186,12 +7204,6 @@ class $961b5c64bef4662f$export$f34314aa9505732e {
   set market(market) {
     this.#market_signal[1](market);
   }
-  get meta_title_suffix() {
-    return this.#meta_title_suffix_[0]();
-  }
-  set meta_title_suffix(new_suffix) {
-    this.#meta_title_suffix_[1](new_suffix);
-  }
   get disable_override_listing_id() {
     return this.#disable_override_listing_id[0]();
   }
@@ -7210,7 +7222,7 @@ class $961b5c64bef4662f$export$f34314aa9505732e {
     on_navigation: on_navigation,
     display_transformers: display_transformers,
     unique_instance_key_for_state = "",
-    listing_id_state_key: listing_id_state_key,
+    listing_query_state_key: listing_query_state_key,
     ...props_on_class
   }) {
     const owner = $i7OB2$getOwner() || $i7OB2$createRoot(() => $i7OB2$getOwner()); // we might have an owner, if so, pass it on. Otherwise, create one so solid doesn't print warnings to the console
@@ -7220,7 +7232,7 @@ class $961b5c64bef4662f$export$f34314aa9505732e {
         throw new Error("You can only have one instance of DepictCategory with the same uniqueInstanceKeyForState");
       Object.assign(this, props_on_class); // set initial signal values
       $90980bd87c9960f9$export$5162a71f252e6122();
-      this.#router = new (0, $4fd2ba03703a7d92$export$7e1297a3a19f10d8)("hard_navigation", listing_id_state_key);
+      this.#router = new (0, $4fd2ba03703a7d92$export$7e1297a3a19f10d8)("hard_navigation", listing_query_state_key);
       if (on_navigation) this.#router.on_navigation_ = on_navigation;
       const override_listing_id_query_param_names_ = ["listing_id_" + unique_instance_key_for_state, "listing_id"]; // If you're wondering why this is an array https://gitlab.com/depict-ai/depict.ai/-/merge_requests/7958#note_1511700842
       const sorting_query_param_ = "sorting" + unique_instance_key_for_state;
@@ -7280,14 +7292,16 @@ function $961b5c64bef4662f$export$e2bf8ce7779e827e(props) {
     category_title: category_title
   } = props;
   const shared_properties = $961b5c64bef4662f$var$get_shared_properties(depict_category);
+  const diffableListingQuery = $i7OB2$createMemo(() => Object.values(depict_category.listing_query || {}).join(""));
   return $16b52438165aafe2$export$23fca46f3143581f(() => {
     $i7OB2$createEffect(prev => {
       // this is here (and not on DepictCategory) so that people also know when PageReplacer removes the page, it's intended to help people replace their own content when a depict page is navigated, see https://depictaiworkspace.slack.com/archives/C04M8MGCF3K/p1691670636155369
-      const id = depict_category.listing_id; // <- this is a reactive getter
-      $d8dbf52fea1773e2$export$f50b88e2a00918b5(props.on_listing_id_change)(id, prev);
-      return id;
+      diffableListingQuery(); // Only re-run this effect when the listing query *actually* changes (not just the object reference)
+      const newId = $i7OB2$untrack(() => depict_category.listing_query);
+      $d8dbf52fea1773e2$export$f50b88e2a00918b5(props.on_listing_query_change)(newId, prev);
+      return newId;
     });
-    $i7OB2$onCleanup(() => $d8dbf52fea1773e2$export$f50b88e2a00918b5(props.on_listing_id_change)());
+    $i7OB2$onCleanup(() => $d8dbf52fea1773e2$export$f50b88e2a00918b5(props.on_listing_query_change)());
     const grid_spacing_override = $i7OB2$createMemo(() => {
       const {
         grid_spacing: grid_spacing
@@ -7328,8 +7342,11 @@ function $961b5c64bef4662f$export$e2bf8ce7779e827e(props) {
       depict_api_: depict_api_,
       min_products_to_fetch_: $961b5c64bef4662f$var$min_products_to_fetch_,
       local_filter_cache_: local_filter_cache_,
-      listing_id_: $i7OB2$createMemo(() => !depict_category.disable_override_listing_id && override_listing_id_accessor_() || depict_category.listing_id),
-      meta_title_suffix_: () => depict_category.meta_title_suffix,
+      id_to_query_for_: $i7OB2$createMemo(() => !depict_category.disable_override_listing_id && override_listing_id_accessor_() || depict_category.listing_query.id),
+      id_type_: $i7OB2$createMemo(() => {
+        if (!depict_category.disable_override_listing_id && override_listing_id_accessor_()) return $c20599a0d81d953a$export$74ee7529ce0f8a00;
+        return depict_category.listing_query.type;
+      }),
       i18n_: i18n_,
       show_quicklinks_: $i7OB2$createMemo(() => props.show_quicklinks ?? true),
       category_title_: category_title,
@@ -7389,13 +7406,16 @@ function $961b5c64bef4662f$export$de035477d6fef996({
     sorting_query_param_: sorting_query_param_,
     filter_query_param_prefix_: filter_query_param_prefix_
   } = $961b5c64bef4662f$var$get_shared_properties(depict_category);
+  const id_to_query_for_ = $i7OB2$createMemo(() => depict_category.listing_query.id);
+  const id_type_ = $i7OB2$createMemo(() => depict_category.listing_query.type);
   return $i7OB2$createComponent($961b5c64bef4662f$var$InExternalAreaDiv, {
     get children() {
       return $06edf3aec9073663$export$466cdc317043f6cb({
         i18n_: i18n_,
         quicklinks_data_: quicklinks_data_,
         router_: router_,
-        current_listing_id_: () => depict_category.listing_id,
+        id_type_: id_type_,
+        id_to_query_for_: id_to_query_for_,
         breadcrumb_data_: breadcrumb_data_,
         sorting_query_param_: sorting_query_param_,
         filter_query_param_prefix_: filter_query_param_prefix_
@@ -8161,7 +8181,7 @@ function $cea52f6b24092f05$export$e872e2339fb04a7f({
       searching_for_value_: searching_for_value_
     }), $i7OB2$ssr($cea52f6b24092f05$var$_tmpl$3, $i7OB2$ssrHydrationKey(), $i7OB2$escape($i7OB2$createMemo(() => {
       if (input_obj().type === "content") return i18n_.content_();
-      if (input_obj().category_type === "brand") return i18n_.brand_();
+      if (input_obj().listing_type === "brand") return i18n_.brand_();
       return i18n_.category_();
     })()))]));
   };
@@ -8376,7 +8396,7 @@ function $15f380f0ce2812cc$var$actual_navigation_working_on_fake_data({
         url.searchParams.set(search_query_param_name_, title);
         return $92a48aea6a9364d8$export$1efe1013da60d0e4(e, url.href);
       }));
-    } else if (selected_entry?.type == "category" || selected_entry?.type === "content") $i7OB2$runWithOwner(owner, () => override_on_enter_for_this_entry(e => {
+    } else if (selected_entry?.type == "listing" || selected_entry?.type === "content") $i7OB2$runWithOwner(owner, () => override_on_enter_for_this_entry(e => {
       const {
         page_url: page_url
       } = selected_entry;
@@ -8830,7 +8850,7 @@ function $793905995512612d$export$c05a196222ba1302({
   suggestions_: suggestions_,
   children: children
 }) {
-  const category_suggestions_ = $i7OB2$createMemo(() => suggestions_()?.suggestions.filter(s => s.type === "category"));
+  const category_suggestions_ = $i7OB2$createMemo(() => suggestions_()?.suggestions.filter(s => s.type === "listing"));
   return $i7OB2$createComponent((0, $i7OB2$Show), {
     get when() {
       return category_suggestions_()?.length || suggestions_.loading;