@swell/apps-sdk 1.0.128 → 1.0.129

package/dist/index.js

@@ -535,12 +535,18 @@
       }
       return instance[prop];
     }
+    // add additional properties to the loaded result
+    _transformResult(result) {
+      return result;
+    }
     async _get(..._args) {
       if (this._getter) {
         const getter = this._getter.bind(
           this
         );
         return Promise.resolve().then(getter).then((result) => {
+          return this._transformResult(result);
+        }).then((result) => {
           this._result = result;
           if (result) {
             Object.assign(this, result);
@@ -616,6 +622,8 @@
   function cloneStorefrontResource(input) {
     const resourceName = input._resourceName;
     const clone = new StorefrontResource(input._getter);
+    clone._params = input._params;
+    clone._transformResult = input._transformResult.bind(clone);
     Object.defineProperty(clone.constructor, "name", {
       value: resourceName
     });
@@ -786,10 +794,12 @@
   };
   var SwellStorefrontRecord = class extends SwellStorefrontResource {
     _id;
+    _params;
     constructor(swell, collection, id, query = {}, getter) {
       super(swell, collection, getter);
       this._id = id;
       this._query = query;
+      this._params = {};
       if (!getter) {
         this._setGetter(this._defaultGetter());
       }
@@ -827,6 +837,8 @@
           ],
           getter
         ).then((result) => {
+          return this._transformResult(result);
+        }).then((result) => {
           this._result = result;
           if (result) {
             Object.assign(this, result);
@@ -7067,6 +7079,169 @@
     }
   };
 
+  // src/resources/product_helpers.ts
+  function calculateAddOptionsPrice(product, queryParams) {
+    const { option_values = "" } = queryParams;
+    const queryOptionValues = option_values;
+    const optionValues = queryOptionValues.split(",");
+    const addPrice = product.options?.reduce((acc, option) => {
+      if (!option.active || !option.values || option.values.length <= 0) {
+        return acc;
+      }
+      if (option.input_type !== "select") {
+        return acc;
+      }
+      for (const value of option.values) {
+        if (optionValues.includes(value.id)) {
+          return acc + (value.price || 0);
+        }
+      }
+      return acc + (option.values[0].price || 0);
+    }, 0);
+    return product.price + (addPrice || 0);
+  }
+  function calculateAddOptionsVariantPrice(product, variant, queryParams) {
+    const { option_values = "" } = queryParams;
+    const queryOptionValues = option_values;
+    const optionValues = queryOptionValues.split(",");
+    const addPrice = product.options?.reduce((acc, option) => {
+      if (option.variant || // skip variant options
+      !option.active || !option.values || option.values.length <= 0) {
+        return acc;
+      }
+      if (option.input_type !== "select") {
+        return acc;
+      }
+      for (const value of option.values) {
+        if (optionValues.includes(value.id)) {
+          return acc + (value.price || 0);
+        }
+      }
+      return acc + (option.values[0].price || 0);
+    }, 0);
+    let price = product.price;
+    if (variant.price !== null && variant.price !== void 0) {
+      price = variant.price;
+    }
+    return price + (addPrice || 0);
+  }
+  function getAvailableVariants(product) {
+    return (product.variants?.results?.slice()?.reverse() || []).filter(
+      (variant) => variant.stock_status === "in_stock" || !variant.stock_status
+    );
+  }
+  function getSelectedSwellVariant(product, queryParams) {
+    const { variant: queryVariant, option_values } = queryParams;
+    const queryOptionValues = option_values;
+    const variants = getAvailableVariants(product);
+    let selectedVariant = void 0;
+    if (queryVariant) {
+      selectedVariant = variants.find((variant) => variant.id === queryVariant);
+    } else if (queryOptionValues) {
+      const optionValues = queryOptionValues.split(",");
+      selectedVariant = variants.find(
+        (variant) => variant.option_value_ids.every(
+          (optionValueId) => optionValues.includes(optionValueId)
+        )
+      );
+    }
+    return selectedVariant || variants?.[0] || void 0;
+  }
+  function getSelectedVariant(product, queryParams) {
+    return getSelectedSwellVariant(
+      product,
+      queryParams
+    );
+  }
+  function getSelectedOptionValues(product, queryParams) {
+    const variant = getSelectedSwellVariant(product, queryParams);
+    return getSelectedVariantOptionValues(product, variant, queryParams);
+  }
+  function getSelectedVariantOptionValues(product, variant, queryParams) {
+    const { option_values = "" } = queryParams;
+    const queryOptionValues = option_values;
+    const optionValues = queryOptionValues.split(",");
+    const selectedValues = variant ? [...variant.option_value_ids || []] : [];
+    const values = [];
+    for (const option of product.options || []) {
+      if (option.active && option.values && option.values.length > 0 && option.input_type === "select") {
+        let selectedByVariantId = "";
+        let selectedByOptionId = "";
+        for (const value of option.values) {
+          if (selectedValues.includes(value.id)) {
+            selectedByVariantId = value.id;
+            break;
+          }
+          if (optionValues.includes(value.id)) {
+            selectedByOptionId = value.id;
+          }
+        }
+        values.push(
+          selectedByVariantId || selectedByOptionId || option.values[0].id
+        );
+      }
+    }
+    return values;
+  }
+
+  // src/resources/variant.ts
+  function transformSwellVariant(params, product, variant) {
+    if (!product) {
+      return product;
+    }
+    if (!variant) {
+      return variant;
+    }
+    return {
+      ...variant,
+      // add swell properties there
+      price: calculateAddOptionsVariantPrice(product, variant, params),
+      selected_option_values: getSelectedVariantOptionValues(
+        product,
+        variant,
+        params
+      )
+    };
+  }
+
+  // src/resources/product.ts
+  function transformSwellProduct(params, product) {
+    if (!product) {
+      return product;
+    }
+    const newProduct = {
+      ...product,
+      // add swell properties there
+      price: calculateAddOptionsPrice(product, params),
+      selected_option_values: getSelectedOptionValues(product, params)
+    };
+    if (Array.isArray(newProduct.variants?.results)) {
+      newProduct.variants = {
+        ...newProduct.variants,
+        results: newProduct.variants.results.map(
+          (variant) => transformSwellVariant(params, product, variant)
+        )
+      };
+    }
+    return newProduct;
+  }
+  var SwellProduct = class extends SwellStorefrontRecord {
+    _params;
+    constructor(swell, id, query = {}, getter) {
+      super(swell, "products", id, query, getter);
+      this._params = swell.queryParams;
+      return this._getProxy();
+    }
+    // add swell properties to the resolved object
+    _transformResult(result) {
+      const res = transformSwellProduct(
+        this._params,
+        result
+      );
+      return res;
+    }
+  };
+
   // src/api.ts
   var DEFAULT_API_HOST = "https://api.schema.io";
   var resourceCaches = /* @__PURE__ */ new Map();
@@ -7502,39 +7677,6 @@ ${formattedMessage}`;
     }
   };
 
-  // src/products.ts
-  function getProducts(swell, query) {
-    return new SwellStorefrontCollection(swell, "products", query);
-  }
-  function getProduct(swell, id, query) {
-    return new SwellStorefrontRecord(swell, "products", id, query);
-  }
-  function getProductsFiltered(swell, {
-    search,
-    filter,
-    sort
-  }) {
-    return new SwellStorefrontCollection(swell, "products", {
-      search,
-      filter,
-      sort
-    });
-  }
-
-  // src/categories.ts
-  function getCategories(swell, query) {
-    return new SwellStorefrontCollection(swell, "categories", query);
-  }
-  function getCategory(swell, id, query) {
-    return new SwellStorefrontRecord(swell, "categories", id, query);
-  }
-  async function getCategoryWithProducts(swell, id, query) {
-    const category = getCategory(swell, id, query);
-    const categoryId = await category.id;
-    category.products = getProducts(swell, { category: categoryId });
-    return category;
-  }
-
   // src/content.ts
   function getContentModel(swell, name) {
     return swell.getCachedResource(
@@ -13727,11 +13869,15 @@ ${formattedMessage}`;
     if (variant instanceof ShopifyResource) {
       return variant.clone();
     }
+    let swellVariant = {};
     if (variant instanceof StorefrontResource) {
       variant = cloneStorefrontResource(variant);
+    } else {
+      swellVariant = { ...variant };
     }
     const product = productIn || variant.product || {};
     return new ShopifyResource({
+      ...swellVariant,
       available: deferWith(
         variant,
         (variant2) => Boolean(variant2.stock_status === "in_stock" || !variant2.stock_status)
@@ -13777,25 +13923,19 @@ ${formattedMessage}`;
       metafields: {},
       next_incoming_date: void 0,
       options: getOptions(product, variant),
-      // @ts-expect-error: move this to swell product class
-      selected_option_values: deferWith(
-        [product, variant],
-        (product2, variant2) => getSelectedVariantOptionValues(
-          product2,
-          variant2,
-          instance.swell.queryParams
-        )
-      ),
       option1: getOptionByIndex(product, variant, 0),
       // Deprecated by Shopify
       option2: getOptionByIndex(product, variant, 1),
       // Deprecated by Shopify
       option3: getOptionByIndex(product, variant, 2),
       // Deprecated by Shopify
-      price: deferWith(
-        [product, variant],
-        (product2, variant2) => getVariantPrice(product2, variant2, instance.swell.queryParams)
-      ),
+      price: deferWith([product, variant], (product2, variant2) => {
+        let price = product2.price;
+        if (variant2.price !== null && variant2.price !== void 0) {
+          price = variant2.price;
+        }
+        return price;
+      }),
       product: deferWith(product, (product2) => {
         return ShopifyProduct(
           instance,
@@ -13882,30 +14022,6 @@ ${formattedMessage}`;
       }
     );
   }
-  function getVariantPrice(product, variant, queryParams) {
-    const { option_values: queryOptionValues = "" } = queryParams;
-    const optionValues = queryOptionValues.split(",");
-    const addPrice = product.options?.reduce((acc, option) => {
-      if (option.variant || // skip variant options
-      !option.active || !option.values || option.values.length <= 0) {
-        return acc;
-      }
-      if (option.input_type !== "select") {
-        return acc;
-      }
-      for (const value of option.values) {
-        if (optionValues.includes(value.id)) {
-          return acc + (value.price || 0);
-        }
-      }
-      return acc + (option.values[0].price || 0);
-    }, 0);
-    let price = product.price;
-    if (variant.price !== null && variant.price !== void 0) {
-      price = variant.price;
-    }
-    return price + (addPrice || 0);
-  }
 
   // src/compatibility/shopify-objects/product.ts
   function ShopifyProduct(instance, product, depth = 0) {
@@ -13981,12 +14097,6 @@ ${formattedMessage}`;
         }
         return product2.options.filter((option) => option.active && option.name).map((option) => option.name);
       }),
-      // all options values including non-variant
-      // @ts-expect-error: move this to swell product class
-      selected_option_values: deferWith(
-        product,
-        (product2) => getSelectedOptionValues(product2, instance.swell.queryParams)
-      ),
       options_by_name: deferWith(product, (product2) => {
         if (!Array.isArray(product2.options)) {
           return {};
@@ -14054,10 +14164,7 @@ ${formattedMessage}`;
           });
         }
       ),
-      price: deferWith(
-        product,
-        (product2) => calculateAddOptionsPrice(product2, instance.swell.queryParams)
-      ),
+      price: deferWith(product, (product2) => product2.price),
       price_max: deferWith(product, (product2) => {
         if (!Array.isArray(product2.variants?.results)) {
           return product2.price;
@@ -14092,6 +14199,8 @@ ${formattedMessage}`;
         product,
         (product2) => product2.prices?.length > 0
       ),
+      // ShopifyProduct does not have this property
+      // @ts-expect-error property
       quantity_rule: deferWith(product, (product2) => {
         let inventory = product2.stock_level || 0;
         if (inventory < 0) {
@@ -14150,77 +14259,6 @@ ${formattedMessage}`;
   function ShopifyProductOptionValue(values) {
     return new ShopifyResource(values, "name");
   }
-  function getSelectedVariant(product, queryParams) {
-    const { variant: queryVariant, option_values: queryOptionValues } = queryParams;
-    const variants = getAvailableVariants(product);
-    let selectedVariant = void 0;
-    if (queryVariant) {
-      selectedVariant = variants.find(
-        (variant) => variant.id === queryVariant
-      );
-    } else if (queryOptionValues) {
-      const optionValues = queryOptionValues.split(",");
-      selectedVariant = variants.find(
-        (variant) => variant.option_value_ids.every(
-          (optionValueId) => optionValues.includes(optionValueId)
-        )
-      );
-    }
-    return selectedVariant || variants?.[0] || void 0;
-  }
-  function getAvailableVariants(product) {
-    return (product.variants?.results?.slice()?.reverse() || []).filter(
-      (variant) => variant.stock_status === "in_stock" || !variant.stock_status
-    );
-  }
-  function calculateAddOptionsPrice(product, queryParams) {
-    const { option_values: queryOptionValues = "" } = queryParams;
-    const optionValues = queryOptionValues.split(",");
-    const addPrice = product.options?.reduce((acc, option) => {
-      if (!option.active || !option.values || option.values.length <= 0) {
-        return acc;
-      }
-      if (option.input_type !== "select") {
-        return acc;
-      }
-      for (const value of option.values) {
-        if (optionValues.includes(value.id)) {
-          return acc + (value.price || 0);
-        }
-      }
-      return acc + (option.values[0].price || 0);
-    }, 0);
-    return product.price + (addPrice || 0);
-  }
-  function getSelectedOptionValues(product, queryParams) {
-    const variant = getSelectedVariant(product, queryParams);
-    return getSelectedVariantOptionValues(product, variant, queryParams);
-  }
-  function getSelectedVariantOptionValues(product, variant, queryParams) {
-    const { option_values: queryOptionValues = "" } = queryParams;
-    const optionValues = queryOptionValues.split(",");
-    const selectedValues = variant ? [...variant.option_value_ids || []] : [];
-    const values = [];
-    for (const option of product.options || []) {
-      if (option.active && option.values?.length > 0 && option.input_type === "select") {
-        let selectedByVariantId = "";
-        let selectedByOptionId = "";
-        for (const value of option.values) {
-          if (selectedValues.includes(value.id)) {
-            selectedByVariantId = value.id;
-            break;
-          }
-          if (optionValues.includes(value.id)) {
-            selectedByOptionId = value.id;
-          }
-        }
-        values.push(
-          selectedByVariantId || selectedByOptionId || option.values[0].id
-        );
-      }
-    }
-    return values;
-  }
   function isLikeShopifyProduct(value) {
     return typeof value === "object" && value !== null && Object.hasOwn(value, "variants") && Object.hasOwn(value, "gift_card?") && Object.hasOwn(value, "price_varies") && Object.hasOwn(value, "has_only_default_variant");
   }