@astryxdesign/core 0.5.1-canary.8359f1a → 0.5.1

package/dist/i18n/InternationalizationContext.d.ts

@@ -1,11 +1,9 @@
-import { getResolve } from './resolve';
 import type { Locale, MessagesByLocale, Overrides } from './types';
 export interface InternationalizationContextValue {
     locale: Locale;
     direction: 'ltr' | 'rtl';
     messages: MessagesByLocale;
     overrides?: Overrides;
-    translate: ReturnType<typeof getResolve>;
 }
 /**
  * Default value falls through to the shipped en catalog in resolve().

package/dist/i18n/InternationalizationContext.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"InternationalizationContext.d.ts","sourceRoot":"","sources":["../../src/i18n/InternationalizationContext.ts"],"names":[],"mappings":"AAyBA,OAAO,EAAC,UAAU,EAAC,MAAM,WAAW,CAAC;AACrC,OAAO,KAAK,EAAC,MAAM,EAAE,gBAAgB,EAAE,SAAS,EAAC,MAAM,SAAS,CAAC;AAEjE,MAAM,WAAW,gCAAgC;IAC/C,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,KAAK,GAAG,KAAK,CAAC;IACzB,QAAQ,EAAE,gBAAgB,CAAC;IAC3B,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB,SAAS,EAAE,UAAU,CAAC,OAAO,UAAU,CAAC,CAAC;CAC1C;AAED;;;GAGG;AACH,eAAO,MAAM,2BAA2B,2DAMpC,CAAC"}
+{"version":3,"file":"InternationalizationContext.d.ts","sourceRoot":"","sources":["../../src/i18n/InternationalizationContext.ts"],"names":[],"mappings":"AAyBA,OAAO,KAAK,EAAC,MAAM,EAAE,gBAAgB,EAAE,SAAS,EAAC,MAAM,SAAS,CAAC;AAEjE,MAAM,WAAW,gCAAgC;IAC/C,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,KAAK,GAAG,KAAK,CAAC;IACzB,QAAQ,EAAE,gBAAgB,CAAC;IAC3B,SAAS,CAAC,EAAE,SAAS,CAAC;CACvB;AAED;;;GAGG;AACH,eAAO,MAAM,2BAA2B,2DAKpC,CAAC"}

package/dist/i18n/InternationalizationContext.js

@@ -22,7 +22,6 @@
  * - /packages/core/src/i18n/index.ts
  */
 import { createContext } from 'react';
-import { getResolve } from "./resolve.js";
 /**
  * Default value falls through to the shipped en catalog in resolve().
  * A consumer that doesn't render a provider still gets English defaults.
@@ -30,7 +29,6 @@ import { getResolve } from "./resolve.js";
 export const InternationalizationContext = /*#__PURE__*/createContext({
   locale: 'en',
   direction: 'ltr',
-  messages: {},
-  translate: getResolve('en', {})
+  messages: {}
 });
 InternationalizationContext.displayName = 'InternationalizationContext';

package/dist/i18n/InternationalizationProvider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"InternationalizationProvider.d.ts","sourceRoot":"","sources":["../../src/i18n/InternationalizationProvider.tsx"],"names":[],"mappings":"AAIA;;;;;;;;;;;;;;;GAeG;AAEH,OAAO,EAAU,KAAK,SAAS,EAAC,MAAM,OAAO,CAAC;AAG9C,OAAO,KAAK,EAAC,MAAM,EAAE,gBAAgB,EAAE,SAAS,EAAC,MAAM,SAAS,CAAC;AAGjE,MAAM,WAAW,iCAAiC;IAChD;;;;;;OAMG;IACH,MAAM,EAAE,MAAM,CAAC;IACf;;;;;;;;;OASG;IACH,QAAQ,CAAC,EAAE,gBAAgB,CAAC;IAC5B;;;;;;;;;;OAUG;IACH,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB;;;;;;;;;;;OAWG;IACH,GAAG,CAAC,EAAE,KAAK,GAAG,KAAK,CAAC;IACpB,QAAQ,EAAE,SAAS,CAAC;CACrB;AAED;;;GAGG;AACH,wBAAgB,4BAA4B,CAAC,EAC3C,MAAM,EACN,QAAQ,EACR,SAAS,EACT,GAAG,EACH,QAAQ,GACT,EAAE,iCAAiC,+BAiBnC;yBAvBe,4BAA4B"}
+{"version":3,"file":"InternationalizationProvider.d.ts","sourceRoot":"","sources":["../../src/i18n/InternationalizationProvider.tsx"],"names":[],"mappings":"AAIA;;;;;;;;;;;;;;;GAeG;AAEH,OAAO,EAAU,KAAK,SAAS,EAAC,MAAM,OAAO,CAAC;AAG9C,OAAO,KAAK,EAAC,MAAM,EAAE,gBAAgB,EAAE,SAAS,EAAC,MAAM,SAAS,CAAC;AAEjE,MAAM,WAAW,iCAAiC;IAChD;;;;;;OAMG;IACH,MAAM,EAAE,MAAM,CAAC;IACf;;;;;;;;;OASG;IACH,QAAQ,CAAC,EAAE,gBAAgB,CAAC;IAC5B;;;;;;;;;;OAUG;IACH,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB;;;;;;;;;;;OAWG;IACH,GAAG,CAAC,EAAE,KAAK,GAAG,KAAK,CAAC;IACpB,QAAQ,EAAE,SAAS,CAAC;CACrB;AAED;;;GAGG;AACH,wBAAgB,4BAA4B,CAAC,EAC3C,MAAM,EACN,QAAQ,EACR,SAAS,EACT,GAAG,EACH,QAAQ,GACT,EAAE,iCAAiC,+BAWnC;yBAjBe,4BAA4B"}

