@akinon/next 1.89.0-rc.6 → 1.89.0-rc.8

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @akinon/next
 
+## 1.89.0-rc.8
+
+### Minor Changes
+
+- d8fad39: ZERO-3370: include plugins test to build stage
+- 943a239: ZERO-3370: add allowJs in akinon-next test tsconfig
+- 0cabbda: ZERO-3370: replace inline monorepo check with reusable utility
+
+## 1.89.0-rc.7
+
+### Minor Changes
+
+- dfaceff: ZERO-3356: Add useLoyaltyAvailability hook and update checkout state management
+
 ## 1.89.0-rc.6
 
 ## 1.89.0-rc.5

package/__tests__/tsconfig.json

@@ -15,7 +15,8 @@
     "preserveWatchOutput": true,
     "skipLibCheck": true,
     "strict": true,
-    "jsx": "react-jsx"
+    "jsx": "react-jsx",
+    "allowJs": true
   },
   "exclude": ["node_modules"],
   "include": [".", "../."]

package/bin/pz-run-tests.js

@@ -5,60 +5,95 @@ const path = require('path');
 const fs = require('fs');
 const glob = require('glob');
 const findBaseDir = require('../utils/find-base-dir');
+const checkMonorepo = require('../utils/check-monorepo');
 
+const IS_MONOREPO = checkMonorepo() !== null;
 const BASE_DIR = findBaseDir();
+const PLUGINS = require(path.join(BASE_DIR, 'src', 'plugins.js'));
 
