@swell/apps-sdk 1.0.159 → 1.0.161

package/dist/index.cjs

@@ -46,6 +46,7 @@ __export(index_exports, {
   DeferredShopifyResource: () => DeferredShopifyResource,
   FILE_DATA_INCLUDE_QUERY: () => FILE_DATA_INCLUDE_QUERY,
   GEO_DATA: () => GEO_DATA,
+  HtmlCache: () => HtmlCache,
   LANG_TO_COUNTRY_CODES: () => LANG_TO_COUNTRY_CODES,
   LiquidSwell: () => LiquidSwell30,
   MAX_QUERY_PAGE_LIMIT: () => MAX_QUERY_PAGE_LIMIT,
@@ -93,7 +94,6 @@ __export(index_exports, {
   ThemeForm: () => ThemeForm,
   ThemeFormErrors: () => ThemeFormErrors,
   VariantResource: () => VariantResource,
-  WorkerHtmlCache: () => WorkerHtmlCache,
   adaptShopifyFontData: () => adaptShopifyFontData,
   adaptShopifyFormData: () => adaptShopifyFormData,
   adaptShopifyMenuData: () => adaptShopifyMenuData,
@@ -121,6 +121,7 @@ __export(index_exports, {
   getEasyblocksComponentDefinitions: () => getEasyblocksComponentDefinitions,
   getEasyblocksPagePropsWithConfigs: () => getEasyblocksPagePropsWithConfigs,
   getEasyblocksPageTemplate: () => getEasyblocksPageTemplate,
+  getHtmlCache: () => getHtmlCache,
   getKVFlavor: () => getKVFlavor,
   getLayoutSectionGroups: () => getLayoutSectionGroups,
   getMenuItemStorefrontUrl: () => getMenuItemStorefrontUrl,
@@ -866,7 +867,8 @@ var RESOURCE_CLONE_PROPS = Object.freeze([
   "_swell",
   "_params",
   "_id",
-  "_resourceName"
+  "_resourceName",
+  "_result"
 ]);
 function cloneStorefrontResource(input) {
   const resourceName = input._resourceName || input.constructor?.name;
@@ -7436,12 +7438,7 @@ var ThemeCache = class extends Cache {
   }
 };
 
-// src/cache/theme-file-storage.ts
-var import_bluebird2 = __toESM(require("bluebird"), 1);
-
 // src/cache/kv-variety.ts
-var import_bluebird = __toESM(require("bluebird"), 1);
-var { Promise: Promise2 } = import_bluebird.default;
 var CFKV = class {
   constructor(kv) {
     this.kv = kv;
@@ -7473,13 +7470,11 @@ var MiniflareKV = class {
       return /* @__PURE__ */ new Map();
     }
     const result = /* @__PURE__ */ new Map();
-    await Promise2.map(
-      keys,
-      async (key) => {
+    await Promise.all(
+      keys.map(async (key) => {
         const value = await this.kv.get(key, "text");
         result.set(key, value);
-      },
-      { concurrency: 50 }
+      })
     );
     return result;
   }
@@ -7511,16 +7506,13 @@ function createClientKV(env, flavor = "cf") {
   return new MemoryKV();
 }
 
-// src/cache/theme-file-storage.ts
-var { Promise: Promise3 } = import_bluebird2.default;
-var ThemeFileStorage = class {
+// src/cache/theme-file-cache.ts
+var ThemeFileCache = class {
   kv;
-  maxConcurrency;
   maxBatchSize = 20 * 1024 * 1024;
   // 20MB safety margin
   constructor(env, flavor = "cf") {
     this.kv = createClientKV(env, flavor);
-    this.maxConcurrency = flavor === "miniflare" ? 50 : 6;
   }
   /**
    * Build a KV storage key from a file hash
@@ -7613,10 +7605,8 @@ var ThemeFileStorage = class {
       totalSize,
       trace
     });
-    const results = await Promise3.map(
-      batches,
-      (batch) => this.loadBatch(batch),
-      { concurrency: Math.min(this.maxConcurrency, batches.length) }
+    const results = await Promise.all(
+      batches.map((batch) => this.loadBatch(batch))
     );
     const mergedConfigs = this.mergeResults(configs, results);
     const loadedCount = mergedConfigs.filter((c) => c.file_data).length;
@@ -7681,10 +7671,8 @@ var ThemeFileStorage = class {
     }
     const existing = /* @__PURE__ */ new Set();
     const batches = this.planGetBatches(configs);
-    const results = await Promise3.map(
-      batches,
-      (batch) => this.kv.get(batch.keys),
-      { concurrency: this.maxConcurrency }
+    const results = await Promise.all(
+      batches.map((batch) => this.kv.get(batch.keys))
     );
     for (const batchResult of results) {
       for (const [key, value] of batchResult.entries()) {
@@ -7748,15 +7736,13 @@ var ThemeFileStorage = class {
         skippedExisting: existing.size,
         trace
       });
-      await Promise3.map(
-        toWrite,
-        async (config) => {
+      await Promise.all(
+        toWrite.map(async (config) => {
           const key = this.buildKey(config.hash);
           const metadata = config.file?.content_type ? { content_type: config.file.content_type } : void 0;
-          await this.kv.put(key, config.file_data, metadata);
+          await this.kv.put(key, config.file_data, { metadata });
           result.written++;
-        },
-        { concurrency: this.maxConcurrency }
+        })
       );
     }
     logger.info("[ThemeFileStorage] Put files complete", {
@@ -7770,378 +7756,6 @@ var ThemeFileStorage = class {
   }
 };
 
-// src/cache/constants.ts
-var SECOND = 1e3;
-var MINUTE = 60 * SECOND;
-var HOUR = 60 * MINUTE;
-var DAY = 24 * HOUR;
-var YEAR = 365 * DAY;
-var SHORT_TTL = 5 * SECOND;
-
-// src/cache/worker-html-cache.ts
-var CACHE_NAME = "swell-html-v0";
-var CACHE_KEY_ORIGIN = "https://cache.swell.store";
-var TTL_CONFIG = {
-  LIVE: {
-    DEFAULT: 20,
-    HOME: 20,
-    PRODUCT: 20,
-    COLLECTION: 20,
-    PAGE: 20,
-    BLOG: 20,
-    SWR: 180
-  },
-  PREVIEW: {
-    DEFAULT: 20,
-    HOME: 20,
-    PRODUCT: 20,
-    COLLECTION: 20,
-    PAGE: 20,
-    BLOG: 20,
-    SWR: 180
-  }
-};
-var WorkerHtmlCache = class {
-  epoch;
-  constructor(epoch) {
-    this.epoch = epoch;
-  }
-  async get(request) {
-    const trace = createTraceId();
-    if (request.method !== "GET") {
-      logger.debug("[SDK Html-cache] non-cacheable", { trace });
-      return { found: false, cacheable: false };
-    }
-    if (!this.isCacheable(request)) {
-      logger.debug("[SDK Html-cache] non-cacheable", { trace });
-      return { found: false, cacheable: false };
-    }
-    try {
-      const cache = await caches.open(CACHE_NAME + this.epoch);
-      const cacheKey = this.buildCacheKey(request);
-      const cached = await cache.match(cacheKey);
-      if (!cached) {
-        logger.debug("[SDK Html-cache] cacheable, MISS", { trace });
-        return { found: false, cacheable: true };
-      }
-      const age = this.getResponseAge(cached);
-      const ttl = parseInt(cached.headers.get("X-Original-TTL") || "") || this.getTTLForRequest(request);
-      const swr = parseInt(cached.headers.get("X-Original-SWR") || "") || this.getSWRForRequest(request);
-      const isStale = age >= ttl;
-      const isExpired = age >= ttl + swr;
-      if (!isExpired) {
-        logger.debug("[SDK Html-cache] cacheable, HIT", {
-          stale: isStale,
-          age,
-          trace
-        });
-        const clientResponse = this.buildClientResponse(
-          cached,
-          ttl,
-          swr,
-          isStale,
-          age
-        );
-        return {
-          found: true,
-          stale: isStale,
-          response: clientResponse,
-          cacheable: true,
-          age: Math.floor(age)
-        };
-      }
-      logger.debug("[SDK Html-cache] cacheable, hit, expired", { trace });
-      return { found: false, cacheable: true };
-    } catch (_) {
-      logger.warn("[SDK Html-cache] no get support", { trace });
-      return null;
-    }
-  }
-  // 304 support
-  async getWithConditionals(request) {
-    const result = await this.get(request);
-    if (!result?.found || result.stale) {
-      return result;
-    }
-    const ifModifiedSince = request.headers.get("If-Modified-Since");
-    const ifNoneMatch = request.headers.get("If-None-Match");
-    if ((ifModifiedSince || ifNoneMatch) && result.response) {
-      const lastModified = result.response.headers.get("Last-Modified");
-      const etag = result.response.headers.get("ETag");
-      if (this.checkNotModified(ifModifiedSince, ifNoneMatch, lastModified, etag)) {
-        result.notModified = true;
-        result.conditional304 = new Response(null, {
-          status: 304,
-          headers: {
-            "Last-Modified": lastModified || "",
-            ETag: etag || "",
-            "Cache-Control": result.response.headers.get("Cache-Control") || "",
-            "Cloudflare-CDN-Cache-Control": result.response.headers.get("Cloudflare-CDN-Cache-Control") || "",
-            "X-Cache-Status": "HIT-304"
-          }
-        });
-      }
-    }
-    return result;
-  }
-  checkNotModified(ifModifiedSince, ifNoneMatch, lastModified, etag) {
-    if (ifNoneMatch && etag) {
-      return ifNoneMatch === etag;
-    }
-    if (ifModifiedSince && lastModified) {
-      const ifModDate = new Date(ifModifiedSince);
-      const lastModDate = new Date(lastModified);
-      return !isNaN(ifModDate.getTime()) && !isNaN(lastModDate.getTime()) && ifModDate >= lastModDate;
-    }
-    return false;
-  }
-  createRevalidationRequest(request) {
-    const headers = new Headers(request.headers);
-    headers.set("X-Cache-Bypass", "revalidation");
-    headers.delete("If-None-Match");
-    headers.delete("If-Modified-Since");
-    headers.delete("Cache-Control");
-    headers.delete("Pragma");
-    return new Request(request.url, {
-      method: "GET",
-      headers
-    });
-  }
-  async put(request, response) {
-    const trace = createTraceId();
-    if (request.method !== "GET" || !response.ok) {
-      logger.debug("[SDK Html-cache] put skipped", { trace });
-      return;
-    }
-    if (!this.isCacheable(request) || !this.isResponseCacheable(response)) {
-      logger.debug("[SDK Html-cache] put skipped, non-cacheable", {
-        trace
-      });
-      return;
-    }
-    try {
-      const cache = await caches.open(CACHE_NAME + this.epoch);
-      const cacheKey = this.buildCacheKey(request);
-      await cache.delete(cacheKey);
-      const ttl = this.getTTLForRequest(request);
-      const swr = this.getSWRForRequest(request);
-      const headers = new Headers(response.headers);
-      const existingCacheControl = response.headers.get("Cache-Control");
-      if (!existingCacheControl || existingCacheControl === "public") {
-        const internalMaxAge = ttl + swr;
-        headers.set("Cache-Control", `public, max-age=${internalMaxAge}`);
-      }
-      const cacheTime = (/* @__PURE__ */ new Date()).toISOString();
-      headers.set("X-Cache-Time", cacheTime);
-      headers.set("X-Original-TTL", ttl.toString());
-      headers.set("X-Original-SWR", swr.toString());
-      if (!headers.get("Last-Modified")) {
-        headers.set("Last-Modified", new Date(cacheTime).toUTCString());
-      }
-      const cacheableResponse = new Response(response.body, {
-        status: response.status,
-        statusText: response.statusText,
-        headers
-      });
-      await cache.put(cacheKey, cacheableResponse);
-      logger.debug("[SDK Html-cache] put done", { trace });
-    } catch (_) {
-      logger.warn("[SDK Html-cache] no put support", { trace });
-    }
-  }
-  buildClientResponse(cachedResponse, ttl, swr, isStale, age) {
-    const headers = new Headers(cachedResponse.headers);
-    headers.set(
-      "Cache-Control",
-      `public, max-age=${ttl}, stale-while-revalidate=${swr}`
-    );
-    headers.set(
-      "Cloudflare-CDN-Cache-Control",
-      `public, s-maxage=${ttl}, stale-while-revalidate=${swr}, stale-if-error=60`
-    );
-    const cacheTime = headers.get("X-Cache-Time");
-    if (cacheTime) {
-      const lastModified = new Date(cacheTime).toUTCString();
-      headers.set("Last-Modified", lastModified);
-    }
-    headers.set("X-Cache-Status", isStale ? "STALE" : "HIT");
-    headers.set("X-Cache-Age", Math.floor(age).toString());
-    headers.delete("X-Original-TTL");
-    headers.delete("X-Original-SWR");
-    headers.delete("X-Cache-Time");
-    return new Response(cachedResponse.body, {
-      status: cachedResponse.status,
-      statusText: cachedResponse.statusText,
-      headers
-    });
-  }
-  buildCacheKey(request) {
-    const url = new URL(request.url);
-    const versionHash = this.generateVersionHash(request.headers);
-    const normalizedQuery = this.normalizeSearchParams(url.searchParams);
-    const cacheKeyPath = `${versionHash}${url.pathname}`;
-    const keyUrl = new URL(`${CACHE_KEY_ORIGIN}${cacheKeyPath}`);
-    if (normalizedQuery) {
-      keyUrl.search = `?${normalizedQuery}`;
-    }
-    const sanitizedHeaders = this.sanitizeHeaders(request.headers);
-    return new Request(keyUrl.toString(), {
-      method: "GET",
-      headers: sanitizedHeaders
-    });
-  }
-  sanitizeHeaders(originalHeaders) {
-    const CACHE_RELEVANT_HEADERS = [
-      // Content negotiation (affects response format)
-      "accept",
-      "accept-language"
-    ];
-    const sanitized = new Headers();
-    CACHE_RELEVANT_HEADERS.forEach((header) => {
-      const value = originalHeaders.get(header);
-      if (value) {
-        sanitized.set(header, value);
-      }
-    });
-    return sanitized;
-  }
-  generateVersionHash(headers) {
-    const swellData = this.extractSwellData(headers);
-    const versionFactors = {
-      store: headers.get("swell-storefront-id") || "",
-      auth: headers.get("swell-access-token") || "",
-      theme: headers.get("swell-theme-version-hash") || "",
-      modified: headers.get("swell-cache-modified") || "",
-      currency: swellData["swell-currency"] || "USD",
-      locale: headers.get("x-locale") || headers.get("accept-language")?.split(",")[0] || "default",
-      context: headers.get("swell-storefront-context"),
-      epoch: this.epoch
-    };
-    return md5(JSON.stringify(versionFactors));
-  }
-  extractSwellData(headers) {
-    const cookie = headers.get("cookie");
-    if (!cookie) return {};
-    const swellDataMatch = cookie.match(/swell-data=([^;]+)/);
-    if (!swellDataMatch) return {};
-    try {
-      const parsed = JSON.parse(decodeURIComponent(swellDataMatch[1]));
-      if (typeof parsed === "object" && parsed !== null) {
-        return parsed;
-      }
-      return {};
-    } catch {
-      return {};
-    }
-  }
-  isCacheable(request) {
-    const url = new URL(request.url);
-    const headers = request.headers;
-    if (headers.get("swell-deployment-mode") === "editor") {
-      return false;
-    }
-    const skipPaths = ["/checkout"];
-    if (skipPaths.some((path) => url.pathname.startsWith(path))) {
-      return false;
-    }
-    if (headers.get("cache-control")?.includes("no-cache")) {
-      return false;
-    }
-    return true;
-  }
-  isResponseCacheable(response) {
-    const contentType = response.headers.get("content-type");
-    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")) {
-      return false;
-    }
-    return true;
-  }
-  getDeploymentMode(headers) {
-    const mode = headers.get("swell-deployment-mode");
-    if (mode === "preview" || mode === "editor") {
-      return mode;
-    }
-    return "live";
-  }
-  getTTLForRequest(request) {
-    const url = new URL(request.url);
-    const path = url.pathname;
-    const mode = this.getDeploymentMode(request.headers);
-    if (mode === "editor") {
-      return 0;
-    }
-    const config = mode === "preview" ? TTL_CONFIG.PREVIEW : TTL_CONFIG.LIVE;
-    if (path === "/") {
-      return config.HOME;
-    }
-    if (path.startsWith("/products/")) {
-      return config.PRODUCT;
-    }
-    if (path.startsWith("/categories/")) {
-      return config.COLLECTION;
-    }
-    if (path.startsWith("/pages/")) {
-      return config.PAGE;
-    }
-    if (path.startsWith("/blogs/")) {
-      return config.BLOG;
-    }
-    return config.DEFAULT;
-  }
-  getSWRForRequest(request) {
-    const mode = this.getDeploymentMode(request.headers);
-    if (mode === "editor") {
-      return 0;
-    }
-    return mode === "preview" ? TTL_CONFIG.PREVIEW.SWR : TTL_CONFIG.LIVE.SWR;
-  }
-  getResponseAge(response) {
-    const cacheTime = response.headers.get("X-Cache-Time");
-    if (!cacheTime) {
-      return Infinity;
-    }
-    const cacheDate = new Date(cacheTime);
-    if (isNaN(cacheDate.getTime())) {
-      return Infinity;
-    }
-    const age = (Date.now() - cacheDate.getTime()) / 1e3;
-    return Math.max(0, age);
-  }
-  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)}`
-        );
-      }
-    });
-    return relevantParams.sort().join("&");
-  }
-};
-
 // src/resources/addresses.ts
 var SwellAddresses = class extends SwellStorefrontCollection {
   constructor(swell, query) {
@@ -16283,9 +15897,16 @@ function convertToShopifySorting(value) {
 function getProducts(instance, object, mapper) {
   return deferWith(object, (object2) => {
     const { page, limit: limit2 } = instance.swell.queryParams;
-    const categoryFilter = object2.id && object2.id !== "all" ? object2.id : void 0;
-    const productQuery = categoryFilter ? { category: categoryFilter, $variants: true } : { $variants: true };
-    const filterQuery = productQueryWithFilters(instance.swell, productQuery);
+    const productQuery = {
+      $variants: true
+    };
+    if (typeof object2.id === "string" && object2.id !== "all") {
+      productQuery.category = object2.id;
+    }
+    if (object2.performed && typeof object2.query === "string") {
+      productQuery.search = object2.query;
+    }
+    const filterQuery = productQueryWithFilters(instance.swell, productQuery);
     const products = new SwellStorefrontCollection(
       instance.swell,
       "products",
@@ -16400,7 +16021,7 @@ function ShopifyAddress(instance, address, account) {
 function joinAddressLines(...props) {
   return props.filter(Boolean).join("\n");
 }
-function ShopifyCountry(_instance, countryCode) {
+function ShopifyCountry(_instance2, countryCode) {
   const currencyCode = getCurrencyByCountry(countryCode) || "USD";
   return new ShopifyResource(
     {
@@ -16733,7 +16354,7 @@ async function resolveLastOrder(instance, account) {
 }
 
 // src/compatibility/shopify-objects/font.ts
-function ShopifyFont(_instance, font) {
+function ShopifyFont(_instance2, font) {
   if (font instanceof ShopifyResource) {
     return font.clone();
   }
@@ -16744,7 +16365,7 @@ function ShopifyFont(_instance, font) {
     family: font.family,
     style: font.style,
     "system?": font.system,
-    variants: font.variants.map((variant) => ShopifyFont(_instance, variant)),
+    variants: font.variants.map((variant) => ShopifyFont(_instance2, variant)),
     weight: font.weight
   });
 }
@@ -16757,7 +16378,7 @@ var SHOPIFY_FORMS = {
     })
   }
 };
-function ShopifyForm(_instance, form) {
+function ShopifyForm(_instance2, form) {
   if (form instanceof ShopifyResource) {
     return form.clone();
   }
@@ -17054,7 +16675,7 @@ function ShopifyRecommendations(instance, product) {
 }
 
 // src/compatibility/shopify-objects/page.ts
-function ShopifyPage(_instance, page) {
+function ShopifyPage(_instance2, page) {
   if (page instanceof ShopifyResource) {
     return page.clone();
   }
@@ -17100,11 +16721,11 @@ function ShopifySearch(instance, search) {
         (filter) => ShopifyFilter(instance, filter)
       );
     }),
-    performed: defer(() => search.performed),
+    performed: deferWith(search, (search2) => search2.performed),
     results: defer(async () => (await resolveProducts())?.results ?? []),
     results_count: defer(async () => (await resolveProducts())?.count || 0),
     sort_by: defer(() => search.sort),
-    sort_options: defer(() => search.sort_options),
+    sort_options: deferWith(search, (search2) => search2.sort_options),
     terms: defer(() => search.query),
     types: ["product"]
   });
@@ -18266,7 +17887,7 @@ ${injects.join("\n")}</script>`;
 };
 
 // src/compatibility/shopify-objects/template.ts
-function ShopifyTemplate(_instance, template) {
+function ShopifyTemplate(_instance2, template) {
   return new ShopifyResource(
     {
       directory: template.path,
@@ -20578,7 +20199,7 @@ var ThemeLoader = class _ThemeLoader {
       flavor,
       trace
     });
-    const storage = new ThemeFileStorage(this.swell.workerEnv, flavor);
+    const storage = new ThemeFileCache(this.swell.workerEnv, flavor);
     const result = await storage.putFiles(configs);
     if (result.warnings.length > 0) {
       logger.warn("[ThemeLoader] Theme cache updated with warnings", {
@@ -20616,7 +20237,7 @@ var ThemeLoader = class _ThemeLoader {
       total: configMetadata.length
     });
     const flavor = getKVFlavor(this.swell.workerEnv);
-    const storage = new ThemeFileStorage(this.swell.workerEnv, flavor);
+    const storage = new ThemeFileCache(this.swell.workerEnv, flavor);
     const kvHydrated = await storage.getFiles(configMetadata);
     const completeConfigs = await this.ensureConfigsHaveData(kvHydrated);
     for (const config of completeConfigs) {
@@ -22838,6 +22459,547 @@ function getResourceQuery(slug, query) {
     ...query
   };
 }
+
+// src/cache/html-cache/html-cache.ts
+var CACHE_KEY_ORIGIN = "https://cache.swell.store";
+var TTL_CONFIG = {
+  LIVE: {
+    DEFAULT: 20,
+    HOME: 20,
+    PRODUCT: 20,
+    COLLECTION: 20,
+    PAGE: 20,
+    BLOG: 20,
+    SWR: 60 * 60 * 24 * 7
+    // 1 week
+  },
+  PREVIEW: {
+    DEFAULT: 10,
+    HOME: 10,
+    PRODUCT: 10,
+    COLLECTION: 10,
+    PAGE: 10,
+    BLOG: 10,
+    SWR: 60 * 60 * 24 * 7
+    // 1 week
+  }
+};
+var HtmlCache = class {
+  epoch;
+  backend;
+  constructor(epoch, backend) {
+    this.epoch = epoch;
+    this.backend = backend;
+  }
+  async get(request) {
+    const trace = createTraceId();
+    if (request.method !== "GET") {
+      logger.debug("[SDK Html-cache] non-cacheable method", { trace });
+      return { found: false, cacheable: false };
+    }
+    if (!this.isCacheable(request)) {
+      logger.debug("[SDK Html-cache] non-cacheable request", { trace });
+      return { found: false, cacheable: false };
+    }
+    try {
+      const cacheKey = this.buildCacheKey(request);
+      const entry = await this.backend.read(cacheKey);
+      if (!entry) {
+        logger.debug("[SDK Html-cache] cacheable, MISS", { trace });
+        return { found: false, cacheable: true };
+      }
+      const age = this.getEntryAge(entry);
+      const { ttl, swr } = entry;
+      const isStale = age >= ttl;
+      const isExpired = age >= ttl + swr;
+      if (!isExpired) {
+        logger.debug("[SDK Html-cache] cacheable, HIT", {
+          stale: isStale,
+          age,
+          trace
+        });
+        const clientResponse = this.buildClientResponse(entry, isStale, age);
+        return {
+          found: true,
+          stale: isStale,
+          response: clientResponse,
+          cacheable: true,
+          age: Math.floor(age)
+        };
+      }
+      logger.debug("[SDK Html-cache] cacheable, hit, expired", { trace });
+      return { found: false, cacheable: true };
+    } catch (e) {
+      logger.warn("[SDK Html-cache] get failed", {
+        trace,
+        error: e instanceof Error ? e.message : String(e)
+      });
+      return null;
+    }
+  }
+  async getWithConditionals(request) {
+    const result = await this.get(request);
+    if (!result?.found || result.stale) {
+      return result;
+    }
+    const ifModifiedSince = request.headers.get("If-Modified-Since");
+    const ifNoneMatch = request.headers.get("If-None-Match");
+    if ((ifModifiedSince || ifNoneMatch) && result.response) {
+      const lastModified = result.response.headers.get("Last-Modified");
+      const etag = result.response.headers.get("ETag");
+      if (this.checkNotModified(ifModifiedSince, ifNoneMatch, lastModified, etag)) {
+        result.notModified = true;
+        result.conditional304 = new Response(null, {
+          status: 304,
+          headers: {
+            "Last-Modified": lastModified || "",
+            ETag: etag || "",
+            "Cache-Control": result.response.headers.get("Cache-Control") || "",
+            "Cloudflare-CDN-Cache-Control": result.response.headers.get("Cloudflare-CDN-Cache-Control") || "",
+            "X-Cache-Status": "HIT-304"
+          }
+        });
+      }
+    }
+    return result;
+  }
+  async put(request, response) {
+    const trace = createTraceId();
+    if (request.method !== "GET" || !response.ok) {
+      logger.debug("[SDK Html-cache] put skipped, invalid method or response", {
+        trace
+      });
+      return;
+    }
+    if (!this.isCacheable(request) || !this.isResponseCacheable(response)) {
+      logger.debug("[SDK Html-cache] put skipped, non-cacheable", { trace });
+      return;
+    }
+    try {
+      let lowercaseHeaders2 = function(headers2) {
+        const out = {};
+        headers2.forEach((value, key) => {
+          out[key.toLowerCase()] = value;
+        });
+        return out;
+      };
+      var lowercaseHeaders = lowercaseHeaders2;
+      const cacheKey = this.buildCacheKey(request);
+      const ttl = this.getTTLForRequest(request);
+      const swr = this.getSWRForRequest(request);
+      const body = await response.text();
+      const cacheTimeISO = (/* @__PURE__ */ new Date()).toISOString();
+      const headers = lowercaseHeaders2(response.headers);
+      const entry = {
+        status: response.status,
+        statusText: response.statusText,
+        headers,
+        body,
+        cacheTimeISO,
+        ttl,
+        swr,
+        etag: this.quoteETag(headers["etag"] || md5(body)),
+        lastModifiedUTC: headers["last-modified"] || new Date(cacheTimeISO).toUTCString()
+      };
+      const hardExpireSeconds = ttl + swr;
+      await this.backend.write(cacheKey, entry, hardExpireSeconds);
+      logger.debug("[SDK Html-cache] put done", { trace });
+    } catch (e) {
+      logger.warn("[SDK Html-cache] put failed", {
+        trace,
+        error: e instanceof Error ? e.message : String(e)
+      });
+    }
+  }
+  async delete(requestOrKey) {
+    try {
+      const key = typeof requestOrKey === "string" ? requestOrKey : this.buildCacheKey(requestOrKey);
+      if (this.backend.delete) {
+        await this.backend.delete(key);
+      }
+    } catch (e) {
+      logger.warn("[SDK Html-cache] delete failed", {
+        error: e instanceof Error ? e.message : String(e)
+      });
+    }
+  }
+  isReadCacheCandidate(request) {
+    const m = request.method.toUpperCase();
+    return (m === "GET" || m === "HEAD") && this.isCacheable(request);
+  }
+  isWriteCacheCandidate(request, response) {
+    if (request.method.toUpperCase() !== "GET") return false;
+    if (!this.isCacheable(request)) return false;
+    return this.isResponseCacheable(response);
+  }
+  createRevalidationRequest(request) {
+    const headers = new Headers(request.headers);
+    headers.set("X-Cache-Bypass", "revalidation");
+    headers.delete("If-None-Match");
+    headers.delete("If-Modified-Since");
+    headers.delete("Cache-Control");
+    headers.delete("Pragma");
+    return new Request(request.url, {
+      method: "GET",
+      headers
+    });
+  }
+  buildClientResponse(entry, isStale, age) {
+    const headers = new Headers(entry.headers);
+    headers.set("Cache-Control", "public, max-age=0, must-revalidate");
+    headers.set(
+      "Cloudflare-CDN-Cache-Control",
+      `public, s-maxage=${entry.ttl}, stale-while-revalidate=${entry.swr}, stale-if-error=60`
+    );
+    if (entry.lastModifiedUTC) {
+      headers.set("Last-Modified", entry.lastModifiedUTC);
+    }
+    if (entry.etag) {
+      headers.set("ETag", entry.etag);
+    }
+    headers.set("X-Cache-Status", isStale ? "STALE" : "HIT");
+    headers.set("X-Cache-Age", Math.floor(age).toString());
+    this.sanitizeClientHeaders(headers);
+    return new Response(entry.body, {
+      status: entry.status,
+      statusText: entry.statusText,
+      headers
+    });
+  }
+  buildCacheKey(request) {
+    const url = new URL(request.url);
+    const versionHash = this.generateVersionHash(request.headers);
+    const normalizedQuery = this.normalizeSearchParams(url.searchParams);
+    const cacheKeyPath = `${versionHash}${url.pathname}`;
+    const keyUrl = new URL(`${CACHE_KEY_ORIGIN}${cacheKeyPath}`);
+    if (normalizedQuery) {
+      keyUrl.search = `?${normalizedQuery}`;
+    }
+    return keyUrl.toString();
+  }
+  checkNotModified(ifModifiedSince, ifNoneMatch, lastModified, etag) {
+    if (this.ifNoneMatchMatches(ifNoneMatch, etag)) {
+      return true;
+    }
+    if (ifModifiedSince && lastModified) {
+      try {
+        const ifModDate = new Date(ifModifiedSince);
+        const lastModDate = new Date(lastModified);
+        if (isNaN(ifModDate.getTime()) || isNaN(lastModDate.getTime())) {
+          return false;
+        }
+        return ifModDate >= lastModDate;
+      } catch {
+        return false;
+      }
+    }
+    return false;
+  }
+  ifNoneMatchMatches(ifNoneMatch, etag) {
+    if (!ifNoneMatch || !etag) return false;
+    const header = ifNoneMatch.trim();
+    if (header === "*") return true;
+    const tokens = header.split(",").map((t) => t.trim());
+    const normalizedEtag = etag.replace(/^W\//, "");
+    for (const token of tokens) {
+      if (token === etag) return true;
+      const normalizedToken = token.replace(/^W\//, "");
+      if (normalizedToken === normalizedEtag) return true;
+    }
+    return false;
+  }
+  quoteETag(value) {
+    if (!value) return value;
+    if (value.startsWith('"') || value.startsWith('W/"')) return value;
+    if (value.startsWith("W/")) return `W/"${value.slice(2)}"`;
+    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");
+  }
+  generateVersionHash(headers) {
+    const swellData = this.extractSwellData(headers);
+    const acceptLang = headers.get("accept-language") || "";
+    const accept = headers.get("accept") || "";
+    const versionFactors = {
+      store: headers.get("swell-storefront-id") || "",
+      auth: headers.get("swell-access-token") || "",
+      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",
+      context: headers.get("swell-storefront-context"),
+      accept,
+      epoch: this.epoch
+    };
+    return md5(JSON.stringify(versionFactors));
+  }
+  extractSwellData(headers) {
+    const cookie = headers.get("cookie");
+    if (!cookie) return {};
+    const swellDataMatch = cookie.match(/swell-data=([^;]+)/);
+    if (!swellDataMatch) return {};
+    try {
+      return JSON.parse(decodeURIComponent(swellDataMatch[1])) || {};
+    } catch {
+      return {};
+    }
+  }
+  isCacheable(request) {
+    const url = new URL(request.url);
+    if (request.headers.get("swell-deployment-mode") === "editor") return false;
+    const skipPaths = ["/checkout"];
+    if (skipPaths.some((path) => url.pathname.startsWith(path))) 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;
+    if (response.headers.get("set-cookie")) return false;
+    const cacheControl = response.headers.get("cache-control");
+    if (cacheControl?.includes("no-store") || cacheControl?.includes("private"))
+      return false;
+    return true;
+  }
+  getDeploymentMode(headers) {
+    const mode = headers.get("swell-deployment-mode");
+    return mode === "preview" || mode === "editor" ? mode : "live";
+  }
+  getTTLForRequest(request) {
+    const url = new URL(request.url);
+    const mode = this.getDeploymentMode(request.headers);
+    if (mode === "editor") return 0;
+    const config = mode === "preview" ? TTL_CONFIG.PREVIEW : TTL_CONFIG.LIVE;
+    if (url.pathname === "/") return config.HOME;
+    if (url.pathname.startsWith("/products/")) return config.PRODUCT;
+    if (url.pathname.startsWith("/categories/")) return config.COLLECTION;
+    if (url.pathname.startsWith("/pages/")) return config.PAGE;
+    if (url.pathname.startsWith("/blogs/")) return config.BLOG;
+    return config.DEFAULT;
+  }
+  getSWRForRequest(request) {
+    const mode = this.getDeploymentMode(request.headers);
+    if (mode === "editor") return 0;
+    return mode === "preview" ? TTL_CONFIG.PREVIEW.SWR : TTL_CONFIG.LIVE.SWR;
+  }
+  getEntryAge(entry) {
+    const t = Date.parse(entry.cacheTimeISO);
+    if (Number.isNaN(t)) return Infinity;
+    const age = (Date.now() - t) / 1e3;
+    return age < 0 ? 0 : age;
+  }
+  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)}`
+        );
+      }
+    });
+    return relevantParams.sort().join("&");
+  }
+};
+
+// src/cache/html-cache/html-cache-kv.ts
+var KVCacheBackend = class {
+  kv;
+  prefix;
+  hashKeys;
+  maxValueBytes;
+  constructor(kv, opts = {}) {
+    this.kv = kv;
+    this.prefix = opts.prefix;
+    this.hashKeys = opts.hashKeys !== false;
+    this.maxValueBytes = opts.maxValueBytes ?? Math.floor(24.5 * 1024 * 1024);
+  }
+  async read(key) {
+    const kvKey = this.makeKey(key);
+    const value = await this.kv.get(kvKey, "json");
+    if (!value) return null;
+    const entry = {
+      status: value.status,
+      statusText: value.statusText,
+      headers: value.headers,
+      body: value.body,
+      cacheTimeISO: value.cacheTimeISO,
+      ttl: value.ttl,
+      swr: value.swr,
+      etag: value.etag,
+      lastModifiedUTC: value.lastModifiedUTC
+    };
+    return entry;
+  }
+  async write(key, entry, hardExpireSeconds) {
+    const kvKey = this.makeKey(key);
+    const payload = {
+      v: 1,
+      status: entry.status,
+      statusText: entry.statusText,
+      headers: entry.headers,
+      body: entry.body,
+      cacheTimeISO: entry.cacheTimeISO,
+      ttl: entry.ttl,
+      swr: entry.swr,
+      etag: entry.etag,
+      lastModifiedUTC: entry.lastModifiedUTC
+    };
+    const json = JSON.stringify(payload);
+    this.assertSize(json);
+    const metadata = {
+      v: 1,
+      cacheTimeISO: entry.cacheTimeISO,
+      ttl: entry.ttl,
+      swr: entry.swr,
+      etag: entry.etag,
+      lastModifiedUTC: entry.lastModifiedUTC
+    };
+    await this.kv.put(kvKey, json, {
+      expirationTtl: hardExpireSeconds + 60,
+      // natural hard expiry after SWR + grace period
+      metadata
+    });
+  }
+  async delete(key) {
+    const kvKey = this.makeKey(key);
+    await this.kv.delete(kvKey);
+  }
+  // ---- private helpers ----
+  makeKey(raw) {
+    const core = this.hashKeys ? md5(raw) : raw;
+    return this.prefix ? `${this.prefix}:${core}` : core;
+  }
+  assertSize(json) {
+    const bytes = typeof TextEncoder !== "undefined" ? new TextEncoder().encode(json).length : this.approxUtf8Bytes(json);
+    if (bytes > this.maxValueBytes) {
+      throw new Error(
+        `KV value too large: ${bytes} bytes exceeds limit ${this.maxValueBytes} bytes`
+      );
+    }
+  }
+  approxUtf8Bytes(str) {
+    let count = 0;
+    for (let i = 0; i < str.length; i++) {
+      const code = str.charCodeAt(i);
+      if (code <= 127) count += 1;
+      else if (code <= 2047) count += 2;
+      else count += 3;
+    }
+    return count;
+  }
+};
+
+// src/cache/html-cache/html-cache-worker.ts
+var CACHE_NAME_PREFIX = "swell-html-v0";
+var WorkerCacheBackend = class {
+  cacheName;
+  constructor(epoch) {
+    this.cacheName = CACHE_NAME_PREFIX + epoch;
+  }
+  async read(key) {
+    const cache = await caches.open(this.cacheName);
+    const request = new Request(key);
+    const response = await cache.match(request);
+    if (!response) return null;
+    const headers = {};
+    response.headers.forEach((value, name) => {
+      headers[name.toLowerCase()] = value;
+    });
+    return {
+      status: response.status,
+      statusText: response.statusText,
+      headers,
+      body: await response.text(),
+      cacheTimeISO: response.headers.get("x-cache-time") || (/* @__PURE__ */ new Date(0)).toISOString(),
+      ttl: parseInt(response.headers.get("x-original-ttl") || "0", 10),
+      swr: parseInt(response.headers.get("x-original-swr") || "0", 10),
+      etag: response.headers.get("etag") || void 0,
+      lastModifiedUTC: response.headers.get("last-modified") || void 0
+    };
+  }
+  async write(key, entry, _hardExpireSeconds) {
+    const cache = await caches.open(this.cacheName);
+    const request = new Request(key);
+    const headers = new Headers(entry.headers);
+    if (entry.lastModifiedUTC && !headers.get("Last-Modified")) {
+      headers.set("Last-Modified", entry.lastModifiedUTC);
+    }
+    if (entry.etag && !headers.get("ETag")) {
+      headers.set("ETag", entry.etag);
+    }
+    headers.set("X-Cache-Time", entry.cacheTimeISO);
+    headers.set("X-Original-TTL", String(entry.ttl));
+    headers.set("X-Original-SWR", String(entry.swr));
+    headers.delete("content-encoding");
+    headers.delete("content-length");
+    const existing = headers.get("Cache-Control");
+    if (!existing || existing.trim().toLowerCase() === "public") {
+      headers.set("Cache-Control", `public, max-age=${entry.ttl + entry.swr}`);
+    }
+    const response = new Response(entry.body, {
+      status: entry.status,
+      statusText: entry.statusText,
+      headers
+    });
+    await cache.delete(request);
+    await cache.put(request, response);
+  }
+  async delete(key) {
+    const cache = await caches.open(this.cacheName);
+    const request = new Request(key);
+    await cache.delete(request);
+  }
+};
+
+// src/cache/html-cache/html-cache-factory.ts
+var _instance = null;
+function getHtmlCache(env) {
+  const epoch = env?.HTML_CACHE_EPOCH;
+  if (typeof epoch !== "string" || !epoch) return null;
+  if (_instance) return _instance;
+  const kv = env?.NAMESPACE;
+  if (env?.HTML_CACHE_BACKEND !== "worker" && kv) {
+    _instance = new HtmlCache(epoch, new KVCacheBackend(kv));
+    return _instance;
+  }
+  _instance = new HtmlCache(epoch, new WorkerCacheBackend(epoch));
+  return _instance;
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   AccountAddressesResource,
@@ -22856,6 +23018,7 @@ function getResourceQuery(slug, query) {
   DeferredShopifyResource,
   FILE_DATA_INCLUDE_QUERY,
   GEO_DATA,
+  HtmlCache,
   LANG_TO_COUNTRY_CODES,
   LiquidSwell,
   MAX_QUERY_PAGE_LIMIT,
@@ -22903,7 +23066,6 @@ function getResourceQuery(slug, query) {
   ThemeForm,
   ThemeFormErrors,
   VariantResource,
-  WorkerHtmlCache,
   adaptShopifyFontData,
   adaptShopifyFormData,
   adaptShopifyMenuData,
@@ -22931,6 +23093,7 @@ function getResourceQuery(slug, query) {
   getEasyblocksComponentDefinitions,
   getEasyblocksPagePropsWithConfigs,
   getEasyblocksPageTemplate,
+  getHtmlCache,
   getKVFlavor,
   getLayoutSectionGroups,
   getMenuItemStorefrontUrl,