@faststore/core 4.0.1-dev.1 → 4.0.1-dev.2

package/.turbo/turbo-generate.log

@@ -1,9 +1,9 @@
 
-> @faststore/core@4.0.1-dev.0 generate /home/runner/work/faststore/faststore/packages/core
+> @faststore/core@4.0.1-dev.1 generate /home/runner/work/faststore/faststore/packages/core
 > pnpm run gen-types && pnpm run cache-graphql 
 
 
-> @faststore/core@4.0.1-dev.0 gen-types /home/runner/work/faststore/faststore/packages/core
+> @faststore/core@4.0.1-dev.1 gen-types /home/runner/work/faststore/faststore/packages/core
 > node ../cli/bin/run generate-types .
 
 [STARTED] Parse Configuration
@@ -19,7 +19,7 @@
 [COMPLETED] Generate to /home/runner/work/faststore/faststore/packages/core/@generated/
 [COMPLETED] Generate outputs
 
-> @faststore/core@4.0.1-dev.0 cache-graphql /home/runner/work/faststore/faststore/packages/core
+> @faststore/core@4.0.1-dev.1 cache-graphql /home/runner/work/faststore/faststore/packages/core
 > node ../cli/bin/run cache-graphql --config=./discovery.config.default.js --queries=./@generated/persisted-documents.json
 
 [Info] - Config file location: /home/runner/work/faststore/faststore/packages/core/discovery.config.default.js

package/.turbo/turbo-test.log

@@ -1,13 +1,13 @@
 
-> @faststore/core@4.0.1-dev.0 test /home/runner/work/faststore/faststore/packages/core
+> @faststore/core@4.0.1-dev.1 test /home/runner/work/faststore/faststore/packages/core
 > vitest run
 
 
  RUN  v4.0.7 /home/runner/work/faststore/faststore/packages/core
 
  ✓  node  test/utils/match-url.test.ts (10 tests) 37ms
- ✓  node  test/utils/localization/bindingPaths.test.ts (71 tests) 82ms
- ✓  node  test/sdk/localization/bindingSelector.test.ts (18 tests) 29ms
+ ✓  node  test/utils/localization/bindingPaths.test.ts (71 tests) 122ms
+ ✓  node  test/sdk/localization/bindingSelector.test.ts (18 tests) 37ms
 stderr | test/sdk/localization/store-url.browser.test.ts
 Error in optimistic validation: TypeError: Cannot read properties of undefined (reading 'read')
     at validateCart (/home/runner/work/faststore/faststore/packages/core/src/sdk/cart/index.ts:119:27)
@@ -15,6 +15,7 @@
     at a (/home/runner/work/faststore/faststore/packages/sdk/dist/es/index.mjs:342:23)
     at processTicksAndRejections (node:internal/process/task_queues:103:5)
 
+ ✓  node  test/utils/cookieCacheBusting.test.ts (10 tests) 40ms
 stderr | test/sdk/localization/store-url.browser.test.ts
 Error in optimistic validation: ReferenceError: Cannot access '__vite_ssr_import_4__' before initialization
     at getSettings (/home/runner/work/faststore/faststore/packages/core/src/sdk/localization/useLocalizationConfig.tsx:126:45)
@@ -23,25 +24,24 @@
     at a (/home/runner/work/faststore/faststore/packages/sdk/dist/es/index.mjs:342:23)
     at processTicksAndRejections (node:internal/process/task_queues:103:5)
 
