@swell/apps-sdk 1.0.167 → 1.0.169

package/dist/index.cjs

@@ -42,6 +42,7 @@ __export(index_exports, {
   CartResource: () => CartResource,
   CategoriesResource: () => CategoriesResource,
   CategoryResource: () => CategoryResource,
+  ContentCache: () => ContentCache,
   DEFAULT_CACHE_RULES: () => DEFAULT_CACHE_RULES,
   DEFAULT_QUERY_PAGE_LIMIT: () => DEFAULT_QUERY_PAGE_LIMIT,
   DeferredShopifyResource: () => DeferredShopifyResource,
@@ -1254,10 +1255,10 @@ var FILE_DATA_INCLUDE_QUERY = {
         { 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)$" } }
     ]
   }
@@ -7780,6 +7781,33 @@ var ThemeFileCache = class {
   }
 };
 
+// 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) {
@@ -14916,10 +14944,10 @@ function ShopifyArticle(instance, blog, blogCategory) {
       blog,
       (blog2) => blog2.date_updated || blog2.date_created
     ),
-    url: deferWith(
-      [blog, blog.category],
-      (blog2, blogCategory2) => blogCategory2 ? `/blogs/${blogCategory2?.slug}/${blog2.slug}` : ""
-    ),
+    url: deferWith([blog, blog.category], (blog2, blogCategory2) => {
+      const blogCategoryId = blogCategory2?.slug || blogCategory2?.id || blog2.category_id;
+      return blogCategoryId ? `/blogs/${blogCategoryId}/${blog2.slug}` : "";
+    }),
     user: defer(() => blog.author),
     // Comments not supported
     comment_post_url: "",
@@ -18702,7 +18730,9 @@ function bind15(liquidSwell) {
         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);
@@ -18796,7 +18826,7 @@ var tags = {
 };
 function bindTags(liquidSwell) {
   Object.entries(tags).forEach(
-    ([tag, bind64]) => liquidSwell.registerTag(tag, bind64(liquidSwell))
+    ([tag, bind65]) => liquidSwell.registerTag(tag, bind65(liquidSwell))
   );
 }
 
@@ -18958,7 +18988,7 @@ function applyDateFormat(type, date) {
   }
 }
 function isCustomDateFormat(format) {
-  return format.includes("%");
+  return Boolean(format) && format.includes("%");
 }
 function applyStrftimeFormat(format, date) {
   return (0, import_strftime.default)(format, date);
@@ -19493,6 +19523,38 @@ function bind57(_liquidSwell) {
   };
 }
 
+// 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) {
@@ -19507,14 +19569,14 @@ var item_count_for_variant_default = {
 };
 
 // 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;
   };
@@ -19616,7 +19678,7 @@ var svgs = {
 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) {
@@ -19627,7 +19689,7 @@ function bind60(_liquidSwell) {
 }
 
 // src/liquid/filters/shopify/shopify_asset_url.ts
-function bind61(_liquidSwell) {
+function bind62(_liquidSwell) {
   return function filterShopifyAssetUrl(input) {
     if (typeof input === "string") {
       switch (input) {
@@ -19652,7 +19714,7 @@ function bind61(_liquidSwell) {
 }
 
 // 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) {
@@ -19730,7 +19792,7 @@ function convertToSchemaOrgProductGroup(product) {
 }
 
 // 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;
@@ -19788,14 +19850,15 @@ var filters = {
   // 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)) {
@@ -19809,8 +19872,8 @@ function bindFilters(liquidSwell) {
     }
   }
 }
-function bindWithResolvedProps(liquidSwell, bind64, resolve = []) {
-  const handler = bind64(liquidSwell);
+function bindWithResolvedProps(liquidSwell, bind65, resolve = []) {
+  const handler = bind65(liquidSwell);
   if (!Array.isArray(resolve)) {
     return handler;
   }
@@ -20620,6 +20683,7 @@ var SwellTheme3 = class {
   globals;
   forms;
   resources;
+  dynamicAssetUrl;
   liquidSwell;
   themeLoader;
   page;
@@ -20633,13 +20697,20 @@ var SwellTheme3 = class {
   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,
@@ -20704,10 +20775,7 @@ var SwellTheme3 = class {
       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 || ""}`,
@@ -20735,13 +20803,8 @@ var SwellTheme3 = class {
     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;
@@ -20993,10 +21056,7 @@ var SwellTheme3 = class {
     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() {
@@ -21315,11 +21375,31 @@ var SwellTheme3 = class {
   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) {
@@ -21407,10 +21487,7 @@ var SwellTheme3 = class {
     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);
@@ -21586,9 +21663,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,
@@ -21735,10 +21810,7 @@ ${this.shopifyCompatibility.getContentForHeader()}`;
           }
           return {
             ...block,
-            settings: {
-              ...blockDefaults,
-              ...block.settings || void 0
-            }
+            settings: { ...blockDefaults, ...block.settings || void 0 }
           };
         }
       );
@@ -21875,10 +21947,7 @@ ${this.shopifyCompatibility.getContentForHeader()}`;
             )}</style>`;
           }
         }
-        return {
-          ...sectionConfig,
-          output
-        };
+        return { ...sectionConfig, output };
       })
     );
   }
