@swell/apps-sdk 1.0.130 → 1.0.133

package/dist/index.mjs

@@ -7053,108 +7053,144 @@ var ThemeCache = class extends Cache {
 };
 
 // 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;
+function isOptionValueAvailable(option, value, product, availableVariants) {
+  if (!option.variant) {
+    return true;
+  }
+  const hasVariants = product.variants?.results.length > 0;
+  if (!hasVariants) {
+    return true;
+  }
+  const variants = availableVariants || getAvailableVariants(product);
+  return variants.some(
+    (variant) => variant.option_value_ids.includes(value.id)
+  );
+}
+function isOptionValueSelected(option, value, product, queryParams, selectedVariant) {
+  let variant;
+  if (option.variant) {
+    variant = selectedVariant || getSelectedVariant(product, queryParams);
+  }
+  const selectedOptionValues = getSelectedVariantOptionValues(
+    product,
+    queryParams,
+    variant
+  );
+  return selectedOptionValues.includes(value.id);
+}
+function getSelectedVariant(product, queryParams) {
+  const {
+    variant: queryVariant,
+    option_values: queryOptionValues,
+    selected_option_value: selectedOptionValue
+  } = 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(
+    selectedVariant = variants.find((variant) => {
+      if (variant.option_value_ids.length !== optionValues.length) {
+        return false;
+      }
+      return variant.option_value_ids.every(
         (optionValueId) => optionValues.includes(optionValueId)
-      )
-    );
+      );
+    });
+    if (!selectedVariant && selectedOptionValue) {
+      selectedVariant = variants.filter(
+        (variant) => variant.option_value_ids.includes(selectedOptionValue)
+      )[0];
+    }
   }
   return selectedVariant || variants?.[0] || void 0;
 }
