@swell/apps-sdk 1.0.183 → 1.0.185

package/dist/index.mjs

@@ -2903,7 +2903,7 @@ var LANG_TO_COUNTRY_CODES = {
 var CURRENCY_COUNTRIES = Object.freeze({
   USD: { name: "United States", iso: "US" },
   EUR: { name: "Europe", iso: "EU" },
-  GBP: { name: "United Kingdom", iso: "UK" },
+  GBP: { name: "United Kingdom", iso: "GB" },
   JPY: { name: "Japan", iso: "JP" },
   CAD: { name: "Canada", iso: "CA" },
   AUD: { name: "Australia", iso: "AU" },
@@ -4629,7 +4629,7 @@ function getSelectedSubscriptionPurchaseOptionPlan(selectedPurchaseOptionType, s
   return selectedPlan || subscriptionPurchaseOption.plans[0];
 }
 var SORT_OPTIONS = Object.freeze([
-  { value: "", name: "Featured" },
+  { value: "manual", name: "Featured" },
   { value: "popularity", name: "Popularity", query: "popularity desc" },
   { value: "price_asc", name: "Price, low to high", query: "price asc" },
   { value: "price_desc", name: "Price, high to low", query: "price desc" },
@@ -4639,7 +4639,7 @@ var SORT_OPTIONS = Object.freeze([
   { value: "name_desc", name: "Product name, Z-A", query: "name desc" }
 ]);
 async function getProductFilters(swell, productQuery) {
-  const sortBy = swell.queryParams.sort || "";
+  const sortBy = swell.queryParams.sort || "manual";
   const filterQuery = productQueryWithFilters(swell, productQuery);
   return {
     filter_options: await getProductFiltersByQuery(swell, filterQuery),
@@ -4686,7 +4686,7 @@ function productQueryWithFilters(swell, query) {
     },
     {}
   );
-  const sortBy = swell.queryParams.sort || "";
+  const sortBy = swell.queryParams.sort || "manual";
   return {
     sort: SORT_OPTIONS.find((option) => option.value === sortBy)?.query || void 0,
     $filters: filters2,
@@ -17441,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(
@@ -17458,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(
@@ -19418,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;
@@ -19425,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();
@@ -19516,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);
@@ -19552,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);
@@ -19619,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;
@@ -19649,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") || "",
@@ -19684,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 {};
@@ -19737,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) => {
@@ -19756,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 {
@@ -19777,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("&");