refactor(mf2): In mf2/messageformat/src/, move some files from data-model/ to resolve/

Author: XM5jDcsHTyGJtQqlCi

mf2/messageformat/src/functions/index.ts

@@ -1,6 +1,6 @@
 import type { MessageExpressionPart } from '../formatted-parts.js';
 
-export type { MessageFunctionContext } from '../data-model/function-context.js';
+export type { MessageFunctionContext } from '../resolve/function-context.js';
 export { type MessageDateTime, date, datetime, time } from './datetime.js';
 export { type MessageFallback, fallback } from './fallback.js';
 export { type MessageNumber, integer, number } from './number.js';

mf2/messageformat/src/messageformat.ts

@@ -1,8 +1,4 @@
-import { formatMarkup } from './data-model/format-markup.js';
-import type { MessageFunctionContext } from './data-model/function-context.js';
 import { parseMessage } from './data-model/parse.js';
-import { resolveExpression } from './data-model/resolve-expression.js';
-import { UnresolvedExpression } from './data-model/resolve-variable.js';
 import type { Message } from './data-model/types.js';
 import { validate } from './data-model/validate.js';
 import { FSI, LRI, PDI, RLI, getLocaleDir } from './dir-utils.js';
@@ -18,6 +14,10 @@ import {
   string,
   time
 } from './functions/index.js';
+import { formatMarkup } from './resolve/format-markup.js';
+import type { MessageFunctionContext } from './resolve/function-context.js';
+import { resolveExpression } from './resolve/resolve-expression.js';
+import { UnresolvedExpression } from './resolve/resolve-variable.js';
 import { selectPattern } from './select-pattern.js';
 
 const defaultFunctions = Object.freeze({

mf2/messageformat/src/data-model/format-markup.ts renamed to mf2/messageformat/src/resolve/format-markup.ts

@@ -2,7 +2,7 @@ import { MessageResolutionError } from '../errors.js';
 import type { Context } from '../format-context.js';
 import type { MessageMarkupPart } from '../formatted-parts.js';
 import { getValueSource, resolveValue } from './resolve-value.js';
-import type { Markup } from './types.js';
+import type { Markup } from '../data-model/types.js';
 
 export function formatMarkup(
   ctx: Context,

mf2/messageformat/src/data-model/function-context.ts renamed to mf2/messageformat/src/resolve/function-context.ts

@@ -1,7 +1,7 @@
 import { MessageResolutionError } from '../errors.js';
 import type { Context } from '../format-context.js';
 import { getValueSource, resolveValue } from './resolve-value.js';
-import { Options } from './types.js';
+import { Options } from '../data-model/types.js';
 
 export class MessageFunctionContext {
   #ctx: Context;

mf2/messageformat/src/data-model/function-ref.test.ts renamed to mf2/messageformat/src/resolve/function-ref.test.ts

@@ -3,7 +3,7 @@ import type { MessageValue } from '../functions/index.js';
 import { resolveFunctionRef } from './resolve-function-ref.js';
 import { resolveLiteral } from './resolve-literal.js';
 import { resolveVariableRef } from './resolve-variable.js';
-import type { Expression } from './types.js';
+import type { Expression } from '../data-model/types.js';
 
 export function resolveExpression(
   ctx: Context,

mf2/messageformat/src/data-model/literal.test.ts renamed to mf2/messageformat/src/resolve/literal.test.ts

@@ -3,7 +3,12 @@ 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 './types.js';
+import type {
+  FunctionRef,
+  Literal,
+  Options,
+  VariableRef
+} from '../data-model/types.js';
 
 export function resolveFunctionRef(
   ctx: Context,

mf2/messageformat/src/data-model/markup.test.ts renamed to mf2/messageformat/src/resolve/markup.test.ts

@@ -1,6 +1,6 @@
 import type { Context } from '../format-context.js';
 import { MessageFunctionContext } from './function-context.js';
-import type { Literal } from './types.js';
+import type { Literal } from '../data-model/types.js';
 
 export function resolveLiteral(ctx: Context, lit: Literal) {
   const msgCtx = new MessageFunctionContext(ctx, `|${lit.value}|`);