-function getSelectedVariant(product, queryParams) {
-  return getSelectedSwellVariant(
+function getSelectedVariantOptionValues(product, queryParams, variant) {
+  if (variant) {
+    return variant.option_value_ids;
+  }
+  const { option_values: queryOptionValues = "" } = queryParams;
+  const optionValues = queryOptionValues.split(",");
+  return (product.options || []).reduce((acc, option) => {
+    if (!option.values) {
+      return acc;
+    }
+    const hasOptionValues = option.values.length > 0;
+    if (!option.active || !hasOptionValues) {
+      return acc;
+    }
+    const value = option.values.find(
+      (value2) => optionValues.includes(value2.id)
+    );
+    if (value) {
+      acc.push(value.id);
+    }
+    return acc;
+  }, []);
+}
+function getPurchaseOptions(product, queryParams) {
+  if (!product?.purchase_options) {
+    return null;
+  }
+  const { standard, subscription } = product.purchase_options;
+  const selectedPurchaseOptionType = getSelectedPurchaseOptionType(
     product,
     queryParams
   );
+  const purchaseOptions = {};
+  if (standard) {
+    purchaseOptions.standard = {
+      ...standard,
+      selected: selectedPurchaseOptionType === "standard"
+    };
+  }
+  if (subscription) {
+    const selectedPlan = getSelectedSubscriptionPurchaseOptionPlan(
+      selectedPurchaseOptionType,
+      subscription,
+      queryParams
+    );
+    purchaseOptions.subscription = {
+      ...subscription,
+      selected: selectedPurchaseOptionType === "subscription",
+      plans: subscription.plans.map((plan) => ({
+        ...plan,
+        selected: selectedPlan ? plan.id === selectedPlan.id : false
+      }))
+    };
+  }
+  return Object.keys(purchaseOptions).length > 0 ? purchaseOptions : null;
 }
-function getSelectedOptionValues(product, queryParams) {
-  const variant = getSelectedSwellVariant(product, queryParams);
-  return getSelectedVariantOptionValues(product, variant, queryParams);
+function getSelectedPurchaseOptionType(product, queryParams) {
+  const { purchase_options: purchaseOptions } = product;
+  if (!purchaseOptions) {
+    return null;
+  }
+  const { purchase_option: purchaseOption } = queryParams;
+  const purchaseOptionType = purchaseOption?.type;
+  if (purchaseOptionType && purchaseOptionType in purchaseOptions) {
+    return purchaseOptionType;
+  }
+  return purchaseOptions.standard ? "standard" : "subscription";
 }
-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
-      );
-    }
+function getSelectedSubscriptionPurchaseOptionPlan(selectedPurchaseOptionType, subscriptionPurchaseOption, queryParams) {
+  if (selectedPurchaseOptionType !== "subscription") {
+    return null;
   }
-  return values;
+  const { purchase_option: purchaseOption } = queryParams;
+  let selectedPlan = null;
+  if (purchaseOption?.plan_id) {
+    selectedPlan = subscriptionPurchaseOption.plans.find(
+      (plan) => plan.id === purchaseOption.plan_id
+    );
+  }
+  return selectedPlan || subscriptionPurchaseOption.plans[0];
 }
 
 // src/resources/variant.ts
@@ -7168,11 +7204,10 @@ function transformSwellVariant(params, product, variant) {
   return {
     ...variant,
     // add swell properties there
-    price: calculateAddOptionsVariantPrice(product, variant, params),
     selected_option_values: getSelectedVariantOptionValues(
       product,
-      variant,
-      params
+      params,
+      variant
     )
   };
 }
@@ -7185,8 +7220,8 @@ function transformSwellProduct(params, product) {
   const newProduct = {
     ...product,
     // add swell properties there
-    price: calculateAddOptionsPrice(product, params),
-    selected_option_values: getSelectedOptionValues(product, params)
+    selected_option_values: getSelectedVariantOptionValues(product, params),
+    purchase_options: getPurchaseOptions(product, params)
   };
   if (Array.isArray(newProduct.variants?.results)) {
     newProduct.variants = {
@@ -7543,14 +7578,10 @@ var Swell = class _Swell {
   }
 };
 function getCacheKey(key, args) {
-  let cacheKey = key;
   if (Array.isArray(args) && args.length > 0) {
-    cacheKey += `_${JSON.stringify(args)}`;
-  }
-  if (cacheKey.length > 512) {
-    cacheKey = `${cacheKey.slice(0, 480)}${md5(cacheKey)}`;
+    return `${key}_${md5(JSON.stringify(args))}`;
   }
-  return cacheKey;
+  return key;
 }
 var SwellBackendAPI = class {
   apiHost = DEFAULT_API_HOST;
@@ -8058,11 +8089,7 @@ function getAllSectionComponentTemplates(allSections) {
       );
     }
   }
-  return list.filter((template) => {
-    return Object.keys(template.entry).some(
-      (key) => key !== "_id" && key !== "_component"
-    );
-  });
+  return list;
 }
 function getEasyblocksPagePropsWithConfigs(themeGlobals, allSections, pageSections, layoutSectionGroups, pageId) {
   const rootComponent = {
@@ -14073,29 +14100,23 @@ function ShopifyProduct(instance, product, depth = 0) {
       if (!Array.isArray(product2.options)) {
         return {};
       }
-      let index = 0;
+      const { queryParams } = instance.swell;
+      const variants = getAvailableVariants(product2);
+      const variant = getSelectedVariant(product2, queryParams);
       return product2.options.reduce(
-        (acc, option) => {
-          if (option.active && option.name) {
-            acc[option.name.toLowerCase()] = {
-              name: option.name,
-              position: ++index,
-              selected_value: void 0,
-              // variant_option: option.variant,
-              values: option.values?.map(
-                (value) => ShopifyProductOptionValue({
-                  available: true,
-                  id: value.id,
-                  name: value.name,
-                  product_url: void 0,
-                  selected: false,
-                  swatch: void 0,
-                  variant: void 0
-                  // addPrice: value.price,
-                })
-              ) ?? []
-            };
+        (acc, option, index) => {
+          if (!option.active || !option.name) {
+            return acc;
           }
+          acc[option.name.toLowerCase()] = getOption(
+            option,
+            index,
+            product2,
+            instance,
+            depth,
+            variants,
+            variant
+          );
           return acc;
         },
         {}
@@ -14107,33 +14128,20 @@ function ShopifyProduct(instance, product, depth = 0) {
         if (!Array.isArray(product2.options)) {
           return [];
         }
-        const variant = getSelectedVariant(product2, instance.swell.queryParams);
-        const optionValues = variant?.option_value_ids || [];
-        return product2.options.filter((option) => option.active && option.name).map((option, index) => {
-          return {
-            name: option.name,
-            position: index + 1,
-            selected_value: void 0,
-            // variant_option: option.variant,
-            values: option.values?.map(
-              (value) => ShopifyProductOptionValue({
-                available: true,
-                id: value.id,
-                name: value.name,
-                product_url: void 0,
-                selected: optionValues.includes(value.id),
-                swatch: void 0,
-                variant: ShopifyVariant(
-                  instance,
-                  variant || product2,
-                  product2,
-                  depth + 1
-                )
-                // addPrice: value.price,
-              })
-            )
-          };
-        });
+        const { queryParams } = instance.swell;
+        const variants = getAvailableVariants(product2);
+        const variant = getSelectedVariant(product2, queryParams);
+        return product2.options.filter((option) => option.active && option.name).map(
+          (option, index) => getOption(
+            option,
+            index,
+            product2,
+            instance,
+            depth,
+            variants,
+            variant
+          )
+        );
       }
     ),
     price: deferWith(product, (product2) => product2.price),
@@ -14234,6 +14242,38 @@ function ShopifyProductOptionValue(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");
 }
+function getOption(option, index, product, instance, depth, variants, variant) {
+  const { queryParams } = instance.swell;
+  return {
+    ...option,
+    name: option.name,
+    position: index + 1,
+    selected_value: void 0,
+    values: option.values?.map(
+      (value) => ShopifyProductOptionValue({
+        ...value,
+        available: isOptionValueAvailable(option, value, product, variants),
+        id: value.id,
+        name: value.name,
+        product_url: void 0,
+        selected: isOptionValueSelected(
+          option,
+          value,
+          product,
+          queryParams,
+          variant
+        ),
+        swatch: void 0,
+        variant: ShopifyVariant(
+          instance,
+          variant || product,
+          product,
+          depth + 1
+        )
+      })
+    )
+  };
+}
 
 // src/compatibility/shopify-objects/line_item.ts
 function ShopifyLineItem(instance, item, cart, options = {}) {
@@ -14348,26 +14388,8 @@ function isTrialSubscriptionItem(item) {
 function resolveSubscription(item) {
   const purchaseOption = item?.purchase_option;
   if (purchaseOption?.type !== "subscription") {
-    return void 0;
-  }
-  const trialDays = purchaseOption.billing_schedule?.trial_days || 0;
-  const trialText = trialDays > 0 ? ` (Includes ${trialDays} trial day${trialDays === 1 ? "" : "s"})` : "";
-  const intervalCount = purchaseOption.billing_schedule?.interval_count || 1;
-  let intervalText = "day";
-  switch (purchaseOption.billing_schedule?.interval) {
-    case "weekly":
-      intervalText = "wk";
-      break;
-    case "monthly":
-      intervalText = "mo";
-      break;
-    case "yearly":
-      intervalText = "yr";
-      break;
-    default:
+    return;
   }
-  const periodText = `${intervalCount > 1 ? intervalCount : ""}${intervalText}`;
-  const text = `${periodText}${trialText}`;
   return {
     checkout_charge_amount: item.price,
     compare_at_price: item.price,
@@ -14377,14 +14399,11 @@ function resolveSubscription(item) {
     remaining_balance_charge_amount: 0,
     selling_plan_group_id: purchaseOption.plan_id,
     selling_plan: {
-      id: 0,
+      id: purchaseOption.plan_id,
       group_id: purchaseOption.plan_id,
       name: purchaseOption.plan_name,
       description: purchaseOption.plan_description,
-      // billing_schedule: purchaseOption.billing_schedule,
       options: [],
-      // provide as separate parts to properly render currency
-      // planPriceText: text,
       checkout_charge: { value: item.price, value_type: "price" },
       recurring_deliveries: item.delivery === "shipment",
       price_adjustments: [],
@@ -14509,10 +14528,7 @@ function ShopifyCart(instance, cart) {
     }),
     items_subtotal_price: defer(() => cart.sub_total),
     note: defer(() => cart.comments),
-    original_total_price: deferWith(
-      cart,
-      (cart2) => cart2.sub_total + cart2.item_discount
-    ),
+    original_total_price: deferWith(cart, (cart2) => cart2.capture_total),
     requires_shipping: defer(() => Boolean(cart.shipment_delivery)),
     taxes_included: defer(() => Boolean(cart.item_tax_included)),
     total_discount: defer(() => cart.discount_total),
@@ -19012,6 +19028,7 @@ var SwellTheme3 = class {
       current: Number(this.swell.queryParams.page) || 1,
       url: this.swell.url.pathname,
       custom: !swellPage,
+      title: swellPage?.label,
       slug: void 0,
       description: void 0,
       $locale: void 0
@@ -19031,9 +19048,17 @@ var SwellTheme3 = class {
         console.warn(err);
       }
       if (pageSchema?.page) {
-        const { slug, label, description, $locale } = pageSchema.page;
+        const {
+          title,
+          label,
+          // 'label' is deprecated, kept for compatibility
+          description,
+          slug,
+          $locale
+        } = pageSchema.page;
+        page.label = page.label || title || label || "";
+        page.title = title || page.label;
         page.slug = slug;
-        page.label = label || page.label;
         page.description = description;
         page.$locale = $locale;
       }
@@ -19750,9 +19775,9 @@ ${content.slice(pos)}`;
       this.setGlobals(pageData);
     }
     let pageConfig;
-    if (this.page?.id) {
+    if (this.pageId) {
       pageConfig = await this.renderPageTemplate(
-        this.page.id,
+        this.pageId,
         pageData,
         altTemplateId
       );