fix(mf2): Unsupported statement parsing

eemeli · eemeli · commit 86f40462c77d · 2024-02-10T23:49:48.000+02:00
diff --git a/packages/mf2-messageformat/src/__fixtures/test-core.json b/packages/mf2-messageformat/src/__fixtures/test-core.json
@@ -176,5 +176,25 @@
       { "type": "fallback", "source": "?" }
     ],
     "errors": [{ "type": "unsupported-annotation" }]
+  },
+  {
+    "src": ".foo {42} {{bar}}",
+    "exp": "bar",
+    "parts": [{ "type": "literal", "value": "bar" }],
+    "errors": [{ "type": "unsupported-statement" }]
+  },
+  {
+    "src": ".foo{42}{{bar}}",
+    "cleanSrc": ".foo {42} {{bar}}",
+    "exp": "bar",
+    "parts": [{ "type": "literal", "value": "bar" }],
+    "errors": [{ "type": "unsupported-statement" }]
+  },
+  {
+    "src": ".foo |}lit{| {42}{{bar}}",
+    "cleanSrc": ".foo |}lit{| {42} {{bar}}",
+    "exp": "bar",
+    "parts": [{ "type": "literal", "value": "bar" }],
+    "errors": [{ "type": "unsupported-statement" }]
   }
 ]
diff --git a/packages/mf2-messageformat/src/cst/declarations.ts b/packages/mf2-messageformat/src/cst/declarations.ts
@@ -121,7 +121,9 @@ function parseReservedStatement(
 
   const values: CST.Expression[] = [];
   while (ctx.source[pos] === '{') {
+    if (ctx.source.startsWith('{{', pos)) break;
     const value = parseExpression(ctx, pos);
+    values.push(value)
     end = value.end;
     pos = end + whitespaces(ctx.source, end);
   }
diff --git a/packages/mf2-messageformat/src/cst/expression.ts b/packages/mf2-messageformat/src/cst/expression.ts
@@ -260,6 +260,7 @@ export function parseReservedBody(
         pos = parseQuotedLiteral(ctx, pos).end;
         break;
       case '@':
+      case '{':
       case '}':
         break loop;
       default: {
@@ -273,7 +274,7 @@ export function parseReservedBody(
     }
   }
   let prev = ctx.source[pos - 1];
-  while (whitespaceChars.includes(prev)) {
+  while (pos > start && whitespaceChars.includes(prev)) {
     pos -= 1;
     prev = ctx.source[pos - 1];
   }
diff --git a/packages/mf2-messageformat/src/cst/stringify-cst.ts b/packages/mf2-messageformat/src/cst/stringify-cst.ts
@@ -27,7 +27,7 @@ export function stringifyCST(cst: CST.Message): string {
         }
         case 'reserved-statement': {
           str += kw;
-          if (decl.body) str += ' ' + decl.body;
+          if (decl.body.value) str += ' ' + decl.body.value;
           for (const exp of decl.values) str += ' ' + stringifyExpression(exp);
           str += '\n';
           break;

Original file line number	Diff line number	Diff line change
`@@ -121,7 +121,9 @@ function parseReservedStatement(`
`121`	`121`
`122`	`122`	`const values: CST.Expression[] = [];`
`123`	`123`	`while (ctx.source[pos] === '{') {`
	`124`	`+ if (ctx.source.startsWith('{{', pos)) break;`
`124`	`125`	`const value = parseExpression(ctx, pos);`
	`126`	`+ values.push(value)`
`125`	`127`	`end = value.end;`
`126`	`128`	`pos = end + whitespaces(ctx.source, end);`
`127`	`129`	`}`
Original file line number	Diff line number	Diff line change
`@@ -260,6 +260,7 @@ export function parseReservedBody(`
`260`	`260`	`pos = parseQuotedLiteral(ctx, pos).end;`
`261`	`261`	`break;`
`262`	`262`	`case '@':`
	`263`	`+ case '{':`
`263`	`264`	`case '}':`
`264`	`265`	`break loop;`
`265`	`266`	`default: {`
`@@ -273,7 +274,7 @@ export function parseReservedBody(`
`273`	`274`	`}`
`274`	`275`	`}`
`275`	`276`	`let prev = ctx.source[pos - 1];`
`276`		`- while (whitespaceChars.includes(prev)) {`
	`277`	`+ while (pos > start && whitespaceChars.includes(prev)) {`
`277`	`278`	`pos -= 1;`
`278`	`279`	`prev = ctx.source[pos - 1];`
`279`	`280`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ export function stringifyCST(cst: CST.Message): string {`
`27`	`27`	`}`
`28`	`28`	`case 'reserved-statement': {`
`29`	`29`	`str += kw;`
`30`		`- if (decl.body) str += ' ' + decl.body;`
	`30`	`+ if (decl.body.value) str += ' ' + decl.body.value;`
`31`	`31`	`for (const exp of decl.values) str += ' ' + stringifyExpression(exp);`
`32`	`32`	`str += '\n';`
`33`	`33`	`break;`