@akinon/next 1.126.0-rc.3 → 1.126.0

package/CHANGELOG.md

@@ -1,40 +1,14 @@
 # @akinon/next
 
-## 1.126.0-rc.3
+## 1.126.0
 
-### Minor Changes
-
-- 324f97d5: ZERO-4219: replace masterpass-rest-complete with masterpass-rest-callback
-- 4ac7b2a1: ZERO-4219: fix masterpass-rest callback route format and double-encoded error cookie
-
-## 1.126.0-rc.2
-
-### Minor Changes
-
-- 4998a963: ZERO-4168: Add server-side payload optimization
+## 1.125.2
 
-## 1.126.0-rc.1
+## 1.125.1
 
-### Minor Changes
-
-- 0cf9ea23: BRDG-16491: Prevent redirect when iframe payment is active
-
-## 1.126.0-rc.0
-
-### Minor Changes
+### Patch Changes
 
-- ZERO-4160: Enhance oauth-login middleware with improved request handling and logging
-- b55acb76: ZERO-2577: Fix pagination bug and update usePagination hook and ensure pagination controls rendering correctly
-- 760258c1: ZERO-4160: Enhance oauth-login middleware to handle fetch errors and improve response handling
-- 143be2b9: ZERO-3457: Crop styles are customizable and logic improved for rendering similar products modal
-- 9f8cd3bc: ZERO-3449: AI Search Active Filters & Crop Style changes have been implemented
-- bfafa3f4: ZERO-4160: Refactor oauth-login middleware to use fetchCommerce for API calls and improve cookie handling
-- d99a6a7d: ZERO-3457_1: Fixed the settings prop and made sure everything is customizable.
-- 591e345e: ZERO-3855: Enhance credit card payment handling in checkout middlewares
-- 4de5303c: ZERO-2504: add cookie filter to api client request
-- 95b139dc: ZERO-3795: Remove duplicate entry for SavedCard in PluginComponents map
-- 3909d322: Edit the duplicate Plugin.SimilarProducts in the plugin-module.
-- e18836b2: ZERO-4160: Restore scope in Sentry addon configuration in akinon.json
+- 06da9a95: ZERO-4241: Upgrade Next.js from 14.2.25 to 14.2.35 to fix security vulnerabilities (CVE-2025-55184, CVE-2025-67779)
 
 ## 1.125.0
 

package/components/plugin-module.tsx

@@ -114,6 +114,7 @@ const PluginComponents = new Map([
     ]
   ],
   [Plugin.SavedCard, [Component.SavedCard, Component.IyzicoSavedCard]],
