refactor(mf2): Drop locale from MessageValue as unnecessary

Author: XM5jDcsHTyGJtQqlCi

mf2/fluent/src/functions.ts

@@ -38,7 +38,6 @@ export function getFluentFunctions(res: FluentMessageResource) {
       type: 'fluent-message' as const,
       source,
       dir,
-      locale,
       selectKey(keys) {
         str ??= mf.format(options, onError);
         return keys.has(str) ? str : null;

mf2/icu-messageformat-1/src/functions.ts

@@ -60,7 +60,7 @@ function time(
  *   trailing `.sss` part for non-integer input
  */
 function duration(
-  { locales, source }: MessageFunctionContext,
+  { source }: MessageFunctionContext,
   _options: unknown,
   input?: unknown
 ) {
@@ -96,7 +96,6 @@ function duration(
 
   return {
     type: 'mf1-duration' as const,
-    locale: locales[0],
     source,
     toParts() {
       const res = { type: 'mf1-duration' as const, source, value: str };
@@ -148,12 +147,12 @@ function number(
     type: 'number',
     source,
     get dir() {
-      dir ??= getLocaleDir(this.locale);
+      if (dir == null) {
+        locale ??= Intl.NumberFormat.supportedLocalesOf(locales, opt)[0];
+        dir = getLocaleDir(locale);
+      }
       return dir;
     },
-    get locale() {
-      return (locale ??= Intl.NumberFormat.supportedLocalesOf(locales, opt)[0]);
-    },
     get options() {
       return { ...opt };
     },

mf2/messageformat/src/functions/datetime.ts

@@ -10,7 +10,6 @@ export interface MessageDateTime extends MessageValue {
   readonly type: 'datetime';
   readonly source: string;
   readonly dir: 'ltr' | 'rtl' | 'auto';
-  readonly locale: string;
   readonly options: Readonly<Intl.DateTimeFormatOptions>;
   toParts(): [MessageDateTimePart];
   toString(): string;
@@ -163,15 +162,12 @@ function dateTimeImplementation(
     type: 'datetime',
     source,
     get dir() {
-      dir ??= getLocaleDir(this.locale);
+      if (dir == null) {
+        locale ??= Intl.DateTimeFormat.supportedLocalesOf(locales, opt)[0];
+        dir = getLocaleDir(locale);
+      }
       return dir;
     },
-    get locale() {
-      return (locale ??= Intl.DateTimeFormat.supportedLocalesOf(
-        locales,
-        opt
-      )[0]);
-    },
     get options() {
       return { ...opt };
     },

mf2/messageformat/src/functions/fallback.ts

@@ -9,7 +9,6 @@ import type { MessageValue } from '../message-value.js';
 export interface MessageFallback extends MessageValue {
   readonly type: 'fallback';
   readonly source: string;
-  readonly locale: 'und';
   toParts(): [MessageFallbackPart];
   toString(): string;
 }
@@ -22,7 +21,6 @@ export interface MessageFallbackPart extends MessageExpressionPart {
 
 export const fallback = (source: string = '�'): MessageFallback => ({
   type: 'fallback',
-  locale: 'und',
   source,
   toParts: () => [{ type: 'fallback', source }],
   toString: () => `{${source}}`

mf2/messageformat/src/functions/number.ts

@@ -10,7 +10,6 @@ export interface MessageNumber extends MessageValue {
   readonly type: 'number';
   readonly source: string;
   readonly dir: 'ltr' | 'rtl' | 'auto';
-  readonly locale: string;
   readonly options: Readonly<
     Intl.NumberFormatOptions & Intl.PluralRulesOptions
   >;
@@ -135,15 +134,12 @@ export function number(
     type: 'number',
     source,
     get dir() {
-      dir ??= getLocaleDir(this.locale);
+      if (dir == null) {
+        locale ??= Intl.NumberFormat.supportedLocalesOf(locales, options)[0];
+        dir = getLocaleDir(locale);
+      }
       return dir;
     },
-    get locale() {
-      return (locale ??= Intl.NumberFormat.supportedLocalesOf(
-        locales,
-        options
-      )[0]);
-    },
     get options() {
       return { ...options };
     },

mf2/messageformat/src/functions/string.ts

@@ -7,7 +7,6 @@ export interface MessageString extends MessageValue {
   readonly type: 'string';
   readonly source: string;
   readonly dir: 'ltr' | 'rtl' | 'auto';
-  readonly locale: string;
   selectKey(keys: Set<string>): string | null;
   toParts(): [MessageStringPart];
   toString(): string;
@@ -35,15 +34,14 @@ export function string(
 ): MessageString {
   const str = input === undefined ? '' : String(input);
   const selStr = str.normalize();
-  const locale = ctx.locales[0];
   return {
     type: 'string',
     source: ctx.source,
     dir: ctx.dir ?? 'auto',
-    locale,
     selectKey: keys => (keys.has(selStr) ? selStr : null),
     toParts() {
       const { dir, source } = ctx;
+      const locale = ctx.locales[0];
       return dir === 'ltr' || dir === 'rtl'
         ? [{ type: 'string', source, dir, locale, value: str }]
         : [{ type: 'string', source, locale, value: str }];

mf2/messageformat/src/functions/unknown.ts

@@ -6,7 +6,6 @@ export interface MessageUnknownValue extends MessageValue {
   readonly type: 'unknown';
   readonly source: string;
   readonly dir: 'auto';
-  readonly locale: 'und';
   toParts(): [MessageUnknownPart];
   toString(): string;
   valueOf(): unknown;
@@ -27,7 +26,6 @@ export const unknown = (
   type: 'unknown',
   source,
   dir: 'auto',
-  locale: 'und',
   toParts: () => [{ type: 'unknown', source, value: input }],
   toString: () => String(input),
   valueOf: () => input

mf2/messageformat/src/message-value.ts

@@ -5,7 +5,6 @@ export const BIDI_ISOLATE = Symbol('bidi-isolate');
 export interface MessageValue {
   readonly type: string;
   readonly source: string;
-  readonly locale: string;
   readonly dir?: 'ltr' | 'rtl' | 'auto';
   readonly options?: Readonly<object>;
   selectKey?: (keys: Set<string>) => string | null;