@akinon/next 2.0.59-beta.0 → 2.0.59

package/CHANGELOG.md

@@ -1,10 +1,10 @@
 # @akinon/next
 
-## 2.0.59-beta.0
+## 2.0.59
 
 ### Patch Changes
 
-- cbbbfd75: ZERO-4376: Bootstrap beta cycle (next-main pre-release motor)
+- 9a1a2df: ZERO-4804: Port the deterministic checkout fix to v2 by removing the shared checkout abort controller and the 250 ms delayed validation, and guarding pre-order auto-select middlewares with pre_order preconditions
 
 ## 2.0.58
 

package/data/client/api.ts

@@ -33,6 +33,15 @@ const customBaseQuery: BaseQueryFn<
     ).length > 1
   ) {
     api.abort('Mutation already in progress.');
+
+    // Short-circuit explicitly instead of relying on the abort to settle
+    // before the request reaches the network (ZERO-4638).
+    return {
+      error: {
+        status: 'CUSTOM_ERROR',
+        error: 'Mutation already in progress.'
+      } as FetchBaseQueryError
+    };
   }
 
   const baseQuery = fetchBaseQuery({

package/data/client/checkout.ts

@@ -36,12 +36,6 @@ import {
 import { devLogger } from '@akinon/next/hooks/use-logger-context';
 import { LogLevel } from '@akinon/next/hooks/use-logger';
 
-const getLatestState = async (getState: () => any): Promise<any> => {
-  await new Promise((resolve) => setTimeout(resolve, 250));
-
-  return getState();
-};
-
 const recentLogMessages = new Map<string, number>();
 
 const getStore = async (): Promise<AppStore> => {
@@ -59,6 +53,10 @@ interface CheckoutResponse {
   redirect_url?: string;
 }
 
+// Log-only diagnostics: checkout mutations are never aborted based on these
+// checks anymore. Invalid auto-dispatches are prevented at their source in
+// redux/middlewares/pre-order, and Commerce stays the authority for manual
+// dispatches (ZERO-4638).
 const validateCheckoutState = (
   state: any,
   validations: Array<{
@@ -66,17 +64,10 @@ const validateCheckoutState = (
     errorMessage: string;
     severity?: LogLevel;
     data?: any;
-    action?: () => void;
   }>
 ) => {
   validations.forEach(
-    ({
-      condition,
-      errorMessage,
-      severity = 'error',
-      data: logData,
-      action
-    }) => {
+    ({ condition, errorMessage, severity = 'error', data: logData }) => {
       if (condition(state)) {
         const now = Date.now();
         const lastLogged = recentLogMessages.get(errorMessage) || 0;
@@ -90,15 +81,12 @@ const validateCheckoutState = (
                 errorMessage,
                 logData || state.checkout?.preOrder
               );
-              action?.();
               break;
             case 'warn':
               devLogger.warn(errorMessage, logData || state.checkout?.preOrder);
-              action?.();
               break;
             default:
               devLogger.info(errorMessage, logData || state.checkout?.preOrder);
-              action?.();
           }
         }
       }
@@ -254,6 +242,12 @@ const completeMasterpassPayment = async (
 
 let checkoutAbortController = new AbortController();
 
+/**
+ * @deprecated Checkout mutations no longer share an abort signal; nothing in
+ * the core aborts this controller anymore. Premature auto-dispatches are
+ * prevented in redux/middlewares/pre-order instead (ZERO-4638). Kept only so
+ * existing external imports keep compiling.
+ */
 export const getCheckoutAbortSignal = () => {
   if (checkoutAbortController.signal.aborted) {
     checkoutAbortController = new AbortController();
@@ -261,11 +255,6 @@ export const getCheckoutAbortSignal = () => {
   return checkoutAbortController.signal;
 };
 
-const abortCheckout = () => {
-  checkoutAbortController.abort();
-  checkoutAbortController = new AbortController();
-};
-
 export const checkoutApi = api.injectEndpoints({
   endpoints: (build) => ({
     fetchCheckout: build.query<CheckoutResponse, void>({
@@ -452,13 +441,12 @@ export const checkoutApi = api.injectEndpoints({
         method: 'POST',
         body: {
           delivery_option: String(pk)
-        },
-        signal: getCheckoutAbortSignal()
+        }
       }),
       async onQueryStarted(arg, { dispatch, queryFulfilled, getState }) {
         dispatch(setShippingStepBusy(true));
 
-        const state = await getLatestState(getState);
+        const state = getState();
 
         validateCheckoutState(state, [
           {
@@ -468,8 +456,7 @@ export const checkoutApi = api.injectEndpoints({
               return preOrder?.basket?.basketitem_set?.length === 0;
             },
             errorMessage:
-              'Your shopping basket is empty. Please add items to your basket before selecting a delivery option.',
-            action: () => abortCheckout()
+              'Your shopping basket is empty. Please add items to your basket before selecting a delivery option.'
           }
         ]);
 
@@ -490,13 +477,12 @@ export const checkoutApi = api.injectEndpoints({
         body: {
           shipping_address: String(shippingAddressPk),
           billing_address: String(billingAddressPk)
-        },
-        signal: getCheckoutAbortSignal()
+        }
       }),
       async onQueryStarted(arg, { dispatch, queryFulfilled, getState }) {
         dispatch(setShippingStepBusy(true));
 
-        const state = await getLatestState(getState);
+        const state = getState();
 
         validateCheckoutState(state, [
           {
@@ -509,8 +495,7 @@ export const checkoutApi = api.injectEndpoints({
                 : false;
             },
             errorMessage:
-              'You need to select a delivery option before setting your addresses. Dispatch setAddresses action after delivery option selection.',
-            action: () => abortCheckout()
+              'You need to select a delivery option before setting your addresses. Dispatch setAddresses action after delivery option selection.'
           }
         ]);
 
@@ -530,13 +515,12 @@ export const checkoutApi = api.injectEndpoints({
         method: 'POST',
         body: {
           shipping_option: String(pk)
-        },
-        signal: getCheckoutAbortSignal()
+        }
       }),
       async onQueryStarted(arg, { dispatch, queryFulfilled, getState }) {
         dispatch(setShippingStepBusy(true));
 
-        const state = await getLatestState(getState);
+        const state = getState();
 
         validateCheckoutState(state, [
           {
@@ -546,8 +530,7 @@ export const checkoutApi = api.injectEndpoints({
               return !preOrder?.billing_address;
             },
             errorMessage:
-              'You need to provide a billing address before selecting a shipping option. Dispatch setShippingOption action after billing address selection.',
-            action: () => abortCheckout()
+              'You need to provide a billing address before selecting a shipping option. Dispatch setShippingOption action after billing address selection.'
           },
           {
             condition: (state) => {
@@ -556,8 +539,7 @@ export const checkoutApi = api.injectEndpoints({
               return !preOrder?.shipping_address;
             },
             errorMessage:
-              'You need to provide a shipping address before selecting a shipping option. Dispatch setShippingOption action after shipping address selection.',
-            action: () => abortCheckout()
+              'You need to provide a shipping address before selecting a shipping option. Dispatch setShippingOption action after shipping address selection.'
           }
         ]);
 
@@ -614,8 +596,7 @@ export const checkoutApi = api.injectEndpoints({
         method: 'POST',
         body: {
           payment_option: String(pk)
-        },
-        signal: getCheckoutAbortSignal()
+        }
       }),
       async onQueryStarted(arg, { dispatch, queryFulfilled, getState }) {
         dispatch(setPaymentStepBusy(true));
@@ -624,7 +605,7 @@ export const checkoutApi = api.injectEndpoints({
         dispatch(setSelectedBankAccountPk(null));
         dispatch(setCardType(null));
 
-        const state = await getLatestState(getState);
+        const state = getState();
 
         validateCheckoutState(state, [
           {
@@ -634,8 +615,7 @@ export const checkoutApi = api.injectEndpoints({
               return !preOrder?.shipping_option?.pk;
             },
             errorMessage:
-              'You need to select a shipping option before choosing a payment method. Dispatch setPaymentOption action after shipping option selection.',
-            action: () => abortCheckout()
+              'You need to select a shipping option before choosing a payment method. Dispatch setPaymentOption action after shipping option selection.'
           }
         ]);
 

package/package.json

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

package/redux/middlewares/pre-order/address.ts

@@ -14,7 +14,7 @@ export const setAddressMiddleware: Middleware = ({
       return result;
     }
 
-    const { addressList: addresses } = getState().checkout;
+    const { addressList: addresses, deliveryOptions } = getState().checkout;
     const { endpoints: apiEndpoints } = checkoutApi;
 
     const hasNoAddresses =
@@ -31,6 +31,14 @@ export const setAddressMiddleware: Middleware = ({
       isCustomerDelivery &&
       firstAddressPk
     ) {
+      // Commerce requires a delivery option on the pre_order before addresses
+      // can be selected when delivery options are offered. Returning null
+      // keeps the pre-fix suppression of outer middlewares for this action
+      // (ZERO-4638).
+      if (deliveryOptions?.length > 0 && !preOrder.delivery_option?.pk) {
+        return null;
+      }
+
       dispatch(
         apiEndpoints.setAddresses.initiate({
           shippingAddressPk: firstAddressPk,

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

@@ -23,6 +23,13 @@ export const deliveryOptionMiddleware: Middleware = ({
       )?.pk;
 
       if (customerDeliveryOption) {
+        // A delivery option cannot be selected for an empty basket. Returning
+        // null keeps the pre-fix suppression of outer middlewares for this
+        // action (ZERO-4638).
+        if (preOrder.basket?.basketitem_set?.length === 0) {
+          return null;
+        }
+
         dispatch(
           apiEndpoints.setDeliveryOption.initiate(customerDeliveryOption)
         );

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

@@ -18,6 +18,13 @@ export const paymentOptionMiddleware: Middleware = ({
     const { endpoints: apiEndpoints } = checkoutApi;
 
     if (!preOrder?.payment_option && paymentOptions.length > 0) {
+      // Commerce requires a shipping option on the pre_order before a payment
+      // option can be selected. Returning null keeps the pre-fix suppression
+      // of outer middlewares for this action (ZERO-4638).
+      if (!preOrder.shipping_option?.pk) {
+        return null;
+      }
+
       const firstPaymentOptionPk = paymentOptions[0]?.pk;
 
       dispatch(apiEndpoints.setPaymentOption.initiate(firstPaymentOptionPk));

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

@@ -27,6 +27,16 @@ export const shippingOptionMiddleware: Middleware = ({
       const defaultShippingOption = shippingOptions[0]?.pk;
 
       if (defaultShippingOption) {
+        // Commerce requires both addresses on the pre_order before a shipping
+        // option can be selected; auto-dispatching earlier (e.g. from the
+        // early Checkout refetch during a guest's first address save) races
+        // the in-flight AddressSelectionPage request. Returning null keeps
+        // the pre-fix suppression of outer middlewares for this action
+        // (ZERO-4638).
+        if (!preOrder.billing_address || !preOrder.shipping_address) {
+          return null;
+        }
+
         dispatch(
           apiEndpoints.setShippingOption.initiate(defaultShippingOption)
         );