@swell/apps-sdk 1.0.168 → 1.0.170

package/dist/index.js

@@ -1133,10 +1133,10 @@
           { content_type: { $regex: "^image/svg" } }
         ]
       },
-      // Do not return assets unless they end with .liquid.[ext] or css/js/svg
+      // Do not return assets unless they end with .liquid or css/js/svg
       $or: [
         { file_path: { $regex: "^(?!theme/assets/)" } },
-        { file_path: { $regex: ".liquid.[a-zA-Z0-9]+$" } },
+        { file_path: { $regex: ".liquid$" } },
         { file_path: { $regex: ".(css|js|svg)$" } }
       ]
     }
@@ -7659,6 +7659,33 @@
     }
   };
 
+  // src/cache/content-cache.ts
+  var DEFAULT_TTL2 = 90 * 24 * 60 * 60 * 1e3;
+  var ContentCache = class {
+    cache;
+    defaultTtl;
+    constructor(options) {
+      const { defaultTtl, ...cacheOptions } = options || {};
+      this.defaultTtl = defaultTtl ?? DEFAULT_TTL2;
+      this.cache = new Cache({
+        ttl: this.defaultTtl,
+        ...cacheOptions
+      });
+    }
+    /**
+     * Get content from cache
+     */
+    async get(key) {
+      return this.cache.get(key);
+    }
+    /**
+     * Set content in cache
+     */
+    async set(key, value, ttl) {
+      await this.cache.set(key, value, ttl ?? this.defaultTtl);
+    }
+  };
+
   // src/resources/addresses.ts
   var SwellAddresses = class extends SwellStorefrontCollection {
     constructor(swell, query) {
@@ -15783,7 +15810,10 @@ ${formattedMessage}`;
       tags: [],
       template_suffix: defer(() => category.theme_template),
       title: defer(() => category.name),
-      url: deferWith(category, (category2) => `/collections/${category2.slug}`)
+      url: deferWith(
+        category,
+        (category2) => category2.slug ? `/collections/${category2.slug}` : ""
+      )
     });
   }
   function getFirstImage(category) {
@@ -15812,9 +15842,7 @@ ${formattedMessage}`;
   function getProducts(instance, object, mapper) {
     return deferWith(object, (object2) => {
       const { page, limit: limit2 } = instance.swell.queryParams;
-      const productQuery = {
-        $variants: true
-      };
+      const productQuery = { $variants: true };
       if (typeof object2.id === "string" && object2.id !== "all") {
         productQuery.category = object2.id;
       }
@@ -15825,11 +15853,7 @@ ${formattedMessage}`;
       const products = new SwellStorefrontCollection(
         instance.swell,
         "products",
-        {
-          page,
-          limit: limit2,
-          ...filterQuery
-        },
+        { page, limit: limit2, ...filterQuery },
         async function() {
           return this._defaultGetter().call(this);
         }
@@ -17336,10 +17360,9 @@ ${formattedMessage}`;
             ({ from }) => from === key || from.startsWith(keyObject)
           );
           if (resourceMap && value instanceof StorefrontResource) {
-            const resource = resourceMap.object(this, value);
-            const composed = Object.assign({}, value.toObject(), resource);
-            Object.setPrototypeOf(composed, Object.getPrototypeOf(resource));
-            pageData[resourceMap.to] = composed;
+            const resourceProps = resourceMap.object(this, value);
+            value.setCompatibilityProps(resourceProps);
+            pageData[resourceMap.to] = value;
           }
         }
       }
@@ -18581,7 +18604,9 @@ ${injects.join("\n")}<\/script>`;
           scope[filepath] = yield (0, import_liquidjs25.evalToken)(this.withVar, ctx);
         }
         ctx.push(ctx.opts.jekyllInclude ? { include: scope } : scope);
-        const output = yield liquidSwell.getComponentPath(filepath).then((path) => liquidSwell.getThemeConfig(path)).then((themeConfig) => liquidSwell.renderTemplate(themeConfig, scope));
+        const output = yield liquidSwell.getComponentPath(filepath).then((path) => liquidSwell.getThemeConfig(path)).then(
+          (themeConfig) => liquidSwell.renderTemplate(themeConfig, ctx.getAll())
+        );
         emitter.write(output);
         ctx.pop();
         ctx.restoreRegister(saved);
@@ -18675,7 +18700,7 @@ ${injects.join("\n")}<\/script>`;
   };
   function bindTags(liquidSwell) {
     Object.entries(tags).forEach(
-      ([tag, bind64]) => liquidSwell.registerTag(tag, bind64(liquidSwell))
+      ([tag, bind65]) => liquidSwell.registerTag(tag, bind65(liquidSwell))
     );
   }
 
@@ -18837,7 +18862,7 @@ ${injects.join("\n")}<\/script>`;
     }
   }
   function isCustomDateFormat(format) {
-    return format.includes("%");
+    return Boolean(format) && format.includes("%");
   }
   function applyStrftimeFormat(format, date) {
     return (0, import_strftime.default)(format, date);
@@ -19372,6 +19397,38 @@ ${injects.join("\n")}<\/script>`;
     };
   }
 
