test/login/i18n.typelevel-spec.ts (1)

128-149: Type-level coverage for withMessageFormatter is good; add a tiny runtime check

Consider a small runtime spec ensuring the custom formatter is actually invoked (e.g., stub that records calls).

Would you like me to add an integration test that builds i18n with withMessageFormatter and asserts the stub was called?

test/login/formatMessageChoiceFormat.spec.ts (1)

1-310: Add boundary tests to match Java ChoiceFormat semantics

Please add:

• ≤ semantics for “#”: e.g., "3#≤3|3< >3" with values 2, 3, 4.
• Interval coverage: "5# ≤5|10# ≤10|10< >10" with value 7 should pick the ≤10 branch.
• Negative/decimal values (e.g., -1, 2.5).
• Sparse/large indices (e.g., {0} and {10}) to ensure placeholder mapping by explicit index.

I can draft these additional cases if helpful.

src/login/i18n/noJsx/formatMessageChoiceFormat.ts (1)

106-139: Minor: simplify by dropping startIndex entirely after refactor

After the above change, startIndex is unused in formatChoiceMessage; you can remove it for clarity.

src/login/i18n/withJsx/useI18n.tsx (1)

24-26: Ergonomics: default generic = never might block passing messageFormatter

With MessageFormatter defaulting to never, callers of createUseI18n can’t pass messageFormatter unless they specify the generic. If this factory is public, consider defaulting to MessageFormatter_I18n instead, or ensure builder paths always provide the generic.

If you prefer the current constraint, please confirm that external consumers don’t call createUseI18n directly.

Also applies to: 38-41, 118-118

src/login/i18n/noJsx/getI18n.tsx (2)

18-18: Unify and tighten MessageFormatter arg type

Use unknown over any to avoid unsoundness and align across API.

-export type MessageFormatter = (message: string, args: (any | undefined)[]) => string;
+export type MessageFormatter = (message: string, args: (unknown | undefined)[]) => string;

---

352-357: Guard custom formatter; fallback on error

A throwing formatter will break rendering. Catch and fallback to default.

-            if (messageFormatter) {
-                return messageFormatter(message, args);
-            }
-
-            return formatChoiceMessage(message, args);
+            if (messageFormatter) {
+                try {
+                    return messageFormatter(message, args);
+                } catch (e) {
+                    console.warn("keycloakify:i18n messageFormatter error; falling back to ChoiceFormat", e);
+                }
+            }
+            return formatChoiceMessage(message, args);

src/login/i18n/noJsx/i18nBuilder.ts (1)

62-70: Use the shared formatter type alias to avoid drift

Accept the aliased type instead of re-stating the function signature.

-        withMessageFormatter: (
-            formatter: (message: string, args: (string | undefined)[]) => string
-        ) => I18nBuilder<
+        withMessageFormatter: (
+            formatter: MessageFormatter_I18n
+        ) => I18nBuilder<

src/login/i18n/withJsx/i18nBuilder.ts (1)

62-70: Type consistency: accept the alias for formatter

Mirror the central alias to prevent signature drift and ease refactors.

-        withMessageFormatter: (
-            formatter: (message: string, args: (string | undefined)[]) => string
-        ) => I18nBuilder<
+        withMessageFormatter: (
+            formatter: MessageFormatter_I18n
+        ) => I18nBuilder<

Configuration used: CodeRabbit UI

Review profile: CHILL

Plan: Pro