feat(mf2)!: Follow new datetime function spec (unicode-org/message-format-wg#1078, unicode-org/message-format-wg#1083)

Author: eemeli

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

@@ -30,13 +30,22 @@ function currency(
   return DraftFunctions.currency(ctx, options, operand);
 }
 
-function datetime(
+function date(
   ctx: MessageFunctionContext,
   options: Record<string, unknown>,
   operand?: unknown
 ): MessageDateTime {
   checkArgStyle(ctx, options);
-  return DraftFunctions.datetime(ctx, options, operand);
+  return DraftFunctions.date(ctx, options, operand);
+}
+
+function time(
+  ctx: MessageFunctionContext,
+  options: Record<string, unknown>,
+  operand?: unknown
+): MessageDateTime {
+  checkArgStyle(ctx, options);
+  return DraftFunctions.time(ctx, options, operand);
 }
 
 function duration(
@@ -149,10 +158,16 @@ export let MF1Functions = {
   'mf1:currency': currency,
 
   /**
-   * A wrapper around {@link DraftFunctions.datetime},
-   * used for formatting `date` and `time` placeholders.
+   * A wrapper around {@link DraftFunctions.date},
+   * used for formatting `date` placeholders.
+   */
+  'mf1:date': date,
+
+  /**
+   * A wrapper around {@link DraftFunctions.time},
+   * used for formatting `time` placeholders.
    */
-  'mf1:datetime': datetime,
+  'mf1:time': time,
 
   /**
    * Formats a duration expressed as seconds.

mf2/icu-messageformat-1/src/mf1-to-message-data.ts

@@ -1,7 +1,3 @@
-import {
-  getDateTimeFormatOptions,
-  parseDateTokens
-} from '@messageformat/date-skeleton';
 import {
   getNumberFormatOptions,
   parseNumberPattern,
@@ -54,27 +50,6 @@ function findSelectArgs(tokens: AST.Token[]): SelectArg[] {
   return args;
 }
 
-function parseDateTimeArgStyle(argStyle: string): MF.Options {
-  const options: MF.Options = new Map();
-  const onError = () =>
-    options.set('mf1:argStyle', { type: 'literal', value: argStyle });
-  const tokens = parseDateTokens(argStyle.substring(2));
-  const dtfOpt = getDateTimeFormatOptions(tokens, onError);
-  loop: for (let [key, value] of Object.entries(dtfOpt)) {
-    switch (key) {
-      case 'dayPeriod':
-        onError();
-        continue loop;
-      case 'hourCycle':
-        key = 'hour12';
-        value = String(value === 'h11' || value === 'h12');
-        break;
-    }
-    options.set(key, { type: 'literal', value });
-  }
-  return options;
-}
-
 function parseNumberArgStyle(argStyle: string): MF.FunctionRef {
   let name = 'number';
   const options: MF.Options = new Map();
@@ -155,36 +130,27 @@ function tokenToFunctionRef(token: AST.FunctionArg): {
 
   switch (token.key) {
     case 'date': {
-      let options: MF.Options;
-      if (argStyle.startsWith('::')) {
-        options = parseDateTimeArgStyle(argStyle);
-      } else {
-        const month: MF.Literal = { type: 'literal', value: 'short' };
-        options = new Map([
-          ['year', { type: 'literal', value: 'numeric' }],
-          ['month', month],
-          ['day', { type: 'literal', value: 'numeric' }]
-        ]);
-        switch (argStyle) {
-          case 'full':
-            month.value = 'long';
-            options.set('weekday', { type: 'literal', value: 'long' });
-            break;
-          case 'long':
-            month.value = 'long';
-            break;
-          case 'short':
-            month.value = 'numeric';
-            break;
-          case '':
-          case 'medium':
-            break;
-          default:
-            options.set('mf1:argStyle', { type: 'literal', value: argStyle });
-        }
+      const options: MF.Options = new Map();
+      switch (argStyle) {
+        case '':
+          break;
+        case 'full':
+          options.set('fields', {
+            type: 'literal',
+            value: 'year-month-day-weekday'
+          });
+          options.set('length', { type: 'literal', value: 'long' });
+          break;
+        case 'long':
+        case 'medium':
+        case 'short':
+          options.set('length', { type: 'literal', value: argStyle });
+          break;
+        default:
+          options.set('mf1:argStyle', { type: 'literal', value: argStyle });
       }
       return {
-        functionRef: { type: 'function', name: 'mf1:datetime', options },
+        functionRef: { type: 'function', name: 'mf1:date', options },
         attributes
       };
     }
@@ -223,32 +189,28 @@ function tokenToFunctionRef(token: AST.FunctionArg): {
       }
 
     case 'time': {
-      let options: MF.Options;
-      if (argStyle.startsWith('::')) {
-        options = parseDateTimeArgStyle(argStyle);
-      } else {
-        options = new Map([
-          ['hour', { type: 'literal', value: 'numeric' }],
-          ['minute', { type: 'literal', value: 'numeric' }]
-        ]);
-        switch (argStyle) {
-          case 'full':
-          case 'long':
-            options.set('second', { type: 'literal', value: 'numeric' });
-            options.set('timeZoneName', { type: 'literal', value: 'short' });
-            break;
-          case 'short':
-            break;
-          case '':
-          case 'medium':
-            options.set('second', { type: 'literal', value: 'numeric' });
-            break;
-          default:
-            options.set('mf1:argStyle', { type: 'literal', value: argStyle });
-        }
+      const options: MF.Options = new Map();
+      switch (argStyle) {
+        case 'full':
+          options.set('precision', { type: 'literal', value: 'second' });
+          options.set('timeZoneName', { type: 'literal', value: 'long' });
+          break;
+        case 'long':
+          options.set('precision', { type: 'literal', value: 'second' });
+          options.set('timeZoneName', { type: 'literal', value: 'short' });
+          break;
+        case '':
+        case 'medium':
+          options.set('precision', { type: 'literal', value: 'second' });
+          break;
+        case 'short':
+          options.set('precision', { type: 'literal', value: 'minute' });
+          break;
+        default:
+          options.set('mf1:argStyle', { type: 'literal', value: argStyle });
       }
       return {
-        functionRef: { type: 'function', name: 'mf1:datetime', options },
+        functionRef: { type: 'function', name: 'mf1:time', options },
         attributes
       };
     }

mf2/icu-messageformat-1/src/mf1.test.ts

@@ -384,22 +384,6 @@ export const testCases: Record<string, TestCase[]> = {
     }
   ],
 
-  'Datetime skeletons': [
-    {
-      src: 'At {1,time,::jmm} on {1,date,::dMMMM}',
-      exp: [[{ 1: 978484385000 }, /^At \d\d?:\d\d\s(AM|PM) on January \d$/]]
-    },
-    {
-      src: "{1, date, ::EEE, MMM d, ''yy}",
-      exp: [
-        [
-          { 1: 978484385000 },
-          { res: 'Wed, Jan 3, 2001', errors: ['bad-option'] }
-        ]
-      ]
-    }
-  ],
-
   'Unsupported formatters': [
     {
       src: '{N, spellout}',