@ultimat3/i18n 23.0.0 → 24.0.0

package/CLAUDE.md

@@ -53,6 +53,16 @@ Imported by every package that renders a string.
   and `x verify`'s `i18n` step is what asks it of an app. An app reads strings through its OWN
   module (`useT()` from `packages/i18n/src/index.ts`), never `t` from `@ultimat3/i18n`, so that
   registration is a consequence of rendering rather than something a boot has to remember.
+- **`t()` ALWAYS interpolates, `As of 2026-10`.** It skipped `interpolate` when `vars` was omitted,
+  so `t('a')` on `Hello {name}` put the raw placeholder on the page where `t('a', {})` put the loud
+  `⟦name⟧`, and `{{` stayed escaped. One message, one render. A caller that wants the TEMPLATE
+  (plural forms for a client island) calls `t.raw(key)`. **Breaking.**
+- **`defineCatalogs` runs `assertLocale` over every tag BEFORE the register loop.**
+  `configureLocales` validated them after it, so `X_LOCALE_INVALID` arrived with the bad tag
+  already in `registeredLocales()`. That code is `@ultimat3/core`'s, raised by its `assertLocale` —
+  never add it to `I18N_ERROR_CODES` (a second claim is `X_ERROR_CODE_DUPLICATE`).
+- **A `q` that is not a plain decimal is 0**, so the range is dropped. A digits-only capture meant
+  `en;q=abc` never matched and kept the default quality of 1.
 - Only an **own** property of `vars` is a variable — `interpolate` guards with `Object.hasOwn`.
   A plain object inherits `constructor`, `toString`, `valueOf` and `__proto__`, so a bare
   `vars[name]` rendered a function's source into the page for a template nobody wrote a variable

package/README.md

@@ -54,6 +54,8 @@ t('pagination.showing', { from: 1, to: 20, total: 137 });
 t('pagination.result', { count: 1 });   // "1 result"
 t('pagination.result', { count: 9 });   // "9 results"
 t('nav.settings');                      // "⟦nav.settings⟧" — fix it or ship it broken, visibly
