@faststore/core 3.81.0 → 3.82.2

package/.turbo/turbo-build.log

@@ -1,23 +1,23 @@
 
-> @faststore/core@3.80.0 prebuild /home/runner/work/faststore/faststore/packages/core
+> @faststore/core@3.82.0 prebuild /home/runner/work/faststore/faststore/packages/core
 > na run partytown && na run generate
 
 
-> @faststore/core@3.80.0 partytown /home/runner/work/faststore/faststore/packages/core
+> @faststore/core@3.82.0 partytown /home/runner/work/faststore/faststore/packages/core
 > partytown copylib ./public/~partytown
 
 Partytown lib copied to: /home/runner/work/faststore/faststore/packages/core/public/~partytown
 
-> @faststore/core@3.80.0 generate /home/runner/work/faststore/faststore/packages/core
+> @faststore/core@3.82.0 generate /home/runner/work/faststore/faststore/packages/core
 > na run generate:schema && na run generate:codegen && na run format:generated
 
 
-> @faststore/core@3.80.0 generate:schema /home/runner/work/faststore/faststore/packages/core
+> @faststore/core@3.82.0 generate:schema /home/runner/work/faststore/faststore/packages/core
 > tsx src/server/generator/generateGraphQLSchemaFile.ts
 
 Schema GraphQL file generated successfully
 
-> @faststore/core@3.80.0 generate:codegen /home/runner/work/faststore/faststore/packages/core
+> @faststore/core@3.82.0 generate:codegen /home/runner/work/faststore/faststore/packages/core
 > graphql-codegen
 
 [STARTED] Parse Configuration
@@ -37,11 +37,11 @@ Running lifecycle hook "afterStart" scripts...
 [CLI] Loading Documents
 [CLI] Generating output
 
-> @faststore/core@3.80.0 format:generated /home/runner/work/faststore/faststore/packages/core
+> @faststore/core@3.82.0 format:generated /home/runner/work/faststore/faststore/packages/core
 > prettier --write "@generated/**/*.{ts,js,tsx,jsx,json}" --loglevel error
 
 
-> @faststore/core@3.80.0 build /home/runner/work/faststore/faststore/packages/core
+> @faststore/core@3.82.0 build /home/runner/work/faststore/faststore/packages/core
 > next build
 
 ⚠ No build cache found. Please configure build caching for faster rebuilds. Read more: https://nextjs.org/docs/messages/no-cache
@@ -65,52 +65,52 @@ Browserslist: browsers data (caniuse-lite) is 8 months old. Please run:
    Collecting page data ...
    Generating static pages (0/6) ...
 
   Generating static pages (1/6) 
-
   Generating static pages (2/6) 
 Warning: Dynamic Content not found for the page: home. Refer to the Dynamic Content documentation at https://developers.vtex.com/docs/guides/faststore/dynamic-content-overview for mapping the page and the corresponding data-fetching function.
+
   Generating static pages (2/6) 
 
   Generating static pages (4/6) 
 
 ✓ Generating static pages (6/6) 
    Finalizing page optimization ...
    Collecting build traces ...
 
 Route (pages)                              Size     First Load JS
-┌ ● /                                      3.66 kB         140 kB
+┌ ● /                                      3.66 kB         141 kB
 ├   └ css/b1806cbafd0c1f81.css             3.06 kB
-├   /_app                                  0 B             106 kB
-├ ● /[...slug]                             2.45 kB         154 kB
+├   /_app                                  0 B             107 kB
+├ ● /[...slug]                             2.45 kB         155 kB
 ├ ● /[slug]/p                              33.2 kB         170 kB
 ├   ├ css/a3ca6a9b63f657be.css             5.75 kB
 ├   ├ css/62a5153ac7061286.css             6.11 kB
 ├   └ css/6d92375b6ee8276a.css             16.1 kB
