fix(parser): fixes #38

meriyah · Aug 26, 2019 · 9834975 · 9834975
1 parent 61c471b
commit 9834975
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 4 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "meriyah",
-  "version": "1.6.14",
+  "version": "1.6.15",
   "description": "A 100% compliant, self-hosted javascript parser with high focus on both performance and stability",
   "main": "dist/meriyah.umd.js",
   "module": "dist/meriyah.esm.js",

diff --git a/src/meriyah.ts b/src/meriyah.ts
@@ -26,4 +26,4 @@ export function parse(source: string, options?: Options): ESTree.Program {
 export { Options, ESTree };
 
 // Current version
-export const version = '1.6.14';
+export const version = '1.6.15';
diff --git a/src/parser.ts b/src/parser.ts
@@ -8395,8 +8395,10 @@ export function parseFieldDefinition(
         linePos,
         colPos
       );
-      if ((parser.token & Token.IsClassField) !== Token.IsClassField) {
-        value = parseAssignmentExpression(parser, context | Context.InClass, 0, 0, tokenPos, linePos, colPos, value);
+
+      value = parseAssignmentExpression(parser, context | Context.InClass, 0, 0, tokenPos, linePos, colPos, value);
+      if (parser.token === Token.Comma) {
+        value = parseSequenceExpression(parser, context, 0, start, line, column, value as any);
       }
     }
   }

diff --git a/test/parser/expressions/class.ts b/test/parser/expressions/class.ts
@@ -540,6 +540,15 @@ describe('Expressions - Class', () => {
     ['class E0 { 0123() {} }', Context.None],
     ['class E1 { 0123.1() {} }', Context.None],
     ['class yield { }', Context.None],
+    ['class x { x = new y<a>() }', Context.OptionsNext],
+    ['class x { x = new y<a,>() }', Context.OptionsNext],
+    ['class x { x = new y<a,b>() }', Context.OptionsNext],
+    ['class x { x = y<a>() }', Context.OptionsNext],
+    ['class x { x = new y<a,>() }', Context.OptionsNext],
+    ['class x { x = new y<a,b>() }', Context.OptionsNext],
+    ['class x { x = new y<a>() }', Context.None],
+    ['class x { x = new y<a,>() }', Context.None],
+    ['class x { x = new y<a,b>() }', Context.None],
     ['class eval { }', Context.None],
     ['class let { }', Context.None],
     ['class impl\\u0065ments {}', Context.None],