@swell/apps-sdk 1.0.166 → 1.0.168

package/dist/index.cjs

@@ -14916,10 +14916,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: "",
@@ -22659,11 +22659,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);
@@ -22796,22 +22803,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 +22828,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 +22855,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",