-├ ○ /404                                   1.55 kB         138 kB
-├ ● /500                                   1.55 kB         138 kB
-├ λ /account                               240 B           106 kB
-├ ● /account/[...unknown]                  281 B           106 kB
+├ ○ /404                                   1.55 kB         139 kB
+├ ● /500                                   1.55 kB         139 kB
+├ λ /account                               240 B           107 kB
+├ ● /account/[...unknown]                  281 B           107 kB
 ├ λ /account/403                           2.44 kB         139 kB
 ├   └ css/b7bba8fce075688b.css             4.2 kB
 ├ λ /account/404                           2.13 kB         139 kB
 ├   └ css/5347dbc8b71de47d.css             4.25 kB
 ├ λ /account/orders                        10.1 kB         147 kB
 ├   └ css/38e3a4a55b13b062.css             12.7 kB
-├ λ /account/orders/[id]                   12.1 kB         149 kB
+├ λ /account/orders/[id]                   12.2 kB         149 kB
 ├   └ css/297be4be3be36ff0.css             12.6 kB
-├ λ /account/profile                       1.79 kB         138 kB
+├ λ /account/profile                       1.79 kB         139 kB
 ├   └ css/831a1f72fe4b2d80.css             3.97 kB
-├ λ /account/security                      3.76 kB         140 kB
+├ λ /account/security                      3.76 kB         141 kB
 ├   └ css/ec7fdad03808422d.css             5.22 kB
-├ λ /account/user-details                  1.74 kB         138 kB
+├ λ /account/user-details                  1.74 kB         139 kB
 ├   └ css/e46393a76c5d93a9.css             4.17 kB
-├ λ /api/graphql                           0 B             106 kB
-├ λ /api/health/live                       0 B             106 kB
-├ λ /api/health/ready                      0 B             106 kB
-├ λ /api/preview                           0 B             106 kB
-├ ● /checkout                              737 B           137 kB
-├ ● /login                                 1.68 kB         138 kB
+├ λ /api/graphql                           0 B             107 kB
+├ λ /api/health/live                       0 B             107 kB
+├ λ /api/health/ready                      0 B             107 kB
+├ λ /api/preview                           0 B             107 kB
+├ ● /checkout                              737 B           138 kB
+├ ● /login                                 1.68 kB         139 kB
 └ ● /s                                     3.3 kB          155 kB
 + First Load JS shared by all              110 kB
   ├ chunks/framework-807b0f81cbc129f0.js   45.4 kB
   ├ chunks/main-f658704b53a96ab1.js        33.1 kB
-  ├ chunks/pages/_app-57478e0d1d2ddf62.js  23.8 kB
-  ├ chunks/webpack-39f2e04144d694ad.js     3.85 kB
+  ├ chunks/pages/_app-f8a8608651b3f06b.js  24.3 kB
+  ├ chunks/webpack-3f872192534f3b6d.js     3.85 kB
   └ css/4b8252ed2f23ac67.css               3.51 kB
 
 λ  (Server)  server-side renders at runtime (uses getInitialProps or getServerSideProps)

package/.turbo/turbo-test.log

@@ -1,14 +1,14 @@
 
-> @faststore/core@3.80.0 test /home/runner/work/faststore/faststore/packages/core
+> @faststore/core@3.82.0 test /home/runner/work/faststore/faststore/packages/core
 > jest
 
-PASS test/utils/multipleTemplates.test.ts (26.996 s)
-PASS test/server/cms/global.test.ts (27.008 s)
+PASS test/server/cms/global.test.ts (27.279 s)
+PASS test/utils/multipleTemplates.test.ts (27.591 s)
 PASS test/server/cms/index.test.ts
-PASS test/server/index.test.ts (30.315 s)
+PASS test/server/index.test.ts (31.521 s)
 
 Test Suites: 4 passed, 4 total
 Tests:       22 passed, 22 total
 Snapshots:   0 total
-Time:        31.607 s
+Time:        32.836 s
 Ran all test suites.

package/CHANGELOG.md

