@swell/apps-sdk 1.0.129 → 1.0.132

package/dist/index.cjs

@@ -7179,108 +7179,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
@@ -7294,11 +7330,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
     )
   };
 }
@@ -7311,8 +7346,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 = {
@@ -7669,14 +7704,10 @@ var Swell = class _Swell {
   }
 };
 function getCacheKey(key, args) {
-  let cacheKey = key;
   if (Array.isArray(args) && args.length > 0) {
-    cacheKey += `_${JSON.stringify(args)}`;
+    return `${key}_${md5(JSON.stringify(args))}`;
   }
-  if (cacheKey.length > 512) {
-    cacheKey = `${cacheKey.slice(0, 480)}${md5(cacheKey)}`;
-  }
-  return cacheKey;
+  return key;
 }
 var SwellBackendAPI = class {
   apiHost = DEFAULT_API_HOST;
@@ -7808,11 +7839,12 @@ async function getBlog(swell, id, query) {
 var import_json53 = __toESM(require("json5"), 1);
 var import_lodash_es4 = require("lodash-es");
 var NO_INLINE = true;
-async function getEasyblocksPageTemplate(theme, pageId) {
+async function getEasyblocksPageTemplate(theme, pageId, altTemplate) {
   let templateConfig = null;
   templateConfig = await theme.getThemeTemplateConfigByType(
     "templates",
-    pageId
+    pageId,
+    altTemplate
   );
   if (templateConfig) {
     if (templateConfig.file_path.endsWith(".liquid")) {
@@ -8183,11 +8215,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 = {
@@ -13866,8 +13894,7 @@ function ShopifyArticle(instance, blog, blogCategory) {
       (blog2) => blog2.date_published || blog2.date_created
     ),
     tags: defer(() => blog.tags),
-    template_suffix: void 0,
-    // TODO
+    template_suffix: defer(() => blog.theme_template),
     title: defer(() => blog.title),
     updated_at: deferWith(
       blog,
@@ -13936,8 +13963,7 @@ function ShopifyBlog(instance, blogCategory) {
     // TODO
     tags: allTags,
     // TODO: this should only apply to articles in the current view
-    template_suffix: void 0,
-    // TODO
+    template_suffix: defer(() => blogCategory.theme_template),
     title: defer(() => blogCategory.title),
     url: deferWith(
       blogCategory,
@@ -14200,29 +14226,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;
         },
         {}
@@ -14234,33 +14254,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),
@@ -14335,7 +14342,7 @@ function ShopifyProduct(instance, product, depth = 0) {
     selected_variant: void 0,
     selling_plan_groups: [],
     tags: defer(() => product.tags),
-    template_suffix: void 0,
+    template_suffix: defer(() => product.theme_template),
     title: defer(() => product.name),
     type: defer(() => product.type),
     url: deferWith(product, (product2) => `/products/${product2.slug}`),
@@ -14361,6 +14368,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 = {}) {
@@ -14475,26 +14514,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,
@@ -14504,14 +14525,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: [],
@@ -14636,10 +14654,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),
@@ -14847,7 +14862,7 @@ function ShopifyCollection(instance, category) {
     sort_by: defer(() => category.sort),
     sort_options: defer(() => category.sort_options),
     tags: [],
-    template_suffix: void 0,
+    template_suffix: defer(() => category.theme_template),
     title: defer(() => category.name),
     url: deferWith(category, (category2) => `/collections/${category2.slug}`)
   });
@@ -15648,8 +15663,7 @@ function ShopifyPage(_instance, page) {
       page,
       (page2) => page2.date_published || page2.date_created
     ),
-    template_suffix: void 0,
-    // TODO
+    template_suffix: defer(() => page.theme_template),
     title: deferWith(page, (page2) => page2.title || page2.name),
     // Due to deprecated name field
     url: deferWith(page, (page2) => `/pages/${page2.slug}`)
@@ -15985,17 +15999,13 @@ var ShopifyCompatibility3 = class {
     this.queryParamsMap = this.getQueryParamsMap();
   }
   initGlobals(globals) {
-    const { request, page } = globals;
-    this.pageId = this.getPageType(globals.page?.id);
-    globals.page = {
-      ...page || void 0
-    };
+    const { request } = globals;
     globals.request = {
       ...request || void 0,
       design_mode: this.swell.isEditor,
       visual_section_preview: false,
       // TODO: Add support for visual section preview
-      page_type: page?.id
+      page_type: ""
     };
     globals.collections = new CollectionsDrop(this);
     globals.current_page = this.swell.queryParams.page || 1;
@@ -16004,6 +16014,8 @@ var ShopifyCompatibility3 = class {
   adaptGlobals(globals, prevGlobals) {
     if (globals.page) {
       this.pageId = this.getPageType(globals.page.id);
+      const request = globals.request || prevGlobals.request;
+      request.page_type = globals.page.id;
     }
     if (globals.request) {
       const page = globals.page || prevGlobals.page;
@@ -19082,12 +19094,10 @@ var SwellTheme3 = class {
   getSwellAppThemeProps(swellConfig) {
     return swellConfig?.storefront?.theme || {};
   }
-  async initGlobals(pageId) {
-    this.pageId = pageId;
+  async initGlobals() {
     await this.themeLoader.init(this.themeConfigs || void 0);
     const { store, session, menus, geo, configs } = await this.getSettingsAndConfigs();
-    const { settings, request, page, cart, account, customer } = await this.resolvePageData(store, configs, pageId);
-    this.page = page;
+    const { settings, request, cart, account, customer } = await this.resolvePageData(store, configs);
     const globals = {
       ...this.globalData,
       store,
@@ -19095,7 +19105,7 @@ var SwellTheme3 = class {
       session,
       request,
       menus,
-      page,
+      page: {},
       cart,
       account,
       customer,
@@ -19126,6 +19136,45 @@ var SwellTheme3 = class {
       ...this.globals
     };
   }
+  async initPageGlobals(pageId, altTemplate) {
+    this.pageId = pageId;
+    const swellPage = this.props.pages?.find(
+      (page2) => page2.id === pageId
+    );
+    const page = {
+      ...swellPage,
+      current: Number(this.swell.queryParams.page) || 1,
+      url: this.swell.url.pathname,
+      custom: !swellPage,
+      slug: void 0,
+      description: void 0,
+      $locale: void 0
+    };
+    if (pageId) {
+      const templateConfig = await this.getThemeTemplateConfigByType(
+        "templates",
+        pageId,
+        altTemplate
+      );
+      let pageSchema;
+      try {
+        pageSchema = import_json56.default.parse(
+          templateConfig?.file_data || "{}"
+        );
+      } catch (err) {
+        console.warn(err);
+      }
+      if (pageSchema?.page) {
+        const { slug, label, description, $locale } = pageSchema.page;
+        page.slug = slug;
+        page.label = label || page.label;
+        page.description = description;
+        page.$locale = $locale;
+      }
+    }
+    this.page = page;
+    this.setGlobals({ page });
+  }
   async getSettingsAndConfigs() {
     const geo = GEO_DATA;
     const [storefrontSettings, settingConfigs] = await Promise.all([
@@ -19175,7 +19224,7 @@ var SwellTheme3 = class {
       configs
     };
   }
-  async resolvePageData(store, configs, pageId) {
+  async resolvePageData(store, configs) {
     const configVersion = String(
       this.swell.swellHeaders["theme-config-version"]
     );
@@ -19207,39 +19256,6 @@ var SwellTheme3 = class {
       is_editor: this.swell.isEditor,
       is_preview: this.swell.isPreview
     };
-    const swellPage = this.props.pages?.find(
-      (page2) => page2.id === pageId
-    );
-    const page = {
-      ...swellPage,
-      current: Number(this.swell.queryParams.page) || 1,
-      url: this.swell.url.pathname,
-      custom: !swellPage,
-      slug: void 0,
-      description: void 0,
-      $locale: void 0
-    };
-    if (pageId) {
-      const templateConfig = await this.getThemeTemplateConfigByType(
-        "templates",
-        pageId
-      );
-      let pageSchema;
-      try {
-        pageSchema = import_json56.default.parse(
-          templateConfig?.file_data || "{}"
-        );
-      } catch (err) {
-        console.warn(err);
-      }
-      if (pageSchema?.page) {
-        const { slug, label, description, $locale } = pageSchema.page;
-        page.slug = slug;
-        page.label = label || page.label;
-        page.description = description;
-        page.$locale = $locale;
-      }
-    }
     const [cart, account] = await Promise.all([
       this.fetchSingletonResourceCached(
         "cart",
@@ -19262,7 +19278,6 @@ var SwellTheme3 = class {
     return {
       settings,
       request,
-      page,
       cart,
       account,
       customer
@@ -19622,15 +19637,15 @@ var SwellTheme3 = class {
   async preloadThemeConfigs(version, configs) {
     await this.themeLoader.preloadTheme(version, configs);
   }
-  getPageConfigPath(pageId) {
+  getPageConfigPath(pageId, altTemplate) {
     if (this.shopifyCompatibility) {
       const configPath = this.shopifyCompatibility.getThemeFilePath(
         "templates",
         pageId
       );
-      return `theme/${configPath}.json`;
+      return `${withSuffix(`theme/${configPath}`, altTemplate)}.json`;
     }
-    return `theme/templates/${pageId}.json`;
+    return `${withSuffix(`theme/templates/${pageId}`, altTemplate)}.json`;
   }
   async getThemeConfig(filePath) {
     if (this.themeConfigs !== null) {
@@ -19659,12 +19674,11 @@ var SwellTheme3 = class {
     }
     return this.getThemeConfig(`${filePath}.liquid`);
   }
-  async getThemeTemplateConfigByType(type, name) {
-    const templatesByPriority = [`${type}/${name}`];
+  async getThemeTemplateConfigByType(type, name, suffix) {
+    const templatesByPriority = [withSuffix(`${type}/${name}`, suffix)];
     if (this.shopifyCompatibility) {
-      templatesByPriority.push(
-        this.shopifyCompatibility.getThemeFilePath(type, name)
-      );
+      const path = this.shopifyCompatibility.getThemeFilePath(type, name);
+      templatesByPriority.push(withSuffix(path, suffix));
     }
     for (const filePath of templatesByPriority) {
       const templateConfig = await this.getThemeTemplateConfig(
@@ -19833,7 +19847,8 @@ ${content.slice(pos)}`;
     if (altTemplateId) {
       templateConfig = await this.getThemeTemplateConfigByType(
         "templates",
-        `${name}.${altTemplateId}`
+        name,
+        altTemplateId
       );
     }
     if (!templateConfig) {
@@ -20130,10 +20145,11 @@ ${this.shopifyCompatibility.getContentForHeader()}`;
   /**
    * Get a list of sections and section groups in a page layout.
    */
-  async getPageSectionGroups(pageId) {
+  async getPageSectionGroups(pageId, altTemplate) {
     const pageConfig = await this.getThemeTemplateConfigByType(
       "templates",
-      pageId
+      pageId,
+      altTemplate
     );
     if (pageConfig === null) {
       return [];
@@ -20450,6 +20466,9 @@ function extractSchemaTag(template) {
   }
   return list[0];
 }
+function withSuffix(path, suffix) {
+  return suffix ? `${path}.${suffix}` : path;
+}
 
 // src/menus.ts
 async function resolveMenuSettings(theme, menus, options) {