Add experimental support for custom message arguments

lib/rules/custom-property-pattern/index.js

@@ -79,7 +79,8 @@ const rule = (primary) => {
 			report({
 				result,
 				ruleName,
-				message: messages.expected(primary),
+				message: messages.expected,
+				messageArgs: [primary],
 				node: decl,
 				index,
 				endIndex: index + length,

lib/utils/__tests__/report.test.js

@@ -2,15 +2,17 @@
 
 const report = require('../report');
 
-it('without disabledRanges', () => {
+const defaultRangeBy = () => ({ start: { line: 2, column: 1 }, end: { line: 2, column: 2 } });
+
+test('without disabledRanges', () => {
 	const v = {
 		ruleName: 'foo',
 		result: {
 			warn: jest.fn(),
 		},
 		message: 'bar',
 		node: {
-			rangeBy: () => ({ start: { line: 2, column: 1 }, end: { line: 2, column: 2 } }),
+			rangeBy: defaultRangeBy,
 		},
 	};
 
@@ -21,7 +23,7 @@ it('without disabledRanges', () => {
 	expect(spyArgs[1].node).toBe(v.node);
 });
 
-it('with irrelevant general disabledRange', () => {
+test('with irrelevant general disabledRange', () => {
 	const v = {
 		ruleName: 'foo',
 		result: {
@@ -34,7 +36,7 @@ it('with irrelevant general disabledRange', () => {
 		},
 		message: 'bar',
 		node: {
-			rangeBy: () => ({ start: { line: 2, column: 1 }, end: { line: 2, column: 2 } }),
+			rangeBy: defaultRangeBy,
 		},
 	};
 
@@ -45,7 +47,7 @@ it('with irrelevant general disabledRange', () => {
 	expect(spyArgs[1].node).toBe(v.node);
 });
 
-it('with relevant general disabledRange', () => {
+test('with relevant general disabledRange', () => {
 	const v = {
 		ruleName: 'foo',
 		result: {
@@ -66,7 +68,7 @@ it('with relevant general disabledRange', () => {
 	expect(v.result.warn).toHaveBeenCalledTimes(0);
 });
 
-it('with irrelevant rule-specific disabledRange', () => {
+test('with irrelevant rule-specific disabledRange', () => {
 	const v = {
 		ruleName: 'foo',
 		result: {
@@ -91,7 +93,7 @@ it('with irrelevant rule-specific disabledRange', () => {
 	expect(spyArgs[1].node).toBe(v.node);
 });
 
-it('with relevant rule-specific disabledRange', () => {
+test('with relevant rule-specific disabledRange', () => {
 	const v = {
 		ruleName: 'foo',
 		result: {
@@ -113,7 +115,7 @@ it('with relevant rule-specific disabledRange', () => {
 	expect(v.result.warn).toHaveBeenCalledTimes(0);
 });
 
-it('with relevant general disabledRange, among others', () => {
+test('with relevant general disabledRange, among others', () => {
 	const v = {
 		ruleName: 'foo',
 		result: {
@@ -137,7 +139,7 @@ it('with relevant general disabledRange, among others', () => {
 	expect(v.result.warn).toHaveBeenCalledTimes(0);
 });
 
-it('with relevant rule-specific disabledRange, among others', () => {
+test('with relevant rule-specific disabledRange, among others', () => {
 	const v = {
 		ruleName: 'foo',
 		result: {
@@ -162,7 +164,7 @@ it('with relevant rule-specific disabledRange, among others', () => {
 	expect(v.result.warn).toHaveBeenCalledTimes(0);
 });
 
-it('with relevant rule-specific disabledRange with range report', () => {
+test('with relevant rule-specific disabledRange with range report', () => {
 	const v = {
 		ruleName: 'foo',
 		result: {
@@ -184,7 +186,7 @@ it('with relevant rule-specific disabledRange with range report', () => {
 	expect(v.result.warn).toHaveBeenCalledTimes(0);
 });
 
-it("with quiet mode on and rule severity of 'warning'", () => {
+test("with quiet mode on and rule severity of 'warning'", () => {
 	const v = {
 		ruleName: 'foo',
 		result: {
@@ -198,15 +200,15 @@ it("with quiet mode on and rule severity of 'warning'", () => {
 		},
 		message: 'bar',
 		node: {
-			rangeBy: () => ({ start: { line: 6, column: 1 }, end: { line: 6, column: 2 } }),
+			rangeBy: defaultRangeBy,
 		},
 	};
 
 	report(v);
 	expect(v.result.warn).toHaveBeenCalledTimes(0);
 });
 
-it("with quiet mode on and rule severity of 'error'", () => {
+test("with quiet mode on and rule severity of 'error'", () => {
 	const v = {
 		ruleName: 'foo',
 		result: {
@@ -220,10 +222,76 @@ it("with quiet mode on and rule severity of 'error'", () => {
 		},
 		message: 'bar',
 		node: {
-			rangeBy: () => ({ start: { line: 6, column: 1 }, end: { line: 6, column: 2 } }),
+			rangeBy: defaultRangeBy,
 		},
 	};
 
 	report(v);
 	expect(v.result.warn).toHaveBeenCalledTimes(1);
 });
+
+test('with message function', () => {
+	const v = {
+		ruleName: 'foo',
+		result: {
+			warn: jest.fn(),
+		},
+		message: (a, b, c, d) => `a=${a}, b=${b}, c=${c}, d=${d}`,
+		messageArgs: ['str', true, 10, /regex/],
+		node: {
+			rangeBy: defaultRangeBy,
+		},
+	};
+
+	report(v);
+	const spyArgs = v.result.warn.mock.calls[0];
+
+	expect(spyArgs[0]).toBe('a=str, b=true, c=10, d=/regex/');
+	expect(spyArgs[1].node).toBe(v.node);
+});
+
+test('with custom message', () => {
+	const v = {
+		ruleName: 'foo',
+		result: {
+			warn: jest.fn(),
+			stylelint: {
+				customMessages: { foo: 'A custom message: %s, %s, %d, %s' },
+			},
+		},
+		message: 'bar',
+		messageArgs: ['str', true, 10, /regex/],
+		node: {
+			rangeBy: defaultRangeBy,
+		},
+	};
+
+	report(v);
+	const spyArgs = v.result.warn.mock.calls[0];
+
+	expect(spyArgs[0]).toBe('A custom message: str, true, 10, /regex/');
+	expect(spyArgs[1].node).toBe(v.node);
+});
+
+test('with custom message function', () => {
+	const v = {
+		ruleName: 'foo',
+		result: {
+			warn: jest.fn(),
+			stylelint: {
+				customMessages: { foo: (a, b) => `a=${a}, b=${b}` },
+			},
+		},
+		message: 'bar',
+		messageArgs: ['str', 123],
+		node: {
+			rangeBy: defaultRangeBy,
+		},
+	};
+
+	report(v);
+	const spyArgs = v.result.warn.mock.calls[0];
+
+	expect(spyArgs[0]).toBe('a=str, b=123');
+	expect(spyArgs[1].node).toBe(v.node);
+});

lib/utils/report.js

@@ -1,5 +1,7 @@
 'use strict';
 
+const util = require('util');
+
 /**
  * Report a problem.
  *
@@ -15,7 +17,7 @@
  * @type {typeof import('stylelint').utils.report}
  */
 module.exports = function report(problem) {
-	const { ruleName, result, message, line, node, index, endIndex, word } = problem;
+	const { ruleName, result, message, messageArgs, line, node, index, endIndex, word } = problem;
 
 	result.stylelint = result.stylelint || {
 		ruleSeverities: {},
@@ -104,8 +106,26 @@ module.exports = function report(problem) {
 		warningProperties.word = word;
 	}
 
-	const warningMessage =
-		(result.stylelint.customMessages && result.stylelint.customMessages[ruleName]) || message;
+	const { customMessages } = result.stylelint;
+	const warningMessage = buildWarningMessage(
+		(customMessages && customMessages[ruleName]) || message,
+		messageArgs,
+	);
 
 	result.warn(warningMessage, warningProperties);
 };
+
+/**
+ * @param {import('stylelint').RuleMessage} message
+ * @param {import('stylelint').Problem['messageArgs']} messageArgs
+ * @returns {string}
+ */
+function buildWarningMessage(message, messageArgs) {
+	const args = messageArgs || [];
+
+	if (typeof message === 'string') {
+		return util.format(message, ...args);
+	}
+
+	return message(...args);
+}

scripts/visual-config.json

@@ -6,7 +6,7 @@
 		"custom-property-pattern": [
 			"^([a-z][a-z0-9]*)(-[a-z0-9]+)*$",
 			{
-				"message": "Expected custom property name to be kebab-case",
+				"message": "Expected custom property name to be kebab-case; pattern=/%s/",
 				"severity": "warning"
 			}
 		],

types/stylelint/index.d.ts

@@ -89,7 +89,7 @@ declare module 'stylelint' {
 
 		export type StylelintPostcssResult = {
 			ruleSeverities: { [ruleName: string]: Severity };
-			customMessages: { [ruleName: string]: any };
+			customMessages: { [ruleName: string]: RuleMessage };
 			ruleMetadata: { [ruleName: string]: Partial<RuleMeta> };
 			quiet?: boolean;
 			disabledRanges: DisabledRangeObject;
@@ -154,7 +154,9 @@ declare module 'stylelint' {
 			bivariance(...args: (string | number | boolean | RegExp)[]): string;
 		}['bivariance'];
 
-		export type RuleMessages = { [message: string]: string | RuleMessageFunc };
+		export type RuleMessage = string | RuleMessageFunc;
+
+		export type RuleMessages = { [message: string]: RuleMessage };
 
 		export type RuleOptionsPossibleFunc = (value: unknown) => boolean;
 
@@ -350,7 +352,8 @@ declare module 'stylelint' {
 		export type Problem = {
 			ruleName: string;
 			result: PostcssResult;
-			message: string;
+			message: RuleMessage;
+			messageArgs?: Parameters<RuleMessage> | undefined;
 			node: PostCSS.Node;
 			/**
 			 * The inclusive start index of the problem, relative to the node's