-function isJestAvailable() {
+function findPluginTestFiles(akinonNextPackagePath) {
+  const pluginsRootPath = path.join(
+    akinonNextPackagePath,
+    '..',
+    '..',
+    IS_MONOREPO ? 'packages' : '@akinon'
+  );
+
+  if (!fs.existsSync(pluginsRootPath)) {
+    console.log('Plugins directory not found:', pluginsRootPath);
+    return [];
+  }
+
+  return PLUGINS.reduce((testFiles, pluginName) => {
+    const pluginDirectoryPath = path.join(pluginsRootPath, pluginName);
+    if (fs.existsSync(pluginDirectoryPath)) {
+      const pluginTestFiles = glob.sync('**/*.test.ts', {
+        cwd: pluginDirectoryPath,
+        absolute: true
+      });
+
+      return testFiles.concat(pluginTestFiles);
+    } else {
+      console.log(`Plugin directory not found: ${pluginName}`);
+    }
+    return testFiles;
+  }, []);
+}
+
+function isJestInstalled() {
   try {
-    const jestPath = path.join(BASE_DIR, 'node_modules', '.bin', 'jest');
-    return fs.existsSync(jestPath);
+    const jestExecutablePath = path.join(
+      BASE_DIR,
+      'node_modules',
+      '.bin',
+      'jest'
+    );
+    return fs.existsSync(jestExecutablePath);
   } catch (error) {
     return false;
   }
 }
 
-function findAkinonNextPath() {
-  const insideNodeModules = __dirname.includes('node_modules');
-
-  if (insideNodeModules) {
+function getAkinonNextPackagePath() {
+  if (!IS_MONOREPO) {
     return path.resolve(__dirname, '..');
   }
 
   return path.resolve(__dirname, '../../../packages/akinon-next');
 }
 
-if (!isJestAvailable()) {
-  console.error('\x1b[31mError: Jest is not available!\x1b[0m');
+if (!isJestInstalled()) {
+  console.error('\x1b[31mError: Jest is not installed in the project!\x1b[0m');
   console.error(
-    'Please make sure you have installed all dependencies by running:'
+    'Please install all dependencies by running one of the following commands:'
   );
   console.error('  npm install');
-  console.error('or');
   console.error('  yarn install');
   process.exit(1);
 }
 
-const jestPath = path.join(BASE_DIR, 'node_modules', '.bin', 'jest');
-const akinonNextPath = findAkinonNextPath();
+const jestExecutablePath = path.join(BASE_DIR, 'node_modules', '.bin', 'jest');
+const akinonNextPackagePath = getAkinonNextPackagePath();
 
-const testFiles = glob.sync('__tests__/**/*.test.ts', {
-  cwd: akinonNextPath,
-  absolute: true
-});
+const testFiles = [
+  ...glob.sync('__tests__/**/*.test.ts', {
+    cwd: akinonNextPackagePath,
+    absolute: true
+  }),
+  ...findPluginTestFiles(akinonNextPackagePath)
+];
 
-const jestArgs = [
+console.log(`Found ${testFiles.length} test files to run`);
+
+const jestArguments = [
   ...testFiles,
-  `--config ${path.join(akinonNextPath, 'jest.config.js')}`,
+  `--config ${path.join(akinonNextPackagePath, 'jest.config.js')}`,
   '--runTestsByPath',
   '--passWithNoTests'
 ];
 
-const jestProcess = spawn(jestPath, jestArgs, {
-  cwd: akinonNextPath,
+spawn(jestExecutablePath, jestArguments, {
+  cwd: akinonNextPackagePath,
   stdio: 'inherit',
   shell: true
 });
-
-jestProcess.on('close', (code) => {
-  process.exit(code);
-});

package/components/price.tsx

@@ -55,8 +55,8 @@ export const Price = (props: NumericFormatProps & PriceProps) => {
       : formattedValue;
 
   const currentCurrencyDecimalScale = Settings.localization.currencies.find(
-    (currency) => currency.code === currencyCode_
-  ).decimalScale;
+    (currency) => currency?.code === currencyCode_
+  )?.decimalScale;
 
   return (
     <NumericFormat

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/jest.config.js

@@ -4,7 +4,7 @@ module.exports = {
   preset: 'ts-jest',
   testEnvironment: 'node',
   rootDir: path.resolve(__dirname),
-  roots: [path.resolve(__dirname, '__tests__')],
+  roots: [],
   testMatch: ['**/*.test.ts'],
   testPathIgnorePatterns: [],
   transformIgnorePatterns: [],

package/package.json

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

package/redux/middlewares/checkout.ts

@@ -20,7 +20,8 @@ import {
   setShippingOptions,
   setHepsipayAvailability,
   setWalletPaymentData,
-  setPayOnDeliveryOtpModalActive
+  setPayOnDeliveryOtpModalActive,
+  setUnavailablePaymentOptions
 } from '../../redux/reducers/checkout';
 import { RootState, TypedDispatch } from 'redux/store';
 import { checkoutApi } from '../../data/client/checkout';
@@ -148,6 +149,14 @@ export const contextListMiddleware: Middleware = ({
           dispatch(setPaymentOptions(context.page_context.payment_options));
         }
 
+        if (context.page_context.unavailable_options) {
+          dispatch(
+            setUnavailablePaymentOptions(
+              context.page_context.unavailable_options
+            )
+          );
+        }
+
         if (context.page_context.credit_payment_options) {
           dispatch(
             setCreditPaymentOptions(context.page_context.credit_payment_options)

package/redux/reducers/checkout.ts

@@ -40,6 +40,7 @@ export interface CheckoutState {
   shippingOptions: ShippingOption[];
   dataSourceShippingOptions: DataSource[];
   paymentOptions: PaymentOption[];
+  unavailablePaymentOptions: PaymentOption[];
   creditPaymentOptions: CheckoutCreditPaymentOption[];
   selectedCreditPaymentPk: number;
   paymentChoices: PaymentChoice[];
@@ -94,6 +95,7 @@ const initialState: CheckoutState = {
   shippingOptions: [],
   dataSourceShippingOptions: [],
   paymentOptions: [],
+  unavailablePaymentOptions: [],
   creditPaymentOptions: [],
   selectedCreditPaymentPk: null,
   paymentChoices: [],
@@ -157,6 +159,9 @@ const checkoutSlice = createSlice({
     setPaymentOptions(state, { payload }) {
       state.paymentOptions = payload;
     },
+    setUnavailablePaymentOptions(state, { payload }) {
+      state.unavailablePaymentOptions = payload;
+    },
     setPaymentChoices(state, { payload }) {
       state.paymentChoices = payload;
     },
@@ -218,9 +223,10 @@ export const {
   setShippingOptions,
   setDataSourceShippingOptions,
   setPaymentOptions,
+  setUnavailablePaymentOptions,
+  setPaymentChoices,
   setCreditPaymentOptions,
   setSelectedCreditPaymentPk,
-  setPaymentChoices,
   setCardType,
   setInstallmentOptions,
   setBankAccounts,