refactor(mf2): Move MessageValue definition to its own file

XM5jDcsHTyGJtQqlCi · XM5jDcsHTyGJtQqlCi · commit 6b2d1a6dca3d · 2024-11-19T14:27:29.000+02:00
diff --git a/mf2/messageformat/src/format-context.ts b/mf2/messageformat/src/format-context.ts
@@ -1,4 +1,4 @@
-import type { MessageValue } from './functions/index.js';
+import type { MessageValue } from './message-value.js';
 import type { MessageFunctions } from './messageformat.js';
 
 export interface Context {
diff --git a/mf2/messageformat/src/functions/datetime.ts b/mf2/messageformat/src/functions/datetime.ts
@@ -1,7 +1,8 @@
+import { getLocaleDir } from '../dir-utils.js';
 import { MessageResolutionError } from '../errors.js';
 import type { MessageExpressionPart } from '../formatted-parts.js';
-import { getLocaleDir } from '../dir-utils.js';
-import type { MessageFunctionContext, MessageValue } from './index.js';
+import type { MessageValue } from '../message-value.js';
+import type { MessageFunctionContext } from '../resolve/function-context.js';
 import {
   asBoolean,
   asPositiveInteger,
diff --git a/mf2/messageformat/src/functions/fallback.ts b/mf2/messageformat/src/functions/fallback.ts
@@ -1,5 +1,5 @@
 import type { MessageExpressionPart } from '../formatted-parts.js';
-import type { MessageValue } from './index.js';
+import type { MessageValue } from '../message-value.js';
 
 /**
  * Used to represent runtime/formatting errors.
diff --git a/mf2/messageformat/src/functions/index.ts b/mf2/messageformat/src/functions/index.ts
@@ -1,22 +1,9 @@
-import type { MessageExpressionPart } from '../formatted-parts.js';
-
+export type { MessageValue } from '../message-value.js';
 export type { MessageFunctionContext } from '../resolve/function-context.js';
 export { currency } from './currency.js';
-export { type MessageDateTime, date, datetime, time } from './datetime.js';
-export { type MessageFallback, fallback } from './fallback.js';
+export { date, datetime, time, type MessageDateTime } from './datetime.js';
+export { fallback, type MessageFallback } from './fallback.js';
 export { math } from './math.js';
-export { type MessageNumber, integer, number } from './number.js';
-export { type MessageString, string } from './string.js';
-export { type MessageUnknownValue, unknown } from './unknown.js';
-
-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;
-  toParts?: () => MessageExpressionPart[];
-  toString?: () => string;
-  valueOf?: () => unknown;
-}
+export { integer, number, type MessageNumber } from './number.js';
+export { string, type MessageString } from './string.js';
+export { unknown, type MessageUnknownValue } from './unknown.js';
diff --git a/mf2/messageformat/src/functions/number.ts b/mf2/messageformat/src/functions/number.ts
@@ -1,7 +1,8 @@
+import { getLocaleDir } from '../dir-utils.js';
 import { MessageResolutionError } from '../errors.js';
 import type { MessageExpressionPart } from '../formatted-parts.js';
-import { getLocaleDir } from '../dir-utils.js';
-import type { MessageFunctionContext, MessageValue } from './index.js';
+import type { MessageValue } from '../message-value.js';
+import type { MessageFunctionContext } from '../resolve/function-context.js';
 import { asPositiveInteger, asString, mergeLocales } from './utils.js';
 
 /** @beta */
diff --git a/mf2/messageformat/src/functions/string.ts b/mf2/messageformat/src/functions/string.ts
@@ -1,5 +1,6 @@
 import type { MessageExpressionPart } from '../formatted-parts.js';
-import type { MessageFunctionContext, MessageValue } from './index.js';
+import type { MessageValue } from '../message-value.js';
+import type { MessageFunctionContext } from '../resolve/function-context.js';
 import { mergeLocales } from './utils.js';
 
 /** @beta */
diff --git a/mf2/messageformat/src/functions/test-functions.ts b/mf2/messageformat/src/functions/test-functions.ts
@@ -6,7 +6,8 @@
  */
 
 import { MessageResolutionError } from '../errors.js';
-import type { MessageFunctionContext, MessageValue } from './index.js';
+import type { MessageValue } from '../message-value.js';
+import type { MessageFunctionContext } from '../resolve/function-context.js';
 import { asPositiveInteger, asString } from './utils.js';
 
 interface TestValue extends MessageValue {
diff --git a/mf2/messageformat/src/functions/unknown.ts b/mf2/messageformat/src/functions/unknown.ts
@@ -1,5 +1,5 @@
 import type { MessageExpressionPart } from '../formatted-parts.js';
-import type { MessageValue } from './index.js';
+import type { MessageValue } from '../message-value.js';
 
 /** @beta */
 export interface MessageUnknownValue extends MessageValue {
diff --git a/mf2/messageformat/src/messageformat.ts b/mf2/messageformat/src/messageformat.ts
@@ -6,7 +6,6 @@ import { MessageDataModelError, MessageError } from './errors.js';
 import type { Context } from './format-context.js';
 import type { MessagePart } from './formatted-parts.js';
 import {
-  MessageValue,
   currency,
   date,
   datetime,
@@ -16,6 +15,7 @@ import {
   string,
   time
 } from './functions/index.js';
+import type { MessageValue } from './message-value.js';
 import { formatMarkup } from './resolve/format-markup.js';
 import type { MessageFunctionContext } from './resolve/function-context.js';
 import { resolveExpression } from './resolve/resolve-expression.js';
diff --git a/mf2/messageformat/src/mf2-features.test.mts b/mf2/messageformat/src/mf2-features.test.mts
@@ -7,16 +7,17 @@ import {
 import { parse } from '@messageformat/parser';
 import { source } from '~/test/utils/source.js';
 
+import type {
+  MessageFunctionContext,
+  MessageValue
+} from './functions/index.js';
 import {
+  MessageBiDiIsolationPart,
   MessageExpressionPart,
   MessageFormat,
   MessageLiteralPart,
   SelectMessage
 } from './index.js';
-import type {
-  MessageFunctionContext,
-  MessageValue
-} from './functions/index.js';
 
 describe('Plural Range Selectors & Range Formatters (unicode-org/message-format-wg#125)', () => {
   function range(
@@ -288,7 +289,9 @@ maybe('List formatting', () => {
 describe('Neighbouring text transformations (unicode-org/message-format-wg#160)', () => {
   function hackyFixArticles(
     locales: string[],
-    parts: Array<MessageExpressionPart | MessageLiteralPart>
+    parts: Array<
+      MessageExpressionPart | MessageLiteralPart | MessageBiDiIsolationPart
+    >
   ) {
     if (locales[0] !== 'en') throw new Error('Only English supported');
     if (!parts) return;
diff --git a/mf2/messageformat/src/resolve/resolve-expression.ts b/mf2/messageformat/src/resolve/resolve-expression.ts
@@ -1,9 +1,9 @@
+import type { Expression } from '../data-model/types.js';
 import type { Context } from '../format-context.js';
-import type { MessageValue } from '../functions/index.js';
+import type { MessageValue } from '../message-value.js';
 import { resolveFunctionRef } from './resolve-function-ref.js';
 import { resolveLiteral } from './resolve-literal.js';
 import { resolveVariableRef } from './resolve-variable.js';
-import type { Expression } from '../data-model/types.js';
 
 export function resolveExpression(
   ctx: Context,
diff --git a/mf2/messageformat/src/resolve/resolve-function-ref.ts b/mf2/messageformat/src/resolve/resolve-function-ref.ts
@@ -1,14 +1,14 @@
-import { MessageError } from '../errors.js';
-import type { Context } from '../format-context.js';
-import { fallback } from '../functions/fallback.js';
-import { MessageFunctionContext } from './function-context.js';
-import { getValueSource, resolveValue } from './resolve-value.js';
 import type {
   FunctionRef,
   Literal,
   Options,
   VariableRef
 } from '../data-model/types.js';
+import { MessageError } from '../errors.js';
+import type { Context } from '../format-context.js';
+import { fallback } from '../functions/fallback.js';
+import { MessageFunctionContext } from './function-context.js';
+import { getValueSource, resolveValue } from './resolve-value.js';
 
 export function resolveFunctionRef(
   ctx: Context,
diff --git a/mf2/messageformat/src/resolve/resolve-variable.ts b/mf2/messageformat/src/resolve/resolve-variable.ts
@@ -1,11 +1,11 @@
+import type { Expression, VariableRef } from '../data-model/types.js';
 import { MessageResolutionError } from '../errors.js';
 import type { Context } from '../format-context.js';
 import { fallback } from '../functions/fallback.js';
-import { MessageValue } from '../functions/index.js';
 import { unknown } from '../functions/unknown.js';
+import { MessageValue } from '../message-value.js';
 import { MessageFunctionContext } from './function-context.js';
 import { resolveExpression } from './resolve-expression.js';
-import type { Expression, VariableRef } from '../data-model/types.js';
 
 /**
  * Declarations aren't resolved until they're requierd,

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import type { MessageValue } from './functions/index.js';`
	`1`	`+import type { MessageValue } from './message-value.js';`
`2`	`2`	`import type { MessageFunctions } from './messageformat.js';`
`3`	`3`
`4`	`4`	`export interface Context {`