feat(mf2): Drop :plural and :ordinal functions (unicode-org/message-format-wg#621)

eemeli · eemeli · commit 474662009a76 · 2024-02-17T14:27:51.000+02:00
diff --git a/packages/mf2-messageformat/src/__fixtures/test-functions.json b/packages/mf2-messageformat/src/__fixtures/test-functions.json
@@ -194,44 +194,26 @@
     {
       "src": ".match {$foo :ordinal} one {{st}} two {{nd}} few {{rd}} * {{th}}",
       "params": { "foo": 1 },
-      "exp": "st"
-    },
-    {
-      "src": ".match {$foo :ordinal} one {{st}} two {{nd}} few {{rd}} * {{th}}",
-      "params": { "foo": 2 },
-      "exp": "nd"
-    },
-    {
-      "src": ".match {$foo :ordinal} one {{st}} two {{nd}} few {{rd}} * {{th}}",
-      "params": { "foo": 3 },
-      "exp": "rd"
-    },
-    {
-      "src": ".match {$foo :ordinal} one {{st}} two {{nd}} few {{rd}} * {{th}}",
-      "params": { "foo": 4 },
-      "exp": "th"
+      "exp": "th",
+      "errors": [{ "type": "missing-func" }, { "type": "not-selectable" }]
     },
     {
       "src": "hello {42 :ordinal}",
       "exp": "hello {|42|}",
-      "errors": [{ "type": "not-formattable" }]
+      "errors": [{ "type": "missing-func" }]
     }
   ],
   "plural": [
     {
       "src": ".match {$foo :plural} one {{one}} * {{other}}",
       "params": { "foo": 1 },
-      "exp": "one"
-    },
-    {
-      "src": ".match {$foo :plural} one {{one}} * {{other}}",
-      "params": { "foo": 1.1 },
-      "exp": "other"
+      "exp": "other",
+      "errors": [{ "type": "missing-func" }, { "type": "not-selectable" }]
     },
     {
       "src": "hello {42 :plural}",
       "exp": "hello {|42|}",
-      "errors": [{ "type": "not-formattable" }]
+      "errors": [{ "type": "missing-func" }]
     }
   ],
   "string": [
diff --git a/packages/mf2-messageformat/src/functions/index.ts b/packages/mf2-messageformat/src/functions/index.ts
@@ -3,13 +3,7 @@ import type { MessageExpressionPart } from '../formatted-parts.js';
 export type { MessageFunctionContext } from '../data-model/function-context.js';
 export { type MessageDateTime, datetime } from './datetime.js';
 export { type MessageFallback, fallback } from './fallback.js';
-export {
-  type MessageNumber,
-  integer,
-  number,
-  ordinal,
-  plural
-} from './number.js';
+export { type MessageNumber, integer, number } from './number.js';
 export { type MessageString, string } from './string.js';
 export { type MessageUnknownValue, unknown } from './unknown.js';
 
diff --git a/packages/mf2-messageformat/src/functions/number.ts b/packages/mf2-messageformat/src/functions/number.ts
@@ -182,39 +182,3 @@ export const integer = (
     { ...options, maximumFractionDigits: 0, style: 'decimal' },
     input
   );
-
-/**
- * `ordinal` accepts a number, BigInt or string representing a JSON number as input
- * and acts as a ordinal category selector on the value, using
- * {@link https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl/PluralRules | Intl.PluralRules}.
- *
- * `ordinal` cannot be used as a formatter.
- *
- * @beta
- */
-export const ordinal = (
-  ctx: MessageFunctionContext,
-  options: Record<string, unknown>,
-  input?: unknown
-) =>
-  number(ctx, { ...options, select: 'ordinal', [NotFormattable]: true }, input);
-
-/**
- * `plural` accepts a number, BigInt or string representing a JSON number as input
- * and acts as a cardinal plural selector on the value, using
- * {@link https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl/PluralRules | Intl.PluralRules}.
- *
- * `plural` cannot be used as a formatter.
- *
- * @beta
- */
-export const plural = (
-  ctx: MessageFunctionContext,
-  options: Record<string, unknown>,
-  input?: unknown
-) =>
-  number(
-    ctx,
-    { ...options, select: 'cardinal', [NotFormattable]: true },
-    input
-  );
diff --git a/packages/mf2-messageformat/src/messageformat.ts b/packages/mf2-messageformat/src/messageformat.ts
@@ -18,8 +18,6 @@ import {
   datetime,
   integer,
   number,
-  ordinal,
-  plural,
   string
 } from './functions/index.js';
 import { selectPattern } from './select-pattern.js';
@@ -28,8 +26,6 @@ const defaultFunctions = Object.freeze({
   datetime,
   integer,
   number,
-  ordinal,
-  plural,
   string
 });
 
