ASTUtils: Refactoring

Author: matz3

lib/lbt/utils/ASTUtils.js

@@ -13,20 +13,18 @@ const {Syntax} = require("../utils/parseUtils");
  * @returns {boolean} Whether the node is a literal and whether its value matches the given string
  */
 function isString(node, literal) {
-	if (isLiteral(node)) {
-		return literal == null ? true: node.value === literal;
-	} else if (isTemplateLiteralWithoutExpression(node)) {
-		return literal == null ? true : getTemplateLiteralValue(node) === literal;
-	} else {
+	const value = getStringValue(node);
+	if (value === undefined) {
 		return false;
 	}
+	return literal == null ? true: value === literal;
 }
 
 function getStringValue(node) {
 	if (isLiteral(node)) {
 		return node.value;
 	} else if (isTemplateLiteralWithoutExpression(node)) {
-		return getTemplateLiteralValue(node);
+		return node?.quasis?.[0]?.value?.cooked;
 	}
 }
 
@@ -35,17 +33,9 @@ function isLiteral(node) {
 }
 
 function isTemplateLiteralWithoutExpression(node) {
-	if (node && node.type === Syntax.TemplateLiteral &&
-		node.quasis && node.quasis.length === 1 &&
-		node.quasis[0].type === Syntax.TemplateElement &&
-		typeof node.quasis[0].value.raw === "string") {
-		return true;
-	}
-	return false;
-}
-
-function getTemplateLiteralValue(node) {
-	return node?.quasis?.[0]?.value?.cooked;
+	return node?.type === Syntax.TemplateLiteral &&
+		node?.expressions?.length === 0 &&
+		node?.quasis?.length === 1;
 }
 
 function isBoolean(node, literal) {