fix #38, use code from esprima-net

package.json

@@ -17,7 +17,7 @@
     "esparse": "./bin/esparse.js",
     "esvalidate": "./bin/esvalidate.js"
   },
-  "version": "6.0.1",
+  "version": "6.0.2",
   "files": [
     "bin",
     "dist/esprima.js",

src/esprima.ts

@@ -130,7 +130,7 @@ export { Syntax } from './syntax';
 export { Visitor } from './visitor'
 
 // Sync with *.json manifests.
-export const version = '6.0.1';
+export const version = '6.0.2';
 
 export default {
     parse, parseModule, parseScript, tokenize, Syntax, version

src/parser.ts

@@ -1342,21 +1342,27 @@ export class Parser {
         this.expectKeyword('import');
         this.expect("(");
 
+        var previousIsAssignmentTarget = this.context.isAssignmentTarget;
+        this.context.isAssignmentTarget = true;
+
         const source = this.parseAssignmentExpression();
 
         let attributes: Node.Expression | null = null;
         if (this.match(",")) {
             this.nextToken();
-            attributes = this.parseObjectInitializer();
+            if (!this.match(")"))
+                attributes = this.parseAssignmentExpression();
         }
 
-        if (!this.match(")") && this.config.tolerant) {
-            this.tolerateUnexpectedToken(this.nextToken());
-        } else {
-            this.expect(")");
-            if (this.match(";")) {
+        this.context.isAssignmentTarget = previousIsAssignmentTarget;
+
+        if (!this.match(")")) {
+            if (this.match(",")) {
                 this.nextToken();
             }
+            this.expect(")");
+        } else {
+            this.nextToken();
         }
         return this.finalize(node, new Node.ImportExpression(source, attributes));
     }

test/esprima-next.issue.test.ts

@@ -215,4 +215,12 @@ test('esprima-next - #36 - fixes after changes', () => {
     `;
     let ast = parseModule(code);
     expect(ast).not.toBeNull();
-});
+});
+
+test('esprima-next - #38 - Error with await import and the following statement on the same line', () => {
+    let code = `async function load (i) {
+        let c = await import(i,);  console.log(c);
+      }`;
+    let ast = parseModule(code, { loc: true, range:true, tokens:true });
+    expect(ast).not.toBeNull();
+});