@akinon/next 2.0.23-beta.0 → 2.0.23

package/CHANGELOG.md

@@ -1,10 +1,19 @@
 # @akinon/next
 
-## 2.0.23-beta.0
+## 2.0.23
 
 ### Patch Changes
 
-- cbbbfd75: ZERO-4376: Bootstrap beta cycle (next-main pre-release motor)
+- 079fc67: ZERO-4522: Normalize searchParams at the entry of server data functions so v2 brand SSR no longer drops query params and no longer collides on a single Redis cache entry.
+
+  `withSegmentDefaults` converts Next 16's plain searchParams into a `URLSearchParams` instance for v1 brand compatibility. The instance then flowed into `getProductData` / `getCategoryData` / `getListData` / `getSpecialPageData` and broke two things:
+
+  - `JSON.stringify(new URLSearchParams(...))` returns `"{}"`, so every cache key for the same `pk` collapsed onto one Redis entry. The first user's filtered/variant response was served to every subsequent visitor.
+  - `getProductData`'s outbound URL builder used `Object.keys(searchParams).map(...)`, which returns `[]` for `URLSearchParams`. The backend product fetch silently dropped every query param — variant/attribute selections on the PDP never reached the commerce backend, and the add-to-cart button stayed stuck in its loading state.
+
+  Add `normalizeSearchParams` (`packages/akinon-next/utils/normalize-search-params.ts`) and call it once at the entry of each public data function. Multi-value URLSearchParams keys (`?color=red&color=blue`) collapse to `string[]` so multi-select filters survive. v1 brand pages keep receiving `URLSearchParams` from the HOC — only the internal data layer canonicalizes. No public signature change.
+
+  Side note: v1 brand PDP requests will now actually forward `?` params to the commerce backend instead of silently dropping them. Any v1 brand that relied on PDP requests ignoring query strings should smoke-test variant fetches.
 
 ## 2.0.22
 

package/data/server/category.ts

@@ -1,5 +1,6 @@
 import { GetCategoryResponse, SearchParams } from '../../types';
 import { generateCommerceSearchParams } from '../../utils';
+import { normalizeSearchParams } from '../../utils/normalize-search-params';
 import appFetch, { FetchResponseType } from '../../utils/app-fetch';
 import { category, product } from '../urls';
 import { Cache, CacheKey } from '../../lib/cache';
