@swell/apps-sdk 1.0.128 → 1.0.130

package/dist/index.cjs

@@ -67,6 +67,7 @@ __export(index_exports, {
   Swell: () => Swell,
   SwellBackendAPI: () => SwellBackendAPI,
   SwellError: () => SwellError,
+  SwellProduct: () => SwellProduct,
   SwellStorefrontCollection: () => SwellStorefrontCollection,
   SwellStorefrontPagination: () => SwellStorefrontPagination,
   SwellStorefrontRecord: () => SwellStorefrontRecord,
@@ -93,9 +94,6 @@ __export(index_exports, {
   getAllSections: () => getAllSections,
   getBlog: () => getBlog,
   getBlogs: () => getBlogs,
-  getCategories: () => getCategories,
-  getCategory: () => getCategory,
-  getCategoryWithProducts: () => getCategoryWithProducts,
   getContentEntry: () => getContentEntry,
   getContentList: () => getContentList,
   getContentModel: () => getContentModel,
@@ -112,9 +110,6 @@ __export(index_exports, {
   getMenuItemValueId: () => getMenuItemValueId,
   getPage: () => getPage,
   getPageSections: () => getPageSections,
-  getProduct: () => getProduct,
-  getProducts: () => getProducts,
-  getProductsFiltered: () => getProductsFiltered,
   getSectionGroupProp: () => getSectionGroupProp,
   getSectionSettingsFromProps: () => getSectionSettingsFromProps,
   getThemeSettingsFromProps: () => getThemeSettingsFromProps,
@@ -639,12 +634,18 @@ var StorefrontResource = class {
     }
     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);
@@ -720,6 +721,8 @@ var StorefrontResource = class {
 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
   });
@@ -890,10 +893,12 @@ var SwellStorefrontCollection = class _SwellStorefrontCollection extends SwellSt
 };
 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());
     }
@@ -931,6 +936,8 @@ var SwellStorefrontRecord = class extends SwellStorefrontResource {
         ],
         getter
       ).then((result) => {
+        return this._transformResult(result);
+      }).then((result) => {
         this._result = result;
         if (result) {
           Object.assign(this, result);
@@ -7171,6 +7178,169 @@ 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;
+  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();
@@ -7606,39 +7776,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(
@@ -7671,11 +7808,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")) {
@@ -13729,8 +13867,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,
@@ -13799,8 +13936,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,
@@ -13831,11 +13967,15 @@ function ShopifyVariant(instance, variant, productIn, depth = 0) {
   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)
@@ -13881,25 +14021,19 @@ function ShopifyVariant(instance, variant, productIn, depth = 0) {
     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,
@@ -13986,30 +14120,6 @@ function getOptionByIndex(product, variant, index) {
     }
   );
 }
-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) {
@@ -14085,12 +14195,6 @@ function ShopifyProduct(instance, product, depth = 0) {
       }
       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 {};
@@ -14158,10 +14262,7 @@ function ShopifyProduct(instance, product, depth = 0) {
         });
       }
     ),
-    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;
@@ -14196,6 +14297,8 @@ function ShopifyProduct(instance, product, depth = 0) {
       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) {
@@ -14231,7 +14334,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}`),
@@ -14254,77 +14357,6 @@ function ShopifyProduct(instance, product, depth = 0) {
 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");
 }
@@ -14814,7 +14846,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}`)
   });
@@ -15615,8 +15647,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}`)
@@ -15952,17 +15983,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;
@@ -15971,6 +15998,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;
@@ -19049,12 +19078,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,
@@ -19062,7 +19089,7 @@ var SwellTheme3 = class {
       session,
       request,
       menus,
-      page,
+      page: {},
       cart,
       account,
       customer,
@@ -19093,6 +19120,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([
@@ -19142,7 +19208,7 @@ var SwellTheme3 = class {
       configs
     };
   }
-  async resolvePageData(store, configs, pageId) {
+  async resolvePageData(store, configs) {
     const configVersion = String(
       this.swell.swellHeaders["theme-config-version"]
     );
@@ -19174,39 +19240,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",
@@ -19229,7 +19262,6 @@ var SwellTheme3 = class {
     return {
       settings,
       request,
-      page,
       cart,
       account,
       customer
@@ -19589,15 +19621,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) {
@@ -19626,12 +19658,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(
@@ -19800,7 +19831,8 @@ ${content.slice(pos)}`;
     if (altTemplateId) {
       templateConfig = await this.getThemeTemplateConfigByType(
         "templates",
-        `${name}.${altTemplateId}`
+        name,
+        altTemplateId
       );
     }
     if (!templateConfig) {
@@ -20097,10 +20129,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 [];
@@ -20417,6 +20450,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) {
@@ -20843,6 +20879,7 @@ function getResourceQuery(slug, query) {
   Swell,
   SwellBackendAPI,
   SwellError,
+  SwellProduct,
   SwellStorefrontCollection,
   SwellStorefrontPagination,
   SwellStorefrontRecord,
@@ -20869,9 +20906,6 @@ function getResourceQuery(slug, query) {
   getAllSections,
   getBlog,
   getBlogs,
-  getCategories,
-  getCategory,
-  getCategoryWithProducts,
   getContentEntry,
   getContentList,
   getContentModel,
@@ -20888,9 +20922,6 @@ function getResourceQuery(slug, query) {
   getMenuItemValueId,
   getPage,
   getPageSections,
-  getProduct,
-  getProducts,
-  getProductsFiltered,
   getSectionGroupProp,
   getSectionSettingsFromProps,
   getThemeSettingsFromProps,