package/dist/i18n/InternationalizationProvider.js

@@ -21,7 +21,6 @@
 import { useMemo } from 'react';
 import { InternationalizationContext } from "./InternationalizationContext.js";
 import { getLocaleDirection } from "./getLocaleDirection.js";
-import { getResolve } from "./resolve.js";
 import { jsx as _jsx } from "react/jsx-runtime";
 /**
  * Provides locale + additional messages + overrides to all astryx
@@ -39,8 +38,7 @@ export function InternationalizationProvider({
     locale,
     direction,
     messages: messages ?? {},
-    overrides,
-    translate: getResolve(locale, messages ?? {}, overrides)
+    overrides
   }), [locale, direction, messages, overrides]);
   return /*#__PURE__*/_jsx(InternationalizationContext, {
     value: value,

package/dist/i18n/resolve.d.ts

@@ -13,7 +13,7 @@ import type { Locale, MessagesByLocale, Overrides } from './types';
  * shipped en catalog separately as the final source-of-truth.
  */
 export declare function resolveLocaleChain(locale: Locale): Locale[];
-export declare function getResolve(locale: Locale, messages: MessagesByLocale, overrides?: Overrides): (key: string, values: Record<string, unknown> | undefined) => string;
+export declare function resolve(key: string, values: Record<string, unknown> | undefined, locale: Locale, messages: MessagesByLocale, overrides: Overrides | undefined): string;
 /**
  * Reset internal caches. Test-only.
  * @internal

package/dist/i18n/resolve.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"resolve.d.ts","sourceRoot":"","sources":["../../src/i18n/resolve.ts"],"names":[],"mappings":"AAsBA,OAAO,KAAK,EAAU,MAAM,EAAE,gBAAgB,EAAE,SAAS,EAAC,MAAM,SAAS,CAAC;AAwB1E;;;;;;;;;;;;GAYG;AACH,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,CAc3D;AAkCD,wBAAgB,UAAU,CACxB,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,gBAAgB,EAC1B,SAAS,CAAC,EAAE,SAAS,IAIb,KAAK,MAAM,EAAE,QAAQ,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,YA0BjE;AAED;;;GAGG;AACH,wBAAgB,eAAe,IAAI,IAAI,CAGtC"}
+{"version":3,"file":"resolve.d.ts","sourceRoot":"","sources":["../../src/i18n/resolve.ts"],"names":[],"mappings":"AAsBA,OAAO,KAAK,EAAU,MAAM,EAAE,gBAAgB,EAAE,SAAS,EAAC,MAAM,SAAS,CAAC;AAwB1E;;;;;;;;;;;;GAYG;AACH,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,CAc3D;AAsCD,wBAAgB,OAAO,CACrB,GAAG,EAAE,MAAM,EACX,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,EAC3C,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,gBAAgB,EAC1B,SAAS,EAAE,SAAS,GAAG,SAAS,GAC/B,MAAM,CA0BR;AAED;;;GAGG;AACH,wBAAgB,eAAe,IAAI,IAAI,CAGtC"}

package/dist/i18n/resolve.js

@@ -69,54 +69,55 @@ export function resolveLocaleChain(locale) {
   }
   return chain;
 }
-function getLookup(locale, messages, overrides) {
-  const lookup = {};
+function lookup(key, locale, messages, overrides) {
   const chain = resolveLocaleChain(locale);
+
   // 1 + 2. Overrides (most specific to least specific in the chain)
   if (overrides !== undefined) {
     for (const tag of chain) {
-      if (overrides[tag]) {
-        for (const [key, value] of Object.entries(overrides[tag])) {
-          if (lookup[key] === undefined && value !== null) {
-            lookup[key] = value;
-          }
-        }
+      const value = overrides[tag]?.[key];
+      if (value !== undefined) {
+        return value;
       }
     }
   }
+
+  // 3 + 4. Shipped catalogs (most specific to least specific)
   for (const tag of chain) {
-    if (messages[tag]) {
-      for (const [key, value] of Object.entries(messages[tag])) {
-        if (lookup[key] === undefined && value?.defaultMessage !== null) {
-          lookup[key] = value?.defaultMessage;
-        }
-      }
+    const entry = messages[tag]?.[key];
+    if (entry !== undefined) {
+      return entry.defaultMessage;
     }
   }
-  return lookup;
+
+  // 5. Shipped en catalog — always present
+  const enEntry = EN_CATALOG[key];
+  if (enEntry !== undefined) {
+    return enEntry.defaultMessage;
+  }
+
+  // 6. Nothing found
+  return null;
 }
-export function getResolve(locale, messages, overrides) {
-  const lookup = getLookup(locale, messages, overrides);
-  return (key, values) => {
-    const result = lookup[key] ?? EN_CATALOG[key]?.defaultMessage;
-    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).
-      // Fallback to `en` from a non-en locale is expected and stays silent,
-      // matching the FormatJS / i18next default.
-      warnOnce(`astryx-i18n:${locale}::${key}`, 'astryx-i18n', `missing key: ${key} (locale: ${locale})`);
-      return key;
-    }
-    if (values === undefined) {
-      // Static string — skip the parser entirely for the common case
-      return result;
-    }
-    const formatted = getFormatter(result, locale).format(values);
-    // IntlMessageFormat.format returns string | (string | React elements) — we
-    // only ever pass string values so it will be a string; assert for the type
-    // system.
-    return formatted;
-  };
+export function resolve(key, values, locale, messages, overrides) {
+  const result = lookup(key, locale, messages, overrides);
+  if (result === null) {
+    // Fires ONLY when a key is missing from every source including the
+    // shipped `en` catalog — a real bug (typo, stale catalog, deleted key).
+    // Fallback to `en` from a non-en locale is expected and stays silent,
+    // matching the FormatJS / i18next default.
+    warnOnce(`astryx-i18n:${locale}::${key}`, 'astryx-i18n', `missing key: ${key} (locale: ${locale})`);
+    return key;
+  }
+  if (values === undefined) {
+    // Static string — skip the parser entirely for the common case
+    return result;
+  }
+  const formatted = getFormatter(result, locale).format(values);
+  // IntlMessageFormat.format returns string | (string | React elements) — we
+  // only ever pass string values so it will be a string; assert for the type
+  // system.
+  return formatted;
 }
 
 /**

package/dist/i18n/useTranslator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useTranslator.d.ts","sourceRoot":"","sources":["../../src/i18n/useTranslator.ts"],"names":[],"mappings":"AAwBA,MAAM,MAAM,YAAY,GAAG,CACzB,GAAG,EAAE,MAAM,EACX,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAC7B,MAAM,CAAC;AAEZ;;;;;;;;;;;GAWG;AACH,wBAAgB,aAAa,IAAI,YAAY,CAG5C"}
+{"version":3,"file":"useTranslator.d.ts","sourceRoot":"","sources":["../../src/i18n/useTranslator.ts"],"names":[],"mappings":"AAyBA,MAAM,MAAM,YAAY,GAAG,CACzB,GAAG,EAAE,MAAM,EACX,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAC7B,MAAM,CAAC;AAEZ;;;;;;;;;;;GAWG;AACH,wBAAgB,aAAa,IAAI,YAAY,CAO5C"}

package/dist/i18n/useTranslator.js

@@ -18,8 +18,9 @@
  * - /packages/core/src/i18n/index.ts
  * - /packages/core/src/i18n/t.client.ts
  */
-import { use } from 'react';
+import { use, useCallback } from 'react';
 import { InternationalizationContext } from "./InternationalizationContext.js";
+import { resolve } from "./resolve.js";
 /**
  * Returns a translator function bound to the current provider's locale.
  * Safe to call from event handlers and effects.
@@ -34,5 +35,5 @@ import { InternationalizationContext } from "./InternationalizationContext.js";
  */
 export function useTranslator() {
   const ctx = use(InternationalizationContext);
-  return ctx.translate;
+  return useCallback((key, values) => resolve(key, values, ctx.locale, ctx.messages, ctx.overrides), [ctx.locale, ctx.messages, ctx.overrides]);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@astryxdesign/core",
-  "version": "0.5.1-canary.8359f1a",
+  "version": "0.5.1",
   "displayName": "Astryx Core",
   "description": "The component library. Accessible, themeable React components with built-in spacing, dark mode, and StyleX styling.",
   "author": "Meta Open Source",
@@ -661,7 +661,6 @@
     "react-dom": ">=19.0.0"
   },
   "devDependencies": {
-    "@astryxdesign/cli": "0.5.1-canary.8359f1a",
     "@babel/cli": "^8.0.4",
     "@babel/core": "^7.29.7",
     "@babel/preset-react": "^8.0.1",
@@ -669,7 +668,8 @@
     "@stylexjs/babel-plugin": "^0.19.0",
     "@testing-library/dom": "^10.0.0",
     "@testing-library/jest-dom": "^6.6.0",
-    "@testing-library/react": "^16.3.2"
+    "@testing-library/react": "^16.3.2",
+    "@astryxdesign/cli": "0.5.1"
   },
   "dependencies": {
     "intl-messageformat": "^11.2.9"

package/src/i18n/InternationalizationContext.ts

@@ -23,7 +23,6 @@
  */
 
 import {createContext} from 'react';
-import {getResolve} from './resolve';
 import type {Locale, MessagesByLocale, Overrides} from './types';
 
 export interface InternationalizationContextValue {
@@ -31,7 +30,6 @@ export interface InternationalizationContextValue {
   direction: 'ltr' | 'rtl';
   messages: MessagesByLocale;
   overrides?: Overrides;
-  translate: ReturnType<typeof getResolve>;
 }
 
 /**
@@ -43,6 +41,5 @@ export const InternationalizationContext =
     locale: 'en',
     direction: 'ltr',
     messages: {},
-    translate: getResolve('en', {}),
   });
 InternationalizationContext.displayName = 'InternationalizationContext';

package/src/i18n/InternationalizationProvider.tsx

@@ -23,7 +23,6 @@ import {useMemo, type ReactNode} from 'react';
 import {InternationalizationContext} from './InternationalizationContext';
 import {getLocaleDirection} from './getLocaleDirection';
 import type {Locale, MessagesByLocale, Overrides} from './types';
-import {getResolve} from './resolve';
 
 export interface InternationalizationProviderProps {
   /**
@@ -86,13 +85,7 @@ export function InternationalizationProvider({
 }: InternationalizationProviderProps) {
   const direction = dir ?? getLocaleDirection(locale);
   const value = useMemo(
-    () => ({
-      locale,
-      direction,
-      messages: messages ?? {},
-      overrides,
-      translate: getResolve(locale, messages ?? {}, overrides),
-    }),
+    () => ({locale, direction, messages: messages ?? {}, overrides}),
     [locale, direction, messages, overrides],
   );
   return (

package/src/i18n/__tests__/resolve.test.ts

@@ -9,16 +9,9 @@
  */
 
 import {describe, expect, test, beforeEach, vi} from 'vitest';
-import {__resetForTests, getResolve, resolveLocaleChain} from '../resolve';
+import {__resetForTests, resolve, resolveLocaleChain} from '../resolve';
 import type {Catalog, MessagesByLocale, Overrides} from '../types';
 
-const resolve = (
-  ...[key, values, locale, messages, overrides]: [
-    ...Parameters<ReturnType<typeof getResolve>>,
-    ...Parameters<typeof getResolve>,
-  ]
-) => getResolve(locale, messages, overrides)(key, values);
-
 // Reset caches between tests so warn-once and formatter cache don't bleed.
 beforeEach(() => {
   __resetForTests();
@@ -216,21 +209,6 @@ describe('resolve — overrides', () => {
     // Should fall through to en since fr has no messages and es override doesn't apply
     expect(out).toBe('Go to next page');
   });
-
-  test('override `pt` should take precedence over message `pt-BR`', () => {
-    const overrides: Overrides = {
-      pt: {key: 'override'},
-    };
-    const messages: MessagesByLocale = {
-      'pt-BR': {
-        key: {
-          defaultMessage: 'shipped',
-        },
-      },
-    };
-    const out = resolve('key', undefined, 'pt-BR', messages, overrides);
-    expect(out).toBe('override');
-  });
 });
 
 describe('resolve — ICU MessageFormat', () => {

package/src/i18n/resolve.ts

@@ -73,71 +73,74 @@ export function resolveLocaleChain(locale: Locale): Locale[] {
   return chain;
 }
 
-function getLookup(
+function lookup(
+  key: string,
   locale: Locale,
   messages: MessagesByLocale,
-  overrides?: Overrides,
-): Record<string, string> {
-  const lookup: Record<string, string> = {};
+  overrides: Overrides | undefined,
+): string | null {
   const chain = resolveLocaleChain(locale);
+
   // 1 + 2. Overrides (most specific to least specific in the chain)
   if (overrides !== undefined) {
     for (const tag of chain) {
-      if (overrides[tag]) {
-        for (const [key, value] of Object.entries(overrides[tag])) {
-          if (lookup[key] === undefined && value !== null) {
-            lookup[key] = value;
-          }
-        }
+      const value = overrides[tag]?.[key];
+      if (value !== undefined) {
+        return value;
       }
     }
   }
+
+  // 3 + 4. Shipped catalogs (most specific to least specific)
   for (const tag of chain) {
-    if (messages[tag]) {
-      for (const [key, value] of Object.entries(messages[tag])) {
-        if (lookup[key] === undefined && value?.defaultMessage !== null) {
-          lookup[key] = value?.defaultMessage;
-        }
-      }
+    const entry = messages[tag]?.[key];
+    if (entry !== undefined) {
+      return entry.defaultMessage;
     }
   }
 
-  return lookup;
+  // 5. Shipped en catalog — always present
+  const enEntry = EN_CATALOG[key];
+  if (enEntry !== undefined) {
+    return enEntry.defaultMessage;
+  }
+
+  // 6. Nothing found
+  return null;
 }
 
-export function getResolve(
+export function resolve(
+  key: string,
+  values: Record<string, unknown> | undefined,
   locale: Locale,
   messages: MessagesByLocale,
-  overrides?: Overrides,
-) {
-  const lookup = getLookup(locale, messages, overrides);
-
-  return (key: string, values: Record<string, unknown> | undefined) => {
-    const result = lookup[key] ?? EN_CATALOG[key]?.defaultMessage;
-    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).
-      // Fallback to `en` from a non-en locale is expected and stays silent,
-      // matching the FormatJS / i18next default.
-      warnOnce(
-        `astryx-i18n:${locale}::${key}`,
-        'astryx-i18n',
-        `missing key: ${key} (locale: ${locale})`,
-      );
-      return key;
-    }
+  overrides: Overrides | undefined,
+): string {
+  const result = lookup(key, locale, messages, overrides);
 
-    if (values === undefined) {
-      // Static string — skip the parser entirely for the common case
-      return result;
-    }
+  if (result === null) {
+    // Fires ONLY when a key is missing from every source including the
+    // shipped `en` catalog — a real bug (typo, stale catalog, deleted key).
+    // Fallback to `en` from a non-en locale is expected and stays silent,
+    // matching the FormatJS / i18next default.
+    warnOnce(
+      `astryx-i18n:${locale}::${key}`,
+      'astryx-i18n',
+      `missing key: ${key} (locale: ${locale})`,
+    );
+    return key;
+  }
+
+  if (values === undefined) {
+    // Static string — skip the parser entirely for the common case
+    return result;
+  }
 
-    const formatted = getFormatter(result, locale).format(values);
-    // IntlMessageFormat.format returns string | (string | React elements) — we
-    // only ever pass string values so it will be a string; assert for the type
-    // system.
-    return formatted as string;
-  };
+  const formatted = getFormatter(result, locale).format(values);
+  // IntlMessageFormat.format returns string | (string | React elements) — we
+  // only ever pass string values so it will be a string; assert for the type
+  // system.
+  return formatted as string;
 }
 
 /**

package/src/i18n/useTranslator.ts

@@ -19,8 +19,9 @@
  * - /packages/core/src/i18n/t.client.ts
  */
 
-import {use} from 'react';
+import {use, useCallback} from 'react';
 import {InternationalizationContext} from './InternationalizationContext';
+import {resolve} from './resolve';
 
 export type TranslatorFn = (
   key: string,
@@ -41,5 +42,9 @@ export type TranslatorFn = (
  */
 export function useTranslator(): TranslatorFn {
   const ctx = use(InternationalizationContext);
-  return ctx.translate;
+  return useCallback(
+    (key: string, values?: Record<string, unknown>) =>
+      resolve(key, values, ctx.locale, ctx.messages, ctx.overrides),
+    [ctx.locale, ctx.messages, ctx.overrides],
+  );
 }