@@ -21941,10 +22010,7 @@ function resolveSectionSettings(theme, sectionConfig, index) {
     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
@@ -22659,11 +22725,18 @@ var HtmlCache = class {
   }
   canReadFromCache(request) {
     const method = request.method.toUpperCase();
-    return (method === "GET" || method === "HEAD") && this.isRequestCacheable(request);
+    if (!(method === "GET" || method === "HEAD")) return false;
+    const res = this.resolvePathRule(request);
+    if (res.skip) return false;
+    return this.isRequestCacheable(request);
   }
   canWriteToCache(request, response) {
     const method = request.method.toUpperCase();
-    return method === "GET" && response.ok && this.isRequestCacheable(request) && this.isResponseCacheable(response);
+    if (method !== "GET" || !response.ok) return false;
+    const res = this.resolvePathRule(request);
+    if (res.skip) return false;
+    if (!this.isRequestCacheable(request)) return false;
+    return this.isResponseCacheable(response, res.rule);
   }
   createRevalidationRequest(request) {
     const headers = new Headers(request.headers);
@@ -22770,7 +22843,6 @@ var HtmlCache = class {
   }
   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") || ""),
@@ -22778,7 +22850,7 @@ var HtmlCache = class {
       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
     };
@@ -22796,22 +22868,20 @@ var HtmlCache = class {
     }
   }
   isRequestCacheable(request) {
-    const url = new URL(request.url);
     if (request.headers.get("swell-deployment-mode") === "editor") return false;
-    if (this.cacheRules.pathRules) {
-      for (const rule of this.cacheRules.pathRules) {
-        if (this.pathMatches(rule.path, url.pathname) && rule.skip) {
-          return false;
-        }
-      }
-    }
     if (request.headers.get("cache-control")?.includes("no-cache"))
       return false;
     return true;
   }
-  isResponseCacheable(response) {
-    if (!response.headers.get("content-type")?.includes("text/html"))
-      return false;
+  isResponseCacheable(response, matchedRule) {
+    const contentType = response.headers.get("content-type") || "";
+    const allowed = matchedRule?.contentTypes;
+    if (Array.isArray(allowed) && allowed.length > 0) {
+      const ok = allowed.some((ct) => contentType.toLowerCase().startsWith(ct));
+      if (!ok) return false;
+    } else {
+      if (!contentType.includes("text/html")) return false;
+    }
     if (response.headers.get("set-cookie")) return false;
     const cacheControl = response.headers.get("cache-control");
     if (cacheControl?.includes("no-store") || cacheControl?.includes("private"))
@@ -22823,30 +22893,10 @@ var HtmlCache = class {
     return mode === "preview" ? "preview" : "live";
   }
   getTTLForRequest(request) {
-    const url = new URL(request.url);
-    const mode = this.getDeploymentMode(request.headers);
-    if (this.cacheRules.pathRules) {
-      for (const rule of this.cacheRules.pathRules) {
-        if (this.pathMatches(rule.path, url.pathname) && rule.ttl !== void 0) {
-          return rule.ttl;
-        }
-      }
-    }
-    const defaults = this.cacheRules.defaults?.[mode];
-    return defaults?.ttl ?? DEFAULT_CACHE_RULES.defaults[mode].ttl;
+    return this.resolvePathRule(request).effectiveTTL;
   }
   getSWRForRequest(request) {
-    const url = new URL(request.url);
-    const mode = this.getDeploymentMode(request.headers);
-    if (this.cacheRules.pathRules) {
-      for (const rule of this.cacheRules.pathRules) {
-        if (this.pathMatches(rule.path, url.pathname) && rule.swr !== void 0) {
-          return rule.swr;
-        }
-      }
-    }
-    const defaults = this.cacheRules.defaults?.[mode];
-    return defaults?.swr ?? DEFAULT_CACHE_RULES.defaults[mode].swr;
+    return this.resolvePathRule(request).effectiveSWR;
   }
   getEntryAge(entry) {
     const t = Date.parse(entry.cacheTimeISO);
@@ -22870,6 +22920,29 @@ var HtmlCache = class {
     });
     return normalized;
   }
+  resolvePathRule(request) {
+    const url = new URL(request.url);
+    const mode = this.getDeploymentMode(request.headers);
+    const defaults = this.cacheRules.defaults?.[mode] ?? DEFAULT_CACHE_RULES.defaults[mode];
+    let rule;
+    if (this.cacheRules.pathRules) {
+      for (const r of this.cacheRules.pathRules) {
+        if (this.pathMatches(r.path, url.pathname)) {
+          rule = r;
+          break;
+        }
+      }
+    }
+    const effectiveTTL = (rule?.ttl !== void 0 ? rule.ttl : defaults?.ttl) ?? defaults.ttl;
+    const effectiveSWR = (rule?.swr !== void 0 ? rule.swr : defaults?.swr) ?? defaults.swr;
+    return {
+      rule,
+      mode,
+      effectiveTTL,
+      effectiveSWR,
+      skip: Boolean(rule?.skip)
+    };
+  }
   normalizeSearchParams(searchParams) {
     const ignoredParams = [
       "utm_source",
@@ -23072,6 +23145,7 @@ function getHtmlCache(env, cacheRules) {
   CartResource,
   CategoriesResource,
   CategoryResource,
+  ContentCache,
   DEFAULT_CACHE_RULES,
   DEFAULT_QUERY_PAGE_LIMIT,
   DeferredShopifyResource,