@depict-ai/ui 2.0.7 → 2.0.9

package/server/ES10/index.cjs

@@ -67,7 +67,7 @@ $parcel$export(module.exports, "defaultColsAtSize", () => $33eed84f447aa0c0$expo
 $parcel$export(module.exports, "defaultCategoryTitlePlugin", () => $33eed84f447aa0c0$export$7bf543b9d9be2c22);
 $parcel$export(module.exports, "version", () => $aa1938dec50d6c12$export$83d89fbfd8236492);
 /*! Depict.ai search and product listing SDK */
-const $aa1938dec50d6c12$export$83d89fbfd8236492 = "2.0.7";
+const $aa1938dec50d6c12$export$83d89fbfd8236492 = "2.0.9";
 
 /** @jsxImportSource solid-js */
 
@@ -124,7 +124,7 @@ const $5401a6698b0c0658$export$6daf8749b65a1b77 = cols_at_size => {
   return $5401a6698b0c0658$var$transform_elements(sorted_cols_at_size);
 };
 function $8edd3cf30d1fd8b4$export$a2cc176055f8f08() {
-  const text = "Please try setting `colsAtSize` on the `SearchPage`/`CategoryPage` components to change the grid before setting it with CSS. If you do with CSS, set `ColsAtSize` to an empty array to ensure no declarations created by the SDK leak through.";
+  const text = "Please try setting `columnsAtSize` on the `SearchPage`/`CategoryPage` components to change the grid before setting it with CSS. If you do with CSS, set `ColsAtSize` to an empty array to ensure no declarations created by the SDK leak through.";
   return (0, $3hooq$solidjsweb.isServer) ? {
     t: "<!-- ".concat(text, " -->")
   } : document.createComment(text);
@@ -255,6 +255,7 @@ function $76012c4468a53d1f$export$7f8bd308237ab5a5(get_displays_) {
   });
   return displays_by_key_;
 }
+const $76012c4468a53d1f$var$result_ids = ["search_result_id", "product_listing_result_id", "recommendation_id"];
 function $76012c4468a53d1f$export$43f0fb951fcb0c54(_ref) {
   let {
     displays_by_key_: displays_by_key_,
@@ -269,17 +270,25 @@ function $76012c4468a53d1f$export$43f0fb951fcb0c54(_ref) {
     },
     children: (product_id, index) => {
       const owner = $3hooq$solidjs.getOwner();
-      const display_accessor = $3hooq$solidjs.createMemo(() => displays_by_key_().get(product_id));
-      const [product_card_resource] = $3hooq$solidjs.createResource(display_accessor,
-      // re-render when the reference to the display object changes
-      // this should only be the case when the merchant or market changes and the new request has completed
-      display => {
+      const display_accessor = $3hooq$solidjs.createMemo(prev => {
+        const new_display = displays_by_key_().get(product_id);
+        if (prev && $76012c4468a53d1f$var$deep_equal(prev, new_display))
+          // If displays are identical, they haven't changed due to merchant/market changing OR we made a new query and the displays are the same. Return the old display (same object reference) to avoid re-rendering.
+          // This doesn't work if people mutate the displays from within the template but we hope they don't
+          // (We can't know if the display changing is due to merchant/market changing or a new query otherwise and don't want to run into https://gitlab.com/depict-ai/depict.ai/-/merge_requests/6890/diffs)
+          return prev;
+        return new_display;
+      });
+      const [product_card_resource] = $3hooq$solidjs.createResource(() => [merchant_(), market_(), display_accessor()],
+      // re-render when the reference to the display object changes or the merchant or market changes
+      // (We don't want to re-render if nothing has changed)
+      _ref2 => {
+        let [merchant, market, display] = _ref2;
         // get display in the function that re-runs when merchant or market have changed, since the display may have changed but product_id not
         return product_card_template_(display, {
           set_on_index_change: fn => $3hooq$solidjs.runWithOwner(owner, () => $3hooq$solidjs.createEffect(() => fn(index()))),
-          merchant: $3hooq$solidjs.untrack(merchant_),
-          // this means that the merchant and market provided to the template is wrong while we do another fetch, but I don't see how anyone would need to know the correct market there
-          market: $3hooq$solidjs.untrack(market_) // recommendation_grid can provide a sneaky undefined here just FYI
+          merchant: merchant,
+          market: market // recommendation_grid can provide a sneaky undefined here just FYI
         });
       });
 
@@ -294,15 +303,13 @@ function $76012c4468a53d1f$export$43f0fb951fcb0c54(_ref) {
           elements.push(element);
           // Add tracking ids
           if (!(element instanceof HTMLElement)) continue; // Apparently only HTMLElements have dataset
-          const {
-            dataset: dataset
-          } = element;
-          const {
-            search_result_id: search_result_id,
-            product_listing_result_id: product_listing_result_id,
-            recommendation_id: recommendation_id
-          } = display;
-          if (search_result_id) dataset.searchResultId = search_result_id;else if (product_listing_result_id) dataset.productListingResultId = product_listing_result_id;else if (recommendation_id) dataset.recommendationId = recommendation_id;
+          for (let i = 0; i < $76012c4468a53d1f$var$result_ids.length; i++) {
+            const id = $76012c4468a53d1f$var$result_ids[i];
+            const value = display[id];
+            if (value) Object.assign(element.dataset, $3hooq$depictaiutilishared.camelCasifyObject({
+              [id]: value
+            }));
+          }
         }
         do_per_elements_ === null || do_per_elements_ === void 0 || do_per_elements_(elements, index);
       });
@@ -310,6 +317,23 @@ function $76012c4468a53d1f$export$43f0fb951fcb0c54(_ref) {
     }
   });
 }
