@swell/apps-sdk 1.0.182 → 1.0.184

package/dist/index.mjs

@@ -12649,7 +12649,7 @@ function ShopifyCart(instance, cart) {
       );
     }),
     items_subtotal_price: defer(() => instance.toShopifyPrice(cart.sub_total)),
-    note: defer(() => cart.comments),
+    note: deferWith(cart, (cart2) => cart2.comments),
     original_total_price: deferWith(
       cart,
       (cart2) => instance.toShopifyPrice(cart2.sub_total)
@@ -13734,15 +13734,10 @@ var CollectionsDrop = class extends Drop10 {
     switch (typeof key) {
       case "string": {
         if (key === "all") {
-          let resource = this.#map.get(key);
-          if (resource === void 0) {
-            resource = ShopifyCollection(
-              this.#instance,
-              new AllCategoryResource(this.#instance)
-            );
-            this.#map.set(key, resource);
-          }
-          return resource;
+          return this.getAllCollection();
+        }
+        if (key === "size") {
+          return this.getAllCollectionsSize();
         }
         return this.getCollection(key);
       }
@@ -13772,6 +13767,21 @@ var CollectionsDrop = class extends Drop10 {
     }
     return resource;
   }
+  getAllCollection() {
+    let resource = this.#map.get("all");
+    if (resource === void 0) {
+      resource = ShopifyCollection(
+        this.#instance,
+        new AllCategoryResource(this.#instance)
+      );
+      this.#map.set("all", resource);
+    }
+    return resource;
+  }
+  getAllCollectionsSize() {
+    const count = this.#instance.theme.globals.shop?.collections_count;
+    return count || 0;
+  }
 };
 var Collections = class extends SwellStorefrontCollection {
   #drop;
@@ -15549,7 +15559,7 @@ var tags = {
 };
 function bindTags(liquidSwell) {
   Object.entries(tags).forEach(
-    ([tag, bind66]) => liquidSwell.registerTag(tag, bind66(liquidSwell))
+    ([tag, bind67]) => liquidSwell.registerTag(tag, bind67(liquidSwell))
   );
 }
 
@@ -15817,8 +15827,22 @@ function bind37(_liquidSwell) {
   };
 }
 
-// src/liquid/filters/font_face.ts
+// src/liquid/filters/escape.ts
+import { escape } from "lodash-es";
 function bind38(_liquidSwell) {
+  return function escapeTag(input) {
+    if (!input?.startsWith) {
+      return input;
+    }
+    if (input.startsWith("<img") || input.startsWith("<video")) {
+      return input;
+    }
+    return escape(input);
+  };
+}
+
+// src/liquid/filters/font_face.ts
+function bind39(_liquidSwell) {
   return (fontSetting, ...params) => {
     if (!fontSetting) {
       return null;
@@ -15830,14 +15854,14 @@ function bind38(_liquidSwell) {
 }
 
 // src/liquid/filters/font_modify.ts
-function bind39(_liquidSwell) {
+function bind40(_liquidSwell) {
   return (fontSetting, prop, value) => {
     return ThemeFont.clone(fontSetting).modify(prop, value);
   };
 }
 
 // src/liquid/filters/font_url.ts
-function bind40(_liquidSwell) {
+function bind41(_liquidSwell) {
   return (fontSetting) => {
     return ThemeFont.get(fontSetting).url();
   };
@@ -15887,14 +15911,14 @@ var format_address_default = {
 
 // src/liquid/filters/handleize.ts
 import { kebabCase } from "lodash-es";
-function bind41(_liquidSwell) {
+function bind42(_liquidSwell) {
   return function filterHandleize(handle) {
     return kebabCase(handle);
   };
 }
 
 // src/liquid/filters/image_tag.ts
-function bind42(_liquidSwell) {
+function bind43(_liquidSwell) {
   return function filterImageTag(imageUrl, ...params) {
     imageUrl = String(imageUrl || "");
     let {
@@ -16058,7 +16082,7 @@ var filterDefinition = {
 var image_url_default = filterDefinition;
 
 // src/liquid/filters/inline_asset_content.ts
-function bind43(liquidSwell) {
+function bind44(liquidSwell) {
   return async (assetPath) => {
     const config = await liquidSwell.theme.getThemeConfig(
       `theme/assets/${assetPath}`
@@ -16068,14 +16092,14 @@ function bind43(liquidSwell) {
 }
 
 // src/liquid/filters/json.ts
-function bind44(_liquidSwell) {
+function bind45(_liquidSwell) {
   return async function filterJson(input, space = 0) {
     return jsonStringifyAsync(input, space);
   };
 }
 
 // src/liquid/filters/json_pretty.ts
-function bind45(_liquidSwell) {
+function bind46(_liquidSwell) {
   return async function filterJsonPretty(input, space = 2) {
     const output = await jsonStringifyAsync(input, space);
     return `<pre>${output}</pre>`;
@@ -16085,7 +16109,7 @@ function bind45(_liquidSwell) {
 // src/liquid/filters/locale_flag.ts
 import { hasFlag } from "country-flag-icons";
 import * as flags from "country-flag-icons/string/1x1";
-function bind46(_liquidSwell) {
+function bind47(_liquidSwell) {
   return (localeCode) => {
     if (typeof localeCode !== "string") {
       return flags.US;
@@ -16096,7 +16120,7 @@ function bind46(_liquidSwell) {
 }
 
 // src/liquid/filters/minus.ts
-function bind47(_liquidSwell) {
+function bind48(_liquidSwell) {
   return (first, second) => {
     const firstValue = isNumber(first) ? first : 0;
     const secondValue = isNumber(second) ? second : 0;
@@ -16105,7 +16129,7 @@ function bind47(_liquidSwell) {
 }
 
 // src/liquid/filters/money.ts
-function bind48(liquidSwell) {
+function bind49(liquidSwell) {
   return function filterMoney(value) {
     const amount = getMoneyAmount(liquidSwell, value);
     return liquidSwell.renderCurrency(amount);
@@ -16122,7 +16146,7 @@ function getMoneyAmount(liquidSwell, value) {
 }
 
 // src/liquid/filters/money_with_currency.ts
-function bind49(liquidSwell) {
+function bind50(liquidSwell) {
   return function filterMoneyWithCurrency(value) {
     const { currency } = liquidSwell.theme.swell.getStorefrontLocalization();
     const amount = getMoneyAmount(liquidSwell, value);
@@ -16131,7 +16155,7 @@ function bind49(liquidSwell) {
 }
 
 // src/liquid/filters/money_without_currency.ts
-function bind50(liquidSwell) {
+function bind51(liquidSwell) {
   return function filterMoneyWithoutCurrency(value) {
     const amount = getMoneyAmount(liquidSwell, value);
     return liquidSwell.renderCurrency(amount).replace(/[^0-9.,]/g, "");
@@ -16139,7 +16163,7 @@ function bind50(liquidSwell) {
 }
 
 // src/liquid/filters/money_without_trailing_zeros.ts
-function bind51(liquidSwell) {
+function bind52(liquidSwell) {
   return function filterMoneyWithoutTrailingZeros(value) {
     const amount = getMoneyAmount(liquidSwell, value);
     return liquidSwell.renderCurrency(amount).split(".")[0].split(",")[0];
@@ -16147,21 +16171,21 @@ function bind51(liquidSwell) {
 }
 
 // src/liquid/filters/script_tag.ts
-function bind52(_liquidSwell) {
+function bind53(_liquidSwell) {
   return function filterScriptTag(assetUrl) {
     return `<script src="${assetUrl}" type="text/javascript"></script>`;
   };
 }
 
 // src/liquid/filters/stylesheet_tag.ts
-function bind53(_liquidSwell) {
+function bind54(_liquidSwell) {
   return function filterStyleSheetTag(assetUrl) {
     return `<link href="${assetUrl}" rel="stylesheet" type="text/css" media="all" />`;
   };
 }
 
 // src/liquid/filters/time_tag.ts
-function bind54(_liquidSwell) {
+function bind55(_liquidSwell) {
   const dateFilter = bind33(_liquidSwell);
   return (dateValue, ...params) => {
     const date = ensureDate(dateValue);
@@ -16172,7 +16196,7 @@ function bind54(_liquidSwell) {
 }
 
 // src/liquid/filters/translate.ts
-function bind55(liquidSwell) {
+function bind56(liquidSwell) {
   return async function filterTranslate(key, params) {
     const props = params && paramsToProps(params);
     const str = await liquidSwell.renderTranslation(key, props);
@@ -16181,7 +16205,7 @@ function bind55(liquidSwell) {
 }
 
 // src/liquid/filters/where.ts
-function bind56(_liquidSwell) {
+function bind57(_liquidSwell) {
   return function* filterWhere(arr, property, expected) {
     const results = [];
     const list = yield resolveEnumerable(arr);
@@ -16235,7 +16259,7 @@ function getSizesFromParam(param) {
     height: height ? Number(height) : void 0
   };
 }
-function bind57(liquidSwell) {
+function bind58(liquidSwell) {
   return async function filterAssetImgUrl(assetPath, size = "small") {
     const imageUrl = await liquidSwell.getAssetUrl(assetPath).then((url) => url || "");
     const sizes = getSizesFromParam(size);
@@ -16251,14 +16275,14 @@ function bind57(liquidSwell) {
 }
 
 // src/liquid/filters/shopify/hex_to_rgba.ts
-function bind58(_liquidSwell) {
+function bind59(_liquidSwell) {
   return (color, alpha) => {
     return ThemeColor.get(color).rgba(alpha || 1);
   };
 }
 
 // src/liquid/filters/shopify/img_url.ts
-function bind59(liquidSwell) {
+function bind60(liquidSwell) {
   return async function filterImgUrl(input, ...params) {
     const url = await getImageUrlFromInput(input, liquidSwell);
     if (typeof url !== "string" || url === "") {
@@ -16296,14 +16320,14 @@ var item_count_for_variant_default = {
 };
 
 // src/liquid/filters/shopify/payment_button.ts
-function bind60(_liquidSwell) {
+function bind61(_liquidSwell) {
   return (form) => {
     return `<button style="display: block; visibility: hidden;"></button>`;
   };
 }
 
 // src/liquid/filters/shopify/payment_terms.ts
-function bind61(_liquidSwell) {
+function bind62(_liquidSwell) {
   return (form) => {
     return null;
   };
@@ -16405,7 +16429,7 @@ var svgs = {
 var placeholder_svgs_default = svgs;
 
 // src/liquid/filters/shopify/placeholder_svg_tag.ts
-function bind62(_liquidSwell) {
+function bind63(_liquidSwell) {
   return function filterPlaceholderSvgTag(name, className) {
     const svg = placeholder_svgs_default[name];
     if (typeof svg === "object" && svg !== null) {
@@ -16416,7 +16440,7 @@ function bind62(_liquidSwell) {
 }
 
 // src/liquid/filters/shopify/shopify_asset_url.ts
-function bind63(_liquidSwell) {
+function bind64(_liquidSwell) {
   return function filterShopifyAssetUrl(input) {
     if (typeof input === "string") {
       switch (input) {
@@ -16441,7 +16465,7 @@ function bind63(_liquidSwell) {
 }
 
 // src/liquid/filters/shopify/structured_data.ts
-function bind64(_liquidSwell) {
+function bind65(_liquidSwell) {
   return async function filterStructuredData(input) {
     let value = input;
     if (value instanceof StorefrontResource) {
@@ -16519,7 +16543,7 @@ function convertToSchemaOrgProductGroup(product) {
 }
 
 // src/liquid/filters/inline_editable.ts
-function bind65(_liquidSwell) {
+function bind66(_liquidSwell) {
   return (value, key) => {
     if (typeof value === "object" && "value" in value) {
       value = value.value;
@@ -16550,43 +16574,44 @@ var filters = {
   default_errors: bind35,
   divided_by: bind36,
   embedded_content: bind37,
-  font_face: bind38,
-  font_modify: bind39,
-  font_url: bind40,
+  escape: bind38,
+  font_face: bind39,
+  font_modify: bind40,
+  font_url: bind41,
   format_address: format_address_default,
-  handle: bind41,
+  handle: bind42,
   // alias
-  handleize: bind41,
-  image_tag: bind42,
+  handleize: bind42,
+  image_tag: bind43,
   image_url: image_url_default,
-  inline_asset_content: bind43,
-  json: bind44,
-  json_pretty: bind45,
-  locale_flag: bind46,
-  minus: bind47,
-  money: bind48,
-  money_with_currency: bind49,
-  money_without_currency: bind50,
-  money_without_trailing_zeros: bind51,
-  script_tag: bind52,
-  stylesheet_tag: bind53,
-  time_tag: bind54,
-  translate: bind55,
-  t: bind55,
+  inline_asset_content: bind44,
+  json: bind45,
+  json_pretty: bind46,
+  locale_flag: bind47,
+  minus: bind48,
+  money: bind49,
+  money_with_currency: bind50,
+  money_without_currency: bind51,
+  money_without_trailing_zeros: bind52,
+  script_tag: bind53,
+  stylesheet_tag: bind54,
+  time_tag: bind55,
+  translate: bind56,
+  t: bind56,
   // alias
-  where: bind56,
+  where: bind57,
   // Shopify compatibility only
-  asset_img_url: bind57,
-  hex_to_rgba: bind58,
-  img_url: bind59,
+  asset_img_url: bind58,
+  hex_to_rgba: bind59,
+  img_url: bind60,
   item_count_for_variant: item_count_for_variant_default,
-  payment_button: bind60,
-  payment_terms: bind61,
-  placeholder_svg_tag: bind62,
-  shopify_asset_url: bind63,
-  structured_data: bind64,
+  payment_button: bind61,
+  payment_terms: bind62,
+  placeholder_svg_tag: bind63,
+  shopify_asset_url: bind64,
+  structured_data: bind65,
   // Swell only
-  inline_editable: bind65
+  inline_editable: bind66
 };
 function bindFilters(liquidSwell) {
   for (const [tag, handler] of Object.entries(filters)) {
@@ -16600,8 +16625,8 @@ function bindFilters(liquidSwell) {
     }
   }
 }
-function bindWithResolvedProps(liquidSwell, bind66, resolve = []) {
-  const handler = bind66(liquidSwell);
+function bindWithResolvedProps(liquidSwell, bind67, resolve = []) {
+  const handler = bind67(liquidSwell);
   if (!Array.isArray(resolve)) {
     return handler;
   }
@@ -17416,14 +17441,14 @@ function getRobotsGlobals(canonicalUrl) {
     default_groups: [
       {
         user_agent: RobotsRule.from("User-agent", "*"),
-        // sitemap: RobotsRule.from('Sitemap', sitemapUrl),
+        sitemap: RobotsRule.from("Sitemap", sitemapUrl),
         rules: defaultRules.map(
           (rule) => RobotsRule.from(rule.directive, rule.value)
         )
       },
       {
         user_agent: RobotsRule.from("User-agent", "AhrefsBot"),
-        // sitemap: RobotsRule.from('Sitemap', sitemapUrl),
+        sitemap: RobotsRule.from("Sitemap", sitemapUrl),
         rules: [
           RobotsRule.from("Crawl-delay", "10"),
           ...defaultRules.map(
@@ -17433,7 +17458,7 @@ function getRobotsGlobals(canonicalUrl) {
       },
       {
         user_agent: RobotsRule.from("User-agent", "AhrefsSiteAudit"),
-        // sitemap: RobotsRule.from('Sitemap', sitemapUrl),
+        sitemap: RobotsRule.from("Sitemap", sitemapUrl),
         rules: [
           RobotsRule.from("Crawl-delay", "10"),
           ...defaultRules.map(
@@ -19393,6 +19418,35 @@ var DEFAULT_CACHE_RULES = {
   },
   pathRules: [{ path: "/checkout/*", skip: true }]
 };
+var SANITIZE_CLIENT_HEADERS = Object.freeze([
+  "connection",
+  "proxy-connection",
+  "keep-alive",
+  "transfer-encoding",
+  "upgrade",
+  "proxy-authenticate",
+  "proxy-authorization",
+  "te",
+  "trailers",
+  "via",
+  "alt-svc",
+  "content-length",
+  "content-encoding",
+  // Also strip any legacy internal metadata keys
+  "x-original-ttl",
+  "x-original-swr",
+  "x-cache-time"
+]);
+var CACHE_KEY_HEADERS = Object.freeze([
+  "cookie",
+  "swell-storefront-id",
+  "swell-app-id",
+  "swell-access-token",
+  "swell-theme-version-hash",
+  "swell-cache-modified",
+  "x-locale",
+  "swell-storefront-context"
+]);
 var HtmlCache = class {
   epoch;
   backend;
@@ -19400,7 +19454,23 @@ var HtmlCache = class {
   constructor(epoch, backend, cacheRules = DEFAULT_CACHE_RULES) {
     this.epoch = epoch;
     this.backend = backend;
-    this.cacheRules = cacheRules;
+    this.cacheRules = {
+      ...cacheRules,
+      pathRules: cacheRules.pathRules?.map((rule) => ({
+        ...rule,
+        regex: this.convertPathToRegex(rule.path)
+      }))
+    };
+  }
+  /**
+   * Converts wildcard pattern to regex and tests against path.
+   *
+   * - `*` matches any characters except `/`
+   * - `**` matches any characters including `/`
+   */
+  convertPathToRegex(pattern) {
+    const regex = pattern.replace(/[.+?^${}()|[\]\\]/g, "\\$&").replace(/\*\*/g, "___DOUBLE_STAR___").replace(/\*/g, "[^/]*").replace(/___DOUBLE_STAR___/g, ".*");
+    return new RegExp(`^${regex}$`);
   }
   async get(request) {
     const trace = createTraceId();
@@ -19491,18 +19561,18 @@ var HtmlCache = class {
         );
         return;
       }
-      const cacheTimeISO = (/* @__PURE__ */ new Date()).toISOString();
+      const date = /* @__PURE__ */ new Date();
       const headers = this.normalizeHeaders(response.headers);
       const entry = {
         status: response.status,
         statusText: response.statusText,
         headers,
         body,
-        cacheTimeISO,
+        cacheTimeISO: date.toISOString(),
         ttl,
         swr,
         etag: this.quoteETag(headers["etag"] || md5(body)),
-        lastModifiedUTC: headers["last-modified"] || new Date(cacheTimeISO).toUTCString()
+        lastModifiedUTC: headers["last-modified"] || date.toUTCString()
       };
       const hardExpireSeconds = ttl + swr;
       await this.backend.write(cacheKey, entry, hardExpireSeconds);
@@ -19527,8 +19597,13 @@ var HtmlCache = class {
     }
   }
   canReadFromCache(request) {
-    const method = request.method.toUpperCase();
-    if (!(method === "GET" || method === "HEAD")) return false;
+    switch (request.method.toUpperCase()) {
+      case "GET":
+      case "HEAD":
+        break;
+      default:
+        return false;
+    }
     const res = this.resolvePathRule(request);
     if (res.skip) return false;
     return this.isRequestCacheable(request);
@@ -19594,7 +19669,7 @@ var HtmlCache = class {
       try {
         const ifModDate = new Date(ifModifiedSince);
         const lastModDate = new Date(lastModified);
-        if (isNaN(ifModDate.getTime()) || isNaN(lastModDate.getTime())) {
+        if (Number.isNaN(ifModDate.getTime()) || Number.isNaN(lastModDate.getTime())) {
           return false;
         }
         return ifModDate >= lastModDate;
@@ -19624,31 +19699,25 @@ var HtmlCache = class {
     return `"${value}"`;
   }
   sanitizeClientHeaders(headers) {
-    const HOP_BY_HOP = [
-      "connection",
-      "proxy-connection",
-      "keep-alive",
-      "transfer-encoding",
-      "upgrade",
-      "proxy-authenticate",
-      "proxy-authorization",
-      "te",
-      "trailers",
-      "via",
-      "alt-svc",
-      "content-length"
-    ];
-    for (const h of HOP_BY_HOP) headers.delete(h);
-    headers.delete("content-encoding");
-    headers.delete("x-original-ttl");
-    headers.delete("x-original-swr");
-    headers.delete("x-cache-time");
+    for (const name of SANITIZE_CLIENT_HEADERS) {
+      headers.delete(name);
+    }
+  }
+  getCacheKeyHeaders(headers) {
+    const acc = new Headers();
+    for (const name of CACHE_KEY_HEADERS) {
+      const value = headers.get(name);
+      if (value) {
+        acc.set(name, value);
+      }
+    }
+    return acc;
   }
   generateVersionHash(headers) {
-    const swellData = this.extractSwellData(headers);
+    const swellData = this.extractSwellData(headers.get("cookie"));
     const versionFactors = {
       store: headers.get("swell-storefront-id") || "",
-      app: (headers.get("swell-app-id") || "") + "@" + (headers.get("host") || ""),
+      app: headers.get("swell-app-id") || "",
       auth: headers.get("swell-access-token") || "",
       theme: headers.get("swell-theme-version-hash") || "",
       modified: headers.get("swell-cache-modified") || "",
@@ -19659,8 +19728,7 @@ var HtmlCache = class {
     };
     return md5(JSON.stringify(versionFactors));
   }
-  extractSwellData(headers) {
-    const cookie = headers.get("cookie");
+  extractSwellData(cookie) {
     if (!cookie) return {};
     const swellDataMatch = cookie.match(/swell-data=([^;]+)/);
     if (!swellDataMatch) return {};
@@ -19712,15 +19780,6 @@ var HtmlCache = class {
     const age = (Date.now() - t) / 1e3;
     return age < 0 ? 0 : age;
   }
-  /**
-   * Converts wildcard pattern to regex and tests against path.
-   * - * matches any characters except /
-   * - ** matches any characters including /
-   */
-  pathMatches(pattern, path) {
-    const regex = pattern.replace(/[.+?^${}()|[\]\\]/g, "\\$&").replace(/\*\*/g, "___DOUBLE_STAR___").replace(/\*/g, "[^/]*").replace(/___DOUBLE_STAR___/g, ".*");
-    return new RegExp(`^${regex}$`).test(path);
-  }
   normalizeHeaders(headers) {
     const normalized = {};
     headers.forEach((value, key) => {
@@ -19731,16 +19790,10 @@ var HtmlCache = class {
   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 defaults = this.cacheRules.defaults?.[mode] ?? DEFAULT_CACHE_RULES.defaults?.[mode];
+    const rule = this.cacheRules.pathRules?.find(
+      (r) => r.regex.test(url.pathname)
+    );
     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 {
@@ -19752,27 +19805,29 @@ var HtmlCache = class {
     };
   }
   normalizeSearchParams(searchParams) {
-    const ignoredParams = [
-      "utm_source",
-      "utm_medium",
-      "utm_campaign",
-      "utm_content",
-      "utm_term",
-      "fbclid",
-      "gclid",
-      "gbraid",
-      "wbraid",
-      "ref",
-      "source",
-      "mc_cid",
-      "mc_eid"
-    ];
     const relevantParams = [];
     searchParams.forEach((value, key) => {
-      if (!ignoredParams.includes(key)) {
-        relevantParams.push(
-          `${encodeURIComponent(key)}=${encodeURIComponent(value)}`
-        );
+      switch (key) {
+        case "utm_source":
+        case "utm_medium":
+        case "utm_campaign":
+        case "utm_content":
+        case "utm_term":
+        case "fbclid":
+        case "gclid":
+        case "gbraid":
+        case "wbraid":
+        case "ref":
+        case "source":
+        case "mc_cid":
+        case "mc_eid":
+          break;
+        default: {
+          relevantParams.push(
+            `${encodeURIComponent(key)}=${encodeURIComponent(value)}`
+          );
+          break;
+        }
       }
     });
     return relevantParams.sort().join("&");