fix(parser): fixed import call implementation

meriyah · May 28, 2019 · cb09a9c · cb09a9c
1 parent 66fe1b0
commit cb09a9c
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 9 deletions.
diff --git a/src/errors.ts b/src/errors.ts
@@ -156,7 +156,8 @@ export const enum Errors {
   InvalidNestedStatement,
   UnknownLabel,
   InvalidImportTail,
-  ImportNotOneArg
+  ImportNotOneArg,
+  InvalidImportNew
 }
 
 /*@internal*/
@@ -326,7 +327,8 @@ export const errorMessages: {
   [Errors.InvalidNestedStatement]: 'continue statement must be nested within an iteration statement',
   [Errors.UnknownLabel]: "Undefined label '%0'",
   [Errors.InvalidImportTail]: 'Trailing comma is disallowed inside import(...) arguments',
-  [Errors.ImportNotOneArg]: 'import() requires exactly one argument'
+  [Errors.ImportNotOneArg]: 'import() requires exactly one argument',
+  [Errors.InvalidImportNew]: 'Cannot use new with import(...)'
 };
 
 export class ParseError extends SyntaxError {

diff --git a/src/parser.ts b/src/parser.ts
@@ -2810,16 +2810,18 @@ function parseImportCallExpression(
 
   nextToken(parser, context);
 
-  if (parser.token === Token.Period || parser.token === Token.RightBracket)
+  if (parser.token !== Token.LeftParen)
     report(parser, Errors.UnexpectedToken, KeywordDescTable[parser.token & Token.Type]);
 
-  if (inNewExpression) report(parser, Errors.UnexpectedToken, KeywordDescTable[parser.token & Token.Type]);
+  if (inNewExpression) report(parser, Errors.InvalidImportNew);
 
-  let expr: ESTree.ImportExpression = { type: 'Import' };
-
-  parser.assignable = AssignmentKind.CannotAssign;
-
-  expr = parseMemberOrUpdateExpression(parser, context, expr as any, inNewExpression, /* isDynamicImport */ 1);
+  const expr = parseMemberOrUpdateExpression(
+    parser,
+    context,
+    { type: 'Import' } as any,
+    inNewExpression,
+    /* isDynamicImport */ 1
+  );
 
   parser.assignable = AssignmentKind.CannotAssign;