From 1e82e4f20fb1ac42607d9df1fa1ddd911a9ffc10 Mon Sep 17 00:00:00 2001
From: Micha Reiser <micha@rome.tools>
Date: Fri, 12 Nov 2021 13:05:54 +0100
Subject: [PATCH] refactor(rslint_parser): Update Literals AST Facade

Refines the AST Facade for literals to match the grammar proposed in #1719. This change is part of #1725.

* Introduce new `JsAnyLiteral`
* Split `Literal` into `JsStringLiteral`, `JsBooleanLiteral`, `JsNullLiteral`, `JsRegexLiteral`, and `JsBigIntLiteral`. This allows to implement custom methods on the corresponding literal nodes.
* Renames the `number` and kinds to `JS_NUMBER_LITERAL_TOKEN` `JS_STRING_LITERAL_TOKEN` to avoid conflicts with the TS `number` keyword (and keep symmetry).
* Removed some unused keywords and special handling inside of the code gen.
---
 crates/rome_formatter/src/cst.rs              |  37 ++-
 crates/rome_formatter/src/format_json.rs      |  23 +-
 crates/rome_formatter/src/formatter.rs        |   8 +-
 .../src/ts/expressions/expression.rs          |   2 +-
 .../src/ts/expressions/literal.rs             |  60 +++-
 crates/rome_formatter/src/ts/mod.rs           |   1 -
 .../rome_formatter/src/ts/props/prop_name.rs  |   3 +-
 crates/rome_formatter/src/ts/tokens/mod.rs    |   1 -
 .../src/ts/tokens/string_token.rs             |  16 -
 crates/rslint_lexer/src/highlight.rs          |   8 +-
 crates/rslint_lexer/src/lib.rs                |  10 +-
 crates/rslint_lexer/src/tests.rs              |  80 ++---
 crates/rslint_parser/src/ast.rs               |  15 +-
 crates/rslint_parser/src/ast/expr_ext.rs      |  85 +-----
 .../rslint_parser/src/ast/generated/nodes.rs  | 280 +++++++++++++-----
 .../rslint_parser/src/ast/generated/tokens.rs |  42 ---
 crates/rslint_parser/src/ast/stmt_ext.rs      |  21 +-
 crates/rslint_parser/src/ast/ts_ext.rs        |   2 +-
 crates/rslint_parser/src/lib.rs               |   2 +-
 crates/rslint_parser/src/numbers.rs           |  67 +++--
 crates/rslint_parser/src/syntax/decl.rs       |  12 +-
 crates/rslint_parser/src/syntax/expr.rs       |  46 ++-
 crates/rslint_parser/src/syntax/program.rs    |   6 +-
 crates/rslint_parser/src/syntax/stmt.rs       |  24 +-
 crates/rslint_parser/src/syntax/typescript.rs |  32 +-
 crates/rslint_parser/src/syntax/util.rs       |   2 +-
 .../inline/err/binary_expressions_err.rast    |   4 +-
 .../err/binding_identifier_invalid.rast       |  12 +-
 .../inline/err/do_while_stmt_err.rast         |   4 +-
 .../inline/err/export_decl_not_top_level.rast |   4 +-
 .../test_data/inline/err/for_stmt_err.rast    |   8 +-
 .../test_data/inline/err/if_stmt_err.rast     |   4 +-
 .../inline/err/import_decl_not_top_level.rast |   4 +-
 .../inline/err/invalid_method_recover.rast    |   8 +-
 .../err/object_expr_error_prop_name.rast      |   6 +-
 .../object_expr_non_ident_literal_prop.rast   |   4 +-
 .../paren_or_arrow_expr_invalid_params.rast   |   4 +-
 .../test_data/inline/err/throw_stmt_err.rast  |   4 +-
 .../test_data/inline/err/var_decl_err.rast    |   8 +-
 .../test_data/inline/err/while_stmt_err.rast  |   6 +-
 .../test_data/inline/ok/assign_expr.rast      |   4 +-
 .../inline/ok/binary_expressions.rast         |  96 +++---
 .../test_data/inline/ok/bracket_expr.rast     |  12 +-
 .../test_data/inline/ok/continue_stmt.rast    |   2 +-
 .../inline/ok/do_while_statement.rast         |  28 +-
 .../test_data/inline/ok/export.rast           |   4 +-
 .../test_data/inline/ok/for_stmt.rast         |   8 +-
 .../test_data/inline/ok/if_stmt.rast          |  10 +-
 .../test_data/inline/ok/import_call.rast      |   4 +-
 .../test_data/inline/ok/import_decl.rast      |   4 +-
 .../test_data/inline/ok/literals.rast         |  22 +-
 .../test_data/inline/ok/new_exprs.rast        |   8 +-
 .../inline/ok/object_expr_assign_prop.rast    |   4 +-
 .../ok/object_expr_ident_literal_prop.rast    |   2 +-
 .../test_data/inline/ok/object_prop_name.rast |  16 +-
 .../inline/ok/paren_or_arrow_expr.rast        |   8 +-
 .../test_data/inline/ok/semicolons.rast       |   2 +-
 .../test_data/inline/ok/sequence_expr.rast    |  20 +-
 .../test_data/inline/ok/throw_stmt.rast       |   8 +-
 .../test_data/inline/ok/var_decl.rast         |  12 +-
 .../test_data/inline/ok/while_stmt.rast       |   6 +-
 crates/rslint_syntax/src/generated.rs         |  30 +-
 xtask/js.ungram                               |  61 ++--
 xtask/src/codegen/ast.rs                      |  16 +-
 xtask/src/codegen/generate_syntax_kinds.rs    |   4 +
 xtask/src/codegen/kinds_src.rs                |  17 +-
 66 files changed, 758 insertions(+), 615 deletions(-)
 delete mode 100644 crates/rome_formatter/src/ts/tokens/mod.rs
 delete mode 100644 crates/rome_formatter/src/ts/tokens/string_token.rs

diff --git a/crates/rome_formatter/src/cst.rs b/crates/rome_formatter/src/cst.rs
index 7197586b35fb..364fc738fe17 100644
--- a/crates/rome_formatter/src/cst.rs
+++ b/crates/rome_formatter/src/cst.rs
@@ -1,15 +1,16 @@
-use crate::{token, FormatElement, FormatResult, Formatter, ToFormatElement};
+use crate::{FormatElement, FormatResult, Formatter, ToFormatElement};
 use rslint_parser::ast::{
 	ArgList, ArrayExpr, ArrayPattern, ArrowExpr, AssignPattern, CallExpr, ClassBody, ClassDecl,
 	ClassProp, Condition, ConstructorParameters, FnDecl, ForInStmt, ForStmt, ForStmtInit,
-	ForStmtTest, ForStmtUpdate, Getter, IdentProp, JsBlockStatement, JsCaseClause, JsCatchClause,
-	JsContinueStatement, JsDebuggerStatement, JsDefaultClause, JsDoWhileStatement,
-	JsEmptyStatement, JsExpressionStatement, JsFinallyClause, JsIfStatement, JsLabeledStatement,
-	JsReturnStatement, JsScript, JsSwitchStatement, JsTryStatement, JsVariableDeclarationStatement,
-	JsVariableDeclarator, JsWhileStatement, JsWithStatement, Literal, LiteralProp, Name, NameRef,
+	ForStmtTest, ForStmtUpdate, Getter, IdentProp, JsBlockStatement, JsBooleanLiteral,
+	JsCaseClause, JsCatchClause, JsContinueStatement, JsDebuggerStatement, JsDefaultClause,
+	JsDoWhileStatement, JsEmptyStatement, JsExpressionStatement, JsFinallyClause, JsIfStatement,
+	JsLabeledStatement, JsNullLiteral, JsNumberLiteral, JsReturnStatement, JsScript,
+	JsStringLiteral, JsSwitchStatement, JsTryStatement, JsVariableDeclarationStatement,
+	JsVariableDeclarator, JsWhileStatement, JsWithStatement, LiteralProp, Name, NameRef,
 	ObjectExpr, ParameterList, SequenceExpr, Setter, SinglePattern,
 };
