@decocms/blocks 7.62.1 → 7.62.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@decocms/blocks",
-  "version": "7.62.1",
+  "version": "7.62.3",
   "type": "module",
   "engines": {
     "node": ">=24"

package/src/cms/resolve.test.ts

@@ -239,6 +239,50 @@ describe("commerce loader auto-injects URL search params as props", () => {
     });
   });
 
+  it("strips tracking params from __pageUrl and never injects them as props", async () => {
+    const calls: Array<Record<string, unknown>> = [];
+    registerCommerceLoader(KEY, async (props: Record<string, unknown>) => {
+      calls.push({ ...props });
+      return null;
+    });
+
+    await resolveValue({ __resolveType: KEY, slug: "sabonete" }, undefined, {
+      url: "https://store.com/produto/sabonete/p?skuId=12345&utm_source=google&gclid=abc&srsltid=xyz",
+      path: "/produto/sabonete/p",
+    });
+
+    expect(calls[0]).toMatchObject({
+      slug: "sabonete",
+      skuId: "12345",
+      __pageUrl: "https://store.com/produto/sabonete/p?skuId=12345",
+    });
+    expect(calls[0]).not.toHaveProperty("utm_source");
+    expect(calls[0]).not.toHaveProperty("gclid");
+    expect(calls[0]).not.toHaveProperty("srsltid");
+  });
+
+  // The point of the strip: `createCachedLoader`'s default keyFn is
+  // JSON.stringify(props), so identical props mean a shared cache entry. A
+  // campaign tail used to mint a fresh one on every paid landing.
+  it("gives a paid-traffic landing the same props as the clean URL", async () => {
+    const calls: Array<Record<string, unknown>> = [];
+    registerCommerceLoader(KEY, async (props: Record<string, unknown>) => {
+      calls.push({ ...props });
+      return null;
+    });
+
+    const at = (url: string) =>
+      resolveValue({ __resolveType: KEY, slug: "sabonete" }, undefined, {
+        url,
+        path: "/produto/sabonete/p",
+      });
+
+    await at("https://store.com/produto/sabonete/p");
+    await at("https://store.com/produto/sabonete/p?utm_source=google&gclid=abc&fbclid=d");
+
+    expect(JSON.stringify(calls[1])).toBe(JSON.stringify(calls[0]));
+  });
+
   it("does NOT override a CMS-configured prop with a URL param of the same name", async () => {
     const calls: Array<Record<string, unknown>> = [];
     registerCommerceLoader(KEY, async (props: Record<string, unknown>) => {

package/src/cms/resolve.ts

@@ -5,6 +5,7 @@ import { stickyDecide } from "../sdk/experiments";
 import { parseSegmentCookie, SEGMENT_COOKIE, type StoredFlag, trafficToPct } from "../sdk/flags";
 import { withInflightTimeout } from "../sdk/inflightTimeout";
 import { normalizeUrlsInObject } from "../sdk/normalizeUrls";
+import { stripTrackingParams } from "../sdk/urlUtils";
 import { findPageByPath, loadBlocks } from "./loader";
 import { getOnBeforeResolveProps, getSection, registerOnBeforeResolveProps } from "./registry";
 import {
@@ -956,21 +957,35 @@ async function internalResolve(value: unknown, rctx: ResolveContext): Promise<un
       resolvedProps.__pagePath = rctx.matcherCtx.path;
     }
     if (rctx.matcherCtx.url) {
-      resolvedProps.__pageUrl = rctx.matcherCtx.url;
+      // Strip tracking params before anything here reaches props.
+      //
+      // The comment this replaces claimed the enrichment was "safe re: cache
+      // fragmentation" because commerce loaders run without a framework-level
+      // cache. That was wrong — `getCommerceLoader()` returns the
+      // `createCachedLoader`-wrapped functions, whose default keyFn hashes
+      // exactly these props — so a `?utm_source`/`gclid`/`srsltid` minted a
+      // fresh cache entry and made every paid-traffic landing a permanent cold
+      // miss. Measured on a production storefront: 0.2–1.5% hit rate on the
+      // default keyFn vs 73.5% on a loader that hand-rolled a key excluding it.
+      //
+      // Stripping here rather than in the keyFn covers `__pageUrl` and the
+      // param spread below in one place, and matches how the edge cache key is
+      // already normalized in workerEntry. No loader reads tracking params.
+      //
+      // Deliberately does NOT drop `__pageUrl`/`__pagePath` themselves: on a
+      // PDP the path IS the product identity (the CMS block leaves `slug`
+      // null) and on a PLP the query carries the facets. Dropping them would
+      // merge distinct results onto one entry and serve wrong content.
+      const pageUrl = stripTrackingParams(rctx.matcherCtx.url);
+      resolvedProps.__pageUrl = pageUrl;
       // Auto-inject URL search params as top-level props so loaders that
       // expect `props.skuId` / `props.q` / `props.page` (the apps-start
       // canonical shape) get them populated on direct entry (Google
       // Shopping deep links, paid ads, email campaigns). Existing values
       // from the CMS block win — URL params are a fallback, not an
       // override.
-      //
-      // Safe re: cache fragmentation: commerce loaders run through this
-      // path without a framework-level cache (the section/page cache
-      // layer hashes section.props BEFORE this enrichment in
-      // sectionLoaders.ts), so adding query params here does not
-      // fragment any cache key.
-      if (URL.canParse(rctx.matcherCtx.url)) {
-        const url = new URL(rctx.matcherCtx.url);
+      if (URL.canParse(pageUrl)) {
+        const url = new URL(pageUrl);
         for (const [k, v] of url.searchParams.entries()) {
           if (resolvedProps[k] !== undefined) continue;
           // `page` is skipped on purpose (#391): loaders that read `page`
@@ -994,7 +1009,7 @@ async function internalResolve(value: unknown, rctx: ResolveContext): Promise<un
         // upstream is wrong — surface it so the caller can fix it.
         console.warn(
           `[CMS] malformed matcherCtx.url for "${resolveType}"; ` +
-            `skipping query-param injection: ${rctx.matcherCtx.url}`,
+            `skipping query-param injection: ${pageUrl}`,
         );
       }
     }

package/src/sdk/cacheHeaders.test.ts

@@ -88,6 +88,35 @@ describe("canonicalizeServerFnPayloadForCacheKey — variant-param cache key", (
     expect(a).toBe(b);
   });
 
+  it("strips tracking params — paid traffic shares the canonical entry", () => {
+    const paid = canonicalizeServerFnPayloadForCacheKey(
+      envelope("/aneis?filter.color=ouro&utm_source=google&gclid=abc&srsltid=xyz"),
+    );
+    const canonical = canonicalizeServerFnPayloadForCacheKey(
+      envelope("/aneis?filter.color=ouro"),
+    );
+    expect(paid).toBe(canonical);
+  });
+
+  it("canonicalizes absolute URLs too, not just paths", () => {
+    // Sites embed one in the payload (the deferred-section `pageUrl` is built
+    // with `new URL(...)`), and the old guard skipped anything not starting
+    // with "/" — so not even skuId was stripped there.
+    const messy = canonicalizeServerFnPayloadForCacheKey(
+      envelope("https://store.com/mala-preta/p?skuId=148940&utm_source=ads"),
+    );
+    const canonical = canonicalizeServerFnPayloadForCacheKey(
+      envelope("https://store.com/mala-preta/p"),
+    );
+    expect(messy).toBe(canonical);
+  });
+
+  it("leaves non-URL strings alone", () => {
+    const a = canonicalizeServerFnPayloadForCacheKey(envelope("mala preta ?utm_source=x"));
+    expect(a).toBe(canonicalizeServerFnPayloadForCacheKey(envelope("mala preta ?utm_source=x")));
+    expect(a).toContain("utm_source");
+  });
+
   it("keeps PLP filter/search params (they DO change the response)", () => {
     const filtered = canonicalizeServerFnPayloadForCacheKey(
       envelope("/c/shoes?filter.size=40"),

package/src/sdk/cacheHeaders.ts

@@ -17,6 +17,8 @@
  * ```
  */
 
+import { isTrackingParam } from "./urlUtils";
+
 // ---------------------------------------------------------------------------
 // Types
 // ---------------------------------------------------------------------------
@@ -520,9 +522,11 @@ export const DEFAULT_SERVERFN_CACHE_IGNORE_PARAMS = ["skuId", "idsku"];
 /**
  * Canonicalize a TanStack GET server-fn `payload` for use in the edge cache
  * key: re-serialize it (so equivalent requests always produce byte-identical
- * keys) and strip the given cache-irrelevant search params from any embedded
- * route path. This makes `/product/p?skuId=148940` and `/product/p` share one
- * cache entry, since `loadCmsPage` resolves both to the same page.
+ * keys) and strip the cache-irrelevant search params — `ignoreParams` plus every
+ * known tracking param — from any embedded route path or absolute URL. This
+ * makes `/product/p?skuId=148940`, `/product/p?utm_source=ads` and `/product/p`
+ * share one cache entry, since `loadCmsPage` resolves all three to the same
+ * page.
  *
  * Returns the original payload unchanged on any parse failure (fail-safe: the
  * caller keeps the raw payload, never worse than before).
@@ -532,13 +536,34 @@ export function canonicalizeServerFnPayloadForCacheKey(
   ignoreParams: string[] = DEFAULT_SERVERFN_CACHE_IGNORE_PARAMS,
 ): string {
   try {
+    const drop = (sp: URLSearchParams): void => {
+      for (const p of ignoreParams) sp.delete(p);
+      // Tracking params never change what the server fn resolves, but they DO
+      // change this key — so a shopper arriving from paid media mints a brand
+      // new entry on every SPA interaction. Measured on a production
+      // storefront: `/_serverFn/:id` at 84% MISS, 1401ms average.
+      for (const k of [...sp.keys()]) if (isTrackingParam(k)) sp.delete(k);
+    };
     const stripQuery = (s: string): string => {
+      // Absolute URL: sites embed one in the payload (the deferred-section
+      // `pageUrl` is built with `new URL(...)`), and it fragments the key
+      // exactly like a relative path does — but the guard below skipped it, so
+      // not even `skuId` was canonicalized there.
+      if (/^https?:\/\//i.test(s)) {
+        try {
+          const u = new URL(s);
+          drop(u.searchParams);
+          return u.toString();
+        } catch {
+          return s;
+        }
+      }
       if (!s.startsWith("/") || s.startsWith("//")) return s;
       const qIdx = s.indexOf("?");
       if (qIdx < 0) return s;
       const path = s.slice(0, qIdx);
       const sp = new URLSearchParams(s.slice(qIdx + 1));
-      for (const p of ignoreParams) sp.delete(p);
+      drop(sp);
       const rest = sp.toString();
       return rest ? `${path}?${rest}` : path;
     };

package/src/sdk/urlUtils.ts

@@ -44,6 +44,17 @@ export function registerTrackingParams(params: string[]): void {
   }
 }
 
+/**
+ * Whether a search param is a known tracking/attribution param.
+ *
+ * Exposed so cache-key builders can filter params in place without having to
+ * round-trip through a `URL` (server-fn payloads carry bare relative paths) and
+ * without keeping a second copy of the list.
+ */
+export function isTrackingParam(param: string): boolean {
+  return UTM_PARAMS.has(param.toLowerCase());
+}
+
 /**
  * Strip UTM and tracking parameters from a URL.
  *