fix(mf2): Fix attributes on reserved & private annotation expressions

eemeli · eemeli · commit 2ecf17483925 · 2024-02-10T23:49:48.000+02:00
diff --git a/packages/mf2-messageformat/src/__fixtures/syntax-errors.json b/packages/mf2-messageformat/src/__fixtures/syntax-errors.json
@@ -17,6 +17,10 @@
   "missing space {|foo|:func}",
   "missing space {|foo|@bar}",
   "missing space {:func@bar}",
+  "missing space {:func @bar@baz}",
+  "missing space {:func @bar=42@baz}",
+  "missing space {+reserved@bar}",
+  "missing space {&private@bar}",
   "bad {:} placeholder",
   "bad {\\u0000placeholder}",
   "no-equal {|42| :number minimumFractionDigits 2}",
diff --git a/packages/mf2-messageformat/src/__fixtures/test-core.json b/packages/mf2-messageformat/src/__fixtures/test-core.json
@@ -114,6 +114,19 @@
       }
     ]
   },
+  {
+    "src": "{#tag foo=bar/}",
+    "cleanSrc": "{#tag foo=bar /}",
+    "exp": "",
+    "parts": [
+      {
+        "type": "markup",
+        "kind": "standalone",
+        "name": "tag",
+        "options": { "foo": "bar" }
+      }
+    ]
+  },
   {
     "src": "{#tag a:foo=|foo| b:bar=$bar}",
     "params": { "bar": "b a r" },
@@ -136,5 +149,32 @@
     "src": "{42 @foo=$bar}",
     "exp": "42",
     "parts": [{ "type": "string", "value": "42" }]
+  },
+  {
+    "src": "foo {+reserved}",
+    "exp": "foo {+}",
+    "parts": [
+      { "type": "literal", "value": "foo " },
+      { "type": "fallback", "source": "+" }
+    ],
+    "errors": [{ "type": "unsupported-annotation" }]
+  },
+  {
+    "src": "foo {&private}",
+    "exp": "foo {&}",
+    "parts": [
+      { "type": "literal", "value": "foo " },
+      { "type": "fallback", "source": "&" }
+    ],
+    "errors": [{ "type": "unsupported-annotation" }]
+  },
+  {
+    "src": "foo {?reserved @a @b=$c}",
+    "exp": "foo {?}",
+    "parts": [
+      { "type": "literal", "value": "foo " },
+      { "type": "fallback", "source": "?" }
+    ],
+    "errors": [{ "type": "unsupported-annotation" }]
   }
 ]
diff --git a/packages/mf2-messageformat/src/cst/expression.ts b/packages/mf2-messageformat/src/cst/expression.ts
@@ -259,6 +259,7 @@ export function parseReservedBody(
       case '|':
         pos = parseQuotedLiteral(ctx, pos).end;
         break;
+      case '@':
       case '}':
         break loop;
       default: {
diff --git a/packages/mf2-messageformat/src/cst/types.ts b/packages/mf2-messageformat/src/cst/types.ts
@@ -151,7 +151,7 @@ export interface FunctionRef {
 /** @beta */
 export interface ReservedAnnotation {
   type: 'reserved-annotation';
-  open: Syntax<'!' | '#' | '%' | '^' | '&' | '*' | '<' | '>' | '?' | '~'>;
+  open: Syntax<'!' | '%' | '^' | '&' | '*' | '+' | '<' | '>' | '?' | '~'>;
   source: Syntax<string>;
   start: number;
   end: number;
diff --git a/packages/mf2-messageformat/src/data-model/types.ts b/packages/mf2-messageformat/src/data-model/types.ts
@@ -222,7 +222,7 @@ export interface FunctionAnnotation {
  */
 export interface UnsupportedAnnotation {
   type: 'unsupported-annotation';
-  sigil: '!' | '#' | '%' | '^' | '&' | '*' | '<' | '>' | '?' | '~' | '�';
+  sigil: '!' | '%' | '^' | '&' | '*' | '+' | '<' | '>' | '?' | '~' | '�';
   source: string;
   name?: never;
   options?: never;
diff --git a/packages/mf2-xliff/src/xliff-spec.ts b/packages/mf2-xliff/src/xliff-spec.ts
@@ -1234,7 +1234,7 @@ export interface MessageOption extends Element {
 export interface MessageUnsupported extends Element {
   name: 'mf:unsupported';
   attributes: {
-    sigil: '!' | '#' | '%' | '^' | '&' | '*' | '<' | '>' | '?' | '~' | '�';
+    sigil: '!' | '%' | '^' | '&' | '*' | '+' | '<' | '>' | '?' | '~' | '�';
   };
   elements: (Text | CharCode)[];
 }

Original file line number	Diff line number	Diff line change
`@@ -1234,7 +1234,7 @@ export interface MessageOption extends Element {`
`1234`	`1234`	`export interface MessageUnsupported extends Element {`
`1235`	`1235`	`name: 'mf:unsupported';`
`1236`	`1236`	`attributes: {`
`1237`		`- sigil: '!' \| '#' \| '%' \| '^' \| '&' \| '*' \| '<' \| '>' \| '?' \| '~' \| '�';`
	`1237`	`+ sigil: '!' \| '%' \| '^' \| '&' \| '*' \| '+' \| '<' \| '>' \| '?' \| '~' \| '�';`
`1238`	`1238`	`};`
`1239`	`1239`	`elements: (Text \| CharCode)[];`
`1240`	`1240`	`}`