+t('pagination.result');                 // "⟦count⟧ result" — vars or none, the template is always
+                                        // interpolated; t.raw(key) is the template itself
 ```
 
 | Call | Returns | Use for |
@@ -114,6 +116,7 @@ X_CATALOG_MISSING_KEYS: catalog is incomplete
 | Code | When |
 |---|---|
 | `X_LOCALE_UNSUPPORTED` | a tag outside the supported set was asserted, or a `defineCatalogs` default that is not one of its locales |
+| `X_LOCALE_INVALID` | `defineCatalogs` or `configureLocales` was given a tag that is not well-formed BCP 47 (`en_US`). **`@ultimat3/core`'s code**, raised by its `assertLocale` — not an `I18nError` and not in `I18N_ERROR_CODES` |
 | `X_CATALOG_MISSING_KEYS` | a shipped locale lacks a key the source uses |
 | `X_CATALOG_INVALID` | non-string leaf, bad key segment, or a dotted/nested collision |
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ultimat3/i18n",
-  "version": "23.0.0",
+  "version": "24.0.0",
   "description": "Dependency-free translator, catalog flattening, locale negotiation and loud missing-key rendering",
   "license": "MIT",
   "type": "module",
@@ -36,6 +36,6 @@
     "test": "bun test"
   },
   "dependencies": {
-    "@ultimat3/core": "23.0.0"
+    "@ultimat3/core": "24.0.0"
   }
 }

package/src/catalogs/en.json

@@ -205,7 +205,8 @@
       "secret-required": "A value is required: this column is sealed and has no default.",
       "action-not-applicable": "This action does not apply to the row as it is now.",
       "row-out-of-scope": "The row this write would leave is outside the rows this account may see.",
-      "batch-not-offered": "This action does not run over a selection of rows."
+      "batch-not-offered": "This action does not run over a selection of rows.",
+      "row-changed": "Someone changed this row after you opened it. Your values are kept over the row as it is now: review them and save again."
     },
     "filter": {
       "any": "Any",
@@ -326,7 +327,8 @@
       "skipped": {
         "forbidden": "this account may not search that entity",
         "no-text-fields": "that entity has no text field to search",
-        "no-repo": "that entity has no repo bound"
+        "no-repo": "that entity has no repo bound",
+        "failed": "that entity's repo failed while searching"
       }
     },
     "value": {

package/src/context.ts

@@ -3,7 +3,13 @@
  * No call site passes a locale by hand — `t()` here is the ambient translator.
  */
 
-import { assertLocale, cachedFormatter, canonicalLocale, tryUseContext } from '@ultimat3/core';
+import {
+  assertLocale,
+  cachedFormatter,
+  canonicalLocale,
+  readCookie,
+  tryUseContext,
+} from '@ultimat3/core';
 import { type Catalog, mergeCatalogs } from './catalog';
 import {
   DEFAULT_LOCALE,
@@ -145,24 +151,12 @@ export function resolveLocale(
   return { locale: fallback, direction: directionOf(fallback), source: 'default' };
 }
 
-/** Read `x_locale` out of a raw `Cookie` header. */
+/**
+ * Read `x_locale` out of a raw `Cookie` header — through core's `readCookie`, so a malformed
+ * escape (`x_locale=%`) is the raw value, which `resolveLocale` then fails to normalise and skips.
+ */
 export function localeCookieOf(cookieHeader?: string | null): string | undefined {
-  if (!cookieHeader) return undefined;
-  for (const pair of cookieHeader.split(';')) {
-    const index = pair.indexOf('=');
-    if (index === -1) continue;
-    if (pair.slice(0, index).trim() !== LOCALE_COOKIE) continue;
-    const raw = pair.slice(index + 1).trim();
-    try {
-      return decodeURIComponent(raw);
-    } catch {
-      // A cookie is client-authored: `x_locale=%` is a `URIError` out of a per-request path, and
-      // a 500 for a malformed locale is worse than the raw value, which `resolveLocale` then
-      // fails to normalise and skips. Same guard as `@ultimat3/auth`'s `decodeCookieValue`.
-      return raw;
-    }
-  }
-  return undefined;
+  return readCookie(cookieHeader, LOCALE_COOKIE) ?? undefined;
 }
 
 /**

package/src/define-catalogs.ts

@@ -4,6 +4,7 @@
  * Boot-time only — nothing here runs per request.
  */
 
+import { assertLocale } from '@ultimat3/core';
 import { type Catalog, catalogKeys, loadCatalog, mergeCatalogs } from './catalog';
 import { configureLocales, registerCatalog } from './context';
 import { localeUnsupported } from './errors';
@@ -42,6 +43,10 @@ export function defineCatalogs<TLocales extends CatalogSources>(
 ): CatalogSet<TLocales> {
   const locales = Object.keys(input.locales) as (keyof TLocales & string)[];
   if (!locales.includes(input.default)) throw localeUnsupported(input.default, locales);
+  // Every tag, before anything is registered. `configureLocales` below runs the same screen, but
+  // after the register loop — so its `X_LOCALE_INVALID` arrived with the malformed tag already in
+  // `registeredLocales()` and the well-formed locales' strings already live.
+  for (const locale of locales) assertLocale(locale);
 
   // Load everything before registering anything: a malformed catalog must fail the boot
   // whole, not leave half the locales live and the other half missing.

package/src/locales.ts

@@ -107,6 +107,9 @@ export interface LanguageRange {
   quality: number;
 }
 
+/** A plain non-negative decimal — `0.8`, `1`, `.5`. No sign, no exponent, one point. */
+const Q_VALUE = /^(?:\d+(?:\.\d*)?|\.\d+)$/;
+
 /**
  * Parse `Accept-Language: en-GB,en;q=0.9,fr-CH;q=0.8,*;q=0.5` into ranges sorted by
  * quality descending, ties resolved by header order (stable sort).
@@ -120,10 +123,13 @@ export function parseAcceptLanguage(header?: string | null): LanguageRange[] {
     if (!tag) continue;
     let quality = 1;
     for (const param of params) {
-      const match = /^\s*q\s*=\s*([0-9.]+)\s*$/i.exec(param);
+      // The value is captured WHATEVER it is and judged after. Capturing digits only meant
+      // `q=abc` did not match at all, so the default of 1 stood: a malformed range outranked
+      // every well-formed one. A `q` that is not a plain decimal is a range nobody can rank — 0.
+      const match = /^\s*q\s*=(.*)$/i.exec(param);
       if (match?.[1] !== undefined) {
-        const parsed = Number.parseFloat(match[1]);
-        quality = Number.isFinite(parsed) ? Math.min(Math.max(parsed, 0), 1) : 0;
+        const value = match[1].trim();
+        quality = Q_VALUE.test(value) ? Math.min(Number.parseFloat(value), 1) : 0;
       }
     }
     if (quality > 0) ranges.push({ tag: tag.toLowerCase(), quality });

package/src/translator.ts

@@ -72,7 +72,11 @@ export function createTranslator(catalog: Catalog, locale: Locale = DEFAULT_LOCA
     const resolved = resolveKey(key, vars);
     const template = hasExact(resolved) ? catalog[resolved] : undefined;
     if (template === undefined) return `⟦${key}⟧`;
-    return vars === undefined ? template : interpolate(template, vars);
+    // Always, never only when `vars` was passed: skipping it made `t('a')` and `t('a', {})` two
+    // renders of one message — the first put the raw `Hello {name}` on the page where the second
+    // put the loud `⟦name⟧`, and left `{{` escaped. `interpolate` returns a brace-free template
+    // untouched, so the common case pays one `includes`.
+    return interpolate(template, vars);
   };
 
   return Object.assign(translate, {