@@ -3,6 +3,16 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [3.82.2](https://github.com/vtex/faststore/compare/v3.82.1...v3.82.2) (2025-09-05)
+
+**Note:** Version bump only for package @faststore/core
+
+# [3.82.0](https://github.com/vtex/faststore/compare/v3.81.0...v3.82.0) (2025-09-05)
+
+### Features
+
+- Delivery Promise 2.1 - filters by Delivery Option ([#2926](https://github.com/vtex/faststore/issues/2926)) ([d365a5e](https://github.com/vtex/faststore/commit/d365a5ea0da451a58c87fd6bcfd7f49df2c96158)), closes [#2928](https://github.com/vtex/faststore/issues/2928) [#2930](https://github.com/vtex/faststore/issues/2930) [#2937](https://github.com/vtex/faststore/issues/2937)
+
 # 3.81.0 (2025-09-05)
 
 ### Features

package/cms/faststore/content-types.json

@@ -234,6 +234,27 @@
                       }
                     }
                   }
+                },
+                "deliveryOptions": {
+                  "title": "PLP/Search Filter: Delivery Options",
+                  "type": "object",
+                  "properties": {
+                    "enabled": {
+                      "title": "Should enable Delivery Options?",
+                      "type": "boolean",
+                      "default": true
+                    },
+                    "title": {
+                      "title": "Delivery Options title",
+                      "type": "string",
+                      "default": "Delivery Option"
+                    },
+                    "allDeliveryOptions": {
+                      "title": "All delivery options label",
+                      "type": "string",
+                      "default": "All delivery options"
+                    }
+                  }
                 }
               }
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@faststore/core",
-  "version": "3.81.0",
+  "version": "3.82.2",
   "license": "MIT",
   "repository": "vtex/faststore",
   "browserslist": "supports es6-module and not dead",
@@ -44,7 +44,7 @@
     "@envelop/graphql-jit": "^8.0.3",
     "@envelop/parser-cache": "^6.0.2",
     "@envelop/validation-cache": "^6.0.2",
-    "@faststore/api": "^3.81.0",
+    "@faststore/api": "^3.82.0",
     "@faststore/graphql-utils": "^3.81.0",
     "@faststore/lighthouse": "^3.81.0",
     "@faststore/sdk": "^3.81.0",
@@ -108,5 +108,5 @@
     "ts-jest": "29.1.1",
     "typescript": "5.3.2"
   },
-  "gitHead": "37ac845dce3df8c22a348a2e6895f5b65dc9de45"
+  "gitHead": "fbbcce83dabcc215933fa167adc54ced9473c9f0"
 }

package/src/Layout.tsx

@@ -1,12 +1,10 @@
 import { useMemo, type PropsWithChildren, type ReactElement } from 'react'
 
-import { useRegionModal } from './components/region/RegionModal/useRegionModal'
 import { usePageViewEvent } from './sdk/analytics/hooks/usePageViewEvent'
 
 function Layout({ children }: PropsWithChildren) {
   const props = useMemo(() => (children as ReactElement)?.props, [])
   usePageViewEvent(props)
-  useRegionModal()
 
   return <>{children}</>
 }

package/src/components/region/RegionBar/RegionBar.tsx

@@ -1,20 +1,16 @@
-import {
-  regionSliderTypes,
-  type RegionBarProps as UIRegionBarProps,
-} from '@faststore/ui'
+import type { RegionBarProps as UIRegionBarProps } from '@faststore/ui'
 import { useEffect, useRef } from 'react'
 
-import { useUI } from '@faststore/ui'
-import { useSession } from 'src/sdk/session'
+import { regionSliderTypes, useUI } from '@faststore/ui'
+import { sessionStore, useSession } from 'src/sdk/session'
 import { useDeliveryPromise } from 'src/sdk/deliveryPromise'
 