+  [Plugin.SavedCard, [Component.SavedCard]],
   [Plugin.FlowPayment, [Component.FlowPayment]],
   [
     Plugin.VirtualTryOn,

package/data/server/category.ts

@@ -7,8 +7,6 @@ import { parse } from 'lossless-json';
 import logger from '../../utils/log';
 import { headers as nHeaders } from 'next/headers';
 import { ServerVariables } from '../../utils/server-variables';
-import { optimizeCategoryResponse } from '../../utils/payload-optimizer';
-import settings from 'settings';
 
 function getCategoryDataHandler(
   pk: number,
@@ -82,7 +80,7 @@ function getCategoryDataHandler(
   };
 }
 
-export const getCategoryData = async ({
+export const getCategoryData = ({
   pk,
   searchParams,
   headers,
@@ -95,7 +93,7 @@ export const getCategoryData = async ({
   searchParams?: URLSearchParams;
   headers?: Record<string, string>;
 }) => {
-  const result = await Cache.wrap(
+  return Cache.wrap(
     CacheKey.Category(pk, searchParams, headers),
     locale,
     getCategoryDataHandler(pk, locale, currency, searchParams, headers),
@@ -104,16 +102,6 @@ export const getCategoryData = async ({
       compressed: true
     }
   );
-
-  if (settings.payloadOptimization?.enabled && result?.data) {
-    try {
-      return { ...result, data: optimizeCategoryResponse(result.data, settings.payloadOptimization) };
-    } catch (e) {
-      logger.error('Payload optimization failed for category', { pk, error: (e as Error).message });
-    }
-  }
-
-  return result;
 };
 
 function getCategoryBySlugDataHandler(

package/data/server/list.ts

@@ -6,8 +6,6 @@ import appFetch, { FetchResponseType } from '../../utils/app-fetch';
 import { parse } from 'lossless-json';
 import logger from '../../utils/log';
 import { ServerVariables } from '../../utils/server-variables';
-import { optimizeCategoryResponse } from '../../utils/payload-optimizer';
-import settings from 'settings';
 
 const getListDataHandler = (
   locale,
@@ -68,7 +66,7 @@ export const getListData = async ({
   searchParams: URLSearchParams;
   headers?: Record<string, string>;
 }) => {
-  const result = await Cache.wrap(
+  return Cache.wrap(
     CacheKey.List(searchParams, headers),
     locale,
     getListDataHandler(locale, currency, searchParams, headers),
@@ -77,14 +75,4 @@ export const getListData = async ({
       compressed: true
     }
   );
-
-  if (settings.payloadOptimization?.enabled && result) {
-    try {
-      return optimizeCategoryResponse(result, settings.payloadOptimization);
-    } catch (e) {
-      logger.error('Payload optimization failed for list', { error: (e as Error).message });
-    }
-  }
-
-  return result;
 };

package/data/server/product.ts

@@ -4,8 +4,6 @@ import { ProductCategoryResult, ProductResult } from '../../types';
 import appFetch from '../../utils/app-fetch';
 import { ServerVariables } from '../../utils/server-variables';
 import logger from '../../utils/log';
-import { optimizeProductResponse } from '../../utils/payload-optimizer';
-import settings from 'settings';
 
 type GetProduct = {
   pk: number | string;
@@ -165,13 +163,5 @@ export const getProductData = async ({
     throw error;
   }
 
-  if (settings.payloadOptimization?.enabled && result?.data) {
-    try {
-      return { ...result, data: optimizeProductResponse(result.data, settings.payloadOptimization) };
-    } catch (e) {
-      logger.error('Payload optimization failed for product', { pk, error: (e as Error).message });
-    }
-  }
-
   return result;
 };

package/data/server/special-page.ts

@@ -4,9 +4,6 @@ import { GetCategoryResponse } from '../../types';
 import { generateCommerceSearchParams } from '../../utils';
 import appFetch from '../../utils/app-fetch';
 import { ServerVariables } from '../../utils/server-variables';
-import { optimizeCategoryResponse } from '../../utils/payload-optimizer';
-import logger from '../../utils/log';
-import settings from 'settings';
 
 const getSpecialPageDataHandler = (
   pk: number,
@@ -48,7 +45,7 @@ export const getSpecialPageData = async ({
   searchParams: URLSearchParams;
   headers?: Record<string, string>;
 }) => {
-  const result = await Cache.wrap(
+  return Cache.wrap(
     CacheKey.SpecialPage(pk, searchParams, headers),
     locale,
     getSpecialPageDataHandler(pk, locale, currency, searchParams, headers),
@@ -57,14 +54,4 @@ export const getSpecialPageData = async ({
       compressed: true
     }
   );
-
-  if (settings.payloadOptimization?.enabled && result) {
-    try {
-      return optimizeCategoryResponse(result, settings.payloadOptimization);
-    } catch (e) {
-      logger.error('Payload optimization failed for special-page', { pk, error: (e as Error).message });
-    }
-  }
-
-  return result;
 };

package/data/server/widget.ts

@@ -4,9 +4,6 @@ import { CacheOptions, WidgetResultType } from '../../types';
 import appFetch from '../../utils/app-fetch';
 import { widgets } from '../urls';
 import { ServerVariables } from '../../utils/server-variables';
-import { optimizeWidgetResponse } from '../../utils/payload-optimizer';
-import logger from '../../utils/log';
-import settings from 'settings';
 
 const getWidgetDataHandler =
   (
@@ -43,7 +40,7 @@ export const getWidgetData = async <T>({
   cacheOptions?: CacheOptions;
   headers?: Record<string, string>;
 }): Promise<WidgetResultType<T>> => {
-  const result = await Cache.wrap(
+  return Cache.wrap(
     CacheKey.Widget(slug),
     locale,
     getWidgetDataHandler(slug, locale, currency, headers),
@@ -52,14 +49,4 @@ export const getWidgetData = async <T>({
       ...cacheOptions
     }
   );
-
-  if (settings.payloadOptimization?.enabled && result) {
-    try {
-      return optimizeWidgetResponse(result, settings.payloadOptimization) as WidgetResultType<T>;
-    } catch (e) {
-      logger.error('Payload optimization failed for widget', { slug, error: (e as Error).message });
-    }
-  }
-
-  return result as WidgetResultType<T>;
 };

package/data/urls.ts

@@ -183,11 +183,7 @@ export const product = {
   breadcrumbUrl: (menuitemmodel: string) =>
     `/menus/generate_breadcrumb/?item=${menuitemmodel}&generator_name=menu_item`,
   bundleProduct: (productPk: string, queryString: string) =>
-    `/bundle-product/${productPk}/?${queryString}`,
-  similarProducts: (params?: string) =>
-    `/similar-products${params ? `?${params}` : ''}`,
-  similarProductsList: (params?: string) =>
-    `/similar-product-list${params ? `?${params}` : ''}`
+    `/bundle-product/${productPk}/?${queryString}`
 };
 
 export const wishlist = {

package/middlewares/masterpass-rest-callback.ts

@@ -10,23 +10,49 @@ const withMasterpassRestCallback =
   async (req: PzNextRequest, event: NextFetchEvent) => {
     const url = req.nextUrl.clone();
     const ip = req.headers.get('x-forwarded-for') ?? '';
+    const sessionId = req.cookies.get('osessionid');
 
-    const isMasterpassCompletePage =
-      url.pathname.includes('/orders/checkout') &&
-      url.searchParams.get('page') === 'MasterpassRestCompletePage';
-
-    if (!isMasterpassCompletePage) {
+    if (!url.pathname.includes('/orders/masterpass-rest-callback')) {
       return middleware(req, event);
     }
 
-    try {
-      const isPostCheckout = req.cookies.get('pz-post-checkout-flow')?.value === 'true';
-      const requestUrl = new URL(getCheckoutPath(isPostCheckout), Settings.commerceUrl);
+    if (req.method !== 'POST') {
+      logger.warn('Invalid request method for masterpass REST callback', {
+        middleware: 'masterpass-rest-callback',
+        method: req.method,
+        ip
+      });
+
+      return NextResponse.redirect(
+        `${url.origin}${getUrlPathWithLocale(
+          '/orders/checkout/',
+          req.cookies.get('pz-locale')?.value
+        )}`,
+        303
+      );
+    }
 
-      url.searchParams.forEach((value, key) => {
-        requestUrl.searchParams.set(key, value);
+    const responseCode = url.searchParams.get('responseCode');
+    const token = url.searchParams.get('token');
+
+    if (!responseCode || !token) {
+      logger.warn('Missing required parameters for masterpass REST callback', {
+        middleware: 'masterpass-rest-callback',
+        responseCode,
+        token,
+        ip
       });
 
+      return NextResponse.redirect(
+        `${url.origin}${getUrlPathWithLocale(
+          '/orders/checkout/',
+          req.cookies.get('pz-locale')?.value
+        )}`,
+        303
+      );
+    }
+
+    try {
       const formData = await req.formData();
       const body: Record<string, string> = {};
 
@@ -34,6 +60,38 @@ const withMasterpassRestCallback =
         body[key] = value.toString();
       });
 
+      if (!sessionId) {
+        logger.warn(
+          'Make sure that the SESSION_COOKIE_SAMESITE environment variable is set to None in Commerce.',
+          {
+            middleware: 'masterpass-rest-callback',
+            ip
+          }
+        );
+
+        return NextResponse.redirect(
+          `${url.origin}${getUrlPathWithLocale(
+            '/orders/checkout/',
+            req.cookies.get('pz-locale')?.value
+          )}`,
+          303
+        );
+      }
+
+      const isPostCheckout = req.cookies.get('pz-post-checkout-flow')?.value === 'true';
+      const requestUrl = new URL(getCheckoutPath(isPostCheckout), Settings.commerceUrl);
+      requestUrl.searchParams.set('page', 'MasterpassRestCompletePage');
+      requestUrl.searchParams.set('responseCode', responseCode);
+      requestUrl.searchParams.set('token', token);
+      requestUrl.searchParams.set(
+        'three_d_secure',
+        body.transactionType?.includes('3D') ? 'true' : 'false'
+      );
+      requestUrl.searchParams.set(
+        'transactionType',
+        body.transactionType || ''
+      );
+
       const requestHeaders = {
         'Content-Type': 'application/x-www-form-urlencoded',
         'X-Requested-With': 'XMLHttpRequest',
@@ -49,13 +107,33 @@ const withMasterpassRestCallback =
         body: new URLSearchParams(body)
       });
 
+      logger.info('Masterpass REST callback request', {
+        requestUrl: requestUrl.toString(),
+        status: request.status,
+        requestHeaders,
+        ip
+      });
+
       const response = await request.json();
-      const { errors } = response;
+
+      const { context_list: contextList, errors } = response;
+
+      let redirectUrl = response.redirect_url;
+
+      if (!redirectUrl && contextList && contextList.length > 0) {
+        for (const context of contextList) {
+          if (context.page_context && context.page_context.redirect_url) {
+            redirectUrl = context.page_context.redirect_url;
+            break;
+          }
+        }
+      }
 
       if (errors && Object.keys(errors).length) {
-        logger.error('Error while processing MasterpassRestCompletePage', {
+        logger.error('Error while processing masterpass REST callback', {
           middleware: 'masterpass-rest-callback',
           errors,
+          requestHeaders,
           ip
         });
 
@@ -64,7 +142,12 @@ const withMasterpassRestCallback =
             '/orders/checkout/',
             req.cookies.get('pz-locale')?.value
           )}`,
-          303
+          {
+            status: 303,
+            headers: {
+              'Set-Cookie': `pz-pos-error=${encodeURIComponent(JSON.stringify(errors))}; path=/;`
+            }
+          }
         );
 
         // Add error cookie
@@ -75,40 +158,70 @@ const withMasterpassRestCallback =
         return errorResponse;
       }
 
-      const redirectUrl =
-        response.redirect_url ||
-        response.context_list?.[0]?.page_context?.redirect_url;
+      logger.info('Masterpass REST callback response', {
+        middleware: 'masterpass-rest-callback',
+        contextList,
+        redirectUrl,
+        ip
+      });
 
-      if (redirectUrl) {
-        const nextResponse = NextResponse.redirect(
-          `${url.origin}${getUrlPathWithLocale(redirectUrl, req.cookies.get('pz-locale')?.value)}`,
-          303
+      if (!redirectUrl) {
+        logger.warn(
+          'No redirection url found in response. Redirecting to checkout page.',
+          {
+            middleware: 'masterpass-rest-callback',
+            requestHeaders,
+            response: JSON.stringify(response),
+            ip
+          }
         );
 
-        // Forward set-cookie headers from the upstream response
-        const setCookieHeader = request.headers.get('set-cookie');
-        if (setCookieHeader) {
-          setCookieHeader.split(',').forEach((cookie) => {
-            nextResponse.headers.append('Set-Cookie', cookie.trim());
-          });
-        }
+        const redirectUrlWithLocale = `${url.origin}${getUrlPathWithLocale(
+          '/orders/checkout/',
+          req.cookies.get('pz-locale')?.value
+        )}`;
 
-        return nextResponse;
+        return NextResponse.redirect(redirectUrlWithLocale, 303);
       }
 
-      return NextResponse.redirect(
-        `${url.origin}${getUrlPathWithLocale('/orders/checkout/', req.cookies.get('pz-locale')?.value)}`,
-        303
-      );
+      const redirectUrlWithLocale = `${url.origin}${getUrlPathWithLocale(
+        redirectUrl,
+        req.cookies.get('pz-locale')?.value
+      )}`;
+
+      logger.info('Redirecting after masterpass REST callback', {
+        middleware: 'masterpass-rest-callback',
+        redirectUrl: redirectUrlWithLocale,
+        ip
+      });
+
+      const nextResponse = NextResponse.redirect(redirectUrlWithLocale, 303);
+
+      // Forward set-cookie headers from the upstream response
+      const setCookieHeader = request.headers.get('set-cookie');
+      if (setCookieHeader) {
+        setCookieHeader.split(',').forEach((cookie) => {
+          nextResponse.headers.append('Set-Cookie', cookie.trim());
+        });
+      }
+
+      return nextResponse;
     } catch (error) {
-      logger.error('Error while processing MasterpassRestCompletePage', {
+      logger.error('Error while processing masterpass REST callback', {
         middleware: 'masterpass-rest-callback',
         error,
+        requestHeaders: {
+          Cookie: req.headers.get('cookie') ?? '',
+          'x-currency': req.cookies.get('pz-currency')?.value ?? ''
+        },
         ip
       });
 
       return NextResponse.redirect(
-        `${url.origin}${getUrlPathWithLocale('/orders/checkout/', req.cookies.get('pz-locale')?.value)}`,
+        `${url.origin}${getUrlPathWithLocale(
+          '/orders/checkout/',
+          req.cookies.get('pz-locale')?.value
+        )}`,
         303
       );
     }

package/package.json

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

package/plugins.d.ts

@@ -37,16 +37,6 @@ declare module '@akinon/pz-cybersource-uc/src/redux/middleware' {
   export default middleware as any;
 }
 
-declare module '@akinon/pz-apple-pay' {}
-
-declare module '@akinon/pz-similar-products' {
-  export const SimilarProductsModal: any;
-  export const SimilarProductsFilterSidebar: any;
-  export const SimilarProductsResultsGrid: any;
-  export const SimilarProductsPlugin: any;
-  export const SimilarProductsButtonPlugin: any;
-}
-
 declare module '@akinon/pz-cybersource-uc/src/redux/reducer' {
   export default reducer as any;
 }

package/plugins.js

@@ -16,7 +16,6 @@ module.exports = [
   'pz-tabby-extension',
   'pz-apple-pay',
   'pz-tamara-extension',
-  'pz-similar-products',
   'pz-cybersource-uc',
   'pz-hepsipay',
   'pz-flow-payment',

package/redux/middlewares/checkout.ts

@@ -33,21 +33,6 @@ import { LocaleUrlStrategy } from '../../localization';
 import { showMobile3dIframe } from '../../utils/mobile-3d-iframe';
 import { showRedirectionIframe } from '../../utils/redirection-iframe';
 
-const IFRAME_REDIRECTION_KEY = 'pz-iframe-redirection-active';
-
-const isIframeRedirectionActive = () =>
-  typeof window !== 'undefined' &&
-  sessionStorage.getItem(IFRAME_REDIRECTION_KEY) === 'true';
-
-const setIframeRedirectionActive = (active: boolean) => {
-  if (typeof window === 'undefined') return;
-  if (active) {
-    sessionStorage.setItem(IFRAME_REDIRECTION_KEY, 'true');
-  } else {
-    sessionStorage.removeItem(IFRAME_REDIRECTION_KEY);
-  }
-};
-
 interface CheckoutResult {
   payload: {
     errors?: Record<string, string[]>;
@@ -84,7 +69,7 @@ export const redirectUrlMiddleware: Middleware = () => {
     const result: CheckoutResult = next(action);
     const redirectUrl = result?.payload?.redirect_url;
 
-    if (redirectUrl && !isIframeRedirectionActive()) {
+    if (redirectUrl) {
       const currentLocale = getCookie('pz-locale');
 
       let url = redirectUrl;
@@ -149,7 +134,6 @@ export const contextListMiddleware: Middleware = ({
           if (isMobileDevice && isIframePaymentOptionIncluded) {
             showMobile3dIframe(urlObj.toString());
           } else if (isIframe) {
-            setIframeRedirectionActive(true);
             showRedirectionIframe(urlObj.toString());
           } else {
             window.location.href = urlObj.toString();
@@ -225,25 +209,15 @@ export const contextListMiddleware: Middleware = ({
             (ctx) => ctx.page_name === 'DeliveryOptionSelectionPage'
           )
         ) {
-          const isCreditCardPayment =
-            preOrder?.payment_option?.payment_type === 'credit_card' ||
-            preOrder?.payment_option?.payment_type === 'masterpass';
-
           if (context.page_context.card_type) {
             dispatch(setCardType(context.page_context.card_type));
-          } else if (isCreditCardPayment) {
-            dispatch(setCardType(null));
           }
 
           if (
             context.page_context.installments &&
             preOrder?.payment_option?.payment_type !== 'masterpass_rest'
           ) {
-            if (!isCreditCardPayment || context.page_context.card_type) {
-              dispatch(
-                setInstallmentOptions(context.page_context.installments)
-              );
-            }
+            dispatch(setInstallmentOptions(context.page_context.installments));
           }
         }
 

package/redux/middlewares/pre-order/installment-option.ts

@@ -14,17 +14,9 @@ export const installmentOptionMiddleware: Middleware = ({
       return result;
     }
 
-    const { installmentOptions, cardType } = getState().checkout;
+    const { installmentOptions } = getState().checkout;
     const { endpoints: apiEndpoints } = checkoutApi;
 
-    const isCreditCardPayment =
-      preOrder?.payment_option?.payment_type === 'credit_card' ||
-      preOrder?.payment_option?.payment_type === 'masterpass';
-
-    if (isCreditCardPayment && !cardType) {
-      return result;
-    }
-
     if (
       !preOrder?.installment &&
       preOrder?.payment_option?.payment_type !== 'saved_card' &&

package/types/index.ts

@@ -85,12 +85,6 @@ export interface Settings {
   };
   usePrettyUrlRoute?: boolean;
   commerceUrl: string;
-  /**
-   * This option allows you to track Sentry events on the client side, in addition to server and edge environments.
-   *
-   * It overrides process.env.NEXT_PUBLIC_SENTRY_DSN and process.env.SENTRY_DSN.
-   */
-  sentryDsn?: string;
   redis: {
     defaultExpirationTime: number;
   };
@@ -223,7 +217,6 @@ export interface Settings {
     separator?: string;
     segments: PzSegmentDefinition[];
   };
-  payloadOptimization?: import('../utils/payload-optimizer').PayloadOptimizationConfig;
 }
 
 export interface CacheOptions {

package/with-pz-config.js

@@ -62,8 +62,7 @@ const defaultConfig = {
         acc[`@akinon/${plugin}`] = false;
         return acc;
       }, {}),
-      translations: false,
-      '@opentelemetry/exporter-jaeger': false
+      translations: false
     };
     return config;
   }

package/utils/payload-optimizer.ts

@@ -1,481 +0,0 @@
-import { GetCategoryResponse } from '../types/commerce/category'
-import { Product, ProductResult } from '../types/commerce/product'
-
-/**
- * Payload Optimization Config
- *
- * - Optimizer returns minimum fields needed for the base project.
- * - Projects extend via "Extra" arrays in settings.js.
- * - Each config array works as "base + extra".
- *
- * Example:
- * ```js
- * payloadOptimization: {
- *   enabled: true,
- *   listProductImageLimit: 1,
- *   listProductExtraFields: ['stock', 'tax_rate'],
- *   listProductExtraAttributes: ['my_custom_attr'],
- *   listProductExtraAttributesKwargs: ['integration_renk'],
- * }
- * ```
- */
-export interface PayloadOptimizationConfig {
-  enabled: boolean
-
-  // ── Image Limits ───────────────────────────────────────────────────────────
-  /** Max images per product on list pages (default: 3) */
-  listProductImageLimit?: number
-  /** Extra hover image count after the limit (default: 2) */
-  listHoverImageCount?: number
-  /** Max images per product in widgets (default: listProductImageLimit) */
-  widgetProductImageLimit?: number
-  /** Widget hover image count (default: listHoverImageCount) */
-  widgetHoverImageCount?: number
-  /** Max images per variant product on PDP (default: 1) */
-  pdpVariantImageLimit?: number
-
-  // ── List / Category / Special Page ─────────────────────────────────────────
-  /** Extra top-level product fields on top of base */
-  listProductExtraFields?: string[]
-  /** Extra keys from product.attributes on top of base */
-  listProductExtraAttributes?: string[]
-  /** Extra keys from product.attributes_kwargs on top of base */
-  listProductExtraAttributesKwargs?: string[]
-  /** Extra keys from product.extra_attributes on top of base */
-  listProductExtraExtraAttributes?: string[]
-  /** Extra keys from product.data_source on top of base */
-  listDataSourceExtraFields?: string[]
-
-  // ── Product Detail Page ────────────────────────────────────────────────────
-  /** Extra keys from product.attributes on top of base */
-  pdpProductExtraAttributes?: string[]
-  /** Extra keys from product.attributes_kwargs on top of base */
-  pdpProductExtraAttributesKwargs?: string[]
-  /** Extra keys from product.extra_attributes on top of base */
-  pdpProductExtraExtraAttributes?: string[]
-  /** Extra keys from variant product.attributes on top of base */
-  pdpVariantExtraAttributes?: string[]
-  /** Extra keys from variant product.attributes_kwargs on top of base */
-  pdpVariantExtraAttributesKwargs?: string[]
-  /** Extra keys from product.data_source on top of base */
-  pdpDataSourceExtraFields?: string[]
-  /** Extra top-level product fields on top of base */
-  pdpProductExtraFields?: string[]
-
-  // ── Category ───────────────────────────────────────────────────────────────
-  /** Extra top-level category fields on top of base */
-  categoryExtraFields?: string[]
-  /** Extra keys from category.attributes on top of base */
-  categoryExtraAttributes?: string[]
-
-  // ── Special Page ───────────────────────────────────────────────────────────
-  /** Extra fields from special_page on top of base */
-  specialPageExtraFields?: string[]
-
-  // ── Offers ─────────────────────────────────────────────────────────────────
-  /** Extra keys from offer.listing_kwargs on top of base */
-  offerExtraListingKwargsFields?: string[]
-}
-
-// ─── Base Field Sets ─────────────────────────────────────────────────────────
-// Minimum fields required by the base project (projectzeronext).
-// Projects extend these via "Extra" arrays in settings.js.
-
-const BASE_LIST_PRODUCT_FIELDS = [
-  'pk', 'name', 'base_code', 'absolute_url',
-  'price', 'retail_price', 'in_stock'
-]
-
-const BASE_LIST_PRODUCT_ATTRIBUTES: string[] = []
-const BASE_LIST_PRODUCT_ATTRIBUTES_KWARGS: string[] = []
-const BASE_LIST_PRODUCT_EXTRA_ATTRIBUTES: string[] = []
-const BASE_LIST_DATASOURCE_FIELDS = ['pk', 'name']
-
-const BASE_PDP_PRODUCT_FIELDS = [
-  'pk', 'name', 'sku', 'base_code', 'price', 'retail_price',
-  'in_stock', 'product_type', 'currency_type', 'absolute_url',
-  'productimage_set', 'attribute_set', 'unit_type', 'tax_rate',
-  'stock', 'price_type', 'form_schema', 'is_ready_to_basket',
-  'data_source', 'basket_offers', 'data_source_offers',
-  'is_listable', 'listing_code', 'price_extra_field'
-]
-
-const BASE_PDP_PRODUCT_ATTRIBUTES = [
-  'integration_ProductAtt03Desc', 'integration_kumas_icerik',
-  'model_olculeri', 'aciklama'
-]
-
-const BASE_PDP_PRODUCT_ATTRIBUTES_KWARGS: string[] = []
-const BASE_PDP_PRODUCT_EXTRA_ATTRIBUTES: string[] = []
-
-const BASE_PDP_DATASOURCE_FIELDS = [
-  'pk', 'name', 'title', 'phone_number', 'address',
-  'mersis_number', 'kep_address'
-]
-
-const BASE_PDP_VARIANT_ATTRIBUTES: string[] = []
-const BASE_PDP_VARIANT_ATTRIBUTES_KWARGS: string[] = []
-
-const BASE_CATEGORY_FIELDS = [
-  'pk', 'name', 'menuitemmodel', 'absolute_url', 'sort_option'
-]
-
-const BASE_CATEGORY_ATTRIBUTES: string[] = []
-
-const BASE_SPECIAL_PAGE_FIELDS = ['pk', 'name', 'url', 'banner_url']
-
-const DEFAULT_LIST_IMAGE_LIMIT = 3
-const DEFAULT_PDP_VARIANT_IMAGE_LIMIT = 1
-
-// ─── Helpers ─────────────────────────────────────────────────────────────────
-
-function merge(base: string[], extra?: string[]): string[] {
-  if (!extra?.length) return base
-  return [...base, ...extra]
-}
-
-function pickKeys(obj: any, keys: string[]): any {
-  if (!obj) return undefined
-  const result: any = {}
-  for (const key of keys) {
-    if (obj[key] != null) {
-      result[key] = obj[key]
-    }
-  }
-  return result
-}
-
-function pickAttributesKwargs(kwargs: any, keys: string[]): any {
-  if (!kwargs) return undefined
-  const result: any = {}
-  for (const key of keys) {
-    if (kwargs[key] != null) {
-      result[key] = kwargs[key]?.label != null
-        ? { label: kwargs[key].label }
-        : kwargs[key]
-    }
-  }
-  return result
-}
-
-function stripImages(images: any[] | undefined, limit: number) {
-  if (!images?.length) return undefined
-  return images.slice(0, limit).map((img: any) => ({ image: img.image }))
-}
-
-function stripOffer(offer: any, extraFields?: string[]) {
-  if (!offer) return offer
-  const lk: any = offer.listing_kwargs
-    ? { discounted_total_price: offer.listing_kwargs.discounted_total_price, quantity: offer.listing_kwargs.quantity }
-    : undefined
-
-  if (lk && extraFields && offer.listing_kwargs) {
-    for (const f of extraFields) {
-      if (offer.listing_kwargs[f] !== undefined) lk[f] = offer.listing_kwargs[f]
-    }
-  }
-
-  return {
-    pk: offer.pk,
-    label: offer.label,
-    listing_kwargs: lk,
-    kwargs: offer.kwargs,
-    data_source: offer.data_source ? { pk: offer.data_source.pk } : undefined
-  }
-}
-
-function applyOffers(target: any, source: any, config: PayloadOptimizationConfig) {
-  const extra = config.offerExtraListingKwargsFields
-  if (source.basket_offers) {
-    target.basket_offers = source.basket_offers.map((o: any) => stripOffer(o, extra))
-  }
-  if (source.data_source_offers) {
-    target.data_source_offers = source.data_source_offers.map(
-      (g: any) => Array.isArray(g) ? g.map((o: any) => stripOffer(o, extra)) : stripOffer(g, extra)
-    )
-  }
-}
-
-function stripFacet(facet: any) {
-  if (!facet) return facet
-  return {
-    key: facet.key,
-    name: facet.name,
-    search_key: facet.search_key,
-    widget_type: facet.widget_type,
-    data: facet.data ? {
-      choices: facet.data.choices?.map((c: any) => ({
-        label: c.label, value: c.value, quantity: c.quantity,
-        selected: c.selected, is_selected: c.is_selected,
-        children: c.children
-      })),
-      key: facet.data.key, name: facet.data.name, order: facet.data.order,
-      search_key: facet.data.search_key, widget_type: facet.data.widget_type
-    } : undefined
-  }
-}
-
-// ─── Precomputed Key Sets ────────────────────────────────────────────────────
-// Computed once per config to avoid repeated merge() calls per product.
-
-interface ListKeySet {
-  fields: string[]
-  attrKeys: string[]
-  kwargsKeys: string[]
-  extraAttrKeys: string[]
-  dsFields: string[]
-  imageLimit: number
-  hoverCount: number
-}
-
-function buildListKeySet(config: PayloadOptimizationConfig): ListKeySet {
-  return {
-    fields: merge(BASE_LIST_PRODUCT_FIELDS, config.listProductExtraFields),
-    attrKeys: merge(BASE_LIST_PRODUCT_ATTRIBUTES, config.listProductExtraAttributes),
-    kwargsKeys: merge(BASE_LIST_PRODUCT_ATTRIBUTES_KWARGS, config.listProductExtraAttributesKwargs),
-    extraAttrKeys: merge(BASE_LIST_PRODUCT_EXTRA_ATTRIBUTES, config.listProductExtraExtraAttributes),
-    dsFields: merge(BASE_LIST_DATASOURCE_FIELDS, config.listDataSourceExtraFields),
-    imageLimit: config.listProductImageLimit ?? DEFAULT_LIST_IMAGE_LIMIT,
-    hoverCount: config.listHoverImageCount ?? 2
-  }
-}
-
-function buildWidgetKeySet(config: PayloadOptimizationConfig): ListKeySet {
-  const listKeys = buildListKeySet(config)
-  return {
-    ...listKeys,
-    imageLimit: config.widgetProductImageLimit ?? listKeys.imageLimit,
-    hoverCount: config.widgetHoverImageCount ?? listKeys.hoverCount
-  }
-}
-
-// ─── Shared Product Stripping ────────────────────────────────────────────────
-
-function stripProduct(
-  product: any,
-  keys: ListKeySet,
-  config: PayloadOptimizationConfig,
-  opts?: { includeHoverImages?: boolean, includeWidgetVariants?: boolean }
-): any {
-  if (!product) return product
-
-  const allImages = product.productimage_set ?? []
-  const stripped: any = pickKeys(product, keys.fields)
-
-  stripped.productimage_set = stripImages(allImages, keys.imageLimit)
-
-  if (opts?.includeHoverImages && keys.hoverCount > 0 && allImages.length > keys.imageLimit) {
-    stripped._hoverImageUrls = allImages
-      .slice(keys.imageLimit, keys.imageLimit + keys.hoverCount)
-      .map((img: any) => img.image)
-  }
-
-  stripped.attributes = pickKeys(product.attributes, keys.attrKeys)
-  stripped.attributes_kwargs = pickAttributesKwargs(product.attributes_kwargs, keys.kwargsKeys)
-  stripped.extra_attributes = pickKeys(product.extra_attributes, keys.extraAttrKeys)
-
-  if (product.data_source) {
-    stripped.data_source = pickKeys(product.data_source, keys.dsFields)
-  }
-
-  applyOffers(stripped, product, config)
-
-  // Widget variants: strip to minimal
-  if (opts?.includeWidgetVariants && product.extra_data?.variants) {
-    stripped.extra_data = {
-      variants: product.extra_data.variants.map((variant: any) => ({
-        attribute_key: variant.attribute_key,
-        options: variant.options?.map((option: any) => {
-          if (!option.product) return option
-          const op = option.product
-          return {
-            ...option,
-            product: {
-              pk: op.pk,
-              absolute_url: op.absolute_url,
-              price: op.price,
-              retail_price: op.retail_price,
-              stock: op.stock,
-              in_stock: op.in_stock != null ? op.in_stock : (op.stock ?? 0) > 0,
-              productimage_set: stripImages(op.productimage_set, 1),
-              attributes: pickKeys(op.attributes, keys.attrKeys),
-              price_extra_field: op.price_extra_field
-            }
-          }
-        })
-      }))
-    }
-  }
-
-  return stripped
-}
-
-// ─── List / Category / Special Page ──────────────────────────────────────────
-
-export function optimizeCategoryResponse(data: GetCategoryResponse, config: PayloadOptimizationConfig): GetCategoryResponse {
-  if (!data) return data
-
-  // Shallow copy to avoid mutating cached data
-  const result = { ...data }
-  const keys = buildListKeySet(config)
-
-  if (result.products?.length) {
-    result.products = result.products.map(
-      (p) => stripProduct(p, keys, config, { includeHoverImages: true }) as Product
-    )
-  }
-
-  if (result.facets?.length) {
-    result.facets = result.facets.map((f) => stripFacet(f) as typeof f)
-  }
-
-  if (result.category) {
-    const cat = result.category as any
-    const catFields = merge(BASE_CATEGORY_FIELDS, config.categoryExtraFields)
-    const strippedCat: any = pickKeys(cat, catFields)
-    strippedCat.attributes = config.categoryExtraAttributes?.length
-      ? pickKeys(cat.attributes, merge(BASE_CATEGORY_ATTRIBUTES, config.categoryExtraAttributes))
-      : cat.attributes
-    result.category = strippedCat
-  }
-
-  if ((result as any).special_page) {
-    const spFields = merge(BASE_SPECIAL_PAGE_FIELDS, config.specialPageExtraFields)
-    ;(result as any).special_page = pickKeys((result as any).special_page, spFields)
-  }
-
-  return result
-}
-
-// ─── Product Detail Page ─────────────────────────────────────────────────────
-
-export function optimizeProductResponse(data: ProductResult, config: PayloadOptimizationConfig): ProductResult {
-  if (!data) return data
-
-  // Shallow copy to avoid mutating cached data
-  const result = { ...data } as any
-  const variantImageLimit = config.pdpVariantImageLimit ?? DEFAULT_PDP_VARIANT_IMAGE_LIMIT
-
-  // Precompute key sets once
-  const pdpFields = merge(BASE_PDP_PRODUCT_FIELDS, config.pdpProductExtraFields)
-  const attrKeys = merge(BASE_PDP_PRODUCT_ATTRIBUTES, config.pdpProductExtraAttributes)
-  const kwargsKeys = merge(BASE_PDP_PRODUCT_ATTRIBUTES_KWARGS, config.pdpProductExtraAttributesKwargs)
-  const extraAttrKeys = merge(BASE_PDP_PRODUCT_EXTRA_ATTRIBUTES, config.pdpProductExtraExtraAttributes)
-  const dsFields = merge(BASE_PDP_DATASOURCE_FIELDS, config.pdpDataSourceExtraFields)
-  const varAttrKeys = merge(BASE_PDP_VARIANT_ATTRIBUTES, config.pdpVariantExtraAttributes)
-  const varKwargsKeys = config.pdpVariantExtraAttributesKwargs?.length
-    ? merge(BASE_PDP_VARIANT_ATTRIBUTES_KWARGS, config.pdpVariantExtraAttributesKwargs)
-    : undefined
-
-  if (data.product) {
-    const p = data.product as any
-    const stripped: any = pickKeys(p, pdpFields)
-
-    // Strip specialimage_set from images
-    if (stripped.productimage_set) {
-      stripped.productimage_set = stripped.productimage_set.map((img: any) => ({
-        pk: img.pk, image: img.image, order: img.order, status: img.status
-      }))
-    }
-
-    stripped.attributes = pickKeys(p.attributes, attrKeys)
-    stripped.attributes_kwargs = pickKeys(p.attributes_kwargs, kwargsKeys)
-    stripped.extra_attributes = pickKeys(p.extra_attributes, extraAttrKeys)
-
-    if (p.data_source) {
-      stripped.data_source = pickKeys(p.data_source, dsFields)
-    }
-
-    applyOffers(stripped, p, config)
-    result.product = stripped
-  }
-
-  if (result.offers) {
-    result.offers = result.offers.map((offer: any) => ({
-      pk: offer.pk,
-      name: offer.name,
-      in_stock: offer.in_stock,
-      price: offer.price,
-      retail_price: offer.retail_price,
-      absolute_url: offer.absolute_url,
-      attributes: pickKeys(offer.attributes, attrKeys),
-      attributes_kwargs: pickKeys(offer.attributes_kwargs, kwargsKeys),
-      extra_attributes: pickKeys(offer.extra_attributes, extraAttrKeys),
-      data_source: offer.data_source ? pickKeys(offer.data_source, dsFields) : undefined
-    }))
-  }
-
-  if (data.variants) {
-    result.variants = data.variants.map((variant: any) => ({
-      ...variant,
-      options: variant.options?.map((option: any) => {
-        if (!option.product) return option
-        const op = option.product
-        return {
-          ...option,
-          product: {
-            pk: op.pk,
-            sku: op.sku,
-            name: op.name,
-            in_stock: op.in_stock,
-            stock: op.stock,
-            price: op.price,
-            retail_price: op.retail_price,
-            absolute_url: op.absolute_url,
-            productimage_set: op.productimage_set?.slice(0, variantImageLimit),
-            price_extra_field: op.price_extra_field,
-            attributes: pickKeys(op.attributes, varAttrKeys),
-            attributes_kwargs: varKwargsKeys ? pickKeys(op.attributes_kwargs, varKwargsKeys) : op.attributes_kwargs
-          }
-        }
-      })
-    }))
-  }
-
-  if (data.group_products) {
-    result.group_products = data.group_products.map((gp: any) => ({
-      pk: gp.pk, name: gp.name, sku: gp.sku,
-      in_stock: gp.in_stock, price: gp.price, retail_price: gp.retail_price,
-      productimage_set: gp.productimage_set
-    }))
-  }
-
-  return result as ProductResult
-}
-
-// ─── Widget ──────────────────────────────────────────────────────────────────
-
-export function optimizeWidgetResponse(data: any, config: PayloadOptimizationConfig): any {
-  if (!data) return data
-
-  const result = { ...data }
-  const keys = buildWidgetKeySet(config)
-
-  if (result.products?.length && result.products[0]?.pk) {
-    result.products = result.products.map(
-      (p: any) => stripProduct(p, keys, config, { includeHoverImages: true, includeWidgetVariants: true })
-    )
-  }
-
-  if (result.attributes) {
-    result.attributes = { ...result.attributes }
-    for (const key of Object.keys(result.attributes)) {
-      const val = result.attributes[key]
-      if (Array.isArray(val) && val.length > 0 && val[0]?.pk && val[0]?.productimage_set) {
-        result.attributes[key] = val.map(
-          (p: any) => stripProduct(p, keys, config, { includeHoverImages: true, includeWidgetVariants: true })
-        )
-      }
-      if (val?.value && Array.isArray(val.value) && val.value.length > 0 && val.value[0]?.pk && val.value[0]?.productimage_set) {
-        result.attributes[key] = {
-          ...val,
-          value: val.value.map(
-            (p: any) => stripProduct(p, keys, config, { includeHoverImages: true, includeWidgetVariants: true })
-          )
-        }
-      }
-    }
-  }
-
-  return result
-}