- ✓  node  test/utils/cookieCacheBusting.test.ts (10 tests) 45ms
- ✓  browser  test/sdk/localization/store-url.browser.test.ts (3 tests) 12ms
- ✓  node  test/sdk/search/useSearchHistory.test.ts (13 tests) 145ms
- ✓  node  test/utils/multipleTemplates.test.ts (8 tests) 19ms
- ✓  node  test/sdk/localization/useBindingSelector.test.tsx (12 tests) 23ms
- ✓  node  test/utils/clearCookies.test.ts (20 tests) 72ms
- ✓  node  test/server/cms/global.test.ts (3 tests) 24ms
- ✓  node  test/server/content/service.test.ts (5 tests) 7ms
- ✓  node  test/utils/getRequestHostname.test.ts (12 tests) 34ms
- ✓  node  test/sdk/localization/store-url.test.ts (1 test) 16ms
- ✓  node  test/utils/validateSessionRefreshToken.test.ts (6 tests) 14ms
- ✓  node  test/pages/api/preview.test.ts (2 tests) 18ms
- ✓  node  test/server/cms/index.test.ts (2 tests) 12ms
- ✓  node  test/server/index.test.ts (7 tests) 1205ms
-       ✓ should return a valid merged GraphQL schema  556ms
-       ✓ should handle options and execute  326ms
+ ✓  browser  test/sdk/localization/store-url.browser.test.ts (3 tests) 15ms
+ ✓  node  test/sdk/localization/useBindingSelector.test.tsx (12 tests) 22ms
+ ✓  node  test/sdk/search/useSearchHistory.test.ts (13 tests) 92ms
+ ✓  node  test/utils/multipleTemplates.test.ts (8 tests) 25ms
+ ✓  node  test/utils/clearCookies.test.ts (20 tests) 79ms
+ ✓  node  test/server/content/service.test.ts (5 tests) 10ms
+ ✓  node  test/server/cms/global.test.ts (3 tests) 12ms
+ ✓  node  test/utils/getRequestHostname.test.ts (12 tests) 16ms
+ ✓  node  test/sdk/localization/store-url.test.ts (1 test) 12ms
+ ✓  node  test/utils/validateSessionRefreshToken.test.ts (6 tests) 18ms
+ ✓  node  test/pages/api/preview.test.ts (2 tests) 24ms
+ ✓  node  test/server/cms/index.test.ts (2 tests) 7ms
+ ✓  node  test/server/index.test.ts (7 tests) 1259ms
+       ✓ should return a valid merged GraphQL schema  599ms
+       ✓ should exist with its plugins  406ms
 
  Test Files  17 passed (17)
       Tests  203 passed (203)
-   Start at  21:31:36
-   Duration  13.22s (transform 5.15s, setup 0ms, collect 15.16s, tests 1.79s, environment 7.75s, prepare 789ms)
+   Start at  15:30:48
+   Duration  13.81s (transform 5.83s, setup 0ms, collect 16.52s, tests 1.83s, environment 9.75s, prepare 663ms)
 

package/CHANGELOG.md

