feat(mf2): Prefix custom functions: fluent:message, mf1:date, mf1:number, ...

Author: XM5jDcsHTyGJtQqlCi

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

@@ -160,13 +160,13 @@ function asExpression(exp: Fluent.Expression): Expression {
       return {
         type: 'expression',
         arg: { type: 'literal', value: msgId },
-        functionRef: { type: 'function', name: 'message' }
+        functionRef: { type: 'function', name: 'fluent:message' }
       };
     }
     case 'TermReference': {
       const annotation: FunctionRef = {
         type: 'function',
-        name: 'message'
+        name: 'fluent:message'
       };
       const msgId = exp.attribute
         ? `-${exp.id.name}.${exp.attribute.name}`

packages/mf2-fluent/src/fluent.test.ts

@@ -847,12 +847,12 @@ describe('messagetoFluent', () => {
         {
           type: 'expression',
           arg: { type: 'literal', value: 'msg' },
-          functionRef: { type: 'function', name: 'message' }
+          functionRef: { type: 'function', name: 'fluent:message' }
         },
         {
           type: 'expression',
           arg: { type: 'variable', name: 'local' },
-          functionRef: { type: 'function', name: 'message' }
+          functionRef: { type: 'function', name: 'fluent:message' }
         }
       ]
     };
@@ -889,7 +889,7 @@ describe('messagetoFluent', () => {
         {
           type: 'expression',
           arg: { type: 'variable', name: 'input' },
-          functionRef: { type: 'function', name: 'message' }
+          functionRef: { type: 'function', name: 'fluent:message' }
         }
       ]
     };

packages/mf2-fluent/src/functions.ts

@@ -48,5 +48,5 @@ export function getFluentFunctions(res: FluentMessageResource) {
   }
   Object.freeze(message);
 
-  return { message };
+  return { 'fluent:message': message };
 }

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

@@ -34,7 +34,7 @@ export type FunctionMap = Record<string, string | symbol | null>;
  */
 export const defaultFunctionMap: FunctionMap = {
   datetime: 'DATETIME',
-  message: FluentMessageRef,
+  'fluent:message': FluentMessageRef,
   number: 'NUMBER',
   plural: 'NUMBER',
   string: null

packages/mf2-icu-mf1/src/functions.ts

@@ -180,4 +180,9 @@ function number(
  *
  * @beta
  */
-export const getMF1Functions = () => ({ date, duration, number, time });
+export const getMF1Functions = () => ({
+  'mf1:date': date,
+  'mf1:duration': duration,
+  'mf1:number': number,
+  'mf1:time': time
+});

packages/mf2-icu-mf1/src/mf1-to-message-data.ts

@@ -67,7 +67,7 @@ function tokenToPart(
     case 'function': {
       const functionRef: FunctionRef = {
         type: 'function',
-        name: token.key
+        name: `mf1:${token.key}`
       };
       if (token.param && token.param.length > 0) {
         let value = '';
@@ -113,7 +113,7 @@ function argToInputDeclaration({
       options.set('type', { type: 'literal', value: 'ordinal' });
     }
 
-    functionRef = { type: 'function', name: 'number' };
+    functionRef = { type: 'function', name: 'mf1:number' };
     if (options.size) functionRef.options = options;
   }
   return {

packages/mf2-messageformat/src/mf2-features.test.ts

@@ -1,5 +1,6 @@
 import { fluentToResource } from '@messageformat/fluent';
 import {
+  getMF1Functions,
   mf1ToMessage,
   mf1ToMessageData
 } from '@messageformat/icu-messageformat-1';
@@ -134,7 +135,7 @@ describe('Multi-selector messages (unicode-org/message-format-wg#119)', () => {
     expect(msg.selectors).toHaveLength(6);
     expect(msg.variants).toHaveLength(64);
 
-    const mf = new MessageFormat('en', msg);
+    const mf = new MessageFormat('en', msg, { functions: getMF1Functions() });
 
     const one = mf.format({
       N: 1,