Fix parsing of nested class with constructor

Co-authored-by: DimaIT <dima@surfly.com>
meriyah · May 10, 2023 · ae643fd · ae643fd
1 parent 8de5c17
commit ae643fd
Show file tree

Hide file tree

Showing 2 changed files with 126 additions and 1 deletion.
diff --git a/src/parser.ts b/src/parser.ts
@@ -8204,6 +8204,8 @@ export function parseClassBody(
 
   consume(parser, context | Context.AllowRegExp, Token.LeftBrace);
   context = (context | Context.DisallowIn) ^ Context.DisallowIn;
+
+  let hasConstr = parser.flags & Flags.HasConstructor;
   parser.flags = (parser.flags | Flags.HasConstructor) ^ Flags.HasConstructor;
 
   const body: (ESTree.MethodDefinition | ESTree.PropertyDefinition | ESTree.StaticBlock)[] = [];
@@ -8245,6 +8247,7 @@ export function parseClassBody(
     );
   }
   consume(parser, origin & Origin.Declaration ? context | Context.AllowRegExp : context, Token.RightBrace);
+  parser.flags = (parser.flags & ~Flags.HasConstructor) | hasConstr;
 
   return finishNode(parser, context, tokenPos, linePos, colPos, {
     type: 'ClassBody',

diff --git a/test/parser/expressions/class.ts b/test/parser/expressions/class.ts
@@ -799,7 +799,9 @@ describe('Expressions - Class', () => {
     ['(class A { static prototype() {} })', Context.None],
     ['(class A { static *get [x](){} })', Context.None],
     ['(class A { static *set [x](y){}})', Context.None],
-    ['async function f(foo = class y extends (await f) {}){}', Context.None]
+    ['async function f(foo = class y extends (await f) {}){}', Context.None],
+    ['new class { constructor() {} start() { new class { constructor() {}}} constructor() {}}', Context.None]
+    ['new class { constructor() {} start() { new class { } } constructor() {}}', Context.None]
   ]);
 
   for (const arg of [
@@ -12789,6 +12791,126 @@ describe('Expressions - Class', () => {
         sourceType: 'module',
         type: 'Program'
       }
+    ],
+    [
+      `new class {
+        start() {
+          new class {
+            constructor() {}
+          }
+        }
+        constructor() {}
+      }`,
+      Context.None,
+      {
+        body: [
+          {
+            type: "ExpressionStatement",
+            expression: {
+              type: "NewExpression",
+              callee: {
+                type: "ClassExpression",
+                id: null,
+                superClass: null,
+                decorators: [],
+                body: {
+                  type: "ClassBody",
+                  body: [
+                    {
+                      type: "MethodDefinition",
+                      kind: "method",
+                      static: false,
+                      computed: false,
+                      key: {
+                        type: "Identifier",
+                        name: "start"
+                      },
+                      decorators: [],
+                      value: {
+                        type: "FunctionExpression",
+                        params: [],
+                        body: {
+                          type: "BlockStatement",
+                          body: [
+                            {
+                              type: "ExpressionStatement",
+                              expression: {
+                                type: "NewExpression",
+                                callee: {
+                                  type: "ClassExpression",
+                                  id: null,
+                                  superClass: null,
+                                  decorators: [],
+                                  body: {
+                                    type: "ClassBody",
+                                    body: [
+                                      {
+                                        type: "MethodDefinition",
+                                        kind: "constructor",
+                                        static: false,
+                                        computed: false,
+                                        key: {
+                                          type: "Identifier",
+                                          name: "constructor"
+                                        },
+                                        decorators: [],
+                                        value: {
+                                          type: "FunctionExpression",
+                                          params: [],
+                                          body: {
+                                            type: "BlockStatement",
+                                            body: []
+                                          },
+                                          async: false,
+                                          generator: false,
+                                          id: null
+                                        }
+                                      }
+                                    ]
+                                  }
+                                },
+                                arguments: []
+                              }
+                            }
+                          ]
+                        },
+                        async: false,
+                        generator: false,
+                        id: null
+                      }
+                    },
+                    {
+                      type: "MethodDefinition",
+                      kind: "constructor",
+                      static: false,
+                      computed: false,
+                      key: {
+                        type: "Identifier",
+                        name: "constructor"
+                      },
+                      decorators: [],
+                      value: {
+                        type: "FunctionExpression",
+                        params: [],
+                        body: {
+                          type: "BlockStatement",
+                          body: []
+                        },
+                        async: false,
+                        generator: false,
+                        id: null
+                      }
+                    }
+                  ]
+                }
+              },
+              arguments: []
+            }
+          }
+        ],
+        type: "Program",
+        sourceType: "script"
+      }
     ]
   ]);
 });