@swell/apps-sdk 1.0.142 → 1.0.143

package/dist/index.mjs

@@ -7402,6 +7402,16 @@ function transformSwellVariant(params, product, variant) {
 }
 
 // src/resources/product.ts
+var SORT_OPTIONS = [
+  { value: "", name: "Featured" },
+  { value: "popularity", name: "Popularity", query: "popularity desc" },
+  { value: "price_asc", name: "Price, low to high", query: "price asc" },
+  { value: "price_desc", name: "Price, high to low", query: "price desc" },
+  { value: "date_asc", name: "Date, old to new", query: "date asc" },
+  { value: "date_desc", name: "Date, new to old", query: "date desc" },
+  { value: "name_asc", name: "Product name, A-Z", query: "name asc" },
+  { value: "name_desc", name: "Product name, Z-A", query: "name desc" }
+];
 function transformSwellProduct(params, product) {
   if (!product) {
     return product;
@@ -7438,6 +7448,28 @@ var SwellProduct = class extends SwellStorefrontRecord {
     return res;
   }
 };
+function productQueryWithFilters(swell, query = {}) {
+  const sortBy = swell.queryParams.sort || "";
+  const filters2 = Object.entries(swell.queryParams).reduce(
+    (acc, [key, value]) => {
+      if (key.startsWith("filter_")) {
+        const qkey = key.replace("filter_", "");
+        if (value?.gte !== void 0 || value?.lte !== void 0) {
+          acc[qkey] = [value.gte || 0, value.lte || void 0];
+        } else {
+          acc[qkey] = value;
+        }
+      }
+      return acc;
+    },
+    {}
+  );
+  return {
+    sort: SORT_OPTIONS.find((option) => option.value === sortBy)?.query || void 0,
+    $filters: filters2,
+    ...query
+  };
+}
 
 // src/api.ts
 var DEFAULT_API_HOST = "https://api.schema.io";
@@ -14878,9 +14910,11 @@ function ShopifyCollection(instance, category) {
   if (category instanceof StorefrontResource) {
     category = cloneStorefrontResource(category);
   }
+  const productMapper = (product) => ShopifyProduct(instance, product);
   const resolveProducts = makeProductsCollectionResolve(
+    instance,
     category,
-    (product) => ShopifyProduct(instance, product)
+    productMapper
   );
   return new ShopifyResource({
     all_products_count: defer(
@@ -14932,8 +14966,9 @@ function ShopifyCollection(instance, category) {
       category,
       (category2) => getFirstImage(instance, category2)
     ),
-    filters: defer(
-      async () => ((await resolveProducts())?.filter_options ?? []).map(
+    filters: deferWith(
+      category,
+      (category2) => (category2?.filter_options ?? []).map(
         (filter) => ShopifyFilter(instance, filter)
       )
     ),
@@ -14943,9 +14978,7 @@ function ShopifyCollection(instance, category) {
     metafields: {},
     next_product: void 0,
     previous_product: void 0,
-    products: defer(async () => {
-      return (await resolveProducts())?.results ?? [];
-    }),
+    products: getProducts(instance, category, productMapper),
     products_count: defer(
       async () => (await resolveProducts())?.results?.length || 0
     ),
@@ -14984,28 +15017,35 @@ function convertToShopifySorting(value) {
       return "manual";
   }
 }
-function makeProductsCollectionResolve(object, mapper) {
-  const productResults = deferWith(object, (object2) => {
-    if (object2.products) {
-      if (object2.products instanceof SwellStorefrontCollection) {
-        return object2.products._cloneWithCompatibilityResult((products) => {
-          return {
-            ...products,
-            results: products.results.map(mapper)
-          };
-        });
+function getProducts(instance, object, mapper) {
+  return deferWith(object, (object2) => {
+    const { page, limit: limit2 } = instance.swell.queryParams;
+    const categoryFilter = object2.id && object2.id !== "all" ? object2.id : void 0;
+    const productQuery = categoryFilter ? { category: categoryFilter, $variants: true } : { $variants: true };
+    const filterQuery = productQueryWithFilters(instance.swell, productQuery);
+    const products = new SwellStorefrontCollection(
+      instance.swell,
+      "products",
+      {
+        page,
+        limit: limit2,
+        ...filterQuery
+      },
+      async function() {
+        return this._defaultGetter().call(this);
       }
-      if (Array.isArray(object2.products?.results)) {
-        return {
-          ...object2.products,
-          results: object2.products.results.map(mapper)
-        };
+    );
+    return products._cloneWithCompatibilityResult(
+      (products2) => {
+        return { ...products2, results: products2.results.map(mapper) };
       }
-    }
-    return null;
+    );
   });
+}
+function makeProductsCollectionResolve(instance, object, mapper) {
+  const products = getProducts(instance, object, mapper);
   async function resolveProducts() {
-    const resolved = await productResults.resolve();
+    const resolved = await products.resolve();
     if (resolved && "_resolve" in resolved) {
       return resolved._resolve();
     }
@@ -15769,11 +15809,15 @@ function ShopifySearch(instance, search) {
   if (search instanceof ShopifyResource) {
     return search.clone();
   }
-  const resolveProducts = makeProductsCollectionResolve(search, (product) => {
-    const shopifyProduct = ShopifyProduct(instance, product);
-    shopifyProduct.object_type = "product";
-    return shopifyProduct;
-  });
+  const resolveProducts = makeProductsCollectionResolve(
+    instance,
+    search,
+    (product) => {
+      const shopifyProduct = ShopifyProduct(instance, product);
+      shopifyProduct.object_type = "product";
+      return shopifyProduct;
+    }
+  );
   return new ShopifyResource({
     default_sort_by: deferWith(
       search,