@swell/apps-sdk 1.0.129 → 1.0.130

package/dist/index.cjs

@@ -7808,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")) {
@@ -13866,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,
@@ -13936,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,
@@ -14335,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}`),
@@ -14847,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}`)
   });
@@ -15648,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}`)
@@ -15985,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;
@@ -16004,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;
@@ -19082,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,
@@ -19095,7 +19089,7 @@ var SwellTheme3 = class {
       session,
       request,
       menus,
-      page,
+      page: {},
       cart,
       account,
       customer,
@@ -19126,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([
@@ -19175,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"]
     );
@@ -19207,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",
@@ -19262,7 +19262,6 @@ var SwellTheme3 = class {
     return {
       settings,
       request,
-      page,
       cart,
       account,
       customer
@@ -19622,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) {
@@ -19659,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(
@@ -19833,7 +19831,8 @@ ${content.slice(pos)}`;
     if (altTemplateId) {
       templateConfig = await this.getThemeTemplateConfigByType(
         "templates",
-        `${name}.${altTemplateId}`
+        name,
+        altTemplateId
       );
     }
     if (!templateConfig) {
@@ -20130,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 [];
@@ -20450,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) {