ASTUtils: support template strings in getStringArray

Author: matz3

lib/lbt/utils/ASTUtils.js

@@ -131,10 +131,15 @@ function getValue(obj, names) {
  */
 function getStringArray(array, skipNonStringLiterals) {
 	return array.elements.reduce( (result, item) => {
-		if ( isString(item) ) {
-			result.push(item.value);
+		const value = getStringValue(item);
+		if ( value !== undefined ) {
+			result.push(value);
 		} else if ( !skipNonStringLiterals ) {
-			throw new TypeError("array element is not a string literal:" + item.type);
+			if (item.type === Syntax.TemplateLiteral) {
+				throw new TypeError("array element is a template literal with expressions");
+			} else {
+				throw new TypeError("array element is not a string literal: " + item.type);
+			}
 		}
 		return result;
 	}, []);

test/lib/lbt/utils/ASTUtils.js

@@ -129,16 +129,36 @@ test("isMethodCall", (t) => {
 
 test("getStringArray", (t) => {
 	const array = parseJS("['a', 5]").body[0].expression;
-	const error = t.throws(() => {
+	t.throws(() => {
 		ASTUtils.getStringArray(array);
-	}, {instanceOf: TypeError}, "array contains a number");
-
-	t.deepEqual(error.message, "array element is not a string literal:Literal");
+	}, {
+		instanceOf: TypeError,
+		message: "array element is not a string literal: Literal"
+	}, "array contains a number");
 
 	const stringArray = parseJS("['a', 'x']").body[0].expression;
 	t.deepEqual(ASTUtils.getStringArray(stringArray), ["a", "x"], "array contains only strings");
 });
 
+test("getStringArray (skipNonStringLiterals=true)", (t) => {
+	const array = parseJS("['a', `x`, true, 5, `${foo}`, {}]").body[0].expression;
+	t.deepEqual(ASTUtils.getStringArray(array, true), ["a", "x"], "result contains only strings");
+});
+
+test("getStringArray (template literal)", (t) => {
+	const array = parseJS("[`a`, `${a}`]").body[0].expression;
+	t.throws(() => {
+		ASTUtils.getStringArray(array);
+	}, {
+		instanceOf: TypeError,
+		message: "array element is a template literal with expressions"
+	});
+
+	const stringArray = parseJS("[`a`, 'x']").body[0].expression;
+	t.deepEqual(ASTUtils.getStringArray(stringArray), ["a", "x"],
+		"array contains only strings or template literals without expressions");
+});
+
 test("getLocation", (t) => {
 	t.deepEqual(ASTUtils.getLocation([{value: "module/name"}]), "module/name");
 });