feat(rslint_parser): Parse 2nd param for JsImportCallExpression (#1923)

crates/rome_formatter/src/ts/import/mod.rs

@@ -5,9 +5,7 @@ impl ToFormatElement for JsImportCallExpression {
 	fn to_format_element(&self, formatter: &Formatter) -> FormatResult<FormatElement> {
 		Ok(format_elements![
 			formatter.format_token(&self.import_token()?)?,
-			formatter.format_token(&self.l_paren_token()?)?,
-			formatter.format_node(self.argument()?)?,
-			formatter.format_token(&self.r_paren_token()?)?,
+			formatter.format_node(self.arguments()?)?,
 		])
 	}
 }

crates/rome_formatter/tests/specs/js/import/import_call.js

@@ -1,3 +1,3 @@
 import(x)
 import('x')
-import(aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa)
+import(aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa, {assert: {type:'json'}})

crates/rome_formatter/tests/specs/js/import/import_call.js.snap

@@ -6,11 +6,13 @@ expression: import_call.js
 # Input
 import(x)
 import('x')
-import(aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa)
+import(aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa, {assert: {type:'json'}})
 
 ---
 # Output
 import(x);
 import("x");
-import(aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa);
+import(aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa, {
+	assert: { type: "json" },
+});
 

crates/rslint_parser/src/ast/generated/nodes.rs

@@ -1143,14 +1143,8 @@ impl JsImportCallExpression {
 	pub fn import_token(&self) -> SyntaxResult<SyntaxToken> {
 		support::required_token(&self.syntax, 0usize)
 	}
-	pub fn l_paren_token(&self) -> SyntaxResult<SyntaxToken> {
-		support::required_token(&self.syntax, 1usize)
-	}
-	pub fn argument(&self) -> SyntaxResult<JsAnyExpression> {
-		support::required_node(&self.syntax, 2usize)
-	}
-	pub fn r_paren_token(&self) -> SyntaxResult<SyntaxToken> {
-		support::required_token(&self.syntax, 3usize)
+	pub fn arguments(&self) -> SyntaxResult<JsCallArguments> {
+		support::required_node(&self.syntax, 1usize)
 	}
 }
 #[derive(Clone, PartialEq, Eq, Hash)]
@@ -5689,15 +5683,7 @@ impl std::fmt::Debug for JsImportCallExpression {
 				"import_token",
 				&support::DebugSyntaxResult(self.import_token()),
 			)
-			.field(
-				"l_paren_token",
-				&support::DebugSyntaxResult(self.l_paren_token()),
-			)
-			.field("argument", &support::DebugSyntaxResult(self.argument()))
-			.field(
-				"r_paren_token",
-				&support::DebugSyntaxResult(self.r_paren_token()),
-			)
+			.field("arguments", &support::DebugSyntaxResult(self.arguments()))
 			.finish()
 	}
 }

crates/rslint_parser/src/ast/generated/syntax_factory.rs

@@ -2905,7 +2905,7 @@ impl SyntaxFactory for JsSyntaxFactory {
 			}
 			JS_IMPORT_CALL_EXPRESSION => {
 				let mut elements = (&children).into_iter();
-				let mut slots: RawNodeSlots<4usize> = RawNodeSlots::default();
+				let mut slots: RawNodeSlots<2usize> = RawNodeSlots::default();
 				let mut current_element = elements.next();
 				if let Some(element) = &current_element {
 					if element.kind() == T![import] {
@@ -2915,21 +2915,7 @@ impl SyntaxFactory for JsSyntaxFactory {
 				}
 				slots.next_slot();
 				if let Some(element) = &current_element {
-					if element.kind() == T!['('] {
-						slots.mark_present();
-						current_element = elements.next();
-					}
-				}
-				slots.next_slot();
-				if let Some(element) = &current_element {
-					if JsAnyExpression::can_cast(element.kind()) {
-						slots.mark_present();
-						current_element = elements.next();
-					}
-				}
-				slots.next_slot();
-				if let Some(element) = &current_element {
-					if element.kind() == T![')'] {
+					if JsCallArguments::can_cast(element.kind()) {
 						slots.mark_present();
 						current_element = elements.next();
 					}

crates/rslint_parser/src/syntax/expr.rs

@@ -1091,21 +1091,62 @@ fn parse_primary_expression(p: &mut Parser) -> ParsedSyntax {
 					p.error(err);
 					m.complete(p, JS_UNKNOWN)
 				}
-			} else {
-				// test_err import_call_no_arg
-				// let a = import();
-				// foo();
-
+			} else if p.at(T!['(']) {
 				// test import_call
 				// import("foo")
+				// import("foo", { assert: { type: 'json' } })
 
-				// test_err import_call
+				// test_err import_invalid_args
 				// import()
-				p.expect(T!['(']);
-				parse_expr_or_assignment(p)
-					.or_add_diagnostic(p, js_parse_error::expected_expression_assignment);
+				// import(...["foo"])
+				// import("foo", { assert: { type: 'json' } }, "bar")
+
+				let args = p.start();
+				p.bump(T!['(']);
+				let args_list = p.start();
+
+				let mut progress = ParserProgress::default();
+				let mut error_range_start = p.cur_tok().start();
+				let mut args_count = 0;
+
+				while !p.at(EOF) && !p.at(T![')']) {
+					progress.assert_progressing(p);
+					args_count += 1;
+
+					if args_count == 3 {
+						error_range_start = p.cur_tok().start();
+					}
+
+					if p.at(T![...]) {
+						let err = p
+							.err_builder("`...` is not allowed in `import()`")
+							.primary(p.cur_tok().range(), "");
+						p.error(err);
+					} else {
+						parse_expr_or_assignment(p)
+							.or_add_diagnostic(p, js_parse_error::expected_expression_assignment);
+					}
+
+					if p.at(T![,]) {
+						p.bump_any();
+					} else {
+						break;
+					}
+				}
+
+				args_list.complete(p, JS_CALL_ARGUMENT_LIST);
+				if args_count == 0 || args_count > 2 {
+					let err = p
+						.err_builder("`import()` requires exactly one or two arguments. ")
+						.primary(error_range_start..p.cur_tok().end(), "");
+					p.error(err);
+				}
+
 				p.expect(T![')']);
+				args.complete(p, JS_CALL_ARGUMENTS);
 				m.complete(p, JS_IMPORT_CALL_EXPRESSION)
+			} else {
+				return Absent;
 			}
 		}
 		BACKTICK => parse_template_literal(p, Absent),

crates/rslint_parser/test_data/inline/err/import_invalid_args.js

@@ -0,0 +1,3 @@
+import()
+import(...["foo"])
+import("foo", { assert: { type: 'json' } }, "bar")