-use rslint_parser::{AstNode, AstToken, SyntaxKind, SyntaxNode, SyntaxToken};
+use rslint_parser::{AstNode, SyntaxKind, SyntaxNode};
 
 impl ToFormatElement for SyntaxNode {
 	fn to_format_element(&self, formatter: &Formatter) -> FormatResult<FormatElement> {
@@ -23,7 +24,16 @@ impl ToFormatElement for SyntaxNode {
 			SyntaxKind::ASSIGN_PATTERN => AssignPattern::cast(self.clone())
 				.unwrap()
 				.to_format_element(formatter),
-			SyntaxKind::LITERAL => Literal::cast(self.clone())
+			SyntaxKind::JS_BOOLEAN_LITERAL => JsBooleanLiteral::cast(self.clone())
+				.unwrap()
+				.to_format_element(formatter),
+			SyntaxKind::JS_STRING_LITERAL => JsStringLiteral::cast(self.clone())
+				.unwrap()
+				.to_format_element(formatter),
+			SyntaxKind::JS_NULL_LITERAL => JsNullLiteral::cast(self.clone())
+				.unwrap()
+				.to_format_element(formatter),
+			SyntaxKind::JS_NUMBER_LITERAL => JsNumberLiteral::cast(self.clone())
 				.unwrap()
 				.to_format_element(formatter),
 			SyntaxKind::NAME => Name::cast(self.clone())
@@ -171,14 +181,3 @@ impl ToFormatElement for SyntaxNode {
 		}
 	}
 }
-
-impl ToFormatElement for SyntaxToken {
-	fn to_format_element(&self, formatter: &Formatter) -> FormatResult<FormatElement> {
-		match self.kind() {
-			SyntaxKind::STRING => rslint_parser::ast::String::cast(self.clone())
-				.unwrap()
-				.to_format_element(formatter),
-			_ => Ok(token(self.text())),
-		}
-	}
-}
diff --git a/crates/rome_formatter/src/format_json.rs b/crates/rome_formatter/src/format_json.rs
index 5d159d17059e..334412156dab 100644
--- a/crates/rome_formatter/src/format_json.rs
+++ b/crates/rome_formatter/src/format_json.rs
@@ -4,17 +4,18 @@ use crate::{
 	space_token, token,
 };
 use rslint_parser::ast::{
-	ArrayExpr, GroupingExpr, Literal, LiteralProp, ObjectExpr, ObjectProp, UnaryExpr,
+	ArrayExpr, GroupingExpr, JsBooleanLiteral, JsNullLiteral, JsNumberLiteral, JsStringLiteral,
+	LiteralProp, ObjectExpr, ObjectProp, UnaryExpr,
 };
-use rslint_parser::{parse_text, AstNode, SyntaxKind, SyntaxNode, SyntaxToken};
+use rslint_parser::{parse_text, AstNode, SyntaxKind, SyntaxNode, SyntaxNodeExt, SyntaxToken};
 
 fn tokenize_token(syntax_token: SyntaxToken) -> FormatElement {
 	match syntax_token.kind() {
 		SyntaxKind::NULL_KW => token("null"),
 		SyntaxKind::TRUE_KW => token("true"),
 		SyntaxKind::FALSE_KW => token("false"),
-		SyntaxKind::STRING => token(syntax_token.text()),
-		SyntaxKind::NUMBER => token(syntax_token.text()),
+		SyntaxKind::JS_STRING_LITERAL_TOKEN => token(syntax_token.text()),
+		SyntaxKind::JS_NUMBER_LITERAL_TOKEN => token(syntax_token.text()),
 		SyntaxKind::MINUS => token("-"),
 		_ => panic!("Unsupported JSON token {:?}", syntax_token),
 	}
@@ -22,9 +23,17 @@ fn tokenize_token(syntax_token: SyntaxToken) -> FormatElement {
 
 fn tokenize_node(node: SyntaxNode) -> FormatElement {
 	match node.kind() {
-		SyntaxKind::LITERAL => {
-			let literal = Literal::cast(node).unwrap();
-			tokenize_token(literal.token())
+		SyntaxKind::JS_STRING_LITERAL => {
+			tokenize_token(node.to::<JsStringLiteral>().value_token().unwrap())
+		}
+		SyntaxKind::JS_BOOLEAN_LITERAL => {
+			tokenize_token(node.to::<JsBooleanLiteral>().value_token().unwrap())
+		}
+		SyntaxKind::JS_NULL_LITERAL => {
+			tokenize_token(node.to::<JsNullLiteral>().value_token().unwrap())
+		}
+		SyntaxKind::JS_NUMBER_LITERAL => {
+			tokenize_token(node.to::<JsNumberLiteral>().value_token().unwrap())
 		}
 		SyntaxKind::UNARY_EXPR => {
 			let expr = UnaryExpr::cast(node).unwrap();
diff --git a/crates/rome_formatter/src/formatter.rs b/crates/rome_formatter/src/formatter.rs
index 1217fe8767a2..a48d018b2794 100644
--- a/crates/rome_formatter/src/formatter.rs
+++ b/crates/rome_formatter/src/formatter.rs
@@ -87,8 +87,8 @@ impl Formatter {
 	/// use rome_rowan::{NodeOrToken, TreeBuilder};
 	///
 	/// let mut builder = TreeBuilder::<'_, JsLanguage>::new();
-	/// builder.start_node(SyntaxKind::LITERAL);
-	/// builder.token(SyntaxKind::STRING, "'abc'");
+	/// builder.start_node(SyntaxKind::JS_STRING_LITERAL);
+	/// builder.token(SyntaxKind::JS_STRING_LITERAL_TOKEN, "'abc'");
 	/// builder.finish_node();
 	/// let node = builder.finish();
 	///
@@ -97,10 +97,10 @@ impl Formatter {
 	/// let formatter = Formatter::default();
 	/// let result = formatter.format_token(&syntax_token);
 	///
-	/// assert_eq!(Ok(token("\"abc\"")), result)
+	/// assert_eq!(Ok(token("'abc'")), result)
 	/// ```
 	pub fn format_token(&self, syntax_token: &SyntaxToken) -> FormatResult<FormatElement> {
-		syntax_token.to_format_element(self)
+		Ok(token(syntax_token.text()))
 	}
 
 	/// Formats each child and returns the result as a list.
diff --git a/crates/rome_formatter/src/ts/expressions/expression.rs b/crates/rome_formatter/src/ts/expressions/expression.rs
index 91d22b89bcd7..fd0f4231e984 100644
--- a/crates/rome_formatter/src/ts/expressions/expression.rs
+++ b/crates/rome_formatter/src/ts/expressions/expression.rs
@@ -5,7 +5,7 @@ impl ToFormatElement for JsAnyExpression {
 	fn to_format_element(&self, formatter: &Formatter) -> FormatResult<FormatElement> {
 		match self {
 			JsAnyExpression::ArrowExpr(arrow) => arrow.to_format_element(formatter),
-			JsAnyExpression::Literal(literal) => literal.to_format_element(formatter),
+			JsAnyExpression::JsAnyLiteral(literal) => literal.to_format_element(formatter),
 			JsAnyExpression::Template(_) => todo!(),
 			JsAnyExpression::NameRef(name_ref) => name_ref.to_format_element(formatter),
 			JsAnyExpression::ThisExpr(_) => todo!(),
diff --git a/crates/rome_formatter/src/ts/expressions/literal.rs b/crates/rome_formatter/src/ts/expressions/literal.rs
index 418eb619e4e8..f73702424a58 100644
--- a/crates/rome_formatter/src/ts/expressions/literal.rs
+++ b/crates/rome_formatter/src/ts/expressions/literal.rs
@@ -1,9 +1,61 @@
-use rslint_parser::ast::Literal;
+use crate::{token, FormatElement, FormatResult, Formatter, ToFormatElement};
+use rslint_parser::ast::{
+	JsAnyLiteral, JsBigIntLiteral, JsBooleanLiteral, JsNullLiteral, JsNumberLiteral,
+	JsStringLiteral,
+};
 
-use crate::{FormatElement, FormatResult, Formatter, ToFormatElement};
+impl ToFormatElement for JsStringLiteral {
+	fn to_format_element(&self, _: &Formatter) -> FormatResult<FormatElement> {
+		let value_token = self.value_token()?;
+		let quoted = value_token.text();
 
-impl ToFormatElement for Literal {
+		// uses single quotes
+		if quoted.starts_with('\'') {
+			let mut double_quoted = String::from(quoted);
+			double_quoted.replace_range(0..1, "\"");
+			double_quoted.replace_range(double_quoted.len() - 1..double_quoted.len(), "\"");
+			Ok(token(double_quoted.as_str()))
+		} else {
+			Ok(token(quoted))
+		}
+	}
+}
+
+impl ToFormatElement for JsBooleanLiteral {
+	fn to_format_element(&self, formatter: &Formatter) -> FormatResult<FormatElement> {
+		formatter.format_token(&self.value_token()?)
+	}
+}
+
+impl ToFormatElement for JsNullLiteral {
+	fn to_format_element(&self, formatter: &Formatter) -> FormatResult<FormatElement> {
+		formatter.format_token(&self.value_token()?)
+	}
+}
+
+impl ToFormatElement for JsNumberLiteral {
+	fn to_format_element(&self, formatter: &Formatter) -> FormatResult<FormatElement> {
+		formatter.format_token(&self.value_token()?)
+	}
+}
+
+impl ToFormatElement for JsBigIntLiteral {
+	fn to_format_element(&self, formatter: &Formatter) -> FormatResult<FormatElement> {
+		formatter.format_token(&self.value_token()?)
+	}
+}
+
+impl ToFormatElement for JsAnyLiteral {
 	fn to_format_element(&self, formatter: &Formatter) -> FormatResult<FormatElement> {
-		formatter.format_token(&self.token())
+		match self {
+			JsAnyLiteral::JsBooleanLiteral(boolean) => boolean.to_format_element(formatter),
+			JsAnyLiteral::JsStringLiteral(string_literal) => {
+				string_literal.to_format_element(formatter)
+			}
+			JsAnyLiteral::JsNumberLiteral(number) => number.to_format_element(formatter),
+			JsAnyLiteral::JsBigIntLiteral(big_int) => big_int.to_format_element(formatter),
+			JsAnyLiteral::JsNullLiteral(null_literal) => null_literal.to_format_element(formatter),
+			JsAnyLiteral::JsRegexLiteral(_) => todo!(),
+		}
 	}
 }
diff --git a/crates/rome_formatter/src/ts/mod.rs b/crates/rome_formatter/src/ts/mod.rs
index ad3a3aa77aaa..cccc3534a5d5 100644
--- a/crates/rome_formatter/src/ts/mod.rs
+++ b/crates/rome_formatter/src/ts/mod.rs
@@ -17,7 +17,6 @@ mod script;
 mod setter;
 mod spread;
 mod statements;
-mod tokens;
 
 #[cfg(test)]
 mod test {
diff --git a/crates/rome_formatter/src/ts/props/prop_name.rs b/crates/rome_formatter/src/ts/props/prop_name.rs
index d84d656ac629..7524118e521c 100644
--- a/crates/rome_formatter/src/ts/props/prop_name.rs
+++ b/crates/rome_formatter/src/ts/props/prop_name.rs
@@ -6,7 +6,8 @@ impl ToFormatElement for PropName {
 	fn to_format_element(&self, formatter: &Formatter) -> FormatResult<FormatElement> {
 		match self {
 			PropName::ComputedPropertyName(_) => todo!(),
-			PropName::Literal(literal) => literal.to_format_element(formatter),
+			PropName::JsStringLiteral(literal) => literal.to_format_element(formatter),
+			PropName::JsNumberLiteral(literal) => literal.to_format_element(formatter),
 			PropName::Ident(ident) => ident.to_format_element(formatter),
 			PropName::Name(name) => name.to_format_element(formatter),
 			PropName::JsUnknownBinding(_) => todo!(),
diff --git a/crates/rome_formatter/src/ts/tokens/mod.rs b/crates/rome_formatter/src/ts/tokens/mod.rs
deleted file mode 100644
index 6026f19c2c15..000000000000
--- a/crates/rome_formatter/src/ts/tokens/mod.rs
+++ /dev/null
@@ -1 +0,0 @@
-mod string_token;
diff --git a/crates/rome_formatter/src/ts/tokens/string_token.rs b/crates/rome_formatter/src/ts/tokens/string_token.rs
deleted file mode 100644
index f72a666cfa3d..000000000000
--- a/crates/rome_formatter/src/ts/tokens/string_token.rs
+++ /dev/null
@@ -1,16 +0,0 @@
-use crate::{token, FormatElement, FormatResult, Formatter, ToFormatElement};
-use rslint_parser::ast::String as JsString;
-
-impl ToFormatElement for JsString {
-	fn to_format_element(&self, _formatter: &Formatter) -> FormatResult<FormatElement> {
-		let mut content = self.to_string();
-
-		// uses single quotes
-		if content.starts_with('\'') {
-			content.replace_range(0..1, "\"");
-			content.replace_range(content.len() - 1..content.len(), "\"");
-		}
-
-		Ok(token(content.as_str()))
-	}
-}
diff --git a/crates/rslint_lexer/src/highlight.rs b/crates/rslint_lexer/src/highlight.rs
index a652787f94dd..c21407e988d3 100644
--- a/crates/rslint_lexer/src/highlight.rs
+++ b/crates/rslint_lexer/src/highlight.rs
@@ -120,10 +120,12 @@ impl<'s> Iterator for Highlighter<'s> {
 			}
 			t if t.is_punct() => rgb![86, 182, 194],
 			t if t.is_keyword() => rgb![198, 120, 221],
-			SyntaxKind::STRING | SyntaxKind::BACKTICK | SyntaxKind::TEMPLATE_CHUNK => {
+			SyntaxKind::JS_STRING_LITERAL_TOKEN
+			| SyntaxKind::BACKTICK
+			| SyntaxKind::TEMPLATE_CHUNK => {
 				rgb![152, 195, 121]
 			}
-			SyntaxKind::NUMBER => rgb![209, 154, 102],
+			SyntaxKind::JS_NUMBER_LITERAL_TOKEN => rgb![209, 154, 102],
 			SyntaxKind::DOLLARCURLY => rgb![198, 120, 221],
 			SyntaxKind::ERROR_TOKEN => rgb![244, 71, 71],
 			SyntaxKind::COMMENT => rgb![127, 132, 142],
@@ -137,7 +139,7 @@ impl<'s> Iterator for Highlighter<'s> {
 	}
 }
 
-/// Colors a piece of source code using ANSI.  
+/// Colors a piece of source code using ANSI.
 /// The string returned will be unaltered if stdout and stderr are not terminals.
 pub fn color(source: &str) -> String {
 	Highlighter::new(source).color()
diff --git a/crates/rslint_lexer/src/lib.rs b/crates/rslint_lexer/src/lib.rs
index c89410ee230c..1db1d3a936dc 100644
--- a/crates/rslint_lexer/src/lib.rs
+++ b/crates/rslint_lexer/src/lib.rs
@@ -862,7 +862,7 @@ impl<'src> Lexer<'src> {
 				Some(err),
 			)
 		} else {
-			tok!(NUMBER, self.cur - start)
+			tok!(JS_NUMBER_LITERAL_TOKEN, self.cur - start)
 		}
 	}
 
@@ -1009,7 +1009,7 @@ impl<'src> Lexer<'src> {
 									}
 								},
 								_ => {
-									return (Token::new(SyntaxKind::REGEX, self.cur - start), diagnostic)
+									return (Token::new(SyntaxKind::JS_REGEX_LITERAL_TOKEN, self.cur - start), diagnostic)
 								}
 							}
 						}
@@ -1020,7 +1020,7 @@ impl<'src> Lexer<'src> {
 						let err = Diagnostic::error(self.file_id, "", "expected a character after a regex escape, but found none")
 							.primary(self.cur..self.cur + 1, "expected a character following this");
 
-						return (Token::new(SyntaxKind::REGEX, self.cur - start), Some(err));
+						return (Token::new(SyntaxKind::JS_REGEX_LITERAL_TOKEN, self.cur - start), Some(err));
 					}
 				},
 				None => {
@@ -1028,7 +1028,7 @@ impl<'src> Lexer<'src> {
 						.primary(self.cur..self.cur, "...but the file ends here")
 						.secondary(start..start + 1, "a regex literal starts there...");
 
-					return (Token::new(SyntaxKind::REGEX, self.cur - start), Some(err));
+					return (Token::new(SyntaxKind::JS_REGEX_LITERAL_TOKEN, self.cur - start), Some(err));
 				},
 				_ => {},
 			}
@@ -1333,7 +1333,7 @@ impl<'src> Lexer<'src> {
 						Some(err),
 					)
 				} else {
-					tok!(STRING, self.cur - start)
+					tok!(JS_STRING_LITERAL_TOKEN, self.cur - start)
 				}
 			}
 			IDT => self.resolve_identifier((byte as char, start)),
diff --git a/crates/rslint_lexer/src/tests.rs b/crates/rslint_lexer/src/tests.rs
index bcc84d17c302..14fb39f9f42d 100644
--- a/crates/rslint_lexer/src/tests.rs
+++ b/crates/rslint_lexer/src/tests.rs
@@ -170,12 +170,12 @@ fn all_whitespace() {
 fn empty_string() {
 	assert_lex! {
 		r#""""#,
-		STRING:2
+		JS_STRING_LITERAL_TOKEN:2
 	}
 
 	assert_lex! {
 		"''",
-		STRING:2
+		JS_STRING_LITERAL_TOKEN:2
 	}
 }
 
@@ -219,12 +219,12 @@ fn template_literals() {
 fn simple_string() {
 	assert_lex! {
 		r#"'abcdefghijklmnopqrstuvwxyz123456789\'10🦀'"#,
-		STRING:45
+		JS_STRING_LITERAL_TOKEN:45
 	}
 
 	assert_lex! {
 		r#""abcdefghijklmnopqrstuvwxyz123456789\"10🦀""#,
-		STRING:45
+		JS_STRING_LITERAL_TOKEN:45
 	}
 }
 
@@ -245,12 +245,12 @@ fn string_unicode_escape_invalid() {
 fn string_unicode_escape_valid() {
 	assert_lex! {
 		r#""abcd\u2000a""#,
-		STRING:13
+		JS_STRING_LITERAL_TOKEN:13
 	}
 
 	assert_lex! {
 		r#"'abcd\u2000a'"#,
-		STRING:13
+		JS_STRING_LITERAL_TOKEN:13
 	}
 }
 
@@ -258,12 +258,12 @@ fn string_unicode_escape_valid() {
 fn string_unicode_escape_valid_resolving_to_endquote() {
 	assert_lex! {
 		r#""abcd\u0022a""#,
-		STRING:13
+		JS_STRING_LITERAL_TOKEN:13
 	}
 
 	assert_lex! {
 		r#"'abcd\u0027a'"#,
-		STRING:13
+		JS_STRING_LITERAL_TOKEN:13
 	}
 }
 
@@ -284,12 +284,12 @@ fn string_hex_escape_invalid() {
 fn string_hex_escape_valid() {
 	assert_lex! {
 		r#""abcd \x00 \xAB""#,
-		STRING:16
+		JS_STRING_LITERAL_TOKEN:16
 	}
 
 	assert_lex! {
 		r#"'abcd \x00 \xAB'"#,
-		STRING:16
+		JS_STRING_LITERAL_TOKEN:16
 	}
 }
 
@@ -328,7 +328,7 @@ fn complex_string_1() {
 		WHITESPACE:1,
 		PLUSEQ:2,
 		WHITESPACE:1,
-		STRING:14,
+		JS_STRING_LITERAL_TOKEN:14,
 		SEMICOLON:1
 	}
 
@@ -339,7 +339,7 @@ fn complex_string_1() {
 		WHITESPACE:1,
 		PLUSEQ:2,
 		WHITESPACE:1,
-		STRING:14,
+		JS_STRING_LITERAL_TOKEN:14,
 		SEMICOLON:1
 	}
 }
@@ -677,23 +677,23 @@ fn labels_y() {
 fn number_basic() {
 	assert_lex! {
 		"1",
-		NUMBER:1
+		JS_NUMBER_LITERAL_TOKEN:1
 	}
 
 	assert_lex! {
 		"123456 ",
-		NUMBER:6,
+		JS_NUMBER_LITERAL_TOKEN:6,
 		WHITESPACE:1
 	}
 
 	assert_lex! {
 		"90",
-		NUMBER:2
+		JS_NUMBER_LITERAL_TOKEN:2
 	}
 
 	assert_lex! {
 		".13",
-		NUMBER:3
+		JS_NUMBER_LITERAL_TOKEN:3
 	}
 }
 
@@ -701,7 +701,7 @@ fn number_basic() {
 fn number_basic_err() {
 	assert_lex! {
 		"2_?",
-		NUMBER:2, // numeric separator error
+		JS_NUMBER_LITERAL_TOKEN:2, // numeric separator error
 		QUESTION:1
 	}
 
@@ -712,7 +712,7 @@ fn number_basic_err() {
 
 	assert_lex! {
 		r#"25\uFEFFb"#,
-		NUMBER:2,
+		JS_NUMBER_LITERAL_TOKEN:2,
 		ERROR_TOKEN:6,
 		IDENT:1
 	}
@@ -727,19 +727,19 @@ fn number_basic_err() {
 fn number_complex() {
 	assert_lex! {
 		"3e-5 123e+56",
-		NUMBER:4,
+		JS_NUMBER_LITERAL_TOKEN:4,
 		WHITESPACE:1,
-		NUMBER:7
+		JS_NUMBER_LITERAL_TOKEN:7
 	}
 
 	assert_lex! {
 		"3.14159e+1",
-		NUMBER:10
+		JS_NUMBER_LITERAL_TOKEN:10
 	}
 
 	assert_lex! {
 		".0e34",
-		NUMBER:5
+		JS_NUMBER_LITERAL_TOKEN:5
 	}
 }
 
@@ -750,12 +750,12 @@ fn dot_number_disambiguation() {
 		DOT:1,
 		IDENT:1,
 		PLUS:1,
-		NUMBER:1
+		JS_NUMBER_LITERAL_TOKEN:1
 	}
 
 	assert_lex! {
 		".0e+5",
-		NUMBER:5
+		JS_NUMBER_LITERAL_TOKEN:5
 	}
 }
 
@@ -763,13 +763,13 @@ fn dot_number_disambiguation() {
 fn binary_literals() {
 	assert_lex! {
 		"0b10101010, 0B10101010, 0b10101010n",
-		NUMBER:10,
+		JS_NUMBER_LITERAL_TOKEN:10,
 		COMMA:1,
 		WHITESPACE:1,
-		NUMBER:10,
+		JS_NUMBER_LITERAL_TOKEN:10,
 		COMMA:1,
 		WHITESPACE:1,
-		NUMBER:11
+		JS_NUMBER_LITERAL_TOKEN:11
 	}
 }
 
@@ -777,13 +777,13 @@ fn binary_literals() {
 fn octal_literals() {
 	assert_lex! {
 		"0o01742242, 0B10101010, 0b10101010n",
-		NUMBER:10,
+		JS_NUMBER_LITERAL_TOKEN:10,
 		COMMA:1,
 		WHITESPACE:1,
-		NUMBER:10,
+		JS_NUMBER_LITERAL_TOKEN:10,
 		COMMA:1,
 		WHITESPACE:1,
-		NUMBER:11
+		JS_NUMBER_LITERAL_TOKEN:11
 	}
 }
 
@@ -791,11 +791,11 @@ fn octal_literals() {
 fn bigint_literals() {
 	assert_lex! {
 		"0n 1743642n 1n",
-		NUMBER:2,
+		JS_NUMBER_LITERAL_TOKEN:2,
 		WHITESPACE:1,
-		NUMBER:8,
+		JS_NUMBER_LITERAL_TOKEN:8,
 		WHITESPACE:1,
-		NUMBER:2
+		JS_NUMBER_LITERAL_TOKEN:2
 	}
 }
 
@@ -821,15 +821,15 @@ fn shebang() {
 	assert_lex! {
 		"#0",
 		ERROR_TOKEN:1,
-		NUMBER:1
+		JS_NUMBER_LITERAL_TOKEN:1
 	}
 
 	assert_lex! {
 		"0#!/bin/deno",
-		NUMBER:1,
+		JS_NUMBER_LITERAL_TOKEN:1,
 		HASH:1,
 		BANG:1,
-		REGEX:9
+		JS_REGEX_LITERAL_TOKEN:9
 	}
 }
 
@@ -877,7 +877,7 @@ fn regex() {
 		WHITESPACE:1,
 		EQ:1,
 		WHITESPACE:1,
-		REGEX:7
+		JS_REGEX_LITERAL_TOKEN:7
 	}
 }
 
@@ -891,11 +891,11 @@ fn division() {
 		WHITESPACE:1,
 		EQ:1,
 		WHITESPACE:1,
-		NUMBER:1,
+		JS_NUMBER_LITERAL_TOKEN:1,
 		WHITESPACE:1,
 		SLASH:1,
 		WHITESPACE:1,
-		NUMBER:1
+		JS_NUMBER_LITERAL_TOKEN:1
 	}
 }
 
@@ -1007,7 +1007,7 @@ fn issue_30() {
 fn fuzz_fail_7() {
 	assert_lex! {
 		"/\u{0}/ª\u{80}",
-		REGEX:5,
+		JS_REGEX_LITERAL_TOKEN:5,
 		ERROR_TOKEN:2
 	}
 }
diff --git a/crates/rslint_parser/src/ast.rs b/crates/rslint_parser/src/ast.rs
index 62dbe4ba041f..13eabb805765 100644
--- a/crates/rslint_parser/src/ast.rs
+++ b/crates/rslint_parser/src/ast.rs
@@ -439,7 +439,7 @@ mod support {
 
 #[cfg(test)]
 mod tests {
-	use crate::ast::{AstSeparatedElement, AstSeparatedList, Literal};
+	use crate::ast::{AstSeparatedElement, AstSeparatedList, JsNumberLiteral};
 	use crate::{JsLanguage, SyntaxKind};
 	use rome_rowan::TreeBuilder;
 
@@ -447,15 +447,18 @@ mod tests {
 	/// The elements are pairs of: (value, separator).
 	fn build_list<'a>(
 		elements: impl IntoIterator<Item = (Option<i32>, Option<&'a str>)>,
-	) -> AstSeparatedList<Literal> {
+	) -> AstSeparatedList<JsNumberLiteral> {
 		let mut builder: TreeBuilder<JsLanguage> = TreeBuilder::new();
 
 		builder.start_node(SyntaxKind::LIST);
 
 		for (node, separator) in elements.into_iter() {
 			if let Some(node) = node {
-				builder.start_node(SyntaxKind::LITERAL);
-				builder.token(SyntaxKind::NUMBER, node.to_string().as_str());
+				builder.start_node(SyntaxKind::JS_NUMBER_LITERAL);
+				builder.token(
+					SyntaxKind::JS_NUMBER_LITERAL_TOKEN,
+					node.to_string().as_str(),
+				);
 				builder.finish_node();
 			}
 
@@ -472,7 +475,7 @@ mod tests {
 	}
 
 	fn assert_elements<'a>(
-		actual: impl Iterator<Item = AstSeparatedElement<Literal>>,
+		actual: impl Iterator<Item = AstSeparatedElement<JsNumberLiteral>>,
 		expected: impl IntoIterator<Item = (f64, Option<&'a str>)>,
 	) {
 		let actual = actual.map(|element| {
@@ -493,7 +496,7 @@ mod tests {
 	}
 
 	fn assert_nodes(
-		actual: impl Iterator<Item = Literal>,
+		actual: impl Iterator<Item = JsNumberLiteral>,
 		expected: impl IntoIterator<Item = f64>,
 	) {
 		assert_eq!(
diff --git a/crates/rslint_parser/src/ast/expr_ext.rs b/crates/rslint_parser/src/ast/expr_ext.rs
index 38a97b62c692..8321d46e64d3 100644
--- a/crates/rslint_parser/src/ast/expr_ext.rs
+++ b/crates/rslint_parser/src/ast/expr_ext.rs
@@ -1,6 +1,7 @@
 //! Extensions for things which are not easily generated in ast expr nodes
 
-use crate::{ast::*, numbers::*, util::*, SyntaxText, TextRange, TextSize, TokenSet, T};
+use crate::{ast::*, numbers::*, util::*, TextRange, TokenSet, T};
+use rome_rowan::{SyntaxText, TextSize};
 use SyntaxKind::*;
 
 impl BracketExpr {
@@ -333,74 +334,21 @@ impl ObjectExpr {
 	}
 }
 
-#[derive(Debug, Clone, PartialEq, PartialOrd)]
-pub enum LiteralKind {
-	Number(f64),
-	BigInt(BigInt),
-	String,
-	Null,
-	Bool(bool),
-	Regex,
-}
-
-impl Literal {
-	pub fn token(&self) -> SyntaxToken {
-		self.syntax()
-			.children_with_tokens()
-			.find(|e| !e.kind().is_trivia())
-			.and_then(|e| e.into_token())
-			.unwrap()
-	}
-
-	pub fn kind(&self) -> LiteralKind {
-		match self.token().kind() {
-			T![null] => LiteralKind::Null,
-			NUMBER => match parse_js_num(self.to_string()).unwrap() {
-				JsNum::BigInt(bigint) => LiteralKind::BigInt(bigint),
-				JsNum::Float(float) => LiteralKind::Number(float),
-			},
-			STRING => LiteralKind::String,
-			TRUE_KW => LiteralKind::Bool(true),
-			FALSE_KW => LiteralKind::Bool(false),
-			REGEX => LiteralKind::Regex,
-			_ => unreachable!(),
-		}
-	}
-
+impl JsNumberLiteral {
 	pub fn as_number(&self) -> Option<f64> {
-		if let LiteralKind::Number(num) = self.kind() {
-			Some(num)
-		} else {
-			None
-		}
-	}
-
-	pub fn is_number(&self) -> bool {
-		matches!(self.kind(), LiteralKind::Number(_))
-	}
-
-	pub fn is_string(&self) -> bool {
-		self.kind() == LiteralKind::String
-	}
-
-	pub fn is_null(&self) -> bool {
-		self.kind() == LiteralKind::Null
-	}
-
-	pub fn is_bool(&self) -> bool {
-		matches!(self.kind(), LiteralKind::Bool(_))
+		parse_js_number(self.value_token().unwrap().text())
 	}
+}
 
-	pub fn is_regex(&self) -> bool {
-		self.kind() == LiteralKind::Regex
+impl JsBigIntLiteral {
+	pub fn as_number(&self) -> Option<BigInt> {
+		parse_js_big_int(self.value_token().ok()?.text())
 	}
+}
 
+impl JsStringLiteral {
 	/// Get the inner text of a string not including the quotes
-	pub fn inner_string_text(&self) -> Option<SyntaxText> {
-		if !self.is_string() {
-			return None;
-		}
-
+	pub fn inner_string_text(&self) -> SyntaxText {
 		let start = self.syntax().text_range().start() + TextSize::from(1);
 		let end_char = self
 			.syntax()
@@ -415,11 +363,9 @@ impl Literal {
 
 		let offset = self.syntax().text_range().start();
 
-		Some(
-			self.syntax()
-				.text()
-				.slice(TextRange::new(start - offset, end - offset)),
-		)
+		self.syntax()
+			.text()
+			.slice(TextRange::new(start - offset, end - offset))
 	}
 }
 
@@ -516,7 +462,8 @@ impl ObjectProp {
 fn prop_name_syntax(name: PropName) -> Option<SyntaxNode> {
 	Some(match name {
 		PropName::Ident(idt) => idt.syntax().clone(),
-		PropName::Literal(lit) => lit.syntax().clone(),
+		PropName::JsStringLiteral(lit) => lit.syntax().clone(),
+		PropName::JsNumberLiteral(lit) => lit.syntax().clone(),
 		PropName::Name(name) => name.syntax().clone(),
 		PropName::ComputedPropertyName(_) => return None,
 		PropName::JsUnknownBinding(_) => todo!(),
diff --git a/crates/rslint_parser/src/ast/generated/nodes.rs b/crates/rslint_parser/src/ast/generated/nodes.rs
index 857d7430b9b5..07231ba7174c 100644
--- a/crates/rslint_parser/src/ast/generated/nodes.rs
+++ b/crates/rslint_parser/src/ast/generated/nodes.rs
@@ -386,6 +386,7 @@ impl ImportDecl {
 	pub fn from_token(&self) -> SyntaxResult<SyntaxToken> {
 		support::required_token(&self.syntax, T![from])
 	}
+	pub fn source(&self) -> SyntaxResult<JsStringLiteral> { support::required_node(&self.syntax) }
 	pub fn asserted_object(&self) -> SyntaxResult<ObjectExpr> {
 		support::required_node(&self.syntax)
 	}
@@ -453,6 +454,7 @@ impl ExportWildcard {
 	pub fn from_token(&self) -> SyntaxResult<SyntaxToken> {
 		support::required_token(&self.syntax, T![from])
 	}
+	pub fn source(&self) -> SyntaxResult<JsStringLiteral> { support::required_node(&self.syntax) }
 }
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct ExportDecl {
@@ -643,30 +645,6 @@ impl ArrowExpr {
 	pub fn return_type(&self) -> Option<TsType> { support::node(&self.syntax) }
 }
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct Literal {
-	pub(crate) syntax: SyntaxNode,
-}
-impl Literal {
-	pub fn true_token(&self) -> SyntaxResult<SyntaxToken> {
-		support::required_token(&self.syntax, T![true])
-	}
-	pub fn false_token(&self) -> SyntaxResult<SyntaxToken> {
-		support::required_token(&self.syntax, T![false])
-	}
-	pub fn number_token(&self) -> SyntaxResult<SyntaxToken> {
-		support::required_token(&self.syntax, T![number])
-	}
-	pub fn regex_token(&self) -> SyntaxResult<SyntaxToken> {
-		support::required_token(&self.syntax, T![regex])
-	}
-	pub fn float_token(&self) -> SyntaxResult<SyntaxToken> {
-		support::required_token(&self.syntax, T![float])
-	}
-	pub fn big_int_token(&self) -> SyntaxResult<SyntaxToken> {
-		support::required_token(&self.syntax, T![big_int])
-	}
-}
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct Template {
 	pub(crate) syntax: SyntaxNode,
 }
@@ -1300,21 +1278,57 @@ impl SpreadElement {
 	pub fn element(&self) -> SyntaxResult<JsAnyExpression> { support::required_node(&self.syntax) }
 }
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct Null {
+pub struct JsStringLiteral {
 	pub(crate) syntax: SyntaxNode,
 }
-impl Null {
-	pub fn null_token(&self) -> SyntaxResult<SyntaxToken> {
+impl JsStringLiteral {
+	pub fn value_token(&self) -> SyntaxResult<SyntaxToken> {
+		support::required_token(&self.syntax, T![js_string_literal_token])
+	}
+}
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
+pub struct JsNumberLiteral {
+	pub(crate) syntax: SyntaxNode,
+}
+impl JsNumberLiteral {
+	pub fn value_token(&self) -> SyntaxResult<SyntaxToken> {
+		support::required_token(&self.syntax, T![js_number_literal_token])
+	}
+}
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
+pub struct JsBigIntLiteral {
+	pub(crate) syntax: SyntaxNode,
+}
+impl JsBigIntLiteral {
+	pub fn value_token(&self) -> SyntaxResult<SyntaxToken> {
+		support::required_token(&self.syntax, T![js_big_int_literal_token])
+	}
+}
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
+pub struct JsBooleanLiteral {
+	pub(crate) syntax: SyntaxNode,
+}
+impl JsBooleanLiteral {
+	pub fn value_token(&self) -> SyntaxResult<SyntaxToken> {
+		support::find_required_token(&self.syntax, &[T![true], T![false]])
+	}
+}
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
+pub struct JsNullLiteral {
+	pub(crate) syntax: SyntaxNode,
+}
+impl JsNullLiteral {
+	pub fn value_token(&self) -> SyntaxResult<SyntaxToken> {
 		support::required_token(&self.syntax, T![null])
 	}
 }
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct Undefined {
+pub struct JsRegexLiteral {
 	pub(crate) syntax: SyntaxNode,
 }
-impl Undefined {
-	pub fn undefined_token(&self) -> SyntaxResult<SyntaxToken> {
-		support::required_token(&self.syntax, T![undefined])
+impl JsRegexLiteral {
+	pub fn value_token(&self) -> SyntaxResult<SyntaxToken> {
+		support::required_token(&self.syntax, T![js_regex_literal_token])
 	}
 }
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
@@ -1652,7 +1666,11 @@ impl NamedImports {
 pub struct ImportStringSpecifier {
 	pub(crate) syntax: SyntaxNode,
 }
-impl ImportStringSpecifier {}
+impl ImportStringSpecifier {
+	pub fn js_string_literal_token_token(&self) -> SyntaxResult<SyntaxToken> {
+		support::required_token(&self.syntax, T![js_string_literal_token])
+	}
+}
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct Specifier {
 	pub(crate) syntax: SyntaxNode,
@@ -1671,6 +1689,9 @@ impl TsExternalModuleRef {
 	pub fn l_paren_token(&self) -> SyntaxResult<SyntaxToken> {
 		support::required_token(&self.syntax, T!['('])
 	}
+	pub fn js_string_literal_token_token(&self) -> SyntaxResult<SyntaxToken> {
+		support::required_token(&self.syntax, T![js_string_literal_token])
+	}
 	pub fn r_paren_token(&self) -> SyntaxResult<SyntaxToken> {
 		support::required_token(&self.syntax, T![')'])
 	}
@@ -2225,7 +2246,7 @@ pub enum Decl {
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub enum JsAnyExpression {
 	ArrowExpr(ArrowExpr),
-	Literal(Literal),
+	JsAnyLiteral(JsAnyLiteral),
 	Template(Template),
 	NameRef(NameRef),
 	ThisExpr(ThisExpr),
@@ -2278,6 +2299,15 @@ pub enum Pattern {
 	JsUnknownPattern(JsUnknownPattern),
 }
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
+pub enum JsAnyLiteral {
+	JsStringLiteral(JsStringLiteral),
+	JsNumberLiteral(JsNumberLiteral),
+	JsBigIntLiteral(JsBigIntLiteral),
+	JsBooleanLiteral(JsBooleanLiteral),
+	JsNullLiteral(JsNullLiteral),
+	JsRegexLiteral(JsRegexLiteral),
+}
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub enum TsType {
 	TsAny(TsAny),
 	TsUnknown(TsUnknown),
@@ -2347,7 +2377,8 @@ pub enum ClassElement {
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub enum PropName {
 	ComputedPropertyName(ComputedPropertyName),
-	Literal(Literal),
+	JsStringLiteral(JsStringLiteral),
+	JsNumberLiteral(JsNumberLiteral),
 	Ident(Ident),
 	Name(Name),
 	JsUnknownBinding(JsUnknownBinding),
@@ -2944,17 +2975,6 @@ impl AstNode for ArrowExpr {
 	}
 	fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl AstNode for Literal {
-	fn can_cast(kind: SyntaxKind) -> bool { kind == LITERAL }
-	fn cast(syntax: SyntaxNode) -> Option<Self> {
-		if Self::can_cast(syntax.kind()) {
-			Some(Self { syntax })
-		} else {
-			None
-		}
-	}
-	fn syntax(&self) -> &SyntaxNode { &self.syntax }
-}
 impl AstNode for Template {
 	fn can_cast(kind: SyntaxKind) -> bool { kind == TEMPLATE }
 	fn cast(syntax: SyntaxNode) -> Option<Self> {
@@ -3472,8 +3492,41 @@ impl AstNode for SpreadElement {
 	}
 	fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl AstNode for Null {
-	fn can_cast(kind: SyntaxKind) -> bool { kind == NULL }
+impl AstNode for JsStringLiteral {
+	fn can_cast(kind: SyntaxKind) -> bool { kind == JS_STRING_LITERAL }
+	fn cast(syntax: SyntaxNode) -> Option<Self> {
+		if Self::can_cast(syntax.kind()) {
+			Some(Self { syntax })
+		} else {
+			None
+		}
+	}
+	fn syntax(&self) -> &SyntaxNode { &self.syntax }
+}
+impl AstNode for JsNumberLiteral {
+	fn can_cast(kind: SyntaxKind) -> bool { kind == JS_NUMBER_LITERAL }
+	fn cast(syntax: SyntaxNode) -> Option<Self> {
+		if Self::can_cast(syntax.kind()) {
+			Some(Self { syntax })
+		} else {
+			None
+		}
+	}
+	fn syntax(&self) -> &SyntaxNode { &self.syntax }
+}
+impl AstNode for JsBigIntLiteral {
+	fn can_cast(kind: SyntaxKind) -> bool { kind == JS_BIG_INT_LITERAL }
+	fn cast(syntax: SyntaxNode) -> Option<Self> {
+		if Self::can_cast(syntax.kind()) {
+			Some(Self { syntax })
+		} else {
+			None
+		}
+	}
+	fn syntax(&self) -> &SyntaxNode { &self.syntax }
+}
+impl AstNode for JsBooleanLiteral {
+	fn can_cast(kind: SyntaxKind) -> bool { kind == JS_BOOLEAN_LITERAL }
 	fn cast(syntax: SyntaxNode) -> Option<Self> {
 		if Self::can_cast(syntax.kind()) {
 			Some(Self { syntax })
@@ -3483,8 +3536,19 @@ impl AstNode for Null {
 	}
 	fn syntax(&self) -> &SyntaxNode { &self.syntax }
 }
-impl AstNode for Undefined {
-	fn can_cast(kind: SyntaxKind) -> bool { kind == UNDEFINED }
+impl AstNode for JsNullLiteral {
+	fn can_cast(kind: SyntaxKind) -> bool { kind == JS_NULL_LITERAL }
+	fn cast(syntax: SyntaxNode) -> Option<Self> {
+		if Self::can_cast(syntax.kind()) {
+			Some(Self { syntax })
+		} else {
+			None
+		}
+	}
+	fn syntax(&self) -> &SyntaxNode { &self.syntax }
+}
+impl AstNode for JsRegexLiteral {
+	fn can_cast(kind: SyntaxKind) -> bool { kind == JS_REGEX_LITERAL }
 	fn cast(syntax: SyntaxNode) -> Option<Self> {
 		if Self::can_cast(syntax.kind()) {
 			Some(Self { syntax })
@@ -4630,9 +4694,6 @@ impl AstNode for Decl {
 impl From<ArrowExpr> for JsAnyExpression {
 	fn from(node: ArrowExpr) -> JsAnyExpression { JsAnyExpression::ArrowExpr(node) }
 }
-impl From<Literal> for JsAnyExpression {
-	fn from(node: Literal) -> JsAnyExpression { JsAnyExpression::Literal(node) }
-}
 impl From<Template> for JsAnyExpression {
 	fn from(node: Template) -> JsAnyExpression { JsAnyExpression::Template(node) }
 }
@@ -4733,7 +4794,6 @@ impl AstNode for JsAnyExpression {
 	fn can_cast(kind: SyntaxKind) -> bool {
 		match kind {
 			ARROW_EXPR
-			| LITERAL
 			| TEMPLATE
 			| NAME_REF
 			| THIS_EXPR
@@ -4764,13 +4824,13 @@ impl AstNode for JsAnyExpression {
 			| TS_ASSERTION
 			| TS_CONST_ASSERTION
 			| JS_UNKNOWN_EXPRESSION => true,
+			k if JsAnyLiteral::can_cast(k) => true,
 			_ => false,
 		}
 	}
 	fn cast(syntax: SyntaxNode) -> Option<Self> {
 		let res = match syntax.kind() {
 			ARROW_EXPR => JsAnyExpression::ArrowExpr(ArrowExpr { syntax }),
-			LITERAL => JsAnyExpression::Literal(Literal { syntax }),
 			TEMPLATE => JsAnyExpression::Template(Template { syntax }),
 			NAME_REF => JsAnyExpression::NameRef(NameRef { syntax }),
 			THIS_EXPR => JsAnyExpression::ThisExpr(ThisExpr { syntax }),
@@ -4807,14 +4867,18 @@ impl AstNode for JsAnyExpression {
 			JS_UNKNOWN_EXPRESSION => {
 				JsAnyExpression::JsUnknownExpression(JsUnknownExpression { syntax })
 			}
-			_ => return None,
+			_ => {
+				if let Some(js_any_literal) = JsAnyLiteral::cast(syntax) {
+					return Some(JsAnyExpression::JsAnyLiteral(js_any_literal));
+				}
+				return None;
+			}
 		};
 		Some(res)
 	}
 	fn syntax(&self) -> &SyntaxNode {
 		match self {
 			JsAnyExpression::ArrowExpr(it) => &it.syntax,
-			JsAnyExpression::Literal(it) => &it.syntax,
 			JsAnyExpression::Template(it) => &it.syntax,
 			JsAnyExpression::NameRef(it) => &it.syntax,
 			JsAnyExpression::ThisExpr(it) => &it.syntax,
@@ -4845,6 +4909,7 @@ impl AstNode for JsAnyExpression {
 			JsAnyExpression::TsAssertion(it) => &it.syntax,
 			JsAnyExpression::TsConstAssertion(it) => &it.syntax,
 			JsAnyExpression::JsUnknownExpression(it) => &it.syntax,
+			JsAnyExpression::JsAnyLiteral(it) => it.syntax(),
 		}
 	}
 }
@@ -4962,6 +5027,55 @@ impl AstNode for Pattern {
 		}
 	}
 }
+impl From<JsStringLiteral> for JsAnyLiteral {
+	fn from(node: JsStringLiteral) -> JsAnyLiteral { JsAnyLiteral::JsStringLiteral(node) }
+}
+impl From<JsNumberLiteral> for JsAnyLiteral {
+	fn from(node: JsNumberLiteral) -> JsAnyLiteral { JsAnyLiteral::JsNumberLiteral(node) }
+}
+impl From<JsBigIntLiteral> for JsAnyLiteral {
+	fn from(node: JsBigIntLiteral) -> JsAnyLiteral { JsAnyLiteral::JsBigIntLiteral(node) }
+}
+impl From<JsBooleanLiteral> for JsAnyLiteral {
+	fn from(node: JsBooleanLiteral) -> JsAnyLiteral { JsAnyLiteral::JsBooleanLiteral(node) }
+}
+impl From<JsNullLiteral> for JsAnyLiteral {
+	fn from(node: JsNullLiteral) -> JsAnyLiteral { JsAnyLiteral::JsNullLiteral(node) }
+}
+impl From<JsRegexLiteral> for JsAnyLiteral {
+	fn from(node: JsRegexLiteral) -> JsAnyLiteral { JsAnyLiteral::JsRegexLiteral(node) }
+}
+impl AstNode for JsAnyLiteral {
+	fn can_cast(kind: SyntaxKind) -> bool {
+		match kind {
+			JS_STRING_LITERAL | JS_NUMBER_LITERAL | JS_BIG_INT_LITERAL | JS_BOOLEAN_LITERAL
+			| JS_NULL_LITERAL | JS_REGEX_LITERAL => true,
+			_ => false,
+		}
+	}
+	fn cast(syntax: SyntaxNode) -> Option<Self> {
+		let res = match syntax.kind() {
+			JS_STRING_LITERAL => JsAnyLiteral::JsStringLiteral(JsStringLiteral { syntax }),
+			JS_NUMBER_LITERAL => JsAnyLiteral::JsNumberLiteral(JsNumberLiteral { syntax }),
+			JS_BIG_INT_LITERAL => JsAnyLiteral::JsBigIntLiteral(JsBigIntLiteral { syntax }),
+			JS_BOOLEAN_LITERAL => JsAnyLiteral::JsBooleanLiteral(JsBooleanLiteral { syntax }),
+			JS_NULL_LITERAL => JsAnyLiteral::JsNullLiteral(JsNullLiteral { syntax }),
+			JS_REGEX_LITERAL => JsAnyLiteral::JsRegexLiteral(JsRegexLiteral { syntax }),
+			_ => return None,
+		};
+		Some(res)
+	}
+	fn syntax(&self) -> &SyntaxNode {
+		match self {
+			JsAnyLiteral::JsStringLiteral(it) => &it.syntax,
+			JsAnyLiteral::JsNumberLiteral(it) => &it.syntax,
+			JsAnyLiteral::JsBigIntLiteral(it) => &it.syntax,
+			JsAnyLiteral::JsBooleanLiteral(it) => &it.syntax,
+			JsAnyLiteral::JsNullLiteral(it) => &it.syntax,
+			JsAnyLiteral::JsRegexLiteral(it) => &it.syntax,
+		}
+	}
+}
 impl From<TsAny> for TsType {
 	fn from(node: TsAny) -> TsType { TsType::TsAny(node) }
 }
@@ -5324,8 +5438,11 @@ impl AstNode for ClassElement {
 impl From<ComputedPropertyName> for PropName {
 	fn from(node: ComputedPropertyName) -> PropName { PropName::ComputedPropertyName(node) }
 }
-impl From<Literal> for PropName {
-	fn from(node: Literal) -> PropName { PropName::Literal(node) }
+impl From<JsStringLiteral> for PropName {
+	fn from(node: JsStringLiteral) -> PropName { PropName::JsStringLiteral(node) }
+}
+impl From<JsNumberLiteral> for PropName {
+	fn from(node: JsNumberLiteral) -> PropName { PropName::JsNumberLiteral(node) }
 }
 impl From<Ident> for PropName {
 	fn from(node: Ident) -> PropName { PropName::Ident(node) }
@@ -5339,7 +5456,12 @@ impl From<JsUnknownBinding> for PropName {
 impl AstNode for PropName {
 	fn can_cast(kind: SyntaxKind) -> bool {
 		match kind {
-			COMPUTED_PROPERTY_NAME | LITERAL | IDENT | NAME | JS_UNKNOWN_BINDING => true,
+			COMPUTED_PROPERTY_NAME
+			| JS_STRING_LITERAL
+			| JS_NUMBER_LITERAL
+			| IDENT
+			| NAME
+			| JS_UNKNOWN_BINDING => true,
 			_ => false,
 		}
 	}
@@ -5348,7 +5470,8 @@ impl AstNode for PropName {
 			COMPUTED_PROPERTY_NAME => {
 				PropName::ComputedPropertyName(ComputedPropertyName { syntax })
 			}
-			LITERAL => PropName::Literal(Literal { syntax }),
+			JS_STRING_LITERAL => PropName::JsStringLiteral(JsStringLiteral { syntax }),
+			JS_NUMBER_LITERAL => PropName::JsNumberLiteral(JsNumberLiteral { syntax }),
 			IDENT => PropName::Ident(Ident { syntax }),
 			NAME => PropName::Name(Name { syntax }),
 			JS_UNKNOWN_BINDING => PropName::JsUnknownBinding(JsUnknownBinding { syntax }),
@@ -5359,7 +5482,8 @@ impl AstNode for PropName {
 	fn syntax(&self) -> &SyntaxNode {
 		match self {
 			PropName::ComputedPropertyName(it) => &it.syntax,
-			PropName::Literal(it) => &it.syntax,
+			PropName::JsStringLiteral(it) => &it.syntax,
+			PropName::JsNumberLiteral(it) => &it.syntax,
 			PropName::Ident(it) => &it.syntax,
 			PropName::Name(it) => &it.syntax,
 			PropName::JsUnknownBinding(it) => &it.syntax,
@@ -5776,6 +5900,11 @@ impl std::fmt::Display for Pattern {
 		std::fmt::Display::fmt(self.syntax(), f)
 	}
 }
+impl std::fmt::Display for JsAnyLiteral {
+	fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+		std::fmt::Display::fmt(self.syntax(), f)
+	}
+}
 impl std::fmt::Display for TsType {
 	fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
 		std::fmt::Display::fmt(self.syntax(), f)
@@ -6101,11 +6230,6 @@ impl std::fmt::Display for ArrowExpr {
 		std::fmt::Display::fmt(self.syntax(), f)
 	}
 }
-impl std::fmt::Display for Literal {
-	fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-		std::fmt::Display::fmt(self.syntax(), f)
-	}
-}
 impl std::fmt::Display for Template {
 	fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
 		std::fmt::Display::fmt(self.syntax(), f)
@@ -6341,12 +6465,32 @@ impl std::fmt::Display for SpreadElement {
 		std::fmt::Display::fmt(self.syntax(), f)
 	}
 }
-impl std::fmt::Display for Null {
+impl std::fmt::Display for JsStringLiteral {
+	fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+		std::fmt::Display::fmt(self.syntax(), f)
+	}
+}
+impl std::fmt::Display for JsNumberLiteral {
+	fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+		std::fmt::Display::fmt(self.syntax(), f)
+	}
+}
+impl std::fmt::Display for JsBigIntLiteral {
+	fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+		std::fmt::Display::fmt(self.syntax(), f)
+	}
+}
+impl std::fmt::Display for JsBooleanLiteral {
+	fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+		std::fmt::Display::fmt(self.syntax(), f)
+	}
+}
+impl std::fmt::Display for JsNullLiteral {
 	fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
 		std::fmt::Display::fmt(self.syntax(), f)
 	}
 }
-impl std::fmt::Display for Undefined {
+impl std::fmt::Display for JsRegexLiteral {
 	fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
 		std::fmt::Display::fmt(self.syntax(), f)
 	}
diff --git a/crates/rslint_parser/src/ast/generated/tokens.rs b/crates/rslint_parser/src/ast/generated/tokens.rs
index 50ce07ec36cb..d0d84c6ced56 100644
--- a/crates/rslint_parser/src/ast/generated/tokens.rs
+++ b/crates/rslint_parser/src/ast/generated/tokens.rs
@@ -6,48 +6,6 @@ use crate::{
 	SyntaxToken,
 };
 
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct String {
-	pub(crate) syntax: SyntaxToken,
-}
-impl std::fmt::Display for String {
-	fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-		std::fmt::Display::fmt(&self.syntax, f)
-	}
-}
-impl AstToken for String {
-	fn can_cast(kind: SyntaxKind) -> bool { kind == STRING }
-	fn cast(syntax: SyntaxToken) -> Option<Self> {
-		if Self::can_cast(syntax.kind()) {
-			Some(Self { syntax })
-		} else {
-			None
-		}
-	}
-	fn syntax(&self) -> &SyntaxToken { &self.syntax }
-}
-
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct Number {
-	pub(crate) syntax: SyntaxToken,
-}
-impl std::fmt::Display for Number {
-	fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-		std::fmt::Display::fmt(&self.syntax, f)
-	}
-}
-impl AstToken for Number {
-	fn can_cast(kind: SyntaxKind) -> bool { kind == NUMBER }
-	fn cast(syntax: SyntaxToken) -> Option<Self> {
-		if Self::can_cast(syntax.kind()) {
-			Some(Self { syntax })
-		} else {
-			None
-		}
-	}
-	fn syntax(&self) -> &SyntaxToken { &self.syntax }
-}
-
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct Whitespace {
 	pub(crate) syntax: SyntaxToken,
diff --git a/crates/rslint_parser/src/ast/stmt_ext.rs b/crates/rslint_parser/src/ast/stmt_ext.rs
index f6824b62701a..a2d3b3a99117 100644
--- a/crates/rslint_parser/src/ast/stmt_ext.rs
+++ b/crates/rslint_parser/src/ast/stmt_ext.rs
@@ -65,25 +65,6 @@ impl JsVariableDeclaration {
 	}
 }
 
-impl ImportDecl {
-	/// The source of the import, such as `import a from "a"` ("a"), or `import "foo"` ("foo")
-	pub fn source(&self) -> Option<Literal> {
-		self.syntax()
-			.children()
-			.find_map(|x| x.try_to::<Literal>().filter(|x| x.is_string()))
-	}
-}
-
-impl ExportDecl {
-	/// The source of the export, such as `export a from "a"` ("a"), or `export "foo"` ("foo")
-	pub fn source(&self) -> Option<Literal> {
-		self.syntax().children().find_map(|x| {
-			x.children()
-				.find_map(|x| x.try_to::<Literal>().filter(|x| x.is_string()))
-		})
-	}
-}
-
 impl Specifier {
 	pub fn as_token(&self) -> Option<SyntaxToken> {
 		self.syntax()
@@ -131,6 +112,6 @@ mod tests {
 
 impl TsEnumMember {
 	pub fn string_token(&self) -> Option<SyntaxToken> {
-		support::token(&self.syntax, STRING)
+		support::token(&self.syntax, JS_STRING_LITERAL_TOKEN)
 	}
 }
diff --git a/crates/rslint_parser/src/ast/ts_ext.rs b/crates/rslint_parser/src/ast/ts_ext.rs
index 5be641680c16..c38e18b39fbc 100644
--- a/crates/rslint_parser/src/ast/ts_ext.rs
+++ b/crates/rslint_parser/src/ast/ts_ext.rs
@@ -39,7 +39,7 @@ impl TsImport {
 		self.syntax()
 			.tokens()
 			.into_iter()
-			.find(|t| t.kind() == STRING)
+			.find(|t| t.kind() == JS_STRING_LITERAL_TOKEN)
 	}
 }
 
diff --git a/crates/rslint_parser/src/lib.rs b/crates/rslint_parser/src/lib.rs
index ad120e61fd83..8ad12f1b4d73 100644
--- a/crates/rslint_parser/src/lib.rs
+++ b/crates/rslint_parser/src/lib.rs
@@ -81,7 +81,7 @@ pub use crate::{
 	event::{process, Event},
 	lossless_tree_sink::LosslessTreeSink,
 	lossy_tree_sink::LossyTreeSink,
-	numbers::{parse_js_num, BigInt, JsNum},
+	numbers::BigInt,
 	parse::*,
 	parser::{Checkpoint, CompletedMarker, Marker, Parser},
 	state::{ParserState, StrictMode},
diff --git a/crates/rslint_parser/src/numbers.rs b/crates/rslint_parser/src/numbers.rs
index 24372289d73c..05ee74c54e72 100644
--- a/crates/rslint_parser/src/numbers.rs
+++ b/crates/rslint_parser/src/numbers.rs
@@ -4,48 +4,45 @@ use lexical::parse_radix;
 
 pub use num_bigint::BigInt;
 
-#[derive(Debug, Clone, PartialEq)]
-pub enum JsNum {
-	Float(f64),
-	BigInt(BigInt),
-}
-
-/// Parse a js number as a string into a number.
-pub fn parse_js_num(num: String) -> Option<JsNum> {
-	let (radix, mut raw) = match num.get(0..2) {
+fn split_into_radix_and_number(num: &str) -> (u32, String) {
+	match num.get(0..2) {
 		Some("0x") | Some("0X") => (16, num.get(2..).unwrap().replace("_", "")),
 		Some("0b") | Some("0B") => (2, num.get(2..).unwrap().replace("_", "")),
 		Some("0o") | Some("0O") => (8, num.get(2..).unwrap().replace("_", "")),
-		_ => (10, num.as_str().replace("_", "")),
-	};
+		_ => (10, num.replace("_", "")),
+	}
+}
+
+/// Parse a js number as a string into a number.
+pub fn parse_js_number(num: &str) -> Option<f64> {
+	let (radix, raw) = split_into_radix_and_number(num);
 
 	if radix == 10 && raw.starts_with('0') {
 		// account for legacy octal literals
-		if let Ok(parsed) = parse_radix(raw.as_bytes(), 8) {
-			return Some(JsNum::Float(parsed));
+		if let Ok(parsed) = parse_radix::<f64, _>(raw.as_bytes(), 8) {
+			return Some(parsed);
 		}
 	}
 
-	let bigint = if raw.get(raw.len() - 1..raw.len()) == Some("n") {
-		raw = raw.split_at(raw.len() - 1).0.to_string();
-		true
-	} else {
-		false
-	};
+	parse_radix::<f64, _>(raw.as_bytes(), radix as u8).ok()
+}
 
-	if bigint {
-		Some(JsNum::BigInt(BigInt::parse_bytes(raw.as_bytes(), radix)?))
+/// Parse a big int number as a string into a number.
+pub fn parse_js_big_int(num: &str) -> Option<BigInt> {
+	let (radix, raw) = split_into_radix_and_number(num);
+
+	let raw = if raw.get(raw.len() - 1..raw.len()) == Some("n") {
+		raw.split_at(raw.len() - 1).0.to_string()
 	} else {
-		Some(JsNum::Float(
-			parse_radix::<f64, _>(raw.as_bytes(), radix as u8).ok()?,
-		))
-	}
+		raw
+	};
+	BigInt::parse_bytes(raw.as_bytes(), radix)
 }
 
 #[cfg(test)]
 mod tests {
 	use crate::{
-		ast::{JsAnyExpression, LiteralKind},
+		ast::{AstNode, JsBigIntLiteral, JsNumberLiteral},
 		parse_expr,
 	};
 	use num_bigint::ToBigInt;
@@ -53,10 +50,13 @@ mod tests {
 	macro_rules! assert_float {
 		($literal:literal, $value:expr) => {
 			let parsed = parse_expr($literal, 0);
-			if let JsAnyExpression::Literal(literal) = parsed.tree() {
+			if let Some(literal) = JsNumberLiteral::cast(parsed.syntax()) {
 				assert_eq!(literal.as_number(), Some($value));
 			} else {
-				panic!("Parsed expression is not a literal");
+				panic!(
+					"Parsed expression is not a number literal. Expr:\n{:#?}",
+					parsed.syntax()
+				);
 			}
 		};
 	}
@@ -64,11 +64,14 @@ mod tests {
 	macro_rules! assert_bigint {
 		($literal:literal, $value:expr) => {
 			let parsed = parse_expr($literal, 0);
-			if let JsAnyExpression::Literal(literal) = parsed.tree() {
-				let val = ($value as u64).to_bigint().unwrap();
-				assert_eq!(literal.kind(), LiteralKind::BigInt(val));
+			if let Some(literal) = JsBigIntLiteral::cast(parsed.syntax()) {
+				let val = ($value as u64).to_bigint();
+				assert_eq!(literal.as_number(), val);
 			} else {
-				panic!("Parsed expression is not a literal");
+				panic!(
+					"Parsed expression is not a big int literal. Expr:\n{:#?}",
+					parsed.syntax()
+				);
 			}
 		};
 	}
diff --git a/crates/rslint_parser/src/syntax/decl.rs b/crates/rslint_parser/src/syntax/decl.rs
index 7f3202b4a8aa..fbe4060b8969 100644
--- a/crates/rslint_parser/src/syntax/decl.rs
+++ b/crates/rslint_parser/src/syntax/decl.rs
@@ -14,8 +14,8 @@ pub const BASE_METHOD_RECOVERY_SET: TokenSet = token_set![
 	T![await],
 	T![;],
 	T!['}'],
-	NUMBER,
-	STRING
+	JS_NUMBER_LITERAL_TOKEN,
+	JS_STRING_LITERAL_TOKEN
 ];
 
 pub fn decorators(p: &mut Parser) -> Vec<CompletedMarker> {
@@ -1151,7 +1151,13 @@ pub fn method(
 			args_body(&mut *guard);
 			m.complete(&mut *guard, METHOD)
 		}
-		T![*] | STRING | NUMBER | T![await] | T![ident] | T![yield] | T!['['] => {
+		T![*]
+		| JS_STRING_LITERAL_TOKEN
+		| JS_NUMBER_LITERAL_TOKEN
+		| T![await]
+		| T![ident]
+		| T![yield]
+		| T!['['] => {
 			let in_generator = p.eat(T![*]);
 			let mut guard = p.with_state(ParserState {
 				in_generator,
diff --git a/crates/rslint_parser/src/syntax/expr.rs b/crates/rslint_parser/src/syntax/expr.rs
index 8d84ac9ebff8..a0641a944162 100644
--- a/crates/rslint_parser/src/syntax/expr.rs
+++ b/crates/rslint_parser/src/syntax/expr.rs
@@ -13,8 +13,6 @@ use super::typescript::*;
 use super::util::*;
 use crate::{SyntaxKind::*, *};
 
-pub const LITERAL: TokenSet = token_set![TRUE_KW, FALSE_KW, NUMBER, STRING, NULL_KW, REGEX];
-
 pub const EXPR_RECOVERY_SET: TokenSet = token_set![VAR_KW, R_PAREN, L_PAREN, L_BRACK, R_BRACK];
 
 pub const ASSIGN_TOKENS: TokenSet = token_set![
@@ -61,8 +59,13 @@ pub const STARTS_EXPR: TokenSet = token_set![
 	T![import],
 	T![super],
 	BACKTICK,
-]
-.union(LITERAL);
+	TRUE_KW,
+	FALSE_KW,
+	JS_NUMBER_LITERAL_TOKEN,
+	JS_STRING_LITERAL_TOKEN,
+	NULL_KW,
+	JS_REGEX_LITERAL_TOKEN
+];
 
 /// A literal expression.
 ///
@@ -76,12 +79,27 @@ pub const STARTS_EXPR: TokenSet = token_set![
 // 'bar'
 // null
 pub fn literal(p: &mut Parser) -> Option<CompletedMarker> {
-	if !p.at_ts(LITERAL) {
-		return None;
-	}
+	let literal_kind = match p.cur_tok().kind {
+		SyntaxKind::JS_NUMBER_LITERAL_TOKEN => {
+			if p.cur_src().ends_with('n') {
+				let m = p.start();
+				p.bump_remap(SyntaxKind::JS_BIG_INT_LITERAL_TOKEN);
+				return Some(m.complete(p, JS_BIG_INT_LITERAL));
+			};
+
+			SyntaxKind::JS_NUMBER_LITERAL
+		}
+		SyntaxKind::JS_STRING_LITERAL_TOKEN => SyntaxKind::JS_STRING_LITERAL,
+		SyntaxKind::NULL_KW => SyntaxKind::JS_NULL_LITERAL,
+		SyntaxKind::TRUE_KW | SyntaxKind::FALSE_KW => SyntaxKind::JS_BOOLEAN_LITERAL,
+		// TODO
+		SyntaxKind::JS_REGEX_LITERAL_TOKEN => SyntaxKind::JS_REGEX_LITERAL,
+		_ => return None,
+	};
+
 	let m = p.start();
 	p.bump_any();
-	Some(m.complete(p, SyntaxKind::LITERAL))
+	Some(m.complete(p, literal_kind))
 }
 
 /// An assignment expression such as `foo += bar` or `foo = 5`.
@@ -1178,8 +1196,14 @@ pub fn object_expr(p: &mut Parser) -> CompletedMarker {
 	m.complete(p, OBJECT_EXPR)
 }
 
-const STARTS_OBJ_PROP: TokenSet =
-	token_set![STRING, NUMBER, T![ident], T![await], T![yield], T!['[']];
+const STARTS_OBJ_PROP: TokenSet = token_set![
+	JS_STRING_LITERAL_TOKEN,
+	JS_NUMBER_LITERAL_TOKEN,
+	T![ident],
+	T![await],
+	T![yield],
+	T!['[']
+];
 
 /// An individual object property such as `"a": b` or `5: 6 + 6`.
 pub fn object_property(p: &mut Parser) -> Option<CompletedMarker> {
@@ -1276,7 +1300,7 @@ pub fn object_property(p: &mut Parser) -> Option<CompletedMarker> {
 // let a = {"foo": foo, [6 + 6]: foo, bar: foo, 7: foo}
 pub fn object_prop_name(p: &mut Parser, binding: bool) -> Option<CompletedMarker> {
 	match p.cur() {
-		STRING | NUMBER => literal(p),
+		JS_STRING_LITERAL_TOKEN | JS_NUMBER_LITERAL_TOKEN => literal(p),
 		T!['['] => {
 			let m = p.start();
 			p.bump_any();
diff --git a/crates/rslint_parser/src/syntax/program.rs b/crates/rslint_parser/src/syntax/program.rs
index b708fa662e74..3fe987429012 100644
--- a/crates/rslint_parser/src/syntax/program.rs
+++ b/crates/rslint_parser/src/syntax/program.rs
@@ -113,7 +113,7 @@ pub fn import_decl(p: &mut Parser) -> CompletedMarker {
 
 	let list = p.start();
 
-	if p.at(STRING) {
+	if p.at(JS_STRING_LITERAL_TOKEN) {
 		let inner = p.start();
 		p.bump_any();
 		inner.complete(p, IMPORT_STRING_SPECIFIER);
@@ -178,7 +178,7 @@ pub fn import_decl(p: &mut Parser) -> CompletedMarker {
 		p.bump_remap(T![from]);
 	}
 
-	if !p.at(STRING) {
+	if !p.at(JS_STRING_LITERAL_TOKEN) {
 		let err = p
 			.err_builder(
 				"expected a source for a `from` clause in an import statement, but found none",
@@ -557,7 +557,7 @@ pub fn ts_external_module_ref(p: &mut Parser) -> CompletedMarker {
 	}
 
 	p.expect(T!['(']);
-	p.expect(STRING);
+	p.expect(JS_STRING_LITERAL_TOKEN);
 	p.expect(T![')']);
 	m.complete(p, TS_EXTERNAL_MODULE_REF)
 }
diff --git a/crates/rslint_parser/src/syntax/stmt.rs b/crates/rslint_parser/src/syntax/stmt.rs
index 3a5e55e3953b..4d053f3542ba 100644
--- a/crates/rslint_parser/src/syntax/stmt.rs
+++ b/crates/rslint_parser/src/syntax/stmt.rs
@@ -8,6 +8,7 @@ use super::pat::*;
 use super::program::{export_decl, import_decl};
 use super::typescript::*;
 use super::util::{check_for_stmt_declaration, check_label_use, check_lhs};
+use crate::ast::JsStringLiteral;
 use crate::{SyntaxKind::*, *};
 
 pub const STMT_RECOVERY_SET: TokenSet = token_set![
@@ -591,18 +592,17 @@ pub(crate) fn block_items(
 					let parsed = p
 						.parse_marker::<ast::JsExpressionStatement>(complete.as_ref().unwrap())
 						.expression();
-					if let Ok(LITERAL) = parsed.as_ref().map(|it| it.syntax().kind()) {
-						let unwrapped = parsed.unwrap().syntax().to::<ast::Literal>();
-						if unwrapped.is_string() {
-							if unwrapped.inner_string_text().unwrap() == "use strict" {
-								let range = complete.as_ref().unwrap().range(p).into();
-								// We must do this because we cannot have multiple mutable borrows of p
-								let mut new = p.state.clone();
-								new.strict(p, range);
-								p.state = new;
-								could_be_directive = false;
-							}
-						} else {
+					if let Some(string_literal) = parsed
+						.as_ref()
+						.ok()
+						.and_then(|it| JsStringLiteral::cast(it.syntax().clone()))
+					{
+						if string_literal.inner_string_text() == "use strict" {
+							let range = complete.as_ref().unwrap().range(p).into();
+							// We must do this because we cannot have multiple mutable borrows of p
+							let mut new = p.state.clone();
+							new.strict(p, range);
+							p.state = new;
 							could_be_directive = false;
 						}
 					}
diff --git a/crates/rslint_parser/src/syntax/typescript.rs b/crates/rslint_parser/src/syntax/typescript.rs
index aec84c4d2af1..61d9f752e1b9 100644
--- a/crates/rslint_parser/src/syntax/typescript.rs
+++ b/crates/rslint_parser/src/syntax/typescript.rs
@@ -221,7 +221,7 @@ pub(crate) fn ts_decl(p: &mut Parser) -> Option<CompletedMarker> {
 	}
 
 	if p.cur_src() == "module" {
-		if p.nth_at(1, STRING) {
+		if p.nth_at(1, JS_STRING_LITERAL_TOKEN) {
 			return ts_ambient_external_module_decl(p, true);
 		} else if token_set![T![ident], T![yield], T![await]].contains(p.nth(1)) {
 			p.bump_remap(T![module]);
@@ -313,7 +313,7 @@ pub fn ts_ambient_external_module_decl(
 	if p.cur_src() == "global" {
 		p.bump_any();
 	} else {
-		p.expect(STRING);
+		p.expect(JS_STRING_LITERAL_TOKEN);
 	}
 	if p.at(T!['{']) {
 		ts_module_block(p);
@@ -465,7 +465,7 @@ fn ts_property_or_method_sig(p: &mut Parser, m: Marker, readonly: bool) -> Optio
 		p.expect_no_recover(T![']'])?;
 	} else {
 		match p.cur() {
-			STRING | NUMBER => {
+			JS_STRING_LITERAL_TOKEN | JS_NUMBER_LITERAL_TOKEN => {
 				literal(p);
 			}
 			_ => {
@@ -585,7 +585,7 @@ pub fn ts_enum(p: &mut Parser) -> CompletedMarker {
 		let member = p.start();
 		let err_occured = if !p.at_ts(token_set![T![ident], T![yield], T![await]])
 			&& !p.cur().is_keyword()
-			&& !p.at(STRING)
+			&& !p.at(JS_STRING_LITERAL_TOKEN)
 		{
 			let err = p
 				.err_builder("expected an identifier or string for an enum variant, but found none")
@@ -598,7 +598,7 @@ pub fn ts_enum(p: &mut Parser) -> CompletedMarker {
 			);
 			true
 		} else {
-			if !p.eat(STRING) {
+			if !p.eat(JS_STRING_LITERAL_TOKEN) {
 				identifier_name(p).unwrap().undo_completion(p).abandon(p);
 			}
 			false
@@ -932,9 +932,11 @@ pub fn ts_non_array_type(p: &mut Parser) -> Option<CompletedMarker> {
 				ts_type_ref(p, None)
 			}
 		}
-		NUMBER | STRING | TRUE_KW | FALSE_KW | REGEX => {
-			Some(literal(p).unwrap().precede(p).complete(p, TS_LITERAL))
-		}
+		JS_NUMBER_LITERAL_TOKEN
+		| JS_STRING_LITERAL_TOKEN
+		| TRUE_KW
+		| FALSE_KW
+		| JS_REGEX_LITERAL_TOKEN => Some(literal(p).unwrap().precede(p).complete(p, TS_LITERAL)),
 		BACKTICK => {
 			let m = p.start();
 			p.bump_any();
@@ -961,12 +963,12 @@ pub fn ts_non_array_type(p: &mut Parser) -> Option<CompletedMarker> {
 		T![-] => {
 			let m = p.start();
 			p.bump_any();
-			if p.at(NUMBER) {
+			if p.at(JS_NUMBER_LITERAL_TOKEN) {
 				let _m = p.start();
 				p.bump_any();
-				_m.complete(p, LITERAL);
+				_m.complete(p, JS_NUMBER_LITERAL);
 			} else {
-				p.expect_no_recover(NUMBER)?;
+				p.expect_no_recover(JS_NUMBER_LITERAL_TOKEN)?;
 			}
 			Some(m.complete(p, TS_LITERAL))
 		}
@@ -1020,11 +1022,11 @@ pub fn ts_non_array_type(p: &mut Parser) -> Option<CompletedMarker> {
 					T![this],
 					T![import],
 					T![-],
-					NUMBER,
-					STRING,
+					JS_NUMBER_LITERAL_TOKEN,
+					JS_STRING_LITERAL_TOKEN,
 					TRUE_KW,
 					FALSE_KW,
-					REGEX,
+					JS_REGEX_LITERAL_TOKEN,
 					BACKTICK,
 					T![&],
 					T![|]
@@ -1136,7 +1138,7 @@ pub fn ts_import(p: &mut Parser) -> Option<CompletedMarker> {
 	let m = p.start();
 	p.expect_no_recover(T![import])?;
 	p.expect_no_recover(T!['('])?;
-	p.expect_no_recover(STRING)?;
+	p.expect_no_recover(JS_STRING_LITERAL_TOKEN)?;
 	p.expect_no_recover(T![')'])?;
 	if p.eat(T![.]) {
 		ts_entity_name(p, None, false);
diff --git a/crates/rslint_parser/src/syntax/util.rs b/crates/rslint_parser/src/syntax/util.rs
index b23056c90b27..7e817aa0f88e 100644
--- a/crates/rslint_parser/src/syntax/util.rs
+++ b/crates/rslint_parser/src/syntax/util.rs
@@ -58,7 +58,7 @@ pub fn check_assign_target(
 
 		fn should_deny(e: &JsAnyExpression, deny_call: bool) -> bool {
 			match e {
-				JsAnyExpression::Literal(_) => false,
+				JsAnyExpression::JsAnyLiteral(_) => false,
 				JsAnyExpression::CallExpr(_) => deny_call,
 				JsAnyExpression::BinExpr(_) => false,
 				JsAnyExpression::GroupingExpr(it) => {
diff --git a/crates/rslint_parser/test_data/inline/err/binary_expressions_err.rast b/crates/rslint_parser/test_data/inline/err/binary_expressions_err.rast
index 9f3bbd5ed65f..4260eaa97ca5 100644
--- a/crates/rslint_parser/test_data/inline/err/binary_expressions_err.rast
+++ b/crates/rslint_parser/test_data/inline/err/binary_expressions_err.rast
@@ -25,8 +25,8 @@ JS_MODULE@0..35
         BIN_EXPR@18..21
           STAR@18..19 "*"
           WHITESPACE@19..20 " "
-          LITERAL@20..21
-            NUMBER@20..21 "2"
+          JS_NUMBER_LITERAL@20..21
+            JS_NUMBER_LITERAL_TOKEN@20..21 "2"
       SEMICOLON@21..22 ";"
     WHITESPACE@22..23 "\n"
     JS_EXPRESSION_STATEMENT@23..34
diff --git a/crates/rslint_parser/test_data/inline/err/binding_identifier_invalid.rast b/crates/rslint_parser/test_data/inline/err/binding_identifier_invalid.rast
index 1e6df8890228..495cac1eeb20 100644
--- a/crates/rslint_parser/test_data/inline/err/binding_identifier_invalid.rast
+++ b/crates/rslint_parser/test_data/inline/err/binding_identifier_invalid.rast
@@ -28,8 +28,8 @@ JS_MODULE@0..83
                     JS_EQUAL_VALUE_CLAUSE@24..27
                       EQ@24..25 "="
                       WHITESPACE@25..26 " "
-                      LITERAL@26..27
-                        NUMBER@26..27 "5"
+                      JS_NUMBER_LITERAL@26..27
+                        JS_NUMBER_LITERAL_TOKEN@26..27 "5"
               SEMICOLON@27..28 ";"
           WHITESPACE@28..29 " "
           R_CURLY@29..30 "}"
@@ -62,8 +62,8 @@ JS_MODULE@0..83
                   JS_EQUAL_VALUE_CLAUSE@62..65
                     EQ@62..63 "="
                     WHITESPACE@63..64 " "
-                    LITERAL@64..65
-                      NUMBER@64..65 "5"
+                    JS_NUMBER_LITERAL@64..65
+                      JS_NUMBER_LITERAL_TOKEN@64..65 "5"
             SEMICOLON@65..66 ";"
         WHITESPACE@66..67 "\n"
         R_CURLY@67..68 "}"
@@ -81,8 +81,8 @@ JS_MODULE@0..83
             JS_EQUAL_VALUE_CLAUSE@78..81
               EQ@78..79 "="
               WHITESPACE@79..80 " "
-              LITERAL@80..81
-                NUMBER@80..81 "5"
+              JS_NUMBER_LITERAL@80..81
+                JS_NUMBER_LITERAL_TOKEN@80..81 "5"
       SEMICOLON@81..82 ";"
   WHITESPACE@82..83 "\n"
 --
diff --git a/crates/rslint_parser/test_data/inline/err/do_while_stmt_err.rast b/crates/rslint_parser/test_data/inline/err/do_while_stmt_err.rast
index ac8a511bca20..d7c7bc0e81c7 100644
--- a/crates/rslint_parser/test_data/inline/err/do_while_stmt_err.rast
+++ b/crates/rslint_parser/test_data/inline/err/do_while_stmt_err.rast
@@ -7,7 +7,7 @@ JS_MODULE@0..42
         WHILE_KW@3..8 "while"
         WHITESPACE@8..9 " "
         L_PAREN@9..10 "("
-        LITERAL@10..14
+        JS_BOOLEAN_LITERAL@10..14
           TRUE_KW@10..14 "true"
         R_PAREN@14..15 ")"
         WHITESPACE@15..16 "\n"
@@ -26,7 +26,7 @@ JS_MODULE@0..42
               JS_WHILE_STATEMENT@31..42
                 WHILE_KW@31..36 "while"
                 WHITESPACE@36..37 " "
-                LITERAL@37..41
+                JS_BOOLEAN_LITERAL@37..41
                   TRUE_KW@37..41 "true"
                 WHITESPACE@41..42 "\n"
                 ERROR@42..42
diff --git a/crates/rslint_parser/test_data/inline/err/export_decl_not_top_level.rast b/crates/rslint_parser/test_data/inline/err/export_decl_not_top_level.rast
index 509ce91c9e9e..9b1fe70444a3 100644
--- a/crates/rslint_parser/test_data/inline/err/export_decl_not_top_level.rast
+++ b/crates/rslint_parser/test_data/inline/err/export_decl_not_top_level.rast
@@ -19,8 +19,8 @@ JS_MODULE@0..34
             WHITESPACE@18..19 " "
             FROM_KW@19..23 "from"
             WHITESPACE@23..24 " "
-            LITERAL@24..30
-              STRING@24..30 "\"life\""
+            JS_STRING_LITERAL@24..30
+              JS_STRING_LITERAL_TOKEN@24..30 "\"life\""
             SEMICOLON@30..31 ";"
       WHITESPACE@31..32 "\n"
       R_CURLY@32..33 "}"
diff --git a/crates/rslint_parser/test_data/inline/err/for_stmt_err.rast b/crates/rslint_parser/test_data/inline/err/for_stmt_err.rast
index 4f63a9e05afd..ac080fac201b 100644
--- a/crates/rslint_parser/test_data/inline/err/for_stmt_err.rast
+++ b/crates/rslint_parser/test_data/inline/err/for_stmt_err.rast
@@ -28,8 +28,8 @@ JS_MODULE@0..40
                 JS_EQUAL_VALUE_CLAUSE@20..23
                   EQ@20..21 "="
                   WHITESPACE@21..22 " "
-                  LITERAL@22..23
-                    NUMBER@22..23 "5"
+                  JS_NUMBER_LITERAL@22..23
+                    JS_NUMBER_LITERAL_TOKEN@22..23 "5"
         SEMICOLON@23..24 ";"
         WHITESPACE@24..25 " "
         FOR_STMT_TEST@25..31
@@ -39,8 +39,8 @@ JS_MODULE@0..40
             WHITESPACE@26..27 " "
             L_ANGLE@27..28 "<"
             WHITESPACE@28..29 " "
-            LITERAL@29..31
-              NUMBER@29..31 "10"
+            JS_NUMBER_LITERAL@29..31
+              JS_NUMBER_LITERAL_TOKEN@29..31 "10"
         SEMICOLON@31..32 ";"
         WHITESPACE@32..33 " "
         FOR_STMT_UPDATE@33..36
diff --git a/crates/rslint_parser/test_data/inline/err/if_stmt_err.rast b/crates/rslint_parser/test_data/inline/err/if_stmt_err.rast
index 66b2ed617a15..ba1a240af491 100644
--- a/crates/rslint_parser/test_data/inline/err/if_stmt_err.rast
+++ b/crates/rslint_parser/test_data/inline/err/if_stmt_err.rast
@@ -4,7 +4,7 @@ JS_MODULE@0..61
       IF_KW@0..2 "if"
       WHITESPACE@2..3 " "
       L_PAREN@3..4 "("
-      LITERAL@4..8
+      JS_BOOLEAN_LITERAL@4..8
         TRUE_KW@4..8 "true"
       R_PAREN@8..9 ")"
       WHITESPACE@9..10 " "
@@ -20,7 +20,7 @@ JS_MODULE@0..61
       IF_KW@18..20 "if"
       WHITESPACE@20..21 " "
       L_PAREN@21..22 "("
-      LITERAL@22..26
+      JS_BOOLEAN_LITERAL@22..26
         TRUE_KW@22..26 "true"
       R_PAREN@26..27 ")"
       WHITESPACE@27..28 " "
diff --git a/crates/rslint_parser/test_data/inline/err/import_decl_not_top_level.rast b/crates/rslint_parser/test_data/inline/err/import_decl_not_top_level.rast
index 64b19371fb45..c051c08f2e82 100644
--- a/crates/rslint_parser/test_data/inline/err/import_decl_not_top_level.rast
+++ b/crates/rslint_parser/test_data/inline/err/import_decl_not_top_level.rast
@@ -13,8 +13,8 @@ JS_MODULE@0..28
           WHITESPACE@13..14 " "
           FROM_KW@14..18 "from"
           WHITESPACE@18..19 " "
-          LITERAL@19..24
-            STRING@19..24 "\"bar\""
+          JS_STRING_LITERAL@19..24
+            JS_STRING_LITERAL_TOKEN@19..24 "\"bar\""
           SEMICOLON@24..25 ";"
       WHITESPACE@25..26 "\n"
       R_CURLY@26..27 "}"
diff --git a/crates/rslint_parser/test_data/inline/err/invalid_method_recover.rast b/crates/rslint_parser/test_data/inline/err/invalid_method_recover.rast
index 3557b452b8af..e60fc1ec93ab 100644
--- a/crates/rslint_parser/test_data/inline/err/invalid_method_recover.rast
+++ b/crates/rslint_parser/test_data/inline/err/invalid_method_recover.rast
@@ -11,13 +11,13 @@ JS_MODULE@0..48
             COMPUTED_PROPERTY_NAME@10..17
               L_BRACK@10..11 "["
               BIN_EXPR@11..16
-                LITERAL@11..12
-                  NUMBER@11..12 "1"
+                JS_NUMBER_LITERAL@11..12
+                  JS_NUMBER_LITERAL_TOKEN@11..12 "1"
                 WHITESPACE@12..13 " "
                 PLUS@13..14 "+"
                 WHITESPACE@14..15 " "
-                LITERAL@15..16
-                  NUMBER@15..16 "1"
+                JS_NUMBER_LITERAL@15..16
+                  JS_NUMBER_LITERAL_TOKEN@15..16 "1"
               R_BRACK@16..17 "]"
             WHITESPACE@17..18 " "
             EQ@18..19 "="
diff --git a/crates/rslint_parser/test_data/inline/err/object_expr_error_prop_name.rast b/crates/rslint_parser/test_data/inline/err/object_expr_error_prop_name.rast
index 1a4e3364f626..a1ff51b14bd3 100644
--- a/crates/rslint_parser/test_data/inline/err/object_expr_error_prop_name.rast
+++ b/crates/rslint_parser/test_data/inline/err/object_expr_error_prop_name.rast
@@ -19,11 +19,11 @@ JS_MODULE@0..40
                 LIST@10..24
                   LITERAL_PROP@10..24
                     ERROR@10..17
-                      REGEX@10..17 "/: 6, /"
+                      JS_REGEX_LITERAL_TOKEN@10..17 "/: 6, /"
                     COLON@17..18 ":"
                     WHITESPACE@18..19 " "
-                    LITERAL@19..24
-                      REGEX@19..24 "/foo/"
+                    JS_REGEX_LITERAL@19..24
+                      JS_REGEX_LITERAL_TOKEN@19..24 "/foo/"
                 WHITESPACE@24..25 " "
                 R_CURLY@25..26 "}"
     WHITESPACE@26..27 "\n"
diff --git a/crates/rslint_parser/test_data/inline/err/object_expr_non_ident_literal_prop.rast b/crates/rslint_parser/test_data/inline/err/object_expr_non_ident_literal_prop.rast
index 8be2bc120655..834477b1adbf 100644
--- a/crates/rslint_parser/test_data/inline/err/object_expr_non_ident_literal_prop.rast
+++ b/crates/rslint_parser/test_data/inline/err/object_expr_non_ident_literal_prop.rast
@@ -17,8 +17,8 @@ JS_MODULE@0..12
                 L_CURLY@8..9 "{"
                 LIST@9..10
                   LITERAL_PROP@9..10
-                    LITERAL@9..10
-                      NUMBER@9..10 "5"
+                    JS_NUMBER_LITERAL@9..10
+                      JS_NUMBER_LITERAL_TOKEN@9..10 "5"
                 R_CURLY@10..11 "}"
   WHITESPACE@11..12 "\n"
 --
diff --git a/crates/rslint_parser/test_data/inline/err/paren_or_arrow_expr_invalid_params.rast b/crates/rslint_parser/test_data/inline/err/paren_or_arrow_expr_invalid_params.rast
index f7676f0f83c0..23f99c4ac477 100644
--- a/crates/rslint_parser/test_data/inline/err/paren_or_arrow_expr_invalid_params.rast
+++ b/crates/rslint_parser/test_data/inline/err/paren_or_arrow_expr_invalid_params.rast
@@ -6,12 +6,12 @@ JS_MODULE@0..14
           L_PAREN@0..1 "("
           LIST@1..4
             ERROR@1..2
-              NUMBER@1..2 "5"
+              JS_NUMBER_LITERAL_TOKEN@1..2 "5"
             WHITESPACE@2..3 " "
             ERROR@3..4
               PLUS@3..4 "+"
         WHITESPACE@4..5 " "
-        NUMBER@5..6 "5"
+        JS_NUMBER_LITERAL_TOKEN@5..6 "5"
     ERROR@6..7
       R_PAREN@6..7 ")"
     WHITESPACE@7..8 " "
diff --git a/crates/rslint_parser/test_data/inline/err/throw_stmt_err.rast b/crates/rslint_parser/test_data/inline/err/throw_stmt_err.rast
index 221a3cae2733..fda357d71d94 100644
--- a/crates/rslint_parser/test_data/inline/err/throw_stmt_err.rast
+++ b/crates/rslint_parser/test_data/inline/err/throw_stmt_err.rast
@@ -12,8 +12,8 @@ JS_MODULE@0..28
         ARG_LIST@15..27
           L_PAREN@15..16 "("
           LIST@16..26
-            LITERAL@16..26
-              STRING@16..26 "\"oh no :(\""
+            JS_STRING_LITERAL@16..26
+              JS_STRING_LITERAL_TOKEN@16..26 "\"oh no :(\""
           R_PAREN@26..27 ")"
   WHITESPACE@27..28 "\n"
 --
diff --git a/crates/rslint_parser/test_data/inline/err/var_decl_err.rast b/crates/rslint_parser/test_data/inline/err/var_decl_err.rast
index 69ba22969a76..a0e432998a0c 100644
--- a/crates/rslint_parser/test_data/inline/err/var_decl_err.rast
+++ b/crates/rslint_parser/test_data/inline/err/var_decl_err.rast
@@ -28,8 +28,8 @@ JS_MODULE@0..32
             JS_EQUAL_VALUE_CLAUSE@17..20
               EQ@17..18 "="
               WHITESPACE@18..19 " "
-              LITERAL@19..20
-                NUMBER@19..20 "5"
+              JS_NUMBER_LITERAL@19..20
+                JS_NUMBER_LITERAL_TOKEN@19..20 "5"
     WHITESPACE@20..21 " "
     JS_VARIABLE_DECLARATION_STATEMENT@21..31
       JS_VARIABLE_DECLARATION@21..30
@@ -44,8 +44,8 @@ JS_MODULE@0..32
             JS_EQUAL_VALUE_CLAUSE@27..30
               EQ@27..28 "="
               WHITESPACE@28..29 " "
-              LITERAL@29..30
-                NUMBER@29..30 "5"
+              JS_NUMBER_LITERAL@29..30
+                JS_NUMBER_LITERAL_TOKEN@29..30 "5"
       SEMICOLON@30..31 ";"
   WHITESPACE@31..32 "\n"
 --
diff --git a/crates/rslint_parser/test_data/inline/err/while_stmt_err.rast b/crates/rslint_parser/test_data/inline/err/while_stmt_err.rast
index 9fd997c87852..85c5209d2ec3 100644
--- a/crates/rslint_parser/test_data/inline/err/while_stmt_err.rast
+++ b/crates/rslint_parser/test_data/inline/err/while_stmt_err.rast
@@ -3,7 +3,7 @@ JS_MODULE@0..52
     JS_WHILE_STATEMENT@0..13
       WHILE_KW@0..5 "while"
       WHITESPACE@5..6 " "
-      LITERAL@6..10
+      JS_BOOLEAN_LITERAL@6..10
         TRUE_KW@6..10 "true"
       WHITESPACE@10..11 " "
       JS_BLOCK_STATEMENT@11..13
@@ -23,7 +23,7 @@ JS_MODULE@0..52
       WHILE_KW@23..28 "while"
       WHITESPACE@28..29 " "
       L_PAREN@29..30 "("
-      LITERAL@30..34
+      JS_BOOLEAN_LITERAL@30..34
         TRUE_KW@30..34 "true"
       WHITESPACE@34..35 " "
       JS_BLOCK_STATEMENT@35..37
@@ -34,7 +34,7 @@ JS_MODULE@0..52
     JS_WHILE_STATEMENT@38..51
       WHILE_KW@38..43 "while"
       WHITESPACE@43..44 " "
-      LITERAL@44..48
+      JS_BOOLEAN_LITERAL@44..48
         TRUE_KW@44..48 "true"
       R_PAREN@48..49 ")"
       WHITESPACE@49..50 " "
diff --git a/crates/rslint_parser/test_data/inline/ok/assign_expr.rast b/crates/rslint_parser/test_data/inline/ok/assign_expr.rast
index 15537af20de9..ef338f784313 100644
--- a/crates/rslint_parser/test_data/inline/ok/assign_expr.rast
+++ b/crates/rslint_parser/test_data/inline/ok/assign_expr.rast
@@ -19,8 +19,8 @@ JS_MODULE@0..101
             WHITESPACE@14..15 " "
             QUESTION2EQ@15..18 "??="
             WHITESPACE@18..19 " "
-            LITERAL@19..20
-              NUMBER@19..20 "3"
+            JS_NUMBER_LITERAL@19..20
+              JS_NUMBER_LITERAL_TOKEN@19..20 "3"
       SEMICOLON@20..21 ";"
     WHITESPACE@21..22 "\n"
     JS_EXPRESSION_STATEMENT@22..33
diff --git a/crates/rslint_parser/test_data/inline/ok/binary_expressions.rast b/crates/rslint_parser/test_data/inline/ok/binary_expressions.rast
index c3be51f5c216..2f0d71f2639a 100644
--- a/crates/rslint_parser/test_data/inline/ok/binary_expressions.rast
+++ b/crates/rslint_parser/test_data/inline/ok/binary_expressions.rast
@@ -2,80 +2,80 @@ JS_MODULE@0..125
   LIST@0..124
     JS_EXPRESSION_STATEMENT@0..5
       BIN_EXPR@0..5
-        LITERAL@0..1
-          NUMBER@0..1 "5"
+        JS_NUMBER_LITERAL@0..1
+          JS_NUMBER_LITERAL_TOKEN@0..1 "5"
         WHITESPACE@1..2 " "
         STAR@2..3 "*"
         WHITESPACE@3..4 " "
-        LITERAL@4..5
-          NUMBER@4..5 "5"
+        JS_NUMBER_LITERAL@4..5
+          JS_NUMBER_LITERAL_TOKEN@4..5 "5"
     WHITESPACE@5..6 "\n"
     JS_EXPRESSION_STATEMENT@6..17
       BIN_EXPR@6..17
-        LITERAL@6..7
-          NUMBER@6..7 "6"
+        JS_NUMBER_LITERAL@6..7
+          JS_NUMBER_LITERAL_TOKEN@6..7 "6"
         WHITESPACE@7..8 " "
         STAR2@8..10 "**"
         WHITESPACE@10..11 " "
         BIN_EXPR@11..17
-          LITERAL@11..12
-            NUMBER@11..12 "6"
+          JS_NUMBER_LITERAL@11..12
+            JS_NUMBER_LITERAL_TOKEN@11..12 "6"
           WHITESPACE@12..13 " "
           STAR2@13..15 "**"
           WHITESPACE@15..16 " "
-          LITERAL@16..17
-            NUMBER@16..17 "7"
+          JS_NUMBER_LITERAL@16..17
+            JS_NUMBER_LITERAL_TOKEN@16..17 "7"
     WHITESPACE@17..18 "\n"
     JS_EXPRESSION_STATEMENT@18..39
       BIN_EXPR@18..39
-        LITERAL@18..19
-          NUMBER@18..19 "1"
+        JS_NUMBER_LITERAL@18..19
+          JS_NUMBER_LITERAL_TOKEN@18..19 "1"
         WHITESPACE@19..20 " "
         PLUS@20..21 "+"
         WHITESPACE@21..22 " "
         BIN_EXPR@22..39
           BIN_EXPR@22..35
-            LITERAL@22..23
-              NUMBER@22..23 "2"
+            JS_NUMBER_LITERAL@22..23
+              JS_NUMBER_LITERAL_TOKEN@22..23 "2"
             WHITESPACE@23..24 " "
             STAR@24..25 "*"
             WHITESPACE@25..26 " "
             CALL_EXPR@26..35
-              LITERAL@26..27
-                NUMBER@26..27 "3"
+              JS_NUMBER_LITERAL@26..27
+                JS_NUMBER_LITERAL_TOKEN@26..27 "3"
               WHITESPACE@27..28 "\n"
               ARG_LIST@28..35
                 L_PAREN@28..29 "("
                 LIST@29..34
                   BIN_EXPR@29..34
-                    LITERAL@29..30
-                      NUMBER@29..30 "1"
+                    JS_NUMBER_LITERAL@29..30
+                      JS_NUMBER_LITERAL_TOKEN@29..30 "1"
                     WHITESPACE@30..31 " "
                     PLUS@31..32 "+"
                     WHITESPACE@32..33 " "
-                    LITERAL@33..34
-                      NUMBER@33..34 "2"
+                    JS_NUMBER_LITERAL@33..34
+                      JS_NUMBER_LITERAL_TOKEN@33..34 "2"
                 R_PAREN@34..35 ")"
           WHITESPACE@35..36 " "
           STAR@36..37 "*"
           WHITESPACE@37..38 " "
-          LITERAL@38..39
-            NUMBER@38..39 "3"
+          JS_NUMBER_LITERAL@38..39
+            JS_NUMBER_LITERAL_TOKEN@38..39 "3"
     WHITESPACE@39..40 "\n"
     JS_EXPRESSION_STATEMENT@40..45
       BIN_EXPR@40..45
-        LITERAL@40..41
-          NUMBER@40..41 "1"
+        JS_NUMBER_LITERAL@40..41
+          JS_NUMBER_LITERAL_TOKEN@40..41 "1"
         WHITESPACE@41..42 " "
         SLASH@42..43 "/"
         WHITESPACE@43..44 " "
-        LITERAL@44..45
-          NUMBER@44..45 "2"
+        JS_NUMBER_LITERAL@44..45
+          JS_NUMBER_LITERAL_TOKEN@44..45 "2"
     WHITESPACE@45..46 "\n"
     JS_EXPRESSION_STATEMENT@46..55
       BIN_EXPR@46..55
-        LITERAL@46..48
-          NUMBER@46..48 "74"
+        JS_NUMBER_LITERAL@46..48
+          JS_NUMBER_LITERAL_TOKEN@46..48 "74"
         WHITESPACE@48..49 " "
         IN_KW@49..51 "in"
         WHITESPACE@51..52 " "
@@ -106,55 +106,55 @@ JS_MODULE@0..125
       BIN_EXPR@88..101
         BIN_EXPR@88..97
           BIN_EXPR@88..93
-            LITERAL@88..89
-              NUMBER@88..89 "1"
+            JS_NUMBER_LITERAL@88..89
+              JS_NUMBER_LITERAL_TOKEN@88..89 "1"
             WHITESPACE@89..90 " "
             PLUS@90..91 "+"
             WHITESPACE@91..92 " "
-            LITERAL@92..93
-              NUMBER@92..93 "1"
+            JS_NUMBER_LITERAL@92..93
+              JS_NUMBER_LITERAL_TOKEN@92..93 "1"
           WHITESPACE@93..94 " "
           PLUS@94..95 "+"
           WHITESPACE@95..96 " "
-          LITERAL@96..97
-            NUMBER@96..97 "1"
+          JS_NUMBER_LITERAL@96..97
+            JS_NUMBER_LITERAL_TOKEN@96..97 "1"
         WHITESPACE@97..98 " "
         PLUS@98..99 "+"
         WHITESPACE@99..100 " "
-        LITERAL@100..101
-          NUMBER@100..101 "1"
+        JS_NUMBER_LITERAL@100..101
+          JS_NUMBER_LITERAL_TOKEN@100..101 "1"
     WHITESPACE@101..102 "\n"
     JS_EXPRESSION_STATEMENT@102..124
       BIN_EXPR@102..124
         BIN_EXPR@102..107
-          LITERAL@102..103
-            NUMBER@102..103 "5"
+          JS_NUMBER_LITERAL@102..103
+            JS_NUMBER_LITERAL_TOKEN@102..103 "5"
           WHITESPACE@103..104 " "
           PLUS@104..105 "+"
           WHITESPACE@105..106 " "
-          LITERAL@106..107
-            NUMBER@106..107 "6"
+          JS_NUMBER_LITERAL@106..107
+            JS_NUMBER_LITERAL_TOKEN@106..107 "6"
         WHITESPACE@107..108 " "
         MINUS@108..109 "-"
         WHITESPACE@109..110 " "
         BIN_EXPR@110..124
           BIN_EXPR@110..115
-            LITERAL@110..111
-              NUMBER@110..111 "1"
+            JS_NUMBER_LITERAL@110..111
+              JS_NUMBER_LITERAL_TOKEN@110..111 "1"
             WHITESPACE@111..112 " "
             STAR@112..113 "*"
             WHITESPACE@113..114 " "
-            LITERAL@114..115
-              NUMBER@114..115 "2"
+            JS_NUMBER_LITERAL@114..115
+              JS_NUMBER_LITERAL_TOKEN@114..115 "2"
           WHITESPACE@115..116 " "
           SLASH@116..117 "/"
           WHITESPACE@117..118 " "
           BIN_EXPR@118..124
-            LITERAL@118..119
-              NUMBER@118..119 "1"
+            JS_NUMBER_LITERAL@118..119
+              JS_NUMBER_LITERAL_TOKEN@118..119 "1"
             WHITESPACE@119..120 " "
             STAR2@120..122 "**"
             WHITESPACE@122..123 " "
-            LITERAL@123..124
-              NUMBER@123..124 "6"
+            JS_NUMBER_LITERAL@123..124
+              JS_NUMBER_LITERAL_TOKEN@123..124 "6"
   WHITESPACE@124..125 "\n"
diff --git a/crates/rslint_parser/test_data/inline/ok/bracket_expr.rast b/crates/rslint_parser/test_data/inline/ok/bracket_expr.rast
index 5c526c36778b..866b9b88a84e 100644
--- a/crates/rslint_parser/test_data/inline/ok/bracket_expr.rast
+++ b/crates/rslint_parser/test_data/inline/ok/bracket_expr.rast
@@ -15,13 +15,13 @@ JS_MODULE@0..56
           IDENT@9..12 "foo"
         L_BRACK@12..13 "["
         BIN_EXPR@13..18
-          LITERAL@13..14
-            NUMBER@13..14 "5"
+          JS_NUMBER_LITERAL@13..14
+            JS_NUMBER_LITERAL_TOKEN@13..14 "5"
           WHITESPACE@14..15 " "
           PLUS@15..16 "+"
           WHITESPACE@16..17 " "
-          LITERAL@17..18
-            NUMBER@17..18 "5"
+          JS_NUMBER_LITERAL@17..18
+            JS_NUMBER_LITERAL_TOKEN@17..18 "5"
         R_BRACK@18..19 "]"
     WHITESPACE@19..20 "\n"
     JS_EXPRESSION_STATEMENT@20..30
@@ -29,8 +29,8 @@ JS_MODULE@0..56
         NAME_REF@20..23
           IDENT@20..23 "foo"
         L_BRACK@23..24 "["
-        LITERAL@24..29
-          STRING@24..29 "\"bar\""
+        JS_STRING_LITERAL@24..29
+          JS_STRING_LITERAL_TOKEN@24..29 "\"bar\""
         R_BRACK@29..30 "]"
     WHITESPACE@30..31 "\n"
     JS_EXPRESSION_STATEMENT@31..44
diff --git a/crates/rslint_parser/test_data/inline/ok/continue_stmt.rast b/crates/rslint_parser/test_data/inline/ok/continue_stmt.rast
index 3e7bb9ce7688..e592b37aa788 100644
--- a/crates/rslint_parser/test_data/inline/ok/continue_stmt.rast
+++ b/crates/rslint_parser/test_data/inline/ok/continue_stmt.rast
@@ -13,7 +13,7 @@ JS_MODULE@0..64
       WHILE_KW@8..13 "while"
       WHITESPACE@13..14 " "
       L_PAREN@14..15 "("
-      LITERAL@15..19
+      JS_BOOLEAN_LITERAL@15..19
         TRUE_KW@15..19 "true"
       R_PAREN@19..20 ")"
       WHITESPACE@20..21 " "
diff --git a/crates/rslint_parser/test_data/inline/ok/do_while_statement.rast b/crates/rslint_parser/test_data/inline/ok/do_while_statement.rast
index 0a4e3b02e07d..5ffa8739ed05 100644
--- a/crates/rslint_parser/test_data/inline/ok/do_while_statement.rast
+++ b/crates/rslint_parser/test_data/inline/ok/do_while_statement.rast
@@ -14,14 +14,14 @@ JS_MODULE@0..144
           ARG_LIST@14..22
             L_PAREN@14..15 "("
             LIST@15..21
-              LITERAL@15..21
-                STRING@15..21 "\"test\""
+              JS_STRING_LITERAL@15..21
+                JS_STRING_LITERAL_TOKEN@15..21 "\"test\""
             R_PAREN@21..22 ")"
         SEMICOLON@22..23 ";"
       WHITESPACE@23..24 " "
       WHILE_KW@24..29 "while"
       L_PAREN@29..30 "("
-      LITERAL@30..34
+      JS_BOOLEAN_LITERAL@30..34
         TRUE_KW@30..34 "true"
       R_PAREN@34..35 ")"
     WHITESPACE@35..37 "\n\n"
@@ -43,8 +43,8 @@ JS_MODULE@0..144
               ARG_LIST@54..62
                 L_PAREN@54..55 "("
                 LIST@55..61
-                  LITERAL@55..61
-                    STRING@55..61 "\"test\""
+                  JS_STRING_LITERAL@55..61
+                    JS_STRING_LITERAL_TOKEN@55..61 "\"test\""
                 R_PAREN@61..62 ")"
         WHITESPACE@62..63 "\n"
         R_CURLY@63..64 "}"
@@ -52,7 +52,7 @@ JS_MODULE@0..144
       WHILE_KW@65..70 "while"
       WHITESPACE@70..71 " "
       L_PAREN@71..72 "("
-      LITERAL@72..76
+      JS_BOOLEAN_LITERAL@72..76
         TRUE_KW@72..76 "true"
       R_PAREN@76..77 ")"
       SEMICOLON@77..78 ";"
@@ -70,8 +70,8 @@ JS_MODULE@0..144
             JS_EQUAL_VALUE_CLAUSE@86..89
               EQ@86..87 "="
               WHITESPACE@87..88 " "
-              LITERAL@88..89
-                NUMBER@88..89 "1"
+              JS_NUMBER_LITERAL@88..89
+                JS_NUMBER_LITERAL_TOKEN@88..89 "1"
       SEMICOLON@89..90 ";"
     WHITESPACE@90..91 "\n"
     JS_DO_WHILE_STATEMENT@91..143
@@ -97,8 +97,8 @@ JS_MODULE@0..144
                   WHITESPACE@107..108 " "
                   PLUS@108..109 "+"
                   WHITESPACE@109..110 " "
-                  LITERAL@110..111
-                    NUMBER@110..111 "1"
+                  JS_NUMBER_LITERAL@110..111
+                    JS_NUMBER_LITERAL_TOKEN@110..111 "1"
           WHITESPACE@111..113 "\n\t"
           R_CURLY@113..114 "}"
         WHITESPACE@114..115 " "
@@ -110,8 +110,8 @@ JS_MODULE@0..144
           WHITESPACE@122..123 " "
           L_ANGLE@123..124 "<"
           WHITESPACE@124..125 " "
-          LITERAL@125..126
-            NUMBER@125..126 "5"
+          JS_NUMBER_LITERAL@125..126
+            JS_NUMBER_LITERAL_TOKEN@125..126 "5"
         R_PAREN@126..127 ")"
       WHITESPACE@127..128 "\n"
       WHILE_KW@128..133 "while"
@@ -123,7 +123,7 @@ JS_MODULE@0..144
         WHITESPACE@136..137 " "
         L_ANGLE@137..138 "<"
         WHITESPACE@138..139 " "
-        LITERAL@139..142
-          NUMBER@139..142 "100"
+        JS_NUMBER_LITERAL@139..142
+          JS_NUMBER_LITERAL_TOKEN@139..142 "100"
       R_PAREN@142..143 ")"
   WHITESPACE@143..144 "\n"
diff --git a/crates/rslint_parser/test_data/inline/ok/export.rast b/crates/rslint_parser/test_data/inline/ok/export.rast
index 02e4afdcd069..61402fd118c6 100644
--- a/crates/rslint_parser/test_data/inline/ok/export.rast
+++ b/crates/rslint_parser/test_data/inline/ok/export.rast
@@ -15,7 +15,7 @@ JS_MODULE@0..27
         WHITESPACE@14..15 " "
         FROM_KW@15..19 "from"
         WHITESPACE@19..20 " "
-        LITERAL@20..25
-          STRING@20..25 "\"bla\""
+        JS_STRING_LITERAL@20..25
+          JS_STRING_LITERAL_TOKEN@20..25 "\"bla\""
         SEMICOLON@25..26 ";"
   WHITESPACE@26..27 "\n"
diff --git a/crates/rslint_parser/test_data/inline/ok/for_stmt.rast b/crates/rslint_parser/test_data/inline/ok/for_stmt.rast
index 3450e7e81ae7..c7f219c389d4 100644
--- a/crates/rslint_parser/test_data/inline/ok/for_stmt.rast
+++ b/crates/rslint_parser/test_data/inline/ok/for_stmt.rast
@@ -17,8 +17,8 @@ JS_MODULE@0..95
               JS_EQUAL_VALUE_CLAUSE@11..14
                 EQ@11..12 "="
                 WHITESPACE@12..13 " "
-                LITERAL@13..14
-                  NUMBER@13..14 "5"
+                JS_NUMBER_LITERAL@13..14
+                  JS_NUMBER_LITERAL_TOKEN@13..14 "5"
       SEMICOLON@14..15 ";"
       WHITESPACE@15..16 " "
       FOR_STMT_TEST@16..22
@@ -28,8 +28,8 @@ JS_MODULE@0..95
           WHITESPACE@17..18 " "
           L_ANGLE@18..19 "<"
           WHITESPACE@19..20 " "
-          LITERAL@20..22
-            NUMBER@20..22 "10"
+          JS_NUMBER_LITERAL@20..22
+            JS_NUMBER_LITERAL_TOKEN@20..22 "10"
       SEMICOLON@22..23 ";"
       WHITESPACE@23..24 " "
       FOR_STMT_UPDATE@24..27
diff --git a/crates/rslint_parser/test_data/inline/ok/if_stmt.rast b/crates/rslint_parser/test_data/inline/ok/if_stmt.rast
index 48b90c2a96ac..20a6d379a925 100644
--- a/crates/rslint_parser/test_data/inline/ok/if_stmt.rast
+++ b/crates/rslint_parser/test_data/inline/ok/if_stmt.rast
@@ -4,7 +4,7 @@ JS_MODULE@0..88
       IF_KW@0..2 "if"
       WHITESPACE@2..3 " "
       L_PAREN@3..4 "("
-      LITERAL@4..8
+      JS_BOOLEAN_LITERAL@4..8
         TRUE_KW@4..8 "true"
       R_PAREN@8..9 ")"
       WHITESPACE@9..10 " "
@@ -25,7 +25,7 @@ JS_MODULE@0..88
       IF_KW@21..23 "if"
       WHITESPACE@23..24 " "
       L_PAREN@24..25 "("
-      LITERAL@25..29
+      JS_BOOLEAN_LITERAL@25..29
         TRUE_KW@25..29 "true"
       R_PAREN@29..30 ")"
       WHITESPACE@30..31 " "
@@ -38,12 +38,12 @@ JS_MODULE@0..88
       IF_KW@34..36 "if"
       WHITESPACE@36..37 " "
       L_PAREN@37..38 "("
-      LITERAL@38..42
+      JS_BOOLEAN_LITERAL@38..42
         TRUE_KW@38..42 "true"
       R_PAREN@42..43 ")"
       WHITESPACE@43..44 " "
       JS_EXPRESSION_STATEMENT@44..49
-        LITERAL@44..49
+        JS_BOOLEAN_LITERAL@44..49
           FALSE_KW@44..49 "false"
     WHITESPACE@49..50 "\n"
     JS_IF_STATEMENT@50..87
@@ -66,7 +66,7 @@ JS_MODULE@0..88
           IF_KW@67..69 "if"
           WHITESPACE@69..70 " "
           L_PAREN@70..71 "("
-          LITERAL@71..75
+          JS_BOOLEAN_LITERAL@71..75
             TRUE_KW@71..75 "true"
           R_PAREN@75..76 ")"
           WHITESPACE@76..77 " "
diff --git a/crates/rslint_parser/test_data/inline/ok/import_call.rast b/crates/rslint_parser/test_data/inline/ok/import_call.rast
index 9feb9ec74df8..acc1cbaba3e5 100644
--- a/crates/rslint_parser/test_data/inline/ok/import_call.rast
+++ b/crates/rslint_parser/test_data/inline/ok/import_call.rast
@@ -4,7 +4,7 @@ JS_MODULE@0..14
       IMPORT_CALL@0..13
         IMPORT_KW@0..6 "import"
         L_PAREN@6..7 "("
-        LITERAL@7..12
-          STRING@7..12 "\"foo\""
+        JS_STRING_LITERAL@7..12
+          JS_STRING_LITERAL_TOKEN@7..12 "\"foo\""
         R_PAREN@12..13 ")"
   WHITESPACE@13..14 "\n"
diff --git a/crates/rslint_parser/test_data/inline/ok/import_decl.rast b/crates/rslint_parser/test_data/inline/ok/import_decl.rast
index ba473a79d5ef..ad64f03d8794 100644
--- a/crates/rslint_parser/test_data/inline/ok/import_decl.rast
+++ b/crates/rslint_parser/test_data/inline/ok/import_decl.rast
@@ -14,7 +14,7 @@ JS_MODULE@0..28
       WHITESPACE@15..16 " "
       FROM_KW@16..20 "from"
       WHITESPACE@20..21 " "
-      LITERAL@21..26
-        STRING@21..26 "\"bla\""
+      JS_STRING_LITERAL@21..26
+        JS_STRING_LITERAL_TOKEN@21..26 "\"bla\""
       SEMICOLON@26..27 ";"
   WHITESPACE@27..28 "\n"
diff --git a/crates/rslint_parser/test_data/inline/ok/literals.rast b/crates/rslint_parser/test_data/inline/ok/literals.rast
index 709dd9e40376..eae224f34ff4 100644
--- a/crates/rslint_parser/test_data/inline/ok/literals.rast
+++ b/crates/rslint_parser/test_data/inline/ok/literals.rast
@@ -1,30 +1,30 @@
 JS_MODULE@0..33
   LIST@0..32
     JS_EXPRESSION_STATEMENT@0..1
-      LITERAL@0..1
-        NUMBER@0..1 "5"
+      JS_NUMBER_LITERAL@0..1
+        JS_NUMBER_LITERAL_TOKEN@0..1 "5"
     WHITESPACE@1..2 "\n"
     JS_EXPRESSION_STATEMENT@2..6
-      LITERAL@2..6
+      JS_BOOLEAN_LITERAL@2..6
         TRUE_KW@2..6 "true"
     WHITESPACE@6..7 "\n"
     JS_EXPRESSION_STATEMENT@7..12
-      LITERAL@7..12
+      JS_BOOLEAN_LITERAL@7..12
         FALSE_KW@7..12 "false"
     WHITESPACE@12..13 "\n"
     JS_EXPRESSION_STATEMENT@13..15
-      LITERAL@13..15
-        NUMBER@13..15 "5n"
+      JS_BIG_INT_LITERAL@13..15
+        JS_BIG_INT_LITERAL_TOKEN@13..15 "5n"
     WHITESPACE@15..16 "\n"
     JS_EXPRESSION_STATEMENT@16..21
-      LITERAL@16..21
-        STRING@16..21 "\"foo\""
+      JS_STRING_LITERAL@16..21
+        JS_STRING_LITERAL_TOKEN@16..21 "\"foo\""
     WHITESPACE@21..22 "\n"
     JS_EXPRESSION_STATEMENT@22..27
-      LITERAL@22..27
-        STRING@22..27 "'bar'"
+      JS_STRING_LITERAL@22..27
+        JS_STRING_LITERAL_TOKEN@22..27 "'bar'"
     WHITESPACE@27..28 "\n"
     JS_EXPRESSION_STATEMENT@28..32
-      LITERAL@28..32
+      JS_NULL_LITERAL@28..32
         NULL_KW@28..32 "null"
   WHITESPACE@32..33 "\n"
diff --git a/crates/rslint_parser/test_data/inline/ok/new_exprs.rast b/crates/rslint_parser/test_data/inline/ok/new_exprs.rast
index b9ebf126b285..8e9b26208206 100644
--- a/crates/rslint_parser/test_data/inline/ok/new_exprs.rast
+++ b/crates/rslint_parser/test_data/inline/ok/new_exprs.rast
@@ -64,13 +64,13 @@ JS_MODULE@0..113
             COMMA@69..70 ","
             WHITESPACE@70..71 " "
             BIN_EXPR@71..76
-              LITERAL@71..72
-                NUMBER@71..72 "6"
+              JS_NUMBER_LITERAL@71..72
+                JS_NUMBER_LITERAL_TOKEN@71..72 "6"
               WHITESPACE@72..73 " "
               PLUS@73..74 "+"
               WHITESPACE@74..75 " "
-              LITERAL@75..76
-                NUMBER@75..76 "6"
+              JS_NUMBER_LITERAL@75..76
+                JS_NUMBER_LITERAL_TOKEN@75..76 "6"
             COMMA@76..77 ","
             WHITESPACE@77..78 " "
             BIN_EXPR@78..111
diff --git a/crates/rslint_parser/test_data/inline/ok/object_expr_assign_prop.rast b/crates/rslint_parser/test_data/inline/ok/object_expr_assign_prop.rast
index 2bb243ea7bc3..5bfa7fd2c68f 100644
--- a/crates/rslint_parser/test_data/inline/ok/object_expr_assign_prop.rast
+++ b/crates/rslint_parser/test_data/inline/ok/object_expr_assign_prop.rast
@@ -23,8 +23,8 @@ JS_MODULE@0..31
                     WHITESPACE@13..14 " "
                     EQ@14..15 "="
                     WHITESPACE@15..16 " "
-                    LITERAL@16..17
-                      NUMBER@16..17 "4"
+                    JS_NUMBER_LITERAL@16..17
+                      JS_NUMBER_LITERAL_TOKEN@16..17 "4"
                   COMMA@17..18 ","
                   WHITESPACE@18..19 " "
                   INITIALIZED_PROP@19..28
diff --git a/crates/rslint_parser/test_data/inline/ok/object_expr_ident_literal_prop.rast b/crates/rslint_parser/test_data/inline/ok/object_expr_ident_literal_prop.rast
index 55eea4c6e686..c00597501706 100644
--- a/crates/rslint_parser/test_data/inline/ok/object_expr_ident_literal_prop.rast
+++ b/crates/rslint_parser/test_data/inline/ok/object_expr_ident_literal_prop.rast
@@ -22,7 +22,7 @@ JS_MODULE@0..20
                       IDENT@10..11 "a"
                     COLON@11..12 ":"
                     WHITESPACE@12..13 " "
-                    LITERAL@13..17
+                    JS_BOOLEAN_LITERAL@13..17
                       TRUE_KW@13..17 "true"
                 WHITESPACE@17..18 " "
                 R_CURLY@18..19 "}"
diff --git a/crates/rslint_parser/test_data/inline/ok/object_prop_name.rast b/crates/rslint_parser/test_data/inline/ok/object_prop_name.rast
index 224d20a548cd..643ca18a631e 100644
--- a/crates/rslint_parser/test_data/inline/ok/object_prop_name.rast
+++ b/crates/rslint_parser/test_data/inline/ok/object_prop_name.rast
@@ -17,8 +17,8 @@ JS_MODULE@0..53
                 L_CURLY@8..9 "{"
                 LIST@9..51
                   LITERAL_PROP@9..19
-                    LITERAL@9..14
-                      STRING@9..14 "\"foo\""
+                    JS_STRING_LITERAL@9..14
+                      JS_STRING_LITERAL_TOKEN@9..14 "\"foo\""
                     COLON@14..15 ":"
                     WHITESPACE@15..16 " "
                     NAME_REF@16..19
@@ -29,13 +29,13 @@ JS_MODULE@0..53
                     COMPUTED_PROPERTY_NAME@21..28
                       L_BRACK@21..22 "["
                       BIN_EXPR@22..27
-                        LITERAL@22..23
-                          NUMBER@22..23 "6"
+                        JS_NUMBER_LITERAL@22..23
+                          JS_NUMBER_LITERAL_TOKEN@22..23 "6"
                         WHITESPACE@23..24 " "
                         PLUS@24..25 "+"
                         WHITESPACE@25..26 " "
-                        LITERAL@26..27
-                          NUMBER@26..27 "6"
+                        JS_NUMBER_LITERAL@26..27
+                          JS_NUMBER_LITERAL_TOKEN@26..27 "6"
                       R_BRACK@27..28 "]"
                     COLON@28..29 ":"
                     WHITESPACE@29..30 " "
@@ -53,8 +53,8 @@ JS_MODULE@0..53
                   COMMA@43..44 ","
                   WHITESPACE@44..45 " "
                   LITERAL_PROP@45..51
-                    LITERAL@45..46
-                      NUMBER@45..46 "7"
+                    JS_NUMBER_LITERAL@45..46
+                      JS_NUMBER_LITERAL_TOKEN@45..46 "7"
                     COLON@46..47 ":"
                     WHITESPACE@47..48 " "
                     NAME_REF@48..51
diff --git a/crates/rslint_parser/test_data/inline/ok/paren_or_arrow_expr.rast b/crates/rslint_parser/test_data/inline/ok/paren_or_arrow_expr.rast
index 4451f0215bcb..e3ed1b74286c 100644
--- a/crates/rslint_parser/test_data/inline/ok/paren_or_arrow_expr.rast
+++ b/crates/rslint_parser/test_data/inline/ok/paren_or_arrow_expr.rast
@@ -30,13 +30,13 @@ JS_MODULE@0..85
       GROUPING_EXPR@20..27
         L_PAREN@20..21 "("
         BIN_EXPR@21..26
-          LITERAL@21..22
-            NUMBER@21..22 "5"
+          JS_NUMBER_LITERAL@21..22
+            JS_NUMBER_LITERAL_TOKEN@21..22 "5"
           WHITESPACE@22..23 " "
           PLUS@23..24 "+"
           WHITESPACE@24..25 " "
-          LITERAL@25..26
-            NUMBER@25..26 "5"
+          JS_NUMBER_LITERAL@25..26
+            JS_NUMBER_LITERAL_TOKEN@25..26 "5"
         R_PAREN@26..27 ")"
       SEMICOLON@27..28 ";"
     WHITESPACE@28..29 "\n"
diff --git a/crates/rslint_parser/test_data/inline/ok/semicolons.rast b/crates/rslint_parser/test_data/inline/ok/semicolons.rast
index 570ba0d9b217..7912bd163322 100644
--- a/crates/rslint_parser/test_data/inline/ok/semicolons.rast
+++ b/crates/rslint_parser/test_data/inline/ok/semicolons.rast
@@ -82,7 +82,7 @@ JS_MODULE@0..84
           JS_RETURN_STATEMENT@70..81
             RETURN_KW@70..76 "return"
             WHITESPACE@76..77 " "
-            LITERAL@77..81
+            JS_BOOLEAN_LITERAL@77..81
               TRUE_KW@77..81 "true"
         WHITESPACE@81..82 " "
         R_CURLY@82..83 "}"
diff --git a/crates/rslint_parser/test_data/inline/ok/sequence_expr.rast b/crates/rslint_parser/test_data/inline/ok/sequence_expr.rast
index e1b00c090a84..c569b6bc9b1c 100644
--- a/crates/rslint_parser/test_data/inline/ok/sequence_expr.rast
+++ b/crates/rslint_parser/test_data/inline/ok/sequence_expr.rast
@@ -3,22 +3,22 @@ JS_MODULE@0..14
     JS_EXPRESSION_STATEMENT@0..13
       SEQUENCE_EXPR@0..13
         LIST@0..13
-          LITERAL@0..1
-            NUMBER@0..1 "1"
+          JS_NUMBER_LITERAL@0..1
+            JS_NUMBER_LITERAL_TOKEN@0..1 "1"
           COMMA@1..2 ","
           WHITESPACE@2..3 " "
-          LITERAL@3..4
-            NUMBER@3..4 "2"
+          JS_NUMBER_LITERAL@3..4
+            JS_NUMBER_LITERAL_TOKEN@3..4 "2"
           COMMA@4..5 ","
           WHITESPACE@5..6 " "
-          LITERAL@6..7
-            NUMBER@6..7 "3"
+          JS_NUMBER_LITERAL@6..7
+            JS_NUMBER_LITERAL_TOKEN@6..7 "3"
           COMMA@7..8 ","
           WHITESPACE@8..9 " "
-          LITERAL@9..10
-            NUMBER@9..10 "4"
+          JS_NUMBER_LITERAL@9..10
+            JS_NUMBER_LITERAL_TOKEN@9..10 "4"
           COMMA@10..11 ","
           WHITESPACE@11..12 " "
-          LITERAL@12..13
-            NUMBER@12..13 "5"
+          JS_NUMBER_LITERAL@12..13
+            JS_NUMBER_LITERAL_TOKEN@12..13 "5"
   WHITESPACE@13..14 "\n"
diff --git a/crates/rslint_parser/test_data/inline/ok/throw_stmt.rast b/crates/rslint_parser/test_data/inline/ok/throw_stmt.rast
index 0e39e14caa8b..bdc20b3431bd 100644
--- a/crates/rslint_parser/test_data/inline/ok/throw_stmt.rast
+++ b/crates/rslint_parser/test_data/inline/ok/throw_stmt.rast
@@ -11,14 +11,14 @@ JS_MODULE@0..36
         ARG_LIST@15..22
           L_PAREN@15..16 "("
           LIST@16..21
-            LITERAL@16..21
-              STRING@16..21 "\"foo\""
+            JS_STRING_LITERAL@16..21
+              JS_STRING_LITERAL_TOKEN@16..21 "\"foo\""
           R_PAREN@21..22 ")"
       SEMICOLON@22..23 ";"
     WHITESPACE@23..24 "\n"
     JS_THROW_STATEMENT@24..35
       THROW_KW@24..29 "throw"
       WHITESPACE@29..30 " "
-      LITERAL@30..35
-        STRING@30..35 "\"foo\""
+      JS_STRING_LITERAL@30..35
+        JS_STRING_LITERAL_TOKEN@30..35 "\"foo\""
   WHITESPACE@35..36 "\n"
diff --git a/crates/rslint_parser/test_data/inline/ok/var_decl.rast b/crates/rslint_parser/test_data/inline/ok/var_decl.rast
index 725d7cfdc00d..94b0081fc6b5 100644
--- a/crates/rslint_parser/test_data/inline/ok/var_decl.rast
+++ b/crates/rslint_parser/test_data/inline/ok/var_decl.rast
@@ -13,8 +13,8 @@ JS_MODULE@0..92
             JS_EQUAL_VALUE_CLAUSE@6..9
               EQ@6..7 "="
               WHITESPACE@7..8 " "
-              LITERAL@8..9
-                NUMBER@8..9 "5"
+              JS_NUMBER_LITERAL@8..9
+                JS_NUMBER_LITERAL_TOKEN@8..9 "5"
       SEMICOLON@9..10 ";"
     WHITESPACE@10..11 "\n"
     JS_VARIABLE_DECLARATION_STATEMENT@11..32
@@ -41,8 +41,8 @@ JS_MODULE@0..92
             JS_EQUAL_VALUE_CLAUSE@28..31
               EQ@28..29 "="
               WHITESPACE@29..30 " "
-              LITERAL@30..31
-                NUMBER@30..31 "5"
+              JS_NUMBER_LITERAL@30..31
+                JS_NUMBER_LITERAL_TOKEN@30..31 "5"
       SEMICOLON@31..32 ";"
     WHITESPACE@32..33 "\n"
     JS_VARIABLE_DECLARATION_STATEMENT@33..46
@@ -75,8 +75,8 @@ JS_MODULE@0..92
             JS_EQUAL_VALUE_CLAUSE@55..58
               EQ@55..56 "="
               WHITESPACE@56..57 " "
-              LITERAL@57..58
-                NUMBER@57..58 "5"
+              JS_NUMBER_LITERAL@57..58
+                JS_NUMBER_LITERAL_TOKEN@57..58 "5"
       SEMICOLON@58..59 ";"
     WHITESPACE@59..60 "\n"
     JS_VARIABLE_DECLARATION_STATEMENT@60..91
diff --git a/crates/rslint_parser/test_data/inline/ok/while_stmt.rast b/crates/rslint_parser/test_data/inline/ok/while_stmt.rast
index 0eaaecd55199..fe243dd23439 100644
--- a/crates/rslint_parser/test_data/inline/ok/while_stmt.rast
+++ b/crates/rslint_parser/test_data/inline/ok/while_stmt.rast
@@ -4,7 +4,7 @@ JS_MODULE@0..29
       WHILE_KW@0..5 "while"
       WHITESPACE@5..6 " "
       L_PAREN@6..7 "("
-      LITERAL@7..11
+      JS_BOOLEAN_LITERAL@7..11
         TRUE_KW@7..11 "true"
       R_PAREN@11..12 ")"
       WHITESPACE@12..13 " "
@@ -17,8 +17,8 @@ JS_MODULE@0..29
       WHILE_KW@16..21 "while"
       WHITESPACE@21..22 " "
       L_PAREN@22..23 "("
-      LITERAL@23..24
-        NUMBER@23..24 "5"
+      JS_NUMBER_LITERAL@23..24
+        JS_NUMBER_LITERAL_TOKEN@23..24 "5"
       R_PAREN@24..25 ")"
       WHITESPACE@25..26 " "
       JS_BLOCK_STATEMENT@26..28
diff --git a/crates/rslint_syntax/src/generated.rs b/crates/rslint_syntax/src/generated.rs
index bdddef3cc3b5..90e8c5362f8e 100644
--- a/crates/rslint_syntax/src/generated.rs
+++ b/crates/rslint_syntax/src/generated.rs
@@ -141,14 +141,11 @@ pub enum SyntaxKind {
 	UNDEFINED_KW,
 	LET_KW,
 	FLOAT_KW,
-	BIG_INT_KW,
 	NUMBER_KW,
-	REGEX_KW,
-	NUMBER,
-	BIG_INT,
-	FLOAT,
-	STRING,
-	REGEX,
+	JS_NUMBER_LITERAL_TOKEN,
+	JS_BIG_INT_LITERAL_TOKEN,
+	JS_STRING_LITERAL_TOKEN,
+	JS_REGEX_LITERAL_TOKEN,
 	HASH,
 	TEMPLATE_CHUNK,
 	DOLLARCURLY,
@@ -157,7 +154,6 @@ pub enum SyntaxKind {
 	WHITESPACE,
 	COMMENT,
 	JS_SHEBANG,
-	JS_IDENTIFIER,
 	JS_SCRIPT,
 	JS_MODULE,
 	JS_DIRECTIVE,
@@ -215,7 +211,12 @@ pub enum SyntaxKind {
 	ASSIGN_EXPR,
 	SEQUENCE_EXPR,
 	ARG_LIST,
-	LITERAL,
+	JS_STRING_LITERAL,
+	JS_NUMBER_LITERAL,
+	JS_BIG_INT_LITERAL,
+	JS_BOOLEAN_LITERAL,
+	JS_NULL_LITERAL,
+	JS_REGEX_LITERAL,
 	TEMPLATE,
 	TEMPLATE_ELEMENT,
 	CONDITION,
@@ -364,7 +365,7 @@ impl SyntaxKind {
 			| ABSTRACT_KW | STATIC_KW | ASYNC_KW | TYPE_KW | FROM_KW | AS_KW | REQUIRE_KW
 			| NAMESPACE_KW | ASSERT_KW | MODULE_KW | GLOBAL_KW | INFER_KW | GET_KW | SET_KW
 			| OF_KW | TARGET_KW | NEVER_KW | UNKNOWN_KW | ANY_KW | UNDEFINED_KW | LET_KW
-			| FLOAT_KW | BIG_INT_KW | NUMBER_KW | REGEX_KW => true,
+			| FLOAT_KW | NUMBER_KW => true,
 			_ => false,
 		}
 	}
@@ -382,7 +383,10 @@ impl SyntaxKind {
 	}
 	pub fn is_literal(self) -> bool {
 		match self {
-			NUMBER | BIG_INT | FLOAT | STRING | REGEX => true,
+			JS_NUMBER_LITERAL_TOKEN
+			| JS_BIG_INT_LITERAL_TOKEN
+			| JS_STRING_LITERAL_TOKEN
+			| JS_REGEX_LITERAL_TOKEN => true,
 			_ => false,
 		}
 	}
@@ -468,9 +472,7 @@ impl SyntaxKind {
 			"undefined" => UNDEFINED_KW,
 			"let" => LET_KW,
 			"float" => FLOAT_KW,
-			"big_int" => BIG_INT_KW,
 			"number" => NUMBER_KW,
-			"regex" => REGEX_KW,
 			_ => return None,
 		};
 		Some(kw)
@@ -575,4 +577,4 @@ impl SyntaxKind {
 }
 #[doc = r" Utility macro for creating a SyntaxKind through simple macro syntax"]
 #[macro_export]
-macro_rules ! T { [;] => { $ crate :: SyntaxKind :: SEMICOLON } ; [,] => { $ crate :: SyntaxKind :: COMMA } ; ['('] => { $ crate :: SyntaxKind :: L_PAREN } ; [')'] => { $ crate :: SyntaxKind :: R_PAREN } ; ['{'] => { $ crate :: SyntaxKind :: L_CURLY } ; ['}'] => { $ crate :: SyntaxKind :: R_CURLY } ; ['['] => { $ crate :: SyntaxKind :: L_BRACK } ; [']'] => { $ crate :: SyntaxKind :: R_BRACK } ; [<] => { $ crate :: SyntaxKind :: L_ANGLE } ; [>] => { $ crate :: SyntaxKind :: R_ANGLE } ; [~] => { $ crate :: SyntaxKind :: TILDE } ; [?] => { $ crate :: SyntaxKind :: QUESTION } ; [??] => { $ crate :: SyntaxKind :: QUESTION2 } ; [?.] => { $ crate :: SyntaxKind :: QUESTIONDOT } ; [&] => { $ crate :: SyntaxKind :: AMP } ; [|] => { $ crate :: SyntaxKind :: PIPE } ; [+] => { $ crate :: SyntaxKind :: PLUS } ; [++] => { $ crate :: SyntaxKind :: PLUS2 } ; [*] => { $ crate :: SyntaxKind :: STAR } ; [**] => { $ crate :: SyntaxKind :: STAR2 } ; [/] => { $ crate :: SyntaxKind :: SLASH } ; [^] => { $ crate :: SyntaxKind :: CARET } ; [%] => { $ crate :: SyntaxKind :: PERCENT } ; [.] => { $ crate :: SyntaxKind :: DOT } ; [...] => { $ crate :: SyntaxKind :: DOT2 } ; [:] => { $ crate :: SyntaxKind :: COLON } ; [=] => { $ crate :: SyntaxKind :: EQ } ; [==] => { $ crate :: SyntaxKind :: EQ2 } ; [===] => { $ crate :: SyntaxKind :: EQ3 } ; [=>] => { $ crate :: SyntaxKind :: FAT_ARROW } ; [!] => { $ crate :: SyntaxKind :: BANG } ; [!=] => { $ crate :: SyntaxKind :: NEQ } ; [!==] => { $ crate :: SyntaxKind :: NEQ2 } ; [-] => { $ crate :: SyntaxKind :: MINUS } ; [--] => { $ crate :: SyntaxKind :: MINUS2 } ; [<=] => { $ crate :: SyntaxKind :: LTEQ } ; [>=] => { $ crate :: SyntaxKind :: GTEQ } ; [+=] => { $ crate :: SyntaxKind :: PLUSEQ } ; [-=] => { $ crate :: SyntaxKind :: MINUSEQ } ; [|=] => { $ crate :: SyntaxKind :: PIPEEQ } ; [&=] => { $ crate :: SyntaxKind :: AMPEQ } ; [^=] => { $ crate :: SyntaxKind :: CARETEQ } ; [/=] => { $ crate :: SyntaxKind :: SLASHEQ } ; [*=] => { $ crate :: SyntaxKind :: STAREQ } ; [%=] => { $ crate :: SyntaxKind :: PERCENTEQ } ; [&&] => { $ crate :: SyntaxKind :: AMP2 } ; [||] => { $ crate :: SyntaxKind :: PIPE2 } ; [<<] => { $ crate :: SyntaxKind :: SHL } ; [>>] => { $ crate :: SyntaxKind :: SHR } ; [>>>] => { $ crate :: SyntaxKind :: USHR } ; [<<=] => { $ crate :: SyntaxKind :: SHLEQ } ; [>>=] => { $ crate :: SyntaxKind :: SHREQ } ; [>>>=] => { $ crate :: SyntaxKind :: USHREQ } ; [&&=] => { $ crate :: SyntaxKind :: AMP2EQ } ; [||=] => { $ crate :: SyntaxKind :: PIPE2EQ } ; [**=] => { $ crate :: SyntaxKind :: STAR2EQ } ; [??=] => { $ crate :: SyntaxKind :: QUESTION2EQ } ; [@] => { $ crate :: SyntaxKind :: AT } ; ['`'] => { $ crate :: SyntaxKind :: BACKTICK } ; [await] => { $ crate :: SyntaxKind :: AWAIT_KW } ; [break] => { $ crate :: SyntaxKind :: BREAK_KW } ; [case] => { $ crate :: SyntaxKind :: CASE_KW } ; [catch] => { $ crate :: SyntaxKind :: CATCH_KW } ; [class] => { $ crate :: SyntaxKind :: CLASS_KW } ; [const] => { $ crate :: SyntaxKind :: CONST_KW } ; [continue] => { $ crate :: SyntaxKind :: CONTINUE_KW } ; [debugger] => { $ crate :: SyntaxKind :: DEBUGGER_KW } ; [default] => { $ crate :: SyntaxKind :: DEFAULT_KW } ; [delete] => { $ crate :: SyntaxKind :: DELETE_KW } ; [do] => { $ crate :: SyntaxKind :: DO_KW } ; [else] => { $ crate :: SyntaxKind :: ELSE_KW } ; [enum] => { $ crate :: SyntaxKind :: ENUM_KW } ; [export] => { $ crate :: SyntaxKind :: EXPORT_KW } ; [extends] => { $ crate :: SyntaxKind :: EXTENDS_KW } ; [false] => { $ crate :: SyntaxKind :: FALSE_KW } ; [finally] => { $ crate :: SyntaxKind :: FINALLY_KW } ; [for] => { $ crate :: SyntaxKind :: FOR_KW } ; [function] => { $ crate :: SyntaxKind :: FUNCTION_KW } ; [if] => { $ crate :: SyntaxKind :: IF_KW } ; [in] => { $ crate :: SyntaxKind :: IN_KW } ; [instanceof] => { $ crate :: SyntaxKind :: INSTANCEOF_KW } ; [interface] => { $ crate :: SyntaxKind :: INTERFACE_KW } ; [import] => { $ crate :: SyntaxKind :: IMPORT_KW } ; [implements] => { $ crate :: SyntaxKind :: IMPLEMENTS_KW } ; [new] => { $ crate :: SyntaxKind :: NEW_KW } ; [null] => { $ crate :: SyntaxKind :: NULL_KW } ; [package] => { $ crate :: SyntaxKind :: PACKAGE_KW } ; [private] => { $ crate :: SyntaxKind :: PRIVATE_KW } ; [protected] => { $ crate :: SyntaxKind :: PROTECTED_KW } ; [public] => { $ crate :: SyntaxKind :: PUBLIC_KW } ; [return] => { $ crate :: SyntaxKind :: RETURN_KW } ; [super] => { $ crate :: SyntaxKind :: SUPER_KW } ; [switch] => { $ crate :: SyntaxKind :: SWITCH_KW } ; [this] => { $ crate :: SyntaxKind :: THIS_KW } ; [throw] => { $ crate :: SyntaxKind :: THROW_KW } ; [try] => { $ crate :: SyntaxKind :: TRY_KW } ; [true] => { $ crate :: SyntaxKind :: TRUE_KW } ; [typeof] => { $ crate :: SyntaxKind :: TYPEOF_KW } ; [var] => { $ crate :: SyntaxKind :: VAR_KW } ; [void] => { $ crate :: SyntaxKind :: VOID_KW } ; [while] => { $ crate :: SyntaxKind :: WHILE_KW } ; [with] => { $ crate :: SyntaxKind :: WITH_KW } ; [yield] => { $ crate :: SyntaxKind :: YIELD_KW } ; [readonly] => { $ crate :: SyntaxKind :: READONLY_KW } ; [keyof] => { $ crate :: SyntaxKind :: KEYOF_KW } ; [unique] => { $ crate :: SyntaxKind :: UNIQUE_KW } ; [declare] => { $ crate :: SyntaxKind :: DECLARE_KW } ; [abstract] => { $ crate :: SyntaxKind :: ABSTRACT_KW } ; [static] => { $ crate :: SyntaxKind :: STATIC_KW } ; [async] => { $ crate :: SyntaxKind :: ASYNC_KW } ; [type] => { $ crate :: SyntaxKind :: TYPE_KW } ; [from] => { $ crate :: SyntaxKind :: FROM_KW } ; [as] => { $ crate :: SyntaxKind :: AS_KW } ; [require] => { $ crate :: SyntaxKind :: REQUIRE_KW } ; [namespace] => { $ crate :: SyntaxKind :: NAMESPACE_KW } ; [assert] => { $ crate :: SyntaxKind :: ASSERT_KW } ; [module] => { $ crate :: SyntaxKind :: MODULE_KW } ; [global] => { $ crate :: SyntaxKind :: GLOBAL_KW } ; [infer] => { $ crate :: SyntaxKind :: INFER_KW } ; [get] => { $ crate :: SyntaxKind :: GET_KW } ; [set] => { $ crate :: SyntaxKind :: SET_KW } ; [of] => { $ crate :: SyntaxKind :: OF_KW } ; [target] => { $ crate :: SyntaxKind :: TARGET_KW } ; [never] => { $ crate :: SyntaxKind :: NEVER_KW } ; [unknown] => { $ crate :: SyntaxKind :: UNKNOWN_KW } ; [any] => { $ crate :: SyntaxKind :: ANY_KW } ; [undefined] => { $ crate :: SyntaxKind :: UNDEFINED_KW } ; [let] => { $ crate :: SyntaxKind :: LET_KW } ; [float] => { $ crate :: SyntaxKind :: FLOAT_KW } ; [big_int] => { $ crate :: SyntaxKind :: BIG_INT_KW } ; [number] => { $ crate :: SyntaxKind :: NUMBER_KW } ; [regex] => { $ crate :: SyntaxKind :: REGEX_KW } ; [ident] => { $ crate :: SyntaxKind :: IDENT } ; [js_shebang] => { $ crate :: SyntaxKind :: JS_SHEBANG } ; [#] => { $ crate :: SyntaxKind :: HASH } ; }
+macro_rules ! T { [;] => { $ crate :: SyntaxKind :: SEMICOLON } ; [,] => { $ crate :: SyntaxKind :: COMMA } ; ['('] => { $ crate :: SyntaxKind :: L_PAREN } ; [')'] => { $ crate :: SyntaxKind :: R_PAREN } ; ['{'] => { $ crate :: SyntaxKind :: L_CURLY } ; ['}'] => { $ crate :: SyntaxKind :: R_CURLY } ; ['['] => { $ crate :: SyntaxKind :: L_BRACK } ; [']'] => { $ crate :: SyntaxKind :: R_BRACK } ; [<] => { $ crate :: SyntaxKind :: L_ANGLE } ; [>] => { $ crate :: SyntaxKind :: R_ANGLE } ; [~] => { $ crate :: SyntaxKind :: TILDE } ; [?] => { $ crate :: SyntaxKind :: QUESTION } ; [??] => { $ crate :: SyntaxKind :: QUESTION2 } ; [?.] => { $ crate :: SyntaxKind :: QUESTIONDOT } ; [&] => { $ crate :: SyntaxKind :: AMP } ; [|] => { $ crate :: SyntaxKind :: PIPE } ; [+] => { $ crate :: SyntaxKind :: PLUS } ; [++] => { $ crate :: SyntaxKind :: PLUS2 } ; [*] => { $ crate :: SyntaxKind :: STAR } ; [**] => { $ crate :: SyntaxKind :: STAR2 } ; [/] => { $ crate :: SyntaxKind :: SLASH } ; [^] => { $ crate :: SyntaxKind :: CARET } ; [%] => { $ crate :: SyntaxKind :: PERCENT } ; [.] => { $ crate :: SyntaxKind :: DOT } ; [...] => { $ crate :: SyntaxKind :: DOT2 } ; [:] => { $ crate :: SyntaxKind :: COLON } ; [=] => { $ crate :: SyntaxKind :: EQ } ; [==] => { $ crate :: SyntaxKind :: EQ2 } ; [===] => { $ crate :: SyntaxKind :: EQ3 } ; [=>] => { $ crate :: SyntaxKind :: FAT_ARROW } ; [!] => { $ crate :: SyntaxKind :: BANG } ; [!=] => { $ crate :: SyntaxKind :: NEQ } ; [!==] => { $ crate :: SyntaxKind :: NEQ2 } ; [-] => { $ crate :: SyntaxKind :: MINUS } ; [--] => { $ crate :: SyntaxKind :: MINUS2 } ; [<=] => { $ crate :: SyntaxKind :: LTEQ } ; [>=] => { $ crate :: SyntaxKind :: GTEQ } ; [+=] => { $ crate :: SyntaxKind :: PLUSEQ } ; [-=] => { $ crate :: SyntaxKind :: MINUSEQ } ; [|=] => { $ crate :: SyntaxKind :: PIPEEQ } ; [&=] => { $ crate :: SyntaxKind :: AMPEQ } ; [^=] => { $ crate :: SyntaxKind :: CARETEQ } ; [/=] => { $ crate :: SyntaxKind :: SLASHEQ } ; [*=] => { $ crate :: SyntaxKind :: STAREQ } ; [%=] => { $ crate :: SyntaxKind :: PERCENTEQ } ; [&&] => { $ crate :: SyntaxKind :: AMP2 } ; [||] => { $ crate :: SyntaxKind :: PIPE2 } ; [<<] => { $ crate :: SyntaxKind :: SHL } ; [>>] => { $ crate :: SyntaxKind :: SHR } ; [>>>] => { $ crate :: SyntaxKind :: USHR } ; [<<=] => { $ crate :: SyntaxKind :: SHLEQ } ; [>>=] => { $ crate :: SyntaxKind :: SHREQ } ; [>>>=] => { $ crate :: SyntaxKind :: USHREQ } ; [&&=] => { $ crate :: SyntaxKind :: AMP2EQ } ; [||=] => { $ crate :: SyntaxKind :: PIPE2EQ } ; [**=] => { $ crate :: SyntaxKind :: STAR2EQ } ; [??=] => { $ crate :: SyntaxKind :: QUESTION2EQ } ; [@] => { $ crate :: SyntaxKind :: AT } ; ['`'] => { $ crate :: SyntaxKind :: BACKTICK } ; [await] => { $ crate :: SyntaxKind :: AWAIT_KW } ; [break] => { $ crate :: SyntaxKind :: BREAK_KW } ; [case] => { $ crate :: SyntaxKind :: CASE_KW } ; [catch] => { $ crate :: SyntaxKind :: CATCH_KW } ; [class] => { $ crate :: SyntaxKind :: CLASS_KW } ; [const] => { $ crate :: SyntaxKind :: CONST_KW } ; [continue] => { $ crate :: SyntaxKind :: CONTINUE_KW } ; [debugger] => { $ crate :: SyntaxKind :: DEBUGGER_KW } ; [default] => { $ crate :: SyntaxKind :: DEFAULT_KW } ; [delete] => { $ crate :: SyntaxKind :: DELETE_KW } ; [do] => { $ crate :: SyntaxKind :: DO_KW } ; [else] => { $ crate :: SyntaxKind :: ELSE_KW } ; [enum] => { $ crate :: SyntaxKind :: ENUM_KW } ; [export] => { $ crate :: SyntaxKind :: EXPORT_KW } ; [extends] => { $ crate :: SyntaxKind :: EXTENDS_KW } ; [false] => { $ crate :: SyntaxKind :: FALSE_KW } ; [finally] => { $ crate :: SyntaxKind :: FINALLY_KW } ; [for] => { $ crate :: SyntaxKind :: FOR_KW } ; [function] => { $ crate :: SyntaxKind :: FUNCTION_KW } ; [if] => { $ crate :: SyntaxKind :: IF_KW } ; [in] => { $ crate :: SyntaxKind :: IN_KW } ; [instanceof] => { $ crate :: SyntaxKind :: INSTANCEOF_KW } ; [interface] => { $ crate :: SyntaxKind :: INTERFACE_KW } ; [import] => { $ crate :: SyntaxKind :: IMPORT_KW } ; [implements] => { $ crate :: SyntaxKind :: IMPLEMENTS_KW } ; [new] => { $ crate :: SyntaxKind :: NEW_KW } ; [null] => { $ crate :: SyntaxKind :: NULL_KW } ; [package] => { $ crate :: SyntaxKind :: PACKAGE_KW } ; [private] => { $ crate :: SyntaxKind :: PRIVATE_KW } ; [protected] => { $ crate :: SyntaxKind :: PROTECTED_KW } ; [public] => { $ crate :: SyntaxKind :: PUBLIC_KW } ; [return] => { $ crate :: SyntaxKind :: RETURN_KW } ; [super] => { $ crate :: SyntaxKind :: SUPER_KW } ; [switch] => { $ crate :: SyntaxKind :: SWITCH_KW } ; [this] => { $ crate :: SyntaxKind :: THIS_KW } ; [throw] => { $ crate :: SyntaxKind :: THROW_KW } ; [try] => { $ crate :: SyntaxKind :: TRY_KW } ; [true] => { $ crate :: SyntaxKind :: TRUE_KW } ; [typeof] => { $ crate :: SyntaxKind :: TYPEOF_KW } ; [var] => { $ crate :: SyntaxKind :: VAR_KW } ; [void] => { $ crate :: SyntaxKind :: VOID_KW } ; [while] => { $ crate :: SyntaxKind :: WHILE_KW } ; [with] => { $ crate :: SyntaxKind :: WITH_KW } ; [yield] => { $ crate :: SyntaxKind :: YIELD_KW } ; [readonly] => { $ crate :: SyntaxKind :: READONLY_KW } ; [keyof] => { $ crate :: SyntaxKind :: KEYOF_KW } ; [unique] => { $ crate :: SyntaxKind :: UNIQUE_KW } ; [declare] => { $ crate :: SyntaxKind :: DECLARE_KW } ; [abstract] => { $ crate :: SyntaxKind :: ABSTRACT_KW } ; [static] => { $ crate :: SyntaxKind :: STATIC_KW } ; [async] => { $ crate :: SyntaxKind :: ASYNC_KW } ; [type] => { $ crate :: SyntaxKind :: TYPE_KW } ; [from] => { $ crate :: SyntaxKind :: FROM_KW } ; [as] => { $ crate :: SyntaxKind :: AS_KW } ; [require] => { $ crate :: SyntaxKind :: REQUIRE_KW } ; [namespace] => { $ crate :: SyntaxKind :: NAMESPACE_KW } ; [assert] => { $ crate :: SyntaxKind :: ASSERT_KW } ; [module] => { $ crate :: SyntaxKind :: MODULE_KW } ; [global] => { $ crate :: SyntaxKind :: GLOBAL_KW } ; [infer] => { $ crate :: SyntaxKind :: INFER_KW } ; [get] => { $ crate :: SyntaxKind :: GET_KW } ; [set] => { $ crate :: SyntaxKind :: SET_KW } ; [of] => { $ crate :: SyntaxKind :: OF_KW } ; [target] => { $ crate :: SyntaxKind :: TARGET_KW } ; [never] => { $ crate :: SyntaxKind :: NEVER_KW } ; [unknown] => { $ crate :: SyntaxKind :: UNKNOWN_KW } ; [any] => { $ crate :: SyntaxKind :: ANY_KW } ; [undefined] => { $ crate :: SyntaxKind :: UNDEFINED_KW } ; [let] => { $ crate :: SyntaxKind :: LET_KW } ; [float] => { $ crate :: SyntaxKind :: FLOAT_KW } ; [number] => { $ crate :: SyntaxKind :: NUMBER_KW } ; [ident] => { $ crate :: SyntaxKind :: IDENT } ; [js_shebang] => { $ crate :: SyntaxKind :: JS_SHEBANG } ; [js_string_literal_token] => { $ crate :: SyntaxKind :: JS_STRING_LITERAL_TOKEN } ; [js_number_literal_token] => { $ crate :: SyntaxKind :: JS_NUMBER_LITERAL_TOKEN } ; [js_big_int_literal_token] => { $ crate :: SyntaxKind :: JS_BIG_INT_LITERAL_TOKEN } ; [js_regex_literal_token] => { $ crate :: SyntaxKind :: JS_REGEX_LITERAL_TOKEN } ; [#] => { $ crate :: SyntaxKind :: HASH } ; }
diff --git a/xtask/js.ungram b/xtask/js.ungram
index f0e340d2ef3e..490e1026016f 100644
--- a/xtask/js.ungram
+++ b/xtask/js.ungram
@@ -236,7 +236,7 @@ JsDebuggerStatement =
 // Expression
 JsAnyExpression =
 	ArrowExpr
-	| Literal
+	| JsAnyLiteral
 	| Template
 	| NameRef
 	| ThisExpr
@@ -457,25 +457,35 @@ PostUpdateExpression =
     operand:JsAnyExpression
     operator:('++' | '--')
 
-// Literals
-Literal =
-	'string'
-	| 'true'
-	| 'false'
-	| 'number'
-	| 'regex'
-	| 'float'
-	| 'big_int'
 
-Null = 'null'
-Undefined = 'undefined'
+///////////////
+// LITERALS
+///////////////
 
-ExprOrBlock =
-	JsAnyExpression
-	| JsBlockStatement
+JsAnyLiteral =
+	JsStringLiteral
+	| JsNumberLiteral
+	| JsBigIntLiteral
+	| JsBooleanLiteral
+	| JsNullLiteral
+	| JsRegexLiteral
 
-ParameterList = '(' parameters:(Pattern (',' Pattern)* ','?) ')'
-ArgList = '(' args:(JsAnyExpression (',' JsAnyExpression)* ','?) ')'
+// "abcd" | 'abcd'
+JsStringLiteral = value: 'js_string_literal_token'
+
+// 4, 5.5, 0x00, ...
+JsNumberLiteral = value: 'js_number_literal_token'
+
+// 45n
+JsBigIntLiteral =  value: 'js_big_int_literal_token'
+
+// true, false
+JsBooleanLiteral = value_token: ('true' | 'false')
+
+// null
+JsNullLiteral = value: 'null'
+
+JsRegexLiteral = value: 'js_regex_literal_token'
 
 
 ///////////////
@@ -544,7 +554,8 @@ LiteralProp = manual__key:PropName ':' manual__value:JsAnyExpression
 
 PropName =
 	ComputedPropertyName
-	| Literal
+	| JsStringLiteral
+	| JsNumberLiteral
 	| Ident
 	| Name
 	| JsUnknownBinding
@@ -645,6 +656,7 @@ ImportDecl =
 	imports:ImportClause*
 	'type'?
 	'from'
+	source: JsStringLiteral
 	asserted_object:ObjectExpr
 	'assert'?
 	';'?
@@ -660,7 +672,7 @@ DefaultDecl =
 ExportDefaultExpr = 'export' 'type'? 'default'? expr:JsAnyExpression
 
 // export wildcard
-ExportWildcard = 'export' 'type'? '*' 'as'? ident: Ident? 'from'
+ExportWildcard = 'export' 'type'? '*' 'as'? ident: Ident? 'from' source: JsStringLiteral
 
 
 // export declaration
@@ -688,7 +700,7 @@ Specifier = name:Ident manual__:'as'? manual__alias:Name
 
 
 // this is not currently implemented in rslint parser
-ImportStringSpecifier = 'string'
+ImportStringSpecifier = 'js_string_literal_token'
 
 
 WildcardImport = '*' 'as'? ident: Ident?
@@ -700,6 +712,13 @@ ExportNamed = 'export' 'type'? 'from'?  '{' specifiers:(Specifier (',' Specifier
 // AUXILIARY
 ///////////////
 
+ExprOrBlock =
+	JsAnyExpression
+	| JsBlockStatement
+
+ParameterList = '(' parameters:(Pattern (',' Pattern)* ','?) ')'
+ArgList = '(' args:(JsAnyExpression (',' JsAnyExpression)* ','?) ')'
+
 
 // let a = 10;
 //       ^^^^
@@ -726,7 +745,7 @@ TsModuleRef =
 	TsEntityName
 
 
-TsExternalModuleRef = 'require' '(' 'string' ')'
+TsExternalModuleRef = 'require' '(' 'js_string_literal_token' ')'
 
 TsType =
 	TsAny
diff --git a/xtask/src/codegen/ast.rs b/xtask/src/codegen/ast.rs
index 8afc9130dd51..b64f4a5a1e1b 100644
--- a/xtask/src/codegen/ast.rs
+++ b/xtask/src/codegen/ast.rs
@@ -42,7 +42,7 @@ pub fn generate_ast(mode: Mode) -> Result<()> {
 }
 
 fn make_ast(grammar: &Grammar) -> AstSrc {
-	let tokens = "String Number Whitespace Comment"
+	let tokens = "Whitespace Comment"
 		.split_ascii_whitespace()
 		.map(|it| it.to_string())
 		.collect::<Vec<_>>();
@@ -143,14 +143,12 @@ fn handle_rule(
 		Rule::Token(token) => {
 			let name = clean_token_name(grammar, token);
 
-			if name != "int_number" && name != "string" {
-				let field = Field::Token {
-					name: label.cloned().unwrap_or_else(|| name.clone()),
-					kind: TokenKind::Single(name),
-					optional,
-				};
-				fields.push(field);
-			}
+			let field = Field::Token {
+				name: label.cloned().unwrap_or_else(|| name.clone()),
+				kind: TokenKind::Single(name),
+				optional,
+			};
+			fields.push(field);
 		}
 
 		Rule::Rep(rule) => {
diff --git a/xtask/src/codegen/generate_syntax_kinds.rs b/xtask/src/codegen/generate_syntax_kinds.rs
index 6ff7e7ac5c8a..4d8bad3951d0 100644
--- a/xtask/src/codegen/generate_syntax_kinds.rs
+++ b/xtask/src/codegen/generate_syntax_kinds.rs
@@ -155,6 +155,10 @@ pub fn generate_syntax_kinds(grammar: KindsSrc) -> Result<String> {
 			#([#all_keywords_idents] => { $crate::SyntaxKind::#all_keywords };)*
 			[ident] => { $crate::SyntaxKind::IDENT };
 			[js_shebang] => { $crate::SyntaxKind::JS_SHEBANG };
+			[js_string_literal_token] => { $crate::SyntaxKind::JS_STRING_LITERAL_TOKEN };
+			[js_number_literal_token] => { $crate::SyntaxKind::JS_NUMBER_LITERAL_TOKEN };
+			[js_big_int_literal_token] => { $crate::SyntaxKind::JS_BIG_INT_LITERAL_TOKEN };
+			[js_regex_literal_token] => { $crate::SyntaxKind::JS_REGEX_LITERAL_TOKEN };
 			[#] => { $crate::SyntaxKind::HASH };
 		}
 	};
diff --git a/xtask/src/codegen/kinds_src.rs b/xtask/src/codegen/kinds_src.rs
index 47ca92a9995c..96d7fd9d80d8 100644
--- a/xtask/src/codegen/kinds_src.rs
+++ b/xtask/src/codegen/kinds_src.rs
@@ -149,11 +149,14 @@ pub const KINDS_SRC: KindsSrc = KindsSrc {
 		"undefined",
 		"let",
 		"float",
-		"big_int",
 		"number",
-		"regex",
 	],
-	literals: &["NUMBER", "BIG_INT", "FLOAT", "STRING", "REGEX"],
+	literals: &[
+		"JS_NUMBER_LITERAL_TOKEN",
+		"JS_BIG_INT_LITERAL_TOKEN",
+		"JS_STRING_LITERAL_TOKEN",
+		"JS_REGEX_LITERAL_TOKEN",
+	],
 	tokens: &[
 		"HASH", // #
 		"TEMPLATE_CHUNK",
@@ -163,7 +166,6 @@ pub const KINDS_SRC: KindsSrc = KindsSrc {
 		"WHITESPACE",
 		"COMMENT",
 		"JS_SHEBANG",
-		"JS_IDENTIFIER",
 	],
 	nodes: &[
 		"JS_SCRIPT",
@@ -223,7 +225,12 @@ pub const KINDS_SRC: KindsSrc = KindsSrc {
 		"ASSIGN_EXPR",
 		"SEQUENCE_EXPR",
 		"ARG_LIST",
-		"LITERAL",
+		"JS_STRING_LITERAL",
+		"JS_NUMBER_LITERAL",
+		"JS_BIG_INT_LITERAL",
+		"JS_BOOLEAN_LITERAL",
+		"JS_NULL_LITERAL",
+		"JS_REGEX_LITERAL",
 		"TEMPLATE",
 		"TEMPLATE_ELEMENT",
 		"CONDITION",