@faststore/core 4.10.0-dev.0 → 4.10.0-dev.1

package/@generated/graphql.ts

@@ -803,7 +803,10 @@ export type PickupPointDistance = {
 export type PickupPoints = {
   /** List of pickup point distances for the given location. */
   pickupPointDistances: Maybe<Array<Maybe<PickupPointDistance>>>;
-  /** Hash of the pickup points data. */
+  /**
+   * Not returned by Intelligent Search pickup-point-availability. Always null.
+   * @deprecated Not returned by Intelligent Search pickup-point-availability. Always null.
+   */
   pickupPointsHash: Maybe<Scalars['String']['output']>;
 };
 
@@ -913,7 +916,7 @@ export type Query = {
   orderEntryOperation: Maybe<StoreOrderEntryOperationStatus>;
   /** Returns the items in an orderForm by its ID. */
   orderFormItems: Array<StoreOrderFormCartItem>;
-  /** Returns a list of pickup points near to the given geo coordinates. */
+  /** Returns pickup points that have products available for the shopper location and sales channel. */
   pickupPoints: Maybe<PickupPoints>;
   /** Returns the details of a product based on the specified locator. */
   product: StoreProduct;
@@ -999,7 +1002,10 @@ export type QueryOrderFormItemsArgs = {
 
 
 export type QueryPickupPointsArgs = {
+  channel: InputMaybe<Scalars['String']['input']>;
+  country: InputMaybe<Scalars['String']['input']>;
   geoCoordinates: InputMaybe<IStoreGeoCoordinates>;
+  postalCode: InputMaybe<Scalars['String']['input']>;
 };
 
 
@@ -2961,6 +2967,9 @@ export type CartProductItemFragment = { sku: string, name: string, unitMultiplie
 
 export type ClientPickupPointsQueryQueryVariables = Exact<{
   geoCoordinates: InputMaybe<IStoreGeoCoordinates>;
+  postalCode: InputMaybe<Scalars['String']['input']>;
+  country: InputMaybe<Scalars['String']['input']>;
+  channel: InputMaybe<Scalars['String']['input']>;
 }>;
 
 
@@ -3663,7 +3672,7 @@ export const ProcessOrderAuthorizationMutationDocument = {"__meta__":{"operation
 export const ValidateUserDocument = {"__meta__":{"operationName":"ValidateUser","operationHash":"32f99c73c3de958b64d6bece1afe800469f54548"}} as unknown as TypedDocumentString<ValidateUserQuery, ValidateUserQueryVariables>;
 export const StartRecommendationSessionDocument = {"__meta__":{"operationName":"StartRecommendationSession","operationHash":"1def6438c0cd87b85002411ac7326c221f192583"}} as unknown as TypedDocumentString<StartRecommendationSessionMutation, StartRecommendationSessionMutationVariables>;
 export const ValidateCartMutationDocument = {"__meta__":{"operationName":"ValidateCartMutation","operationHash":"3c71b0d3fc2bade14df68abfa271858beb361b12"}} as unknown as TypedDocumentString<ValidateCartMutationMutation, ValidateCartMutationMutationVariables>;
-export const ClientPickupPointsQueryDocument = {"__meta__":{"operationName":"ClientPickupPointsQuery","operationHash":"3fa04e88c811fcb5ece7206fd5aa745bdbc143a8"}} as unknown as TypedDocumentString<ClientPickupPointsQueryQuery, ClientPickupPointsQueryQueryVariables>;
+export const ClientPickupPointsQueryDocument = {"__meta__":{"operationName":"ClientPickupPointsQuery","operationHash":"0f70fea0ad598b50c0ca9c086860907881a68e4f"}} as unknown as TypedDocumentString<ClientPickupPointsQueryQuery, ClientPickupPointsQueryQueryVariables>;
 export const SubscribeToNewsletterDocument = {"__meta__":{"operationName":"SubscribeToNewsletter","operationHash":"feb7005103a859e2bc8cf2360d568806fd88deba"}} as unknown as TypedDocumentString<SubscribeToNewsletterMutation, SubscribeToNewsletterMutationVariables>;
 export const StartOrderEntryOperationMutationDocument = {"__meta__":{"operationName":"StartOrderEntryOperationMutation","operationHash":"78c50fbf9b85d03dbeac9b05b06405217f2ec440"}} as unknown as TypedDocumentString<StartOrderEntryOperationMutationMutation, StartOrderEntryOperationMutationMutationVariables>;
 export const OrderEntryOperationQueryDocument = {"__meta__":{"operationName":"OrderEntryOperationQuery","operationHash":"93fc6c5c593dd4c82686fdf063fe419760297e54"}} as unknown as TypedDocumentString<OrderEntryOperationQueryQuery, OrderEntryOperationQueryQueryVariables>;

package/@generated/persisted-documents.json

@@ -16,7 +16,7 @@
   "32f99c73c3de958b64d6bece1afe800469f54548": "query ValidateUser { validateUser { isValid } }",
   "1def6438c0cd87b85002411ac7326c221f192583": "mutation StartRecommendationSession { startRecommendationSession }",
   "3c71b0d3fc2bade14df68abfa271858beb361b12": "fragment CartItem on StoreOffer { isGift itemOffered { ...CartProductItem } listPrice listPriceWithTaxes price priceToken priceWithTaxes quantity seller { identifier } } fragment CartMessage on StoreCartMessage { status text } fragment CartProductItem on StoreProduct { additionalProperty { name propertyID value valueReference } brand { name } gtin image { alternateName url } isVariantOf { name productGroupID skuVariants { activeVariations availableVariations slugsMap } } name sku unitMultiplier } mutation ValidateCartMutation($cart: IStoreCart!, $session: IStoreSession!) { validateCart(cart: $cart, session: $session) { messages { ...CartMessage } order { acceptedOffer { ...CartItem } orderNumber salesChannel shouldSplitItem } } }",
-  "3fa04e88c811fcb5ece7206fd5aa745bdbc143a8": "query ClientPickupPointsQuery($geoCoordinates: IStoreGeoCoordinates) { pickupPoints(geoCoordinates: $geoCoordinates) { pickupPointDistances { address { city number postalCode state street } distance isActive pickupId pickupName } } }",
+  "0f70fea0ad598b50c0ca9c086860907881a68e4f": "query ClientPickupPointsQuery($channel: String, $country: String, $geoCoordinates: IStoreGeoCoordinates, $postalCode: String) { pickupPoints( geoCoordinates: $geoCoordinates postalCode: $postalCode country: $country channel: $channel ) { pickupPointDistances { address { city number postalCode state street } distance isActive pickupId pickupName } } }",
   "feb7005103a859e2bc8cf2360d568806fd88deba": "mutation SubscribeToNewsletter($data: IPersonNewsletter!) { subscribeToNewsletter(data: $data) { id } }",
   "78c50fbf9b85d03dbeac9b05b06405217f2ec440": "mutation StartOrderEntryOperationMutation($data: IOrderEntryOperation!) { startOrderEntryOperation(data: $data) { operationId } }",
   "93fc6c5c593dd4c82686fdf063fe419760297e54": "query OrderEntryOperationQuery($operationId: String!) { orderEntryOperation(operationId: $operationId) { entityId message missingItems { itemId itemName reason } status } }",

package/@generated/schema.graphql

@@ -764,8 +764,10 @@ type PickupPointDistance {
 type PickupPoints {
   """List of pickup point distances for the given location."""
   pickupPointDistances: [PickupPointDistance]
-  """Hash of the pickup points data."""
-  pickupPointsHash: String
+  """
+  Not returned by Intelligent Search pickup-point-availability. Always null.
+  """
+  pickupPointsHash: String @deprecated(reason: "Not returned by Intelligent Search pickup-point-availability. Always null.")
 }
 
 type PickupStoreInfo {
@@ -1008,11 +1010,25 @@ type Query {
   Returns whether the current authenticated user belongs to a B2B organization unit.
   """
   isOrganizationMember: Boolean! @auth @cacheControl(scope: "private", sMaxAge: 300, staleWhileRevalidate: 3600)
-  """Returns a list of pickup points near to the given geo coordinates."""
+  """
+  Returns pickup points that have products available for the shopper location and sales channel.
+  """
   pickupPoints(
-    """Geo coordinates input."""
+    """
+    Geo coordinates used to sort pickup points by distance (`longitude,latitude`). Without `postalCode`, the segment postal code stays in place.
+    """
     geoCoordinates: IStoreGeoCoordinates
-  ): PickupPoints @cacheControl(scope: "public", sMaxAge: 300, staleWhileRevalidate: 3600)
+    """
+    Postal code. When it differs from the segment cookie, delivery hashes are omitted so a simulated address is not resolved against the previous CEP.
+    """
+    postalCode: String
+    """Three-letter country code for `postalCode`."""
+    country: String
+    """
+    Shopper channel, the same JSON string used by the `channel` search facet. When set, its sales channel is used instead of the store default.
+    """
+    channel: String
+  ): PickupPoints @cacheControl(scope: "private", sMaxAge: 300, staleWhileRevalidate: 3600)
   """Returns the status of an Order Entry Service operation by its ID."""
   orderEntryOperation(operationId: String!): StoreOrderEntryOperationStatus @auth
   """Returns the items in an orderForm by its ID."""

package/CHANGELOG.md

@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [4.10.0-dev.1](https://github.com/vtex/faststore/compare/v4.10.0-dev.0...v4.10.0-dev.1) (2026-10-15)
+
+### Bug Fixes
+
+- **core:** drop a late pickup response and clear a failed simulation ([fa86e1c](https://github.com/vtex/faststore/commit/fa86e1c0a5026d73e5d869131b5647b39b2913f1))
+- honor a postal code override without a country ([4a3f83c](https://github.com/vtex/faststore/commit/4a3f83cb56a9aef1a1802a493ea167be3bf3e618))
+- ignore stale pickup point responses ([0936343](https://github.com/vtex/faststore/commit/0936343f334133e067aef9eded4821114191f08e))
+- refresh pickup points when the shopper channel changes ([0a0e370](https://github.com/vtex/faststore/commit/0a0e370a270f8c6ab5de89a1889c2f808711077a))
+- refresh stored pickup points for the current channel ([fac72e3](https://github.com/vtex/faststore/commit/fac72e3b02ee3997f413f98fdd92240f0db365a7))
+- retry pickup points after a failed request ([6ead323](https://github.com/vtex/faststore/commit/6ead323d5d7170c1649d3d707dfe32d64807c04f))
+- use the shopper sales channel for pickup points ([5034eb6](https://github.com/vtex/faststore/commit/5034eb6f564c154cf7a20bcf287d9365b10da022))
+
+### Features
+
+- list pickup points from Intelligent Search ([6dfb717](https://github.com/vtex/faststore/commit/6dfb71779c107276620a671e8739d2cd286103fe))
+
 # [4.10.0-dev.0](https://github.com/vtex/faststore/compare/v4.9.3-dev.2...v4.10.0-dev.0) (2026-10-08)
 
 ### Features

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@faststore/core",
-  "version": "4.10.0-dev.0",
+  "version": "4.10.0-dev.1",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -71,11 +71,11 @@
     "style-loader": "^3.3.1",
     "swr": "^2.2.5",
     "use-sync-external-store": "^1.6.0",
-    "@faststore/api": "4.10.0-dev.0",
-    "@faststore/diagnostics": "4.10.0-dev.0",
-    "@faststore/lighthouse": "4.10.0-dev.0",
-    "@faststore/ui": "4.10.0-dev.0",
-    "@faststore/sdk": "4.10.0-dev.0"
+    "@faststore/api": "4.10.0-dev.1",
+    "@faststore/diagnostics": "4.10.0-dev.1",
+    "@faststore/lighthouse": "4.10.0-dev.1",
+    "@faststore/ui": "4.10.0-dev.1",
+    "@faststore/sdk": "4.10.0-dev.1"
   },
   "devDependencies": {
     "@cypress/code-coverage": "^3.12.1",

package/src/components/region/RegionSlider/RegionSlider.tsx

@@ -74,6 +74,7 @@ function RegionSlider() {
   )
   const pickupPoints = useMemo(
     () =>
+      pickupPointsSimulation?.postalCode ||
       pickupPointsSimulation?.geoCoordinates
         ? pickupPointsSimulation.pickupPoints
         : statePickupPoints,

package/src/sdk/deliveryPromise/provider.tsx

@@ -6,6 +6,7 @@ import {
   useEffect,
   useMemo,
   useReducer,
+  useRef,
 } from 'react'
 
 import { useSession } from 'src/sdk/session'
@@ -24,32 +25,150 @@ type Context = DeliveryPromiseReducerState & {
   dispatchDeliveryPromiseAction: Dispatch<DeliveryPromiseReducerAction>
 }
 
+export function pickupLocationKey(
+  channel?: string | null,
+  country?: string | null
+) {
+  return `${channel ?? ''}\0${country ?? ''}`
+}
+
+/** A cleared update flag still refetches when the shopper channel or country changes. */
+export function shouldRefreshPickupPoints(
+  postalCode: string | null | undefined,
+  shouldUpdatePickupPoints: boolean,
+  previousLocationKey: string | null,
+  locationKey: string,
+  failedLocationKey: string | null = null,
+  hasPersistedList = false
+) {
+  if (!postalCode) {
+    return false
+  }
+
+  if (shouldUpdatePickupPoints) {
+    return true
+  }
+
+  if (failedLocationKey === locationKey) {
+    return false
+  }
+
+  // A list restored from storage has no channel recorded for this page load.
+  if (previousLocationKey === null && hasPersistedList) {
+    return true
+  }
+
+  const locationChanged =
+    previousLocationKey !== null && previousLocationKey !== locationKey
+
+  return locationChanged
+}
+
+export function isCurrentPickupRequest(
+  requestId: number,
+  latestRequestId: number
+) {
+  return requestId === latestRequestId
+}
+
 const DeliveryPromiseContext = createContext<Context | undefined>(undefined)
 
 export function DeliveryPromiseProvider({
   children,
 }: PropsWithChildren<unknown>) {
-  const { postalCode, geoCoordinates } = useSession()
+  const { postalCode, geoCoordinates, country, channel } = useSession()
   const [state, dispatch] = useReducer(
     deliveryPromiseReducer,
     undefined,
     initializeDeliveryPromiseState
   )
+  const fetchedLocationKey = useRef<string | null>(null)
+  const failedLocationKey = useRef<string | null>(null)
+  const pickupRequestId = useRef(0)
 
   useEffect(() => {
-    if (!postalCode || !state.shouldUpdatePickupPoints) {
+    const locationKey = pickupLocationKey(channel, country)
+    const hasPersistedList = (state.pickupPoints?.length ?? 0) > 0
+
+    if (
+      !shouldRefreshPickupPoints(
+        postalCode,
+        state.shouldUpdatePickupPoints,
+        fetchedLocationKey.current,
+        locationKey,
+        failedLocationKey.current,
+        hasPersistedList
+      )
+    ) {
       return
     }
 
+    const currentRequest = ++pickupRequestId.current
+    failedLocationKey.current = null
+
     async function fetchPickupPoints() {
-      const newPickupPoints = await getPickupPoints({
-        geoCoordinates:
-          state.simulatePickupPoints &&
-          state.pickupPointsSimulation?.geoCoordinates
-            ? state.pickupPointsSimulation.geoCoordinates
+      const simulation = state.simulatePickupPoints
+        ? state.pickupPointsSimulation
+        : undefined
+
+      try {
+        const newPickupPoints = await getPickupPoints({
+          geoCoordinates: simulation
+            ? (simulation.geoCoordinates ?? null)
             : geoCoordinates,
-      })
+          postalCode: simulation
+            ? (simulation.postalCode ?? postalCode)
+            : postalCode,
+          country: simulation ? (simulation.country ?? country) : country,
+          channel,
+        })
 
+        if (!isCurrentPickupRequest(currentRequest, pickupRequestId.current)) {
+          return
+        }
+
+        fetchedLocationKey.current = locationKey
+        applyPickupPoints(newPickupPoints ?? [])
+      } catch (error) {
+        if (!isCurrentPickupRequest(currentRequest, pickupRequestId.current)) {
+          return
+        }
+
+        console.warn('Failed to fetch pickup points:', error)
+        failedLocationKey.current = locationKey
+
+        if (state.simulatePickupPoints) {
+          const failedSimulation = {
+            pickupPointsSimulation: {
+              ...state.pickupPointsSimulation,
+              pickupPoints: [],
+            },
+            shouldUpdatePickupPoints: false,
+            simulatePickupPoints: false,
+          }
+
+          deliveryPromiseStore.set(failedSimulation)
+          dispatch({
+            type: 'updateDeliveryPromiseState',
+            payload: failedSimulation,
+          })
+
+          return
+        }
+
+        dispatch({
+          type: 'updateDeliveryPromiseState',
+          payload: {
+            shouldUpdatePickupPoints: false,
+            simulatePickupPoints: false,
+          },
+        })
+      }
+    }
+
+    function applyPickupPoints(
+      newPickupPoints: NonNullable<Awaited<ReturnType<typeof getPickupPoints>>>
+    ) {
       // Pickup points simulation
       if (state.simulatePickupPoints) {
         deliveryPromiseStore.set({
@@ -91,7 +210,17 @@ export function DeliveryPromiseProvider({
     }
 
     fetchPickupPoints()
-  }, [state.shouldUpdatePickupPoints, postalCode])
+
+    return () => {
+      pickupRequestId.current += 1
+    }
+  }, [
+    state.shouldUpdatePickupPoints,
+    state.pickupPoints?.length,
+    postalCode,
+    channel,
+    country,
+  ])
 
   const value = useMemo(
     () => ({

package/src/sdk/deliveryPromise/queries.ts

@@ -10,8 +10,16 @@ import { request } from 'src/sdk/graphql/request'
 const pickupPointsQuery = gql(`
   query ClientPickupPointsQuery(
     $geoCoordinates: IStoreGeoCoordinates
+    $postalCode: String
+    $country: String
+    $channel: String
   ) {
-    pickupPoints(geoCoordinates: $geoCoordinates) {
+    pickupPoints(
+      geoCoordinates: $geoCoordinates
+      postalCode: $postalCode
+      country: $country
+      channel: $channel
+    ) {
       pickupPointDistances {
         pickupId
         distance
@@ -34,21 +42,30 @@ type GetPickupPointsProps = {
     latitude: number
     longitude: number
   } | null
+  postalCode?: string | null
+  country?: string | null
+  channel?: string | null
 }
 
 export const getPickupPoints = async ({
   geoCoordinates,
+  postalCode,
+  country,
+  channel,
 }: GetPickupPointsProps) => {
   if (!deliveryPromise.enabled) {
     return []
   }
 
-  if (!geoCoordinates) {
+  if (!postalCode && !geoCoordinates) {
     return []
   }
 
   const variables = {
     geoCoordinates: geoCoordinates ?? undefined,
+    postalCode: postalCode ?? undefined,
+    country: country ?? undefined,
+    channel: channel ?? undefined,
   }
 
   const data = await request<

package/src/sdk/deliveryPromise/reducer.ts

@@ -5,11 +5,15 @@ import type { PickupPoint } from '.'
 export type PickupPointsSimulation = {
   pickupPoints?: PickupPoint[]
   geoCoordinates: Session['geoCoordinates'] | null
+  postalCode?: string | null
+  country?: string | null
 }
 
 export const initialPickupPointsSimulation: PickupPointsSimulation = {
   pickupPoints: [],
   geoCoordinates: null,
+  postalCode: null,
+  country: null,
 }
 
 export type DeliveryPromiseReducerState = {
@@ -89,7 +93,9 @@ export const deliveryPromiseReducer = (
           simulatePickupPoints,
           pickupPointsSimulation: {
             ...state.pickupPointsSimulation,
-            geoCoordinates: validatedSession.geoCoordinates,
+            geoCoordinates: validatedSession.geoCoordinates ?? null,
+            postalCode: validatedSession.postalCode ?? null,
+            country: validatedSession.country ?? null,
           },
           shouldUpdatePickupPoints: true,
         }