+// Source: https://dmitripavlutin.com/how-to-compare-objects-in-javascript/
+function $76012c4468a53d1f$var$deep_equal(object1, object2) {
+  const keys1 = Object.keys(object1);
+  const keys2 = Object.keys(object2);
+  if (keys1.length !== keys2.length) return false;
+  for (const key of keys1) {
+    if ($76012c4468a53d1f$var$result_ids.includes(key)) continue; // ignore result ids that change per response
+    const val1 = object1[key];
+    const val2 = object2[key];
+    const areObjects = $76012c4468a53d1f$var$is_object(val1) && $76012c4468a53d1f$var$is_object(val2);
+    if (areObjects && !$76012c4468a53d1f$var$deep_equal(val1, val2) || !areObjects && val1 !== val2) return false;
+  }
+  return true;
+}
+function $76012c4468a53d1f$var$is_object(object) {
+  return object != null && typeof object === "object";
+}
 
 // Errors caused by SDK consuming code interfacing with the SDK, not the SDK itself or other Depict packages
 class $95e4006e1dcb5b72$export$e1d52e4f0c7557a1 extends Error {}
@@ -581,7 +605,14 @@ function $d05611ff6b8c8357$export$23fca46f3143581f(component, error_message) {
     return component_in_error_boundary(elements => {
       const have_multiple = Array.isArray(elements);
       if (have_multiple ? !(elements !== null && elements !== void 0 && elements.length) : !elements) return;
-      (0, $3hooq$depictaiutilishared.observer).onremoved(have_multiple ? elements[0] : elements, dispose);
+      (0, $3hooq$depictaiutilishared.observer).onremoved(have_multiple ? elements[0] : elements, _ref => {
+        let {
+          element: element
+        } = _ref;
+        if (document.documentElement.contains(element)) return; // If element has instantly been re-inserted, don't dispose
+        // See https://depictaiworkspace.slack.com/archives/C050GHEPBTR/p1695809102791259?thread_ts=1695106805.459729&cid=C050GHEPBTR
+        dispose();
+      });
     });
   });else
     // we're already in a root so cleanups are handled
@@ -631,44 +662,43 @@ function $2c920813c92d6987$export$7da560f849543dff(_ref) {
     return recommendations_resource_.loading || ((_recommendations_reso = recommendations_resource_()) === null || _recommendations_reso === void 0 ? void 0 : _recommendations_reso.length);
   });
   const num_placeholders_ = () => 20;