-import { deliveryPromise, session as initialSession } from 'discovery.config'
 import { useOverrideComponents } from 'src/sdk/overrides/OverrideContext'
 import { textToTitleCase } from 'src/utils/utilities'
 import { getGlobalSettings } from 'src/utils/globalSettings'
+import { useCheckRegionState } from 'src/sdk/userLocation'
 
-import { useRegionModal } from '../RegionModal/useRegionModal'
-
+import { deliveryPromise } from 'discovery.config'
 export interface RegionBarProps {
   /**
    * A React component that will be rendered as the location icon.
@@ -55,40 +51,38 @@ function RegionBar({
     FilterButtonIcon,
   } = useOverrideComponents<'RegionBar'>()
 
-  const { openModal, openPopover, openRegionSlider } = useUI()
   const { city, postalCode } = useSession()
-  const { isValidationComplete } = useRegionModal()
+  const regionBarRef = useRef<HTMLDivElement>(null)
+  const { openPopover, openRegionSlider } = useUI()
+  const { openModal } = useCheckRegionState(regionBarRef)
   const { globalPickupPoint } = useDeliveryPromise()
   const {
     deliveryPromise: { filterByPickupPoint } = {},
   } = getGlobalSettings()
-  const regionBarRef = useRef<HTMLDivElement>(null)
+  const initialSession = sessionStore.readInitial()
 
-  const defaultPostalCode =
-    !!initialSession?.postalCode && postalCode === initialSession.postalCode
   const shouldDisplayGlobalFilter =
     deliveryPromise.enabled && !!postalCode && filterByPickupPoint?.enabled
 
-  // If location is not mandatory, and default zipCode is provided or if the user has not set a zipCode, show the popover.
-  const displayRegionPopover =
-    defaultPostalCode || (!postalCode && !deliveryPromise.mandatory)
-
   useEffect(() => {
     if (!deliveryPromise.enabled) {
       return
     }
 
-    if (!isValidationComplete) {
-      return
-    }
+    const defaultPostalCode =
+      !!initialSession?.postalCode && postalCode === initialSession.postalCode
+
+    // If location is not mandatory, and default zipCode is provided or if the user has not set a zipCode, show the popover.
+    const displayRegionPopover =
+      defaultPostalCode || (!postalCode && !deliveryPromise.mandatory)
 
-    if (isValidationComplete && displayRegionPopover && regionBarRef.current) {
+    if (displayRegionPopover && regionBarRef.current) {
       openPopover({
         isOpen: true,
         triggerRef: regionBarRef,
       })
     }
-  }, [isValidationComplete])
+  }, [])
 
   return (
     <RegionBarWrapper.Component

package/src/components/region/RegionButton/RegionButton.tsx

@@ -1,45 +1,14 @@
-import { useEffect, useRef } from 'react'
+import { useRef } from 'react'
 
-import { Button as UIButton, Icon as UIIcon, useUI } from '@faststore/ui'
-import { deliveryPromise, session as initialSession } from 'discovery.config'
+import { Button as UIButton, Icon as UIIcon } from '@faststore/ui'
 import { useSession } from 'src/sdk/session'
 import { textToTitleCase } from 'src/utils/utilities'
-
-import { useRegionModal } from '../RegionModal/useRegionModal'
+import { useCheckRegionState } from 'src/sdk/userLocation'
 
 function RegionButton({ icon, label }: { icon: string; label: string }) {
-  const { openModal, openPopover } = useUI()
   const { city, postalCode } = useSession()
-  const { isValidationComplete } = useRegionModal()
   const regionButtonRef = useRef<HTMLButtonElement>(null)
-
-  const defaultPostalCode =
-    !!initialSession?.postalCode && postalCode === initialSession.postalCode
-
-  // If location is not mandatory, and default zipCode is provided or if the user has not set a zipCode, show the popover.
-  const displayRegionPopover =
-    defaultPostalCode || (!postalCode && !deliveryPromise.mandatory)
-
-  useEffect(() => {
-    if (!deliveryPromise.enabled) {
-      return
-    }
-
-    if (!isValidationComplete) {
-      return
-    }
-
-    if (
-      isValidationComplete &&
-      displayRegionPopover &&
-      regionButtonRef.current
-    ) {
-      openPopover({
-        isOpen: true,
-        triggerRef: regionButtonRef,
-      })
-    }
-  }, [isValidationComplete])
+  const { openModal } = useCheckRegionState(regionButtonRef)
 
   return (
     <UIButton

package/src/components/search/Filter/FilterDeliveryMethodFacet.tsx

@@ -1,17 +1,11 @@
 import { regionSliderTypes, Button as UIButton, useUI } from '@faststore/ui'
+import type { StoreFacetValueBoolean } from '@generated/graphql'
 import { sessionStore } from 'src/sdk/session'
 import type { GlobalCmsData } from 'src/utils/globalSettings'
 import { textToTitleCase } from 'src/utils/utilities'
 
-interface FacetValue {
-  value: string
-  label: string
-  selected: boolean
-  quantity: number
-}
-
 interface FilterDeliveryMethodFacetProps {
-  item: FacetValue
+  item: StoreFacetValueBoolean
   deliveryMethods: GlobalCmsData['deliveryPromise']['deliveryMethods']
 }
 

package/src/components/search/Filter/FilterDesktop.tsx

@@ -18,8 +18,8 @@ import type { useFilter } from 'src/sdk/search/useFilter'
 import type { FilterSliderProps } from './FilterSlider'
 
 import {
-  useDeliveryPromise,
   PICKUP_ALL_FACET_VALUE,
+  useDeliveryPromise,
 } from 'src/sdk/deliveryPromise'
 import { getGlobalSettings } from 'src/utils/globalSettings'
 import FilterDeliveryMethodFacet from './FilterDeliveryMethodFacet'
@@ -48,6 +48,7 @@ function FilterDesktop({
   const {
     facets: filteredFacets,
     deliveryLabel,
+    deliveryOptionsLabel,
     isPickupAllEnabled,
     shouldDisplayDeliveryButton,
     onDeliveryFacetChange,
@@ -92,17 +93,24 @@ function FilterDesktop({
           const index = shouldDisplayDeliveryButton ? idx + 1 : idx
           const { __typename: type, label } = facet
           const isExpanded = expanded.has(index)
-          const isDeliveryFacet = facet.key === 'shipping'
+          const isDeliveryMethodFacet = facet.key === 'shipping'
+          const isDeliveryOptionFacet = facet.key === 'delivery-options'
+
+          const sectionLabel = isDeliveryMethodFacet
+            ? deliveryLabel
+            : isDeliveryOptionFacet
+              ? deliveryOptionsLabel
+              : label
 
           return (
             <UIFilterFacets
-              key={`${testId}-${label}-${index}`}
+              key={`${testId}-${sectionLabel}-${index}`}
               testId={testId}
               index={index}
               type={type}
-              label={isDeliveryFacet ? deliveryLabel : label}
+              label={sectionLabel}
               description={
-                isDeliveryFacet
+                isDeliveryMethodFacet
                   ? deliveryPromiseSettings?.deliveryMethods?.description
                   : undefined
               }
@@ -126,7 +134,7 @@ function FilterDesktop({
                           quantity={item.quantity}
                           facetKey={facet.key}
                           label={
-                            isDeliveryFacet ? (
+                            isDeliveryMethodFacet ? (
                               <FilterDeliveryMethodFacet
                                 item={item}
                                 deliveryMethods={
@@ -137,7 +145,11 @@ function FilterDesktop({
                               item.label
                             )
                           }
-                          type={isDeliveryFacet ? 'radio' : 'checkbox'}
+                          type={
+                            isDeliveryMethodFacet || isDeliveryOptionFacet
+                              ? 'radio'
+                              : 'checkbox'
+                          }
                         />
                       )
                   )}

package/src/components/search/Filter/FilterSlider.tsx

@@ -12,17 +12,16 @@ import {
   type FilterSliderProps as UIFilterSliderProps,
   type IconProps as UIIconProps,
 } from '@faststore/ui'
-
 import { useFormattedPrice } from 'src/sdk/product/useFormattedPrice'
 
 import type { Filter_FacetsFragment } from '@generated/graphql'
 import FilterDeliveryMethodFacet from './FilterDeliveryMethodFacet'
 
-import type { useFilter } from 'src/sdk/search/useFilter'
 import {
-  useDeliveryPromise,
   PICKUP_ALL_FACET_VALUE,
+  useDeliveryPromise,
 } from 'src/sdk/deliveryPromise'
+import type { useFilter } from 'src/sdk/search/useFilter'
 import { getGlobalSettings } from 'src/utils/globalSettings'
 
 import styles from './section.module.scss'
@@ -104,6 +103,7 @@ function FilterSlider({
   const {
     facets: filteredFacets,
     deliveryLabel,
+    deliveryOptionsLabel,
     isPickupAllEnabled,
     shouldDisplayDeliveryButton,
     onDeliveryFacetChange,
@@ -190,17 +190,24 @@ function FilterSlider({
             const index = shouldDisplayDeliveryButton ? idx + 1 : idx
             const { __typename: type, label } = facet
             const isExpanded = expanded.has(index)
-            const isDeliveryFacet = facet.key === 'shipping'
+            const isDeliveryMethodFacet = facet.key === 'shipping'
+            const isDeliveryOptionFacet = facet.key === 'delivery-options'
+
+            const sectionLabel = isDeliveryMethodFacet
+              ? deliveryLabel
+              : isDeliveryOptionFacet
+                ? deliveryOptionsLabel
+                : label
 
             return (
               <UIFilterFacets
-                key={`${testId}-${label}-${index}`}
+                key={`${testId}-${sectionLabel}-${index}`}
                 testId={`mobile-${testId}`}
                 index={index}
                 type={type}
-                label={isDeliveryFacet ? deliveryLabel : label}
+                label={sectionLabel}
                 description={
-                  isDeliveryFacet
+                  isDeliveryMethodFacet
                     ? deliveryPromiseSettings?.deliveryMethods?.description
                     : undefined
                 }
@@ -226,7 +233,7 @@ function FilterSlider({
                             quantity={item.quantity}
                             facetKey={facet.key}
                             label={
-                              isDeliveryFacet ? (
+                              isDeliveryMethodFacet ? (
                                 <FilterDeliveryMethodFacet
                                   item={item}
                                   deliveryMethods={
@@ -237,7 +244,11 @@ function FilterSlider({
                                 item.label
                               )
                             }
-                            type={isDeliveryFacet ? 'radio' : 'checkbox'}
+                            type={
+                              isDeliveryMethodFacet || isDeliveryOptionFacet
+                                ? 'radio'
+                                : 'checkbox'
+                            }
                           />
                         )
                     )}

package/src/components/templates/ProductListingPage/ProductListing.tsx

@@ -1,4 +1,4 @@
-import { formatSearchState, useSearch } from '@faststore/sdk'
+import { useSearch } from '@faststore/sdk'
 import type {
   ServerCollectionPageQueryQuery,
   ServerManyProductsQueryQuery,

package/src/components/ui/ProductGallery/ProductGallery.tsx

@@ -22,8 +22,8 @@ import { useDelayedPagination } from 'src/sdk/search/useDelayedPagination'
 import { useFilter } from 'src/sdk/search/useFilter'
 import useScreenResize from 'src/sdk/ui/useScreenResize'
 
-import styles from '../../sections/ProductGallery/section.module.scss'
 import { useFormattedPrice } from 'src/sdk/product/useFormattedPrice'
+import styles from '../../sections/ProductGallery/section.module.scss'
 
 const ProductGalleryPage = lazy(() => import('./ProductGalleryPage'))
 const FilterSkeleton = dynamic(