@akinon/next 2.0.0-beta.12 → 2.0.0-beta.13

package/data/server/menu.ts

@@ -48,6 +48,9 @@ export const getMenu = async (params?: MenuHandlerParams) => {
   return Cache.wrap(
     CacheKey.Menu(params?.depth ?? DEFAULT_DEPTH, params?.parent),
     params?.locale ?? ServerVariables.locale,
-    getMenuHandler(params)
+    getMenuHandler(params),
+    {
+      compressed: true
+    }
   );
 };

package/data/server/product.ts

@@ -1,15 +1,15 @@
 import { Cache, CacheKey } from '../../lib/cache';
 import { product } from '../urls';
-import { ProductCategoryResult, ProductResult } from '../../types';
+import { ProductCategoryResult, ProductResult, SearchParams } from '../../types';
 import appFetch from '../../utils/app-fetch';
 import { ServerVariables } from '../../utils/server-variables';
 import logger from '../../utils/log';
 
 type GetProduct = {
-  pk: number;
+  pk: number | string;
   locale?: string;
   currency?: string;
-  searchParams?: URLSearchParams;
+  searchParams?: SearchParams;
   groupProduct?: boolean;
   headers?: Record<string, string>;
 };
@@ -23,9 +23,21 @@ const getProductDataHandler = ({
   headers
 }: GetProduct) => {
   return async function () {
+    // Convert pk to number if it's a string and validate
+    const numericPk = typeof pk === 'string' ? parseInt(pk, 10) : pk;
+
+    if (isNaN(numericPk)) {
+      logger.warn('Invalid product pk provided', {
+        handler: 'getProductDataHandler',
+        pk,
+        numericPk
+      });
+      return null;
+    }
+
     let url = groupProduct
-      ? product.getGroupProductByPk(pk)
-      : product.getProductByPk(pk);
+      ? product.getGroupProductByPk(numericPk)
+      : product.getProductByPk(numericPk);
 
     if (searchParams) {
       url +=
@@ -35,61 +47,81 @@ const getProductDataHandler = ({
           .join('&');
     }
 
-    const data = await appFetch<ProductResult>({
-      url,
-      locale,
-      currency,
-      init: {
-        headers: {
-          Accept: 'application/json',
-          'Content-Type': 'application/json',
-          ...(headers ?? {})
+    try {
+      const data = await appFetch<ProductResult>({
+        url,
+        locale,
+        currency,
+        init: {
+          headers: {
+            Accept: 'application/json',
+            'Content-Type': 'application/json',
+            ...(headers ?? {})
+          }
         }
+      });
+
+      // If product data is not found, return null to trigger 404
+      if (!data?.product?.pk) {
+        logger.warn('Product not found', {
+          handler: 'getProductDataHandler',
+          pk: numericPk,
+          hasData: !!data,
+          hasProduct: !!data?.product
+        });
+        return null;
       }
-    });
 
-    const categoryUrl = product.categoryUrl(data.product.pk);
+      const categoryUrl = product.categoryUrl(data.product.pk);
 
-    const productCategoryData = await appFetch<ProductCategoryResult>({
-      url: categoryUrl,
-      locale,
-      currency,
-      init: {
-        headers: {
-          Accept: 'application/json',
-          'Content-Type': 'application/json'
+      const productCategoryData = await appFetch<ProductCategoryResult>({
+        url: categoryUrl,
+        locale,
+        currency,
+        init: {
+          headers: {
+            Accept: 'application/json',
+            'Content-Type': 'application/json'
+          }
         }
-      }
-    });
+      });
 
-    const menuItemModel = productCategoryData?.results[0]?.menuitemmodel;
+      const menuItemModel = productCategoryData?.results[0]?.menuitemmodel;
 
-    if (!menuItemModel) {
-      logger.warn('menuItemModel is undefined, skipping breadcrumbData fetch', {
-        handler: 'getProductDataHandler',
-        pk
-      });
-      return { data, breadcrumbData: undefined };
-    }
+      if (!menuItemModel) {
+        logger.warn('menuItemModel is undefined, skipping breadcrumbData fetch', {
+          handler: 'getProductDataHandler',
+          pk: numericPk
+        });
+        return { data, breadcrumbData: undefined };
+      }
 
-    const breadcrumbUrl = product.breadcrumbUrl(menuItemModel);
+      const breadcrumbUrl = product.breadcrumbUrl(menuItemModel);
 
-    const breadcrumbData = await appFetch<any>({
-      url: breadcrumbUrl,
-      locale,
-      currency,
-      init: {
-        headers: {
-          Accept: 'application/json',
-          'Content-Type': 'application/json'
+      const breadcrumbData = await appFetch<any>({
+        url: breadcrumbUrl,
+        locale,
+        currency,
+        init: {
+          headers: {
+            Accept: 'application/json',
+            'Content-Type': 'application/json'
+          }
         }
-      }
-    });
+      });
 
-    return {
-      data,
-      breadcrumbData: breadcrumbData?.menu
-    };
+      return {
+        data,
+        breadcrumbData: breadcrumbData?.menu
+      };
+    } catch (error) {
+      logger.error('Error in getProductDataHandler', {
+        handler: 'getProductDataHandler',
+        pk: numericPk,
+        error: error.message
+      });
+      return null;
+    }
   };
 };
 
@@ -101,9 +133,12 @@ export const getProductData = async ({
   groupProduct,
   headers
 }: GetProduct) => {
-  return Cache.wrap(
+  // 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'](
-      pk,
+      numericPkForCache,
       searchParams ?? new URLSearchParams()
     ),
     locale,
@@ -116,7 +151,17 @@ export const getProductData = async ({
       headers
     }),
     {
-      expire: 300
+      expire: 300,
+      compressed: true
     }
   );
+
+  // If product data is not found, throw 404 error
+  if (!result) {
+    const error = new Error('Product not found') as Error & { status: number };
+    error.status = 404;
+    throw error;
+  }
+
+  return result;
 };

package/data/server/seo.ts

@@ -43,6 +43,9 @@ export const getSeoData = async (
   return Cache.wrap(
     CacheKey.Seo(url),
     locale,
-    getSeoDataHandler({ url, locale, currency, headers })
+    getSeoDataHandler({ url, locale, currency, headers }),
+    {
+      compressed: true
+    }
   );
 };

package/data/server/special-page.ts

@@ -1,6 +1,6 @@
 import { Cache, CacheKey } from '../../lib/cache';
 import { category } from '../urls';
-import { GetCategoryResponse } from '../../types';
+import { GetCategoryResponse, SearchParams } from '../../types';
 import { generateCommerceSearchParams } from '../../utils';
 import appFetch from '../../utils/app-fetch';
 import { ServerVariables } from '../../utils/server-variables';
@@ -9,7 +9,7 @@ const getSpecialPageDataHandler = (
   pk: number,
   locale: string,
   currency: string,
-  searchParams: URLSearchParams,
+  searchParams: SearchParams,
   headers?: Record<string, string>
 ) => {
   return async function () {
@@ -42,7 +42,7 @@ export const getSpecialPageData = async ({
   pk: number;
   locale?: string;
   currency?: string;
-  searchParams: URLSearchParams;
+  searchParams: SearchParams;
   headers?: Record<string, string>;
 }) => {
   return Cache.wrap(
@@ -50,7 +50,8 @@ export const getSpecialPageData = async ({
     locale,
     getSpecialPageDataHandler(pk, locale, currency, searchParams, headers),
     {
-      expire: 300
+      expire: 300,
+      compressed: true
     }
   );
 };

package/data/server/widget.ts

@@ -44,6 +44,9 @@ export const getWidgetData = async <T>({
     CacheKey.Widget(slug),
     locale,
     getWidgetDataHandler(slug, locale, currency, headers),
-    cacheOptions
+    {
+      compressed: true,
+      ...cacheOptions
+    }
   );
 };

package/data/urls.ts

@@ -142,7 +142,8 @@ export const checkout = {
   setOrderSelectionPage: '/orders/checkout/?page=OrderSelectionPage',
   loyaltyCardPage: '/orders/checkout/?page=LoyaltyCardPage',
   sendSmsPage: '/orders/checkout/?page=SendSmsPage',
-  verifySmsPage: '/orders/checkout/?page=VerifySmsPage'
+  verifySmsPage: '/orders/checkout/?page=VerifySmsPage',
+  saveSampleProducts: '/orders/checkout/?page=SampleProductPage'
 };
 
 export const flatpage = {
@@ -246,7 +247,7 @@ export const widgets = {
 };
 
 export const form = {
-  getForm: (pk: number) => `/forms/${pk}/generate/`
+  getForm: (pk: number) => `/forms/${pk}/generate`
 };
 
 const URLS = {

package/hocs/client/with-segment-defaults.tsx

@@ -1,4 +1,4 @@
-import { LayoutProps, PageProps, RootLayoutProps } from '../../types';
+import { ResolvedLayoutProps, ResolvedPageProps, ResolvedRootLayoutProps } from '../../types';
 import React, { JSX } from 'react';
 
 type SegmentType = 'client-root' | 'layout' | 'page';
@@ -8,7 +8,7 @@ interface SegmentDefaultsOptions {
 }
 
 export const withSegmentDefaults =
-  <T extends PageProps | LayoutProps | RootLayoutProps>(
+  <T extends ResolvedPageProps | ResolvedLayoutProps | ResolvedRootLayoutProps>(
     Component: (
       props?: T
     ) => null | JSX.Element | Promise<JSX.Element> | Promise<JSX.Element[]>,

package/hocs/server/with-segment-defaults.tsx

@@ -1,10 +1,20 @@
-import settings from 'settings';
 import { JSX } from 'react';
-import { LayoutProps, PageProps, RootLayoutProps } from '../../types';
+import settings from 'settings';
+import {
+  ResolvedPageProps,
+  ResolvedLayoutProps,
+  ResolvedRootLayoutProps
+} from '../../types';
 import { redirect } from 'next/navigation';
 import { ServerVariables } from '../../utils/server-variables';
 import { ROUTES } from 'routes';
 import logger from '../../utils/log';
+import {
+  decodePzValue,
+  getPzSegmentsConfig,
+  getBuiltInSegments,
+  isLegacyMode
+} from '../../utils/pz-segments';
 
 type SegmentType = 'root-layout' | 'layout' | 'page';
 
@@ -13,27 +23,50 @@ interface SegmentDefaultsOptions {
 }
 
 export const withSegmentDefaults =
-  <T extends PageProps | LayoutProps | RootLayoutProps>(
+  <T extends ResolvedPageProps | ResolvedLayoutProps | ResolvedRootLayoutProps>(
     Component: (
       props?: T
     ) => null | JSX.Element | Promise<JSX.Element> | Promise<JSX.Element[]>,
     options: SegmentDefaultsOptions
   ) =>
-  async (props: T) => {
-    let componentProps = { ...props };
-
-    const { locale, currency } = await props.params;
+  async (props: any) => {
+    const resolvedParams = await props.params;
+    const resolvedSearchParams = props.searchParams
+      ? await props.searchParams
+      : undefined;
+
+    let componentProps = {
+      ...props,
+      params: resolvedParams,
+      searchParams: resolvedSearchParams,
+      ...('children' in props ? { children: (props as any).children } : {})
+    } as T;
+
+    let localeValue: string;
+    let currencyValue: string;
+
+    if (isLegacyMode(settings)) {
+      localeValue = resolvedParams.locale;
+      currencyValue = resolvedParams.currency;
+    } else {
+      const pzConfig = getPzSegmentsConfig(settings);
+      const parsed = decodePzValue(resolvedParams.pz, pzConfig);
+      const builtIn = getBuiltInSegments(parsed, settings);
+      localeValue = builtIn.locale;
+      currencyValue = builtIn.currency;
+    }
 
     if (options.segmentType === 'root-layout') {
       componentProps = (await addRootLayoutProps(
-        componentProps as RootLayoutProps
+        componentProps as ResolvedRootLayoutProps,
+        localeValue
       )) as T;
 
       checkRedisVariables();
     }
 
-    ServerVariables.locale = await locale;
-    ServerVariables.currency = await currency;
+    ServerVariables.locale = localeValue;
+    ServerVariables.currency = currencyValue;
 
     return await (
       <>
@@ -42,12 +75,21 @@ export const withSegmentDefaults =
     );
   };
 
-const addRootLayoutProps = async (componentProps: RootLayoutProps) => {
-  const params = await componentProps.params;
-
-  if (
-    params.commerce !== encodeURIComponent(decodeURI(settings.commerceUrl)) ||
-    !settings.localization.locales.find((l) => l.value === params.locale)
+const addRootLayoutProps = async (
+  componentProps: ResolvedRootLayoutProps,
+  localeValue: string
+) => {
+  if (isLegacyMode(settings)) {
+    const params = componentProps.params;
+    if (
+      params.commerce !==
+        encodeURIComponent(decodeURI(settings.commerceUrl)) ||
+      !settings.localization.locales.find((l) => l.value === localeValue)
+    ) {
+      return redirect(ROUTES.HOME);
+    }
+  } else if (
+    !settings.localization.locales.find((l) => l.value === localeValue)
   ) {
     return redirect(ROUTES.HOME);
   }
@@ -55,12 +97,12 @@ const addRootLayoutProps = async (componentProps: RootLayoutProps) => {
   const { getTranslations } = settings.useOptimizedTranslations
     ? require('translations')
     : require('../../utils/server-translation');
-  const translations = await getTranslations(params.locale);
+  const translations = await getTranslations(localeValue);
 
   componentProps.translations = translations;
 
   const locale = settings.localization.locales.find(
-    (l) => l.value === params.locale
+    (l) => l.value === localeValue
   );
   const [isoCode] = locale.value.split('-');
 
@@ -75,10 +117,13 @@ const addRootLayoutProps = async (componentProps: RootLayoutProps) => {
 const checkRedisVariables = () => {
   const requiredVariableValues = [
     process.env.CACHE_HOST,
-    process.env.CACHE_PORT,
-    process.env.CACHE_SECRET
+    process.env.CACHE_PORT
   ];
 
+  if (!settings.usePrettyUrlRoute) {
+    requiredVariableValues.push(process.env.CACHE_SECRET);
+  }
+
   if (
     !requiredVariableValues.every((v) => v) &&
     process.env.NODE_ENV === 'production'

package/hooks/index.ts

@@ -11,3 +11,4 @@ export * from './use-payment-options';
 export * from './use-pagination';
 export * from './use-message-listener';
 export * from './use-sentry-uncaught-errors';
+export * from './use-pz-params';

package/hooks/use-loyalty-availability.ts

@@ -0,0 +1,21 @@
+import { useAppSelector } from '../redux/hooks';
+
+export const useLoyaltyAvailability = () => {
+  const { paymentOptions, unavailablePaymentOptions } = useAppSelector(
+    (state) => state.checkout
+  );
+
+  const hasLoyaltyInAvailable = paymentOptions.some(
+    (option) =>
+      option.payment_type === 'loyalty_money' ||
+      option.payment_type === 'loyalty'
+  );
+
+  const hasLoyaltyInUnavailable = unavailablePaymentOptions.some(
+    (option) =>
+      option.payment_type === 'loyalty_money' ||
+      option.payment_type === 'loyalty'
+  );
+
+  return hasLoyaltyInAvailable || hasLoyaltyInUnavailable;
+};

package/hooks/use-payment-options.ts

@@ -21,7 +21,8 @@ export const usePaymentOptions = () => {
     credit_payment: 'pz-credit-payment',
     masterpass: 'pz-masterpass',
     saved_card: 'pz-saved-card',
-    gpay: 'pz-gpay'
+    gpay: 'pz-gpay',
+    masterpass_rest: 'pz-masterpass-rest'
   };
 
   const isInitialTypeIncluded = (type: string) => initialTypes.has(type);

package/hooks/use-pz-params.ts

@@ -0,0 +1,37 @@
+'use client';
+
+import { useParams } from 'next/navigation';
+import settings from 'settings';
+import {
+  decodePzValue,
+  getPzSegmentsConfig,
+  getBuiltInSegments,
+  isLegacyMode
+} from '../utils/pz-segments';
+
+export function usePzParams(): {
+  locale: string;
+  currency: string;
+  [key: string]: string;
+} {
+  const params = useParams() as Record<string, string>;
+
+  if (isLegacyMode(settings)) {
+    return {
+      locale:
+        params.locale ?? settings.localization.defaultLocaleValue,
+      currency:
+        params.currency ?? settings.localization.defaultCurrencyCode
+    };
+  }
+
+  const pzValue = params.pz ?? '';
+  const config = getPzSegmentsConfig(settings);
+  const parsed = decodePzValue(pzValue, config);
+  const builtIn = getBuiltInSegments(parsed, settings);
+
+  return {
+    ...parsed,
+    ...builtIn
+  };
+}

package/instrumentation/index.ts

@@ -3,7 +3,6 @@ import * as Sentry from '@sentry/nextjs';
 
 export async function register() {
   if (process.env.NEXT_RUNTIME === 'nodejs') {
-    await import('./node');
     initSentry('Server');
   }
 

package/instrumentation/node.ts

@@ -1,20 +1,2 @@
-import { NodeSDK } from '@opentelemetry/sdk-node';
-import { OTLPTraceExporter } from '@opentelemetry/exporter-trace-otlp-http';
-import { Resource } from '@opentelemetry/resources';
-import { SemanticResourceAttributes } from '@opentelemetry/semantic-conventions';
-import { SimpleSpanProcessor } from '@opentelemetry/sdk-trace-node';
-
-const sdk = new NodeSDK({
-  resource: new Resource({
-    [SemanticResourceAttributes.SERVICE_NAME]: 'pz-next-app'
-  }),
-  spanProcessor: new SimpleSpanProcessor(
-    new OTLPTraceExporter({
-      url: `${
-        process.env.PZ_DASHBOARD_URL ?? 'http://localhost:3005'
-      }/api/traces`
-    })
-  )
-});
-
-sdk.start();
+// OpenTelemetry tracing is handled by Sentry.
+// Custom NodeSDK setup removed due to version incompatibility with Sentry 10's OpenTelemetry v2.x requirements.

package/jest.config.js

@@ -1,13 +1,19 @@
 const path = require('path');
+const findBaseDir = require('./utils/find-base-dir');
+
+const baseDir = findBaseDir();
 
 module.exports = {
   preset: 'ts-jest',
   testEnvironment: 'node',
   rootDir: path.resolve(__dirname),
-  roots: [],
   testMatch: ['**/*.test.ts'],
   testPathIgnorePatterns: [],
+  roots: [path.resolve(__dirname)],
   transformIgnorePatterns: [],
+  moduleNameMapper: {
+    '^settings$': path.resolve(baseDir, 'src/settings.js')
+  },
   transform: {
     '^.+\\.(tsx?|jsx?|mjs?)$': [
       'ts-jest',