+  // src/liquid/filters/shopify/img_url.ts
+  function bind58(_liquidSwell) {
+    return function filterImgUrl(input, ...params) {
+      if (!input) return "";
+      let url;
+      if (typeof input === "object") {
+        if (input.url) {
+          url = input.url;
+        } else {
+          return "";
+        }
+      } else {
+        url = String(input);
+      }
+      const query = [];
+      params.forEach((param) => {
+        if (!param) {
+          return;
+        }
+        const [key, value] = param.includes(":") ? param.split(":").map((s) => s.trim()) : [param, void 0];
+        if (/^w\d+$/.test(key)) {
+          query.push(`width=${key.slice(1)}`);
+        } else if (/^h\d+$/.test(key)) {
+          query.push(`height=${key.slice(1)}`);
+        } else if (key === "crop" && value) {
+          query.push(`crop=${encodeURIComponent(value)}`);
+        }
+      });
+      return query.length ? `${url}?${query.join("&")}` : url;
+    };
+  }
+
   // src/liquid/filters/shopify/item_count_for_variant.ts
   var item_count_for_variant_default = {
     bind(_liquidSwell) {
@@ -19386,14 +19443,14 @@ ${injects.join("\n")}<\/script>`;
   };
 
   // src/liquid/filters/shopify/payment_button.ts
-  function bind58(_liquidSwell) {
+  function bind59(_liquidSwell) {
     return (form) => {
       return null;
     };
   }
 
   // src/liquid/filters/shopify/payment_terms.ts
-  function bind59(_liquidSwell) {
+  function bind60(_liquidSwell) {
     return (form) => {
       return null;
     };
@@ -19495,7 +19552,7 @@ ${injects.join("\n")}<\/script>`;
   var placeholder_svgs_default = svgs;
 
   // src/liquid/filters/shopify/placeholder_svg_tag.ts
-  function bind60(_liquidSwell) {
+  function bind61(_liquidSwell) {
     return function filterPlaceholderSvgTag(name, className) {
       const svg = placeholder_svgs_default[name];
       if (typeof svg === "object" && svg !== null) {
@@ -19506,7 +19563,7 @@ ${injects.join("\n")}<\/script>`;
   }
 
   // src/liquid/filters/shopify/shopify_asset_url.ts
-  function bind61(_liquidSwell) {
+  function bind62(_liquidSwell) {
     return function filterShopifyAssetUrl(input) {
       if (typeof input === "string") {
         switch (input) {
@@ -19531,7 +19588,7 @@ ${injects.join("\n")}<\/script>`;
   }
 
   // src/liquid/filters/shopify/structured_data.ts
-  function bind62(_liquidSwell) {
+  function bind63(_liquidSwell) {
     return async function filterStructuredData(input) {
       let value = input;
       if (value instanceof StorefrontResource) {
@@ -19609,7 +19666,7 @@ ${injects.join("\n")}<\/script>`;
   }
 
   // src/liquid/filters/inline_editable.ts
-  function bind63(_liquidSwell) {
+  function bind64(_liquidSwell) {
     return (value, key) => {
       if (typeof value === "object" && "value" in value) {
         value = value.value;
@@ -19667,14 +19724,15 @@ ${injects.join("\n")}<\/script>`;
     // Shopify compatibility only
     asset_img_url: bind56,
     hex_to_rgba: bind57,
+    img_url: bind58,
     item_count_for_variant: item_count_for_variant_default,
-    payment_button: bind58,
-    payment_terms: bind59,
-    placeholder_svg_tag: bind60,
-    shopify_asset_url: bind61,
-    structured_data: bind62,
+    payment_button: bind59,
+    payment_terms: bind60,
+    placeholder_svg_tag: bind61,
+    shopify_asset_url: bind62,
+    structured_data: bind63,
     // Swell only
-    inline_editable: bind63
+    inline_editable: bind64
   };
   function bindFilters(liquidSwell) {
     for (const [tag, handler] of Object.entries(filters)) {
@@ -19688,8 +19746,8 @@ ${injects.join("\n")}<\/script>`;
       }
     }
   }
-  function bindWithResolvedProps(liquidSwell, bind64, resolve = []) {
-    const handler = bind64(liquidSwell);
+  function bindWithResolvedProps(liquidSwell, bind65, resolve = []) {
+    const handler = bind65(liquidSwell);
     if (!Array.isArray(resolve)) {
       return handler;
     }
@@ -20499,6 +20557,7 @@ ${injects.join("\n")}<\/script>`;
     globals;
     forms;
     resources;
+    dynamicAssetUrl;
     liquidSwell;
     themeLoader;
     page;
@@ -20512,13 +20571,20 @@ ${injects.join("\n")}<\/script>`;
     themeSettingFilePath = "theme/config/theme.json";
     pageSectionGroups = null;
     constructor(swell, options = {}) {
-      const { forms, resources, globals, shopifyCompatibilityClass } = options;
+      const {
+        forms,
+        resources,
+        globals,
+        dynamicAssetUrl,
+        shopifyCompatibilityClass
+      } = options;
       this.swell = swell;
       this.props = this.getSwellAppThemeProps(swell.config);
       this.shopifyCompatibilityConfig = swell.shopifyCompatibilityConfig || null;
       this.globals = globals || {};
       this.forms = forms;
       this.resources = resources;
+      this.dynamicAssetUrl = dynamicAssetUrl;
       this.shopifyCompatibilityClass = shopifyCompatibilityClass || ShopifyCompatibility2;
       this.liquidSwell = new LiquidSwell30({
         theme: this,
@@ -20583,10 +20649,7 @@ ${injects.join("\n")}<\/script>`;
         geo,
         configs,
         language: configs?.language,
-        ...pageRecord ? getRecordGlobals(this, pageRecord) : {
-          page_title: page.title,
-          page_description: page.description
-        },
+        ...pageRecord ? getRecordGlobals(this, pageRecord) : { page_title: page.title, page_description: page.description },
         all_country_option_tags: countryOptions,
         country_option_tags: countryOptions,
         canonical_url: `${store.url}${this.swell.url?.pathname || ""}`,
@@ -20614,13 +20677,8 @@ ${injects.join("\n")}<\/script>`;
       if (this.shopifyCompatibility) {
         this.shopifyCompatibility.adaptGlobals(globals, this.globals);
       }
-      this.globals = {
-        ...this.globals,
-        ...globals
-      };
-      this.liquidSwell.options.globals = {
-        ...this.globals
-      };
+      this.globals = { ...this.globals, ...globals };
+      this.liquidSwell.options.globals = { ...this.globals };
     }
     async getSettingsAndConfigs() {
       const geo = GEO_DATA;
@@ -20872,10 +20930,7 @@ ${injects.join("\n")}<\/script>`;
       return Object.keys(serializedFormData).length > 0 ? serializedFormData : null;
     }
     setGlobalData(data = {}) {
-      this.globalData = {
-        ...this.globalData,
-        ...data
-      };
+      this.globalData = { ...this.globalData, ...data };
       this.setGlobals(this.globalData);
     }
     serializeGlobalData() {
@@ -21194,11 +21249,31 @@ ${injects.join("\n")}<\/script>`;
     async getAssetConfig(assetName) {
       return await this.getThemeConfig(`theme/assets/${assetName}`) ?? await this.getThemeConfig(`assets/${assetName}`) ?? null;
     }
+    async getDynamicAssetUrl(filePath) {
+      if (!this.dynamicAssetUrl) {
+        return null;
+      }
+      const assetName = `${filePath}.liquid`;
+      const assetConfig = await this.getAssetConfig(assetName);
+      if (!assetConfig) {
+        return null;
+      }
+      if (!this.dynamicAssetUrl.endsWith("/")) {
+        this.dynamicAssetUrl += "/";
+      }
+      const settingsConfig = this._getTemplateConfigByType(
+        "config",
+        "settings_data",
+        "json"
+      );
+      const settingsHash = settingsConfig?.hash;
+      return settingsHash ? `${this.dynamicAssetUrl}v/${settingsHash}/${assetName}` : `${this.dynamicAssetUrl}${assetName}`;
+    }
     async getAssetUrl(filePath) {
       const assetConfig = await this.getAssetConfig(filePath);
       const file = assetConfig?.file;
       if (!file) {
-        return null;
+        return this.getDynamicAssetUrl(filePath);
       }
       const fileUrl = file.url || null;
       if (!fileUrl) {
@@ -21286,10 +21361,7 @@ ${injects.join("\n")}<\/script>`;
       if (schemaStartIndex === -1 || schemaEndIndex === -1) {
         return null;
       }
-      return {
-        ...config,
-        file_data: schemaTag + schemaData + schemaEndTag
-      };
+      return { ...config, file_data: schemaTag + schemaData + schemaEndTag };
     }
     async renderThemeTemplate(filePath, data) {
       const config = await this.getThemeTemplateConfig(filePath);
@@ -21465,9 +21537,7 @@ ${content.slice(pos)}`;
           const pageSectionGroup = {
             // use original pageId to return exactly the requested section id
             id: originalPageId,
-            sections: {
-              [sectionKey]: oldSections[sectionKey]
-            }
+            sections: { [sectionKey]: oldSections[sectionKey] }
           };
           const [pageSection] = await this.renderPageSections(
             pageSectionGroup,
@@ -21614,10 +21684,7 @@ ${this.shopifyCompatibility.getContentForHeader()}`;
             }
             return {
               ...block,
-              settings: {
-                ...blockDefaults,
-                ...block.settings || void 0
-              }
+              settings: { ...blockDefaults, ...block.settings || void 0 }
             };
           }
         );
@@ -21754,10 +21821,7 @@ ${this.shopifyCompatibility.getContentForHeader()}`;
               )}</style>`;
             }
           }
-          return {
-            ...sectionConfig,
-            output
-          };
+          return { ...sectionConfig, output };
         })
       );
     }
@@ -21820,10 +21884,7 @@ ${this.shopifyCompatibility.getContentForHeader()}`;
       return settings;
     }
     const editorSettings = [
-      {
-        label: schema.label,
-        fields: schema.fields
-      }
+      { label: schema.label, fields: schema.fields }
     ];
     let blocks = settings.section.blocks?.filter(
       (block) => block.disabled !== true
@@ -22656,7 +22717,6 @@ ${this.shopifyCompatibility.getContentForHeader()}`;
     }
     generateVersionHash(headers) {
       const swellData = this.extractSwellData(headers);
-      const acceptLang = headers.get("accept-language") || "";
       const versionFactors = {
         store: headers.get("swell-storefront-id") || "",
         app: (headers.get("swell-app-id") || "") + "@" + (headers.get("host") || ""),
@@ -22664,7 +22724,7 @@ ${this.shopifyCompatibility.getContentForHeader()}`;
         theme: headers.get("swell-theme-version-hash") || "",
         modified: headers.get("swell-cache-modified") || "",
         currency: swellData["swell-currency"] || "USD",
-        locale: headers.get("x-locale") || acceptLang.split(",")[0].trim().toLowerCase() || "default",
+        locale: headers.get("x-locale") || swellData["swell-locale"] || "en-US",
         context: headers.get("swell-storefront-context"),
         epoch: this.epoch
       };