@decocms/blocks 7.21.1 → 7.22.1

package/package.json

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

package/src/cms/resolve.test.ts

@@ -308,6 +308,37 @@ describe("commerce loader auto-injects URL search params as props", () => {
       warnSpy.mockRestore();
     }
   });
+
+  it("never auto-injects `page` — loaders that read __pageUrl apply their own index-base conversion (#391)", async () => {
+    const calls: Array<Record<string, unknown>> = [];
+    registerCommerceLoader(KEY, async (props: Record<string, unknown>) => {
+      calls.push({ ...props });
+      return null;
+    });
+
+    await resolveValue({ __resolveType: KEY }, undefined, {
+      url: "https://store.com/?page=3",
+      path: "/",
+    });
+
+    expect(calls[0]?.page).toBeUndefined();
+  });
+
+  it("coerces `count`/`pageOffset` to numbers instead of injecting raw strings", async () => {
+    const calls: Array<Record<string, unknown>> = [];
+    registerCommerceLoader(KEY, async (props: Record<string, unknown>) => {
+      calls.push({ ...props });
+      return null;
+    });
+
+    await resolveValue({ __resolveType: KEY }, undefined, {
+      url: "https://store.com/?count=24&pageOffset=2",
+      path: "/",
+    });
+
+    expect(calls[0]?.count).toBe(24);
+    expect(calls[0]?.pageOffset).toBe(2);
+  });
 });
 
 describe("commerce loader resolves legacy .ts-suffixed resolveType", () => {

package/src/cms/resolve.ts

@@ -880,7 +880,20 @@ async function internalResolve(value: unknown, rctx: ResolveContext): Promise<un
       if (URL.canParse(rctx.matcherCtx.url)) {
         const url = new URL(rctx.matcherCtx.url);
         for (const [k, v] of url.searchParams.entries()) {
-          if (resolvedProps[k] === undefined) resolvedProps[k] = v;
+          if (resolvedProps[k] !== undefined) continue;
+          // `page` is skipped on purpose (#391): loaders that read `page`
+          // from `__pageUrl` themselves (e.g. VTEX's PLP loader) apply their
+          // own 1-indexed-URL -> 0-indexed-internal conversion. Auto-injecting
+          // the raw 1-indexed URL string here as `props.page` bypasses that
+          // conversion and produces an off-by-one, on top of arriving as an
+          // un-coerced string. Numeric conventional names get coerced so a
+          // loader declaring `count?: number` doesn't receive a raw string.
+          if (k === "page") continue;
+          if ((k === "count" || k === "pageOffset") && Number.isFinite(Number(v))) {
+            resolvedProps[k] = Number(v);
+            continue;
+          }
+          resolvedProps[k] = v;
         }
       } else {
         // Loud warning instead of silent swallow: matcherCtx.url should