An open source design system that's fully customizable and agent ready
TypeScript
fix(core): many components carry only the English for their own strings (#9429)
Cindy Zhang99cc6dc85c44
diff --git a/.changeset/smaller-component-english-fallback.md b/.changeset/smaller-component-english-fallback.mdnew file mode 100644index 0000000000..7d6da72cee--- /dev/null+++ b/.changeset/smaller-component-english-fallback.md@@ -0,0 +1,7 @@+---+'@astryxdesign/core': patch+---++[fix] Many components that show built-in text are smaller. Each one now carries only the English for its own strings instead of every Core string, so a component such as Button loads about 7 KB less (gzip) and a new string elsewhere in Core no longer makes it bigger. Table (and Markdown, which renders it), Chat, PowerSearch, CommandPalette and the date and time inputs still carry every Core string for now. Nothing you see changes: every built-in string still shows the same English, translations and overrides resolve as before, and `useTranslator`, `InternationalizationContext` and `@astryxdesign/core/locales/en.generated.js` still reach every Astryx string.++@cixzhangdiff --git a/.gitignore b/.gitignoreindex fd8765ec49..640c022c96 100644--- a/.gitignore+++ b/.gitignore@@ -86,9 +86,10 @@ mise.toml# Generated shadcn Registry output (rebuilt by the docsite generate step)apps/docsite/public/shadcn/-# Generated i18n artifacts (rebuilt from en.json and translated catalogs)+# Generated i18n artifacts (rebuilt from en.json, translated catalogs, and the keys Core modules name)packages/core/locales/pseudo.jsonpackages/core/src/i18n/generated-locales/+packages/core/src/i18n/generated-english/# Generated lab readiness report (rebuild with `pnpm lab:readiness`).# Deliberately not committed: a checked-in snapshot goes stale the moment thediff --git a/docs/architecture/internationalization.md b/docs/architecture/internationalization.mdindex 6f404a0c1c..fef6a45735 100644--- a/docs/architecture/internationalization.md+++ b/docs/architecture/internationalization.md@@ -14,7 +14,9 @@ applies_to:packages/core/src/i18n/,packages/core/locales/,packages/core/src/i18n/generated-locales/,+ packages/core/src/i18n/generated-english/,scripts/generate-i18n-runtime.mjs,+ scripts/i18n-english-fallback.mjs,packages/build/src/vite.ts,packages/core/src/utils/plainDate.ts,packages/core/src/utils/dateParser.ts,@@ -35,6 +37,8 @@ verified_by:packages/core/src/i18n/__tests__/getLocaleDirection.test.ts,packages/core/src/i18n/__tests__/useCollator.test.tsx,packages/core/src/i18n/useTranslator.test.tsx,+ packages/core/src/i18n/__tests__/englishFallback.test.ts,+ scripts/i18n-english-fallback.test.mjs,scripts/check-i18n-catalog.test.mjs,scripts/generate-i18n-runtime.test.mjs,packages/build/src/vite.test.ts,@@ -151,7 +155,10 @@ Astryx-owned string→ provider-bound translator→ exact locale→ parent locale(s)- → shipped English fallback (generated English runtime catalog)+ → shipped English fallback+ → each Core module's derived English map for the keys it names+ (packages/core/src/i18n/generated-english/, ignored; scripts/i18n-english-fallback.mjs)+ → the whole generated English catalog on public paths that resolve any Astryx keyLocale-sensitive formatting or comparison→ active provider locale passed directly to the shared formatter@@ -306,9 +313,16 @@ for all 30 shipped locales plus `pseudo`.authored catalog changes, and an edit that lands during the initial generationqueues another pass rather than being missed. A rich entry without a string`defaultMessage` fails generation; runtime maps carry no `description` or- other metadata. The built-in English fallback imports the generated English- module. Neither path, shape, nor export of the rich catalogs changes because- generated modules exist.+ other metadata. The built-in English fallback reads English derived from the+ generated English module: each Core module that names catalog keys registers+ a derived map of exactly those keys, and public paths that resolve any Astryx+ key register the whole module. Neither path, shape, nor export of the rich+ catalogs changes because generated modules exist. Table, Chat, PowerSearch,+ CommandPalette, and the date and time input modules do not yet conform: they+ register no map of their own and resolve their keys through the public+ `useTranslator`, so every component that renders one still carries the whole+ catalog. That is a known conformance gap, and the wiring check accepts it+ until those modules register their own maps.- **INV16 — Standard build integration resolves both catalog forms.** The AstryxVite plugin resolves `@astryxdesign/core/locales/<tag>.json` to the richauthored file and `@astryxdesign/core/locales/<tag>.generated.js` to the@@ -380,6 +394,16 @@ inferred from an implementation pull request.- `packages/core/src/i18n/generated-locales/*.generated.ts` — derived runtimecatalogs, ignored by version control, published as`@astryxdesign/core/locales/*.generated.js`.+- `scripts/i18n-english-fallback.mjs`,+ `packages/core/src/i18n/englishFallback.ts`,+ `packages/core/src/i18n/fullEnglishFallback.ts` — derive each Core module's+ English map into `packages/core/src/i18n/generated-english/` (ignored,+ internal, not exported), check that every module naming catalog keys+ registers its own map, and name the public paths that register the whole+ catalog, such as the public `useTranslator` and the public+ `InternationalizationContext` export. Until the INV15 conformance gap closes,+ the check also accepts a module that names keys and imports the public+ `useTranslator` instead of its own map.- `packages/core/package.json` `exports` — publishes both `./locales/*.json` and`./locales/*.generated.js`.- `packages/build/src/vite.ts` — resolves both catalog import forms in source@@ -413,16 +437,16 @@ consumer or every edge case conforms. Helper admission defines responsibility;review and regression tests verify caller behavior. Missing evidence or violatingcallers remain conformance work and do not relax INV1a, INV8, INV9, or INV10.-| Invariant | Evidence | Failure signal |-| ------------------ | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |-| INV1, INV1a, INV7 | hardcoded-string lint, catalog tests, component translation tests with a non-English provider | Astryx-owned text bypasses the catalog, an announcement or count is assembled from fragments or a hand-rolled plural, or non-string output reaches visible/AT attributes |-| INV2, INV13, INV14 | export drift checks, public i18n tests, compatibility review | A parallel/replacement runtime lands without migration, or client hooks claim server behavior |-| INV3–INV5 | resolver and provider rerender tests | no-provider output depends on the host, locale swaps stay stale, fallback order changes, or malformed-locale behavior is described as graceful |-| INV3a | factory unit tests: a flat option or `labels` key replaces its message, including under a provider, and outside a provider its absence announces or shows shipped English; wrapper tests: under a non-English provider its absence gives the translation. Evidence gap: no factory test covers a flat option or `labels` key yet | a factory announces or shows Astryx text that no option or `labels` key can replace, groups more than one string outside one `labels` object, takes a translator, ignores a given string, or gives something other than the catalog message when it is absent |-| INV6 | `check:i18n-catalog`, key-format lint, and focused mutation tests | stale/malformed keys, malformed ICU, or source/translation runtime-contract drift passes CI |-| INV15 | generator tests, `check:i18n-runtime`, package-export drift check, provider/resolver runtime-catalog tests | a generated module carries descriptions or is committed, a malformed entry projects instead of failing, a rich export path changes, or a `RuntimeCatalog` input is rejected or leaks a non-rich context shape |-| INV16 | build-plugin unit and real-build tests | a rich or generated locale import fails to resolve through the standard plugin |-| INV8, INV9 | raw-Intl-locale lint (module allowlist plus date-helper locale-argument check) and provider-locale regression tests, including a server/client render pair | Astryx output follows the host locale, raw `Intl` appears outside a named formatter module, an owned call omits the locale argument, or server and client output differ for the same provider locale |-| INV10 | PlainDate and built-in date formatter tests, including locales with non-Gregorian defaults | locale selects a non-Gregorian built-in date display, changes PlainDate calendar semantics, or loses the explicit low-level display override |-| INV11, INV12 | direction helper/provider tests plus rendered RTL audit | component layout reads provider direction instead of the region, provider mutates DOM, or overrides stop composing |-| INV17 | `typeaheadMatch.test.ts`, `useTypeahead` and `useTreeFocus` tests and type-to-select tests in Selector, MultiSelector, DropdownMenu and TreeList, one case each: a combining mark ("a" reaches "Ánh"); each stroked letter (đ, ł, ø, ħ, ŧ, ƀ); ı and İ ("i" and "ı" reach "Isparta" and "İzmir"); and a typed diacritic, stroked letter, ı or İ preferring the exact match ("đ" reaches "Đào" before "Dung", "ı" reaches "Isparta" before "İzmir", "İ" reaches "İzmir" before "Isparta"); under en, vi, pl, sv and tr providers | a plain letter misses a marked or stroked first letter in any locale, i or ı misses an İ or I label, a typed diacritic, stroked letter, ı or İ does not prefer the exact match, ı or İ pairs case the non-Turkish way, two paths disagree, or folding reaches sorting or displayed text |+| Invariant | Evidence | Failure signal |+| ------------------ | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |+| INV1, INV1a, INV7 | hardcoded-string lint, catalog tests, component translation tests with a non-English provider | Astryx-owned text bypasses the catalog, an announcement or count is assembled from fragments or a hand-rolled plural, or non-string output reaches visible/AT attributes |+| INV2, INV13, INV14 | export drift checks, public i18n tests, compatibility review | A parallel/replacement runtime lands without migration, or client hooks claim server behavior |+| INV3–INV5 | resolver and provider rerender tests | no-provider output depends on the host, locale swaps stay stale, fallback order changes, or malformed-locale behavior is described as graceful |+| INV3a | factory unit tests: a flat option or `labels` key replaces its message, including under a provider, and outside a provider its absence announces or shows shipped English; wrapper tests: under a non-English provider its absence gives the translation. Evidence gap: no factory test covers a flat option or `labels` key yet | a factory announces or shows Astryx text that no option or `labels` key can replace, groups more than one string outside one `labels` object, takes a translator, ignores a given string, or gives something other than the catalog message when it is absent |+| INV6 | `check:i18n-catalog`, key-format lint, and focused mutation tests | stale/malformed keys, malformed ICU, or source/translation runtime-contract drift passes CI |+| INV15 | generator tests, `check:i18n-runtime`, package-export drift check, provider/resolver runtime-catalog tests; per-module English resolution-parity test (every key each Core module names, in every shipped locale’s fallback path, its own map versus the whole catalog); import-cost check (component bundles carry only the English they name; public paths keep the whole catalog). Known gap: Table, Chat, PowerSearch, CommandPalette, and the date and time input modules still resolve through the public `useTranslator` | a generated module carries descriptions or is committed, a malformed entry projects instead of failing, a rich export path changes, or a `RuntimeCatalog` input is rejected or leaks a non-rich context shape, a key a module names resolves differently from the whole catalog, a component bundle carries the whole catalog, or a public path stops resolving a shipped key |+| INV16 | build-plugin unit and real-build tests | a rich or generated locale import fails to resolve through the standard plugin |+| INV8, INV9 | raw-Intl-locale lint (module allowlist plus date-helper locale-argument check) and provider-locale regression tests, including a server/client render pair | Astryx output follows the host locale, raw `Intl` appears outside a named formatter module, an owned call omits the locale argument, or server and client output differ for the same provider locale |+| INV10 | PlainDate and built-in date formatter tests, including locales with non-Gregorian defaults | locale selects a non-Gregorian built-in date display, changes PlainDate calendar semantics, or loses the explicit low-level display override |+| INV11, INV12 | direction helper/provider tests plus rendered RTL audit | component layout reads provider direction instead of the region, provider mutates DOM, or overrides stop composing |+| INV17 | `typeaheadMatch.test.ts`, `useTypeahead` and `useTreeFocus` tests and type-to-select tests in Selector, MultiSelector, DropdownMenu and TreeList, one case each: a combining mark ("a" reaches "Ánh"); each stroked letter (đ, ł, ø, ħ, ŧ, ƀ); ı and İ ("i" and "ı" reach "Isparta" and "İzmir"); and a typed diacritic, stroked letter, ı or İ preferring the exact match ("đ" reaches "Đào" before "Dung", "ı" reaches "Isparta" before "İzmir", "İ" reaches "İzmir" before "Isparta"); under en, vi, pl, sv and tr providers | a plain letter misses a marked or stroked first letter in any locale, i or ı misses an İ or I label, a typed diacritic, stroked letter, ı or İ does not prefer the exact match, ı or İ pairs case the non-Turkish way, two paths disagree, or folding reaches sorting or displayed text |diff --git a/packages/core/src/AlertDialog/AlertDialog.tsx b/packages/core/src/AlertDialog/AlertDialog.tsxindex 402f865d2a..54e4e88105 100644--- a/packages/core/src/AlertDialog/AlertDialog.tsx+++ b/packages/core/src/AlertDialog/AlertDialog.tsx@@ -30,8 +30,14 @@ import type {ButtonVariant} from '../Button';import type {BaseProps} from '../BaseProps';import {mergeProps} from '../utils/mergeProps';import {themeProps} from '../utils/themeProps';-import {useTranslator} from '../i18n/useTranslator';import {useMediaQuery} from '../hooks/useMediaQuery';+import {+ registerEnglishFallback,+ useComponentTranslator,+} from '../i18n/useComponentTranslator';+import english from '../i18n/generated-english/AlertDialog/AlertDialog.generated';++registerEnglishFallback(english);const SMALL_SCREEN_QUERY = '(max-width: 640px)';@@ -158,7 +164,7 @@ export function AlertDialog({'data-testid': testId,...rest}: AlertDialogProps) {- const t = useTranslator();+ const t = useComponentTranslator();const cancelLabel = cancelLabelFromProps ?? t('@astryx.alertDialog.cancel');const titleId = useId();const descriptionId = useId();diff --git a/packages/core/src/AppShell/AppShell.tsx b/packages/core/src/AppShell/AppShell.tsxindex ab45141e4d..58924e4648 100644--- a/packages/core/src/AppShell/AppShell.tsx+++ b/packages/core/src/AppShell/AppShell.tsx@@ -72,7 +72,6 @@ import {import {useMediaQuery} from '../hooks/useMediaQuery';import {observeResize} from '../utils/sharedResizeObserver';import {themeProps} from '../utils/themeProps';-import {useTranslator} from '../i18n';import {useThemeDefinition} from '../theme/useTheme';import {DEFAULT_WIDTH_BREAKPOINTS,@@ -83,6 +82,13 @@ import type {AppShellVariantMap} from './index';import {useMergedRefs} from '../hooks/useMergedRefs';import {attachScrollKeyboardDelegation} from '../hooks/scrollKeyboardDelegation';import {observeMainOverflow} from './observeMainOverflow';+import {+ registerEnglishFallback,+ useComponentTranslator,+} from '../i18n/useComponentTranslator';+import english from '../i18n/generated-english/AppShell/AppShell.generated';++registerEnglishFallback(english);const HasActivity = typeof React.Activity !== 'undefined';const ActivityWrapper = HasActivity? ({@@ -537,7 +543,7 @@ export function AppShell({ref,...rest}: AppShellProps) {- const t = useTranslator();+ const t = useComponentTranslator();const activeTheme = useThemeDefinition();// =========================================================================// Parse mobileNav prop — normalize to config, custom element, or disableddiff --git a/packages/core/src/Avatar/Avatar.tsx b/packages/core/src/Avatar/Avatar.tsxindex fe5bf6c783..2e143bbcb3 100644--- a/packages/core/src/Avatar/Avatar.tsx+++ b/packages/core/src/Avatar/Avatar.tsx@@ -5,7 +5,7 @@/*** @file Avatar.tsx* @input Uses React, HTMLAttributes, ReactNode, useState, useRef; useTooltip- * (Tooltip hook) for the optional name-on-hover tooltip; useTranslator (i18n)+ * (Tooltip hook) for the optional name-on-hover tooltip; useComponentTranslator (i18n)* @output Exports Avatar component, AvatarProps, AvatarSize types* @position Core implementation; consumed by index.ts*@@ -50,7 +50,14 @@ import {useTooltip} from '../Tooltip/useTooltip';import {useDevWarning} from '../hooks/useDevWarning';import {useLinkComponent} from '../Link/useLinkComponent';import type {LinkComponentType} from '../Link/types';-import {useTranslator, type TranslatorFn} from '../i18n';+import type {TranslatorFn} from '../i18n';+import {+ registerEnglishFallback,+ useComponentTranslator,+} from '../i18n/useComponentTranslator';+import english from '../i18n/generated-english/Avatar/Avatar.generated';++registerEnglishFallback(english);/*** The offset ratio for positioning elements on a circle's edge at 45°.@@ -612,7 +619,7 @@ export function Avatar({// neither a name nor a labelled status, the avatar is decorative — expose// it as `presentation`/`aria-hidden` rather than announcing a meaningless// generic "Avatar" (obs-9).- const t = useTranslator();+ const t = useComponentTranslator();const nameLabel = meaningfulAlt || meaningfulName;// This render can only see a label introspected off a directly-passed// element. A status inside a consumer's own wrapper reports through the refdiff --git a/packages/core/src/AvatarGroup/AvatarGroup.tsx b/packages/core/src/AvatarGroup/AvatarGroup.tsxindex 45f2b85214..c3d76c1f4d 100644--- a/packages/core/src/AvatarGroup/AvatarGroup.tsx+++ b/packages/core/src/AvatarGroup/AvatarGroup.tsx@@ -33,12 +33,18 @@ import {mergeProps} from '../utils';import {composeEventHandlers} from '../utils/composeEventHandlers';import {AvatarGroupContext} from './AvatarGroupContext';import {themeProps} from '../utils/themeProps';-import {useTranslator} from '../i18n';import {useListFocus} from '../hooks/useListFocus';import {useIsomorphicLayoutEffect} from '../hooks/useIsomorphicLayoutEffect';import {VisuallyHidden} from '../VisuallyHidden';import {useMergedRefs} from '../hooks/useMergedRefs';+import {+ registerEnglishFallback,+ useComponentTranslator,+} from '../i18n/useComponentTranslator';+import english from '../i18n/generated-english/AvatarGroup/AvatarGroup.generated';++registerEnglishFallback(english);const OVERLAP_RATIO = 0.25;export interface AvatarGroupProps extends BaseProps<HTMLDivElement> {@@ -123,7 +129,7 @@ export function AvatarGroup({ref,...props}: AvatarGroupProps): ReactNode {- const t = useTranslator();+ const t = useComponentTranslator();const ariaLabel = ariaLabelFromProps ?? t('@astryx.avatarGroup.label');const numericSize = resolveSize(size);const overlap = Math.round(numericSize * OVERLAP_RATIO);diff --git a/packages/core/src/AvatarGroup/AvatarGroupOverflow.tsx b/packages/core/src/AvatarGroup/AvatarGroupOverflow.tsxindex 0534fc8e32..9268d3582e 100644--- a/packages/core/src/AvatarGroup/AvatarGroupOverflow.tsx+++ b/packages/core/src/AvatarGroup/AvatarGroupOverflow.tsx@@ -3,7 +3,7 @@/*** @file AvatarGroupOverflow.tsx- * @input Uses React, StyleX, AvatarGroupContext, i18n (useTranslator)+ * @input Uses React, StyleX, AvatarGroupContext, i18n (useComponentTranslator)* @output Exports AvatarGroupOverflow for overflow indicator* @position Slot component used inside AvatarGroup*@@ -32,7 +32,13 @@ import {themeProps} from '../utils/themeProps';import {focusOutlineProps} from '../utils/focusOutline.stylex';import {interactionOverlayStyles} from '../utils/interactionOverlay.stylex';import {usePressFeedback} from '../hooks/usePressFeedback';-import {useTranslator} from '../i18n';+import {+ registerEnglishFallback,+ useComponentTranslator,+} from '../i18n/useComponentTranslator';+import english from '../i18n/generated-english/AvatarGroup/AvatarGroupOverflow.generated';++registerEnglishFallback(english);const BORDER_WIDTH = 2;const OVERFLOW_FONT_RATIO = 0.35;@@ -160,7 +166,7 @@ export function AvatarGroupOverflow({...rest}: AvatarGroupOverflowProps): ReactNode {const pressable = usePressFeedback();- const t = useTranslator();+ const t = useComponentTranslator();const group = useAvatarGroup();const size = group?.size ?? 'md';const shape = group?.shape ?? 'circle';diff --git a/packages/core/src/Banner/Banner.tsx b/packages/core/src/Banner/Banner.tsxindex 6820e8ca57..8b6bea6cb1 100644--- a/packages/core/src/Banner/Banner.tsx+++ b/packages/core/src/Banner/Banner.tsx@@ -74,8 +74,14 @@ import {composeEventHandlers, isRenderable, mergeProps} from '../utils';import type {Elevation} from '../utils/types';import {edgeCompSlot} from '../Layout/edgeCompensation.stylex';import {themeProps} from '../utils/themeProps';-import {useTranslator} from '../i18n';import type {BannerStatusMap, BannerContainerMap} from './index';+import {+ registerEnglishFallback,+ useComponentTranslator,+} from '../i18n/useComponentTranslator';+import english from '../i18n/generated-english/Banner/Banner.generated';++registerEnglishFallback(english);// =============================================================================// Types@@ -535,7 +541,7 @@ export function Banner({onPointerDownCapture,...rest}: BannerProps) {- const t = useTranslator();+ const t = useComponentTranslator();const [isDismissed, setIsDismissed] = useState(false);// The disclosure state machine is the shared one — Banner owns no collapse// state of its own. `collapsible={false}` disables it, and that is whatdiff --git a/packages/core/src/Breadcrumbs/Breadcrumbs.tsx b/packages/core/src/Breadcrumbs/Breadcrumbs.tsxindex 655cd4a22d..4bc09272b3 100644--- a/packages/core/src/Breadcrumbs/Breadcrumbs.tsx+++ b/packages/core/src/Breadcrumbs/Breadcrumbs.tsx@@ -23,8 +23,14 @@ import {spacingVars} from '../theme/tokens.stylex';import {mergeProps} from '../utils';import type {BaseProps} from '../BaseProps';import {themeProps} from '../utils/themeProps';-import {useTranslator} from '../i18n';import type {BreadcrumbsVariantMap} from './index';+import {+ registerEnglishFallback,+ useComponentTranslator,+} from '../i18n/useComponentTranslator';+import english from '../i18n/generated-english/Breadcrumbs/Breadcrumbs.generated';++registerEnglishFallback(english);// =============================================================================// Variant type@@ -139,7 +145,7 @@ export function Breadcrumbs({ref,...rest}: BreadcrumbsProps) {- const t = useTranslator();+ const t = useComponentTranslator();const label = labelFromProps ?? t('@astryx.breadcrumbs.label');const ctxValue = useMemo<BreadcrumbContextValue>(() => ({variant, separator}),diff --git a/packages/core/src/Button/Button.tsx b/packages/core/src/Button/Button.tsxindex a698dadd0e..493eaaef7f 100644--- a/packages/core/src/Button/Button.tsx+++ b/packages/core/src/Button/Button.tsx@@ -4,7 +4,7 @@/*** @file Button.tsx- * @input Uses React, ButtonHTMLAttributes, ReactNode, i18n (useTranslator), group contexts+ * @input Uses React, ButtonHTMLAttributes, ReactNode, i18n (useComponentTranslator), group contexts* @output Exports Button component, ButtonProps, ButtonVariant types* @position Core implementation; consumed by index.ts, tested by Button.test.tsx*@@ -65,8 +65,14 @@ import {themeProps} from '../utils/themeProps';import {focusOutlineProps} from '../utils/focusOutline.stylex';import {interactionOverlayStyles} from '../utils/interactionOverlay.stylex';import {usePressFeedback} from '../hooks/usePressFeedback';-import {useTranslator} from '../i18n/useTranslator';import type {ButtonVariantMap} from './index';+import {+ registerEnglishFallback,+ useComponentTranslator,+} from '../i18n/useComponentTranslator';+import english from '../i18n/generated-english/Button/Button.generated';++registerEnglishFallback(english);/*** Base button styles@@ -605,7 +611,7 @@ export function Button({...props}: ButtonProps): ReactNode {const pressFeedback = usePressFeedback();- const t = useTranslator();+ const t = useComponentTranslator();const size = useSize(sizeProp, 'md');const buttonGroup = useButtonGroup();const inputGroup = useInputGroup();diff --git a/packages/core/src/Calendar/Calendar.tsx b/packages/core/src/Calendar/Calendar.tsxindex a21a514b94..7cc5b9a45f 100644--- a/packages/core/src/Calendar/Calendar.tsx+++ b/packages/core/src/Calendar/Calendar.tsx@@ -94,8 +94,15 @@ import type {} from '../utils/dateTypes';import {normalizeDayOfWeek} from '../utils/dateTypes';import {themeProps} from '../utils/themeProps';-import {useLocale, useTranslator} from '../i18n';+import {useLocale} from '../i18n';import {VisuallyHidden} from '../VisuallyHidden';+import {+ registerEnglishFallback,+ useComponentTranslator,+} from '../i18n/useComponentTranslator';+import english from '../i18n/generated-english/Calendar/Calendar.generated';++registerEnglishFallback(english);/** How a month navigation moves the focused day: by its row offset in days, or by whole months. */type NavigationUnit = 'days' | 'months';@@ -249,7 +256,7 @@ function firstEnabledDayOfMonth(* ```*/export function Calendar({ref, ...props}: CalendarProps) {- const t = useTranslator();+ const t = useComponentTranslator();const locale = useLocale();const {handleRef,@@ -1253,7 +1260,7 @@ function DayCell({onDayClick,onDayHover,}: DayCellProps) {- const t = useTranslator();+ const t = useComponentTranslator();const locale = useLocale();const pressable = usePressFeedback();const {date, isOutside, dayNumber} = day;diff --git a/packages/core/src/Carousel/Carousel.tsx b/packages/core/src/Carousel/Carousel.tsxindex d8b1a3c695..8f04f0b560 100644--- a/packages/core/src/Carousel/Carousel.tsx+++ b/packages/core/src/Carousel/Carousel.tsx@@ -51,9 +51,15 @@ import type {BaseProps} from '../BaseProps';import {mergeProps, rtlStyles} from '../utils';import type {SpacingStep} from '../utils/types';import {themeProps} from '../utils/themeProps';-import {useTranslator} from '../i18n';import {useMergedRefs} from '../hooks/useMergedRefs';+import {+ registerEnglishFallback,+ useComponentTranslator,+} from '../i18n/useComponentTranslator';+import english from '../i18n/generated-english/Carousel/Carousel.generated';++registerEnglishFallback(english);/*** Imperative control surface for the Carousel, accessed via the `handleRef`* prop. Methods drive the same native-scroll machinery as the built-in@@ -340,7 +346,7 @@ export function Carousel({'data-testid': testId,...htmlProps}: CarouselProps) {- const t = useTranslator();+ const t = useComponentTranslator();const ariaLabel = ariaLabelFromProps ?? t('@astryx.carousel.label');const scrollElRef = useRef<HTMLElement | null>(null);const startButtonRef = useRef<HTMLButtonElement>(null);diff --git a/packages/core/src/CheckboxInput/CheckboxInput.tsx b/packages/core/src/CheckboxInput/CheckboxInput.tsxindex 8073810c98..e8d527650c 100644--- a/packages/core/src/CheckboxInput/CheckboxInput.tsx+++ b/packages/core/src/CheckboxInput/CheckboxInput.tsx@@ -47,7 +47,6 @@ import {mergeProps} from '../utils/mergeProps';import {rtlStyles} from '../utils/rtlStyles';import {indicatorScope} from '../Indicator/indicator.markers.stylex';import {interactionOverlayStyles} from '../utils/interactionOverlay.stylex';-import {useTranslator} from '../i18n/useTranslator';import {useIndicatorFocusRing} from '../hooks/useIndicatorFocusRing';import {useBusyAnnouncement} from '../hooks/useBusyAnnouncement';import {usePressFeedback} from '../hooks/usePressFeedback';@@ -56,6 +55,13 @@ import {useIndicator} from '../Indicator/useIndicator';import {themeProps} from '../utils/themeProps';import {useMergedRefs} from '../hooks/useMergedRefs';+import {+ registerEnglishFallback,+ useComponentTranslator,+} from '../i18n/useComponentTranslator';+import english from '../i18n/generated-english/CheckboxInput/CheckboxInput.generated';++registerEnglishFallback(english);// The touch press's paint, declared by the shared overlay styles on the// element the controller writes to (`pressedAlpha`) at the press's strength,@@ -374,7 +380,7 @@ export function CheckboxInput({// `opacity: 0`, and only the indicator's own element can shape the outline// to match it. See useIndicatorFocusRing.const indicatorRef = useRef<HTMLSpanElement>(null);- const t = useTranslator();+ const t = useComponentTranslator();// The busy Spinner sits in the decorative, aria-hidden indicator, so this// control announces its busy start itself (spec:AST-086 FR8).useBusyAnnouncement(isBusy, t('@astryx.spinner.loading'), indicatorRef);diff --git a/packages/core/src/CheckboxList/CheckboxListItem.tsx b/packages/core/src/CheckboxList/CheckboxListItem.tsxindex 56ce90d9be..aacc3aa90a 100644--- a/packages/core/src/CheckboxList/CheckboxListItem.tsx+++ b/packages/core/src/CheckboxList/CheckboxListItem.tsx@@ -27,10 +27,16 @@ import type {CheckboxInputProps} from '../CheckboxInput/CheckboxInput';import {ListItem} from '../List/ListItem';import {ListContext} from '../List/ListContext';import {CheckboxListContext} from './CheckboxListContext';-import {useTranslator} from '../i18n';import {ItemDescriptionContext} from '../Item/ItemDescriptionContext';import {joinAriaIDs} from '../utils/inputAria';import type {ItemAlign} from '../Item';+import {+ registerEnglishFallback,+ useComponentTranslator,+} from '../i18n/useComponentTranslator';+import english from '../i18n/generated-english/CheckboxList/CheckboxListItem.generated';++registerEnglishFallback(english);// =============================================================================// Styles@@ -209,7 +215,7 @@ export function CheckboxListItem({align,...restProps}: CheckboxListItemProps) {- const t = useTranslator();+ const t = useComponentTranslator();const ctx = use(CheckboxListContext);if (ctx && ctx.value !== undefined && value === undefined) {diff --git a/packages/core/src/Citation/Citation.tsx b/packages/core/src/Citation/Citation.tsxindex 58ce033fcb..3e244b7385 100644--- a/packages/core/src/Citation/Citation.tsx+++ b/packages/core/src/Citation/Citation.tsx@@ -33,8 +33,14 @@ import {mergeProps} from '../utils';import {isSafeUrl} from '../utils/safeUrl';import type {BaseProps} from '../BaseProps';import {themeProps} from '../utils/themeProps';-import {useTranslator} from '../i18n';import {renderIconSlot} from '../Icon';+import {+ registerEnglishFallback,+ useComponentTranslator,+} from '../i18n/useComponentTranslator';+import english from '../i18n/generated-english/Citation/Citation.generated';++registerEnglishFallback(english);export interface CitationSource {title?: string;@@ -188,7 +194,7 @@ export function Citation({'data-testid': testId,...rest}: CitationProps): React.ReactElement {- const t = useTranslator();+ const t = useComponentTranslator();const title = source.title ?? String(number);const href =source.url != null && isSafeUrl(source.url) ? source.url : undefined;diff --git a/packages/core/src/CodeBlock/CodeBlock.tsx b/packages/core/src/CodeBlock/CodeBlock.tsxindex a412a83adf..303229aac0 100644--- a/packages/core/src/CodeBlock/CodeBlock.tsx+++ b/packages/core/src/CodeBlock/CodeBlock.tsx@@ -57,8 +57,14 @@ import {ensureHighlightStyles} from './highlightStyles';import {applyHighlightRangesChunked} from './highlightRanges';import {themeProps} from '../utils/themeProps';import {focusOutlineProps} from '../utils/focusOutline.stylex';-import {useTranslator} from '../i18n';import {SyntaxTheme, type SyntaxThemeDefinition} from '../theme/syntax';+import {+ registerEnglishFallback,+ useComponentTranslator,+} from '../i18n/useComponentTranslator';+import english from '../i18n/generated-english/CodeBlock/CodeBlock.generated';++registerEnglishFallback(english);// ---------------------------------------------------------------------------// Styles@@ -978,7 +984,7 @@ export function CodeBlock({ref,...props}: CodeBlockProps) {- const t = useTranslator();+ const t = useComponentTranslator();// Owns the clipboard write, the transient copied flag, its reset timer, and// the polite copy announcement (a swapped aria-label alone is not reliably// announced) — shared with Timestamp via the same hook.diff --git a/packages/core/src/ComplexSelector/ComplexSelector.tsx b/packages/core/src/ComplexSelector/ComplexSelector.tsxindex 9724af078e..c013cb0fb6 100644--- a/packages/core/src/ComplexSelector/ComplexSelector.tsx+++ b/packages/core/src/ComplexSelector/ComplexSelector.tsx@@ -40,7 +40,6 @@ import {useBusyAnnouncement} from '../hooks/useBusyAnnouncement';import {Field, inputWrapperStyles} from '../Field';import {Icon, renderIconSlot, type IconType} from '../Icon';import {Spinner} from '../Spinner';-import {useTranslator} from '../i18n';import {layerAnimations} from '../Layer/layerAnimations.stylex';import type {LayerAlignment, LayerPlacement} from '../Layer/useLayer';import {usePopover} from '../Popover/usePopover';@@ -66,6 +65,13 @@ import type {SizeValue} from '../utils/types';import {themeProps} from '../utils/themeProps';import {layerViewportInset} from '../Layer/layerViewportInset.stylex';import type {FieldStatusPlacement} from '../Field/fieldStatusPlacement';+import {+ registerEnglishFallback,+ useComponentTranslator,+} from '../i18n/useComponentTranslator';+import english from '../i18n/generated-english/ComplexSelector/ComplexSelector.generated';++registerEnglishFallback(english);// The popup content's own block-size cap; the viewport cap is the layer// runtime's.@@ -572,7 +578,7 @@ export function ComplexSelector<Value>({controlClassName != null ||controlStyle != null),);- const t = useTranslator();+ const t = useComponentTranslator();const pressable = usePressFeedback();const isEffectivelyRequired = useResolvedRequired({isRequired, isOptional});const placeholder = placeholderFromProps ?? t('@astryx.selector.placeholder');diff --git a/packages/core/src/ContextMenu/ContextMenu.tsx b/packages/core/src/ContextMenu/ContextMenu.tsxindex 59aa0f5461..ade7f678a7 100644--- a/packages/core/src/ContextMenu/ContextMenu.tsx+++ b/packages/core/src/ContextMenu/ContextMenu.tsx@@ -92,7 +92,6 @@ import {mergeProps, rtlStyles} from '../utils';import type {BaseProps} from '../BaseProps';import type {StyleXStyles} from '../theme/types';import {themeProps} from '../utils/themeProps';-import {useTranslator} from '../i18n';import type {DropdownMenuOption,DropdownMenuItemData,@@ -105,6 +104,13 @@ import {useAdaptivePresentation,type AdaptivePresentation,} from '../hooks/useAdaptivePresentation';+import {+ registerEnglishFallback,+ useComponentTranslator,+} from '../i18n/useComponentTranslator';+import english from '../i18n/generated-english/ContextMenu/ContextMenu.generated';++registerEnglishFallback(english);const LazyMenuBottomSheet = lazy(async () =>import('../DropdownMenu/MenuBottomSheet').then(module => ({@@ -344,7 +350,7 @@ export function ContextMenu({'data-testid': testId,...rest}: ContextMenuProps) {- const t = useTranslator();+ const t = useComponentTranslator();const label = labelFromProps ?? t('@astryx.contextMenu.label');const backLabel = t('@astryx.dropdownMenu.back');const resolvedPresentation = useAdaptivePresentation(presentation);diff --git a/packages/core/src/Dialog/DialogHeader.tsx b/packages/core/src/Dialog/DialogHeader.tsxindex e36459420a..de93243e42 100644--- a/packages/core/src/Dialog/DialogHeader.tsx+++ b/packages/core/src/Dialog/DialogHeader.tsx@@ -29,7 +29,13 @@ import {isRenderable} from '../utils/isRenderable';import {mergeProps} from '../utils/mergeProps';import {themeProps} from '../utils/themeProps';import {useDialogContext} from './DialogContext';-import {useTranslator} from '../i18n/useTranslator';+import {+ registerEnglishFallback,+ useComponentTranslator,+} from '../i18n/useComponentTranslator';+import english from '../i18n/generated-english/Dialog/DialogHeader.generated';++registerEnglishFallback(english);const styles = stylex.create({container: {@@ -160,7 +166,7 @@ export function DialogHeader({ref,...rest}: DialogHeaderProps) {- const t = useTranslator();+ const t = useComponentTranslator();const titleRef = useRef<HTMLHeadingElement>(null);const dialogContext = useDialogContext();const shouldAutoFocus = dialogContext?.isInline !== true;diff --git a/packages/core/src/Drawer/DrawerHeader.tsx b/packages/core/src/Drawer/DrawerHeader.tsxindex 4c8e2c8435..2486f5db19 100644--- a/packages/core/src/Drawer/DrawerHeader.tsx+++ b/packages/core/src/Drawer/DrawerHeader.tsx@@ -34,8 +34,14 @@ import {Heading} from '../Heading';import {Icon} from '../Icon';import {LayoutHeader} from '../Layout';import {Text} from '../Text';-import {useTranslator} from '../i18n';import {isRenderable, mergeProps, themeProps} from '../utils';+import {+ registerEnglishFallback,+ useComponentTranslator,+} from '../i18n/useComponentTranslator';+import english from '../i18n/generated-english/Drawer/DrawerHeader.generated';++registerEnglishFallback(english);const styles = stylex.create({container: {@@ -147,7 +153,7 @@ export function DrawerHeader({ref,...rest}: DrawerHeaderProps) {- const t = useTranslator();+ const t = useComponentTranslator();const hasSubtitle = isRenderable(subtitle);const hasStartContent = isRenderable(startContent);const hasEndContent = isRenderable(endContent);diff --git a/packages/core/src/DropdownMenu/DropdownMenu.tsx b/packages/core/src/DropdownMenu/DropdownMenu.tsxindex abfdc88eb4..0ed3059384 100644--- a/packages/core/src/DropdownMenu/DropdownMenu.tsx+++ b/packages/core/src/DropdownMenu/DropdownMenu.tsx@@ -110,8 +110,14 @@ import {getInteractionModality,useInteractionModalityTracking,} from '../utils/interactionModality';-import {useTranslator} from '../i18n';import {focusOutlineStyles} from '../utils/focusOutline.stylex';+import {+ registerEnglishFallback,+ useComponentTranslator,+} from '../i18n/useComponentTranslator';+import english from '../i18n/generated-english/DropdownMenu/DropdownMenu.generated';++registerEnglishFallback(english);// The menu's own lower cap on the placement axis; the viewport cap underneath// it is the layer runtime's (spec:AST-059 FR3).@@ -548,7 +554,7 @@ function DropdownMenuBottomSheet({'data-testid': testId,...rest}: DropdownMenuDataProps & {presentation: 'bottom-sheet'}) {- const t = useTranslator();+ const t = useComponentTranslator();const button = buttonFromProps ?? {label: t(DEFAULT_BUTTON_I18N_KEY)};const backLabel = t('@astryx.dropdownMenu.back');const buttonRef = useRef<HTMLElement>(null);@@ -858,7 +864,7 @@ function DropdownMenuPopover({'data-testid': testId,...props}: DropdownMenuProps) {- const t = useTranslator();+ const t = useComponentTranslator();const button = buttonFromProps ?? {label: t(DEFAULT_BUTTON_I18N_KEY)};const items = ('items' in props ? props.items : undefined) ?? [];diff --git a/packages/core/src/DropdownMenu/DropdownMenuSubMenu.tsx b/packages/core/src/DropdownMenu/DropdownMenuSubMenu.tsxindex 74079aedef..943d4fba4f 100644--- a/packages/core/src/DropdownMenu/DropdownMenuSubMenu.tsx+++ b/packages/core/src/DropdownMenu/DropdownMenuSubMenu.tsx@@ -120,7 +120,13 @@ import {} from './DropdownMenuContext';import {focusMenuItemOnHover} from './menuItemHover';import {DropdownMenuItem} from './DropdownMenuItem';-import {useTranslator} from '../i18n';+import {+ registerEnglishFallback,+ useComponentTranslator,+} from '../i18n/useComponentTranslator';+import english from '../i18n/generated-english/DropdownMenu/DropdownMenuSubMenu.generated';++registerEnglishFallback(english);// The flyout's own lower cap on the placement axis; the viewport cap under// it and the inline gutter beside it are the layer runtime's (spec:AST-059).@@ -506,7 +512,7 @@ export function DropdownMenuSubMenu(...rest} = props;- const t = useTranslator();+ const t = useComponentTranslator();const menuCtx = useDropdownMenuContext();const rootSurface = use(DropdownMenuSurfaceContext);const rootHasRegions = use(MenuRegionsContext);diff --git a/packages/core/src/Field/FieldLabel.tsx b/packages/core/src/Field/FieldLabel.tsxindex cf607abbb1..88db96a91d 100644--- a/packages/core/src/Field/FieldLabel.tsx+++ b/packages/core/src/Field/FieldLabel.tsx@@ -4,7 +4,7 @@/*** @file FieldLabel.tsx- * @input Uses React, Icon, IconType, useTranslator, FormLayoutContext+ * @input Uses React, Icon, IconType, useComponentTranslator, FormLayoutContext* @output Exports FieldLabel component, FieldLabelProps* @position Core label implementation; used by Field, CheckboxInput, Switch*@@ -32,10 +32,16 @@ import {Icon, renderIconSlot} from '../Icon/Icon';import type {IconType} from '../Icon';import {Tooltip} from '../Tooltip/Tooltip';import {useTapStop} from '../Layer/useTouchTrigger';-import {useTranslator} from '../i18n/useTranslator';import {themeProps} from '../utils/themeProps';import {useInputContainer} from '../hooks/useInputContainer';import {FormLayoutContext} from '../FormLayout/FormLayoutContext';+import {+ registerEnglishFallback,+ useComponentTranslator,+} from '../i18n/useComponentTranslator';+import english from '../i18n/generated-english/Field/FieldLabel.generated';++registerEnglishFallback(english);const styles = stylex.create({// The label and its description read as a single block, with no space@@ -213,7 +219,7 @@ export function FieldLabel({ref,...rest}: FieldLabelProps) {- const t = useTranslator();+ const t = useComponentTranslator();const {defaultOptionality} = use(FormLayoutContext);// A form-level `defaultOptionality` means "only the exception is marked": adiff --git a/packages/core/src/Field/InputClearButton.tsx b/packages/core/src/Field/InputClearButton.tsxindex 27d2269c9b..0e55aafda0 100644--- a/packages/core/src/Field/InputClearButton.tsx+++ b/packages/core/src/Field/InputClearButton.tsx@@ -20,8 +20,14 @@ import type {ReactNode} from 'react';import * as stylex from '@stylexjs/stylex';import {Button} from '../Button/Button';import {Icon} from '../Icon/Icon';-import {useTranslator} from '../i18n/useTranslator';import {themeProps} from '../utils/themeProps';+import {+ registerEnglishFallback,+ useComponentTranslator,+} from '../i18n/useComponentTranslator';+import english from '../i18n/generated-english/Field/InputClearButton.generated';++registerEnglishFallback(english);const styles = stylex.create({button: {@@ -138,7 +144,7 @@ function renderInputClearButton({}export function InputClearButton(props: InputClearButtonProps): ReactNode {- const t = useTranslator();+ const t = useComponentTranslator();return renderInputClearButton({...props,tooltip: t('@astryx.inputClearButton.tooltip'),@@ -149,7 +155,7 @@ export function InputClearButton(props: InputClearButtonProps): ReactNode {export function InternalInputClearButton(props: InternalInputClearButtonProps,): ReactNode {- const t = useTranslator();+ const t = useComponentTranslator();return renderInputClearButton({...props,tooltip: t('@astryx.inputClearButton.tooltip'),diff --git a/packages/core/src/FileInput/FileInput.tsx b/packages/core/src/FileInput/FileInput.tsxindex 443c6aac2c..06ea631371 100644--- a/packages/core/src/FileInput/FileInput.tsx+++ b/packages/core/src/FileInput/FileInput.tsx@@ -59,13 +59,19 @@ import {} from '../Field/fieldParts';import type {SizeValue} from '../utils/types';import {themeProps} from '../utils/themeProps';-import {useTranslator} from '../i18n';import type {TranslatorFn} from '../i18n';import {useMergedRefs} from '../hooks/useMergedRefs';import {useListFormatter} from '../i18n/useListFormatter';import {useResolvedRequired} from '../hooks/useResolvedRequired';import type {FieldStatusPlacement} from '../Field/fieldStatusPlacement';+import {+ registerEnglishFallback,+ useComponentTranslator,+} from '../i18n/useComponentTranslator';+import english from '../i18n/generated-english/FileInput/FileInput.generated';++registerEnglishFallback(english);function formatFileSize(bytes: number, t: TranslatorFn): string {if (bytes < 1024) {return t('@astryx.fileInput.fileSize.bytes', {size: bytes});@@ -489,7 +495,7 @@ export function FileInput({containerClassName,containerStyle,});- const t = useTranslator();+ const t = useComponentTranslator();const generatedID = useId();const id = idProp ?? generatedID;const descriptionID = useId();diff --git a/packages/core/src/Kbd/Kbd.tsx b/packages/core/src/Kbd/Kbd.tsxindex 6340505199..5a7deaf80e 100644--- a/packages/core/src/Kbd/Kbd.tsx+++ b/packages/core/src/Kbd/Kbd.tsx@@ -19,7 +19,7 @@ import {mergeProps} from '../utils';import {isApplePlatform} from '../utils/isApplePlatform';import type {BaseProps} from '../BaseProps';import {themeProps} from '../utils/themeProps';-import {useTranslator, type TranslatorFn} from '../i18n';+import type {TranslatorFn} from '../i18n';import {colorVars,spacingVars,@@ -28,6 +28,13 @@ import {fontWeightVars,typeScaleVars,} from '../theme/tokens.stylex';+import {+ registerEnglishFallback,+ useComponentTranslator,+} from '../i18n/useComponentTranslator';+import english from '../i18n/generated-english/Kbd/Kbd.generated';++registerEnglishFallback(english);const styles = stylex.create({wrapper: {@@ -90,7 +97,9 @@ function getKeyDisplay(key: string, isMac: boolean, t: TranslatorFn): string {if (key === 'mod') {return isMac ? '\u2318' : t('@astryx.kbd.key.controlShort');}- if (key === 'escape') return t('@astryx.kbd.key.escapeShort');+ if (key === 'escape') {+ return t('@astryx.kbd.key.escapeShort');+ }return KEY_DISPLAY.get(key) ?? key.toUpperCase();}@@ -166,7 +175,7 @@ export interface KbdProps extends BaseProps<HTMLSpanElement> {* ```*/export function Kbd({keys, ref, xstyle, className, style, ...rest}: KbdProps) {- const t = useTranslator();+ const t = useComponentTranslator();const isMac = useSyncExternalStore(subscribeToPlatformChanges,isApplePlatform,diff --git a/packages/core/src/Lightbox/Lightbox.tsx b/packages/core/src/Lightbox/Lightbox.tsxindex 526dca3a37..3f63993ae8 100644--- a/packages/core/src/Lightbox/Lightbox.tsx+++ b/packages/core/src/Lightbox/Lightbox.tsx@@ -45,10 +45,16 @@ import {ModalAnnounceProvider} from '../hooks/ModalAnnounceProvider';import {overlayPaddingReset} from '../Layout/padding.stylex';import {LayerDepthProvider} from '../Layer/LayerDepthContext';import {useLayerDismissal} from '../Layer/useLayerDismissal';-import {useTranslator} from '../i18n';import {useMergedRefs} from '../hooks/useMergedRefs';import {isRtlElement} from '../hooks/isRtlElement';+import {+ registerEnglishFallback,+ useComponentTranslator,+} from '../i18n/useComponentTranslator';+import english from '../i18n/generated-english/Lightbox/Lightbox.generated';++registerEnglishFallback(english);/*** Media type for lightbox items.*/@@ -329,7 +335,7 @@ export function Lightbox({onKeyDown: onKeyDownProp,...props}: LightboxProps) {- const t = useTranslator();+ const t = useComponentTranslator();const dialogRef = useRef<HTMLDialogElement>(null);const mergedDialogRef = useMergedRefs(ref, dialogRef);const containerRef = useRef<HTMLDivElement>(null);diff --git a/packages/core/src/Link/Link.tsx b/packages/core/src/Link/Link.tsxindex 9877970365..b8b38f218b 100644--- a/packages/core/src/Link/Link.tsx+++ b/packages/core/src/Link/Link.tsx@@ -47,8 +47,14 @@ import {themeDataAttributes, themeProps} from '../utils/themeProps';import {focusOutlineProps} from '../utils/focusOutline.stylex';import {interactionOverlayStyles} from '../utils/interactionOverlay.stylex';import {usePressFeedback} from '../hooks/usePressFeedback';-import {useTranslator} from '../i18n';import {disabledInteractionProps} from '../utils/disabledInteraction';+import {+ registerEnglishFallback,+ useComponentTranslator,+} from '../i18n/useComponentTranslator';+import english from '../i18n/generated-english/Link/Link.generated';++registerEnglishFallback(english);/*** Base link styles@@ -320,7 +326,7 @@ export function Link({// document controller once, so the link's output stays a pure function of// its props.const pressable = usePressFeedback();- const t = useTranslator();+ const t = useComponentTranslator();const newTabLabel = newTabLabelFromProps ?? t('@astryx.link.newTab');const LinkComponent = useLinkComponent(as);const role = useInteractiveRole({href, onClick, isDisabled});diff --git a/packages/core/src/Markdown/Markdown.tsx b/packages/core/src/Markdown/Markdown.tsxindex f010c70f3c..dcb462d8e8 100644--- a/packages/core/src/Markdown/Markdown.tsx+++ b/packages/core/src/Markdown/Markdown.tsx@@ -98,7 +98,14 @@ import {headingLinksHeadingStyle,} from './plugins/HeadingLinksRenderer';import {themeProps} from '../utils/themeProps';-import {useTranslator, type TranslatorFn} from '../i18n';+import type {TranslatorFn} from '../i18n';+import {+ registerEnglishFallback,+ useComponentTranslator,+} from '../i18n/useComponentTranslator';+import english from '../i18n/generated-english/Markdown/Markdown.generated';++registerEnglishFallback(english);type SyncReactNode = Exclude<React.ReactNode, Promise<unknown>>;type RenderExtensionNode = MarkdownExtensionNode;@@ -2166,7 +2173,7 @@ export function Markdown<'data-testid': testId,...props}: MarkdownProps<Plugins>): React.ReactElement {- const t = useTranslator();+ const t = useComponentTranslator();// Keep one list while it names the same values, so an inline// `codeLanguages={[…]}` does not re-render every block on each parent// render (adjusting state during render, not in an Effect).diff --git a/packages/core/src/Markdown/plugins/HeadingLinksRenderer.tsx b/packages/core/src/Markdown/plugins/HeadingLinksRenderer.tsxindex 96d6ecb854..fa5a1bc768 100644--- a/packages/core/src/Markdown/plugins/HeadingLinksRenderer.tsx+++ b/packages/core/src/Markdown/plugins/HeadingLinksRenderer.tsx@@ -17,9 +17,15 @@ import {Button} from '../../Button/Button';import {Icon} from '../../Icon';import {useClipboard} from '../../hooks/useClipboard';import {useContainerReveal} from '../../hooks/useContainerReveal';-import {useTranslator} from '../../i18n';import {colorVars, sizeVars, spacingVars} from '../../theme/tokens.stylex';import {mergeProps, rtlStyles} from '../../utils';+import {+ registerEnglishFallback,+ useComponentTranslator,+} from '../../i18n/useComponentTranslator';+import english from '../../i18n/generated-english/Markdown/plugins/HeadingLinksRenderer.generated';++registerEnglishFallback(english);const COPY_FEEDBACK_MS = 1500;const COARSE_TARGET = '24px';@@ -132,7 +138,7 @@ export function HeadingLinksRenderer({headingTextStyle,blockSpacingStyle,}: HeadingLinksRendererProps): ReactElement {- const t = useTranslator();+ const t = useComponentTranslator();const copiedLabel = t('@astryx.markdownHeadingLinks.copied');const copyLabel = t('@astryx.markdownHeadingLinks.copy', {heading: headingLabel || headingId,diff --git a/packages/core/src/MetadataList/MetadataList.tsx b/packages/core/src/MetadataList/MetadataList.tsxindex f8dccfd027..64db0e21b8 100644--- a/packages/core/src/MetadataList/MetadataList.tsx+++ b/packages/core/src/MetadataList/MetadataList.tsx@@ -4,7 +4,7 @@/*** @file MetadataList.tsx- * @input Uses React, ReactNode, StyleXStyles, theme tokens, MetadataListContext, i18n (useTranslator)+ * @input Uses React, ReactNode, StyleXStyles, theme tokens, MetadataListContext, i18n (useComponentTranslator)* @output Exports MetadataList component, MetadataListProps, MetadataListColumns types* @position Core implementation; consumed by index.ts, tested by MetadataList.test.tsx*@@ -32,7 +32,13 @@ import type {BaseProps} from '../BaseProps';import {mergeProps} from '../utils';import {isRenderable} from '../utils/isRenderable';import {themeProps} from '../utils/themeProps';-import {useTranslator} from '../i18n';+import {+ registerEnglishFallback,+ useComponentTranslator,+} from '../i18n/useComponentTranslator';+import english from '../i18n/generated-english/MetadataList/MetadataList.generated';++registerEnglishFallback(english);// =============================================================================// Types@@ -217,7 +223,7 @@ export function MetadataList({);const [isShowAll, setIsShowAll] = useState(false);const contentId = useId();- const t = useTranslator();+ const t = useComponentTranslator();const contextValue = useMemo(() => ({diff --git a/packages/core/src/MobileNav/MobileNav.tsx b/packages/core/src/MobileNav/MobileNav.tsxindex 1743769b57..20332be1a1 100644--- a/packages/core/src/MobileNav/MobileNav.tsx+++ b/packages/core/src/MobileNav/MobileNav.tsx@@ -76,9 +76,15 @@ import {ModalAnnounceProvider} from '../hooks/ModalAnnounceProvider';import {useLayerDismissal} from '../Layer/useLayerDismissal';import type {BaseProps} from '../BaseProps';import {themeProps} from '../utils/themeProps';-import {useTranslator} from '../i18n';import {useMergedRefs} from '../hooks/useMergedRefs';+import {+ registerEnglishFallback,+ useComponentTranslator,+} from '../i18n/useComponentTranslator';+import english from '../i18n/generated-english/MobileNav/MobileNav.generated';++registerEnglishFallback(english);// =============================================================================// Styles// =============================================================================@@ -477,7 +483,7 @@ export function MobileNav({ref,...rest}: MobileNavProps) {- const t = useTranslator();+ const t = useComponentTranslator();// Read from AppShell context as fallbackconst appShellMobile = useAppShellMobile();const isOpen = isOpenProp ?? appShellMobile.isMobileNavOpen;diff --git a/packages/core/src/MobileNav/MobileNavToggle.tsx b/packages/core/src/MobileNav/MobileNavToggle.tsxindex ff40d7cd6b..e928dfcd78 100644--- a/packages/core/src/MobileNav/MobileNavToggle.tsx+++ b/packages/core/src/MobileNav/MobileNavToggle.tsx@@ -22,8 +22,14 @@ import {Button} from '../Button';import {Icon} from '../Icon';import {useAppShellMobile} from '../AppShell/AppShellMobileContext';import type {BaseProps} from '../BaseProps';-import {useTranslator} from '../i18n';import {composeEventHandlers} from '../utils';+import {+ registerEnglishFallback,+ useComponentTranslator,+} from '../i18n/useComponentTranslator';+import english from '../i18n/generated-english/MobileNav/MobileNavToggle.generated';++registerEnglishFallback(english);export interface MobileNavToggleProps extends Omit<BaseProps<HTMLButtonElement>,@@ -74,7 +80,7 @@ export function MobileNavToggle({onClick,...rest}: MobileNavToggleProps) {- const t = useTranslator();+ const t = useComponentTranslator();const label = labelFromProps ?? t('@astryx.mobileNav.toggle.open');const {isMobile,diff --git a/packages/core/src/MoreMenu/MoreMenu.tsx b/packages/core/src/MoreMenu/MoreMenu.tsxindex 5d56b05c47..4054286ebf 100644--- a/packages/core/src/MoreMenu/MoreMenu.tsx+++ b/packages/core/src/MoreMenu/MoreMenu.tsx@@ -30,7 +30,13 @@ import type {LayerAlignment, LayerPlacement} from '../Layer';import type {ButtonVariant, ButtonSize} from '../Button';import type {BaseProps} from '../BaseProps';import {stableClassName} from '../naming';-import {useTranslator} from '../i18n';+import {+ registerEnglishFallback,+ useComponentTranslator,+} from '../i18n/useComponentTranslator';+import english from '../i18n/generated-english/MoreMenu/MoreMenu.generated';++registerEnglishFallback(english);export interface MoreMenuProps extends Pick<BaseProps,@@ -144,7 +150,7 @@ export function MoreMenu({'data-testid': testId,ref,}: MoreMenuProps) {- const t = useTranslator();+ const t = useComponentTranslator();const label = labelFromProps ?? t('@astryx.moreMenu.label');const size = useSize(sizeProp, 'md');const moreIcon = useIcon('moreHorizontal');diff --git a/packages/core/src/MultiSelector/MultiSelector.tsx b/packages/core/src/MultiSelector/MultiSelector.tsxindex 7b7612d683..689d7955eb 100644--- a/packages/core/src/MultiSelector/MultiSelector.tsx+++ b/packages/core/src/MultiSelector/MultiSelector.tsx@@ -101,12 +101,18 @@ import {groupStyles, inputGroupItemProps} from '../InputGroup/groupStyles';import {useInputGroup} from '../InputGroup/InputGroupContext';import {InputGroupInternalContext} from '../InputGroup/InputGroupInternalContext';import {VisuallyHidden} from '../VisuallyHidden';-import {useTranslator} from '../i18n';import type {AdaptivePresentation} from '../hooks/useAdaptivePresentation';import {SelectorBottomSheet} from '../Selector/SelectorBottomSheet';import {useSelectorPresentation} from '../Selector/useSelectorPresentation';import {selectorPresentationStyles} from '../Selector/selectorPresentation.stylex';import type {FieldStatusPlacement} from '../Field/fieldStatusPlacement';+import {+ registerEnglishFallback,+ useComponentTranslator,+} from '../i18n/useComponentTranslator';+import english from '../i18n/generated-english/MultiSelector/MultiSelector.generated';++registerEnglishFallback(english);// Sentinel value for the select-all item in keyboard navigationconst SELECT_ALL_VALUE = '__xds_select_all__';@@ -1156,7 +1162,7 @@ export function MultiSelector<T extends MultiSelectorOptionType>({controlClassName != null ||controlStyle != null),);- const t = useTranslator();+ const t = useComponentTranslator();const pressable = usePressFeedback();const isEffectivelyRequired = useResolvedRequired({isRequired, isOptional});const placeholder =diff --git a/packages/core/src/NumberInput/NumberInput.tsx b/packages/core/src/NumberInput/NumberInput.tsxindex ab1c4170a7..9c66b224ba 100644--- a/packages/core/src/NumberInput/NumberInput.tsx+++ b/packages/core/src/NumberInput/NumberInput.tsx@@ -231,10 +231,17 @@ import {} from '../Field/fieldParts';import type {SizeValue} from '../utils/types';import {themeProps} from '../utils/themeProps';-import {useTranslator, useLocale} from '../i18n';+import {useLocale} from '../i18n';import {formatEditableNumber} from './numberParser';import {parseNumberInput, resolveNumberInputCommit} from './numberInputCommit';import type {FieldStatusPlacement} from '../Field/fieldStatusPlacement';+import {+ registerEnglishFallback,+ useComponentTranslator,+} from '../i18n/useComponentTranslator';+import english from '../i18n/generated-english/NumberInput/NumberInput.generated';++registerEnglishFallback(english);interface NumberInputPropsBase extends Omit<FieldInputBaseProps,@@ -598,7 +605,7 @@ export function NumberInput({containerStyle,});const pressable = usePressFeedback();- const t = useTranslator();+ const t = useComponentTranslator();const locale = useLocale();const isEffectivelyRequired = useResolvedRequired({isRequired, isOptional});const size = useSize(sizeProp, 'md');diff --git a/packages/core/src/Outline/Outline.tsx b/packages/core/src/Outline/Outline.tsxindex 37fb1ff02a..bcdc5aaee8 100644--- a/packages/core/src/Outline/Outline.tsx+++ b/packages/core/src/Outline/Outline.tsx@@ -45,9 +45,15 @@ import {themeProps} from '../utils/themeProps';import {focusOutlineProps} from '../utils/focusOutline.stylex';import {interactionOverlayStyles} from '../utils/interactionOverlay.stylex';import {usePressFeedback} from '../hooks/usePressFeedback';-import {useTranslator} from '../i18n';import {useMergedRefs} from '../hooks/useMergedRefs';+import {+ registerEnglishFallback,+ useComponentTranslator,+} from '../i18n/useComponentTranslator';+import english from '../i18n/generated-english/Outline/Outline.generated';++registerEnglishFallback(english);export type {OutlineItem} from './types';export interface OutlineProps extends BaseProps<HTMLElement> {@@ -347,7 +353,7 @@ export function Outline({...props}: OutlineProps) {const pressable = usePressFeedback();- const t = useTranslator();+ const t = useComponentTranslator();const label = labelFromProps ?? t('@astryx.outline.label');const rootRef = useRef<HTMLElement | null>(null);const LinkComponent = useLinkComponent();diff --git a/packages/core/src/Pagination/Pagination.tsx b/packages/core/src/Pagination/Pagination.tsxindex a5b15917f0..67b93acb08 100644--- a/packages/core/src/Pagination/Pagination.tsx+++ b/packages/core/src/Pagination/Pagination.tsx@@ -45,8 +45,14 @@ import {mergeProps, rtlStyles} from '../utils';import type {BaseProps} from '../BaseProps';import {themeProps} from '../utils/themeProps';import {focusOutlineProps} from '../utils/focusOutline.stylex';-import {useTranslator} from '../i18n/useTranslator';import type {PaginationVariantMap} from './index';+import {+ registerEnglishFallback,+ useComponentTranslator,+} from '../i18n/useComponentTranslator';+import english from '../i18n/generated-english/Pagination/Pagination.generated';++registerEnglishFallback(english);// =============================================================================// Types@@ -395,7 +401,7 @@ export function Pagination({const [, startTransition] = useTransition();// Resolve system strings once per render. Prop overrides win.- const t = useTranslator();+ const t = useComponentTranslator();const label = labelFromProps ?? t('@astryx.pagination.label');const firstLabel = t('@astryx.pagination.first');const lastLabel = t('@astryx.pagination.last');diff --git a/packages/core/src/Popover/Popover.tsx b/packages/core/src/Popover/Popover.tsxindex a0ae8ab2ee..8a592ce92c 100644--- a/packages/core/src/Popover/Popover.tsx+++ b/packages/core/src/Popover/Popover.tsx@@ -64,7 +64,13 @@ import {preloadPopoverBottomSheet,} from './lazyPopoverBottomSheet';import {Button} from '../Button';-import {useTranslator} from '../i18n';+import {+ registerEnglishFallback,+ useComponentTranslator,+} from '../i18n/useComponentTranslator';+import english from '../i18n/generated-english/Popover/Popover.generated';++registerEnglishFallback(english);// =============================================================================// Helpers@@ -519,7 +525,7 @@ export function Popover({style,'data-testid': testId,}: PopoverProps): ReactElement {- const t = useTranslator();+ const t = useComponentTranslator();const wrapperRef = useRef<HTMLDivElement>(null);const measurementFrameRef = useRef<{id: number; view: Window} | null>(null);const [hasOverflow, setHasOverflow] = useState(false);diff --git a/packages/core/src/Popover/usePopover.tsx b/packages/core/src/Popover/usePopover.tsxindex 6aa8868fea..79ad089a6e 100644--- a/packages/core/src/Popover/usePopover.tsx+++ b/packages/core/src/Popover/usePopover.tsx@@ -31,7 +31,6 @@ import {import {Button} from '../Button';import {FOCUSABLE_SELECTOR} from '../hooks/focusableSelector';import {rtlStyles} from '../utils';-import {useTranslator} from '../i18n';import {useDevWarning} from '../hooks/useDevWarning';import {focusOutlineProps} from '../utils/focusOutline.stylex';import {mergeProps} from '../utils/mergeProps';@@ -39,6 +38,13 @@ import {themeProps} from '../utils/themeProps';import {paddingStyles} from '../Layout/padding.stylex';import type {SpacingStep} from '../utils/types';import {stableClassName} from '../naming';+import {+ registerEnglishFallback,+ useComponentTranslator,+} from '../i18n/useComponentTranslator';+import english from '../i18n/generated-english/Popover/usePopover.generated';++registerEnglishFallback(english);/*** The fallback close button's wrapper (anchored layer) or button (sheet,@@ -407,7 +413,7 @@ function usePopoverImplementation(isModal = true,} = options;- const t = useTranslator();+ const t = useComponentTranslator();const closeButtonLabel =closeButtonLabelFromProps ?? t('@astryx.popover.close');diff --git a/packages/core/src/PowerSearch/formatFilterValue.ts b/packages/core/src/PowerSearch/formatFilterValue.tsindex d5490ae670..ab226bca18 100644--- a/packages/core/src/PowerSearch/formatFilterValue.ts+++ b/packages/core/src/PowerSearch/formatFilterValue.ts@@ -14,6 +14,10 @@ import type {OperatorValue, FilterValue, EnumItem} from './types';import type {InternalConfig} from './useInternalConfig';import type {Locale, TranslatorFn} from '../i18n';import {truncateCharacters} from '../utils/characters';+import {registerEnglishFallback} from '../i18n/englishFallback';+import english from '../i18n/generated-english/PowerSearch/formatFilterValue.generated';++registerEnglishFallback(english);function truncate(str: string, maxLength: number): string {return truncateCharacters(str, maxLength);diff --git a/packages/core/src/PowerSearch/usePowerSearchConfig.ts b/packages/core/src/PowerSearch/usePowerSearchConfig.tsindex ec7c4c529d..419dc0791f 100644--- a/packages/core/src/PowerSearch/usePowerSearchConfig.ts+++ b/packages/core/src/PowerSearch/usePowerSearchConfig.ts@@ -18,6 +18,10 @@ import type {PowerSearchOperator,} from './types';import {resolveDateTimeRangePart} from './resolveDateTimeRangePart';+import {registerEnglishFallback} from '../i18n/englishFallback';+import english from '../i18n/generated-english/PowerSearch/usePowerSearchConfig.generated';++registerEnglishFallback(english);// =============================================================================// Public Typesdiff --git a/packages/core/src/Resizable/ResizeHandle.tsx b/packages/core/src/Resizable/ResizeHandle.tsxindex 248e97df20..fbd74f23b5 100644--- a/packages/core/src/Resizable/ResizeHandle.tsx+++ b/packages/core/src/Resizable/ResizeHandle.tsx@@ -52,9 +52,15 @@ import {type ResizableProps,} from './useResizable';import {themeProps} from '../utils/themeProps';-import {useTranslator} from '../i18n';import {useMergedRefs} from '../hooks/useMergedRefs';+import {+ registerEnglishFallback,+ useComponentTranslator,+} from '../i18n/useComponentTranslator';+import english from '../i18n/generated-english/Resizable/ResizeHandle.generated';++registerEnglishFallback(english);const KEYBOARD_STEP = 10;const KEYBOARD_LARGE_STEP = 50;@@ -450,7 +456,7 @@ export function ResizeHandle({ref,...props}: ResizeHandleProps) {- const t = useTranslator();+ const t = useComponentTranslator();const label = labelFromProps ?? t('@astryx.resizable.handle.label');const handleRef = useRef<HTMLDivElement>(null);// The pointer that owns the in-flight drag, plus the values its deltas arediff --git a/packages/core/src/Selector/Selector.tsx b/packages/core/src/Selector/Selector.tsxindex cc7cbe78b9..d32fc05e6a 100644--- a/packages/core/src/Selector/Selector.tsx+++ b/packages/core/src/Selector/Selector.tsx@@ -99,12 +99,18 @@ import {groupStyles, inputGroupItemProps} from '../InputGroup/groupStyles';import {useInputGroup} from '../InputGroup/InputGroupContext';import {InputGroupInternalContext} from '../InputGroup/InputGroupInternalContext';import {VisuallyHidden} from '../VisuallyHidden';-import {useTranslator} from '../i18n';import type {AdaptivePresentation} from '../hooks/useAdaptivePresentation';import {SelectorBottomSheet} from './SelectorBottomSheet';import {useSelectorPresentation} from './useSelectorPresentation';import {selectorPresentationStyles} from './selectorPresentation.stylex';import type {FieldStatusPlacement} from '../Field/fieldStatusPlacement';+import {+ registerEnglishFallback,+ useComponentTranslator,+} from '../i18n/useComponentTranslator';+import english from '../i18n/generated-english/Selector/Selector.generated';++registerEnglishFallback(english);const styles = stylex.create({// Trigger container — the enhanced click target wrapping the combobox button and clear button as siblings@@ -947,7 +953,7 @@ function filterOptionsByQuery(export function Selector<T extends SelectorOptionType>(props: SelectorProps<T>,) {- const t = useTranslator();+ const t = useComponentTranslator();const pressable = usePressFeedback();const {label,diff --git a/packages/core/src/SideNav/SideNav.tsx b/packages/core/src/SideNav/SideNav.tsxindex 2b1716226d..dab2591f5d 100644--- a/packages/core/src/SideNav/SideNav.tsx+++ b/packages/core/src/SideNav/SideNav.tsx@@ -52,7 +52,6 @@ import {ResizeHandle} from '../Resizable/ResizeHandle';import {themeProps} from '../utils/themeProps';import {SizeProvider} from '../SizeContext/SizeContext';import {useDevWarning} from '../hooks/useDevWarning';-import {useTranslator} from '../i18n';import {useMergedRefs} from '../hooks/useMergedRefs';import {LayoutChangeSnapshot} from '../motion/LayoutChangeSnapshot';@@ -77,6 +76,13 @@ import {type RailMotion,type RailSnapshot,} from './railMotion';+import {+ registerEnglishFallback,+ useComponentTranslator,+} from '../i18n/useComponentTranslator';+import english from '../i18n/generated-english/SideNav/SideNav.generated';++registerEnglishFallback(english);// =============================================================================// Constants// =============================================================================@@ -465,7 +471,7 @@ export function SideNav({handleRef,...props}: SideNavProps) {- const t = useTranslator();+ const t = useComponentTranslator();// Parse collapsible propconst collapsibleConfig = typeof collapsible === 'object' ? collapsible : {};const hasCollapseButton = collapsibleConfig.hasButton ?? true;diff --git a/packages/core/src/SideNav/SideNavCollapseButton.tsx b/packages/core/src/SideNav/SideNavCollapseButton.tsxindex 39cb2f5c12..3f1ccdaede 100644--- a/packages/core/src/SideNav/SideNavCollapseButton.tsx+++ b/packages/core/src/SideNav/SideNavCollapseButton.tsx@@ -31,10 +31,16 @@ import {type SideNavImperativeCollapseHandle,} from './SideNavCollapseContext';import {useAppShellMobile} from '../AppShell/AppShellMobileContext';-import {useTranslator} from '../i18n';import {useMergedRefs} from '../hooks/useMergedRefs';import {SideNavFocusTargetsContext} from './SideNavFocusTargetsContext';import type {ElementSize} from '../SizeContext/SizeContext';+import {+ registerEnglishFallback,+ useComponentTranslator,+} from '../i18n/useComponentTranslator';+import english from '../i18n/generated-english/SideNav/SideNavCollapseButton.generated';++registerEnglishFallback(english);// =============================================================================// Styles@@ -140,7 +146,7 @@ export function SideNavCollapseButton({onClick: onClickProp,...props}: SideNavCollapseButtonProps) {- const t = useTranslator();+ const t = useComponentTranslator();const {isCollapsed, toggle, isCollapsible} = useSideNavCollapseState(collapsible,handleRef,diff --git a/packages/core/src/SideNav/SideNavHeading.tsx b/packages/core/src/SideNav/SideNavHeading.tsxindex 76adab4a2c..2f51fee41e 100644--- a/packages/core/src/SideNav/SideNavHeading.tsx+++ b/packages/core/src/SideNav/SideNavHeading.tsx@@ -56,7 +56,13 @@ import {NavHeadingDismissContext,} from '../NavMenu/NavMenuContext';import {themeProps} from '../utils/themeProps';-import {useTranslator} from '../i18n';+import {+ registerEnglishFallback,+ useComponentTranslator,+} from '../i18n/useComponentTranslator';+import english from '../i18n/generated-english/SideNav/SideNavHeading.generated';++registerEnglishFallback(english);// =============================================================================// Styles@@ -393,7 +399,7 @@ export function SideNavHeading({...props}: SideNavHeadingProps) {const pressable = usePressFeedback();- const t = useTranslator();+ const t = useComponentTranslator();const LinkComponent = useLinkComponent(as);const {isCollapsed} = useSideNavCollapse();const rootRef = useRef<HTMLDivElement>(null);diff --git a/packages/core/src/SideNav/SideNavItem.tsx b/packages/core/src/SideNav/SideNavItem.tsxindex da66ca0f4a..3251d5f268 100644--- a/packages/core/src/SideNav/SideNavItem.tsx+++ b/packages/core/src/SideNav/SideNavItem.tsx@@ -75,10 +75,16 @@ import {useSideNavRenderMode} from './SideNavRenderContext';import {useAppShellMobile} from '../AppShell/AppShellMobileContext';import {themeProps} from '../utils/themeProps';import {disabledInteractionProps} from '../utils/disabledInteraction';-import {useTranslator} from '../i18n';import {useMergedRefs} from '../hooks/useMergedRefs';import {SideNavFocusTargetsContext} from './SideNavFocusTargetsContext';+import {+ registerEnglishFallback,+ useComponentTranslator,+} from '../i18n/useComponentTranslator';+import english from '../i18n/generated-english/SideNav/SideNavItem.generated';++registerEnglishFallback(english);// =============================================================================// Styles// =============================================================================@@ -525,7 +531,7 @@ export function SideNavItem({// The row (or, collapsed, the trigger/link/button) is the pressable; the// expand toggle inside it is its own.const pressable = usePressFeedback();- const t = useTranslator();+ const t = useComponentTranslator();const {isCollapsed} = useSideNavCollapse();const renderMode = useSideNavRenderMode();const {closeMobileNav} = useAppShellMobile();diff --git a/packages/core/src/Slider/Slider.tsx b/packages/core/src/Slider/Slider.tsxindex 47eeeb4196..a75e7c275b 100644--- a/packages/core/src/Slider/Slider.tsx+++ b/packages/core/src/Slider/Slider.tsx@@ -56,7 +56,13 @@ import {themeProps} from '../utils/themeProps';import {useMergedRefs} from '../hooks/useMergedRefs';import {useResolvedRequired} from '../hooks/useResolvedRequired';-import {useTranslator} from '../i18n';+import {+ registerEnglishFallback,+ useComponentTranslator,+} from '../i18n/useComponentTranslator';+import english from '../i18n/generated-english/Slider/Slider.generated';++registerEnglishFallback(english);// =============================================================================// Types// =============================================================================@@ -511,7 +517,7 @@ export function Slider({ref, ...props}: SliderProps) {'aria-describedby': ariaDescribedByProp,...restWithRange} = props;- const t = useTranslator();+ const t = useComponentTranslator();const {minStepsBetweenThumbs: _minSteps, ...restProps} =restWithRange as typeof restWithRange & {minStepsBetweenThumbs?: number};const {rest, container} = useFieldInputStyling('Slider', restProps, {diff --git a/packages/core/src/Spinner/Spinner.tsx b/packages/core/src/Spinner/Spinner.tsxindex 0e637a8f1f..9e29e06160 100644--- a/packages/core/src/Spinner/Spinner.tsx+++ b/packages/core/src/Spinner/Spinner.tsx@@ -4,7 +4,7 @@/*** @file Spinner.tsx- * @input Uses React, i18n (useTranslator), StyleX, SVG rendering+ * @input Uses React, i18n (useComponentTranslator), StyleX, SVG rendering* @output Exports Spinner component, SpinnerProps, SpinnerSize, SpinnerShade types* @position Core implementation of spinner loading indicator*@@ -22,8 +22,14 @@ import {colorVars, durationVars, spacingVars} from '../theme/tokens.stylex';import type {BaseProps} from '../BaseProps';import {Text} from '../Text/Text';import {mergeProps} from '../utils/mergeProps';-import {useTranslator} from '../i18n/useTranslator';import {themeProps} from '../utils/themeProps';+import {+ registerEnglishFallback,+ useComponentTranslator,+} from '../i18n/useComponentTranslator';+import english from '../i18n/generated-english/Spinner/Spinner.generated';++registerEnglishFallback(english);// =============================================================================// Constants@@ -511,7 +517,7 @@ export function Spinner({const arcLength = circumference * ARC_FRACTION;const hasLabel = label != null;const labelId = useId();- const t = useTranslator();+ const t = useComponentTranslator();// When a visible string label renders (and no explicit aria-label is set),// name the status element from the visible Text via aria-labelledby insteaddiff --git a/packages/core/src/Stepper/Step.tsx b/packages/core/src/Stepper/Step.tsxindex 304cc10c7d..1cc223ddee 100644--- a/packages/core/src/Stepper/Step.tsx+++ b/packages/core/src/Stepper/Step.tsx@@ -63,10 +63,16 @@ import {usePressFeedback} from '../hooks/usePressFeedback';import type {BaseProps} from '../BaseProps';import {Icon} from '../Icon';import {VisuallyHidden} from '../VisuallyHidden';-import {useTranslator} from '../i18n';import {useStepperInternalContext} from './StepperContext';import {stepMarker} from './stepper.stylex';import type {StepStatus} from './StepStatus';+import {+ registerEnglishFallback,+ useComponentTranslator,+} from '../i18n/useComponentTranslator';+import english from '../i18n/generated-english/Stepper/Step.generated';++registerEnglishFallback(english);/*** Built-in indicator presets. Anything other than these strings passed to@@ -1012,7 +1018,7 @@ export function Step({...rest}: StepProps) {const pressable = usePressFeedback();- const t = useTranslator();+ const t = useComponentTranslator();const ctx = useStepperInternalContext();const {activeStep,diff --git a/packages/core/src/Stepper/Stepper.tsx b/packages/core/src/Stepper/Stepper.tsxindex e11aad483d..20a775ce27 100644--- a/packages/core/src/Stepper/Stepper.tsx+++ b/packages/core/src/Stepper/Stepper.tsx@@ -41,7 +41,6 @@ import type {BaseProps} from '../BaseProps';import {themeProps} from '../utils';import {Icon} from '../Icon';import {IconButton} from '../IconButton';-import {useTranslator} from '../i18n';import {StepperContext,StepperInternalContext,@@ -51,6 +50,13 @@ import {type StepperInternalContextValue,type StepperRegistrationOptions,} from './StepperContext';+import {+ registerEnglishFallback,+ useComponentTranslator,+} from '../i18n/useComponentTranslator';+import english from '../i18n/generated-english/Stepper/Stepper.generated';++registerEnglishFallback(english);/*** Default width below which a step can no longer hold its own label. Under@@ -246,7 +252,7 @@ export function Stepper({ref,...rest}: StepperProps) {- const t = useTranslator();+ const t = useComponentTranslator();const label = labelFromProps ?? t('@astryx.stepper.label');const minimumStepWidth =horizontalOptions?.minimumStepWidth ?? DEFAULT_MIN_STEP_WIDTH;diff --git a/packages/core/src/Switch/Switch.tsx b/packages/core/src/Switch/Switch.tsxindex bc1ff12b36..98d7fd2034 100644--- a/packages/core/src/Switch/Switch.tsx+++ b/packages/core/src/Switch/Switch.tsx@@ -4,7 +4,7 @@/*** @file Switch.tsx- * @input Uses React, useId, ChangeEvent, FieldLabel, FieldStatus, IconType, InputStatus, useTooltip, i18n (useTranslator)+ * @input Uses React, useId, ChangeEvent, FieldLabel, FieldStatus, IconType, InputStatus, useTooltip, i18n (useComponentTranslator)* @output Exports Switch component, SwitchProps, SwitchLabelPosition, SwitchLabelSpacing* @position Core implementation; consumed by index.ts, tested by Switch.test.tsx*@@ -51,10 +51,16 @@ import type {SizeValue} from '../utils/types';import {themeProps} from '../utils/themeProps';import {useAnnounce} from '../hooks/useAnnounce';import {useResolvedRequired} from '../hooks/useResolvedRequired';-import {useTranslator} from '../i18n';import {useMergedRefs} from '../hooks/useMergedRefs';import {usePressFeedback} from '../hooks/usePressFeedback';+import {+ registerEnglishFallback,+ useComponentTranslator,+} from '../i18n/useComponentTranslator';+import english from '../i18n/generated-english/Switch/Switch.generated';++registerEnglishFallback(english);const wrapperSizeStyles = stylex.create({sm: {width: 32,@@ -573,7 +579,7 @@ export function Switch({'aria-labelledby': ariaLabelledByProp,...rest}: SwitchProps) {- const t = useTranslator();+ const t = useComponentTranslator();const id = useId();// The row is the pressable: the input, the track and the label all sit// inside it, and the pressed arms above read the row's scope marker.diff --git a/packages/core/src/TabList/TabList.tsx b/packages/core/src/TabList/TabList.tsxindex 2449661b3a..778271228b 100644--- a/packages/core/src/TabList/TabList.tsx+++ b/packages/core/src/TabList/TabList.tsx@@ -56,9 +56,15 @@ import {themeProps} from '../utils/themeProps';import {observeResize} from '../utils/sharedResizeObserver';import {devWarn} from '../utils/devWarning';import {focusOutlineProps} from '../utils/focusOutline.stylex';-import {useTranslator} from '../i18n';import {useMergedRefs} from '../hooks/useMergedRefs';+import {+ registerEnglishFallback,+ useComponentTranslator,+} from '../i18n/useComponentTranslator';+import english from '../i18n/generated-english/TabList/TabList.generated';++registerEnglishFallback(english);/*** Selector matching the focusable stops in the tab strip: every Tab* (`[data-tab-value]`) and every TabMenu trigger (`[data-tab-menu]`),@@ -413,7 +419,7 @@ export function TabList({[EDGE_COMP_ATTR]: _edgeCompAttr,...restProps}: TabListProps) {- const t = useTranslator();+ const t = useComponentTranslator();const ariaLabel = ariaLabelFromProps ?? t('@astryx.tabList.label');const size = useSize(sizeProp, 'md');const hasScroll = overflow !== 'visible';diff --git a/packages/core/src/TextArea/TextArea.tsx b/packages/core/src/TextArea/TextArea.tsxindex b4b49277cc..2aed0d3025 100644--- a/packages/core/src/TextArea/TextArea.tsx+++ b/packages/core/src/TextArea/TextArea.tsx@@ -61,11 +61,17 @@ import {useResolvedRequired} from '../hooks/useResolvedRequired';import {useSize} from '../SizeContext/SizeContext';import {themeProps} from '../utils/themeProps';import {characterCount} from '../utils/characters';-import {useTranslator} from '../i18n';import {useMergedRefs} from '../hooks/useMergedRefs';import {useBusyAnnouncement} from '../hooks/useBusyAnnouncement';import type {FieldStatusPlacement} from '../Field/fieldStatusPlacement';+import {+ registerEnglishFallback,+ useComponentTranslator,+} from '../i18n/useComponentTranslator';+import english from '../i18n/generated-english/TextArea/TextArea.generated';++registerEnglishFallback(english);const COUNTER_WARNING_THRESHOLD = 0.8;const styles = stylex.create({@@ -427,7 +433,7 @@ export function TextArea({containerStyle,});const size = useSize(sizeProp, 'md');- const t = useTranslator();+ const t = useComponentTranslator();const isEffectivelyRequired = useResolvedRequired({isRequired, isOptional});const announce = useAnnounce();const generatedID = useId();diff --git a/packages/core/src/TextInput/TextInput.tsx b/packages/core/src/TextInput/TextInput.tsxindex c74803d88f..a8abae4963 100644--- a/packages/core/src/TextInput/TextInput.tsx+++ b/packages/core/src/TextInput/TextInput.tsx@@ -118,11 +118,17 @@ import {import {inputDisabledFocusStyles} from '../Field/inputDisabledFocus';import type {SizeValue} from '../utils/types';import {themeProps} from '../utils/themeProps';-import {useTranslator} from '../i18n';import {useMergedRefs} from '../hooks/useMergedRefs';import {useBusyAnnouncement} from '../hooks/useBusyAnnouncement';import type {FieldStatusPlacement} from '../Field/fieldStatusPlacement';+import {+ registerEnglishFallback,+ useComponentTranslator,+} from '../i18n/useComponentTranslator';+import english from '../i18n/generated-english/TextInput/TextInput.generated';++registerEnglishFallback(english);export type TextInputType = 'text' | 'password' | 'email';export interface TextInputProps extends Omit<@@ -339,7 +345,7 @@ export function TextInput({containerClassName,containerStyle,});- const t = useTranslator();+ const t = useComponentTranslator();const isEffectivelyRequired = useResolvedRequired({isRequired, isOptional});// A disabled field keeps its tab stop but, like a natively disabled one,// runs no caller event handler other than focus and blur (`spec:AST-085` FR2).diff --git a/packages/core/src/Thumbnail/Thumbnail.tsx b/packages/core/src/Thumbnail/Thumbnail.tsxindex 441db9c6ca..a2fa502e01 100644--- a/packages/core/src/Thumbnail/Thumbnail.tsx+++ b/packages/core/src/Thumbnail/Thumbnail.tsx@@ -48,7 +48,13 @@ import {themeProps} from '../utils/themeProps';import {focusOutlineProps} from '../utils/focusOutline.stylex';import {interactionOverlayStyles} from '../utils/interactionOverlay.stylex';import {usePressFeedback} from '../hooks/usePressFeedback';-import {useTranslator} from '../i18n';+import {+ registerEnglishFallback,+ useComponentTranslator,+} from '../i18n/useComponentTranslator';+import english from '../i18n/generated-english/Thumbnail/Thumbnail.generated';++registerEnglishFallback(english);export interface ThumbnailProps extends BaseProps<HTMLDivElement> {/** Ref forwarded to the root element */@@ -358,7 +364,7 @@ export function Thumbnail({...props}: ThumbnailProps) {const pressable = usePressFeedback();- const t = useTranslator();+ const t = useComponentTranslator();// Track the exact src that failed (rather than a boolean) so a changed src// gets a fresh load attempt instead of the stale error.diff --git a/packages/core/src/Timestamp/Timestamp.tsx b/packages/core/src/Timestamp/Timestamp.tsxindex 6cb84f8565..ebb2323e0b 100644--- a/packages/core/src/Timestamp/Timestamp.tsx+++ b/packages/core/src/Timestamp/Timestamp.tsx@@ -30,7 +30,6 @@ import {Text} from '../Text';import type {TextType, TextSize, TextColor, TextWeight} from '../theme/types';import {mergeProps} from '../utils';import {useDevWarning} from '../hooks/useDevWarning';-import {useTranslator} from '../i18n';import {useLocale} from '../i18n/useLocale';import type {BaseProps} from '../BaseProps';import {themeProps} from '../utils/themeProps';@@ -43,6 +42,13 @@ import type {} from './tooltipEntries';import {useMergedRefs} from '../hooks/useMergedRefs';+import {+ registerEnglishFallback,+ useComponentTranslator,+} from '../i18n/useComponentTranslator';+import english from '../i18n/generated-english/Timestamp/Timestamp.generated';++registerEnglishFallback(english);// Load the overlay lazily so a card-less Timestamp — the default — never// bundles HoverCard or the copy affordance's Icon/IconButton. Mirrors the code// split the read-only Tooltip path used before it.@@ -289,7 +295,7 @@ export function Timestamp({'data-testid': testId,...rest}: TimestampProps) {- const t = useTranslator();+ const t = useComponentTranslator();const locale = useLocale();const timeRef = useRef<HTMLTimeElement>(null);const mergedTimeRef = useMergedRefs(ref, timeRef);diff --git a/packages/core/src/Timestamp/TimestampHoverCard.tsx b/packages/core/src/Timestamp/TimestampHoverCard.tsxindex a93855f1c4..32840973ee 100644--- a/packages/core/src/Timestamp/TimestampHoverCard.tsx+++ b/packages/core/src/Timestamp/TimestampHoverCard.tsx@@ -30,7 +30,6 @@ import {HoverCard} from '../HoverCard/HoverCard';import {IconButton} from '../IconButton/IconButton';import {Icon} from '../Icon/Icon';import {useClipboard} from '../hooks/useClipboard';-import {useTranslator} from '../i18n/useTranslator';import {themeProps} from '../utils/themeProps';import {colorVars,@@ -39,6 +38,13 @@ import {fontWeightVars,} from '../theme/tokens.stylex';import type {TimestampTooltipLine} from './tooltipEntries';+import {+ registerEnglishFallback,+ useComponentTranslator,+} from '../i18n/useComponentTranslator';+import english from '../i18n/generated-english/Timestamp/TimestampHoverCard.generated';++registerEnglishFallback(english);const styles = stylex.create({// The card is a definition list laid out as a grid so cells align into@@ -117,7 +123,7 @@ const COPY_FEEDBACK_MS = 1500;* of this machinery.*/function CopyButton({value}: {value: string}) {- const t = useTranslator();+ const t = useComponentTranslator();const {copy, isCopied: copied} = useClipboard({announce: t('@astryx.timestamp.copied'),resetAfterMs: COPY_FEEDBACK_MS,diff --git a/packages/core/src/Toast/Toast.tsx b/packages/core/src/Toast/Toast.tsxindex b912c385ef..a012218249 100644--- a/packages/core/src/Toast/Toast.tsx+++ b/packages/core/src/Toast/Toast.tsx@@ -42,8 +42,14 @@ import type {ToastContentRenderFn,} from './types';import {themeProps} from '../utils/themeProps';-import {useTranslator} from '../i18n';import {useToastGesture, type ToastGestureDirection} from './useToastGesture';+import {+ registerEnglishFallback,+ useComponentTranslator,+} from '../i18n/useComponentTranslator';+import english from '../i18n/generated-english/Toast/Toast.generated';++registerEnglishFallback(english);const SWIPE_INTERACTIVE_TARGET_SELECTOR = `${INTERACTIVE_SELECTORS},[tabindex],[contenteditable]:not([contenteditable="false"])`;@@ -188,7 +194,7 @@ export function ToastSurface({renderContent,gestureDirection,}: ToastSurfaceProps) {- const t = useTranslator();+ const t = useComponentTranslator();const timerRef = useRef<ReturnType<typeof setTimeout> | null>(null);// Every condition that holds the auto-hide timer (pointer over the card,// focus inside it, a touch or pen gesture, the window blurred) is tracked ondiff --git a/packages/core/src/Toast/ToastViewport.tsx b/packages/core/src/Toast/ToastViewport.tsxindex 87363af02a..22c15f4ee4 100644--- a/packages/core/src/Toast/ToastViewport.tsx+++ b/packages/core/src/Toast/ToastViewport.tsx@@ -41,9 +41,15 @@ import {import {ToastSurface} from './Toast';import {ToastContext, type ToastContextValue} from './ToastContext';import type {ToastEntry, ToastPosition, ToastDismissReason} from './types';-import {useTranslator} from '../i18n';import {layerInsetProperties} from '../Layer/layerInset';import type {LayerInset} from '../Layer/LayerContext';+import {+ registerEnglishFallback,+ useComponentTranslator,+} from '../i18n/useComponentTranslator';+import english from '../i18n/generated-english/Toast/ToastViewport.generated';++registerEnglishFallback(english);const SAFE_AREA_INLINE_START = `max(${spacingVars['--spacing-4']}, env(safe-area-inset-left, 0px))`;const SAFE_AREA_INLINE_END = `max(${spacingVars['--spacing-4']}, env(safe-area-inset-right, 0px))`;@@ -316,7 +322,7 @@ export function ToastViewport({isTopLayer = true,children,}: ToastViewportProps) {- const t = useTranslator();+ const t = useComponentTranslator();const [toasts, setToasts] = useState<ToastEntry[]>([]);const [exitingIds, setExitingIds] = useState<Set<string>>(new Set());const toastsRef = useRef(toasts);diff --git a/packages/core/src/Token/Token.tsx b/packages/core/src/Token/Token.tsxindex c8dfab44d0..3886c47b60 100644--- a/packages/core/src/Token/Token.tsx+++ b/packages/core/src/Token/Token.tsx@@ -41,9 +41,15 @@ import {interactionOverlayStyles} from '../utils/interactionOverlay.stylex';import {innermostInteractive} from '../hooks/useClickableContainer';import {usePressFeedback} from '../hooks/usePressFeedback';import {isLayerSurface} from '../Layer/layerSurfacePress';-import {useTranslator} from '../i18n';import type {TokenColorMap} from './index';import {disabledInteractionProps} from '../utils/disabledInteraction';+import {+ registerEnglishFallback,+ useComponentTranslator,+} from '../i18n/useComponentTranslator';+import english from '../i18n/generated-english/Token/Token.generated';++registerEnglishFallback(english);// =============================================================================// Types@@ -310,7 +316,7 @@ export function Token({// document controller once, so the token's output stays a pure function// of its props.const pressable = usePressFeedback();- const t = useTranslator();+ const t = useComponentTranslator();const LinkComponent = useLinkComponent();const role = useInteractiveRole({href, onClick, isDisabled});diff --git a/packages/core/src/Tokenizer/Tokenizer.tsx b/packages/core/src/Tokenizer/Tokenizer.tsxindex 06a26f9e75..010ae52e18 100644--- a/packages/core/src/Tokenizer/Tokenizer.tsx+++ b/packages/core/src/Tokenizer/Tokenizer.tsx@@ -94,10 +94,16 @@ import {composeEventHandlers, mergeProps} from '../utils';import {joinAriaIDs} from '../utils/inputAria';import {isFocusDetached} from '../utils/focusReturn';import {themeProps} from '../utils/themeProps';-import {useTranslator} from '../i18n';import type {TokenizerBottomSheetProps} from './TokenizerBottomSheet';import {useResolvedRequired} from '../hooks/useResolvedRequired';import type {FieldStatusPlacement} from '../Field/fieldStatusPlacement';+import {+ registerEnglishFallback,+ useComponentTranslator,+} from '../i18n/useComponentTranslator';+import english from '../i18n/generated-english/Tokenizer/Tokenizer.generated';++registerEnglishFallback(english);// Re-export status types for convenienceexport type {@@ -782,7 +788,7 @@ export function Tokenizer<T extends SearchableItem>({// A caller's onClick arrives through the base props; the sheet trigger// composes it with its own open handler rather than letting either win.const {onClick: callerOnClick, ...restWithoutClick} = rest;- const t = useTranslator();+ const t = useComponentTranslator();const size = useSize(sizeProp, 'md');const generatedInputId = useId();const inputId = idProp ?? generatedInputId;diff --git a/packages/core/src/Tokenizer/TokenizerBottomSheet.tsx b/packages/core/src/Tokenizer/TokenizerBottomSheet.tsxindex 987696b89e..d281618293 100644--- a/packages/core/src/Tokenizer/TokenizerBottomSheet.tsx+++ b/packages/core/src/Tokenizer/TokenizerBottomSheet.tsx@@ -50,10 +50,16 @@ import {useIsomorphicLayoutEffect} from '../hooks/useIsomorphicLayoutEffect';import {useAnnounce} from '../hooks/useAnnounce';import {useAnnounceRenderedText} from '../hooks/useAnnounceRenderedText';import {Text} from '../Text/Text';-import {useTranslator} from '../i18n/useTranslator';import {warnOnce} from '../utils/devWarning';import type {SearchableItem, SearchSource} from '../Typeahead/types';import {colorVars, radiusVars, spacingVars} from '../theme/tokens.stylex';+import {+ registerEnglishFallback,+ useComponentTranslator,+} from '../i18n/useComponentTranslator';+import english from '../i18n/generated-english/Tokenizer/TokenizerBottomSheet.generated';++registerEnglishFallback(english);/*** Sentinel prefix for the create row's synthetic item. Kept identical to the@@ -317,7 +323,7 @@ function TokenizerSheetContent<T extends SearchableItem>({onClearAll,onChangeQuery,}: TokenizerSheetContentProps<T>) {- const t = useTranslator();+ const t = useComponentTranslator();const searchRef = useRef<HTMLInputElement>(null);const listRef = useRef<HTMLDivElement>(null);// Whether a checkbox row holds focus, kept by the list's own focus events,diff --git a/packages/core/src/TopNav/TopNav.tsx b/packages/core/src/TopNav/TopNav.tsxindex 12bb04a3de..32dfc8232a 100644--- a/packages/core/src/TopNav/TopNav.tsx+++ b/packages/core/src/TopNav/TopNav.tsx@@ -21,7 +21,6 @@ import type {BaseProps} from '../BaseProps';import * as stylex from '@stylexjs/stylex';import {spacingVars} from '../theme/tokens.stylex';import {mergeProps} from '../utils';-import {useTranslator} from '../i18n';import {TopNavSlotContext} from './TopNavContext';import {useTopNavRenderMode} from './TopNavRenderContext';import {useTopNavMobileContent} from './TopNavMobileContentContext';@@ -30,6 +29,13 @@ import {MobileNav} from '../MobileNav/MobileNav';import {MobileNavToggle} from '../MobileNav/MobileNavToggle';import {useAppShellMobile} from '../AppShell/AppShellMobileContext';import {themeProps} from '../utils/themeProps';+import {+ registerEnglishFallback,+ useComponentTranslator,+} from '../i18n/useComponentTranslator';+import english from '../i18n/generated-english/TopNav/TopNav.generated';++registerEnglishFallback(english);/*** Base TopNav styles@@ -193,7 +199,7 @@ export function TopNav({ref,...props}: TopNavProps) {- const t = useTranslator();+ const t = useComponentTranslator();const label = labelFromProps ?? t('@astryx.topNav.landmarkLabel');const renderMode = useTopNavRenderMode();const mobileContent = useTopNavMobileContent();diff --git a/packages/core/src/TopNav/TopNavHeading.tsx b/packages/core/src/TopNav/TopNavHeading.tsxindex ea5fb76c2e..64b28e2256 100644--- a/packages/core/src/TopNav/TopNavHeading.tsx+++ b/packages/core/src/TopNav/TopNavHeading.tsx@@ -44,7 +44,13 @@ import {menuTouchActionStyles} from '../DropdownMenu/menuTouchAction.stylex';import {useMenuOverflow} from '../DropdownMenu/useMenuOverflow';import {NavHeadingCloseContext} from '../NavMenu/NavMenuContext';import {themeProps} from '../utils/themeProps';-import {useTranslator} from '../i18n';+import {+ registerEnglishFallback,+ useComponentTranslator,+} from '../i18n/useComponentTranslator';+import english from '../i18n/generated-english/TopNav/TopNavHeading.generated';++registerEnglishFallback(english);// =============================================================================// Styles@@ -333,7 +339,7 @@ export function TopNavHeading({ref,...props}: TopNavHeadingProps) {- const t = useTranslator();+ const t = useComponentTranslator();const LinkComponent = useLinkComponent(as);// When the logo is wrapped in a link it needs its own accessible name (the// logo image itself is decorative). Prefer an explicit logoLabel, fall backdiff --git a/packages/core/src/TreeList/TreeListItem.tsx b/packages/core/src/TreeList/TreeListItem.tsxindex 9d9108cee4..e7d5395b27 100644--- a/packages/core/src/TreeList/TreeListItem.tsx+++ b/packages/core/src/TreeList/TreeListItem.tsx@@ -39,8 +39,14 @@ import {useLinkComponent} from '../Link/useLinkComponent';import {TreeListBranches} from './TreeListBranches';import type {TreeListDensity, TreeListVariant} from './TreeListTypes';import {themeProps} from '../utils/themeProps';-import {useTranslator} from '../i18n';import {disabledInteractionProps} from '../utils/disabledInteraction';+import {+ registerEnglishFallback,+ useComponentTranslator,+} from '../i18n/useComponentTranslator';+import english from '../i18n/generated-english/TreeList/TreeListItem.generated';++registerEnglishFallback(english);// =============================================================================// Styles@@ -414,7 +420,7 @@ export function TreeListItem({isTabbable,}: TreeListItemInternalProps) {const pressable = usePressFeedback();- const t = useTranslator();+ const t = useComponentTranslator();const labelId = useId();const descriptionId = useId();const LinkComponent = useLinkComponent();diff --git a/packages/core/src/Typeahead/BaseTypeahead.tsx b/packages/core/src/Typeahead/BaseTypeahead.tsxindex a2927cdafd..495a8c4882 100644--- a/packages/core/src/Typeahead/BaseTypeahead.tsx+++ b/packages/core/src/Typeahead/BaseTypeahead.tsx@@ -64,12 +64,18 @@ import {warnOnce} from '../utils/devWarning';import type {BaseProps} from '../BaseProps';import type {SearchContext, SearchableItem, SearchSource} from './types';import {themeProps} from '../utils/themeProps';-import {useTranslator} from '../i18n';import {useMergedRefs} from '../hooks/useMergedRefs';import {useBusyAnnouncement} from '../hooks/useBusyAnnouncement';import {layerViewportInset} from '../Layer/layerViewportInset.stylex';import {clampInlineSize} from '../Layer/clampInlineSize';+import {+ registerEnglishFallback,+ useComponentTranslator,+} from '../i18n/useComponentTranslator';+import english from '../i18n/generated-english/Typeahead/BaseTypeahead.generated';++registerEnglishFallback(english);// =============================================================================// Types// =============================================================================@@ -530,7 +536,7 @@ export const BaseTypeahead = function BaseTypeahead<T extends SearchableItem>({ref,...rest}: BaseTypeaheadProps<T>) {- const t = useTranslator();+ const t = useComponentTranslator();const placeholder =placeholderFromProps ?? t('@astryx.typeahead.searchPlaceholder');const emptySearchText =diff --git a/packages/core/src/Typeahead/Typeahead.tsx b/packages/core/src/Typeahead/Typeahead.tsxindex ff677eb1cd..0a13a40ffb 100644--- a/packages/core/src/Typeahead/Typeahead.tsx+++ b/packages/core/src/Typeahead/Typeahead.tsx@@ -72,12 +72,18 @@ import {inputDisabledFocusStyles} from '../Field/inputDisabledFocus';import type {SizeValue} from '../utils/types';import type {SearchableItem, SearchSource} from './types';import {themeProps} from '../utils/themeProps';-import {useTranslator} from '../i18n';import {useMergedRefs} from '../hooks/useMergedRefs';import {useBusyAnnouncement} from '../hooks/useBusyAnnouncement';import {useResolvedRequired} from '../hooks/useResolvedRequired';import type {FieldStatusPlacement} from '../Field/fieldStatusPlacement';+import {+ registerEnglishFallback,+ useComponentTranslator,+} from '../i18n/useComponentTranslator';+import english from '../i18n/generated-english/Typeahead/Typeahead.generated';++registerEnglishFallback(english);export type {InputStatus as TypeaheadStatus,InputStatusType as TypeaheadStatusType,@@ -432,7 +438,7 @@ export function Typeahead<T extends SearchableItem>({containerClassName,containerStyle,});- const t = useTranslator();+ const t = useComponentTranslator();const size = useSize(sizeProp, 'md');const generatedInputId = useId();const inputId = idProp ?? generatedInputId;diff --git a/packages/core/src/hooks/useInputStatusIcon.tsx b/packages/core/src/hooks/useInputStatusIcon.tsxindex 5985f2f537..7c6af841b1 100644--- a/packages/core/src/hooks/useInputStatusIcon.tsx+++ b/packages/core/src/hooks/useInputStatusIcon.tsx@@ -38,11 +38,17 @@ import * as stylex from '@stylexjs/stylex';import {Icon, type IconName, type IconSize} from '../Icon';import type {InputStatus, InputStatusType} from '../Field/types';import {useTooltip} from '../Tooltip';-import {useTranslator} from '../i18n';import {radiusVars} from '../theme/tokens.stylex';import {themeProps} from '../utils/themeProps';import {focusOutlineStyles} from '../utils/focusOutline.stylex';import type {FieldStatusPlacement} from '../Field/fieldStatusPlacement';+import {+ registerEnglishFallback,+ useComponentTranslator,+} from '../i18n/useComponentTranslator';+import english from '../i18n/generated-english/hooks/useInputStatusIcon.generated';++registerEnglishFallback(english);/*** Maps each status type to its glyph. Shared so every input shows the same icon@@ -140,7 +146,7 @@ export function useInputStatusIcon({isInGroup = false,size = 'md',}: UseInputStatusIconOptions): UseInputStatusIconReturn {- const t = useTranslator();+ const t = useComponentTranslator();const isTooltipVariant = statusVariant === 'tooltip';const hasTooltip = isTooltipVariant && !!status?.message;diff --git a/packages/core/src/hooks/useKeyboardHint.tsx b/packages/core/src/hooks/useKeyboardHint.tsxindex ac83cfaf5e..2ca68d2c8e 100644--- a/packages/core/src/hooks/useKeyboardHint.tsx+++ b/packages/core/src/hooks/useKeyboardHint.tsx@@ -4,7 +4,7 @@/*** @file useKeyboardHint.tsx- * @input Uses React, StyleX, Kbd, useLayer, i18n (useTranslator)+ * @input Uses React, StyleX, Kbd, useLayer, i18n (useComponentTranslator)* @output Exports useKeyboardHint hook — ephemeral arrow-key navigation hint* @position Core hook; shows sighted keyboard users how to navigate composite* widgets that use roving tabindex (single Tab stop, arrows inside)@@ -27,7 +27,13 @@ import {} from '../theme/tokens.stylex';import {Kbd} from '../Kbd';import {useLayer} from '../Layer/useLayer';-import {useTranslator} from '../i18n';+import {+ registerEnglishFallback,+ useComponentTranslator,+} from '../i18n/useComponentTranslator';+import english from '../i18n/generated-english/hooks/useKeyboardHint.generated';++registerEnglishFallback(english);// ---------------------------------------------------------------------------// Types@@ -181,7 +187,7 @@ export function useKeyboardHint(isEnabled = true,} = options;- const t = useTranslator();+ const t = useComponentTranslator();const timeoutRef = useRef<ReturnType<typeof setTimeout> | null>(null);const dismissedRef = useRef(false);const isVisibleRef = useRef(false);diff --git a/packages/core/src/i18n/InternationalizationContext.ts b/packages/core/src/i18n/InternationalizationContext.tsindex 80ebf11dc5..0e2c451fc2 100644--- a/packages/core/src/i18n/InternationalizationContext.ts+++ b/packages/core/src/i18n/InternationalizationContext.ts@@ -35,7 +35,7 @@ export interface InternationalizationContextValue {}/**- * Default value falls through to the shipped en catalog in resolve().+ * Default value falls through to the shipped English fallback in resolve().* A consumer that doesn't render a provider still gets English defaults.*/export const InternationalizationContext =diff --git a/packages/core/src/i18n/__tests__/englishFallback.test.ts b/packages/core/src/i18n/__tests__/englishFallback.test.tsnew file mode 100644index 0000000000..753bf4bdd9--- /dev/null+++ b/packages/core/src/i18n/__tests__/englishFallback.test.ts@@ -0,0 +1,138 @@+// Copyright (c) Meta Platforms, Inc. and affiliates.++/**+ * @file englishFallback.test.ts+ * @input The generated per-module English fallback maps, the generated locale+ * catalogs, resolve.ts, and scripts/i18n-english-fallback.mjs+ * @output Resolution-parity and wiring tests for Core's per-module English+ * @position Proves a component resolves every key it names exactly as it did+ * with the whole English catalog, in every shipped locale's fallback path.+ *+ * This file must not import the public `useTranslator` or the public context+ * export: both register the whole catalog, which would hide a missing map.+ */++import fs from 'node:fs';+import path from 'node:path';+import {pathToFileURL} from 'node:url';+import {describe, expect, it, beforeEach} from 'vitest';+import {renderHook} from '@testing-library/react';+import {+ CORE_SRC_DIR,+ ENGLISH_FALLBACK_DIR,+ collectEnglishFallbackSlices,+ findWiringProblems,+ getSliceModuleName,+} from '../../../../../scripts/i18n-english-fallback.mjs';+import enCatalog from '../generated-locales/en.generated';+import {__resetForTests, getResolve} from '../resolve';+import {englishFallback} from '../englishFallback';+import {+ registerEnglishFallback,+ useComponentTranslator,+} from '../useComponentTranslator';+import type {RuntimeCatalog} from '../types';++/** Load every generated module under `dir`, keyed by its path relative to `dir`. */+async function loadGenerated(+ dir: string,+): Promise<Record<string, RuntimeCatalog>> {+ const files = fs+ .readdirSync(dir, {recursive: true, encoding: 'utf8'})+ .filter(file => file.endsWith('.generated.ts'))+ .map(file => file.split(path.sep).join('/'));+ const entries = await Promise.all(+ files.map(async file => {+ const module = (await import(+ /* @vite-ignore */ pathToFileURL(path.join(dir, file)).href+ )) as {default: RuntimeCatalog};+ return [file, module.default] as const;+ }),+ );+ return Object.fromEntries(entries);+}++const slices = await loadGenerated(ENGLISH_FALLBACK_DIR);++const localeCatalogs = Object.fromEntries(+ Object.entries(+ await loadGenerated(path.join(CORE_SRC_DIR, 'i18n', 'generated-locales')),+ ).map(([file, catalog]) => [file.slice(0, -'.generated.ts'.length), catalog]),+);++beforeEach(() => {+ __resetForTests();+});++describe('per-module English fallback', () => {+ it('derives one map per Core module that names catalog keys, holding exactly those keys', () => {+ const expected = collectEnglishFallbackSlices(enCatalog);+ expect(expected.size).toBeGreaterThan(0);+ expect(new Set(Object.keys(slices))).toEqual(+ new Set([...expected.keys()].map(getSliceModuleName)),+ );+ for (const [sourceRel, keys] of expected) {+ expect(+ new Set(Object.keys(slices[getSliceModuleName(sourceRel)])),+ ).toEqual(new Set(keys));+ }+ });++ it('wires every such module to import and register its own map', () => {+ expect(findWiringProblems(collectEnglishFallbackSlices(enCatalog))).toEqual(+ [],+ );+ });++ it('holds the same English as the whole catalog', () => {+ for (const slice of Object.values(slices)) {+ for (const [key, message] of Object.entries(slice)) {+ expect(message).toBe(enCatalog[key]);+ }+ }+ });++ it('resolves every key each module names exactly as the whole catalog does, in every shipped locale', () => {+ // The formatted result is a function of the resolved message and the+ // locale, so equal messages give equal output for any values.+ expect(Object.keys(localeCatalogs)).toContain('en');+ expect(Object.keys(localeCatalogs).length).toBeGreaterThan(2);+ let compared = 0;+ for (const [locale, catalog] of Object.entries(localeCatalogs)) {+ const messages = {[locale]: catalog};+ const full = getResolve(locale, messages, undefined, enCatalog);+ for (const slice of Object.values(slices)) {+ const sliced = getResolve(locale, messages, undefined, slice);+ for (const key of Object.keys(slice)) {+ expect(sliced(key, undefined), `${locale} ${key}`).toBe(+ full(key, undefined),+ );+ compared += 1;+ }+ }+ // With no provider catalog, every key falls straight to English.+ const fullNoCatalog = getResolve(locale, {}, undefined, enCatalog);+ for (const slice of Object.values(slices)) {+ const slicedNoCatalog = getResolve(locale, {}, undefined, slice);+ for (const key of Object.keys(slice)) {+ expect(slicedNoCatalog(key, undefined)).toBe(+ fullNoCatalog(key, undefined),+ );+ }+ }+ }+ expect(compared).toBeGreaterThan(Object.keys(localeCatalogs).length);+ });++ it('lets a component resolve the keys it registered without the whole catalog', () => {+ registerEnglishFallback(slices['Button/Button.generated.ts']);+ const {result} = renderHook(() => useComponentTranslator());+ expect(result.current('@astryx.button.loading')).toBe(+ enCatalog['@astryx.button.loading'],+ );+ // Only registered modules contribute; nothing here loaded the whole catalog.+ expect(Object.keys(englishFallback).length).toBeLessThan(+ Object.keys(enCatalog).length,+ );+ });+});diff --git a/packages/core/src/i18n/__tests__/resolve.test.ts b/packages/core/src/i18n/__tests__/resolve.test.tsindex 88b0e7efb9..64ff6ad282 100644--- a/packages/core/src/i18n/__tests__/resolve.test.ts+++ b/packages/core/src/i18n/__tests__/resolve.test.ts@@ -10,6 +10,7 @@import {describe, expect, test, beforeEach, vi} from 'vitest';import {__resetForTests, getResolve, resolveLocaleChain} from '../resolve';+import {registerFullEnglishFallback} from '../fullEnglishFallback';import type {Catalog,MessagesByLocale,@@ -24,6 +25,11 @@ const resolve = (]) => getResolve(locale, messages, overrides)(key, values);+// The resolver falls back to the English registered by loaded modules. These+// tests cover lookup over every shipped key, as the public paths register it;+// englishFallback.test.ts covers a component's own English.+registerFullEnglishFallback();+// Reset caches between tests so warn-once and formatter cache don't bleed.beforeEach(() => {__resetForTests();diff --git a/packages/core/src/i18n/englishFallback.ts b/packages/core/src/i18n/englishFallback.tsnew file mode 100644index 0000000000..45620866bb--- /dev/null+++ b/packages/core/src/i18n/englishFallback.ts@@ -0,0 +1,40 @@+// Copyright (c) Meta Platforms, Inc. and affiliates.++/**+ * @file englishFallback.ts+ * @input English key-to-message maps registered at module scope by the Core+ * modules that name those keys+ * @output registerEnglishFallback and the read-only englishFallback map+ * @position The shipped English fallback resolve.ts reads after the locale+ * chain.+ *+ * A Core module that names catalog keys registers the English for exactly+ * those keys from its generated map (`i18n/generated-english/`, derived by+ * scripts/generate-i18n-runtime.mjs):+ *+ * import english from '../i18n/generated-english/Button/Button.generated';+ * registerEnglishFallback(english);+ *+ * so a component carries the English it can show rather than the whole+ * catalog. Registration runs when the module loads, before any of its code+ * can look a key up, so a key resolves wherever the module naming it is+ * loaded. Public paths that resolve arbitrary Astryx keys register the whole+ * catalog through fullEnglishFallback.ts.+ *+ * SYNC: When modified, update these files to stay in sync:+ * - /packages/core/src/i18n/resolve.ts+ * - /packages/core/src/i18n/fullEnglishFallback.ts+ * - /scripts/i18n-english-fallback.mjs+ */++import type {RuntimeCatalog} from './types';++const registered: Record<string, string> = {};++/** The English registered so far, keyed by catalog key. */+export const englishFallback: RuntimeCatalog = registered;++/** Add a module's English to the shipped fallback. */+export function registerEnglishFallback(messages: RuntimeCatalog): void {+ Object.assign(registered, messages);+}diff --git a/packages/core/src/i18n/fullEnglishFallback.ts b/packages/core/src/i18n/fullEnglishFallback.tsnew file mode 100644index 0000000000..38f00ef62d--- /dev/null+++ b/packages/core/src/i18n/fullEnglishFallback.ts@@ -0,0 +1,26 @@+// Copyright (c) Meta Platforms, Inc. and affiliates.++/**+ * @file fullEnglishFallback.ts+ * @input The generated English runtime catalog+ * @output registerFullEnglishFallback+ * @position The only Core module that imports the whole English catalog.+ *+ * Called at module scope by the public paths that resolve arbitrary Astryx+ * keys: the public `useTranslator` and the public `InternationalizationContext`+ * export.+ * Component modules register only their own keys (englishFallback.ts).+ * scripts/i18n-english-fallback.mjs rejects any other caller.+ *+ * SYNC: When modified, update these files to stay in sync:+ * - /packages/core/src/i18n/englishFallback.ts+ * - /scripts/i18n-english-fallback.mjs+ */++import enCatalog from './generated-locales/en.generated';+import {registerEnglishFallback} from './englishFallback';++/** Make every shipped Astryx key resolve to its English. */+export function registerFullEnglishFallback(): void {+ registerEnglishFallback(enCatalog);+}diff --git a/packages/core/src/i18n/index.ts b/packages/core/src/i18n/index.tsindex 3bed7c1a8c..fe9077e999 100644--- a/packages/core/src/i18n/index.ts+++ b/packages/core/src/i18n/index.ts@@ -16,6 +16,11 @@* - getLocaleDirection — server-safe locale → direction helper* - Translator — interface for consumer-injected runtimes*+ * `useTranslator` and `InternationalizationContext` are the public paths+ * that resolve any Astryx key, so they register the whole English catalog.+ * Core modules import the defining modules (useComponentTranslator.ts,+ * InternationalizationContext.ts) instead of this barrel for those two.+ ** SYNC: When modified, update these files to stay in sync:* - /packages/core/src/index.ts* - /packages/core/src/i18n/useLocale.ts@@ -26,7 +31,7 @@export {InternationalizationProvider} from './InternationalizationProvider';export type {InternationalizationProviderProps} from './InternationalizationProvider';-export {InternationalizationContext} from './InternationalizationContext';+export {InternationalizationContext} from './publicContext';export type {InternationalizationContextValue} from './InternationalizationContext';export {useTranslator} from './useTranslator';export type {TranslatorFn} from './useTranslator';diff --git a/packages/core/src/i18n/publicContext.ts b/packages/core/src/i18n/publicContext.tsnew file mode 100644index 0000000000..fb553de473--- /dev/null+++ b/packages/core/src/i18n/publicContext.ts@@ -0,0 +1,29 @@+// Copyright (c) Meta Platforms, Inc. and affiliates.++'use client';++/**+ * @file publicContext.ts+ * @input InternationalizationContext, fullEnglishFallback+ * @output The public InternationalizationContext export+ * @position The package's InternationalizationContext, re-exported by the i18n+ * barrel. The same context object Core components read.+ *+ * Application code may call `translate` from this context with any Astryx+ * key, so loading the public export registers the whole English catalog.+ * Core modules import ./InternationalizationContext directly and register only+ * the English they name. The export is its own binding rather than a+ * re-export so bundlers keep this module, and its registration, whenever the+ * public context is used.+ *+ * SYNC: When modified, update these files to stay in sync:+ * - /packages/core/src/i18n/InternationalizationContext.ts+ * - /packages/core/src/i18n/index.ts+ */++import {InternationalizationContext as ProviderContext} from './InternationalizationContext';+import {registerFullEnglishFallback} from './fullEnglishFallback';++registerFullEnglishFallback();++export const InternationalizationContext = ProviderContext;diff --git a/packages/core/src/i18n/resolve.ts b/packages/core/src/i18n/resolve.tsindex 120551ef7d..8deb27d6ba 100644--- a/packages/core/src/i18n/resolve.ts+++ b/packages/core/src/i18n/resolve.ts@@ -11,17 +11,25 @@* 2. Per-locale override for a parent locale (pt-BR → pt)* 3. Shipped catalog entry for the exact locale* 4. Shipped catalog entry for a parent locale (pt-BR → pt)- * 5. Shipped en catalog (the source of truth, always present)+ * 5. Shipped English: the English registered by the loaded modules that+ * name the key (englishFallback.ts), or the whole catalog on public+ * paths that resolve arbitrary keys* 6. The key itself (dev-visible fallback, warns once)** SYNC: When modified, update these files to stay in sync:* - /packages/core/src/i18n/useTranslator.ts+ * - /packages/core/src/i18n/englishFallback.ts* - /packages/core/src/i18n/__tests__/resolve.test.ts*/import IntlMessageFormat from 'intl-messageformat';-import type {Locale, Overrides, ProviderMessagesByLocale} from './types';-import enCatalog from './generated-locales/en.generated';+import type {+ Locale,+ Overrides,+ ProviderMessagesByLocale,+ RuntimeCatalog,+} from './types';+import {englishFallback} from './englishFallback';import {warnOnce, __resetDevWarnings} from '../utils/devWarning';/**@@ -105,15 +113,20 @@ function getLookup(return lookup;}+/**+ * `english` defaults to the shipped English registry; tests pass a fixed map+ * to compare one module's English with the whole catalog.+ */export function getResolve(locale: Locale,messages: ProviderMessagesByLocale,overrides?: Overrides,+ english: RuntimeCatalog = englishFallback,) {const lookup = getLookup(locale, messages, overrides);return (key: string, values: Record<string, unknown> | undefined) => {- const result = lookup[key] ?? enCatalog[key];+ const result = lookup[key] ?? english[key];if (result === undefined) {// Fires ONLY when a key is missing from every source including the// shipped `en` catalog — a real bug (typo, stale catalog, deleted key).diff --git a/packages/core/src/i18n/useComponentTranslator.ts b/packages/core/src/i18n/useComponentTranslator.tsnew file mode 100644index 0000000000..b0112f6024--- /dev/null+++ b/packages/core/src/i18n/useComponentTranslator.ts@@ -0,0 +1,45 @@+// Copyright (c) Meta Platforms, Inc. and affiliates.++'use client';++/**+ * @file useComponentTranslator.ts+ * @input InternationalizationContext (via use())+ * @output useComponentTranslator, and registerEnglishFallback re-exported for+ * the same importers+ * @position Internal translator for Core components. Not exported from the+ * package; application code uses the public `useTranslator`.+ *+ * Returns the same provider-bound translator as the public hook. The public+ * hook also registers the whole English catalog, because application code may+ * translate any Astryx key; a component instead registers the English for the+ * keys it names, from its generated map:+ *+ * import {+ * registerEnglishFallback,+ * useComponentTranslator,+ * } from '../i18n/useComponentTranslator';+ * import english from '../i18n/generated-english/Button/Button.generated';+ *+ * registerEnglishFallback(english);+ *+ * SYNC: When modified, update these files to stay in sync:+ * - /packages/core/src/i18n/useTranslator.ts+ * - /packages/core/src/i18n/englishFallback.ts+ * - /scripts/i18n-english-fallback.mjs+ */++import {use} from 'react';+import {InternationalizationContext} from './InternationalizationContext';+import type {TranslatorFn} from './useTranslator';++export {registerEnglishFallback} from './englishFallback';++/**+ * Returns the translator bound to the current provider's locale. Keys resolve+ * to English only when the module naming them registered its English.+ */+export function useComponentTranslator(): TranslatorFn {+ const ctx = use(InternationalizationContext);+ return ctx.translate;+}diff --git a/packages/core/src/i18n/useTranslator.test.tsx b/packages/core/src/i18n/useTranslator.test.tsxindex 59dfd9f934..16bfa0b92c 100644--- a/packages/core/src/i18n/useTranslator.test.tsx+++ b/packages/core/src/i18n/useTranslator.test.tsx@@ -18,6 +18,8 @@ import {useTranslator, type TranslatorFn} from './useTranslator';import {InternationalizationProvider} from './InternationalizationProvider';import {InternationalizationContext} from './InternationalizationContext';import {__resetForTests} from './resolve';+import {InternationalizationContext as PublicInternationalizationContext} from './publicContext';+import enCatalog from './generated-locales/en.generated';import type {MessagesByLocale,Overrides,@@ -53,6 +55,21 @@ describe('useTranslator — resolution', () => {expect(result.current('@astryx.pagination.next')).toBe('Go to next page');});+ it('resolves every shipped key to its English, whichever modules are loaded', () => {+ // Application code may translate any Astryx key through the public hook.+ const {result} = renderHook(() => useTranslator());+ for (const [key, message] of Object.entries(enCatalog)) {+ expect(result.current(key)).toBe(message);+ }+ });++ it('resolves every shipped key through the public context export', () => {+ const {result} = renderHook(() => use(PublicInternationalizationContext));+ for (const [key, message] of Object.entries(enCatalog)) {+ expect(result.current.translate(key, undefined)).toBe(message);+ }+ });+it('interpolates values into the message', () => {const {result} = renderHook(() => useTranslator());expect(result.current('@astryx.pagination.goToPage', {page: 5})).toBe(diff --git a/packages/core/src/i18n/useTranslator.ts b/packages/core/src/i18n/useTranslator.tsindex c7abd5dc45..6a2bd5a25b 100644--- a/packages/core/src/i18n/useTranslator.ts+++ b/packages/core/src/i18n/useTranslator.ts@@ -14,13 +14,20 @@* to translate inside an event handler or effect, capture a translator during* render via useTranslator() and call it later.*+ * This is the public hook: application code may translate any Astryx key, so+ * loading it registers the whole English catalog. Core components use+ * useComponentTranslator.ts and register only the English they name.+ ** SYNC: When modified, update these files to stay in sync:* - /packages/core/src/i18n/index.ts- * - /packages/core/src/i18n/t.client.ts+ * - /packages/core/src/i18n/useComponentTranslator.ts*/import {use} from 'react';import {InternationalizationContext} from './InternationalizationContext';+import {registerFullEnglishFallback} from './fullEnglishFallback';++registerFullEnglishFallback();export type TranslatorFn = (key: string,diff --git a/scripts/generate-i18n-runtime.mjs b/scripts/generate-i18n-runtime.mjsindex 11727db963..7b00b7d5be 100644--- a/scripts/generate-i18n-runtime.mjs+++ b/scripts/generate-i18n-runtime.mjs@@ -7,6 +7,10 @@* packages/core/locales/*.json remain the canonical Crowdin sources and keep* translator descriptions. Each generated module exports only the* key-to-defaultMessage map used at runtime.+ *+ * It also derives Core's per-module English fallback maps (see+ * scripts/i18n-english-fallback.mjs) and fails when a Core module that names+ * catalog keys does not import and register its own map.*/import {spawn} from 'node:child_process';@@ -14,6 +18,13 @@ import fs from 'node:fs';import path from 'node:path';import {fileURLToPath} from 'node:url';import {createPseudoCatalog} from '../packages/core/scripts/build-pseudo-locale.mjs';+import {+ CORE_SRC_DIR,+ collectEnglishFallbackSlices,+ findWiringProblems,+ isShippedSourceModule,+ writeEnglishFallbackSlices,+} from './i18n-english-fallback.mjs';const SCRIPT_DIR = path.dirname(fileURLToPath(import.meta.url));const REPO_ROOT = path.resolve(SCRIPT_DIR, '..');@@ -144,11 +155,25 @@ export function isSourceLocaleFile(file) {export async function generateRuntimeCatalogs({check = false} = {}) {const runtimeCatalogs = createRuntimeCatalogs(readSourceCatalogs());+ const english = runtimeCatalogs[EN_FILE];+ const slices = collectEnglishFallbackSlices(english);+ const wiringProblems = findWiringProblems(slices);+ const failOnWiringProblems = () => {+ if (wiringProblems.length === 0) return;+ throw new Error(+ `${wiringProblems.length} Core module(s) do not reach their English fallback:\n` ++ wiringProblems.map(problem => ` - ${problem}`).join('\n'),+ );+ };if (check) {+ failOnWiringProblems();console.log(`✓ ${Object.keys(runtimeCatalogs).length} authored locale catalogs produce metadata-free runtime maps`,);+ console.log(+ `✓ All ${slices.size} Core modules that name catalog keys reach their English`,+ );return;}@@ -163,10 +188,16 @@ export async function generateRuntimeCatalogs({check = false} = {}) {if (writeIfChanged(getGeneratedModulePath(file), output)) changed += 1;}+ const fallback = writeEnglishFallbackSlices(english, slices);+console.log(`Generated ${Object.keys(runtimeCatalogs).length} runtime locale modules ` +- `(${changed} changed, ${removed} stale removed)`,+ `(${changed} changed, ${removed} stale removed) and ${slices.size} ` ++ `English fallback maps (${fallback.changed} changed, ${fallback.removed} stale removed)`,);+ // Written first so a development server still gets current maps; a module+ // that cannot reach its English still fails the build and the test run.+ failOnWiringProblems();}export function createSpawnInvocation(@@ -197,9 +228,7 @@ async function watchRuntimeCatalogs(command) {regeneration = next.catch(() => {});return next;};- const watcher = fs.watch(SOURCE_LOCALES_DIR, (_event, file) => {- const fileName = file == null ? null : String(file);- if (fileName !== null && !isSourceLocaleFile(fileName)) return;+ const scheduleGeneration = () => {clearTimeout(debounce);debounce = setTimeout(() => {void queueGeneration().catch(error => {@@ -209,7 +238,24 @@ async function watchRuntimeCatalogs(command) {);});}, 75);+ };+ const watcher = fs.watch(SOURCE_LOCALES_DIR, (_event, file) => {+ const fileName = file == null ? null : String(file);+ if (fileName !== null && !isSourceLocaleFile(fileName)) return;+ scheduleGeneration();});+ // Core modules decide which keys each English fallback map holds, so a+ // module edit regenerates the maps too.+ const sourceWatcher = fs.watch(+ CORE_SRC_DIR,+ {recursive: true},+ (_event, file) => {+ const fileName =+ file == null ? null : String(file).split(path.sep).join('/');+ if (fileName !== null && !isShippedSourceModule(fileName)) return;+ scheduleGeneration();+ },+ );try {// Register the watcher first so an edit during initial generation queues a@@ -236,6 +282,7 @@ async function watchRuntimeCatalogs(command) {} finally {clearTimeout(debounce);watcher.close();+ sourceWatcher.close();}}diff --git a/scripts/i18n-english-fallback.d.mts b/scripts/i18n-english-fallback.d.mtsnew file mode 100644index 0000000000..f5db2937fc--- /dev/null+++ b/scripts/i18n-english-fallback.d.mts@@ -0,0 +1,30 @@+// Copyright (c) Meta Platforms, Inc. and affiliates.++/** Absolute path of packages/core/src. */+export const CORE_SRC_DIR: string;+/** Absolute path of the generated per-module English maps. */+export const ENGLISH_FALLBACK_DIR: string;+/** Core modules (relative to src) that register the whole English catalog. */+export const FULL_FALLBACK_MODULES: readonly string[];+/** Whether a path relative to packages/core/src ships in the package build. */+export function isShippedSourceModule(relPath: string): boolean;+/** Every string literal in a module that is a key of `catalog`, sorted. */+export function collectCatalogKeys(+ sourceText: string,+ fileName: string,+ catalog: Readonly<Record<string, string>>,+): string[];+/** Shipped Core module (relative to src) → the catalog keys it names. */+export function collectEnglishFallbackSlices(+ englishCatalog: Readonly<Record<string, string>>,+ srcDir?: string,+): Map<string, string[]>;+/** A module's generated map path, relative to ENGLISH_FALLBACK_DIR. */+export function getSliceModuleName(sourceRel: string): string;+/** The specifier a module imports its generated map with. */+export function getSliceImportSpecifier(sourceRel: string): string;+/** Modules that name keys without reaching their own map, and other misuse. */+export function findWiringProblems(+ slices: Map<string, string[]>,+ srcDir?: string,+): string[];diff --git a/scripts/i18n-english-fallback.mjs b/scripts/i18n-english-fallback.mjsnew file mode 100644index 0000000000..9f64afbc39--- /dev/null+++ b/scripts/i18n-english-fallback.mjs@@ -0,0 +1,318 @@+// Copyright (c) Meta Platforms, Inc. and affiliates.++/**+ * @file i18n-english-fallback.mjs+ * @input packages/core/src modules and the English runtime catalog+ * @output Derived per-module English fallback maps under+ * packages/core/src/i18n/generated-english/, plus the wiring checks that keep+ * every Core module's keys reachable through its own map+ * @position Used by scripts/generate-i18n-runtime.mjs, the derived-sources step+ * that runs before install, build, test, Storybook, docsite, and sandbox.+ *+ * A Core module that names catalog keys imports the English for exactly those+ * keys from its own generated map and registers it at module scope:+ *+ * import english from '../i18n/generated-english/Button/Button.generated';+ * registerEnglishFallback(english);+ *+ * A component's bundle therefore carries the English for the keys its modules+ * name, not the whole catalog. The resolver reads the registered English, so a+ * key resolves wherever the module that names it is loaded, including a key a+ * helper module looks up with a translator another module created.+ *+ * Public paths that resolve any Astryx key (the public `useTranslator` and+ * the public context export) register the whole catalog through+ * `registerFullEnglishFallback()`. Only the modules in FULL_FALLBACK_MODULES+ * may do that. A Core module that names keys and has not moved to its own map+ * still uses the public `useTranslator`, so it carries the whole catalog.+ *+ * A key reference is any string literal in a module that equals a catalog key.+ * That is wider than the translator call sites check-i18n-catalog verifies, so+ * keys kept in local maps (`new Map([['ctrl', '@astryx.kbd.key.control']])`)+ * are included too.+ */++import fs from 'node:fs';+import path from 'node:path';+import {createRequire} from 'node:module';+import {fileURLToPath} from 'node:url';++const require = createRequire(import.meta.url);++const SCRIPT_DIR = path.dirname(fileURLToPath(import.meta.url));+const REPO_ROOT = path.resolve(SCRIPT_DIR, '..');++export const CORE_SRC_DIR = path.join(REPO_ROOT, 'packages', 'core', 'src');+export const ENGLISH_FALLBACK_DIRNAME = 'generated-english';+export const ENGLISH_FALLBACK_DIR = path.join(+ CORE_SRC_DIR,+ 'i18n',+ ENGLISH_FALLBACK_DIRNAME,+);++/** The one module that imports the whole generated English catalog. */+export const FULL_CATALOG_MODULE = 'i18n/fullEnglishFallback.ts';++/**+ * Modules that register the whole English catalog, each because callers can+ * hand it an arbitrary Astryx key.+ */+export const FULL_FALLBACK_MODULES = Object.freeze([+ // The public hook: application code may translate any Astryx key.+ 'i18n/useTranslator.ts',+ // The public context export: application code may read `translate` from it.+ 'i18n/publicContext.ts',+]);++/**+ * Whether a path under packages/core/src (POSIX separators) ships in the+ * package build. Mirrors the build's ignore list: tests, stories, docs, perf+ * fixtures, and declarations never ship, and generated catalogs are data.+ */+export function isShippedSourceModule(relPath) {+ const name = relPath.slice(relPath.lastIndexOf('/') + 1);+ return (+ /\.tsx?$/.test(name) &&+ !name.endsWith('.d.ts') &&+ !name.includes('.test.') &&+ !name.includes('.stories.') &&+ !name.includes('.perf.') &&+ !relPath.split('/').includes('__tests__') &&+ !relPath.startsWith('i18n/generated-locales/') &&+ !relPath.startsWith(`i18n/${ENGLISH_FALLBACK_DIRNAME}/`)+ );+}++function listSourceModules(srcDir) {+ const results = [];+ const visit = dir => {+ for (const entry of fs.readdirSync(dir, {withFileTypes: true})) {+ const full = path.join(dir, entry.name);+ if (entry.isDirectory()) {+ visit(full);+ continue;+ }+ const rel = path.relative(srcDir, full).split(path.sep).join('/');+ if (entry.isFile() && isShippedSourceModule(rel)) results.push(rel);+ }+ };+ visit(srcDir);+ return results.sort();+}++/** Every string literal in `sourceText` that is a key of `catalog`. */+export function collectCatalogKeys(sourceText, fileName, catalog) {+ if (!sourceText.includes('@astryx.')) return [];+ const ts = require('typescript');+ const sourceFile = ts.createSourceFile(+ fileName,+ sourceText,+ ts.ScriptTarget.Latest,+ false,+ fileName.endsWith('.tsx') ? ts.ScriptKind.TSX : ts.ScriptKind.TS,+ );+ const keys = new Set();+ const visit = node => {+ if (+ (ts.isStringLiteral(node) || ts.isNoSubstitutionTemplateLiteral(node)) &&+ Object.hasOwn(catalog, node.text)+ ) {+ keys.add(node.text);+ }+ ts.forEachChild(node, visit);+ };+ visit(sourceFile);+ return [...keys].sort();+}++/**+ * Map each shipped Core module that names catalog keys to those keys.+ * @returns {Map<string, string[]>} module path (relative to src) → keys+ */+export function collectEnglishFallbackSlices(+ englishCatalog,+ srcDir = CORE_SRC_DIR,+) {+ const slices = new Map();+ for (const rel of listSourceModules(srcDir)) {+ const text = fs.readFileSync(path.join(srcDir, rel), 'utf8');+ const keys = collectCatalogKeys(text, rel, englishCatalog);+ if (keys.length > 0) slices.set(rel, keys);+ }+ return slices;+}++function stripExtension(rel) {+ return rel.replace(/\.tsx?$/, '');+}++/** The generated map's path relative to its directory, e.g. `Button/Button.generated.ts`. */+export function getSliceModuleName(sourceRel) {+ return `${stripExtension(sourceRel)}.generated.ts`;+}++/** The specifier `sourceRel` imports its generated map with. */+export function getSliceImportSpecifier(sourceRel) {+ const fromDir = path.posix.dirname(sourceRel);+ const target = path.posix.join(+ 'i18n',+ ENGLISH_FALLBACK_DIRNAME,+ stripExtension(sourceRel) + '.generated',+ );+ const relative = path.posix.relative(fromDir, target);+ return relative.startsWith('.') ? relative : `./${relative}`;+}++export function renderEnglishFallbackModule(englishCatalog, keys, sourceRel) {+ const slice = Object.fromEntries(keys.map(key => [key, englishCatalog[key]]));+ return (+ `// Copyright (c) Meta Platforms, Inc. and affiliates.\n\n` ++ `/**\n` ++ ` * @generated by scripts/generate-i18n-runtime.mjs from packages/core/locales/en.json,\n` ++ ` * holding the English for the catalog keys named in packages/core/src/${sourceRel}.\n` ++ ` * Do not edit by hand. Run \`pnpm generate:i18n-runtime\` instead.\n` ++ ` */\n\n` ++ `const english: Readonly<Record<string, string>> = ${JSON.stringify(slice, null, 2)};\n\n` ++ `export default english;\n`+ );+}++const SLICE_IMPORT_PATTERN = new RegExp(+ String.raw`^import\s+(\w+)\s+from\s+'([^']*\/${ENGLISH_FALLBACK_DIRNAME}\/[^']+)';`,+ 'gm',+);+const FULL_CATALOG_IMPORT_PATTERN = /generated-locales\/en\.generated['"]/;+const FULL_FALLBACK_CALL_PATTERN = /^registerFullEnglishFallback\(\);$/m;+// A value import of the public hook, from the i18n barrel or its module.+const PUBLIC_TRANSLATOR_IMPORT_PATTERN =+ /^import\s*\{[^}]*\buseTranslator\b[^}]*\}\s*from\s*'(?:\.\.?\/)+i18n(?:\/index|\/useTranslator)?';/m;++/**+ * Wiring problems: a module that names keys without importing and registering+ * its own generated map, a module importing another module's map or a map it+ * no longer needs, or a full-catalog path outside the allowed modules.+ */+export function findWiringProblems(slices, srcDir = CORE_SRC_DIR) {+ const problems = [];+ for (const rel of listSourceModules(srcDir)) {+ const text = fs.readFileSync(path.join(srcDir, rel), 'utf8');+ const imports = [...text.matchAll(SLICE_IMPORT_PATTERN)];+ const expected = getSliceImportSpecifier(rel);+ const usesPublicTranslator = PUBLIC_TRANSLATOR_IMPORT_PATTERN.test(text);+ if (slices.has(rel)) {+ const own = imports.find(([, , specifier]) => specifier === expected);+ if (own === undefined) {+ // A module not yet moved to its own map still resolves its keys+ // through the public hook, which registers the whole catalog.+ if (!usesPublicTranslator) {+ problems.push(+ `${rel}: names catalog keys but does not import its English fallback ` ++ `(import english from '${expected}';)`,+ );+ }+ } else if (usesPublicTranslator) {+ problems.push(+ `${rel}: registers its English fallback but also imports the public ` ++ `useTranslator, which carries the whole catalog; use useComponentTranslator`,+ );+ } else if (+ !new RegExp(+ String.raw`^registerEnglishFallback\(${own[1]}\);$`,+ 'm',+ ).test(text)+ ) {+ problems.push(+ `${rel}: imports its English fallback but does not register it at ` ++ `module scope (registerEnglishFallback(${own[1]});)`,+ );+ }+ }+ for (const [, , specifier] of imports) {+ if (!slices.has(rel) || specifier !== expected) {+ problems.push(+ `${rel}: imports '${specifier}', which is not its own English fallback`,+ );+ }+ }+ if (rel !== FULL_CATALOG_MODULE && FULL_CATALOG_IMPORT_PATTERN.test(text)) {+ problems.push(+ `${rel}: imports the whole English catalog; use its own generated ` ++ `English fallback instead`,+ );+ }+ if (+ !FULL_FALLBACK_MODULES.includes(rel) &&+ FULL_FALLBACK_CALL_PATTERN.test(text)+ ) {+ problems.push(+ `${rel}: registers the whole English catalog but is not a public path ` ++ `that resolves arbitrary keys (FULL_FALLBACK_MODULES)`,+ );+ }+ }+ for (const rel of FULL_FALLBACK_MODULES) {+ const file = path.join(srcDir, rel);+ if (+ !fs.existsSync(file) ||+ !FULL_FALLBACK_CALL_PATTERN.test(fs.readFileSync(file, 'utf8'))+ ) {+ problems.push(+ `${rel}: must register the whole English catalog at module scope ` ++ `(registerFullEnglishFallback();)`,+ );+ }+ }+ return problems;+}++function writeIfChanged(file, content) {+ if (fs.existsSync(file) && fs.readFileSync(file, 'utf8') === content) {+ return false;+ }+ fs.mkdirSync(path.dirname(file), {recursive: true});+ fs.writeFileSync(file, content);+ return true;+}++function removeStaleSlices(dir, expected, base = dir) {+ if (!fs.existsSync(dir)) return 0;+ let removed = 0;+ for (const entry of fs.readdirSync(dir, {withFileTypes: true})) {+ const full = path.join(dir, entry.name);+ if (entry.isDirectory()) {+ removed += removeStaleSlices(full, expected, base);+ if (fs.readdirSync(full).length === 0) fs.rmdirSync(full);+ continue;+ }+ const rel = path.relative(base, full).split(path.sep).join('/');+ if (!expected.has(rel)) {+ fs.rmSync(full);+ removed += 1;+ }+ }+ return removed;+}++/**+ * Write one English fallback map per Core module that names catalog keys and+ * remove maps whose module no longer does.+ */+export function writeEnglishFallbackSlices(+ englishCatalog,+ slices,+ outDir = ENGLISH_FALLBACK_DIR,+) {+ const expected = new Set(+ [...slices.keys()].map(sourceRel => getSliceModuleName(sourceRel)),+ );+ const removed = removeStaleSlices(outDir, expected);+ let changed = 0;+ for (const [sourceRel, keys] of slices) {+ const output = renderEnglishFallbackModule(englishCatalog, keys, sourceRel);+ if (+ writeIfChanged(path.join(outDir, getSliceModuleName(sourceRel)), output)+ )+ changed += 1;+ }+ return {changed, removed};+}diff --git a/scripts/i18n-english-fallback.test.mjs b/scripts/i18n-english-fallback.test.mjsnew file mode 100644index 0000000000..ba82b2159f--- /dev/null+++ b/scripts/i18n-english-fallback.test.mjs@@ -0,0 +1,288 @@+// Copyright (c) Meta Platforms, Inc. and affiliates.++/**+ * @file i18n-english-fallback.test.mjs+ * @input scripts/i18n-english-fallback.mjs, temporary source fixtures, and+ * the built @astryxdesign/core (built once by the node project's globalSetup)+ * @output Unit tests for key collection and wiring, and the import-cost check+ * that a component's bundle carries its own English, not the whole catalog+ * @position Verifies architecture:internationalization's per-module English+ * fallback. Resolution parity lives in+ * packages/core/src/i18n/__tests__/englishFallback.test.ts.+ */++import fs from 'node:fs';+import os from 'node:os';+import path from 'node:path';+import {createRequire} from 'node:module';+import {fileURLToPath} from 'node:url';+import {afterEach, describe, expect, it} from 'vitest';+import {+ collectCatalogKeys,+ collectEnglishFallbackSlices,+ findWiringProblems,+ getSliceImportSpecifier,+ getSliceModuleName,+ isShippedSourceModule,+ renderEnglishFallbackModule,+} from './i18n-english-fallback.mjs';++const require = createRequire(import.meta.url);+const REPO_ROOT = fileURLToPath(new URL('..', import.meta.url));+const CORE_DIST = path.join(REPO_ROOT, 'packages', 'core', 'dist');++const CATALOG = {+ '@astryx.button.loading': 'Loading',+ '@astryx.kbd.key.control': 'Control',+ '@astryx.pagination.next': 'Go to next page',+};++const temps = [];+function fixture(files) {+ const dir = fs.mkdtempSync(path.join(os.tmpdir(), 'astryx-en-fallback-'));+ temps.push(dir);+ for (const [rel, text] of Object.entries(files)) {+ fs.mkdirSync(path.dirname(path.join(dir, rel)), {recursive: true});+ fs.writeFileSync(path.join(dir, rel), text);+ }+ return dir;+}+afterEach(() => {+ for (const dir of temps.splice(0)) {+ fs.rmSync(dir, {recursive: true, force: true});+ }+});++const FULL_FALLBACK_FILES = {+ 'i18n/useTranslator.ts': 'registerFullEnglishFallback();\n',+ 'i18n/publicContext.ts': 'registerFullEnglishFallback();\n',+};++describe('collectCatalogKeys', () => {+ it('collects every string literal that is a catalog key, including keys kept in local maps', () => {+ const source = [+ `const LABEL = new Map([['ctrl', '@astryx.kbd.key.control']]);`,+ 'const t = (key: string) => key;',+ 't(`@astryx.button.loading`);',+ `t('@astryx.button.loading');`,+ ].join('\n');+ expect(collectCatalogKeys(source, 'A.ts', CATALOG)).toEqual([+ '@astryx.button.loading',+ '@astryx.kbd.key.control',+ ]);+ });++ it('ignores comments and strings that are not catalog keys', () => {+ const source = [+ `// t('@astryx.pagination.next')`,+ `/** t('@astryx.pagination.next') */`,+ `const other = '@astryx.not.inCatalog';`,+ ].join('\n');+ expect(collectCatalogKeys(source, 'A.tsx', CATALOG)).toEqual([]);+ });+});++describe('module paths', () => {+ it('mirrors the source path under i18n/generated-english', () => {+ expect(getSliceModuleName('Button/Button.tsx')).toBe(+ 'Button/Button.generated.ts',+ );+ expect(getSliceImportSpecifier('Button/Button.tsx')).toBe(+ '../i18n/generated-english/Button/Button.generated',+ );+ expect(getSliceImportSpecifier('Table/plugins/tree/useTree.tsx')).toBe(+ '../../../i18n/generated-english/Table/plugins/tree/useTree.generated',+ );+ });++ it('derives maps only for shipped modules', () => {+ expect(isShippedSourceModule('Button/Button.tsx')).toBe(true);+ expect(isShippedSourceModule('Button/Button.test.tsx')).toBe(false);+ expect(isShippedSourceModule('Button/Button.stories.tsx')).toBe(false);+ expect(isShippedSourceModule('i18n/__tests__/resolve.test.ts')).toBe(false);+ expect(+ isShippedSourceModule('i18n/generated-locales/en.generated.ts'),+ ).toBe(false);+ expect(+ isShippedSourceModule(+ 'i18n/generated-english/Button/Button.generated.ts',+ ),+ ).toBe(false);+ });++ it('renders the English for exactly the named keys', () => {+ const output = renderEnglishFallbackModule(+ CATALOG,+ ['@astryx.button.loading'],+ 'Button/Button.tsx',+ );+ expect(output).toContain('"@astryx.button.loading": "Loading"');+ expect(output).not.toContain('@astryx.pagination.next');+ expect(output).toContain('@generated');+ });+});++describe('findWiringProblems', () => {+ const WIRED = [+ `import english from '../i18n/generated-english/Button/Button.generated';`,+ '',+ 'registerEnglishFallback(english);',+ `t('@astryx.button.loading');`,+ '',+ ].join('\n');++ it('accepts a module that imports and registers its own map', () => {+ const dir = fixture({...FULL_FALLBACK_FILES, 'Button/Button.tsx': WIRED});+ const slices = collectEnglishFallbackSlices(CATALOG, dir);+ expect([...slices.keys()]).toEqual(['Button/Button.tsx']);+ expect(findWiringProblems(slices, dir)).toEqual([]);+ });++ it('rejects a module that names keys without its map, or never registers it', () => {+ const dir = fixture({+ ...FULL_FALLBACK_FILES,+ 'Button/Button.tsx': `t('@astryx.button.loading');\n`,+ 'Kbd/Kbd.tsx': [+ `import english from '../i18n/generated-english/Kbd/Kbd.generated';`,+ `t('@astryx.kbd.key.control');`,+ '',+ ].join('\n'),+ });+ const problems = findWiringProblems(+ collectEnglishFallbackSlices(CATALOG, dir),+ dir,+ );+ expect(problems).toEqual([+ expect.stringMatching(/^Button\/Button\.tsx: .*does not import/),+ expect.stringMatching(/^Kbd\/Kbd\.tsx: .*does not register/),+ ]);+ });++ it("rejects another module's map, the whole catalog, and unlisted full-catalog registration", () => {+ const dir = fixture({+ ...FULL_FALLBACK_FILES,+ 'Button/Button.tsx': WIRED,+ 'Link/Link.tsx': [+ `import english from '../i18n/generated-english/Button/Button.generated';`,+ `import enCatalog from '../i18n/generated-locales/en.generated';`,+ 'registerFullEnglishFallback();',+ '',+ ].join('\n'),+ });+ const problems = findWiringProblems(+ collectEnglishFallbackSlices(CATALOG, dir),+ dir,+ );+ expect(problems).toEqual([+ expect.stringMatching(/^Link\/Link\.tsx: .*not its own/),+ expect.stringMatching(/^Link\/Link\.tsx: imports the whole English/),+ expect.stringMatching(/^Link\/Link\.tsx: registers the whole English/),+ ]);+ });++ it('accepts a module that still resolves its keys through the public useTranslator', () => {+ const dir = fixture({+ ...FULL_FALLBACK_FILES,+ 'Table/Table.tsx': [+ `import {useLocale, useTranslator} from '../i18n';`,+ `t('@astryx.pagination.next');`,+ '',+ ].join('\n'),+ });+ expect(+ findWiringProblems(collectEnglishFallbackSlices(CATALOG, dir), dir),+ ).toEqual([]);+ });++ it('rejects a module that registers its map but also imports the public useTranslator', () => {+ const dir = fixture({+ ...FULL_FALLBACK_FILES,+ 'Button/Button.tsx': `import {useTranslator} from '../i18n/useTranslator';\n${WIRED}`,+ });+ expect(+ findWiringProblems(collectEnglishFallbackSlices(CATALOG, dir), dir),+ ).toEqual([+ expect.stringMatching(/^Button\/Button\.tsx: .*also imports the public/),+ ]);+ });++ it('requires every public path that resolves arbitrary keys to register the whole catalog', () => {+ const dir = fixture({+ ...FULL_FALLBACK_FILES,+ 'i18n/useTranslator.ts': 'export {};\n',+ });+ expect(findWiringProblems(new Map(), dir)).toEqual([+ expect.stringMatching(/^i18n\/useTranslator\.ts: must register/),+ ]);+ });+});++describe('import cost', () => {+ // Same per-component import measurement as the pull-request size report.+ const {bundleImport} = require('../.github/scripts/lib/component-size.js');+ const enCatalogFile = path.join(+ CORE_DIST,+ 'i18n',+ 'generated-locales',+ 'en.generated.js',+ );++ function catalogKeysIn(text, keys) {+ return keys.filter(key => text.includes(JSON.stringify(key)));+ }++ function loadCatalogKeys() {+ const source = fs.readFileSync(enCatalogFile, 'utf8');+ return [...source.matchAll(/["'](@astryx\.[^"']+)["']\s*:/g)].map(+ match => match[1],+ );+ }++ it('bundles only the English a component names, not the whole catalog', () => {+ const keys = loadCatalogKeys();+ expect(keys.length).toBeGreaterThan(100);+ for (const name of ['Button', 'TreeList', 'SideNav', 'Selector']) {+ const text = bundleImport(path.join(CORE_DIST, name, `${name}.js`));+ expect(text, name).not.toBeNull();+ const bundled = catalogKeysIn(text, keys);+ expect(bundled.length, name).toBeGreaterThan(0);+ expect(bundled.length, name).toBeLessThan(keys.length / 4);+ }+ });++ // Application code imports the package entry; bundlers drop the modules+ // whose exports it does not use, so check what each public export keeps.+ function bundlePackageExport(exportName) {+ const esbuild = require('esbuild');+ const entry = JSON.stringify(path.join(CORE_DIST, 'index.js'));+ const result = esbuild.buildSync({+ stdin: {+ contents: `import {${exportName}} from ${entry}; export const value = ${exportName};`,+ resolveDir: REPO_ROOT,+ loader: 'js',+ },+ bundle: true,+ minify: true,+ format: 'esm',+ platform: 'browser',+ write: false,+ external: ['react', 'react-dom', '@stylexjs/stylex'],+ define: {'process.env.NODE_ENV': '"production"'},+ loader: {'.css': 'empty'},+ logLevel: 'silent',+ });+ return result.outputFiles[0].text;+ }++ it('keeps the whole catalog on the public paths that resolve any Astryx key', () => {+ const keys = loadCatalogKeys();+ for (const exportName of ['useTranslator', 'InternationalizationContext']) {+ expect(+ catalogKeysIn(bundlePackageExport(exportName), keys),+ exportName,+ ).toHaveLength(keys.length);+ }+ // A public export that resolves no keys carries none.+ expect(catalogKeysIn(bundlePackageExport('useLocale'), keys)).toEqual([]);+ });+});