feat(mf2)!: Remove style=percent from :number and :integer (unicode-org/message-format-wg#988)

Author: XM5jDcsHTyGJtQqlCi

mf2/fluent/src/fluent-to-message.ts

@@ -149,6 +149,24 @@ function asExpression(exp: Fluent.Expression): Expression {
           });
         }
       }
+      if (annotation.name === 'number') {
+        const style = annotation.options?.get('style');
+        if (style?.type === 'literal') {
+          switch (style.value) {
+            case 'decimal':
+              break;
+            case 'currency':
+            case 'unit':
+              annotation.name = style.value;
+              break;
+            default:
+              throw new Error(
+                `Unsupported NUMBER(..., style=${JSON.stringify(style.value)})`
+              );
+          }
+          annotation.options!.delete('style');
+        }
+      }
       return args.length > 0
         ? { type: 'expression', arg: args[0], functionRef: annotation }
         : { type: 'expression', functionRef: annotation };

mf2/fluent/src/fluent.test.ts

@@ -81,8 +81,9 @@ const testCases: Record<string, TestCase> = {
       num-bare = { NUMBER($arg) }
       num-fraction-valid = { NUMBER($arg, minimumFractionDigits: 1) }
       num-fraction-bad = { NUMBER($arg, minimumFractionDigits: "oops") }
-      num-style = { NUMBER($arg, style: "percent") }
       num-currency = { NUMBER($arg, style: "currency", currency: "EUR") }
+      # TODO: num-percent = { NUMBER($arg, style: "percent") }
+      # TODO: num-unit = { NUMBER($arg, style: "unit", unit: "meter") }
       num-unknown = { NUMBER($arg, unknown: "unknown") }
     `,
     tests: [
@@ -94,8 +95,9 @@ const testCases: Record<string, TestCase> = {
         exp: '1,234',
         errors: ['bad-option']
       },
-      { msg: 'num-style', scope: { arg: 1234 }, exp: '123,400%' },
       { msg: 'num-currency', scope: { arg: 1234 }, exp: '€1,234.00' },
+      // TODO: { msg: 'num-percent', scope: { arg: 1234 }, exp: '123,400%' },
+      // TODO: { msg: 'num-unit', scope: { arg: 1234 }, exp: '1,234 m' },
       { msg: 'num-unknown', scope: { arg: 1234 }, exp: '1,234' }
     ]
   },

mf2/fluent/src/message-to-fluent.ts

@@ -200,6 +200,22 @@ function functionRefToFluent(
     return new Fluent.FunctionReference(new Fluent.Identifier(id), args);
   }
 
+  if (
+    (name === 'currency' || name === 'unit') &&
+    typeof ctx.functionMap.number === 'string'
+  ) {
+    args.named.unshift(
+      new Fluent.NamedArgument(
+        new Fluent.Identifier('style'),
+        new Fluent.StringLiteral(name)
+      )
+    );
+    return new Fluent.FunctionReference(
+      new Fluent.Identifier(ctx.functionMap.number),
+      args
+    );
+  }
+
   if (id === FluentMessageRef) {
     const lit = args.positional[0];
     if (!(lit instanceof Fluent.BaseLiteral)) {

mf2/messageformat/src/functions/number.ts

@@ -93,6 +93,7 @@ export function number(
     try {
       switch (name) {
         case 'locale':
+        case 'style': // https://github.com/unicode-org/message-format-wg/pull/988
         case 'type': // used internally by Intl.PluralRules, but called 'select' here
           break;
         case 'minimumIntegerDigits':