-  return $3hooq$solidjsweb.createComponent((0, $3hooq$solidjs.Show), {
-    get when() {
-      return is_showing_something();
+  const elements = $3hooq$solidjsweb.ssr($2c920813c92d6987$var$_tmpl$, $3hooq$solidjsweb.ssrHydrationKey(), $3hooq$solidjsweb.escape($8edd3cf30d1fd8b4$export$a2cc176055f8f08()), $3hooq$solidjsweb.escape($3hooq$solidjsweb.createComponent((0, $6c2c739b113a8ddf$export$d21e32dfedac04be), $3hooq$solidjsweb.mergeProps({
+    get rows() {
+      return rows_object_();
     },
+    layout: "grid",
+    element_attributes: {
+      class: "cards"
+    }
+  }, layout_options_, {
     get children() {
-      return $3hooq$solidjsweb.ssr($2c920813c92d6987$var$_tmpl$, $3hooq$solidjsweb.ssrHydrationKey(), $3hooq$solidjsweb.escape($8edd3cf30d1fd8b4$export$a2cc176055f8f08()), $3hooq$solidjsweb.escape($3hooq$solidjsweb.createComponent((0, $6c2c739b113a8ddf$export$d21e32dfedac04be), $3hooq$solidjsweb.mergeProps({
-        get rows() {
-          return rows_object_();
+      return $3hooq$solidjsweb.createComponent((0, $3hooq$solidjs.Suspense), {
+        get fallback() {
+          return $e3915574cfd3466c$export$f33414a4df0afd3f({
+            num_placeholders_: num_placeholders_,
+            product_card_template_: product_card_template_
+          });
         },
-        layout: "grid",
-        element_attributes: {
-          class: "cards"
-        }
-      }, layout_options_, {
         get children() {
-          return $3hooq$solidjsweb.createComponent((0, $3hooq$solidjs.Suspense), {
-            get fallback() {
-              return $e3915574cfd3466c$export$f33414a4df0afd3f({
-                num_placeholders_: num_placeholders_,
-                product_card_template_: product_card_template_
-              });
-            },
-            get children() {
-              return (() => {
-                // IIFE to make sure we access both the recommendations_resource and the resources containing the product card rendering results themselves within the Suspense boundary
-                const displays_by_key_ = $76012c4468a53d1f$export$7f8bd308237ab5a5($3hooq$solidjs.createMemo(() => recommendations_resource_() || []));
-                return $76012c4468a53d1f$export$43f0fb951fcb0c54({
-                  displays_by_key_: displays_by_key_,
-                  merchant_: merchant_,
-                  market_: market_,
-                  product_card_template_: product_card_template_
-                });
-              })();
-            }
-          });
+          return (() => {
+            // IIFE to make sure we access both the recommendations_resource and the resources containing the product card rendering results themselves within the Suspense boundary
+            const displays_by_key_ = $76012c4468a53d1f$export$7f8bd308237ab5a5($3hooq$solidjs.createMemo(() => recommendations_resource_() || []));
+            return $76012c4468a53d1f$export$43f0fb951fcb0c54({
+              displays_by_key_: displays_by_key_,
+              merchant_: merchant_,
+              market_: market_,
+              product_card_template_: product_card_template_
+            });
+          })();
         }
-      }))));
+      });
     }
+  }))));
+  return $3hooq$solidjsweb.createComponent((0, $3hooq$solidjs.Show), {
+    get when() {
+      return is_showing_something();
+    },
+    children: elements
   });
 }
 const $41227f10ad680afd$var$_tmpl$ = ["<button", ' class="show-more major" type="button">', "</button>"],
@@ -3712,7 +3742,10 @@ function $0d3ee7000f047e67$export$a1fd619a4743ca08(_ref) {
   const [get_extra_displays, set_extra_displays_] = $3hooq$solidjs.createSignal([], {
     equals: false
   });
-  const displays_by_key_ = $76012c4468a53d1f$export$7f8bd308237ab5a5($3hooq$solidjs.createMemo(() => [...plp_results_().displays, ...get_extra_displays()]));
+  const displays_by_key_ = $76012c4468a53d1f$export$7f8bd308237ab5a5($3hooq$solidjs.createMemo(() => {
+    var _plp_results_;
+    return [...(((_plp_results_ = plp_results_()) === null || _plp_results_ === void 0 ? void 0 : _plp_results_.displays) || []), ...get_extra_displays()];
+  }));
   const percentage_in_view_ = $45c16e404a883f74$export$63dd0350f8559dda({
     get_last_result_in_viewport_: get_last_result_in_viewport_,
     displays_by_key_: displays_by_key_,
@@ -3832,18 +3865,18 @@ function $484eec37514a982e$export$3925f87b1545cfc6(_ref) {
             layout_options_: layout_options_,
             sort_or_filter_open_: sort_or_filter_open_
           });
-          $3hooq$solidjs.createComputed(() => {
-            if (!is_loading_()) return;
-            set_should_have_placeholders_rendered(true);
-            set_suspense_is_blocked(false);
-            is_just_after_plp_results_update = true;
-          });
           const block_suspense_if_needed = () => {
             if (!is_just_after_plp_results_update) return;
             is_just_after_plp_results_update = false;
             fallback_is_alive = false;
             set_suspense_is_blocked(true);
           };
+          $3hooq$solidjs.createComputed(() => {
+            if (!is_loading_()) return;
+            set_should_have_placeholders_rendered(true);
+            set_suspense_is_blocked(false);
+            is_just_after_plp_results_update = true;
+          });
           $3hooq$solidjs.createEffect($3hooq$solidjs.on(plp_results_, () => {
             if (!fallback_is_alive) {
               // if all product card rendering functions after the initial rendering are synchronous the suspense boundary will never go into the fallback, so we don't know when they have finished rendering, and we can't block the suspense. Therefore, we're just doing it with this effect
@@ -3853,6 +3886,48 @@ function $484eec37514a982e$export$3925f87b1545cfc6(_ref) {
           }, {
             defer: true
           }));
+          /*
+          This suspense ensures that if someone has async templates, we still show placeholders until the product cards actually have finished rendering (automagically since they're createResource's)
+          We're creating it outside the <Show> so that we can benefit from <For>'s optimisation between changing results
+          (For the whole idea of the displays being cached to work we can't tear down and re-run ProductCards for every new result.
+          We have to keep ProductCards alive, but hidden, and feed them new data as soon as we had it)
+          */
+          const product_cards_when_data = $3hooq$solidjsweb.createComponent((0, $3hooq$solidjs.Suspense), {
+            get fallback() {
+              return (() => {
+                fallback_is_alive = true;
+                $3hooq$solidjs.onCleanup(block_suspense_if_needed); // Block suspense after initial run every time after we fetch
+                return $3hooq$solidjs.createMemo(() => {
+                  // We need to be able to block the suspense since when async product cards are *rendering* we want to show the placeholders on initial load but not when loading more
+                  // In future we could have individual suspense's for each product card, but that's too much for now
+                  if (get_suspense_is_blocked()) return suspense_contents;
+                  set_should_have_placeholders_rendered(true); // just in case
+                  $3hooq$solidjs.onCleanup(() => set_should_have_placeholders_rendered(false));
+                  return rendered_placeholders; // I lifted the placeholders into the memo since we don't want to re-render them when switching from <Show> to <Suspense>
+                });
+              })();
+            },
+
+            get children() {
+              return (() => {
+                suspense_contents = $0d3ee7000f047e67$export$a1fd619a4743ca08({
+                  product_card_template_: product_card_template_,
+                  plp_results_: plp_results_,
+                  last_result_in_viewport_: last_result_in_viewport_,
+                  first_result_in_viewport_: first_result_in_viewport_,
+                  market_: market_,
+                  merchant_: merchant_,
+                  all_products_loaded_: all_products_loaded_,
+                  min_products_to_fetch_: min_products_to_fetch_,
+                  query_base_: query_base_,
+                  depict_api_: depict_api_,
+                  is_loading_: is_loading_
+                });
+                $3hooq$solidjs.onCleanup(() => suspense_contents = undefined);
+                return suspense_contents;
+              })();
+            }
+          });
           return [$8edd3cf30d1fd8b4$export$a2cc176055f8f08(), $3hooq$solidjsweb.createComponent((0, $6c2c739b113a8ddf$export$d21e32dfedac04be), {
             get cols_at_size() {
               return modified_cols_at_size();
@@ -3876,44 +3951,7 @@ function $484eec37514a982e$export$3925f87b1545cfc6(_ref) {
                 get fallback() {
                   return rendered_placeholders();
                 },
-                get children() {
-                  return $3hooq$solidjsweb.createComponent((0, $3hooq$solidjs.Suspense), {
-                    get fallback() {
-                      return (() => {
-                        fallback_is_alive = true;
-                        $3hooq$solidjs.onCleanup(block_suspense_if_needed); // Block suspense after initial run every time after we fetch
-                        return $3hooq$solidjs.createMemo(() => {
-                          // We need to be able to block the suspense since when async product cards are *rendering* we want to show the placeholders on initial load but not when loading more
-                          // In future we could have individual suspense's for each product card, but that's too much for now
-                          if (get_suspense_is_blocked()) return suspense_contents;
-                          set_should_have_placeholders_rendered(true); // just in case
-                          $3hooq$solidjs.onCleanup(() => set_should_have_placeholders_rendered(false));
-                          return rendered_placeholders; // I lifted the placeholders into the memo since we don't want to re-render them when switching from <Show> to <Suspense>
-                        });
-                      })();
-                    },
-
-                    get children() {
-                      return (() => {
-                        suspense_contents = $0d3ee7000f047e67$export$a1fd619a4743ca08({
-                          product_card_template_: product_card_template_,
-                          plp_results_: plp_results_,
-                          last_result_in_viewport_: last_result_in_viewport_,
-                          first_result_in_viewport_: first_result_in_viewport_,
-                          market_: market_,
-                          merchant_: merchant_,
-                          all_products_loaded_: all_products_loaded_,
-                          min_products_to_fetch_: min_products_to_fetch_,
-                          query_base_: query_base_,
-                          depict_api_: depict_api_,
-                          is_loading_: is_loading_
-                        });
-                        $3hooq$solidjs.onCleanup(() => suspense_contents = undefined);
-                        return suspense_contents;
-                      })();
-                    }
-                  });
-                }
+                children: product_cards_when_data
               });
             }
           })];
@@ -6603,7 +6641,8 @@ function $c77adcdf5346b187$export$7de92c4c2205ebf3(_ref) {
     product_card_template_: product_card_template_,
     showing_recommendation_rows_: showing_recommendation_rows_,
     view_more_button_ = true,
-    layout_options_: layout_options_
+    layout_options_: layout_options_,
+    all_products_loaded_: all_products_loaded_
   } = _ref;
   const [get_showing_recommendation_rows] = showing_recommendation_rows_; // We reset this in after_submit in search.tsx FYI
   const rows_object = view_more_button_ ? $c77adcdf5346b187$var$make_state_saved_rows(showing_recommendation_rows_, i18n_) : "all";
@@ -6616,42 +6655,42 @@ function $c77adcdf5346b187$export$7de92c4c2205ebf3(_ref) {
     let [per_column] = _ref2;
     return per_column;
   })));
-  return $3hooq$solidjsweb.createComponent((0, $3hooq$solidjs.Show), {
-    get when() {
-      return is_showing_something();
-    },
+  // Don't tear down elements every time one updates the page - don't put them within <Show>
+  const elements = $3hooq$solidjsweb.ssr($c77adcdf5346b187$var$_tmpl$, $3hooq$solidjsweb.ssrHydrationKey(), $3hooq$solidjsweb.escape(i18n_.search_recs_title_()), $3hooq$solidjsweb.escape($8edd3cf30d1fd8b4$export$a2cc176055f8f08()), $3hooq$solidjsweb.escape($3hooq$solidjsweb.createComponent((0, $6c2c739b113a8ddf$export$d21e32dfedac04be), $3hooq$solidjsweb.mergeProps({
+    rows: rows_object,
+    layout: "grid",
+    element_attributes: {
+      class: "cards"
+    }
+  }, layout_options_, {
     get children() {
-      return $3hooq$solidjsweb.ssr($c77adcdf5346b187$var$_tmpl$, $3hooq$solidjsweb.ssrHydrationKey(), $3hooq$solidjsweb.escape(i18n_.search_recs_title_()), $3hooq$solidjsweb.escape($8edd3cf30d1fd8b4$export$a2cc176055f8f08()), $3hooq$solidjsweb.escape($3hooq$solidjsweb.createComponent((0, $6c2c739b113a8ddf$export$d21e32dfedac04be), $3hooq$solidjsweb.mergeProps({
-        rows: rows_object,
-        layout: "grid",
-        element_attributes: {
-          class: "cards"
-        }
-      }, layout_options_, {
-        get children() {
-          return $3hooq$solidjsweb.createComponent((0, $3hooq$solidjs.Suspense), {
-            get fallback() {
-              return $e3915574cfd3466c$export$f33414a4df0afd3f({
-                num_placeholders_: num_placeholders_,
-                product_card_template_: product_card_template_
-              });
-            },
-            get children() {
-              return (() => {
-                // IIFE to make sure we access both the recommendations_resource and the resources containing the product card rendering results themselves within the Suspense boundary
-                const displays_by_key_ = $76012c4468a53d1f$export$7f8bd308237ab5a5($3hooq$solidjs.createMemo(() => recommendations_resource() || []));
-                return $76012c4468a53d1f$export$43f0fb951fcb0c54({
-                  displays_by_key_: displays_by_key_,
-                  merchant_: $3hooq$solidjs.createMemo(() => search_query_base_().tenant),
-                  market_: $3hooq$solidjs.createMemo(() => search_query_base_().market),
-                  product_card_template_: product_card_template_
-                });
-              })();
-            }
+      return $3hooq$solidjsweb.createComponent((0, $3hooq$solidjs.Suspense), {
+        get fallback() {
+          return $e3915574cfd3466c$export$f33414a4df0afd3f({
+            num_placeholders_: num_placeholders_,
+            product_card_template_: product_card_template_
           });
+        },
+        get children() {
+          return (() => {
+            // IIFE to make sure we access both the recommendations_resource and the resources containing the product card rendering results themselves within the Suspense boundary
+            const displays_by_key_ = $76012c4468a53d1f$export$7f8bd308237ab5a5($3hooq$solidjs.createMemo(() => recommendations_resource() || []));
+            return $76012c4468a53d1f$export$43f0fb951fcb0c54({
+              displays_by_key_: displays_by_key_,
+              merchant_: $3hooq$solidjs.createMemo(() => search_query_base_().tenant),
+              market_: $3hooq$solidjs.createMemo(() => search_query_base_().market),
+              product_card_template_: product_card_template_
+            });
+          })();
         }
-      }))));
+      });
     }
+  }))));
+  return $3hooq$solidjsweb.createComponent((0, $3hooq$solidjs.Show), {
+    get when() {
+      return is_showing_something() && all_products_loaded_();
+    },
+    children: elements
   });
 }
 function $c77adcdf5346b187$var$make_state_saved_rows(_ref3, i18n_) {
@@ -8773,9 +8812,7 @@ function $739c927cbecd26b0$export$a54ec244c8863715(_ref) {
       });
     }
   })), $3hooq$solidjsweb.escape($3hooq$solidjsweb.createComponent((0, $3hooq$solidjs.Show), {
-    get when() {
-      return get_all_products_loaded() && !disable_search_recommendations_;
-    },
+    when: !disable_search_recommendations_,
     keyed: false,
     get children() {
       return $3hooq$solidjsweb.createComponent((0, $1b3cf201cdd38687$export$b69d0d92862de18b), {
@@ -8794,7 +8831,8 @@ function $739c927cbecd26b0$export$a54ec244c8863715(_ref) {
             },
             showing_recommendation_rows_: showing_recommendation_rows_,
             view_more_button_: search_recs_view_more_,
-            product_card_template_: product_card_template_
+            product_card_template_: product_card_template_,
+            all_products_loaded_: get_all_products_loaded
           });
         }
       });

package/server/ES10/index.d.ts

@@ -7,7 +7,7 @@ import { CategorySuggestion, SearchSuggestionsResponse } from "@depict-ai/types/
 import { BaseSearchRequest } from "@depict-ai/types/api/BaseSearchRequest";
 import { SearchSuggestionsRequest } from "@depict-ai/types/api/SearchSuggestionsRequest";
 import { ProductListingRequest } from "@depict-ai/types/api/ProductListingRequest";
-export const version = "2.0.7";
+export const version = "2.0.9";
 /**
  * Returns accessor with the size of the provided element, including padding and border (I think)
  */