Bugfix import Expression, needs a Parameter for filename

sebastienros · Apr 12, 2021 · 272dd32 · 272dd32
1 parent 3d910f3
commit 272dd32
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 3 deletions.
diff --git a/src/Esprima/Ast/Import.cs b/src/Esprima/Ast/Import.cs
@@ -2,10 +2,13 @@
 {
     public sealed class Import : Expression
     {
-        public Import() : base(Nodes.Import)
+        public readonly Expression Source;
+
+        public Import(Expression source) : base(Nodes.Import)
         {
+            Source = source;
         }
 
-        public override NodeCollection ChildNodes => NodeCollection.Empty;
+        public override NodeCollection ChildNodes => new NodeCollection(Source);
     }
 }
diff --git a/src/Esprima/JavascriptParser.cs b/src/Esprima/JavascriptParser.cs
@@ -1459,7 +1459,22 @@ private Import ParseImportCall()
         {
             var node = CreateNode();
             ExpectKeyword("import");
-            return this.Finalize(node, new Import());
+            Expect("(");
+            var source = ParseExpression();
+
+            if (!Match(")") && _config.Tolerant)
+            {
+                TolerateUnexpectedToken(NextToken());
+            }
+            else
+            {
+                Expect(")");
+                if (Match(";"))
+                {
+                    NextToken();
+                }
+            }
+            return this.Finalize(node, new Import(source));
         }
 
         private Expression ParseLeftHandSideExpressionAllowCall()