@@ -3,6 +3,12 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [4.0.1-dev.2](https://github.com/vtex/faststore/compare/v4.0.1-dev.1...v4.0.1-dev.2) (2026-05-11)
+
+### Bug Fixes
+
+- localization selector stale and reset selection for unsaved changes ([#3301](https://github.com/vtex/faststore/issues/3301)) ([023e52e](https://github.com/vtex/faststore/commit/023e52ee3c8798cfc9f12ed98e99e8efacb1f1d5))
+
 ## [4.0.1-dev.1](https://github.com/vtex/faststore/compare/v4.0.1-dev.0...v4.0.1-dev.1) (2026-05-07)
 
 ### Bug Fixes

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@faststore/core",
-  "version": "4.0.1-dev.1",
+  "version": "4.0.1-dev.2",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -39,11 +39,11 @@
     "@envelop/graphql-jit": "catalog:",
     "@envelop/parser-cache": "catalog:",
     "@envelop/validation-cache": "catalog:",
-    "@faststore/api": "4.0.1-dev.1",
-    "@faststore/diagnostics": "4.0.1-dev.1",
-    "@faststore/lighthouse": "4.0.1-dev.1",
-    "@faststore/sdk": "4.0.1-dev.1",
-    "@faststore/ui": "4.0.1-dev.1",
+    "@faststore/api": "4.0.1-dev.2",
+    "@faststore/diagnostics": "4.0.1-dev.2",
+    "@faststore/lighthouse": "4.0.1-dev.2",
+    "@faststore/sdk": "4.0.1-dev.2",
+    "@faststore/ui": "4.0.1-dev.2",
     "@graphql-codegen/cli": "catalog:",
     "@graphql-codegen/client-preset": "4.2.6",
     "@graphql-codegen/typescript": "catalog:",
@@ -113,5 +113,5 @@
     "react": "catalog:",
     "react-dom": "catalog:"
   },
-  "gitHead": "de1a5b1ae2466025e8c007f8bca5b9dd34d82daa"
+  "gitHead": "78469e62248563c911ba449ea69fc1edacf7277e"
 }

package/src/components/ui/LocalizationButton/LocalizationButton.tsx

@@ -49,6 +49,7 @@ const LocalizationButton = ({
     setLocaleCode,
     setCurrencyCode,
     save,
+    reset,
     isSaveEnabled,
     error,
   } = useBindingSelector()
@@ -97,7 +98,10 @@ const LocalizationButton = ({
       {isSelectorOpen && (
         <LocalizationSelector
           isOpen={isSelectorOpen}
-          onClose={() => setIsSelectorOpen(false)}
+          onClose={() => {
+            setIsSelectorOpen(false)
+            reset()
+          }}
           triggerRef={buttonRef}
           languages={languages}
           currencies={currencies}

package/src/sdk/localization/useBindingSelector.ts

@@ -1,4 +1,4 @@
-import { useCallback, useMemo, useState } from 'react'
+import { useCallback, useEffect, useMemo, useRef, useState } from 'react'
 
 import storeConfig from '../../../discovery.config'
 import { buildRedirectUrl } from '../../utils/localization/bindingPaths'
@@ -56,6 +56,8 @@ export interface UseBindingSelectorReturn {
   setCurrencyCode: (code: string) => void
   /** Action to save selections and redirect */
   save: () => void
+  /** Discards unsaved changes and resets selections to current session values */
+  reset: () => void
 }
 
 /**
@@ -77,6 +79,23 @@ export function useBindingSelector(): UseBindingSelectorReturn {
   )
   const [error, setError] = useState<BindingSelectorError | null>(null)
 
+  const hasUserEditedSelection = useRef(false)
+
+  // Sync selections when session resolves after initial render (e.g. stale session
+  // from a previous locale when navigating between locale-prefixed paths).
+  // Skipped once the user has made an in-progress selection; call reset() on close to re-enable.
+  useEffect(() => {
+    if (!hasUserEditedSelection.current) {
+      setLocaleCode(currentLocale ?? null)
+    }
+  }, [currentLocale])
+
+  useEffect(() => {
+    if (!hasUserEditedSelection.current) {
+      setCurrencyCode(currentCurrency?.code ?? null)
+    }
+  }, [currentCurrency?.code])
+
   // Build language options with disambiguation - returns Record<localeCode, languageName>
   const languages = useMemo(
     () => buildLanguageOptions(localizationConfig.locales),
@@ -98,6 +117,7 @@ export function useBindingSelector(): UseBindingSelectorReturn {
   // Handle locale code change
   const handleSetLocaleCode = useCallback(
     (code: string) => {
+      hasUserEditedSelection.current = true
       setLocaleCode(code)
       setError(null)
 
@@ -126,6 +146,7 @@ export function useBindingSelector(): UseBindingSelectorReturn {
 
   // Handle currency code change
   const handleSetCurrencyCode = useCallback((code: string) => {
+    hasUserEditedSelection.current = true
     setCurrencyCode(code)
     setError(null)
   }, [])
@@ -169,6 +190,14 @@ export function useBindingSelector(): UseBindingSelectorReturn {
 
   const isSaveEnabled = Boolean(localeCode && currencyCode && !error)
 
+  // Discards unsaved changes and re-enables session syncing
+  const reset = useCallback(() => {
+    hasUserEditedSelection.current = false
+    setLocaleCode(currentLocale ?? null)
+    setCurrencyCode(currentCurrency?.code ?? null)
+    setError(null)
+  }, [currentLocale, currentCurrency?.code])
+
   return {
     languages,
     currencies,
@@ -179,5 +208,6 @@ export function useBindingSelector(): UseBindingSelectorReturn {
     setLocaleCode: handleSetLocaleCode,
     setCurrencyCode: handleSetCurrencyCode,
     save,
+    reset,
   }
 }