fix(mf2): Use correct error codes

Author: XM5jDcsHTyGJtQqlCi

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

@@ -272,15 +272,15 @@ const testCases: Record<string, TestCase> = {
         msg: 'plural',
         scope: {},
         exp: 'B',
-        errors: ['$selector', 'bad-operand', 'not-selectable']
+        errors: ['$selector', 'bad-operand', 'bad-selector']
       },
       { msg: 'plural', scope: { selector: 1 }, exp: 'A' },
       { msg: 'plural', scope: { selector: 2 }, exp: 'B' },
       {
         msg: 'plural',
         scope: { selector: 'one' },
         exp: 'B',
-        errors: ['bad-operand', 'not-selectable']
+        errors: ['bad-operand', 'bad-selector']
       },
       {
         msg: 'default',
@@ -667,7 +667,7 @@ describe('formatToParts', () => {
       expect(msg).toEqual([{ type: 'literal', value: 'Other' }]);
       expect(onError.mock.calls.map(args => args[0].type)).toEqual([
         'bad-operand',
-        'not-selectable'
+        'bad-selector'
       ]);
     });
   });

packages/mf2-messageformat/src/cst/parse-cst.ts

@@ -95,7 +95,7 @@ function parseSelectMessage(
     const sel = parseExpression(ctx, pos);
     const body = sel.markup ?? sel.annotation;
     if (body && body.type !== 'function') {
-      ctx.onError('bad-selector', body.start, body.end);
+      ctx.onError('parse-error', body.start, body.end);
     }
     selectors.push(sel);
     pos = sel.end;

packages/mf2-messageformat/src/data-model/resolve-function-annotation.ts

@@ -28,7 +28,7 @@ export function resolveFunctionAnnotation(
 
     const rf = ctx.functions[name];
     if (!rf) {
-      throw new MessageError('missing-func', `Unknown function :${name}`);
+      throw new MessageError('unknown-function', `Unknown function :${name}`);
     }
     const msgCtx = new MessageFunctionContext(ctx, source);
     const opt = resolveOptions(ctx, options);

packages/mf2-messageformat/src/errors.ts

@@ -8,8 +8,8 @@ import { cst } from './data-model/from-cst.js';
  */
 export class MessageError extends Error {
   type:
-    | 'missing-func'
     | 'not-formattable'
+    | 'unknown-function'
     | typeof MessageResolutionError.prototype.type
     | typeof MessageSelectionError.prototype.type
     | typeof MessageSyntaxError.prototype.type;
@@ -30,7 +30,6 @@ export class MessageSyntaxError extends MessageError {
     | 'empty-token'
     | 'bad-escape'
     | 'bad-input-expression'
-    | 'bad-selector'
     | 'duplicate-declaration'
     | 'duplicate-option'
     | 'extra-content'
@@ -107,7 +106,7 @@ export class MessageResolutionError extends MessageError {
  * @beta
  */
 export class MessageSelectionError extends MessageError {
-  declare type: 'no-match' | 'not-selectable';
+  declare type: 'bad-selector' | 'no-match';
   constructor(type: typeof MessageSelectionError.prototype.type) {
     super(type, `Selection error: ${type}`);
   }

packages/mf2-messageformat/src/select-pattern.ts

@@ -15,7 +15,7 @@ export function selectPattern(context: Context, message: Message): Pattern {
         if (typeof selector.selectKey === 'function') {
           selectKey = selector.selectKey.bind(selector);
         } else {
-          context.onError(new MessageSelectionError('not-selectable'));
+          context.onError(new MessageSelectionError('bad-selector'));
           selectKey = () => null;
         }
         return {
@@ -70,7 +70,7 @@ export function selectPattern(context: Context, message: Message): Pattern {
     }
 
     default:
-      context.onError(new MessageSelectionError('not-selectable'));
+      context.onError(new MessageSelectionError('bad-selector'));
       return [];
   }
 }