@@ -93,6 +94,8 @@ export const getCategoryData = ({
   searchParams?: SearchParams;
   headers?: Record<string, string>;
 }) => {
+  searchParams = normalizeSearchParams(searchParams);
+
   return Cache.wrap(
     CacheKey.Category(pk, searchParams, headers),
     locale,

package/data/server/list.ts

@@ -2,6 +2,7 @@ import { Cache, CacheKey } from '../../lib/cache';
 import { category } from '../urls';
 import { GetCategoryResponse, SearchParams } from '../../types';
 import { generateCommerceSearchParams } from '../../utils';
+import { normalizeSearchParams } from '../../utils/normalize-search-params';
 import appFetch, { FetchResponseType } from '../../utils/app-fetch';
 import { parse } from 'lossless-json';
 import logger from '../../utils/log';
@@ -66,6 +67,8 @@ export const getListData = async ({
   searchParams: SearchParams;
   headers?: Record<string, string>;
 }) => {
+  searchParams = normalizeSearchParams(searchParams);
+
   return Cache.wrap(
     CacheKey.List(searchParams, headers),
     locale,

package/data/server/product.ts

@@ -2,6 +2,7 @@ import { Cache, CacheKey } from '../../lib/cache';
 import { product } from '../urls';
 import { ProductCategoryResult, ProductResult, SearchParams } from '../../types';
 import appFetch from '../../utils/app-fetch';
+import { normalizeSearchParams } from '../../utils/normalize-search-params';
 import { ServerVariables } from '../../utils/server-variables';
 import logger from '../../utils/log';
 
@@ -133,13 +134,15 @@ export const getProductData = async ({
   groupProduct,
   headers
 }: GetProduct) => {
+  searchParams = normalizeSearchParams(searchParams);
+
   // Convert pk to number for cache key if it's a string
   const numericPkForCache = typeof pk === 'string' ? parseInt(pk, 10) : pk;
 
   const result = await Cache.wrap(
     CacheKey[groupProduct ? 'GroupProduct' : 'Product'](
       numericPkForCache,
-      searchParams ?? new URLSearchParams()
+      searchParams ?? {}
     ),
     locale,
     getProductDataHandler({

package/data/server/special-page.ts

@@ -2,6 +2,7 @@ import { Cache, CacheKey } from '../../lib/cache';
 import { category } from '../urls';
 import { GetCategoryResponse, SearchParams } from '../../types';
 import { generateCommerceSearchParams } from '../../utils';
+import { normalizeSearchParams } from '../../utils/normalize-search-params';
 import appFetch from '../../utils/app-fetch';
 import { ServerVariables } from '../../utils/server-variables';
 
@@ -45,6 +46,8 @@ export const getSpecialPageData = async ({
   searchParams: SearchParams;
   headers?: Record<string, string>;
 }) => {
+  searchParams = normalizeSearchParams(searchParams);
+
   return Cache.wrap(
     CacheKey.SpecialPage(pk, searchParams, headers),
     locale,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@akinon/next",
   "description": "Core package for Project Zero Next",
-  "version": "2.0.23-beta.0",
+  "version": "2.0.23",
   "private": false,
   "license": "MIT",
   "bin": {
@@ -36,7 +36,7 @@
     "set-cookie-parser": "2.6.0"
   },
   "devDependencies": {
-    "@akinon/eslint-plugin-projectzero": "2.0.23-beta.0",
+    "@akinon/eslint-plugin-projectzero": "2.0.23",
     "@babel/core": "7.26.10",
     "@babel/preset-env": "7.26.9",
     "@babel/preset-typescript": "7.27.0",

package/utils/index.ts

@@ -6,6 +6,7 @@ import getRootHostname from './get-root-hostname';
 export * from './get-currency';
 export * from './menu-generator';
 export * from './generate-commerce-search-params';
+export * from './normalize-search-params';
 export * from './get-currency-label';
 export * from './pz-segments';
 export * from './get-checkout-path';

package/utils/normalize-search-params.ts

@@ -0,0 +1,42 @@
+import { SearchParams } from '../types';
+
+/**
+ * Normalize SearchParams to a plain Record<string, string | string[]>.
+ *
+ * Accepts either a URLSearchParams instance (Next 16 HOC output / v2 brands)
+ * or a plain Record (v1 brands / direct callers) and always returns a plain
+ * object. Downstream code can then safely:
+ *   - JSON.stringify it for stable cache keys (avoids the URLSearchParams
+ *     `JSON.stringify === "{}"` cache collision)
+ *   - iterate with Object.keys / Object.entries (avoids the dropped query
+ *     param bug on the PDP outbound URL builder)
+ *   - spread with { ...obj }
+ *
+ * Repeated keys in URLSearchParams (e.g. ?color=red&color=blue) collapse to
+ * a string[] value so multi-value filter semantics survive.
+ *
+ * Returns undefined when the input is undefined so downstream
+ * `if (searchParams)` guards keep working unchanged.
+ */
+export const normalizeSearchParams = (
+  searchParams?: SearchParams
+): Record<string, string | string[]> | undefined => {
+  if (!searchParams) return undefined;
+
+  if (searchParams instanceof URLSearchParams) {
+    const out: Record<string, string | string[]> = {};
+    for (const key of new Set(searchParams.keys())) {
+      const all = searchParams.getAll(key);
+      out[key] = all.length > 1 ? all : all[0];
+    }
+    return out;
+  }
+
+  // Plain object — drop undefined values so cache key serialization is stable
+  // across calls that omit some keys.
+  const out: Record<string, string | string[]> = {};
+  for (const [key, value] of Object.entries(searchParams)) {
+    if (value !== undefined) out[key] = value;
+  }
+  return out;
+};